diff options
Diffstat (limited to 'data')
79 files changed, 607 insertions, 824 deletions
diff --git a/data/battle_anim_80A9C70.s b/data/battle_anim_80A9C70.s deleted file mode 100644 index f82a657b9..000000000 --- a/data/battle_anim_80A9C70.s +++ /dev/null @@ -1,89 +0,0 @@ -#include "constants/battle_anim.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_0853EDE4:: @ 853EDE4 - .2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EDF8:: @ 853EDF8 - .4byte gUnknown_0853EDE4 - - .align 2 -gUnknown_0853EDFC:: @ 853EDFC - spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC - spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8A6C - - .align 2 -gUnknown_0853EE2C:: @ 853EE2C - .2byte 0x0000, 0x0003, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EE34:: @ 853EE34 - .4byte gUnknown_0853EE2C - - .align 2 -gUnknown_0853EE38:: @ 853EE38 - spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30 - - .align 2 -gUnknown_0853EE50:: @ 853EE50 - spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4 - - .align 2 -gUnknown_0853EE68:: @ 853EE68 - .2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003, 0x0040, 0x0003, 0xffff, 0x0000 - - .align 2 -gUnknown_0853EE80:: @ 853EE80 - .4byte gUnknown_0853EE68 - - .align 2 -gUnknown_0853EE84:: @ 853EE84 - spr_template ANIM_TAG_SPARKLE_4, ANIM_TAG_SPARKLE_4, gUnknown_08524914, gUnknown_0853EE80, NULL, gDummySpriteAffineAnimTable, sub_80A8B64 - spr_template ANIM_TAG_UNUSED_MONSTER_FOOT, ANIM_TAG_UNUSED_MONSTER_FOOT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC - - .align 2 -gUnknown_0853EEB4:: @ 853EEB4 - .2byte 0x0000, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EEBC:: @ 853EEBC - .2byte 0x0000, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EEC4:: @ 853EEC4 - .2byte 0x0000, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EECC:: @ 853EECC - .4byte gUnknown_0853EEB4 - .4byte gUnknown_0853EEBC - .4byte gUnknown_0853EEC4 - - .align 2 -gUnknown_0853EED8:: @ 853EED8 - spr_template ANIM_TAG_IMPACT, ANIM_TAG_IMPACT, gUnknown_08524914, gUnknown_0853EECC, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC - - .align 2 -gUnknown_0853EEF0:: @ 853EEF0 - .2byte 0x0000, 0x000f, 0xfffe, 0x0000 - - .align 2 -gUnknown_0853EEF8:: @ 853EEF8 - .4byte gUnknown_0853EEF0 - - .align 2 -gUnknown_0853EEFC:: @ 853EEFC - .2byte 0x0060, 0x0060, 0x0000, 0x0000, 0x0002, 0x0002, 0x0100, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_0853EF14:: @ 853EF14 - .4byte gUnknown_0853EEFC - - .align 2 -gUnknown_0853EF18:: @ 853EF18 - spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C diff --git a/data/contest.s b/data/contest.s index eaf3f8c95..48bfa1080 100644 --- a/data/contest.s +++ b/data/contest.s @@ -406,7 +406,7 @@ gSpriteTemplate_858998C:: @ 858998C spr_template 0x80eb, 0x80eb, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy .align 2 -gUnknown_085899EC:: @ 85899EC +gContestExcitementTable:: @ 85899EC .2byte 0x0001, 0xffff, 0x0000, 0x0001, 0xffff, 0x00ff, 0x0001, 0xffff, 0x00ff, 0x0001, 0xff00, 0x00ff, 0x0001, 0x0000 diff --git a/data/event_scripts.s b/data/event_scripts.s index 1da2a016f..3c3c38eb9 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -2,6 +2,7 @@ #include "constants/battle_frontier.h" #include "constants/battle_setup.h" #include "constants/event_objects.h" +#include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" #include "constants/flags.h" #include "constants/items.h" @@ -60,11 +61,7 @@ gStdScripts:: @ 81DC2A0 .4byte Std_RegisteredInMatchCall .4byte Std_9 .4byte Std_10 - gStdScripts_End:: @ 81DC2CC - map_script 3, PetalburgCity_MapScript1_1DC2D7 - map_script 2, PetalburgCity_MapScript2_1DC31C - .byte 0 .include "data/maps/PetalburgCity/scripts.inc" .include "data/maps/SlateportCity/scripts.inc" @@ -638,17 +635,17 @@ SecretBase_RedCave1_Text_23B759: @ 823B759 .include "data/maps/RecordCorner/scripts.inc" .include "data/maps/DoubleBattleColosseum/scripts.inc" .include "data/maps/LinkContestRoom1/scripts.inc" - .include "data/maps/LinkContestRoom2/scripts.inc" - .include "data/maps/LinkContestRoom3/scripts.inc" - .include "data/maps/LinkContestRoom4/scripts.inc" - .include "data/maps/LinkContestRoom5/scripts.inc" - .include "data/maps/LinkContestRoom6/scripts.inc" .include "data/maps/UnknownMap_25_29/scripts.inc" .include "data/maps/UnknownMap_25_30/scripts.inc" .include "data/maps/UnknownMap_25_31/scripts.inc" .include "data/maps/UnknownMap_25_32/scripts.inc" .include "data/maps/UnknownMap_25_33/scripts.inc" .include "data/maps/UnknownMap_25_34/scripts.inc" + .include "data/maps/LinkContestRoom2/scripts.inc" + .include "data/maps/LinkContestRoom3/scripts.inc" + .include "data/maps/LinkContestRoom4/scripts.inc" + .include "data/maps/LinkContestRoom5/scripts.inc" + .include "data/maps/LinkContestRoom6/scripts.inc" .include "data/maps/InsideOfTruck/scripts.inc" .include "data/maps/SSTidalCorridor/scripts.inc" .include "data/maps/SSTidalLowerDeck/scripts.inc" diff --git a/data/fanfares.s b/data/fanfares.s deleted file mode 100644 index 2a0c2576a..000000000 --- a/data/fanfares.s +++ /dev/null @@ -1,26 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -sFanfares:: @ 85248BC -@ song number, duration - .2byte 0x016f, 0x0050 - .2byte 0x0172, 0x00a0 - .2byte 0x0173, 0x00dc - .2byte 0x0174, 0x00dc - .2byte 0x0170, 0x00a0 - .2byte 0x0171, 0x0154 - .2byte 0x017a, 0x00b4 - .2byte 0x0183, 0x0078 - .2byte 0x0184, 0x02c6 - .2byte 0x0185, 0x00fa - .2byte 0x0186, 0x0096 - .2byte 0x0187, 0x00a0 - .2byte 0x0226, 0x01c2 - .2byte 0x0212, 0x00aa - .2byte 0x0211, 0x00c4 - .2byte 0x01cb, 0x0139 - .2byte 0x01d2, 0x013e - .2byte 0x01cc, 0x0087 diff --git a/data/field_weather.s b/data/field_weather.s deleted file mode 100644 index 2121ecf23..000000000 --- a/data/field_weather.s +++ /dev/null @@ -1,103 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_0854014C:: @ 854014C - .incbin "graphics/misc/sunny_day/0.gbapal" - .incbin "graphics/misc/sunny_day/1.gbapal" - .incbin "graphics/misc/sunny_day/2.gbapal" - .incbin "graphics/misc/sunny_day/3.gbapal" - .incbin "graphics/misc/sunny_day/4.gbapal" - .incbin "graphics/misc/sunny_day/5.gbapal" - .incbin "graphics/misc/sunny_day/6.gbapal" - .incbin "graphics/misc/sunny_day/7.gbapal" - .incbin "graphics/misc/sunny_day/8.gbapal" - .incbin "graphics/misc/sunny_day/9.gbapal" - .incbin "graphics/misc/sunny_day/10.gbapal" - .incbin "graphics/misc/sunny_day/11.gbapal" - .incbin "graphics/misc/sunny_day/12.gbapal" - .incbin "graphics/misc/sunny_day/13.gbapal" - .incbin "graphics/misc/sunny_day/14.gbapal" - .incbin "graphics/misc/sunny_day/15.gbapal" - .incbin "graphics/misc/sunny_day/16.gbapal" - .incbin "graphics/misc/sunny_day/17.gbapal" - .incbin "graphics/misc/sunny_day/18.gbapal" - .incbin "graphics/misc/sunny_day/19.gbapal" - .incbin "graphics/misc/sunny_day/20.gbapal" - .incbin "graphics/misc/sunny_day/21.gbapal" - .incbin "graphics/misc/sunny_day/22.gbapal" - .incbin "graphics/misc/sunny_day/23.gbapal" - .incbin "graphics/misc/sunny_day/24.gbapal" - .incbin "graphics/misc/sunny_day/25.gbapal" - .incbin "graphics/misc/sunny_day/26.gbapal" - .incbin "graphics/misc/sunny_day/27.gbapal" - .incbin "graphics/misc/sunny_day/28.gbapal" - .incbin "graphics/misc/sunny_day/29.gbapal" - .incbin "graphics/misc/sunny_day/30.gbapal" - .incbin "graphics/misc/sunny_day/31.gbapal" - .incbin "graphics/misc/sunny_day/32.gbapal" - .incbin "graphics/misc/sunny_day/33.gbapal" - .incbin "graphics/misc/sunny_day/34.gbapal" - .incbin "graphics/misc/sunny_day/35.gbapal" - .incbin "graphics/misc/sunny_day/36.gbapal" - .incbin "graphics/misc/sunny_day/37.gbapal" - .incbin "graphics/misc/sunny_day/38.gbapal" - .incbin "graphics/misc/sunny_day/39.gbapal" - .incbin "graphics/misc/sunny_day/40.gbapal" - .incbin "graphics/misc/sunny_day/41.gbapal" - .incbin "graphics/misc/sunny_day/42.gbapal" - .incbin "graphics/misc/sunny_day/43.gbapal" - .incbin "graphics/misc/sunny_day/44.gbapal" - .incbin "graphics/misc/sunny_day/45.gbapal" - .incbin "graphics/misc/sunny_day/46.gbapal" - .incbin "graphics/misc/sunny_day/47.gbapal" - .incbin "graphics/misc/sunny_day/48.gbapal" - .incbin "graphics/misc/sunny_day/49.gbapal" - .incbin "graphics/misc/sunny_day/50.gbapal" - .incbin "graphics/misc/sunny_day/51.gbapal" - .incbin "graphics/misc/sunny_day/52.gbapal" - .incbin "graphics/misc/sunny_day/53.gbapal" - .incbin "graphics/misc/sunny_day/54.gbapal" - .incbin "graphics/misc/sunny_day/55.gbapal" - .incbin "graphics/misc/sunny_day/56.gbapal" - .incbin "graphics/misc/sunny_day/57.gbapal" - .incbin "graphics/misc/sunny_day/58.gbapal" - .incbin "graphics/misc/sunny_day/59.gbapal" - .incbin "graphics/misc/sunny_day/60.gbapal" - .incbin "graphics/misc/sunny_day/61.gbapal" - .incbin "graphics/misc/sunny_day/62.gbapal" - .incbin "graphics/misc/sunny_day/63.gbapal" - .incbin "graphics/misc/sunny_day/64.gbapal" - .incbin "graphics/misc/sunny_day/65.gbapal" - .incbin "graphics/misc/sunny_day/66.gbapal" - .incbin "graphics/misc/sunny_day/67.gbapal" - .incbin "graphics/misc/sunny_day/68.gbapal" - .incbin "graphics/misc/sunny_day/69.gbapal" - .incbin "graphics/misc/sunny_day/70.gbapal" - .incbin "graphics/misc/sunny_day/71.gbapal" - .incbin "graphics/misc/sunny_day/72.gbapal" - .incbin "graphics/misc/sunny_day/73.gbapal" - .incbin "graphics/misc/sunny_day/74.gbapal" - .incbin "graphics/misc/sunny_day/75.gbapal" - .incbin "graphics/misc/sunny_day/76.gbapal" - .incbin "graphics/misc/sunny_day/77.gbapal" - .incbin "graphics/misc/sunny_day/78.gbapal" - .incbin "graphics/misc/sunny_day/79.gbapal" - .incbin "graphics/misc/sunny_day/80.gbapal" - .incbin "graphics/misc/sunny_day/81.gbapal" - .incbin "graphics/misc/sunny_day/82.gbapal" - .incbin "graphics/misc/sunny_day/83.gbapal" - .incbin "graphics/misc/sunny_day/84.gbapal" - .incbin "graphics/misc/sunny_day/85.gbapal" - .incbin "graphics/misc/sunny_day/86.gbapal" - .incbin "graphics/misc/sunny_day/87.gbapal" - .incbin "graphics/misc/sunny_day/88.gbapal" - .incbin "graphics/misc/sunny_day/89.gbapal" - .incbin "graphics/misc/sunny_day/90.gbapal" - .incbin "graphics/misc/sunny_day/91.gbapal" - .incbin "graphics/misc/sunny_day/92.gbapal" - .incbin "graphics/misc/sunny_day/93.gbapal" - .incbin "graphics/misc/sunny_day/94.gbapal" - .incbin "graphics/misc/sunny_day/95.gbapal" diff --git a/data/layouts/RustboroCity_House/layout.inc b/data/layouts/RustboroCity_House/layout.inc index b1b90daee..0c8a2075e 100644 --- a/data/layouts/RustboroCity_House/layout.inc +++ b/data/layouts/RustboroCity_House/layout.inc @@ -5,7 +5,7 @@ RustboroCity_House_MapBlockdata:: .incbin "data/layouts/RustboroCity_House/map.bin" .align 2 -RustboroCity_House_Layouts:: +RustboroCity_House_Layout:: .4byte 0xc .4byte 0x9 .4byte RustboroCity_House_MapBorder diff --git a/data/layouts_table.inc b/data/layouts_table.inc index ab5578438..fb1385bdb 100644 --- a/data/layouts_table.inc +++ b/data/layouts_table.inc @@ -95,7 +95,7 @@ gMapLayouts:: .4byte RustboroCity_DevonCorp_2F_Layout .4byte RustboroCity_Gym_Layout .4byte RustboroCity_PokemonSchool_Layout - .4byte RustboroCity_House_Layouts + .4byte RustboroCity_House_Layout .4byte RustboroCity_House1_Layout .4byte RustboroCity_CuttersHouse_Layout .4byte FortreeCity_House1_Layout diff --git a/data/map_events.s b/data/map_events.s index 1d4813b73..6b2062076 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -387,17 +387,17 @@ .include "data/maps/RecordCorner/events.inc" .include "data/maps/DoubleBattleColosseum/events.inc" .include "data/maps/LinkContestRoom1/events.inc" - .include "data/maps/LinkContestRoom2/events.inc" - .include "data/maps/LinkContestRoom3/events.inc" - .include "data/maps/LinkContestRoom4/events.inc" - .include "data/maps/LinkContestRoom5/events.inc" - .include "data/maps/LinkContestRoom6/events.inc" .include "data/maps/UnknownMap_25_29/events.inc" .include "data/maps/UnknownMap_25_30/events.inc" .include "data/maps/UnknownMap_25_31/events.inc" .include "data/maps/UnknownMap_25_32/events.inc" .include "data/maps/UnknownMap_25_33/events.inc" .include "data/maps/UnknownMap_25_34/events.inc" + .include "data/maps/LinkContestRoom2/events.inc" + .include "data/maps/LinkContestRoom3/events.inc" + .include "data/maps/LinkContestRoom4/events.inc" + .include "data/maps/LinkContestRoom5/events.inc" + .include "data/maps/LinkContestRoom6/events.inc" .include "data/maps/InsideOfTruck/events.inc" .include "data/maps/SSTidalCorridor/events.inc" .include "data/maps/SSTidalLowerDeck/events.inc" diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index d92c6cbf4..7dbeee042 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -968,7 +968,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919 compare VAR_TEMP_D, 0 goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E setobjectxyperm 6, 2, 0 - setobjectmovementtype 6, 10 + setobjectmovementtype 6, MOVEMENT_TYPE_FACE_RIGHT return BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 82a3b8469..899df4d2c 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -28,7 +28,7 @@ LavaridgeTown_EventScript_1EA518:: @ 81EA518 LavaridgeTown_EventScript_1EA529:: @ 81EA529 setobjectxyperm 8, 11, 9 setobjectxyperm 7, 9, 8 - setobjectmovementtype 7, 7 + setobjectmovementtype 7, MOVEMENT_TYPE_FACE_UP clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 return diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 06ea54a98..bf48225ec 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -38,22 +38,22 @@ LavaridgeTown_Gym_1F_EventScript_1FE756:: @ 81FE756 LavaridgeTown_Gym_1F_EventScript_1FE757:: @ 81FE757 checktrainerflag TRAINER_COLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE764 - setobjectmovementtype 2, 63 + setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_1FE764:: @ 81FE764 checktrainerflag TRAINER_GERALD goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE771 - setobjectmovementtype 3, 63 + setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_1FE771:: @ 81FE771 checktrainerflag TRAINER_AXLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE77E - setobjectmovementtype 4, 63 + setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_1FE77E:: @ 81FE77E checktrainerflag TRAINER_DANIELLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE78B - setobjectmovementtype 5, 63 + setobjectmovementtype 5, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B return diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc index 222f36810..a8a6eaa54 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -37,22 +37,22 @@ LavaridgeTown_Gym_B1F_EventScript_1FF8DB:: @ 81FF8DB LavaridgeTown_Gym_B1F_EventScript_1FF8DC:: @ 81FF8DC checktrainerflag TRAINER_KEEGAN goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8E9 - setobjectmovementtype 2, 63 + setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_1FF8E9:: @ 81FF8E9 checktrainerflag TRAINER_JACE goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8F6 - setobjectmovementtype 1, 63 + setobjectmovementtype 1, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_1FF8F6:: @ 81FF8F6 checktrainerflag TRAINER_JEFF goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF903 - setobjectmovementtype 3, 63 + setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_1FF903:: @ 81FF903 checktrainerflag TRAINER_ELI goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF910 - setobjectmovementtype 4, 63 + setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_1FF910:: @ 81FF910 return diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc index 5c1a3b9f4..7b6b875c2 100644 --- a/data/maps/LinkContestRoom1/events.inc +++ b/data/maps/LinkContestRoom1/events.inc @@ -16,3 +16,4 @@ LinkContestRoom1_EventObjects: @ 8539EFC object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 LinkContestRoom1_MapEvents:: @ 853A064 + map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index 5276adcd8..e756c2bc6 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -1 +1,458 @@ LinkContestRoom1_MapScripts:: @ 823B781 + map_script 4, LinkContestRoom1_MapScript2_23B81F + map_script 2, LinkContestRoom1_MapScript2_23B815 + map_script 3, LinkContestRoom1_MapScript1_23B79F + map_script 5, LinkContestRoom1_MapScript1_23B803 + map_script 7, LinkContestRoom1_MapScript1_23B79B + .byte 0 + +LinkContestRoom1_MapScript1_23B79B: @ 823B79B + special sub_80F8B94 + end + +LinkContestRoom1_MapScript1_23B79F: @ 823B79F + call LinkContestRoom1_EventScript_23B7AF + setvar VAR_TEMP_0, 1 + call LinkContestRoom1_EventScript_23B842 + end + +LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF + call LinkContestRoom1_EventScript_27A133 + special ScriptGetMultiplayerId + compare VAR_RESULT, 0 + call_if_eq LinkContestRoom1_EventScript_23B7EF + compare VAR_RESULT, 1 + call_if_eq LinkContestRoom1_EventScript_23B7F3 + compare VAR_RESULT, 2 + call_if_eq LinkContestRoom1_EventScript_23B7F7 + compare VAR_RESULT, 3 + call_if_eq LinkContestRoom1_EventScript_23B7FB + compare VAR_RESULT, 4 + call_if_eq LinkContestRoom1_EventScript_23B7FF + return + +LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF + savebgm MUS_TEST1 + return + +LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3 + savebgm MUS_TEST2 + return + +LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7 + savebgm MUS_TEST3 + return + +LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB + savebgm MUS_TEST4 + return + +LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF + savebgm MUS_CONTEST0 + return + +LinkContestRoom1_MapScript1_23B803: @ 823B803 + compare VAR_TEMP_9, 1 + call_if_eq LinkContestRoom1_EventScript_23B80F + end + +LinkContestRoom1_EventScript_23B80F:: @ 823B80F + call LinkContestRoom1_EventScript_23BB2B + return + +LinkContestRoom1_MapScript2_23B815: @ 823B815 + map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B829 + .2byte 0 + +LinkContestRoom1_MapScript2_23B81F: @ 823B81F + map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B834 + .2byte 0 + +LinkContestRoom1_EventScript_23B829:: @ 823B829 + call LinkContestRoom1_EventScript_279F97 + call LinkContestRoom1_EventScript_23BE44 + end + +LinkContestRoom1_EventScript_23B834:: @ 823B834 + special sub_80F8B94 + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN + call LinkContestRoom1_EventScript_23BB2B + end + +LinkContestRoom1_EventScript_23B842:: @ 823B842 + call LinkContestRoom1_EventScript_23B8F8 + call LinkContestRoom1_EventScript_23B858 + compare VAR_TEMP_0, 8 + goto_if_lt LinkContestRoom1_EventScript_23B842 + return + +LinkContestRoom1_EventScript_23B858:: @ 823B858 + switch VAR_TEMP_0 + case 1, LinkContestRoom1_EventScript_23B8AB + case 2, LinkContestRoom1_EventScript_23B8B6 + case 3, LinkContestRoom1_EventScript_23B8C1 + case 4, LinkContestRoom1_EventScript_23B8CC + case 5, LinkContestRoom1_EventScript_23B8D7 + case 6, LinkContestRoom1_EventScript_23B8E2 + case 7, LinkContestRoom1_EventScript_23B8ED + end + +LinkContestRoom1_EventScript_23B8AB:: @ 823B8AB + copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8B6:: @ 823B8B6 + copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8C1:: @ 823B8C1 + copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8CC:: @ 823B8CC + copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8D7:: @ 823B8D7 + copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8E2:: @ 823B8E2 + copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED + copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 + return + +LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8 + setvar VAR_RESULT, 32 + special ScriptRandom + addvar VAR_RESULT, 1 + switch VAR_RESULT + case 1, LinkContestRoom1_EventScript_23BA6B + case 2, LinkContestRoom1_EventScript_23BA71 + case 3, LinkContestRoom1_EventScript_23BA77 + case 4, LinkContestRoom1_EventScript_23BA7D + case 5, LinkContestRoom1_EventScript_23BA83 + case 6, LinkContestRoom1_EventScript_23BA89 + case 7, LinkContestRoom1_EventScript_23BA8F + case 8, LinkContestRoom1_EventScript_23BA95 + case 9, LinkContestRoom1_EventScript_23BA9B + case 10, LinkContestRoom1_EventScript_23BAA1 + case 11, LinkContestRoom1_EventScript_23BAA7 + case 12, LinkContestRoom1_EventScript_23BAAD + case 13, LinkContestRoom1_EventScript_23BAB3 + case 14, LinkContestRoom1_EventScript_23BAB9 + case 15, LinkContestRoom1_EventScript_23BABF + case 16, LinkContestRoom1_EventScript_23BAC5 + case 17, LinkContestRoom1_EventScript_23BACB + case 18, LinkContestRoom1_EventScript_23BAD1 + case 19, LinkContestRoom1_EventScript_23BAD7 + case 20, LinkContestRoom1_EventScript_23BADD + case 21, LinkContestRoom1_EventScript_23BAE3 + case 22, LinkContestRoom1_EventScript_23BAE9 + case 23, LinkContestRoom1_EventScript_23BAEF + case 24, LinkContestRoom1_EventScript_23BAF5 + case 25, LinkContestRoom1_EventScript_23BAFB + case 26, LinkContestRoom1_EventScript_23BB01 + case 27, LinkContestRoom1_EventScript_23BB07 + case 28, LinkContestRoom1_EventScript_23BB0D + case 29, LinkContestRoom1_EventScript_23BB13 + case 30, LinkContestRoom1_EventScript_23BB19 + case 31, LinkContestRoom1_EventScript_23BB1F + case 32, LinkContestRoom1_EventScript_23BB25 + end + +LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B + setvar VAR_TEMP_1, 5 + return + +LinkContestRoom1_EventScript_23BA71:: @ 823BA71 + setvar VAR_TEMP_1, 6 + return + +LinkContestRoom1_EventScript_23BA77:: @ 823BA77 + setvar VAR_TEMP_1, 7 + return + +LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D + setvar VAR_TEMP_1, 8 + return + +LinkContestRoom1_EventScript_23BA83:: @ 823BA83 + setvar VAR_TEMP_1, 10 + return + +LinkContestRoom1_EventScript_23BA89:: @ 823BA89 + setvar VAR_TEMP_1, 11 + return + +LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F + setvar VAR_TEMP_1, 12 + return + +LinkContestRoom1_EventScript_23BA95:: @ 823BA95 + setvar VAR_TEMP_1, 13 + return + +LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B + setvar VAR_TEMP_1, 14 + return + +LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1 + setvar VAR_TEMP_1, 15 + return + +LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7 + setvar VAR_TEMP_1, 17 + return + +LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD + setvar VAR_TEMP_1, 18 + return + +LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3 + setvar VAR_TEMP_1, 19 + return + +LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9 + setvar VAR_TEMP_1, 20 + return + +LinkContestRoom1_EventScript_23BABF:: @ 823BABF + setvar VAR_TEMP_1, 21 + return + +LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5 + setvar VAR_TEMP_1, 22 + return + +LinkContestRoom1_EventScript_23BACB:: @ 823BACB + setvar VAR_TEMP_1, 25 + return + +LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1 + setvar VAR_TEMP_1, 26 + return + +LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7 + setvar VAR_TEMP_1, 27 + return + +LinkContestRoom1_EventScript_23BADD:: @ 823BADD + setvar VAR_TEMP_1, 47 + return + +LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3 + setvar VAR_TEMP_1, 30 + return + +LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9 + setvar VAR_TEMP_1, 31 + return + +LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF + setvar VAR_TEMP_1, 32 + return + +LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5 + setvar VAR_TEMP_1, 33 + return + +LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB + setvar VAR_TEMP_1, 34 + return + +LinkContestRoom1_EventScript_23BB01:: @ 823BB01 + setvar VAR_TEMP_1, 35 + return + +LinkContestRoom1_EventScript_23BB07:: @ 823BB07 + setvar VAR_TEMP_1, 36 + return + +LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D + setvar VAR_TEMP_1, 37 + return + +LinkContestRoom1_EventScript_23BB13:: @ 823BB13 + setvar VAR_TEMP_1, 38 + return + +LinkContestRoom1_EventScript_23BB19:: @ 823BB19 + setvar VAR_TEMP_1, 44 + return + +LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F + setvar VAR_TEMP_1, 45 + return + +LinkContestRoom1_EventScript_23BB25:: @ 823BB25 + setvar VAR_TEMP_1, 46 + return + +LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B + specialvar VAR_RESULT, sub_80F9160 + compare VAR_RESULT, 1 + goto_if_eq LinkContestRoom1_EventScript_23BD86 + switch VAR_0x4088 + case 1, LinkContestRoom1_EventScript_23BB78 + case 2, LinkContestRoom1_EventScript_23BB8B + case 3, LinkContestRoom1_EventScript_23BBE6 + case 4, LinkContestRoom1_EventScript_23BC92 + case 5, LinkContestRoom1_EventScript_23BC92 + return + +LinkContestRoom1_EventScript_23BB78:: @ 823BB78 + createvobject 5, 20, 3, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + return + +LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 46, 3, 2, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 12, 13, 12, 8, 3, 3 + createvobject 47, 20, 3, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + return + +LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 48, 3, 2, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 45, 13, 12, 8, 3, 3 + createvobject 22, 20, 3, 2, 3, 1 + createvobject 23, 20, 6, 2, 3, 1 + createvobject 34, 20, 7, 2, 3, 1 + createvobject 46, 24, 8, 2, 3, 1 + createvobject 48, 24, 11, 2, 3, 1 + createvobject 11, 25, 3, 9, 3, 2 + createvobject 35, 26, 4, 9, 3, 2 + createvobject 17, 27, 5, 9, 3, 2 + createvobject 40, 28, 9, 9, 3, 2 + createvobject 38, 29, 10, 9, 3, 2 + createvobject 83, 30, 11, 9, 3, 2 + return + +LinkContestRoom1_EventScript_23BC92:: @ 823BC92 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 12, 3, 2, 8, 3, 4 + createvobject 39, 4, 1, 3, 3, 4 + createvobject 34, 6, 1, 5, 3, 4 + createvobject 26, 7, 1, 6, 3, 4 + createvobject 48, 9, 1, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 45, 13, 12, 8, 3, 3 + createvobject 50, 14, 13, 3, 3, 3 + createvobject 52, 15, 13, 4, 3, 3 + createvobject 65, 17, 13, 6, 3, 3 + createvobject 83, 18, 13, 7, 3, 3 + createvobject 116, 19, 13, 8, 3, 3 + createvobject 25, 20, 3, 2, 3, 1 + createvobject 31, 21, 6, 2, 3, 1 + createvobject 33, 22, 7, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + createvobject 49, 25, 3, 9, 3, 2 + createvobject 35, 26, 4, 9, 3, 2 + createvobject 48, 27, 5, 9, 3, 2 + createvobject 40, 28, 9, 9, 3, 2 + createvobject 38, 29, 10, 9, 3, 2 + createvobject 83, 30, 11, 9, 3, 2 + return + +LinkContestRoom1_EventScript_23BD86:: @ 823BD86 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 12, 3, 2, 8, 3, 4 + createvobject 39, 4, 1, 3, 3, 4 + createvobject 34, 6, 1, 5, 3, 4 + createvobject 26, 7, 1, 6, 3, 4 + createvobject 48, 9, 1, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 45, 13, 12, 8, 3, 3 + createvobject 50, 14, 13, 3, 3, 3 + createvobject 52, 15, 13, 4, 3, 3 + createvobject 65, 17, 13, 6, 3, 3 + createvobject 83, 18, 13, 7, 3, 3 + createvobject 116, 19, 13, 8, 3, 3 + createvobject 25, 20, 3, 2, 3, 1 + createvobject 31, 21, 6, 2, 3, 1 + createvobject 33, 22, 7, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + return + +LinkContestRoom1_EventScript_23BE44:: @ 823BE44 + special sub_80F9154 + switch VAR_0x4088 + case 1, LinkContestRoom1_EventScript_23BE84 + case 2, LinkContestRoom1_EventScript_23BE8E + case 3, LinkContestRoom1_EventScript_23BE98 + case 4, LinkContestRoom1_EventScript_23BEA2 + case 5, LinkContestRoom1_EventScript_23BEAC + return + +LinkContestRoom1_EventScript_23BE84:: @ 823BE84 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +LinkContestRoom1_EventScript_23BE98:: @ 823BE98 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + waitstate + end + +LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4 + waitstate + end + +LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6 + checkplayergender + compare VAR_RESULT, MALE + goto_if_eq LilycoveCity_ContestLobby_EventScript_23BECE + compare VAR_RESULT, FEMALE + goto_if_eq LilycoveCity_ContestLobby_EventScript_23BED4 + return + +LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + return + +LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4 + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + return + diff --git a/data/maps/LinkContestRoom2/events.inc b/data/maps/LinkContestRoom2/events.inc index 89cb251d5..8b1378917 100644 --- a/data/maps/LinkContestRoom2/events.inc +++ b/data/maps/LinkContestRoom2/events.inc @@ -1 +1 @@ -LinkContestRoom2_MapEvents:: @ 853A064 + diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index f9274e58b..e37d65f86 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -1,7 +1,7 @@ LinkContestRoom2: @ 8484E64 .4byte LinkContestRoom2_Layout - .4byte LinkContestRoom2_MapEvents - .4byte LinkContestRoom2_MapScripts + .4byte LinkContestRoom1_MapEvents + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 .2byte 232 diff --git a/data/maps/LinkContestRoom2/scripts.inc b/data/maps/LinkContestRoom2/scripts.inc index ff85310f7..8b1378917 100644 --- a/data/maps/LinkContestRoom2/scripts.inc +++ b/data/maps/LinkContestRoom2/scripts.inc @@ -1 +1 @@ -LinkContestRoom2_MapScripts:: @ 823B781 + diff --git a/data/maps/LinkContestRoom3/events.inc b/data/maps/LinkContestRoom3/events.inc index 1e1b194c6..8b1378917 100644 --- a/data/maps/LinkContestRoom3/events.inc +++ b/data/maps/LinkContestRoom3/events.inc @@ -1 +1 @@ -LinkContestRoom3_MapEvents:: @ 853A064 + diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 1b445db4b..90333ebd9 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -1,7 +1,7 @@ LinkContestRoom3: @ 8484E80 .4byte LinkContestRoom3_Layout - .4byte LinkContestRoom3_MapEvents - .4byte LinkContestRoom3_MapScripts + .4byte LinkContestRoom1_MapEvents + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 .2byte 233 diff --git a/data/maps/LinkContestRoom3/scripts.inc b/data/maps/LinkContestRoom3/scripts.inc index c3a5c95fb..8b1378917 100644 --- a/data/maps/LinkContestRoom3/scripts.inc +++ b/data/maps/LinkContestRoom3/scripts.inc @@ -1 +1 @@ -LinkContestRoom3_MapScripts:: @ 823B781 + diff --git a/data/maps/LinkContestRoom4/events.inc b/data/maps/LinkContestRoom4/events.inc index 56e608f20..8b1378917 100644 --- a/data/maps/LinkContestRoom4/events.inc +++ b/data/maps/LinkContestRoom4/events.inc @@ -1 +1 @@ -LinkContestRoom4_MapEvents:: @ 853A064 + diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 20720be06..781ebed0f 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -1,7 +1,7 @@ LinkContestRoom4: @ 8484E9C .4byte LinkContestRoom4_Layout - .4byte LinkContestRoom4_MapEvents - .4byte LinkContestRoom4_MapScripts + .4byte LinkContestRoom1_MapEvents + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 .2byte 234 diff --git a/data/maps/LinkContestRoom4/scripts.inc b/data/maps/LinkContestRoom4/scripts.inc index 9a544e6f3..8b1378917 100644 --- a/data/maps/LinkContestRoom4/scripts.inc +++ b/data/maps/LinkContestRoom4/scripts.inc @@ -1 +1 @@ -LinkContestRoom4_MapScripts:: @ 823B781 + diff --git a/data/maps/LinkContestRoom5/events.inc b/data/maps/LinkContestRoom5/events.inc index 90644518e..8b1378917 100644 --- a/data/maps/LinkContestRoom5/events.inc +++ b/data/maps/LinkContestRoom5/events.inc @@ -1 +1 @@ -LinkContestRoom5_MapEvents:: @ 853A064 + diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index f2e9c6c55..87253d0d6 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -1,7 +1,7 @@ LinkContestRoom5: @ 8484EB8 .4byte LinkContestRoom5_Layout - .4byte LinkContestRoom5_MapEvents - .4byte LinkContestRoom5_MapScripts + .4byte LinkContestRoom1_MapEvents + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 .2byte 235 diff --git a/data/maps/LinkContestRoom5/scripts.inc b/data/maps/LinkContestRoom5/scripts.inc index f7ea72996..8b1378917 100644 --- a/data/maps/LinkContestRoom5/scripts.inc +++ b/data/maps/LinkContestRoom5/scripts.inc @@ -1 +1 @@ -LinkContestRoom5_MapScripts:: @ 823B781 + diff --git a/data/maps/LinkContestRoom6/events.inc b/data/maps/LinkContestRoom6/events.inc index 802987a1d..8b1378917 100644 --- a/data/maps/LinkContestRoom6/events.inc +++ b/data/maps/LinkContestRoom6/events.inc @@ -1 +1 @@ -LinkContestRoom6_MapEvents:: @ 853A064 + diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index 225a99e46..ade67e7e7 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -1,7 +1,7 @@ LinkContestRoom6: @ 8484ED4 .4byte LinkContestRoom6_Layout - .4byte LinkContestRoom6_MapEvents - .4byte LinkContestRoom6_MapScripts + .4byte LinkContestRoom1_MapEvents + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 .2byte 236 diff --git a/data/maps/LinkContestRoom6/scripts.inc b/data/maps/LinkContestRoom6/scripts.inc index bea65ea48..8b1378917 100644 --- a/data/maps/LinkContestRoom6/scripts.inc +++ b/data/maps/LinkContestRoom6/scripts.inc @@ -1 +1 @@ -LinkContestRoom6_MapScripts:: @ 823B781 + diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index b7067f451..5d9161cb4 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -56,17 +56,17 @@ LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F compare VAR_0x4050, 0 goto_if_eq LittlerootTown_EventScript_1E7E86 setobjectxyperm 1, 10, 1 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_EventScript_1E7E86:: @ 81E7E86 setobjectxyperm 1, 7, 2 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return LittlerootTown_EventScript_1E7E92:: @ 81E7E92 clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE - setobjectmovementtype 4, 8 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN checkplayergender compare VAR_RESULT, MALE call_if_eq LittlerootTown_EventScript_1E7EB1 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 8fa7adbca..42cfe308b 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -36,17 +36,17 @@ LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4 LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6 setobjectxyperm 1, 8, 4 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_BrendansHouse_1F_EventScript_1F77D2:: @ 81F77D2 setobjectxyperm 1, 4, 5 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE setobjectxyperm 1, 9, 8 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 8bd4b43b9..ea00693a8 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -27,7 +27,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433 compare VAR_0x40D3, 2 goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F9309 setobjectxyperm 1, 0, 2 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 25ebc1bbd..36bda7e03 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -36,17 +36,17 @@ LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4 LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916 setobjectxyperm 1, 2, 4 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_MaysHouse_1F_EventScript_1F8922:: @ 81F8922 setobjectxyperm 1, 6, 5 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E setobjectxyperm 1, 1, 8 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index ffc4a6519..353437ad4 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -27,7 +27,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6 compare VAR_0x40D3, 2 goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 setobjectxyperm 1, 8, 2 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_BrendansHouse_2F_EventScript_1F9309:: @ 81F9309 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 1f65beda3..ee7e1730b 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -19,7 +19,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD specialvar VAR_RESULT, HasAllHoennMons compare VAR_RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9 - setobjectmovementtype 3, 3 + setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end @@ -33,7 +33,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 setmaplayoutindex 432 - setobjectmovementtype 3, 3 + setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 91eda813c..e875be96f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -10,14 +10,14 @@ MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 setobjectxyperm 3, 1, 9 - setobjectmovementtype 3, 10 + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 5, 0, 8 - setobjectmovementtype 5, 10 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 4, 1, 6 - setobjectmovementtype 4, 10 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 1, 3, 4 - setobjectmovementtype 1, 10 - setobjectmovementtype 2, 10 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT compare VAR_0x409E, 1 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA compare VAR_0x409E, 2 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 163f7045f..0602c9dad 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -13,11 +13,11 @@ MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A clearflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER setobjectxyperm 3, 5, 3 - setobjectmovementtype 3, 10 + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 1, 3, 2 - setobjectmovementtype 1, 10 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 2, 1, 3 - setobjectmovementtype 2, 10 + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT return MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F @@ -319,7 +319,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT removeobject 3 setobjectxyperm 3, 5, 6 - setobjectmovementtype 3, 2 + setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_AROUND addobject 3 fadescreen 0 end diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index d2bd91694..51f1ac16e 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -19,7 +19,7 @@ MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8 MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4 setobjectxyperm 1, 6, 5 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 8e52438c9..6c389e2ad 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -10,7 +10,7 @@ MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11 setobjectxyperm 1, 5, 4 - setobjectmovementtype 1, 10 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT return MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D @@ -24,7 +24,7 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 waitmovement 0 setvar VAR_0x40A3, 0 setobjectxyperm 1, 6, 7 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN releaseall end diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index c8a598da9..7431cbf2a 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -16,12 +16,12 @@ OldaleTown_EventScript_1E8ECC:: @ 81E8ECC OldaleTown_EventScript_1E8ED2:: @ 81E8ED2 setobjectxyperm 3, 1, 11 - setobjectmovementtype 3, 9 + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_LEFT return OldaleTown_EventScript_1E8EDE:: @ 81E8EDE setobjectxyperm 2, 13, 14 - setobjectmovementtype 2, 8 + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN return OldaleTown_EventScript_1E8EEA:: @ 81E8EEA diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index 6a4f82bfa..5cf3cc6e1 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -1,7 +1,7 @@ PetalburgCity: @ 84824B8 .4byte PetalburgCity_Layout .4byte PetalburgCity_MapEvents - .4byte gStdScripts_End + .4byte PetalburgCity_MapScripts .4byte PetalburgCity_MapConnections .2byte MUS_MACHI_S2 .2byte 1 diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 137731ae2..f69eb3a3a 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,3 +1,8 @@ +PetalburgCity_MapScripts:: + map_script 3, PetalburgCity_MapScript1_1DC2D7 + map_script 2, PetalburgCity_MapScript2_1DC31C + .byte 0 + PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 setflag FLAG_VISITED_PETALBURG_CITY compare VAR_0x4057, 0 diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index ba1afc428..17ed47206 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -15,9 +15,9 @@ Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50 setobjectxyperm 1, 9, 3 - setobjectmovementtype 1, 50 + setobjectmovementtype 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT setobjectxyperm 2, 9, 6 - setobjectmovementtype 2, 51 + setobjectmovementtype 2, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN return Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67 diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 0455ebb1f..7c98cc603 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -484,8 +484,8 @@ Route110_EventScript_1EF8EC:: @ 81EF8EC call_if_eq Route110_EventScript_1EF998 compare VAR_0x8008, 3 call_if_eq Route110_EventScript_1EF9A0 - setobjectmovementtype 28, 10 - setobjectmovementtype 29, 10 + setobjectmovementtype 28, MOVEMENT_TYPE_FACE_RIGHT + setobjectmovementtype 29, MOVEMENT_TYPE_FACE_RIGHT removeobject 28 addobject 29 delay 45 diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index 037d7ca05..a430a497e 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -11,7 +11,7 @@ Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 Route112_CableCarStation_EventScript_22AADD:: @ 822AADD setobjectxyperm 1, 7, 4 - setobjectmovementtype 1, 9 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_LEFT return Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9 @@ -25,7 +25,7 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 waitmovement 0 setvar VAR_0x40A3, 0 setobjectxyperm 1, 6, 7 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN releaseall end diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index b98fd3321..96d591d2d 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -9,7 +9,7 @@ Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33 Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D setobjectxyperm 1, 6, 5 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49 diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 8dada27e8..ae0fea259 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -9,7 +9,7 @@ Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98 setobjectxyperm 5, 0, 5 - setobjectmovementtype 5, 10 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT return Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index e7d2cb03d..bbee65df8 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -12,17 +12,17 @@ Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44 setobjectxyperm 5, 1, 6 - setobjectmovementtype 5, 10 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT return Route119_WeatherInstitute_2F_EventScript_26FF50:: @ 826FF50 setobjectxyperm 5, 4, 6 - setobjectmovementtype 5, 10 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT return Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C setobjectxyperm 5, 2, 2 - setobjectmovementtype 5, 7 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_UP return Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 5a601678d..cd864e1dc 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -57,7 +57,7 @@ Route120_EventScript_1F54A3:: @ 81F54A3 return Route120_EventScript_1F54C8:: @ 81F54C8 - setobjectmovementtype 36, 10 + setobjectmovementtype 36, MOVEMENT_TYPE_FACE_RIGHT return Route120_MapScript1_1F54CD: @ 81F54CD diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 7c1e14118..8ffbf8373 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -245,7 +245,7 @@ RustboroCity_EventScript_1E094E:: @ 81E094E RustboroCity_EventScript_1E095A:: @ 81E095A lockall setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 + setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 0 goto RustboroCity_EventScript_1E09CD end @@ -253,7 +253,7 @@ RustboroCity_EventScript_1E095A:: @ 81E095A RustboroCity_EventScript_1E0971:: @ 81E0971 lockall setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 + setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 1 goto RustboroCity_EventScript_1E09CD end @@ -261,7 +261,7 @@ RustboroCity_EventScript_1E0971:: @ 81E0971 RustboroCity_EventScript_1E0988:: @ 81E0988 lockall setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 + setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 2 goto RustboroCity_EventScript_1E09CD end @@ -269,7 +269,7 @@ RustboroCity_EventScript_1E0988:: @ 81E0988 RustboroCity_EventScript_1E099F:: @ 81E099F lockall setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 + setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 3 goto RustboroCity_EventScript_1E09CD end @@ -277,7 +277,7 @@ RustboroCity_EventScript_1E099F:: @ 81E099F RustboroCity_EventScript_1E09B6:: @ 81E09B6 lockall setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 + setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 4 goto RustboroCity_EventScript_1E09CD end diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index 157947c2d..a7a84335b 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -8,7 +8,7 @@ RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255 setobjectxyperm 2, 14, 2 - setobjectmovementtype 2, 8 + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN return RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261 diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index da78ccb4b..9d5fbe58b 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -11,7 +11,7 @@ RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449 setobjectxyperm 2, 3, 2 - setobjectmovementtype 2, 9 + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT return RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index 1de4f0e36..d842f2e79 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -1,5 +1,5 @@ RustboroCity_House2: @ 8483494 - .4byte RustboroCity_House_Layouts + .4byte RustboroCity_House_Layout .4byte RustboroCity_House2_MapEvents .4byte RustboroCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index c1a0312e3..7f057cf15 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -1,5 +1,5 @@ RustboroCity_House3: @ 8483504 - .4byte RustboroCity_House_Layouts + .4byte RustboroCity_House_Layout .4byte RustboroCity_House3_MapEvents .4byte RustboroCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index c0bc2e4c1..c091991a3 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -24,7 +24,7 @@ SkyPillar_Top_MapScript1_2396E6: @ 82396E6 SkyPillar_Top_EventScript_2396FD:: @ 82396FD setmaplayoutindex 438 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return SkyPillar_Top_EventScript_239705:: @ 8239705 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 7b19c84b8..2e7859fba 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -26,13 +26,13 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99 setobjectxyperm 8, 28, 16 setobjectxyperm 1, 29, 16 setobjectxyperm 2, 31, 14 - setobjectmovementtype 11, 8 - setobjectmovementtype 7, 18 - setobjectmovementtype 3, 16 - setobjectmovementtype 6, 7 - setobjectmovementtype 8, 7 - setobjectmovementtype 1, 7 - setobjectmovementtype 2, 9 + setobjectmovementtype 11, MOVEMENT_TYPE_FACE_DOWN + setobjectmovementtype 7, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT + setobjectmovementtype 6, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype 8, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT return SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 @@ -41,12 +41,12 @@ SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 compare VAR_0x8004, 30 goto_if_eq SlateportCity_EventScript_1DCD06 setobjectxyperm 35, 23, 27 - setobjectmovementtype 35, 10 + setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT return SlateportCity_EventScript_1DCD06:: @ 81DCD06 setobjectxyperm 35, 22, 27 - setobjectmovementtype 35, 10 + setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT return SlateportCity_MapScript2_1DCD12: @ 81DCD12 @@ -82,7 +82,7 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C waitmovement 0 removeobject 35 setobjectxyperm 35, 10, 12 - setobjectmovementtype 35, 8 + setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN clearflag FLAG_SPECIAL_FLAG_0x4000 setvar VAR_0x40D2, 2 addvar VAR_0x40D1, 1 diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 2f71a2dc9..24e139edf 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -17,7 +17,7 @@ SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5 SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9 savebgm MUS_AQA_0 setobjectxyperm 4, 12, 13 - setobjectmovementtype 4, 9 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_LEFT setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS return @@ -78,7 +78,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE moveobjectoffscreen 4 - setobjectmovementtype 4, 10 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_RIGHT releaseall end diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index da5caab3f..a116aeb56 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -70,10 +70,10 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785 setobjectxyperm 5, 46, 32 setobjectxyperm 4, 48, 41 setobjectxyperm 8, 45, 43 - setobjectmovementtype 3, 7 - setobjectmovementtype 5, 9 - setobjectmovementtype 4, 9 - setobjectmovementtype 8, 9 + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_LEFT + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_LEFT + setobjectmovementtype 8, MOVEMENT_TYPE_FACE_LEFT return SootopolisCity_EventScript_1E57B2:: @ 81E57B2 @@ -150,17 +150,17 @@ SootopolisCity_EventScript_1E5871:: @ 81E5871 SootopolisCity_EventScript_1E58AF:: @ 81E58AF setobjectxyperm 18, 31, 33 - setobjectmovementtype 18, 8 + setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN return SootopolisCity_EventScript_1E58BB:: @ 81E58BB setobjectxyperm 18, 32, 33 - setobjectmovementtype 18, 8 + setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN return SootopolisCity_EventScript_1E58C7:: @ 81E58C7 setobjectxyperm 18, 30, 33 - setobjectmovementtype 18, 8 + setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN return SootopolisCity_EventScript_1E58D3:: @ 81E58D3 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 18b573fbd..0493cb05f 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -15,13 +15,13 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D setvar VAR_TEMP_1, 1 setobjectxyperm 1, 3, 2 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN setmaplayoutindex 441 return SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991 setobjectxyperm 1, 2, 2 - setobjectmovementtype 1, 10 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT return SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D diff --git a/data/maps/UnknownMap_25_29/events.inc b/data/maps/UnknownMap_25_29/events.inc index 13ea1b8b9..8b1378917 100644 --- a/data/maps/UnknownMap_25_29/events.inc +++ b/data/maps/UnknownMap_25_29/events.inc @@ -1 +1 @@ -UnknownMap_25_29_MapEvents:: @ 853A064 + diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index a3777fd80..aa4ffc0cd 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -1,7 +1,7 @@ UnknownMap_25_29: @ 8484DBC .4byte UnknownMap_25_29_Layout - .4byte UnknownMap_25_29_MapEvents - .4byte UnknownMap_25_29_MapScripts + .4byte LinkContestRoom1_MapEvents + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI .2byte 226 diff --git a/data/maps/UnknownMap_25_29/scripts.inc b/data/maps/UnknownMap_25_29/scripts.inc index 575e7a898..8b1378917 100644 --- a/data/maps/UnknownMap_25_29/scripts.inc +++ b/data/maps/UnknownMap_25_29/scripts.inc @@ -1 +1 @@ -UnknownMap_25_29_MapScripts:: @ 823B781 + diff --git a/data/maps/UnknownMap_25_30/events.inc b/data/maps/UnknownMap_25_30/events.inc index 0e221e240..8b1378917 100644 --- a/data/maps/UnknownMap_25_30/events.inc +++ b/data/maps/UnknownMap_25_30/events.inc @@ -1 +1 @@ -UnknownMap_25_30_MapEvents:: @ 853A064 + diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index a4184b85d..86e2d4f70 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -1,7 +1,7 @@ UnknownMap_25_30: @ 8484DD8 .4byte UnknownMap_25_30_Layout - .4byte UnknownMap_25_30_MapEvents - .4byte UnknownMap_25_30_MapScripts + .4byte LinkContestRoom1_MapEvents + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI .2byte 227 diff --git a/data/maps/UnknownMap_25_30/scripts.inc b/data/maps/UnknownMap_25_30/scripts.inc index dbc73166d..8b1378917 100644 --- a/data/maps/UnknownMap_25_30/scripts.inc +++ b/data/maps/UnknownMap_25_30/scripts.inc @@ -1 +1 @@ -UnknownMap_25_30_MapScripts:: @ 823B781 + diff --git a/data/maps/UnknownMap_25_31/events.inc b/data/maps/UnknownMap_25_31/events.inc index 99e450de5..8b1378917 100644 --- a/data/maps/UnknownMap_25_31/events.inc +++ b/data/maps/UnknownMap_25_31/events.inc @@ -1 +1 @@ -UnknownMap_25_31_MapEvents:: @ 853A064 + diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index ec4838bd5..78ede2d65 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -1,7 +1,7 @@ UnknownMap_25_31: @ 8484DF4 .4byte UnknownMap_25_31_Layout - .4byte UnknownMap_25_31_MapEvents - .4byte UnknownMap_25_31_MapScripts + .4byte LinkContestRoom1_MapEvents + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI .2byte 228 diff --git a/data/maps/UnknownMap_25_31/scripts.inc b/data/maps/UnknownMap_25_31/scripts.inc index cacda4d1f..8b1378917 100644 --- a/data/maps/UnknownMap_25_31/scripts.inc +++ b/data/maps/UnknownMap_25_31/scripts.inc @@ -1 +1 @@ -UnknownMap_25_31_MapScripts:: @ 823B781 + diff --git a/data/maps/UnknownMap_25_32/events.inc b/data/maps/UnknownMap_25_32/events.inc index c48eedb17..8b1378917 100644 --- a/data/maps/UnknownMap_25_32/events.inc +++ b/data/maps/UnknownMap_25_32/events.inc @@ -1 +1 @@ -UnknownMap_25_32_MapEvents:: @ 853A064 + diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 39e982093..826528119 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -1,7 +1,7 @@ UnknownMap_25_32: @ 8484E10 .4byte UnknownMap_25_32_Layout - .4byte UnknownMap_25_32_MapEvents - .4byte UnknownMap_25_32_MapScripts + .4byte LinkContestRoom1_MapEvents + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI .2byte 229 diff --git a/data/maps/UnknownMap_25_32/scripts.inc b/data/maps/UnknownMap_25_32/scripts.inc index e34f454e7..8b1378917 100644 --- a/data/maps/UnknownMap_25_32/scripts.inc +++ b/data/maps/UnknownMap_25_32/scripts.inc @@ -1 +1 @@ -UnknownMap_25_32_MapScripts:: @ 823B781 + diff --git a/data/maps/UnknownMap_25_33/events.inc b/data/maps/UnknownMap_25_33/events.inc index 14f4571d2..8b1378917 100644 --- a/data/maps/UnknownMap_25_33/events.inc +++ b/data/maps/UnknownMap_25_33/events.inc @@ -1 +1 @@ -UnknownMap_25_33_MapEvents:: @ 853A064 + diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index 87f8b0c1e..99502bb0f 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -1,7 +1,7 @@ UnknownMap_25_33: @ 8484E2C .4byte UnknownMap_25_33_Layout - .4byte UnknownMap_25_33_MapEvents - .4byte UnknownMap_25_33_MapScripts + .4byte LinkContestRoom1_MapEvents + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI .2byte 230 diff --git a/data/maps/UnknownMap_25_33/scripts.inc b/data/maps/UnknownMap_25_33/scripts.inc index 086d2d32c..8b1378917 100644 --- a/data/maps/UnknownMap_25_33/scripts.inc +++ b/data/maps/UnknownMap_25_33/scripts.inc @@ -1 +1 @@ -UnknownMap_25_33_MapScripts:: @ 823B781 + diff --git a/data/maps/UnknownMap_25_34/events.inc b/data/maps/UnknownMap_25_34/events.inc index 975f08470..8b1378917 100644 --- a/data/maps/UnknownMap_25_34/events.inc +++ b/data/maps/UnknownMap_25_34/events.inc @@ -1,3 +1 @@ -UnknownMap_25_34_MapEvents:: @ 853A064 - map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index c053c5e19..6e95a8222 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -1,7 +1,7 @@ UnknownMap_25_34: @ 8484E48 .4byte UnknownMap_25_34_Layout - .4byte UnknownMap_25_34_MapEvents - .4byte UnknownMap_25_34_MapScripts + .4byte LinkContestRoom1_MapEvents + .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI .2byte 231 diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc index fe88972df..8b1378917 100644 --- a/data/maps/UnknownMap_25_34/scripts.inc +++ b/data/maps/UnknownMap_25_34/scripts.inc @@ -1,458 +1 @@ -UnknownMap_25_34_MapScripts:: @ 823B781 - map_script 4, LinkContestRoom1_MapScript2_23B81F - map_script 2, LinkContestRoom1_MapScript2_23B815 - map_script 3, LinkContestRoom1_MapScript1_23B79F - map_script 5, LinkContestRoom1_MapScript1_23B803 - map_script 7, LinkContestRoom1_MapScript1_23B79B - .byte 0 - -LinkContestRoom1_MapScript1_23B79B: @ 823B79B - special sub_80F8B94 - end - -LinkContestRoom1_MapScript1_23B79F: @ 823B79F - call LinkContestRoom1_EventScript_23B7AF - setvar VAR_TEMP_0, 1 - call LinkContestRoom1_EventScript_23B842 - end - -LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF - call LinkContestRoom1_EventScript_27A133 - special ScriptGetMultiplayerId - compare VAR_RESULT, 0 - call_if_eq LinkContestRoom1_EventScript_23B7EF - compare VAR_RESULT, 1 - call_if_eq LinkContestRoom1_EventScript_23B7F3 - compare VAR_RESULT, 2 - call_if_eq LinkContestRoom1_EventScript_23B7F7 - compare VAR_RESULT, 3 - call_if_eq LinkContestRoom1_EventScript_23B7FB - compare VAR_RESULT, 4 - call_if_eq LinkContestRoom1_EventScript_23B7FF - return - -LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF - savebgm MUS_TEST1 - return - -LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3 - savebgm MUS_TEST2 - return - -LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7 - savebgm MUS_TEST3 - return - -LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB - savebgm MUS_TEST4 - return - -LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF - savebgm MUS_CONTEST0 - return - -LinkContestRoom1_MapScript1_23B803: @ 823B803 - compare VAR_TEMP_9, 1 - call_if_eq LinkContestRoom1_EventScript_23B80F - end - -LinkContestRoom1_EventScript_23B80F:: @ 823B80F - call LinkContestRoom1_EventScript_23BB2B - return - -LinkContestRoom1_MapScript2_23B815: @ 823B815 - map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B829 - .2byte 0 - -LinkContestRoom1_MapScript2_23B81F: @ 823B81F - map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B834 - .2byte 0 - -LinkContestRoom1_EventScript_23B829:: @ 823B829 - call LinkContestRoom1_EventScript_279F97 - call LinkContestRoom1_EventScript_23BE44 - end - -LinkContestRoom1_EventScript_23B834:: @ 823B834 - special sub_80F8B94 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN - call LinkContestRoom1_EventScript_23BB2B - end - -LinkContestRoom1_EventScript_23B842:: @ 823B842 - call LinkContestRoom1_EventScript_23B8F8 - call LinkContestRoom1_EventScript_23B858 - compare VAR_TEMP_0, 8 - goto_if_lt LinkContestRoom1_EventScript_23B842 - return - -LinkContestRoom1_EventScript_23B858:: @ 823B858 - switch VAR_TEMP_0 - case 1, LinkContestRoom1_EventScript_23B8AB - case 2, LinkContestRoom1_EventScript_23B8B6 - case 3, LinkContestRoom1_EventScript_23B8C1 - case 4, LinkContestRoom1_EventScript_23B8CC - case 5, LinkContestRoom1_EventScript_23B8D7 - case 6, LinkContestRoom1_EventScript_23B8E2 - case 7, LinkContestRoom1_EventScript_23B8ED - end - -LinkContestRoom1_EventScript_23B8AB:: @ 823B8AB - copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8B6:: @ 823B8B6 - copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8C1:: @ 823B8C1 - copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8CC:: @ 823B8CC - copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8D7:: @ 823B8D7 - copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8E2:: @ 823B8E2 - copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED - copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1 - addvar VAR_TEMP_0, 1 - return - -LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8 - setvar VAR_RESULT, 32 - special ScriptRandom - addvar VAR_RESULT, 1 - switch VAR_RESULT - case 1, LinkContestRoom1_EventScript_23BA6B - case 2, LinkContestRoom1_EventScript_23BA71 - case 3, LinkContestRoom1_EventScript_23BA77 - case 4, LinkContestRoom1_EventScript_23BA7D - case 5, LinkContestRoom1_EventScript_23BA83 - case 6, LinkContestRoom1_EventScript_23BA89 - case 7, LinkContestRoom1_EventScript_23BA8F - case 8, LinkContestRoom1_EventScript_23BA95 - case 9, LinkContestRoom1_EventScript_23BA9B - case 10, LinkContestRoom1_EventScript_23BAA1 - case 11, LinkContestRoom1_EventScript_23BAA7 - case 12, LinkContestRoom1_EventScript_23BAAD - case 13, LinkContestRoom1_EventScript_23BAB3 - case 14, LinkContestRoom1_EventScript_23BAB9 - case 15, LinkContestRoom1_EventScript_23BABF - case 16, LinkContestRoom1_EventScript_23BAC5 - case 17, LinkContestRoom1_EventScript_23BACB - case 18, LinkContestRoom1_EventScript_23BAD1 - case 19, LinkContestRoom1_EventScript_23BAD7 - case 20, LinkContestRoom1_EventScript_23BADD - case 21, LinkContestRoom1_EventScript_23BAE3 - case 22, LinkContestRoom1_EventScript_23BAE9 - case 23, LinkContestRoom1_EventScript_23BAEF - case 24, LinkContestRoom1_EventScript_23BAF5 - case 25, LinkContestRoom1_EventScript_23BAFB - case 26, LinkContestRoom1_EventScript_23BB01 - case 27, LinkContestRoom1_EventScript_23BB07 - case 28, LinkContestRoom1_EventScript_23BB0D - case 29, LinkContestRoom1_EventScript_23BB13 - case 30, LinkContestRoom1_EventScript_23BB19 - case 31, LinkContestRoom1_EventScript_23BB1F - case 32, LinkContestRoom1_EventScript_23BB25 - end - -LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B - setvar VAR_TEMP_1, 5 - return - -LinkContestRoom1_EventScript_23BA71:: @ 823BA71 - setvar VAR_TEMP_1, 6 - return - -LinkContestRoom1_EventScript_23BA77:: @ 823BA77 - setvar VAR_TEMP_1, 7 - return - -LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D - setvar VAR_TEMP_1, 8 - return - -LinkContestRoom1_EventScript_23BA83:: @ 823BA83 - setvar VAR_TEMP_1, 10 - return - -LinkContestRoom1_EventScript_23BA89:: @ 823BA89 - setvar VAR_TEMP_1, 11 - return - -LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F - setvar VAR_TEMP_1, 12 - return - -LinkContestRoom1_EventScript_23BA95:: @ 823BA95 - setvar VAR_TEMP_1, 13 - return - -LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B - setvar VAR_TEMP_1, 14 - return - -LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1 - setvar VAR_TEMP_1, 15 - return - -LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7 - setvar VAR_TEMP_1, 17 - return - -LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD - setvar VAR_TEMP_1, 18 - return - -LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3 - setvar VAR_TEMP_1, 19 - return - -LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9 - setvar VAR_TEMP_1, 20 - return - -LinkContestRoom1_EventScript_23BABF:: @ 823BABF - setvar VAR_TEMP_1, 21 - return - -LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5 - setvar VAR_TEMP_1, 22 - return - -LinkContestRoom1_EventScript_23BACB:: @ 823BACB - setvar VAR_TEMP_1, 25 - return - -LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1 - setvar VAR_TEMP_1, 26 - return - -LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7 - setvar VAR_TEMP_1, 27 - return - -LinkContestRoom1_EventScript_23BADD:: @ 823BADD - setvar VAR_TEMP_1, 47 - return - -LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3 - setvar VAR_TEMP_1, 30 - return - -LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9 - setvar VAR_TEMP_1, 31 - return - -LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF - setvar VAR_TEMP_1, 32 - return - -LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5 - setvar VAR_TEMP_1, 33 - return - -LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB - setvar VAR_TEMP_1, 34 - return - -LinkContestRoom1_EventScript_23BB01:: @ 823BB01 - setvar VAR_TEMP_1, 35 - return - -LinkContestRoom1_EventScript_23BB07:: @ 823BB07 - setvar VAR_TEMP_1, 36 - return - -LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D - setvar VAR_TEMP_1, 37 - return - -LinkContestRoom1_EventScript_23BB13:: @ 823BB13 - setvar VAR_TEMP_1, 38 - return - -LinkContestRoom1_EventScript_23BB19:: @ 823BB19 - setvar VAR_TEMP_1, 44 - return - -LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F - setvar VAR_TEMP_1, 45 - return - -LinkContestRoom1_EventScript_23BB25:: @ 823BB25 - setvar VAR_TEMP_1, 46 - return - -LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B - specialvar VAR_RESULT, sub_80F9160 - compare VAR_RESULT, 1 - goto_if_eq LinkContestRoom1_EventScript_23BD86 - switch VAR_0x4088 - case 1, LinkContestRoom1_EventScript_23BB78 - case 2, LinkContestRoom1_EventScript_23BB8B - case 3, LinkContestRoom1_EventScript_23BBE6 - case 4, LinkContestRoom1_EventScript_23BC92 - case 5, LinkContestRoom1_EventScript_23BC92 - return - -LinkContestRoom1_EventScript_23BB78:: @ 823BB78 - createvobject 5, 20, 3, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 - return - -LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 46, 3, 2, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 12, 13, 12, 8, 3, 3 - createvobject 47, 20, 3, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 - return - -LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6 - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 48, 3, 2, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 45, 13, 12, 8, 3, 3 - createvobject 22, 20, 3, 2, 3, 1 - createvobject 23, 20, 6, 2, 3, 1 - createvobject 34, 20, 7, 2, 3, 1 - createvobject 46, 24, 8, 2, 3, 1 - createvobject 48, 24, 11, 2, 3, 1 - createvobject 11, 25, 3, 9, 3, 2 - createvobject 35, 26, 4, 9, 3, 2 - createvobject 17, 27, 5, 9, 3, 2 - createvobject 40, 28, 9, 9, 3, 2 - createvobject 38, 29, 10, 9, 3, 2 - createvobject 83, 30, 11, 9, 3, 2 - return - -LinkContestRoom1_EventScript_23BC92:: @ 823BC92 - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 12, 3, 2, 8, 3, 4 - createvobject 39, 4, 1, 3, 3, 4 - createvobject 34, 6, 1, 5, 3, 4 - createvobject 26, 7, 1, 6, 3, 4 - createvobject 48, 9, 1, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 45, 13, 12, 8, 3, 3 - createvobject 50, 14, 13, 3, 3, 3 - createvobject 52, 15, 13, 4, 3, 3 - createvobject 65, 17, 13, 6, 3, 3 - createvobject 83, 18, 13, 7, 3, 3 - createvobject 116, 19, 13, 8, 3, 3 - createvobject 25, 20, 3, 2, 3, 1 - createvobject 31, 21, 6, 2, 3, 1 - createvobject 33, 22, 7, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 - createvobject 49, 25, 3, 9, 3, 2 - createvobject 35, 26, 4, 9, 3, 2 - createvobject 48, 27, 5, 9, 3, 2 - createvobject 40, 28, 9, 9, 3, 2 - createvobject 38, 29, 10, 9, 3, 2 - createvobject 83, 30, 11, 9, 3, 2 - return - -LinkContestRoom1_EventScript_23BD86:: @ 823BD86 - createvobject 45, 0, 2, 3, 3, 4 - createvobject 66, 1, 2, 4, 3, 4 - createvobject 55, 2, 2, 7, 3, 4 - createvobject 12, 3, 2, 8, 3, 4 - createvobject 39, 4, 1, 3, 3, 4 - createvobject 34, 6, 1, 5, 3, 4 - createvobject 26, 7, 1, 6, 3, 4 - createvobject 48, 9, 1, 8, 3, 4 - createvobject 5, 10, 12, 3, 3, 3 - createvobject 20, 11, 12, 4, 3, 3 - createvobject 24, 12, 12, 7, 3, 3 - createvobject 45, 13, 12, 8, 3, 3 - createvobject 50, 14, 13, 3, 3, 3 - createvobject 52, 15, 13, 4, 3, 3 - createvobject 65, 17, 13, 6, 3, 3 - createvobject 83, 18, 13, 7, 3, 3 - createvobject 116, 19, 13, 8, 3, 3 - createvobject 25, 20, 3, 2, 3, 1 - createvobject 31, 21, 6, 2, 3, 1 - createvobject 33, 22, 7, 2, 3, 1 - createvobject 46, 24, 11, 2, 3, 1 - return - -LinkContestRoom1_EventScript_23BE44:: @ 823BE44 - special sub_80F9154 - switch VAR_0x4088 - case 1, LinkContestRoom1_EventScript_23BE84 - case 2, LinkContestRoom1_EventScript_23BE8E - case 3, LinkContestRoom1_EventScript_23BE98 - case 4, LinkContestRoom1_EventScript_23BEA2 - case 5, LinkContestRoom1_EventScript_23BEAC - return - -LinkContestRoom1_EventScript_23BE84:: @ 823BE84 - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BE98:: @ 823BE98 - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2 - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 - waitstate - end - -LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC - warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4 - waitstate - end - -LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6 - checkplayergender - compare VAR_RESULT, MALE - goto_if_eq LilycoveCity_ContestLobby_EventScript_23BECE - compare VAR_RESULT, FEMALE - goto_if_eq LilycoveCity_ContestLobby_EventScript_23BED4 - return - -LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL - return - -LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL - return diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 20f36868e..2d1c63027 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -11,12 +11,12 @@ VictoryRoad_1F_MapScript1_235D80: @ 8235D80 VictoryRoad_1F_EventScript_235D97:: @ 8235D97 setobjectxyperm 4, 2, 24 - setobjectmovementtype 4, 8 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN return VictoryRoad_1F_EventScript_235DA3:: @ 8235DA3 setobjectxyperm 4, 3, 24 - setobjectmovementtype 4, 8 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN return VictoryRoad_1F_EventScript_235DAF:: @ 8235DAF diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc index 737e4b862..1406ba3cb 100644 --- a/data/text/contest_strings.inc +++ b/data/text/contest_strings.inc @@ -665,19 +665,19 @@ gText_0827E817:: @ 827E817 .string "{STR_VAR_1}'s\n" .string "{STR_VAR_2} is ignored.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" -gText_0827E837:: @ 827E837 +gText_Contest_Shyness:: @ 827E837 .string "shyness$" -gText_0827E83F:: @ 827E83F +gText_Contest_Anxiety:: @ 827E83F .string "anxiety$" -gText_0827E847:: @ 827E847 +gText_Contest_Laziness:: @ 827E847 .string "laziness$" -gText_0827E850:: @ 827E850 +gText_Contest_Hesitancy:: @ 827E850 .string "hesitancy$" -gText_0827E85A:: @ 827E85A +gText_Contest_Fear:: @ 827E85A .string "fear$" gText_0827E85F:: @ 827E85F |