diff options
39 files changed, 196 insertions, 196 deletions
diff --git a/berry_fix/payload/include/constants/vars.h b/berry_fix/payload/include/constants/vars.h index 856aba069..5243d9590 100644 --- a/berry_fix/payload/include/constants/vars.h +++ b/berry_fix/payload/include/constants/vars.h @@ -110,7 +110,7 @@ #define VAR_LINK_CONTEST_ROOM_STATE 0x4086 #define VAR_CABLE_CLUB_STATE 0x4087 #define VAR_CONTEST_LOCATION 0x4088 -#define VAR_0x4089 0x4089 // TODO: related to decorations +#define VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F 0x4089 // TODO: related to decorations #define VAR_CONTEST_PRIZE_PICKUP 0x408A #define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C // TODO: needs more investigation diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 63d8e8f0f..aa31cd1ca 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -10,7 +10,7 @@ CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 call_if 1, EventScript_166F24 compare_var_to_value VAR_0x4071, 3 call_if 1, EventScript_166F52 - compare_var_to_value VAR_0x408A, 1 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1 call_if 1, EventScript_166F0B end @@ -51,7 +51,7 @@ EventScript_166F68:: @ 8166F68 return CinnabarIsland_MapScript2_166F6E:: @ 8166F6E - map_script_2 VAR_0x408A, 1, EventScript_166F88 + 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 .2byte 0 @@ -61,7 +61,7 @@ EventScript_166F88:: @ 8166F88 clearflag FLAG_SPECIAL_FLAG_0x4001 savebgm MUS_DUMMY textcolor 0 - setvar VAR_0x408A, 2 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 delay 20 call EventScript_1670E6 releaseall @@ -224,7 +224,7 @@ EventScript_1670E6:: @ 81670E6 removeobject 3 delay 40 setflag FLAG_0x06B - setvar VAR_0x4075, 1 + setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1 setvar VAR_0x8004, 8 setvar VAR_0x8006, 1 goto EventScript_1A90DA diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 0e162f512..00d3afb78 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -51,7 +51,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A compare_var_to_value VAR_FACING, 3 call_if 1, EventScript_16E993 removeobject 7 - setvar VAR_0x408A, 1 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1 clearflag FLAG_0x062 warp MAP_CINNABAR_ISLAND, 255, 14, 11 waitstate diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index e187fbacc..14622ea67 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -9,11 +9,11 @@ FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38 end EventScript_164C42:: @ 8164C42 - setvar VAR_0x4083, 1 + setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1 return FiveIsland_LostCave_Room10_MapScript2_164C48:: @ 8164C48 - map_script_2 VAR_0x4083, 0, EventScript_164C52 + map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 0, EventScript_164C52 .2byte 0 EventScript_164C52:: @ 8164C52 @@ -42,8 +42,8 @@ EventScript_164C52:: @ 8164C52 EventScript_164CA5:: @ 8164CA5 setflag FLAG_0x093 clearflag FLAG_0x094 - setvar VAR_0x4083, 1 - setvar VAR_0x4084, 1 + setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1 + setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1 return EventScript_164CB6:: @ 8164CB6 diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index a65ea5490..ec8cea449 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -4,7 +4,7 @@ FiveIsland_ResortGorgeous_MapScripts:: @ 81687E4 .byte 0 FiveIsland_ResortGorgeous_MapScript1_1687EF:: @ 81687EF - map_script_2 VAR_0x4084, 1, EventScript_1687F9 + map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_1687F9 .2byte 0 EventScript_1687F9:: @ 81687F9 @@ -12,7 +12,7 @@ EventScript_1687F9:: @ 81687F9 end FiveIsland_ResortGorgeous_MapScript2_1687FE:: @ 81687FE - map_script_2 VAR_0x4084, 1, EventScript_168808 + map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_168808 .2byte 0 EventScript_168808:: @ 8168808 @@ -31,7 +31,7 @@ EventScript_168808:: @ 8168808 waitdooranim removeobject 8 clearflag FLAG_0x095 - setvar VAR_0x4084, 2 + setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 2 releaseall end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 887b9ca4e..97ebe39ec 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -5,7 +5,7 @@ FourIsland_MapScripts:: @ 8167CAE FourIsland_MapScript1_167CB9:: @ 8167CB9 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND - compare_var_to_value VAR_0x4086, 0 + compare_var_to_value VAR_MAP_SCENE_FOUR_ISLAND, 0 call_if 1, EventScript_167CCD call EventScript_167CD1 end @@ -23,7 +23,7 @@ EventScript_167CE1:: @ 8167CE1 return FourIsland_MapScript2_167CE2:: @ 8167CE2 - map_script_2 VAR_0x4086, 0, EventScript_167CEC + map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, EventScript_167CEC .2byte 0 EventScript_167CEC:: @ 8167CEC @@ -49,7 +49,7 @@ EventScript_167CEC:: @ 8167CEC playse SE_KAIDAN delay 35 removeobject 10 - setvar VAR_0x4086, 1 + setvar VAR_MAP_SCENE_FOUR_ISLAND, 1 releaseall end diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 313a47da7..a32bc6042 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -3,9 +3,9 @@ FuchsiaCity_SafariZone_Entrance_MapScripts:: @ 816D2A8 .byte 0 FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE:: @ 816D2AE - map_script_2 VAR_0x406E, 1, EventScript_16D2F2 - map_script_2 VAR_0x406E, 2, EventScript_16D312 - map_script_2 VAR_0x406E, 3, EventScript_16D2C8 + map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 1, EventScript_16D2F2 + map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2, EventScript_16D312 + map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 3, EventScript_16D2C8 .2byte 0 EventScript_16D2C8:: @ 816D2C8 @@ -19,7 +19,7 @@ EventScript_16D2C8:: @ 816D2C8 applymovement 255, Movement_16D367 waitmovement 0 special sub_80A0EEC - setvar VAR_0x406E, 0 + setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 releaseall end @@ -32,7 +32,7 @@ EventScript_16D2F2:: @ 816D2F2 applymovement 255, Movement_16D362 waitmovement 0 special sub_80A0EEC - setvar VAR_0x406E, 0 + setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 releaseall end @@ -49,7 +49,7 @@ EventScript_16D312:: @ 816D312 applymovement 255, Movement_16D362 waitmovement 0 special sub_80A0EEC - setvar VAR_0x406E, 0 + setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 releaseall end @@ -143,7 +143,7 @@ EventScript_16D3CA:: @ 816D3CA compare_var_to_value VAR_0x4002, 2 call_if 1, EventScript_16D457 special sub_80A0EC4 - setvar VAR_0x406E, 2 + setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2 warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 waitstate end diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index 656e7045c..873224926 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -5,7 +5,7 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR - compare_var_to_value VAR_0x4085, 1 + compare_var_to_value VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 call_if 1, EventScript_167255 end @@ -14,7 +14,7 @@ EventScript_167255:: @ 8167255 return IndigoPlateau_Exterior_MapScript2_16725A:: @ 816725A - map_script_2 VAR_0x4085, 1, EventScript_167264 + map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, EventScript_167264 .2byte 0 EventScript_167264:: @ 8167264 @@ -56,7 +56,7 @@ EventScript_167264:: @ 8167264 applymovement 255, Movement_167311 waitmovement 0 special RemoveScriptFieldObject - setvar VAR_0x4085, 0 + setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0 removeobject 1 removeobject 2 special sub_80F39B4 diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 020c334f6..829dfd8a2 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -15,7 +15,7 @@ EventScript_163960:: @ 8163960 return MtEmber_Exterior_MapScript2_163969:: @ 8163969 - compare_var_to_value VAR_0x4076, 4 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 call_if 4, EventScript_163975 end @@ -27,7 +27,7 @@ MtEmber_Exterior_EventScript_16397F:: @ 816397F lock checktrainerflag 537 goto_if 1, EventScript_16399E - compare_var_to_value VAR_0x4076, 4 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if 1, EventScript_1639A8 loadword 0, gUnknown_817A82A callstd 4 @@ -70,7 +70,7 @@ MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 faceplayer checktrainerflag 538 goto_if 1, EventScript_163A1B - compare_var_to_value VAR_0x4076, 4 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if 1, EventScript_163A25 loadword 0, gUnknown_817A88C callstd 4 diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index b0a4ac263..8b9d0845a 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -8,7 +8,7 @@ OneIsland_MapScript1_16748F:: @ 816748F end OneIsland_MapScript2_167493:: @ 8167493 - map_script_2 VAR_0x4075, 2, EventScript_16749D + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2, EventScript_16749D .2byte 0 EventScript_16749D:: @ 816749D @@ -30,7 +30,7 @@ EventScript_16749D:: @ 816749D closedoor 14, 5 waitdooranim removeobject 1 - setvar VAR_0x4075, 3 + setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 3 warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 255, 9, 9 waitstate releaseall diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 81c7dc54b..44c18ff60 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -4,7 +4,7 @@ OneIsland_Harbor_MapScripts:: @ 8171378 .byte 0 OneIsland_Harbor_MapScript1_171383:: @ 8171383 - map_script_2 VAR_0x4075, 1, EventScript_17138D + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17138D .2byte 0 EventScript_17138D:: @ 817138D @@ -12,7 +12,7 @@ EventScript_17138D:: @ 817138D end OneIsland_Harbor_MapScript2_171392:: @ 8171392 - map_script_2 VAR_0x4075, 1, EventScript_17139C + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17139C .2byte 0 EventScript_17139C:: @ 817139C @@ -20,7 +20,7 @@ EventScript_17139C:: @ 817139C textcolor 0 applymovement 255, Movement_1713B9 waitmovement 0 - setvar VAR_0x4075, 2 + setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2 warp MAP_ONE_ISLAND, 255, 12, 18 waitstate releaseall diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index ec515417d..381d1f9d4 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -114,7 +114,7 @@ "x": 12, "y": 6, "elevation": 3, - "var": "VAR_0x4076", + "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, "script": "OneIsland_PokemonCenter_1F_EventScript_1711AA" }, @@ -123,7 +123,7 @@ "x": 12, "y": 7, "elevation": 3, - "var": "VAR_0x4076", + "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, "script": "OneIsland_PokemonCenter_1F_EventScript_1711B6" }, @@ -132,7 +132,7 @@ "x": 12, "y": 8, "elevation": 3, - "var": "VAR_0x4076", + "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, "script": "OneIsland_PokemonCenter_1F_EventScript_1711C2" }, @@ -141,7 +141,7 @@ "x": 12, "y": 9, "elevation": 3, - "var": "VAR_0x4076", + "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", "var_value": 2, "script": "OneIsland_PokemonCenter_1F_EventScript_1711CE" } diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index e09b5d380..76f8b8c5d 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -6,7 +6,7 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 .byte 0 OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D - compare_var_to_value VAR_0x4076, 5 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 call_if 4, EventScript_170C22 checkflag 2116 call_if 1, EventScript_170C36 @@ -28,16 +28,16 @@ EventScript_170C36:: @ 8170C36 OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E setrespawn 14 - compare_var_to_value VAR_0x4076, 6 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 call_if 1, EventScript_170C73 - compare_var_to_value VAR_0x4076, 0 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 call_if 1, EventScript_170C79 - compare_var_to_value VAR_0x4076, 2 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 call_if 1, EventScript_170C90 end EventScript_170C73:: @ 8170C73 - setvar VAR_0x4076, 7 + setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 return EventScript_170C79:: @ 8170C79 @@ -55,7 +55,7 @@ EventScript_170C90:: @ 8170C90 return OneIsland_PokemonCenter_1F_MapScript4_170CA7:: @ 8170CA7 - map_script_2 VAR_0x4076, 0, EventScript_170CB1 + map_script_2 VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, EventScript_170CB1 .2byte 0 EventScript_170CB1:: @ 8170CB1 @@ -144,7 +144,7 @@ EventScript_170CB1:: @ 8170CB1 applymovement 3, Movement_1A75E9 waitmovement 0 setflag 2113 - setvar VAR_0x4076, 1 + setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 releaseall end @@ -236,22 +236,22 @@ EventScript_170EB1:: @ 8170EB1 OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 lock faceplayer - compare_var_to_value VAR_0x4076, 7 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 goto_if 1, EventScript_170F35 - compare_var_to_value VAR_0x4076, 6 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 goto_if 1, EventScript_170F9B checkflag FLAG_0x2DC goto_if 1, EventScript_170FA5 - compare_var_to_value VAR_0x4076, 5 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if 1, EventScript_17103A checkflag FLAG_0x2DD goto_if 1, EventScript_171044 - compare_var_to_value VAR_0x4076, 4 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if 1, EventScript_1710F2 specialvar VAR_RESULT, sub_806E25C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1710FC - compare_var_to_value VAR_0x4076, 3 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 goto_if 1, EventScript_171134 loadword 0, gUnknown_81A1321 callstd 4 @@ -340,7 +340,7 @@ EventScript_170FA5:: @ 8170FA5 setflag 2116 setflag FLAG_0x05C setflag FLAG_0x08C - setvar VAR_0x4076, 6 + setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 special InitRoamer release end @@ -389,7 +389,7 @@ EventScript_1710B2:: @ 81710B2 callstd 4 removeitem ITEM_RUBY, 1 removeitem ITEM_TRI_PASS, 1 - setvar VAR_0x4076, 5 + setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 additem ITEM_RAINBOW_PASS, 1 setflag 2118 textcolor 3 @@ -423,7 +423,7 @@ EventScript_1710FC:: @ 81710FC loadword 0, gUnknown_81A17DF callstd 4 setvar VAR_0x407F, 1 - setvar VAR_0x4076, 4 + setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 release end @@ -577,7 +577,7 @@ EventScript_1711DA:: @ 81711DA waitmovement 0 playse SE_KAIDAN setflag FLAG_0x072 - setvar VAR_0x4076, 3 + setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 clearflag FLAG_0x062 setvar VAR_0x4071, 3 setvar VAR_0x8004, 1 diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 076af662f..38e88b144 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_0x4050", + "var": "VAR_MAP_SCENE_PALLET_TOWN", "var_value": 0, "script": "PalletTown_EventScript_1655ED" }, @@ -102,7 +102,7 @@ "x": 13, "y": 1, "elevation": 3, - "var": "VAR_0x4050", + "var": "VAR_MAP_SCENE_PALLET_TOWN", "var_value": 0, "script": "PalletTown_EventScript_1655F9" }, diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index bafeced89..202258462 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -39,7 +39,7 @@ EventScript_1654BD:: @ 81654BD return PalletTown_MapScript2_1654CE:: @ 81654CE - map_script_2 VAR_0x4050, 2, EventScript_1654D8 + map_script_2 VAR_MAP_SCENE_PALLET_TOWN, 2, EventScript_1654D8 .2byte 0 EventScript_1654D8:: @ 81654D8 @@ -76,8 +76,8 @@ EventScript_1654D8:: @ 81654D8 waitmovement 0 closedoor 16, 13 waitdooranim - setvar VAR_0x4055, 7 - setvar VAR_0x4050, 3 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 + setvar VAR_MAP_SCENE_PALLET_TOWN, 3 setflag FLAG_0x02C warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 waitstate @@ -89,7 +89,7 @@ EventScript_16557E:: @ 816557E applymovement 3, Movement_1655BE waitmovement 0 removeobject 3 - setvar VAR_0x4050, 3 + setvar VAR_MAP_SCENE_PALLET_TOWN, 3 releaseall end @@ -225,9 +225,9 @@ EventScript_165605:: @ 8165605 waitmovement 0 closedoor 16, 13 waitdooranim - setvar VAR_0x4055, 1 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 clearflag FLAG_0x02B - setvar VAR_0x4050, 1 + setvar VAR_MAP_SCENE_PALLET_TOWN, 1 setflag FLAG_0x02C setflag FLAG_SPECIAL_FLAG_0x4001 warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index e1adae4c1..56d49fb90 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -32,7 +32,7 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 goto_if 1, EventScript_168F59 compare_var_to_value VAR_0x4058, 1 goto_if 1, EventScript_168EF6 - compare_var_to_value VAR_0x4055, 1 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 goto_if 4, EventScript_168DAF loadword 0, gUnknown_818D58C callstd 4 diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 1e89902c6..d36443b37 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -4,7 +4,7 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 .byte 0 PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE - compare_var_to_value VAR_0x4056, 0 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 call_if 1, EventScript_168CBA end @@ -13,12 +13,12 @@ EventScript_168CBA:: @ 8168CBA return PalletTown_PlayersHouse_2F_MapScript2_168CBE:: @ 8168CBE - map_script_2 VAR_0x4056, 0, EventScript_168CC8 + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0, EventScript_168CC8 .2byte 0 EventScript_168CC8:: @ 8168CC8 turnobject 255, 2 - setvar VAR_0x4056, 1 + setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1 end PalletTown_PlayersHouse_2F_EventScript_168CD2:: @ 8168CD2 diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index f974f7ac0..8e651c9d8 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -173,7 +173,7 @@ "x": 5, "y": 8, "elevation": 3, - "var": "VAR_0x4055", + "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 2, "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" }, @@ -182,7 +182,7 @@ "x": 6, "y": 8, "elevation": 3, - "var": "VAR_0x4055", + "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 2, "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" }, @@ -191,7 +191,7 @@ "x": 7, "y": 8, "elevation": 3, - "var": "VAR_0x4055", + "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 2, "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3" }, @@ -200,7 +200,7 @@ "x": 5, "y": 8, "elevation": 3, - "var": "VAR_0x4055", + "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 3, "script": "PalletTown_ProfessorOaksLab_EventScript_1692E7" }, @@ -209,7 +209,7 @@ "x": 6, "y": 8, "elevation": 3, - "var": "VAR_0x4055", + "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 3, "script": "PalletTown_ProfessorOaksLab_EventScript_1692F3" }, @@ -218,7 +218,7 @@ "x": 7, "y": 8, "elevation": 3, - "var": "VAR_0x4055", + "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", "var_value": 3, "script": "PalletTown_ProfessorOaksLab_EventScript_1692FF" } diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 084ad2491..73a88153c 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -6,11 +6,11 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E setflag FLAG_0x2CF - compare_var_to_value VAR_0x4055, 1 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 call_if 1, EventScript_168FC6 - compare_var_to_value VAR_0x4055, 7 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 call_if 1, EventScript_168FD5 - compare_var_to_value VAR_0x4055, 8 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 call_if 1, EventScript_168FC0 checkflag FLAG_0x247 call_if 1, EventScript_168FBC @@ -21,7 +21,7 @@ EventScript_168FBC:: @ 8168FBC return EventScript_168FC0:: @ 8168FC0 - setvar VAR_0x4055, 9 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 return EventScript_168FC6:: @ 8168FC6 @@ -36,7 +36,7 @@ EventScript_168FD5:: @ 8168FD5 return PalletTown_ProfessorOaksLab_MapScript2_168FE1:: @ 8168FE1 - map_script_2 VAR_0x4055, 1, EventScript_168FEB + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_168FEB .2byte 0 EventScript_168FEB:: @ 8168FEB @@ -44,8 +44,8 @@ EventScript_168FEB:: @ 8168FEB end PalletTown_ProfessorOaksLab_MapScript3_168FF0:: @ 8168FF0 - map_script_2 VAR_0x4055, 1, EventScript_16923E - map_script_2 VAR_0x4055, 7, EventScript_169002 + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_16923E + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7, EventScript_169002 .2byte 0 EventScript_169002:: @ 8169002 @@ -137,7 +137,7 @@ EventScript_169035:: @ 8169035 call_if 1, EventScript_169B7B removeobject 8 fadedefaultbgm - setvar VAR_0x4055, 8 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 releaseall end @@ -248,7 +248,7 @@ EventScript_16923E:: @ 816923E callstd 4 loadword 0, gUnknown_818E0EA callstd 4 - setvar VAR_0x4055, 2 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 releaseall end @@ -515,7 +515,7 @@ EventScript_1694C2:: @ 81694C2 removeobject 8 playse SE_KAIDAN fadedefaultbgm - setvar VAR_0x4055, 4 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 setflag FLAG_0x258 releaseall end @@ -588,9 +588,9 @@ Movement_169559:: @ 8169559 PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F lock faceplayer - compare_var_to_value VAR_0x4055, 3 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 1, EventScript_16958B - compare_var_to_value VAR_0x4055, 2 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if 1, EventScript_169581 loadword 0, gUnknown_818DC67 callstd 4 @@ -614,21 +614,21 @@ PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 faceplayer checkflag FLAG_0x002 goto_if 1, EventScript_169600 - compare_var_to_value VAR_0x4055, 9 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 goto_if 1, EventScript_169903 - compare_var_to_value VAR_0x4055, 8 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 goto_if 1, EventScript_169A6E checkflag 2092 goto_if 1, EventScript_1699CE compare_var_to_value VAR_0x4052, 1 goto_if 1, EventScript_169903 - compare_var_to_value VAR_0x4055, 6 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 goto_if 1, EventScript_1698D6 - compare_var_to_value VAR_0x4057, 1 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 goto_if 4, EventScript_16961E - compare_var_to_value VAR_0x4055, 4 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 goto_if 1, EventScript_169614 - compare_var_to_value VAR_0x4055, 3 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 1, EventScript_16960A loadword 0, gUnknown_818E116 callstd 4 @@ -776,8 +776,8 @@ EventScript_16961E:: @ 816961E call_if 1, EventScript_169B7B removeobject 8 fadedefaultbgm - setvar VAR_0x4055, 6 - setvar VAR_0x4057, 2 + 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 @@ -1196,9 +1196,9 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB setvar VAR_0x4002, 1 setvar VAR_0x4003, 4 setvar VAR_0x4004, 7 - compare_var_to_value VAR_0x4055, 3 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 4, EventScript_169DE4 - compare_var_to_value VAR_0x4055, 2 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if 1, EventScript_169BE1 loadword 0, gUnknown_818EA19 callstd 4 @@ -1318,7 +1318,7 @@ EventScript_169D2F:: @ 8169D2F waitmessage playfanfare BGM_FRLG_ME_KEYITEM waitfanfare - setvar VAR_0x4055, 3 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 checkflag 2110 call_if 1, EventScript_169D5C release @@ -1363,9 +1363,9 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 setvar VAR_0x4002, 7 setvar VAR_0x4003, 1 setvar VAR_0x4004, 5 - compare_var_to_value VAR_0x4055, 3 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 4, EventScript_169DE4 - compare_var_to_value VAR_0x4055, 2 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if 1, EventScript_169BE1 loadword 0, gUnknown_818EA19 callstd 4 @@ -1379,9 +1379,9 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE setvar VAR_0x4002, 4 setvar VAR_0x4003, 7 setvar VAR_0x4004, 6 - compare_var_to_value VAR_0x4055, 3 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 4, EventScript_169DE4 - compare_var_to_value VAR_0x4055, 2 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if 1, EventScript_169BE1 loadword 0, gUnknown_818EA19 callstd 4 @@ -1460,7 +1460,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A lockall - compare_var_to_value VAR_0x4055, 6 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 goto_if 4, EventScript_169E90 loadword 0, gUnknown_818EA84 callstd 4 diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 7b3b035a1..3bccccb50 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -14,7 +14,7 @@ EventScript_1680FF:: @ 81680FF return Route16_MapScript2_168103:: @ 8168103 - compare_var_to_value VAR_0x405E, 1 + compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 call_if 1, EventScript_16810F end @@ -23,7 +23,7 @@ EventScript_16810F:: @ 816810F return Route16_MapScript3_168113:: @ 8168113 - map_script_2 VAR_0x405E, 1, EventScript_16811D + map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16811D .2byte 0 EventScript_16811D:: @ 816811D diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 586be196d..1216fc987 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -83,7 +83,7 @@ "x": 10, "y": 12, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" }, @@ -92,7 +92,7 @@ "x": 2, "y": 12, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" }, @@ -119,7 +119,7 @@ "x": 1, "y": 13, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" }, @@ -128,7 +128,7 @@ "x": 1, "y": 11, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_1A77C1" }, @@ -137,7 +137,7 @@ "x": 11, "y": 11, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" }, @@ -146,7 +146,7 @@ "x": 11, "y": 13, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, "script": "Route16_NorthEntrance_1F_EventScript_1A77B6" }, diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index 130e3d43c..97f574984 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -4,7 +4,7 @@ Route18_MapScripts:: @ 81681F6 .byte 0 Route18_MapScript1_168201:: @ 8168201 - compare_var_to_value VAR_0x405E, 1 + compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 call_if 1, EventScript_16820D end @@ -13,7 +13,7 @@ EventScript_16820D:: @ 816820D return Route18_MapScript2_168211:: @ 8168211 - map_script_2 VAR_0x405E, 1, EventScript_16821B + map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16821B .2byte 0 EventScript_16821B:: @ 816821B diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 6e85ecee0..16286a240 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -56,7 +56,7 @@ "x": 2, "y": 6, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1A77C1" }, @@ -110,7 +110,7 @@ "x": 10, "y": 6, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, "script": "Route18_EastEntrance_1F_EventScript_1A77B6" }, @@ -119,7 +119,7 @@ "x": 11, "y": 5, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, "script": "Route18_EastEntrance_1F_EventScript_1A77B6" }, @@ -128,7 +128,7 @@ "x": 11, "y": 7, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 1, "script": "Route18_EastEntrance_1F_EventScript_1A77B6" }, @@ -137,7 +137,7 @@ "x": 1, "y": 5, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1A77C1" }, @@ -146,7 +146,7 @@ "x": 1, "y": 7, "elevation": 3, - "var": "VAR_0x405E", + "var": "VAR_MAP_SCENE_ROUTE16", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1A77C1" } diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 5583646e3..56e5b2fec 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -27,7 +27,7 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A loadword 0, gUnknown_81737D2 callstd 4 setflag FLAG_0x237 - setvar VAR_0x407E, 1 + setvar VAR_MAP_SCENE_VERMILION_CITY, 1 release end diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 3d7a41b35..0d08a0152 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -8,7 +8,7 @@ SSAnne_Exterior_MapScript1_16084B:: @ 816084B end SSAnne_Exterior_MapScript2_16084F:: @ 816084F - map_script_2 VAR_0x407E, 1, SSAnne_Exterior_160859 + map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 1, SSAnne_Exterior_160859 .2byte 0 SSAnne_Exterior_160859:: @ 8160859 @@ -25,7 +25,7 @@ SSAnne_Exterior_160859:: @ 8160859 removeobject 1 applymovement 255, Movement_1608B7 waitmovement 0 - setvar VAR_0x407E, 2 + setvar VAR_MAP_SCENE_VERMILION_CITY, 2 setvar VAR_0x4053, 0 warp MAP_VERMILION_CITY, 255, 23, 34 waitstate diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 4d1217282..1c0809ce3 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -4,7 +4,7 @@ SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF .byte 0 SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA:: @ 816F0CA - map_script_2 VAR_0x4073, 1, EventScript_16F0D4 + map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, EventScript_16F0D4 .2byte 0 EventScript_16F0D4:: @ 816F0D4 @@ -26,7 +26,7 @@ EventScript_16F0D4:: @ 816F0D4 waitmovement 0 loadword 0, gUnknown_819C235 callstd 4 - setvar VAR_0x4073, 2 + setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 releaseall end @@ -73,9 +73,9 @@ Movement_16F13E:: @ 816F13E step_end SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144 - compare_var_to_value VAR_0x4073, 1 + compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 goto_if 1, EventScript_16F267 - compare_var_to_value VAR_0x4073, 2 + compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 goto_if 1, EventScript_16F15B end @@ -168,7 +168,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 faceplayer setvar VAR_0x8004, 0 special sub_81133A4 - compare_var_to_value VAR_0x4073, 0 + compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if 1, EventScript_16F2EE specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 @@ -213,7 +213,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 faceplayer setvar VAR_0x8004, 3 special sub_81133A4 - compare_var_to_value VAR_0x4073, 0 + compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if 1, EventScript_16F365 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 @@ -258,7 +258,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F faceplayer setvar VAR_0x8004, 1 special sub_81133A4 - compare_var_to_value VAR_0x4073, 0 + compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if 1, EventScript_16F3DC specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 @@ -303,7 +303,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 faceplayer setvar VAR_0x8004, 2 special sub_81133A4 - compare_var_to_value VAR_0x4073, 0 + compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if 1, EventScript_16F453 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index a5ac9bbf7..8f43bfec1 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -46,7 +46,7 @@ EventScript_162FA2:: @ 8162FA2 call_if 0, EventScript_162FF6 compare_var_to_value VAR_0x8008, 24 call_if 4, EventScript_163001 - setvar VAR_0x4063, 1 + setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1 warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 waitstate releaseall diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 283120f81..64a6719d7 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -102,7 +102,7 @@ "x": 26, "y": 19, "elevation": 1, - "var": "VAR_0x4063", + "var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F", "var_value": 0, "script": "SeafoamIslands_B4F_EventScript_16319D" }, @@ -111,7 +111,7 @@ "x": 27, "y": 19, "elevation": 1, - "var": "VAR_0x4063", + "var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F", "var_value": 0, "script": "SeafoamIslands_B4F_EventScript_16319D" }, @@ -120,7 +120,7 @@ "x": 28, "y": 19, "elevation": 1, - "var": "VAR_0x4063", + "var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F", "var_value": 0, "script": "SeafoamIslands_B4F_EventScript_16319D" } diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index a2d2189b4..b9d1ca5ba 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -65,7 +65,7 @@ EventScript_1630D4:: @ 81630D4 end SeafoamIslands_B4F_MapScript4_1630E7:: @ 81630E7 - map_script_2 VAR_0x4063, 1, EventScript_1630F1 + map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_1630F1 .2byte 0 EventScript_1630F1:: @ 81630F1 @@ -74,7 +74,7 @@ EventScript_1630F1:: @ 81630F1 end SeafoamIslands_B4F_MapScript5_1630F9:: @ 81630F9 - map_script_2 VAR_0x4063, 1, EventScript_16310B + map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_16310B map_script_2 VAR_0x4001, 1, EventScript_163121 .2byte 0 @@ -82,7 +82,7 @@ EventScript_16310B:: @ 816310B lockall applymovement 255, Movement_16311D waitmovement 0 - setvar VAR_0x4063, 0 + setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 0 releaseall end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index fa023efd4..03f21af78 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -7,7 +7,7 @@ SevenIsland_House_Room1_MapScript1_170895:: @ 8170895 special ValidateEReaderTrainer compare_var_to_value VAR_RESULT, 0 call_if 1, EventScript_1708AF - compare_var_to_value VAR_0x4074, 0 + compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 call_if 5, EventScript_1708C3 end @@ -24,9 +24,9 @@ EventScript_1708C3:: @ 81708C3 return SevenIsland_House_Room1_MapScript2_1708CF:: @ 81708CF - map_script_2 VAR_0x4074, 1, EventScript_1708E9 - map_script_2 VAR_0x4074, 2, EventScript_1708E9 - map_script_2 VAR_0x4074, 3, EventScript_1708E9 + map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, EventScript_1708E9 + map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, EventScript_1708E9 + map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3, EventScript_1708E9 .2byte 0 EventScript_1708E9:: @ 1708E9 @@ -39,14 +39,14 @@ EventScript_1708E9:: @ 1708E9 moveobjectoffscreen 1 applymovement 255, Movement_1A75E9 waitmovement 0 - compare_var_to_value VAR_0x4074, 1 + compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 call_if 1, EventScript_170938 - compare_var_to_value VAR_0x4074, 2 + compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 call_if 1, EventScript_170941 - compare_var_to_value VAR_0x4074, 3 + compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 call_if 1, EventScript_17094A special LoadPlayerParty - setvar VAR_0x4074, 0 + setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 releaseall end diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 57bfa131c..a0f3f6f20 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -41,20 +41,20 @@ EventScript_170A97:: @ 8170A97 end EventScript_170AFE:: @ 8170AFE - setvar VAR_0x4074, 3 + setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 loadword 0, gUnknown_81A07EC callstd 4 return EventScript_170B0C:: @ 8170B0C - setvar VAR_0x4074, 1 + setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 special sub_80CA68C waitmessage waitbuttonpress return EventScript_170B17:: @ 8170B17 - setvar VAR_0x4074, 2 + setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 special sub_80CA68C waitmessage waitbuttonpress diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 2eb0554e4..c9335f853 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -6,7 +6,7 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A setrespawn 20 - compare_var_to_value VAR_0x4089, 0 + compare_var_to_value VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 call_if 1, EventScript_171D89 end @@ -15,7 +15,7 @@ EventScript_171D89:: @ 8171D89 return SixIsland_PokemonCenter_1F_MapScript3_171D8D:: @ 8171D8D - map_script_2 VAR_0x4089, 0, EventScript_171D97 + map_script_2 VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0, EventScript_171D97 .2byte 0 EventScript_171D97:: @ 8171D97 @@ -41,8 +41,8 @@ EventScript_171D97:: @ 8171D97 playse SE_KAIDAN delay 35 removeobject 2 - setvar VAR_0x4089, 1 - setvar VAR_0x4086, 1 + setvar VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 1 + setvar VAR_MAP_SCENE_FOUR_ISLAND, 1 releaseall end diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 5acd5a6d3..d7413edd5 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -43,7 +43,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 closemessage setflag FLAG_0x2A3 setflag FLAG_0x07A - setvar VAR_0x4079, 2 + setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 clearflag FLAG_0x075 warp MAP_TWO_ISLAND_JOYFUL_GAME_CORNER, 255, 6, 6 waitstate diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 8ea267722..0e0760109 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -10,7 +10,7 @@ ThreeIsland_Port_MapScript1_16878F:: @ 816878F ThreeIsland_Port_EventScript_168796:: @ 8168796 lock faceplayer - compare_var_to_value VAR_0x4079, 2 + 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 goto_if 4, EventScript_1687C2 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 496c0fa3d..58b6052f2 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -14,11 +14,11 @@ EventScript_1713EF:: @ 81713EF setobjectxyperm 1, 6, 2 setobjectmovementtype 1, 8 setobjectmovementtype 3, 1 - setvar VAR_0x4079, 4 + setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 return TwoIsland_JoyfulGameCorner_MapScript2_171404:: @ 8171404 - map_script_2 VAR_0x4079, 2, EventScript_171416 + map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171416 map_script_2 VAR_0x406F, 8, EventScript_1BB227 .2byte 0 @@ -27,8 +27,8 @@ EventScript_171416:: @ 8171416 end TwoIsland_JoyfulGameCorner_MapScript3_17141B:: @ 817141B - map_script_2 VAR_0x4079, 0, EventScript_17145F - map_script_2 VAR_0x4079, 2, EventScript_171435 + map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, EventScript_17145F + map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171435 map_script_2 VAR_0x406F, 8, EventScript_1BB2FD .2byte 0 @@ -44,7 +44,7 @@ EventScript_171435:: @ 8171435 closemessage applymovement 3, Movement_1A75ED waitmovement 0 - setvar VAR_0x4079, 3 + setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 releaseall end @@ -97,7 +97,7 @@ EventScript_17145F:: @ 817145F callstd 4 clearflag FLAG_0x091 setvar VAR_0x407B, 2 - setvar VAR_0x4079, 1 + setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 1 releaseall end @@ -133,7 +133,7 @@ Movement_17152F:: @ 817152F TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 lock faceplayer - compare_var_to_value VAR_0x4079, 4 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 goto_if 1, EventScript_1BC060 checkflag FLAG_0x2A3 goto_if 1, EventScript_171555 @@ -151,11 +151,11 @@ EventScript_171555:: @ 8171555 TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F lock faceplayer - compare_var_to_value VAR_0x4079, 4 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 goto_if 1, EventScript_1BC0CE checkflag FLAG_0x2FB goto_if 1, EventScript_1715F5 - compare_var_to_value VAR_0x4079, 3 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 goto_if 1, EventScript_17158A loadword 0, gUnknown_81A2743 callstd 4 @@ -167,7 +167,7 @@ EventScript_17158A:: @ 817158A goto_if 1, EventScript_1715C4 loadword 0, gUnknown_81A296A callstd 4 - setvar VAR_0x4076, 2 + setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 textcolor 3 playfanfare MUS_ME_WAZA message Text_1A29F7 diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 8c0b7a1de..f1b10e1d2 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -4,14 +4,14 @@ VermilionCity_MapScripts:: @ 81668DC .byte 0 VermilionCity_MapScript2_1668E7:: @ 81668E7 - map_script_2 VAR_0x407E, 2, EventScript_1668F1 + map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 2, EventScript_1668F1 .2byte 0 EventScript_1668F1:: @ 81668F1 lockall applymovement 255, Movement_166903 waitmovement 0 - setvar VAR_0x407E, 3 + setvar VAR_MAP_SCENE_VERMILION_CITY, 3 releaseall end @@ -38,7 +38,7 @@ VermilionCity_EventScript_166917:: @ 8166917 VermilionCity_EventScript_166920:: @ 8166920 lock faceplayer - compare_var_to_value VAR_0x407E, 3 + compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if 1, EventScript_166937 loadword 0, gUnknown_817F776 callstd 4 @@ -54,7 +54,7 @@ EventScript_166937:: @ 8166937 VermilionCity_EventScript_166941:: @ 8166941 lock faceplayer - compare_var_to_value VAR_0x407E, 3 + compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if 1, EventScript_166996 loadword 0, gUnknown_817FA22 callstd 4 @@ -81,9 +81,9 @@ EventScript_166977:: @ 8166977 EventScript_166996:: @ 8166996 setvar VAR_0x8004, 0 - compare_var_to_value VAR_0x4076, 5 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if 4, EventScript_1669BB - compare_var_to_value VAR_0x4076, 1 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 goto_if 4, EventScript_166B3B loadword 0, gUnknown_817FB10 callstd 4 @@ -236,7 +236,7 @@ EventScript_166BA0:: @ 8166BA0 applymovement 6, Movement_1A75E7 applymovement 255, Movement_1A75EB waitmovement 0 - compare_var_to_value VAR_0x407E, 3 + compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if 1, EventScript_166BED loadword 0, gUnknown_817FA3C callstd 4 @@ -257,9 +257,9 @@ EventScript_166BDE:: @ 8166BDE EventScript_166BED:: @ 8166BED setvar VAR_0x8004, 0 - compare_var_to_value VAR_0x4076, 5 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if 4, EventScript_1669BB - compare_var_to_value VAR_0x4076, 1 + compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 goto_if 4, EventScript_166B3B loadword 0, gUnknown_817FB10 callstd 4 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 0f5bb19c8..383960ddc 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -14,7 +14,7 @@ EventScript_16A1E8:: @ 816A1E8 end ViridianCity_Mart_MapScript2_16A1FB:: @ 816A1FB - map_script_2 VAR_0x4057, 0, EventScript_16A205 + map_script_2 VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 0, EventScript_16A205 .2byte 0 EventScript_16A205:: @ 816A205 @@ -30,14 +30,14 @@ EventScript_16A205:: @ 816A205 waitmovement 0 loadword 0, gUnknown_819023A callstd 4 - setvar VAR_0x4057, 1 + setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 additem ITEM_OAKS_PARCEL, 1 loadword 0, gUnknown_8190289 setorcopyvar VAR_0x8000, 349 setorcopyvar VAR_0x8001, 1 setorcopyvar VAR_0x8002, 318 callstd 9 - setvar VAR_0x4055, 5 + setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5 releaseall end @@ -60,7 +60,7 @@ Movement_16A262:: @ 816A262 ViridianCity_Mart_EventScript_16A268:: @ 816A268 lock faceplayer - compare_var_to_value VAR_0x4057, 1 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 goto_if 1, EventScript_16A2A4 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 diff --git a/include/constants/vars.h b/include/constants/vars.h index 2f817fb02..54bcb20a0 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -86,26 +86,26 @@ #define VAR_0x404D 0x404D #define VAR_0x404E 0x404E #define VAR_LOTAD_SIZE_RECORD 0x404F -#define VAR_0x4050 0x4050 +#define VAR_MAP_SCENE_PALLET_TOWN 0x4050 #define VAR_0x4051 0x4051 #define VAR_0x4052 0x4052 #define VAR_0x4053 0x4053 #define VAR_0x4054 0x4054 -#define VAR_0x4055 0x4055 -#define VAR_0x4056 0x4056 -#define VAR_0x4057 0x4057 +#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_0x405E 0x405E +#define VAR_MAP_SCENE_ROUTE16 0x405E #define VAR_0x405F 0x405F #define VAR_0x4060 0x4060 #define VAR_0x4061 0x4061 #define VAR_0x4062 0x4062 -#define VAR_0x4063 0x4063 +#define VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F 0x4063 #define VAR_0x4064 0x4064 #define VAR_0x4065 0x4065 #define VAR_0x4066 0x4066 @@ -116,35 +116,35 @@ #define VAR_0x406B 0x406B #define VAR_0x406C 0x406C #define VAR_0x406D 0x406D -#define VAR_0x406E 0x406E +#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_0x4073 0x4073 -#define VAR_0x4074 0x4074 -#define VAR_0x4075 0x4075 -#define VAR_0x4076 0x4076 +#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_0x4079 0x4079 +#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_0x407E 0x407E +#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_0x4083 0x4083 -#define VAR_0x4084 0x4084 -#define VAR_0x4085 0x4085 -#define VAR_0x4086 0x4086 +#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_0x4089 0x4089 -#define VAR_0x408A 0x408A +#define VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F 0x4089 +#define VAR_MAP_SCENE_CINNABAR_ISLAND 0x408A #define VAR_0x408B 0x408B #define VAR_0x408C 0x408C #define VAR_0x408D 0x408D diff --git a/src/quest_log.c b/src/quest_log.c index 366af45f3..ea695d3af 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -2515,7 +2515,7 @@ void sub_81130BC(struct Var4038Struct * varPtr) FlagClear(FLAG_0x06D); FlagClear(FLAG_0x06E); FlagClear(FLAG_0x06F); - VarSet(VAR_0x4073, 1); + VarSet(VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1); } } @@ -2523,7 +2523,7 @@ ALIGNED(4) const u8 gUnknown_8456934[] = {2, 1, 2, 1}; u8 sub_8113114(struct Var4038Struct * a0, u8 a1) { - if (VarGet(VAR_0x4073) == 2) + if (VarGet(VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB) == 2) { if (a0->unk_0_0 + gUnknown_8456934[a1] >= 20) { @@ -2743,7 +2743,7 @@ void sub_81134B8(void) void sub_81134CC(struct Var4038Struct * a0) { - if (VarGet(VAR_0x4073) == 2) + if (VarGet(VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB) == 2) { sub_8113078(a0); if (gUnknown_2023E8A == 1) |