diff options
101 files changed, 420 insertions, 399 deletions
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 3c5a80478..7976fdffa 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -26,20 +26,28 @@ CHRIS EQU __enum__ KRIS EQU __enum__ trainerclass FALKNER ; 1 + const FALKNER1 trainerclass WHITNEY ; 2 + const WHITNEY1 trainerclass BUGSY ; 3 + const BUGSY1 trainerclass MORTY ; 4 + const MORTY1 trainerclass PRYCE ; 5 + const PRYCE1 trainerclass JASMINE ; 6 + const JASMINE1 trainerclass CHUCK ; 7 + const CHUCK1 trainerclass CLAIR ; 8 + const CLAIR1 trainerclass RIVAL1 ; 9 const RIVAL1_1_CHIKORITA @@ -61,6 +69,7 @@ KRIS EQU __enum__ trainerclass POKEMON_PROF ; a trainerclass WILL ; b + const WILL1 trainerclass CAL ; c const CAL1 @@ -68,19 +77,25 @@ KRIS EQU __enum__ const CAL3 trainerclass BRUNO ; d + const BRUNO1 trainerclass KAREN ; e + const KAREN1 trainerclass KOGA ; f + const KOGA1 trainerclass CHAMPION ; 10 const LANCE trainerclass BROCK ; 11 + const BROCK1 trainerclass MISTY ; 12 + const MISTY1 trainerclass LT_SURGE ; 13 + const LT_SURGE1 trainerclass SCIENTIST ; 14 const ROSS @@ -90,6 +105,7 @@ KRIS EQU __enum__ const RICH trainerclass ERIKA ; 15 + const ERIKA1 trainerclass YOUNGSTER ; 16 const JOEY1 @@ -174,6 +190,7 @@ KRIS EQU __enum__ const DANA5 trainerclass JANINE ; 1a + const JANINE1 trainerclass COOLTRAINERM ; 1b const NICK @@ -306,6 +323,7 @@ KRIS EQU __enum__ const SHIRLEY trainerclass SABRINA ; 23 + const SABRINA1 trainerclass BUG_CATCHER ; 24 const DON @@ -478,6 +496,7 @@ KRIS EQU __enum__ const GLENN trainerclass BLAINE ; 2e + const BLAINE1 trainerclass BURGLAR ; 2f const DUNCAN @@ -662,8 +681,10 @@ KRIS EQU __enum__ const JAIME trainerclass RED ; 3f + const RED1 trainerclass BLUE ; 40 + const BLUE1 trainerclass OFFICER ; 41 const KEITH diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 1e36df96f..b73a00a03 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -23,7 +23,7 @@ AzaleaGymBugsyScript: waitbutton closetext winlosstext BugsyText_ResearchIncomplete, 0 - loadtrainer BUGSY, 1 + loadtrainer BUGSY, BUGSY1 startbattle reloadmapafterbattle setevent EVENT_BEAT_BUGSY @@ -146,7 +146,7 @@ AzaleaGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext BUGSY, 1, $1 + trainertotext BUGSY, BUGSY1, $1 jumpstd gymstatue2 BugsyText_INeverLose: diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index ba1ee1a2c..a0c3ab79e 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -37,7 +37,7 @@ AzaleaTown_MapScriptHeader: return AzaleaTownRivalBattleScene1: - moveobject AZALEATOWN_SILVER, $b, $b + moveobject AZALEATOWN_SILVER, 11, 11 spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -102,7 +102,7 @@ AzaleaTownRivalBattleScript: applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement playsound SFX_EXIT_BUILDING disappear AZALEATOWN_SILVER - setscene $0 + setscene 0 waitsfx playmapmusic end @@ -170,7 +170,7 @@ AzaleaTownCelebiScene: setflag ENGINE_HAVE_EXAMINED_GS_BALL clearevent EVENT_ILEX_FOREST_LASS setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS - setscene $0 + setscene 0 closetext end diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 0e44eab3a..b769b0429 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -38,7 +38,7 @@ BattleTower1F_MapScriptHeader: writebyte BATTLETOWERACTION_06 special BattleTowerAction .SkipEverything: - setscene $1 + setscene 1 .Scene1: end @@ -81,10 +81,10 @@ Script_ChooseChallenge: ; 0x9e40f writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel - setscene $0 + setscene 0 special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - setscene $1 + setscene 1 writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags] special BattleTowerAction special BattleTowerRoomMenu @@ -105,9 +105,9 @@ Script_ResumeBattleTowerChallenge: special BattleTowerAction Script_WalkToBattleTowerElevator: musicfadeout MUSIC_NONE, 8 - setmapscene BATTLE_TOWER_BATTLE_ROOM, $0 - setmapscene BATTLE_TOWER_ELEVATOR, $0 - setmapscene BATTLE_TOWER_HALLWAY, $0 + setmapscene BATTLE_TOWER_BATTLE_ROOM, 0 + setmapscene BATTLE_TOWER_ELEVATOR, 0 + setmapscene BATTLE_TOWER_HALLWAY, 0 follow BATTLETOWER1F_RECEPTIONIST, PLAYER applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator writebyte BATTLETOWERACTION_0A @@ -208,10 +208,10 @@ continue: writetext Text_SaveBeforeReentry yesorno iffalse Script_Menu_ChallengeExplanationCancel - setscene $0 + setscene 0 special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - setscene $1 + setscene 1 writebyte BATTLETOWERACTION_06 special BattleTowerAction writebyte BATTLETOWERACTION_12 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index acd8bfa66..3b2916f56 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -14,7 +14,7 @@ BattleTowerBattleRoom_MapScriptHeader: .EnterBattleRoom: ; 0x9f419 disappear BATTLETOWERBATTLEROOM_YOUNGSTER priorityjump Script_BattleRoom - setscene $1 + setscene 1 .DummyScene: end @@ -87,14 +87,14 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3 special BattleTowerAction closetext special FadeOutPalettes - warpfacing UP, BATTLE_TOWER_1F, $7, $7 + warpfacing UP, BATTLE_TOWER_1F, 7, 7 opentext jump Script_BattleTowerHopeToServeYouAgain Script_FailedBattleTowerChallenge: pause 60 special Special_BattleTowerFade - warpfacing UP, BATTLE_TOWER_1F, $7, $7 + warpfacing UP, BATTLE_TOWER_1F, 7, 7 writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction opentext @@ -106,7 +106,7 @@ Script_FailedBattleTowerChallenge: Script_BeatenAllTrainers: ; 0x9f4d9 pause 60 special Special_BattleTowerFade - warpfacing UP, BATTLE_TOWER_1F, $7, $7 + warpfacing UP, BATTLE_TOWER_1F, 7, 7 Script_BeatenAllTrainers2: opentext writetext Text_CongratulationsYouveBeatenAllTheTrainers diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 2327b31fa..d9974beea 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -12,7 +12,7 @@ BattleTowerElevator_MapScriptHeader: .Scene0: priorityjump .RideElevator - setscene $1 + setscene 1 .Scene1: end diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 41a3beb83..e461ce613 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -12,7 +12,7 @@ BattleTowerHallway_MapScriptHeader: .Scene0: priorityjump .ChooseBattleRoom - setscene $1 + setscene 1 .Scene1: end diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index c640c2c06..0d654d5c8 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -16,15 +16,15 @@ BlackthornGym1F_MapScriptHeader: .Boulders: checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1 iffalse .skip1 - changeblock $8, $2, $3b + changeblock 8, 2, $3b .skip1 checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_2 iffalse .skip2 - changeblock $2, $4, $3a + changeblock 2, 4, $3a .skip2 checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_3 iffalse .skip3 - changeblock $8, $6, $3b + changeblock 8, 6, $3b .skip3 return @@ -39,7 +39,7 @@ BlackthornGymClairScript: waitbutton closetext winlosstext ClairWinText, 0 - loadtrainer CLAIR, 1 + loadtrainer CLAIR, CLAIR1 startbattle reloadmapafterbattle setevent EVENT_BEAT_CLAIR @@ -146,7 +146,7 @@ BlackthornGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext CLAIR, 1, $1 + trainertotext CLAIR, CLAIR1, $1 jumpstd gymstatue2 ClairIntroText: diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 784f06185..9e9ad1894 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -21,11 +21,11 @@ BrunosRoom_MapScriptHeader: .BrunosRoomDoors: checkevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED iffalse .KeepDoorClosed - changeblock $4, $e, $2a + changeblock 4, 14, $2a .KeepDoorClosed: checkevent EVENT_BRUNOS_ROOM_EXIT_OPEN iffalse .OpenDoor - changeblock $4, $2, $16 + changeblock 4, 2, $16 .OpenDoor: return @@ -34,10 +34,10 @@ BrunosRoom_MapScriptHeader: refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock $4, $e, $2a + changeblock 4, 14, $2a reloadmappart closetext - setscene $1 + setscene 1 setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -51,7 +51,7 @@ BrunoScript_Battle: waitbutton closetext winlosstext BrunoScript_BrunoBeatenText, 0 - loadtrainer BRUNO, 1 + loadtrainer BRUNO, BRUNO1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_BRUNO @@ -60,7 +60,7 @@ BrunoScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock $4, $2, $16 + changeblock 4, 2, $16 reloadmappart closetext setevent EVENT_BRUNOS_ROOM_EXIT_OPEN diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 69b71d9e3..fce0e73c8 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -29,11 +29,11 @@ BurnedTower1F_MapScriptHeader: .HoleAndLadder: checkevent EVENT_HOLE_IN_BURNED_TOWER iftrue .Next - changeblock $a, $8, $32 ; hole + changeblock 10, 8, $32 ; hole .Next: checkevent EVENT_RELEASED_THE_BEASTS iftrue .Done - changeblock $6, $e, $9 ; ladder + changeblock 6, 14, $9 ; ladder .Done: return @@ -45,8 +45,8 @@ BurnedTower1F_MapScriptHeader: writetext BurnedTower1FEusineIntroText waitbutton closetext - moveobject BURNEDTOWER1F_EUSINE, $9, $e - setscene $1 + moveobject BURNEDTOWER1F_EUSINE, 9, 14 + setscene 1 end BurnedTowerRivalBattleScript: @@ -98,7 +98,7 @@ BurnedTowerRivalBattleScript: writetext BurnedTowerSilver_AfterText1 waitbutton closetext - setscene $2 + setscene 2 setevent EVENT_RIVAL_BURNED_TOWER special Special_FadeOutMusic pause 15 @@ -106,7 +106,7 @@ BurnedTowerRivalBattleScript: showemote EMOTE_SHOCK, PLAYER, 15 playsound SFX_ENTER_DOOR waitsfx - changeblock $a, $8, $25 + changeblock 10, 8, $25 reloadmappart pause 15 applymovement PLAYER, BurnedTower1FMovement_PlayerStartsToFall diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 07f5c3d6e..935c14516 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -28,7 +28,7 @@ BurnedTowerB1F_MapScriptHeader: .LadderCallback: checkevent EVENT_RELEASED_THE_BEASTS iftrue .NoChange - changeblock $6, $e, $2 + changeblock 6, 14, $2 .NoChange: return @@ -81,11 +81,11 @@ ReleaseTheBeasts: disappear BURNEDTOWERB1F_SUICUNE1 waitsfx special RestartMapMusic - setscene $1 + setscene 1 setevent EVENT_RELEASED_THE_BEASTS special InitRoamMons - setmapscene ECRUTEAK_GYM, $1 - setmapscene CIANWOOD_CITY, $1 + setmapscene ECRUTEAK_GYM, 1 + setmapscene CIANWOOD_CITY, 1 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY setevent EVENT_ECRUTEAK_GYM_GRAMPS clearevent EVENT_ECRUTEAK_CITY_GRAMPS @@ -93,10 +93,10 @@ ReleaseTheBeasts: setevent EVENT_BURNED_TOWER_1F_EUSINE appear BURNEDTOWERB1F_EUSINE refreshscreen $0 - changeblock $6, $e, $1b + changeblock 6, 14, $1b reloadmappart closetext - setscene $1 + setscene 1 end BurnedTowerB1FEusine: diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index c94ef993e..ad34df21f 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -11,7 +11,7 @@ CeladonDeptStore6F_MapScriptHeader: dbw MAPCALLBACK_TILES, .Callback .Callback: - changeblock $c, $0, $3 + changeblock 12, 0, $3 return CeladonDeptStore6FSuperNerdScript: diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index cabb2d45c..0bbad4f98 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -22,7 +22,7 @@ ErikaScript_0x72a6a: waitbutton closetext winlosstext UnknownText_0x72c3e, 0 - loadtrainer ERIKA, 1 + loadtrainer ERIKA, ERIKA1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ERIKA @@ -109,7 +109,7 @@ CeladonGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext ERIKA, 1, $1 + trainertotext ERIKA, ERIKA1, $1 jumpstd gymstatue2 UnknownText_0x72b28: diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 2c2a594e6..e607d0e9d 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -133,7 +133,7 @@ NoBeastsText: para "#MON RAIKOU and" line "ENTEI?" - para $56, $56, $56 + para "<......><......><......>" para "Okay…" diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 59a1b72b9..3ed242b70 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -48,9 +48,9 @@ CeruleanGym_MapScriptHeader: setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM clearevent EVENT_ROUTE_24_ROCKET clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND - setscene $0 - setmapscene ROUTE_25, $1 - setmapscene POWER_PLANT, $0 + setscene 0 + setmapscene ROUTE_25, 1 + setmapscene POWER_PLANT, 0 waitsfx special RestartMapMusic pause 15 @@ -67,7 +67,7 @@ MistyScript_0x188432: waitbutton closetext winlosstext UnknownText_0x18870c, 0 - loadtrainer MISTY, 1 + loadtrainer MISTY, MISTY1 startbattle reloadmapafterbattle setevent EVENT_BEAT_MISTY @@ -161,7 +161,7 @@ CeruleanGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext MISTY, 1, $1 + trainertotext MISTY, MISTY1, $1 jumpstd gymstatue2 MovementData_0x1884e3: @@ -178,9 +178,9 @@ MovementData_0x1884e8: MovementData_0x1884eb: fix_facing - db $39 ; movement + set_sliding jump_step UP - db $38 ; movement + remove_sliding remove_fixed_facing step_sleep 8 step_sleep 8 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index d87d52165..94b66d104 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -101,7 +101,7 @@ CherrygroveCityGuideGent: end CherrygroveSilverSceneSouth: - moveobject CHERRYGROVECITY_SILVER, $27, $7 + moveobject CHERRYGROVECITY_SILVER, 39, 7 CherrygroveSilverSceneNorth: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 @@ -171,7 +171,7 @@ CherrygroveSilverSceneNorth: spriteface PLAYER, LEFT applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft disappear CHERRYGROVECITY_SILVER - setscene $0 + setscene 0 special HealParty playmapmusic end diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 75c34f6e1..078915791 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -49,9 +49,9 @@ CianwoodCitySuicuneAndEusine: applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0 disappear CIANWOODCITY_SUICUNE pause 10 - setscene $0 + setscene 0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42 - setmapscene ROUTE_42, $1 + setmapscene ROUTE_42, 1 checkevent EVENT_FOUGHT_EUSINE iftrue .Done setevent EVENT_FOUGHT_EUSINE @@ -151,20 +151,20 @@ CianwoodCityHiddenMaxEther: dwb EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER MovementData_0x1a00da: - db $39 ; movement + set_sliding fast_jump_step DOWN fast_jump_step DOWN fast_jump_step RIGHT - db $38 ; movement + remove_sliding step_end MovementData_0x1a00e0: - db $39 ; movement + set_sliding fast_jump_step RIGHT fast_jump_step UP fast_jump_step RIGHT fast_jump_step RIGHT - db $38 ; movement + remove_sliding step_end MovementData_0x1a00e7: diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 0323fc0eb..49db07005 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -40,7 +40,7 @@ ChuckScript_0x9d60f: waitbutton closetext winlosstext ChuckLossText, 0 - loadtrainer CHUCK, 1 + loadtrainer CHUCK, CHUCK1 startbattle reloadmapafterbattle setevent EVENT_BEAT_CHUCK @@ -138,7 +138,7 @@ CianwoodGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext CHUCK, 1, $1 + trainertotext CHUCK, CHUCK1, $1 jumpstd gymstatue2 CianwoodGymMovement_ChuckChucksBoulder: diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 647e16541..be3742ef3 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -37,12 +37,12 @@ Colosseum_MapScriptHeader: return .PreparePokecenter2F: - setmapscene POKECENTER_2F, $2 + setmapscene POKECENTER_2F, 2 return .InitializeAndPreparePokecenter2F: - setscene $1 - setmapscene POKECENTER_2F, $2 + setscene 1 + setmapscene POKECENTER_2F, 2 end MapColosseumSignpost1Script: diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 1df424ca1..a27c0e6b0 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -165,8 +165,8 @@ DragonShrine_MapScriptHeader: waitsfx special RestartMapMusic specialphonecall SPECIALCALL_MASTERBALL - setscene $1 - setmapscene DRAGONS_DEN_B1F, $1 + setscene 1 + setmapscene DRAGONS_DEN_B1F, 1 writetext UnknownText_0x18d9f2 buttonsound writetext UnknownText_0x18da0b @@ -614,7 +614,7 @@ UnknownText_0x18d916: para "You did fail?" - para $56, $56, $56, $56, $56, $56 + para "<......><......><......><......><......><......>" para "…What? You passed?" done @@ -665,7 +665,7 @@ UnknownText_0x18da0b: done UnknownText_0x18dab4: - text $56, $56, $56, $56, $56, $56 + text "<......><......><......><......><......><......>" done DragonShrine_MapEventHeader: diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 8f87735db..b79857e36 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -80,7 +80,7 @@ DragonsDenB1F_ClairScene: pause 30 special RestartMapMusic disappear DRAGONSDENB1F_CLAIR - setscene $0 + setscene 0 end TrainerCooltrainermDarin: diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 491aaff7b..6948996e2 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -32,7 +32,7 @@ MortyScript_0x99d58: waitbutton closetext winlosstext UnknownText_0x9a00a, 0 - loadtrainer MORTY, 1 + loadtrainer MORTY, MORTY1 startbattle reloadmapafterbattle setevent EVENT_BEAT_MORTY @@ -43,7 +43,7 @@ MortyScript_0x99d58: setflag ENGINE_FOGBADGE checkcode VAR_BADGES scall EcruteakGymActivateRockets - setmapscene ECRUTEAK_HOUSE, $1 + setmapscene ECRUTEAK_HOUSE, 1 setevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_2 .FightDone: @@ -94,7 +94,7 @@ EcruteakGymClosed: special FadeOutPalettes playsound SFX_ENTER_DOOR waitsfx - warp ECRUTEAK_CITY, $6, $1b + warp ECRUTEAK_CITY, 6, 27 end TrainerSageJeffrey: @@ -162,7 +162,7 @@ EcruteakGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext MORTY, 1, $1 + trainertotext MORTY, MORTY1, $1 jumpstd gymstatue2 MovementData_0x99e5d: diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 274cc99e3..69dbfcbfa 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -35,7 +35,7 @@ EcruteakHouse_MapScriptHeader: setevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE checkitem CLEAR_BELL iftrue .NoClearBell - setscene $0 + setscene 0 .NoClearBell: return @@ -47,7 +47,7 @@ EcruteakHouse_CoordEvent1: checkevent EVENT_RANG_CLEAR_BELL_2 iftrue EcruteakHouse_CoordEvent_DontMove applymovement ECRUTEAKHOUSE_SAGE2, MovementData_0x980c7 - moveobject ECRUTEAKHOUSE_SAGE1, $4, $6 + moveobject ECRUTEAKHOUSE_SAGE1, 4, 6 appear ECRUTEAKHOUSE_SAGE1 pause 5 disappear ECRUTEAKHOUSE_SAGE2 @@ -57,7 +57,7 @@ EcruteakHouse_CoordEvent2: checkevent EVENT_RANG_CLEAR_BELL_1 iftrue EcruteakHouse_CoordEvent_DontMove applymovement ECRUTEAKHOUSE_SAGE1, MovementData_0x980cc - moveobject ECRUTEAKHOUSE_SAGE2, $5, $6 + moveobject ECRUTEAKHOUSE_SAGE2, 5, 6 appear ECRUTEAKHOUSE_SAGE2 pause 5 disappear ECRUTEAKHOUSE_SAGE1 @@ -100,7 +100,7 @@ SageScript_0x98062: writetext UnknownText_0x98250 waitbutton closetext - setscene $1 + setscene 1 setevent EVENT_RANG_CLEAR_BELL_2 clearevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_GAVE_KURT_APRICORNS @@ -202,7 +202,7 @@ UnknownText_0x98250: line "but I must ask you" cont "to leave." - para $56, $56, $56 + para "<......><......><......>" para "Ah!" diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index da661209f..dce2160de 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -53,7 +53,7 @@ EcruteakPokecenter1F_MapScriptHeader: disappear ECRUTEAKPOKECENTER1F_BILL clearevent EVENT_MET_BILL setflag ENGINE_TIME_CAPSULE - setscene $1 + setscene 1 waitsfx end diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 13c8b367e..c3e1a51f5 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -42,7 +42,7 @@ ElmsLab_MapScriptHeader: .MoveElmCallback: checkscene iftrue .Skip - moveobject ELMSLAB_ELM, $3, $4 + moveobject ELMSLAB_ELM, 3, 4 .Skip: return @@ -84,7 +84,7 @@ ElmsLab_MapScriptHeader: opentext writetext ElmText_ChooseAPokemon waitbutton - setscene $1 + setscene 1 closetext end @@ -274,8 +274,8 @@ ElmDirectionsScript: closetext setevent EVENT_GOT_A_POKEMON_FROM_ELM setevent EVENT_RIVAL_CHERRYGROVE_CITY - setscene $5 - setmapscene NEW_BARK_TOWN, $1 + setscene 5 + setmapscene NEW_BARK_TOWN, 1 end ElmDescribesMrPokemonScript: @@ -341,13 +341,13 @@ ElmAfterTheftScript: buttonsound setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setflag ENGINE_BUG_CONTEST_ON - setmapscene ROUTE_29, $1 + setmapscene ROUTE_29, 1 clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY setevent EVENT_ROUTE_30_BATTLE writetext ElmAfterTheftText6 waitbutton closetext - setscene $6 + setscene 6 end ElmStudyingEggScript: @@ -479,7 +479,7 @@ AideScript_GivePotions: writetext AideText_AlwaysBusy waitbutton closetext - setscene $2 + setscene 2 end AideScript_WalkBalls1: @@ -507,7 +507,7 @@ AideScript_GiveYouBalls: buttonsound itemnotify closetext - setscene $2 + setscene 2 end AideScript_ReceiveTheBalls: @@ -562,7 +562,7 @@ CopScript: closetext applymovement ELMSLAB_OFFICER, OfficerLeavesMovement disappear ELMSLAB_OFFICER - setscene $2 + setscene 2 end ElmsLabWindow: @@ -794,7 +794,7 @@ ElmText_GotAnEmail: text "Oh, hey! I got an" line "e-mail!" - para $56, $56, $56 + para "<......><......><......>" line "Hm… Uh-huh…" para "Okay…" diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 869cb147c..d702ded51 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -35,11 +35,11 @@ FastShip1F_MapScriptHeader: clearevent EVENT_FAST_SHIP_HAS_ARRIVED checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue .SkipGrandpa - setscene $2 + setscene 2 end .SkipGrandpa: - setscene $0 + setscene 0 end SailorScript_0x75160: @@ -71,8 +71,8 @@ SailorScript_0x75160: special FadeOutPalettes waitsfx setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - setmapscene VERMILION_PORT, $1 - warp VERMILION_PORT, $7, $11 + setmapscene VERMILION_PORT, 1 + warp VERMILION_PORT, 7, 17 end ._Olivine: @@ -84,8 +84,8 @@ SailorScript_0x75160: special FadeOutPalettes waitsfx setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY - setmapscene OLIVINE_PORT, $1 - warp OLIVINE_PORT, $7, $17 + setmapscene OLIVINE_PORT, 1 + warp OLIVINE_PORT, 7, 23 end .LetThePlayerOut: @@ -120,7 +120,7 @@ FastShip1FSailorScript: jumptextfaceplayer FastShip1FSailorText WorriedGrandpaSceneRight: - moveobject FASTSHIP1F_GENTLEMAN, $14, $6 + moveobject FASTSHIP1F_GENTLEMAN, 20, 6 WorriedGrandpaSceneLeft: appear FASTSHIP1F_GENTLEMAN @@ -135,7 +135,7 @@ WorriedGrandpaSceneLeft: spriteface PLAYER, RIGHT applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222 disappear FASTSHIP1F_GENTLEMAN - setscene $0 + setscene 0 end MovementData_0x7520e: diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 498e65f70..988ab724e 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -31,7 +31,7 @@ UnknownScript_0x7673c: checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT iftrue UnknownScript_0x76766 applymovement FASTSHIPB1F_SAILOR2, MovementData_0x76876 - moveobject FASTSHIPB1F_SAILOR1, $1e, $6 + moveobject FASTSHIPB1F_SAILOR1, 30, 6 appear FASTSHIPB1F_SAILOR1 pause 5 disappear FASTSHIPB1F_SAILOR2 @@ -41,7 +41,7 @@ UnknownScript_0x76751: checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT iftrue UnknownScript_0x76766 applymovement FASTSHIPB1F_SAILOR1, MovementData_0x76871 - moveobject FASTSHIPB1F_SAILOR2, $1f, $6 + moveobject FASTSHIPB1F_SAILOR2, 31, 6 appear FASTSHIPB1F_SAILOR2 pause 5 disappear FASTSHIPB1F_SAILOR1 diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 1bd1c91f1..26618e8d3 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -98,7 +98,7 @@ SailorScript_0x755f1: waitbutton closetext setevent EVENT_FAST_SHIP_LAZY_SAILOR - setmapscene FAST_SHIP_B1F, $1 + setmapscene FAST_SHIP_B1F, 1 checkcode VAR_FACING if_equal $3, UnknownScript_0x75629 applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index efccd7d92..67e78a725 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -52,7 +52,7 @@ SSAquaGranddaughterBefore: special Special_ReloadSpritesNoPalettes disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 applymovement PLAYER, MovementData_0x76004 - moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, $3, $13 + moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, 3, 19 appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 spriteface PLAYER, UP spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP @@ -81,7 +81,7 @@ SSAquaGranddaughterBefore: writetext SSAquaEntertainedGranddaughterText buttonsound setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - setmapscene FAST_SHIP_1F, $0 + setmapscene FAST_SHIP_1F, 0 jump SSAquaMetalCoatAndDocking SSAquaGrandpa: @@ -94,7 +94,7 @@ SSAquaGrandpa: writetext SSAquaCantFindGranddaughterText waitbutton closetext - setmapscene FAST_SHIP_1F, $0 + setmapscene FAST_SHIP_1F, 0 end SSAquaMetalCoatAndDocking: diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 8aaf6e364..64f580c5b 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -23,7 +23,7 @@ FuchsiaGymJanineScript: waitbutton closetext winlosstext JanineText_ToughOne, 0 - loadtrainer JANINE, 1 + loadtrainer JANINE, JANINE1 startbattle reloadmapafterbattle setevent EVENT_BEAT_JANINE @@ -216,7 +216,7 @@ FuchsiaGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext JANINE, 1, $1 + trainertotext JANINE, JANINE1, $1 jumpstd gymstatue2 Movement_NinjaSpin: diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 82d04ccc8..6cbb4441a 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -105,8 +105,8 @@ GoldenrodClangText: text "Clang! A can of" line "@" text_from_ram StringBuffer3 - text $55 - db "popped out!" + text "" + cont "popped out!" done GoldenrodVendingNoMoneyText: diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index da3dd0765..f2e88b6a1 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -23,7 +23,7 @@ UnknownScript_0x7d781: jump UnknownScript_0x7d791 UnknownScript_0x7d78a: - changeblock $10, $4, $d + changeblock 16, 4, $d jump UnknownScript_0x7d791 UnknownScript_0x7d791: @@ -31,15 +31,15 @@ UnknownScript_0x7d791: iftrue .Layout2 checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 iftrue .Layout3 - changeblock $a, $8, $d + changeblock 10, 8, $d return .Layout2: - changeblock $4, $a, $d + changeblock 4, 10, $d return .Layout3: - changeblock $a, $c, $d + changeblock 10, 12, $d return UnknownScript_0x7d7ac: diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index b384d43f1..baed07d79 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -23,8 +23,8 @@ GoldenrodDeptStoreRoof_MapScriptHeader: return .ChangeBlock: - changeblock $0, $2, $3f - changeblock $0, $4, $f + changeblock 0, 2, $3f + changeblock 0, 4, $f return .CheckSaleChangeClerk: diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 4446e653a..248864782 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -30,12 +30,12 @@ WhitneyScript_0x5400c: waitbutton closetext winlosstext UnknownText_0x541a5, 0 - loadtrainer WHITNEY, 1 + loadtrainer WHITNEY, WHITNEY1 startbattle reloadmapafterbattle setevent EVENT_BEAT_WHITNEY setevent EVENT_MADE_WHITNEY_CRY - setscene $1 + setscene 1 setevent EVENT_BEAT_BEAUTY_VICTORIA setevent EVENT_BEAT_BEAUTY_SAMANTHA setevent EVENT_BEAT_LASS_CARRIE @@ -112,7 +112,7 @@ WhitneyCriesScript: waitbutton closetext applymovement GOLDENRODGYM_LASS2, BridgetWalksAwayMovement - setscene $0 + setscene 0 clearevent EVENT_MADE_WHITNEY_CRY end @@ -171,7 +171,7 @@ GoldenrodGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext WHITNEY, 1, $1 + trainertotext WHITNEY, WHITNEY1, $1 jumpstd gymstatue2 BridgetWalksUpMovement: diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 8b114fd1c..73cc9701a 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -39,7 +39,7 @@ OfficerScript_0x550ec: warpcheck newloadmap MAPSETUP_TRAIN applymovement PLAYER, .MovementBoardTheTrain - wait $14 + wait 20 end .MovementBoardTheTrain: diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 617d54327..3cf35c3c0 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -25,7 +25,7 @@ GoldenrodPokecenter1F_GSBallSceneLeft: checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING - moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 + moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, 0, 7 disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND @@ -57,7 +57,7 @@ GoldenrodPokecenter1F_GSBallSceneRight: checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING - moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 + moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, 0, 7 disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index debf98bfa..1c5872548 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -45,7 +45,7 @@ GoldenrodUnderground_MapScriptHeader: return .LockBasementDoor: - changeblock $12, $6, $3d + changeblock 18, 6, $3d return .CheckDayOfWeek: @@ -384,7 +384,7 @@ BasementDoorScript:: writetext UnknownText_0x7c5d6 waitbutton closetext - changeblock $12, $6, $2e + changeblock 18, 6, $2e reloadmappart closetext setevent EVENT_USED_BASEMENT_KEY diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index c9bfdac9d..a10468875 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -28,7 +28,7 @@ HallOfFame_MapScriptHeader: closetext spriteface HALLOFFAME_LANCE, UP applymovement PLAYER, HallOfFame_SlowlyApproachMachine - setscene $1 + setscene 1 pause 15 writebyte 2 ; Machine is in the Hall of Fame special HealMachineAnim @@ -38,7 +38,7 @@ HallOfFame_MapScriptHeader: clearevent EVENT_RED_IN_MT_SILVER setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - setmapscene SPROUT_TOWER_3F, $1 + setmapscene SPROUT_TOWER_3F, 1 special HealParty checkevent EVENT_GOT_SS_TICKET_FROM_ELM iftrue .SkipPhoneCall diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 7bbba6562..094567692 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -37,52 +37,52 @@ IlexForest_MapScriptHeader: return .PositionOne: - moveobject ILEXFOREST_FARFETCHD, $e, $1f + moveobject ILEXFOREST_FARFETCHD, 14, 31 appear ILEXFOREST_FARFETCHD return .PositionTwo: - moveobject ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, 15, 25 appear ILEXFOREST_FARFETCHD return .PositionThree: - moveobject ILEXFOREST_FARFETCHD, $14, $18 + moveobject ILEXFOREST_FARFETCHD, 20, 24 appear ILEXFOREST_FARFETCHD return .PositionFour: - moveobject ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, 29, 22 appear ILEXFOREST_FARFETCHD return .PositionFive: - moveobject ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, 28, 31 appear ILEXFOREST_FARFETCHD return .PositionSix: - moveobject ILEXFOREST_FARFETCHD, $18, $23 + moveobject ILEXFOREST_FARFETCHD, 24, 35 appear ILEXFOREST_FARFETCHD return .PositionSeven: - moveobject ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, 22, 31 appear ILEXFOREST_FARFETCHD return .PositionEight: - moveobject ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, 15, 29 appear ILEXFOREST_FARFETCHD return .PositionNine: - moveobject ILEXFOREST_FARFETCHD, $a, $23 + moveobject ILEXFOREST_FARFETCHD, 10, 35 appear ILEXFOREST_FARFETCHD return .PositionTen: - moveobject ILEXFOREST_FARFETCHD, $6, $1c + moveobject ILEXFOREST_FARFETCHD, 6, 28 appear ILEXFOREST_FARFETCHD return @@ -125,7 +125,7 @@ IlexForestFarfetchdScript: waitbutton closetext applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos1_Pos2 - moveobject ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, 15, 25 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 2 @@ -135,7 +135,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal DOWN, .Position2_Down applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos2_Pos3 - moveobject ILEXFOREST_FARFETCHD, $14, $18 + moveobject ILEXFOREST_FARFETCHD, 20, 24 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 3 @@ -143,7 +143,7 @@ IlexForestFarfetchdScript: .Position2_Down: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos2_Pos8 - moveobject ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, 15, 29 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 @@ -153,7 +153,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal LEFT, .Position3_Left applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos3_Pos4 - moveobject ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, 29, 22 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 4 @@ -161,7 +161,7 @@ IlexForestFarfetchdScript: .Position3_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos3_Pos2 - moveobject ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, 15, 25 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 2 @@ -171,7 +171,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal UP, .Position4_Up applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos4_Pos5 - moveobject ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, 28, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 5 @@ -179,7 +179,7 @@ IlexForestFarfetchdScript: .Position4_Up: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos4_Pos3 - moveobject ILEXFOREST_FARFETCHD, $14, $18 + moveobject ILEXFOREST_FARFETCHD, 20, 24 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 3 @@ -191,7 +191,7 @@ IlexForestFarfetchdScript: if_equal LEFT, .Position5_Left if_equal RIGHT, .Position5_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos5_Pos6 - moveobject ILEXFOREST_FARFETCHD, $18, $23 + moveobject ILEXFOREST_FARFETCHD, 24, 35 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 6 @@ -199,7 +199,7 @@ IlexForestFarfetchdScript: .Position5_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos5_Pos7 - moveobject ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, 22, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 7 @@ -207,7 +207,7 @@ IlexForestFarfetchdScript: .Position5_Up: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos5_Pos4_Up - moveobject ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, 29, 22 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 4 @@ -215,7 +215,7 @@ IlexForestFarfetchdScript: .Position5_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos5_Pos4_Right - moveobject ILEXFOREST_FARFETCHD, $1d, $16 + moveobject ILEXFOREST_FARFETCHD, 29, 22 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 4 @@ -225,7 +225,7 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal RIGHT, .Position6_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos6_Pos7 - moveobject ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, 22, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 7 @@ -233,7 +233,7 @@ IlexForestFarfetchdScript: .Position6_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos6_Pos5 - moveobject ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, 28, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 5 @@ -244,7 +244,7 @@ IlexForestFarfetchdScript: if_equal DOWN, .Position7_Down if_equal LEFT, .Position7_Left applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos8 - moveobject ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, 15, 29 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 @@ -252,7 +252,7 @@ IlexForestFarfetchdScript: .Position7_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos6 - moveobject ILEXFOREST_FARFETCHD, $18, $23 + moveobject ILEXFOREST_FARFETCHD, 24, 35 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 6 @@ -260,7 +260,7 @@ IlexForestFarfetchdScript: .Position7_Down: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos5 - moveobject ILEXFOREST_FARFETCHD, $1c, $1f + moveobject ILEXFOREST_FARFETCHD, 28, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 5 @@ -272,7 +272,7 @@ IlexForestFarfetchdScript: if_equal LEFT, .Position8_Left if_equal RIGHT, .Position8_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos9 - moveobject ILEXFOREST_FARFETCHD, $a, $23 + moveobject ILEXFOREST_FARFETCHD, 10, 35 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 9 @@ -280,7 +280,7 @@ IlexForestFarfetchdScript: .Position8_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos7 - moveobject ILEXFOREST_FARFETCHD, $16, $1f + moveobject ILEXFOREST_FARFETCHD, 22, 31 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 7 @@ -289,7 +289,7 @@ IlexForestFarfetchdScript: .Position8_Up: .Position8_Left: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos2 - moveobject ILEXFOREST_FARFETCHD, $f, $19 + moveobject ILEXFOREST_FARFETCHD, 15, 25 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 2 @@ -300,7 +300,7 @@ IlexForestFarfetchdScript: if_equal DOWN, .Position9_Down if_equal RIGHT, .Position9_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos10 - moveobject ILEXFOREST_FARFETCHD, $6, $1c + moveobject ILEXFOREST_FARFETCHD, 6, 28 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 10 @@ -311,7 +311,7 @@ IlexForestFarfetchdScript: .Position9_Right: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos8_Right - moveobject ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, 15, 29 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 @@ -319,7 +319,7 @@ IlexForestFarfetchdScript: .Position9_Down: applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos8_Down - moveobject ILEXFOREST_FARFETCHD, $f, $1d + moveobject ILEXFOREST_FARFETCHD, 15, 29 disappear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 879e1dd8b..f5f156565 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -19,12 +19,12 @@ IndigoPlateauPokecenter1F_MapScriptHeader: end .PrepareElite4: - setmapscene WILLS_ROOM, $0 - setmapscene KOGAS_ROOM, $0 - setmapscene BRUNOS_ROOM, $0 - setmapscene KARENS_ROOM, $0 - setmapscene LANCES_ROOM, $0 - setmapscene HALL_OF_FAME, $0 + setmapscene WILLS_ROOM, 0 + setmapscene KOGAS_ROOM, 0 + setmapscene BRUNOS_ROOM, 0 + setmapscene KARENS_ROOM, 0 + setmapscene LANCES_ROOM, 0 + setmapscene HALL_OF_FAME, 0 clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED clearevent EVENT_WILLS_ROOM_EXIT_OPEN clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED @@ -54,7 +54,7 @@ PlateauRivalBattle1: if_equal THURSDAY, PlateauRivalScriptDone if_equal FRIDAY, PlateauRivalScriptDone if_equal SATURDAY, PlateauRivalScriptDone - moveobject INDIGOPLATEAUPOKECENTER1F_SILVER, $11, $9 + moveobject INDIGOPLATEAUPOKECENTER1F_SILVER, 17, 9 appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 @@ -130,7 +130,7 @@ PlateauRivalPostBattle: spriteface PLAYER, DOWN applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement disappear INDIGOPLATEAUPOKECENTER1F_SILVER - setscene $0 + setscene 0 playmapmusic setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT PlateauRivalScriptDone: @@ -160,7 +160,7 @@ TeleportGuyScript: playsound SFX_WARP_TO special FadeOutPalettes waitsfx - warp NEW_BARK_TOWN, $d, $6 + warp NEW_BARK_TOWN, 13, 6 end .No: diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index cba4aed9a..cb1743d8a 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -21,11 +21,11 @@ KarensRoom_MapScriptHeader: .KarensRoomDoors: checkevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED iffalse .KeepDoorsClosed - changeblock $4, $e, $2a + changeblock 4, 14, $2a .KeepDoorsClosed: checkevent EVENT_KARENS_ROOM_EXIT_OPEN iffalse .OpenDoors - changeblock $4, $2, $16 + changeblock 4, 2, $16 .OpenDoors: return @@ -34,10 +34,10 @@ KarensRoom_MapScriptHeader: refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock $4, $e, $2a + changeblock 4, 14, $2a reloadmappart closetext - setscene $1 + setscene 1 setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -51,7 +51,7 @@ KarenScript_Battle: waitbutton closetext winlosstext KarenScript_KarenBeatenText, 0 - loadtrainer KAREN, 1 + loadtrainer KAREN, KAREN1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_KAREN @@ -60,7 +60,7 @@ KarenScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock $4, $2, $16 + changeblock 4, 2, $16 reloadmappart closetext setevent EVENT_KARENS_ROOM_EXIT_OPEN diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index d621ed342..2c6900d89 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -21,11 +21,11 @@ KogasRoom_MapScriptHeader: .KogasRoomDoors: checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED iffalse .KeepDoorsClosed - changeblock $4, $e, $2a + changeblock 4, 14, $2a .KeepDoorsClosed: checkevent EVENT_KOGAS_ROOM_EXIT_OPEN iffalse .OpenDoors - changeblock $4, $2, $16 + changeblock 4, 2, $16 .OpenDoors: return @@ -34,10 +34,10 @@ KogasRoom_MapScriptHeader: refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock $4, $e, $2a + changeblock 4, 14, $2a reloadmappart closetext - setscene $1 + setscene 1 setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -51,7 +51,7 @@ KogaScript_Battle: waitbutton closetext winlosstext KogaScript_KogaBeatenText, 0 - loadtrainer KOGA, 1 + loadtrainer KOGA, KOGA1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_KOGA @@ -60,7 +60,7 @@ KogaScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock $4, $2, $16 + changeblock 4, 2, $16 reloadmappart closetext setevent EVENT_KOGAS_ROOM_EXIT_OPEN diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 24092cc4f..addfeef13 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -43,7 +43,7 @@ UnknownScript_0x7a4f6: setflag ENGINE_POKEGEAR setflag ENGINE_PHONE_CARD addcellnum PHONE_MOM - setscene $1 + setscene 1 setevent EVENT_KRISS_HOUSE_MOM_1 clearevent EVENT_KRISS_HOUSE_MOM_2 writetext UnknownText_0x7a6bd diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 65d5fdaee..15e5d3641 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -93,7 +93,7 @@ KrissHousePC: closetext end .Warp: - warp NONE, $0, $0 + warp NONE, 0, 0 end KrisRadioText1: diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 6c1d6a9eb..2c1e7ba70 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -311,7 +311,7 @@ KurtScript_0x18e178: clearevent EVENT_AZALEA_TOWN_KURT waitsfx special RestartMapMusic - setmapscene AZALEA_TOWN, $2 + setmapscene AZALEA_TOWN, 2 end KurtScript_0x18e3bd: diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 50e7f05d0..6ff7060f9 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -62,7 +62,7 @@ UnknownScript_0x70035: disappear LAKEOFRAGE_LANCE clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_DECIDED_TO_HELP_LANCE - setmapscene MAHOGANY_MART_1F, $1 + setmapscene MAHOGANY_MART_1F, 1 end UnknownScript_0x7004e: @@ -101,7 +101,7 @@ UnknownScript_0x7007a: waitsfx itemnotify closetext - setscene $0 + setscene 0 appear LAKEOFRAGE_LANCE end diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index f185af0dc..6a1931d1b 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -23,11 +23,11 @@ LancesRoom_MapScriptHeader: .LancesRoomDoors: checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED iffalse .KeepDoorsClosed - changeblock $4, $16, $34 + changeblock 4, 22, $34 .KeepDoorsClosed: checkevent EVENT_LANCES_ROOM_EXIT_OPEN iffalse .OpenDoors - changeblock $4, $0, $b + changeblock 4, 0, $b .OpenDoors: return @@ -36,10 +36,10 @@ LancesRoom_MapScriptHeader: refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock $4, $16, $34 + changeblock 4, 22, $34 reloadmappart closetext - setscene $1 + setscene 1 setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED end @@ -69,7 +69,7 @@ LanceScript_0x180e7b: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock $4, $0, $b + changeblock 4, 0, $b reloadmappart closetext setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED @@ -127,7 +127,7 @@ LanceScript_0x180e7b: applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth special FadeOutPalettes pause 15 - warpfacing UP, HALL_OF_FAME, $4, $d + warpfacing UP, HALL_OF_FAME, 4, 13 end LancesRoom_PlayerWalksInMovementData: diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index a8de6e987..814e81776 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -23,7 +23,7 @@ PryceScript_0x199a9e: waitbutton closetext winlosstext PryceText_Impressed, 0 - loadtrainer PRYCE, 1 + loadtrainer PRYCE, PRYCE1 startbattle reloadmapafterbattle setevent EVENT_BEAT_PRYCE @@ -146,7 +146,7 @@ MahoganyGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext PRYCE, 1, $1 + trainertotext PRYCE, PRYCE1, $1 jumpstd gymstatue2 PryceText_Intro: diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index a25277fd9..2dbdf203d 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -28,7 +28,7 @@ MahoganyMart1F_MapScriptHeader: return .ShowStairs: - changeblock $6, $2, $1e + changeblock 6, 2, $1e return PharmacistScript_0x6c367: @@ -89,7 +89,7 @@ UnknownScript_0x6c38f: waitbutton showemote EMOTE_SHOCK, MAHOGANYMART1F_PHARMACIST, 10 playsound SFX_FAINT - changeblock $6, $2, $1e + changeblock 6, 2, $1e reloadmappart closetext setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART @@ -101,7 +101,7 @@ UnknownScript_0x6c38f: applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412 playsound SFX_EXIT_BUILDING disappear MAHOGANYMART1F_LANCE - setscene $0 + setscene 0 waitsfx end diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 870321f3d..9439eabf3 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -15,8 +15,8 @@ MobileBattleRoom_MapScriptHeader: end .InitializeAndPreparePokecenter2F: - setscene $1 - setmapscene POKECENTER_2F, $5 + setscene 1 + setmapscene POKECENTER_2F, 5 end MapMobileBattleRoomSignpost0Script: diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 1003d4ea5..bcc2c2d79 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -15,8 +15,8 @@ MobileTradeRoomMobile_MapScriptHeader: end .InitializeAndPreparePokecenter2F: - setscene $1 - setmapscene POKECENTER_2F, $4 + setscene 1 + setmapscene POKECENTER_2F, 4 end MapMobileTradeRoomMobileSignpost0Script: diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 73306f424..531c8a327 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -66,7 +66,7 @@ MountMoon_MapScriptHeader: closetext applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter disappear MOUNTMOON_SILVER - setscene $1 + setscene 1 setevent EVENT_BEAT_RIVAL_IN_MT_MOON playmapmusic end diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index f808d44c8..4b5d25ecb 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -125,9 +125,9 @@ MrPokemonsHouse_OakScript: setevent EVENT_RIVAL_NEW_BARK_TOWN setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR - setscene $1 - setmapscene CHERRYGROVE_CITY, $1 - setmapscene ELMS_LAB, $3 + setscene 1 + setmapscene CHERRYGROVE_CITY, 1 + setmapscene ELMS_LAB, 3 specialphonecall SPECIALCALL_ROBBED clearevent EVENT_COP_IN_ELMS_LAB checkevent EVENT_GOT_TOTODILE_FROM_ELM @@ -169,7 +169,7 @@ MrPokemonsHouse_OakExits: step DOWN step LEFT turn_head DOWN - db $3f ; movement + step_sleep 2 step_end MrPokemonIntroText1: diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 2e5129bc5..26e673ded 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -41,7 +41,7 @@ UnknownScript_0x1a8833: applymovement PLAYER, MovementData_0x1a88f4 spriteface PLAYER, RIGHT applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db - setscene $1 + setscene 1 disappear OLIVINECITY_OLIVINE_RIVAL special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY @@ -66,7 +66,7 @@ UnknownScript_0x1a886b: spriteface PLAYER, RIGHT applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8 disappear OLIVINECITY_OLIVINE_RIVAL - setscene $1 + setscene 1 special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY special MapCallbackSprites_LoadUsedSpritesGFX diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index cb87bdd85..849f6eecf 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -18,7 +18,7 @@ JasmineScript_0x9c12f: waitbutton closetext winlosstext Jasmine_BetterTrainer, 0 - loadtrainer JASMINE, 1 + loadtrainer JASMINE, JASMINE1 startbattle reloadmapafterbattle setevent EVENT_BEAT_JASMINE @@ -91,7 +91,7 @@ OlivineGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext JASMINE, 1, $1 + trainertotext JASMINE, JASMINE1, $1 jumpstd gymstatue2 Jasmine_SteelTypeIntro: diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index f34281e43..4fd072c67 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -26,7 +26,7 @@ OlivinePort_MapScriptHeader: .LeaveFastShipScript: applymovement PLAYER, MovementData_0x74a32 appear OLIVINEPORT_SAILOR1 - setscene $0 + setscene 0 setevent EVENT_GAVE_KURT_APRICORNS blackoutmod OLIVINE_CITY end @@ -64,8 +64,8 @@ SailorScript_0x748c0: UnknownScript_0x7490a: clearevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear OLIVINEPORT_SAILOR1 - setmapscene FAST_SHIP_1F, $1 - warp FAST_SHIP_1F, $19, $1 + setmapscene FAST_SHIP_1F, 1 + warp FAST_SHIP_1F, 25, 1 end UnknownScript_0x74919: diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index ca94d9e9f..cfe63fe18 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -19,7 +19,7 @@ BrockScript_0x1a2864: waitbutton closetext winlosstext UnknownText_0x1a29bb, 0 - loadtrainer BROCK, 1 + loadtrainer BROCK, BROCK1 startbattle reloadmapafterbattle setevent EVENT_BEAT_BROCK @@ -72,7 +72,7 @@ PewterGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext BROCK, 1, $1 + trainertotext BROCK, BROCK1, $1 jumpstd gymstatue2 UnknownText_0x1a28d0: diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index ece34605d..cf626c500 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -376,15 +376,15 @@ LinkReceptionistScript_TimeCapsule: Script_LeftCableTradeCenter: special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkTradeRoom - setscene $0 - setmapscene TRADE_CENTER, $0 + setscene 0 + setmapscene TRADE_CENTER, 0 end Script_LeftMobileTradeRoom: special Function101220 scall Script_WalkOutOfMobileTradeRoom - setscene $0 - setmapscene MOBILE_TRADE_ROOM_MOBILE, $0 + setscene 0 + setmapscene MOBILE_TRADE_ROOM_MOBILE, 0 end Script_WalkOutOfMobileTradeRoom: @@ -396,15 +396,15 @@ Script_WalkOutOfMobileTradeRoom: Script_LeftCableColosseum: special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkBattleRoom - setscene $0 - setmapscene COLOSSEUM, $0 + setscene 0 + setmapscene COLOSSEUM, 0 end Script_LeftMobileBattleRoom: special Function101220 scall Script_WalkOutOfMobileBattleRoom - setscene $0 - setmapscene MOBILE_BATTLE_ROOM, $0 + setscene 0 + setmapscene MOBILE_BATTLE_ROOM, 0 end Script_WalkOutOfMobileBattleRoom: @@ -579,8 +579,8 @@ Script_LeftTimeCapsule: applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2 .Done: - setscene $0 - setmapscene TIME_CAPSULE, $0 + setscene 0 + setmapscene TIME_CAPSULE, 0 end MapPokecenter2FSignpost0Script: diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 371ef6c58..f3b02fe44 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -42,7 +42,7 @@ PowerPlantGuardPhoneScript: closetext spriteface PLAYER, DOWN applymovement POWERPLANT_OFFICER1, MovementData_0x188eda - setscene $0 + setscene 0 end OfficerScript_0x188df5: @@ -148,8 +148,8 @@ PowerPlantManager: setevent EVENT_MET_MANAGER_AT_POWER_PLANT clearevent EVENT_CERULEAN_GYM_ROCKET clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM - setmapscene CERULEAN_GYM, $1 - setscene $1 + setmapscene CERULEAN_GYM, 1 + setscene 1 end UnknownScript_0x188e8d: diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index febce1a36..d3ded02ea 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -249,8 +249,8 @@ UnknownText_0x5cf5a: done UnknownText_0x5cf79: - text $56 - line $56 + text "<......>" + line "<......>" done UnknownText_0x5cf7e: diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 5a0e360c5..3ac8c1388 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -21,8 +21,8 @@ RadioTower3F_MapScriptHeader: return .Change: - changeblock $e, $2, $2a - changeblock $e, $4, $1 + changeblock 14, 2, $2a + changeblock 14, 4, $1 return RadioTower3FSuperNerdScript: @@ -143,8 +143,8 @@ UnknownScript_0x5e605: waitbutton setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER playsound SFX_ENTER_DOOR - changeblock $e, $2, $2a - changeblock $e, $4, $1 + changeblock 14, 2, $2a + changeblock 14, 4, $1 reloadmappart closetext waitsfx diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index c73d53de2..1ef195be0 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -47,7 +47,7 @@ FakeDirectorScript: buttonsound verbosegiveitem BASEMENT_KEY closetext - setscene $1 + setscene 1 setevent EVENT_BEAT_ROCKET_EXECUTIVEM_3 end @@ -115,7 +115,7 @@ RadioTower5FRocketBossScene: clearevent EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM special PlayMapMusic disappear RADIOTOWER5F_DIRECTOR - moveobject RADIOTOWER5F_DIRECTOR, $c, $0 + moveobject RADIOTOWER5F_DIRECTOR, 12, 0 appear RADIOTOWER5F_DIRECTOR applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksIn spriteface PLAYER, RIGHT @@ -126,8 +126,8 @@ RadioTower5FRocketBossScene: writetext RadioTower5FDirectorDescribeClearBellText waitbutton closetext - setscene $2 - setmapscene ECRUTEAK_HOUSE, $0 + setscene 2 + setmapscene ECRUTEAK_HOUSE, 0 setevent EVENT_GOT_CLEAR_BELL setevent EVENT_TEAM_ROCKET_DISBANDED jump .UselessJump diff --git a/maps/Route19.asm b/maps/Route19.asm index 7681b39c2..eee48f089 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -17,12 +17,12 @@ Route19_MapScriptHeader: .ClearRocks: checkevent EVENT_CINNABAR_ROCKS_CLEARED iftrue .Done - changeblock $6, $6, $7a - changeblock $8, $6, $7a - changeblock $a, $6, $7a - changeblock $c, $8, $7a - changeblock $4, $8, $7a - changeblock $a, $a, $7a + changeblock 6, 6, $7a + changeblock 8, 6, $7a + changeblock 10, 6, $7a + changeblock 12, 8, $7a + changeblock 4, 8, $7a + changeblock 10, 10, $7a .Done: return diff --git a/maps/Route25.asm b/maps/Route25.asm index ce37fe894..0d2f7a054 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -48,7 +48,7 @@ UnknownScript_0x19eea0: applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - setscene $0 + setscene 0 special RestartMapMusic end @@ -74,7 +74,7 @@ UnknownScript_0x19eee0: applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - setscene $0 + setscene 0 special RestartMapMusic end diff --git a/maps/Route27.asm b/maps/Route27.asm index 3afac9155..4b02422f7 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -42,7 +42,7 @@ UnknownScript_0x1a088c: writetext Route27FisherText waitbutton closetext - setscene $1 + setscene 1 end Route27FisherScript: diff --git a/maps/Route29.asm b/maps/Route29.asm index 6d564f083..a990cdc18 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -59,7 +59,7 @@ Route29Tutorial1: writetext CatchingTutorialDebriefText waitbutton closetext - setscene $0 + setscene 0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end @@ -84,7 +84,7 @@ Route29Tutorial2: writetext CatchingTutorialDebriefText waitbutton closetext - setscene $0 + setscene 0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end @@ -93,7 +93,7 @@ Script_RefusedTutorial1: waitbutton closetext applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b - setscene $0 + setscene 0 end Script_RefusedTutorial2: @@ -101,7 +101,7 @@ Script_RefusedTutorial2: waitbutton closetext applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b - setscene $0 + setscene 0 end CatchingTutorialDudeScript: diff --git a/maps/Route32.asm b/maps/Route32.asm index 659ea40db..b9de0d4df 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -127,7 +127,7 @@ Route32WannaBuyASlowpokeTailScript: SlowpokeTailSalesmanScript: faceplayer _OfferToSellSlowpokeTail: - setscene $2 + setscene 2 opentext writetext Text_MillionDollarSlowpokeTail yesorno diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index cf68bbcc2..84bc40ccc 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -28,11 +28,11 @@ Route35NationalParkGate_MapScriptHeader: .CheckIfContestRunning: checkflag ENGINE_BUG_CONTEST_TIMER iftrue .BugContestIsRunning - setscene $0 + setscene 0 return .BugContestIsRunning: - setscene $2 + setscene 2 return .CheckIfContestAvailable: @@ -76,7 +76,7 @@ Route35NationalParkGate_MapScriptHeader: playsound SFX_ENTER_DOOR special FadeOutPalettes waitsfx - warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f + warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47 end OfficerScript_0x6a204: @@ -114,7 +114,7 @@ Route35NationalParkGate_OkayToProceed: special FadeOutPalettes waitsfx special Special_SelectRandomBugContestContestants - warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f + warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47 end Route35NationalParkGate_EnterContest: diff --git a/maps/Route36.asm b/maps/Route36.asm index 4076725b4..40a4ae446 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -44,9 +44,9 @@ Route36SuicuneScript: disappear ROUTE36_SUICUNE spriteface PLAYER, DOWN pause 10 - setscene $0 + setscene 0 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - setmapscene CIANWOOD_CITY, $1 + setmapscene CIANWOOD_CITY, 1 end SudowoodoScript: diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 88d7abb14..9c6bd8c45 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -37,11 +37,11 @@ Route36NationalParkGate_MapScriptHeader: .CheckIfContestRunning: checkflag ENGINE_BUG_CONTEST_TIMER iftrue .BugContestIsRunning - setscene $0 + setscene 0 return .BugContestIsRunning: - setscene $2 + setscene 2 return .CheckIfContestAvailable: @@ -93,7 +93,7 @@ Route36NationalParkGate_MapScriptHeader: playsound SFX_EXIT_BUILDING special FadeOutPalettes waitsfx - warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 + warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 end .CopyContestants: @@ -177,7 +177,7 @@ Route36OfficerScriptContest: special FadeOutPalettes waitsfx special Special_SelectRandomBugContestContestants - warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 + warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 end .LeaveMonsWithOfficer: diff --git a/maps/Route42.asm b/maps/Route42.asm index ccf174b17..9f18f09e8 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -31,9 +31,9 @@ Route42SuicuneScript: applymovement ROUTE42_SUICUNE, MovementData_0x1a9356 disappear ROUTE42_SUICUNE pause 10 - setscene $0 + setscene 0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36 - setmapscene ROUTE_36, $1 + setmapscene ROUTE_36, 1 end TrainerFisherTully1: @@ -216,14 +216,14 @@ Route42HiddenMaxPotion: MovementData_0x1a9356: - db $39 ; movement + set_sliding fast_jump_step UP fast_jump_step UP fast_jump_step UP fast_jump_step RIGHT fast_jump_step RIGHT fast_jump_step RIGHT - db $38 ; movement + remove_sliding step_end FisherTully1SeenText: diff --git a/maps/Route43.asm b/maps/Route43.asm index b76ebaead..79e367af9 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -19,11 +19,11 @@ Route43_MapScriptHeader: .CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .NoRockets - setmapscene ROUTE_43_GATE, $0 + setmapscene ROUTE_43_GATE, 0 return .NoRockets: - setmapscene ROUTE_43_GATE, $1 + setmapscene ROUTE_43_GATE, 1 return TrainerCamperSpencer: diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 58bb163ef..e59c04390 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -25,11 +25,11 @@ Route43Gate_MapScriptHeader: .CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .NoRockets - setmapscene ROUTE_43, $0 + setmapscene ROUTE_43, 0 return .NoRockets: - setmapscene ROUTE_43, $1 + setmapscene ROUTE_43, 1 return .RocketTakeover: @@ -37,7 +37,7 @@ Route43Gate_MapScriptHeader: checkcode VAR_FACING if_equal DOWN, RocketScript_Southbound if_equal UP, RocketScript_Northbound - setscene $1 + setscene 1 end RocketScript_Southbound: @@ -69,7 +69,7 @@ RocketScript_ShakeDownSouth: closetext applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth - setscene $1 + setscene 1 special RestartMapMusic end @@ -101,7 +101,7 @@ RocketScript_ShakeDownNorth: closetext applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth - setscene $1 + setscene 1 special RestartMapMusic end diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 355b5591c..14ed627d1 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -23,15 +23,15 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader: .HiddenDoors: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER iftrue .WallOpen - changeblock $4, $0, $2e + changeblock 4, 0, $2e .WallOpen: checkevent EVENT_SOLVED_AERODACTYL_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock $2, $2, $1 - changeblock $4, $2, $2 + changeblock 2, 2, $1 + changeblock 4, 2, $2 return .WallOpenScript: @@ -40,10 +40,10 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader: showemote EMOTE_SHOCK, PLAYER, 20 pause 30 playsound SFX_STRENGTH - changeblock $4, $0, $30 + changeblock 4, 0, $30 reloadmappart earthquake 50 - setscene $1 + setscene 1 closetext end @@ -59,11 +59,11 @@ UnknownScript_0x58df7: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_AERODACTYL_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_3 - setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 - changeblock $2, $2, $18 - changeblock $4, $2, $19 + changeblock 2, 2, $18 + changeblock 4, 2, $19 reloadmappart playsound SFX_STRENGTH earthquake 80 @@ -106,7 +106,7 @@ UnknownScript_0x58e46: end MovementData_0x58e4d: - db $59 ; movement + skyfall_top step_end UnknownText_0x58e4f: diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 52915317d..586231a08 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -24,15 +24,15 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: .HiddenDoors: checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue .WallOpen - changeblock $4, $0, $2e + changeblock 4, 0, $2e .WallOpen: checkevent EVENT_SOLVED_HO_OH_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock $2, $2, $1 - changeblock $4, $2, $2 + changeblock 2, 2, $1 + changeblock 4, 2, $2 return .WallOpenScript: @@ -41,10 +41,10 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: showemote EMOTE_SHOCK, PLAYER, 20 pause 30 playsound SFX_STRENGTH - changeblock $4, $0, $30 + changeblock 4, 0, $30 reloadmappart earthquake 50 - setscene $1 + setscene 1 closetext end @@ -60,11 +60,11 @@ UnknownScript_0x585ba: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_HO_OH_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_4 - setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 - changeblock $2, $2, $18 - changeblock $4, $2, $19 + changeblock 2, 2, $18 + changeblock 4, 2, $19 reloadmappart playsound SFX_STRENGTH earthquake 80 @@ -107,7 +107,7 @@ UnknownScript_0x58609: end MovementData_0x58610: - db $59 ; movement + skyfall_top step_end UnknownText_0x58612: diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index e0f9b4ad8..a7c329068 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -24,7 +24,7 @@ RuinsOfAlphInnerChamber_MapScriptHeader: writetext RuinsOfAlphStrangePresenceText waitbutton closetext - setscene $0 + setscene 0 setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER end diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index e4f3f16c5..e7ea3ee53 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -27,15 +27,15 @@ RuinsOfAlphKabutoChamber_MapScriptHeader: .HiddenDoors: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue .WallOpen - changeblock $4, $0, $2e + changeblock 4, 0, $2e .WallOpen: checkevent EVENT_SOLVED_KABUTO_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock $2, $2, $1 - changeblock $4, $2, $2 + changeblock 2, 2, $1 + changeblock 4, 2, $2 return .WallOpenScript: @@ -44,10 +44,10 @@ RuinsOfAlphKabutoChamber_MapScriptHeader: showemote EMOTE_SHOCK, PLAYER, 20 pause 30 playsound SFX_STRENGTH - changeblock $4, $0, $30 + changeblock 4, 0, $30 reloadmappart earthquake 50 - setscene $1 + setscene 1 closetext end @@ -67,11 +67,11 @@ UnknownScript_0x58778: setevent EVENT_SOLVED_KABUTO_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_1 setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST - setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 - changeblock $2, $2, $18 - changeblock $4, $2, $19 + changeblock 2, 2, $18 + changeblock 4, 2, $19 reloadmappart playsound SFX_STRENGTH earthquake 80 @@ -144,7 +144,7 @@ UnknownScript_0x587f7: end MovementData_0x587fe: - db $59 ; movement + skyfall_top step_end RuinsOfAlphKabutoChamberReceptionistText: diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 994f69edd..9943aeef8 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -24,15 +24,15 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: .HiddenDoors: checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue .WallOpen - changeblock $4, $0, $2e + changeblock 4, 0, $2e .WallOpen: checkevent EVENT_SOLVED_OMANYTE_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock $2, $2, $1 - changeblock $4, $2, $2 + changeblock 2, 2, $1 + changeblock 4, 2, $2 return .WallOpenScript: @@ -41,10 +41,10 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: showemote EMOTE_SHOCK, PLAYER, 20 pause 30 playsound SFX_STRENGTH - changeblock $4, $0, $30 + changeblock 4, 0, $30 reloadmappart earthquake 50 - setscene $1 + setscene 1 closetext end @@ -60,11 +60,11 @@ UnknownScript_0x58c36: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_OMANYTE_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_2 - setmapscene RUINS_OF_ALPH_INNER_CHAMBER, $1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 - changeblock $2, $2, $18 - changeblock $4, $2, $19 + changeblock 2, 2, $18 + changeblock 4, 2, $19 reloadmappart playsound SFX_STRENGTH earthquake 80 @@ -107,7 +107,7 @@ UnknownScript_0x58c85: end MovementData_0x58c8c: - db $59 ; movement + skyfall_top step_end UnknownText_0x58c8e: diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 478a2b9d0..258a6f1c8 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -35,12 +35,12 @@ RuinsOfAlphOutside_MapScriptHeader: .YesScientist: appear RUINSOFALPHOUTSIDE_SCIENTIST - setscene $1 + setscene 1 return .NoScientist: disappear RUINSOFALPHOUTSIDE_SCIENTIST - setscene $0 + setscene 0 return RuinsOfAlphOutsideScientistScene1: @@ -66,7 +66,7 @@ UnknownScript_0x58044: disappear RUINSOFALPHOUTSIDE_SCIENTIST stopfollow applymovement PLAYER, MovementData_0x580c5 - setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, $1 + setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, 1 warpcheck end diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 223b2bd62..bd20284d0 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -26,7 +26,7 @@ RuinsOfAlphResearchCenter_MapScriptHeader: return .ShowScientist: - moveobject RUINSOFALPHRESEARCHCENTER_SCIENTIST3, $3, $7 + moveobject RUINSOFALPHRESEARCHCENTER_SCIENTIST3, 3, 7 appear RUINSOFALPHRESEARCHCENTER_SCIENTIST3 return @@ -55,7 +55,7 @@ RuinsOfAlphResearchCenter_MapScriptHeader: waitbutton closetext applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276 - setscene $0 + setscene 0 special RestartMapMusic end diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 008356172..53f900cad 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -22,7 +22,7 @@ SabrinaScript_0x189c2e: waitbutton closetext winlosstext UnknownText_0x189df4, 0 - loadtrainer SABRINA, 1 + loadtrainer SABRINA, SABRINA1 startbattle reloadmapafterbattle setevent EVENT_BEAT_SABRINA @@ -111,7 +111,7 @@ SaffronGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext SABRINA, 1, $1 + trainertotext SABRINA, SABRINA1, $1 jumpstd gymstatue2 UnknownText_0x189cdf: diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 19c35a37c..19ea7a6ec 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -41,7 +41,7 @@ OfficerScript_0x18a81e: warpcheck newloadmap MAPSETUP_TRAIN applymovement PLAYER, .MovementBoardTheTrain - wait $14 + wait 20 end .MovementBoardTheTrain: diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index f08ba0b8f..225dab027 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -22,7 +22,7 @@ BlaineScript_0x1ab4fb: waitbutton closetext winlosstext UnknownText_0x1ab646, 0 - loadtrainer BLAINE, 1 + loadtrainer BLAINE, BLAINE1 startbattle iftrue .ReturnAfterBattle appear SEAFOAMGYM_GYM_GUY diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 7daab6ba8..fd546e67a 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -16,7 +16,7 @@ Red: waitbutton closetext winlosstext .Text2, .Text2 - loadtrainer RED, 1 + loadtrainer RED, RED1 startbattle dontrestartmapmusic reloadmapafterbattle @@ -37,8 +37,8 @@ Red: end .Text1: - text $56 - line $56 + text "<......>" + line "<......>" done .Text2: @@ -46,8 +46,8 @@ Red: done .Text3: - text $56 - line $56 + text "<......>" + line "<......>" done SilverCaveRoom3_MapEventHeader: diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index c4357abf1..5f549fc8f 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -47,7 +47,7 @@ TrainerGruntM1: pause 15 special Special_FadeInQuickly disappear SLOWPOKEWELLB1F_KURT - moveobject SLOWPOKEWELLB1F_KURT, $b, $6 + moveobject SLOWPOKEWELLB1F_KURT, 11, 6 appear SLOWPOKEWELLB1F_KURT applymovement SLOWPOKEWELLB1F_KURT, KurtSlowpokeWellVictoryMovementData spriteface PLAYER, RIGHT @@ -57,7 +57,7 @@ TrainerGruntM1: closetext setevent EVENT_CLEARED_SLOWPOKE_WELL variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER - setmapscene AZALEA_TOWN, $1 + setmapscene AZALEA_TOWN, 1 clearevent EVENT_ILEX_FOREST_APPRENTICE clearevent EVENT_ILEX_FOREST_FARFETCHD setevent EVENT_CHARCOAL_KILN_FARFETCH_D @@ -70,7 +70,7 @@ TrainerGruntM1: special FadeOutPalettes special HealParty pause 15 - warp KURTS_HOUSE, $3, $3 + warp KURTS_HOUSE, 3, 3 end TrainerGruntM2: diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 33dd4dcd8..643a590f5 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -59,7 +59,7 @@ UnknownScript_0x184947: disappear SPROUTTOWER3F_SILVER waitsfx special Special_FadeInQuickly - setscene $1 + setscene 1 special RestartMapMusic end diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 464215210..fce00700b 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -30,7 +30,7 @@ SecurityCamera1a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $2 + moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 2 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -39,7 +39,7 @@ SecurityCamera1a: scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $2 + moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 2 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 @@ -55,7 +55,7 @@ SecurityCamera1b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $3 + moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 3 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -64,7 +64,7 @@ SecurityCamera1b: scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $3 + moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 3 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 @@ -80,7 +80,7 @@ SecurityCamera2a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $4, $7 + moveobject TEAMROCKETBASEB1F_ROCKET1, 4, 7 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement2 @@ -90,7 +90,7 @@ SecurityCamera2a: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveobject TEAMROCKETBASEB1F_ROCKET1, $c, $5 + moveobject TEAMROCKETBASEB1F_ROCKET1, 12, 5 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement3 scall TrainerCameraGrunt2 @@ -106,7 +106,7 @@ SecurityCamera2b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $4, $8 + moveobject TEAMROCKETBASEB1F_ROCKET1, 4, 8 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement4 @@ -116,7 +116,7 @@ SecurityCamera2b: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveobject TEAMROCKETBASEB1F_ROCKET1, $c, $5 + moveobject TEAMROCKETBASEB1F_ROCKET1, 12, 5 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement5 scall TrainerCameraGrunt2 @@ -132,7 +132,7 @@ SecurityCamera3a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $6 + moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 6 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -142,7 +142,7 @@ SecurityCamera3a: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveobject TEAMROCKETBASEB1F_ROCKET1, $19, $b + moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 11 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement6 scall TrainerCameraGrunt2 @@ -158,7 +158,7 @@ SecurityCamera3b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $13, $7 + moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 7 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -168,7 +168,7 @@ SecurityCamera3b: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveobject TEAMROCKETBASEB1F_ROCKET1, $19, $c + moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 12 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement7 scall TrainerCameraGrunt2 @@ -184,7 +184,7 @@ SecurityCamera4: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $11, $10 + moveobject TEAMROCKETBASEB1F_ROCKET1, 17, 16 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -194,7 +194,7 @@ SecurityCamera4: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveobject TEAMROCKETBASEB1F_ROCKET1, $19, $b + moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 11 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement8 scall TrainerCameraGrunt2 @@ -210,7 +210,7 @@ SecurityCamera5: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveobject TEAMROCKETBASEB1F_ROCKET1, $3, $10 + moveobject TEAMROCKETBASEB1F_ROCKET1, 3, 16 appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 @@ -220,7 +220,7 @@ SecurityCamera5: showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveobject TEAMROCKETBASEB1F_ROCKET1, $e, $10 + moveobject TEAMROCKETBASEB1F_ROCKET1, 14, 16 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement9 scall TrainerCameraGrunt2 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 0ed2c67f0..76b22da03 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -44,18 +44,18 @@ TeamRocketBaseB2F_MapScriptHeader: return .Change: - changeblock $e, $c, $7 + changeblock 14, 12, $7 return UnknownScript_0x6cf95: - moveobject TEAMROCKETBASEB2F_LANCE, $9, $d + moveobject TEAMROCKETBASEB2F_LANCE, 9, 13 jump UnknownScript_0x6cfac UnknownScript_0x6cf9c: - moveobject TEAMROCKETBASEB2F_ROCKET_GIRL, $15, $10 - moveobject TEAMROCKETBASEB2F_ROCKET1, $15, $10 - moveobject TEAMROCKETBASEB2F_DRAGON, $a, $d - moveobject TEAMROCKETBASEB2F_LANCE, $a, $d + moveobject TEAMROCKETBASEB2F_ROCKET_GIRL, 21, 16 + moveobject TEAMROCKETBASEB2F_ROCKET1, 21, 16 + moveobject TEAMROCKETBASEB2F_DRAGON, 10, 13 + moveobject TEAMROCKETBASEB2F_LANCE, 10, 13 UnknownScript_0x6cfac: appear TEAMROCKETBASEB2F_ROCKET_GIRL appear TEAMROCKETBASEB2F_ROCKET1 @@ -118,7 +118,7 @@ UnknownScript_0x6cfac: disappear TEAMROCKETBASEB2F_ROCKET4 pause 15 special Special_FadeInQuickly - setscene $2 + setscene 2 clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE spriteface TEAMROCKETBASEB2F_LANCE, DOWN opentext @@ -175,7 +175,7 @@ LanceHealsCommon: writetext LanceHealsText2 waitbutton closetext - setscene $1 + setscene 1 setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE checkcode VAR_FACING if_equal RIGHT, UnknownScript_0x6d0be @@ -280,7 +280,7 @@ UnknownScript_0x6d182: end UnknownScript_0x6d184: - moveobject TEAMROCKETBASEB2F_LANCE, $12, $6 + moveobject TEAMROCKETBASEB2F_LANCE, 18, 6 appear TEAMROCKETBASEB2F_LANCE applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a spriteface PLAYER, RIGHT @@ -304,7 +304,7 @@ UnknownScript_0x6d184: clearflag ENGINE_ROCKET_SIGNAL_ON_CH20 setevent EVENT_ROUTE_43_GATE_ROCKETS setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM - setscene $3 + setscene 3 clearevent EVENT_LAKE_OF_RAGE_CIVILIANS setevent EVENT_TURNED_OFF_SECURITY_CAMERAS setevent EVENT_SECURITY_CAMERA_1 @@ -330,7 +330,7 @@ UnknownScript_0x6d1e8: writetext UnknownText_0x6dd6b waitbutton playsound SFX_ENTER_DOOR - changeblock $e, $c, $7 + changeblock 14, 12, $7 reloadmappart closetext setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER @@ -414,9 +414,9 @@ MovementData_0x6d236: MovementData_0x6d23b: fix_facing - db $39 ; movement + set_sliding jump_step RIGHT - db $38 ; movement + remove_sliding remove_fixed_facing step_end diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 63729ce63..3801be542 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -45,7 +45,7 @@ TeamRocketBaseB3F_MapScriptHeader: return .OpenSesame: - changeblock $a, $8, $7 + changeblock 10, 8, $7 return LanceGetPasswordScript: @@ -60,7 +60,7 @@ LanceGetPasswordScript: closetext applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c disappear TEAMROCKETBASEB3F_LANCE - setscene $1 + setscene 1 end RocketBaseRival: @@ -79,7 +79,7 @@ RocketBaseRival: applymovement PLAYER, RocketBaseRivalShovesPlayerMovement applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeaveMovement disappear TEAMROCKETBASEB3F_SILVER - setscene $2 + setscene 2 special RestartMapMusic end @@ -116,7 +116,7 @@ UnknownScript_0x6e056: playsound SFX_TACKLE applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147 disappear TEAMROCKETBASEB3F_ROCKET1 - setscene $3 + setscene 3 end RocketBaseMurkrow: @@ -194,7 +194,7 @@ TeamRocketBaseB3FLockedDoor: writetext UnknownText_0x6e9a3 waitbutton playsound SFX_ENTER_DOOR - changeblock $a, $8, $7 + changeblock 10, 8, $7 reloadmappart closetext setevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index c24c1606a..b199df655 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -32,8 +32,8 @@ TimeCapsule_MapScriptHeader: return .InitializeAndPreparePokecenter2F: - setscene $1 - setmapscene POKECENTER_2F, $3 + setscene 1 + setmapscene POKECENTER_2F, 3 end MapTimeCapsuleSignpost1Script: diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index ab23a7b3e..a322c6846 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -79,7 +79,7 @@ TinTower1F_MapScriptHeader: .StairsCallback: checkevent EVENT_GOT_RAINBOW_WING iftrue .DontHideStairs - changeblock $a, $2, $9 + changeblock 10, 2, $9 .DontHideStairs: return @@ -125,36 +125,36 @@ TinTower1F_MapScriptHeader: disappear TINTOWER1F_SUICUNE setevent EVENT_FOUGHT_SUICUNE setevent EVENT_SAW_SUICUNE_ON_ROUTE_42 - setmapscene ROUTE_42, $0 + setmapscene ROUTE_42, 0 setevent EVENT_SAW_SUICUNE_ON_ROUTE_36 - setmapscene ROUTE_36, $0 + setmapscene ROUTE_36, 0 setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - setmapscene CIANWOOD_CITY, $0 - setscene $1 + setmapscene CIANWOOD_CITY, 0 + setscene 1 clearevent EVENT_SET_WHEN_FOUGHT_HO_OH reloadmapafterbattle pause 20 spriteface PLAYER, DOWN playmusic MUSIC_MYSTICALMAN_ENCOUNTER playsound SFX_ENTER_DOOR - moveobject TINTOWER1F_EUSINE, $a, $f + moveobject TINTOWER1F_EUSINE, 10, 15 appear TINTOWER1F_EUSINE applymovement TINTOWER1F_EUSINE, MovementData_0x1851ec playsound SFX_ENTER_DOOR - moveobject TINTOWER1F_SAGE1, $9, $f + moveobject TINTOWER1F_SAGE1, 9, 15 appear TINTOWER1F_SAGE1 applymovement TINTOWER1F_SAGE1, MovementData_0x1851f5 playsound SFX_ENTER_DOOR - moveobject TINTOWER1F_SAGE2, $9, $f + moveobject TINTOWER1F_SAGE2, 9, 15 appear TINTOWER1F_SAGE2 applymovement TINTOWER1F_SAGE2, MovementData_0x1851fb playsound SFX_ENTER_DOOR - moveobject TINTOWER1F_SAGE3, $9, $f + moveobject TINTOWER1F_SAGE3, 9, 15 appear TINTOWER1F_SAGE3 applymovement TINTOWER1F_SAGE3, MovementData_0x1851fe - moveobject TINTOWER1F_SAGE1, $7, $d - moveobject TINTOWER1F_SAGE2, $9, $d - moveobject TINTOWER1F_SAGE3, $b, $d + moveobject TINTOWER1F_SAGE1, 7, 13 + moveobject TINTOWER1F_SAGE2, 9, 13 + moveobject TINTOWER1F_SAGE3, 11, 13 spriteface PLAYER, RIGHT opentext writetext TinTowerEusineSuicuneText @@ -201,7 +201,7 @@ TinTower1FSage5Script: earthquake 72 waitsfx playsound SFX_STRENGTH - changeblock $a, $2, $20 + changeblock 10, 2, $20 reloadmappart setevent EVENT_GOT_RAINBOW_WING closetext diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index fe9e43ce4..2e1318363 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -32,8 +32,8 @@ TradeCenter_MapScriptHeader: return .InitializeAndPreparePokecenter2F: - setscene $1 - setmapscene POKECENTER_2F, $1 + setscene 1 + setmapscene POKECENTER_2F, 1 end MapTradeCenterSignpost1Script: diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 7c86eba76..a815a0e35 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -21,7 +21,7 @@ SurgeScript_0x1920a5: waitbutton closetext winlosstext UnknownText_0x192238, 0 - loadtrainer LT_SURGE, 1 + loadtrainer LT_SURGE, LT_SURGE1 startbattle reloadmapafterbattle setevent EVENT_BEAT_LTSURGE @@ -101,7 +101,7 @@ VermilionGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext LT_SURGE, 1, $1 + trainertotext LT_SURGE, LT_SURGE1, $1 jumpstd gymstatue2 UnknownText_0x192142: diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 8d7af46a8..557525898 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -27,7 +27,7 @@ VermilionPort_MapScriptHeader: .LeaveFastShipScript: applymovement PLAYER, MovementData_0x74ef3 appear VERMILIONPORT_SAILOR1 - setscene $0 + setscene 0 setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP @@ -68,8 +68,8 @@ SailorScript_0x74dc4: clearevent EVENT_BEAT_SCHOOLBOY_RICKY setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear VERMILIONPORT_SAILOR1 - setmapscene FAST_SHIP_1F, $1 - warp FAST_SHIP_1F, $19, $1 + setmapscene FAST_SHIP_1F, 1 + warp FAST_SHIP_1F, 25, 1 end UnknownScript_0x74e1a: diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index ef8bd3ead..1ae22e121 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -22,7 +22,7 @@ VictoryRoad_MapScriptHeader: end UnknownScript_0x74492: - moveobject VICTORYROAD_SILVER, $12, $b + moveobject VICTORYROAD_SILVER, 18, 11 spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -32,7 +32,7 @@ UnknownScript_0x74492: scall UnknownScript_0x744d4 applymovement VICTORYROAD_SILVER, MovementData_0x7454c disappear VICTORYROAD_SILVER - setscene $1 + setscene 1 playmapmusic end @@ -46,7 +46,7 @@ UnknownScript_0x744b5: scall UnknownScript_0x744d4 applymovement VICTORYROAD_SILVER, MovementData_0x74555 disappear VICTORYROAD_SILVER - setscene $1 + setscene 1 playmapmusic end diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 95011fd5e..3d15be073 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -40,7 +40,7 @@ VictoryRoadGateBadgeCheckScript: writetext VictoryRoadGateEightBadgesText waitbutton closetext - setscene $1 + setscene 1 end VictoryRoadGateLeftBlackBeltScript: diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 84effea16..aa5934103 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -20,7 +20,7 @@ FalknerScript_0x683c2: waitbutton closetext winlosstext UnknownText_0x6854a, 0 - loadtrainer FALKNER, 1 + loadtrainer FALKNER, FALKNER1 startbattle reloadmapafterbattle setevent EVENT_BEAT_FALKNER @@ -36,7 +36,7 @@ FalknerScript_0x683c2: iftrue .SpeechAfterTM setevent EVENT_BEAT_BIRD_KEEPER_ROD setevent EVENT_BEAT_BIRD_KEEPER_ABE - setmapscene ELMS_LAB, $2 + setmapscene ELMS_LAB, 2 specialphonecall SPECIALCALL_ASSISTANT writetext UnknownText_0x685c8 buttonsound @@ -109,7 +109,7 @@ VioletGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext FALKNER, 1, $1 + trainertotext FALKNER, FALKNER1, $1 jumpstd gymstatue2 UnknownText_0x68473: diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index e4c6e8df6..f16ee8989 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -32,7 +32,7 @@ VioletPokecenter1F_ElmsAideScript: setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE clearevent EVENT_ELMS_AIDE_IN_LAB clearevent EVENT_TOGEPI_HATCHED - setmapscene ROUTE_32, $1 + setmapscene ROUTE_32, 1 writetext UnknownText_0x695c5 waitbutton closetext diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index bf6a99290..ce75a5503 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -18,7 +18,7 @@ ViridianGymBlueScript: waitbutton closetext winlosstext LeaderBlueWinText, 0 - loadtrainer BLUE, 1 + loadtrainer BLUE, BLUE1 startbattle reloadmapafterbattle setevent EVENT_BEAT_BLUE @@ -60,7 +60,7 @@ ViridianGymStatue: jumpstd gymstatue1 .Beaten: - trainertotext BLUE, 1, $1 + trainertotext BLUE, BLUE1, $1 jumpstd gymstatue2 LeaderBlueBeforeText: diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index d72451638..81ece5a06 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -21,11 +21,11 @@ WillsRoom_MapScriptHeader: .WillsRoomDoors: checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED iffalse .KeepDoorsClosed - changeblock $4, $e, $2a + changeblock 4, 14, $2a .KeepDoorsClosed: checkevent EVENT_WILLS_ROOM_EXIT_OPEN iffalse .OpenDoors - changeblock $4, $2, $16 + changeblock 4, 2, $16 .OpenDoors: return @@ -34,10 +34,10 @@ WillsRoom_MapScriptHeader: refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock $4, $e, $2a + changeblock 4, 14, $2a reloadmappart closetext - setscene $1 + setscene 1 setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -51,7 +51,7 @@ WillScript_Battle: waitbutton closetext winlosstext WillScript_WillBeatenText, 0 - loadtrainer WILL, 1 + loadtrainer WILL, WILL1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_WILL @@ -60,7 +60,7 @@ WillScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock $4, $2, $16 + changeblock 4, 2, $16 reloadmappart closetext setevent EVENT_WILLS_ROOM_EXIT_OPEN diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index ab072fb36..1a7b959ff 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -105,7 +105,7 @@ TrainerSageKoji: applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628 spriteface WISETRIOSROOM_SAGE6, UP setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - setscene $1 + setscene 1 end UnknownScript_0x9861b: |