diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-18 12:49:59 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-18 12:49:59 -0400 |
| commit | 4f15cb02d29707bc30a57db725cbea09aec43eb8 (patch) | |
| tree | 00cf809c83a39ae20e08395e7be79c538f85df90 | |
| parent | 9903f7a77a1836c269119dcf2766df5ab09df765 (diff) | |
Rename map scene vars and partially document Oak's lab
89 files changed, 474 insertions, 506 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 67ddfac23..bf3ff24fc 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1559,7 +1559,7 @@ EventScript_1A651A:: @ 81A651A return EventScript_1A653B:: @ 81A653B - setvar VAR_MAP_SCENE_PALLET_TOWN, 2 + setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 2 return EventScript_1A6541:: @ 81A6541 @@ -1584,7 +1584,7 @@ EventScript_1A6551:: @ 81A6551 cleartrainerflag TRAINER_CHAMPION_TERRY_4 cleartrainerflag TRAINER_CHAMPION_TERRY_5 cleartrainerflag TRAINER_CHAMPION_TERRY_6 - setvar VAR_0x4068, 0 + setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 0 return EventScript_1A6578:: @ 81A6578 @@ -2821,7 +2821,7 @@ EventScript_1A77F9:: @ 81A77F9 end EventScript_1A7803:: @ 81A7803 - compare_var_to_var VAR_0x405F, VAR_0x4001 + compare_var_to_var VAR_MAP_SCENE_ROUTE23, VAR_0x4001 goto_if 4, EventScript_1A77EC copyvar VAR_0x8000, VAR_0x4001 compare_var_to_value VAR_0x8000, 1 @@ -2843,7 +2843,7 @@ EventScript_1A7803:: @ 81A7803 end EventScript_1A786C:: @ 81A786C - compare_var_to_var VAR_0x405F, VAR_0x4001 + compare_var_to_var VAR_MAP_SCENE_ROUTE23, VAR_0x4001 goto_if 4, EventScript_1A77F9 copyvar VAR_0x8000, VAR_0x4001 compare_var_to_value VAR_0x8000, 1 @@ -2918,13 +2918,13 @@ EventScript_1A794D:: @ 81A794D playfanfare MUS_FANFA1 waitfanfare waitbuttonpress - copyvar VAR_0x405F, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 release end EventScript_1A795F:: @ 81A795F msgbox Text_1A5839 - copyvar VAR_0x405F, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 release end @@ -3029,13 +3029,13 @@ EventScript_1A7A96:: @ 81A7A96 playfanfare MUS_FANFA1 waitfanfare waitbuttonpress - copyvar VAR_0x405F, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 releaseall end EventScript_1A7AA8:: @ 81A7AA8 msgbox Text_1A5839 - copyvar VAR_0x405F, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 releaseall end @@ -4211,7 +4211,7 @@ EventScript_1A8EC0:: @ 81A8EC0 EventScript_1A8EC5:: @ 81A8EC5 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if 4, EventScript_1A911E - compare_var_to_value VAR_0x4071, 4 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 goto_if 4, EventScript_1A8F12 multichoice 19, 6, 44, 0 copyvar VAR_0x8000, VAR_RESULT @@ -4243,7 +4243,7 @@ EventScript_1A8F12:: @ 81A8F12 EventScript_1A8F54:: @ 81A8F54 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if 4, EventScript_1A911E - compare_var_to_value VAR_0x4071, 4 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 goto_if 4, EventScript_1A8FA1 multichoice 19, 6, 45, 0 copyvar VAR_0x8000, VAR_RESULT @@ -4295,7 +4295,7 @@ EventScript_1A9004:: @ 81A9004 EventScript_1A900F:: @ 81A900F compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if 4, EventScript_1A911E - compare_var_to_value VAR_0x4071, 4 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 goto_if 4, EventScript_1A905C multichoice 19, 6, 46, 0 copyvar VAR_0x8000, VAR_RESULT @@ -8667,7 +8667,7 @@ ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 - map_script_2 VAR_0x407C, 1, EventScript_1BB415 + map_script_2 VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1, EventScript_1BB415 map_script_2 VAR_0x406F, 1, EventScript_1BB2E5 map_script_2 VAR_0x406F, 2, EventScript_1BB2E5 map_script_2 VAR_0x406F, 5, EventScript_1BB2E5 @@ -8790,7 +8790,7 @@ EventScript_1BB415:: @ 81BB415 waitmovement 0 delay 30 msgbox gUnknown_81BD966 - setvar VAR_0x407C, 2 + setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 2 releaseall end diff --git a/data/maps/CeruleanCity/events_bad.inc b/data/maps/CeruleanCity/events_bad.inc deleted file mode 100644 index f523a18d5..000000000 --- a/data/maps/CeruleanCity/events_bad.inc +++ /dev/null @@ -1,43 +0,0 @@ -CeruleanCity_EventObjects: - object_event 1, 60, 0, 31, 0, 12, 0, 3, 8, 17, 0, 0, 0 - object_event 2, 49, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0 - object_event 3, 16, 0, 16, 0, 21, 0, 3, 3, 49, 0, 0, 0 - object_event 4, 30, 0, 9, 0, 23, 0, 3, 2, 17, 0, 0, 0 - object_event 5, 129, 0, 32, 0, 29, 0, 3, 8, 17, 0, 0, 0 - object_event 6, 22, 0, 33, 0, 29, 0, 3, 9, 17, 0, 0, 0 - object_event 7, 18, 0, 34, 0, 22, 0, 3, 8, 17, 0, 0, 0 - object_event 8, 72, 0, 22, 0, 0, 0, 3, 8, 17, 0, 0, 0 - object_event 9, 95, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0 - object_event 10, 65375, 0, 50, 0, 18, 0, 10, 0, 0, 0, 27, 0 - object_event 11, 23, 0, 12, 0, 30, 0, 3, 7, 17, 0, 0, 0 - object_event 12, 41, 0, 1, 0, 13, 0, 3, 8, 17, 0, 0, 0 - -CeruleanCity_MapWarps: - warp_def 10, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE1 - warp_def 30, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE2 - warp_def 15, 17, 0, 1, MAP_CERULEAN_CITY_HOUSE3 - warp_def 22, 19, 0, 1, MAP_CERULEAN_CITY_POKEMONCENTER_1F - warp_def 31, 21, 0, 1, MAP_CERULEAN_CITY_GYM - warp_def 13, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP - warp_def 29, 28, 0, 1, MAP_CERULEAN_CITY_MART - warp_def 1, 12, 0, 0, MAP_CERULEAN_CAVE_1F - warp_def 10, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE1 - warp_def 31, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE2 - warp_def 31, 9, 3, 3, MAP_CERULEAN_CITY_HOUSE2 - warp_def 14, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP - warp_def 23, 28, 0, 0, MAP_CERULEAN_CITY_HOUSE4 - warp_def 17, 11, 0, 0, MAP_CERULEAN_CITY_HOUSE5 - -CeruleanCity_MapCoordEvents: - coord_event 22, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_16649A - coord_event 23, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664A6 - coord_event 24, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664B9 - coord_event 33, 5, 3, VAR_0x407D, , CeruleanCity_EventScript_166683 - coord_event 33, 7, 3, VAR_0x407D, , CeruleanCity_EventScript_1666A3 - -CeruleanCity_MapBGEvents: - bg_hidden_item_event 18, 7, 3, ITEM_RARE_CANDY, - -CeruleanCity_MapEvents:: - map_events CeruleanCity_EventObjects, CeruleanCity_MapWarps, CeruleanCity_MapCoordEvents, CeruleanCity_MapBGEvents - diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index a387eeb28..5d9ed18fa 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -297,7 +297,7 @@ "x": 22, "y": 6, "elevation": 3, - "var": "VAR_0x4052", + "var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL", "var_value": 0, "script": "CeruleanCity_EventScript_16649A" }, @@ -306,7 +306,7 @@ "x": 23, "y": 6, "elevation": 3, - "var": "VAR_0x4052", + "var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL", "var_value": 0, "script": "CeruleanCity_EventScript_1664A6" }, @@ -315,7 +315,7 @@ "x": 24, "y": 6, "elevation": 3, - "var": "VAR_0x4052", + "var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL", "var_value": 0, "script": "CeruleanCity_EventScript_1664B9" }, @@ -324,7 +324,7 @@ "x": 33, "y": 5, "elevation": 3, - "var": "VAR_0x407D", + "var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET", "var_value": 0, "script": "CeruleanCity_EventScript_166683" }, @@ -333,7 +333,7 @@ "x": 33, "y": 7, "elevation": 3, - "var": "VAR_0x407D", + "var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET", "var_value": 0, "script": "CeruleanCity_EventScript_1666A3" } diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index a1b003f0c..8ae7552fe 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -36,7 +36,7 @@ CeruleanCity_EventScript_1664B9:: @ 81664B9 EventScript_1664CC:: @ 81664CC textcolor 0 - setvar VAR_0x4054, 2 + setvar VAR_MAP_SCENE_ROUTE22, 2 playbgm MUS_RIVAL1, 0 addobject 8 applymovement 8, Movement_1665D3 @@ -62,7 +62,7 @@ EventScript_1664CC:: @ 81664CC compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_1665B5 msgbox gUnknown_817ECD4 - setvar VAR_0x4052, 1 + setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 setflag FLAG_0x29B giveitem ITEM_FAME_CHECKER msgbox gUnknown_817ED5D @@ -180,7 +180,7 @@ CeruleanCity_EventScript_166603:: @ 8166603 playbgm MUS_ROCKET, 0 waitbuttonpress trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70 - setvar VAR_0x407D, 1 + setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 goto EventScript_16662E end @@ -231,7 +231,7 @@ EventScript_1666C3:: @ 81666C3 msgbox Text_17EE0E setvar VAR_LAST_TALKED, 2 trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70 - setvar VAR_0x407D, 1 + setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 goto EventScript_16662E end diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 556fde4de..daecdc3aa 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -6,11 +6,11 @@ CinnabarIsland_MapScripts:: @ 8166ED6 CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND call EventScript_166F5E - compare_var_to_value VAR_0x4071, 1 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1 call_if 1, EventScript_166F24 - compare_var_to_value VAR_0x4071, 3 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 3 call_if 1, EventScript_166F52 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 call_if 1, EventScript_166F0B end @@ -51,9 +51,9 @@ EventScript_166F68:: @ 8166F68 return CinnabarIsland_MapScript2_166F6E:: @ 8166F6E - map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166F88 - map_script_2 VAR_0x4071, 1, EventScript_166FCD - map_script_2 VAR_0x4071, 3, EventScript_166FA0 + map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, EventScript_166F88 + map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166FCD + map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 3, EventScript_166FA0 .2byte 0 EventScript_166F88:: @ 8166F88 @@ -61,7 +61,7 @@ EventScript_166F88:: @ 8166F88 clearflag FLAG_SPECIAL_FLAG_0x4001 savebgm MUS_DUMMY textcolor 0 - setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 2 delay 20 call EventScript_1670E6 releaseall @@ -75,7 +75,7 @@ EventScript_166FA0:: @ 8166FA0 applymovement 3, Movement_166FC6 waitmovement 0 removeobject 3 - setvar VAR_0x4071, 4 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 4 setflag FLAG_0x075 clearflag FLAG_0x076 releaseall @@ -151,7 +151,7 @@ EventScript_167078:: @ 8167078 checkflag FLAG_0x002 call_if 1, EventScript_1670B3 removeobject 3 - setvar VAR_0x4071, 2 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 clearflag FLAG_0x0A2 releaseall end @@ -214,7 +214,7 @@ EventScript_1670E6:: @ 81670E6 call_if 0, EventScript_167171 checkflag FLAG_0x002 call_if 1, EventScript_167183 - setvar VAR_0x4071, 2 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 removeobject 3 delay 40 setflag FLAG_0x06B diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index f0ca816b8..0e8ccef23 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -70,7 +70,7 @@ EventScript_16DA06:: @ 816DA06 setflag FLAG_0x4B6 setflag FLAG_BADGE07_GET setrespawn SPAWN_CINNABAR_ISLAND - setvar VAR_0x4071, 1 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1 clearflag FLAG_0x062 setvar VAR_0x8008, 7 call EventScript_1A6B18 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index e85ebefc9..eb9744435 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -46,7 +46,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A compare_var_to_value VAR_FACING, 3 call_if 1, EventScript_16E993 removeobject 7 - setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 clearflag FLAG_0x062 warp MAP_CINNABAR_ISLAND, 255, 14, 11 waitstate diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index 5da8c3e89..f8f4bcbc6 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -3,12 +3,12 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 .byte 0 CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279 - compare_var_to_value VAR_0x406A, 1 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 call_if 1, EventScript_16E285 end EventScript_16E285:: @ 816E285 - setvar VAR_0x406A, 2 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 return CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index 3b415bfab..18f18f6d2 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -43,13 +43,13 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D lock faceplayer setvar VAR_RESULT, 0 - checkflag FLAG_0x2EE + checkflag FLAG_REVIVED_AMBER call_if 1, EventScript_16E8A1 compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_16E897 - compare_var_to_value VAR_0x406A, 2 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 goto_if_eq EventScript_16E736 - compare_var_to_value VAR_0x406A, 1 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 goto_if_eq EventScript_16E72C call EventScript_16E4EC compare_var_to_value VAR_RESULT, 1 @@ -67,7 +67,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D EventScript_16E4EC:: @ 816E4EC checkflag FLAG_0x273 goto_if 0, EventScript_16E534 - checkflag FLAG_0x2ED + checkflag FLAG_REVIVED_HELIX goto_if_eq EventScript_16E534 setvar VAR_RESULT, 1 return @@ -75,7 +75,7 @@ EventScript_16E4EC:: @ 816E4EC EventScript_16E504:: @ 816E504 checkflag FLAG_0x272 goto_if 0, EventScript_16E534 - checkflag FLAG_0x2EC + checkflag FLAG_REVIVED_DOME goto_if_eq EventScript_16E534 setvar VAR_RESULT, 1 return @@ -83,7 +83,7 @@ EventScript_16E504:: @ 816E504 EventScript_16E51C:: @ 816E51C checkflag FLAG_0x25E goto_if 0, EventScript_16E534 - checkflag FLAG_0x2EE + checkflag FLAG_REVIVED_AMBER goto_if_eq EventScript_16E534 setvar VAR_RESULT, 1 return @@ -161,8 +161,8 @@ EventScript_16E668:: @ 816E668 textcolor 0 removeitem ITEM_HELIX_FOSSIL, 1 msgbox gUnknown_819A4AB - setvar VAR_0x406A, 1 - setvar VAR_0x4069, 1 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1 release end @@ -176,8 +176,8 @@ EventScript_16E6A6:: @ 816E6A6 textcolor 0 removeitem ITEM_DOME_FOSSIL, 1 msgbox gUnknown_819A4AB - setvar VAR_0x406A, 1 - setvar VAR_0x4069, 2 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2 release end @@ -191,8 +191,8 @@ EventScript_16E6E4:: @ 816E6E4 textcolor 0 removeitem ITEM_OLD_AMBER, 1 msgbox gUnknown_819A4AB - setvar VAR_0x406A, 1 - setvar VAR_0x4069, 3 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3 release end @@ -207,22 +207,22 @@ EventScript_16E72C:: @ 816E72C end EventScript_16E736:: @ 816E736 - compare_var_to_value VAR_0x4069, 1 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1 goto_if_eq EventScript_16E758 - compare_var_to_value VAR_0x4069, 2 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2 goto_if_eq EventScript_16E79D - compare_var_to_value VAR_0x4069, 3 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3 goto_if_eq EventScript_16E7E2 end EventScript_16E758:: @ 816E758 - setvar VAR_0x4001, 138 + setvar VAR_0x4001, SPECIES_OMANYTE getspeciesname 0, SPECIES_OMANYTE msgbox gUnknown_819A34F givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A927C - setflag FLAG_0x2ED + setflag FLAG_REVIVED_HELIX compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16E827 compare_var_to_value VAR_RESULT, 1 @@ -230,13 +230,13 @@ EventScript_16E758:: @ 816E758 end EventScript_16E79D:: @ 816E79D - setvar VAR_0x4001, 140 + setvar VAR_0x4001, SPECIES_KABUTO getspeciesname 0, SPECIES_KABUTO msgbox gUnknown_819A34F givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A927C - setflag FLAG_0x2EC + setflag FLAG_REVIVED_DOME compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16E827 compare_var_to_value VAR_RESULT, 1 @@ -244,13 +244,13 @@ EventScript_16E79D:: @ 816E79D end EventScript_16E7E2:: @ 816E7E2 - setvar VAR_0x4001, 142 + setvar VAR_0x4001, SPECIES_AERODACTYL getspeciesname 0, SPECIES_AERODACTYL msgbox gUnknown_819A34F givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A927C - setflag FLAG_0x2EE + setflag FLAG_REVIVED_AMBER compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16E827 compare_var_to_value VAR_RESULT, 1 @@ -263,7 +263,7 @@ EventScript_16E827:: @ 816E827 message Text_19A39E waitmessage waitfanfare - setvar VAR_0x406A, 0 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16E895 @@ -278,7 +278,7 @@ EventScript_16E85B:: @ 816E85B message Text_19A39E waitmessage waitfanfare - setvar VAR_0x406A, 0 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16E88A @@ -309,13 +309,13 @@ EventScript_16E8A1:: @ 816E8A1 end EventScript_16E8B9:: @ 816E8B9 - checkflag FLAG_0x2ED + checkflag FLAG_REVIVED_HELIX goto_if 0, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E8C8:: @ 816E8C8 - checkflag FLAG_0x2EC + checkflag FLAG_REVIVED_DOME goto_if 0, EventScript_16E534 setvar VAR_RESULT, 1 return diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index bf53c4597..c82cf9f50 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -159,7 +159,7 @@ "x": 22, "y": 11, "elevation": 3, - "var": "VAR_0x4088", + "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE", "var_value": 0, "script": "FiveIsland_RocketWarehouse_EventScript_163F81" }, @@ -168,7 +168,7 @@ "x": 23, "y": 11, "elevation": 3, - "var": "VAR_0x4088", + "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE", "var_value": 0, "script": "FiveIsland_RocketWarehouse_EventScript_163F81" }, @@ -177,7 +177,7 @@ "x": 24, "y": 11, "elevation": 3, - "var": "VAR_0x4088", + "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE", "var_value": 0, "script": "FiveIsland_RocketWarehouse_EventScript_163F81" } diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 7e6a885b4..b090f94b7 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -38,7 +38,7 @@ FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 lockall applymovement 4, Movement_1A75E7 waitmovement 0 - setvar VAR_0x4088, 1 + setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 releaseall end @@ -91,7 +91,7 @@ EventScript_16402F:: @ 816402F removeobject 3 setflag FLAG_0x088 fadescreen 0 - setvar VAR_0x4088, 1 + setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 setflag FLAG_0x2D5 release end diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 6be98b468..b47ef6927 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -81,7 +81,7 @@ "x": 11, "y": 18, "elevation": 3, - "var": "VAR_0x4080", + "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", "var_value": 0, "script": "FourIsland_IcefallCave_Back_EventScript_163D98" }, @@ -90,7 +90,7 @@ "x": 12, "y": 18, "elevation": 3, - "var": "VAR_0x4080", + "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", "var_value": 0, "script": "FourIsland_IcefallCave_Back_EventScript_163D98" }, @@ -99,7 +99,7 @@ "x": 13, "y": 18, "elevation": 3, - "var": "VAR_0x4080", + "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", "var_value": 0, "script": "FourIsland_IcefallCave_Back_EventScript_163D98" } diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 06b8ed5e1..d14521586 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -3,7 +3,7 @@ FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 .byte 0 FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88 - compare_var_to_value VAR_0x4080, 1 + compare_var_to_value VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 call_if 1, EventScript_163D94 end @@ -83,7 +83,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 msgbox gUnknown_817B457 setflag FLAG_0x08E clearflag FLAG_0x08C - setvar VAR_0x4080, 1 + setvar VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 releaseall end diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index 999662e6e..642332965 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -4,7 +4,7 @@ LavenderTown_MapScripts:: @ 816686B LavenderTown_MapScript1_166871:: @ 8166871 setworldmapflag FLAG_WORLD_MAP_LAVENDER_TOWN - setvar VAR_0x405B, 1 + setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 setflag FLAG_0x03D end diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 7da817efd..fa38fac93 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -324,7 +324,7 @@ "x": 37, "y": 43, "elevation": 0, - "var": "VAR_0x407F", + "var": "VAR_MAP_SCENE_MT_EMBER_EXTERIOR", "var_value": 1, "script": "MtEmber_Exterior_EventScript_163A4E" }, @@ -333,7 +333,7 @@ "x": 38, "y": 43, "elevation": 0, - "var": "VAR_0x407F", + "var": "VAR_MAP_SCENE_MT_EMBER_EXTERIOR", "var_value": 1, "script": "MtEmber_Exterior_EventScript_163A4E" }, @@ -342,7 +342,7 @@ "x": 39, "y": 43, "elevation": 0, - "var": "VAR_0x407F", + "var": "VAR_MAP_SCENE_MT_EMBER_EXTERIOR", "var_value": 1, "script": "MtEmber_Exterior_EventScript_163A4E" } diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 198a0e1c0..9aa791184 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -5,7 +5,7 @@ MtEmber_Exterior_MapScripts:: @ 8163946 MtEmber_Exterior_MapScript1_163951:: @ 8163951 setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR - compare_var_to_value VAR_0x407F, 2 + compare_var_to_value VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 call_if 1, EventScript_163960 end @@ -111,7 +111,7 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E waitmovement 0 call EventScript_163960 msgbox gUnknown_817A9E1 - setvar VAR_0x407F, 2 + setvar VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 releaseall end diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index ad5ea2d86..7d5fd8368 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -193,7 +193,7 @@ "x": 14, "y": 11, "elevation": 3, - "var": "VAR_0x408B", + "var": "VAR_MAP_SCENE_MT_MOON_B2F", "var_value": 0, "script": "MtMoon_B2F_EventScript_1606B0" } diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 9ffc6b1e0..1fb1a3251 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -39,7 +39,7 @@ EventScript_1606DD:: @ 81606DD waitbuttonpress setvar VAR_LAST_TALKED, 3 trainerbattle 3, TRAINER_SUPER_NERD_MIGUEL, 0, Text_172B99 - setvar VAR_0x408B, 1 + setvar VAR_MAP_SCENE_MT_MOON_B2F, 1 msgbox gUnknown_8172BAB return diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index fef3ac5df..6604b9ea3 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -112,9 +112,9 @@ EventScript_170CB1:: @ 8170CB1 additem ITEM_TRI_PASS, 1 giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5 msgbox gUnknown_81A1150 - compare_var_to_value VAR_0x4058, 2 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if 4, EventScript_170E46 - compare_var_to_value VAR_0x4058, 2 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if 0, EventScript_170E58 setflag FLAG_0x845 msgbox gUnknown_81A1230 @@ -147,7 +147,7 @@ EventScript_170E46:: @ 8170E46 EventScript_170E58:: @ 8170E58 setflag FLAG_0x039 - setvar VAR_0x4058, 2 + setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 additem ITEM_TOWN_MAP, 1 giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5 return @@ -375,7 +375,7 @@ EventScript_1710FC:: @ 81710FC applymovement 3, Movement_1A75E1 waitmovement 0 msgbox gUnknown_81A17DF - setvar VAR_0x407F, 1 + setvar VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 1 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 release end @@ -517,7 +517,7 @@ EventScript_1711DA:: @ 81711DA setflag FLAG_0x072 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 clearflag FLAG_0x062 - setvar VAR_0x4071, 3 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 3 setvar VAR_0x8004, 1 setvar VAR_0x8006, 8 goto EventScript_1A90DA diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 4b4acaf09..b47575c42 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -93,7 +93,7 @@ "x": 12, "y": 1, "elevation": 3, - "var": "VAR_MAP_SCENE_PALLET_TOWN", + "var": "VAR_MAP_SCENE_PALLET_TOWN_OAK", "var_value": 0, "script": "PalletTown_EventScript_1655ED" }, @@ -102,7 +102,7 @@ "x": 13, "y": 1, "elevation": 3, - "var": "VAR_MAP_SCENE_PALLET_TOWN", + "var": "VAR_MAP_SCENE_PALLET_TOWN_OAK", "var_value": 0, "script": "PalletTown_EventScript_1655F9" }, diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index fb4e11798..eb3a85f4c 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -7,22 +7,22 @@ PalletTown_MapScript1_165465:: @ 8165465 setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN checkflag FLAG_0x291 call_if 1, EventScript_165488 - compare_var_to_value VAR_0x4070, 0 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 call_if 1, EventScript_1654A8 - compare_var_to_value VAR_0x4070, 1 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 call_if 1, EventScript_1654A2 end EventScript_165488:: @ 8165488 - checkflag FLAG_0x83E + checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN goto_if 0, EventScript_1A77A9 - compare_var_to_value VAR_0x4070, 1 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 goto_if 4, EventScript_1A77A9 - setvar VAR_0x4070, 1 + setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return EventScript_1654A2:: @ 81654A2 - setvar VAR_0x4070, 2 + setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 return EventScript_1654A8:: @ 81654A8 @@ -39,7 +39,7 @@ EventScript_1654BD:: @ 81654BD return PalletTown_MapScript2_1654CE:: @ 81654CE - map_script_2 VAR_MAP_SCENE_PALLET_TOWN, 2, EventScript_1654D8 + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_OAK, 2, EventScript_1654D8 .2byte 0 EventScript_1654D8:: @ 81654D8 @@ -75,7 +75,7 @@ EventScript_1654D8:: @ 81654D8 closedoor 16, 13 waitdooranim setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 - setvar VAR_MAP_SCENE_PALLET_TOWN, 3 + setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 3 setflag FLAG_0x02C warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 waitstate @@ -87,7 +87,7 @@ EventScript_16557E:: @ 816557E applymovement 3, Movement_1655BE waitmovement 0 removeobject 3 - setvar VAR_MAP_SCENE_PALLET_TOWN, 3 + setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 3 releaseall end @@ -222,7 +222,7 @@ EventScript_165605:: @ 8165605 waitdooranim setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 clearflag FLAG_0x02B - setvar VAR_MAP_SCENE_PALLET_TOWN, 1 + setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 1 setflag FLAG_0x02C setflag FLAG_SPECIAL_FLAG_0x4001 warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 @@ -376,9 +376,9 @@ Movement_165758:: @ 8165758 PalletTown_EventScript_16575C:: @ 816575C lock - compare_var_to_value VAR_0x4070, 2 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 goto_if_eq EventScript_1657ED - compare_var_to_value VAR_0x4070, 1 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 goto_if_eq EventScript_165815 compare_var_to_value VAR_0x4002, 1 goto_if_eq EventScript_1658C2 @@ -472,7 +472,7 @@ PalletTown_EventScript_165862:: @ 8165862 PalletTown_EventScript_16586B:: @ 816586B lockall msgbox gUnknown_81B1CC1 - setvar VAR_0x4070, 1 + setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 releaseall end @@ -491,8 +491,8 @@ EventScript_165894:: @ 8165894 closemessage delay 20 textcolor 3 - setflag FLAG_0x83E - setvar VAR_0x4070, 1 + setflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN + setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 setvar VAR_0x4002, 0 special sub_80699E0 special sub_80699BC diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index ffe5d8aec..77ad05e06 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -3,9 +3,9 @@ PalletTown_GarysHouse_MapScripts:: @ 8168D27 .byte 0 PalletTown_GarysHouse_MapScript1_168D2D:: @ 8168D2D - compare_var_to_value VAR_0x4058, 2 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if 0, EventScript_168D44 - compare_var_to_value VAR_0x4058, 2 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if 4, EventScript_168D50 end @@ -28,9 +28,9 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 goto_if_eq EventScript_168DB9 compare_var_to_value VAR_0x4001, 1 goto_if_eq EventScript_168EEC - compare_var_to_value VAR_0x4058, 2 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 goto_if_eq EventScript_168F59 - compare_var_to_value VAR_0x4058, 1 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 goto_if_eq EventScript_168EF6 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 goto_if 4, EventScript_168DAF @@ -150,7 +150,7 @@ EventScript_168EF6:: @ 8168EF6 applymovement 1, Movement_1A75EB waitmovement 0 removeobject 2 - setvar VAR_0x4058, 2 + setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 delay 15 applymovement 1, Movement_1A75E1 waitmovement 0 diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 7ddae81ca..bb31dba40 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -603,7 +603,7 @@ PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 goto_if_eq EventScript_169A6E checkflag FLAG_SYS_GAME_CLEAR goto_if_eq EventScript_1699CE - compare_var_to_value VAR_0x4052, 1 + compare_var_to_value VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 goto_if_eq EventScript_169903 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 goto_if_eq EventScript_1698D6 @@ -708,7 +708,7 @@ EventScript_16961E:: @ 816961E call EventScript_1A6675 setflag FLAG_SYS_POKEDEX_GET special sub_810B810 - setvar VAR_0x407C, 1 + setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1 msgbox gUnknown_818E612 additem ITEM_POKE_BALL, 5 giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 @@ -741,9 +741,9 @@ EventScript_16961E:: @ 816961E fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 2 - setvar VAR_0x4051, 1 - setvar VAR_0x4058, 1 - setvar VAR_0x4054, 1 + setvar VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 + setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 + setvar VAR_MAP_SCENE_ROUTE22, 1 release end @@ -1001,7 +1001,7 @@ EventScript_1699FB:: @ 81699FB end EventScript_169A34:: @ 8169A34 - compare_var_to_value VAR_0x4054, 2 + compare_var_to_value VAR_MAP_SCENE_ROUTE22, 2 goto_if 4, EventScript_169A45 goto EventScript_169A6E end @@ -1143,13 +1143,18 @@ Movement_169BA4:: @ 8169BA4 step_10 step_end + .equ VAR_OAKSLAB_PLAYER_STARTER_NO, VAR_0x4001 + .equ VAR_OAKSLAB_PLAYER_STARTER_SPECIES, VAR_0x4002 + .equ VAR_OAKSLAB_RIVAL_STARTER_SPECIES, VAR_0x4003 + .equ VAR_OAKSLAB_RIVAL_STARTER_OBJID, VAR_0x4004 + PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB lock faceplayer - setvar VAR_0x4001, 0 - setvar VAR_0x4002, 1 - setvar VAR_0x4003, 4 - setvar VAR_0x4004, 7 + setvar VAR_OAKSLAB_PLAYER_STARTER_NO, 0 + setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_BULBASAUR + setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER + setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 7 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 4, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 @@ -1161,121 +1166,121 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB EventScript_169BE1:: @ 8169BE1 applymovement 4, Movement_1A75EF waitmovement 0 - drawmonpic VAR_0x4002, 10, 3 + drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3 textcolor 0 - compare_var_to_value VAR_0x4001, 0 - goto_if_eq EventScript_169C14 - compare_var_to_value VAR_0x4001, 1 - goto_if_eq EventScript_169C33 - compare_var_to_value VAR_0x4001, 2 - goto_if_eq EventScript_169C52 + compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0 + goto_if_eq EventScript_OakDescribesBulbasaur + compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1 + goto_if_eq EventScript_OakDescribesCharmander + compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2 + goto_if_eq EventScript_OakDescribesSquirtle end -EventScript_169C14:: @ 8169C14 +EventScript_OakDescribesBulbasaur:: @ 8169C14 msgbox gUnknown_818E272, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_169C74 + goto_if_eq EventScript_ThisPokeIsRealyEnergetic compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_169C71 + goto_if_eq EventScript_DeclinedStarter end -EventScript_169C33:: @ 8169C33 +EventScript_OakDescribesCharmander:: @ 8169C33 msgbox gUnknown_818E207, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_169C74 + goto_if_eq EventScript_ThisPokeIsRealyEnergetic compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_169C71 + goto_if_eq EventScript_DeclinedStarter end -EventScript_169C52:: @ 8169C52 +EventScript_OakDescribesSquirtle:: @ 8169C52 msgbox gUnknown_818E194, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_169C74 + goto_if_eq EventScript_ThisPokeIsRealyEnergetic compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_169C71 + goto_if_eq EventScript_DeclinedStarter end -EventScript_169C71:: @ 8169C71 +EventScript_DeclinedStarter:: @ 8169C71 erasemonpic release end -EventScript_169C74:: @ 8169C74 +EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 erasemonpic removeobject VAR_LAST_TALKED msgbox gUnknown_818E2E5 call EventScript_1A6675 setflag FLAG_SYS_POKEMON_GET setflag FLAG_0x291 - givemon VAR_0x4002, 5, ITEM_NONE, 0, 0, 0 - copyvar VAR_STARTER_MON, VAR_0x4001 - getspeciesname 0, VAR_0x4002 + givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE, 0, 0, 0 + copyvar VAR_STARTER_MON, VAR_OAKSLAB_PLAYER_STARTER_NO + getspeciesname 0, VAR_OAKSLAB_PLAYER_STARTER_SPECIES message Text_18E30D waitmessage playfanfare MUS_FAN5 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_169CCC + goto_if_eq EventScript_GiveNicknameToStarter compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_169CDC + goto_if_eq EventScript_SkipGiveNicknameToStarter end -EventScript_169CCC:: @ 8169CCC +EventScript_GiveNicknameToStarter:: @ 8169CCC setvar VAR_0x8004, 0 call EventScript_1A74EB - goto EventScript_169CDC + goto EventScript_SkipGiveNicknameToStarter end -EventScript_169CDC:: @ 8169CDC +EventScript_SkipGiveNicknameToStarter:: @ 8169CDC closemessage - compare_var_to_value VAR_0x4001, 0 - goto_if_eq EventScript_169CFF - compare_var_to_value VAR_0x4001, 1 - goto_if_eq EventScript_169D1F - compare_var_to_value VAR_0x4001, 2 - goto_if_eq EventScript_169D0F + compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0 + goto_if_eq EventScript_RivalWalksToCharmander + compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1 + goto_if_eq EventScript_RivalWalksToSquirtle + compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2 + goto_if_eq EventScript_RivalWalksToBulbasaur end -EventScript_169CFF:: @ 8169CFF - applymovement 8, Movement_169D62 +EventScript_RivalWalksToCharmander:: @ 8169CFF + applymovement 8, Movement_RivalWalksToCharmander waitmovement 0 - goto EventScript_169D2F + goto Movement_RivalTakesHisStarter end -EventScript_169D0F:: @ 8169D0F - applymovement 8, Movement_169D6B +EventScript_RivalWalksToBulbasaur:: @ 8169D0F + applymovement 8, Movement_RivalWalksToBulbasaur waitmovement 0 - goto EventScript_169D2F + goto Movement_RivalTakesHisStarter end -EventScript_169D1F:: @ 8169D1F - applymovement 8, Movement_169D72 +EventScript_RivalWalksToSquirtle:: @ 8169D1F + applymovement 8, Movement_RivalWalksToSquirtle waitmovement 0 - goto EventScript_169D2F + goto Movement_RivalTakesHisStarter end -EventScript_169D2F:: @ 8169D2F +Movement_RivalTakesHisStarter:: @ 8169D2F textcolor 0 msgbox gUnknown_818DD34 - removeobject VAR_0x4004 + removeobject VAR_OAKSLAB_RIVAL_STARTER_OBJID textcolor 3 - getspeciesname 0, VAR_0x4003 + getspeciesname 0, VAR_OAKSLAB_RIVAL_STARTER_SPECIES message Text_18DD52 waitmessage playfanfare MUS_FAN5 waitfanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - checkflag FLAG_0x83E + checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN call_if 1, EventScript_169D5C release end EventScript_169D5C:: @ 8169D5C - setvar VAR_0x4070, 1 + setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return -Movement_169D62:: @ 8169D62 +Movement_RivalWalksToCharmander:: @ 8169D62 step_10 step_10 step_13 @@ -1286,7 +1291,7 @@ Movement_169D62:: @ 8169D62 step_11 step_end -Movement_169D6B:: @ 8169D6B +Movement_RivalWalksToBulbasaur:: @ 8169D6B step_10 step_13 step_13 @@ -1295,7 +1300,7 @@ Movement_169D6B:: @ 8169D6B step_2e step_end -Movement_169D72:: @ 8169D72 +Movement_RivalWalksToSquirtle:: @ 8169D72 step_10 step_13 step_13 @@ -1306,10 +1311,10 @@ Movement_169D72:: @ 8169D72 PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 lock faceplayer - setvar VAR_0x4001, 1 - setvar VAR_0x4002, 7 - setvar VAR_0x4003, 1 - setvar VAR_0x4004, 5 + setvar VAR_OAKSLAB_PLAYER_STARTER_NO, 1 + setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_SQUIRTLE + setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR + setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 5 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 4, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 @@ -1321,10 +1326,10 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE lock faceplayer - setvar VAR_0x4001, 2 - setvar VAR_0x4002, 4 - setvar VAR_0x4003, 7 - setvar VAR_0x4004, 6 + setvar VAR_OAKSLAB_PLAYER_STARTER_NO, 2 + setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_CHARMANDER + setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE + setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 6 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 4, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index a3e8f4d40..d1d8f5b96 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -173,7 +173,7 @@ "x": 42, "y": 21, "elevation": 3, - "var": "VAR_0x406C", + "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 0, "script": "PewterCity_EventScript_165D8E" }, @@ -182,7 +182,7 @@ "x": 42, "y": 22, "elevation": 3, - "var": "VAR_0x406C", + "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 0, "script": "PewterCity_EventScript_165D9A" }, @@ -191,7 +191,7 @@ "x": 42, "y": 23, "elevation": 3, - "var": "VAR_0x406C", + "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 0, "script": "PewterCity_EventScript_165DA6" }, @@ -200,7 +200,7 @@ "x": 43, "y": 23, "elevation": 3, - "var": "VAR_0x406C", + "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 0, "script": "PewterCity_EventScript_165DB2" }, @@ -209,7 +209,7 @@ "x": 46, "y": 21, "elevation": 3, - "var": "VAR_0x406C", + "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 1, "script": "PewterCity_EventScript_1662B7" }, @@ -218,7 +218,7 @@ "x": 46, "y": 22, "elevation": 3, - "var": "VAR_0x406C", + "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 1, "script": "PewterCity_EventScript_1662C4" }, @@ -227,7 +227,7 @@ "x": 46, "y": 23, "elevation": 3, - "var": "VAR_0x406C", + "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 1, "script": "PewterCity_EventScript_1662D1" } diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index d4c461de2..41069ec3f 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -4,7 +4,7 @@ PewterCity_MapScripts:: @ 8165B8E PewterCity_MapScript1_165B94:: @ 8165B94 setworldmapflag FLAG_WORLD_MAP_PEWTER_CITY - setvar VAR_0x4061, 0 + setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 0 end PewterCity_EventScript_165B9D:: @ 8165B9D @@ -1468,8 +1468,8 @@ EventScript_1662DE:: @ 81662DE msgbox gUnknown_817EA36 closemessage removeobject 7 - setflag FLAG_0x82F - setvar VAR_0x406C, 2 + setflag FLAG_SYS_RUNNING_SHOES + setvar VAR_MAP_SCENE_PEWTER_CITY, 2 return EventScript_1663CA:: @ 81663CA diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index f23729456..aadf6ed98 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -18,7 +18,7 @@ EventScript_16A5C5:: @ 816A5C5 special SetFlavorTextFlagFromSpecialVars setflag FLAG_0x4B0 setflag FLAG_BADGE01_GET - setvar VAR_0x406C, 1 + setvar VAR_MAP_SCENE_PEWTER_CITY, 1 setflag FLAG_0x02E clearflag FLAG_0x092 setvar VAR_0x8008, 1 diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 8a4e54380..0f545ce75 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -142,7 +142,7 @@ "x": 12, "y": 5, "elevation": 3, - "var": "VAR_0x4061", + "var": "VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F", "var_value": 0, "script": "PewterCity_Museum_1F_EventScript_16A38F" }, @@ -151,7 +151,7 @@ "x": 13, "y": 5, "elevation": 3, - "var": "VAR_0x4061", + "var": "VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F", "var_value": 0, "script": "PewterCity_Museum_1F_EventScript_16A3A5" }, @@ -160,7 +160,7 @@ "x": 14, "y": 5, "elevation": 3, - "var": "VAR_0x4061", + "var": "VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F", "var_value": 0, "script": "PewterCity_Museum_1F_EventScript_16A3BB" } diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 275282638..3b83cbf3a 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -92,7 +92,7 @@ EventScript_16A402:: @ 816A402 updatemoneybox 0, 0, 0 waitse msgbox gUnknown_8190505 - setvar VAR_0x4061, 1 + setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 1 hidemoneybox .byte 0 .byte 0 diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 904002c30..b7a6b4751 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -13,7 +13,7 @@ PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825 PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830 checkflag FLAG_0x4BA call_if 1, EventScript_16284B - compare_var_to_value VAR_0x4068, 3 + compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 3 call_if 1, EventScript_162845 end @@ -34,13 +34,13 @@ EventScript_16285B:: @ 816285B end PokemonLeague_AgathasRoom_MapScript4_162860:: @ 8162860 - map_script_2 VAR_0x4068, 2, EventScript_16286A + map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 2, EventScript_16286A .2byte 0 EventScript_16286A:: @ 816286A lockall call EventScript_1A751F - setvar VAR_0x4068, 3 + setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 3 releaseall end diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 747833135..ae1e84901 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -13,7 +13,7 @@ PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5 checkflag FLAG_0x4B9 call_if 1, EventScript_1626C0 - compare_var_to_value VAR_0x4068, 2 + compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 2 call_if 1, EventScript_1626BA end @@ -34,13 +34,13 @@ EventScript_1626D0:: @ 81626D0 end PokemonLeague_BrunosRoom_MapScript4_1626D5:: @ 81626D5 - map_script_2 VAR_0x4068, 1, EventScript_1626DF + map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 1, EventScript_1626DF .2byte 0 EventScript_1626DF:: @ 81626DF lockall call EventScript_1A751F - setvar VAR_0x4068, 2 + setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 2 releaseall end diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 0b46c0fa1..295bf1b80 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -11,7 +11,7 @@ PokemonLeague_LancesRoom_MapScript1_162942:: @ 8162942 end PokemonLeague_LancesRoom_MapScript2_16294D:: @ 816294D - compare_var_to_value VAR_0x4068, 4 + compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 4 call_if 1, EventScript_162962 checkflag FLAG_0x4BB call_if 1, EventScript_162968 @@ -34,7 +34,7 @@ EventScript_162978:: @ 8162978 end PokemonLeague_LancesRoom_MapScript4_16297D:: @ 816297D - map_script_2 VAR_0x4068, 3, EventScript_162987 + map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 3, EventScript_162987 .2byte 0 EventScript_162987:: @ 8162987 @@ -46,7 +46,7 @@ EventScript_162987:: @ 8162987 playse SE_KI_GASYAN special DrawWholeMapView waitse - setvar VAR_0x4068, 4 + setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 4 releaseall end diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index 0f0db575e..5356038e3 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -14,7 +14,7 @@ PokemonLeague_LoreleisRoom_MapScript1_162586:: @ 8162586 PokemonLeague_LoreleisRoom_MapScript2_162591:: @ 8162591 checkflag FLAG_0x4B8 call_if 1, EventScript_1625AC - compare_var_to_value VAR_0x4068, 1 + compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 1 call_if 1, EventScript_1625A6 end @@ -39,13 +39,13 @@ EventScript_1625C0:: @ 81625C0 end PokemonLeague_LoreleisRoom_MapScript5_1625C5:: @ 81625C5 - map_script_2 VAR_0x4068, 0, EventScript_1625CF + map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 0, EventScript_1625CF .2byte 0 EventScript_1625CF:: @ 81625CF lockall call EventScript_1A751F - setvar VAR_0x4068, 1 + setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 1 releaseall end diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 4aea2b3b7..9b23a2904 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -62,7 +62,7 @@ "x": 17, "y": 5, "elevation": 3, - "var": "VAR_0x405D", + "var": "VAR_MAP_SCENE_POKEMON_TOWER_2F", "var_value": 0, "script": "PokemonTower_2F_EventScript_16328F" }, @@ -71,7 +71,7 @@ "x": 16, "y": 6, "elevation": 3, - "var": "VAR_0x405D", + "var": "VAR_MAP_SCENE_POKEMON_TOWER_2F", "var_value": 0, "script": "PokemonTower_2F_EventScript_16329B" } diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 9706ca26c..13de9b5a4 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -47,7 +47,7 @@ EventScript_1632A7:: @ 81632A7 delay 25 fadedefaultbgm removeobject 1 - setvar VAR_0x405D, 1 + setvar VAR_MAP_SCENE_POKEMON_TOWER_2F, 1 releaseall end diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index b331bed20..f97249088 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -101,7 +101,7 @@ "x": 11, "y": 15, "elevation": 3, - "var": "VAR_0x4059", + "var": "VAR_MAP_SCENE_POKEMON_TOWER_6F", "var_value": 0, "script": "PokemonTower_6F_EventScript_1634B8" }, @@ -110,7 +110,7 @@ "x": 12, "y": 16, "elevation": 3, - "var": "VAR_0x4059", + "var": "VAR_MAP_SCENE_POKEMON_TOWER_6F", "var_value": 0, "script": "PokemonTower_6F_EventScript_1634B8" } diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 69f324b83..8a221884a 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -27,7 +27,7 @@ EventScript_1634F5:: @ 81634F5 waitbuttonpress waitmoncry msgbox gUnknown_817A342 - setvar VAR_0x4059, 1 + setvar VAR_MAP_SCENE_POKEMON_TOWER_6F, 1 releaseall end diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index c03b8068d..5a5969bb3 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -60,7 +60,7 @@ "x": 33, "y": 4, "elevation": 3, - "var": "VAR_0x4054", + "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 1, "script": "Route22_EventScript_16828C" }, @@ -69,7 +69,7 @@ "x": 33, "y": 5, "elevation": 3, - "var": "VAR_0x4054", + "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 1, "script": "Route22_EventScript_168298" }, @@ -78,7 +78,7 @@ "x": 33, "y": 6, "elevation": 0, - "var": "VAR_0x4054", + "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 1, "script": "Route22_EventScript_1682AB" }, @@ -87,7 +87,7 @@ "x": 33, "y": 4, "elevation": 3, - "var": "VAR_0x4054", + "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 3, "script": "Route22_EventScript_1683ED" }, @@ -96,7 +96,7 @@ "x": 33, "y": 5, "elevation": 3, - "var": "VAR_0x4054", + "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 3, "script": "Route22_EventScript_1683F9" }, @@ -105,7 +105,7 @@ "x": 33, "y": 6, "elevation": 0, - "var": "VAR_0x4054", + "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 3, "script": "Route22_EventScript_16840C" } diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index d7855e45e..930665e21 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -57,7 +57,7 @@ EventScript_1682BE:: @ 81682BE call_if 1, EventScript_1683A5 fadedefaultbgm removeobject 1 - setvar VAR_0x4054, 2 + setvar VAR_MAP_SCENE_ROUTE22, 2 releaseall end @@ -219,7 +219,7 @@ EventScript_16841F:: @ 816841F waitmovement 0 fadedefaultbgm removeobject 1 - setvar VAR_0x4054, 4 + setvar VAR_MAP_SCENE_ROUTE22, 4 releaseall end diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index f1f379416..71a4802f7 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -63,7 +63,7 @@ "x": 7, "y": 2, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 0, "script": "Route22_NorthEntrance_EventScript_17050D" } diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 0daa60650..42b705667 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -152,7 +152,7 @@ "x": 13, "y": 149, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 1, "script": "Route23_EventScript_168583" }, @@ -161,7 +161,7 @@ "x": 7, "y": 140, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 2, "script": "Route23_EventScript_168598" }, @@ -170,7 +170,7 @@ "x": 12, "y": 123, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 3, "script": "Route23_EventScript_1685AD" }, @@ -179,7 +179,7 @@ "x": 11, "y": 111, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -188,7 +188,7 @@ "x": 9, "y": 94, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 5, "script": "Route23_EventScript_1685D7" }, @@ -197,7 +197,7 @@ "x": 12, "y": 61, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 6, "script": "Route23_EventScript_1685EC" }, @@ -206,7 +206,7 @@ "x": 1, "y": 35, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -215,7 +215,7 @@ "x": 1, "y": 34, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -224,7 +224,7 @@ "x": 1, "y": 32, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -233,7 +233,7 @@ "x": 1, "y": 33, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -242,7 +242,7 @@ "x": 1, "y": 31, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -251,7 +251,7 @@ "x": 1, "y": 36, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -260,7 +260,7 @@ "x": 5, "y": 35, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -269,7 +269,7 @@ "x": 4, "y": 35, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -278,7 +278,7 @@ "x": 10, "y": 60, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 6, "script": "Route23_EventScript_1685EC" }, @@ -287,7 +287,7 @@ "x": 13, "y": 61, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 6, "script": "Route23_EventScript_1685EC" }, @@ -296,7 +296,7 @@ "x": 11, "y": 60, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 6, "script": "Route23_EventScript_1685EC" }, @@ -305,7 +305,7 @@ "x": 8, "y": 94, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 5, "script": "Route23_EventScript_1685D7" }, @@ -314,7 +314,7 @@ "x": 5, "y": 92, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 5, "script": "Route23_EventScript_1685D7" }, @@ -323,7 +323,7 @@ "x": 7, "y": 94, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 5, "script": "Route23_EventScript_1685D7" }, @@ -332,7 +332,7 @@ "x": 4, "y": 92, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 5, "script": "Route23_EventScript_1685D7" }, @@ -341,7 +341,7 @@ "x": 3, "y": 92, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 5, "script": "Route23_EventScript_1685D7" }, @@ -350,7 +350,7 @@ "x": 2, "y": 92, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 5, "script": "Route23_EventScript_1685D7" }, @@ -359,7 +359,7 @@ "x": 4, "y": 139, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 2, "script": "Route23_EventScript_168598" }, @@ -368,7 +368,7 @@ "x": 5, "y": 139, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 2, "script": "Route23_EventScript_168598" }, @@ -377,7 +377,7 @@ "x": 6, "y": 140, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 2, "script": "Route23_EventScript_168598" }, @@ -386,7 +386,7 @@ "x": 10, "y": 122, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 3, "script": "Route23_EventScript_1685AD" }, @@ -395,7 +395,7 @@ "x": 11, "y": 122, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 3, "script": "Route23_EventScript_1685AD" }, @@ -404,7 +404,7 @@ "x": 13, "y": 123, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 3, "script": "Route23_EventScript_1685AD" }, @@ -413,7 +413,7 @@ "x": 8, "y": 109, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -422,7 +422,7 @@ "x": 9, "y": 109, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -431,7 +431,7 @@ "x": 10, "y": 109, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -440,7 +440,7 @@ "x": 11, "y": 109, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -449,7 +449,7 @@ "x": 12, "y": 109, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -458,7 +458,7 @@ "x": 12, "y": 111, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -467,7 +467,7 @@ "x": 14, "y": 112, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -476,7 +476,7 @@ "x": 13, "y": 112, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -485,7 +485,7 @@ "x": 15, "y": 112, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -494,7 +494,7 @@ "x": 12, "y": 148, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 1, "script": "Route23_EventScript_168583" }, @@ -503,7 +503,7 @@ "x": 11, "y": 148, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 1, "script": "Route23_EventScript_168583" }, @@ -512,7 +512,7 @@ "x": 14, "y": 149, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 1, "script": "Route23_EventScript_168583" }, @@ -521,7 +521,7 @@ "x": 10, "y": 148, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 1, "script": "Route23_EventScript_168583" } diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index f5c504650..9d94968bc 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -5,10 +5,10 @@ Route23_MapScripts:: @ 81684EB Route23_MapScript1_1684F1:: @ 81684F1 clearflag FLAG_0x059 setflag FLAG_0x058 - setvar VAR_0x4064, 0 - setvar VAR_0x4065, 0 - setvar VAR_0x4066, 0 - setvar VAR_0x4067, 0 + setvar VAR_MAP_SCENE_VICTORY_ROAD_1F, 0 + setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 0 + setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 0 + setvar VAR_MAP_SCENE_VICTORY_ROAD_3F, 0 end Route23_EventScript_16850C:: @ 816850C diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 93dd519c1..f392b64bf 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -136,7 +136,7 @@ "x": 10, "y": 15, "elevation": 3, - "var": "VAR_0x406B", + "var": "VAR_MAP_SCENE_ROUTE24", "var_value": 0, "script": "Route24_EventScript_168660" }, @@ -145,7 +145,7 @@ "x": 11, "y": 15, "elevation": 3, - "var": "VAR_0x406B", + "var": "VAR_MAP_SCENE_ROUTE24", "var_value": 0, "script": "Route24_EventScript_16866C" } diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index e2af4628c..aee471392 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -4,7 +4,7 @@ Route24_MapScripts:: @ 816861F Route24_EventScript_168620:: @ 8168620 lock faceplayer - compare_var_to_value VAR_0x406B, 1 + compare_var_to_value VAR_MAP_SCENE_ROUTE24, 1 goto_if_eq EventScript_168656 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 @@ -62,7 +62,7 @@ EventScript_1686B9:: @ 81686B9 setvar VAR_LAST_TALKED, 1 trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_6, 0, Text_188DDC msgbox gUnknown_8188DF1 - setvar VAR_0x406B, 1 + setvar VAR_MAP_SCENE_ROUTE24, 1 return EventScript_1686FD:: @ 81686FD diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index d4b2409d3..121e9f89b 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -63,7 +63,7 @@ "x": 3, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route5_SouthEntrance_EventScript_16F90A" }, @@ -72,7 +72,7 @@ "x": 4, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route5_SouthEntrance_EventScript_16F916" }, @@ -81,7 +81,7 @@ "x": 5, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route5_SouthEntrance_EventScript_16F922" } diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index 1ac21c6b1..a065877db 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -51,7 +51,7 @@ EventScript_16F963:: @ 816F963 compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_16F9B2 msgbox gUnknown_819E0C1 - setvar VAR_0x4062, 1 + setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index efa911ca9..2e0ac628d 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -63,7 +63,7 @@ "x": 3, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route6_NorthEntrance_EventScript_16F9D0" }, @@ -72,7 +72,7 @@ "x": 4, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route6_NorthEntrance_EventScript_16F9DC" }, @@ -81,7 +81,7 @@ "x": 5, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route6_NorthEntrance_EventScript_16F9E8" } diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 9537d2e82..88aca79a9 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -51,7 +51,7 @@ EventScript_16FA29:: @ 816FA29 compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_16FA78 msgbox gUnknown_819E1F7 - setvar VAR_0x4062, 1 + setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index 1609edf7d..c8bea59f8 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -63,7 +63,7 @@ "x": 6, "y": 4, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route7_EastEntrance_EventScript_16FA97" }, @@ -72,7 +72,7 @@ "x": 6, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route7_EastEntrance_EventScript_16FAA3" }, @@ -81,7 +81,7 @@ "x": 6, "y": 6, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route7_EastEntrance_EventScript_16FAAF" } diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index 845eab835..a07ed8e8a 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -51,7 +51,7 @@ EventScript_16FAF0:: @ 816FAF0 compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_16FB3F msgbox gUnknown_819E32D - setvar VAR_0x4062, 1 + setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index 2ad2abb9b..c90244197 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -63,7 +63,7 @@ "x": 6, "y": 4, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route8_WestEntrance_EventScript_16FB5D" }, @@ -72,7 +72,7 @@ "x": 6, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route8_WestEntrance_EventScript_16FB69" }, @@ -81,7 +81,7 @@ "x": 6, "y": 6, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route8_WestEntrance_EventScript_16FB75" } diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index 1d347d2d0..60f525e79 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -61,7 +61,7 @@ EventScript_16FBCC:: @ 816FBCC compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_16FC1B msgbox gUnknown_819E463 - setvar VAR_0x4062, 1 + setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 80641f2ed..36e4dfd79 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -111,7 +111,7 @@ "x": 30, "y": 6, "elevation": 3, - "var": "VAR_0x405B", + "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR", "var_value": 0, "script": "SSAnne_2F_Corridor_EventScript_1608DF" }, @@ -120,7 +120,7 @@ "x": 31, "y": 6, "elevation": 3, - "var": "VAR_0x405B", + "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR", "var_value": 0, "script": "SSAnne_2F_Corridor_EventScript_1608EB" }, @@ -129,7 +129,7 @@ "x": 32, "y": 6, "elevation": 3, - "var": "VAR_0x405B", + "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR", "var_value": 0, "script": "SSAnne_2F_Corridor_EventScript_1608F7" } diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 79ee7db7d..652501f5b 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -61,7 +61,7 @@ EventScript_160903:: @ 8160903 call_if 1, EventScript_160A13 fadedefaultbgm removeobject 1 - setvar VAR_0x405B, 1 + setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 releaseall end diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 85f44168e..1b3c2ff04 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -134,7 +134,7 @@ "x": 5, "y": 5, "elevation": 3, - "var": "VAR_0x4081", + "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO", "var_value": 0, "script": "SaffronCity_Dojo_EventScript_16EBDC" }, @@ -143,7 +143,7 @@ "x": 7, "y": 5, "elevation": 3, - "var": "VAR_0x4081", + "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO", "var_value": 0, "script": "SaffronCity_Dojo_EventScript_16EBEE" } diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 1ec8ae42a..e35c5237a 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -3,7 +3,7 @@ SaffronCity_Dojo_MapScripts:: @ 816EBDB SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC lockall - setvar VAR_0x4081, 1 + setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 applymovement 5, Movement_1A75E7 waitmovement 0 releaseall @@ -11,7 +11,7 @@ SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE lockall - setvar VAR_0x4081, 1 + setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 applymovement 5, Movement_1A75EB waitmovement 0 releaseall @@ -155,6 +155,6 @@ EventScript_16EDC6:: @ 816EDC6 end EventScript_16EDD0:: @ 816EDD0 - setvar VAR_0x4081, 1 + setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 release end diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 65c37eaf3..8df5fce2b 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -25,7 +25,7 @@ SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 lock faceplayer - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if_eq EventScript_16F02D msgbox gUnknown_819C0B4 release diff --git a/data/maps/SevenIsland_TrainerTower/scripts.inc b/data/maps/SevenIsland_TrainerTower/scripts.inc index 74902ebc8..e0b5f78c0 100644 --- a/data/maps/SevenIsland_TrainerTower/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower/scripts.inc @@ -3,7 +3,7 @@ SevenIsland_TrainerTower_MapScripts:: @ 8168BD5 .byte 0 SevenIsland_TrainerTower_MapScript1_168BDB:: @ 8168BDB - setvar VAR_0x4082, 0 + setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 end SevenIsland_TrainerTower_EventScript_168BE1:: @ 8168BE1 diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json index ac93f0992..b690a29dd 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json +++ b/data/maps/SevenIsland_TrainerTower_Lobby/map.json @@ -108,7 +108,7 @@ "x": 9, "y": 7, "elevation": 3, - "var": "VAR_0x4082", + "var": "VAR_MAP_SCENE_TRAINER_TOWER", "var_value": 0, "script": "SevenIsland_TrainerTower_Lobby_EventScript_1649CE" } diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 5515316cb..858ff3c97 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -93,7 +93,7 @@ EventScript_16494B:: @ 816494B closemessage applymovement 255, Movement_164AD6 waitmovement 0 - setvar VAR_0x4082, 0 + setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 release EventScript_16495C:: @ 816495C @@ -195,7 +195,7 @@ EventScript_164A53:: @ 8164A53 EventScript_164AA0:: @ 8164AA0 copyvar VAR_0x8005, VAR_RESULT - setvar VAR_0x4082, 1 + setvar VAR_MAP_SCENE_TRAINER_TOWER, 1 special sp000_heal_pokemon msgbox gUnknown_817C8BF setvar VAR_0x8004, 6 diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index 637ab2ba4..255acde62 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -10,7 +10,7 @@ SilphCo_10F_MapScript1_161D8C:: @ 8161D8C SilphCo_10F_EventScript_161D96:: @ 8161D96 lock faceplayer - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if 4, EventScript_161DAD msgbox gUnknown_8176DBA release diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 3406c6a7b..0bccc6bae 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -121,7 +121,7 @@ "x": 5, "y": 15, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_MAP_SCENE_SILPH_CO_11F", "var_value": 0, "script": "SilphCo_11F_EventScript_161E88" }, @@ -130,7 +130,7 @@ "x": 6, "y": 15, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_MAP_SCENE_SILPH_CO_11F", "var_value": 0, "script": "SilphCo_11F_EventScript_161E94" } diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index de4820653..47b720f5c 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -85,7 +85,7 @@ EventScript_161EA0:: @ 8161EA0 removeobject 4 removeobject 6 fadescreen 0 - setvar VAR_0x4060, 1 + setvar VAR_MAP_SCENE_SILPH_CO_11F, 1 setflag FLAG_0x03E clearflag FLAG_0x03F releaseall diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index 517fdaa39..b5cdacdff 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -12,7 +12,7 @@ SilphCo_3F_MapScript1_1616CB:: @ 81616CB SilphCo_3F_EventScript_1616DE:: @ 81616DE lock faceplayer - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if 4, EventScript_1616F5 msgbox gUnknown_81758AD release diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index 794d2294a..efa92d1f8 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -12,7 +12,7 @@ SilphCo_4F_MapScript1_16173C:: @ 816173C SilphCo_4F_EventScript_16174F:: @ 816174F lock faceplayer - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if 4, EventScript_161766 msgbox gUnknown_81759F5 release diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index 327aede13..4a040e83e 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -14,7 +14,7 @@ SilphCo_5F_MapScript1_1617C4:: @ 81617C4 SilphCo_5F_EventScript_1617E0:: @ 81617E0 lock faceplayer - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if 4, EventScript_1617F7 msgbox gUnknown_8175B70 release diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index 7a9bc4c5a..139781594 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -10,7 +10,7 @@ SilphCo_6F_MapScript1_161887:: @ 8161887 SilphCo_6F_EventScript_161891:: @ 8161891 lock faceplayer - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if 4, EventScript_1618A8 msgbox gUnknown_817607E release @@ -24,7 +24,7 @@ EventScript_1618A8:: @ 81618A8 SilphCo_6F_EventScript_1618B2:: @ 81618B2 lock faceplayer - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if 4, EventScript_1618C9 msgbox gUnknown_8175F24 release @@ -38,7 +38,7 @@ EventScript_1618C9:: @ 81618C9 SilphCo_6F_EventScript_1618D3:: @ 81618D3 lock faceplayer - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if 4, EventScript_1618EA msgbox gUnknown_8175F70 release @@ -52,7 +52,7 @@ EventScript_1618EA:: @ 81618EA SilphCo_6F_EventScript_1618F4:: @ 81618F4 lock faceplayer - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if 4, EventScript_16190B msgbox gUnknown_8175FAA release @@ -66,7 +66,7 @@ EventScript_16190B:: @ 816190B SilphCo_6F_EventScript_161915:: @ 8161915 lock faceplayer - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if 4, EventScript_16192C msgbox gUnknown_8176012 release diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index e106c5ad8..e8298a7fa 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -207,7 +207,7 @@ "x": 2, "y": 4, "elevation": 3, - "var": "VAR_0x405C", + "var": "VAR_MAP_SCENE_SILPH_CO_7F", "var_value": 0, "script": "SilphCo_7F_EventScript_1619BC" }, @@ -216,7 +216,7 @@ "x": 2, "y": 5, "elevation": 3, - "var": "VAR_0x405C", + "var": "VAR_MAP_SCENE_SILPH_CO_7F", "var_value": 0, "script": "SilphCo_7F_EventScript_1619C8" } diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 6795c72d5..5f66a1376 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -13,7 +13,7 @@ SilphCo_7F_MapScript1_16198F:: @ 816198F end SilphCo_7F_MapScript2_1619AB:: @ 81619AB - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 call_if 4, EventScript_1619B7 end @@ -69,7 +69,7 @@ EventScript_1619D4:: @ 81619D4 fadedefaultbgm removeobject 1 waitse - setvar VAR_0x405C, 1 + setvar VAR_MAP_SCENE_SILPH_CO_7F, 1 releaseall end @@ -199,7 +199,7 @@ EventScript_161B8D:: @ 8161B8D SilphCo_7F_EventScript_161B97:: @ 8161B97 lock faceplayer - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if 4, EventScript_161BAE msgbox gUnknown_8176444 release @@ -213,7 +213,7 @@ EventScript_161BAE:: @ 8161BAE SilphCo_7F_EventScript_161BB8:: @ 8161BB8 lock faceplayer - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if 4, EventScript_161BCF msgbox gUnknown_81764C2 release @@ -227,7 +227,7 @@ EventScript_161BCF:: @ 8161BCF SilphCo_7F_EventScript_161BD9:: @ 8161BD9 lock faceplayer - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if 4, EventScript_161BF0 msgbox gUnknown_8176532 release diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 7fb3d75d0..a089a5583 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -10,7 +10,7 @@ SilphCo_8F_MapScript1_161C65:: @ 8161C65 SilphCo_8F_EventScript_161C6F:: @ 8161C6F lock faceplayer - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if 4, EventScript_161C86 msgbox gUnknown_817696D release diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index 5342e9f6b..689102cef 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -16,7 +16,7 @@ SilphCo_9F_MapScript1_161CE4:: @ 8161CE4 SilphCo_9F_EventScript_161D09:: @ 8161D09 lock faceplayer - compare_var_to_value VAR_0x4060, 1 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if 4, EventScript_161D2E msgbox gUnknown_8176B54 closemessage diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 635f1a356..9c111147d 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -264,7 +264,7 @@ "x": 7, "y": 27, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, "script": "ThreeIsland_EventScript_1679B5" }, @@ -273,7 +273,7 @@ "x": 8, "y": 27, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, "script": "ThreeIsland_EventScript_1679B5" }, @@ -282,7 +282,7 @@ "x": 9, "y": 27, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, "script": "ThreeIsland_EventScript_1679B5" }, @@ -291,7 +291,7 @@ "x": 10, "y": 27, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, "script": "ThreeIsland_EventScript_1679B5" }, @@ -300,7 +300,7 @@ "x": 7, "y": 26, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, "script": "ThreeIsland_EventScript_167A1D" }, @@ -309,7 +309,7 @@ "x": 8, "y": 26, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, "script": "ThreeIsland_EventScript_167A29" }, @@ -318,7 +318,7 @@ "x": 9, "y": 26, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, "script": "ThreeIsland_EventScript_167A35" }, @@ -327,7 +327,7 @@ "x": 11, "y": 27, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, "script": "ThreeIsland_EventScript_1679B5" }, @@ -336,7 +336,7 @@ "x": 10, "y": 26, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, "script": "ThreeIsland_EventScript_167A41" }, @@ -345,7 +345,7 @@ "x": 11, "y": 26, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, "script": "ThreeIsland_EventScript_167A4D" } diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 346d5b6a2..78d532795 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -6,7 +6,7 @@ ThreeIsland_MapScript1_1677B3:: @ 81677B3 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND checkflag FLAG_0x2A3 call_if 1, EventScript_1677CB - compare_var_to_value VAR_0x407B, 4 + compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 call_if 1, EventScript_1677CF end @@ -30,7 +30,7 @@ ThreeIsland_EventScript_1677E5:: @ 81677E5 lock checkflag FLAG_0x2FC goto_if_eq EventScript_167806 - compare_var_to_value VAR_0x407B, 4 + compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 goto_if_eq EventScript_16781A setvar VAR_0x4001, 0 call EventScript_16786F @@ -136,7 +136,7 @@ EventScript_167973:: @ 8167973 ThreeIsland_EventScript_167989:: @ 8167989 lock - compare_var_to_value VAR_0x407B, 4 + compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 goto_if_eq EventScript_1679A1 setvar VAR_0x4001, 1 call EventScript_16786F @@ -168,7 +168,7 @@ ThreeIsland_EventScript_1679B5:: @ 81679B5 applymovement 1, Movement_167A1B waitmovement 0 msgbox gUnknown_81823C7 - setvar VAR_0x407B, 3 + setvar VAR_MAP_SCENE_THREE_ISLAND, 3 releaseall end @@ -281,7 +281,7 @@ EventScript_167A59:: @ 8167A59 removeobject 8 removeobject 14 fadescreen 0 - setvar VAR_0x407B, 4 + setvar VAR_MAP_SCENE_THREE_ISLAND, 4 releaseall end diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 8fb20ce26..17851408b 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -12,7 +12,7 @@ ThreeIsland_Port_EventScript_168796:: @ 8168796 faceplayer compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 goto_if 4, EventScript_1687B8 - compare_var_to_value VAR_0x407B, 4 + compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 goto_if 4, EventScript_1687C2 msgbox gUnknown_818A307 release diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index ba2ee8216..9ccc7f1f5 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -49,21 +49,21 @@ EventScript_1675E8:: @ 81675E8 end EventScript_1675EE:: @ 81675EE - setvar VAR_0x4078, 1 + setvar VAR_MAP_SCENE_TWO_ISLAND, 1 return EventScript_1675F4:: @ 81675F4 - setvar VAR_0x4078, 2 + setvar VAR_MAP_SCENE_TWO_ISLAND, 2 clearflag FLAG_0x07B return EventScript_1675FD:: @ 81675FD - setvar VAR_0x4078, 3 + setvar VAR_MAP_SCENE_TWO_ISLAND, 3 clearflag FLAG_0x07C return EventScript_167606:: @ 8167606 - setvar VAR_0x4078, 4 + setvar VAR_MAP_SCENE_TWO_ISLAND, 4 clearflag FLAG_0x07D return @@ -73,11 +73,11 @@ TwoIsland_EventScript_16760F:: @ 816760F goto_if_eq EventScript_1A7AE0 lock faceplayer - compare_var_to_value VAR_0x4078, 4 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 4 goto_if_eq EventScript_167646 - compare_var_to_value VAR_0x4078, 3 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 3 goto_if_eq EventScript_16765E - compare_var_to_value VAR_0x4078, 2 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 2 goto_if_eq EventScript_167676 goto EventScript_16768E end @@ -121,11 +121,11 @@ EventScript_16768E:: @ 816768E EventScript_1676A6:: @ 81676A6 message Text_1A6211 waitmessage - compare_var_to_value VAR_0x4078, 4 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 4 goto_if_eq EventScript_167728 - compare_var_to_value VAR_0x4078, 3 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 3 goto_if_eq EventScript_167708 - compare_var_to_value VAR_0x4078, 2 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 2 goto_if_eq EventScript_1676EC goto EventScript_1676D3 end diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 94a0e4445..629857b3e 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -88,7 +88,7 @@ EventScript_17145F:: @ 817145F delay 60 msgbox gUnknown_81A270C clearflag FLAG_0x091 - setvar VAR_0x407B, 2 + setvar VAR_MAP_SCENE_THREE_ISLAND, 2 setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 1 releaseall end diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index f509d6232..b1201e38a 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -127,7 +127,7 @@ "x": 20, "y": 16, "elevation": 3, - "var": "VAR_0x4064", + "var": "VAR_MAP_SCENE_VICTORY_ROAD_1F", "var_value": 99, "script": "VictoryRoad_1F_EventScript_160F33" } diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 564573c38..67cf54017 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -4,7 +4,7 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 .byte 0 VictoryRoad_1F_MapScript1_160F10:: @ 8160F10 - compare_var_to_value VAR_0x4064, 100 + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 call_if 5, EventScript_160F1C end @@ -19,7 +19,7 @@ VictoryRoad_1F_MapScript2_160F2F:: @ 8160F2F VictoryRoad_1F_EventScript_160F33:: @ 8160F33 lockall - compare_var_to_value VAR_0x4064, 100 + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 goto_if_eq EventScript_160F62 setmetatile 12, 14, 721, 0 setmetatile 12, 15, 737, 0 @@ -27,7 +27,7 @@ VictoryRoad_1F_EventScript_160F33:: @ 8160F33 special DrawWholeMapView waitse moveobjectoffscreen 5 - setvar VAR_0x4064, 100 + setvar VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 releaseall end diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 1591bf1ee..a477c4474 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -254,7 +254,7 @@ "x": 2, "y": 19, "elevation": 3, - "var": "VAR_0x4065", + "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1", "var_value": 99, "script": "VictoryRoad_2F_EventScript_160FD5" }, @@ -263,7 +263,7 @@ "x": 14, "y": 19, "elevation": 3, - "var": "VAR_0x4066", + "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2", "var_value": 99, "script": "VictoryRoad_2F_EventScript_161006" } diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index 01d89cdc6..7831e662f 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -3,9 +3,9 @@ VictoryRoad_2F_MapScripts:: @ 8160F92 .byte 0 VictoryRoad_2F_MapScript1_160F98:: @ 8160F98 - compare_var_to_value VAR_0x4065, 100 + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 call_if 5, EventScript_160FAF - compare_var_to_value VAR_0x4066, 100 + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 call_if 5, EventScript_160FC2 end @@ -21,7 +21,7 @@ EventScript_160FC2:: @ 8160FC2 VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 lockall - compare_var_to_value VAR_0x4065, 100 + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 goto_if_eq EventScript_161004 setmetatile 13, 10, 721, 0 setmetatile 13, 11, 737, 0 @@ -29,7 +29,7 @@ VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 special DrawWholeMapView waitse moveobjectoffscreen 11 - setvar VAR_0x4065, 100 + setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 releaseall end @@ -39,7 +39,7 @@ EventScript_161004:: @ 8161004 VictoryRoad_2F_EventScript_161006:: @ 8161006 lockall - compare_var_to_value VAR_0x4066, 100 + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 goto_if_eq EventScript_161035 setmetatile 33, 16, 721, 0 setmetatile 33, 17, 737, 0 @@ -47,7 +47,7 @@ VictoryRoad_2F_EventScript_161006:: @ 8161006 special DrawWholeMapView waitse moveobjectoffscreen 12 - setvar VAR_0x4066, 100 + setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 releaseall end diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 32eb36734..609326d0f 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -213,7 +213,7 @@ "x": 7, "y": 7, "elevation": 3, - "var": "VAR_0x4067", + "var": "VAR_MAP_SCENE_VICTORY_ROAD_3F", "var_value": 99, "script": "VictoryRoad_3F_EventScript_1610CF" } diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index aa1abb783..6710153dc 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -3,7 +3,7 @@ VictoryRoad_3F_MapScripts:: @ 81610AA .byte 0 VictoryRoad_3F_MapScript1_1610B0:: @ 81610B0 - compare_var_to_value VAR_0x4067, 100 + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 call_if 5, EventScript_1610BC end @@ -14,7 +14,7 @@ EventScript_1610BC:: @ 81610BC VictoryRoad_3F_EventScript_1610CF:: @ 81610CF lockall - compare_var_to_value VAR_0x4067, 100 + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 goto_if_eq EventScript_161101 setmetatile 12, 12, 721, 0 setmetatile 12, 13, 737, 0 @@ -23,7 +23,7 @@ VictoryRoad_3F_EventScript_1610CF:: @ 81610CF waitse moveobjectoffscreen 7 moveobjectoffscreen 10 - setvar VAR_0x4067, 100 + setvar VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 releaseall end diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index de9ff3465..394f58d7e 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -190,7 +190,7 @@ "x": 22, "y": 11, "elevation": 3, - "var": "VAR_0x4051", + "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN", "var_value": 0, "script": "ViridianCity_EventScript_165AF6" }, @@ -199,7 +199,7 @@ "x": 36, "y": 11, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR", "var_value": 0, "script": "ViridianCity_EventScript_16596D" }, @@ -208,7 +208,7 @@ "x": 20, "y": 8, "elevation": 3, - "var": "VAR_0x4051", + "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN", "var_value": 1, "script": "ViridianCity_EventScript_165B10" }, @@ -217,7 +217,7 @@ "x": 22, "y": 8, "elevation": 3, - "var": "VAR_0x4051", + "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN", "var_value": 1, "script": "ViridianCity_EventScript_165B2E" } diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index a5ab3a840..54ac81980 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -4,13 +4,13 @@ ViridianCity_MapScripts:: @ 81658D3 ViridianCity_MapScript1_1658D9:: @ 81658D9 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY - compare_var_to_value VAR_0x4051, 0 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 call_if 1, EventScript_165920 - compare_var_to_value VAR_0x4051, 1 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 call_if 1, EventScript_16590F - compare_var_to_value VAR_0x4051, 2 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 call_if 4, EventScript_165909 - compare_var_to_value VAR_0x405A, 0 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 0 call_if 1, EventScript_165931 end @@ -43,7 +43,7 @@ EventScript_165931:: @ 8165931 goto_if 0, EventScript_1A77A9 checkflag FLAG_BADGE07_GET goto_if 0, EventScript_1A77A9 - setvar VAR_0x405A, 1 + setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 return ViridianCity_EventScript_16596D:: @ 816596D @@ -90,7 +90,7 @@ ViridianCity_EventScript_1659C1:: @ 81659C1 ViridianCity_EventScript_1659CA:: @ 81659CA lock faceplayer - compare_var_to_value VAR_0x405A, 1 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 goto_if_eq EventScript_1659EC msgbox gUnknown_817DB39 closemessage @@ -109,11 +109,11 @@ ViridianCity_EventScript_1659F6:: @ 81659F6 faceplayer checkflag FLAG_BADGE01_GET goto_if_eq EventScript_165A23 - compare_var_to_value VAR_0x4051, 2 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 goto_if 4, EventScript_165A4A - compare_var_to_value VAR_0x4051, 1 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 goto_if_eq EventScript_165A54 - compare_var_to_value VAR_0x4051, 0 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 goto_if_eq EventScript_165A84 end @@ -185,7 +185,7 @@ EventScript_165ABA:: @ 8165ABA ViridianCity_EventScript_165AC4:: @ 8165AC4 lock faceplayer - compare_var_to_value VAR_0x4051, 0 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 goto_if_eq EventScript_165ADB msgbox gUnknown_817DC99 release @@ -251,7 +251,7 @@ EventScript_165B4C:: @ 8165B4C lock faceplayer msgbox gUnknown_817DE9B - setvar VAR_0x4051, 2 + setvar VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 giveitem ITEM_TEACHY_TV msgbox gUnknown_817DEEB return diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index 1789b183e..b075c7e51 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -23,7 +23,7 @@ EventScript_169F04:: @ 8169F04 setflag FLAG_0x0AD setflag FLAG_0x4B7 setflag FLAG_BADGE08_GET - setvar VAR_0x4054, 3 + setvar VAR_MAP_SCENE_ROUTE22, 3 setvar VAR_0x8008, 8 call EventScript_1A6B18 goto EventScript_169F2F diff --git a/include/constants/flags.h b/include/constants/flags.h index 913bf9724..fbb463c0a 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -581,7 +581,7 @@ #define FLAG_0x240 0x240 #define FLAG_0x241 0x241 #define FLAG_0x242 0x242 -#define FLAG_GOT_COIN_CASE 0x243 +#define FLAG_GOT_COIN_CASE 0x243 #define FLAG_0x244 0x244 #define FLAG_0x245 0x245 #define FLAG_0x246 0x246 @@ -750,9 +750,9 @@ #define FLAG_0x2E9 0x2E9 #define FLAG_0x2EA 0x2EA #define FLAG_0x2EB 0x2EB -#define FLAG_0x2EC 0x2EC -#define FLAG_0x2ED 0x2ED -#define FLAG_0x2EE 0x2EE +#define FLAG_REVIVED_DOME 0x2EC +#define FLAG_REVIVED_HELIX 0x2ED +#define FLAG_REVIVED_AMBER 0x2EE #define FLAG_0x2EF 0x2EF #define FLAG_0x2F0 0x2F0 #define FLAG_0x2F1 0x2F1 @@ -986,7 +986,7 @@ #define FLAG_0x3D5 0x3D5 #define FLAG_0x3D6 0x3D6 #define FLAG_0x3D7 0x3D7 -#define FLAG_MYSTERY_EVENT_DONE 0x3D8 +#define FLAG_MYSTERY_EVENT_DONE 0x3D8 #define FLAG_0x3D9 0x3D9 #define FLAG_0x3DA 0x3DA #define FLAG_0x3DB 0x3DB @@ -1315,12 +1315,13 @@ #define FLAG_SYS_POKEMON_GET (SYS_FLAGS + 0x28) #define FLAG_SYS_POKEDEX_GET (SYS_FLAGS + 0x29) #define FLAG_SYS_GAME_CLEAR (SYS_FLAGS + 0x2C) -#define FLAG_0x82F (SYS_FLAGS + 0x2F) +#define FLAG_SYS_RUNNING_SHOES (SYS_FLAGS + 0x2F) #define FLAG_0x830 (SYS_FLAGS + 0x30) #define FLAG_SYS_NOT_SOMEONES_PC (SYS_FLAGS + 0x34) #define FLAG_SYS_RIBBON_GET (SYS_FLAGS + 0x3B) #define FLAG_0x83C (SYS_FLAGS + 0x3C) -#define FLAG_0x83E (SYS_FLAGS + 0x3E) +#define FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN (SYS_FLAGS + 0x3E) +#define FLAG_SYS_NATIONAL_DEX (SYS_FLAGS + 0x40) #define FLAG_0x841 (SYS_FLAGS + 0x41) #define FLAG_0x842 (SYS_FLAGS + 0x42) #define FLAG_0x843 (SYS_FLAGS + 0x43) diff --git a/include/constants/vars.h b/include/constants/vars.h index 2f155646b..503d3dfed 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -86,66 +86,70 @@ #define VAR_0x404D 0x404D #define VAR_0x404E 0x404E #define VAR_LOTAD_SIZE_RECORD 0x404F -#define VAR_MAP_SCENE_PALLET_TOWN 0x4050 -#define VAR_0x4051 0x4051 -#define VAR_0x4052 0x4052 -#define VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER 0x4053 -#define VAR_0x4054 0x4054 -#define VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB 0x4055 -#define VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F 0x4056 -#define VAR_MAP_SCENE_VIRIDIAN_CITY_MART 0x4057 -#define VAR_0x4058 0x4058 -#define VAR_0x4059 0x4059 -#define VAR_0x405A 0x405A -#define VAR_0x405B 0x405B -#define VAR_0x405C 0x405C -#define VAR_0x405D 0x405D -#define VAR_MAP_SCENE_ROUTE16 0x405E -#define VAR_0x405F 0x405F -#define VAR_0x4060 0x4060 -#define VAR_0x4061 0x4061 -#define VAR_0x4062 0x4062 -#define VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F 0x4063 -#define VAR_0x4064 0x4064 -#define VAR_0x4065 0x4065 -#define VAR_0x4066 0x4066 -#define VAR_0x4067 0x4067 -#define VAR_0x4068 0x4068 -#define VAR_0x4069 0x4069 -#define VAR_0x406A 0x406A -#define VAR_0x406B 0x406B -#define VAR_0x406C 0x406C -#define VAR_0x406D 0x406D -#define VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 0x406E -#define VAR_0x406F 0x406F -#define VAR_0x4070 0x4070 -#define VAR_0x4071 0x4071 -#define VAR_0x4072 0x4072 -#define VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB 0x4073 -#define VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1 0x4074 -#define VAR_MAP_SCENE_ONE_ISLAND_HARBOR 0x4075 -#define VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F 0x4076 -#define VAR_0x4077 0x4077 -#define VAR_0x4078 0x4078 -#define VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER 0x4079 -#define VAR_0x407A 0x407A -#define VAR_0x407B 0x407B -#define VAR_0x407C 0x407C -#define VAR_0x407D 0x407D -#define VAR_MAP_SCENE_VERMILION_CITY 0x407E -#define VAR_0x407F 0x407F -#define VAR_0x4080 0x4080 -#define VAR_0x4081 0x4081 -#define VAR_0x4082 0x4082 -#define VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10 0x4083 -#define VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS 0x4084 -#define VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR 0x4085 -#define VAR_MAP_SCENE_FOUR_ISLAND 0x4086 -#define VAR_0x4087 0x4087 -#define VAR_0x4088 0x4088 -#define VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F 0x4089 -#define VAR_MAP_SCENE_CINNABAR_ISLAND 0x408A -#define VAR_0x408B 0x408B + +// Map Scene +#define VAR_MAP_SCENE_PALLET_TOWN_OAK 0x4050 +#define VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN 0x4051 +#define VAR_MAP_SCENE_CERULEAN_CITY_RIVAL 0x4052 +#define VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER 0x4053 +#define VAR_MAP_SCENE_ROUTE22 0x4054 +#define VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB 0x4055 +#define VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F 0x4056 +#define VAR_MAP_SCENE_VIRIDIAN_CITY_MART 0x4057 +#define VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE 0x4058 +#define VAR_MAP_SCENE_POKEMON_TOWER_6F 0x4059 +#define VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR 0x405A +#define VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR 0x405B +#define VAR_MAP_SCENE_SILPH_CO_7F 0x405C +#define VAR_MAP_SCENE_POKEMON_TOWER_2F 0x405D +#define VAR_MAP_SCENE_ROUTE16 0x405E +#define VAR_MAP_SCENE_ROUTE23 0x405F +#define VAR_MAP_SCENE_SILPH_CO_11F 0x4060 +#define VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F 0x4061 +#define VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES 0x4062 +#define VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F 0x4063 +#define VAR_MAP_SCENE_VICTORY_ROAD_1F 0x4064 +#define VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1 0x4065 +#define VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2 0x4066 +#define VAR_MAP_SCENE_VICTORY_ROAD_3F 0x4067 +#define VAR_MAP_SCENE_POKEMON_LEAGUE 0x4068 +#define VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL 0x4069 +#define VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE 0x406A +#define VAR_MAP_SCENE_ROUTE24 0x406B +#define VAR_MAP_SCENE_PEWTER_CITY 0x406C +#define VAR_0x406D 0x406D +#define VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 0x406E +#define VAR_0x406F 0x406F +#define VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY 0x4070 +#define VAR_MAP_SCENE_CINNABAR_ISLAND 0x4071 +#define VAR_0x4072 0x4072 +#define VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB 0x4073 +#define VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1 0x4074 +#define VAR_MAP_SCENE_ONE_ISLAND_HARBOR 0x4075 +#define VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F 0x4076 +#define VAR_0x4077 0x4077 +#define VAR_MAP_SCENE_TWO_ISLAND 0x4078 +#define VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER 0x4079 +#define VAR_0x407A 0x407A +#define VAR_MAP_SCENE_THREE_ISLAND 0x407B +#define VAR_MAP_SCENE_POKEMON_CENTER_TEALA 0x407C +#define VAR_MAP_SCENE_CERULEAN_CITY_ROCKET 0x407D +#define VAR_MAP_SCENE_VERMILION_CITY 0x407E +#define VAR_MAP_SCENE_MT_EMBER_EXTERIOR 0x407F +#define VAR_MAP_SCENE_ICEFALL_CAVE_BACK 0x4080 +#define VAR_MAP_SCENE_SAFFRON_CITY_DOJO 0x4081 +#define VAR_MAP_SCENE_TRAINER_TOWER 0x4082 +#define VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10 0x4083 +#define VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS 0x4084 +#define VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR 0x4085 +#define VAR_MAP_SCENE_FOUR_ISLAND 0x4086 +#define VAR_0x4087 0x4087 +#define VAR_MAP_SCENE_ROCKET_WAREHOUSE 0x4088 +#define VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F 0x4089 +#define VAR_MAP_SCENE_CINNABAR_ISLAND_2 0x408A +#define VAR_MAP_SCENE_MT_MOON_B2F 0x408B + + #define VAR_0x408C 0x408C #define VAR_0x408D 0x408D #define VAR_0x408E 0x408E @@ -187,7 +191,7 @@ #define VAR_0x40B2 0x40B2 #define VAR_0x40B3 0x40B3 #define VAR_PORTHOLE 0x40B4 -#define VAR_EVENT_PICHU_SLOT 0x40B5 +#define VAR_EVENT_PICHU_SLOT 0x40B5 #define VAR_0x40B6 0x40B6 #define VAR_0x40B7 0x40B7 #define VAR_0x40B8 0x40B8 diff --git a/include/global.h b/include/global.h index 5ddf9a0a8..596f6b1d9 100644 --- a/include/global.h +++ b/include/global.h @@ -127,7 +127,7 @@ struct Pokedex /*0x00*/ u8 order; /*0x01*/ u8 unknown1; /*0x02*/ u8 nationalMagic; // must equal 0xDA in order to have National mode - /*0x03*/ u8 unknown2; + /*0x03*/ u8 unknown2; // set to 0xB9 when national dex is first enabled /*0x04*/ u32 unownPersonality; // set when you first see Unown /*0x08*/ u32 spindaPersonality; // set when you first see Spinda /*0x0C*/ u32 unknown3; diff --git a/src/heal_location.c b/src/heal_location.c index 5c6dbc882..89d9478c0 100644 --- a/src/heal_location.c +++ b/src/heal_location.c @@ -122,10 +122,10 @@ void SetBlackoutRespawnWarpAndHealerNpc(struct WarpData * warp) { u32 healLocationIdx; - if (VarGet(VAR_0x4082) == 1) + if (VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 1) { if (!gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2) - VarSet(VAR_0x4082, 0); + VarSet(VAR_MAP_SCENE_TRAINER_TOWER, 0); gSpecialVar_LastTalked = 1; warp->x = 4; warp->y = 11; @@ -159,7 +159,7 @@ void SetBlackoutRespawnWarpAndHealerNpc(struct WarpData * warp) { warp->x = 4; warp->y = 11; - VarSet(VAR_0x4082, 0); + VarSet(VAR_MAP_SCENE_TRAINER_TOWER, 0); } else { diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 9512e73d1..e3fb9da95 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -5,6 +5,7 @@ #include "constants/vars.h" #include "constants/items.h" #include "constants/species.h" +#include "constants/maps.h" #include "malloc.h" #include "save.h" #include "util.h" @@ -118,91 +119,91 @@ extern const u8 *const gUnknown_83FE9C4[]; const struct UnkStruct_8479D34 gUnknown_8479D34[] = { { - 0x03, 0x26, + MAP_GROUP(ROUTE20), MAP_NUM(ROUTE20), .flags1 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags2 = {0x99, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags3 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} }, { - 0x03, 0x27, + MAP_GROUP(ROUTE21_NORTH), MAP_NUM(ROUTE21_NORTH), .flags1 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags2 = {0x9a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags3 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} }, { - 0x01, 0x1f, + MAP_GROUP(UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL), MAP_NUM(UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL), .flags1 = {0x4c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags2 = {0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0xff, 0xff}, .flags3 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} }, { - 0x01, 0x22, + MAP_GROUP(UNDERGROUND_PATH_EAST_WEST_TUNNEL), MAP_NUM(UNDERGROUND_PATH_EAST_WEST_TUNNEL), .flags1 = {0x53, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags2 = {0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0xff, 0xff}, .flags3 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} }, { - 0x03, 0x41, + MAP_GROUP(SEVEN_ISLAND_TANOBY_RUINS), MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS), .flags1 = {0x40, 0x41, 0x42, 0x43, 0xff, 0xff, 0xff, 0xff}, .flags2 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags3 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} }, { - 0x01, 0x02, + MAP_GROUP(MT_MOON_B1F), MAP_NUM(MT_MOON_B1F), .flags1 = {0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0xff, 0xff}, .flags2 = {0x54, 0x55, 0x56, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags3 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} }, { - 0x01, 0x6d, + MAP_GROUP(THREE_ISLAND_BERRY_FOREST), MAP_NUM(THREE_ISLAND_BERRY_FOREST), .flags1 = {0x5b, 0x5d, 0x5e, 0x5f, 0x63, 0x64, 0x65, 0x66}, .flags2 = {0x5b, 0x5d, 0x5e, 0x5f, 0x63, 0x64, 0x65, 0xff}, .flags3 = {0x5a, 0x5c, 0x60, 0x61, 0x62, 0xff, 0xff, 0xff} }, { - 0x03, 0x2e, + MAP_GROUP(ONE_ISLAND_TREASURE_BEACH), MAP_NUM(ONE_ISLAND_TREASURE_BEACH), .flags1 = {0x6b, 0x6c, 0x6d, 0x6e, 0xff, 0xff, 0xff, 0xff}, .flags2 = {0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0xff, 0xff}, .flags3 = {0x6b, 0x6c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} }, { - 0x03, 0x30, + MAP_GROUP(THREE_ISLAND_BOND_BRIDGE), MAP_NUM(THREE_ISLAND_BOND_BRIDGE), .flags1 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags2 = {0xa6, 0xa7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags3 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} }, { - 0x03, 0x0f, + MAP_GROUP(FOUR_ISLAND), MAP_NUM(FOUR_ISLAND), .flags1 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags2 = {0xa8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags3 = {0xa9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} }, { - 0x03, 0x39, + MAP_GROUP(FIVE_ISLAND_MEMORIAL_PILLAR), MAP_NUM(FIVE_ISLAND_MEMORIAL_PILLAR), .flags1 = {0xaa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags2 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags3 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} }, { - 0x03, 0x36, + MAP_GROUP(FIVE_ISLAND_RESORT_GORGEOUS), MAP_NUM(FIVE_ISLAND_RESORT_GORGEOUS), .flags1 = {0xae, 0xb0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags2 = {0xaf, 0xb1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags3 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} }, { - 0x03, 0x3a, + MAP_GROUP(SIX_ISLAND_OUTCAST_ISLAND), MAP_NUM(SIX_ISLAND_OUTCAST_ISLAND), .flags1 = {0xb2, 0xb3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags2 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags3 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} }, { - 0x03, 0x3b, + MAP_GROUP(SIX_ISLAND_GREEN_PATH), MAP_NUM(SIX_ISLAND_GREEN_PATH), .flags1 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags2 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags3 = {0xb4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} }, { - 0x03, 0x3e, + MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER), MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER), .flags1 = {0xb9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags2 = {0xba, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, .flags3 = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} @@ -1323,7 +1324,7 @@ void sub_815E8CC(void) void sub_815E908(void) { - if (gMapHeader.mapDataId == 0x0129 && VarGet(VAR_0x4082) == 0) + if (gMapHeader.mapDataId == 0x0129 && VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 0) { gSpecialVar_Result = FALSE; } |