diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-09 14:46:14 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-09 14:46:14 -0500 |
commit | 94fbc3ac489e529176533a1fad7deac7e1014b9d (patch) | |
tree | 601565077b265a1f4dbe7d9272f3c7a13797e5e1 | |
parent | 0f5e3174d0d4b910beb273de772772d257692c94 (diff) |
Sync temp vars
82 files changed, 609 insertions, 609 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 27b22fa85..2ff7dc61a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1270,19 +1270,19 @@ gUnknown_81A6C32:: @ 81A6C32 EventScript_1A7493:: @ 81A7493 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_1A74B7 end EventScript_1A749F:: @ 81A749F lockall - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 goto EventScript_1A74B7 end EventScript_1A74AB:: @ 81A74AB lockall - setvar VAR_0x4003, 1 + setvar VAR_TEMP_3, 1 goto EventScript_1A74B7 end @@ -1297,11 +1297,11 @@ EventScript_1A74B7:: @ 81A74B7 end EventScript_1A74D1:: @ 81A74D1 - setvar VAR_0x4001, 1 - setvar VAR_0x4002, 1 - setvar VAR_0x4003, 1 - setvar VAR_0x4004, 1 - setvar VAR_0x4005, 1 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_5, 1 return EventScript_1A74EB:: @ 81A74EB @@ -1851,7 +1851,7 @@ EventScript_1A8C33:: @ 81A8C33 EventScript_1A8C3C:: @ 81A8C3C bufferboxname 0, VAR_0x4037 - getspeciesname 1, VAR_0x4001 + getspeciesname 1, VAR_TEMP_1 checkflag FLAG_SYS_NOT_SOMEONES_PC call_if FALSE, EventScript_1A8C57 checkflag FLAG_SYS_NOT_SOMEONES_PC diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 1d5879580..2e6e09d48 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -8,7 +8,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464 CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D lock faceplayer - setvar VAR_0x4001, SPECIES_EEVEE + setvar VAR_TEMP_1, SPECIES_EEVEE givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0 compare VAR_RESULT, 0 goto_if eq, EventScript_16C4A6 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 63feedabb..0668a0287 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -9,13 +9,13 @@ CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD lock faceplayer call EventScript_16BCF6 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 goto_if eq, EventScript_16C00E goto EventScript_16BD3E end EventScript_16BCF6:: @ 816BCF6 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 checkitem ITEM_FRESH_WATER, 1 compare VAR_RESULT, 1 call_if eq, EventScript_16BD2C @@ -28,15 +28,15 @@ EventScript_16BCF6:: @ 816BCF6 return EventScript_16BD2C:: @ 816BD2C - addvar VAR_0x4001, 1 + addvar VAR_TEMP_1, 1 return EventScript_16BD32:: @ 816BD32 - addvar VAR_0x4001, 2 + addvar VAR_TEMP_1, 2 return EventScript_16BD38:: @ 816BD38 - addvar VAR_0x4001, 4 + addvar VAR_TEMP_1, 4 return EventScript_16BD3E:: @ 816BD3E @@ -47,7 +47,7 @@ EventScript_16BD3E:: @ 816BD3E message Text_195D5F waitmessage textcolor 1 - switch VAR_0x4001 + switch VAR_TEMP_1 case 1, EventScript_16BDAE case 2, EventScript_16BDDA case 3, EventScript_16BE06 @@ -221,8 +221,8 @@ CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 EventScript_16C045:: @ 816C045 multichoice 12, 0, MULTICHOICE_CELADON_VENDING_MACHINE, FALSE - copyvar VAR_0x4001, VAR_RESULT - switch VAR_0x4001 + copyvar VAR_TEMP_1, VAR_RESULT + switch VAR_TEMP_1 case 0, EventScript_16C083 case 1, EventScript_16C094 case 2, EventScript_16C0A5 @@ -231,19 +231,19 @@ EventScript_16C045:: @ 816C045 end EventScript_16C083:: @ 816C083 - setvar VAR_0x4000, ITEM_FRESH_WATER + setvar VAR_TEMP_0, ITEM_FRESH_WATER checkmoney 200, 0 goto EventScript_16C0CB end EventScript_16C094:: @ 816C094 - setvar VAR_0x4000, ITEM_SODA_POP + setvar VAR_TEMP_0, ITEM_SODA_POP checkmoney 300, 0 goto EventScript_16C0CB end EventScript_16C0A5:: @ 816C0A5 - setvar VAR_0x4000, ITEM_LEMONADE + setvar VAR_TEMP_0, ITEM_LEMONADE checkmoney 350, 0 goto EventScript_16C0CB end @@ -263,20 +263,20 @@ EventScript_16C0C4:: @ 816C0C4 EventScript_16C0CB:: @ 816C0CB compare VAR_RESULT, 0 goto_if eq, EventScript_16C131 - checkitemspace VAR_0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 goto_if eq, EventScript_16C13F - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16C0B6 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16C0BD - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16C0C4 updatemoneybox 0, 0, 0 - getitemname 0, VAR_0x4000 + getitemname 0, VAR_TEMP_0 playse SE_JIHANKI msgbox gUnknown_8196076 - additem VAR_0x4000, 1 + additem VAR_TEMP_0, 1 goto EventScript_16C125 end diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index d107b3330..eb242f2e6 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -48,8 +48,8 @@ EventScript_16C6E6:: @ 816C6E6 end EventScript_16C706:: @ 816C706 - checkcoins VAR_0x4001 - compare VAR_0x4001, 9500 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9500 goto_if ge, EventScript_16C79E checkmoney 10000, 0 compare VAR_RESULT, 0 @@ -60,8 +60,8 @@ EventScript_16C706:: @ 816C706 end EventScript_16C734:: @ 816C734 - checkcoins VAR_0x4001 - compare VAR_0x4001, 9950 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9950 goto_if ge, EventScript_16C79E checkmoney 1000, 0 compare VAR_RESULT, 0 @@ -134,8 +134,8 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 msgbox gUnknown_8196AF3 checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16C839 - checkcoins VAR_0x4001 - compare VAR_0x4001, 9990 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9990 goto_if ge, EventScript_16C82B givecoins 10 textcolor 3 @@ -198,8 +198,8 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E msgbox gUnknown_8196D2B checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16C839 - checkcoins VAR_0x4001 - compare VAR_0x4001, 9980 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9980 goto_if ge, EventScript_16C8E2 givecoins 20 textcolor 3 @@ -228,8 +228,8 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE msgbox gUnknown_8196DB7 checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16C839 - checkcoins VAR_0x4001 - compare VAR_0x4001, 9980 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9980 goto_if ge, EventScript_16C942 givecoins 20 textcolor 3 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 225685d6a..92987068e 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -43,12 +43,12 @@ EventScript_16CC10:: @ 816CC10 EventScript_16CC15:: @ 816CC15 .ifdef FIRERED - setvar VAR_0x4001, SPECIES_ABRA - setvar VAR_0x4002, 180 + setvar VAR_TEMP_1, SPECIES_ABRA + setvar VAR_TEMP_2, 180 .else .ifdef LEAFGREEN - setvar VAR_0x4001, SPECIES_ABRA - setvar VAR_0x4002, 120 + setvar VAR_TEMP_1, SPECIES_ABRA + setvar VAR_TEMP_2, 120 .endif .endif goto EventScript_16CC65 @@ -56,12 +56,12 @@ EventScript_16CC15:: @ 816CC15 EventScript_16CC25:: @ 816CC25 .ifdef FIRERED - setvar VAR_0x4001, SPECIES_CLEFAIRY - setvar VAR_0x4002, 500 + setvar VAR_TEMP_1, SPECIES_CLEFAIRY + setvar VAR_TEMP_2, 500 .else .ifdef LEAFGREEN - setvar VAR_0x4001, SPECIES_CLEFAIRY - setvar VAR_0x4002, 750 + setvar VAR_TEMP_1, SPECIES_CLEFAIRY + setvar VAR_TEMP_2, 750 .endif .endif goto EventScript_16CC65 @@ -69,12 +69,12 @@ EventScript_16CC25:: @ 816CC25 EventScript_16CC35:: @ 816CC35 .ifdef FIRERED - setvar VAR_0x4001, SPECIES_DRATINI - setvar VAR_0x4002, 2800 + setvar VAR_TEMP_1, SPECIES_DRATINI + setvar VAR_TEMP_2, 2800 .else .ifdef LEAFGREEN - setvar VAR_0x4001, SPECIES_PINSIR - setvar VAR_0x4002, 2500 + setvar VAR_TEMP_1, SPECIES_PINSIR + setvar VAR_TEMP_2, 2500 .endif .endif goto EventScript_16CC65 @@ -82,12 +82,12 @@ EventScript_16CC35:: @ 816CC35 EventScript_16CC45:: @ 816CC45 .ifdef FIRERED - setvar VAR_0x4001, SPECIES_SCYTHER - setvar VAR_0x4002, 5500 + setvar VAR_TEMP_1, SPECIES_SCYTHER + setvar VAR_TEMP_2, 5500 .else .ifdef LEAFGREEN - setvar VAR_0x4001, SPECIES_DRATINI - setvar VAR_0x4002, 4600 + setvar VAR_TEMP_1, SPECIES_DRATINI + setvar VAR_TEMP_2, 4600 .endif .endif goto EventScript_16CC65 @@ -95,27 +95,27 @@ EventScript_16CC45:: @ 816CC45 EventScript_16CC55:: @ 816CC55 .ifdef FIRERED - setvar VAR_0x4001, SPECIES_PORYGON - setvar VAR_0x4002, 9999 + setvar VAR_TEMP_1, SPECIES_PORYGON + setvar VAR_TEMP_2, 9999 .else .ifdef LEAFGREEN - setvar VAR_0x4001, SPECIES_PORYGON - setvar VAR_0x4002, 6500 + setvar VAR_TEMP_1, SPECIES_PORYGON + setvar VAR_TEMP_2, 6500 .endif .endif goto EventScript_16CC65 end EventScript_16CC65:: @ 816CC65 - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 msgbox gUnknown_819709D, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if eq, EventScript_16CC10 checkcoins VAR_RESULT - compare VAR_RESULT, VAR_0x4002 + compare VAR_RESULT, VAR_TEMP_2 goto_if lt, EventScript_16CDA5 textcolor 3 - switch VAR_0x4001 + switch VAR_TEMP_1 case SPECIES_ABRA, EventScript_16CCD4 case SPECIES_CLEFAIRY, EventScript_16CCE9 case SPECIES_DRATINI, EventScript_16CCFE @@ -126,10 +126,10 @@ EventScript_16CC65:: @ 816CC65 EventScript_16CCD4:: @ 816CCD4 .ifdef FIRERED - givemon VAR_0x4001, 9, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 9, ITEM_NONE, 0, 0, 0 .else .ifdef LEAFGREEN - givemon VAR_0x4001, 7, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 7, ITEM_NONE, 0, 0, 0 .endif .endif goto EventScript_16CD52 @@ -137,10 +137,10 @@ EventScript_16CCD4:: @ 816CCD4 EventScript_16CCE9:: @ 816CCE9 .ifdef FIRERED - givemon VAR_0x4001, 8, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 8, ITEM_NONE, 0, 0, 0 .else .ifdef LEAFGREEN - givemon VAR_0x4001, 12, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 12, ITEM_NONE, 0, 0, 0 .endif .endif goto EventScript_16CD52 @@ -148,33 +148,33 @@ EventScript_16CCE9:: @ 816CCE9 EventScript_16CCFE:: @ 816CCFE .ifdef FIRERED - givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 18, ITEM_NONE, 0, 0, 0 .else .ifdef LEAFGREEN - givemon VAR_0x4001, 24, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 24, ITEM_NONE, 0, 0, 0 .endif .endif goto EventScript_16CD52 end EventScript_16CD13:: @ 816CD13 - givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 25, ITEM_NONE, 0, 0, 0 goto EventScript_16CD52 end EventScript_16CD28:: @ 816CD28 .ifdef FIRERED - givemon VAR_0x4001, 26, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 26, ITEM_NONE, 0, 0, 0 .else .ifdef LEAFGREEN - givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 18, ITEM_NONE, 0, 0, 0 .endif .endif goto EventScript_16CD52 end EventScript_16CD3D:: @ 816CD3D - givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 18, ITEM_NONE, 0, 0, 0 goto EventScript_16CD52 end @@ -214,9 +214,9 @@ EventScript_16CDA5:: @ 816CDA5 end EventScript_16CDB3:: @ 816CDB3 - takecoins VAR_0x4002 + takecoins VAR_TEMP_2 updatecoinsbox 0, 5 - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 message Text_1A5DF1 waitmessage @@ -228,9 +228,9 @@ EventScript_16CDB3:: @ 816CDB3 end EventScript_16CDE0:: @ 816CDE0 - takecoins VAR_0x4002 + takecoins VAR_TEMP_2 updatecoinsbox 0, 5 - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 message Text_1A5DF1 waitmessage @@ -275,36 +275,36 @@ EventScript_16CE47:: @ 816CE47 end EventScript_16CEA5:: @ 816CEA5 - setvar VAR_0x4001, ITEM_TM13 - setvar VAR_0x4002, 4000 + setvar VAR_TEMP_1, ITEM_TM13 + setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_ICE_BEAM goto EventScript_16CF09 end EventScript_16CEB9:: @ 816CEB9 - setvar VAR_0x4001, ITEM_TM23 - setvar VAR_0x4002, 3500 + setvar VAR_TEMP_1, ITEM_TM23 + setvar VAR_TEMP_2, 3500 getmovename 1, MOVE_IRON_TAIL goto EventScript_16CF09 end EventScript_16CECD:: @ 816CECD - setvar VAR_0x4001, ITEM_TM24 - setvar VAR_0x4002, 4000 + setvar VAR_TEMP_1, ITEM_TM24 + setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_THUNDERBOLT goto EventScript_16CF09 end EventScript_16CEE1:: @ 816CEE1 - setvar VAR_0x4001, ITEM_TM30 - setvar VAR_0x4002, 4500 + setvar VAR_TEMP_1, ITEM_TM30 + setvar VAR_TEMP_2, 4500 getmovename 1, MOVE_SHADOW_BALL goto EventScript_16CF09 end EventScript_16CEF5:: @ 816CEF5 - setvar VAR_0x4001, ITEM_TM35 - setvar VAR_0x4002, 4000 + setvar VAR_TEMP_1, ITEM_TM35 + setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_FLAMETHROWER goto EventScript_16CF09 end @@ -317,7 +317,7 @@ EventScript_16CF09:: @ 816CF09 end EventScript_16CF22:: @ 816CF22 - getitemname 0, VAR_0x4001 + getitemname 0, VAR_TEMP_1 msgbox gUnknown_819709D, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if eq, EventScript_16CC10 @@ -325,16 +325,16 @@ EventScript_16CF22:: @ 816CF22 end EventScript_16CF3F:: @ 816CF3F - getitemname 0, VAR_0x4001 + getitemname 0, VAR_TEMP_1 checkcoins VAR_RESULT - compare VAR_RESULT, VAR_0x4002 + compare VAR_RESULT, VAR_TEMP_2 goto_if lt, EventScript_16CDA5 - checkitemspace VAR_0x4001, 1 + checkitemspace VAR_TEMP_1, 1 compare VAR_RESULT, 0 goto_if eq, EventScript_16CF79 - takecoins VAR_0x4002 + takecoins VAR_TEMP_2 updatecoinsbox 0, 5 - giveitem VAR_0x4001 + giveitem VAR_TEMP_1 goto EventScript_16CC10 end @@ -373,31 +373,31 @@ EventScript_16CFB2:: @ 816CFB2 end EventScript_16D010:: @ 816D010 - setvar VAR_0x4001, ITEM_SMOKE_BALL - setvar VAR_0x4002, 800 + setvar VAR_TEMP_1, ITEM_SMOKE_BALL + setvar VAR_TEMP_2, 800 goto EventScript_16CF22 end EventScript_16D020:: @ 816D020 - setvar VAR_0x4001, ITEM_MIRACLE_SEED - setvar VAR_0x4002, 1000 + setvar VAR_TEMP_1, ITEM_MIRACLE_SEED + setvar VAR_TEMP_2, 1000 goto EventScript_16CF22 end EventScript_16D030:: @ 816D030 - setvar VAR_0x4001, ITEM_CHARCOAL - setvar VAR_0x4002, 1000 + setvar VAR_TEMP_1, ITEM_CHARCOAL + setvar VAR_TEMP_2, 1000 goto EventScript_16CF22 end EventScript_16D040:: @ 816D040 - setvar VAR_0x4001, ITEM_MYSTIC_WATER - setvar VAR_0x4002, 1000 + setvar VAR_TEMP_1, ITEM_MYSTIC_WATER + setvar VAR_TEMP_2, 1000 goto EventScript_16CF22 end EventScript_16D050:: @ 816D050 - setvar VAR_0x4001, ITEM_YELLOW_FLUTE - setvar VAR_0x4002, 1600 + setvar VAR_TEMP_1, ITEM_YELLOW_FLUTE + setvar VAR_TEMP_2, 1600 goto EventScript_16CF22 end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index b31b09ec2..6edb5737e 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -16,20 +16,20 @@ EventScript_166484:: @ 8166484 CeruleanCity_EventScript_16649A:: @ 816649A lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_1664CC end CeruleanCity_EventScript_1664A6:: @ 81664A6 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 8, 23, 0 goto EventScript_1664CC end CeruleanCity_EventScript_1664B9:: @ 81664B9 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 setobjectxyperm 8, 24, 0 goto EventScript_1664CC end @@ -53,11 +53,11 @@ EventScript_1664CC:: @ 81664CC msgbox gUnknown_817EB95 closemessage playbgm MUS_RIVAL2, 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_1665A3 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_1665A3 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1665B5 msgbox gUnknown_817ECD4 setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 @@ -206,7 +206,7 @@ EventScript_166677:: @ 8166677 CeruleanCity_EventScript_166683:: @ 8166683 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown @@ -216,7 +216,7 @@ CeruleanCity_EventScript_166683:: @ 8166683 CeruleanCity_EventScript_1666A3:: @ 81666A3 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index ecc68bb6d..c83feff7b 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -120,7 +120,7 @@ "x": 20, "y": 5, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "CinnabarIsland_EventScript_1671CA" } diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 8c7e882d0..fa5546852 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -47,7 +47,7 @@ EventScript_166F5E:: @ 8166F5E return EventScript_166F68:: @ 8166F68 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return CinnabarIsland_OnFrame:: @ 8166F6E diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 9b1c42a45..03fbf26f0 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -214,13 +214,13 @@ EventScript_16DBDE:: @ 816DBDE CinnabarIsland_Gym_EventScript_16DBE8:: @ 816DBE8 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DC00 end CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DC00 end @@ -275,9 +275,9 @@ EventScript_16DC6A:: @ 816DC6A end EventScript_16DC7A:: @ 816DC7A - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16DCB4 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16DCC6 textcolor 0 msgbox gUnknown_819983F @@ -311,13 +311,13 @@ Movement_16DCDB:: @ 816DCDB CinnabarIsland_Gym_EventScript_16DCDD:: @ 816DCDD lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DCF5 end CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DCF5 end @@ -354,9 +354,9 @@ EventScript_16DD41:: @ 816DD41 end EventScript_16DD51:: @ 816DD51 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16DD8B - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16DD9D textcolor 0 msgbox gUnknown_81998BD @@ -399,13 +399,13 @@ Movement_16DDB7:: @ 816DDB7 CinnabarIsland_Gym_EventScript_16DDBB:: @ 816DDBB lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DDD3 end CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DDD3 end @@ -442,9 +442,9 @@ EventScript_16DE1F:: @ 816DE1F end EventScript_16DE2F:: @ 816DE2F - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16DE69 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16DE7B textcolor 0 msgbox gUnknown_8199948 @@ -478,13 +478,13 @@ Movement_16DE90:: @ 816DE90 CinnabarIsland_Gym_EventScript_16DE92:: @ 816DE92 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DEAA end CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DEAA end @@ -521,9 +521,9 @@ EventScript_16DEF6:: @ 816DEF6 end EventScript_16DF06:: @ 816DF06 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16DF40 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16DF52 textcolor 0 msgbox gUnknown_81999B7 @@ -557,13 +557,13 @@ Movement_16DF67:: @ 816DF67 CinnabarIsland_Gym_EventScript_16DF69:: @ 816DF69 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DF81 end CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DF81 end @@ -600,9 +600,9 @@ EventScript_16DFCD:: @ 816DFCD end EventScript_16DFDD:: @ 816DFDD - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16E017 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16E029 textcolor 0 msgbox gUnknown_8199A7F @@ -636,13 +636,13 @@ Movement_16E03E:: @ 816E03E CinnabarIsland_Gym_EventScript_16E040:: @ 816E040 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16E058 end CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16E058 end @@ -679,9 +679,9 @@ EventScript_16E0A4:: @ 816E0A4 end EventScript_16E0B4:: @ 816E0B4 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16E0EE - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16E100 textcolor 0 msgbox gUnknown_8199AFC diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index 03562d9c1..fba30d1e8 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -216,7 +216,7 @@ EventScript_16E736:: @ 816E736 end EventScript_16E758:: @ 816E758 - setvar VAR_0x4001, SPECIES_OMANYTE + setvar VAR_TEMP_1, SPECIES_OMANYTE getspeciesname 0, SPECIES_OMANYTE msgbox gUnknown_819A34F givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0 @@ -230,7 +230,7 @@ EventScript_16E758:: @ 816E758 end EventScript_16E79D:: @ 816E79D - setvar VAR_0x4001, SPECIES_KABUTO + setvar VAR_TEMP_1, SPECIES_KABUTO getspeciesname 0, SPECIES_KABUTO msgbox gUnknown_819A34F givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0 @@ -244,7 +244,7 @@ EventScript_16E79D:: @ 816E79D end EventScript_16E7E2:: @ 816E7E2 - setvar VAR_0x4001, SPECIES_AERODACTYL + setvar VAR_TEMP_1, SPECIES_AERODACTYL getspeciesname 0, SPECIES_AERODACTYL msgbox gUnknown_819A34F givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0 diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index bc73fb818..c3e3eaff2 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -13,7 +13,7 @@ FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57 end FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B - map_script_2 VAR_0x4001, 1, EventScript_163D65 + map_script_2 VAR_TEMP_1, 1, EventScript_163D65 .2byte 0 EventScript_163D65:: @ 8163D65 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index 13f4ee261..625d4098b 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -76,7 +76,7 @@ "x": 4, "y": 3, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D36D" }, @@ -85,7 +85,7 @@ "x": 5, "y": 3, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D379" }, @@ -94,7 +94,7 @@ "x": 3, "y": 3, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D385" } diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 8d248b5d0..2ec411238 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -79,19 +79,19 @@ Movement_16D36A:: @ 816D36A FuchsiaCity_SafariZone_Entrance_EventScript_16D36D:: @ 816D36D lockall - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 goto EventScript_16D391 end FuchsiaCity_SafariZone_Entrance_EventScript_16D379:: @ 816D379 lockall - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 goto EventScript_16D391 end FuchsiaCity_SafariZone_Entrance_EventScript_16D385:: @ 816D385 lockall - setvar VAR_0x4002, 2 + setvar VAR_TEMP_2, 2 goto EventScript_16D391 end @@ -124,11 +124,11 @@ EventScript_16D3CA:: @ 816D3CA msgbox gUnknown_8197D80 closemessage hidemoneybox 0, 0 - compare VAR_0x4002, 0 + compare VAR_TEMP_2, 0 call_if eq, EventScript_16D44C - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 call_if eq, EventScript_16D441 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 call_if eq, EventScript_16D457 special EnterSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2 diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 6baaa256f..669097ef3 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -42,7 +42,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "NavelRock_Summit_EventScript_164FFB" } diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index f881628e2..065fdfa42 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -11,15 +11,15 @@ NavelRock_Summit_OnTransition:: @ 8164FAA end EventScript_164FBD:: @ 8164FBD - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setflag FLAG_HIDE_HO_OH return EventScript_164FC6:: @ 8164FC6 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 checkflag FLAG_HO_OH_FLEW_AWAY goto_if TRUE, EventScript_1A77A9 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 clearflag FLAG_HIDE_HO_OH return @@ -41,7 +41,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB goto_if eq, EventScript_1A7AE0 special sub_8112364 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 special SpawnCameraObject setvar VAR_0x8004, 3 setvar VAR_0x8005, 35 diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index a04cfa085..97c4318c3 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -107,7 +107,7 @@ "x": 13, "y": 13, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "OneIsland_KindleRoad_EmberSpa_EventScript_1653CF" } diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index 71c8cf0ee..a4bd33e22 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -48,6 +48,6 @@ OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF special sp000_heal_pokemon fadescreen 2 msgbox gUnknown_817D450 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index d2a049acb..bb4d46273 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -437,25 +437,25 @@ EventScript_1711A0:: @ 81711A0 OneIsland_PokemonCenter_1F_EventScript_1711AA:: @ 81711AA lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_1711DA end OneIsland_PokemonCenter_1F_EventScript_1711B6:: @ 81711B6 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_1711DA end OneIsland_PokemonCenter_1F_EventScript_1711C2:: @ 81711C2 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 goto EventScript_1711DA end OneIsland_PokemonCenter_1F_EventScript_1711CE:: @ 81711CE lockall - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 goto EventScript_1711DA end @@ -466,13 +466,13 @@ EventScript_1711DA:: @ 81711DA waitmovement 0 msgbox gUnknown_81A13B8 closemessage - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_1712E4 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1712EF - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if eq, EventScript_1712FA - compare VAR_0x4001, 4 + compare VAR_TEMP_1, 4 call_if eq, EventScript_171305 delay 10 msgbox gUnknown_81A13CB diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 2b2c4330a..1d65c1c3f 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -111,7 +111,7 @@ "x": 13, "y": 2, "elevation": 3, - "var": "VAR_0x4002", + "var": "VAR_TEMP_2", "var_value": 1, "script": "PalletTown_EventScript_16587B" } diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 4feb30355..831c17dde 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -35,7 +35,7 @@ EventScript_1654A8:: @ 81654A8 EventScript_1654BD:: @ 81654BD setobjectxyperm 1, 12, 2 setobjectmovementtype 1, 8 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 return PalletTown_OnFrame:: @ 81654CE @@ -173,13 +173,13 @@ Movement_1655DD:: @ 81655DD PalletTown_EventScript_1655ED:: @ 81655ED lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_165605 end PalletTown_EventScript_1655F9:: @ 81655F9 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_165605 end @@ -199,17 +199,17 @@ EventScript_165605:: @ 8165605 waitmovement 0 delay 30 addobject 3 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_1656B8 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_1656C3 delay 30 msgbox gUnknown_817D74A closemessage delay 30 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_1656CE - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_1656E0 opendoor 16, 13 waitdooranim @@ -378,7 +378,7 @@ PalletTown_EventScript_16575C:: @ 816575C goto_if eq, EventScript_1657ED compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 goto_if eq, EventScript_165815 - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 goto_if eq, EventScript_1658C2 checkflag FLAG_TEMP_2 goto_if TRUE, EventScript_165801 @@ -489,7 +489,7 @@ EventScript_165894:: @ 8165894 textcolor 3 setflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 special sub_80699E0 special sub_80699BC signmsg diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 6a6354a1a..7a76bab27 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -15,7 +15,7 @@ EventScript_168D44:: @ 8168D44 return EventScript_168D50:: @ 8168D50 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 @@ -24,7 +24,7 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkflag FLAG_SYS_GAME_CLEAR goto_if TRUE, EventScript_168DB9 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 goto_if eq, EventScript_168EEC compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 goto_if eq, EventScript_168F59 diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index a4988a1c2..858b12d8c 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -284,19 +284,19 @@ Movement_1692E5:: @ 81692E5 PalletTown_ProfessorOaksLab_EventScript_1692E7:: @ 81692E7 lockall - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 goto EventScript_16930B end PalletTown_ProfessorOaksLab_EventScript_1692F3:: @ 81692F3 lockall - setvar VAR_0x4002, 2 + setvar VAR_TEMP_2, 2 goto EventScript_16930B end PalletTown_ProfessorOaksLab_EventScript_1692FF:: @ 81692FF lockall - setvar VAR_0x4002, 3 + setvar VAR_TEMP_2, 3 goto EventScript_16930B end @@ -320,11 +320,11 @@ EventScript_16930B:: @ 816930B end EventScript_16935A:: @ 816935A - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 goto_if eq, EventScript_16937C - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 goto_if eq, EventScript_16938C - compare VAR_0x4002, 3 + compare VAR_TEMP_2, 3 goto_if eq, EventScript_16939C end @@ -376,11 +376,11 @@ Movement_1693CD:: @ 81693CD step_end EventScript_1693D2:: @ 81693D2 - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 goto_if eq, EventScript_1693F4 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 goto_if eq, EventScript_169404 - compare VAR_0x4002, 3 + compare VAR_TEMP_2, 3 goto_if eq, EventScript_169414 end @@ -435,11 +435,11 @@ Movement_169447:: @ 8169447 step_end EventScript_16944D:: @ 816944D - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 goto_if eq, EventScript_16946F - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 goto_if eq, EventScript_16947F - compare VAR_0x4002, 3 + compare VAR_TEMP_2, 3 goto_if eq, EventScript_16948F end @@ -492,11 +492,11 @@ EventScript_1694C2:: @ 81694C2 msgbox gUnknown_818DE38 closemessage playbgm MUS_RIVAL2, 0 - compare VAR_0x4002, 1 + compare VAR_TEMP_2, 1 call_if eq, EventScript_169504 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 call_if eq, EventScript_169516 - compare VAR_0x4002, 3 + compare VAR_TEMP_2, 3 call_if eq, EventScript_169528 removeobject 8 playse SE_KAIDAN @@ -1141,10 +1141,10 @@ Movement_169BA4:: @ 8169BA4 walk_down 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 + .equ VAR_OAKSLAB_PLAYER_STARTER_NO, VAR_TEMP_1 + .equ VAR_OAKSLAB_PLAYER_STARTER_SPECIES, VAR_TEMP_2 + .equ VAR_OAKSLAB_RIVAL_STARTER_SPECIES, VAR_TEMP_3 + .equ VAR_OAKSLAB_RIVAL_STARTER_OBJID, VAR_TEMP_4 PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB lock diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 7b5d4c2fe..8b196334c 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -418,25 +418,25 @@ Movement_165D83:: @ 8165D83 PewterCity_EventScript_165D8E:: @ 8165D8E lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_165DBE end PewterCity_EventScript_165D9A:: @ 8165D9A lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_165DBE end PewterCity_EventScript_165DA6:: @ 8165DA6 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_165DBE end PewterCity_EventScript_165DB2:: @ 8165DB2 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 goto EventScript_165DBE end @@ -445,11 +445,11 @@ EventScript_165DBE:: @ 8165DBE msgbox gUnknown_817E67E closemessage playbgm MUS_ANNAI, 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_165E0A - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_165E26 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_165E42 msgbox gUnknown_817E6C7 closemessage @@ -1388,39 +1388,39 @@ PewterCity_EventScript_1662A0:: @ 81662A0 PewterCity_EventScript_1662A9:: @ 81662A9 lock faceplayer - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 call EventScript_1662DE release end PewterCity_EventScript_1662B7:: @ 81662B7 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 call EventScript_1662DE releaseall end PewterCity_EventScript_1662C4:: @ 81662C4 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 call EventScript_1662DE releaseall end PewterCity_EventScript_1662D1:: @ 81662D1 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 call EventScript_1662DE releaseall end EventScript_1662DE:: @ 81662DE textcolor 0 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_1663CA - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1663CA - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if eq, EventScript_1663CA waitse playse SE_PIN @@ -1429,13 +1429,13 @@ EventScript_1662DE:: @ 81662DE applymovement 7, Movement_Delay48 waitmovement 0 msgbox gUnknown_817E902 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_1663D5 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_1663DA - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1663E6 - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if eq, EventScript_1663FC msgbox gUnknown_817E90C textcolor 3 @@ -1451,13 +1451,13 @@ EventScript_1662DE:: @ 81662DE call EventScript_1A6675 msgbox gUnknown_817EA06 closemessage - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_166412 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16641D - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_166428 - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if eq, EventScript_166433 delay 30 textcolor 3 diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 8c9e56390..3fdeee10c 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -38,7 +38,7 @@ EventScript_16A37B:: @ 816A37B PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 goto EventScript_16A3D1 @@ -46,7 +46,7 @@ PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 goto EventScript_16A3D1 @@ -54,7 +54,7 @@ PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5 PewterCity_Museum_1F_EventScript_16A3BB:: @ 816A3BB lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 goto EventScript_16A3D1 @@ -79,11 +79,11 @@ EventScript_16A402:: @ 816A402 compare VAR_RESULT, 0 goto_if eq, EventScript_16A476 closemessage - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16A455 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16A460 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16A46B playse SE_SHOP takemoney 50, 0 diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index dcb002b5d..56816cd76 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -26,7 +26,7 @@ EventScript_16284B:: @ 816284B return PokemonLeague_AgathasRoom_OnWarp:: @ 8162851 - map_script_2 VAR_0x4001, 0, EventScript_16285B + map_script_2 VAR_TEMP_1, 0, EventScript_16285B .2byte 0 EventScript_16285B:: @ 816285B diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 0eeb407c9..2f3fd90a1 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -26,7 +26,7 @@ EventScript_1626C0:: @ 81626C0 return PokemonLeague_BrunosRoom_OnWarp:: @ 81626C6 - map_script_2 VAR_0x4001, 0, EventScript_1626D0 + map_script_2 VAR_TEMP_1, 0, EventScript_1626D0 .2byte 0 EventScript_1626D0:: @ 81626D0 diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 63c370711..87754a660 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -37,11 +37,11 @@ EventScript_162B44:: @ 8162B44 return EventScript_162B57:: @ 8162B57 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return PokemonLeague_ChampionsRoom_OnWarp:: @ 8162B5D - map_script_2 VAR_0x4001, 0, EventScript_162B67 + map_script_2 VAR_TEMP_1, 0, EventScript_162B67 .2byte 0 EventScript_162B67:: @ 8162B67 @@ -49,7 +49,7 @@ EventScript_162B67:: @ 8162B67 end PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C - map_script_2 VAR_0x4001, 0, EventScript_162B76 + map_script_2 VAR_TEMP_1, 0, EventScript_162B76 .2byte 0 EventScript_162B76:: @ 8162B76 @@ -104,7 +104,7 @@ EventScript_162B76:: @ 8162B76 applymovement 2, Movement_162D37 applymovement OBJ_EVENT_ID_PLAYER, Movement_162D12 waitmovement 0 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12 waitstate releaseall diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index 960b8cbb1..b28a75449 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -4,7 +4,7 @@ PokemonLeague_HallOfFame_MapScripts:: @ 8162D4C .byte 0 PokemonLeague_HallOfFame_OnWarp:: @ 8162D57 - map_script_2 VAR_0x4001, 0, EventScript_162D61 + map_script_2 VAR_TEMP_1, 0, EventScript_162D61 .2byte 0 EventScript_162D61:: @ 8162D61 @@ -12,7 +12,7 @@ EventScript_162D61:: @ 8162D61 end PokemonLeague_HallOfFame_OnFrame:: @ 8162D66 - map_script_2 VAR_0x4001, 0, EventScript_162D70 + map_script_2 VAR_TEMP_1, 0, EventScript_162D70 .2byte 0 EventScript_162D70:: @ 8162D70 @@ -33,7 +33,7 @@ EventScript_162D70:: @ 8162D70 dofieldeffect 62 waitfieldeffect 62 delay 40 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 call EventScript_1A651A setrespawn SPAWN_PALLET_TOWN fadescreenspeed 1, 24 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 257875ea2..d082de03b 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -26,7 +26,7 @@ EventScript_162968:: @ 8162968 return PokemonLeague_LancesRoom_OnWarp:: @ 816296E - map_script_2 VAR_0x4001, 0, EventScript_162978 + map_script_2 VAR_TEMP_1, 0, EventScript_162978 .2byte 0 EventScript_162978:: @ 8162978 diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index 27550f51f..449bd9f9a 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -31,7 +31,7 @@ PokemonLeague_LoreleisRoom_OnTransition:: @ 81625B2 end PokemonLeague_LoreleisRoom_OnWarp:: @ 81625B6 - map_script_2 VAR_0x4001, 0, EventScript_1625C0 + map_script_2 VAR_TEMP_1, 0, EventScript_1625C0 .2byte 0 EventScript_1625C0:: @ 81625C0 diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 5b9ea13d2..eb47508bf 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -7,22 +7,22 @@ PokemonTower_2F_EventScript_163286:: @ 8163286 PokemonTower_2F_EventScript_16328F:: @ 816328F lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_1632A7 end PokemonTower_2F_EventScript_16329B:: @ 816329B lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_1632A7 end EventScript_1632A7:: @ 81632A7 textcolor 0 playbgm MUS_RIVAL1, 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_163339 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16334B applymovement 1, Movement_ExclamationMark waitmovement 0 @@ -39,9 +39,9 @@ EventScript_1632A7:: @ 81632A7 msgbox gUnknown_8179DD4 closemessage playbgm MUS_RIVAL2, 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16337E - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_163389 playse SE_KAIDAN delay 25 diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index bd64e246e..37b0653e6 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -127,7 +127,7 @@ "x": 10, "y": 8, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -136,7 +136,7 @@ "x": 11, "y": 8, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -145,7 +145,7 @@ "x": 12, "y": 8, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -154,7 +154,7 @@ "x": 10, "y": 9, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -163,7 +163,7 @@ "x": 9, "y": 8, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -172,7 +172,7 @@ "x": 12, "y": 9, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -181,7 +181,7 @@ "x": 10, "y": 10, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -190,7 +190,7 @@ "x": 11, "y": 10, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -199,7 +199,7 @@ "x": 12, "y": 10, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -208,7 +208,7 @@ "x": 9, "y": 9, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -217,7 +217,7 @@ "x": 9, "y": 10, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -226,7 +226,7 @@ "x": 10, "y": 11, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -235,7 +235,7 @@ "x": 11, "y": 11, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -244,7 +244,7 @@ "x": 12, "y": 11, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -253,7 +253,7 @@ "x": 13, "y": 8, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -262,7 +262,7 @@ "x": 13, "y": 9, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -271,7 +271,7 @@ "x": 13, "y": 10, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" } diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index 85517e241..18dc1aedd 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -11,13 +11,13 @@ PokemonTower_5F_EventScript_16343C:: @ 816343C special sp000_heal_pokemon fadescreen 2 msgbox gUnknown_817A1FA - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end PokemonTower_5F_EventScript_163453:: @ 8163453 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index fca61e89b..7adf4ce23 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -3,17 +3,17 @@ RocketHideout_B4F_MapScripts:: @ 81612E8 .byte 0 RocketHideout_B4F_OnLoad:: @ 81612EE - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 call_if eq, EventScript_161311 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if ne, EventScript_16146A end EventScript_161311:: @ 8161311 - addvar VAR_0x4001, 1 + addvar VAR_TEMP_1, 1 return RocketHideout_B4F_EventScript_161317:: @ 8161317 @@ -77,14 +77,14 @@ RocketHideout_B4F_EventScript_1613CE:: @ 81613CE end EventScript_1613E9:: @ 81613E9 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 call_if eq, EventScript_161311 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1614A1 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_161462 release end @@ -95,14 +95,14 @@ RocketHideout_B4F_EventScript_161418:: @ 8161418 end EventScript_161433:: @ 8161433 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 call_if eq, EventScript_161311 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1614A1 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_161462 release end diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 6288d8418..0618f25fd 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -101,7 +101,7 @@ "x": 6, "y": 10, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_1701E4" }, @@ -110,7 +110,7 @@ "x": 6, "y": 11, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_1701F0" }, @@ -155,7 +155,7 @@ "x": 6, "y": 12, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_1701FC" }, @@ -164,7 +164,7 @@ "x": 6, "y": 13, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_170208" }, @@ -173,7 +173,7 @@ "x": 6, "y": 14, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_170214" } diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index 5c87fadab..ecc93ae83 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -9,7 +9,7 @@ Route16_NorthEntrance_1F_OnTransition:: @ 81701C8 end EventScript_1701D5:: @ 81701D5 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return Route16_NorthEntrance_1F_EventScript_1701DB:: @ 81701DB diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 6dfc516fd..15d453cce 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -65,7 +65,7 @@ "x": 6, "y": 4, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_17039A" }, @@ -74,7 +74,7 @@ "x": 6, "y": 5, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1703A6" }, @@ -83,7 +83,7 @@ "x": 6, "y": 6, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1703B2" }, @@ -92,7 +92,7 @@ "x": 6, "y": 7, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1703BE" }, @@ -101,7 +101,7 @@ "x": 6, "y": 8, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1703CA" }, diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index d4582a73e..0be4bc59d 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -9,7 +9,7 @@ Route18_EastEntrance_1F_OnTransition:: @ 817037E end EventScript_17038B:: @ 817038B - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return Route18_EastEntrance_1F_EventScript_170391:: @ 8170391 diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index dc72a7a1c..ad798166c 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -3,7 +3,7 @@ Route22_MapScripts:: @ 816828B Route22_EventScript_16828C:: @ 816828C lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_1682BE EventScript_168297:: @ 8168297 @@ -11,7 +11,7 @@ EventScript_168297:: @ 8168297 Route22_EventScript_168298:: @ 8168298 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 1, 25, 5 goto EventScript_1682BE @@ -20,7 +20,7 @@ EventScript_1682AA:: @ 81682AA Route22_EventScript_1682AB:: @ 81682AB lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 setobjectxyperm 1, 25, 5 goto EventScript_1682BE @@ -31,11 +31,11 @@ EventScript_1682BE:: @ 81682BE textcolor 0 playbgm MUS_RIVAL1, 0 addobject 1 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_168350 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_168350 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16835B delay 6 msgbox gUnknown_8188890 @@ -49,11 +49,11 @@ EventScript_1682BE:: @ 81682BE closemessage delay 10 playbgm MUS_RIVAL2, 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16839A - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16839A - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1683A5 fadedefaultbgm removeobject 1 @@ -169,7 +169,7 @@ Movement_1683E3:: @ 81683E3 Route22_EventScript_1683ED:: @ 81683ED lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16841F EventScript_1683F8:: @ 81683F8 @@ -177,7 +177,7 @@ EventScript_1683F8:: @ 81683F8 Route22_EventScript_1683F9:: @ 81683F9 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 1, 25, 5 goto EventScript_16841F @@ -186,7 +186,7 @@ EventScript_16840B:: @ 816840B Route22_EventScript_16840C:: @ 816840C lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 setobjectxyperm 1, 25, 5 goto EventScript_16841F @@ -197,11 +197,11 @@ EventScript_16841F:: @ 816841F textcolor 0 playbgm MUS_RIVAL1, 0 addobject 1 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16849C - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16849C - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1684A7 msgbox gUnknown_8188A3C setvar VAR_LAST_TALKED, 1 diff --git a/data/maps/Route22_NorthEntrance/scripts.inc b/data/maps/Route22_NorthEntrance/scripts.inc index 49fba6173..afbfbb165 100644 --- a/data/maps/Route22_NorthEntrance/scripts.inc +++ b/data/maps/Route22_NorthEntrance/scripts.inc @@ -4,14 +4,14 @@ Route22_NorthEntrance_MapScripts:: @ 81704FB Route22_NorthEntrance_EventScript_1704FC:: @ 81704FC lock faceplayer - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 getstdstring 0, 15 goto EventScript_1A7803 end Route22_NorthEntrance_EventScript_17050D:: @ 817050D lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setvar VAR_0x8009, 1 getstdstring 0, 15 goto EventScript_1A796E diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index df211bc3f..4a3fcaf60 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -14,7 +14,7 @@ Route23_OnTransition:: @ 81684F1 Route23_EventScript_16850C:: @ 816850C lock faceplayer - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 getstdstring 0, 16 goto EventScript_1A786C end @@ -22,7 +22,7 @@ Route23_EventScript_16850C:: @ 816850C Route23_EventScript_16851D:: @ 816851D lock faceplayer - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 getstdstring 0, 17 goto EventScript_1A786C end @@ -30,7 +30,7 @@ Route23_EventScript_16851D:: @ 816851D Route23_EventScript_16852E:: @ 816852E lock faceplayer - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 getstdstring 0, 18 goto EventScript_1A786C end @@ -38,7 +38,7 @@ Route23_EventScript_16852E:: @ 816852E Route23_EventScript_16853F:: @ 816853F lock faceplayer - setvar VAR_0x4001, 5 + setvar VAR_TEMP_1, 5 getstdstring 0, 19 goto EventScript_1A786C end @@ -46,7 +46,7 @@ Route23_EventScript_16853F:: @ 816853F Route23_EventScript_168550:: @ 8168550 lock faceplayer - setvar VAR_0x4001, 6 + setvar VAR_TEMP_1, 6 getstdstring 0, 20 goto EventScript_1A786C end @@ -54,7 +54,7 @@ Route23_EventScript_168550:: @ 8168550 Route23_EventScript_168561:: @ 8168561 lock faceplayer - setvar VAR_0x4001, 7 + setvar VAR_TEMP_1, 7 getstdstring 0, 21 goto EventScript_1A786C end @@ -62,14 +62,14 @@ Route23_EventScript_168561:: @ 8168561 Route23_EventScript_168572:: @ 8168572 lock faceplayer - setvar VAR_0x4001, 8 + setvar VAR_TEMP_1, 8 getstdstring 0, 22 goto EventScript_1A786C end Route23_EventScript_168583:: @ 8168583 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 setvar VAR_0x8009, 1 getstdstring 0, 16 goto EventScript_1A796E @@ -77,7 +77,7 @@ Route23_EventScript_168583:: @ 8168583 Route23_EventScript_168598:: @ 8168598 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 setvar VAR_0x8009, 2 getstdstring 0, 17 goto EventScript_1A796E @@ -85,7 +85,7 @@ Route23_EventScript_168598:: @ 8168598 Route23_EventScript_1685AD:: @ 81685AD lockall - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 setvar VAR_0x8009, 3 getstdstring 0, 18 goto EventScript_1A796E @@ -93,7 +93,7 @@ Route23_EventScript_1685AD:: @ 81685AD Route23_EventScript_1685C2:: @ 81685C2 lockall - setvar VAR_0x4001, 5 + setvar VAR_TEMP_1, 5 setvar VAR_0x8009, 4 getstdstring 0, 19 goto EventScript_1A796E @@ -101,7 +101,7 @@ Route23_EventScript_1685C2:: @ 81685C2 Route23_EventScript_1685D7:: @ 81685D7 lockall - setvar VAR_0x4001, 6 + setvar VAR_TEMP_1, 6 setvar VAR_0x8009, 5 getstdstring 0, 20 goto EventScript_1A796E @@ -109,7 +109,7 @@ Route23_EventScript_1685D7:: @ 81685D7 Route23_EventScript_1685EC:: @ 81685EC lockall - setvar VAR_0x4001, 7 + setvar VAR_TEMP_1, 7 setvar VAR_0x8009, 6 getstdstring 0, 21 goto EventScript_1A796E @@ -117,7 +117,7 @@ Route23_EventScript_1685EC:: @ 81685EC Route23_EventScript_168601:: @ 8168601 lockall - setvar VAR_0x4001, 8 + setvar VAR_TEMP_1, 8 setvar VAR_0x8009, 7 getstdstring 0, 22 goto EventScript_1A796E diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 831b1f1d1..6889e739c 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -26,21 +26,21 @@ EventScript_168656:: @ 8168656 Route24_EventScript_168660:: @ 8168660 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_168678 end Route24_EventScript_16866C:: @ 816866C lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_168678 end EventScript_168678:: @ 8168678 textcolor 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_1686FD - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_168708 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 @@ -80,7 +80,7 @@ EventScript_168713:: @ 8168713 closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_168743 waitmovement 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_168733 release end diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 333edbb05..dbb66acfd 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -48,7 +48,7 @@ EventScript_16F7A2:: @ 816F7A2 compare VAR_RESULT, 0 goto_if eq, EventScript_16F895 textcolor 3 - setvar VAR_0x4001, 129 + setvar VAR_TEMP_1, 129 givemon SPECIES_MAGIKARP, 5, ITEM_NONE, 0, 0, 0 compare VAR_RESULT, 0 goto_if eq, EventScript_16F7F6 diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index d61bbd99c..2aac04b78 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -7,19 +7,19 @@ Route5_SouthEntrance_EventScript_16F901:: @ 816F901 Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16F92E end Route5_SouthEntrance_EventScript_16F916:: @ 816F916 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16F92E end Route5_SouthEntrance_EventScript_16F922:: @ 816F922 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_16F92E end @@ -44,11 +44,11 @@ EventScript_16F958:: @ 816F958 EventScript_16F963:: @ 816F963 msgbox gUnknown_819E09B closemessage - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16F99C - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16F9A7 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16F9B2 msgbox gUnknown_819E0C1 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 4a7fe8f38..d85587c03 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -7,19 +7,19 @@ Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7 Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16F9F4 end Route6_NorthEntrance_EventScript_16F9DC:: @ 816F9DC lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16F9F4 end Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_16F9F4 end @@ -44,11 +44,11 @@ EventScript_16FA1E:: @ 816FA1E EventScript_16FA29:: @ 816FA29 msgbox gUnknown_819E1D1 closemessage - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16FA62 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16FA6D - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16FA78 msgbox gUnknown_819E1F7 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index a3b8f0412..5cb615467 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -7,19 +7,19 @@ Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E Route7_EastEntrance_EventScript_16FA97:: @ 816FA97 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16FABB end Route7_EastEntrance_EventScript_16FAA3:: @ 816FAA3 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16FABB end Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_16FABB end @@ -44,11 +44,11 @@ EventScript_16FAE5:: @ 816FAE5 EventScript_16FAF0:: @ 816FAF0 msgbox gUnknown_819E307 closemessage - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16FB29 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16FB34 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16FB3F msgbox gUnknown_819E32D setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index dfff0bc4f..6d79a9412 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -7,19 +7,19 @@ Route8_WestEntrance_EventScript_16FB54:: @ 816FB54 Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16FB81 end Route8_WestEntrance_EventScript_16FB69:: @ 816FB69 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16FB81 end Route8_WestEntrance_EventScript_16FB75:: @ 816FB75 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_16FB81 end @@ -54,11 +54,11 @@ EventScript_16FBC1:: @ 816FBC1 EventScript_16FBCC:: @ 816FBCC msgbox gUnknown_819E43D closemessage - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_16FC05 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_16FC10 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16FC1B msgbox gUnknown_819E463 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 723a6d048..7cd9e2f5d 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -3,7 +3,7 @@ SSAnne_2F_Corridor_MapScripts:: @ 81608DE SSAnne_2F_Corridor_EventScript_1608DF:: @ 81608DF lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_160903 EventScript_1608EA:: @ 81608EA @@ -11,7 +11,7 @@ EventScript_1608EA:: @ 81608EA SSAnne_2F_Corridor_EventScript_1608EB:: @ 81608EB lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_160903 EventScript_1608F6:: @ 81608F6 @@ -19,7 +19,7 @@ EventScript_1608F6:: @ 81608F6 SSAnne_2F_Corridor_EventScript_1608F7:: @ 81608F7 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_160903 EventScript_160902:: @ 8160902 @@ -35,11 +35,11 @@ EventScript_160903:: @ 8160903 applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 delay 20 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_1609AD - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_1609B8 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_1609CA msgbox gUnknown_8173035 setvar VAR_LAST_TALKED, 1 @@ -53,11 +53,11 @@ EventScript_160903:: @ 8160903 closemessage delay 10 playbgm MUS_RIVAL2, 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_1609FD - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_160A08 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_160A13 fadedefaultbgm removeobject 1 diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 37856f0fd..06a315907 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -23,7 +23,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 checkflag FLAG_GOT_HITMON_FROM_DOJO goto_if TRUE, EventScript_16EC3C drawmonpic SPECIES_HITMONLEE, 10, 3 - setvar VAR_0x4001, SPECIES_HITMONLEE + setvar VAR_TEMP_1, SPECIES_HITMONLEE applymovement 5, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 @@ -46,7 +46,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 checkflag FLAG_GOT_HITMON_FROM_DOJO goto_if TRUE, EventScript_16EC3C drawmonpic SPECIES_HITMONCHAN, 10, 3 - setvar VAR_0x4001, SPECIES_HITMONCHAN + setvar VAR_TEMP_1, SPECIES_HITMONCHAN applymovement 5, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 @@ -60,7 +60,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 EventScript_16EC82:: @ 816EC82 erasemonpic - givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 25, ITEM_NONE, 0, 0, 0 compare VAR_RESULT, 0 goto_if eq, EventScript_16ECB5 compare VAR_RESULT, 1 @@ -72,7 +72,7 @@ EventScript_16EC82:: @ 816EC82 EventScript_16ECB5:: @ 816ECB5 removeobject VAR_LAST_TALKED - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 message Text_19B473 waitmessage @@ -88,7 +88,7 @@ EventScript_16ECB5:: @ 816ECB5 EventScript_16ECEC:: @ 816ECEC removeobject VAR_LAST_TALKED - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 message Text_19B473 waitmessage diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index 931eb21cf..54543e54a 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -11,12 +11,12 @@ SeafoamIslands_B3F_OnTransition:: @ 8162F5A end EventScript_162F6D:: @ 8162F6D - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 call_if FALSE, EventScript_162FF0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 call_if FALSE, EventScript_162FF0 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 call_if eq, EventScript_162F90 return @@ -29,17 +29,17 @@ EventScript_162F94:: @ 8162F94 return SeafoamIslands_B3F_OnFrame:: @ 8162F98 - map_script_2 VAR_0x4001, 1, EventScript_162FA2 + map_script_2 VAR_TEMP_1, 1, EventScript_162FA2 .2byte 0 EventScript_162FA2:: @ 8162FA2 lockall - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 call_if FALSE, EventScript_162FF0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 call_if FALSE, EventScript_162FF0 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 goto_if eq, EventScript_16300C getplayerxy VAR_0x8008, VAR_0x8009 compare VAR_0x8008, 24 @@ -53,7 +53,7 @@ EventScript_162FA2:: @ 8162FA2 end EventScript_162FF0:: @ 8162FF0 - addvar VAR_0x4002, 1 + addvar VAR_TEMP_2, 1 return EventScript_162FF6:: @ 8162FF6 @@ -67,7 +67,7 @@ EventScript_163001:: @ 8163001 return EventScript_16300C:: @ 816300C - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 70b33cf35..090b65d5f 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -28,12 +28,12 @@ SeafoamIslands_B4F_OnTransition:: @ 8163066 end EventScript_163082:: @ 8163082 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 call_if FALSE, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 call_if FALSE, EventScript_163169 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 call_if eq, EventScript_1630A5 return @@ -50,12 +50,12 @@ EventScript_1630AD:: @ 81630AD return SeafoamIslands_B4F_OnLoad:: @ 81630B1 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 call_if FALSE, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 call_if FALSE, EventScript_163169 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 goto_if eq, EventScript_1630D4 end @@ -75,7 +75,7 @@ EventScript_1630F1:: @ 81630F1 SeafoamIslands_B4F_OnFrame:: @ 81630F9 map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_16310B - map_script_2 VAR_0x4001, 1, EventScript_163121 + map_script_2 VAR_TEMP_1, 1, EventScript_163121 .2byte 0 EventScript_16310B:: @ 816310B @@ -94,12 +94,12 @@ Movement_16311D:: @ 816311D EventScript_163121:: @ 8163121 lockall - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 call_if FALSE, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 call_if FALSE, EventScript_163169 - compare VAR_0x4002, 2 + compare VAR_TEMP_2, 2 goto_if eq, EventScript_163185 getplayerxy VAR_0x8008, VAR_0x8009 compare VAR_0x8008, 9 @@ -107,12 +107,12 @@ EventScript_163121:: @ 8163121 compare VAR_0x8008, 9 call_if ge, EventScript_16317A special sub_805D1A8 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end EventScript_163169:: @ 8163169 - addvar VAR_0x4002, 1 + addvar VAR_TEMP_2, 1 return EventScript_16316F:: @ 816316F @@ -126,7 +126,7 @@ EventScript_16317A:: @ 816317A return EventScript_163185:: @ 8163185 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index fd358401f..33b085474 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -12,7 +12,7 @@ SevenIsland_House_Room1_OnTransition:: @ 8170895 end EventScript_1708AF:: @ 81708AF - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 1, 4, 2 setobjectmovementtype 1, 8 setmaplayoutindex LAYOUT_UNUSED_LAYOUT_8338B4C @@ -77,7 +77,7 @@ SevenIsland_House_Room1_EventScript_170958:: @ 8170958 special ValidateEReaderTrainer compare VAR_RESULT, 1 call_if eq, EventScript_17097D - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 goto_if eq, EventScript_170987 msgbox gUnknown_81A049B release diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 461e4fe45..047f55705 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -8,7 +8,7 @@ SevenIsland_House_Room2_OnTransition:: @ 8170A89 end SevenIsland_House_Room2_OnFrame:: @ 8170A8D - map_script_2 VAR_0x4001, 0, EventScript_170A97 + map_script_2 VAR_TEMP_1, 0, EventScript_170A97 .2byte 0 EventScript_170A97:: @ 8170A97 @@ -33,7 +33,7 @@ EventScript_170A97:: @ 8170A97 applymovement OBJ_EVENT_ID_PLAYER, Movement_170B28 waitmovement 0 special LoadPlayerParty - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 warp MAP_SEVEN_ISLAND_HOUSE_ROOM1, 255, 4, 1 waitstate releaseall diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index c1b70fd2d..cbb2f2b76 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -120,7 +120,7 @@ "x": 7, "y": 2, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39" }, @@ -129,7 +129,7 @@ "x": 9, "y": 8, "elevation": 3, - "var": "VAR_0x4007", + "var": "VAR_TEMP_7", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B" }, @@ -138,7 +138,7 @@ "x": 5, "y": 8, "elevation": 3, - "var": "VAR_0x4006", + "var": "VAR_TEMP_6", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8" }, @@ -147,7 +147,7 @@ "x": 9, "y": 6, "elevation": 3, - "var": "VAR_0x4005", + "var": "VAR_TEMP_5", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5" }, @@ -156,7 +156,7 @@ "x": 5, "y": 6, "elevation": 3, - "var": "VAR_0x4004", + "var": "VAR_TEMP_4", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2" }, @@ -165,7 +165,7 @@ "x": 10, "y": 4, "elevation": 3, - "var": "VAR_0x4003", + "var": "VAR_TEMP_3", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F" }, @@ -174,7 +174,7 @@ "x": 4, "y": 4, "elevation": 3, - "var": "VAR_0x4002", + "var": "VAR_TEMP_2", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C" } diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 708541904..c22f3895b 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -6,14 +6,14 @@ SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS call_if TRUE, EventScript_164E07 - setvar VAR_0x4001, 0 - setvar VAR_0x4002, 0 - setvar VAR_0x4003, 0 - setvar VAR_0x4004, 0 - setvar VAR_0x4005, 0 - setvar VAR_0x4006, 0 - setvar VAR_0x4007, 0 - setvar VAR_0x4008, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + setvar VAR_TEMP_8, 0 end EventScript_164E07:: @ 8164E07 @@ -28,83 +28,83 @@ EventScript_164E07:: @ 8164E07 SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 lockall - compare VAR_0x4001, 100 + compare VAR_TEMP_1, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4001, 100 - compare VAR_0x4008, 7 + setvar VAR_TEMP_1, 100 + compare VAR_TEMP_8, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C lockall - compare VAR_0x4002, 100 + compare VAR_TEMP_2, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4002, 100 - compare VAR_0x4008, 7 + setvar VAR_TEMP_2, 100 + compare VAR_TEMP_8, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F lockall - compare VAR_0x4003, 100 + compare VAR_TEMP_3, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4003, 100 - compare VAR_0x4008, 7 + setvar VAR_TEMP_3, 100 + compare VAR_TEMP_8, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 lockall - compare VAR_0x4004, 100 + compare VAR_TEMP_4, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4004, 100 - compare VAR_0x4008, 7 + setvar VAR_TEMP_4, 100 + compare VAR_TEMP_8, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 lockall - compare VAR_0x4005, 100 + compare VAR_TEMP_5, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4005, 100 - compare VAR_0x4008, 7 + setvar VAR_TEMP_5, 100 + compare VAR_TEMP_8, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 lockall - compare VAR_0x4006, 100 + compare VAR_TEMP_6, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4006, 100 - compare VAR_0x4008, 7 + setvar VAR_TEMP_6, 100 + compare VAR_TEMP_8, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B lockall - compare VAR_0x4007, 100 + compare VAR_TEMP_7, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4007, 100 - compare VAR_0x4008, 7 + setvar VAR_TEMP_7, 100 + compare VAR_TEMP_8, 7 goto_if eq, EventScript_164F8C releaseall end EventScript_164F2E:: @ 8164F2E - addvar VAR_0x4008, 1 + addvar VAR_TEMP_8, 1 playse SE_TRACK_MOVE setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json index 524654792..ef0339b63 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/map.json +++ b/data/maps/SevenIsland_TrainerTower_1F/map.json @@ -101,7 +101,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1C54AF" }, @@ -110,7 +110,7 @@ "x": 9, "y": 12, "elevation": 0, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1C54B4" }, @@ -119,7 +119,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json index dde2e99ac..fe3329368 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/map.json +++ b/data/maps/SevenIsland_TrainerTower_2F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json index ddc7e3009..b241536b6 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/map.json +++ b/data/maps/SevenIsland_TrainerTower_3F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json index 010f213de..d32447db2 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/map.json +++ b/data/maps/SevenIsland_TrainerTower_4F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json index 933e07d80..f9d032e87 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/map.json +++ b/data/maps/SevenIsland_TrainerTower_5F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json index 522d796dd..4ec4b1e45 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/map.json +++ b/data/maps/SevenIsland_TrainerTower_6F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json index 55ca3f1b7..4e28edf5b 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/map.json +++ b/data/maps/SevenIsland_TrainerTower_7F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json index 78e1fe89d..4e8fb9db3 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/map.json +++ b/data/maps/SevenIsland_TrainerTower_8F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 7c4e287a2..1ae95e0d9 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -7,14 +7,14 @@ SevenIsland_TrainerTower_Lobby_MapScripts:: @ 8164839 .byte 0 SevenIsland_TrainerTower_Lobby_OnResume:: @ 8164853 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 setvar VAR_0x8004, 10 special sub_815D9E8 setvar VAR_0x8004, 18 special sub_815D9E8 compare VAR_RESULT, 0 goto_if eq, EventScript_164886 - setvar VAR_0x4000, 0 + setvar VAR_TEMP_0, 0 setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7 applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 @@ -30,7 +30,7 @@ SevenIsland_TrainerTower_Lobby_OnReturnToField:: @ 8164887 end SevenIsland_TrainerTower_Lobby_OnLoad:: @ 8164897 - compare VAR_0x400D, 17 + compare VAR_TEMP_D, 17 call_if eq, EventScript_1648A3 end @@ -40,12 +40,12 @@ EventScript_1648A3:: @ 81648A3 SevenIsland_TrainerTower_Lobby_OnTransition:: @ 81648AD setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY - getplayerxy VAR_0x400D, VAR_RESULT + getplayerxy VAR_TEMP_D, VAR_RESULT end SevenIsland_TrainerTower_Lobby_OnFrame:: @ 81648B6 - map_script_2 VAR_0x4000, 0, EventScript_1648ED - map_script_2 VAR_0x400D, 0x11, EventScript_1648C8 + map_script_2 VAR_TEMP_0, 0, EventScript_1648ED + map_script_2 VAR_TEMP_D, 0x11, EventScript_1648C8 .2byte 0 EventScript_1648C8:: @ 81648C8 @@ -56,7 +56,7 @@ EventScript_1648C8:: @ 81648C8 special DrawWholeMapView playse SE_TK_KASYA waitse - setvar VAR_0x400D, 0 + setvar VAR_TEMP_D, 0 releaseall end @@ -66,7 +66,7 @@ Movement_1648EA:: @ 81648EA step_end EventScript_1648ED:: @ 81648ED - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 setvar VAR_0x8004, 12 special sub_815D9E8 switch VAR_RESULT diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 384e04b54..218838690 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -51,7 +51,7 @@ SilphCo_11F_EventScript_161E7F:: @ 8161E7F SilphCo_11F_EventScript_161E88:: @ 8161E88 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_161EA0 EventScript_161E93:: @ 8161E93 @@ -59,7 +59,7 @@ EventScript_161E93:: @ 8161E93 SilphCo_11F_EventScript_161E94:: @ 8161E94 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_161EA0 EventScript_161E9F:: @ 8161E9F @@ -72,9 +72,9 @@ EventScript_161EA0:: @ 8161EA0 delay 25 msgbox gUnknown_8177108 closemessage - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_161F00 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_161F12 setvar VAR_LAST_TALKED, 3 trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BOSS_GIOVANNI_2, 0, Text_1771AB diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 99a77ed9f..02e5de5e7 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -23,7 +23,7 @@ EventScript_1619B7:: @ 81619B7 SilphCo_7F_EventScript_1619BC:: @ 81619BC lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_1619D4 EventScript_1619C7:: @ 81619C7 @@ -31,7 +31,7 @@ EventScript_1619C7:: @ 81619C7 SilphCo_7F_EventScript_1619C8:: @ 81619C8 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_1619D4 EventScript_1619D3:: @ 81619D3 @@ -46,9 +46,9 @@ EventScript_1619D4:: @ 81619D4 applymovement 1, Movement_Delay48 waitmovement 0 msgbox gUnknown_8176710 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_161A73 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_161A7F msgbox gUnknown_8176727 setvar VAR_LAST_TALKED, 1 @@ -61,9 +61,9 @@ EventScript_1619D4:: @ 81619D4 msgbox gUnknown_8176827 closemessage playbgm MUS_RIVAL2, 0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_161AA1 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_161AAC playse SE_TK_WARPIN fadedefaultbgm @@ -133,7 +133,7 @@ SilphCo_7F_EventScript_161AC8:: @ 8161AC8 checkflag FLAG_GOT_LAPRAS_FROM_SILPH goto_if TRUE, EventScript_161B8D msgbox gUnknown_8176266 - setvar VAR_0x4001, SPECIES_LAPRAS + setvar VAR_TEMP_1, SPECIES_LAPRAS givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0 compare VAR_RESULT, 0 goto_if eq, EventScript_161B12 diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index cc9a3549a..dd3eb293a 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -4,10 +4,10 @@ SixIsland_PatternBush_MapScripts:: @ 8164559 SixIsland_PatternBush_OnTransition:: @ 816455F setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH - getplayerxy VAR_0x4001, VAR_0x4002 - compare VAR_0x4001, 50 + getplayerxy VAR_TEMP_1, VAR_TEMP_2 + compare VAR_TEMP_1, 50 call_if ge, EventScript_16457E - compare VAR_0x4001, 49 + compare VAR_TEMP_1, 49 call_if le, EventScript_164587 end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 0fd043847..f1fe4883a 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -21,7 +21,7 @@ EventScript_1677CF:: @ 81677CF ThreeIsland_EventScript_1677D8:: @ 81677D8 lock - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 call EventScript_16786F release end @@ -32,7 +32,7 @@ ThreeIsland_EventScript_1677E5:: @ 81677E5 goto_if TRUE, EventScript_167806 compare VAR_MAP_SCENE_THREE_ISLAND, 4 goto_if eq, EventScript_16781A - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 call EventScript_16786F release end @@ -64,36 +64,36 @@ EventScript_167865:: @ 8167865 end EventScript_16786F:: @ 816786F - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_167947 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_167947 applymovement 1, Movement_167A1B waitmovement 0 msgbox gUnknown_81820C0 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_167952 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_167952 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16795D applymovement 5, Movement_167A19 waitmovement 0 msgbox gUnknown_8182125 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_167931 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_167931 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_167973 applymovement 2, Movement_167A1B waitmovement 0 msgbox gUnknown_81821A9 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_167952 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_167952 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_16795D applymovement 4, Movement_167A19 waitmovement 0 @@ -138,7 +138,7 @@ ThreeIsland_EventScript_167989:: @ 8167989 lock compare VAR_MAP_SCENE_THREE_ISLAND, 4 goto_if eq, EventScript_1679A1 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 call EventScript_16786F release end @@ -182,31 +182,31 @@ Movement_167A1B:: @ 8167A1B ThreeIsland_EventScript_167A1D:: @ 8167A1D lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_167A59 end ThreeIsland_EventScript_167A29:: @ 8167A29 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_167A59 end ThreeIsland_EventScript_167A35:: @ 8167A35 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_167A59 end ThreeIsland_EventScript_167A41:: @ 8167A41 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 goto EventScript_167A59 end ThreeIsland_EventScript_167A4D:: @ 8167A4D lockall - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 goto EventScript_167A59 end @@ -256,15 +256,15 @@ EventScript_167A59:: @ 8167A59 msgbox gUnknown_81825E2 closemessage delay 45 - compare VAR_0x4001, 0 + compare VAR_TEMP_1, 0 call_if eq, EventScript_167BC6 - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_167BD8 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_167BEA - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if eq, EventScript_167C03 - compare VAR_0x4001, 4 + compare VAR_TEMP_1, 4 call_if eq, EventScript_167C1C playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182623 diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/UnknownMap_00_00/map.json index a4da32612..43e5f14ad 100644 --- a/data/maps/UnknownMap_00_00/map.json +++ b/data/maps/UnknownMap_00_00/map.json @@ -49,7 +49,7 @@ "x": 3, "y": 5, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_00_EventScript_1BB8C3" }, @@ -58,7 +58,7 @@ "x": 10, "y": 5, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_00_EventScript_1BB8CF" } diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/UnknownMap_00_01/map.json index a427bdc14..3cf67c7b1 100644 --- a/data/maps/UnknownMap_00_01/map.json +++ b/data/maps/UnknownMap_00_01/map.json @@ -49,7 +49,7 @@ "x": 4, "y": 5, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_01_EventScript_1BB950" }, @@ -58,7 +58,7 @@ "x": 7, "y": 5, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_01_EventScript_1BB95C" } diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/UnknownMap_00_02/map.json index 611a3c092..8dc5e473f 100644 --- a/data/maps/UnknownMap_00_02/map.json +++ b/data/maps/UnknownMap_00_02/map.json @@ -63,7 +63,7 @@ "x": 6, "y": 4, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_02_EventScript_1BB980" }, @@ -72,7 +72,7 @@ "x": 6, "y": 6, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_02_EventScript_1BB980" }, @@ -81,7 +81,7 @@ "x": 13, "y": 4, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_02_EventScript_1BB980" }, @@ -90,7 +90,7 @@ "x": 13, "y": 6, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_02_EventScript_1BB980" } diff --git a/data/maps/UnknownMap_00_03/map.json b/data/maps/UnknownMap_00_03/map.json index 2f9141fe6..52295b5ea 100644 --- a/data/maps/UnknownMap_00_03/map.json +++ b/data/maps/UnknownMap_00_03/map.json @@ -49,7 +49,7 @@ "x": 3, "y": 4, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_03_EventScript_1BB8DB" }, @@ -58,7 +58,7 @@ "x": 3, "y": 6, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_03_EventScript_1BB915" }, @@ -67,7 +67,7 @@ "x": 10, "y": 4, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_03_EventScript_1BB8F8" }, @@ -76,7 +76,7 @@ "x": 10, "y": 6, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, "script": "UnknownMap_00_03_EventScript_1BB932" } diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 216206ad1..7398ea10b 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -225,7 +225,7 @@ "x": 22, "y": 32, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "VermilionCity_EventScript_166B98" }, @@ -234,7 +234,7 @@ "x": 23, "y": 32, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "VermilionCity_EventScript_166B98" } diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index edef5c0ae..676a4d3fa 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -44,8 +44,8 @@ EventScript_16B778:: @ 816B778 checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES goto_if TRUE, EventScript_1A77A9 special Special_SetVermilionTrashCans - copyvar VAR_0x4000, VAR_0x8004 - copyvar VAR_0x4001, VAR_0x8005 + copyvar VAR_TEMP_0, VAR_0x8004 + copyvar VAR_TEMP_1, VAR_0x8005 return VermilionCity_Gym_EventScript_16B78F:: @ 816B78F @@ -143,8 +143,8 @@ EventScript_16B843:: @ 816B843 compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 - copyvar VAR_0x8004, VAR_0x4000 - copyvar VAR_0x8005, VAR_0x4001 + copyvar VAR_0x8004, VAR_TEMP_0 + copyvar VAR_0x8005, VAR_TEMP_1 checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES goto_if TRUE, EventScript_16B8E5 checkflag FLAG_TEMP_1 @@ -171,8 +171,8 @@ EventScript_16B89E:: @ 816B89E msgbox gUnknown_819536C clearflag FLAG_TEMP_1 special Special_SetVermilionTrashCans - copyvar VAR_0x4000, VAR_0x8004 - copyvar VAR_0x4001, VAR_0x8005 + copyvar VAR_TEMP_0, VAR_0x8004 + copyvar VAR_TEMP_1, VAR_0x8005 call EventScript_16B8EF special DrawWholeMapView releaseall diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 6db5e89ff..f20768d88 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,7 +1,7 @@ PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16 lock faceplayer - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 goto_if eq, EventScript_1BEE3A checkflag FLAG_SYS_SET_TRAINER_CARD_PROFILE goto_if TRUE, EventScript_1BEECD @@ -42,7 +42,7 @@ EventScript_1BEE9E:: @ 81BEE9E end EventScript_1BEEA8:: @ 81BEEA8 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setvar VAR_0x8004, 0 special Special_BufferEasyChatMessage waitmessage @@ -89,7 +89,7 @@ EventScript_1BEF35:: @ 81BEF35 end EventScript_1BEF3F:: @ 81BEF3F - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setvar VAR_0x8004, 0 special Special_BufferEasyChatMessage waitmessage diff --git a/data/scripts/route23.inc b/data/scripts/route23.inc index fe2baa17a..77409e539 100644 --- a/data/scripts/route23.inc +++ b/data/scripts/route23.inc @@ -30,9 +30,9 @@ EventScript_1A77F9:: @ 81A77F9 end EventScript_1A7803:: @ 81A7803 - compare VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 goto_if ge, EventScript_1A77EC - switch VAR_0x4001 + switch VAR_TEMP_1 case 1, EventScript_1A78D5 case 2, EventScript_1A78E4 case 3, EventScript_1A78F3 @@ -44,9 +44,9 @@ EventScript_1A7803:: @ 81A7803 end EventScript_1A786C:: @ 81A786C - compare VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 goto_if ge, EventScript_1A77F9 - switch VAR_0x4001 + switch VAR_TEMP_1 case 1, EventScript_1A78D5 case 2, EventScript_1A78E4 case 3, EventScript_1A78F3 @@ -111,13 +111,13 @@ EventScript_1A794D:: @ 81A794D playfanfare MUS_FANFA1 waitfanfare waitbuttonpress - copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 release end EventScript_1A795F:: @ 81A795F msgbox Text_OnlyPassWithBadgeOhGoAhead - copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 release end @@ -125,7 +125,7 @@ EventScript_1A796E:: @ 81A796E textcolor 0 applymovement VAR_0x8009, Movement_WalkInPlaceFastestLeft waitmovement 0 - switch VAR_0x4001 + switch VAR_TEMP_1 case 1, EventScript_1A79D8 case 2, EventScript_1A79E7 case 3, EventScript_1A79F6 @@ -214,13 +214,13 @@ EventScript_1A7A96:: @ 81A7A96 playfanfare MUS_FANFA1 waitfanfare waitbuttonpress - copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 releaseall end EventScript_1A7AA8:: @ 81A7AA8 msgbox Text_OnlyPassWithBadgeOhGoAhead - copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 releaseall end diff --git a/data/scripts/silphco_doors.inc b/data/scripts/silphco_doors.inc index 07e1db17d..13c59caa7 100644 --- a/data/scripts/silphco_doors.inc +++ b/data/scripts/silphco_doors.inc @@ -348,7 +348,7 @@ EventScript_Open11FDoor:: @ 81A88ED SilphCo_2F_EventScript_Door1:: @ 81A891B lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setvar VAR_0x8004, 634 checkflag FLAG_SILPH_2F_DOOR_1 goto_if TRUE, EventScript_DoorUnlocked @@ -357,7 +357,7 @@ SilphCo_2F_EventScript_Door1:: @ 81A891B SilphCo_2F_EventScript_Door2:: @ 81A8935 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 setvar VAR_0x8004, 635 checkflag FLAG_SILPH_2F_DOOR_2 goto_if TRUE, EventScript_DoorUnlocked @@ -366,7 +366,7 @@ SilphCo_2F_EventScript_Door2:: @ 81A8935 SilphCo_3F_EventScript_Door1:: @ 81A894F lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 setvar VAR_0x8004, 636 checkflag FLAG_SILPH_3F_DOOR_1 goto_if TRUE, EventScript_DoorUnlocked @@ -375,7 +375,7 @@ SilphCo_3F_EventScript_Door1:: @ 81A894F SilphCo_3F_EventScript_Door2:: @ 81A8969 lockall - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 setvar VAR_0x8004, 637 checkflag FLAG_SILPH_3F_DOOR_2 goto_if TRUE, EventScript_DoorUnlocked @@ -384,7 +384,7 @@ SilphCo_3F_EventScript_Door2:: @ 81A8969 SilphCo_4F_EventScript_Door1:: @ 81A8983 lockall - setvar VAR_0x4001, 5 + setvar VAR_TEMP_1, 5 setvar VAR_0x8004, 638 checkflag FLAG_SILPH_4F_DOOR_1 goto_if TRUE, EventScript_DoorUnlocked @@ -393,7 +393,7 @@ SilphCo_4F_EventScript_Door1:: @ 81A8983 SilphCo_4F_EventScript_Door2:: @ 81A899D lockall - setvar VAR_0x4001, 6 + setvar VAR_TEMP_1, 6 setvar VAR_0x8004, 639 checkflag FLAG_SILPH_4F_DOOR_2 goto_if TRUE, EventScript_DoorUnlocked @@ -402,7 +402,7 @@ SilphCo_4F_EventScript_Door2:: @ 81A899D SilphCo_5F_EventScript_Door1:: @ 81A89B7 lockall - setvar VAR_0x4001, 7 + setvar VAR_TEMP_1, 7 setvar VAR_0x8004, 640 checkflag FLAG_SILPH_5F_DOOR_1 goto_if TRUE, EventScript_DoorUnlocked @@ -411,7 +411,7 @@ SilphCo_5F_EventScript_Door1:: @ 81A89B7 SilphCo_5F_EventScript_Door2:: @ 81A89D1 lockall - setvar VAR_0x4001, 8 + setvar VAR_TEMP_1, 8 setvar VAR_0x8004, 641 checkflag FLAG_SILPH_5F_DOOR_2 goto_if TRUE, EventScript_DoorUnlocked @@ -420,7 +420,7 @@ SilphCo_5F_EventScript_Door2:: @ 81A89D1 SilphCo_5F_EventScript_Door3:: @ 81A89EB lockall - setvar VAR_0x4001, 9 + setvar VAR_TEMP_1, 9 setvar VAR_0x8004, 642 checkflag FLAG_SILPH_5F_DOOR_3 goto_if TRUE, EventScript_DoorUnlocked @@ -429,7 +429,7 @@ SilphCo_5F_EventScript_Door3:: @ 81A89EB SilphCo_6F_EventScript_Door:: @ 81A8A05 lockall - setvar VAR_0x4001, 10 + setvar VAR_TEMP_1, 10 setvar VAR_0x8004, 643 checkflag FLAG_SILPH_6F_DOOR goto_if TRUE, EventScript_DoorUnlocked @@ -438,7 +438,7 @@ SilphCo_6F_EventScript_Door:: @ 81A8A05 SilphCo_7F_EventScript_Door1:: @ 81A8A1F lockall - setvar VAR_0x4001, 11 + setvar VAR_TEMP_1, 11 setvar VAR_0x8004, 644 checkflag FLAG_SILPH_7F_DOOR_1 goto_if TRUE, EventScript_DoorUnlocked @@ -447,7 +447,7 @@ SilphCo_7F_EventScript_Door1:: @ 81A8A1F SilphCo_7F_EventScript_Door2:: @ 81A8A39 lockall - setvar VAR_0x4001, 12 + setvar VAR_TEMP_1, 12 setvar VAR_0x8004, 645 checkflag FLAG_SILPH_7F_DOOR_2 goto_if TRUE, EventScript_DoorUnlocked @@ -456,7 +456,7 @@ SilphCo_7F_EventScript_Door2:: @ 81A8A39 SilphCo_7F_EventScript_Door3:: @ 81A8A53 lockall - setvar VAR_0x4001, 13 + setvar VAR_TEMP_1, 13 setvar VAR_0x8004, 646 checkflag FLAG_SILPH_7F_DOOR_3 goto_if TRUE, EventScript_DoorUnlocked @@ -465,7 +465,7 @@ SilphCo_7F_EventScript_Door3:: @ 81A8A53 SilphCo_8F_EventScript_Door:: @ 81A8A6D lockall - setvar VAR_0x4001, 14 + setvar VAR_TEMP_1, 14 setvar VAR_0x8004, 647 checkflag FLAG_SILPH_8F_DOOR goto_if TRUE, EventScript_DoorUnlocked @@ -474,7 +474,7 @@ SilphCo_8F_EventScript_Door:: @ 81A8A6D SilphCo_9F_EventScript_Door1:: @ 81A8A87 lockall - setvar VAR_0x4001, 15 + setvar VAR_TEMP_1, 15 setvar VAR_0x8004, 648 checkflag FLAG_SILPH_9F_DOOR_1 goto_if TRUE, EventScript_DoorUnlocked @@ -483,7 +483,7 @@ SilphCo_9F_EventScript_Door1:: @ 81A8A87 SilphCo_9F_EventScript_Door2:: @ 81A8AA1 lockall - setvar VAR_0x4001, 16 + setvar VAR_TEMP_1, 16 setvar VAR_0x8004, 649 checkflag FLAG_SILPH_9F_DOOR_2 goto_if TRUE, EventScript_DoorUnlocked @@ -492,7 +492,7 @@ SilphCo_9F_EventScript_Door2:: @ 81A8AA1 SilphCo_9F_EventScript_Door3:: @ 81A8ABB lockall - setvar VAR_0x4001, 17 + setvar VAR_TEMP_1, 17 setvar VAR_0x8004, 650 checkflag FLAG_SILPH_9F_DOOR_3 goto_if TRUE, EventScript_DoorUnlocked @@ -501,7 +501,7 @@ SilphCo_9F_EventScript_Door3:: @ 81A8ABB SilphCo_9F_EventScript_Door4:: @ 81A8AD5 lockall - setvar VAR_0x4001, 18 + setvar VAR_TEMP_1, 18 setvar VAR_0x8004, 651 checkflag FLAG_SILPH_9F_DOOR_4 goto_if TRUE, EventScript_DoorUnlocked @@ -510,7 +510,7 @@ SilphCo_9F_EventScript_Door4:: @ 81A8AD5 SilphCo_10F_EventScript_Door:: @ 81A8AEF lockall - setvar VAR_0x4001, 19 + setvar VAR_TEMP_1, 19 setvar VAR_0x8004, 652 checkflag FLAG_SILPH_10F_DOOR goto_if TRUE, EventScript_DoorUnlocked @@ -519,7 +519,7 @@ SilphCo_10F_EventScript_Door:: @ 81A8AEF SilphCo_11F_EventScript_Door:: @ 81A8B09 lockall - setvar VAR_0x4001, 20 + setvar VAR_TEMP_1, 20 setvar VAR_0x8004, 653 checkflag FLAG_SILPH_11F_DOOR goto_if TRUE, EventScript_DoorUnlocked @@ -536,45 +536,45 @@ EventScript_OpenDoor:: @ 81A8B32 playfanfare MUS_FANFA1 msgbox Text_CardKeyOpenedDoor waitfanfare - compare VAR_0x4001, 1 + compare VAR_TEMP_1, 1 call_if eq, EventScript_Open2FDoor1 - compare VAR_0x4001, 2 + compare VAR_TEMP_1, 2 call_if eq, EventScript_Open2FDoor2 - compare VAR_0x4001, 3 + compare VAR_TEMP_1, 3 call_if eq, EventScript_Open3FDoor1 - compare VAR_0x4001, 4 + compare VAR_TEMP_1, 4 call_if eq, EventScript_Open3FDoor2 - compare VAR_0x4001, 5 + compare VAR_TEMP_1, 5 call_if eq, EventScript_Open4FDoor1 - compare VAR_0x4001, 6 + compare VAR_TEMP_1, 6 call_if eq, EventScript_Open4FDoor2 - compare VAR_0x4001, 7 + compare VAR_TEMP_1, 7 call_if eq, EventScript_Open5FDoor1 - compare VAR_0x4001, 8 + compare VAR_TEMP_1, 8 call_if eq, EventScript_Open5FDoor2 - compare VAR_0x4001, 9 + compare VAR_TEMP_1, 9 call_if eq, EventScript_Open5FDoor3 - compare VAR_0x4001, 10 + compare VAR_TEMP_1, 10 call_if eq, EventScript_Open6FDoor - compare VAR_0x4001, 11 + compare VAR_TEMP_1, 11 call_if eq, EventScript_Open7FDoor1 - compare VAR_0x4001, 12 + compare VAR_TEMP_1, 12 call_if eq, EventScript_Open7FDoor2 - compare VAR_0x4001, 13 + compare VAR_TEMP_1, 13 call_if eq, EventScript_Open7FDoor3 - compare VAR_0x4001, 14 + compare VAR_TEMP_1, 14 call_if eq, EventScript_Open8FDoor - compare VAR_0x4001, 15 + compare VAR_TEMP_1, 15 call_if eq, EventScript_Open9FDoor1 - compare VAR_0x4001, 16 + compare VAR_TEMP_1, 16 call_if eq, EventScript_Open9FDoor2 - compare VAR_0x4001, 17 + compare VAR_TEMP_1, 17 call_if eq, EventScript_Open9FDoor3 - compare VAR_0x4001, 18 + compare VAR_TEMP_1, 18 call_if eq, EventScript_Open9FDoor4 - compare VAR_0x4001, 19 + compare VAR_TEMP_1, 19 call_if eq, EventScript_Open10FDoor - compare VAR_0x4001, 20 + compare VAR_TEMP_1, 20 call_if eq, EventScript_Open11FDoor waitse playse SE_KI_GASYAN diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index c3b3cdc2e..ffec7d4c8 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -8,7 +8,7 @@ SevenIsland_TrainerTower_7F_MapScript1_1C4F54:: @ 81C4F54 SevenIsland_TrainerTower_8F_MapScript1_1C4F54:: @ 81C4F54 SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54:: @ 81C4F54 SevenIsland_TrainerTower_Roof_MapScript1_1C4F54:: @ 81C4F54 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 setvar VAR_0x8004, 10 special sub_815D9E8 end @@ -31,15 +31,15 @@ SevenIsland_TrainerTower_8F_MapScript2_1C4F62:: @ 81C4F62 setflag FLAG_TEMP_3 setflag FLAG_TEMP_4 setflag FLAG_TEMP_5 - setvar VAR_0x400E, 1 - setvar VAR_0x400F, 1 + setvar VAR_TEMP_E, 1 + setvar VAR_TEMP_F, 1 end EventScript_1C4FA7:: @ 81C4FA7 setflag FLAG_TEMP_2 setflag FLAG_TEMP_4 setflag FLAG_TEMP_5 - setvar VAR_0x400F, 1 + setvar VAR_TEMP_F, 1 setobjectxyperm 3, 15, 13 setobjectmovementtype 3, 9 goto EventScript_1C5042 @@ -47,7 +47,7 @@ EventScript_1C4FA7:: @ 81C4FA7 EventScript_1C4FC5:: @ 81C4FC5 setflag FLAG_TEMP_3 setflag FLAG_TEMP_4 - setvar VAR_0x400E, 1 + setvar VAR_TEMP_E, 1 setvar VAR_0x8004, 5 special sub_815D9E8 compare VAR_RESULT, 1 @@ -67,7 +67,7 @@ EventScript_1C4FFE:: @ 81C4FFE EventScript_1C5019:: @ 81C5019 setflag FLAG_TEMP_5 - setvar VAR_0x400F, 1 + setvar VAR_TEMP_F, 1 setobjectxyperm 2, 10, 10 setobjectmovementtype 2, 8 setobjectxyperm 3, 14, 13 @@ -88,17 +88,17 @@ SevenIsland_TrainerTower_7F_MapScript3_1C5046:: @ 81C5046 SevenIsland_TrainerTower_8F_MapScript3_1C5046:: @ 81C5046 SevenIsland_TrainerTower_Elevator_MapScript2_1C5046:: @ 81C5046 SevenIsland_TrainerTower_Roof_MapScript2_1C5046:: @ 81C5046 - map_script_2 VAR_0x4002, 0, EventScript_1C5050 + map_script_2 VAR_TEMP_2, 0, EventScript_1C5050 .2byte 0 EventScript_1C5050:: @ 81C5050 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 setvar VAR_0x8004, 5 special sub_815D9E8 compare VAR_RESULT, 0 goto_if eq, EventScript_1C5072 - setvar VAR_0x400E, 1 - setvar VAR_0x400F, 1 + setvar VAR_TEMP_E, 1 + setvar VAR_TEMP_F, 1 EventScript_1C5072: setvar VAR_0x8004, 18 special sub_815D9E8 @@ -124,7 +124,7 @@ EventScript_1C50C2: waitmovement 0 applymovement 3, Movement_Delay48 waitmovement 0 - setvar VAR_0x400E, 1 + setvar VAR_TEMP_E, 1 applymovement 3, Movement_1C5541 waitmovement 0 setvar VAR_0x8004, 1 @@ -138,24 +138,24 @@ EventScript_1C50C2: EventScript_1C510D:: @ 81C510D setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_0x4003 + copyvar VAR_0x8006, VAR_TEMP_3 special sub_815D9E8 msgbox gStringVar4 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - addvar VAR_0x4003, 1 - compare VAR_0x4003, 1 + addvar VAR_TEMP_3, 1 + compare VAR_TEMP_3, 1 goto_if eq, EventScript_1C5146 - setvar VAR_0x4003, 0 + setvar VAR_TEMP_3, 0 EventScript_1C5146: - copyvar VAR_0x8006, VAR_0x4003 + copyvar VAR_0x8006, VAR_TEMP_3 special sub_815D9E8 msgbox gStringVar4 closemessage goto EventScript_1C5219 EventScript_1C515C:: @ 81C515C - switch VAR_0x4001 + switch VAR_TEMP_1 case 0, EventScript_1C5182 case 1, EventScript_1C51AD case 2, EventScript_1C51D8 @@ -193,7 +193,7 @@ EventScript_1C51D8:: @ 81C51D8 EventScript_1C51FE: setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_0x4001 + copyvar VAR_0x8006, VAR_TEMP_1 special sub_815D9E8 msgbox gStringVar4 closemessage @@ -215,16 +215,16 @@ EventScript_1C524D: case 1, EventScript_1C52BA case 2, EventScript_1C5280 EventScript_1C5280: - switch VAR_0x4001 + switch VAR_TEMP_1 case 0, EventScript_1C52A6 case 1, EventScript_1C52B0 case 2, EventScript_1C52D0 EventScript_1C52A6: - addvar VAR_0x4001, 1 + addvar VAR_TEMP_1, 1 goto EventScript_1C515C EventScript_1C52B0:: @ 81C52B0 - addvar VAR_0x4001, 1 + addvar VAR_TEMP_1, 1 goto EventScript_1C515C EventScript_1C52BA:: @ 81C52BA @@ -374,7 +374,7 @@ SevenIsland_TrainerTower_5F_EventScript_1C54B4:: @ 81C54B4 SevenIsland_TrainerTower_7F_EventScript_1C54B4:: @ 81C54B4 SevenIsland_TrainerTower_3F_EventScript_1C54B4:: @ 81C54B4 SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4 - setvar VAR_0x4003, 0 + setvar VAR_TEMP_3, 0 setvar VAR_0x8004, 16 special sub_815D9E8 compare VAR_RESULT, 0 @@ -394,7 +394,7 @@ SevenIsland_TrainerTower_5F_EventScript_1C54EA:: @ 81C54EA SevenIsland_TrainerTower_7F_EventScript_1C54EA:: @ 81C54EA SevenIsland_TrainerTower_3F_EventScript_1C54EA:: @ 81C54EA SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA - setvar VAR_0x4003, 1 + setvar VAR_TEMP_3, 1 setvar VAR_0x8004, 16 special sub_815D9E8 compare VAR_RESULT, 0 @@ -406,7 +406,7 @@ SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA applymovement 5, Movement_Delay48 EventScript_1C551B: waitmovement 0 - setvar VAR_0x400F, 1 + setvar VAR_TEMP_F, 1 goto EventScript_1C508F EventScript_1C5528:: @ 81C5528 diff --git a/include/constants/vars.h b/include/constants/vars.h index 5806b8c42..164ac7c7b 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -6,22 +6,22 @@ #define VARS_START 0x4000 // Temporary variables. Reset on map load. -#define VAR_0x4000 0x4000 -#define VAR_0x4001 0x4001 -#define VAR_0x4002 0x4002 -#define VAR_0x4003 0x4003 -#define VAR_0x4004 0x4004 -#define VAR_0x4005 0x4005 -#define VAR_0x4006 0x4006 -#define VAR_0x4007 0x4007 -#define VAR_0x4008 0x4008 -#define VAR_0x4009 0x4009 -#define VAR_0x400A 0x400A -#define VAR_0x400B 0x400B -#define VAR_0x400C 0x400C -#define VAR_0x400D 0x400D -#define VAR_0x400E 0x400E -#define VAR_0x400F 0x400F +#define VAR_TEMP_0 0x4000 +#define VAR_TEMP_1 0x4001 +#define VAR_TEMP_2 0x4002 +#define VAR_TEMP_3 0x4003 +#define VAR_TEMP_4 0x4004 +#define VAR_TEMP_5 0x4005 +#define VAR_TEMP_6 0x4006 +#define VAR_TEMP_7 0x4007 +#define VAR_TEMP_8 0x4008 +#define VAR_TEMP_9 0x4009 +#define VAR_TEMP_A 0x400A +#define VAR_TEMP_B 0x400B +#define VAR_TEMP_C 0x400C +#define VAR_TEMP_D 0x400D +#define VAR_TEMP_E 0x400E +#define VAR_TEMP_F 0x400F // Object event graphics IDs which can be changed by // script commands. diff --git a/src/battle_tower.c b/src/battle_tower.c index c8098abf4..86ed75273 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -190,33 +190,33 @@ void ScrSpecial_BattleTowerMapScript2(void) case 0: ResetBattleTowerStreak(levelType); if (count == 0) - VarSet(VAR_0x4000, 5); + VarSet(VAR_TEMP_0, 5); break; case 1: ResetBattleTowerStreak(levelType); - VarSet(VAR_0x4000, BTSPECIAL_RESULT_SAVE_SCUM); + VarSet(VAR_TEMP_0, BTSPECIAL_RESULT_SAVE_SCUM); count++; break; case 3: break; case 4: - VarSet(VAR_0x4000, BTSPECIAL_RESULT_WON7); + VarSet(VAR_TEMP_0, BTSPECIAL_RESULT_WON7); count++; break; case 5: - VarSet(VAR_0x4000, BTSPECIAL_RESULT_LOST); + VarSet(VAR_TEMP_0, BTSPECIAL_RESULT_LOST); count++; break; case 6: break; case 2: - VarSet(VAR_0x4000, BTSPECIAL_RESULT_QUICKSAVE); + VarSet(VAR_TEMP_0, BTSPECIAL_RESULT_QUICKSAVE); count++; break; } } if (gSaveBlock2Ptr->battleTower.var_4AE[0] == 3 && gSaveBlock2Ptr->battleTower.var_4AE[1] == 3) - VarSet(VAR_0x4000, BTSPECIAL_RESULT_INACTIVE); + VarSet(VAR_TEMP_0, BTSPECIAL_RESULT_INACTIVE); ValidateBattleTowerRecordChecksums(); } @@ -1150,7 +1150,7 @@ void SaveBattleTowerProgress(void) if (gSpecialVar_0x8004 != 3) gSaveBlock2Ptr->battleTower.var_4AE[battleTowerLevelType] = gSpecialVar_0x8004; - VarSet(VAR_0x4000, BTSPECIAL_TEST); + VarSet(VAR_TEMP_0, BTSPECIAL_TEST); gSaveBlock2Ptr->battleTower.unk_554 = 1; TrySavingData(SAVE_EREADER); } diff --git a/src/field_tasks.c b/src/field_tasks.c index 7ca6d0e7b..e39009a2e 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -213,7 +213,7 @@ static void IcefallCaveIcePerStepCallback(u8 taskId) PlaySE(SE_RU_GASYAN); MapGridSetMetatileIdAt(x, y, 0x35b); CurrentMapDrawMetatileAt(x, y); - VarSet(VAR_0x4001, 1); + VarSet(VAR_TEMP_1, 1); data[1] = 1; } break; diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 5d1b3fc62..60c6fd93d 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -463,7 +463,7 @@ void InitTrainerTowerBattleStruct(void) sub_815DC8C(); sTrainerTowerOpponent = AllocZeroed(sizeof(*sTrainerTowerOpponent)); - r10 = VarGet(VAR_0x4001); + r10 = VarGet(VAR_TEMP_1); StringCopyN(sTrainerTowerOpponent->name, sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].name, 11); for (r9 = 0; r9 < 6; r9++) @@ -494,7 +494,7 @@ void FreeTrainerTowerBattleStruct(void) void sub_815DBF4(u8 *dest, u8 opponentIdx) // TTower_GetBeforeBattleMessage? { - VarSet(VAR_0x4003, opponentIdx); + VarSet(VAR_TEMP_3, opponentIdx); TrainerTowerGetOpponentTextColor(sTrainerTowerOpponent->battleType, sTrainerTowerOpponent->facilityClass); if (opponentIdx == 0) TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechWin, dest); @@ -505,7 +505,7 @@ void sub_815DBF4(u8 *dest, u8 opponentIdx) void sub_815DC40(u8 *dest, u8 opponentIdx) // TTower_GetAfterBattleMessage? { - VarSet(VAR_0x4003, opponentIdx); + VarSet(VAR_TEMP_3, opponentIdx); TrainerTowerGetOpponentTextColor(sTrainerTowerOpponent->battleType, sTrainerTowerOpponent->facilityClass); if (opponentIdx == 0) TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechLose, dest); @@ -706,7 +706,7 @@ static void TrainerTowerGetOpponentTextColor(u8 battleType, u8 facilityClass) } if (r4 != NELEMS(sDoubleBattleTrainerInfo)) { - if (VarGet(VAR_0x4003)) + if (VarGet(VAR_TEMP_3)) r5 = sDoubleBattleTrainerInfo[r4].gender2; else r5 = sDoubleBattleTrainerInfo[r4].gender1; @@ -905,12 +905,12 @@ static void sub_815E720(void) PutWindowTilemap(windowId); CopyWindowToVram(windowId, 3); - VarSet(VAR_0x4001, windowId); + VarSet(VAR_TEMP_1, windowId); } static void sub_815E88C(void) { - u8 windowId = VarGet(VAR_0x4001); + u8 windowId = VarGet(VAR_TEMP_1); ClearStdWindowAndFrameToTransparent(windowId, TRUE); RemoveWindow(windowId); } @@ -948,7 +948,7 @@ static void sub_815E908(void) static void sub_815E948(void) { s32 i; - u16 var_4001 = VarGet(VAR_0x4001); + u16 var_4001 = VarGet(VAR_TEMP_1); u8 r1 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[var_4001].facilityClass; for (i = 0; i < NELEMS(sTrainerEncounterMusicLUT); i++) @@ -974,7 +974,7 @@ static void sub_815E9C8(void) static void BuildEnemyParty(void) { - u16 trainerIdx = VarGet(VAR_0x4001); + u16 trainerIdx = VarGet(VAR_TEMP_1); s32 level = GetPartyMaxLevel(); u8 floorIdx = gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8; s32 i; |