diff options
Diffstat (limited to 'data/maps')
82 files changed, 1275 insertions, 309 deletions
diff --git a/data/maps/events/FieryPath.s b/data/maps/events/FieryPath.s index c6fc85f61..ba51ffb89 100644 --- a/data/maps/events/FieryPath.s +++ b/data/maps/events/FieryPath.s @@ -1,11 +1,11 @@ FieryPath_MapObjects:: @ 838C718 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, 1091, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, FieryPath_EventScript_1B0FCB, 17, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, FieryPath_EventScript_1B0FCB, 18, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, FieryPath_EventScript_1B0FCB, 19, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, FieryPath_EventScript_1B0FCB, 20, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, FieryPath_EventScript_1B0FCB, 21, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, FieryPath_EventScript_1B0FCB, 22, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, 1111, 0, 0 FieryPath_MapWarps:: @ 838C7D8 diff --git a/data/maps/events/GraniteCave_B2F.s b/data/maps/events/GraniteCave_B2F.s index 9d781e583..014a11699 100644 --- a/data/maps/events/GraniteCave_B2F.s +++ b/data/maps/events/GraniteCave_B2F.s @@ -1,13 +1,13 @@ GraniteCave_B2F_MapObjects:: @ 838BFEC object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, 1053, 0, 0 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, 1054, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B0EB7, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B0EB7, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B0EB7, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B0EB7, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B0EB7, 21, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B0EB7, 22, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B0EB7, 23, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0 + object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 23, 0, 0 GraniteCave_B2F_MapWarps:: @ 838C0C4 warp_def 29, 13, 3, 2, GraniteCave_B1F diff --git a/data/maps/events/PetalburgWoods.s b/data/maps/events/PetalburgWoods.s index 633a02de0..3fd0e78c7 100644 --- a/data/maps/events/PetalburgWoods.s +++ b/data/maps/events/PetalburgWoods.s @@ -1,6 +1,6 @@ PetalburgWoods_MapObjects:: @ 838C14C - object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B0DCC, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B0DCC, 18, 0, 0 + object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 725, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 724, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, 1056, 0, 0 diff --git a/data/maps/events/Route102.s b/data/maps/events/Route102.s index 58be44d36..bfb0813b3 100644 --- a/data/maps/events/Route102.s +++ b/data/maps/events/Route102.s @@ -5,8 +5,8 @@ Route102_MapObjects:: @ 83811FC object_event 4, MAP_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EB53, 0, 0, 0 object_event 5, MAP_OBJ_GFX_BOY_1, 0, 37, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route102_EventScript_14EAF5, 0, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, 1000, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, Route102_EventScript_1A14DD, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, Route102_EventScript_1A14DD, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, BerryTreeScript, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, BerryTreeScript, 0, 0, 0 object_event 9, MAP_OBJ_GFX_YOUNGSTER, 0, 19, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route102_EventScript_14EB6A, 0, 0, 0 Route102_MapBGEvents:: @ 83812D4 diff --git a/data/maps/events/Route103.s b/data/maps/events/Route103.s index 2b3f4ef6c..04f75e922 100644 --- a/data/maps/events/Route103.s +++ b/data/maps/events/Route103.s @@ -5,15 +5,15 @@ Route103_MapObjects:: @ 8381300 object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDF1, 0, 0, 0 object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDAB, 0, 0, 0 object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 50, 0, 8, 0, 3, 26, 16, 0, 1, 0, 3, 0, Route103_EventScript_14EE37, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 58, 0, 5, 0, 3, 12, 0, 0, 0, 0, 5, 0, Route103_EventScript_1A14DD, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, Route103_EventScript_1A14DD, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, Route103_EventScript_1A14DD, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 58, 0, 5, 0, 3, 12, 0, 0, 0, 0, 5, 0, BerryTreeScript, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, BerryTreeScript, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, BerryTreeScript, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BOY_1, 0, 20, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, Route103_EventScript_14ED79, 0, 0, 0 object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, 898, 0, 0 object_event 12, MAP_OBJ_GFX_MAN_3, 0, 56, 0, 12, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route103_EventScript_14EE4E, 0, 0, 0 object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, 1114, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B0DCC, 18, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B0DCC, 19, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 Route103_MapBGEvents:: @ 8381468 bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B diff --git a/data/maps/events/Route104.s b/data/maps/events/Route104.s index 8bb03579c..970ff42c6 100644 --- a/data/maps/events/Route104.s +++ b/data/maps/events/Route104.s @@ -8,17 +8,17 @@ Route104_MapObjects:: @ 8381488 object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, 742, 0, 0 object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 738, 0, 0 object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 29, 0, 8, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F172, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, Route104_EventScript_1A14DD, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, Route104_EventScript_1A14DD, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, Route104_EventScript_1A14DD, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, Route104_EventScript_1A14DD, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, Route104_EventScript_1A14DD, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, Route104_EventScript_1A14DD, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, BerryTreeScript, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, BerryTreeScript, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, BerryTreeScript, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, BerryTreeScript, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, BerryTreeScript, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, BerryTreeScript, 0, 0, 0 object_event 16, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 37, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EEC8, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 22, 0, 3, 12, 0, 0, 0, 0, 3, 0, Route104_EventScript_1A14DD, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, Route104_EventScript_1A14DD, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, Route104_EventScript_1A14DD, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, Route104_EventScript_1A14DD, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 22, 0, 3, 12, 0, 0, 0, 0, 3, 0, BerryTreeScript, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, BerryTreeScript, 0, 0, 0 + object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, BerryTreeScript, 0, 0, 0 + object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, BerryTreeScript, 0, 0, 0 object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, 1002, 0, 0 object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, 906, 0, 0 object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F25A, 0, 0, 0 @@ -28,7 +28,7 @@ Route104_MapObjects:: @ 8381488 object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, 1057, 0, 0 object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 18, 0, 67, 0, 3, 46, 101, 0, 1, 0, 2, 0, Route104_EventScript_14F189, 0, 0, 0 object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, 1115, 0, 0 - object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B0DCC, 17, 0, 0 + object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, 1135, 0, 0 object_event 32, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF93, 0, 0, 0 diff --git a/data/maps/events/Route110.s b/data/maps/events/Route110.s index 105119052..b151d1d74 100644 --- a/data/maps/events/Route110.s +++ b/data/maps/events/Route110.s @@ -14,9 +14,9 @@ Route110_MapObjects:: @ 8381D58 object_event 13, MAP_OBJ_GFX_LASS, 0, 33, 0, 15, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAA5, 0, 0, 0 object_event 14, MAP_OBJ_GFX_MANIAC, 0, 23, 0, 40, 0, 3, 20, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FABC, 0, 0, 0 object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 10, 0, 19, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAFA, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, Route110_EventScript_1A14DD, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, Route110_EventScript_1A14DD, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, Route110_EventScript_1A14DD, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, BerryTreeScript, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, BerryTreeScript, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, BerryTreeScript, 0, 0, 0 object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, 1007, 0, 0 object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, 1006, 0, 0 object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 0, 92, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14FA53, 0, 0, 0 diff --git a/data/maps/events/Route110_TrickHousePuzzle1.s b/data/maps/events/Route110_TrickHousePuzzle1.s index 20d28aa1e..a2d4bd7c7 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.s +++ b/data/maps/events/Route110_TrickHousePuzzle1.s @@ -2,22 +2,22 @@ Route110_TrickHousePuzzle1_MapObjects:: @ 839225C object_event 1, MAP_OBJ_GFX_LASS, 0, 13, 0, 21, 0, 3, 9, 0, 0, 1, 0, 5, 0, Route110_TrickHousePuzzle1_EventScript_161D31, 0, 0, 0 object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 13, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle1_EventScript_161D48, 0, 0, 0 object_event 3, MAP_OBJ_GFX_LASS, 0, 3, 0, 8, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle1_EventScript_161D5F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 19, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 17, 0, 0 - object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 18, 0, 0 - object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 20, 0, 0 - object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 23, 0, 0 - object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 22, 0, 0 - object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 21, 0, 0 - object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 25, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 24, 0, 0 - object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 26, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 28, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 27, 0, 0 - object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 29, 0, 0 - object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 30, 0, 0 + object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 + object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 + object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 + object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 20, 0, 0 + object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 23, 0, 0 + object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 22, 0, 0 + object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 21, 0, 0 + object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 25, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 24, 0, 0 + object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 26, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 28, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 27, 0, 0 + object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 29, 0, 0 + object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 30, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, 1060, 0, 0 - object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 31, 0, 0 + object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 31, 0, 0 Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance diff --git a/data/maps/events/Route110_TrickHousePuzzle3.s b/data/maps/events/Route110_TrickHousePuzzle3.s index 7f8b7e792..66c7ca29c 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.s +++ b/data/maps/events/Route110_TrickHousePuzzle3.s @@ -2,14 +2,14 @@ Route110_TrickHousePuzzle3_MapObjects:: @ 839254C object_event 1, MAP_OBJ_GFX_CAMPER, 0, 10, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162708, 0, 0, 0 object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_16271F, 0, 0, 0 object_event 3, MAP_OBJ_GFX_HIKER, 0, 11, 0, 4, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162736, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B0EB7, 17, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B0EB7, 18, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B0EB7, 19, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B0EB7, 20, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, 1064, 0, 0 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, 1063, 0, 0 - object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B0EB7, 21, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B0EB7, 22, 0, 0 + object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0 Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance diff --git a/data/maps/events/Route110_TrickHousePuzzle4.s b/data/maps/events/Route110_TrickHousePuzzle4.s index aaa1bb895..b4fce06f4 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.s +++ b/data/maps/events/Route110_TrickHousePuzzle4.s @@ -3,17 +3,17 @@ Route110_TrickHousePuzzle4_MapObjects:: @ 83926FC object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 4, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_162799, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 7, 0, 4, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle4_EventScript_162782, 0, 0, 0 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, 1065, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 17, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 18, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 19, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 20, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 21, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 22, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 23, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 24, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 25, 0, 0 - object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 26, 0, 0 - object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 27, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0 + object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 + object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0 + object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 24, 0, 0 + object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 25, 0, 0 + object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 26, 0, 0 + object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 27, 0, 0 Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance diff --git a/data/maps/events/Route111.s b/data/maps/events/Route111.s index 500287f46..32369d77c 100644 --- a/data/maps/events/Route111.s +++ b/data/maps/events/Route111.s @@ -4,8 +4,8 @@ Route111_MapObjects:: @ 83821A0 object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, 770, 0, 0 object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 771, 0, 0 object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 28, 0, 51, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503BE, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, Route111_EventScript_1A14DD, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, Route111_EventScript_1A14DD, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, BerryTreeScript, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, BerryTreeScript, 0, 0, 0 object_event 8, MAP_OBJ_GFX_MAN_4, 0, 8, 0, 91, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_150395, 0, 0, 0 object_event 9, MAP_OBJ_GFX_CAMPER, 0, 24, 0, 60, 0, 3, 21, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503A7, 0, 0, 0 object_event 10, MAP_OBJ_GFX_HIKER, 0, 27, 0, 69, 0, 3, 50, 34, 0, 1, 0, 2, 0, Route111_EventScript_150403, 0, 0, 0 @@ -13,19 +13,19 @@ Route111_MapObjects:: @ 83821A0 object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 32, 0, 72, 0, 3, 24, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503EC, 0, 0, 0 object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, 796, 0, 0 object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, 796, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B0EB7, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B0EB7, 18, 0, 0 + object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 + object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0 object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 23, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route111_EventScript_1500C5, 0, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, 1008, 0, 0 - object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, Route111_EventScript_1A14DD, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, Route111_EventScript_1A14DD, 0, 0, 0 + object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, BerryTreeScript, 0, 0, 0 + object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, BerryTreeScript, 0, 0, 0 object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, 799, 0, 0 object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, 799, 0, 0 object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, 903, 0, 0 object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, 903, 0, 0 object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, 1009, 0, 0 object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, 1010, 0, 0 - object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B0DCC, 19, 0, 0 + object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 82, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route111_EventScript_150458, 0, 0, 0 object_event 29, MAP_OBJ_GFX_CAMPER, 0, 11, 0, 71, 0, 3, 22, 0, 0, 1, 0, 3, 0, Route111_EventScript_150441, 0, 0, 0 object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 32, 0, 29, 0, 3, 28, 1, 0, 1, 0, 2, 0, Route111_EventScript_15046F, 0, 0, 0 diff --git a/data/maps/events/Route112.s b/data/maps/events/Route112.s index 7344e0be2..da75250d0 100644 --- a/data/maps/events/Route112.s +++ b/data/maps/events/Route112.s @@ -5,10 +5,10 @@ Route112_MapObjects:: @ 8382818 object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 22, 0, 46, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route112_EventScript_1505B5, 0, 0, 0 object_event 5, MAP_OBJ_GFX_HIKER, 0, 17, 0, 40, 0, 3, 16, 0, 0, 1, 0, 4, 0, Route112_EventScript_150560, 0, 0, 0 object_event 6, 241, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, 819, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, Route112_EventScript_1A14DD, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, Route112_EventScript_1A14DD, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, Route112_EventScript_1A14DD, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, Route112_EventScript_1A14DD, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, BerryTreeScript, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, BerryTreeScript, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, BerryTreeScript, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, BerryTreeScript, 0, 0, 0 object_event 11, MAP_OBJ_GFX_HIKER, 0, 8, 0, 50, 0, 3, 26, 48, 0, 0, 0, 0, 0, Route112_EventScript_150540, 0, 0, 0 object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, 1011, 0, 0 diff --git a/data/maps/events/Route114.s b/data/maps/events/Route114.s index 87e2da82c..fd560752b 100644 --- a/data/maps/events/Route114.s +++ b/data/maps/events/Route114.s @@ -1,25 +1,25 @@ Route114_MapObjects:: @ 8382C48 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, Route114_EventScript_1A14DD, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, Route114_EventScript_1A14DD, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, BerryTreeScript, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, BerryTreeScript, 0, 0, 0 object_event 3, MAP_OBJ_GFX_HIKER, 0, 15, 0, 65, 0, 7, 10, 0, 0, 1, 0, 6, 0, Route114_EventScript_1507F1, 0, 0, 0 object_event 4, MAP_OBJ_GFX_HIKER, 0, 30, 0, 72, 0, 5, 15, 0, 0, 1, 0, 4, 0, Route114_EventScript_150808, 0, 0, 0 object_event 5, MAP_OBJ_GFX_CAMPER, 0, 22, 0, 50, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route114_EventScript_15081F, 0, 0, 0 object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 19, 0, 35, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route114_EventScript_150836, 0, 0, 0 object_event 7, MAP_OBJ_GFX_MANIAC, 0, 20, 0, 56, 0, 3, 7, 0, 0, 1, 0, 3, 0, Route114_EventScript_15084D, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, Route114_EventScript_1A14DD, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, BerryTreeScript, 0, 0, 0 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, 1014, 0, 0 object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, 1015, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B0EB7, 17, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 19, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_150782, 0, 0, 0 object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 19, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_1507C3, 0, 0, 0 object_event 14, MAP_OBJ_GFX_MAN_5, 0, 27, 0, 42, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route114_EventScript_150733, 0, 0, 0 object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 23, 0, 20, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508E0, 0, 0, 0 object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 19, 0, 26, 0, 3, 9, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508C9, 0, 0, 0 object_event 17, MAP_OBJ_GFX_MAN_6, 0, 30, 0, 58, 0, 5, 23, 0, 0, 1, 0, 3, 0, Route114_EventScript_15088B, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route114_EventScript_1B0EB7, 18, 0, 0 - object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route114_EventScript_1B0EB7, 19, 0, 0 - object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, Route114_EventScript_1B0EB7, 20, 0, 0 - object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route114_EventScript_1B0EB7, 21, 0, 0 + object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0 + object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0 + object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0 + object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0 object_event 22, MAP_OBJ_GFX_LASS, 0, 24, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_150912, 0, 0, 0 object_event 23, MAP_OBJ_GFX_LASS, 0, 23, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_1508F7, 0, 0, 0 diff --git a/data/maps/events/Route115.s b/data/maps/events/Route115.s index 0b028b1e2..6c2baf23d 100644 --- a/data/maps/events/Route115.s +++ b/data/maps/events/Route115.s @@ -2,18 +2,18 @@ Route115_MapObjects:: @ 8382F2C object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 18, 0, 68, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route115_EventScript_15092E, 0, 0, 0 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 15, 0, 3, 10, 0, 0, 1, 0, 6, 0, Route115_EventScript_150949, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 27, 0, 53, 0, 3, 15, 17, 0, 1, 0, 4, 0, Route115_EventScript_15099E, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 69, 0, Route115_EventScript_1A14DD, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, Route115_EventScript_1A14DD, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, Route115_EventScript_1A14DD, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 69, 0, BerryTreeScript, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, BerryTreeScript, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, BerryTreeScript, 0, 0, 0 object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 15, 0, 50, 0, 3, 64, 0, 0, 1, 0, 3, 0, Route115_EventScript_1509DC, 0, 0, 0 object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 17, 0, 17, 0, 3, 50, 51, 0, 1, 0, 2, 0, Route115_EventScript_150987, 0, 0, 0 object_event 9, MAP_OBJ_GFX_MANIAC, 0, 25, 0, 61, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route115_EventScript_150A1A, 0, 0, 0 object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, 1016, 0, 0 object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, 1017, 0, 0 object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, 1018, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, Route115_EventScript_1A14DD, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, Route115_EventScript_1A14DD, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B0EB7, 17, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, BerryTreeScript, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, BerryTreeScript, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, 1118, 0, 0 Route115_MapWarps:: @ 83830AC diff --git a/data/maps/events/Route116.s b/data/maps/events/Route116.s index 4fcbd0eb0..b7587f095 100644 --- a/data/maps/events/Route116.s +++ b/data/maps/events/Route116.s @@ -1,18 +1,18 @@ Route116_MapObjects:: @ 8383170 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, Route116_EventScript_1A14DD, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, Route116_EventScript_1A14DD, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, BerryTreeScript, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, BerryTreeScript, 0, 0, 0 object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 12, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route116_EventScript_150C62, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B0DCC, 17, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B0DCC, 18, 0, 0 + object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 + object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 13, 0, 17, 0, 3, 24, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C79, 0, 0, 0 object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, 1019, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, 1020, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, Route116_EventScript_1A14DD, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, Route116_EventScript_1A14DD, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, BerryTreeScript, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, BerryTreeScript, 0, 0, 0 object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, 891, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B0DCC, 19, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 object_event 13, MAP_OBJ_GFX_HIKER, 0, 36, 0, 15, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CCE, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B0DCC, 20, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 20, 0, 0 object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, 1021, 0, 0 object_event 16, MAP_OBJ_GFX_LASS, 0, 22, 0, 16, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route116_EventScript_150CE5, 0, 0, 0 object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 25, 0, 4, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CFC, 0, 0, 0 diff --git a/data/maps/events/Route117.s b/data/maps/events/Route117.s index f3eda5d9e..ecea5d016 100644 --- a/data/maps/events/Route117.s +++ b/data/maps/events/Route117.s @@ -9,11 +9,11 @@ Route117_MapObjects:: @ 8383440 object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 0, 7, 0, 3, 28, 7, 0, 1, 0, 4, 0, Route117_EventScript_150E09, 0, 0, 0 object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 31, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route117_EventScript_150DCB, 0, 0, 0 object_event 10, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 9, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route117_EventScript_150D8D, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, Route117_EventScript_1A14DD, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, Route117_EventScript_1A14DD, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, Route117_EventScript_1A14DD, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, BerryTreeScript, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, BerryTreeScript, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, BerryTreeScript, 0, 0, 0 object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, 1022, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B0DCC, 17, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, 1023, 0, 0 object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 0, 1, 0, 3, 40, 68, 0, 1, 0, 3, 0, Route117_EventScript_150E47, 0, 0, 0 object_event 18, MAP_OBJ_GFX_MANIAC, 0, 17, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, Route117_EventScript_150E85, 0, 0, 0 diff --git a/data/maps/events/Route118.s b/data/maps/events/Route118.s index eaa71212e..fb7de71f9 100644 --- a/data/maps/events/Route118.s +++ b/data/maps/events/Route118.s @@ -1,7 +1,7 @@ Route118_MapObjects:: @ 8383684 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, Route118_EventScript_1A14DD, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, Route118_EventScript_1A14DD, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, Route118_EventScript_1A14DD, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, BerryTreeScript, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, BerryTreeScript, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, BerryTreeScript, 0, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_6, 0, 64, 0, 10, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route118_EventScript_151139, 0, 0, 0 object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, 797, 0, 0 object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, 797, 0, 0 @@ -10,7 +10,7 @@ Route118_MapObjects:: @ 8383684 object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, 901, 0, 0 object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, 904, 0, 0 object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, 904, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route118_EventScript_1B0DCC, 17, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 28, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route118_EventScript_150F34, 0, 0, 0 object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 10, 0, 3, 24, 0, 0, 1, 0, 4, 0, Route118_EventScript_15108F, 0, 0, 0 object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 14, 0, 14, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route118_EventScript_1510E4, 0, 0, 0 diff --git a/data/maps/events/Route119.s b/data/maps/events/Route119.s index e9cbd7300..f399604ac 100644 --- a/data/maps/events/Route119.s +++ b/data/maps/events/Route119.s @@ -1,7 +1,7 @@ Route119_MapObjects:: @ 8383914 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, Route119_EventScript_1A14DD, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, Route119_EventScript_1A14DD, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, Route119_EventScript_1A14DD, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, BerryTreeScript, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, BerryTreeScript, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, BerryTreeScript, 0, 0, 0 object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 12, 0, 123, 0, 3, 59, 0, 0, 1, 0, 1, 0, Route119_EventScript_151491, 0, 0, 0 object_event 5, MAP_OBJ_GFX_MANIAC, 0, 26, 0, 123, 0, 3, 60, 0, 0, 1, 0, 1, 0, Route119_EventScript_151463, 0, 0, 0 object_event 6, MAP_OBJ_GFX_MANIAC, 0, 5, 0, 125, 0, 3, 62, 0, 0, 1, 0, 1, 0, Route119_EventScript_15144C, 0, 0, 0 @@ -25,10 +25,10 @@ Route119_MapObjects:: @ 8383914 object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, 890, 0, 0 object_event 25, 243, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, 923, 0, 0 object_event 26, MAP_OBJ_GFX_BOY_3, 0, 31, 0, 109, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515F3, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, Route119_EventScript_1A14DD, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, Route119_EventScript_1A14DD, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, Route119_EventScript_1A14DD, 0, 0, 0 - object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, Route119_EventScript_1A14DD, 0, 0, 0 + object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, BerryTreeScript, 0, 0, 0 + object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, BerryTreeScript, 0, 0, 0 + object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, BerryTreeScript, 0, 0, 0 + object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, BerryTreeScript, 0, 0, 0 object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 133, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route119_EventScript_15141A, 0, 0, 0 object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, 1106, 0, 0 object_event 33, MAP_OBJ_GFX_BOY_2, 0, 35, 0, 93, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515FC, 0, 0, 0 diff --git a/data/maps/events/Route120.s b/data/maps/events/Route120.s index eaba9195f..3499d066e 100644 --- a/data/maps/events/Route120.s +++ b/data/maps/events/Route120.s @@ -1,14 +1,14 @@ Route120_MapObjects:: @ 8383F30 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, Route120_EventScript_1A14DD, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, Route120_EventScript_1A14DD, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, Route120_EventScript_1A14DD, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, Route120_EventScript_1A14DD, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, Route120_EventScript_1A14DD, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, Route120_EventScript_1A14DD, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, Route120_EventScript_1A14DD, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, Route120_EventScript_1A14DD, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, Route120_EventScript_1A14DD, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, Route120_EventScript_1A14DD, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, BerryTreeScript, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, BerryTreeScript, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, BerryTreeScript, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, BerryTreeScript, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, BerryTreeScript, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, BerryTreeScript, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, BerryTreeScript, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, BerryTreeScript, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, BerryTreeScript, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, BerryTreeScript, 0, 0, 0 object_event 11, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 22, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519B3, 0, 0, 0 object_event 12, MAP_OBJ_GFX_MAN_6, 0, 32, 0, 14, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519CA, 0, 0, 0 object_event 13, MAP_OBJ_GFX_CAMPER, 0, 27, 0, 51, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route120_EventScript_151A08, 0, 0, 0 @@ -19,7 +19,7 @@ Route120_MapObjects:: @ 8383F30 object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, 798, 0, 0 object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, 902, 0, 0 object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, 902, 0, 0 - object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B0DCC, 17, 0, 0 + object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, 1031, 0, 0 object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 92, 0, 5, 5, 1, 0, 0, 0, 0, 0, Route120_EventScript_151739, 0, 0, 0 object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 28, 0, 35, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A74, 0, 0, 0 @@ -30,8 +30,8 @@ Route120_MapObjects:: @ 8383F30 object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, 1107, 0, 0 object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, 970, 0, 0 object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, 972, 0, 0 - object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B0DCC, 20, 0, 0 - object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B0DCC, 18, 0, 0 + object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 20, 0, 0 + object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 10, 0, 72, 0, 3, 58, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AD0, 0, 0, 0 object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 28, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AE7, 0, 0, 0 object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 981, 0, 0 diff --git a/data/maps/events/Route121.s b/data/maps/events/Route121.s index 296f84ce4..771cfb815 100644 --- a/data/maps/events/Route121.s +++ b/data/maps/events/Route121.s @@ -1,26 +1,26 @@ Route121_MapObjects:: @ 8384504 object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 29, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route121_EventScript_151B0A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 2, 0, 3, 12, 0, 0, 0, 0, 47, 0, Route121_EventScript_1A14DD, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, Route121_EventScript_1A14DD, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, Route121_EventScript_1A14DD, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, Route121_EventScript_1A14DD, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, Route121_EventScript_1A14DD, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, Route121_EventScript_1A14DD, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, Route121_EventScript_1A14DD, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, Route121_EventScript_1A14DD, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 2, 0, 3, 12, 0, 0, 0, 0, 47, 0, BerryTreeScript, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, BerryTreeScript, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, BerryTreeScript, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, BerryTreeScript, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, BerryTreeScript, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, BerryTreeScript, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, BerryTreeScript, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, BerryTreeScript, 0, 0, 0 object_event 10, MAP_OBJ_GFX_LASS, 0, 39, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BDE, 0, 0, 0 object_event 11, MAP_OBJ_GFX_LASS, 0, 40, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BF9, 0, 0, 0 object_event 12, 241, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 object_event 13, 241, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 object_event 14, 241, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route121_EventScript_1B0DCC, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route121_EventScript_1B0DCC, 18, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 + object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 63, 0, 5, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route121_EventScript_151B72, 0, 0, 0 object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 55, 0, 8, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route121_EventScript_151B89, 0, 0, 0 object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 11, 0, 10, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route121_EventScript_151BC7, 0, 0, 0 object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 22, 0, 5, 0, 3, 17, 0, 0, 1, 0, 4, 0, Route121_EventScript_151C14, 0, 0, 0 object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, 1103, 0, 0 - object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B0DCC, 19, 0, 0 + object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 Route121_MapWarps:: @ 8384714 warp_def 37, 5, 0, 2, Route121_SafariZoneEntrance diff --git a/data/maps/events/Route123.s b/data/maps/events/Route123.s index 06cdfa2cc..3b7d0850c 100644 --- a/data/maps/events/Route123.s +++ b/data/maps/events/Route123.s @@ -1,30 +1,30 @@ Route123_MapObjects:: @ 83847F8 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, BerryTreeScript, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, BerryTreeScript, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, BerryTreeScript, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, BerryTreeScript, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, BerryTreeScript, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, BerryTreeScript, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, BerryTreeScript, 0, 0, 0 object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 70, 0, 12, 0, 3, 24, 0, 0, 1, 0, 1, 0, Route123_EventScript_151CD1, 0, 0, 0 object_event 9, MAP_OBJ_GFX_MAN_4, 0, 58, 0, 7, 0, 3, 17, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CE8, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 5, 0, 3, 12, 0, 0, 0, 0, 65, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B0DCC, 17, 0, 0 - object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B0DCC, 18, 0, 0 - object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B0DCC, 19, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 5, 0, 3, 12, 0, 0, 0, 0, 65, 0, BerryTreeScript, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, BerryTreeScript, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, BerryTreeScript, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, BerryTreeScript, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, BerryTreeScript, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, BerryTreeScript, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, BerryTreeScript, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, BerryTreeScript, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 + object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 + object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, 1032, 0, 0 object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, 1033, 0, 0 object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 108, 0, 13, 0, 3, 15, 0, 0, 0, 0, 0, 0, Route123_EventScript_151C5D, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, Route123_EventScript_1A14DD, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, BerryTreeScript, 0, 0, 0 + object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, BerryTreeScript, 0, 0, 0 + object_event 26, MAP_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, BerryTreeScript, 0, 0, 0 object_event 27, MAP_OBJ_GFX_WOMAN_3, 0, 16, 0, 9, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CFF, 0, 0, 0 object_event 28, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151DAD, 0, 0, 0 object_event 29, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151D92, 0, 0, 0 diff --git a/data/maps/events/Route130.s b/data/maps/events/Route130.s index 754002e0b..33bbd3cf9 100644 --- a/data/maps/events/Route130.s +++ b/data/maps/events/Route130.s @@ -1,7 +1,7 @@ Route130_MapObjects:: @ 838523C object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 26, 0, 1, 29, 99, 0, 1, 0, 3, 0, Route130_EventScript_152410, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 22, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route130_EventScript_152427, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, Route130_EventScript_1A14DD, 17, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, BerryTreeScript, 17, 0, 0 Route130_MapEvents:: @ 8385284 map_events Route130_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/RusturfTunnel.s b/data/maps/events/RusturfTunnel.s index a37826dc3..56d4fc302 100644 --- a/data/maps/events/RusturfTunnel.s +++ b/data/maps/events/RusturfTunnel.s @@ -1,12 +1,12 @@ RusturfTunnel_MapObjects:: @ 838BD2C object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, 807, 0, 0 - object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B0EB7, 931, 0, 0 + object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 931, 0, 0 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, 1048, 0, 0 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, 1049, 0, 0 object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 879, 0, 0 object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, 878, 0, 0 object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, 880, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B0EB7, 932, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, BreakableRockScript, 932, 0, 0 object_event 9, MAP_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0 object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, 983, 0, 0 diff --git a/data/maps/events/SafariZone_Northeast.s b/data/maps/events/SafariZone_Northeast.s index be0fa2ffa..a7dab8ff2 100644 --- a/data/maps/events/SafariZone_Northeast.s +++ b/data/maps/events/SafariZone_Northeast.s @@ -1,12 +1,12 @@ SafariZone_Northeast_MapObjects:: @ 8391A2C object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 22, 0, 9, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_160011, 0, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 29, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_16001A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B0EB7, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B0EB7, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B0EB7, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B0EB7, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B0EB7, 21, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B0EB7, 22, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, 1119, 0, 0 SafariZone_Northeast_MapEvents:: @ 8391B04 diff --git a/data/maps/events/SeafloorCavern_Room1.s b/data/maps/events/SeafloorCavern_Room1.s index 804888368..20a052399 100644 --- a/data/maps/events/SeafloorCavern_Room1.s +++ b/data/maps/events/SeafloorCavern_Room1.s @@ -1,7 +1,7 @@ SeafloorCavern_Room1_MapObjects:: @ 838D0B8 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_1B0FCB, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_1B0FCB, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_1B0EB7, 19, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0 object_event 4, 241, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, 946, 0, 0 object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, 946, 0, 0 diff --git a/data/maps/events/SeafloorCavern_Room2.s b/data/maps/events/SeafloorCavern_Room2.s index 66ce9694e..a309aaf1c 100644 --- a/data/maps/events/SeafloorCavern_Room2.s +++ b/data/maps/events/SeafloorCavern_Room2.s @@ -1,13 +1,13 @@ SeafloorCavern_Room2_MapObjects:: @ 838D15C - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0FCB, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0FCB, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0FCB, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0FCB, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0FCB, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0FCB, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0EB7, 24, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0EB7, 25, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0FCB, 23, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 24, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 25, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0 SeafloorCavern_Room2_MapWarps:: @ 838D234 warp_def 12, 19, 3, 2, SeafloorCavern_Room1 diff --git a/data/maps/events/SeafloorCavern_Room3.s b/data/maps/events/SeafloorCavern_Room3.s index b653deafd..f55899e5b 100644 --- a/data/maps/events/SeafloorCavern_Room3.s +++ b/data/maps/events/SeafloorCavern_Room3.s @@ -1,13 +1,13 @@ SeafloorCavern_Room3_MapObjects:: @ 838D268 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 23, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 24, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 25, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 24, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 25, 0, 0 object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, 946, 0, 0 SeafloorCavern_Room3_MapWarps:: @ 838D358 diff --git a/data/maps/events/SeafloorCavern_Room5.s b/data/maps/events/SeafloorCavern_Room5.s index 2a037ad1d..8f86c1c76 100644 --- a/data/maps/events/SeafloorCavern_Room5.s +++ b/data/maps/events/SeafloorCavern_Room5.s @@ -1,10 +1,10 @@ SeafloorCavern_Room5_MapObjects:: @ 838D3D0 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_1B0FCB, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_1B0FCB, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_1B0FCB, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_1B0EB7, 21, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_1B0EB7, 22, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_1B0FCB, 20, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 SeafloorCavern_Room5_MapWarps:: @ 838D460 warp_def 4, 1, 3, 1, SeafloorCavern_Room1 diff --git a/data/maps/events/SeafloorCavern_Room8.s b/data/maps/events/SeafloorCavern_Room8.s index dbd4af805..0c513143f 100644 --- a/data/maps/events/SeafloorCavern_Room8.s +++ b/data/maps/events/SeafloorCavern_Room8.s @@ -1,16 +1,16 @@ SeafloorCavern_Room8_MapObjects:: @ 838D4DC - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 23, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 24, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 25, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 26, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 27, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 28, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 24, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 25, 0, 0 + object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 26, 0, 0 + object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 27, 0, 0 + object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 28, 0, 0 SeafloorCavern_Room8_MapWarps:: @ 838D5FC warp_def 5, 2, 3, 0, SeafloorCavern_Room9 diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.s b/data/maps/events/ShoalCave_LowTideLowerRoom.s index 1c810a328..66523ad73 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.s +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.s @@ -1,5 +1,5 @@ ShoalCave_LowTideLowerRoom_MapObjects:: @ 838DE3C - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_1B0FCB, 17, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0, 0, 0 ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C diff --git a/data/maps/events/VictoryRoad_B1F.s b/data/maps/events/VictoryRoad_B1F.s index 8fabd723c..941bb71da 100644 --- a/data/maps/events/VictoryRoad_B1F.s +++ b/data/maps/events/VictoryRoad_B1F.s @@ -1,21 +1,21 @@ VictoryRoad_B1F_MapObjects:: @ 838DA04 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 19, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 20, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 23, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 30, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0EB7, 25, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0EB7, 26, 0, 0 - object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0EB7, 27, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0EB7, 28, 0, 0 - object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0EB7, 29, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 31, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 30, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 25, 0, 0 + object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 26, 0, 0 + object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 27, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 28, 0, 0 + object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 29, 0, 0 + object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 31, 0, 0 object_event 14, MAP_OBJ_GFX_MAN_4, 0, 37, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, VictoryRoad_B1F_EventScript_15DFB5, 0, 0, 0 object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 26, 0, 16, 0, 3, 7, 0, 0, 1, 0, 4, 0, VictoryRoad_B1F_EventScript_15DFCC, 0, 0, 0 object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 21, 0, 3, 9, 0, 0, 1, 0, 2, 0, VictoryRoad_B1F_EventScript_15DFE3, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0EB7, 32, 0, 0 + object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 32, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, 1086, 0, 0 object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, 1087, 0, 0 diff --git a/data/maps/scripts/IslandCave.s b/data/maps/scripts/IslandCave.s index e75f99629..4cad35aab 100644 --- a/data/maps/scripts/IslandCave.s +++ b/data/maps/scripts/IslandCave.s @@ -31,3 +31,54 @@ IslandCave_MapScript1_15EF15:: @ 815EF15 setflag 2133 end + .global gUnknown_0815EF19 +gUnknown_0815EF19: @ 815EF19 + + .incbin "baserom.gba", 0x15ef19, 0x40 + +IslandCave_EventScript_15EF59:: @ 815EF59 + lockall + checkflag 2129 + jumpeq IslandCave_EventScript_15EF72 + braillemsg IslandCave_Braille_1C54FC + special 280 + waitstate + jump IslandCave_EventScript_15EF95 + end + +IslandCave_EventScript_15EF72:: @ 815EF72 + msgbox IslandCave_Text_1A13BE, 4 + releaseall + end + +IslandCave_EventScript_15EF7C:: @ 815EF7C + lockall + braillemsg IslandCave_Braille_1C54FC + checkflag 2129 + jumpeq IslandCave_EventScript_15EF95 + special 280 + waitstate + jump IslandCave_EventScript_15EF95 + end + +IslandCave_EventScript_15EF95:: @ 815EF95 + waitbutton + hidebox 0, 0, 29, 19 + releaseall + end + +IslandCave_EventScript_15EF9D:: @ 815EF9D + lock + faceplayer + checksound + pokecry SPECIES_REGICE, 2 + pause 40 + waitpokecry + setwildbattle SPECIES_REGICE, 40, ITEM_NONE + setflag 936 + setflag 2145 + special 313 + waitstate + clearflag 2145 + release + end diff --git a/data/maps/scripts/LittlerootTown_BrendansHouse_2F.s b/data/maps/scripts/LittlerootTown_BrendansHouse_2F.s index ede1d33a5..e22ae74ca 100644 --- a/data/maps/scripts/LittlerootTown_BrendansHouse_2F.s +++ b/data/maps/scripts/LittlerootTown_BrendansHouse_2F.s @@ -29,3 +29,126 @@ LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 .incbin "baserom.gba", 0x1527f1, 0x2d + .global gUnknown_0815281E +gUnknown_0815281E: @ 815281E + +LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E + lockall + checkgender + compare RESULT, 0 + jumpeq LittlerootTown_BrendansHouse_2F_EventScript_152837 + compare RESULT, 1 + jumpeq LittlerootTown_BrendansHouse_2F_EventScript_15285D + end + +LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 + setvar 0x8004, 1 + special 214 + playsfx 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, 4 + special 249 + waitstate + releaseall + end + + .global gUnknown_08152850 +gUnknown_08152850: @ 8152850 + + .incbin "baserom.gba", 0x152850, 0xd + +LittlerootTown_BrendansHouse_2F_EventScript_15285D:: @ 815285D + msgbox LittlerootTown_BrendansHouse_2F_Text_1A100C, 4 + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_152867:: @ 8152867 +LittlerootTown_MaysHouse_2F_EventScript_152867:: @ 8152867 + msgbox LittlerootTown_BrendansHouse_2F_Text_172F9A, 3 + end + +LittlerootTown_BrendansHouse_2F_EventScript_152870:: @ 8152870 +LittlerootTown_MaysHouse_2F_EventScript_152870:: @ 8152870 + msgbox LittlerootTown_BrendansHouse_2F_Text_17306C, 3 + end + + .include "data/maps/scripts/LittlerootTown_MaysHouse_1F.s" + .include "data/maps/scripts/LittlerootTown_MaysHouse_2F.s" +LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11 + step_down + step_left + step_left + step_left + step_left + step_left + step_left + step_up + step_up + step_13 + step_end + +LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C + step_left + step_left + step_left + step_left + step_left + step_left + step_up + step_13 + step_end + +LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25 + step_down + step_right + step_right + step_right + step_right + step_right + step_right + step_up + step_up + step_13 + step_end + +LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30 + step_right + step_right + step_right + step_right + step_right + step_right + step_up + step_13 + step_end + + .global gUnknown_08152C39 +gUnknown_08152C39: @ 8152C39 + +LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39 + lockall + checkgender + compare RESULT, 0 + jumpeq LittlerootTown_MaysHouse_2F_EventScript_152C52 + compare RESULT, 1 + jumpeq LittlerootTown_MaysHouse_2F_EventScript_152C5C + end + +LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 + msgbox LittlerootTown_MaysHouse_2F_Text_1A100C, 4 + releaseall + end + +LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C + setvar 0x8004, 2 + special 214 + playsfx 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4 + special 249 + waitstate + releaseall + end + + .global gUnknown_08152C75 +gUnknown_08152C75: @ 8152C75 + + .incbin "baserom.gba", 0x152c75, 0xd diff --git a/data/maps/scripts/MauvilleCity_GameCorner.s b/data/maps/scripts/MauvilleCity_GameCorner.s index 073acb9f7..a77e099c5 100644 --- a/data/maps/scripts/MauvilleCity_GameCorner.s +++ b/data/maps/scripts/MauvilleCity_GameCorner.s @@ -520,7 +520,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -531,7 +531,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -542,7 +542,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 2 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -553,7 +553,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 3 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -564,7 +564,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 4 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -575,7 +575,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 5 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -586,7 +586,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 6 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -597,7 +597,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 7 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -608,7 +608,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 8 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -619,7 +619,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 9 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -630,7 +630,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 10 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end @@ -641,7 +641,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 11 specialval RESULT, 286 - pokecasino 32781 + pokecasino RESULT releaseall end diff --git a/data/maps/scripts/MossdeepCity_SpaceCenter_1F.s b/data/maps/scripts/MossdeepCity_SpaceCenter_1F.s index 4e7fe7fb5..460281ebb 100644 --- a/data/maps/scripts/MossdeepCity_SpaceCenter_1F.s +++ b/data/maps/scripts/MossdeepCity_SpaceCenter_1F.s @@ -6,7 +6,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B faceplayer checkdailyflags specialval RESULT, 256 - buffernum 0, 32781 + buffernum 0, RESULT compare RESULT, 0 callif 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 diff --git a/data/maps/scripts/PacifidlogTown_House2.s b/data/maps/scripts/PacifidlogTown_House2.s index 62821dd11..5348a273d 100644 --- a/data/maps/scripts/PacifidlogTown_House2.s +++ b/data/maps/scripts/PacifidlogTown_House2.s @@ -72,7 +72,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 PacifidlogTown_House2_EventScript_154254:: @ 8154254 specialval RESULT, 334 - buffernum 0, 32781 + buffernum 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release end diff --git a/data/maps/scripts/SSTidalCorridor.s b/data/maps/scripts/SSTidalCorridor.s index 90014e7d9..f143d3261 100644 --- a/data/maps/scripts/SSTidalCorridor.s +++ b/data/maps/scripts/SSTidalCorridor.s @@ -40,3 +40,160 @@ SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 msgbox SSTidalRooms_Text_1990F8, 4 return + .global gUnknown_0815FD0D +gUnknown_0815FD0D: @ 815FD0D + + .incbin "baserom.gba", 0x15fd0d, 0x17 + +SSTidalCorridor_EventScript_15FD24:: @ 815FD24 + special 204 + setvar 0x40b4, 3 + lockall + playsfx 73 + msgbox SSTidalCorridor_Text_199088, 4 + releaseall + end + +SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A + special 204 + setvar 0x40b4, 8 + lockall + playsfx 73 + msgbox SSTidalCorridor_Text_1990B4, 4 + releaseall + end + +SSTidalRooms_EventScript_15FD50:: @ 815FD50 + special 204 + setvar 0x40b4, 8 + playsfx 73 + msgbox SSTidalRooms_Text_1990B4, 4 + return + +SSTidalRooms_EventScript_15FD64:: @ 815FD64 + switch 0x40b4 + case 2, SSTidalRooms_EventScript_15FCF9 + case 3, SSTidalRooms_EventScript_15FCF9 + case 6, SSTidalRooms_EventScript_15FCE5 + case 7, SSTidalRooms_EventScript_15FD50 + return + +SSTidalCorridor_EventScript_15FD96:: @ 815FD96 + msgbox SSTidalCorridor_Text_199291, 2 + end + +SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F + lock + faceplayer + checksound + pokecry SPECIES_WINGULL, 0 + msgbox SSTidalCorridor_Text_199388, 4 + waitpokecry + release + end + +SSTidalCorridor_EventScript_15FDB2:: @ 815FDB2 + msgbox SSTidalCorridor_Text_1993A1, 3 + end + +SSTidalCorridor_EventScript_15FDBB:: @ 815FDBB + msgbox SSTidalCorridor_Text_1993A9, 3 + end + +SSTidalCorridor_EventScript_15FDC4:: @ 815FDC4 + msgbox SSTidalCorridor_Text_1993B1, 3 + end + +SSTidalCorridor_EventScript_15FDCD:: @ 815FDCD + msgbox SSTidalCorridor_Text_1993B9, 3 + end + +SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 + lock + faceplayer + compare 0x40b4, 4 + jumpeq SSTidalCorridor_EventScript_15FDF8 + compare 0x40b4, 8 + jumpeq SSTidalCorridor_EventScript_15FE17 + msgbox SSTidalCorridor_Text_19913B, 4 + release + end + +SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 + sethealplace 8 + msgbox SSTidalCorridor_Text_1991F4, 4 + checkflag 260 + callif 1, SSTidalCorridor_EventScript_15FE36 + warp LilycoveCity_Harbor, 255, 8, 11 + waitstate + release + end + +SSTidalCorridor_EventScript_15FE17:: @ 815FE17 + sethealplace 4 + msgbox SSTidalCorridor_Text_1991F4, 4 + checkflag 260 + callif 1, SSTidalCorridor_EventScript_15FE36 + warp SlateportCity_Harbor, 255, 8, 11 + waitstate + release + end + +SSTidalCorridor_EventScript_15FE36:: @ 815FE36 + setflag 951 + return + +SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A + lockall + compare 0x40b4, 2 + jumpeq SSTidalCorridor_EventScript_15FE5B + compare 0x40b4, 7 + jumpeq SSTidalCorridor_EventScript_15FE5B + msgbox SSTidalCorridor_Text_199268, 4 + releaseall + end + +SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B + special 270 + waitstate + end + +SSTidalCorridor_EventScript_15FE60:: @ 815FE60 + lock + faceplayer + checkflag 247 + jumpeq SSTidalCorridor_EventScript_15FE7A + call SSTidalCorridor_EventScript_15FE84 + msgbox SSTidalCorridor_Text_199203, 4 + release + end + +SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A + msgbox SSTidalCorridor_Text_199255, 4 + release + end + +SSTidalCorridor_EventScript_15FE84:: @ 815FE84 + checktrainerflag 494 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + checktrainerflag 495 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + checktrainerflag 294 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + checktrainerflag 255 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + checktrainerflag 256 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + checktrainerflag 641 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + checktrainerflag 138 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + checktrainerflag 119 + jumpif 0, SSTidalCorridor_EventScript_15FED5 + setflag 247 + jump SSTidalCorridor_EventScript_15FE7A + + .incbin "baserom.gba", 0x15fed4, 0x1 + +SSTidalCorridor_EventScript_15FED5:: @ 815FED5 + return diff --git a/data/maps/scripts/SootopolisCity.s b/data/maps/scripts/SootopolisCity.s index 19e796b7c..1690b8104 100644 --- a/data/maps/scripts/SootopolisCity.s +++ b/data/maps/scripts/SootopolisCity.s @@ -207,3 +207,264 @@ SootopolisCity_EventScript_14D2F6:: @ 814D2F6 msgbox SootopolisCity_Text_16A711, 3 end +ClosedSootopolisGymDoorScript:: @ 814D2FF + msgbox ClosedSootopolisGymDoorText, 3 + end + +SootopolisCity_EventScript_14D308:: @ 814D308 + lockall + move 10, SootopolisCity_Movement_1A083F + move 255, SootopolisCity_Movement_1A0843 + waitmove 0 + playsfx 21 + move 10, SootopolisCity_Movement_1A0833 + waitmove 0 + move 10, SootopolisCity_Movement_1A0835 + waitmove 0 + move 10, SootopolisCity_Movement_14D413 + waitmove 0 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169988, 4 + .else + msgbox SootopolisCity_Text_169E0F, 4 + .endif + closebutton + move 10, SootopolisCity_Movement_14D417 + move 255, SootopolisCity_Movement_14D440 + waitmove 10 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_1699FD, 4 + .else + msgbox SootopolisCity_Text_169E82, 4 + .endif + playsfx 21 + move 5, SootopolisCity_Movement_1A0833 + waitmove 0 + move 5, SootopolisCity_Movement_1A0835 + waitmove 0 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169AB7, 4 + .else + msgbox SootopolisCity_Text_169F3C, 4 + .endif + closebutton + pause 30 + move 5, SootopolisCity_Movement_14D46A + move 10, SootopolisCity_Movement_14D41D + move 255, SootopolisCity_Movement_14D445 + waitmove 0 + move 5, SootopolisCity_Movement_1A0843 + move 255, SootopolisCity_Movement_1A0843 + waitmove 0 + pause 30 + move 10, SootopolisCity_Movement_1A0845 + waitmove 0 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169AE7, 4 + .else + msgbox SootopolisCity_Text_169F6B, 4 + .endif + closebutton + pause 30 + move 5, SootopolisCity_Movement_14D47C + move 255, SootopolisCity_Movement_14D457 + move 10, SootopolisCity_Movement_14D42D + waitmove 0 + move 5, SootopolisCity_Movement_1A083F + waitmove 0 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169BC7, 4 + .else + msgbox SootopolisCity_Text_16A06C, 4 + .endif + move 255, SootopolisCity_Movement_1A083F + waitmove 0 + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169C99, 4 + .else + msgbox SootopolisCity_Text_16A13E, 4 + .endif + moveoffscreen 5 + spritebehave 5, 9 + moveoffscreen 10 + spritebehave 10, 10 + setvar 0x405e, 2 + releaseall + end + +SootopolisCity_Movement_14D413:: @ 814D413 + step_left + step_left + step_left + step_end + +SootopolisCity_Movement_14D417:: @ 814D417 + step_right + step_right + step_right + step_up + step_25 + step_end + +SootopolisCity_Movement_14D41D:: @ 814D41D + step_down + step_right + step_down + step_down + step_down + step_right + step_right + step_right + step_right + step_down + step_down + step_down + step_down + step_left + step_left + step_end + +SootopolisCity_Movement_14D42D:: @ 814D42D + 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_end + +SootopolisCity_Movement_14D440:: @ 814D440 + step_right + step_right + step_right + step_right + step_end + +SootopolisCity_Movement_14D445:: @ 814D445 + step_right + step_down + step_down + step_down + 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_end + +SootopolisCity_Movement_14D457:: @ 814D457 + step_14 + step_14 + 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_right + step_end + +SootopolisCity_Movement_14D46A:: @ 814D46A + step_down + step_down + step_down + 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_end + +SootopolisCity_Movement_14D47C:: @ 814D47C + step_14 + step_14 + 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_right + step_right + step_end + +SootopolisCity_EventScript_14D48F:: @ 814D48F + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169D37, 2 + .else + msgbox SootopolisCity_Text_16A1DB, 2 + .endif + end + +SootopolisCity_EventScript_14D498:: @ 814D498 + lock + faceplayer + checkflag 113 + jumpeq SootopolisCity_EventScript_14D4AD + .ifdef SAPPHIRE + msgbox SootopolisCity_Text_169DA6, 2 + .else + msgbox SootopolisCity_Text_16A249, 4 + .endif + release + end + +SootopolisCity_EventScript_14D4AD:: @ 814D4AD + msgbox SootopolisCity_Text_16A33E, 4 + closebutton + move LAST_TALKED, SootopolisCity_Movement_1A0845 + waitmove 0 + pause 50 + setanimation 0, 1 + doanimation 30 + pause 15 + disappear LAST_TALKED + checkanimation 30 + release + end diff --git a/data/maps/text/AbandonedShip_HiddenFloorRooms.s b/data/maps/text/AbandonedShip_HiddenFloorRooms.s index 861f523aa..fffe37c25 100644 --- a/data/maps/text/AbandonedShip_HiddenFloorRooms.s +++ b/data/maps/text/AbandonedShip_HiddenFloorRooms.s @@ -2,5 +2,13 @@ AbandonedShip_HiddenFloorRooms_Text_198EE2:: @ 8198EE2 .string "It’s bright and shiny!\n" .string "But it’s just trash...$" - .incbin "baserom.gba", 0x198f10, 0x79 +UnknownString_8198F10: @ 8198F10 + .string "There’s a small indent in the wall.$" + +UnknownString_8198F34: @ 8198F34 + .string "There’s a small indent in the wall.\p" + .string "Use the SECRET POWER?$" + +UnknownString_8198F6E: @ 8198F6E + .string "Discovered a small cavern!$" diff --git a/data/maps/text/CaveOfOrigin_B4F.s b/data/maps/text/CaveOfOrigin_B4F.s index 5ed888e50..6d59f8971 100644 --- a/data/maps/text/CaveOfOrigin_B4F.s +++ b/data/maps/text/CaveOfOrigin_B4F.s @@ -6,5 +6,169 @@ CaveOfOrigin_B4F_Text_1B5009:: @ 81B5009 .string "GROUDON appears to have settled\n" .string "into sleep again...$" - .incbin "baserom.gba", 0x1b503d, 0xcc0 +UnknownString_81B503D: @ 81B503D + .string "MAXIE: This...$" + +UnknownString_81B504C: @ 81B504C + .string "MAXIE: ... ... ... ... ... ...\n" + .string "... ... ... ... ... ... ... ...\p" + .string "This is good-bye.\n" + .string "This is the last you’ve seen of me...$" + +UnknownString_81B50C3: @ 81B50C3 + .string "I’ll show you exactly how scary\n" + .string "TEAM AQUA can be!$" + +UnknownString_81B50F5: @ 81B50F5 + .string "So you think you can stand up alone\n" + .string "to TEAM AQUA’s might...$" + +UnknownString_81B5131: @ 81B5131 + .string "Yeah, so you are strong...\n" + .string "But there’re a lot of us!$" + +UnknownString_81B5166: @ 81B5166 + .string "What’s up with you?\n" + .string "What does a single kid expect to do?$" + +UnknownString_81B519F: @ 81B519F + .string "Dang...\n" + .string "Too strong...$" + +UnknownString_81B51B5: @ 81B51B5 + .string "You don’t know anything.\n" + .string "Quit messing around with us!$" + +UnknownString_81B51EB: @ 81B51EB + .string "Hey, I remember you from MT. CHIMNEY!\n" + .string "It’s payback time!$" + +UnknownString_81B5224: @ 81B5224 + .string "Urgggh...\n" + .string "Beaten by some kid again!$" + +UnknownString_81B5248: @ 81B5248 + .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!$" + +UnknownString_81B52B0: @ 81B52B0 + .string "ARCHIE: Not you again...\p" + .string "You’ve impeded our plans repeatedly,\n" + .string "but this time you’re too late.\p" + .string "The RED ORB that rested atop\n" + .string "MT. PYRE...\l" + .string "I, ARCHIE, claim it as mine!\p" + .string "Fufufu... Finally, I can realize my\n" + .string "grand design...\p" + .string "Come on, crew!\n" + .string "It’s SLATEPORT next!$" + +UnknownString_81B53AB: @ 81B53AB + .string "Oh, no...\n" + .string "This cannot happen...\p" + .string "How could they take the RED ORB?\p" + .string "The BLUE ORB and RED ORB must never\n" + .string "be separated. They belong together.\p" + .string "... ... ... ... ... ... ... ...\n" + .string "Hmm...\p" + .string "Fine!\n" + .string "You take the remaining BLUE ORB.\p" + .string "Please take after that foul man and\n" + .string "get the other ORB back!$" + +UnknownString_81B54BE: @ 81B54BE + .string "The BLUE ORB you have been entrusted\n" + .string "with and the stolen RED ORB...\p" + .string "They must never be apart...\n" + .string "Something terrible will happen...$" + +UnknownString_81B5540: @ 81B5540 + .string "So...\n" + .string "KYOGRE has awoken...\p" + .string "The wondrous ORB that is said to have\n" + .string "becalmed the raging KYOGRE...\l" + .string "It is the BLUE ORB you bear.\p" + .string "That BLUE ORB was found buried inside\n" + .string "the CAVE OF ORIGIN in SOOTOPOLIS...\p" + .string "There is perhaps a link between\n" + .string "KYOGRE and the CAVE OF ORIGIN...$" + +UnknownString_81B5647: @ 81B5647 + .string "That man, he returned the RED ORB.\p" + .string "Are you going to return the BLUE ORB\n" + .string "to its rightful place, too?$" + +UnknownString_81B56AB: @ 81B56AB + .string "What’s that?!\p" + .string "If the balance is not restored, there\n" + .string "is no telling what could happen.\p" + .string "You will return the BLUE ORB to its\n" + .string "rightful place, yes?$" + +UnknownString_81B5739: @ 81B5739 + .string "{PLAYER} handed the BLUE ORB to the\n" + .string "old woman.$" + +UnknownString_81B5762: @ 81B5762 + .string "Yes...\n" + .string "The two ORBS should remain here.\p" + .string "It is how it should be for the good\n" + .string "of all HOENN...$" + +UnknownString_81B57BE: @ 81B57BE + .string "The spirit of the sea...\p" + .string "That is what KYOGRE is said to be in\n" + .string "POKéMON form...\p" + .string "In the same manner that we and POKéMON\n" + .string "have life, the sea is alive...\p" + .string "KYOGRE has taught us that...$" + +UnknownString_81B586F: @ 81B586F + .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?$" + +UnknownString_81B5992: @ 81B5992 + .string "It happened long, long ago...\p" + .string "The world was wracked by a ferocious\n" + .string "clash between the POKéMON of the sea\l" + .string "and the POKéMON of the land...\p" + .string "The POKéMON of the sea raised huge\n" + .string "waves and carved out oceans...\p" + .string "The POKéMON of the land raised\n" + .string "mountains and created continents...\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...$" + +UnknownString_81B5BD7: @ 81B5BD7 + .string "I see...\n" + .string "Well, that, too, is fine...$" + +UnknownString_81B5BFC: @ 81B5BFC + .string "ARCHIE: You...\n" + .string "So you stopped KYOGRE...\p" + .string "I shouldn’t be surprised...\p" + .string "I understand now that humans cannot\n" + .string "freely control the balance between\l" + .string "the land and the sea...\p" + .string "So I have come to return the\n" + .string "RED ORB...\p" + .string "I doubt that we will cross paths again...\n" + .string "Farewell...$" diff --git a/data/maps/text/FieryPath.s b/data/maps/text/FieryPath.s deleted file mode 100644 index 367fe93ec..000000000 --- a/data/maps/text/FieryPath.s +++ /dev/null @@ -1,18 +0,0 @@ -FieryPath_Text_1B103D:: @ 81B103D - .string "It’s a big boulder, but a POKéMON\n" - .string "may be able to push it aside.\p" - .string "Would you like to use STRENGTH?$" - -FieryPath_Text_1B109D:: @ 81B109D - .string "{STR_VAR_1} used STRENGTH.\p" - .string "{STR_VAR_1}’s STRENGTH made it possible\n" - .string "to move boulders around.$" - -FieryPath_Text_1B10E7:: @ 81B10E7 - .string "It’s a big boulder, but a POKéMON\n" - .string "may be able to push it aside.$" - -FieryPath_Text_1B1127:: @ 81B1127 - .string "STRENGTH made it possible to move\n" - .string "boulders around.$" - diff --git a/data/maps/text/FortreeCity_House2.s b/data/maps/text/FortreeCity_House2.s index 6a549f8c3..60ee2442f 100644 --- a/data/maps/text/FortreeCity_House2.s +++ b/data/maps/text/FortreeCity_House2.s @@ -36,5 +36,11 @@ FortreeCity_House2_Text_186565:: @ 8186565 .string "No, too bad.\n" .string "You guessed wrong.$" - .incbin "baserom.gba", 0x186585, 0x9f +UnknownString_8186585: @ 8186585 + .string "The area around FORTREE CITY is like\n" + .string "a jungle.\p" + .string "It gets awfully tiring walking around\n" + .string "this city.\p" + .string "That’s why I use FLY to instantly go to\n" + .string "any city I’ve visited.$" diff --git a/data/maps/text/LilycoveCity_ContestHall.s b/data/maps/text/LilycoveCity_ContestHall.s index 4ca84f697..99131eb71 100644 --- a/data/maps/text/LilycoveCity_ContestHall.s +++ b/data/maps/text/LilycoveCity_ContestHall.s @@ -185,7 +185,9 @@ LilycoveCity_ContestHall_Text_189E5F:: @ 8189E5F .string "they make we want to get my own!\p" .string "I’m going to go catch some!$" - .incbin "baserom.gba", 0x189ec0, 0x33 +UnknownString_8189EC0: @ 8189EC0 + .string "COOLNESS CONTEST STAGE\n" + .string "BE CHILLED BY COOL POKéMON!$" LilycoveCity_ContestHall_Text_189EF3:: @ 8189EF3 .string "BEAUTY CONTEST STAGE\n" @@ -199,5 +201,7 @@ LilycoveCity_ContestHall_Text_189F5C:: @ 8189F5C .string "SMARTNESS CONTEST STAGE\n" .string "BE IMPRESSED BY SMART POKéMON!$" - .incbin "baserom.gba", 0x189f93, 0x36 +UnknownString_8189F93: @ 8189F93 + .string "TOUGHNESS CONTEST STAGE\n" + .string "BE THRILLED BY TOUGH POKéMON!$" diff --git a/data/maps/text/LilycoveCity_DepartmentStoreElevator.s b/data/maps/text/LilycoveCity_DepartmentStoreElevator.s index c76ef1179..8c7826d44 100644 --- a/data/maps/text/LilycoveCity_DepartmentStoreElevator.s +++ b/data/maps/text/LilycoveCity_DepartmentStoreElevator.s @@ -2,5 +2,15 @@ LilycoveCity_DepartmentStoreElevator_Text_1A0EF6:: @ 81A0EF6 .string "Welcome to LILYCOVE DEPARTMENT STORE.\p" .string "Which floor would you like?$" - .incbin "baserom.gba", 0x1a0f38, 0x5b +UnknownString_81A0F38: @ 81A0F38 + .string "Warp to BATTLE TOWER.$" + +UnknownString_81A0F4E: @ 81A0F4E + .string "Warp to LILYCOVE.$" + +UnknownString_81A0F60: @ 81A0F60 + .string "The time is {STR_VAR_1}!$" + +UnknownString_81A0F70: @ 81A0F70 + .string "The HALL OF FAME will be accessed.$" diff --git a/data/maps/text/LilycoveCity_DepartmentStore_2F.s b/data/maps/text/LilycoveCity_DepartmentStore_2F.s index 6101d1e2c..3b4271ca7 100644 --- a/data/maps/text/LilycoveCity_DepartmentStore_2F.s +++ b/data/maps/text/LilycoveCity_DepartmentStore_2F.s @@ -10,5 +10,7 @@ LilycoveCity_DepartmentStore_2F_Text_18C1D9:: @ 818C1D9 .string "I’m leaving on a long journey soon.\n" .string "I need to stock up on items.$" - .incbin "baserom.gba", 0x18c21a, 0x31 +UnknownString_818C21A: @ 818C21A + .string "FOR YOUR TRAVELING COMPANIONS\n" + .string "2F: TRAINER’S ZONE$" diff --git a/data/maps/text/LilycoveCity_DepartmentStore_3F.s b/data/maps/text/LilycoveCity_DepartmentStore_3F.s index 6e27e6ab5..baecfcecf 100644 --- a/data/maps/text/LilycoveCity_DepartmentStore_3F.s +++ b/data/maps/text/LilycoveCity_DepartmentStore_3F.s @@ -14,5 +14,7 @@ LilycoveCity_DepartmentStore_3F_Text_18C32E:: @ 818C32E .string "I gave a CARBOS to my POKéMON and its\n" .string "SPEED went up.$" - .incbin "baserom.gba", 0x18c363, 0x39 +UnknownString_818C363: @ 818C363 + .string "ESSENTIALS FOR UNBEATABLE TRAINERS\n" + .string "3F: BATTLE COLLECTION$" diff --git a/data/maps/text/LilycoveCity_DepartmentStore_4F.s b/data/maps/text/LilycoveCity_DepartmentStore_4F.s index 2b65fc775..7cfa099ea 100644 --- a/data/maps/text/LilycoveCity_DepartmentStore_4F.s +++ b/data/maps/text/LilycoveCity_DepartmentStore_4F.s @@ -15,5 +15,7 @@ LilycoveCity_DepartmentStore_4F_Text_18C481:: @ 818C481 .string "I’d like to get all the different TMs,\n" .string "but a POKéMON learns only four moves.$" - .incbin "baserom.gba", 0x18c4ce, 0x2b +UnknownString_818C4CE: @ 818C4CE + .string "A SHORTCUT TO POKéMON LEAGUE\n" + .string "4F: TM CORNER$" diff --git a/data/maps/text/LilycoveCity_DepartmentStore_5F.s b/data/maps/text/LilycoveCity_DepartmentStore_5F.s index dc9598a9b..c1e3975cb 100644 --- a/data/maps/text/LilycoveCity_DepartmentStore_5F.s +++ b/data/maps/text/LilycoveCity_DepartmentStore_5F.s @@ -12,5 +12,7 @@ LilycoveCity_DepartmentStore_5F_Text_18C59F:: @ 818C59F .string "I wonder which one I should get?\n" .string "Maybe I’ll buy them all...$" - .incbin "baserom.gba", 0x18c5fa, 0x25 +UnknownString_818C5FA: @ 818C5FA + .string "ADORABLE FRIENDS\n" + .string "5F: POKé DOLL FLOOR$" diff --git a/data/maps/text/LilycoveCity_LilycoveMuseum_1F.s b/data/maps/text/LilycoveCity_LilycoveMuseum_1F.s index 828d08ab3..c8770999f 100644 --- a/data/maps/text/LilycoveCity_LilycoveMuseum_1F.s +++ b/data/maps/text/LilycoveCity_LilycoveMuseum_1F.s @@ -77,7 +77,9 @@ LilycoveCity_LilycoveMuseum_1F_Text_187810:: @ 8187810 .string "small characters of an ancient,\l" .string "unreadable language.$" - .incbin "baserom.gba", 0x18788b, 0x2c +UnknownString_818788B: @ 818788B + .string "Hmmm...\n" + .string "What works of great magnificence...$" LilycoveCity_LilycoveMuseum_1F_Text_1878B7:: @ 81878B7 .string "Battling with POKéMON is fun,\n" diff --git a/data/maps/text/LilycoveCity_LilycoveMuseum_2F.s b/data/maps/text/LilycoveCity_LilycoveMuseum_2F.s index 8c6bf1084..65d4f6700 100644 --- a/data/maps/text/LilycoveCity_LilycoveMuseum_2F.s +++ b/data/maps/text/LilycoveCity_LilycoveMuseum_2F.s @@ -58,7 +58,8 @@ LilycoveCity_LilycoveMuseum_2F_Text_188041:: @ 8188041 LilycoveCity_LilycoveMuseum_2F_Text_188120:: @ 8188120 .string "This is merely a token of my gratitude.$" - .incbin "baserom.gba", 0x188148, 0x1e +UnknownString_8188148: @ 8188148 + .string "{PLAYER} received a GLASS ORNAMENT.$" LilycoveCity_LilycoveMuseum_2F_Text_188166:: @ 8188166 .string "I will keep this for you until we\n" diff --git a/data/maps/text/LilycoveCity_PokemonCenter_1F.s b/data/maps/text/LilycoveCity_PokemonCenter_1F.s index 3f3f0cbbb..b9a43f2e1 100644 --- a/data/maps/text/LilycoveCity_PokemonCenter_1F.s +++ b/data/maps/text/LilycoveCity_PokemonCenter_1F.s @@ -14,5 +14,14 @@ LilycoveCity_PokemonCenter_1F_Text_18A0A1:: @ 818A0A1 .string "POKéMON and rip off METEORITES...\p" .string "I haven’t seen them around recently.$" - .incbin "baserom.gba", 0x18a10a, 0xcc +UnknownString_818A10A: @ 818A10A + .string "I’m going to get X ATTACK to raise\n" + .string "ATTACK during battle.\p" + .string "That way, I’ll be guaranteed to win!$" + +UnknownString_818A168: @ 818A168 + .string "FULL HEAL is a little expensive,\n" + .string "but it is convenient.\p" + .string "Just one of these can cure any\n" + .string "POKéMON status problem.$" diff --git a/data/maps/text/LittlerootTown_BrendansHouse_2F.s b/data/maps/text/LittlerootTown_BrendansHouse_2F.s index 07c127c92..e12500ca9 100644 --- a/data/maps/text/LittlerootTown_BrendansHouse_2F.s +++ b/data/maps/text/LittlerootTown_BrendansHouse_2F.s @@ -12,7 +12,13 @@ LittlerootTown_BrendansHouse_2F_Text_172E4C:: @ 8172E4C .string "Oh, you should make sure that\n" .string "everything’s all there on your desk.$" - .incbin "baserom.gba", 0x172f31, 0x69 +UnknownString_8172F31: @ 8172F31 + .string "The bookshelf is lined entirely with\n" + .string "books on POKéMON.\p" + .string "It’s {PLAYER}’s prized collection.$" + +UnknownString_8172F85: @ 8172F85 + .string "{PLAYER} booted up the PC.$" LittlerootTown_BrendansHouse_2F_Text_172F9A:: @ 8172F9A .string "{PLAYER} flipped open the notebook.\p" @@ -22,7 +28,9 @@ LittlerootTown_BrendansHouse_2F_Text_172F9A:: @ 8172F9A .string "Record your progress with SAVE.\p" .string "The remaining pages are blank...$" - .incbin "baserom.gba", 0x17303d, 0x2f +UnknownString_817303D: @ 817303D + .string "{PLAYER} took a closer look at the\n" + .string "HOENN region map.$" LittlerootTown_BrendansHouse_2F_Text_17306C:: @ 817306C .string "It’s a Nintendo GameCube.\p" diff --git a/data/maps/text/MauvilleCity_GameCorner.s b/data/maps/text/MauvilleCity_GameCorner.s index 05d977447..00eb1368c 100644 --- a/data/maps/text/MauvilleCity_GameCorner.s +++ b/data/maps/text/MauvilleCity_GameCorner.s @@ -28,7 +28,9 @@ MauvilleCity_GameCorner_Text_181D73:: @ 8181D73 .string "Oh... You don’t need COINS, then?\n" .string "Good luck on your adventure!$" - .incbin "baserom.gba", 0x181db2, 0x2f +UnknownString_8181DB2: @ 8181DB2 + .string "It’s ¥1,000 for 50 COINS.\n" + .string "Would you like some?$" MauvilleCity_GameCorner_Text_181DE1:: @ 8181DE1 .string "Welcome.\p" @@ -48,7 +50,9 @@ MauvilleCity_GameCorner_Text_181E49:: @ 8181E49 MauvilleCity_GameCorner_Text_181E76:: @ 8181E76 .string "You don’t have enough COINS.$" - .incbin "baserom.gba", 0x181e93, 0x2f +UnknownString_8181E93: @ 8181E93 + .string "There isn’t any room available for\n" + .string "placing {STR_VAR_1}.$" MauvilleCity_GameCorner_Text_181EC2:: @ 8181EC2 .string "Oh, is that so? \n" @@ -58,7 +62,8 @@ MauvilleCity_GameCorner_Text_181EC2:: @ 8181EC2 MauvilleCity_GameCorner_Text_181F08:: @ 8181F08 .string "Here you go!$" - .incbin "baserom.gba", 0x181f15, 0x28 +UnknownString_8181F15: @ 8181F15 + .string "Oh, you can’t carry any more than that.$" MauvilleCity_GameCorner_Text_181F3D:: @ 8181F3D .string "I made a mistake and got two of the\n" diff --git a/data/maps/text/MeteorFalls_1F_1R.s b/data/maps/text/MeteorFalls_1F_1R.s index efddb3b22..788d692c4 100644 --- a/data/maps/text/MeteorFalls_1F_1R.s +++ b/data/maps/text/MeteorFalls_1F_1R.s @@ -25,7 +25,20 @@ MeteorFalls_1F_1R_Text_193320:: @ 8193320 .string "Hehehe! Be seeing you, you TEAM\n" .string "{GOOD_TEAM} dingbats!$" - .incbin "baserom.gba", 0x1933ec, 0x198 +UnknownString_81933EC: @ 81933EC + .string "And you are?\p" + .string "... ... ... ... ... ... ... ...\n" + .string "... ... ... ... ... ... ... ...\p" + .string "Fine, so you are {PLAYER}{KUN}.\p" + .string "I am MAXIE. As the head of TEAM MAGMA,\n" + .string "I have dedicated myself to thwarting\l" + .string "the dangerous plans of TEAM AQUA.\p" + .string "Why? Because TEAM AQUA is a grave\n" + .string "threat to us all.\p" + .string "They have committed many destructive\n" + .string "acts in their bid to enlarge the sea.\p" + .string "We, TEAM MAGMA, love dry land above\n" + .string "all! TEAM AQUA is our sworn enemy!$" MeteorFalls_1F_1R_Text_193584:: @ 8193584 .string "Who might you be?\p" diff --git a/data/maps/text/MossdeepCity.s b/data/maps/text/MossdeepCity.s index c7d7132c1..9bdcf3b3c 100644 --- a/data/maps/text/MossdeepCity.s +++ b/data/maps/text/MossdeepCity.s @@ -82,6 +82,3 @@ MossdeepCity_Text_16962F:: @ 816962F MossdeepCity_Text_16965C:: @ 816965C .string "MOSSDEEP SPACE CENTER\n" .string "“The closest place to space.”$" - - .incbin "baserom.gba", 0x169690, 0x14 - diff --git a/data/maps/text/MossdeepCity_GameCorner_1F.s b/data/maps/text/MossdeepCity_GameCorner_1F.s index 0b6cd83e4..eff305930 100644 --- a/data/maps/text/MossdeepCity_GameCorner_1F.s +++ b/data/maps/text/MossdeepCity_GameCorner_1F.s @@ -31,5 +31,6 @@ MossdeepCity_GameCorner_1F_Text_18E741:: @ 818E741 MossdeepCity_GameCorner_1F_Text_18E777:: @ 818E777 .string "I hope to see a good match!$" - .incbin "baserom.gba", 0x18e793, 0x3 +UnknownString_818E793: @ 818E793 + .string "{STR_VAR_1}$" diff --git a/data/maps/text/MtPyre_Summit.s b/data/maps/text/MtPyre_Summit.s index a6f1507e5..1c2e6be8a 100644 --- a/data/maps/text/MtPyre_Summit.s +++ b/data/maps/text/MtPyre_Summit.s @@ -90,7 +90,9 @@ MtPyre_Summit_Text_1B62E7:: @ 81B62E7 .string "You will return the RED ORB to its\n" .string "rightful place, yes?$" - .incbin "baserom.gba", 0x1b6374, 0x28 +UnknownString_81B6374: @ 81B6374 + .string "{PLAYER} handed the RED ORB to the\n" + .string "old woman.$" MtPyre_Summit_Text_1B639C:: @ 81B639C .string "Yes...\n" diff --git a/data/maps/text/PetalburgCity_Gym.s b/data/maps/text/PetalburgCity_Gym.s index 041f22a9d..715229880 100644 --- a/data/maps/text/PetalburgCity_Gym.s +++ b/data/maps/text/PetalburgCity_Gym.s @@ -367,7 +367,9 @@ PetalburgCity_Gym_Text_17B870:: @ 817B870 .string "“SPEED ROOM,” the sign says.\p" .string "Do you want to go through?$" - .incbin "baserom.gba", 0x17b8a8, 0x2c +UnknownString_817B8A8: @ 817B8A8 + .string "This door appears to be locked\n" + .string "right now...$" PetalburgCity_Gym_Text_17B8D4:: @ 817B8D4 .string "“ACCURACY ROOM,” the sign says.\p" diff --git a/data/maps/text/RecordCorner.s b/data/maps/text/RecordCorner.s index 665e2360a..4ee9f975b 100644 --- a/data/maps/text/RecordCorner.s +++ b/data/maps/text/RecordCorner.s @@ -4,7 +4,9 @@ RecordCorner_Text_1A4DD7:: @ 81A4DD7 RecordCorner_Text_1A4DF7:: @ 81A4DF7 .string "Thanks for coming.$" - .incbin "baserom.gba", 0x1a4e0a, 0x31 +UnknownString_81A4E0A: @ 81A4E0A + .string "Please choose your POKéMON for the\n" + .string "MULTI BATTLE.$" RecordCorner_Text_1A4E3B:: @ 81A4E3B .string "{STR_VAR_1} sent over one\n" diff --git a/data/maps/text/Route102.s b/data/maps/text/Route102.s index f58934d09..8d9f6bb64 100644 --- a/data/maps/text/Route102.s +++ b/data/maps/text/Route102.s @@ -5,7 +5,14 @@ Route102_Text_16D431:: @ 816D431 .string "Fwafwafwafwafwa...\p" .string "Fwatchoo!$" - .incbin "baserom.gba", 0x16d4a5, 0x75 +UnknownString_816D4A5: @ 816D4A5 + .string "Fufufufu...\n" + .string "Watch me.$" + +UnknownString_816D4BB: @ 816D4BB + .string "Ta-daaaah! Awesome, huh?\p" + .string "There are some ledges that you can’t\n" + .string "climb up, but you can jump down.$" Route102_Text_16D51A:: @ 816D51A .string "I’m going to catch a whole bunch of\n" diff --git a/data/maps/text/Route104_MrBrineysHouse.s b/data/maps/text/Route104_MrBrineysHouse.s index c669d44c5..f75c7a8a2 100644 --- a/data/maps/text/Route104_MrBrineysHouse.s +++ b/data/maps/text/Route104_MrBrineysHouse.s @@ -57,7 +57,11 @@ Route104_MrBrineysHouse_Text_191EDB:: @ 8191EDB .string "You just go on and tell me whenever\n" .string "you want to set sail!$" - .incbin "baserom.gba", 0x191f4f, 0x6a +UnknownString_8191F4F: @ 8191F4F + .string "MR. BRINEY: Ahoy!\n" + .string "We’ve made land in PETALBURG!\p" + .string "You just go on and tell me whenever\n" + .string "you want to set sail!$" Route104_MrBrineysHouse_Text_191FB9:: @ 8191FB9 .string "PEEKO: Pii pihyoroo!$" diff --git a/data/maps/text/Route109_SeashoreHouse.s b/data/maps/text/Route109_SeashoreHouse.s index ef4fc0ed1..59823f02c 100644 --- a/data/maps/text/Route109_SeashoreHouse.s +++ b/data/maps/text/Route109_SeashoreHouse.s @@ -40,7 +40,19 @@ Route109_SeashoreHouse_Text_19B773:: @ 819B773 .string "No?\n" .string "That’s too bad.$" - .incbin "baserom.gba", 0x19b787, 0x82 +UnknownString_819B787: @ 819B787 + .string "SODA POP! The POKéMON favorite!\n" + .string "Just ¥300 a bottle! Want one?$" + +UnknownString_819B7C5: @ 819B7C5 + .string "Here you go!$" + +UnknownString_819B7D2: @ 819B7D2 + .string "Oh, dear!\n" + .string "You don’t have enough money.$" + +UnknownString_819B7F9: @ 819B7F9 + .string "That’s too bad.$" Route109_SeashoreHouse_Text_19B809:: @ 819B809 .string "If you’re looking for a battle on the\n" diff --git a/data/maps/text/Route110.s b/data/maps/text/Route110.s index 6159709d7..29fefe53e 100644 --- a/data/maps/text/Route110.s +++ b/data/maps/text/Route110.s @@ -216,5 +216,22 @@ Route110_Text_16F57C:: @ 816F57C .string "No one seems to have taken the\n" .string "challenge. There is no record...$" - .incbin "baserom.gba", 0x16f5d7, 0x12e +UnknownString_816F5D7: @ 816F5D7 + .string "I watered the plants every day.\n" + .string "They grew lots of flowers.\p" + .string "And they gave me lots of BERRIES, too.\p" + .string "Here you go!\n" + .string "You can have it!$" + +UnknownString_816F657: @ 816F657 + .string "I’m trying to make RED {POKEBLOCK}S!\n" + .string "I hope you do, too!$" + +UnknownString_816F68A: @ 816F68A + .string "Your BAG’s BERRIES POCKET is full.\p" + .string "I’ll give it to you another time.$" + +UnknownString_816F6CF: @ 816F6CF + .string "I’m going to look for red BERRIES to\n" + .string "make RED {POKEBLOCK}S.$" diff --git a/data/maps/text/Route110_TrickHouseEnd.s b/data/maps/text/Route110_TrickHouseEnd.s index 43d6353b6..9d8086d26 100644 --- a/data/maps/text/Route110_TrickHouseEnd.s +++ b/data/maps/text/Route110_TrickHouseEnd.s @@ -102,5 +102,10 @@ Route110_TrickHouseEnd_Text_19CA8B:: @ 819CA8B .string "Now, now! You’re ignoring me now?\n" .string "Now that, I consider heartbreaking!$" - .incbin "baserom.gba", 0x19cad1, 0x7e +UnknownString_819CAD1: @ 819CAD1 + .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!$" diff --git a/data/maps/text/Route110_TrickHousePuzzle1.s b/data/maps/text/Route110_TrickHousePuzzle1.s index 19731e2b4..89a9a7b56 100644 --- a/data/maps/text/Route110_TrickHousePuzzle1.s +++ b/data/maps/text/Route110_TrickHousePuzzle1.s @@ -8,5 +8,8 @@ Route110_TrickHousePuzzle1_Text_19C1CB:: @ 819C1CB Route110_TrickHousePuzzle1_Text_19C1FF:: @ 819C1FF .string "A secret code is written on it.$" - .incbin "baserom.gba", 0x19c21f, 0x62 +UnknownString_819C21F: @ 819C21F + .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/text/Route110_TrickHousePuzzle2.s b/data/maps/text/Route110_TrickHousePuzzle2.s index 76583b324..3b923be21 100644 --- a/data/maps/text/Route110_TrickHousePuzzle2.s +++ b/data/maps/text/Route110_TrickHousePuzzle2.s @@ -31,5 +31,10 @@ Route110_TrickHousePuzzle2_Text_19CEB8:: @ 819CEB8 .string "You’re strong, aren’t you?\n" .string "Maybe even enough to be a GYM LEADER!$" - .incbin "baserom.gba", 0x19cef9, 0x7d +UnknownString_819CEF9: @ 819CEF9 + .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!$" diff --git a/data/maps/text/Route110_TrickHousePuzzle3.s b/data/maps/text/Route110_TrickHousePuzzle3.s index b4e6184fe..9daf76b7d 100644 --- a/data/maps/text/Route110_TrickHousePuzzle3.s +++ b/data/maps/text/Route110_TrickHousePuzzle3.s @@ -33,5 +33,10 @@ Route110_TrickHousePuzzle3_Text_19D110:: @ 819D110 .string "How many traps are in this house?\p" .string "You may be the one to solve that.$" - .incbin "baserom.gba", 0x19d164, 0x7a +UnknownString_819D164: @ 819D164 + .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!$" diff --git a/data/maps/text/Route110_TrickHousePuzzle4.s b/data/maps/text/Route110_TrickHousePuzzle4.s index 7a0516a75..ffb2cef06 100644 --- a/data/maps/text/Route110_TrickHousePuzzle4.s +++ b/data/maps/text/Route110_TrickHousePuzzle4.s @@ -32,5 +32,10 @@ Route110_TrickHousePuzzle4_Text_19D380:: @ 819D380 Route110_TrickHousePuzzle4_Text_19D386:: @ 819D386 .string "Has anyone made it to the end?$" - .incbin "baserom.gba", 0x19d3a5, 0x7e +UnknownString_819D3A5: @ 819D3A5 + .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!$" diff --git a/data/maps/text/Route110_TrickHousePuzzle5.s b/data/maps/text/Route110_TrickHousePuzzle5.s index e88aaa08f..586349a6a 100644 --- a/data/maps/text/Route110_TrickHousePuzzle5.s +++ b/data/maps/text/Route110_TrickHousePuzzle5.s @@ -56,7 +56,9 @@ Route110_TrickHousePuzzle5_Text_19D745:: @ 819D745 .string "The DEVON RESEARCHER was looking for\n" .string "what POKéMON in PETALBURG WOODS?$" - .incbin "baserom.gba", 0x19d79d, 0x36 +UnknownString_819D79D: @ 819D79D + .string "CONGRATULATIONS. CORRECT YOU ARE.\n" + .string "GO THROUGH. PLEASE.$" Route110_TrickHousePuzzle5_Text_19D7D3:: @ 819D7D3 .string "CLICKETY-CLACK...\n" @@ -78,7 +80,9 @@ Route110_TrickHousePuzzle5_Text_19D8BA:: @ 819D8BA .string "Do one FULL HEAL and GREAT BALL\n" .string "cost more than one REVIVE?$" - .incbin "baserom.gba", 0x19d907, 0x36 +UnknownString_819D907: @ 819D907 + .string "CONGRATULATIONS. CORRECT YOU ARE.\n" + .string "GO THROUGH. PLEASE.$" Route110_TrickHousePuzzle5_Text_19D93D:: @ 819D93D .string "CLICKETY-CLACK...\n" @@ -100,7 +104,9 @@ Route110_TrickHousePuzzle5_Text_19DA1D:: @ 819DA1D .string "The first TRAINER in DEWFORD GYM was\n" .string "male or female?$" - .incbin "baserom.gba", 0x19da64, 0x36 +UnknownString_819DA64: @ 819DA64 + .string "CONGRATULATIONS. CORRECT YOU ARE.\n" + .string "GO THROUGH. PLEASE.$" Route110_TrickHousePuzzle5_Text_19DA9A:: @ 819DA9A .string "CLICKETY-CLACK...\n" @@ -123,5 +129,14 @@ Route110_TrickHousePuzzle5_Text_19DB97:: @ 819DB97 .string "How many signs are there in\n" .string "LILYCOVE CITY?$" - .incbin "baserom.gba", 0x19dbd4, 0xb3 +UnknownString_819DBD4: @ 819DBD4 + .string "CONGRATULATIONS. CORRECT YOU ARE.\n" + .string "GO THROUGH. PLEASE.$" + +UnknownString_819DC0A: @ 819DC0A + .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!$" diff --git a/data/maps/text/Route110_TrickHousePuzzle6.s b/data/maps/text/Route110_TrickHousePuzzle6.s index 559336ae4..4261a2797 100644 --- a/data/maps/text/Route110_TrickHousePuzzle6.s +++ b/data/maps/text/Route110_TrickHousePuzzle6.s @@ -34,5 +34,10 @@ Route110_TrickHousePuzzle6_Text_19DE44:: @ 819DE44 .string "You don’t seem to be affected at all.\n" .string "Or do you have your poker face on?$" - .incbin "baserom.gba", 0x19de8d, 0x7e +UnknownString_819DE8D: @ 819DE8D + .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!$" diff --git a/data/maps/text/Route110_TrickHousePuzzle7.s b/data/maps/text/Route110_TrickHousePuzzle7.s index 9cccb954d..7dcfd169c 100644 --- a/data/maps/text/Route110_TrickHousePuzzle7.s +++ b/data/maps/text/Route110_TrickHousePuzzle7.s @@ -34,5 +34,10 @@ Route110_TrickHousePuzzle7_Text_19E0B2:: @ 819E0B2 .string "You’re solving all the puzzles in the\n" .string "TRICK HOUSE. That’s the feeling I get.$" - .incbin "baserom.gba", 0x19e0ff, 0x79 +UnknownString_819E0FF: @ 819E0FF + .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!$" diff --git a/data/maps/text/Route112_CableCarStation.s b/data/maps/text/Route112_CableCarStation.s index ccb3241e7..f7167299c 100644 --- a/data/maps/text/Route112_CableCarStation.s +++ b/data/maps/text/Route112_CableCarStation.s @@ -2,7 +2,8 @@ Route112_CableCarStation_Text_1924F5:: @ 81924F5 .string "The CABLE CAR is ready to go up.\n" .string "Would you like to be on it?$" - .incbin "baserom.gba", 0x192532, 0x16 +UnknownString_8192532: @ 8192532 + .string "Please step this way.$" Route112_CableCarStation_Text_192548:: @ 8192548 .string "Please ride with us another time.$" diff --git a/data/maps/text/Route117_PokemonDayCare.s b/data/maps/text/Route117_PokemonDayCare.s index f3ab011f8..58b5ac4bf 100644 --- a/data/maps/text/Route117_PokemonDayCare.s +++ b/data/maps/text/Route117_PokemonDayCare.s @@ -44,7 +44,8 @@ Route117_PokemonDayCare_Text_1B2AEF:: @ 81B2AEF .string "Your POKéMON team is full.\n" .string "Make room, then come see me.$" - .incbin "baserom.gba", 0x1b2b27, 0x22 +UnknownString_81B2B27: @ 81B2B27 + .string "Which POKéMON will you take back?$" Route117_PokemonDayCare_Text_1B2B49:: @ 81B2B49 .string "If you want your {STR_VAR_1} back,\n" @@ -70,5 +71,8 @@ Route117_PokemonDayCare_Text_1B2C17:: @ 81B2C17 .string "what will you battle with?\p" .string "Come back another time.$" - .incbin "baserom.gba", 0x1b2c68, 0x2d +UnknownString_81B2C68: @ 81B2C68 + .string "Huh?$" + + .incbin "baserom.gba", 0x1B2C6D, 0x28 diff --git a/data/maps/text/Route128.s b/data/maps/text/Route128.s index 2bf3c3433..e2410358b 100644 --- a/data/maps/text/Route128.s +++ b/data/maps/text/Route128.s @@ -37,7 +37,15 @@ Route128_Text_172181:: @ 8172181 .string "STEVEN: {PLAYER}{KUN}!\n" .string "What is happening?$" - .incbin "baserom.gba", 0x1721a2, 0xff +UnknownString_81721A2: @ 81721A2 + .string "This is terrible...\p" + .string "If this doesn’t stop, all 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 should provide answers...$" Route128_Text_1722A1:: @ 81722A1 .string "This is terrible...\p" diff --git a/data/maps/text/RustboroCity.s b/data/maps/text/RustboroCity.s index 70b7fa653..54b658c01 100644 --- a/data/maps/text/RustboroCity.s +++ b/data/maps/text/RustboroCity.s @@ -159,7 +159,10 @@ RustboroCity_Text_167439:: @ 8167439 .string "LEADER: ROXANNE\p" .string "“The ROCK-loving honors student!”$" - .incbin "baserom.gba", 0x167485, 0x58 +UnknownString_8167485: @ 8167485 + .string "DEVON CORP. BRANCH OFFICE\p" + .string "“Access limited to DEVON employees\n" + .string "and authorized personnel.”$" RustboroCity_Text_1674DD:: @ 81674DD .string "RUSTBORO CITY\p" diff --git a/data/maps/text/SeafloorCavern_Room9.s b/data/maps/text/SeafloorCavern_Room9.s index 9aaeb9358..77f2ac9f8 100644 --- a/data/maps/text/SeafloorCavern_Room9.s +++ b/data/maps/text/SeafloorCavern_Room9.s @@ -96,5 +96,20 @@ SeafloorCavern_Room9_Text_1B4ECA:: @ 81B4ECA .string "ARCHIE: {PLAYER}{KUN}, come on, you have\n" .string "to get out of here, too!$" - .incbin "baserom.gba", 0x1b4f03, 0xe1 +UnknownString_81B4F03: @ 81B4F03 + .string "{PLAYER}’s BLUE ORB suddenly began\n" + .string "glowing!$" + +UnknownString_81B4F29: @ 81B4F29 + .string "KYOGRE appears to have settled\n" + .string "into sleep again...$" + +UnknownString_81B4F5C: @ 81B4F5C + .string "ARCHIE: This...$" + +UnknownString_81B4F6C: @ 81B4F6C + .string "ARCHIE: ... ... ... ... ... ...\n" + .string "... ... ... ... ... ... ... ...\p" + .string "This is good-bye.\n" + .string "This is the last you’ve seen of me...$" diff --git a/data/maps/text/SlateportCity_OceanicMuseum_1F.s b/data/maps/text/SlateportCity_OceanicMuseum_1F.s index 038d9f6b8..7ef418d39 100644 --- a/data/maps/text/SlateportCity_OceanicMuseum_1F.s +++ b/data/maps/text/SlateportCity_OceanicMuseum_1F.s @@ -16,7 +16,8 @@ SlateportCity_OceanicMuseum_1F_Text_17E22D:: @ 817E22D .string "You’re the only one who’s late.\n" .string "You’d better go catch up to them!$" - .incbin "baserom.gba", 0x17e2a0, 0x1b +UnknownString_817E2A0: @ 817E2A0 + .string "Please visit another time!$" SlateportCity_OceanicMuseum_1F_Text_17E2BB:: @ 817E2BB .string "We, TEAM {EVIL_TEAM}, exist for the good\n" diff --git a/data/maps/text/SlateportCity_OceanicMuseum_2F.s b/data/maps/text/SlateportCity_OceanicMuseum_2F.s index fb762e07e..e1f087543 100644 --- a/data/maps/text/SlateportCity_OceanicMuseum_2F.s +++ b/data/maps/text/SlateportCity_OceanicMuseum_2F.s @@ -46,7 +46,24 @@ SlateportCity_OceanicMuseum_2F_Text_17EF62:: @ 817EF62 .string "long to snatch some parts, and you\l" .string "simps are held up by a mere child?$" - .incbin "baserom.gba", 0x17efc9, 0x1b5 +UnknownString_817EFC9: @ 817EFC9 + .string "I am TEAM AQUA’s ARCHIE.\p" + .string "Tell me, why do you meddle in the\n" + .string "noble affairs of TEAM AQUA?\p" + .string "POKéMON, people, all life depends on\n" + .string "the sea.\p" + .string "So, TEAM AQUA is dedicated to the\n" + .string "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.\p" + .string "It can’t be helped that you do not\n" + .string "understand our ideals.\p" + .string "But, if you ever oppose us again,\n" + .string "there will be consequences!\p" + .string "Heed my warning!\n" + .string "Farewell!$" SlateportCity_OceanicMuseum_2F_Text_17F17E:: @ 817F17E .string "I am TEAM MAGMA’s MAXIE.\p" @@ -74,7 +91,9 @@ SlateportCity_OceanicMuseum_2F_Text_17F352:: @ 817F352 .string "Oh, yes, I almost forgot that you\n" .string "even brought the parts from DEVON!$" - .incbin "baserom.gba", 0x17f404, 0x2f +UnknownString_817F404: @ 817F404 + .string "{PLAYER} handed over the DEVON GOODS\n" + .string "to CAPT. STERN.$" SlateportCity_OceanicMuseum_2F_Text_17F433:: @ 817F433 .string "CAPT. STERN: Whoops!\n" diff --git a/data/maps/text/SlateportCity_SternsShipyard_1F.s b/data/maps/text/SlateportCity_SternsShipyard_1F.s index 0d16eed1b..35dbb3bee 100644 --- a/data/maps/text/SlateportCity_SternsShipyard_1F.s +++ b/data/maps/text/SlateportCity_SternsShipyard_1F.s @@ -63,7 +63,8 @@ SlateportCity_SternsShipyard_1F_Text_17C53D:: @ 817C53D .string "my experience, I’m sure that we can\l" .string "build one great ship, aye!$" - .incbin "baserom.gba", 0x17c6a6, 0x15 +UnknownString_817C6A6: @ 817C6A6 + .string "PEEKO: Pii piihyoro!$" SlateportCity_SternsShipyard_1F_Text_17C6BB:: @ 817C6BB .string "The seasons, the weather, where the\n" diff --git a/data/maps/text/SlateportCity_SternsShipyard_2F.s b/data/maps/text/SlateportCity_SternsShipyard_2F.s index d97aa7cd0..8262216fc 100644 --- a/data/maps/text/SlateportCity_SternsShipyard_2F.s +++ b/data/maps/text/SlateportCity_SternsShipyard_2F.s @@ -9,5 +9,11 @@ SlateportCity_SternsShipyard_2F_Text_17C80C:: @ 817C80C .string "It floats because of a principle\n" .string "called buoyancy.$" - .incbin "baserom.gba", 0x17c882, 0xb5 +UnknownString_817C882: @ 817C882 + .string "The sea between SLATEPORT and\n" + .string "PACIFIDLOG has a fast-running tide.\p" + .string "Ordinary ships can’t make headway\n" + .string "through there.\p" + .string "You’d need substantial propulsion\n" + .string "to plow through those waters...$" diff --git a/data/maps/text/SootopolisCity.s b/data/maps/text/SootopolisCity.s index 196ca2529..3c2575b99 100644 --- a/data/maps/text/SootopolisCity.s +++ b/data/maps/text/SootopolisCity.s @@ -1,3 +1,6 @@ +ClosedSootopolisGymDoorText: @ 8169690 + .string "The door is closed.$" + SootopolisCity_Text_1696A4:: @ 81696A4 .string "Who might you be?\p" .string "This is the CAVE OF ORIGIN.\p" diff --git a/data/maps/text/SootopolisCity_House8.s b/data/maps/text/SootopolisCity_House8.s index 4f526dc48..cb1046272 100644 --- a/data/maps/text/SootopolisCity_House8.s +++ b/data/maps/text/SootopolisCity_House8.s @@ -18,7 +18,8 @@ SootopolisCity_House8_Text_19021D:: @ 819021D .string "Thanks for showing me.\n" .string "This is my thanks!$" - .incbin "baserom.gba", 0x1902ae, 0x16 +UnknownString_81902AE: @ 81902AE + .string "{PLAYER} received a POTION.$" SootopolisCity_House8_Text_1902C4:: @ 81902C4 .string "Hunh?\n" |