diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-05-15 09:51:36 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-05-15 09:57:37 -0400 |
| commit | 05b591cd95f3fd62e84b33eb56d25f197b17a96c (patch) | |
| tree | 57635b441bb8b2a208a359126c5dc9b8df7abfa6 | |
| parent | 82c33aacb036428bf9861e7f97914c7bb675fa07 (diff) | |
Remove remaining legacy macros from current code.
124 files changed, 515 insertions, 512 deletions
diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index 581fd13c..d157cef5 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -8,7 +8,7 @@ Music_TitleScreen: Music_TitleScreen_Ch1: tempo 256 volume 7, 7 - dutycycle 3 + duty_cycle 3 pitch_offset 2 vibrato 16, 1, 2 stereo_panning TRUE, FALSE @@ -15,7 +15,10 @@ INCLUDE "macros/scripts/battle_commands.asm" INCLUDE "macros/scripts/battle_anims.asm" INCLUDE "macros/scripts/trade_anims.asm" -INCLUDE "macros/legacy.asm" +; TODO: Should this be included or not? +; - Leave out for now so no code depending on legacy macros gets introduced +; +; INCLUDE "macros/legacy.asm" dr: macro IF DEF(_GOLD) diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index be45f78d..7df72482 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -30,7 +30,7 @@ AzaleaGymBugsyScript: playsound SFX_GET_BADGE waitsfx setflag ENGINE_HIVEBADGE - checkcode VAR_BADGES + readvar VAR_BADGES scall AzaleaGymActivateRockets .FightDone: checkevent EVENT_GOT_TM49_FURY_CUTTER @@ -144,7 +144,7 @@ AzaleaGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext BUGSY, BUGSY1, STRING_BUFFER_4 + gettrainername STRING_BUFFER_4, BUGSY, BUGSY1 jumpstd gymstatue2 BugsyText_INeverLose: diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index ca609d23..2eec0d1b 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -38,7 +38,7 @@ AzaleaTownRivalBattleScene1: appear AZALEATOWN_SILVER applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1 turnobject PLAYER, DOWN - jump AzaleaTownRivalBattleScript + sjump AzaleaTownRivalBattleScript AzaleaTownRivalBattleScene2: turnobject PLAYER, RIGHT @@ -65,7 +65,7 @@ AzaleaTownRivalBattleScript: startbattle dontrestartmapmusic reloadmapafterbattle - jump .AfterBattle + sjump .AfterBattle .Totodile: winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText @@ -74,7 +74,7 @@ AzaleaTownRivalBattleScript: startbattle dontrestartmapmusic reloadmapafterbattle - jump .AfterBattle + sjump .AfterBattle .Chikorita: winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText @@ -83,7 +83,7 @@ AzaleaTownRivalBattleScript: startbattle dontrestartmapmusic reloadmapafterbattle - jump .AfterBattle + sjump .AfterBattle .AfterBattle: playmusic MUSIC_RIVAL_AFTER diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index 4dc53b12..aad86012 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -19,7 +19,7 @@ BillScript: writetext BillImCountingOnYouText promptbutton waitsfx - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, .NoRoom writetext ReceivedEeveeText playsound SFX_CAUGHT_MON @@ -95,7 +95,7 @@ BillsSisterScript: .NoRoom: writetext BillsSisterPhoneFullText promptbutton - jump .Refused + sjump .Refused BillsHouseBookshelf1: jumpstd picturebookshelf diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 3705faf3..a0b52077 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -40,7 +40,7 @@ BillsGrandpa: ifnotequal LICKITUNG, .WrongPokemon scall .CorrectPokemon setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA - jump .ShowedLickitung + sjump .ShowedLickitung .GotEverstone: writetext BillsGrandpaOddishText @@ -54,7 +54,7 @@ BillsGrandpa: ifnotequal ODDISH, .WrongPokemon scall .CorrectPokemon setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA - jump .ShowedOddish + sjump .ShowedOddish .GotLeafStone: writetext BillsGrandpaStaryuText @@ -68,7 +68,7 @@ BillsGrandpa: ifnotequal STARYU, .WrongPokemon scall .CorrectPokemon setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA - jump .ShowedStaryu + sjump .ShowedStaryu .GotWaterStone: checkver @@ -84,7 +84,7 @@ BillsGrandpa: ifnotequal GROWLITHE, .WrongPokemon scall .CorrectPokemon setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA - jump .ShowedGrowlitheVulpix + sjump .ShowedGrowlitheVulpix .AskVulpix: writetext BillsGrandpaVulpixText @@ -98,7 +98,7 @@ BillsGrandpa: ifnotequal VULPIX, .WrongPokemon scall .CorrectPokemon setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA - jump .ShowedGrowlitheVulpix + sjump .ShowedGrowlitheVulpix .GotFireStone: writetext BillsGrandpaPichuText @@ -112,7 +112,7 @@ BillsGrandpa: ifnotequal PICHU, .WrongPokemon scall .CorrectPokemon setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA - jump .ShowedPichu + sjump .ShowedPichu .ShowedLickitung: checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index eec1650d..d891fa3c 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -21,7 +21,7 @@ BlackthornCity_MapScripts: return .Santos: - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal SATURDAY, .SantosAppears disappear BLACKTHORNCITY_SANTOS return @@ -90,7 +90,7 @@ SantosScript: opentext checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS iftrue .Saturday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal SATURDAY, .NotSaturday checkevent EVENT_MET_SANTOS_OF_SATURDAY iftrue .MetSantos diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 4451e913..240a1ece 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -143,7 +143,7 @@ BlackthornGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext CLAIR, CLAIR1, STRING_BUFFER_4 + gettrainername STRING_BUFFER_4, CLAIR, CLAIR1 jumpstd gymstatue2 ClairIntroText: diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 73fdb2d3..29bc5b2a 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -29,15 +29,15 @@ BlackthornGym2F_MapScripts: .Boulder1: disappear BLACKTHORNGYM2F_BOULDER1 - jump .Fall + sjump .Fall .Boulder2: disappear BLACKTHORNGYM2F_BOULDER2 - jump .Fall + sjump .Fall .Boulder3: disappear BLACKTHORNGYM2F_BOULDER3 - jump .Fall + sjump .Fall .Fall: pause 30 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index e56221d8..58dda54b 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -9,7 +9,7 @@ BluesHouse_MapScripts: DaisyScript: faceplayer opentext - checkcode VAR_HOUR + readvar VAR_HOUR ifequal 15, .ThreePM writetext DaisyHelloText waitbutton diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 4f091d2c..032ee1dc 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -10,7 +10,7 @@ BrunosRoom_MapScripts: callback MAPCALLBACK_TILES, .BrunosRoomDoors .LockDoor: - priorityjump .BrunosDoorLocksBehindYou + prioritysjump .BrunosDoorLocksBehindYou end .DummyScene: diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 97f790b7..d2836328 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -17,7 +17,7 @@ BurnedTower1F_MapScripts: db 0 ; callbacks .RivalScene: - priorityjump .Rival + prioritysjump .Rival end .DummyScene1: @@ -53,7 +53,7 @@ BurnedTower1F_MapScripts: startbattle dontrestartmapmusic reloadmapafterbattle - jump .returnfrombattle + sjump .returnfrombattle .totodile winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText @@ -62,7 +62,7 @@ BurnedTower1F_MapScripts: startbattle dontrestartmapmusic reloadmapafterbattle - jump .returnfrombattle + sjump .returnfrombattle .chikorita winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText @@ -71,7 +71,7 @@ BurnedTower1F_MapScripts: startbattle dontrestartmapmusic reloadmapafterbattle - jump .returnfrombattle + sjump .returnfrombattle .returnfrombattle playmusic MUSIC_RIVAL_AFTER diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 0b7a3699..a7aa5d72 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -94,7 +94,7 @@ CeladonCafeTrashcan: giveitem LEFTOVERS iffalse .PackFull opentext - itemtotext LEFTOVERS, STRING_BUFFER_3 + getitemname STRING_BUFFER_3, LEFTOVERS writetext FoundLeftoversText playsound SFX_ITEM waitsfx @@ -105,7 +105,7 @@ CeladonCafeTrashcan: .PackFull: opentext - itemtotext LEFTOVERS, STRING_BUFFER_3 + getitemname STRING_BUFFER_3, LEFTOVERS writetext FoundLeftoversText promptbutton writetext NoRoomForLeftoversText diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index d44e2aca..144dde62 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -33,8 +33,8 @@ CeladonDeptStore6FVendingMachine: giveitem FRESH_WATER iffalse .NotEnoughSpace takemoney YOUR_MONEY, 200 - itemtotext FRESH_WATER, STRING_BUFFER_3 - jump .VendItem + getitemname STRING_BUFFER_3, FRESH_WATER + sjump .VendItem .SodaPop: checkmoney YOUR_MONEY, 300 @@ -42,8 +42,8 @@ CeladonDeptStore6FVendingMachine: giveitem SODA_POP iffalse .NotEnoughSpace takemoney YOUR_MONEY, 300 - itemtotext SODA_POP, STRING_BUFFER_3 - jump .VendItem + getitemname STRING_BUFFER_3, SODA_POP + sjump .VendItem .Lemonade: checkmoney YOUR_MONEY, 350 @@ -51,8 +51,8 @@ CeladonDeptStore6FVendingMachine: giveitem LEMONADE iffalse .NotEnoughSpace takemoney YOUR_MONEY, 350 - itemtotext LEMONADE, STRING_BUFFER_3 - jump .VendItem + getitemname STRING_BUFFER_3, LEMONADE + sjump .VendItem .VendItem: pause 10 @@ -60,17 +60,17 @@ CeladonDeptStore6FVendingMachine: writetext CeladonClangText promptbutton itemnotify - jump .Start + sjump .Start .NotEnoughMoney: writetext CeladonVendingNoMoneyText waitbutton - jump .Start + sjump .Start .NotEnoughSpace: writetext CeladonVendingNoSpaceText waitbutton - jump .Start + sjump .Start .MenuHeader: db MENU_BACKUP_TILES ; flags diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 0473916f..b2d1f3be 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -58,7 +58,7 @@ CeladonGameCornerFisherScript: iffalse .NoCoinCase checkcoins MAX_COINS - 1 ifequal HAVE_MORE, .FullCoinCase - stringtotext .coinname, STRING_BUFFER_4 + getstring STRING_BUFFER_4, .coinname scall .GiveCoins givecoins 18 setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON @@ -112,14 +112,14 @@ CeladonGameCornerLuckySlotMachineScript: random 6 ifequal 0, CeladonGameCornerSlotMachineScript refreshscreen - writebyte FALSE + setval FALSE special SlotMachine closetext end CeladonGameCornerSlotMachineScript: refreshscreen - writebyte TRUE + setval TRUE special SlotMachine closetext end diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 543dcf82..e6695f46 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -29,40 +29,40 @@ CeladonPrizeRoom_tmcounterloop: ifequal 1, .doubleteam ifequal 2, .psychic ifequal 3, .hyperbeam - jump CeladonPrizeRoom_cancel + sjump CeladonPrizeRoom_cancel .doubleteam checkcoins 1500 ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins - itemtotext TM_DOUBLE_TEAM, STRING_BUFFER_3 + getitemname STRING_BUFFER_3, TM_DOUBLE_TEAM scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel giveitem TM_DOUBLE_TEAM iffalse CeladonPrizeRoom_notenoughroom takecoins 1500 - jump CeladonPrizeRoom_purchased + sjump CeladonPrizeRoom_purchased .psychic checkcoins 3500 ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins - itemtotext TM_PSYCHIC_M, STRING_BUFFER_3 + getitemname STRING_BUFFER_3, TM_PSYCHIC_M scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel giveitem TM_PSYCHIC_M iffalse CeladonPrizeRoom_notenoughroom takecoins 3500 - jump CeladonPrizeRoom_purchased + sjump CeladonPrizeRoom_purchased .hyperbeam checkcoins 7500 ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins - itemtotext TM_HYPER_BEAM, STRING_BUFFER_3 + getitemname STRING_BUFFER_3, TM_HYPER_BEAM scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel giveitem TM_HYPER_BEAM iffalse CeladonPrizeRoom_notenoughroom takecoins 7500 - jump CeladonPrizeRoom_purchased + sjump CeladonPrizeRoom_purchased CeladonPrizeRoom_askbuy: writetext CeladonPrizeRoom_ConfirmPurchaseText @@ -74,7 +74,7 @@ CeladonPrizeRoom_purchased: playsound SFX_TRANSACTION writetext CeladonPrizeRoom_HereYouGoText waitbutton - jump CeladonPrizeRoom_tmcounterloop + sjump CeladonPrizeRoom_tmcounterloop CeladonPrizeRoom_notenoughcoins: writetext CeladonPrizeRoom_NotEnoughCoinsText @@ -130,61 +130,61 @@ CeladonGameCornerPrizeRoomPokemonVendor: ifequal 1, .mrmime ifequal 2, .eevee ifequal 3, .porygon - jump CeladonPrizeRoom_cancel + sjump CeladonPrizeRoom_cancel .mrmime checkcoins 3333 ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom - pokenamemem MR__MIME, STRING_BUFFER_3 + getmonname STRING_BUFFER_3, MR__MIME scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel waitsfx playsound SFX_TRANSACTION writetext CeladonPrizeRoom_HereYouGoText waitbutton - writebyte MR__MIME + setval MR__MIME special GameCornerPrizeMonCheckDex givepoke MR__MIME, 15 takecoins 3333 - jump .loop + sjump .loop .eevee checkcoins 6666 ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom - pokenamemem EEVEE, STRING_BUFFER_3 + getmonname STRING_BUFFER_3, EEVEE scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel waitsfx playsound SFX_TRANSACTION writetext CeladonPrizeRoom_HereYouGoText waitbutton - writebyte EEVEE + setval EEVEE special GameCornerPrizeMonCheckDex givepoke EEVEE, 15 takecoins 6666 - jump .loop + sjump .loop .porygon checkcoins 9999 ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom - pokenamemem PORYGON, STRING_BUFFER_3 + getmonname STRING_BUFFER_3, PORYGON scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel waitsfx playsound SFX_TRANSACTION writetext CeladonPrizeRoom_HereYouGoText waitbutton - writebyte PORYGON + setval PORYGON special GameCornerPrizeMonCheckDex givepoke PORYGON, 20 takecoins 9999 - jump .loop + sjump .loop .MenuHeader: db MENU_BACKUP_TILES ; flags diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index d3196187..0cce0b17 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -107,7 +107,7 @@ CeladonGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext ERIKA, ERIKA1, STRING_BUFFER_4 + gettrainername STRING_BUFFER_4, ERIKA, ERIKA1 jumpstd gymstatue2 ErikaBeforeBattleText: diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 3986b1c4..08b0934b 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -13,7 +13,7 @@ GameFreakGameDesignerScript: faceplayer opentext writetext GameFreakGameDesignerText - checkcode VAR_DEXCAUGHT + readvar VAR_DEXCAUGHT ifgreater NUM_POKEMON - 2 - 1, .CompletedPokedex ; ignore Mew and Celebi waitbutton closetext diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index fc0c3faf..f033299b 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -17,7 +17,7 @@ CeruleanGym_MapScripts: end .GruntRunsOut: - priorityjump .GruntRunsOutScript + prioritysjump .GruntRunsOutScript end .GruntRunsOutScript: @@ -158,7 +158,7 @@ CeruleanGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext MISTY, MISTY1, STRING_BUFFER_4 + gettrainername STRING_BUFFER_4, MISTY, MISTY1 jumpstd gymstatue2 CeruleanGymGruntRunsDownMovement: diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index b2f56401..d9ad3e3e 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -29,7 +29,7 @@ CherrygroveCityGuideGent: writetext GuideGentIntroText yesorno iffalse .No - jump .Yes + sjump .Yes .Yes: writetext GuideGentTourText1 waitbutton @@ -67,7 +67,7 @@ CherrygroveCityGuideGent: opentext writetext GuideGentGiftText promptbutton - stringtotext .mapcardname, STRING_BUFFER_4 + getstring STRING_BUFFER_4, .mapcardname scall .JumpstdReceiveItem setflag ENGINE_MAP_CARD writetext GotMapCardText @@ -120,34 +120,34 @@ CherrygroveSilverSceneNorth: winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText setlasttalked CHERRYGROVECITY_SILVER loadtrainer RIVAL1, RIVAL1_1_TOTODILE - writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE + loadvar VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle dontrestartmapmusic reloadmap iftrue .AfterVictorious - jump .AfterYourDefeat + sjump .AfterYourDefeat .Totodile: winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText setlasttalked CHERRYGROVECITY_SILVER loadtrainer RIVAL1, RIVAL1_1_CHIKORITA - writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE + loadvar VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle dontrestartmapmusic reloadmap iftrue .AfterVictorious - jump .AfterYourDefeat + sjump .AfterYourDefeat .Chikorita: winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText setlasttalked CHERRYGROVECITY_SILVER loadtrainer RIVAL1, RIVAL1_1_CYNDAQUIL - writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE + loadvar VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle dontrestartmapmusic reloadmap iftrue .AfterVictorious - jump .AfterYourDefeat + sjump .AfterYourDefeat .AfterVictorious: playmusic MUSIC_RIVAL_AFTER @@ -155,7 +155,7 @@ CherrygroveSilverSceneNorth: writetext CherrygroveRivalText_YouWon waitbutton closetext - jump .FinishRival + sjump .FinishRival .AfterYourDefeat: playmusic MUSIC_RIVAL_AFTER diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index f4a47019..62b15126 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -47,7 +47,7 @@ CianwoodGymChuckScript: playsound SFX_GET_BADGE waitsfx setflag ENGINE_STORMBADGE - checkcode VAR_BADGES + readvar VAR_BADGES scall CianwoodGymActivateRockets .FightDone: checkevent EVENT_GOT_TM01_DYNAMICPUNCH @@ -136,7 +136,7 @@ CianwoodGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext CHUCK, CHUCK1, STRING_BUFFER_4 + gettrainername STRING_BUFFER_4, CHUCK, CHUCK1 jumpstd gymstatue2 CianwoodGymMovement_ChuckChucksBoulder: diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index ee6cc343..ae4f2fd7 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -11,7 +11,7 @@ Colosseum_MapScripts: callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeColosseum: - priorityjump .InitializeAndPreparePokecenter2F + prioritysjump .InitializeAndPreparePokecenter2F end .DummyScene1: diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 9cd374ae..1c86d68b 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -61,7 +61,7 @@ Copycat: takeitem LOST_ITEM setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT clearevent EVENT_COPYCATS_HOUSE_2F_DOLL - jump .GivePass + sjump .GivePass .TryGivePassAgain: opentext diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index a302db46..7b6b5ed5 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -86,7 +86,7 @@ DanceTheaterSurfGuy: iffalse .KimonoGirlsUndefeated checkevent EVENT_BEAT_KIMONO_GIRL_MIKI iffalse .KimonoGirlsUndefeated - jump .GetSurf + sjump .GetSurf .KimonoGirlsUndefeated: writetext SurfGuyLadGiftText diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 47f5b0ca..537be0aa 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -22,7 +22,7 @@ DragonsDenB1F_MapScripts: return .CheckDay: - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal TUESDAY, .AppearSilver ifequal THURSDAY, .AppearSilver disappear DRAGONSDENB1F_SILVER @@ -37,15 +37,15 @@ DragonsDenB1FDragonFangScript: iffalse .BagFullDragonFang disappear DRAGONSDENB1F_POKE_BALL1 opentext - itemtotext DRAGON_FANG, STRING_BUFFER_3 + getitemname STRING_BUFFER_3, DRAGON_FANG writetext Text_FoundDragonFang playsound SFX_ITEM waitsfx itemnotify closetext - checkcode VAR_FACING + readvar VAR_FACING ifequal RIGHT, .next - jump .next2 + sjump .next2 .next moveobject DRAGONSDENB1F_CLAIR, 34, 21 .next2 @@ -68,7 +68,7 @@ DragonsDenB1FDragonFangScript: setevent EVENT_GOT_TM24_DRAGONBREATH writetext ClairText_DescribeDragonbreathDragonDen promptbutton - jump .ClairLastText + sjump .ClairLastText .ClairLastText writetext ClairText_WhatsTheMatterDragonDen waitbutton @@ -79,7 +79,7 @@ DragonsDenB1FDragonFangScript: .BagFullDragonFang: opentext - itemtotext DRAGON_FANG, STRING_BUFFER_3 + getitemname STRING_BUFFER_3, DRAGON_FANG writetext Text_FoundDragonFang promptbutton writetext Text_NoRoomForDragonFang diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 07ea18bf..c787c08c 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -78,27 +78,27 @@ AcademyBlackboard: .Poison: writetext AcademyPoisonText waitbutton - jump .Loop + sjump .Loop .Paralysis: writetext AcademyParalysisText waitbutton - jump .Loop + sjump .Loop .Sleep: writetext AcademySleepText waitbutton - jump .Loop + sjump .Loop .Burn: writetext AcademyBurnText waitbutton - jump .Loop + sjump .Loop .Freeze: writetext AcademyFreezeText waitbutton - jump .Loop + sjump .Loop .BlackboardMenuHeader: db MENU_BACKUP_TILES ; flags diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 19a818bd..969e4d78 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -30,7 +30,7 @@ EcruteakGymMortyScript: playsound SFX_GET_BADGE waitsfx setflag ENGINE_FOGBADGE - checkcode VAR_BADGES + readvar VAR_BADGES scall EcruteakGymActivateRockets setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_FINISHED .FightDone: @@ -133,7 +133,7 @@ EcruteakGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext MORTY, MORTY1, STRING_BUFFER_4 + gettrainername STRING_BUFFER_4, MORTY, MORTY1 jumpstd gymstatue2 MortyIntroText: diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index f99eb892..2d97125b 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -13,7 +13,7 @@ EcruteakPokecenter1F_MapScripts: db 0 ; callbacks .MeetBill: - priorityjump .BillActivatesTimeCapsule + prioritysjump .BillActivatesTimeCapsule end .DummyScene: @@ -39,7 +39,7 @@ EcruteakPokecenter1F_MapScripts: opentext writetext EcruteakPokecenter1F_BillText1 promptbutton - jump .PointlessJump + sjump .PointlessJump .PointlessJump: writetext EcruteakPokecenter1F_BillText2 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 14acb93a..41839262 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -18,7 +18,7 @@ ElmsLab_MapScripts: db 0 ; callbacks .MeetElm: - priorityjump .WalkUpToElm + prioritysjump .WalkUpToElm end .DummyScene1: @@ -65,10 +65,10 @@ ElmCheckEverstone: iftrue ElmGiveEverstoneScript checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE iffalse ElmCheckTogepiEgg - writebyte TOGEPI + setval TOGEPI special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript - writebyte TOGETIC + setval TOGETIC special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writetext ElmThoughtEggHatchedText @@ -77,13 +77,13 @@ ElmCheckEverstone: end ElmEggHatchedScript: - writebyte TOGEPI + setval TOGEPI special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript - writebyte TOGETIC + setval TOGETIC special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript - jump ElmCheckGotEggAgain + sjump ElmCheckGotEggAgain ElmCheckTogepiEgg: checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE @@ -133,17 +133,17 @@ CyndaquilPokeBallScript: writetext ChoseStarterText promptbutton waitsfx - pokenamemem CYNDAQUIL, STRING_BUFFER_3 + getmonname STRING_BUFFER_3, CYNDAQUIL writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx promptbutton givepoke CYNDAQUIL, 5, BERRY closetext - checkcode VAR_FACING + readvar VAR_FACING ifequal RIGHT, ElmDirectionsScript applymovement PLAYER, AfterCyndaquilMovement - jump ElmDirectionsScript + sjump ElmDirectionsScript TotodilePokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM @@ -163,7 +163,7 @@ TotodilePokeBallScript: writetext ChoseStarterText promptbutton waitsfx - pokenamemem TOTODILE, STRING_BUFFER_3 + getmonname STRING_BUFFER_3, TOTODILE writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx @@ -171,7 +171,7 @@ TotodilePokeBallScript: givepoke TOTODILE, 5, BERRY closetext applymovement PLAYER, AfterTotodileMovement - jump ElmDirectionsScript + sjump ElmDirectionsScript ChikoritaPokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM @@ -191,7 +191,7 @@ ChikoritaPokeBallScript: writetext ChoseStarterText promptbutton waitsfx - pokenamemem CHIKORITA, STRING_BUFFER_3 + getmonname STRING_BUFFER_3, CHIKORITA writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx @@ -199,7 +199,7 @@ ChikoritaPokeBallScript: givepoke CHIKORITA, 5, BERRY closetext applymovement PLAYER, AfterChikoritaMovement - jump ElmDirectionsScript + sjump ElmDirectionsScript DidntChooseStarterScript: writetext DidntChooseStarterText @@ -267,7 +267,7 @@ ElmsLabHealingMachine: ElmsLabHealingMachine_HealParty: special HealParty playmusic MUSIC_NONE - writebyte HEALMACHINE_ELMS_LAB + setval HEALMACHINE_ELMS_LAB special HealMachineAnim pause 30 special RestartMapMusic @@ -376,7 +376,7 @@ ElmGiveTicketScript: ElmJumpBackScript1: closetext - checkcode VAR_FACING + readvar VAR_FACING ifequal DOWN, ElmJumpDownScript ifequal UP, ElmJumpUpScript ifequal LEFT, ElmJumpLeftScript @@ -385,7 +385,7 @@ ElmJumpBackScript1: ElmJumpBackScript2: closetext - checkcode VAR_FACING + readvar VAR_FACING ifequal DOWN, ElmJumpUpScript ifequal UP, ElmJumpDownScript ifequal LEFT, ElmJumpRightScript @@ -455,7 +455,7 @@ AideScript_GiveYouBalls: opentext writetext AideText_GiveYouBalls promptbutton - itemtotext POKE_BALL, STRING_BUFFER_4 + getitemname STRING_BUFFER_4, POKE_BALL scall AideScript_ReceiveTheBalls giveitem POKE_BALL, 5 writetext AideText_ExplainBalls @@ -526,7 +526,7 @@ ElmsLabWindow: iftrue .Normal checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON iftrue .BreakIn - jump .Normal + sjump .Normal .BreakIn: writetext ElmsLabWindowText2 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index a47965cd..0eb09324 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -16,7 +16,7 @@ FastShip1F_MapScripts: end .EnterFastShip: - priorityjump .EnterFastShipScript + prioritysjump .EnterFastShipScript end .DummyScene2: @@ -87,7 +87,7 @@ FastShip1FSailor1Script: end .LetThePlayerOut: - checkcode VAR_FACING + readvar VAR_FACING ifequal RIGHT, .YouAreFacingRight applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e applymovement PLAYER, MovementData_0x75235 diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index d1c682d3..92866b9f 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -97,7 +97,7 @@ FastShipLazySailorScript: closetext setevent EVENT_FAST_SHIP_LAZY_SAILOR setmapscene FAST_SHIP_B1F, SCENE_FINISHED - checkcode VAR_FACING + readvar VAR_FACING ifequal RIGHT, .Movement2 applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, FastShipLazySailorLeavesMovement1 playsound SFX_EXIT_BUILDING diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index cf5278a3..c9f7842c 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -70,7 +70,7 @@ SSAquaGranddaughterBefore: promptbutton setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY setmapscene FAST_SHIP_1F, SCENE_DEFAULT - jump SSAquaMetalCoatAndDocking + sjump SSAquaMetalCoatAndDocking SSAquaGrandpa: faceplayer diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index ec784776..bd791476 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -39,7 +39,7 @@ FuchsiaGymJanineScript: playsound SFX_GET_BADGE waitsfx setflag ENGINE_SOULBADGE - jump .AfterBattle + sjump .AfterBattle .FightDone: faceplayer opentext @@ -214,7 +214,7 @@ FuchsiaGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext JANINE, JANINE1, STRING_BUFFER_4 + gettrainername STRING_BUFFER_4, JANINE, JANINE1 jumpstd gymstatue2 Movement_NinjaSpin: diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 6a650fdf..d8ba879a 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -13,7 +13,7 @@ GoldenrodDeptStore5F_MapScripts: callback MAPCALLBACK_OBJECTS, .CheckIfSunday .CheckIfSunday: - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal SUNDAY, .yes disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST return @@ -29,12 +29,12 @@ GoldenrodDeptStore5FClerkScript: iftrue .headbutt checkevent EVENT_GOT_TM08_ROCK_SMASH iftrue .onlyrocksmash - jump .neither + sjump .neither .headbutt checkevent EVENT_GOT_TM08_ROCK_SMASH iftrue .both - jump .onlyheadbutt + sjump .onlyheadbutt .neither pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_1 @@ -59,7 +59,7 @@ GoldenrodDeptStore5FClerkScript: GoldenrodDeptStore5FReceptionistScript: faceplayer opentext - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal SUNDAY, .EventIsOver checkflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN iftrue .EventIsOver @@ -68,7 +68,7 @@ GoldenrodDeptStore5FReceptionistScript: promptbutton ifgreater 150 - 1, .VeryHappy ifgreater 50 - 1, .SomewhatHappy - jump .NotVeryHappy + sjump .NotVeryHappy .VeryHappy: writetext UnknownText_0x5615a diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index b27d033e..61425193 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -27,8 +27,8 @@ GoldenrodVendingMachine: giveitem FRESH_WATER iffalse .NotEnoughSpace takemoney YOUR_MONEY, 200 - itemtotext FRESH_WATER, STRING_BUFFER_3 - jump .VendItem + getitemname STRING_BUFFER_3, FRESH_WATER + sjump .VendItem .SodaPop: checkmoney YOUR_MONEY, 300 @@ -36,8 +36,8 @@ GoldenrodVendingMachine: giveitem SODA_POP iffalse .NotEnoughSpace takemoney YOUR_MONEY, 300 - itemtotext SODA_POP, STRING_BUFFER_3 - jump .VendItem + getitemname STRING_BUFFER_3, SODA_POP + sjump .VendItem .Lemonade: checkmoney YOUR_MONEY, 350 @@ -45,8 +45,8 @@ GoldenrodVendingMachine: giveitem LEMONADE iffalse .NotEnoughSpace takemoney YOUR_MONEY, 350 - itemtotext LEMONADE, STRING_BUFFER_3 - jump .VendItem + getitemname STRING_BUFFER_3, LEMONADE + sjump .VendItem .VendItem: pause 10 @@ -54,17 +54,17 @@ GoldenrodVendingMachine: writetext GoldenrodClangText promptbutton itemnotify - jump .Start + sjump .Start .NotEnoughMoney: writetext GoldenrodVendingNoMoneyText waitbutton - jump .Start + sjump .Start .NotEnoughSpace: writetext GoldenrodVendingNoSpaceText waitbutton - jump .Start + sjump .Start .MenuHeader: db MENU_BACKUP_TILES ; flags diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index adadb249..4e7a36f1 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -18,11 +18,11 @@ GoldenrodDeptStoreB1F_MapScripts: .ClearBoxes: checkevent EVENT_RECEIVED_CARD_KEY iftrue .GotCardKey - jump .Continue + sjump .Continue .GotCardKey: changeblock 16, 4, $0d ; floor - jump .Continue + sjump .Continue .Continue: checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2 diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index b75414bb..b7a092f5 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -35,40 +35,40 @@ GoldenrodGameCornerTMVendor_LoopScript: ifequal 1, .Thunder ifequal 2, .Blizzard ifequal 3, .FireBlast - jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript + sjump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript .Thunder: checkcoins 5500 ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - itemtotext TM_THUNDER, STRING_BUFFER_3 + getitemname STRING_BUFFER_3, TM_THUNDER scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_THUNDER iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript takecoins 5500 - jump GoldenrodGameCornerTMVendor_FinishScript + sjump GoldenrodGameCornerTMVendor_FinishScript .Blizzard: checkcoins 5500 ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - itemtotext TM_BLIZZARD, STRING_BUFFER_3 + getitemname STRING_BUFFER_3, TM_BLIZZARD scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_BLIZZARD iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript takecoins 5500 - jump GoldenrodGameCornerTMVendor_FinishScript + sjump GoldenrodGameCornerTMVendor_FinishScript .FireBlast: checkcoins 5500 ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - itemtotext TM_FIRE_BLAST, STRING_BUFFER_3 + getitemname STRING_BUFFER_3, TM_FIRE_BLAST scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_FIRE_BLAST iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript takecoins 5500 - jump GoldenrodGameCornerTMVendor_FinishScript + sjump GoldenrodGameCornerTMVendor_FinishScript GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript: writetext GoldenrodGameCornerPrizeVendorConfirmPrizeText @@ -80,7 +80,7 @@ GoldenrodGameCornerTMVendor_FinishScript: playsound SFX_TRANSACTION writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton - jump GoldenrodGameCornerTMVendor_LoopScript + sjump GoldenrodGameCornerTMVendor_LoopScript GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript: writetext GoldenrodGameCornerPrizeVendorNeedMoreCoinsText @@ -138,61 +138,61 @@ GoldenrodGameCornerPrizeMonVendorScript: ifequal 1, .gold_abra ifequal 2, .gold_ekans ifequal 3, .gold_dratini - jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript + sjump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript .gold_abra checkcoins 200 ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem ABRA, STRING_BUFFER_3 + getmonname STRING_BUFFER_3, ABRA scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx playsound SFX_TRANSACTION writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton - writebyte ABRA + setval ABRA special GameCornerPrizeMonCheckDex givepoke ABRA, 10 takecoins 200 - jump .gold_loop + sjump .gold_loop .gold_ekans checkcoins 700 ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem EKANS, STRING_BUFFER_3 + getmonname STRING_BUFFER_3, EKANS scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx playsound SFX_TRANSACTION writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton - writebyte EKANS + setval EKANS special GameCornerPrizeMonCheckDex givepoke EKANS, 10 takecoins 700 - jump .gold_loop + sjump .gold_loop .gold_dratini checkcoins 2100 ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem DRATINI, STRING_BUFFER_3 + getmonname STRING_BUFFER_3, DRATINI scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx playsound SFX_TRANSACTION writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton - writebyte DRATINI + setval DRATINI special GameCornerPrizeMonCheckDex givepoke DRATINI, 10 takecoins 2100 - jump .gold_loop + sjump .gold_loop .gold_MenuHeader: db MENU_BACKUP_TILES ; flags @@ -217,61 +217,61 @@ GoldenrodGameCornerPrizeMonVendorScript: ifequal 1, .silver_abra ifequal 2, .silver_sandshrew ifequal 3, .silver_dratini - jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript + sjump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript .silver_abra checkcoins 200 ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem ABRA, STRING_BUFFER_3 + getmonname STRING_BUFFER_3, ABRA scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx playsound SFX_TRANSACTION writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton - writebyte ABRA + setval ABRA special GameCornerPrizeMonCheckDex givepoke ABRA, 10 takecoins 200 - jump .silver_loop + sjump .silver_loop .silver_sandshrew checkcoins 700 ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem SANDSHREW, STRING_BUFFER_3 + getmonname STRING_BUFFER_3, SANDSHREW scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx playsound SFX_TRANSACTION writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton - writebyte SANDSHREW + setval SANDSHREW special GameCornerPrizeMonCheckDex givepoke SANDSHREW, 10 takecoins 700 - jump .silver_loop + sjump .silver_loop .silver_dratini checkcoins 2100 ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem DRATINI, STRING_BUFFER_3 + getmonname STRING_BUFFER_3, DRATINI scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx playsound SFX_TRANSACTION writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton - writebyte DRATINI + setval DRATINI special GameCornerPrizeMonCheckDex givepoke DRATINI, 10 takecoins 2100 - jump .silver_loop + sjump .silver_loop .silver_MenuHeader: db MENU_BACKUP_TILES ; flags @@ -342,14 +342,14 @@ GoldenrodGameCornerSlotsMachineScript: random 6 ifequal 0, GoldenrodGameCornerLuckySlotsMachineScript refreshscreen - writebyte FALSE + setval FALSE special SlotMachine closetext end GoldenrodGameCornerLuckySlotsMachineScript: refreshscreen - writebyte TRUE + setval TRUE special SlotMachine closetext end diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 39a56312..88a48a3b 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -59,7 +59,7 @@ GoldenrodGymWhitneyScript: playsound SFX_GET_BADGE waitsfx setflag ENGINE_PLAINBADGE - checkcode VAR_BADGES + readvar VAR_BADGES scall GoldenrodGymActivateRockets .GotPlainBadge: writetext WhitneyPlainBadgeText @@ -169,7 +169,7 @@ GoldenrodGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext WHITNEY, WHITNEY1, STRING_BUFFER_4 + gettrainername STRING_BUFFER_4, WHITNEY, WHITNEY1 jumpstd gymstatue2 BridgetWalksUpMovement: diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index c722cdae..95418751 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -19,7 +19,7 @@ GoldenrodHappinessRaterTeacherScript: ifgreater 150 - 1, .SortOfHappy ifgreater 100 - 1, .QuiteCute ifgreater 50 - 1, .NotUsedToYou - jump .LooksMean + sjump .LooksMean .LovesYouALot: writetext GoldenrodHappinessRatingText_LovesYouALot diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index c1d4a362..4e4a0aa0 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -32,7 +32,7 @@ GoldenrodMagnetTrainStationOfficerScript: closetext applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 applymovement PLAYER, MovementData_0x5514f - writebyte FALSE + setval FALSE special MagnetTrain warpcheck newloadmap MAPSETUP_TRAIN diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 942f7d2c..c4f3ef16 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -176,7 +176,7 @@ UndergroundSilverBattleScript: startbattle dontrestartmapmusic reloadmapafterbattle - jump .FinishRivalBattle + sjump .FinishRivalBattle .Totodile: winlosstext UndergroundSilverWinText, UndergroundSilverLossText @@ -185,7 +185,7 @@ UndergroundSilverBattleScript: startbattle dontrestartmapmusic reloadmapafterbattle - jump .FinishRivalBattle + sjump .FinishRivalBattle .Chikorita: winlosstext UndergroundSilverWinText, UndergroundSilverLossText @@ -194,7 +194,7 @@ UndergroundSilverBattleScript: startbattle dontrestartmapmusic reloadmapafterbattle - jump .FinishRivalBattle + sjump .FinishRivalBattle .FinishRivalBattle: playmusic MUSIC_RIVAL_AFTER @@ -279,21 +279,21 @@ Switch1Script: writetext SwitchRoomText_OffTurnOn yesorno iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle - copybytetovar wUndergroundSwitchPositions - addvar 1 - copyvartobyte wUndergroundSwitchPositions + readmem wUndergroundSwitchPositions + addval 1 + writemem wUndergroundSwitchPositions setevent EVENT_SWITCH_1 - jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors + sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors .On: writetext SwitchRoomText_OnTurnOff yesorno iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle - copybytetovar wUndergroundSwitchPositions - addvar -1 - copyvartobyte wUndergroundSwitchPositions + readmem wUndergroundSwitchPositions + addval -1 + writemem wUndergroundSwitchPositions clearevent EVENT_SWITCH_1 - jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors + sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors Switch2Script: opentext @@ -304,21 +304,21 @@ Switch2Script: writetext SwitchRoomText_OffTurnOn yesorno iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle - copybytetovar wUndergroundSwitchPositions - addvar 2 - copyvartobyte wUndergroundSwitchPositions + readmem wUndergroundSwitchPositions + addval 2 + writemem wUndergroundSwitchPositions setevent EVENT_SWITCH_2 - jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors + sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors .On: writetext SwitchRoomText_OnTurnOff yesorno iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle - copybytetovar wUndergroundSwitchPositions - addvar -2 - copyvartobyte wUndergroundSwitchPositions + readmem wUndergroundSwitchPositions + addval -2 + writemem wUndergroundSwitchPositions clearevent EVENT_SWITCH_2 - jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors + sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors Switch3Script: opentext @@ -329,21 +329,21 @@ Switch3Script: writetext SwitchRoomText_OffTurnOn yesorno iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle - copybytetovar wUndergroundSwitchPositions - addvar 3 - copyvartobyte wUndergroundSwitchPositions + readmem wUndergroundSwitchPositions + addval 3 + writemem wUndergroundSwitchPositions setevent EVENT_SWITCH_3 - jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors + sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors .On: writetext SwitchRoomText_OnTurnOff yesorno iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle - copybytetovar wUndergroundSwitchPositions - addvar -3 - copyvartobyte wUndergroundSwitchPositions + readmem wUndergroundSwitchPositions + addval -3 + writemem wUndergroundSwitchPositions clearevent EVENT_SWITCH_3 - jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors + sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors EmergencySwitchScript: opentext @@ -354,32 +354,32 @@ EmergencySwitchScript: writetext SwitchRoomText_OffTurnOn yesorno iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle - writebyte 7 - copyvartobyte wUndergroundSwitchPositions + setval 7 + writemem wUndergroundSwitchPositions setevent EVENT_EMERGENCY_SWITCH setevent EVENT_SWITCH_1 setevent EVENT_SWITCH_2 setevent EVENT_SWITCH_3 - jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors + sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors .On: writetext SwitchRoomText_OnTurnOff yesorno iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle - writebyte 0 - copyvartobyte wUndergroundSwitchPositions + setval 0 + writemem wUndergroundSwitchPositions clearevent EVENT_EMERGENCY_SWITCH clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_3 - jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors + sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors GoldenrodUndergroundSwitchRoomEntrances_DontToggle: closetext end GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors: - copybytetovar wUndergroundSwitchPositions + readmem wUndergroundSwitchPositions ifequal 0, .Position0 ifequal 1, .Position1 ifequal 2, .Position2 @@ -498,8 +498,8 @@ GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors: scall .Set14 reloadmappart closetext - writebyte 6 - copyvartobyte wUndergroundSwitchPositions + setval 6 + writemem wUndergroundSwitchPositions end .Set4: diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 2f878cc5..0ac3dadd 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -29,8 +29,8 @@ GoldenrodUndergroundWarehouse_MapScripts: clearevent EVENT_SWITCH_12 clearevent EVENT_SWITCH_13 clearevent EVENT_SWITCH_14 - writebyte 0 - copyvartobyte wUndergroundSwitchPositions + setval 0 + writemem wUndergroundSwitchPositions return TrainerGruntM24: diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 5d0588ba..151166d0 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -9,7 +9,7 @@ HallOfFame_MapScripts: db 0 ; callbacks .EnterHallOfFame: - priorityjump .EnterHallOfFameScript + prioritysjump .EnterHallOfFameScript end .DummyScene: @@ -28,7 +28,7 @@ HallOfFame_MapScripts: applymovement PLAYER, HallOfFame_SlowlyApproachMachine setscene SCENE_FINISHED pause 15 - writebyte HEALMACHINE_HALL_OF_FAME + setval HEALMACHINE_HALL_OF_FAME special HealMachineAnim setevent EVENT_BEAT_ELITE_FOUR setevent EVENT_TELEPORT_GUY diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 5f3c150d..a8e07480 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -28,22 +28,22 @@ IcePathB1F_MapScripts: .Boulder1: disappear ICEPATHB1F_BOULDER1 clearevent EVENT_BOULDER_IN_ICE_PATH_1A - jump .FinishBoulder + sjump .FinishBoulder .Boulder2: disappear ICEPATHB1F_BOULDER2 clearevent EVENT_BOULDER_IN_ICE_PATH_2A - jump .FinishBoulder + sjump .FinishBoulder .Boulder3: disappear ICEPATHB1F_BOULDER3 clearevent EVENT_BOULDER_IN_ICE_PATH_3A - jump .FinishBoulder + sjump .FinishBoulder .Boulder4: disappear ICEPATHB1F_BOULDER4 clearevent EVENT_BOULDER_IN_ICE_PATH_4A - jump .FinishBoulder + sjump .FinishBoulder .FinishBoulder: pause 30 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 93ff2035..213939b3 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -243,7 +243,7 @@ FarfetchdCryAndCheckFacing: cry FARFETCH_D waitbutton closetext - checkcode VAR_FACING + readvar VAR_FACING end IlexForestCharcoalMasterScript: diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index bd3fb351..c8fd52c4 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -46,7 +46,7 @@ PlateauRivalBattle1: iffalse PlateauRivalScriptDone checkflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT iftrue PlateauRivalScriptDone - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal SUNDAY, PlateauRivalScriptDone ifequal TUESDAY, PlateauRivalScriptDone ifequal THURSDAY, PlateauRivalScriptDone @@ -61,14 +61,14 @@ PlateauRivalBattle1: applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1 playmusic MUSIC_RIVAL_ENCOUNTER turnobject PLAYER, RIGHT - jump PlateauRivalBattleCommon + sjump PlateauRivalBattleCommon PlateauRivalBattle2: checkevent EVENT_BEAT_RIVAL_IN_MT_MOON iffalse PlateauRivalScriptDone checkflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT iftrue PlateauRivalScriptDone - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal SUNDAY, PlateauRivalScriptDone ifequal TUESDAY, PlateauRivalScriptDone ifequal THURSDAY, PlateauRivalScriptDone @@ -99,7 +99,7 @@ PlateauRivalBattleCommon: startbattle dontrestartmapmusic reloadmapafterbattle - jump PlateauRivalPostBattle + sjump PlateauRivalPostBattle .Totodile: winlosstext PlateauRivalWinText, PlateauRivalLoseText @@ -108,7 +108,7 @@ PlateauRivalBattleCommon: startbattle dontrestartmapmusic reloadmapafterbattle - jump PlateauRivalPostBattle + sjump PlateauRivalPostBattle .Chikorita: winlosstext PlateauRivalWinText, PlateauRivalLoseText @@ -117,7 +117,7 @@ PlateauRivalBattleCommon: startbattle dontrestartmapmusic reloadmapafterbattle - jump PlateauRivalPostBattle + sjump PlateauRivalPostBattle PlateauRivalPostBattle: playmusic MUSIC_RIVAL_AFTER diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 5d41d051..c7266a7f 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -10,7 +10,7 @@ KarensRoom_MapScripts: callback MAPCALLBACK_TILES, .KarensRoomDoors .LockDoor: - priorityjump .KarensDoorLocksBehindYou + prioritysjump .KarensDoorLocksBehindYou end .DummyScene: diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 030eff6c..cec81d71 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -10,7 +10,7 @@ KogasRoom_MapScripts: callback MAPCALLBACK_TILES, .KogasRoomDoors .LockDoor: - priorityjump .KogasDoorLocksBehindYou + prioritysjump .KogasDoorLocksBehindYou end .DummyScene: diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 96aa1f4a..5d48decf 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -38,7 +38,7 @@ Kurt1: closetext special FadeOutMusic setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET - checkcode VAR_FACING + readvar VAR_FACING ifequal UP, .RunAround turnobject PLAYER, DOWN playsound SFX_FLY @@ -117,31 +117,31 @@ Kurt1: ifequal PNK_APRICORN, .Pnk ; .Red setevent EVENT_GAVE_KURT_RED_APRICORN - jump .GaveKurtApricorns + sjump .GaveKurtApricorns .Blu: setevent EVENT_GAVE_KURT_BLU_APRICORN - jump .GaveKurtApricorns + sjump .GaveKurtApricorns .Ylw: setevent EVENT_GAVE_KURT_YLW_APRICORN - jump .GaveKurtApricorns + sjump .GaveKurtApricorns .Grn: setevent EVENT_GAVE_KURT_GRN_APRICORN - jump .GaveKurtApricorns + sjump .GaveKurtApricorns .Wht: setevent EVENT_GAVE_KURT_WHT_APRICORN - jump .GaveKurtApricorns + sjump .GaveKurtApricorns .Blk: setevent EVENT_GAVE_KURT_BLK_APRICORN - jump .GaveKurtApricorns + sjump .GaveKurtApricorns .Pnk: setevent EVENT_GAVE_KURT_PNK_APRICORN - jump .GaveKurtApricorns + sjump .GaveKurtApricorns .GaveKurtApricorns: setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 @@ -181,7 +181,7 @@ Kurt1: verbosegiveitem LEVEL_BALL iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_RED_APRICORN - jump ._ThatTurnedOutGreat + sjump ._ThatTurnedOutGreat .GiveLureBall: checkflag ENGINE_KURT_MAKING_BALLS @@ -191,7 +191,7 @@ Kurt1: verbosegiveitem LURE_BALL iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_BLU_APRICORN - jump ._ThatTurnedOutGreat + sjump ._ThatTurnedOutGreat .GiveMoonBall: checkflag ENGINE_KURT_MAKING_BALLS @@ -201,7 +201,7 @@ Kurt1: verbosegiveitem MOON_BALL iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_YLW_APRICORN - jump ._ThatTurnedOutGreat + sjump ._ThatTurnedOutGreat .GiveFriendBall: checkflag ENGINE_KURT_MAKING_BALLS @@ -211,7 +211,7 @@ Kurt1: verbosegiveitem FRIEND_BALL iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_GRN_APRICORN - jump ._ThatTurnedOutGreat + sjump ._ThatTurnedOutGreat .GiveFastBall: checkflag ENGINE_KURT_MAKING_BALLS @@ -221,7 +221,7 @@ Kurt1: verbosegiveitem FAST_BALL iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_WHT_APRICORN - jump ._ThatTurnedOutGreat + sjump ._ThatTurnedOutGreat .GiveHeavyBall: checkflag ENGINE_KURT_MAKING_BALLS @@ -231,7 +231,7 @@ Kurt1: verbosegiveitem HEAVY_BALL iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_BLK_APRICORN - jump ._ThatTurnedOutGreat + sjump ._ThatTurnedOutGreat .GiveLoveBall: checkflag ENGINE_KURT_MAKING_BALLS @@ -241,7 +241,7 @@ Kurt1: verbosegiveitem LOVE_BALL iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_PNK_APRICORN - jump ._ThatTurnedOutGreat + sjump ._ThatTurnedOutGreat KurtsGranddaughter: faceplayer diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 35c811a1..5f3109da 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -32,7 +32,7 @@ LakeOfRage_MapScripts: return .Wesley: - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal WEDNESDAY, .WesleyAppears disappear LAKEOFRAGE_WESLEY return @@ -76,7 +76,7 @@ LakeOfRageLanceScript: writetext UnknownText_0x703a5 yesorno iffalse .RefusedToHelp - jump .AgreedToHelp + sjump .AgreedToHelp RedGyarados: opentext @@ -85,7 +85,7 @@ RedGyarados: cry GYARADOS closetext loadwildmon GYARADOS, 30 - writecode VAR_BATTLETYPE, BATTLETYPE_SHINY + loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY startbattle ifequal $1, .NotBeaten disappear LAKEOFRAGE_GYARADOS @@ -192,7 +192,7 @@ WesleyScript: opentext checkevent EVENT_GOT_BLACKBELT_FROM_WESLEY iftrue WesleyWednesdayScript - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal WEDNESDAY, WesleyNotWednesdayScript checkevent EVENT_MET_WESLEY_OF_WEDNESDAY iftrue .MetWesley diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index 9374dd6b..005b8444 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -37,7 +37,7 @@ MagikarpLengthRaterScript: end .AskedForMagikarp: - writebyte MAGIKARP + setval MAGIKARP special FindPartyMonThatSpecies iffalse .ClearedRocketHideout writetext MagikarpLengthRaterText_YouHaveAMagikarp @@ -47,7 +47,7 @@ MagikarpLengthRaterScript: ifequal MAGIKARPLENGTH_REFUSED, .Refused ifequal MAGIKARPLENGTH_TOO_SHORT, .TooShort ; MAGIKARPLENGTH_BEAT_RECORD - jump .GetReward + sjump .GetReward .GetReward: writetext MagikarpLengthRaterText_Memento diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 2c2dc654..6f55b17f 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -12,7 +12,7 @@ LancesRoom_MapScripts: callback MAPCALLBACK_TILES, .LancesRoomDoors .LockDoor: - priorityjump .LancesDoorLocksBehindYou + prioritysjump .LancesDoorLocksBehindYou end .DummyScene: @@ -44,7 +44,7 @@ LancesRoom_MapScripts: Script_ApproachLanceFromLeft: special FadeOutMusic applymovement PLAYER, MovementData_ApproachLanceFromLeft - jump LancesRoomLanceScript + sjump LancesRoomLanceScript Script_ApproachLanceFromRight: special FadeOutMusic diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index dc4e895a..474d76ff 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -34,7 +34,7 @@ LavRadioTower1FGentlemanScript: .ReturnedMachinePart: writetext LavRadioTower1FGentlemanText_ReturnedMachinePart promptbutton - stringtotext .expncardname, STRING_BUFFER_4 + getstring STRING_BUFFER_4, .expncardname scall .receiveitem setflag ENGINE_EXPN_CARD .GotExpnCard: diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 55e6da6f..ad3584ec 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -30,7 +30,7 @@ MahoganyGymPryceScript: playsound SFX_GET_BADGE waitsfx setflag ENGINE_GLACIERBADGE - checkcode VAR_BADGES + readvar VAR_BADGES scall MahoganyGymActivateRockets .FightDone: checkevent EVENT_GOT_TM16_ICY_WIND @@ -144,7 +144,7 @@ MahoganyGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext PRYCE, PRYCE1, STRING_BUFFER_4 + gettrainername STRING_BUFFER_4, PRYCE, PRYCE1 jumpstd gymstatue2 PryceText_Intro: diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 75e34a5f..f2d0f674 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -17,7 +17,7 @@ MahoganyMart1F_MapScripts: end .LanceUncoversStaircase: - priorityjump MahoganyMart1FLanceUncoversStaircaseScript + prioritysjump MahoganyMart1FLanceUncoversStaircaseScript end .MahoganyMart1FStaircase: diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 79b2188f..09982fd1 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -9,7 +9,7 @@ MountMoon_MapScripts: db 0 ; callbacks .RivalEncounter: - priorityjump .RivalBattle + prioritysjump .RivalBattle end .DummyScene: @@ -36,7 +36,7 @@ MountMoon_MapScripts: startbattle dontrestartmapmusic reloadmapafterbattle - jump .FinishBattle + sjump .FinishBattle .Totodile: winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss @@ -45,7 +45,7 @@ MountMoon_MapScripts: startbattle dontrestartmapmusic reloadmapafterbattle - jump .FinishBattle + sjump .FinishBattle .Chikorita: winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss @@ -54,7 +54,7 @@ MountMoon_MapScripts: startbattle dontrestartmapmusic reloadmapafterbattle - jump .FinishBattle + sjump .FinishBattle .FinishBattle: playmusic MUSIC_RIVAL_AFTER diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index b972a6f8..628ac17b 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -25,7 +25,7 @@ MountMoonSquare_MapScripts: ClefairyDance: checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY iftrue .NoDancing - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal MONDAY, .NoDancing checktime NITE iffalse .NoDancing diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 7cfb66b2..ea5e4cf3 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -32,7 +32,7 @@ MountMortarB1FKiyoScript: writetext UnknownText_0x7e2c0 promptbutton waitsfx - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, .NoRoom writetext UnknownText_0x7e355 playsound SFX_CAUGHT_MON diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index d849e0a8..1f93028c 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -10,7 +10,7 @@ MrPokemonsHouse_MapScripts: db 0 ; callbacks .MeetMrPokemon: - priorityjump .MrPokemonEvent + prioritysjump .MrPokemonEvent end .DummyScene: @@ -45,7 +45,7 @@ MrPokemonsHouse_MapScripts: writetext MrPokemonIntroText5 waitbutton closetext - jump MrPokemonsHouse_OakScript + sjump MrPokemonsHouse_OakScript MrPokemonsHouse_MrPokemonScript: faceplayer @@ -72,7 +72,7 @@ MrPokemonsHouse_MrPokemonScript: verbosegiveitem EXP_SHARE iffalse .full takeitem RED_SCALE - jump .AlwaysNewDiscoveries + sjump .AlwaysNewDiscoveries .refused writetext MrPokemonText_Disappointed diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index e6038111..8d89f2c3 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -85,7 +85,7 @@ TrainerSchoolboyJack1: promptbutton setevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .RequestNumber + sjump .RequestNumber .AskAgain: scall .AskNumber2 @@ -93,9 +93,9 @@ TrainerSchoolboyJack1: askforphonenumber PHONE_SCHOOLBOY_JACK ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext SCHOOLBOY, JACK1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .Rematch: scall .RematchStd @@ -179,7 +179,7 @@ TrainerPokefanfBeverly1: promptbutton setevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .RequestNumber + sjump .RequestNumber .AskAgain: scall .AskNumber2 @@ -187,9 +187,9 @@ TrainerPokefanfBeverly1: askforphonenumber PHONE_POKEFAN_BEVERLY ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext POKEFANF, BEVERLY1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .Rematch: scall .RematchStd diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index b5b7015e..d16fac60 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -23,10 +23,10 @@ Oak: promptbutton setevent EVENT_TALKED_TO_OAK_IN_KANTO .CheckBadges: - checkcode VAR_BADGES + readvar VAR_BADGES ifequal NUM_BADGES, .OpenMtSilver ifequal NUM_JOHTO_BADGES, .Complain - jump .AhGood + sjump .AhGood .CheckPokedex: writetext OakLabDexCheckText @@ -41,17 +41,17 @@ Oak: writetext OakOpenMtSilverText promptbutton setevent EVENT_OPENED_MT_SILVER - jump .CheckPokedex + sjump .CheckPokedex .Complain: writetext OakNoKantoBadgesText promptbutton - jump .CheckPokedex + sjump .CheckPokedex .AhGood: writetext OakYesKantoBadgesText promptbutton - jump .CheckPokedex + sjump .CheckPokedex OaksAssistant1Script: jumptextfaceplayer OaksAssistant1Text diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 2f2c3332..de380f44 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -25,7 +25,7 @@ OlivineGymJasmineScript: playsound SFX_GET_BADGE waitsfx setflag ENGINE_MINERALBADGE - checkcode VAR_BADGES + readvar VAR_BADGES scall OlivineGymActivateRockets .FightDone: checkevent EVENT_GOT_TM23_IRON_TAIL @@ -89,7 +89,7 @@ OlivineGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext JASMINE, JASMINE1, STRING_BUFFER_4 + gettrainername STRING_BUFFER_4, JASMINE, JASMINE1 jumpstd gymstatue2 Jasmine_SteelTypeIntro: diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 8aa413a4..aa92ab95 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -34,7 +34,7 @@ TrainerSailorHuey: promptbutton setevent EVENT_HUEY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .AskForNumber + sjump .AskForNumber .AskedBefore: scall .AskNumber2 @@ -42,9 +42,9 @@ TrainerSailorHuey: askforphonenumber PHONE_SAILOR_HUEY ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext SAILOR, HUEY1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, SAILOR, HUEY1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .WantsBattle: scall .Rematch diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 87fd486d..a83c0762 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -67,7 +67,7 @@ OlivineLighthouseJasmine: closetext setevent EVENT_JASMINE_RETURNED_TO_GYM clearevent EVENT_OLIVINE_GYM_JASMINE - checkcode VAR_FACING + readvar VAR_FACING ifequal DOWN, .FacingDown ifequal RIGHT, .FacingRight applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c68 @@ -107,7 +107,7 @@ OlivineLighthouseAmphy: checkevent EVENT_JASMINE_RETURNED_TO_GYM iftrue .HealthyNow writetext AmphyPalPalooText - writebyte AMPHAROS + setval AMPHAROS special PlaySlowCry promptbutton writetext AmphyBreathingLaboredText diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 59094ca9..8cb7aa68 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -18,7 +18,7 @@ OlivinePort_MapScripts: end .LeaveFastShip: - priorityjump .LeaveFastShipScript + prioritysjump .LeaveFastShipScript end .LeaveFastShipScript: @@ -82,7 +82,7 @@ OlivinePortWalkUpToShipScript: opentext checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse .FirstTime - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal SUNDAY, .NextShipMonday ifequal SATURDAY, .NextShipMonday ifequal TUESDAY, .NextShipFriday @@ -101,7 +101,7 @@ OlivinePortWalkUpToShipScript: closetext setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 applymovement PLAYER, MovementData_0x74a37 - jump OlivinePortSailorAtGangwayScript + sjump OlivinePortSailorAtGangwayScript .NoTicket: writetext UnknownText_0x74b41 @@ -147,7 +147,7 @@ OlivinePortSailorAfterHOFScript: iftrue OlivinePortAlreadyRodeScript checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse .FirstTime - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal SUNDAY, .NextShipMonday ifequal SATURDAY, .NextShipMonday ifequal TUESDAY, .NextShipFriday @@ -165,14 +165,14 @@ OlivinePortSailorAfterHOFScript: waitbutton closetext setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 - checkcode VAR_FACING + readvar VAR_FACING ifequal RIGHT, .Right applymovement PLAYER, MovementData_0x74a3f - jump OlivinePortSailorAtGangwayScript + sjump OlivinePortSailorAtGangwayScript .Right: applymovement PLAYER, MovementData_0x74a49 - jump OlivinePortSailorAtGangwayScript + sjump OlivinePortSailorAtGangwayScript .NoTicket: writetext UnknownText_0x74b41 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 292bfb75..8f10abe9 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -70,7 +70,7 @@ PewterGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext BROCK, BROCK1, STRING_BUFFER_4 + gettrainername STRING_BUFFER_4, BROCK, BROCK1 jumpstd gymstatue2 BrockIntroText: diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index ea3f5606..52efbaab 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -12,7 +12,7 @@ PlayersHouse1F_MapScripts: db 0 ; callbacks .DummyScene0: - priorityjump MeetMomScript + prioritysjump MeetMomScript end .DummyScene1: @@ -27,7 +27,7 @@ MeetMomScript: opentext writetext ElmsLookingForYouText promptbutton - stringtotext GearName, STRING_BUFFER_4 + getstring STRING_BUFFER_4, GearName scall PlayersHouse1FReceiveItemStd setflag ENGINE_POKEGEAR setflag ENGINE_PHONE_CARD @@ -45,7 +45,7 @@ MeetMomScript: special InitialSetDSTFlag yesorno iffalse .SetDayOfWeek - jump .DayOfWeekDone + sjump .DayOfWeekDone .WrongDay: special InitialClearDSTFlag @@ -55,17 +55,17 @@ MeetMomScript: writetext ComeHomeForDSTText yesorno iffalse .ExplainPhone - jump .KnowPhone + sjump .KnowPhone .KnowPhone: writetext KnowTheInstructionsText promptbutton - jump .FinishPhone + sjump .FinishPhone .ExplainPhone: writetext DontKnowTheInstructionsText promptbutton - jump .FinishPhone + sjump .FinishPhone .FinishPhone: writetext InstructionsNextText diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 4a3041e6..6a4296c8 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -19,21 +19,21 @@ Pokecenter2F_MapScripts: clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .Scene0Done - priorityjump Pokecenter2F_AppearMysteryGiftDeliveryGuy + prioritysjump Pokecenter2F_AppearMysteryGiftDeliveryGuy .Scene0Done: end .Scene1: - priorityjump Script_LeftCableTradeCenter + prioritysjump Script_LeftCableTradeCenter end .Scene2: - priorityjump Script_LeftCableColosseum + prioritysjump Script_LeftCableColosseum end .Scene3: - priorityjump Script_LeftTimeCapsule + prioritysjump Script_LeftTimeCapsule end Pokecenter2F_AppearMysteryGiftDeliveryGuy: @@ -76,14 +76,14 @@ LinkReceptionistScript_Trade: writetext Text_PleaseWait special CheckLinkTimeout iffalse .LinkTimedOut - copybytetovar wOtherPlayerLinkMode + readmem wOtherPlayerLinkMode iffalse .LinkedToFirstGen special CheckBothSelectedSameRoom iffalse .IncompatibleRooms writetext Text_PleaseComeIn2 waitbutton closetext - applymovement2 Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight + applymovementlasttalked Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsUp warpcheck end @@ -109,7 +109,7 @@ LinkReceptionistScript_Trade: .LinkTimedOut: writetext Text_LinkTimedOut - jump .AbortLink + sjump .AbortLink .DidNotSave: writetext Text_PleaseComeAgain @@ -137,14 +137,14 @@ LinkReceptionistScript_Battle: writetext Text_PleaseWait special CheckLinkTimeout iffalse .LinkTimedOut - copybytetovar wOtherPlayerLinkMode + readmem wOtherPlayerLinkMode iffalse .LinkedToFirstGen special CheckBothSelectedSameRoom iffalse .IncompatibleRooms writetext Text_PleaseComeIn2 waitbutton closetext - applymovement2 Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight + applymovementlasttalked Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsUp warpcheck end @@ -170,7 +170,7 @@ LinkReceptionistScript_Battle: .LinkTimedOut: writetext Text_LinkTimedOut - jump .AbortLink + sjump .AbortLink .DidNotSave: writetext Text_PleaseComeAgain @@ -213,7 +213,7 @@ LinkReceptionistScript_TimeCapsule: writetext Text_PleaseWait special CheckLinkTimeout iffalse .LinkTimedOut - copybytetovar wOtherPlayerLinkMode + readmem wOtherPlayerLinkMode iffalse .OK special CheckBothSelectedSameRoom writetext Text_IncompatibleRooms @@ -226,10 +226,10 @@ LinkReceptionistScript_TimeCapsule: writetext Text_PleaseComeIn2 waitbutton closetext - checkcode VAR_FACING + readvar VAR_FACING ifequal LEFT, .MaleFacingLeft ifequal RIGHT, .MaleFacingRight - applymovement2 Pokecenter2FMovementData_ReceptionistWalksLeft_LookRight + applymovementlasttalked Pokecenter2FMovementData_ReceptionistWalksLeft_LookRight applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsUp warpcheck end @@ -242,7 +242,7 @@ LinkReceptionistScript_TimeCapsule: .LinkTimedOut: writetext Text_LinkTimedOut - jump .Cancel + sjump .Cancel .DidNotSave: writetext Text_PleaseComeAgain @@ -267,13 +267,13 @@ LinkReceptionistScript_TimeCapsule: end .MaleFacingLeft: - applymovement2 Pokecenter2FMovementData_ReceptionistWalksLeft_LookRight + applymovementlasttalked Pokecenter2FMovementData_ReceptionistWalksLeft_LookRight applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesStepsLeftUp warpcheck end .MaleFacingRight: - applymovement2 Pokecenter2FMovementData_ReceptionistStepsRightLooksDown + applymovementlasttalked Pokecenter2FMovementData_ReceptionistStepsRightLooksDown applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesStepsRightUp warpcheck end diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index fbadc45f..66ad3a39 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -58,7 +58,7 @@ RadioTower1FLuckyNumberManScript: ifequal 1, .FirstPlace ifequal 2, .SecondPlace ifequal 3, .ThirdPlace - jump .NoPrize + sjump .NoPrize .GameOver: writetext UnknownText_0x5cf7e @@ -75,7 +75,7 @@ RadioTower1FLuckyNumberManScript: iffalse .BagFull itemnotify setflag ENGINE_LUCKY_NUMBER_SHOW - jump .GameOver + sjump .GameOver .SecondPlace: writetext UnknownText_0x5d023 @@ -86,7 +86,7 @@ RadioTower1FLuckyNumberManScript: iffalse .BagFull itemnotify setflag ENGINE_LUCKY_NUMBER_SHOW - jump .GameOver + sjump .GameOver .ThirdPlace: writetext UnknownText_0x5d076 @@ -97,7 +97,7 @@ RadioTower1FLuckyNumberManScript: iffalse .BagFull itemnotify setflag ENGINE_LUCKY_NUMBER_SHOW - jump .GameOver + sjump .GameOver .NoPrize: writetext UnknownText_0x5d0c0 @@ -146,7 +146,7 @@ RadioTower1FRadioCardWomanScript: waitsfx writetext UnknownText_0x5d37b promptbutton - stringtotext .RadioCardText, STRING_BUFFER_4 + getstring STRING_BUFFER_4, .RadioCardText scall .ReceiveItem writetext UnknownText_0x5d3c0 promptbutton diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 29f7e1ac..ad19c63f 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -129,7 +129,7 @@ RadioTower5FRocketBossScene: setscene SCENE_RADIOTOWER5F_NOTHING setevent EVENT_GOT_RAINBOW_WING setevent EVENT_TEAM_ROCKET_DISBANDED - jump .UselessJump + sjump .UselessJump .SilverWing verbosegiveitem SILVER_WING writetext RadioTower5FDirectorDescribeSilverWingText diff --git a/maps/Route16.asm b/maps/Route16.asm index ce0fc39c..9a00cc07 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -5,9 +5,9 @@ Route16_MapScripts: callback MAPCALLBACK_NEWMAP, .AlwaysOnBike .AlwaysOnBike: - checkcode VAR_YCOORD + readvar VAR_YCOORD ifless 5, .CanWalk - checkcode VAR_XCOORD + readvar VAR_XCOORD ifgreater 13, .CanWalk setflag ENGINE_ALWAYS_ON_BIKE return diff --git a/maps/Route26.asm b/maps/Route26.asm index b0bade82..00f3956a 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -40,7 +40,7 @@ TrainerCooltrainermGaven3: promptbutton setevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall .AskNumber2 @@ -48,9 +48,9 @@ TrainerCooltrainermGaven3: askforphonenumber PHONE_COOLTRAINERM_GAVEN ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext COOLTRAINERM, GAVEN3, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .WantsBattle: scall .Rematch @@ -134,7 +134,7 @@ TrainerCooltrainerfBeth1: promptbutton setevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall .AskNumber2 @@ -142,9 +142,9 @@ TrainerCooltrainerfBeth1: askforphonenumber PHONE_COOLTRAINERF_BETH ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext COOLTRAINERF, BETH1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .WantsBattle: scall .Rematch diff --git a/maps/Route27.asm b/maps/Route27.asm index 79153963..0ab76c2c 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -26,7 +26,7 @@ FirstStepIntoKantoLeftScene: turnobject ROUTE27_FISHER, LEFT showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 applymovement ROUTE27_FISHER, MovementData_0x1a0a66 - jump FirstStepIntoKantoScene_Continue + sjump FirstStepIntoKantoScene_Continue FirstStepIntoKantoRightScene: turnobject ROUTE27_FISHER, LEFT @@ -73,7 +73,7 @@ TrainerBirdKeeperJose2: promptbutton setevent EVENT_JOSE_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall .AskNumber2 @@ -81,9 +81,9 @@ TrainerBirdKeeperJose2: askforphonenumber PHONE_BIRDKEEPER_JOSE ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext BIRD_KEEPER, JOSE2, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .WantsBattle: scall .Rematch @@ -178,7 +178,7 @@ TrainerCooltrainerfReena: promptbutton setevent EVENT_REENA_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall .AskNumber2 @@ -186,9 +186,9 @@ TrainerCooltrainerfReena: askforphonenumber PHONE_COOLTRAINERF_REENA ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext COOLTRAINERF, REENA1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .WantsBattle: scall .Rematch diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 3a1990ed..9415e961 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -15,7 +15,7 @@ SandstormHouseWoman: writetext SandstormHouseWomanText1 promptbutton ifgreater 150 - 1, .Loyal - jump .Disloyal + sjump .Disloyal .Loyal: writetext SandstormHouseWomanLoyalText diff --git a/maps/Route29.asm b/maps/Route29.asm index 32820ddd..e5d97a65 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -31,7 +31,7 @@ Route29_MapScripts: return .DoesTuscanyAppear: - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal TUESDAY, .TuscanyDisappears appear ROUTE29_TUSCANY return @@ -105,7 +105,7 @@ Script_RefusedTutorial2: CatchingTutorialDudeScript: faceplayer opentext - checkcode VAR_BOXSPACE + readvar VAR_BOXSPACE ifequal 0, .BoxFull checkevent EVENT_LEARNED_TO_CATCH_POKEMON iftrue .BoxFull @@ -169,7 +169,7 @@ TuscanyScript: opentext checkevent EVENT_GOT_PINK_BOW_FROM_TUSCANY iftrue TuscanyTuesdayScript - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal TUESDAY, TuscanyNotTuesdayScript checkevent EVENT_MET_TUSCANY_OF_TUESDAY iftrue .MetTuscany diff --git a/maps/Route30.asm b/maps/Route30.asm index 2ae0b4b7..8a7834b0 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -52,7 +52,7 @@ TrainerYoungsterJoey: promptbutton setevent EVENT_JOEY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .RequestNumber + sjump .RequestNumber .AskAgain: scall .AskNumber2 @@ -60,9 +60,9 @@ TrainerYoungsterJoey: askforphonenumber PHONE_YOUNGSTER_JOEY ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext YOUNGSTER, JOEY1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .Rematch: scall .RematchStd diff --git a/maps/Route31.asm b/maps/Route31.asm index b9f789f4..18283726 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -38,7 +38,7 @@ TrainerBugCatcherWade1: waitbutton setevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER scall .AskPhoneNumberSTD - jump .Continue + sjump .Continue .AskAgain: scall .AskAgainSTD @@ -46,9 +46,9 @@ TrainerBugCatcherWade1: askforphonenumber PHONE_BUG_CATCHER_WADE ifequal PHONE_CONTACTS_FULL, .PhoneFullSTD ifequal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD - trainertotext BUG_CATCHER, WADE1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1 scall .RegisterNumberSTD - jump .AcceptedNumberSTD + sjump .AcceptedNumberSTD .WadeRematch: scall .RematchSTD diff --git a/maps/Route32.asm b/maps/Route32.asm index 2d4f1ce5..2378cd99 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -33,7 +33,7 @@ Route32_MapScripts: end .Frieda: - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal FRIDAY, .FriedaAppears disappear ROUTE32_FRIEDA return @@ -69,7 +69,7 @@ Route32CooltrainerMContinueScene: verbosegiveitem MIRACLE_SEED iffalse .BagFull setevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 - jump .GotMiracleSeed + sjump .GotMiracleSeed .DontHaveZephyrBadge: writetext Route32CooltrainerMText_VioletGym @@ -120,7 +120,7 @@ Route32RoarTMGuyScript: Route32WannaBuyASlowpokeTailScript: turnobject ROUTE32_FISHER4, DOWN turnobject PLAYER, UP - jump _OfferToSellSlowpokeTail + sjump _OfferToSellSlowpokeTail SlowpokeTailSalesmanScript: faceplayer @@ -179,7 +179,7 @@ TrainerFisherRalph1: promptbutton setevent EVENT_RALPH_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .AskForNumber + sjump .AskForNumber .AskAgain: scall .AskNumber2 @@ -187,9 +187,9 @@ TrainerFisherRalph1: askforphonenumber PHONE_FISHER_RALPH ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext FISHER, RALPH1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, FISHER, RALPH1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .Rematch: scall .RematchStd @@ -273,7 +273,7 @@ TrainerPicnickerLiz1: promptbutton setevent EVENT_LIZ_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .AskForNumber + sjump .AskForNumber .AskAgain: scall .AskNumber2 @@ -281,9 +281,9 @@ TrainerPicnickerLiz1: askforphonenumber PHONE_PICNICKER_LIZ ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext PICNICKER, LIZ1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, PICNICKER, LIZ1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .Rematch: scall .RematchStd @@ -378,7 +378,7 @@ FriedaScript: opentext checkevent EVENT_GOT_POISON_BARB_FROM_FRIEDA iftrue .Friday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal FRIDAY, .NotFriday checkevent EVENT_MET_FRIEDA_OF_FRIDAY iftrue .MetFrieda diff --git a/maps/Route33.asm b/maps/Route33.asm index ada3536a..8a9e8e33 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -24,7 +24,7 @@ TrainerHikerAnthony: promptbutton setevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .AskForPhoneNumber + sjump .AskForPhoneNumber .AskAgain: scall .AskNumber2 @@ -32,9 +32,9 @@ TrainerHikerAnthony: askforphonenumber PHONE_HIKER_ANTHONY ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext HIKER, ANTHONY2, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, HIKER, ANTHONY2 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .Rematch: scall .RematchStd diff --git a/maps/Route34.asm b/maps/Route34.asm index f8fdce62..3e9b8a08 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -24,22 +24,22 @@ Route34_MapScripts: iftrue .PutDayCareManOutside clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE setevent EVENT_DAY_CARE_MAN_ON_ROUTE_34 - jump .CheckMon1 + sjump .CheckMon1 .PutDayCareManOutside: setevent EVENT_DAY_CARE_MAN_IN_DAY_CARE clearevent EVENT_DAY_CARE_MAN_ON_ROUTE_34 - jump .CheckMon1 + sjump .CheckMon1 .CheckMon1: checkflag ENGINE_DAY_CARE_MAN_HAS_MON iffalse .HideMon1 clearevent EVENT_DAY_CARE_MON_1 - jump .CheckMon2 + sjump .CheckMon2 .HideMon1: setevent EVENT_DAY_CARE_MON_1 - jump .CheckMon2 + sjump .CheckMon2 .CheckMon2: checkflag ENGINE_DAY_CARE_LADY_HAS_MON @@ -59,7 +59,7 @@ DayCareManScript_Outside: closetext ifequal TRUE, .end_fail clearflag ENGINE_DAY_CARE_MAN_HAS_EGG - checkcode VAR_FACING + readvar VAR_FACING ifequal RIGHT, .walk_around_player applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside playsound SFX_ENTER_DOOR @@ -101,7 +101,7 @@ TrainerCamperTodd1: promptbutton setevent EVENT_TODD_ASKED_FOR_PHONE_NUMBER scall .AskNumber - jump .FinishAsk + sjump .FinishAsk .AskAgain: scall .AskNumber2 @@ -109,9 +109,9 @@ TrainerCamperTodd1: askforphonenumber PHONE_CAMPER_TODD ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext CAMPER, TODD1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, CAMPER, TODD1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .Rematch: scall .RematchStd @@ -184,7 +184,7 @@ TrainerPicnickerGina1: promptbutton setevent EVENT_GINA_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .FinishAsk + sjump .FinishAsk .AskAgain: scall .AskNumber2 @@ -192,9 +192,9 @@ TrainerPicnickerGina1: askforphonenumber PHONE_PICNICKER_GINA ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext PICNICKER, GINA1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, PICNICKER, GINA1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .Rematch: scall .RematchStd diff --git a/maps/Route35.asm b/maps/Route35.asm index 8babafa0..5301a709 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -43,7 +43,7 @@ TrainerJugglerIrwin: promptbutton setevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER scall Route35AskNumber1M - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall Route35AskNumber2M @@ -51,9 +51,9 @@ TrainerJugglerIrwin: askforphonenumber PHONE_JUGGLER_IRWIN ifequal PHONE_CONTACTS_FULL, Route35PhoneFullM ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM - trainertotext JUGGLER, IRWIN1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, JUGGLER, IRWIN1 scall Route35RegisteredNumberM - jump Route35NumberAcceptedM + sjump Route35NumberAcceptedM .WantsBattle: scall Route35RematchM @@ -170,7 +170,7 @@ TrainerBugCatcherArnie: promptbutton setevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER scall Route35AskNumber1M - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall Route35AskNumber2M @@ -178,9 +178,9 @@ TrainerBugCatcherArnie: askforphonenumber PHONE_BUG_CATCHER_ARNIE ifequal PHONE_CONTACTS_FULL, Route35PhoneFullM ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM - trainertotext BUG_CATCHER, ARNIE1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1 scall Route35RegisteredNumberM - jump Route35NumberAcceptedM + sjump Route35NumberAcceptedM .WantsBattle: scall Route35RematchM diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 47768768..00b33f0a 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -23,7 +23,7 @@ RandyScript: writetext UnknownText_0x69e48 promptbutton waitsfx - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, .partyfull writetext UnknownText_0x69eb8 playsound SFX_KEY_ITEM diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index aed30ee9..435e48ce 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -20,7 +20,7 @@ Route35NationalParkGate_MapScripts: end .LeaveContestEarly: - priorityjump .LeavingContestEarly + prioritysjump .LeavingContestEarly end .CheckIfContestRunning: @@ -34,7 +34,7 @@ Route35NationalParkGate_MapScripts: return .CheckIfContestAvailable: - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal TUESDAY, .SetContestOfficer ifequal THURSDAY, .SetContestOfficer ifequal SATURDAY, .SetContestOfficer @@ -55,9 +55,9 @@ Route35NationalParkGate_MapScripts: applymovement PLAYER, MovementData_0x6a2e2 turnobject ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT opentext - checkcode VAR_CONTESTMINUTES - addvar 1 - vartomem STRING_BUFFER_3 + readvar VAR_CONTESTMINUTES + addval 1 + getnum STRING_BUFFER_3 writetext UnknownText_0x6a79a yesorno iffalse .GoBackToContest @@ -78,7 +78,7 @@ Route35NationalParkGate_MapScripts: end Route35OfficerScriptContest: - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal SUNDAY, Route35NationalParkGate_NoContestToday ifequal MONDAY, Route35NationalParkGate_NoContestToday ifequal WEDNESDAY, Route35NationalParkGate_NoContestToday @@ -91,7 +91,7 @@ Route35OfficerScriptContest: writetext UnknownText_0x6a2eb yesorno iffalse Route35NationalParkGate_DeclinedToParticipate - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifgreater 1, Route35NationalParkGate_LeaveTheRestBehind special ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER @@ -116,7 +116,7 @@ Route35NationalParkGate_OkayToProceed: end Route35NationalParkGate_EnterContest: - checkcode VAR_FACING + readvar VAR_FACING ifequal LEFT, Route35NationalParkGate_FacingLeft applymovement PLAYER, MovementData_0x6a2e5 end @@ -126,9 +126,9 @@ Route35NationalParkGate_FacingLeft: end Route35NationalParkGate_LeaveTheRestBehind: - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifless PARTY_LENGTH, Route35NationalParkGate_LessThanFullParty - checkcode VAR_BOXSPACE + readvar VAR_BOXSPACE ifequal 0, Route35NationalParkGate_NoRoomInBox Route35NationalParkGate_LessThanFullParty: @@ -146,7 +146,7 @@ Route35NationalParkGate_LessThanFullParty: playsound SFX_GOT_SAFARI_BALLS waitsfx promptbutton - jump Route35NationalParkGate_OkayToProceed + sjump Route35NationalParkGate_OkayToProceed Route35NationalParkGate_DeclinedToParticipate: writetext UnknownText_0x6a5dc diff --git a/maps/Route36.asm b/maps/Route36.asm index b3b8a8ef..7700c5ef 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -14,7 +14,7 @@ Route36_MapScripts: callback MAPCALLBACK_OBJECTS, .ArthurCallback .ArthurCallback: - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal THURSDAY, .ArthurAppears disappear ROUTE36_ARTHUR return @@ -128,7 +128,7 @@ TrainerSchoolboyAlan1: promptbutton setevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .ContinueAskForPhoneNumber + sjump .ContinueAskForPhoneNumber .AskAgainForPhoneNumber: scall .AskNumber2 @@ -136,9 +136,9 @@ TrainerSchoolboyAlan1: askforphonenumber PHONE_SCHOOLBOY_ALAN ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext SCHOOLBOY, ALAN1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .ChooseRematch: scall .Rematch @@ -211,7 +211,7 @@ ArthurScript: opentext checkevent EVENT_GOT_HARD_STONE_FROM_ARTHUR iftrue .AlreadyGotStone - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal THURSDAY, ArthurNotThursdayScript checkevent EVENT_MET_ARTHUR_OF_THURSDAY iftrue .MetArthur diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index d7b77429..00da020c 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -29,7 +29,7 @@ Route36NationalParkGate_MapScripts: end .LeaveContestEarly: - priorityjump .LeavingContestEarly + prioritysjump .LeavingContestEarly end .CheckIfContestRunning: @@ -45,7 +45,7 @@ Route36NationalParkGate_MapScripts: .CheckIfContestAvailable: checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE iftrue .Return - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal TUESDAY, .SetContestOfficer ifequal THURSDAY, .SetContestOfficer ifequal SATURDAY, .SetContestOfficer @@ -64,9 +64,9 @@ Route36NationalParkGate_MapScripts: .LeavingContestEarly: turnobject PLAYER, UP opentext - checkcode VAR_CONTESTMINUTES - addvar 1 - vartomem STRING_BUFFER_3 + readvar VAR_CONTESTMINUTES + addval 1 + getnum STRING_BUFFER_3 writetext UnknownText_0x6b284 yesorno iffalse .GoBackToContest @@ -139,7 +139,7 @@ Route36NationalParkGate_MapScripts: end Route36OfficerScriptContest: - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal SUNDAY, _ContestNotOn ifequal MONDAY, _ContestNotOn ifequal WEDNESDAY, _ContestNotOn @@ -152,7 +152,7 @@ Route36OfficerScriptContest: writetext UnknownText_0x6add5 yesorno iffalse .DecidedNotToJoinContest - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifgreater 1, .LeaveMonsWithOfficer special ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER @@ -179,9 +179,9 @@ Route36OfficerScriptContest: end .LeaveMonsWithOfficer: - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifless PARTY_LENGTH, .ContinueLeavingMons - checkcode VAR_BOXSPACE + readvar VAR_BOXSPACE ifequal 0, .BoxFull .ContinueLeavingMons: special CheckFirstMonIsEgg @@ -198,7 +198,7 @@ Route36OfficerScriptContest: playsound SFX_GOT_SAFARI_BALLS waitsfx promptbutton - jump .ResumeStartingContest + sjump .ResumeStartingContest .DecidedNotToJoinContest: writetext UnknownText_0x6b0c6 diff --git a/maps/Route37.asm b/maps/Route37.asm index 0131d174..0c7c8778 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -14,7 +14,7 @@ Route37_MapScripts: callback MAPCALLBACK_OBJECTS, .Sunny .Sunny: - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal SUNDAY, .SunnyAppears disappear ROUTE37_SUNNY return @@ -61,7 +61,7 @@ SunnyScript: opentext checkevent EVENT_GOT_MAGNET_FROM_SUNNY iftrue SunnySundayScript - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal SUNDAY, SunnyNotSundayScript checkevent EVENT_MET_SUNNY_OF_SUNDAY iftrue .MetSunny diff --git a/maps/Route38.asm b/maps/Route38.asm index fec0f4e6..4675464d 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -50,7 +50,7 @@ TrainerLassDana1: promptbutton setevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER scall .AskNumber1F - jump .AskForPhoneNumber + sjump .AskForPhoneNumber .SecondTimeAsking: scall .AskNumber2F @@ -58,9 +58,9 @@ TrainerLassDana1: askforphonenumber PHONE_LASS_DANA ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber - trainertotext LASS, DANA1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, LASS, DANA1 scall .RegisteredPhoneNumber - jump .NumberAccepted + sjump .NumberAccepted .DanaRematch: scall .Rematch @@ -133,7 +133,7 @@ TrainerSchoolboyChad1: promptbutton setevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER scall .AskPhoneNumber1 - jump .AskToRegisterNumber + sjump .AskToRegisterNumber .SecondTimeAsking: scall .AskPhoneNumber2 @@ -141,9 +141,9 @@ TrainerSchoolboyChad1: askforphonenumber PHONE_SCHOOLBOY_CHAD ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .SaidNo - trainertotext SCHOOLBOY, CHAD1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1 scall .RegisteredChad - jump .HaveChadsNumber + sjump .HaveChadsNumber .ChadRematch: scall .Rematch diff --git a/maps/Route39.asm b/maps/Route39.asm index a29445ac..b7d15425 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -39,7 +39,7 @@ TrainerPokefanmDerek: promptbutton setevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall .AskNumber2 @@ -47,9 +47,9 @@ TrainerPokefanmDerek: askforphonenumber PHONE_POKEFANM_DEREK ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext POKEFANM, DEREK1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, POKEFANM, DEREK1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .WantsBattle: scall .Rematch diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 7e45f578..1b558a50 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -49,7 +49,7 @@ MoomooScript: checkevent EVENT_HEALED_MOOMOO iftrue .HappyCow writetext MoomooWeakMooText - writebyte MILTANK + setval MILTANK special PlaySlowCry promptbutton writetext Route39BarnItsCryIsWeakText @@ -67,9 +67,9 @@ MoomooScript: checkitem BERRY iffalse .NoBerriesInBag takeitem BERRY - copybytetovar wMooMooBerries - addvar 1 - copyvartobyte wMooMooBerries + readmem wMooMooBerries + addval 1 + writemem wMooMooBerries ifequal 3, .ThreeBerries ifequal 5, .FiveBerries ifequal 7, .SevenBerries diff --git a/maps/Route40.asm b/maps/Route40.asm index b988de9a..dc87cca4 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -19,7 +19,7 @@ Route40_MapScripts: callback MAPCALLBACK_OBJECTS, .MonicaCallback .MonicaCallback: - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal MONDAY, .MonicaAppears disappear ROUTE40_MONICA return @@ -80,7 +80,7 @@ MonicaScript: opentext checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA iftrue .Monday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal MONDAY, .NotMonday checkevent EVENT_MET_MONICA_OF_MONDAY iftrue .MetMonica diff --git a/maps/Route42.asm b/maps/Route42.asm index 4733bf58..1477d33e 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -30,7 +30,7 @@ TrainerFisherChris: promptbutton setevent EVENT_CHRIS_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall .AskNumber2 @@ -38,9 +38,9 @@ TrainerFisherChris: askforphonenumber PHONE_FISHER_CHRIS ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext FISHER, CHRIS1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, FISHER, CHRIS1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .WantsBattle: scall .Rematch diff --git a/maps/Route43.asm b/maps/Route43.asm index bfce5669..c237679e 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -62,7 +62,7 @@ TrainerPokemaniacBrent: promptbutton setevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall .AskNumber2 @@ -70,9 +70,9 @@ TrainerPokemaniacBrent: askforphonenumber PHONE_POKEMANIAC_BRENT ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext POKEMANIAC, BRENT1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .WantsBattle: scall .Rematch @@ -167,7 +167,7 @@ TrainerPicnickerTiffany: promptbutton setevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall .AskNumber2 @@ -175,9 +175,9 @@ TrainerPicnickerTiffany: askforphonenumber PHONE_PICNICKER_TIFFANY ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext PICNICKER, TIFFANY3, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .WantsBattle: scall .Rematch diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index dbccf93b..5a949eee 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -14,7 +14,7 @@ Route43Gate_MapScripts: callback MAPCALLBACK_NEWMAP, .CheckIfRockets .RocketShakedown: - priorityjump .RocketTakeover + prioritysjump .RocketTakeover end .DummyScene: @@ -32,7 +32,7 @@ Route43Gate_MapScripts: .RocketTakeover: playmusic MUSIC_ROCKET_ENCOUNTER - checkcode VAR_FACING + readvar VAR_FACING ifequal DOWN, RocketScript_Southbound ifequal UP, RocketScript_Northbound setscene SCENE_FINISHED @@ -50,17 +50,17 @@ RocketScript_Southbound: promptbutton checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1 ifequal HAVE_MORE, RocketScript_TollSouth - jump RocketScript_YoureBrokeSouth + sjump RocketScript_YoureBrokeSouth RocketScript_TollSouth: takemoney YOUR_MONEY, ROUTE43GATE_TOLL writetext RocketText_ThankYou - jump RocketScript_ShakeDownSouth + sjump RocketScript_ShakeDownSouth RocketScript_YoureBrokeSouth: takemoney YOUR_MONEY, ROUTE43GATE_TOLL writetext RocketText_AllYouGot - jump RocketScript_ShakeDownSouth + sjump RocketScript_ShakeDownSouth RocketScript_ShakeDownSouth: promptbutton @@ -82,17 +82,17 @@ RocketScript_Northbound: promptbutton checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1 ifequal HAVE_MORE, RocketScript_TollNorth - jump RocketScript_YoureBrokeNorth + sjump RocketScript_YoureBrokeNorth RocketScript_TollNorth: takemoney YOUR_MONEY, ROUTE43GATE_TOLL writetext RocketText_ThankYou - jump RocketScript_ShakeDownNorth + sjump RocketScript_ShakeDownNorth RocketScript_YoureBrokeNorth: takemoney YOUR_MONEY, ROUTE43GATE_TOLL writetext RocketText_AllYouGot - jump RocketScript_ShakeDownNorth + sjump RocketScript_ShakeDownNorth RocketScript_ShakeDownNorth: promptbutton diff --git a/maps/Route44.asm b/maps/Route44.asm index ef43ed51..f302429f 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -32,7 +32,7 @@ TrainerBirdKeeperVance1: promptbutton setevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER scall Route44AskNumber1M - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall Route44AskNumber2M @@ -40,9 +40,9 @@ TrainerBirdKeeperVance1: askforphonenumber PHONE_BIRDKEEPER_VANCE ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM - trainertotext BIRD_KEEPER, VANCE1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1 scall Route44RegisteredNumberM - jump Route44NumberAcceptedM + sjump Route44NumberAcceptedM .WantsBattle: scall Route44RematchM @@ -126,7 +126,7 @@ TrainerFisherWilton1: promptbutton setevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER scall Route44AskNumber1M - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall Route44AskNumber2M @@ -134,9 +134,9 @@ TrainerFisherWilton1: askforphonenumber PHONE_FISHER_WILTON ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM - trainertotext FISHER, WILTON1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, FISHER, WILTON1 scall Route44RegisteredNumberM - jump Route44NumberAcceptedM + sjump Route44NumberAcceptedM .WantsBattle: scall Route44RematchM diff --git a/maps/Route45.asm b/maps/Route45.asm index 477dfb6c..dfa57687 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -34,7 +34,7 @@ TrainerBlackbeltKenji: waitbutton setevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER scall Route45AskNumber1M - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall Route45AskNumber2M @@ -42,9 +42,9 @@ TrainerBlackbeltKenji: askforphonenumber PHONE_BLACKBELT_KENJI ifequal PHONE_CONTACTS_FULL, Route45PhoneFullM ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM - trainertotext BLACKBELT_T, KENJI3, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI3 scall Route45RegisteredNumberM - jump Route45NumberAcceptedM + sjump Route45NumberAcceptedM .WantsBattle: scall Route45RematchM @@ -139,7 +139,7 @@ TrainerHikerParry: promptbutton setevent EVENT_PARRY_ASKED_FOR_PHONE_NUMBER scall Route45AskNumber1M - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall Route45AskNumber2M @@ -147,9 +147,9 @@ TrainerHikerParry: askforphonenumber PHONE_HIKER_PARRY ifequal PHONE_CONTACTS_FULL, Route45PhoneFullM ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM - trainertotext HIKER, PARRY1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, HIKER, PARRY1 scall Route45RegisteredNumberM - jump Route45NumberAcceptedM + sjump Route45NumberAcceptedM .WantsBattle: scall Route45RematchM diff --git a/maps/Route46.asm b/maps/Route46.asm index e4ac8d94..8e2d0383 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -38,7 +38,7 @@ TrainerPicnickerErin1: promptbutton setevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER scall Route46AskNumber1F - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall Route46AskNumber2F @@ -46,9 +46,9 @@ TrainerPicnickerErin1: askforphonenumber PHONE_PICNICKER_ERIN ifequal PHONE_CONTACTS_FULL, Route46PhoneFullF ifequal PHONE_CONTACT_REFUSED, Route46NumberDeclinedF - trainertotext PICNICKER, ERIN1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, PICNICKER, ERIN1 scall Route46RegisteredNumberF - jump Route46NumberAcceptedF + sjump Route46NumberAcceptedF .WantsBattle: scall Route46RematchF diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index a257fada..f795b272 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -16,7 +16,7 @@ RuinsOfAlphAerodactylChamber_MapScripts: RuinsOfAlphAerodactylChamberPuzzle: refreshscreen - writebyte UNOWNPUZZLE_AERODACTYL + setval UNOWNPUZZLE_AERODACTYL special UnownPuzzle closetext iftrue .PuzzleComplete diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index e133e2f6..57b13100 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -16,7 +16,7 @@ RuinsOfAlphHoOhChamber_MapScripts: RuinsOfAlphHoOhChamberPuzzle: refreshscreen - writebyte UNOWNPUZZLE_HO_OH + setval UNOWNPUZZLE_HO_OH special UnownPuzzle closetext iftrue .PuzzleComplete diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index fd7f7074..04b327be 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -14,7 +14,7 @@ RuinsOfAlphInnerChamber_MapScripts: end .UnownAppear: - priorityjump .StrangePresenceScript + prioritysjump .StrangePresenceScript end .StrangePresenceScript: diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index dca455e7..23a82575 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -23,7 +23,7 @@ RuinsOfAlphKabutoChamberHiddenDoors: RuinsOfAlphKabutoChamberPuzzle: refreshscreen - writebyte UNOWNPUZZLE_KABUTO + setval UNOWNPUZZLE_KABUTO special UnownPuzzle closetext iftrue .PuzzleComplete diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 6ea0a8c1..fc8bf60f 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -16,7 +16,7 @@ RuinsOfAlphOmanyteChamber_MapScripts: RuinsOfAlphOmanyteChamberPuzzle: refreshscreen - writebyte UNOWNPUZZLE_OMANYTE + setval UNOWNPUZZLE_OMANYTE special UnownPuzzle closetext iftrue .PuzzleComplete diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 4b098adc..32e52bd6 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -24,12 +24,12 @@ RuinsOfAlphOutside_MapScripts: iftrue .NoScientist checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue .MaybeScientist - jump .NoScientist + sjump .NoScientist .MaybeScientist: - checkcode VAR_UNOWNCOUNT + readvar VAR_UNOWNCOUNT ifgreater 2, .YesScientist - jump .NoScientist + sjump .NoScientist .YesScientist: appear RUINSOFALPHOUTSIDE_SCIENTIST @@ -44,12 +44,12 @@ RuinsOfAlphOutside_MapScripts: RuinsOfAlphOutsideScientistScene1: turnobject RUINSOFALPHOUTSIDE_SCIENTIST, UP turnobject PLAYER, DOWN - jump RuinsOfAlphOutsideScientistSceneContinue + sjump RuinsOfAlphOutsideScientistSceneContinue RuinsOfAlphOutsideScientistScene2: turnobject RUINSOFALPHOUTSIDE_SCIENTIST, LEFT turnobject PLAYER, RIGHT - jump RuinsOfAlphOutsideScientistSceneContinue + sjump RuinsOfAlphOutsideScientistSceneContinue RuinsOfAlphOutsideScientistScript: faceplayer diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 363e6809..1e4df3f3 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -15,7 +15,7 @@ RuinsOfAlphResearchCenter_MapScripts: end .GetUnownDex: - priorityjump .GetUnownDexScript + prioritysjump .GetUnownDexScript end .ScientistCallback: @@ -60,7 +60,7 @@ RuinsOfAlphResearchCenter_MapScripts: RuinsOfAlphResearchCenterScientist3Script: faceplayer opentext - checkcode VAR_UNOWNCOUNT + readvar VAR_UNOWNCOUNT ifequal NUM_UNOWN, .PrinterAvailable writetext RuinsOfAlphResearchCenterScientist3Text waitbutton @@ -117,7 +117,7 @@ RuinsOfAlphResearchCenterComputer: opentext checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue .SkipChecking - checkcode VAR_UNOWNCOUNT + readvar VAR_UNOWNCOUNT ifequal NUM_UNOWN, .FullUnownDex .SkipChecking: writetext RuinsOfAlphResearchCenterComputerText @@ -134,7 +134,7 @@ RuinsOfAlphResearchCenterPrinter: opentext checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue .SkipChecking - checkcode VAR_UNOWNCOUNT + readvar VAR_UNOWNCOUNT ifequal NUM_UNOWN, .PrinterAvailable .SkipChecking: writetext RuinsOfAlphResearchCenterPrinterText_DoesntWork diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 5e2e0674..3fd5578b 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -109,7 +109,7 @@ SaffronGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext SABRINA, SABRINA1, STRING_BUFFER_4 + gettrainername STRING_BUFFER_4, SABRINA, SABRINA1 jumpstd gymstatue2 UnknownText_0x189cdf: diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index c8823fe0..8744675e 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -34,7 +34,7 @@ SaffronMagnetTrainStationOfficerScript: closetext applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f applymovement PLAYER, MovementData_0x18a898 - writebyte TRUE + setval TRUE special MagnetTrain warpcheck newloadmap MAPSETUP_TRAIN diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index edf6134c..40a45fb0 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -450,7 +450,7 @@ VoltorbExplodingTrap: cry VOLTORB special FadeInPalettes setlasttalked -1 - writecode VAR_BATTLETYPE, BATTLETYPE_TRAP + loadvar VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon VOLTORB, 23 startbattle end @@ -460,7 +460,7 @@ GeodudeExplodingTrap: cry GEODUDE special FadeInPalettes setlasttalked -1 - writecode VAR_BATTLETYPE, BATTLETYPE_TRAP + loadvar VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon GEODUDE, 21 startbattle end @@ -470,7 +470,7 @@ KoffingExplodingTrap: cry KOFFING special FadeInPalettes setlasttalked -1 - writecode VAR_BATTLETYPE, BATTLETYPE_TRAP + loadvar VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon KOFFING, 21 startbattle end diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 63a0ecfa..9dbc2820 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -47,7 +47,7 @@ TeamRocketBaseB2F_MapScripts: RocketBaseBossFLeft: moveobject TEAMROCKETBASEB2F_LANCE, 9, 13 - jump RocketBaseBossFScript + sjump RocketBaseBossFScript RocketBaseBossFRight: moveobject TEAMROCKETBASEB2F_ROCKET_GIRL, 21, 16 @@ -154,7 +154,7 @@ RocketBaseLancesSideScript: LanceHealsScript1: turnobject PLAYER, UP - jump LanceHealsCommon + sjump LanceHealsCommon LanceHealsScript2: turnobject PLAYER, RIGHT @@ -174,7 +174,7 @@ LanceHealsCommon: closetext setscene SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE - checkcode VAR_FACING + readvar VAR_FACING ifequal RIGHT, .FacingRight applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d212 disappear TEAMROCKETBASEB2F_LANCE @@ -234,7 +234,7 @@ RocketElectrode1: reloadmapafterbattle special PlayMapMusic applymovement PLAYER, MovementData_0x6d28c - jump RocketBaseElectrodeScript + sjump RocketBaseElectrodeScript RocketElectrode2: cry ELECTRODE @@ -252,7 +252,7 @@ RocketElectrode2: reloadmapafterbattle special PlayMapMusic applymovement PLAYER, MovementData_0x6d299 - jump RocketBaseElectrodeScript + sjump RocketBaseElectrodeScript RocketElectrode3: cry ELECTRODE @@ -270,7 +270,7 @@ RocketElectrode3: reloadmapafterbattle special PlayMapMusic applymovement PLAYER, MovementData_0x6d2a4 - jump RocketBaseElectrodeScript + sjump RocketBaseElectrodeScript TeamRocketBaseB2FReloadMap: reloadmapafterbattle diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 62b51485..d5493f85 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -25,7 +25,7 @@ TeamRocketBaseB3F_MapScripts: callback MAPCALLBACK_TILES, .CheckGiovanniDoor .LanceGetsPassword: - priorityjump LanceGetPasswordScript + prioritysjump LanceGetPasswordScript end .DummyScene1: @@ -86,7 +86,7 @@ TeamRocketBaseB3FRocketScript: RocketBaseBossLeft: applymovement PLAYER, MovementData_0x6e133 - jump RocketBaseBoss + sjump RocketBaseBoss RocketBaseBossRight: applymovement PLAYER, MovementData_0x6e13a @@ -180,7 +180,7 @@ TeamRocketBaseB3FLockedDoor: iffalse .NeedsPassword checkevent EVENT_LEARNED_RATICATE_TAIL iffalse .NeedsPassword - jump .OpenSesame + sjump .OpenSesame .NeedsPassword: writetext TeamRocketBaseB3FLockedDoorNeedsPasswordText diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 502312c9..b0fd42df 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -11,7 +11,7 @@ TimeCapsule_MapScripts: callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTimeCapsule: - priorityjump .InitializeAndPreparePokecenter2F + prioritysjump .InitializeAndPreparePokecenter2F end .DummyScene: diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 8a10e88a..2bfbaf9a 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -12,7 +12,7 @@ TinTowerRoof_MapScripts: iftrue .NoAppear checkitem RAINBOW_WING iftrue .Appear - jump .NoAppear + sjump .NoAppear .Appear: appear TINTOWERROOF_HO_OH @@ -32,7 +32,7 @@ TinTowerHoOh: setevent EVENT_FOUGHT_HO_OH checkver iftrue .Silver - writecode VAR_BATTLETYPE, BATTLETYPE_FORCEITEM + loadvar VAR_BATTLETYPE, BATTLETYPE_FORCEITEM loadwildmon HO_OH, 40 startbattle disappear TINTOWERROOF_HO_OH @@ -40,7 +40,7 @@ TinTowerHoOh: end .Silver: - writecode VAR_BATTLETYPE, BATTLETYPE_FORCEITEM + loadvar VAR_BATTLETYPE, BATTLETYPE_FORCEITEM loadwildmon HO_OH, 70 startbattle disappear TINTOWERROOF_HO_OH diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 51501c5b..6dc1983f 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -11,7 +11,7 @@ TradeCenter_MapScripts: callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTradeCenter: - priorityjump .InitializeAndPreparePokecenter2F + prioritysjump .InitializeAndPreparePokecenter2F end .DummyScene: diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 0c7ef06e..072e51cb 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -20,11 +20,11 @@ TrainerHouseReceptionistScript: promptbutton special TrainerHouse iffalse .GetCal3Name - trainertotext CAL, CAL2, STRING_BUFFER_3 - jump .GotName + gettrainername STRING_BUFFER_3, CAL, CAL2 + sjump .GotName .GetCal3Name: - trainertotext CAL, CAL3, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, CAL, CAL3 .GotName: writetext TrainerHouseB1FYourOpponentIsText promptbutton diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index e5e87401..a33c5416 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -15,7 +15,7 @@ UnionCaveB2F_MapScripts: .Lapras: checkflag ENGINE_UNION_CAVE_LAPRAS iftrue .NoAppear - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal FRIDAY, .Appear .NoAppear: disappear UNIONCAVEB2F_LAPRAS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index f08379d6..52aedf1f 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -52,7 +52,7 @@ VermilionSnorlax: pause 15 cry SNORLAX closetext - writecode VAR_BATTLETYPE, BATTLETYPE_FORCEITEM + loadvar VAR_BATTLETYPE, BATTLETYPE_FORCEITEM loadwildmon SNORLAX, 50 startbattle disappear VERMILIONCITY_BIG_SNORLAX @@ -65,7 +65,7 @@ VermilionGymBadgeGuy: opentext checkevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY iftrue .AlreadyGotItem - checkcode VAR_BADGES + readvar VAR_BADGES ifequal NUM_BADGES, .AllBadges ifgreater 13, .MostBadges ifgreater 9, .SomeBadges diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 992d8fb6..7a5830dd 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -99,7 +99,7 @@ VermilionGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext LT_SURGE, LT_SURGE1, STRING_BUFFER_4 + gettrainername STRING_BUFFER_4, LT_SURGE, LT_SURGE1 jumpstd gymstatue2 LtSurgeIntroText: diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index e4b3ee12..5da38619 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -15,7 +15,7 @@ VermilionPort_MapScripts: end .LeaveFastShip: - priorityjump .LeaveFastShipScript + prioritysjump .LeaveFastShipScript end .FlyPoint: @@ -84,7 +84,7 @@ VermilionPortWalkUpToShipScript: iftrue .skip turnobject PLAYER, LEFT opentext - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal MONDAY, .NextShipWednesday ifequal TUESDAY, .NextShipWednesday ifequal THURSDAY, .NextShipSunday @@ -102,7 +102,7 @@ VermilionPortWalkUpToShipScript: closetext setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 applymovement PLAYER, MovementData_0x74ef8 - jump VermilionPortSailorAtGangwayScript + sjump VermilionPortSailorAtGangwayScript .NoTicket: writetext UnknownText_0x74ff2 @@ -146,7 +146,7 @@ VermilionPortSailorScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue VermilionPortAlreadyRodeScript - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal MONDAY, .NextShipWednesday ifequal TUESDAY, .NextShipWednesday ifequal THURSDAY, .NextShipSunday @@ -164,7 +164,7 @@ VermilionPortSailorScript: closetext setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 applymovement PLAYER, MovementData_0x74efe - jump VermilionPortSailorAtGangwayScript + sjump VermilionPortSailorAtGangwayScript .NoTicket: writetext UnknownText_0x74ff2 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 448db78d..ac300930 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -66,7 +66,7 @@ VictoryRoadRivalNext: startbattle dontrestartmapmusic reloadmapafterbattle - jump .AfterBattle + sjump .AfterBattle .GotTotodile: winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText @@ -75,7 +75,7 @@ VictoryRoadRivalNext: startbattle dontrestartmapmusic reloadmapafterbattle - jump .AfterBattle + sjump .AfterBattle .GotChikorita: winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText @@ -84,7 +84,7 @@ VictoryRoadRivalNext: startbattle dontrestartmapmusic reloadmapafterbattle - jump .AfterBattle + sjump .AfterBattle .AfterBattle: playmusic MUSIC_RIVAL_AFTER diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index c04344fe..940280ff 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -18,7 +18,7 @@ VictoryRoadGate_MapScripts: VictoryRoadGateBadgeCheckScene: turnobject PLAYER, LEFT - jump VictoryRoadGateBadgeCheckScript + sjump VictoryRoadGateBadgeCheckScript VictoryRoadGateOfficerScript: faceplayer @@ -26,7 +26,7 @@ VictoryRoadGateBadgeCheckScript: opentext writetext VictoryRoadGateOfficerText promptbutton - checkcode VAR_BADGES + readvar VAR_BADGES ifgreater NUM_JOHTO_BADGES - 1, .AllEightBadges writetext VictoryRoadGateNotEnoughBadgesText waitbutton diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 966d1f4a..cce516cd 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -25,7 +25,7 @@ VioletCityEarlScript: writetext Text_EarlAsksIfYouBeatFalkner yesorno iffalse .FollowEarl - jump .PointlessJump + sjump .PointlessJump .PointlessJump: writetext Text_VeryNiceIndeed diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 18f0dca3..49b41789 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -27,7 +27,7 @@ VioletGymFalknerScript: playsound SFX_GET_BADGE waitsfx setflag ENGINE_ZEPHYRBADGE - checkcode VAR_BADGES + readvar VAR_BADGES scall VioletGymActivateRockets .FightDone: checkevent EVENT_GOT_TM31_MUD_SLAP @@ -107,7 +107,7 @@ VioletGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext FALKNER, FALKNER1, STRING_BUFFER_4 + gettrainername STRING_BUFFER_4, FALKNER, FALKNER1 jumpstd gymstatue2 FalknerIntroText: diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 8895a987..a8e5723e 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -22,10 +22,10 @@ VioletPokecenter1F_ElmsAideScript: .AskTakeEgg: yesorno iffalse .RefusedEgg - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, .PartyFull giveegg TOGEPI, 5 - stringtotext .eggname, STRING_BUFFER_4 + getstring STRING_BUFFER_4, .eggname scall .AideGivesEgg setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE clearevent EVENT_ELMS_AIDE_IN_LAB @@ -34,7 +34,7 @@ VioletPokecenter1F_ElmsAideScript: writetext UnknownText_0x695c5 waitbutton closetext - checkcode VAR_FACING + readvar VAR_FACING ifequal UP, .AideWalksAroundPlayer turnobject PLAYER, DOWN applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksStraightOutOfPokecenter @@ -74,7 +74,7 @@ VioletPokecenter1F_ElmsAideScript: .SecondTimeAsking: writetext UnknownText_0x69712 - jump .AskTakeEgg + sjump .AskTakeEgg VioletPokecenter1FGameboyKidScript: jumptextfaceplayer VioletPokecenter1FGameboyKidText diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index f3ae1b8a..90e5a40b 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -58,7 +58,7 @@ ViridianGymStatue: jumpstd gymstatue1 .Beaten: - trainertotext BLUE, BLUE1, STRING_BUFFER_4 + gettrainername STRING_BUFFER_4, BLUE, BLUE1 jumpstd gymstatue2 LeaderBlueBeforeText: diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 19c21331..a97fb888 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -12,7 +12,7 @@ WhirlIslandLugiaChamber_MapScripts: iftrue .NoAppear checkitem SILVER_WING iftrue .Appear - jump .NoAppear + sjump .NoAppear .Appear: appear WHIRLISLANDLUGIACHAMBER_LUGIA @@ -33,7 +33,7 @@ Lugia: checkver iftrue .Silver - writecode VAR_BATTLETYPE, BATTLETYPE_FORCEITEM + loadvar VAR_BATTLETYPE, BATTLETYPE_FORCEITEM loadwildmon LUGIA, 70 startbattle disappear WHIRLISLANDLUGIACHAMBER_LUGIA @@ -41,7 +41,7 @@ Lugia: end .Silver: - writecode VAR_BATTLETYPE, BATTLETYPE_FORCEITEM + loadvar VAR_BATTLETYPE, BATTLETYPE_FORCEITEM loadwildmon LUGIA, 40 startbattle disappear WHIRLISLANDLUGIACHAMBER_LUGIA diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 48a0b3ad..f9024983 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -10,7 +10,7 @@ WillsRoom_MapScripts: callback MAPCALLBACK_TILES, .WillsRoomDoors .LockDoor: - priorityjump .WillsDoorLocksBehindYou + prioritysjump .WillsDoorLocksBehindYou end .DummyScene: |