diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-09 14:43:21 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-09 14:43:21 -0800 |
| commit | 65207e03662c639970ef19b372c21b8e28b6f097 (patch) | |
| tree | 1bc82a7d52642f5a925bfa886c443cac3fd5abf1 | |
| parent | 8dd25bcad09064f0b3314a71a62ad22f91b42bb3 (diff) | |
Label all flags up to 901
98 files changed, 714 insertions, 569 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 62a2e5d43..3e5295e29 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1162,108 +1162,108 @@ Event_ResetBerryTrees: @ 19F940 gUnknown_0819FA81:: @ 819FA81 setflag FLAG_LINK_CONTEST_ROOM_POKEBALL - setflag 769 - setflag 770 - setflag 771 + setflag FLAG_HIDE_VICTORIA_WINSTRATE + setflag FLAG_HIDE_VIVI_WINSTRATE + setflag FLAG_HIDE_VICKI_WINSTRATE setflag FLAG_HIDE_BIRCH_IN_LAB - setflag 889 + setflag FLAG_HIDE_RIVAL_BIRCH_LAB setflag FLAG_HIDE_WALLY_PETALBURG - setflag 867 + setflag FLAG_UNKNOWN_363 setflag FLAG_HIDE_GRUNT_RUSTBORO setflag FLAG_HIDE_DEVON_RUSTBORO - setflag 814 - setflag 868 - setflag 739 - setflag 881 - setflag 738 - setflag 740 - setflag 741 - setflag 743 - setflag 744 + setflag FLAG_HIDE_RIVAL_RUSTBORO + setflag FLAG_HIDE_FAT_MAN_LITTLEROOT + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 setflag 906 setflag FLAG_UNKNOWN_2E1 - setflag 747 - setflag 748 - setflag 749 - setflag 756 - setflag 774 - setflag 895 - setflag 776 - setflag 777 - setflag 778 - setflag 779 - setflag 780 - setflag 781 - setflag 782 - setflag 783 + setflag FLAG_UNKNOWN_2EB + setflag FLAG_UNKNOWN_2EC + setflag FLAG_UNKNOWN_2ED + setflag FLAG_UNKNOWN_2F4 + setflag FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1 + setflag FLAG_HIDE_ARTIST_LILCOVE_CONTEST + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER + setflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + setflag FLAG_HIDE_PETALBURG_GYM_GUIDE + setflag FLAG_UNKNOWN_30E + setflag FLAG_UNKNOWN_30F setflag FLAG_HIDE_NORMAN_LITTLEROOT - setflag 849 - setflag 789 - setflag 790 - setflag 791 - setflag 792 - setflag 797 - setflag 798 - setflag 799 - setflag 901 + setflag FLAG_HIDE_MAY_PICHU_DOLL + setflag FLAG_HIDE_FANCLUB_OLD_LADY + setflag FLAG_HIDE_FANCLUB_BOY + setflag FLAG_HIDE_FANCLUB_LITTLE_BOY + setflag FLAG_HIDE_FANCLUB_LADY + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 setflag 902 setflag 903 setflag 904 - setflag 800 - setflag 801 - setflag 803 - setflag 802 - setflag 806 - setflag 808 - setflag 809 + setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR + setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF + setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT + setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE + setflag FLAG_HIDE_WALLY_WANDAS_HOUSE + setflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE + setflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE setflag 984 - setflag 811 - setflag 812 - setflag 866 - setflag 815 - setflag 816 - setflag 869 - setflag 823 - setflag 828 - setflag 829 - setflag 831 - setflag 859 - setflag 841 - setflag 843 - setflag 844 - setflag 847 - setflag 845 - setflag 846 - setflag 860 - setflag 861 - setflag 835 - setflag 840 - setflag 848 - setflag 851 - setflag 855 - setflag 856 + setflag FLAG_HIDE_WALLY_FATHER_PETALBURG + setflag FLAG_HIDE_WALLY_MOTHER_PETALBURG + setflag FLAG_HIDE_WALLY_PETALBURG_GYM + setflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM + setflag FLAG_HIDE_WALLACE_SOOTOPOLIS + setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD + setflag FLAG_UNKNOWN_337 + setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN + setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN + setflag FLAG_HIDE_STERN_SLATEPORT_HARBOR + setflag FLAG_UNKNOWN_34B + setflag FLAG_UNKNOWN_34C + setflag FLAG_UNKNOWN_34F + setflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR + setflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR + setflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR + setflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR + setflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT + setflag FLAG_HIDE_STERN_SLATEPORT + setflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR + setflag FLAG_HIDE_RIVAL_ROUTE119 + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 setflag 973 - setflag 870 - setflag 872 - setflag 877 - setflag 879 - setflag 891 - setflag 880 - setflag 878 - setflag 807 + setflag FLAG_HIDE_LANETTE + setflag FLAG_HIDE_TRICKMASTER_ENTRANCE + setflag FLAG_HIDE_MT_CHIMNEY_PEOPLE + setflag FLAG_HIDE_BRINEY_RUSTURF_TUNNEL + setflag FLAG_HIDE_BRINEY_ROUTE116 + setflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL + setflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL + setflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL setflag 983 - setflag 886 - setflag 884 - setflag 885 + setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F + setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F + setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F setflag 961 - setflag 888 + setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT setflag 941 - setflag 752 - setflag 757 - setflag 892 - setflag 896 - setflag 897 - setflag 898 + setflag FLAG_HIDE_MOM_LITTLEROOT + setflag FLAG_HIDE_MOM_UPSTAIRS + setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F + setflag FLAG_UNKNOWN_BIRCH_380 + setflag FLAG_HIDE_BIRCH_ROUTE101 + setflag FLAG_HIDE_BIRCH_ROUTE103 setflag 909 setflag 910 setflag 911 @@ -1280,18 +1280,18 @@ gUnknown_0819FA81:: @ 819FA81 setflag 939 setflag 940 setflag 928 - setflag 834 + setflag FLAG_HIDE_STEVEN_ROUTE128 setflag 944 setflag 945 setflag 947 setflag 948 - setflag 858 + setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD setflag 950 setflag 968 setflag 1133 setflag FLAG_HIDE_STEVENS_LETTER setflag 979 - setflag 751 + setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD setflag 991 call Event_ResetBerryTrees end @@ -1299,13 +1299,13 @@ gUnknown_0819FA81:: @ 819FA81 EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 clearflag 925 call EverGrandeCity_HallOfFame_EventScript_19FD09 - setflag 869 + setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag 950 clearflag FLAG_HIDE_STEVENS_LETTER setvar 0x40c6, 1 - clearflag 751 - clearflag 860 - clearflag 861 + clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD + clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR + clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR special sub_810FAA0 checkflag FLAG_RECEIVED_SS_TICKET call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62 @@ -1360,35 +1360,35 @@ gUnknown_0819FC9F:: @ 819FC9F end EventScript_19FCC1: - setflag 740 - setflag 743 - setflag 741 - setflag 744 - clearflag 742 - clearflag 739 - clearflag 881 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE end EventScript_19FCD7: - setflag 741 - setflag 744 - setflag 738 - setflag 742 - setflag 739 - setflag 881 - clearflag 740 - clearflag 743 + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD end EventScript_19FCF0: - setflag 738 - setflag 742 - setflag 739 - setflag 881 - setflag 740 - setflag 743 - clearflag 741 - clearflag 744 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + clearflag FLAG_HIDE_MR_BRINEY_ROUTE109 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 end EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09 @@ -1412,11 +1412,11 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC checkflag 1217 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC - checkflag 742 + checkflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49 - checkflag 740 + checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F - checkflag 741 + checkflag FLAG_HIDE_MR_BRINEY_ROUTE109 goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55 return @@ -1807,7 +1807,7 @@ DewfordTown_Gym_EventScript_1A00FB:: @ 81A00FB LavaridgeTown_Gym_1F_EventScript_1A00FB:: @ 81A00FB MauvilleCity_Gym_EventScript_1A00FB:: @ 81A00FB RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB - clearflag 781 + clearflag FLAG_HIDE_PETALBURG_GYM_GUIDE setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS return @@ -2174,23 +2174,23 @@ Route103_EventScript_1A02F4:: @ 81A02F4 Route101_EventScript_1A0358:: @ 81A0358 clearflag FLAG_HIDE_BIRCH_IN_LAB - clearflag 896 - setflag 897 - setflag 898 + clearflag FLAG_UNKNOWN_BIRCH_380 + setflag FLAG_HIDE_BIRCH_ROUTE101 + setflag FLAG_HIDE_BIRCH_ROUTE103 return Route101_EventScript_1A0365:: @ 81A0365 - clearflag 897 + clearflag FLAG_HIDE_BIRCH_ROUTE101 setflag FLAG_HIDE_BIRCH_IN_LAB - setflag 896 - setflag 898 + setflag FLAG_UNKNOWN_BIRCH_380 + setflag FLAG_HIDE_BIRCH_ROUTE103 return Route101_EventScript_1A0372:: @ 81A0372 - clearflag 898 - setflag 897 + clearflag FLAG_HIDE_BIRCH_ROUTE103 + setflag FLAG_HIDE_BIRCH_ROUTE101 setflag FLAG_HIDE_BIRCH_IN_LAB - setflag 896 + setflag FLAG_UNKNOWN_BIRCH_380 return LittlerootTown_ProfessorBirchsLab_EventScript_1A037F:: @ 81A037F @@ -2258,21 +2258,21 @@ SlateportCity_Harbor_Movement_1A041C:: @ 81A041C step_end PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424 - setflag 740 - setflag 743 - setflag 741 - setflag 744 - setflag 738 - setflag 742 - setflag 739 - setflag 881 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE setvar 0x4096, 0 return RusturfTunnel_EventScript_1A0442:: @ 81A0442 removeobject 1 removeobject 10 - clearflag 808 + clearflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE clearflag 984 setvar 0x409a, 6 setflag FLAG_RUSTURF_TUNNEL_OPENED @@ -4676,19 +4676,19 @@ VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 end FallarborTown_ContestLobby_EventScript_1AE1EE:: @ 81AE1EE - clearflag 800 + clearflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR return FallarborTown_ContestLobby_EventScript_1AE1F2:: @ 81AE1F2 - clearflag 801 + clearflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF return FallarborTown_ContestLobby_EventScript_1AE1F6:: @ 81AE1F6 - clearflag 803 + clearflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT return FallarborTown_ContestLobby_EventScript_1AE1FA:: @ 81AE1FA - clearflag 802 + clearflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE return FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE diff --git a/data/event_scripts.s b/data/event_scripts.s index 59e7fef09..38bc34845 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1156,108 +1156,108 @@ Event_ResetBerryTrees: @ 19F940 gUnknown_0819FA81:: @ 819FA81 setflag FLAG_LINK_CONTEST_ROOM_POKEBALL - setflag 769 - setflag 770 - setflag 771 + setflag FLAG_HIDE_VICTORIA_WINSTRATE + setflag FLAG_HIDE_VIVI_WINSTRATE + setflag FLAG_HIDE_VICKI_WINSTRATE setflag FLAG_HIDE_BIRCH_IN_LAB - setflag 889 + setflag FLAG_HIDE_RIVAL_BIRCH_LAB setflag FLAG_HIDE_WALLY_PETALBURG - setflag 867 + setflag FLAG_UNKNOWN_363 setflag FLAG_HIDE_GRUNT_RUSTBORO setflag FLAG_HIDE_DEVON_RUSTBORO - setflag 814 - setflag 868 - setflag 739 - setflag 881 - setflag 738 - setflag 740 - setflag 741 - setflag 743 - setflag 744 + setflag FLAG_HIDE_RIVAL_RUSTBORO + setflag FLAG_HIDE_FAT_MAN_LITTLEROOT + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 setflag 906 setflag FLAG_UNKNOWN_2E1 - setflag 747 - setflag 748 - setflag 749 - setflag 756 - setflag 774 - setflag 895 - setflag 776 - setflag 777 - setflag 778 - setflag 779 - setflag 780 - setflag 781 - setflag 782 - setflag 783 + setflag FLAG_UNKNOWN_2EB + setflag FLAG_UNKNOWN_2EC + setflag FLAG_UNKNOWN_2ED + setflag FLAG_UNKNOWN_2F4 + setflag FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1 + setflag FLAG_HIDE_ARTIST_LILCOVE_CONTEST + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER + setflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + setflag FLAG_HIDE_PETALBURG_GYM_GUIDE + setflag FLAG_UNKNOWN_30E + setflag FLAG_UNKNOWN_30F setflag FLAG_HIDE_NORMAN_LITTLEROOT - setflag 849 - setflag 789 - setflag 790 - setflag 791 - setflag 792 - setflag 797 - setflag 798 - setflag 799 - setflag 901 + setflag FLAG_HIDE_MAY_PICHU_DOLL + setflag FLAG_HIDE_FANCLUB_OLD_LADY + setflag FLAG_HIDE_FANCLUB_BOY + setflag FLAG_HIDE_FANCLUB_LITTLE_BOY + setflag FLAG_HIDE_FANCLUB_LADY + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 setflag 902 setflag 903 setflag 904 - setflag 800 - setflag 801 - setflag 803 - setflag 802 - setflag 806 - setflag 808 - setflag 809 + setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR + setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF + setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT + setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE + setflag FLAG_HIDE_WALLY_WANDAS_HOUSE + setflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE + setflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE setflag 984 - setflag 811 - setflag 812 - setflag 866 - setflag 815 - setflag 816 - setflag 869 - setflag 823 - setflag 828 - setflag 829 - setflag 831 - setflag 859 - setflag 841 - setflag 843 - setflag 844 - setflag 847 - setflag 845 - setflag 846 - setflag 860 - setflag 861 - setflag 835 - setflag 840 - setflag 848 - setflag 851 - setflag 855 - setflag 856 + setflag FLAG_HIDE_WALLY_FATHER_PETALBURG + setflag FLAG_HIDE_WALLY_MOTHER_PETALBURG + setflag FLAG_HIDE_WALLY_PETALBURG_GYM + setflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM + setflag FLAG_HIDE_WALLACE_SOOTOPOLIS + setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD + setflag FLAG_UNKNOWN_337 + setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN + setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN + setflag FLAG_HIDE_STERN_SLATEPORT_HARBOR + setflag FLAG_UNKNOWN_34B + setflag FLAG_UNKNOWN_34C + setflag FLAG_UNKNOWN_34F + setflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR + setflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR + setflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR + setflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR + setflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT + setflag FLAG_HIDE_STERN_SLATEPORT + setflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR + setflag FLAG_HIDE_RIVAL_ROUTE119 + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 setflag 973 - setflag 870 - setflag 872 - setflag 877 - setflag 879 - setflag 891 - setflag 880 - setflag 878 - setflag 807 + setflag FLAG_HIDE_LANETTE + setflag FLAG_HIDE_TRICKMASTER_ENTRANCE + setflag FLAG_HIDE_MT_CHIMNEY_PEOPLE + setflag FLAG_HIDE_BRINEY_RUSTURF_TUNNEL + setflag FLAG_HIDE_BRINEY_ROUTE116 + setflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL + setflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL + setflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL setflag 983 - setflag 886 - setflag 884 - setflag 885 + setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F + setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F + setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F setflag 961 - setflag 888 + setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT setflag 941 - setflag 752 - setflag 757 - setflag 892 - setflag 896 - setflag 897 - setflag 898 + setflag FLAG_HIDE_MOM_LITTLEROOT + setflag FLAG_HIDE_MOM_UPSTAIRS + setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F + setflag FLAG_UNKNOWN_BIRCH_380 + setflag FLAG_HIDE_BIRCH_ROUTE101 + setflag FLAG_HIDE_BIRCH_ROUTE103 setflag 909 setflag 910 setflag 911 @@ -1274,18 +1274,18 @@ gUnknown_0819FA81:: @ 819FA81 setflag 939 setflag 940 setflag 928 - setflag 834 + setflag FLAG_HIDE_STEVEN_ROUTE128 setflag 944 setflag 945 setflag 947 setflag 948 - setflag 858 + setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD setflag 950 setflag 968 setflag 1133 setflag FLAG_HIDE_STEVENS_LETTER setflag 979 - setflag 751 + setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD setflag 991 call Event_ResetBerryTrees end @@ -1293,13 +1293,13 @@ gUnknown_0819FA81:: @ 819FA81 EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 clearflag 925 call EverGrandeCity_HallOfFame_EventScript_19FD09 - setflag 869 + setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag 950 clearflag FLAG_HIDE_STEVENS_LETTER setvar 0x40c6, 1 - clearflag 751 - clearflag 860 - clearflag 861 + clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD + clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR + clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR special sub_810FAA0 checkflag FLAG_RECEIVED_SS_TICKET call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62 @@ -1354,35 +1354,35 @@ gUnknown_0819FC9F:: @ 819FC9F end EventScript_19FCC1: - setflag 740 - setflag 743 - setflag 741 - setflag 744 - clearflag 742 - clearflag 739 - clearflag 881 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE end EventScript_19FCD7: - setflag 741 - setflag 744 - setflag 738 - setflag 742 - setflag 739 - setflag 881 - clearflag 740 - clearflag 743 + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD end EventScript_19FCF0: - setflag 738 - setflag 742 - setflag 739 - setflag 881 - setflag 740 - setflag 743 - clearflag 741 - clearflag 744 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + clearflag FLAG_HIDE_MR_BRINEY_ROUTE109 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 end EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09 @@ -1406,11 +1406,11 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC checkflag 1217 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC - checkflag 742 + checkflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49 - checkflag 740 + checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F - checkflag 741 + checkflag FLAG_HIDE_MR_BRINEY_ROUTE109 goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55 return @@ -1801,7 +1801,7 @@ DewfordTown_Gym_EventScript_1A00FB:: @ 81A00FB LavaridgeTown_Gym_1F_EventScript_1A00FB:: @ 81A00FB MauvilleCity_Gym_EventScript_1A00FB:: @ 81A00FB RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB - clearflag 781 + clearflag FLAG_HIDE_PETALBURG_GYM_GUIDE setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS return @@ -2168,23 +2168,23 @@ Route103_EventScript_1A02F4:: @ 81A02F4 Route101_EventScript_1A0358:: @ 81A0358 clearflag FLAG_HIDE_BIRCH_IN_LAB - clearflag 896 - setflag 897 - setflag 898 + clearflag FLAG_UNKNOWN_BIRCH_380 + setflag FLAG_HIDE_BIRCH_ROUTE101 + setflag FLAG_HIDE_BIRCH_ROUTE103 return Route101_EventScript_1A0365:: @ 81A0365 - clearflag 897 + clearflag FLAG_HIDE_BIRCH_ROUTE101 setflag FLAG_HIDE_BIRCH_IN_LAB - setflag 896 - setflag 898 + setflag FLAG_UNKNOWN_BIRCH_380 + setflag FLAG_HIDE_BIRCH_ROUTE103 return Route101_EventScript_1A0372:: @ 81A0372 - clearflag 898 - setflag 897 + clearflag FLAG_HIDE_BIRCH_ROUTE103 + setflag FLAG_HIDE_BIRCH_ROUTE101 setflag FLAG_HIDE_BIRCH_IN_LAB - setflag 896 + setflag FLAG_UNKNOWN_BIRCH_380 return LittlerootTown_ProfessorBirchsLab_EventScript_1A037F:: @ 81A037F @@ -2252,21 +2252,21 @@ SlateportCity_Harbor_Movement_1A041C:: @ 81A041C step_end PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424 - setflag 740 - setflag 743 - setflag 741 - setflag 744 - setflag 738 - setflag 742 - setflag 739 - setflag 881 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE setvar 0x4096, 0 return RusturfTunnel_EventScript_1A0442:: @ 81A0442 removeobject 1 removeobject 10 - clearflag 808 + clearflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE clearflag 984 setvar 0x409a, 6 setflag FLAG_RUSTURF_TUNNEL_OPENED @@ -4644,19 +4644,19 @@ VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 end FallarborTown_ContestLobby_EventScript_1AE1EE:: @ 81AE1EE - clearflag 800 + clearflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR return FallarborTown_ContestLobby_EventScript_1AE1F2:: @ 81AE1F2 - clearflag 801 + clearflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF return FallarborTown_ContestLobby_EventScript_1AE1F6:: @ 81AE1F6 - clearflag 803 + clearflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT return FallarborTown_ContestLobby_EventScript_1AE1FA:: @ 81AE1FA - clearflag 802 + clearflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE return FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc index 0c8ed6773..e46a06c93 100644 --- a/data/maps/events/AquaHideout_1F.inc +++ b/data/maps/events/AquaHideout_1F.inc @@ -1,6 +1,6 @@ AquaHideout_1F_MapObjects:: @ 838CD0C - object_event 1, 241, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, 821, 0, 0 - object_event 2, 241, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, 822, 0, 0 + object_event 1, 241, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0 + object_event 2, 241, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0 object_event 3, 241, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, 924, 0, 0 AquaHideout_1F_MapWarps:: @ 838CD54 diff --git a/data/maps/events/BattleTower_BattleRoom.inc b/data/maps/events/BattleTower_BattleRoom.inc index 2f7a46a05..c1b2ad55e 100644 --- a/data/maps/events/BattleTower_BattleRoom.inc +++ b/data/maps/events/BattleTower_BattleRoom.inc @@ -1,5 +1,5 @@ BattleTower_BattleRoom_MapObjects:: @ 8391DAC - object_event 1, 240, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 888, 0, 0 + object_event 1, 240, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT, 0, 0 object_event 2, MAP_OBJ_GFX_TEALA, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleTower_BattleRoom_MapWarps:: @ 8391DDC diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc index 35dc61fe8..672604d3e 100644 --- a/data/maps/events/CaveOfOrigin_B4F.inc +++ b/data/maps/events/CaveOfOrigin_B4F.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B4F_MapObjects:: @ 838D880 - object_event 1, 248, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 825, 0, 0 + object_event 1, 248, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN, 0, 0 CaveOfOrigin_B4F_MapWarps:: @ 838D898 warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc index 47a200874..8ca6fa7a1 100644 --- a/data/maps/events/DewfordTown.inc +++ b/data/maps/events/DewfordTown.inc @@ -1,8 +1,8 @@ DewfordTown_MapObjects:: @ 8380B88 object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 12, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0A2, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 9, 0, 3, 9, 16, 0, 0, 0, 3, 0, DewfordTown_EventScript_14E002, 740, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 9, 0, 3, 9, 16, 0, 0, 0, 3, 0, DewfordTown_EventScript_14E002, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, 0, 0 object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 12, 0, 14, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0C6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 8, 0, 1, 8, 0, 0, 0, 0, 0, 0, 0x0, 743, 0, 0 + object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 8, 0, 1, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD, 0, 0 object_event 5, MAP_OBJ_GFX_BOY_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0, 0, 0 DewfordTown_MapWarps:: @ 8380C00 diff --git a/data/maps/events/FallarborTown_ContestLobby.inc b/data/maps/events/FallarborTown_ContestLobby.inc index d34bc68d1..811461c02 100644 --- a/data/maps/events/FallarborTown_ContestLobby.inc +++ b/data/maps/events/FallarborTown_ContestLobby.inc @@ -3,7 +3,7 @@ FallarborTown_ContestLobby_MapObjects:: @ 83866F0 object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 2, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A8E, 0, 0, 0 object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AB2, 0, 0, 0 object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B778A, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, 800, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR, 0, 0 object_event 6, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0, 0, 0 FallarborTown_ContestLobby_MapWarps:: @ 8386780 diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc index e537f497d..ff2278e29 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc @@ -2,7 +2,7 @@ FallarborTown_PokemonCenter_1F_MapObjects:: @ 8386860 object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0, 0, 0 object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0, 0, 0 object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, 871, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR, 0, 0 FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0 warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc index 121ae31cd..efab4fa71 100644 --- a/data/maps/events/GraniteCave_StevensRoom.inc +++ b/data/maps/events/GraniteCave_StevensRoom.inc @@ -1,5 +1,5 @@ GraniteCave_StevensRoom_MapObjects:: @ 838C118 - object_event 1, MAP_OBJ_GFX_STEVEN, 0, 7, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, 833, 0, 0 + object_event 1, MAP_OBJ_GFX_STEVEN, 0, 7, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, FLAG_HIDE_STEVEN_GRANITE_CAVE, 0, 0 GraniteCave_StevensRoom_MapWarps:: @ 838C130 warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc index 5dd100302..490a9c64c 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -8,12 +8,12 @@ LilycoveCity_MapObjects:: @ 838016C object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 35, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0, 0, 0 object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 34, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0, 0, 0 object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 57, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0, 0, 0 - object_event 10, 241, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, 852, 0, 0 + object_event 10, 241, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 61, 0, 36, 0, 5, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, 1042, 0, 0 - object_event 12, 241, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, 852, 0, 0 - object_event 13, 241, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, 852, 0, 0 - object_event 14, 241, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, 852, 0, 0 - object_event 15, 241, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, 852, 0, 0 + object_event 12, 241, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 13, 241, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 14, 241, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 15, 241, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 object_event 16, MAP_OBJ_GFX_GENTLEMAN, 0, 50, 0, 7, 0, 5, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CB74, 0, 0, 0 object_event 17, 240, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, 971, 0, 0 diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc index b0ea1e677..ccbc645b2 100644 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ b/data/maps/events/LilycoveCity_ContestLobby.inc @@ -2,14 +2,14 @@ LilycoveCity_ContestLobby_MapObjects:: @ 838984C object_event 1, MAP_OBJ_GFX_TEALA, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158EB0, 0, 0, 0 object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158B85, 0, 0, 0 object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 17, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B77AB, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ARTIST, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 774, 0, 0 + object_event 4, MAP_OBJ_GFX_ARTIST, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1, 0, 0 object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15901E, 0, 0, 0 object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 3, 0, 10, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159027, 0, 0, 0 object_event 7, MAP_OBJ_GFX_ARTIST, 0, 20, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159042, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, 802, 0, 0 + object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE, 0, 0 object_event 9, MAP_OBJ_GFX_BOY_1, 0, 18, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15907B, 0, 0, 0 object_event 10, MAP_OBJ_GFX_GIRL_1, 0, 19, 0, 9, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159084, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 895, 0, 0 + object_event 11, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_ARTIST_LILCOVE_CONTEST, 0, 0 object_event 12, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159054, 0, 0, 0 object_event 13, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15904B, 0, 0, 0 object_event 14, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 7, 0, 3, 3, 16, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0, 0, 0 diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc index fa651e557..e830d26e7 100644 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ b/data/maps/events/LilycoveCity_Harbor.inc @@ -1,6 +1,6 @@ LilycoveCity_Harbor_MapObjects:: @ 8389F94 object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, 908, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 861, 0, 0 + object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR, 0, 0 object_event 3, MAP_OBJ_GFX_SAILOR, 0, 3, 0, 13, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0, 0, 0 object_event 4, MAP_OBJ_GFX_SAILOR, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 909, 0, 0 diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc index 900cba08f..1ee241c5c 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc @@ -1,14 +1,14 @@ LilycoveCity_LilycoveMuseum_1F_MapObjects:: @ 8389564 object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 5, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15841C, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, 775, 0, 0 + object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, 0, 0 object_event 3, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 13, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158558, 0, 0, 0 object_event 4, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 10, 0, 3, 5, 2, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158561, 0, 0, 0 object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15856A, 0, 0, 0 object_event 6, MAP_OBJ_GFX_WOMAN_5, 0, 3, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158573, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 11, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, 776, 0, 0 - object_event 8, MAP_OBJ_GFX_ARTIST, 0, 19, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, 779, 0, 0 - object_event 9, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 2, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, 780, 0, 0 - object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, 778, 0, 0 + object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 11, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY, 0, 0 + object_event 8, MAP_OBJ_GFX_ARTIST, 0, 19, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER, 0, 0 + object_event 9, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 2, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0 + object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN, 0, 0 LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654 warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc index 372007d1f..83077f069 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc @@ -1,8 +1,8 @@ LilycoveCity_LilycoveMuseum_2F_MapObjects:: @ 8389740 object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 10, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 19, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, 777, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, 780, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_4, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, 780, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 19, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0 + object_event 4, MAP_OBJ_GFX_BOY_4, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0 LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0 warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc index a710e1f5e..59e8e03a3 100644 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc @@ -3,10 +3,10 @@ LilycoveCity_PokemonTrainerFanClub_MapObjects:: @ 8389EB0 object_event 2, MAP_OBJ_GFX_MAN_5, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15952F, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15961D, 0, 0, 0 object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159694, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, 791, 0, 0 - object_event 6, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, 790, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 3, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, 792, 0, 0 - object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 10, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, 789, 0, 0 + object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, FLAG_HIDE_FANCLUB_LITTLE_BOY, 0, 0 + object_event 6, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, FLAG_HIDE_FANCLUB_BOY, 0, 0 + object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 3, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, FLAG_HIDE_FANCLUB_LADY, 0, 0 + object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 10, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, FLAG_HIDE_FANCLUB_OLD_LADY, 0, 0 LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70 warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc index b31b06b61..23debe434 100644 --- a/data/maps/events/LittlerootTown.inc +++ b/data/maps/events/LittlerootTown.inc @@ -1,10 +1,10 @@ LittlerootTown_MapObjects:: @ 83808FC object_event 1, MAP_OBJ_GFX_LITTLE_BOY_3, 0, 16, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6DF, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 12, 0, 13, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6CD, 868, 0, 0 + object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 12, 0, 13, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6CD, FLAG_HIDE_FAT_MAN_LITTLEROOT, 0, 0 object_event 3, MAP_OBJ_GFX_BOY_2, 0, 14, 0, 17, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6D6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MOM, 0, 5, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, 752, 0, 0 - object_event 5, MAP_OBJ_GFX_TRUCK, 0, 2, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 761, 0, 0 - object_event 6, MAP_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 762, 0, 0 + object_event 4, MAP_OBJ_GFX_MOM, 0, 5, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, FLAG_HIDE_MOM_LITTLEROOT, 0, 0 + object_event 5, MAP_OBJ_GFX_TRUCK, 0, 2, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN, 0, 0 + object_event 6, MAP_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY, 0, 0 LittlerootTown_MapWarps:: @ 838098C warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc index 8f6ab7059..bb3d3b195 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc @@ -1,8 +1,8 @@ LittlerootTown_BrendansHouse_1F_MapObjects:: @ 8385674 - object_event 1, MAP_OBJ_GFX_MOM, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, 758, 0, 0 - object_event 2, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 0, 3, 0, 3, 28, 3, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, 755, 0, 0 - object_event 3, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, 754, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, 784, 0, 0 + object_event 1, MAP_OBJ_GFX_MOM, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS, 0, 0 + object_event 2, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 0, 3, 0, 3, 28, 3, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0 + object_event 3, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, FLAG_HIDE_BRENDAN_MOM, 0, 0 object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0 LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc index 2f7d6688d..b7367b1d0 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc @@ -1,5 +1,5 @@ LittlerootTown_BrendansHouse_2F_MapObjects:: @ 8385728 - object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, 760, 0, 0 + object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS, 0, 0 object_event 2, 240, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 object_event 3, 241, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 object_event 4, 242, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 @@ -12,7 +12,7 @@ LittlerootTown_BrendansHouse_2F_MapObjects:: @ 8385728 object_event 11, 249, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 object_event 12, 250, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 object_event 13, 251, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, 757, 0, 0 + object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0 LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878 warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc index 700885519..27a0efbed 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc @@ -1,8 +1,8 @@ LittlerootTown_MaysHouse_1F_MapObjects:: @ 83858C4 - object_event 1, MAP_OBJ_GFX_MOM, 0, 8, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, 759, 0, 0 - object_event 2, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, 754, 0, 0 - object_event 3, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 0, 3, 0, 3, 27, 3, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, 755, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, 785, 0, 0 + object_event 1, MAP_OBJ_GFX_MOM, 0, 8, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, FLAG_HIDE_MAY_MOM_DOWNSTAIRS, 0, 0 + object_event 2, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0 + object_event 3, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 0, 3, 0, 3, 27, 3, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, FLAG_HIDE_MAY_MOM, 0, 0 object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0 LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc index e620bdb8f..fbec5e0e7 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc @@ -12,8 +12,8 @@ LittlerootTown_MaysHouse_2F_MapObjects:: @ 8385978 object_event 11, 249, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 object_event 12, 250, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 object_event 13, 251, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, 757, 0, 0 - object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, 849, 0, 0 + object_event 14, MAP_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0 + object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL, 0, 0 LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0 warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc index 024d1fb3f..fbe8df720 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc @@ -1,7 +1,7 @@ LittlerootTown_ProfessorBirchsLab_MapObjects:: @ 8385B2C object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 9, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0, 0, 0 object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB, 0, 0 - object_event 3, 240, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, 889, 0, 0 + object_event 3, 240, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB, 0, 0 LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74 warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc index acd337496..2a41a962f 100644 --- a/data/maps/events/MagmaHideout_1F.inc +++ b/data/maps/events/MagmaHideout_1F.inc @@ -1,6 +1,6 @@ MagmaHideout_1F_MapObjects:: @ 838E9BC - object_event 1, 241, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, 821, 0, 0 - object_event 2, 241, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, 822, 0, 0 + object_event 1, 241, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0 + object_event 2, 241, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0 object_event 3, 241, 0, 20, 0, 3, 0, 3, 50, 110, 0, 1, 0, 3, 0, MagmaHideout_1F_EventScript_15D80C, 0, 0, 0 MagmaHideout_1F_MapWarps:: @ 838EA04 diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc index 4b5b2f17a..8044b95fc 100644 --- a/data/maps/events/MauvilleCity.inc +++ b/data/maps/events/MauvilleCity.inc @@ -4,8 +4,8 @@ MauvilleCity_MapObjects:: @ 837FB90 object_event 3, MAP_OBJ_GFX_MANIAC, 0, 14, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C063, 0, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 18, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C06C, 0, 0, 0 object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 17, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WALLY, 0, 8, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, 804, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, 805, 0, 0 + object_event 6, MAP_OBJ_GFX_WALLY, 0, 8, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE, 0, 0 + object_event 7, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE, 0, 0 object_event 8, MAP_OBJ_GFX_WATTSON, 0, 29, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, 912, 0, 0 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, 1116, 0, 0 diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc index acab0d36b..cebd8df28 100644 --- a/data/maps/events/MtChimney.inc +++ b/data/maps/events/MtChimney.inc @@ -7,7 +7,7 @@ MtChimney_MapObjects:: @ 838C330 object_event 6, 244, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, 927, 0, 0 object_event 7, 244, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, 927, 0, 0 object_event 8, 244, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, 927, 0, 0 - object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 16, 0, 37, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15CF95, 877, 0, 0 + object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 16, 0, 37, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 object_event 10, 241, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, 926, 0, 0 object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 19, 0, 3, 74, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 18, 0, 3, 64, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 @@ -23,10 +23,10 @@ MtChimney_MapObjects:: @ 838C330 object_event 22, 241, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, 926, 0, 0 object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 20, 0, 39, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 21, 0, 39, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 - object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 16, 0, 18, 0, 3, 13, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D1E3, 877, 0, 0 - object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 7, 0, 3, 70, 0, 0, 1, 0, 4, 0, MtChimney_EventScript_15D221, 877, 0, 0 - object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D238, 877, 0, 0 - object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 27, 0, 17, 0, 3, 16, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D24F, 877, 0, 0 + object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 16, 0, 18, 0, 3, 13, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 + object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 7, 0, 3, 70, 0, 0, 1, 0, 4, 0, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 + object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 + object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 27, 0, 17, 0, 3, 16, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D24F, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 MtChimney_MapWarps:: @ 838C5D0 warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index 2732bc93c..3253c212c 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -3,8 +3,8 @@ PetalburgCity_MapObjects:: @ 837F5F0 object_event 2, MAP_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG, 0, 0 object_event 3, MAP_OBJ_GFX_BOY_1, 0, 8, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0, 0, 0 object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 20, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B824, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 811, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 812, 0, 0 + object_event 5, MAP_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG, 0, 0 + object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG, 0, 0 object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, 1039, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, 1040, 0, 0 object_event 9, MAP_OBJ_GFX_BOY_2, 0, 12, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0, 0, 0 diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc index 2b09951ee..781de130d 100644 --- a/data/maps/events/PetalburgCity_Gym.inc +++ b/data/maps/events/PetalburgCity_Gym.inc @@ -1,5 +1,5 @@ PetalburgCity_Gym_MapObjects:: @ 8387168 - object_event 1, MAP_OBJ_GFX_NORMAN, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, 772, 0, 0 + object_event 1, MAP_OBJ_GFX_NORMAN, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, FLAG_HIDE_NORMAN_PETALBURG_GYM, 0, 0 object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 94, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EE6, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 81, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154DF6, 0, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 42, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E32, 0, 0, 0 @@ -7,8 +7,8 @@ PetalburgCity_Gym_MapObjects:: @ 8387168 object_event 6, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 68, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E6E, 0, 0, 0 object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 16, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154F5E, 0, 0, 0 object_event 8, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EAA, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 109, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, 781, 0, 0 - object_event 10, MAP_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 866, 0, 0 + object_event 9, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 109, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, FLAG_HIDE_PETALBURG_GYM_GUIDE, 0, 0 + object_event 10, MAP_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM, 0, 0 PetalburgCity_Gym_MapWarps:: @ 8387258 warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc index f44f105b6..ae2370546 100644 --- a/data/maps/events/Route101.inc +++ b/data/maps/events/Route101.inc @@ -2,8 +2,8 @@ Route101_MapObjects:: @ 83810BC object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 16, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA64, 0, 0, 0 object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 9, 0, 13, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA, 0, 0 object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG, 0, 0 - object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, 750, 0, 0 - object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, 897, 0, 0 + object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101, 0, 0 + object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101, 0, 0 object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, 991, 0, 0 Route101_MapCoordEvents:: @ 838114C diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc index 0ecfedf38..e94ee3e75 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -9,7 +9,7 @@ Route103_MapObjects:: @ 8381300 object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, S_BerryTree, 0, 0, 0 object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, S_BerryTree, 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 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103, 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, S_CuttableTree, FLAG_TEMP_12, 0, 0 diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index 7176521cc..d46f1c4e5 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -5,8 +5,8 @@ Route104_MapObjects:: @ 8381488 object_event 4, MAP_OBJ_GFX_BOY_1, 0, 27, 0, 63, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route104_EventScript_14EF81, 0, 0, 0 object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 30, 0, 50, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF8A, 0, 0, 0 object_event 6, MAP_OBJ_GFX_GIRL_3, 0, 28, 0, 74, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route104_EventScript_14EFCC, 0, 0, 0 - 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 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, 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, FLAG_HIDE_MR_BRINEY_ROUTE104, 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, S_BerryTree, 0, 0, 0 object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, S_BerryTree, 0, 0, 0 diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc index f04195c9b..d77b2977a 100644 --- a/data/maps/events/Route104_MrBrineysHouse.inc +++ b/data/maps/events/Route104_MrBrineysHouse.inc @@ -1,6 +1,6 @@ Route104_MrBrineysHouse_MapObjects:: @ 838B654 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 3, 0, 3, 50, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, 739, 0, 0 - object_event 2, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 3, 0, 3, 8, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, 881, 0, 0 + object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 3, 0, 3, 50, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE, 0, 0 + object_event 2, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 3, 0, 3, 8, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, FLAG_HIDE_PEEKO_BRINEY_HOUSE, 0, 0 Route104_MrBrineysHouse_MapWarps:: @ 838B684 warp_def 5, 8, 0, 0, MAP_ROUTE104 diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc index 3156a5cb3..76c676dbb 100644 --- a/data/maps/events/Route109.inc +++ b/data/maps/events/Route109.inc @@ -1,6 +1,6 @@ Route109_MapObjects:: @ 8381AFC - object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 0, 26, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, 744, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 21, 0, 24, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F680, 741, 0, 0 + object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 0, 26, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 21, 0, 24, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F680, FLAG_HIDE_MR_BRINEY_ROUTE109, 0, 0 object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 12, 0, 36, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7AD, 0, 0, 0 object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 25, 0, 42, 0, 3, 15, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7C4, 0, 0, 0 object_event 5, MAP_OBJ_GFX_SAILOR, 0, 19, 0, 19, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route109_EventScript_14F7DB, 0, 0, 0 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 5c94ac7bc..b78f2abc9 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -20,11 +20,11 @@ Route110_MapObjects:: @ 8381D58 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 - object_event 22, 241, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, 900, 0, 0 - object_event 23, 241, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, 900, 0, 0 - object_event 24, 241, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, 900, 0, 0 - object_event 25, 241, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, 900, 0, 0 - object_event 26, 241, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 900, 0, 0 + object_event 22, 241, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 23, 241, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 24, 241, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 25, 241, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 26, 241, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 object_event 27, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 0, 78, 0, 4, 51, 23, 0, 1, 0, 2, 0, Route110_EventScript_14FB11, 0, 0, 0 object_event 28, 240, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, 919, 0, 0 object_event 29, 243, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 922, 0, 0 diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc index bedc6357d..8c3cf7e11 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEnd_MapObjects:: @ 83921D0 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, 899, 0, 0 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, FLAG_HIDE_TRICKMASTER_END, 0, 0 Route110_TrickHouseEnd_MapWarps:: @ 83921E8 warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc index 59e329d98..9f6e305cc 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ b/data/maps/events/Route110_TrickHouseEntrance.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEntrance_MapObjects:: @ 8392140 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 6, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, 872, 0, 0 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 6, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, FLAG_HIDE_TRICKMASTER_ENTRANCE, 0, 0 Route110_TrickHouseEntrance_MapWarps:: @ 8392158 warp_def 5, 7, 3, 1, MAP_ROUTE110 diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index e502ae821..6eb13f7f3 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -1,8 +1,8 @@ Route111_MapObjects:: @ 83821A0 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 13, 0, 114, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1501D1, 768, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 769, 0, 0 - 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 1, MAP_OBJ_GFX_MAN_1, 0, 13, 0, 114, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1501D1, FLAG_HIDE_VICTOR_WINSTRATE, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE, 0, 0 + object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE, 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, FLAG_HIDE_VICKI_WINSTRATE, 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, S_BerryTree, 0, 0, 0 object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, S_BerryTree, 0, 0, 0 @@ -11,16 +11,16 @@ Route111_MapObjects:: @ 83821A0 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 object_event 11, MAP_OBJ_GFX_CAMPER, 0, 21, 0, 47, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route111_EventScript_1503D5, 0, 0, 0 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 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0 object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 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, S_BerryTree, 0, 0, 0 object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, S_BerryTree, 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 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 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 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc index 50b300bc9..e29769d77 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -1,10 +1,10 @@ Route112_MapObjects:: @ 8382818 - object_event 1, 241, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, 819, 0, 0 + object_event 1, 241, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0 object_event 2, MAP_OBJ_GFX_HIKER, 0, 24, 0, 34, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route112_EventScript_150549, 0, 0, 0 object_event 3, MAP_OBJ_GFX_CAMPER, 0, 29, 0, 49, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route112_EventScript_15059E, 0, 0, 0 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 6, 241, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0 object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, S_BerryTree, 0, 0, 0 object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, S_BerryTree, 0, 0, 0 object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, S_BerryTree, 0, 0, 0 diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc index 40ff30536..3c14720a6 100644 --- a/data/maps/events/Route114_LanettesHouse.inc +++ b/data/maps/events/Route114_LanettesHouse.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse_MapObjects:: @ 838B92C - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, 870, 0, 0 + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, FLAG_HIDE_LANETTE, 0, 0 Route114_LanettesHouse_MapWarps:: @ 838B944 warp_def 5, 7, 0, 2, MAP_ROUTE114 diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index 32bd1ea57..290a6c25f 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -9,7 +9,7 @@ Route116_MapObjects:: @ 8383170 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, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, S_BerryTree, 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 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116, 0, 0 object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 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, S_CuttableTree, FLAG_TEMP_14, 0, 0 @@ -19,8 +19,8 @@ Route116_MapObjects:: @ 8383170 object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 31, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C90, 0, 0, 0 object_event 19, MAP_OBJ_GFX_MAN_2, 0, 46, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A7B, 947, 0, 0 object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 56, 0, 12, 0, 4, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_1B1564, 1001, 0, 0 - object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 38, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A49, 894, 0, 0 - object_event 22, MAP_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, 813, 0, 0 + object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 38, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116, 0, 0 + object_event 22, MAP_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN, 0, 0 Route116_MapWarps:: @ 8383380 warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index 371b935a7..bc13e0cc1 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -3,11 +3,11 @@ Route118_MapObjects:: @ 8383684 object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, S_BerryTree, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, S_BerryTree, 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 + object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 0, 0 object_event 7, MAP_OBJ_GFX_GIRL_2, 0, 12, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route118_EventScript_150F93, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE522, 901, 0, 0 - 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 8, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0 + object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 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, S_CuttableTree, FLAG_TEMP_11, 0, 0 diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 491f5b469..213e79015 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -14,15 +14,15 @@ Route119_MapObjects:: @ 8383914 object_event 13, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 49, 0, 3, 58, 0, 0, 1, 0, 3, 0, Route119_EventScript_151580, 0, 0, 0 object_event 14, MAP_OBJ_GFX_MAN_6, 0, 10, 0, 50, 0, 4, 10, 0, 0, 1, 0, 3, 0, Route119_EventScript_15153B, 0, 0, 0 object_event 15, MAP_OBJ_GFX_MAN_6, 0, 8, 0, 62, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route119_EventScript_151552, 0, 0, 0 - object_event 16, 240, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 851, 0, 0 + object_event 16, 240, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119, 0, 0 object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 121, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15BF, 1024, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 96, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15CC, 1025, 0, 0 object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15D9, 1026, 0, 0 object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 76, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15E6, 1027, 0, 0 object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15F3, 1028, 0, 0 object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 117, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B1600, 1029, 0, 0 - object_event 23, 241, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, 890, 0, 0 - 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 23, 241, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 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, S_BerryTree, 0, 0, 0 diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc index 58c20fc6e..920439340 100644 --- a/data/maps/events/Route119_WeatherInstitute_1F.inc +++ b/data/maps/events/Route119_WeatherInstitute_1F.inc @@ -1,8 +1,8 @@ Route119_WeatherInstitute_1F_MapObjects:: @ 8392DC0 - object_event 1, 241, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, 890, 0, 0 - object_event 2, 242, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, 890, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_5, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, 892, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 2, 0, 11, 0, 3, 1, 1, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, 892, 0, 0 + object_event 1, 241, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 2, 242, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_5, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_5, 0, 2, 0, 11, 0, 3, 1, 1, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0 object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 14, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0, 0, 0 Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38 diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc index b78eb76d6..4a2db97f1 100644 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ b/data/maps/events/Route119_WeatherInstitute_2F.inc @@ -1,10 +1,10 @@ Route119_WeatherInstitute_2F_MapObjects:: @ 8392E94 - object_event 1, 241, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, 890, 0, 0 - object_event 2, 241, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, 890, 0, 0 - object_event 3, 242, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, 890, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 893, 0, 0 + object_event 1, 241, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 2, 241, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 3, 242, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0 object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 6, 0, 3, 1, 18, 0, 0, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 893, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0 Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24 warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 0463d441d..42ad1f238 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -15,8 +15,8 @@ Route120_MapObjects:: @ 8383F30 object_event 14, MAP_OBJ_GFX_PICNICKER, 0, 36, 0, 45, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route120_EventScript_151A1F, 0, 0, 0 object_event 15, MAP_OBJ_GFX_MANIAC, 0, 19, 0, 80, 0, 5, 15, 0, 0, 1, 0, 3, 0, Route120_EventScript_151A36, 0, 0, 0 object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 55, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B161A, 1030, 0, 0 - object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, 798, 0, 0 - 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 17, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120, 0, 0 + object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120, 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, S_CuttableTree, FLAG_TEMP_11, 0, 0 diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc index 74f99d02c..464481503 100644 --- a/data/maps/events/Route128.inc +++ b/data/maps/events/Route128.inc @@ -1,7 +1,7 @@ Route128_MapObjects:: @ 83850D0 object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 77, 0, 24, 0, 1, 48, 85, 0, 1, 0, 3, 0, Route128_EventScript_1522A4, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 35, 0, 34, 0, 1, 28, 5, 0, 1, 0, 7, 0, Route128_EventScript_1522E2, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_STEVEN, 0, 40, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 834, 0, 0 + object_event 3, MAP_OBJ_GFX_STEVEN, 0, 40, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128, 0, 0 object_event 4, 246, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 944, 0, 0 object_event 5, 247, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 945, 0, 0 object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 63, 0, 28, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route128_EventScript_15234E, 0, 0, 0 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index 6daf6bcf6..f44bf28d5 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -12,7 +12,7 @@ RustboroCity_MapObjects:: @ 837FD14 object_event 11, MAP_OBJ_GFX_MAN_7, 0, 13, 0, 34, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3A5, 0, 0, 0 object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, 1041, 0, 0 object_event 13, MAP_OBJ_GFX_MAN_5, 0, 19, 0, 27, 0, 3, 8, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C475, 0, 0, 0 - object_event 14, 240, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, 814, 0, 0 + object_event 14, 240, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO, 0, 0 RustboroCity_MapWarps:: @ 837FE64 warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index 4779473d8..f32fa3568 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -1,11 +1,11 @@ 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 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL, 0, 0 object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 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 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL, 0, 0 + object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL, 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, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL, 0, 0 object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, 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/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index a6d3ed424..4c1ffb86f 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -1,11 +1,11 @@ SeafloorCavern_Room9_MapObjects:: @ 838D620 - object_event 1, 248, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 859, 0, 0 - object_event 2, 246, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 828, 0, 0 - object_event 3, 247, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 829, 0, 0 - object_event 4, 244, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 831, 0, 0 - object_event 5, 245, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 831, 0, 0 + object_event 1, 248, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN, 0, 0 + object_event 2, 246, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN, 0, 0 + object_event 3, 247, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN, 0, 0 + object_event 4, 244, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 + object_event 5, 245, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, 1090, 0, 0 - object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGENDARY_MON_SEAFLOOR_CAVERN, 0, 0 + object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room9_MapWarps:: @ 838D6C8 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc index e7ef67860..5d5fc52d4 100644 --- a/data/maps/events/SkyPillar_Top.inc +++ b/data/maps/events/SkyPillar_Top.inc @@ -1,5 +1,5 @@ SkyPillar_Top_MapObjects:: @ 838EE50 - object_event 1, MAP_OBJ_GFX_RAYQUAZA, 0, 14, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SkyPillar_Top_EventScript_15F316, 773, 0, 0 + object_event 1, MAP_OBJ_GFX_RAYQUAZA, 0, 14, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SkyPillar_Top_EventScript_15F316, FLAG_HIDE_RAYQUAZA, 0, 0 SkyPillar_Top_MapWarps:: @ 838EE68 warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc index 35416b72d..a0e0f330f 100644 --- a/data/maps/events/SlateportCity.inc +++ b/data/maps/events/SlateportCity.inc @@ -3,13 +3,13 @@ SlateportCity_MapObjects:: @ 837F7AC object_event 2, MAP_OBJ_GFX_MAN_1, 0, 35, 0, 27, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BOY_4, 0, 15, 0, 13, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBB5, 0, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 26, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0, 0, 0 - object_event 5, 240, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, 882, 0, 0 + object_event 5, 240, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 object_event 6, MAP_OBJ_GFX_COOK, 0, 5, 0, 43, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0, 0, 0 object_event 7, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 20, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB60, 0, 0, 0 object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 8, 0, 42, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB81, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 29, 0, 13, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C017, 835, 0, 0 - object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 28, 0, 14, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C020, 835, 0, 0 - object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 28, 0, 13, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, 840, 0, 0 + object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 29, 0, 13, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C017, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0 + object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 28, 0, 14, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C020, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0 + object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 28, 0, 13, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, FLAG_HIDE_STERN_SLATEPORT, 0, 0 object_event 12, MAP_OBJ_GFX_SAILOR, 0, 35, 0, 36, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCE2, 0, 0, 0 object_event 13, MAP_OBJ_GFX_SAILOR, 0, 28, 0, 46, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCEB, 0, 0, 0 object_event 14, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 50, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCF4, 0, 0, 0 @@ -17,19 +17,19 @@ SlateportCity_MapObjects:: @ 837F7AC object_event 16, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD06, 0, 0, 0 object_event 17, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 24, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCB8, 0, 0, 0 object_event 18, MAP_OBJ_GFX_WOMAN_7, 0, 15, 0, 31, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0, 0, 0 - object_event 19, 241, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, 882, 0, 0 - object_event 20, 241, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, 882, 0, 0 + object_event 19, 241, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 20, 241, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 object_event 21, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 38, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0, 0, 0 object_event 22, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 5, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0, 0, 0 object_event 23, MAP_OBJ_GFX_MAN_6, 0, 34, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0, 0, 0 object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 47, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0, 0, 0 object_event 25, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 11, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE9A, 948, 0, 0 object_event 26, MAP_OBJ_GFX_MAN_3, 0, 5, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAB6, 0, 0, 0 - object_event 27, 241, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, 882, 0, 0 - object_event 28, 241, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, 882, 0, 0 - object_event 29, 241, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, 882, 0, 0 - object_event 30, 241, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, 882, 0, 0 - object_event 31, 241, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, 882, 0, 0 + object_event 27, 241, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 28, 241, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 29, 241, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 30, 241, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 31, 241, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 SlateportCity_MapWarps:: @ 837FA94 warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/SlateportCity_ContestLobby.inc b/data/maps/events/SlateportCity_ContestLobby.inc index 09e6c23fb..0c701e0ca 100644 --- a/data/maps/events/SlateportCity_ContestLobby.inc +++ b/data/maps/events/SlateportCity_ContestLobby.inc @@ -3,7 +3,7 @@ SlateportCity_ContestLobby_MapObjects:: @ 8387788 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7795, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554DE, 0, 0, 0 object_event 4, MAP_OBJ_GFX_GIRL_1, 0, 9, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554E7, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, 803, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT, 0, 0 object_event 6, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_155536, 0, 0, 0 object_event 7, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F9, 0, 0, 0 object_event 8, MAP_OBJ_GFX_WOMAN_3, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0, 0, 0 diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index c2f2d5afb..b05d7b861 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -2,11 +2,11 @@ SlateportCity_Harbor_MapObjects:: @ 8387F30 object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, 905, 0, 0 object_event 2, MAP_OBJ_GFX_SAILOR, 0, 4, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, 905, 0, 0 object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, 905, 0, 0 - object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, 841, 0, 0 - object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 860, 0, 0 - object_event 6, 241, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 845, 0, 0 - object_event 7, 246, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 846, 0, 0 - object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 848, 0, 0 + object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR, 0, 0 + object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR, 0, 0 + object_event 6, 241, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR, 0, 0 + object_event 7, 246, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR, 0, 0 + object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR, 0, 0 SlateportCity_Harbor_MapWarps:: @ 8387FF0 warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc index ede07b801..a8866bdc5 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc @@ -1,12 +1,12 @@ SlateportCity_OceanicMuseum_1F_MapObjects:: @ 8387B38 object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0 - object_event 2, 241, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, 883, 0, 0 - object_event 3, 241, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, 883, 0, 0 - object_event 4, 241, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, 883, 0, 0 - object_event 5, 240, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, 883, 0, 0 - object_event 6, 241, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, 883, 0, 0 + object_event 2, 241, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 3, 241, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 4, 241, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 5, 240, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 6, 241, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 object_event 7, MAP_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0 - object_event 8, 241, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, 883, 0, 0 + object_event 8, 241, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, 961, 0, 0 object_event 10, MAP_OBJ_GFX_MANIAC, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, 961, 0, 0 object_event 11, MAP_OBJ_GFX_MAN_3, 0, 17, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, 961, 0, 0 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc index 67d7a6b18..0194c4004 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc @@ -1,8 +1,8 @@ SlateportCity_OceanicMuseum_2F_MapObjects:: @ 8387D70 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, 887, 0, 0 - object_event 2, 246, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 886, 0, 0 - object_event 3, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 884, 0, 0 - object_event 4, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 885, 0, 0 + object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F, 0, 0 + object_event 2, 246, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F, 0, 0 + object_event 3, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F, 0, 0 + object_event 4, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F, 0, 0 object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, 961, 0, 0 object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, 961, 0, 0 object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, 961, 0, 0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc index 8999b6887..a20a2f1b6 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc @@ -2,7 +2,7 @@ SlateportCity_SternsShipyard_1F_MapObjects:: @ 8387698 object_event 1, MAP_OBJ_GFX_MAN_1, 0, 5, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_155336, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553E3, 0, 0, 0 object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553EC, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 11, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, 869, 0, 0 + object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 11, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD, 0, 0 SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8 warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc index ed78d9136..19fd9b3c9 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/events/SootopolisCity.inc @@ -1,15 +1,15 @@ SootopolisCity_MapObjects:: @ 8380608 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, 855, 0, 0 - object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 33, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, 856, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 36, 0, 21, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, 854, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 47, 0, 42, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, 854, 0, 0 - object_event 5, MAP_OBJ_GFX_WALLACE, 0, 32, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, 816, 0, 0 - object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 9, 0, 43, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D19F, 854, 0, 0 - object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 51, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, 854, 0, 0 - object_event 8, MAP_OBJ_GFX_BOY_1, 0, 43, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, 854, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_1, 0, 26, 0, 4, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D287, 854, 0, 0 + object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1, 0, 0 + object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 33, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 36, 0, 21, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 47, 0, 42, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 5, MAP_OBJ_GFX_WALLACE, 0, 32, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, FLAG_HIDE_WALLACE_SOOTOPOLIS, 0, 0 + object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 9, 0, 43, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D19F, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 51, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 8, MAP_OBJ_GFX_BOY_1, 0, 43, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 9, MAP_OBJ_GFX_MAN_1, 0, 26, 0, 4, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 object_event 10, MAP_OBJ_GFX_STEVEN, 0, 30, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D498, 973, 0, 0 - object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, 854, 0, 0 + object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 SootopolisCity_MapWarps:: @ 8380710 warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc index 6145c4afc..4e655191d 100644 --- a/data/maps/events/SootopolisCity_Gym_1F.inc +++ b/data/maps/events/SootopolisCity_Gym_1F.inc @@ -1,5 +1,5 @@ SootopolisCity_Gym_1F_MapObjects:: @ 838ACF0 - object_event 1, MAP_OBJ_GFX_WALLACE, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, 815, 0, 0 + object_event 1, MAP_OBJ_GFX_WALLACE, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0, 0, 0 SootopolisCity_Gym_1F_MapWarps:: @ 838AD20 diff --git a/data/maps/events/VerdanturfTown_ContestLobby.inc b/data/maps/events/VerdanturfTown_ContestLobby.inc index 2fe386421..465bb2fde 100644 --- a/data/maps/events/VerdanturfTown_ContestLobby.inc +++ b/data/maps/events/VerdanturfTown_ContestLobby.inc @@ -3,7 +3,7 @@ VerdanturfTown_ContestLobby_MapObjects:: @ 8386A00 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B77A0, 0, 0, 0 object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 14, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E47, 0, 0, 0 object_event 4, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E3E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, 801, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF, 0, 0 object_event 6, MAP_OBJ_GFX_BOY_3, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0, 0, 0 VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90 diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc index daa90d499..3753a78aa 100644 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ b/data/maps/events/VerdanturfTown_WandasHouse.inc @@ -1,7 +1,7 @@ VerdanturfTown_WandasHouse_MapObjects:: @ 8386CEC - object_event 1, MAP_OBJ_GFX_WALLY, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, 806, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, 808, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, 809, 0, 0 + object_event 1, MAP_OBJ_GFX_WALLY, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, FLAG_HIDE_WALLY_WANDAS_HOUSE, 0, 0 + object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0, 0, 0 object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, 984, 0, 0 diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc index 1d64e4f3a..cffb058b6 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -2,10 +2,10 @@ VictoryRoad_1F_MapObjects:: @ 838D8E4 object_event 1, MAP_OBJ_GFX_MAN_4, 0, 33, 0, 22, 0, 3, 8, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF6F, 0, 0, 0 object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 6, 0, 15, 0, 4, 9, 0, 0, 1, 0, 4, 0, VictoryRoad_1F_EventScript_15DF9D, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 27, 0, 34, 0, 3, 18, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF86, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WALLY, 0, 31, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF28, 858, 0, 0 + object_event 4, MAP_OBJ_GFX_WALLY, 0, 31, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 40, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, 1084, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 39, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, 1085, 0, 0 - object_event 7, MAP_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, 751, 0, 0 + object_event 7, MAP_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD, 0, 0 VictoryRoad_1F_MapWarps:: @ 838D98C warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 7d13f1cc6..1e335cdfa 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -60,43 +60,43 @@ Route111_EventScript_1AE3D7:: @ 81AE3D7 return Route111_EventScript_1AE3E2:: @ 81AE3E2 - setflag 796 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 return Route111_EventScript_1AE3E6:: @ 81AE3E6 - clearflag 796 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 return Route111_EventScript_1AE3EA:: @ 81AE3EA - setflag 797 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 return Route111_EventScript_1AE3EE:: @ 81AE3EE - clearflag 797 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 return Route111_EventScript_1AE3F2:: @ 81AE3F2 - setflag 798 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120 return Route111_EventScript_1AE3F6:: @ 81AE3F6 - clearflag 798 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE120 return Route111_EventScript_1AE3FA:: @ 81AE3FA - setflag 799 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 return Route111_EventScript_1AE3FE:: @ 81AE3FE - clearflag 799 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 return Route111_EventScript_1AE402:: @ 81AE402 - setflag 901 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 return Route111_EventScript_1AE406:: @ 81AE406 - clearflag 901 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 return Route111_EventScript_1AE40A:: @ 81AE40A diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index c0437d804..a587fcc92 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -65,7 +65,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, 4 setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE - setflag 852 + setflag FLAG_HIDE_GRUNTS_LILYCOVE release end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index c0a88a880..d0d19e4b9 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -68,13 +68,13 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 specialvar RESULT, sub_810E300 compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 - setflag 816 - setflag 855 - setflag 856 - clearflag 815 + setflag FLAG_HIDE_WALLACE_SOOTOPOLIS + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 + clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM setvar 0x409b, 1 setflag FLAG_LEGENDARY_BATTLE_COMPLETED - clearflag 854 + clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS clearflag SYS_WEATHER_CTRL setvar 0x40b9, 2 clearflag 916 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index b8da349f3..3d3240e81 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -135,10 +135,10 @@ DewfordTown_EventScript_14E151:: @ 814E151 applymovement 255, DewfordTown_Movement_14E405 waitmovement 0 showobject 255, 0, 19 - clearflag 739 - clearflag 881 - clearflag 742 - setflag 743 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD hideobject 4, 0, 11 setvar 0x408e, 2 resetobjectpriority 255, 0, 11 @@ -171,10 +171,10 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 setobjectpriority 2, 0, 24, 0 applymovement 2, DewfordTown_Movement_14E410 waitmovement 0 - clearflag 741 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE109 addobject 1 - clearflag 744 - setflag 743 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD hideobject 4, 0, 11 checkflag FLAG_DELIVERED_DEVON_GOODS call_if 0, DewfordTown_EventScript_14E281 diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index b13c930cf..ae3cbd4ad 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -136,7 +136,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 waitmovement 0 - setflag 781 + setflag FLAG_HIDE_PETALBURG_GYM_GUIDE warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 waitstate releaseall diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index f6c62fbcb..70f3cbc3b 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -5,7 +5,7 @@ FallarborTown_MapScripts:: @ 814E7E0 FallarborTown_MapScript1_14E7E6:: @ 814E7E6 setflag FLAG_VISITED_FALLARBOR_TOWN setvar 0x4086, 0 - setflag 800 + setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR clearflag FLAG_CONTEST_SKETCH_CREATED end diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 5b1f1c948..1e50c2fd6 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -48,7 +48,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 playse 18 removeobject 4 - clearflag 870 + clearflag FLAG_HIDE_LANETTE release end diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 036523bf1..6cf2d630b 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -26,10 +26,10 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 InsideOfTruck_EventScript_15FC45:: @ 815FC45 sethealplace 1 setvar 0x4092, 1 - setflag 759 - setflag 762 - setflag 784 - setflag 760 + setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS + setflag FLAG_HIDE_MOVING_TRUCK_MAY + setflag FLAG_HIDE_BRENDAN_MOM + setflag FLAG_HIDE_BRENDAN_UPSTAIRS setvar 0x408c, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall @@ -38,9 +38,9 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45 InsideOfTruck_EventScript_15FC68:: @ 815FC68 sethealplace 2 setvar 0x4092, 2 - setflag 758 - setflag 761 - setflag 785 + setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS + setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN + setflag FLAG_HIDE_MAY_MOM setflag FLAG_HIDE_MAY_UPSTAIRS setvar 0x4082, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 4948c17b3..29b5ef2b9 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -19,7 +19,7 @@ LavaridgeTown_EventScript_14E4D0:: @ 814E4D0 return LavaridgeTown_EventScript_14E4DF:: @ 814E4DF - clearflag 877 + clearflag FLAG_HIDE_MT_CHIMNEY_PEOPLE return LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 40c1b6ea9..f6c34484e 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -88,7 +88,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB setvar 0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 - setflag 806 + setflag FLAG_HIDE_WALLY_WANDAS_HOUSE setvar 0x4053, 1 goto LavaridgeTown_Gym_1F_EventScript_1537A7 end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index b8c6b26f5..29a8497ed 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -6,7 +6,7 @@ LilycoveCity_MapScripts:: @ 814CA15 LilycoveCity_MapScript1_14CA20:: @ 814CA20 setflag FLAG_VISITED_LILYCOVE_CITY setvar 0x4086, 0 - setflag 802 + setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE checkflag SYS_WEATHER_CTRL call_if 1, LilycoveCity_EventScript_1A02C1 call LilycoveCity_EventScript_1A0196 @@ -356,7 +356,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CEF7 clearflag FLAG_HIDE_MAY_UPSTAIRS - clearflag 849 + clearflag FLAG_HIDE_MAY_PICHU_DOLL goto LilycoveCity_EventScript_14CF6B end @@ -392,7 +392,7 @@ LilycoveCity_EventScript_14CF12:: @ 814CF12 call_if 1, LilycoveCity_EventScript_14CF47 compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CF50 - clearflag 760 + clearflag FLAG_HIDE_BRENDAN_UPSTAIRS goto LilycoveCity_EventScript_14CF6B end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index f0e515f13..7546fe41b 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -13,7 +13,7 @@ LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877 .2byte 0 LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 - checkflag 775 + checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_if_eq LilycoveCity_ContestLobby_EventScript_158898 setvar 0x4099, 0 end @@ -97,23 +97,23 @@ LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 return LilycoveCity_ContestLobby_EventScript_1589D6:: @ 81589D6 - clearflag 776 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY return LilycoveCity_ContestLobby_EventScript_1589DA:: @ 81589DA - clearflag 777 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL return LilycoveCity_ContestLobby_EventScript_1589DE:: @ 81589DE - clearflag 778 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN return LilycoveCity_ContestLobby_EventScript_1589E2:: @ 81589E2 - clearflag 779 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER return LilycoveCity_ContestLobby_EventScript_1589E6:: @ 81589E6 - clearflag 780 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS return LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA @@ -188,7 +188,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 step_end LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B - checkflag 775 + checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A setvar 0x4099, 0 end @@ -583,7 +583,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 end LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 - setflag 775 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar 0x4094, 0x1 additem ITEM_CONTEST_PASS, 1 setvar 0x800b, 8 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 54e2bd042..117aa5579 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -52,7 +52,7 @@ LittlerootTown_EventScript_14D59A:: @ 814D59A return LittlerootTown_EventScript_14D5A6:: @ 814D5A6 - clearflag 752 + clearflag FLAG_HIDE_MOM_LITTLEROOT setobjectmovementtype 4, 8 checkplayergender compare RESULT, 0 @@ -80,7 +80,7 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF setvar 0x8004, 5 setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B - setflag 761 + setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 waitstate releaseall @@ -91,7 +91,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D setvar 0x8004, 14 setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B - setflag 762 + setflag FLAG_HIDE_MOVING_TRUCK_MAY warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 waitstate releaseall @@ -122,12 +122,12 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 4, LittlerootTown_Movement_14D6B5 applymovement 255, LittlerootTown_Movement_14D6BD waitmovement 0 - setflag 752 + setflag FLAG_HIDE_MOM_LITTLEROOT setvar 0x4092, 3 hideobject 255, 0, 0 closedoor 0x8004, 0x8005 waitdooranim - clearflag 868 + clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT clearflag 0x4000 return diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 8e7a0854d..868e4f06e 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -107,7 +107,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90 LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A lock faceplayer - checkflag 896 + checkflag FLAG_UNKNOWN_BIRCH_380 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F compare 0x4084, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 0bc64765a..451219edb 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -156,8 +156,8 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9 MauvilleCity_EventScript_14C22B:: @ 814C22B removeobject 6 removeobject 7 - clearflag 806 - clearflag 809 + clearflag FLAG_HIDE_WALLY_WANDAS_HOUSE + clearflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE setflag FLAG_DEFEATED_WALLY_MAUVILLE releaseall end diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 06774d400..7ce6e3704 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -77,7 +77,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C removeobject 7 removeobject 8 removeobject 9 - setflag 819 + setflag FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR setvar 0x40bf, 1 releaseall end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 9c32e989c..231865942 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -63,7 +63,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 msgbox MossdeepCity_Gym_Text_18D128, 4 setflag 1229 setflag BADGE07_GET - clearflag 869 + clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag 915 setvar 0x8008, 7 call MossdeepCity_Gym_EventScript_1A01C0 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index e9456ae13..fd90210ca 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -71,8 +71,8 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 MtPyre_Summit_EventScript_15D57A:: @ 815D57A setflag FLAG_MT_PYRE_ORB_STOLEN setvar 0x4058, 1 - clearflag 840 - clearflag 835 + clearflag FLAG_HIDE_STERN_SLATEPORT + clearflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT setvar 0x40a0, 1 setvar 0x40b9, 1 return diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 47601a964..61476b085 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -209,8 +209,8 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 setvar 0x4085, 1 setvar 0x4057, 2 clearflag FLAG_HIDE_WALLY_PETALBURG - clearflag 866 - setflag 889 + clearflag FLAG_HIDE_WALLY_PETALBURG_GYM + setflag FLAG_HIDE_RIVAL_BIRCH_LAB special InitBirchState warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 9af5c1bdc..23ed60f9a 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -119,7 +119,7 @@ Route103_EventScript_14ED46:: @ 814ED46 removeobject 2 setvar 0x4062, 1 setvar 0x4084, 4 - clearflag 889 + clearflag FLAG_HIDE_RIVAL_BIRCH_LAB setflag FLAG_DEFEATED_RIVAL_ROUTE103 setvar 0x40c7, 1 clearflag 979 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 20044f020..ac8a48353 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -145,13 +145,13 @@ Route104_EventScript_14EFD5:: @ 814EFD5 setobjectxyperm 2, 12, 8 addobject 2 setobjectpriority 2, 0, 11, 0 - clearflag 740 + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN applymovement 2, Route104_Movement_14F16F waitmovement 0 addobject 4 - clearflag 743 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD call Route104_EventScript_1A02EF - setflag 742 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobject 7, 0, 19 copyvar 0x4096, 0x8008 resetobjectpriority 255, 0, 19 diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index aabc03439..3d775ccfe 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -11,7 +11,7 @@ Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 end Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0 - setflag 814 + setflag FLAG_HIDE_RIVAL_RUSTBORO return Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4 @@ -80,9 +80,9 @@ Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB msgbox Route104_MrBrineysHouse_Text_191BFD, 4 call Route104_MrBrineysHouse_EventScript_1A010C setvar 0x408e, 1 - clearflag 738 - setflag 739 - setflag 881 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE warp MAP_ROUTE104, 255, 13, 51 waitstate releaseall diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index f4838a211..1277168e0 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -43,14 +43,14 @@ Route109_EventScript_14F548:: @ 814F548 applymovement 255, Route109_Movement_14F670 waitmovement 0 addobject 4 - clearflag 743 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD setobjectxyperm 2, 12, 8 addobject 2 setobjectpriority 2, 0, 11, 0 applymovement 2, Route109_Movement_14F67D waitmovement 0 - clearflag 740 - setflag 744 + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 hideobject 1, 0, 24 msgbox Route109_Text_16B4B5, 4 closemessage diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 343d666b2..7d9c8aaaa 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -40,10 +40,10 @@ Route111_EventScript_15000C:: @ 815000C return Route111_EventScript_15000D:: @ 815000D - clearflag 768 - setflag 769 - setflag 770 - setflag 771 + clearflag FLAG_HIDE_VICTOR_WINSTRATE + setflag FLAG_HIDE_VICTORIA_WINSTRATE + setflag FLAG_HIDE_VIVI_WINSTRATE + setflag FLAG_HIDE_VICKI_WINSTRATE cleartrainerflag OPPONENT_VICTOR cleartrainerflag OPPONENT_VICTORIA cleartrainerflag OPPONENT_VIVI diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index ec47cbd79..5454fa946 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -33,8 +33,8 @@ Route119_MapScript1_15119B:: @ 815119B end Route119_EventScript_1511B9:: @ 81511B9 - setflag 893 - clearflag 892 + setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F + clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F setvar 0x40b3, 2 return diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 09bab727a..4ee12fe93 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -39,10 +39,10 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4 closemessage setvar 0x40b3, 1 - clearflag 893 + clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F fadedefaultbgm fadescreen 1 - setflag 890 + setflag FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE removeobject 1 removeobject 2 removeobject 3 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 358a946a6..ffe133906 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -183,11 +183,11 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 setvar 0x405a, 2 setvar 0x409a, 2 setvar 0x406f, 1 - clearflag 891 - clearflag 880 - clearflag 878 - setflag 739 - setflag 881 + clearflag FLAG_HIDE_BRINEY_ROUTE116 + clearflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL + clearflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE releaseall end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 0cd4a36a8..eca55c118 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -57,13 +57,13 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 setflag SYS_POKENAV_GET setflag FLAG_RECEIVED_POKENAV msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 - setflag 894 - clearflag 807 + setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116 + clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL clearflag 983 - clearflag 739 - clearflag 881 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE setvar 0x4096, 1 - clearflag 814 + clearflag FLAG_HIDE_RIVAL_RUSTBORO setvar 0x408f, 1 releaseall end diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 002071f2d..04364b661 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -345,7 +345,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA setflag FLAG_RECOVERED_DEVON_GOODS setvar 0x405a, 4 setvar 0x4090, 1 - setflag 891 + setflag FLAG_HIDE_BRINEY_ROUTE116 release end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index d38459c1c..9131dcdb3 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -192,23 +192,23 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4ECA, 4 .endif setvar 0x407b, 1 - clearflag 855 - clearflag 856 - clearflag 816 + clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 + clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS clearflag 973 setvar 0x405e, 1 clearflag 944 clearflag 945 setflag SYS_WEATHER_CTRL - setflag 854 + setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN setflag 967 setvar 0x40c6, 1 setvar 0x40a2, 1 - setflag 828 - setflag 829 - setflag 831 - setflag 859 + setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN + setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN setflag 946 warp MAP_ROUTE128, 255, 38, 22 waitstate diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index f22055bc4..b278fcfc2 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -19,7 +19,7 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 playpokecry SPECIES_RAYQUAZA, 2 delay 40 waitpokecry - setflag 773 + setflag FLAG_HIDE_RAYQUAZA setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRayquazaBattle waitstate diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index b94a0ffd3..567dd779b 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -19,7 +19,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C SlateportCity_EventScript_14BA5C:: @ 814BA5C setflag FLAG_VISITED_SLATEPORT_CITY setvar 0x4086, 0 - setflag 803 + setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT return SlateportCity_EventScript_14BA68:: @ 814BA68 @@ -533,10 +533,10 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 255, SlateportCity_Movement_14C008 waitmovement 0 removeobject 11 - clearflag 841 - clearflag 848 - clearflag 845 - clearflag 846 + clearflag FLAG_HIDE_STERN_SLATEPORT_HARBOR + clearflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR + clearflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR + clearflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR setvar 0x4058, 2 warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index daa6b1e7c..2e042b1e5 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -12,7 +12,7 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 end SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 - clearflag 860 + clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR return SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 @@ -73,8 +73,8 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closemessage - setflag 821 - setflag 822 + setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT + setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT moveobjectoffscreen 4 setobjectmovementtype 4, 10 releaseall diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index a8411e067..db65a51db 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -74,7 +74,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 removeobject 4 fadescreen 0 delay 30 - setflag 883 + setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4 @@ -86,7 +86,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 waitmovement 0 playse 9 removeobject 1 - setflag 900 + setflag FLAG_HIDE_EVIL_TEAM_ROUTE110 setflag FLAG_DELIVERED_DEVON_GOODS clearflag 947 setflag 949 diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 7b2ae0d67..73d63fe06 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -19,7 +19,7 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D waitmovement 0 setflag FLAG_DOCK_REJECTED_DEVON_GOODS - setflag 882 + setflag FLAG_HIDE_EVIL_TEAM_SLATEPORT releaseall end diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index babbd8cce..b9e9b85a5 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -5,7 +5,7 @@ VerdanturfTown_MapScripts:: @ 814E854 VerdanturfTown_MapScript1_14E85A:: @ 814E85A setflag FLAG_VISITED_VERDANTURF_TOWN setvar 0x4086, 0 - setflag 801 + setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF end VerdanturfTown_EventScript_14E866:: @ 814E866 diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index e92cdcc82..7e48d3d90 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -8,7 +8,7 @@ VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89 end VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 - setflag 858 + setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD return VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 @@ -41,7 +41,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 msgbox VictoryRoad_1F_Text_19782B, 4 trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943 msgbox VictoryRoad_1F_Text_197967, 4 - clearflag 858 + clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD moveobjectoffscreen 4 setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD setvar 0x40c3, 1 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index b27f98675..5ff45e25a 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -66,8 +66,8 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB delay 30 setvar 0x4092, 6 setflag FLAG_SET_WALL_CLOCK - setflag 754 - setflag 755 + setflag FLAG_HIDE_MACHOKE_MOVER_1 + setflag FLAG_HIDE_MACHOKE_MOVER_2 checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 diff --git a/include/constants/flags.h b/include/constants/flags.h index a07372527..f349e0c15 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -269,10 +269,155 @@ #define FLAG_HIDE_GRUNT_RUSTBORO 0x2DB #define FLAG_HIDE_DEVON_RUSTBORO 0x2DC -#define FLAG_HIDE_LEGENDARY_MON_SEAFLOOR_CAVERN 0x2DD +#define FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN 0x2DD #define FLAG_HIDE_NORMAN_LITTLEROOT 0x2DE #define FLAG_UNKNOWN_2E1 0x2E1 +#define FLAG_HIDE_MR_BRINEY_ROUTE104 0x2E2 +#define FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE 0x2E3 +#define FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN 0x2E4 +#define FLAG_HIDE_MR_BRINEY_ROUTE109 0x2E5 +#define FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 0x2E6 +#define FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD 0x2E7 +#define FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 0x2E8 + +#define FLAG_UNKNOWN_2EB 0x2EB +#define FLAG_UNKNOWN_2EC 0x2EC +#define FLAG_UNKNOWN_2ED 0x2ED +#define FLAG_HIDE_POOCHYENA_ROUTE101 0x2EE +#define FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD 0x2EF +#define FLAG_HIDE_MOM_LITTLEROOT 0x2F0 + +#define FLAG_HIDE_MACHOKE_MOVER_1 0x2F2 +#define FLAG_HIDE_MACHOKE_MOVER_2 0x2F3 +#define FLAG_UNKNOWN_2F4 0x2F4 +#define FLAG_HIDE_MOM_UPSTAIRS 0x2F5 +#define FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS 0x2F6 +#define FLAG_HIDE_MAY_MOM_DOWNSTAIRS 0x2F7 +#define FLAG_HIDE_BRENDAN_UPSTAIRS 0x2F8 +#define FLAG_HIDE_MOVING_TRUCK_BRENDAN 0x2F9 +#define FLAG_HIDE_MOVING_TRUCK_MAY 0x2FA + +#define FLAG_HIDE_VICTOR_WINSTRATE 0x300 +#define FLAG_HIDE_VICTORIA_WINSTRATE 0x301 +#define FLAG_HIDE_VIVI_WINSTRATE 0x302 +#define FLAG_HIDE_VICKI_WINSTRATE 0x303 +#define FLAG_HIDE_NORMAN_PETALBURG_GYM 0x304 +#define FLAG_HIDE_RAYQUAZA 0x305 +#define FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1 0x306 +#define FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR 0x307 +#define FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY 0x308 +#define FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL 0x309 +#define FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN 0x30A +#define FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER 0x30B +#define FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS 0x30C +#define FLAG_HIDE_PETALBURG_GYM_GUIDE 0x30D +#define FLAG_UNKNOWN_30E 0x30E +#define FLAG_UNKNOWN_30F 0x30F +#define FLAG_HIDE_BRENDAN_MOM 0x310 +#define FLAG_HIDE_MAY_MOM 0x311 + +#define FLAG_HIDE_FANCLUB_OLD_LADY 0x315 +#define FLAG_HIDE_FANCLUB_BOY 0x316 +#define FLAG_HIDE_FANCLUB_LITTLE_BOY 0x317 +#define FLAG_HIDE_FANCLUB_LADY 0x318 + +#define FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 0x31C +#define FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 0x31D +#define FLAG_HIDE_GABBY_AND_TY_ROUTE120 0x31E +#define FLAG_HIDE_GABBY_AND_TY_ROUTE120 0x31E +#define FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 0x31F +#define FLAG_HIDE_CONTEST_REPORTER_FALLARBOR 0x320 +#define FLAG_HIDE_CONTEST_REPORTER_VERDANTURF 0x321 +#define FLAG_HIDE_CONTEST_REPORTER_LILYCOVE 0x322 +#define FLAG_HIDE_CONTEST_REPORTER_SLATEPORT 0x323 +#define FLAG_HIDE_WALLY_MAUVILLE 0x324 +#define FLAG_HIDE_WALLY_FATHER_MAUVILLE 0x325 +#define FLAG_HIDE_WALLY_WANDAS_HOUSE 0x326 +#define FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL 0x327 +#define FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE 0x328 +#define FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE 0x329 + +#define FLAG_HIDE_WALLY_FATHER_PETALBURG 0x32B +#define FLAG_HIDE_WALLY_MOTHER_PETALBURG 0x32C +#define FLAG_HIDE_LOST_GLASSES_MAN 0x32D +#define FLAG_HIDE_RIVAL_RUSTBORO 0x32E +#define FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM 0x32F +#define FLAG_HIDE_WALLACE_SOOTOPOLIS 0x330 + +#define FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR 0x333 + +#define FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT 0x335 +#define FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT 0x336 +#define FLAG_UNKNOWN_337 0x337 + +#define FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN 0x339 + +#define FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN 0x33C +#define FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN 0x33D + +#define FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN 0x33F + +#define FLAG_HIDE_STEVEN_GRANITE_CAVE 0x341 +#define FLAG_HIDE_STEVEN_ROUTE128 0x342 +#define FLAG_HIDE_GABBY_AND_TY_SLATEPORT 0x343 + +#define FLAG_HIDE_STERN_SLATEPORT 0x348 +#define FLAG_HIDE_STERN_SLATEPORT_HARBOR 0x349 + +#define FLAG_UNKNOWN_34B 0x34B +#define FLAG_UNKNOWN_34C 0x34C +#define FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR 0x34D +#define FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR 0x34E +#define FLAG_UNKNOWN_34F 0x34F +#define FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR 0x350 +#define FLAG_HIDE_MAY_PICHU_DOLL 0x351 + +#define FLAG_HIDE_RIVAL_ROUTE119 0x353 +#define FLAG_HIDE_GRUNTS_LILYCOVE 0x354 + +#define FLAG_HIDE_SOOTOPOLIS_RESIDENTS 0x356 +#define FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 0x357 +#define FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 0x358 + +#define FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD 0x35A +#define FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN 0x35B +#define FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR 0x35C +#define FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR 0x35D + +#define FLAG_HIDE_WALLY_PETALBURG_GYM 0x362 +#define FLAG_UNKNOWN_363 0x363 +#define FLAG_HIDE_FAT_MAN_LITTLEROOT 0x364 +#define FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD 0x365 +#define FLAG_HIDE_LANETTE 0x366 +#define FLAG_HIDE_LANETTE_FALLARBOR 0x367 +#define FLAG_HIDE_TRICKMASTER_ENTRANCE 0x368 + +#define FLAG_HIDE_MT_CHIMNEY_PEOPLE 0x36D +#define FLAG_HIDE_GRUNT_RUSTURF_TUNNEL 0x36E +#define FLAG_HIDE_BRINEY_RUSTURF_TUNNEL 0x36F +#define FLAG_HIDE_PEEKO_RUSTURF_TUNNEL 0x370 +#define FLAG_HIDE_PEEKO_BRINEY_HOUSE 0x371 +#define FLAG_HIDE_EVIL_TEAM_SLATEPORT 0x372 +#define FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM 0x373 +#define FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F 0x374 +#define FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F 0x375 +#define FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F 0x376 +#define FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F 0x377 +#define FLAG_HIDE_BATTLE_TOWER_OPPONENT 0x378 +#define FLAG_HIDE_RIVAL_BIRCH_LAB 0x379 +#define FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE 0x37A +#define FLAG_HIDE_BRINEY_ROUTE116 0x37B +#define FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F 0x37C +#define FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F 0x37D +#define FLAG_HIDE_TUNNER_DIGGER_ROUTE116 0x37E +#define FLAG_HIDE_ARTIST_LILCOVE_CONTEST 0x37F +#define FLAG_UNKNOWN_BIRCH_380 0x380 // TODO: what should this be called? +#define FLAG_HIDE_BIRCH_ROUTE101 0x381 +#define FLAG_HIDE_BIRCH_ROUTE103 0x382 +#define FLAG_HIDE_TRICKMASTER_END 0x383 +#define FLAG_HIDE_EVIL_TEAM_ROUTE110 0x384 +#define FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 0x385 #define TRAINER_FLAG_START 0x500 |