diff options
Diffstat (limited to 'maps')
227 files changed, 1435 insertions, 1544 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 1e36df96f..c10add3c4 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, MEM_BUFFER_1 jumpstd gymstatue2 BugsyText_INeverLose: diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index ba1ee1a2c..a345898f0 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -21,7 +21,7 @@ AzaleaTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .Flypoint + callback MAPCALLBACK_NEWMAP, .Flypoint .DummyScene0: end @@ -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 @@ -211,7 +211,7 @@ WhiteApricornTree: fruittree FRUITTREE_AZALEA_TOWN AzaleaTownHiddenFullHeal: - dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL AzaleaTownRivalBattleApproachMovement1: step LEFT diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 0e44eab3a..637f5c292 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -16,10 +16,10 @@ BattleTower1F_MapScriptHeader: .Scene0: writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS - special BattleTowerAction + special Special_BattleTowerAction iffalse .SkipEverything writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState - special BattleTowerAction + special Special_BattleTowerAction if_equal $0, .SkipEverything if_equal $2, .priorityjump1 if_equal $3, .SkipEverything @@ -34,11 +34,11 @@ BattleTower1F_MapScriptHeader: .priorityjump1 priorityjump BattleTower_LeftWithoutSaving writebyte BATTLETOWERACTION_CHALLENGECANCELED - special BattleTowerAction + special Special_BattleTowerAction writebyte BATTLETOWERACTION_06 - special BattleTowerAction + special Special_BattleTowerAction .SkipEverything: - setscene $1 + setscene 1 .Scene1: end @@ -55,63 +55,63 @@ UnknownScript_0x9e3e0: ReceptionistScript_0x9e3e2: writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState - special BattleTowerAction + special Special_BattleTowerAction if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm opentext writetext Text_BattleTowerWelcomesYou buttonsound writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags] - special BattleTowerAction + special Special_BattleTowerAction if_not_equal $0, Script_Menu_ChallengeExplanationCancel jump Script_BattleTowerIntroductionYesNo Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc writetext Text_WantToGoIntoABattleRoom - writebyte $1 + writebyte TRUE special Special_Menu_ChallengeExplanationCancel - if_equal $1, Script_ChooseChallenge - if_equal $2, Script_BattleTowerExplanation + if_equal 1, Script_ChooseChallenge + if_equal 2, Script_BattleTowerExplanation jump Script_BattleTowerHopeToServeYouAgain Script_ChooseChallenge: ; 0x9e40f writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM - special BattleTowerAction - special SpecialCheckForBattleTowerRules - if_not_equal $0, Script_WaitButton + special Special_BattleTowerAction + special Special_CheckForBattleTowerRules + if_not_equal FALSE, Script_WaitButton 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 + special Special_BattleTowerAction + special Special_BattleTowerRoomMenu if_equal $a, Script_Menu_ChallengeExplanationCancel if_not_equal $0, Script_MobileError writebyte BATTLETOWERACTION_11 - special BattleTowerAction + special Special_BattleTowerAction writetext Text_RightThisWayToYourBattleRoom waitbutton closetext writebyte BATTLETOWERACTION_CHOOSEREWARD - special BattleTowerAction + special Special_BattleTowerAction jump Script_WalkToBattleTowerElevator Script_ResumeBattleTowerChallenge: closetext writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group - special BattleTowerAction + special 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 - special BattleTowerAction + special Special_BattleTowerAction warpsound disappear BATTLETOWER1F_RECEPTIONIST stopfollow @@ -121,15 +121,15 @@ Script_WalkToBattleTowerElevator: Script_GivePlayerHisPrize: ; 0x9e47a writebyte BATTLETOWERACTION_1C - special BattleTowerAction + special Special_BattleTowerAction writebyte BATTLETOWERACTION_GIVEREWARD - special BattleTowerAction + special Special_BattleTowerAction if_equal POTION, Script_YourPackIsStuffedFull - itemtotext $0, $1 + itemtotext USE_SCRIPT_VAR, MEM_BUFFER_1 giveitem ITEM_FROM_MEM, 5 writetext Text_PlayerGotFive writebyte BATTLETOWERACTION_1D - special BattleTowerAction + special Special_BattleTowerAction closetext end @@ -147,7 +147,7 @@ Script_BattleTowerExplanation: ; 0x9e4a5 writetext Text_BattleTowerIntroduction_2 Script_BattleTowerSkipExplanation: writebyte BATTLETOWERACTION_SET_EXPLANATION_READ - special BattleTowerAction + special Special_BattleTowerAction jump Script_Menu_ChallengeExplanationCancel Script_BattleTowerHopeToServeYouAgain: @@ -157,7 +157,7 @@ Script_BattleTowerHopeToServeYouAgain: end UnreferencedScript_0x9e4b6: - special BattleTowerMobileError + special Special_BattleTowerMobileError closetext end @@ -173,8 +173,8 @@ UnreferencedScript_0x9e4be: special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel writebyte BATTLETOWERACTION_SET_EXPLANATION_READ - special BattleTowerAction - special Function1700ba + special Special_BattleTowerAction + special Special_Function1700ba if_equal $a, Script_Menu_ChallengeExplanationCancel if_not_equal $0, Script_MobileError writetext Text_ReceivedAListOfLeadersOnTheHonorRoll @@ -187,15 +187,15 @@ UnreferencedScript_0x9e4be: UnreferencedScript_0x9e4ea: writebyte BATTLETOWERACTION_LEVEL_CHECK - special BattleTowerAction + special Special_BattleTowerAction if_not_equal $0, Script_APkmnLevelExceeds writebyte BATTLETOWERACTION_UBERS_CHECK - special BattleTowerAction + special Special_BattleTowerAction if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 - special SpecialCheckForBattleTowerRules - if_not_equal $0, Script_WaitButton + special Special_CheckForBattleTowerRules + if_not_equal FALSE, Script_WaitButton writebyte BATTLETOWERACTION_05 - special BattleTowerAction + special Special_BattleTowerAction if_equal $0, .zero writetext Text_CantBeRegistered_PreviousRecordDeleted jump continue @@ -208,14 +208,14 @@ 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 + special Special_BattleTowerAction writebyte BATTLETOWERACTION_12 - special BattleTowerAction + special Special_BattleTowerAction writetext Text_RightThisWayToYourBattleRoom waitbutton jump Script_ResumeBattleTowerChallenge @@ -236,7 +236,7 @@ Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549 jump Script_Menu_ChallengeExplanationCancel Script_MobileError: - special BattleTowerMobileError + special Special_BattleTowerMobileError closetext end diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index acd8bfa66..22cbdef3f 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 @@ -23,17 +23,17 @@ Script_BattleRoom: ; 0x9f421 ; beat all 7 opponents in a row Script_BattleRoomLoop: ; 0x9f425 writebyte BATTLETOWERBATTLEROOM_YOUNGSTER - special Function_LoadOpponentTrainerAndPokemonsWithOTSprite + special Special_LoadOpponentTrainerAndPokemonWithOTSprite appear BATTLETOWERBATTLEROOM_YOUNGSTER warpsound waitsfx applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksIn opentext - battletowertext 1 + battletowertext BATTLETOWERTEXT_INTRO buttonsound closetext - special BattleTowerBattle ; calls predef startbattle - special FadeOutPalettes + special Special_BattleTowerBattle ; calls predef startbattle + special Special_FadeOutPalettes reloadmap if_not_equal $0, Script_FailedBattleTowerChallenge copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64 @@ -48,10 +48,10 @@ Script_BattleRoomLoop: ; 0x9f425 waitbutton closetext playmusic MUSIC_HEAL - special FadeOutPalettes - special LoadMapPalettes + special Special_FadeOutPalettes + special Special_LoadMapPalettes pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic opentext writetext Text_NextUpOpponentNo @@ -68,35 +68,35 @@ Script_DontBattleNextOpponent: ; 0x9f483 yesorno iffalse Script_DontSaveAndEndTheSession writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group - special BattleTowerAction + special Special_BattleTowerAction writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward - special BattleTowerAction + special Special_BattleTowerAction writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave - special BattleTowerAction + special Special_BattleTowerAction playsound SFX_SAVE waitsfx - special FadeOutPalettes + special Special_FadeOutPalettes special Reset Script_DontSaveAndEndTheSession: ; 0x9f4a3 writetext Text_CancelYourBattleRoomChallenge yesorno iffalse Script_ContinueAndBattleNextOpponent writebyte BATTLETOWERACTION_CHALLENGECANCELED - special BattleTowerAction + special Special_BattleTowerAction writebyte BATTLETOWERACTION_06 - special BattleTowerAction + special Special_BattleTowerAction closetext - special FadeOutPalettes - warpfacing UP, BATTLE_TOWER_1F, $7, $7 + special Special_FadeOutPalettes + 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 + special Special_BattleTowerAction opentext writetext Text_ThanksForVisiting waitbutton @@ -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 @@ -114,7 +114,7 @@ Script_BeatenAllTrainers2: UnreferencedScript_0x9f4eb: writebyte BATTLETOWERACTION_CHALLENGECANCELED - special BattleTowerAction + special Special_BattleTowerAction opentext writetext Text_TooMuchTimeElapsedNoRegister waitbutton @@ -123,9 +123,9 @@ UnreferencedScript_0x9f4eb: UnreferencedScript_0x9f4f7: writebyte BATTLETOWERACTION_CHALLENGECANCELED - special BattleTowerAction + special Special_BattleTowerAction writebyte BATTLETOWERACTION_06 - special BattleTowerAction + special Special_BattleTowerAction opentext writetext Text_ThanksForVisiting writetext Text_WeHopeToServeYouAgain @@ -133,13 +133,11 @@ UnreferencedScript_0x9f4f7: closetext end - Text_ReturnedAfterSave_Mobile: text "You'll be returned" line "after you SAVE." done - BattleTowerBattleRoom_MapEventHeader: ; filler db 0, 0 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 2327b31fa..e7b70acdc 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -12,7 +12,7 @@ BattleTowerElevator_MapScriptHeader: .Scene0: priorityjump .RideElevator - setscene $1 + setscene 1 .Scene1: end @@ -22,7 +22,7 @@ BattleTowerElevator_MapScriptHeader: applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn writebyte BATTLETOWERACTION_0A - special BattleTowerAction + special Special_BattleTowerAction playsound SFX_ELEVATOR earthquake 60 waitsfx diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 41a3beb83..c12091582 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -12,7 +12,7 @@ BattleTowerHallway_MapScriptHeader: .Scene0: priorityjump .ChooseBattleRoom - setscene $1 + setscene 1 .Scene1: end @@ -21,7 +21,6 @@ BattleTowerHallway_MapScriptHeader: callasm .asm_load_battle_room jump .WalkToChosenBattleRoom - .asm_load_battle_room ld a, [rSVBK] push af @@ -35,7 +34,6 @@ BattleTowerHallway_MapScriptHeader: ld [rSVBK], a ret - ; enter different rooms for different levels to battle against ; at least it should look like that ; because all warps lead to the same room diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 6ed01da6f..adb0c5f21 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -10,8 +10,8 @@ BattleTowerOutside_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_TILES, .Callback1 - dbw MAPCALLBACK_OBJECTS, .Callback2 + callback MAPCALLBACK_TILES, .Callback1 + callback MAPCALLBACK_OBJECTS, .Callback2 .Callback1: return diff --git a/maps/BetaCinnabarIslandPokemonLabHallway.blk b/maps/BetaCinnabarPokemonLabHallway.blk index 7a6502a26..7a6502a26 100644 --- a/maps/BetaCinnabarIslandPokemonLabHallway.blk +++ b/maps/BetaCinnabarPokemonLabHallway.blk diff --git a/maps/BetaCinnabarIslandPokemonLabRoom1.blk b/maps/BetaCinnabarPokemonLabRoom1.blk index ef77b6561..ef77b6561 100644 --- a/maps/BetaCinnabarIslandPokemonLabRoom1.blk +++ b/maps/BetaCinnabarPokemonLabRoom1.blk diff --git a/maps/BetaCinnabarIslandPokemonLabRoom2.blk b/maps/BetaCinnabarPokemonLabRoom2.blk index 822db175b..822db175b 100644 --- a/maps/BetaCinnabarIslandPokemonLabRoom2.blk +++ b/maps/BetaCinnabarPokemonLabRoom2.blk diff --git a/maps/BetaCinnabarIslandPokemonLabRoom3.blk b/maps/BetaCinnabarPokemonLabRoom3.blk index d9a64a5da..d9a64a5da 100644 --- a/maps/BetaCinnabarIslandPokemonLabRoom3.blk +++ b/maps/BetaCinnabarPokemonLabRoom3.blk diff --git a/maps/BetaTeakCity.blk b/maps/BetaEcruteakCity.blk index ce448c2ef..ce448c2ef 100644 --- a/maps/BetaTeakCity.blk +++ b/maps/BetaEcruteakCity.blk diff --git a/maps/BetaSSAquaInsideCutOut.blk b/maps/BetaFastShipInsideCutOut.blk index b385b0198..b385b0198 100644 --- a/maps/BetaSSAquaInsideCutOut.blk +++ b/maps/BetaFastShipInsideCutOut.blk diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index c5cd10235..178e986bd 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -15,8 +15,8 @@ BlackthornCity_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .FlyPoint - dbw MAPCALLBACK_OBJECTS, .Santos + callback MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_OBJECTS, .Santos .FlyPoint: setflag ENGINE_FLYPOINT_BLACKTHORN diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index c640c2c06..8e997132a 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -11,20 +11,20 @@ BlackthornGym1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .Boulders + callback MAPCALLBACK_TILES, .Boulders .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 @@ -70,7 +70,7 @@ BlackthornGymClairScript: buttonsound giveitem TM_DRAGONBREATH iffalse .BagFull - itemtotext TM_DRAGONBREATH, $0 + itemtotext TM_DRAGONBREATH, MEM_BUFFER_0 writetext BlackthornGymText_ReceivedTM24 playsound SFX_ITEM waitsfx @@ -146,7 +146,7 @@ BlackthornGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext CLAIR, 1, $1 + trainertotext CLAIR, CLAIR1, MEM_BUFFER_1 jumpstd gymstatue2 ClairIntroText: diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 6aa55a0e5..2f23f7c9e 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -14,31 +14,30 @@ BlackthornGym2F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_CMDQUEUE, .Boulders + callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable -.Boulders: - writecmdqueue .BoulderCmdQueue +.SetUpStoneTable: + writecmdqueue .CommandQueue return -.BoulderCmdQueue: - dbw CMDQUEUE_STONETABLE, .BoulderTable ; check if any stones are sitting on a warp - dw 0 ; filler +.CommandQueue: + cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp -.BoulderTable: - stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Disappear4 - stonetable 3, BLACKTHORNGYM2F_BOULDER2, .Disappear5 - stonetable 4, BLACKTHORNGYM2F_BOULDER3, .Disappear6 +.StoneTable: + stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Boulder1 + stonetable 3, BLACKTHORNGYM2F_BOULDER2, .Boulder2 + stonetable 4, BLACKTHORNGYM2F_BOULDER3, .Boulder3 db -1 ; end -.Disappear4: +.Boulder1: disappear BLACKTHORNGYM2F_BOULDER1 jump .Fall -.Disappear5: +.Boulder2: disappear BLACKTHORNGYM2F_BOULDER2 jump .Fall -.Disappear6: +.Boulder3: disappear BLACKTHORNGYM2F_BOULDER3 jump .Fall @@ -56,7 +55,6 @@ BlackthornGym2F_MapScriptHeader: earthquake 80 end - BlackthornGymBoulder: jumpstd strengthboulder diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 9a40a68f6..ba1871480 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -27,20 +27,20 @@ DaisyScript: writetext DaisyWhichMonText waitbutton special Special_DaisyMassage - if_equal 0, .Refused - if_equal 1, .CantGroomEgg + if_equal $0, .Refused + if_equal $1, .CantGroomEgg setflag ENGINE_TEA_IN_BLUES_HOUSE writetext DaisyAlrightText waitbutton closetext - special FadeOutPalettes + special Special_FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic opentext writetext GroomedMonLooksContentText - special PlayCurMonCry + special Special_PlayCurMonCry buttonsound writetext DaisyAllDoneText waitbutton diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 784f06185..568ca0476 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -9,7 +9,7 @@ BrunosRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .BrunosRoomDoors + callback MAPCALLBACK_TILES, .BrunosRoomDoors .LockDoor: priorityjump .BrunosDoorLocksBehindYou @@ -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..d35fd0a00 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -14,7 +14,7 @@ BurnedTower1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HoleAndLadder + callback MAPCALLBACK_TILES, .HoleAndLadder .EusineScene: priorityjump .MeetEusine @@ -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, $09 ; 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 @@ -131,12 +131,10 @@ BurnedTower1FRock: jumpstd smashrock BurnedTower1FHiddenEther: - dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER - + hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER BurnedTower1FHiddenUltraBall: - dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL - + hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL BurnedTower1FHPUp: itemball HP_UP diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 07f5c3d6e..d8f1516e5 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -17,7 +17,7 @@ BurnedTowerB1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .LadderCallback + callback MAPCALLBACK_TILES, .LadderCallback .DummyScene0: end @@ -28,7 +28,7 @@ BurnedTowerB1F_MapScriptHeader: .LadderCallback: checkevent EVENT_RELEASED_THE_BEASTS iftrue .NoChange - changeblock $6, $e, $2 + changeblock 6, 14, $02 .NoChange: return @@ -81,22 +81,22 @@ 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 + special Special_InitRoamMons + 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 setevent EVENT_BURNED_TOWER_MORTY setevent EVENT_BURNED_TOWER_1F_EUSINE appear BURNEDTOWERB1F_EUSINE - refreshscreen $0 - changeblock $6, $e, $1b + refreshscreen + changeblock 6, 14, $1b reloadmappart closetext - setscene $1 + setscene 1 end BurnedTowerB1FEusine: @@ -106,7 +106,7 @@ BurnedTowerB1FEusine: waitbutton closetext checkcode VAR_FACING - if_equal $1, .Movement + if_equal UP, .Movement applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1 jump UnknownScript_0x18622a diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index de89b1953..9a1b58799 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -96,7 +96,7 @@ CeladonCafeTrashcan: giveitem LEFTOVERS iffalse .PackFull opentext - itemtotext LEFTOVERS, $0 + itemtotext LEFTOVERS, MEM_BUFFER_0 writetext FoundLeftoversText playsound SFX_ITEM waitsfx @@ -107,7 +107,7 @@ CeladonCafeTrashcan: .PackFull: opentext - itemtotext LEFTOVERS, $0 + itemtotext LEFTOVERS, MEM_BUFFER_0 writetext FoundLeftoversText buttonsound writetext NoRoomForLeftoversText diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index bfc5265ea..bcd254a2f 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -15,7 +15,7 @@ CeladonCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_CELADON @@ -75,7 +75,7 @@ CeladonCityPokecenterSign: jumpstd pokecentersign CeladonCityHiddenPpUp: - dwb EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP + hiddenitem EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP CeladonCityFisherText: text "This POLIWRATH is" diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 01dfa6642..50a581c91 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -8,10 +8,10 @@ CeladonDeptStore6F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .Callback + callback MAPCALLBACK_TILES, .Callback .Callback: - changeblock $c, $0, $3 + changeblock 12, 0, $03 return CeladonDeptStore6FSuperNerdScript: @@ -24,41 +24,41 @@ CeladonDeptStore6FVendingMachine: opentext writetext CeladonVendingText .Start: - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight loadmenudata .MenuData verticalmenu closewindow - if_equal $1, .FreshWater - if_equal $2, .SodaPop - if_equal $3, .Lemonade + if_equal 1, .FreshWater + if_equal 2, .SodaPop + if_equal 3, .Lemonade closetext end .FreshWater: - checkmoney $0, 200 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 200 + if_equal HAVE_LESS, .NotEnoughMoney giveitem FRESH_WATER iffalse .NotEnoughSpace - takemoney $0, 200 - itemtotext FRESH_WATER, $0 + takemoney YOUR_MONEY, 200 + itemtotext FRESH_WATER, MEM_BUFFER_0 jump .VendItem .SodaPop: - checkmoney $0, 300 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 300 + if_equal HAVE_LESS, .NotEnoughMoney giveitem SODA_POP iffalse .NotEnoughSpace - takemoney $0, 300 - itemtotext SODA_POP, $0 + takemoney YOUR_MONEY, 300 + itemtotext SODA_POP, MEM_BUFFER_0 jump .VendItem .Lemonade: - checkmoney $0, 350 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 350 + if_equal HAVE_LESS, .NotEnoughMoney giveitem LEMONADE iffalse .NotEnoughSpace - takemoney $0, 350 - itemtotext LEMONADE, $0 + takemoney YOUR_MONEY, 350 + itemtotext LEMONADE, MEM_BUFFER_0 jump .VendItem .VendItem: @@ -81,8 +81,7 @@ CeladonDeptStore6FVendingMachine: .MenuData: db MENU_BACKUP_TILES ; flags - db 02, 00 ; start coords - db 11, 19 ; end coords + menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -94,7 +93,6 @@ CeladonDeptStore6FVendingMachine: db "LEMONADE ¥350@" db "CANCEL@" - CeladonDeptStore6FDirectory: jumptext CeladonDeptStore6FDirectoryText diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index d199bb734..13317c02a 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -25,7 +25,7 @@ CeladonDeptStoreElevatorData: elevfloor FLOOR_4F, 3, CELADON_DEPT_STORE_4F elevfloor FLOOR_5F, 3, CELADON_DEPT_STORE_5F elevfloor FLOOR_6F, 2, CELADON_DEPT_STORE_6F - db $ff ; end + db -1 ; end CeladonDeptStoreElevator_MapEventHeader: ; filler diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index d35b1a45b..7310e2e35 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -59,8 +59,8 @@ CeladonGameCornerFisherScript: checkitem COIN_CASE iffalse .NoCoinCase checkcoins MAX_COINS - 1 - if_equal $0, .FullCoinCase - stringtotext .coinname, $1 + if_equal HAVE_MORE, .FullCoinCase + stringtotext .coinname, MEM_BUFFER_1 scall .GiveCoins givecoins 18 setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON @@ -111,23 +111,23 @@ CeladonGameCornerPoster2Script: jumptext CeladonGameCornerPoster2Text CeladonGameCornerLuckySlotMachineScript: - random $6 - if_equal $0, CeladonGameCornerSlotMachineScript - refreshscreen $0 - writebyte $0 + random 6 + if_equal 0, CeladonGameCornerSlotMachineScript + refreshscreen + writebyte FALSE special Special_SlotMachine closetext end CeladonGameCornerSlotMachineScript: - refreshscreen $0 - writebyte $1 + refreshscreen + writebyte TRUE special Special_SlotMachine closetext end CeladonGameCornerCardFlipScript: - refreshscreen $0 + refreshscreen special Special_CardFlip closetext end @@ -144,7 +144,7 @@ MapCeladonGameCornerSignpost9Script: end MovementData_0x721cd: -; Unreferenced. +; unused step RIGHT turn_head LEFT step_end diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 681d144b4..3407943be 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -15,7 +15,7 @@ CeladonGameCornerPrizeRoomGentlemanScript: CeladonGameCornerPrizeRoomPharmacistScript: jumptextfaceplayer CeladonGameCornerPrizeRoomPharmacistText -GoldenrodGameCornerTMVendor: +CeladonGameCornerPrizeRoomTMVendor: faceplayer opentext writetext CeladonPrizeRoom_PrizeVendorIntroText @@ -28,15 +28,15 @@ CeladonPrizeRoom_tmcounterloop: loadmenudata CeladonPrizeRoom_TMMenuDataHeader verticalmenu closewindow - if_equal $1, .doubleteam - if_equal $2, .psychic - if_equal $3, .hyperbeam + if_equal 1, .doubleteam + if_equal 2, .psychic + if_equal 3, .hyperbeam jump CeladonPrizeRoom_cancel .doubleteam checkcoins 1500 - if_equal $2, CeladonPrizeRoom_notenoughcoins - itemtotext TM_DOUBLE_TEAM, $0 + if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins + itemtotext TM_DOUBLE_TEAM, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel giveitem TM_DOUBLE_TEAM @@ -46,8 +46,8 @@ CeladonPrizeRoom_tmcounterloop: .psychic checkcoins 3500 - if_equal $2, CeladonPrizeRoom_notenoughcoins - itemtotext TM_PSYCHIC_M, $0 + if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins + itemtotext TM_PSYCHIC_M, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel giveitem TM_PSYCHIC_M @@ -57,8 +57,8 @@ CeladonPrizeRoom_tmcounterloop: .hyperbeam checkcoins 7500 - if_equal $2, CeladonPrizeRoom_notenoughcoins - itemtotext TM_HYPER_BEAM, $0 + if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins + itemtotext TM_HYPER_BEAM, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel giveitem TM_HYPER_BEAM @@ -102,11 +102,9 @@ CeladonPrizeRoom_NoCoinCase: closetext end - CeladonPrizeRoom_TMMenuDataHeader: db MENU_BACKUP_TILES ; flags - db 02, 00 ; start coords - db 11, 15 ; end coords + menu_coords 0, 2, 15, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -118,8 +116,7 @@ CeladonPrizeRoom_TMMenuDataHeader: db "TM15 7500@" db "CANCEL@" - -GoldenrodGameCornerPokemonVendor: +CeladonGameCornerPrizeRoomPokemonVendor: faceplayer opentext writetext CeladonPrizeRoom_PrizeVendorIntroText @@ -132,17 +129,17 @@ GoldenrodGameCornerPokemonVendor: loadmenudata .MenuDataHeader verticalmenu closewindow - if_equal $1, .pikachu - if_equal $2, .porygon - if_equal $3, .larvitar + if_equal 1, .pikachu + if_equal 2, .porygon + if_equal 3, .larvitar jump CeladonPrizeRoom_cancel .pikachu checkcoins 2222 - if_equal $2, CeladonPrizeRoom_notenoughcoins + if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins checkcode VAR_PARTYCOUNT - if_equal $6, CeladonPrizeRoom_notenoughroom - pokenamemem PIKACHU, $0 + if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom + pokenamemem PIKACHU, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel waitsfx @@ -157,10 +154,10 @@ GoldenrodGameCornerPokemonVendor: .porygon checkcoins 5555 - if_equal $2, CeladonPrizeRoom_notenoughcoins + if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins checkcode VAR_PARTYCOUNT - if_equal $6, CeladonPrizeRoom_notenoughroom - pokenamemem PORYGON, $0 + if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom + pokenamemem PORYGON, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel waitsfx @@ -175,10 +172,10 @@ GoldenrodGameCornerPokemonVendor: .larvitar checkcoins 8888 - if_equal $2, CeladonPrizeRoom_notenoughcoins + if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins checkcode VAR_PARTYCOUNT - if_equal $6, CeladonPrizeRoom_notenoughroom - pokenamemem LARVITAR, $0 + if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom + pokenamemem LARVITAR, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel waitsfx @@ -191,11 +188,9 @@ GoldenrodGameCornerPokemonVendor: takecoins 8888 jump .loop - .MenuDataHeader: db MENU_BACKUP_TILES ; flags - db 02, 00 ; start coords - db 11, 17 ; end coords + menu_coords 0, 2, 17, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -207,7 +202,6 @@ GoldenrodGameCornerPokemonVendor: db "LARVITAR 8888@" db "CANCEL@" - CeladonGameCornerPrizeRoomGentlemanText: text "I wanted PORYGON," line "but I was short by" @@ -283,8 +277,8 @@ CeladonGameCornerPrizeRoom_MapEventHeader: .BGEvents: db 2 - bg_event 2, 1, BGEVENT_READ, GoldenrodGameCornerTMVendor - bg_event 4, 1, BGEVENT_READ, GoldenrodGameCornerPokemonVendor + bg_event 2, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor + bg_event 4, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor .ObjectEvents: db 2 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index cabb2d45c..2cd4d74ad 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, MEM_BUFFER_1 jumpstd gymstatue2 UnknownText_0x72b28: diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 5274b5b38..895e73e14 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -16,7 +16,7 @@ CooltrainerMScript_0x71670: opentext writetext UnknownText_0x716ce checkcode VAR_DEXCAUGHT - if_greater_than 248, UnknownScript_0x7167e + if_greater_than NUM_POKEMON - 2 - 1, UnknownScript_0x7167e ; ignore Mew and Celebi waitbutton closetext end @@ -28,7 +28,7 @@ UnknownScript_0x7167e: waitsfx writetext UnknownText_0x71760 buttonsound - special Diploma + special Special_Diploma writetext UnknownText_0x71763 waitbutton closetext @@ -49,7 +49,7 @@ UnknownScript_0x716a4: writetext UnknownText_0x717d8 yesorno iffalse UnknownScript_0x716b0 - special PrintDiploma + special Special_PrintDiploma closetext end diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 2c2a594e6..252d14b89 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -30,9 +30,9 @@ CeladonEusine: writetext CeladonEusineText1 buttonsound writebyte SUICUNE - special SpecialMonCheck + special Special_MonCheck iffalse .NoSuicune - special SpecialBeastsCheck + special Special_BeastsCheck iftrue .HoOh writetext NoBeastsText waitbutton @@ -45,7 +45,7 @@ CeladonEusine: waitbutton closetext checkcode VAR_FACING - if_equal $1, .Location1 + if_equal UP, .Location1 applymovement CELADONPOKECENTER1F_EUSINE, .Movement1 jump .Continue @@ -133,7 +133,7 @@ NoBeastsText: para "#MON RAIKOU and" line "ENTEI?" - para $56, $56, $56 + para "<......><......><......>" para "Okay…" diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 47a991d21..23dd9444a 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -12,7 +12,7 @@ CeruleanCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_CERULEAN @@ -147,7 +147,7 @@ CeruleanCityMartSign: jumpstd martsign CeruleanCityHiddenBerserkGene: - dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE + hiddenitem EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE CeruleanCityCooltrainerMText1: text "KANTO's POWER" diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 59a1b72b9..144b690b1 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 @@ -135,8 +135,7 @@ CeruleanGymGuyScript: end CeruleanGymHiddenMachinePart: - dwb EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART - + hiddenitem EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART CeruleanGymStatue1: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM @@ -161,7 +160,7 @@ CeruleanGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext MISTY, 1, $1 + trainertotext MISTY, MISTY1, MEM_BUFFER_1 jumpstd gymstatue2 MovementData_0x1884e3: @@ -178,9 +177,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/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 2e03275d4..74b5b2bbb 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -14,7 +14,7 @@ NurseScript_0x18820f: jumpstd pokecenternurse SuperNerdScript_0x188212: - special Mobile_DummyReturnFalse + special Special_Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x188221 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index d87d52165..37464afd5 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -13,7 +13,7 @@ CherrygroveCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end @@ -69,7 +69,7 @@ CherrygroveCityGuideGent: opentext writetext GuideGentGiftText buttonsound - stringtotext .mapcardname, $1 + stringtotext .mapcardname, MEM_BUFFER_1 scall .JumpstdReceiveItem setflag ENGINE_MAP_CARD writetext GotMapCardText @@ -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 86c958205..44d61317a 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -20,7 +20,7 @@ CianwoodCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune + callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune .DummyScene0: end @@ -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 @@ -145,26 +145,26 @@ CianwoodCityRock: jumpstd smashrock CianwoodCityHiddenRevive: - dwb EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE CianwoodCityHiddenMaxEther: - dwb EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem 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: @@ -390,7 +390,7 @@ CianwoodCity_MapEventHeader: warp_def 8, 43, 1, CIANWOOD_GYM warp_def 23, 43, 1, CIANWOOD_POKECENTER_1F warp_def 15, 47, 1, CIANWOOD_PHARMACY - warp_def 9, 31, 1, CIANWOOD_CITY_PHOTO_STUDIO + warp_def 9, 31, 1, CIANWOOD_PHOTO_STUDIO warp_def 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE warp_def 5, 17, 1, POKE_SEERS_HOUSE diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 0323fc0eb..95aa6aaf0 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, MEM_BUFFER_1 jumpstd gymstatue2 CianwoodGymMovement_ChuckChucksBoulder: diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index 3a20c63e6..5b7f63206 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -1,7 +1,7 @@ const_value set 2 - const CIANWOODCITYPHOTOSTUDIO_FISHING_GURU + const CIANWOODPHOTOSTUDIO_FISHING_GURU -CianwoodCityPhotoStudio_MapScriptHeader: +CianwoodPhotoStudio_MapScriptHeader: .SceneScripts: db 0 @@ -16,7 +16,7 @@ FishingGuruScript_0x9e0e0: iffalse UnknownScript_0x9e0f3 writetext UnknownText_0x9e142 waitbutton - special PhotoStudio + special Special_PhotoStudio waitbutton closetext end @@ -48,7 +48,7 @@ UnknownText_0x9e156: line "memento…" done -CianwoodCityPhotoStudio_MapEventHeader: +CianwoodPhotoStudio_MapEventHeader: ; filler db 0, 0 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 50b26a8f5..36d25a127 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -7,7 +7,7 @@ CinnabarIsland_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_CINNABAR @@ -35,7 +35,7 @@ CinnabarIslandPokecenterSign: jumpstd pokecentersign CinnabarIslandHiddenRareCandy: - dwb EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY CinnabarIslandBlueTeleport: teleport_from diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 647e16541..eba9d42fc 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -11,8 +11,8 @@ Colosseum_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_OBJECTS, .SetWhichChris - dbw MAPCALLBACK_NEWMAP, .PreparePokecenter2F + callback MAPCALLBACK_OBJECTS, .SetWhichChris + callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F .InitializeColosseum: priorityjump .InitializeAndPreparePokecenter2F @@ -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/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 5456973dc..78890e37c 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -12,7 +12,7 @@ CopycatsHouse2F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Callback + callback MAPCALLBACK_OBJECTS, .Callback .Callback: checkflag ENGINE_PLAYER_IS_FEMALE @@ -46,7 +46,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Default_Merge_1: - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX checkevent EVENT_RETURNED_MACHINE_PART iftrue .TalkAboutLostItem opentext @@ -70,7 +70,7 @@ Copycat: .Default_Merge_3a: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX opentext writetext CopycatText_QuickMimicking waitbutton @@ -99,7 +99,7 @@ Copycat: .Default_Merge_3b: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX opentext writetext CopycatText_Worried waitbutton @@ -142,7 +142,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .GotPass_Merge_1: - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX opentext checkflag ENGINE_PLAYER_IS_FEMALE iftrue .GotPass_Female_2 @@ -164,7 +164,7 @@ Copycat: .GotPass_Merge_3: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX opentext writetext CopycatText_ItsAScream waitbutton diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index b1e629a54..b7806dcef 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -31,8 +31,7 @@ DarkCaveVioletEntranceRock: jumpstd smashrock DarkCaveVioletEntranceHiddenElixer: - dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER - + hiddenitem EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER DarkCaveVioletEntrance_MapEventHeader: ; filler diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 0d06cea93..447f52971 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -8,7 +8,7 @@ DayCare_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .EggCheckCallback + callback MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: checkflag ENGINE_DAY_CARE_MAN_HAS_EGG diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 04277b792..92e39d7b4 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -12,8 +12,7 @@ DiglettsCavePokefanMScript: jumptextfaceplayer DiglettsCavePokefanMText DiglettsCaveHiddenMaxRevive: - dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE - + hiddenitem EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE DiglettsCavePokefanMText: text "A bunch of DIGLETT" diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 98b57b4de..6bdd57bfa 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -21,67 +21,67 @@ DragonShrine_MapScriptHeader: end .DragonShrineTestScript: - applymovement PLAYER, MovementData_0x18d2bf - applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c7 + applymovement PLAYER, DragonShrinePlayerWalkInMovement + applymovement DRAGONSHRINE_ELDER1, DragonShrineElderStepDownMovement opentext - writetext UnknownText_0x18d2ea + writetext DragonShrineElderGreetingText buttonsound .Question1: setevent EVENT_RECEIVED_BALLS_FROM_KURT - writetext UnknownText_0x18d3bc + writetext DragonShrineQuestion1Text buttonsound - loadmenudata MenuDataHeader_0x18d215 + loadmenudata DragonShrineQuestion1_MenuDataHeader verticalmenu closewindow - if_equal $1, .RightAnswer - if_equal $2, .WrongAnswer - if_equal $3, .RightAnswer + if_equal 1, .RightAnswer + if_equal 2, .WrongAnswer + if_equal 3, .RightAnswer end .Question2: setevent EVENT_DRAGON_SHRINE_QUESTION_2 - writetext UnknownText_0x18d3d3 + writetext DragonShrineQuestion2Text buttonsound - loadmenudata MenuDataHeader_0x18d234 + loadmenudata DragonShrineQuestion2_MenuDataHeader verticalmenu closewindow - if_equal $1, .RightAnswer - if_equal $2, .RightAnswer - if_equal $3, .WrongAnswer + if_equal 1, .RightAnswer + if_equal 2, .RightAnswer + if_equal 3, .WrongAnswer .Question3: setevent EVENT_DRAGON_SHRINE_QUESTION_3 - writetext UnknownText_0x18d3f3 + writetext DragonShrineQuestion3Text buttonsound - loadmenudata MenuDataHeader_0x18d258 + loadmenudata DragonShrineQuestion3_MenuDataHeader verticalmenu closewindow - if_equal $1, .WrongAnswer - if_equal $2, .RightAnswer - if_equal $3, .RightAnswer + if_equal 1, .WrongAnswer + if_equal 2, .RightAnswer + if_equal 3, .RightAnswer .Question4: setevent EVENT_DRAGON_SHRINE_QUESTION_4 - writetext UnknownText_0x18d420 + writetext DragonShrineQuestion4Text buttonsound - loadmenudata MenuDataHeader_0x18d283 + loadmenudata DragonShrineQuestion4_MenuDataHeader verticalmenu closewindow - if_equal $1, .RightAnswer - if_equal $2, .WrongAnswer - if_equal $3, .RightAnswer + if_equal 1, .RightAnswer + if_equal 2, .WrongAnswer + if_equal 3, .RightAnswer .Question5: setevent EVENT_DRAGON_SHRINE_QUESTION_5 - writetext UnknownText_0x18d44a + writetext DragonShrineQuestion5Text buttonsound - loadmenudata MenuDataHeader_0x18d2a5 + loadmenudata DragonShrineQuestion5_MenuDataHeader verticalmenu closewindow - if_equal $1, .WrongAnswer - if_equal $2, .RightAnswer - if_equal $3, .WrongAnswer + if_equal 1, .WrongAnswer + if_equal 2, .RightAnswer + if_equal 3, .WrongAnswer .RightAnswer: checkevent EVENT_DRAGON_SHRINE_QUESTION_5 iftrue .PassedTheTest - writetext UnknownText_0x18d82d + writetext DragonShrineRightAnswerText buttonsound checkevent EVENT_DRAGON_SHRINE_QUESTION_4 iftrue .Question5 @@ -95,12 +95,12 @@ DragonShrine_MapScriptHeader: closetext spriteface DRAGONSHRINE_ELDER1, LEFT opentext - writetext UnknownText_0x18d7f6 + writetext DragonShrineWrongAnswerText1 waitbutton closetext spriteface DRAGONSHRINE_ELDER1, DOWN opentext - writetext UnknownText_0x18d816 + writetext DragonShrineWrongAnswerText2 waitbutton closetext setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG @@ -116,7 +116,7 @@ DragonShrine_MapScriptHeader: checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue .Question1 .PassedTheTest: - writetext UnknownText_0x18d47c + writetext DragonShrinePassedTestText waitbutton closetext playsound SFX_ENTER_DOOR @@ -126,50 +126,50 @@ DragonShrine_MapScriptHeader: waitsfx spriteface PLAYER, DOWN pause 30 - applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2d4 + applymovement DRAGONSHRINE_CLAIR, DragonShrineClairWalkInMovement spriteface DRAGONSHRINE_CLAIR, RIGHT spriteface PLAYER, LEFT spriteface DRAGONSHRINE_ELDER1, LEFT opentext - writetext UnknownText_0x18d916 + writetext DragonShrineClairYouPassedText waitbutton closetext special Special_FadeOutMusic - applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2da + applymovement DRAGONSHRINE_CLAIR, DragonShrineClairBigStepLeftMovement opentext - writetext UnknownText_0x18d974 + writetext DragonShrineClairThatCantBeText waitbutton closetext - applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2dd + applymovement DRAGONSHRINE_CLAIR, DragonShrineClairSlowStepLeftMovement opentext - writetext UnknownText_0x18d983 + writetext DragonShrineClairYoureLyingText waitbutton closetext - applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c9 + applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkToClairMovement spriteface DRAGONSHRINE_CLAIR, UP opentext - writetext UnknownText_0x18d520 + writetext DragonShrineMustIInformLanceText waitbutton closetext showemote EMOTE_SHOCK, DRAGONSHRINE_CLAIR, 15 opentext - writetext UnknownText_0x18d9ae + writetext DragonShrineIUnderstandText waitbutton closetext applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e0 opentext - writetext UnknownText_0x18d9bf + writetext DragonShrineHereRisingBadgeText waitbutton setflag ENGINE_RISINGBADGE playsound SFX_GET_BADGE waitsfx special RestartMapMusic specialphonecall SPECIALCALL_MASTERBALL - setscene $1 - setmapscene DRAGONS_DEN_B1F, $1 - writetext UnknownText_0x18d9f2 + setscene 1 + setmapscene DRAGONS_DEN_B1F, 1 + writetext DragonShrinePlayerReceivedRisingBadgeText buttonsound - writetext UnknownText_0x18da0b + writetext DragonShrineRisingBadgeExplanationText waitbutton closetext applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce @@ -177,11 +177,11 @@ DragonShrine_MapScriptHeader: applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1 spriteface PLAYER, UP opentext - writetext UnknownText_0x18d5a3 + writetext DragonShrineElderScoldsClairText waitbutton closetext opentext - writetext UnknownText_0x18dab4 + writetext DragonShrineSpeechlessText waitbutton closetext applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e3 @@ -191,7 +191,7 @@ DragonShrine_MapScriptHeader: setevent EVENT_GAVE_KURT_APRICORNS end -ElderScript_0x18d1a5: +DragonShrineElder1Script: faceplayer opentext checkevent EVENT_GAVE_KURT_APRICORNS @@ -202,74 +202,72 @@ ElderScript_0x18d1a5: iffalse .GiveDratini checkevent EVENT_BEAT_RIVAL_IN_MT_MOON iftrue .BeatRivalInMtMoon - writetext UnknownText_0x18d724 + writetext DragonShrineClairsGrandfatherText waitbutton closetext end .GiveDratini: - writetext UnknownText_0x18d604 + writetext DragonShrineTakeThisDratiniText waitbutton checkcode VAR_PARTYCOUNT if_equal 6, .PartyFull - writetext UnknownText_0x18d697 + writetext DragonShrinePlayerReceivedDratiniText playsound SFX_CAUGHT_MON waitsfx givepoke DRATINI, 15 checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG - special SpecialDratini + special Special_Dratini setevent EVENT_GOT_DRATINI setevent EVENT_JUST_RECEIVED_DRATINI - writetext UnknownText_0x18d6ca + writetext DragonShrineSymbolicDragonText waitbutton closetext end .PartyFull: - writetext UnknownText_0x18d6ac + writetext DragonShrinePartyFullText waitbutton closetext end .BeatRivalInMtMoon: - writetext UnknownText_0x18d782 + writetext DragonShrineSilverIsInTrainingText waitbutton closetext end .DontGiveDratiniYet: - writetext UnknownText_0x18d5e5 + writetext DragonShrineComeAgainText waitbutton closetext end .ReceivedDratini: - writetext UnknownText_0x18d6ca + writetext DragonShrineSymbolicDragonText waitbutton closetext end -ElderScript_0x18d205: +DragonShrineElder2Script: faceplayer opentext - writetext UnknownText_0x18d840 + writetext DragonShrineElder2Text waitbutton closetext end -ElderScript_0x18d20d: +DragonShrineElder3Script: faceplayer opentext - writetext UnknownText_0x18d8b1 + writetext DragonShrineElder3Text waitbutton closetext end - -MenuDataHeader_0x18d215: +DragonShrineQuestion1_MenuDataHeader: db MENU_BACKUP_TILES ; flags - db 04, 08 ; start coords - db 11, 19 ; end coords + menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -280,11 +278,9 @@ MenuDataHeader_0x18d215: db "Underling@" db "Friend@" - -MenuDataHeader_0x18d234: +DragonShrineQuestion2_MenuDataHeader: db MENU_BACKUP_TILES ; flags - db 04, 09 ; start coords - db 11, 19 ; end coords + menu_coords 9, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -295,11 +291,9 @@ MenuDataHeader_0x18d234: db "Raising@" db "Cheating@" - -MenuDataHeader_0x18d258: +DragonShrineQuestion3_MenuDataHeader: db MENU_BACKUP_TILES ; flags - db 04, 05 ; start coords - db 11, 19 ; end coords + menu_coords 5, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -310,11 +304,9 @@ MenuDataHeader_0x18d258: db "Tough person@" db "Anybody@" - -MenuDataHeader_0x18d283: +DragonShrineQuestion4_MenuDataHeader: db MENU_BACKUP_TILES ; flags - db 04, 08 ; start coords - db 11, 19 ; end coords + menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -325,11 +317,9 @@ MenuDataHeader_0x18d283: db "Violence@" db "Knowledge@" - -MenuDataHeader_0x18d2a5: +DragonShrineQuestion5_MenuDataHeader: db MENU_BACKUP_TILES ; flags - db 04, 12 ; start coords - db 11, 19 ; end coords + menu_coords 12, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -340,8 +330,7 @@ MenuDataHeader_0x18d2a5: db "Both@" db "Weak@" - -MovementData_0x18d2bf: +DragonShrinePlayerWalkInMovement: slow_step UP slow_step UP slow_step UP @@ -351,11 +340,11 @@ MovementData_0x18d2bf: slow_step UP step_end -MovementData_0x18d2c7: +DragonShrineElderStepDownMovement: slow_step DOWN step_end -MovementData_0x18d2c9: +DragonShrineElderWalkToClairMovement: slow_step LEFT slow_step LEFT slow_step LEFT @@ -372,7 +361,7 @@ MovementData_0x18d2d1: turn_head DOWN step_end -MovementData_0x18d2d4: +DragonShrineClairWalkInMovement: slow_step UP slow_step UP slow_step UP @@ -380,12 +369,12 @@ MovementData_0x18d2d4: slow_step UP step_end -MovementData_0x18d2da: +DragonShrineClairBigStepLeftMovement: fix_facing big_step LEFT step_end -MovementData_0x18d2dd: +DragonShrineClairSlowStepLeftMovement: slow_step LEFT remove_fixed_facing step_end @@ -404,7 +393,7 @@ MovementData_0x18d2e3: step DOWN step_end -UnknownText_0x18d2ea: +DragonShrineElderGreetingText: text "Hm… Good to see" line "you here." @@ -427,29 +416,29 @@ UnknownText_0x18d2ea: para "Ready?" done -UnknownText_0x18d3bc: +DragonShrineQuestion1Text: text "What are #MON" line "to you?" done -UnknownText_0x18d3d3: +DragonShrineQuestion2Text: text "What helps you to" line "win battles?" done -UnknownText_0x18d3f3: +DragonShrineQuestion3Text: text "What kind of" line "trainer do you" cont "wish to battle?" done -UnknownText_0x18d420: +DragonShrineQuestion4Text: text "What is most" line "important for" cont "raising #MON?" done -UnknownText_0x18d44a: +DragonShrineQuestion5Text: text "Strong #MON." line "Weak #MON." @@ -457,7 +446,7 @@ UnknownText_0x18d44a: line "important?" done -UnknownText_0x18d47c: +DragonShrinePassedTestText: text "Hm… I see…" para "You care deeply" @@ -476,7 +465,7 @@ UnknownText_0x18d47c: cont "#MON LEAGUE." done -UnknownText_0x18d520: +DragonShrineMustIInformLanceText: text "CLAIR!" para "This child is" @@ -491,7 +480,7 @@ UnknownText_0x18d520: line "LANCE of this?" done -UnknownText_0x18d5a3: +DragonShrineElderScoldsClairText: text "CLAIR…" para "Reflect upon what" @@ -501,12 +490,12 @@ UnknownText_0x18d5a3: line "child has." done -UnknownText_0x18d5e5: +DragonShrineComeAgainText: text "Come again, if you" line "so desire." done -UnknownText_0x18d604: +DragonShrineTakeThisDratiniText: text "Hm… Good to see" line "you here." @@ -523,17 +512,17 @@ UnknownText_0x18d604: line "your worth." done -UnknownText_0x18d697: +DragonShrinePlayerReceivedDratiniText: text "<PLAYER> received" line "DRATINI!" done -UnknownText_0x18d6ac: +DragonShrinePartyFullText: text "Hm? Your #MON" line "party is full." done -UnknownText_0x18d6ca: +DragonShrineSymbolicDragonText: text "Dragon #MON are" line "symbolic of our" cont "clan." @@ -545,7 +534,7 @@ UnknownText_0x18d6ca: line "one." done -UnknownText_0x18d724: +DragonShrineClairsGrandfatherText: text "CLAIR appears to" line "have learned an" @@ -556,7 +545,7 @@ UnknownText_0x18d724: line "grandfather." done -UnknownText_0x18d782: +DragonShrineSilverIsInTrainingText: text "A boy close to" line "your age is in" cont "training here." @@ -568,21 +557,21 @@ UnknownText_0x18d782: line "little worrisome…" done -UnknownText_0x18d7f6: +DragonShrineWrongAnswerText1: text "Hah? I didn't" line "quite catch that…" done -UnknownText_0x18d816: +DragonShrineWrongAnswerText2: text "What was it you" line "said?" done -UnknownText_0x18d82d: +DragonShrineRightAnswerText: text "Oh, I understand…" done -UnknownText_0x18d840: +DragonShrineElder2Text: text "It's been quite" line "some time since a" @@ -594,7 +583,7 @@ UnknownText_0x18d840: line "Master LANCE." done -UnknownText_0x18d8b1: +DragonShrineElder3Text: text "You know young" line "Master LANCE?" @@ -606,7 +595,7 @@ UnknownText_0x18d8b1: line "blood." done -UnknownText_0x18d916: +DragonShrineClairYouPassedText: text "So how did it go?" para "I guess there's no" @@ -614,39 +603,39 @@ UnknownText_0x18d916: para "You did fail?" - para $56, $56, $56, $56, $56, $56 + para "<......><......><......><......><......><......>" para "…What? You passed?" done -UnknownText_0x18d974: +DragonShrineClairThatCantBeText: text "That can't be!" done -UnknownText_0x18d983: +DragonShrineClairYoureLyingText: text "You're lying!" para "Even I haven't" line "been approved!" done -UnknownText_0x18d9ae: +DragonShrineIUnderstandText: text "I-I understand…" done -UnknownText_0x18d9bf: +DragonShrineHereRisingBadgeText: text "Here, this is the" line "RISINGBADGE…" para "Hurry up! Take it!" done -UnknownText_0x18d9f2: +DragonShrinePlayerReceivedRisingBadgeText: text "<PLAYER> received" line "RISINGBADGE." done -UnknownText_0x18da0b: +DragonShrineRisingBadgeExplanationText: text "RISINGBADGE will" line "enable your" @@ -664,8 +653,8 @@ UnknownText_0x18da0b: line "question." done -UnknownText_0x18dab4: - text $56, $56, $56, $56, $56, $56 +DragonShrineSpeechlessText: + text "<......><......><......><......><......><......>" done DragonShrine_MapEventHeader: @@ -685,7 +674,7 @@ DragonShrine_MapEventHeader: .ObjectEvents: db 4 - object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS - object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS - object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS + object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_GAVE_KURT_APRICORNS + object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_GAVE_KURT_APRICORNS + object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_GAVE_KURT_APRICORNS object_event 4, 8, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 8f87735db..678678c07 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -17,7 +17,7 @@ DragonsDenB1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .CheckSilver + callback MAPCALLBACK_NEWMAP, .CheckSilver .DummyScene0: end @@ -57,7 +57,7 @@ DragonsDenB1F_ClairScene: buttonsound giveitem TM_DRAGONBREATH iffalse .BagFull - itemtotext TM_DRAGONBREATH, $0 + itemtotext TM_DRAGONBREATH, MEM_BUFFER_0 writetext NotifyReceiveDragonbreath playsound SFX_ITEM waitsfx @@ -80,7 +80,7 @@ DragonsDenB1F_ClairScene: pause 30 special RestartMapMusic disappear DRAGONSDENB1F_CLAIR - setscene $0 + setscene 0 end TrainerCooltrainermDarin: @@ -135,7 +135,7 @@ PokeBallScript_0x18c95a: iffalse .BagFull disappear DRAGONSDENB1F_POKE_BALL1 opentext - itemtotext DRAGON_FANG, $0 + itemtotext DRAGON_FANG, MEM_BUFFER_0 writetext Text_FoundDragonFang playsound SFX_ITEM waitsfx @@ -145,7 +145,7 @@ PokeBallScript_0x18c95a: .BagFull: opentext - itemtotext DRAGON_FANG, $0 + itemtotext DRAGON_FANG, MEM_BUFFER_0 writetext Text_FoundDragonFang buttonsound writetext Text_NoRoomForDragonFang @@ -183,13 +183,13 @@ DragonsDenB1FMaxElixer: itemball MAX_ELIXER DragonsDenB1FHiddenRevive: - dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE DragonsDenB1FHiddenMaxPotion: - dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION DragonsDenB1FHiddenMaxElixer: - dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER + hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER MovementDragonsDen_ClairWalksToYou: slow_step RIGHT diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index fcaab3039..8f39eb85f 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -69,11 +69,11 @@ AcademyBlackboard: loadmenudata .BlackboardMenuData _2dmenu closewindow - if_equal $1, .Poison - if_equal $2, .Paralysis - if_equal $3, .Sleep - if_equal $4, .Burn - if_equal $5, .Freeze + if_equal 1, .Poison + if_equal 2, .Paralysis + if_equal 3, .Sleep + if_equal 4, .Burn + if_equal 5, .Freeze closetext end @@ -104,8 +104,7 @@ AcademyBlackboard: .BlackboardMenuData: db MENU_BACKUP_TILES ; flags - db 00, 00 ; start coords - db 08, 11 ; end coords + menu_coords 0, 0, 11, 8 dw .MenuData2 db 1 ; default option diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 322b403f6..a81a466e2 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -13,7 +13,7 @@ EcruteakCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_ECRUTEAK @@ -88,7 +88,7 @@ EcruteakCityMartSign: jumpstd martsign EcruteakCityHiddenHyperPotion: - dwb EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION UnusedMissingDaughterText: ; This text is neither used nor referenced in the final game. diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 491aaff7b..7b1fa9e1c 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: @@ -91,10 +91,10 @@ EcruteakGymClosed: follow PLAYER, ECRUTEAKGYM_GRAMPS applymovement PLAYER, MovementData_0x99e5f stopfollow - special FadeOutPalettes + special 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, MEM_BUFFER_1 jumpstd gymstatue2 MovementData_0x99e5d: diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 274cc99e3..57c040d43 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -12,7 +12,7 @@ EcruteakHouse_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .InitializeSages + callback MAPCALLBACK_OBJECTS, .InitializeSages .DummyScene0: end @@ -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..100009393 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 @@ -61,7 +61,7 @@ EcruteakPokecenter1FNurseScript: jumpstd pokecenternurse EcruteakPokecenter1FPokefanMScript: - special Mobile_DummyReturnFalse + special Special_Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer EcruteakPokecenter1FPokefanMText diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 13c8b367e..d1c0824e9 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -18,7 +18,7 @@ ElmsLab_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .MoveElmCallback + callback MAPCALLBACK_OBJECTS, .MoveElmCallback .MeetElm: priorityjump .WalkUpToElm @@ -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 @@ -161,7 +161,7 @@ CyndaquilPokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript spriteface ELMSLAB_ELM, DOWN - refreshscreen $0 + refreshscreen pokepic CYNDAQUIL cry CYNDAQUIL waitbutton @@ -175,7 +175,7 @@ CyndaquilPokeBallScript: writetext ChoseStarterText buttonsound waitsfx - pokenamemem CYNDAQUIL, $0 + pokenamemem CYNDAQUIL, MEM_BUFFER_0 writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx @@ -191,7 +191,7 @@ TotodilePokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript spriteface ELMSLAB_ELM, DOWN - refreshscreen $0 + refreshscreen pokepic TOTODILE cry TOTODILE waitbutton @@ -205,7 +205,7 @@ TotodilePokeBallScript: writetext ChoseStarterText buttonsound waitsfx - pokenamemem TOTODILE, $0 + pokenamemem TOTODILE, MEM_BUFFER_0 writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx @@ -219,7 +219,7 @@ ChikoritaPokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript spriteface ELMSLAB_ELM, DOWN - refreshscreen $0 + refreshscreen pokepic CHIKORITA cry CHIKORITA waitbutton @@ -233,7 +233,7 @@ ChikoritaPokeBallScript: writetext ChoseStarterText buttonsound waitsfx - pokenamemem CHIKORITA, $0 + pokenamemem CHIKORITA, MEM_BUFFER_0 writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx @@ -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: @@ -308,11 +308,11 @@ ElmsLabHealingMachine: end ElmsLabHealingMachine_HealParty: - special TrainerRankings_Healings + special Special_StubbedTrainerRankings_Healings special HealParty playmusic MUSIC_NONE - writebyte 1 ; Machine is in Elm's Lab - special HealMachineAnim + writebyte HEALMACHINE_ELMS_LAB + special Special_HealMachineAnim pause 30 special RestartMapMusic closetext @@ -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: @@ -500,14 +500,14 @@ AideScript_GiveYouBalls: opentext writetext AideText_GiveYouBalls buttonsound - itemtotext POKE_BALL, $1 + itemtotext POKE_BALL, MEM_BUFFER_1 scall AideScript_ReceiveTheBalls giveitem POKE_BALL, 5 writetext AideText_ExplainBalls buttonsound itemnotify closetext - setscene $2 + setscene 2 end AideScript_ReceiveTheBalls: @@ -556,13 +556,13 @@ CopScript: opentext writetext ElmsLabOfficerText1 buttonsound - special SpecialNameRival + special Special_NameRival writetext ElmsLabOfficerText2 waitbutton 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..844810350 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: @@ -68,11 +68,11 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special 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: @@ -81,11 +81,11 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special 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..f9145bcf7 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -98,9 +98,9 @@ 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 + if_equal RIGHT, UnknownScript_0x75629 applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637 playsound SFX_EXIT_BUILDING disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index efccd7d92..c4c192865 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -18,7 +18,7 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader: .MapCallbacks: db 0 -Unused_0x75ea6: +Unreferenced_0x75ea6: end SSAquaCaptain: @@ -49,10 +49,10 @@ SSAquaGranddaughterBefore: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + 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/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 8af9a2e3f..a7f5b69e8 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -49,7 +49,7 @@ TrainerGuitaristClyde: .Script: end_if_just_battled - special Mobile_DummyReturnFalse + special Special_Mobile_DummyReturnFalse iftrue .mobile opentext writetext UnknownText_0x75d65 @@ -70,8 +70,8 @@ FastShipBed: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes - special TrainerRankings_Healings + special ReloadSpritesNoPalettes + special Special_StubbedTrainerRankings_Healings special HealParty playmusic MUSIC_HEAL pause 60 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 79824c76d..8010d3beb 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -10,7 +10,7 @@ FuchsiaCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_FUCHSIA diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 8aaf6e364..1d5e50368 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 @@ -35,7 +35,7 @@ FuchsiaGymJanineScript: variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX opentext writetext Text_ReceivedSoulBadge playsound SFX_GET_BADGE @@ -65,7 +65,7 @@ LassAliceScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_1, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX .AliceUnmasked: faceplayer opentext @@ -99,7 +99,7 @@ LassLindaScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_2, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX .LindaUnmasked: faceplayer opentext @@ -133,7 +133,7 @@ PicnickerCindyScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_3, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX .CindyUnmasked: faceplayer opentext @@ -167,7 +167,7 @@ CamperBarryScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_4, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX .BarryUnmasked: faceplayer opentext @@ -216,7 +216,7 @@ FuchsiaGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext JANINE, 1, $1 + trainertotext JANINE, JANINE1, MEM_BUFFER_1 jumpstd gymstatue2 Movement_NinjaSpin: diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index eca4aa8e0..1e7b32c9e 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -33,7 +33,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX opentext writetext UnknownText_0x19654e waitbutton @@ -41,7 +41,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX end MovementData_0x196486: diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 2032c5b1e..e2b286848 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -22,7 +22,7 @@ BillsHouseBill: buttonsound waitsfx checkcode VAR_PARTYCOUNT - if_equal $6, UnknownScript_0x54c13 + if_equal PARTY_LENGTH, UnknownScript_0x54c13 writetext UnknownText_0x54dae playsound SFX_CAUGHT_MON waitsfx @@ -74,8 +74,8 @@ BillsSister: iftrue UnknownScript_0x54c58 writetext UnknownText_0x54f9e askforphonenumber PHONE_BILL - if_equal $1, UnknownScript_0x54c64 - if_equal $2, UnknownScript_0x54c5e + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x54c64 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x54c5e waitsfx addcellnum PHONE_BILL writetext UnknownText_0x54fd9 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index a2b3f676b..dcc29b99a 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -21,8 +21,8 @@ GoldenrodCity_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .FlyPointAndFloria - dbw MAPCALLBACK_OBJECTS, .MoveTutor + callback MAPCALLBACK_NEWMAP, .FlyPointAndFloria + callback MAPCALLBACK_OBJECTS, .MoveTutor .FlyPointAndFloria: setflag ENGINE_FLYPOINT_GOLDENROD @@ -63,42 +63,40 @@ MoveTutor: yesorno iffalse .Refused2 checkcoins 4000 - if_equal $2, .NotEnoughMoney + if_equal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x1990ce loadmenudata .MoveMenuDataHeader verticalmenu closewindow - if_equal $1, .Flamethrower - if_equal $2, .Thunderbolt - if_equal $3, .IceBeam + if_equal MOVETUTOR_FLAMETHROWER, .Flamethrower + if_equal MOVETUTOR_THUNDERBOLT, .Thunderbolt + if_equal MOVETUTOR_ICE_BEAM, .IceBeam jump .Incompatible .Flamethrower: - writebyte $1 + writebyte MOVETUTOR_FLAMETHROWER writetext UnknownText_0x1991cf special Special_MoveTutor - if_equal $0, .TeachMove + if_equal FALSE, .TeachMove jump .Incompatible .Thunderbolt: - writebyte $2 + writebyte MOVETUTOR_THUNDERBOLT writetext UnknownText_0x1991cf special Special_MoveTutor - if_equal $0, .TeachMove + if_equal FALSE, .TeachMove jump .Incompatible .IceBeam: - writebyte $3 + writebyte MOVETUTOR_ICE_BEAM writetext UnknownText_0x1991cf special Special_MoveTutor - if_equal $0, .TeachMove + if_equal FALSE, .TeachMove jump .Incompatible - .MoveMenuDataHeader: db MENU_BACKUP_TILES ; flags - db 02, 00 ; start coords - db 11, 15 ; end coords + menu_coords 0, 2, 15, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -110,7 +108,6 @@ MoveTutor: db "ICE BEAM@" db "CANCEL@" - .Refused: writetext UnknownText_0x1990b4 waitbutton diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index b22e89026..ae78a5fe9 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -41,8 +41,8 @@ GoldenrodDeptStore2FDirectory: GoldenrodDeptStore2FElevatorButton: jumpstd elevatorbutton -; possibly unused -UnknownText_0x55b7c: +; unused +UnusedText_0x55b7c: text "We intend to sell" line "items for #MON" cont "to hold." @@ -52,8 +52,8 @@ UnknownText_0x55b7c: cont "MON hold it." done -; possibly unused -UnknownText_0x55bd3: +; unused +UnusedText_0x55bd3: text "By giving #MON" line "items to hold, I" diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 70e7ab046..00a2ff11e 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -12,7 +12,7 @@ GoldenrodDeptStore5F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .CheckIfSunday + callback MAPCALLBACK_OBJECTS, .CheckIfSunday .CheckIfSunday: checkcode VAR_WEEKDAY @@ -65,11 +65,11 @@ ReceptionistScript_0x560ce: if_not_equal SUNDAY, .EventIsOver checkflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT iftrue .EventIsOver - special GetFirstPokemonHappiness + special Special_GetFirstPokemonHappiness writetext UnknownText_0x56143 buttonsound - if_greater_than $95, .VeryHappy - if_greater_than $31, .SomewhatHappy + if_greater_than 150 - 1, .VeryHappy + if_greater_than 50 - 1, .SomewhatHappy jump .NotVeryHappy .VeryHappy: @@ -106,8 +106,8 @@ ReceptionistScript_0x560ce: Carrie: faceplayer opentext - special SpecialGameboyCheck - if_not_equal $2, .NotGBC ; This is a dummy check from Gold and Silver. In normal gameplay, this would not be checked. + special Special_GameboyCheck + if_not_equal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver writetext UnknownText_0x56241 waitbutton closetext diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index b9ccc3663..b224ce74c 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -13,41 +13,41 @@ GoldenrodVendingMachine: opentext writetext GoldenrodVendingText .Start: - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight loadmenudata .MenuData verticalmenu closewindow - if_equal $1, .FreshWater - if_equal $2, .SodaPop - if_equal $3, .Lemonade + if_equal 1, .FreshWater + if_equal 2, .SodaPop + if_equal 3, .Lemonade closetext end .FreshWater: - checkmoney $0, 200 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 200 + if_equal HAVE_LESS, .NotEnoughMoney giveitem FRESH_WATER iffalse .NotEnoughSpace - takemoney $0, 200 - itemtotext FRESH_WATER, $0 + takemoney YOUR_MONEY, 200 + itemtotext FRESH_WATER, MEM_BUFFER_0 jump .VendItem .SodaPop: - checkmoney $0, 300 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 300 + if_equal HAVE_LESS, .NotEnoughMoney giveitem SODA_POP iffalse .NotEnoughSpace - takemoney $0, 300 - itemtotext SODA_POP, $0 + takemoney YOUR_MONEY, 300 + itemtotext SODA_POP, MEM_BUFFER_0 jump .VendItem .Lemonade: - checkmoney $0, 350 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 350 + if_equal HAVE_LESS, .NotEnoughMoney giveitem LEMONADE iffalse .NotEnoughSpace - takemoney $0, 350 - itemtotext LEMONADE, $0 + takemoney YOUR_MONEY, 350 + itemtotext LEMONADE, MEM_BUFFER_0 jump .VendItem .VendItem: @@ -70,8 +70,7 @@ GoldenrodVendingMachine: .MenuData: db MENU_BACKUP_TILES ; flags - db 02, 00 ; start coords - db 11, 19 ; end coords + menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -83,7 +82,6 @@ GoldenrodVendingMachine: db "LEMONADE ¥350@" db "CANCEL@" - GoldenrodDeptStore6FLassScript: jumptextfaceplayer GoldenrodDeptStore6FLassText @@ -105,8 +103,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..7922e4185 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -14,8 +14,8 @@ GoldenrodDeptStoreB1F_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_TILES, UnknownScript_0x7d781 - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac + callback MAPCALLBACK_TILES, UnknownScript_0x7d781 + callback MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac UnknownScript_0x7d781: checkevent EVENT_RECEIVED_CARD_KEY @@ -23,7 +23,7 @@ UnknownScript_0x7d781: jump UnknownScript_0x7d791 UnknownScript_0x7d78a: - changeblock $10, $4, $d + changeblock 16, 4, $0d 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, $0d return .Layout2: - changeblock $4, $a, $d + changeblock 4, 10, $0d return .Layout3: - changeblock $a, $c, $d + changeblock 10, 12, $0d return UnknownScript_0x7d7ac: diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 9b6a2158b..7d921dd57 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -43,7 +43,6 @@ MapGoldenrodDeptStoreElevatorSignpost0Script: .Done: end - Elevator_0x566e0: db 7 ; floors elevfloor FLOOR_B1F, 2, GOLDENROD_DEPT_STORE_B1F @@ -55,7 +54,6 @@ Elevator_0x566e0: elevfloor FLOOR_6F, 2, GOLDENROD_DEPT_STORE_6F db -1 ; end - GoldenrodDeptStoreElevator_MapEventHeader: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index b384d43f1..8fcadbb3f 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -14,8 +14,8 @@ GoldenrodDeptStoreRoof_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_TILES, .CheckSaleChangeBlock - dbw MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk + callback MAPCALLBACK_TILES, .CheckSaleChangeBlock + callback MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk .CheckSaleChangeBlock: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON @@ -23,8 +23,8 @@ GoldenrodDeptStoreRoof_MapScriptHeader: return .ChangeBlock: - changeblock $0, $2, $3f - changeblock $0, $4, $f + changeblock 0, 2, $3f + changeblock 0, 4, $0f return .CheckSaleChangeClerk: diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 9314207fa..6db56d9bd 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -18,7 +18,7 @@ GoldenrodGameCorner_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Callback + callback MAPCALLBACK_OBJECTS, .Callback .Callback: checkevent EVENT_BEAT_ELITE_FOUR @@ -64,15 +64,15 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 loadmenudata GoldenrodGameCornerTMVendorMenuData verticalmenu closewindow - if_equal $1, .Thunder - if_equal $2, .Blizzard - if_equal $3, .FireBlast + if_equal 1, .Thunder + if_equal 2, .Blizzard + if_equal 3, .FireBlast jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript .Thunder: checkcoins 5500 - if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - itemtotext TM_THUNDER, $0 + if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + itemtotext TM_THUNDER, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_THUNDER @@ -82,8 +82,8 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 .Blizzard: checkcoins 5500 - if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - itemtotext TM_BLIZZARD, $0 + if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + itemtotext TM_BLIZZARD, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_BLIZZARD @@ -93,8 +93,8 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 .FireBlast: checkcoins 5500 - if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript - itemtotext TM_FIRE_BLAST, $0 + if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + itemtotext TM_FIRE_BLAST, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_FIRE_BLAST @@ -138,11 +138,9 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript: closetext end - GoldenrodGameCornerTMVendorMenuData: db MENU_BACKUP_TILES ; flags - db 02, 00 ; start coords - db 11, 15 ; end coords + menu_coords 0, 2, 15, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -154,7 +152,6 @@ GoldenrodGameCornerTMVendorMenuData: db "TM38 5500@" db "CANCEL@" - GoldenrodGameCornerPrizeMonVendorScript: faceplayer opentext @@ -168,17 +165,17 @@ GoldenrodGameCornerPrizeMonVendorScript: loadmenudata .MenuDataHeader verticalmenu closewindow - if_equal $1, .abra - if_equal $2, .cubone - if_equal $3, .wobbuffet + if_equal 1, .abra + if_equal 2, .cubone + if_equal 3, .wobbuffet jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript .abra checkcoins 100 - if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT - if_equal $6, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem ABRA, $0 + if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript + pokenamemem ABRA, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx @@ -193,10 +190,10 @@ GoldenrodGameCornerPrizeMonVendorScript: .cubone checkcoins 800 - if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT - if_equal $6, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem CUBONE, $0 + if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript + pokenamemem CUBONE, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx @@ -211,10 +208,10 @@ GoldenrodGameCornerPrizeMonVendorScript: .wobbuffet checkcoins 1500 - if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT - if_equal $6, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript - pokenamemem WOBBUFFET, $0 + if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript + pokenamemem WOBBUFFET, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript waitsfx @@ -227,11 +224,9 @@ GoldenrodGameCornerPrizeMonVendorScript: takecoins 1500 jump .loop - .MenuDataHeader: db MENU_BACKUP_TILES ; flags - db 02, 00 ; start coords - db 11, 17 ; end coords + menu_coords 0, 2, 17, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option @@ -243,7 +238,6 @@ GoldenrodGameCornerPrizeMonVendorScript: db "WOBBUFFET 1500@" db "CANCEL@" - GoldenrodGameCornerPharmacistScript: faceplayer opentext @@ -301,21 +295,21 @@ GoldenrodGameCornerLeftTheirDrinkScript: GoldenrodGameCornerSlotsMachineScript: random 6 if_equal 0, GoldenrodGameCornerLuckySlotsMachineScript - refreshscreen $0 + refreshscreen writebyte FALSE special Special_SlotMachine closetext end GoldenrodGameCornerLuckySlotsMachineScript: - refreshscreen $0 + refreshscreen writebyte TRUE special Special_SlotMachine closetext end GoldenrodGameCornerCardFlipMachineScript: - refreshscreen $0 + refreshscreen special Special_CardFlip closetext end diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 4446e653a..598fa8673 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, MEM_BUFFER_1 jumpstd gymstatue2 BridgetWalksUpMovement: diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 667698662..f6eaad339 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -13,14 +13,14 @@ GoldenrodHappinessRater_MapScriptHeader: TeacherScript_0x54953: faceplayer opentext - special GetFirstPokemonHappiness + special Special_GetFirstPokemonHappiness writetext UnknownText_0x549a3 buttonsound - if_greater_than $f9, UnknownScript_0x54973 - if_greater_than $c7, UnknownScript_0x54979 - if_greater_than $95, UnknownScript_0x5497f - if_greater_than $63, UnknownScript_0x54985 - if_greater_than $31, UnknownScript_0x5498b + if_greater_than 250 - 1, UnknownScript_0x54973 + if_greater_than 200 - 1, UnknownScript_0x54979 + if_greater_than 150 - 1, UnknownScript_0x5497f + if_greater_than 100 - 1, UnknownScript_0x54985 + if_greater_than 50 - 1, UnknownScript_0x5498b jump UnknownScript_0x54991 UnknownScript_0x54973: diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 8b114fd1c..f92d2e3da 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -34,12 +34,12 @@ OfficerScript_0x550ec: closetext applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 applymovement PLAYER, MovementData_0x5514f - writebyte $0 + writebyte FALSE special Special_MagnetTrain warpcheck newloadmap MAPSETUP_TRAIN applymovement PLAYER, .MovementBoardTheTrain - wait $14 + wait 20 end .MovementBoardTheTrain: @@ -172,8 +172,8 @@ GoldenrodMagnetTrainStation_MapEventHeader: db 4 warp_def 8, 17, 5, GOLDENROD_CITY warp_def 9, 17, 5, GOLDENROD_CITY - warp_def 6, 5, 4, SAFFRON_TRAIN_STATION - warp_def 11, 5, 3, SAFFRON_TRAIN_STATION + warp_def 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION + warp_def 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION .CoordEvents: db 1 diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index 259e0fbb7..65873f94c 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -11,7 +11,7 @@ GoldenrodNameRater_MapScriptHeader: GoldenrodNameRater: faceplayer opentext - special SpecialNameRater + special Special_NameRater waitbutton closetext end @@ -22,7 +22,7 @@ GoldenrodNameRaterBookshelf: GoldenrodNameRaterRadio: jumpstd radio2 -INCLUDE "text/unused_sweet_honey.asm" +INCLUDE "data/unused_text/sweet_honey.asm" GoldenrodNameRater_MapEventHeader: ; filler diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 1cf7e6f6d..3405df60a 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -28,8 +28,8 @@ UnknownScript_0x625df: loadmenudata MenuDataHeader_0x62602 verticalmenu closewindow - if_equal $1, UnknownScript_0x625f0 - if_equal $2, UnknownScript_0x625f8 + if_equal 1, UnknownScript_0x625f0 + if_equal 2, UnknownScript_0x625f8 jump UnknownScript_0x62600 UnknownScript_0x625f0: @@ -48,11 +48,9 @@ UnknownScript_0x62600: closetext end - MenuDataHeader_0x62602: db MENU_BACKUP_TILES ; flags - db 00, 00 ; start coords - db 08, 15 ; end coords + menu_coords 0, 0, 15, 8 dw .MenuData2 db 1 ; default option @@ -63,7 +61,6 @@ MenuDataHeader_0x62602: db "モバイルセンター@" ; MOBILE CENTER db "やめる@" ; QUIT - MapGoldenrodPokeComCenter2FMobileSignpost1Script: opentext writetext UnknownText_0x62989 @@ -73,8 +70,8 @@ UnknownScript_0x62629: loadmenudata MenuDataHeader_0x6264c verticalmenu closewindow - if_equal $1, UnknownScript_0x6263a - if_equal $2, UnknownScript_0x62642 + if_equal 1, UnknownScript_0x6263a + if_equal 2, UnknownScript_0x62642 jump UnknownScript_0x6264a UnknownScript_0x6263a: @@ -93,11 +90,9 @@ UnknownScript_0x6264a: closetext end - MenuDataHeader_0x6264c: db MENU_BACKUP_TILES ; flags - db 00, 00 ; start coords - db 08, 15 ; end coords + menu_coords 0, 0, 15, 8 dw .MenuData2 db 1 ; default option @@ -108,7 +103,6 @@ MenuDataHeader_0x6264c: db "でんわ", $4a,"つながらないとき@" ; Don't use phone db "やめる@" ; QUIT - MapGoldenrodPokeComCenter2FMobileSignpost2Script: jumptext UnknownText_0x62b26 diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 617d54327..6e48e20dc 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -17,7 +17,7 @@ NurseScript_0x60f91: GoldenrodPokecenter1F_GSBallSceneLeft: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT - special BattleTowerAction + special Special_BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end @@ -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 @@ -49,7 +49,7 @@ GoldenrodPokecenter1F_GSBallSceneLeft: GoldenrodPokecenter1F_GSBallSceneRight: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT - special BattleTowerAction + special Special_BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end @@ -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..6727d9d52 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -15,9 +15,9 @@ GoldenrodUnderground_MapScriptHeader: .MapCallbacks: db 3 - dbw MAPCALLBACK_NEWMAP, .ResetSwitches - dbw MAPCALLBACK_TILES, .CheckBasementKey - dbw MAPCALLBACK_OBJECTS, .CheckDayOfWeek + callback MAPCALLBACK_NEWMAP, .ResetSwitches + callback MAPCALLBACK_TILES, .CheckBasementKey + callback MAPCALLBACK_OBJECTS, .CheckDayOfWeek .ResetSwitches: clearevent EVENT_SWITCH_1 @@ -35,7 +35,7 @@ GoldenrodUnderground_MapScriptHeader: clearevent EVENT_SWITCH_12 clearevent EVENT_SWITCH_13 clearevent EVENT_SWITCH_14 - writebyte $0 + writebyte 0 copyvartobyte UndergroundSwitchPositions return @@ -45,7 +45,7 @@ GoldenrodUnderground_MapScriptHeader: return .LockBasementDoor: - changeblock $12, $6, $3d + changeblock 18, 6, $3d return .CheckDayOfWeek: @@ -192,12 +192,12 @@ OlderHaircutBrotherScript: .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight writetext UnknownText_0x7c5f9 yesorno iffalse .Refused - checkmoney $0, 500 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 500 + if_equal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x7c69a buttonsound special Special_YoungerHaircutBrother @@ -227,15 +227,15 @@ OlderHaircutBrotherScript: jump .then .then - takemoney $0, 500 - special PlaceMoneyTopRight + takemoney YOUR_MONEY, 500 + special Special_PlaceMoneyTopRight writetext UnknownText_0x7c6b8 waitbutton closetext - special FadeOutPalettes + special Special_FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic opentext writetext UnknownText_0x7c6d8 @@ -275,12 +275,12 @@ YoungerHaircutBrotherScript: .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight writetext UnknownText_0x7c75c yesorno iffalse .Refused - checkmoney $0, 300 - if_equal $2, .NotEnoughMoney + checkmoney YOUR_MONEY, 300 + if_equal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x7c7f1 buttonsound special Special_OlderHaircutBrother @@ -310,15 +310,15 @@ YoungerHaircutBrotherScript: jump .then .then - takemoney $0, 300 - special PlaceMoneyTopRight + takemoney YOUR_MONEY, 300 + special Special_PlaceMoneyTopRight writetext UnknownText_0x7c80e waitbutton closetext - special FadeOutPalettes + special Special_FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic opentext writetext UnknownText_0x7c82a @@ -349,21 +349,21 @@ YoungerHaircutBrotherScript: UnknownScript_0x7c2bb: writetext HaircutBrosText_SlightlyHappier - special PlayCurMonCry + special Special_PlayCurMonCry waitbutton closetext end UnknownScript_0x7c2c4: writetext HaircutBrosText_Happier - special PlayCurMonCry + special Special_PlayCurMonCry waitbutton closetext end UnknownScript_0x7c2cd: writetext HaircutBrosText_MuchHappier - special PlayCurMonCry + special Special_PlayCurMonCry waitbutton closetext end @@ -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 @@ -409,13 +409,13 @@ MapGoldenrodUndergroundSignpost1Script: jumptext UnknownText_0x7c91a GoldenrodUndergroundHiddenParlyzHeal: - dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL + hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL GoldenrodUndergroundHiddenSuperPotion: - dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION GoldenrodUndergroundHiddenAntidote: - dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE + hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE SupernerdEricSeenText: text "I got booted out" diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index f3b7f4946..85eb1bc1b 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -51,7 +51,7 @@ GoldenrodUndergroundSwitchRoomEntrances_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .UpdateDoorPositions + callback MAPCALLBACK_TILES, .UpdateDoorPositions .DummyScene0: end @@ -630,10 +630,10 @@ GoldenrodUndergroundSwitchRoomEntrancesFullHeal: itemball FULL_HEAL GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion: - dwb EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive: - dwb EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE UndergroundSilverApproachMovement1: step DOWN diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 03841736b..e87f3ab1b 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -13,7 +13,7 @@ GoldenrodUndergroundWarehouse_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .ResetSwitches + callback MAPCALLBACK_NEWMAP, .ResetSwitches .ResetSwitches: clearevent EVENT_SWITCH_1 @@ -31,7 +31,7 @@ GoldenrodUndergroundWarehouse_MapScriptHeader: clearevent EVENT_SWITCH_12 clearevent EVENT_SWITCH_13 clearevent EVENT_SWITCH_14 - writebyte $0 + writebyte 0 copyvartobyte UndergroundSwitchPositions return diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index c9bfdac9d..4ee1734a5 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -28,17 +28,17 @@ 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 + writebyte HEALMACHINE_HALL_OF_FAME + special Special_HealMachineAnim setevent EVENT_BEAT_ELITE_FOUR setevent EVENT_TELEPORT_GUY setevent EVENT_RIVAL_SPROUT_TOWER 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/IcePathB1F.asm b/maps/IcePathB1F.asm index 78c5dc659..2d1bd1aad 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -11,22 +11,21 @@ IcePathB1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_CMDQUEUE, .SetUpStoneTable + callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable .SetUpStoneTable: writecmdqueue .CommandQueue return .CommandQueue: - dbw CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp - dw 0 ; filler + cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp .StoneTable: stonetable 3, ICEPATHB1F_BOULDER1, .Boulder1 stonetable 4, ICEPATHB1F_BOULDER2, .Boulder2 stonetable 5, ICEPATHB1F_BOULDER3, .Boulder3 stonetable 6, ICEPATHB1F_BOULDER4, .Boulder4 - db -1 + db -1 ; end .Boulder1: disappear ICEPATHB1F_BOULDER1 @@ -62,7 +61,6 @@ IcePathB1F_MapScriptHeader: earthquake 80 end - IcePathB1FBoulder: jumpstd strengthboulder @@ -70,15 +68,13 @@ IcePathB1FIron: itemball IRON IcePathB1FHiddenMaxPotion: - dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION - + hiddenitem EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION IcePathBoulderFellThroughText: text "The boulder fell" line "through." done - IcePathB1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index c171147cd..544d7d600 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -12,8 +12,7 @@ IcePathB2FBlackthornSideTMRest: itemball TM_REST IcePathB2FBlackthornSideHiddenIceHeal: - dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL - + hiddenitem EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL IcePathB2FBlackthornSide_MapEventHeader: ; filler diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 80ae7f938..915794dec 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -13,8 +13,8 @@ IcePathB2FMahoganySide_MapScriptHeader: .MapCallbacks: db 0 -BoulderScript_0x7e5a3: - jumptext UnknownText_0x7e5ad +IcePathB2FMahoganySideBoulder: + jumptext IcePathB2FMahoganySideBoulderText IcePathB2FMahoganySideFullHeal: itemball FULL_HEAL @@ -23,10 +23,9 @@ IcePathB2FMahoganySideMaxPotion: itemball MAX_POTION IcePathB2FMahoganySideHiddenCarbos: - dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS + hiddenitem EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS - -UnknownText_0x7e5ad: +IcePathB2FMahoganySideBoulderText: text "It's immovably" line "imbedded in ice." done @@ -53,9 +52,9 @@ IcePathB2FMahoganySide_MapEventHeader: .ObjectEvents: db 6 - object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A - object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A - object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A - object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A + object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A + object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A + object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A + object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_4A object_event 8, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL object_event 0, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 7bbba6562..4eae83fac 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -17,7 +17,7 @@ IlexForest_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .FarfetchdCallback + callback MAPCALLBACK_OBJECTS, .FarfetchdCallback .FarfetchdCallback: checkevent EVENT_GOT_HM01_CUT @@ -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 @@ -414,15 +414,13 @@ IlexForestEther: itemball ETHER IlexForestHiddenEther: - dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER - + hiddenitem EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER IlexForestHiddenSuperPotion: - dwb EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION - + hiddenitem EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION IlexForestHiddenFullHeal: - dwb EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL IlexForestBoulder: ; unused @@ -472,7 +470,7 @@ MapIlexForestSignpost4Script: startbattle reloadmapafterbattle pause 20 - special CheckCaughtCelebi + special Special_CheckCaughtCelebi iffalse .DidntCatchCelebi appear ILEXFOREST_KURT applymovement ILEXFOREST_KURT, MovementData_0x6ef4e diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 879e1dd8b..f3f79d99f 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -13,18 +13,18 @@ IndigoPlateauPokecenter1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .PrepareElite4 + callback MAPCALLBACK_NEWMAP, .PrepareElite4 .DummyScene: 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: @@ -158,9 +158,9 @@ TeleportGuyScript: waitbutton closetext playsound SFX_WARP_TO - special FadeOutPalettes + special 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..6eccbad60 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -9,7 +9,7 @@ KarensRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .KarensRoomDoors + callback MAPCALLBACK_TILES, .KarensRoomDoors .LockDoor: priorityjump .KarensDoorLocksBehindYou @@ -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..04580cdbb 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -9,7 +9,7 @@ KogasRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .KogasRoomDoors + callback MAPCALLBACK_TILES, .KogasRoomDoors .LockDoor: priorityjump .KogasDoorLocksBehindYou @@ -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..e6bc721aa 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -38,12 +38,12 @@ UnknownScript_0x7a4f6: opentext writetext UnknownText_0x7a604 buttonsound - stringtotext GearName, $1 + stringtotext GearName, MEM_BUFFER_1 scall UnknownScript_0x7a57e 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..9d59396ac 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -10,48 +10,47 @@ KrissHouse2F_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .InitializeRoom - dbw MAPCALLBACK_TILES, .SetSpawn + callback MAPCALLBACK_NEWMAP, .InitializeRoom + callback MAPCALLBACK_TILES, .SetSpawn +; unused .Null: end .InitializeRoom: - special ToggleDecorationsVisibility + special Special_ToggleDecorationsVisibility setevent EVENT_IN_YOUR_ROOM checkevent EVENT_INITIALIZED_EVENTS - iftrue .SkipInizialization + iftrue .SkipInitialization jumpstd initializeevents return -.SkipInizialization: +.SkipInitialization: return .SetSpawn: - special ToggleMaptileDecorations + special Special_ToggleMaptileDecorations return - db 0, 0, 0 ; filler - Doll1: - describedecoration 1 + describedecoration DECODESC_LEFT_DOLL Doll2: - describedecoration 2 + describedecoration DECODESC_RIGHT_DOLL BigDoll: - describedecoration 3 + describedecoration DECODESC_BIG_DOLL GameConsole: - describedecoration 4 + describedecoration DECODESC_CONSOLE KrissHousePoster: - dw EVENT_KRISS_ROOM_POSTER, .Script + conditional_event EVENT_KRISS_ROOM_POSTER, .Script .Script: - describedecoration 0 + describedecoration DECODESC_POSTER KrissHouseRadio: checkevent EVENT_GOT_A_POKEMON_FROM_ELM @@ -93,7 +92,7 @@ KrissHousePC: closetext end .Warp: - warp NONE, $0, $0 + warp NONE, 0, 0 end KrisRadioText1: diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 0cd9f77dc..4c3b2a2b6 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -31,7 +31,7 @@ KrissNeighborsHouseRadio: pause 45 writetext KrisNeighborRadioText3 pause 45 - musicfadeout MUSIC_NEW_BARK_TOWN, $10 + musicfadeout MUSIC_NEW_BARK_TOWN, 16 writetext KrisNeighborRadioText4 pause 45 closetext diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 6c1d6a9eb..478e94e5c 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -11,7 +11,7 @@ KurtsHouse_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .KurtCallback + callback MAPCALLBACK_OBJECTS, .KurtCallback .KurtCallback: checkevent EVENT_CLEARED_SLOWPOKE_WELL @@ -132,7 +132,7 @@ KurtScript_0x18e178: buttonsound setevent EVENT_DRAGON_SHRINE_QUESTION_2 special Special_SelectApricornForKurt - if_equal $0, .Cancel + if_equal FALSE, .Cancel if_equal BLU_APRICORN, .Blu if_equal YLW_APRICORN, .Ylw if_equal GRN_APRICORN, .Grn @@ -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..882e42b22 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -20,8 +20,8 @@ LakeOfRage_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .FlyPoint - dbw MAPCALLBACK_OBJECTS, .Wesley + callback MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_OBJECTS, .Wesley .DummyScene0: end @@ -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 @@ -232,16 +232,13 @@ LakeOfRageTMDetect: itemball TM_DETECT LakeOfRageHiddenFullRestore: - dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE - + hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE LakeOfRageHiddenRareCandy: - dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY - + hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY LakeOfRageHiddenMaxPotion: - dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION - + hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION MovementData_0x70155: teleport_from diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index cc494c8c5..8e164b6f9 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -45,9 +45,10 @@ UnknownScript_0x19a6e0: writetext UnknownText_0x19a93e waitbutton special Special_CheckMagikarpLength - if_equal $0, UnknownScript_0x19a71c - if_equal $1, UnknownScript_0x19a722 - if_equal $2, UnknownScript_0x19a716 + if_equal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c + if_equal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722 + if_equal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716 + ; MAGIKARPLENGTH_BEAT_RECORD jump UnknownScript_0x19a6fe UnknownScript_0x19a6fe: diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index f185af0dc..545457982 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -11,7 +11,7 @@ LancesRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .LancesRoomDoors + callback MAPCALLBACK_TILES, .LancesRoomDoors .LockDoor: priorityjump .LancesDoorLocksBehindYou @@ -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, $0b .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,11 +69,11 @@ LanceScript_0x180e7b: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock $4, $0, $b + changeblock 4, 0, $0b reloadmappart closetext setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED - musicfadeout MUSIC_BEAUTY_ENCOUNTER, $10 + musicfadeout MUSIC_BEAUTY_ENCOUNTER, 16 pause 30 showemote EMOTE_SHOCK, LANCESROOM_LANCE, 15 spriteface LANCESROOM_LANCE, DOWN @@ -125,9 +125,9 @@ LanceScript_0x180e7b: pause 30 closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth - special FadeOutPalettes + special 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/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 424a802c9..4ab8c6f48 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -36,7 +36,7 @@ GentlemanScript_0x7ee6c: .UnknownScript_0x7ee80: writetext UnknownText_0x7f0a1 buttonsound - stringtotext .expncardname, $1 + stringtotext .expncardname, MEM_BUFFER_1 scall .UnknownScript_0x7ee94 setflag ENGINE_EXPN_CARD .UnknownScript_0x7ee8e: diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index d41354143..9b7435312 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -15,7 +15,7 @@ LavenderNameRater_MapScriptHeader: LavenderNameRater: faceplayer opentext - special SpecialNameRater + special Special_NameRater waitbutton closetext end diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index 1cb093dda..ac9decf52 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -1,20 +1,20 @@ const_value set 2 - const LAVENDERTOWNSPEECHHOUSE_POKEFAN_F + const LAVENDERSPEECHHOUSE_POKEFAN_F -LavenderTownSpeechHouse_MapScriptHeader: +LavenderSpeechHouse_MapScriptHeader: .SceneScripts: db 0 .MapCallbacks: db 0 -LavenderTownSpeechHousePokefanFScript: - jumptextfaceplayer LavenderTownSpeechHousePokefanFText +LavenderSpeechHousePokefanFScript: + jumptextfaceplayer LavenderSpeechHousePokefanFText -LavenderTownSpeechHouseBookshelf: +LavenderSpeechHouseBookshelf: jumpstd picturebookshelf -LavenderTownSpeechHousePokefanFText: +LavenderSpeechHousePokefanFText: text "LAVENDER is a" line "tiny, quiet town" @@ -28,7 +28,7 @@ LavenderTownSpeechHousePokefanFText: line "built." done -LavenderTownSpeechHouse_MapEventHeader: +LavenderSpeechHouse_MapEventHeader: ; filler db 0, 0 @@ -42,9 +42,9 @@ LavenderTownSpeechHouse_MapEventHeader: .BGEvents: db 2 - bg_event 0, 1, BGEVENT_READ, LavenderTownSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, LavenderTownSpeechHouseBookshelf + bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf .ObjectEvents: db 1 - object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownSpeechHousePokefanFScript, -1 + object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index e75726abd..57806ef41 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -10,7 +10,7 @@ LavenderTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_LAVENDER @@ -113,7 +113,7 @@ LavenderTown_MapEventHeader: db 7 warp_def 5, 5, 1, LAVENDER_POKECENTER_1F warp_def 5, 9, 1, MR_FUJIS_HOUSE - warp_def 3, 13, 1, LAVENDER_TOWN_SPEECH_HOUSE + warp_def 3, 13, 1, LAVENDER_SPEECH_HOUSE warp_def 7, 13, 1, LAVENDER_NAME_RATER warp_def 1, 5, 2, LAVENDER_MART warp_def 13, 11, 1, SOUL_HOUSE diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index a8de6e987..3c403a735 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, MEM_BUFFER_1 jumpstd gymstatue2 PryceText_Intro: diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index a25277fd9..e0c610f71 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -13,7 +13,7 @@ MahoganyMart1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .MahoganyMart1FStaircase + callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase .DummyScene0: end @@ -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/MahoganyTown.asm b/maps/MahoganyTown.asm index ba907383d..fcb24323b 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -12,7 +12,7 @@ MahoganyTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end @@ -53,17 +53,17 @@ UnknownScript_0x190039: UnknownScript_0x190040: opentext writetext UnknownText_0x1900b0 - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight yesorno iffalse UnknownScript_0x190072 - checkmoney $0, 300 - if_equal $2, UnknownScript_0x19006c + checkmoney YOUR_MONEY, 300 + if_equal HAVE_LESS, UnknownScript_0x19006c giveitem RAGECANDYBAR iffalse UnknownScript_0x190078 waitsfx playsound SFX_TRANSACTION - takemoney $0, 300 - special PlaceMoneyTopRight + takemoney YOUR_MONEY, 300 + special Special_PlaceMoneyTopRight writetext UnknownText_0x19014a waitbutton closetext diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index d60d1081d..0bcc5e5d1 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -18,7 +18,7 @@ ManiaScript: writetext ManiaText_AskLookAfterShuckle yesorno iffalse .refusetotakeshuckie - special SpecialGiveShuckle + special Special_GiveShuckle iffalse .partyfull writetext ManiaText_TakeCareOfShuckle buttonsound @@ -54,11 +54,12 @@ ManiaScript: writetext ManiaText_CanIHaveMyMonBack yesorno iffalse .refused - special SpecialReturnShuckle - if_equal $0, .wrong - if_equal $1, .refused - if_equal $3, .superhappy - if_equal $4, .default_postevent + special Special_ReturnShuckle + if_equal SHUCKIE_WRONG_MON, .wrong + if_equal SHUCKIE_REFUSED, .refused + if_equal SHUCKIE_HAPPY, .superhappy + if_equal SHUCKIE_FAINTED, .default_postevent + ; SHUCKIE_RETURNED writetext ManiaText_ThankYou waitbutton closetext diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 870321f3d..0af2068f8 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -15,15 +15,15 @@ MobileBattleRoom_MapScriptHeader: end .InitializeAndPreparePokecenter2F: - setscene $1 - setmapscene POKECENTER_2F, $5 + setscene 1 + setmapscene POKECENTER_2F, 5 end MapMobileBattleRoomSignpost0Script: - refreshscreen $0 - special Function1037c2 + refreshscreen + special Special_Function1037c2 if_equal $1, .one - special Function1037eb + special Special_Function1037eb iffalse .false if_equal $1, .one_ if_equal $2, .two_ @@ -33,24 +33,24 @@ MapMobileBattleRoomSignpost0Script: writetext MobileBattleRoom_HealText pause 20 closetext - special FadeOutPalettes + special Special_FadeOutPalettes playmusic MUSIC_HEAL - special LoadMapPalettes + special Special_LoadMapPalettes pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic - refreshscreen $0 + refreshscreen .two_ - special TrainerRankings_Healings + special Special_StubbedTrainerRankings_Healings special HealParty - special Function10383c + special Special_Function10383c iftrue .false .one - special Function10387b + special Special_Function10387b writetext MobileBattleRoom_EstablishingCommsText waitbutton reloadmappart - special Function101225 + special Special_Function101225 .false closetext end diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 1003d4ea5..e7c4c7b09 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -15,17 +15,17 @@ MobileTradeRoomMobile_MapScriptHeader: end .InitializeAndPreparePokecenter2F: - setscene $1 - setmapscene POKECENTER_2F, $4 + setscene 1 + setmapscene POKECENTER_2F, 4 end MapMobileTradeRoomMobileSignpost0Script: - refreshscreen $0 - special Function1037c2 + refreshscreen + special Special_Function1037c2 writetext MobileTradeRoomMobile_EstablishingCommsText waitbutton reloadmappart - special Function101231 + special Special_Function101231 closetext end 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/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 3e13b58ea..c914e669f 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -10,8 +10,8 @@ MountMoonSquare_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .DisappearMoonStone - dbw MAPCALLBACK_OBJECTS, .DisappearRock + callback MAPCALLBACK_NEWMAP, .DisappearMoonStone + callback MAPCALLBACK_OBJECTS, .DisappearRock .DummyScene: end @@ -75,8 +75,7 @@ ClefairyDance: end MountMoonSquareHiddenMoonStone: - dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE - + hiddenitem EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE DontLitterSign: jumptext DontLitterSignText diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 659d7a54d..983fd9839 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -64,8 +64,7 @@ MountMortar1FInsideUltraBall: itemball ULTRA_BALL MountMortar1FInsideHiddenMaxRepel: - dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL - + hiddenitem EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL PokemaniacMillerSeenText: text "I'm not losing" diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index faa9930d2..4e8dcf331 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -16,8 +16,7 @@ MountMortar1FOutsideRevive: itemball REVIVE MountMortar1FOutsideHiddenHyperPotion: - dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION - + hiddenitem EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION MountMortar1FOutside_MapEventHeader: ; filler diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 106e51f5a..4d401da9c 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -44,8 +44,7 @@ MountMortar2FInsideEscapeRope: itemball ESCAPE_ROPE MountMortar2FInsideHiddenFullRestore: - dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE - + hiddenitem EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE SupernerdHughSeenText: text "Yo! MARKUS!" diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index ad00662f8..2bfea9fec 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -35,7 +35,7 @@ UnknownScript_0x7e217: buttonsound waitsfx checkcode VAR_PARTYCOUNT - if_equal $6, UnknownScript_0x7e237 + if_equal PARTY_LENGTH, UnknownScript_0x7e237 writetext UnknownText_0x7e355 playsound SFX_CAUGHT_MON waitsfx @@ -72,8 +72,7 @@ MountMortarB1FPPUp: itemball PP_UP MountMortarB1FHiddenMaxRevive: - dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE - + hiddenitem EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE UnknownText_0x7e24d: text "Hey!" diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index a6a50d2dd..c51f0a9e1 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -11,7 +11,7 @@ MoveDeletersHouse_MapScriptHeader: MoveDeleter: faceplayer opentext - special MoveDeletion + special Special_MoveDeletion waitbutton closetext end diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index f808d44c8..d0bb13037 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -111,9 +111,9 @@ MrPokemonsHouse_OakScript: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes playmusic MUSIC_HEAL - special TrainerRankings_Healings + special Special_StubbedTrainerRankings_Healings special HealParty pause 60 special Special_FadeInQuickly @@ -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/NationalPark.asm b/maps/NationalPark.asm index fe1547ea5..56f861384 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -94,9 +94,9 @@ UnknownScript_0x5c071: scall UnknownScript_0x5c100 UnknownScript_0x5c074: askforphonenumber PHONE_SCHOOLBOY_JACK - if_equal $1, UnknownScript_0x5c110 - if_equal $2, UnknownScript_0x5c10c - trainertotext SCHOOLBOY, JACK1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5c110 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5c10c + trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0 scall UnknownScript_0x5c104 jump UnknownScript_0x5c108 @@ -224,9 +224,9 @@ UnknownScript_0x5c160: scall UnknownScript_0x5c193 UnknownScript_0x5c163: askforphonenumber PHONE_POKEFAN_BEVERLY - if_equal $1, UnknownScript_0x5c1a3 - if_equal $2, UnknownScript_0x5c19f - trainertotext POKEFANF, BEVERLY1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5c1a3 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5c19f + trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0 scall UnknownScript_0x5c197 jump UnknownScript_0x5c19b @@ -305,8 +305,7 @@ NationalParkTMDig: itemball TM_DIG NationalParkHiddenFullHeal: - dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL - + hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL NationalParkLassText: text "Look! Check out my" diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 5d7831529..07e6455ac 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -115,8 +115,7 @@ NationalParkBugContestTMDig: itemball TM_DIG NationalParkBugContestHiddenFullHeal: - dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL - + hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL UnknownText_0x5c94c: text "DON: I'm going to" diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 56b5f14db..dee94a7c9 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -11,7 +11,7 @@ NewBarkTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 17da0485d..6021bc980 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -26,14 +26,14 @@ Oak: setevent EVENT_TALKED_TO_OAK_IN_KANTO .CheckBadges: checkcode VAR_BADGES - if_equal 16, .OpenMtSilver - if_equal 8, .Complain + if_equal NUM_BADGES, .OpenMtSilver + if_equal NUM_JOHTO_BADGES, .Complain jump .AhGood .CheckPokedex: writetext OakLabDexCheckText waitbutton - special ProfOaksPCBoot + special Special_ProfOaksPCBoot writetext OakLabGoodbyeText waitbutton closetext diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 2e5129bc5..fce28ceaa 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -12,7 +12,7 @@ OlivineCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end @@ -41,11 +41,11 @@ 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 - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_LoadUsedSpritesGFX end UnknownScript_0x1a886b: @@ -66,10 +66,10 @@ 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 + special Special_LoadUsedSpritesGFX end OlivineCitySailor1Script: @@ -78,8 +78,8 @@ OlivineCitySailor1Script: StandingYoungsterScript_0x1a88a6: faceplayer opentext - random $2 - if_equal $0, UnknownScript_0x1a88b4 + random 2 + if_equal 0, UnknownScript_0x1a88b4 writetext UnknownText_0x1a8b04 waitbutton closetext diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index cb87bdd85..514b8e89a 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, MEM_BUFFER_1 jumpstd gymstatue2 Jasmine_SteelTypeIntro: diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 0961a4427..e078bba2b 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -41,9 +41,9 @@ UnknownScript_0x5afb0: scall UnknownScript_0x5b057 UnknownScript_0x5afb3: askforphonenumber PHONE_SAILOR_HUEY - if_equal $1, UnknownScript_0x5b067 - if_equal $2, UnknownScript_0x5b063 - trainertotext SAILOR, HUEY1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5b067 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5b063 + trainertotext SAILOR, HUEY1, MEM_BUFFER_0 scall UnknownScript_0x5b05b jump UnknownScript_0x5b05f @@ -164,8 +164,8 @@ SailorHuey1BeatenText: line "I lose!" done -; possibly unused -UnknownText_0x5b0be: +; unused +UnusedText_0x5b0be: text "What power!" line "How would you like" diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index e7c4a7884..fdd32455c 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -44,8 +44,7 @@ OlivineLighthouse5FTMSwagger: itemball TM_SWAGGER OlivineLighthouse5FHiddenHyperPotion: - dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION - + hiddenitem EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION SailorErnestSeenText: text "I wanted to battle" diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 686764bfd..e0bd4febf 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -47,9 +47,9 @@ UnknownScript_0x60bab: closetext special RestartMapMusic cry AMPHAROS - special FadeOutPalettes + special Special_FadeOutPalettes pause 10 - special FadeInPalettes + special Special_FadeInPalettes opentext writetext UnknownText_0x60f3d waitbutton @@ -109,7 +109,7 @@ MonsterScript_0x60c3a: iftrue UnknownScript_0x60c51 writetext UnknownText_0x60f03 writebyte AMPHAROS - special PlaySlowCry + special Special_PlaySlowCry buttonsound writetext UnknownText_0x60f19 waitbutton @@ -121,10 +121,10 @@ UnknownScript_0x60c51: cry AMPHAROS waitbutton closetext - special FadeOutPalettes - special FadeInPalettes - special FadeOutPalettes - special FadeInPalettes + special Special_FadeOutPalettes + special Special_FadeInPalettes + special Special_FadeOutPalettes + special Special_FadeInPalettes end OlivineLighthouse6FSuperPotion: diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index f34281e43..063f7db28 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 @@ -46,7 +46,7 @@ SailorScript_0x748c0: waitsfx applymovement PLAYER, MovementData_0x74a30 playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7490a @@ -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: @@ -234,8 +234,7 @@ CooltrainerFScript_0x74a22: end OlivinePortHiddenProtein: - dwb EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN - + hiddenitem EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN MovementData_0x74a30: step DOWN diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index f11cf6d65..e1e6006c9 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -8,7 +8,7 @@ PalletTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_PALLET diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 44ea440a7..876bacfb0 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -11,7 +11,7 @@ PewterCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_PEWTER diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index ca94d9e9f..305baf7fa 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, MEM_BUFFER_1 jumpstd gymstatue2 UnknownText_0x1a28d0: diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 9b9052ee8..7f105c02e 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -11,7 +11,7 @@ PokeSeersHouse_MapScriptHeader: SeerScript: faceplayer opentext - special SpecialPokeSeer + special Special_PokeSeer waitbutton closetext end diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index ece34605d..946bceaf7 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -76,10 +76,10 @@ LinkReceptionistScript_Trade: writetext Text_TradeReceptionistIntro yesorno iffalse .Cancel - special Mobile_DummyReturnFalse ; always returns false + special Special_Mobile_DummyReturnFalse ; always returns false iffalse .NoMobile writetext Text_TradeReceptionistMobile - special AskMobileOrCable + special Special_AskMobileOrCable iffalse .Cancel if_equal $1, .Mobile .NoMobile: @@ -107,7 +107,7 @@ LinkReceptionistScript_Trade: end .FriendNotReady: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end @@ -132,7 +132,7 @@ LinkReceptionistScript_Trade: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit .Cancel: closetext end @@ -153,17 +153,17 @@ LinkReceptionistScript_Trade: iffalse .Mobile_DidNotSave special Special_TryQuickSave iffalse .Mobile_DidNotSave - special Function1011f1 + special Special_Function1011f1 writetext Text_PleaseComeIn2 waitbutton closetext - writebyte $0 + writebyte FALSE end .Mobile_DidNotSave: writetext Text_PleaseComeAgain closetext - writebyte $1 + writebyte TRUE end BattleTradeMobile_WalkIn: @@ -178,10 +178,10 @@ LinkReceptionistScript_Battle: writetext Text_BattleReceptionistIntro yesorno iffalse .Cancel - special Mobile_DummyReturnFalse ; always returns false + special Special_Mobile_DummyReturnFalse ; always returns false iffalse .NoMobile writetext Text_BattleReceptionistMobile - special AskMobileOrCable + special Special_AskMobileOrCable iffalse .Cancel if_equal $1, .Mobile .NoMobile: @@ -209,7 +209,7 @@ LinkReceptionistScript_Battle: end .FriendNotReady: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end @@ -234,7 +234,7 @@ LinkReceptionistScript_Battle: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit .Cancel: closetext end @@ -255,23 +255,23 @@ LinkReceptionistScript_Battle: writetext Text_MustSaveGame yesorno iffalse .Mobile_DidNotSave - special Function103780 + special Special_Function103780 iffalse .Mobile_DidNotSave - special Function1011f1 + special Special_Function1011f1 writetext Text_PleaseComeIn2 waitbutton closetext - writebyte $0 + writebyte FALSE end .Mobile_DidNotSave: writetext Text_PleaseComeAgain closetext - writebyte $1 + writebyte TRUE end .SelectThreeMons: - special Mobile_SelectThreeMons + special Special_Mobile_SelectThreeMons iffalse .Mobile_DidNotSelect if_equal $1, .Mobile_OK if_equal $2, .Mobile_OK @@ -283,11 +283,11 @@ LinkReceptionistScript_Battle: waitbutton .Mobile_DidNotSelect: closetext - writebyte $0 + writebyte FALSE end .Mobile_OK: - writebyte $1 + writebyte TRUE end Script_TimeCapsuleClosed: @@ -342,7 +342,7 @@ LinkReceptionistScript_TimeCapsule: end .FriendNotReady: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end @@ -354,7 +354,7 @@ LinkReceptionistScript_TimeCapsule: .DidNotSave: writetext Text_PleaseComeAgain .Cancel: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit closetext end @@ -374,17 +374,17 @@ LinkReceptionistScript_TimeCapsule: end Script_LeftCableTradeCenter: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit scall Script_WalkOutOfLinkTradeRoom - setscene $0 - setmapscene TRADE_CENTER, $0 + setscene 0 + setmapscene TRADE_CENTER, 0 end Script_LeftMobileTradeRoom: - special Function101220 + special Special_Function101220 scall Script_WalkOutOfMobileTradeRoom - setscene $0 - setmapscene MOBILE_TRADE_ROOM_MOBILE, $0 + setscene 0 + setmapscene MOBILE_TRADE_ROOM_MOBILE, 0 end Script_WalkOutOfMobileTradeRoom: @@ -394,17 +394,17 @@ Script_WalkOutOfMobileTradeRoom: end Script_LeftCableColosseum: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit scall Script_WalkOutOfLinkBattleRoom - setscene $0 - setmapscene COLOSSEUM, $0 + setscene 0 + setmapscene COLOSSEUM, 0 end Script_LeftMobileBattleRoom: - special Function101220 + special Special_Function101220 scall Script_WalkOutOfMobileBattleRoom - setscene $0 - setmapscene MOBILE_BATTLE_ROOM, $0 + setscene 0 + setmapscene MOBILE_BATTLE_ROOM, 0 end Script_WalkOutOfMobileBattleRoom: @@ -558,7 +558,7 @@ TimeCapsuleScript_CheckPlayerGender: end Script_LeftTimeCapsule: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight @@ -579,12 +579,12 @@ 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: - refreshscreen $0 + refreshscreen special Special_DisplayLinkRecord closetext end 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..05a2a8cb8 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -148,7 +148,7 @@ CooltrainerFScript_0x5cdd5: waitsfx writetext UnknownText_0x5d37b buttonsound - stringtotext RadioCardText, $1 + stringtotext RadioCardText, MEM_BUFFER_1 scall UnknownScript_0x5ce3e writetext UnknownText_0x5d3c0 buttonsound @@ -249,8 +249,8 @@ UnknownText_0x5cf5a: done UnknownText_0x5cf79: - text $56 - line $56 + text "<......>" + line "<......>" done UnknownText_0x5cf7e: diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 7942063f9..358bf14a7 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -117,7 +117,7 @@ Buena: if_equal 30, UnknownScript_0x5d87f playmusic MUSIC_BUENAS_PASSWORD writetext UnknownText_0x5de35 - special AskRememberPassword + special Special_AskRememberPassword iffalse UnknownScript_0x5d81e writetext UnknownText_0x5de84 waitbutton @@ -133,8 +133,8 @@ UnknownScript_0x5d7be: waitbutton closetext spriteface RADIOTOWER2F_BUENA, DOWN - refreshscreen $0 - special SpecialBuenasPassword + refreshscreen + special Special_BuenasPassword closetext iffalse UnknownScript_0x5d845 opentext @@ -142,7 +142,7 @@ UnknownScript_0x5d7be: waitbutton closetext checkcode VAR_BLUECARDBALANCE - addvar $1 + addvar 1 writevarcode VAR_BLUECARDBALANCE waitsfx playsound SFX_TRANSACTION @@ -157,7 +157,7 @@ UnknownScript_0x5d7be: pause 20 special RestartMapMusic checkcode VAR_BLUECARDBALANCE - if_equal $1e, UnknownScript_0x5d8a4 + if_equal 30, UnknownScript_0x5d8a4 end UnknownScript_0x5d800: @@ -281,8 +281,8 @@ UnknownScript_0x5d8cc: writetext UnknownText_0x5e2bf UnknownScript_0x5d8d0: askforphonenumber PHONE_BUENA - if_equal $1, UnknownScript_0x5d8f6 - if_equal $2, UnknownScript_0x5d8ed + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5d8f6 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5d8ed writetext UnknownText_0x5e2f3 playsound SFX_REGISTER_PHONE_NUMBER waitsfx @@ -316,7 +316,7 @@ ReceptionistScript_0x5d8ff: iffalse UnknownScript_0x5d90f writetext UnknownText_0x5e392 buttonsound - special SpecialBuenaPrize + special Special_BuenaPrize closetext end diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 5a0e360c5..7c2862e80 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -13,7 +13,7 @@ RadioTower3F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .CardKeyShutterCallback + callback MAPCALLBACK_TILES, .CardKeyShutterCallback .CardKeyShutterCallback: checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER @@ -21,8 +21,8 @@ RadioTower3F_MapScriptHeader: return .Change: - changeblock $e, $2, $2a - changeblock $e, $4, $1 + changeblock 14, 2, $2a + changeblock 14, 4, $01 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, $01 reloadmappart closetext waitsfx diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index c73d53de2..615365caf 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 @@ -96,7 +96,7 @@ RadioTower5FRocketBossScene: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes disappear RADIOTOWER5F_ROCKET disappear RADIOTOWER5F_ROCKET_GIRL pause 15 @@ -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/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 3f2f57f20..6288f23f3 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -16,12 +16,10 @@ RockTunnel1FTMSteelWing: itemball TM_STEEL_WING RockTunnel1FHiddenXAccuracy: - dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY - + hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY RockTunnel1FHiddenXDefend: - dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND - + hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND RockTunnel1F_MapEventHeader: ; filler diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 6d20a92f2..26b465c11 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -20,8 +20,7 @@ RockTunnelB1FRevive: itemball REVIVE RockTunnelB1FHiddenMaxPotion: - dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION - + hiddenitem EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION RockTunnelB1F_MapEventHeader: ; filler diff --git a/maps/Route11.asm b/maps/Route11.asm index 903cf1009..ecb1003a7 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -63,8 +63,7 @@ FruitTreeScript_0x68055: fruittree FRUITTREE_ROUTE_11 Route11HiddenRevive: - dwb EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE - + hiddenitem EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE YoungsterOwenSeenText: text "There's no cheat-" diff --git a/maps/Route12.asm b/maps/Route12.asm index 240ff0bb5..ac585f51b 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -70,8 +70,7 @@ Route12Nugget: itemball NUGGET Route12HiddenElixer: - dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER - + hiddenitem EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER FisherMartinSeenText: text "Patience is the" diff --git a/maps/Route13.asm b/maps/Route13.asm index 59107f67f..014bd4c70 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -77,8 +77,7 @@ Route13DirectionsSign: jumptext Route13DirectionsSignText Route13HiddenCalcium: - dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM - + hiddenitem EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM PokefanmAlexSeenText: text "Bow down before my" diff --git a/maps/Route16.asm b/maps/Route16.asm index e08bf0a25..8d7141f57 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -4,13 +4,13 @@ Route16_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike + callback MAPCALLBACK_NEWMAP, .AlwaysOnBike .AlwaysOnBike: checkcode VAR_YCOORD - if_less_than $5, .CanWalk + if_less_than 5, .CanWalk checkcode VAR_XCOORD - if_greater_than $d, .CanWalk + if_greater_than 13, .CanWalk setflag ENGINE_ALWAYS_ON_BIKE return diff --git a/maps/Route17.asm b/maps/Route17.asm index c8be61da2..9ed64340e 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -10,7 +10,7 @@ Route17_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike + callback MAPCALLBACK_NEWMAP, .AlwaysOnBike .AlwaysOnBike: setflag ENGINE_ALWAYS_ON_BIKE @@ -62,12 +62,10 @@ TrainerBikerGlenn: end Route17HiddenMaxEther: - dwb EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER - + hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER Route17HiddenMaxElixer: - dwb EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER - + hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER BikerRileySeenText: text "Hey, you! You're" @@ -140,8 +138,8 @@ Route17_MapEventHeader: .Warps: db 2 - warp_def 17, 82, 1, ROUTE_17_18_GATE - warp_def 17, 83, 2, ROUTE_17_18_GATE + warp_def 17, 82, 1, ROUTE_17_ROUTE_18_GATE + warp_def 17, 83, 2, ROUTE_17_ROUTE_18_GATE .CoordEvents: db 0 diff --git a/maps/Route1718Gate.asm b/maps/Route17Route18Gate.asm index 9a8a076dd..6596d3809 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route17Route18Gate.asm @@ -1,7 +1,7 @@ const_value set 2 - const ROUTE1718GATE_OFFICER + const ROUTE17ROUTE18GATE_OFFICER -Route1718Gate_MapScriptHeader: +Route17Route18Gate_MapScriptHeader: .SceneScripts: db 1 scene_script .DummyScene @@ -12,8 +12,8 @@ Route1718Gate_MapScriptHeader: .DummyScene: end -Route1718GateOfficerScript: - jumptextfaceplayer Route1718GateOfficerText +Route17Route18GateOfficerScript: + jumptextfaceplayer Route17Route18GateOfficerText UnknownScript_0x73611: checkitem BICYCLE @@ -21,7 +21,7 @@ UnknownScript_0x73611: end UnknownScript_0x73617: - showemote EMOTE_SHOCK, ROUTE1718GATE_OFFICER, 15 + showemote EMOTE_SHOCK, ROUTE17ROUTE18GATE_OFFICER, 15 spriteface PLAYER, UP opentext writetext UnknownText_0x7364d @@ -35,7 +35,7 @@ MovementData_0x73629: turn_head LEFT step_end -Route1718GateOfficerText: +Route17Route18GateOfficerText: text "CYCLING ROAD" line "Uphill Starts Here" done @@ -51,7 +51,7 @@ UnknownText_0x7364d: line "BICYCLE to go on." done -Route1718Gate_MapEventHeader: +Route17Route18Gate_MapEventHeader: ; filler db 0, 0 @@ -72,4 +72,4 @@ Route1718Gate_MapEventHeader: .ObjectEvents: db 1 - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route1718GateOfficerScript, -1 + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route17Route18GateOfficerScript, -1 diff --git a/maps/Route18.asm b/maps/Route18.asm index 04a0cc843..0487cc797 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -83,8 +83,8 @@ Route18_MapEventHeader: .Warps: db 2 - warp_def 2, 6, 3, ROUTE_17_18_GATE - warp_def 2, 7, 4, ROUTE_17_18_GATE + warp_def 2, 6, 3, ROUTE_17_ROUTE_18_GATE + warp_def 2, 7, 4, ROUTE_17_ROUTE_18_GATE .CoordEvents: db 0 diff --git a/maps/Route19.asm b/maps/Route19.asm index 7681b39c2..5309598b6 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -12,17 +12,17 @@ Route19_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .ClearRocks + callback MAPCALLBACK_TILES, .ClearRocks .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/Route2.asm b/maps/Route2.asm index 47abdc9f5..508758448 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -70,16 +70,16 @@ FruitTreeScript_0x1ac306: fruittree FRUITTREE_ROUTE_2 Route2HiddenMaxEther: - dwb EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER Route2HiddenFullHeal: - dwb EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL Route2HiddenFullRestore: - dwb EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE Route2HiddenRevive: - dwb EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE + hiddenitem EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE BugCatcherRobSeenText: text "My bug #MON are" diff --git a/maps/Route20.asm b/maps/Route20.asm index 7137999fe..67118d5cb 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -9,7 +9,7 @@ Route20_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .ClearRocks + callback MAPCALLBACK_NEWMAP, .ClearRocks .ClearRocks: setevent EVENT_CINNABAR_ROCKS_CLEARED diff --git a/maps/Route23.asm b/maps/Route23.asm index 87ba72d9c..c82ae6462 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -4,7 +4,7 @@ Route23_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_INDIGO_PLATEAU diff --git a/maps/Route24.asm b/maps/Route24.asm index 07740a467..e598c01a1 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -29,7 +29,7 @@ RocketScript_0x1adbfa: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes disappear ROUTE24_ROCKET pause 25 special Special_FadeInQuickly diff --git a/maps/Route25.asm b/maps/Route25.asm index ce37fe894..15a2ded4e 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 @@ -191,8 +191,7 @@ Route25Protein: itemball PROTEIN Route25HiddenPotion: - dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION - + hiddenitem EVENT_ROUTE_25_HIDDEN_POTION, POTION MovementData_0x19efe8: big_step DOWN diff --git a/maps/Route26.asm b/maps/Route26.asm index 4af45fe1f..148d5e96c 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -49,9 +49,9 @@ UnknownScript_0x1a4d62: scall UnknownScript_0x1a4dc3 UnknownScript_0x1a4d65: askforphonenumber PHONE_COOLTRAINERM_GAVEN - if_equal $1, UnknownScript_0x1a4dd3 - if_equal $2, UnknownScript_0x1a4dcf - trainertotext COOLTRAINERM, GAVEN3, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a4dd3 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a4dcf + trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0 scall UnknownScript_0x1a4dc7 jump UnknownScript_0x1a4dcb @@ -153,9 +153,9 @@ UnknownScript_0x1a4e1e: scall UnknownScript_0x1a4e7f UnknownScript_0x1a4e21: askforphonenumber PHONE_COOLTRAINERF_BETH - if_equal $1, UnknownScript_0x1a4e8f - if_equal $2, UnknownScript_0x1a4e8b - trainertotext COOLTRAINERF, BETH1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a4e8f + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a4e8b + trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0 scall UnknownScript_0x1a4e83 jump UnknownScript_0x1a4e87 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 15f888fb6..e60b83ce4 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -15,8 +15,8 @@ TeacherScript_0x7b125: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes - special TrainerRankings_Healings + special ReloadSpritesNoPalettes + special Special_StubbedTrainerRankings_Healings playmusic MUSIC_HEAL special HealParty pause 60 diff --git a/maps/Route27.asm b/maps/Route27.asm index 3afac9155..a21606768 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: @@ -84,9 +84,9 @@ UnknownScript_0x1a08e8: scall UnknownScript_0x1a095b UnknownScript_0x1a08eb: askforphonenumber PHONE_BIRDKEEPER_JOSE - if_equal $1, UnknownScript_0x1a096b - if_equal $2, UnknownScript_0x1a0967 - trainertotext BIRD_KEEPER, JOSE2, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a096b + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a0967 + trainertotext BIRD_KEEPER, JOSE2, MEM_BUFFER_0 scall UnknownScript_0x1a095f jump UnknownScript_0x1a0963 @@ -217,9 +217,9 @@ UnknownScript_0x1a09d2: scall UnknownScript_0x1a0a33 UnknownScript_0x1a09d5: askforphonenumber PHONE_COOLTRAINERF_REENA - if_equal $1, UnknownScript_0x1a0a43 - if_equal $2, UnknownScript_0x1a0a3f - trainertotext COOLTRAINERF, REENA1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a0a43 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a0a3f + trainertotext COOLTRAINERF, REENA1, MEM_BUFFER_0 scall UnknownScript_0x1a0a37 jump UnknownScript_0x1a0a3b diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index e66f41f4e..a892e22e3 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -13,10 +13,10 @@ SandstormHouseWoman: opentext checkevent EVENT_GOT_TM37_SANDSTORM iftrue .AlreadyGotItem - special GetFirstPokemonHappiness + special Special_GetFirstPokemonHappiness writetext SandstormHouseWomanText1 buttonsound - if_greater_than $95, .Loyal + if_greater_than 150 - 1, .Loyal jump .Disloyal .Loyal: diff --git a/maps/Route28.asm b/maps/Route28.asm index 8b76bc407..225039518 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -9,8 +9,7 @@ Route28Sign: jumptext Route28SignText Route28HiddenRareCandy: - dwb EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY - + hiddenitem EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY Route28SignText: text "ROUTE 28" diff --git a/maps/Route29.asm b/maps/Route29.asm index cd91a1f3e..8cd26f84b 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -16,7 +16,7 @@ Route29_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Tuscany + callback MAPCALLBACK_OBJECTS, .Tuscany .DummyScene0: end @@ -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,14 +101,14 @@ Script_RefusedTutorial2: waitbutton closetext applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b - setscene $0 + setscene 0 end CatchingTutorialDudeScript: faceplayer opentext checkcode VAR_BOXSPACE - if_equal $0, .BoxFull + if_equal 0, .BoxFull checkevent EVENT_LEARNED_TO_CATCH_POKEMON iftrue .BoxFull checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM @@ -324,7 +324,7 @@ Route29FisherText: line "progress." done -; possibly unused +; unused Text_WaitingForDay: text "I'm waiting for" line "#MON that" @@ -421,7 +421,7 @@ Route29_MapEventHeader: .Warps: db 1 - warp_def 27, 1, 3, ROUTE_29_46_GATE + warp_def 27, 1, 3, ROUTE_29_ROUTE_46_GATE .CoordEvents: db 2 diff --git a/maps/Route2946Gate.asm b/maps/Route29Route46Gate.asm index c90aa3150..e3366fae7 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route29Route46Gate.asm @@ -1,21 +1,21 @@ const_value set 2 - const ROUTE2946GATE_OFFICER - const ROUTE2946GATE_YOUNGSTER + const ROUTE29ROUTE46GATE_OFFICER + const ROUTE29ROUTE46GATE_YOUNGSTER -Route2946Gate_MapScriptHeader: +Route29Route46Gate_MapScriptHeader: .SceneScripts: db 0 .MapCallbacks: db 0 -Route2946GateOfficerScript: - jumptextfaceplayer Route2946GateOfficerText +Route29Route46GateOfficerScript: + jumptextfaceplayer Route29Route46GateOfficerText -Route2946GateYoungsterScript: - jumptextfaceplayer Route2946GateYoungsterText +Route29Route46GateYoungsterScript: + jumptextfaceplayer Route29Route46GateYoungsterText -Route2946GateOfficerText: +Route29Route46GateOfficerText: text "You can't climb" line "ledges." @@ -24,7 +24,7 @@ Route2946GateOfficerText: cont "take a shortcut." done -Route2946GateYoungsterText: +Route29Route46GateYoungsterText: text "Different kinds of" line "#MON appear" cont "past here." @@ -36,7 +36,7 @@ Route2946GateYoungsterText: line "everywhere." done -Route2946Gate_MapEventHeader: +Route29Route46Gate_MapEventHeader: ; filler db 0, 0 @@ -55,5 +55,5 @@ Route2946Gate_MapEventHeader: .ObjectEvents: db 2 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route2946GateOfficerScript, -1 - object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route2946GateYoungsterScript, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1 + object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1 diff --git a/maps/Route30.asm b/maps/Route30.asm index 74db65a31..4884beeee 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -61,9 +61,9 @@ TrainerYoungsterJoey: scall .AskNumber2 .RequestNumber: askforphonenumber PHONE_YOUNGSTER_JOEY - if_equal $1, .PhoneFull - if_equal $2, .NumberDeclined - trainertotext YOUNGSTER, JOEY1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -248,8 +248,7 @@ Route30FruitTree2: fruittree FRUITTREE_ROUTE_30_2 Route30HiddenPotion: - dwb EVENT_ROUTE_30_HIDDEN_POTION, POTION - + hiddenitem EVENT_ROUTE_30_HIDDEN_POTION, POTION Route30_JoeysRattataAttacksMovement: fix_facing diff --git a/maps/Route31.asm b/maps/Route31.asm index e5498917f..15a76a3cf 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -13,7 +13,7 @@ Route31_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .CheckMomCall + callback MAPCALLBACK_NEWMAP, .CheckMomCall .CheckMomCall: checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST @@ -49,9 +49,9 @@ TrainerBugCatcherWade1: scall .AskAgainSTD .Continue: askforphonenumber PHONE_BUG_CATCHER_WADE - if_equal $1, .PhoneFullSTD - if_equal $2, .DeclinedNumberSTD - trainertotext BUG_CATCHER, WADE1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFullSTD + if_equal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD + trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0 scall .RegisterNumberSTD jump .AcceptedNumberSTD @@ -198,10 +198,11 @@ Route31MailRecipientScript: writetext Text_Route31SleepyManGotMail buttonsound checkpokeitem ReceivedSpearowMailText - if_equal $0, .WrongMail - if_equal $2, .Refused - if_equal $3, .NoMail - if_equal $4, .LastMon + if_equal POKEMAIL_WRONG_MAIL, .WrongMail + if_equal POKEMAIL_REFUSED, .Refused + if_equal POKEMAIL_NO_MAIL, .NoMail + if_equal POKEMAIL_LAST_MON, .LastMon + ; POKEMAIL_CORRECT writetext Text_Route31HandOverMailMon buttonsound writetext Text_Route31ReadingMail diff --git a/maps/Route32.asm b/maps/Route32.asm index 659ea40db..369dac494 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -23,7 +23,7 @@ Route32_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Frieda + callback MAPCALLBACK_OBJECTS, .Frieda .DummyScene0: end @@ -59,7 +59,7 @@ Route32CooltrainerMContinueScene: closetext end -.Unused: +.Unreferenced: writetext Route32CooltrainerMText_UnusedSproutTower waitbutton closetext @@ -127,7 +127,7 @@ Route32WannaBuyASlowpokeTailScript: SlowpokeTailSalesmanScript: faceplayer _OfferToSellSlowpokeTail: - setscene $2 + setscene 2 opentext writetext Text_MillionDollarSlowpokeTail yesorno @@ -190,9 +190,9 @@ TrainerFisherRalph1: scall .AskNumber2 .AskForNumber: askforphonenumber PHONE_FISHER_RALPH - if_equal $1, .PhoneFull - if_equal $2, .NumberDeclined - trainertotext FISHER, RALPH1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + trainertotext FISHER, RALPH1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -324,9 +324,9 @@ TrainerPicnickerLiz1: scall .AskNumber2 .AskForNumber: askforphonenumber PHONE_PICNICKER_LIZ - if_equal $1, .PhoneFull - if_equal $2, .NumberDeclined - trainertotext PICNICKER, LIZ1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + trainertotext PICNICKER, LIZ1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -506,12 +506,10 @@ Route32PokecenterSign: jumpstd pokecentersign Route32HiddenGreatBall: - dwb EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL - + hiddenitem EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL Route32HiddenSuperPotion: - dwb EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION - + hiddenitem EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION Movement_Route32CooltrainerMPushesYouBackToViolet: step UP @@ -839,7 +837,7 @@ BirdKeeperPeterAfterText: cont "in VIOLET CITY." done -; possibly unused +; unused Route32UnusedText: text "The fishermen" line "yelled at me for" diff --git a/maps/Route33.asm b/maps/Route33.asm index fbc7b3190..5ab8610d7 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -38,9 +38,9 @@ TrainerHikerAnthony: scall .AskNumber2 .AskForPhoneNumber: askforphonenumber PHONE_HIKER_ANTHONY - if_equal $1, .PhoneFull - if_equal $2, .NumberDeclined - trainertotext HIKER, ANTHONY2, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + trainertotext HIKER, ANTHONY2, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route34.asm b/maps/Route34.asm index 144973036..04ea74ab7 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -19,7 +19,7 @@ Route34_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .EggCheckCallback + callback MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: checkflag ENGINE_DAY_CARE_MAN_HAS_EGG @@ -59,7 +59,7 @@ DayCareManScript_Outside: special Special_DayCareManOutside waitbutton closetext - if_equal $1, .end_fail + if_equal TRUE, .end_fail clearflag ENGINE_DAY_CARE_MAN_HAS_EGG checkcode VAR_FACING if_equal RIGHT, .walk_around_player @@ -112,9 +112,9 @@ TrainerCamperTodd1: scall .AskNumber2 .FinishAsk: askforphonenumber PHONE_CAMPER_TODD - if_equal $1, .PhoneFull - if_equal $2, .NumberDeclined - trainertotext CAMPER, TODD1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + trainertotext CAMPER, TODD1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -237,9 +237,9 @@ TrainerPicnickerGina1: scall .AskNumber2 .FinishAsk: askforphonenumber PHONE_PICNICKER_GINA - if_equal $1, .PhoneFull - if_equal $2, .NumberDeclined - trainertotext PICNICKER, GINA1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + trainertotext PICNICKER, GINA1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -488,12 +488,10 @@ Route34Nugget: itemball NUGGET Route34HiddenRareCandy: - dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY - + hiddenitem EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY Route34HiddenSuperPotion: - dwb EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION - + hiddenitem EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION Route34MovementData_DayCareManWalksBackInside: slow_step LEFT diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 18b010bff..db9f31f39 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -10,7 +10,7 @@ Route34IlexForestGate_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .IsForestRestless + callback MAPCALLBACK_OBJECTS, .IsForestRestless .IsForestRestless: checkevent EVENT_FOREST_IS_RESTLESS diff --git a/maps/Route35.asm b/maps/Route35.asm index becb45ad0..a8a8bfe46 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -50,9 +50,9 @@ UnknownScript_0x19c8ec: scall UnknownScript_0x19c907 UnknownScript_0x19c8ef: askforphonenumber PHONE_JUGGLER_IRWIN - if_equal $1, UnknownScript_0x19c917 - if_equal $2, UnknownScript_0x19c913 - trainertotext JUGGLER, IRWIN1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19c917 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19c913 + trainertotext JUGGLER, IRWIN1, MEM_BUFFER_0 scall UnknownScript_0x19c90b jump UnknownScript_0x19c90f @@ -153,9 +153,9 @@ UnknownScript_0x19c9a4: scall UnknownScript_0x19c907 UnknownScript_0x19c9a7: askforphonenumber PHONE_BUG_CATCHER_ARNIE - if_equal $1, UnknownScript_0x19c917 - if_equal $2, UnknownScript_0x19c913 - trainertotext BUG_CATCHER, ARNIE1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19c917 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19c913 + trainertotext BUG_CATCHER, ARNIE1, MEM_BUFFER_0 scall UnknownScript_0x19c90b jump UnknownScript_0x19c90f diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index cf68bbcc2..c5d9b6c34 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -12,8 +12,8 @@ Route35NationalParkGate_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning - dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable + callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning + callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable .DummyScene0: end @@ -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: @@ -58,8 +58,8 @@ Route35NationalParkGate_MapScriptHeader: spriteface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT opentext checkcode VAR_CONTESTMINUTES - addvar $1 - RAM2MEM $0 + addvar 1 + vartomem MEM_BUFFER_0 writetext UnknownText_0x6a79a yesorno iffalse .GoBackToContest @@ -74,9 +74,9 @@ Route35NationalParkGate_MapScriptHeader: closetext scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx - warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f + warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47 end OfficerScript_0x6a204: @@ -94,8 +94,8 @@ OfficerScript_0x6a204: yesorno iffalse Route35NationalParkGate_DeclinedToParticipate checkcode VAR_PARTYCOUNT - if_greater_than $1, Route35NationalParkGate_LeaveTheRestBehind - special ContestDropOffMons + if_greater_than 1, Route35NationalParkGate_LeaveTheRestBehind + special Special_ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER Route35NationalParkGate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER @@ -111,10 +111,10 @@ Route35NationalParkGate_OkayToProceed: special Special_GiveParkBalls scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special FadeOutPalettes + special 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: @@ -129,17 +129,17 @@ Route35NationalParkGate_FacingLeft: Route35NationalParkGate_LeaveTheRestBehind: checkcode VAR_PARTYCOUNT - if_less_than 6, Route35NationalParkGate_LessThanFullParty + if_less_than PARTY_LENGTH, Route35NationalParkGate_LessThanFullParty checkcode VAR_BOXSPACE if_equal 0, Route35NationalParkGate_NoRoomInBox Route35NationalParkGate_LessThanFullParty: ; 6a27d - special CheckFirstMonIsEgg - if_equal $1, Route35NationalParkGate_FirstMonIsEgg + special Special_CheckFirstMonIsEgg + if_equal TRUE, Route35NationalParkGate_FirstMonIsEgg writetext UnknownText_0x6a4c6 yesorno iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind - special ContestDropOffMons + special Special_ContestDropOffMons iftrue Route35NationalParkGate_FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6a537 diff --git a/maps/Route36.asm b/maps/Route36.asm index 4076725b4..bc94bf2b2 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -17,7 +17,7 @@ Route36_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .ArthurCallback + callback MAPCALLBACK_OBJECTS, .ArthurCallback .DummyScene0: end @@ -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: @@ -94,8 +94,8 @@ DidntCatchSudowoodo: applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN - special MapCallbackSprites_LoadUsedSpritesGFX - special RefreshSprites + special Special_LoadUsedSpritesGFX + special Special_RefreshSprites end Route36FloriaScript: @@ -191,9 +191,9 @@ TrainerSchoolboyAlan1: scall .AskNumber2 .ContinueAskForPhoneNumber: askforphonenumber PHONE_SCHOOLBOY_ALAN - if_equal $1, .PhoneFull - if_equal $2, .NumberDeclined - trainertotext SCHOOLBOY, ALAN1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 88d7abb14..24854b9e3 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -21,8 +21,8 @@ Route36NationalParkGate_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning - dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable + callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning + callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable .DummyScene0: end @@ -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: @@ -67,8 +67,8 @@ Route36NationalParkGate_MapScriptHeader: spriteface PLAYER, UP opentext checkcode VAR_CONTESTMINUTES - addvar $1 - RAM2MEM $0 + addvar 1 + vartomem MEM_BUFFER_0 writetext UnknownText_0x6b284 yesorno iffalse .GoBackToContest @@ -76,7 +76,7 @@ Route36NationalParkGate_MapScriptHeader: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes scall .CopyContestants disappear ROUTE36NATIONALPARKGATE_OFFICER1 appear ROUTE36NATIONALPARKGATE_OFFICER2 @@ -91,9 +91,9 @@ Route36NationalParkGate_MapScriptHeader: closetext spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx - warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 + warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 end .CopyContestants: @@ -155,8 +155,8 @@ Route36OfficerScriptContest: yesorno iffalse .DecidedNotToJoinContest checkcode VAR_PARTYCOUNT - if_greater_than $1, .LeaveMonsWithOfficer - special ContestDropOffMons + if_greater_than 1, .LeaveMonsWithOfficer + special Special_ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER .ResumeStartingContest: setflag ENGINE_BUG_CONTEST_TIMER @@ -174,24 +174,24 @@ Route36OfficerScriptContest: special Special_GiveParkBalls spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx special Special_SelectRandomBugContestContestants - warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 + warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 end .LeaveMonsWithOfficer: checkcode VAR_PARTYCOUNT - if_less_than $6, .ContinueLeavingMons + if_less_than PARTY_LENGTH, .ContinueLeavingMons checkcode VAR_BOXSPACE - if_equal $0, .BoxFull + if_equal 0, .BoxFull .ContinueLeavingMons: - special CheckFirstMonIsEgg - if_equal $1, .FirstMonIsEgg + special Special_CheckFirstMonIsEgg + if_equal TRUE, .FirstMonIsEgg writetext UnknownText_0x6afb0 yesorno iffalse .RefusedToLeaveMons - special ContestDropOffMons + special Special_ContestDropOffMons iftrue .FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6b021 @@ -799,7 +799,6 @@ UnknownText_0x6b7af: ; This text is unused and unreferenced in the final game. ; The tree Pokémon is Sudowoodo. ; The Silph Scope 2 was later reworked into the Squirtbottle. - UnusedSudowoodoText: text "I hear there's a" line "#MON that looks" diff --git a/maps/Route37.asm b/maps/Route37.asm index 190656869..233a299b9 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -13,7 +13,7 @@ Route37_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Sunny + callback MAPCALLBACK_OBJECTS, .Sunny .Sunny: checkcode VAR_WEEKDAY @@ -114,8 +114,7 @@ FruitTreeScript_0x1a8e0d: fruittree FRUITTREE_ROUTE_37_3 Route37HiddenEther: - dwb EVENT_ROUTE_37_HIDDEN_ETHER, ETHER - + hiddenitem EVENT_ROUTE_37_HIDDEN_ETHER, ETHER TwinsAnnandanne1SeenText: text "ANN: ANNE and I" diff --git a/maps/Route38.asm b/maps/Route38.asm index 526bf3e36..c91ad06c1 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -61,9 +61,9 @@ TrainerLassDana1: scall .AskNumber2F .AskForPhoneNumber: askforphonenumber PHONE_LASS_DANA - if_equal $1, .PhoneFull - if_equal $2, .DeclinedPhoneNumber - trainertotext LASS, DANA1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber + trainertotext LASS, DANA1, MEM_BUFFER_0 scall .RegisteredPhoneNumber jump .NumberAccepted @@ -197,9 +197,9 @@ TrainerSchoolboyChad1: scall .AskPhoneNumber2 .AskToRegisterNumber: askforphonenumber PHONE_SCHOOLBOY_CHAD - if_equal $1, .PhoneFull - if_equal $2, .SaidNo - trainertotext SCHOOLBOY, CHAD1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .SaidNo + trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0 scall .RegisteredChad jump .HaveChadsNumber diff --git a/maps/Route39.asm b/maps/Route39.asm index 6545dd77d..6038df139 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -50,9 +50,9 @@ PokefanMDerekWantsYourNumber: scall PokefanMDerekAsksNumber2 PokefanMDerekAsksForPhoneNumber: askforphonenumber PHONE_POKEFANM_DEREK - if_equal $1, PokefanMDerekPhoneFull - if_equal $2, PokefanMDerekDeclined - trainertotext POKEFANM, DEREK1, $0 + if_equal PHONE_CONTACTS_FULL, PokefanMDerekPhoneFull + if_equal PHONE_CONTACT_REFUSED, PokefanMDerekDeclined + trainertotext POKEFANM, DEREK1, MEM_BUFFER_0 scall PokefanMDerekRegistered jump PokefanMDerekAccepted @@ -180,8 +180,7 @@ FruitTreeScript_0x1a5bf4: fruittree FRUITTREE_ROUTE_39 Route39HiddenNugget: - dwb EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET - + hiddenitem EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET Route39MiltankText: text "MILTANK: Mooo!" diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index a7cfe5405..6234a9cf4 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -52,7 +52,7 @@ MooMoo: iftrue .HappyCow writetext Text_WeakMoo writebyte MILTANK - special PlaySlowCry + special Special_PlaySlowCry buttonsound writetext Text_ItsCryIsWeak checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 77531a70d..15f8c2a6d 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -24,15 +24,15 @@ FarmerMScript_SellMilk: checkitem MOOMOO_MILK iftrue FarmerMScript_Milking writetext FarmerMText_BuyMilk - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight yesorno iffalse FarmerMScript_NoSale - checkmoney $0, 500 - if_equal $2, FarmerMScript_NoMoney + checkmoney YOUR_MONEY, 500 + if_equal HAVE_LESS, FarmerMScript_NoMoney giveitem MOOMOO_MILK iffalse FarmerMScript_NoRoom - takemoney $0, 500 - special PlaceMoneyTopRight + takemoney YOUR_MONEY, 500 + special Special_PlaceMoneyTopRight waitsfx playsound SFX_TRANSACTION writetext FarmerMText_GotMilk diff --git a/maps/Route4.asm b/maps/Route4.asm index bd6ea62e5..c28394c0f 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -51,8 +51,7 @@ Route4HPUp: itemball HP_UP Route4HiddenUltraBall: - dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL - + hiddenitem EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL BirdKeeperHankSeenText: text "I'm raising my" diff --git a/maps/Route40.asm b/maps/Route40.asm index 73f089bd2..28461eac8 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -18,7 +18,7 @@ Route40_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .MonicaCallback + callback MAPCALLBACK_OBJECTS, .MonicaCallback .MonicaCallback: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR @@ -79,7 +79,7 @@ Route40Lass1Script: jumptextfaceplayer Route40Lass1Text PokefanMScript_0x1a61c7: - special Mobile_DummyReturnFalse + special Special_Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x1a646a @@ -135,7 +135,7 @@ Route40Rock: jumpstd smashrock Route40HiddenHyperPotion: - dwb EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION MovementData_0x1a621c: step RIGHT diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index f37b78669..9562c3ae4 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -8,7 +8,7 @@ Route40BattleTowerGate_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .ShowSailor + callback MAPCALLBACK_OBJECTS, .ShowSailor .ShowSailor: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/Route41.asm b/maps/Route41.asm index 95618e692..29eb35e04 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -132,7 +132,7 @@ Route41Rock: jumpstd smashrock Route41HiddenMaxEther: - dwb EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER SwimmermCharlieSeenText: text "The water's warm" diff --git a/maps/Route42.asm b/maps/Route42.asm index ccf174b17..46606e647 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: @@ -61,9 +61,9 @@ UnknownScript_0x1a9268: scall UnknownScript_0x1a92f5 UnknownScript_0x1a926b: askforphonenumber PHONE_FISHER_TULLY - if_equal $1, UnknownScript_0x1a9305 - if_equal $2, UnknownScript_0x1a9301 - trainertotext FISHER, TULLY1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a9305 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a9301 + trainertotext FISHER, TULLY1, MEM_BUFFER_0 scall UnknownScript_0x1a92f9 jump UnknownScript_0x1a92fd @@ -212,18 +212,17 @@ FruitTreeScript_0x1a9351: fruittree FRUITTREE_ROUTE_42_3 Route42HiddenMaxPotion: - dwb EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION - + hiddenitem EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION 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..afad4a606 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -14,16 +14,16 @@ Route43_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .CheckIfRockets + callback MAPCALLBACK_NEWMAP, .CheckIfRockets .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: @@ -71,9 +71,9 @@ UnknownScript_0x19d0b8: scall UnknownScript_0x19d130 UnknownScript_0x19d0bb: askforphonenumber PHONE_POKEMANIAC_BRENT - if_equal $1, UnknownScript_0x19d140 - if_equal $2, UnknownScript_0x19d13c - trainertotext POKEMANIAC, BRENT1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d140 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d13c + trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0 scall UnknownScript_0x19d134 jump UnknownScript_0x19d138 @@ -202,9 +202,9 @@ UnknownScript_0x19d1aa: scall UnknownScript_0x19d23d UnknownScript_0x19d1ad: askforphonenumber PHONE_PICNICKER_TIFFANY - if_equal $1, UnknownScript_0x19d24d - if_equal $2, UnknownScript_0x19d249 - trainertotext PICNICKER, TIFFANY3, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d24d + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d249 + trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0 scall UnknownScript_0x19d241 jump UnknownScript_0x19d245 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 58bb163ef..7548394a5 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -13,7 +13,7 @@ Route43Gate_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .CheckIfRockets + callback MAPCALLBACK_NEWMAP, .CheckIfRockets .RocketShakedown: priorityjump .RocketTakeover @@ -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: @@ -50,17 +50,17 @@ RocketScript_Southbound: opentext writetext RocketText_TollFee buttonsound - checkmoney $0, ROUTE43GATE_TOLL - 1 - if_equal $0, RocketScript_TollSouth + checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1 + if_equal HAVE_MORE, RocketScript_TollSouth jump RocketScript_YoureBrokeSouth RocketScript_TollSouth: - takemoney $0, ROUTE43GATE_TOLL + takemoney YOUR_MONEY, ROUTE43GATE_TOLL writetext RocketText_ThankYou jump RocketScript_ShakeDownSouth RocketScript_YoureBrokeSouth: - takemoney $0, ROUTE43GATE_TOLL + takemoney YOUR_MONEY, ROUTE43GATE_TOLL writetext RocketText_AllYouGot jump RocketScript_ShakeDownSouth @@ -69,7 +69,7 @@ RocketScript_ShakeDownSouth: closetext applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth - setscene $1 + setscene 1 special RestartMapMusic end @@ -82,17 +82,17 @@ RocketScript_Northbound: opentext writetext RocketText_TollFee buttonsound - checkmoney $0, ROUTE43GATE_TOLL - 1 - if_equal $0, RocketScript_TollNorth + checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1 + if_equal HAVE_MORE, RocketScript_TollNorth jump RocketScript_YoureBrokeNorth RocketScript_TollNorth: - takemoney $0, ROUTE43GATE_TOLL + takemoney YOUR_MONEY, ROUTE43GATE_TOLL writetext RocketText_ThankYou jump RocketScript_ShakeDownNorth RocketScript_YoureBrokeNorth: - takemoney $0, ROUTE43GATE_TOLL + takemoney YOUR_MONEY, ROUTE43GATE_TOLL writetext RocketText_AllYouGot jump RocketScript_ShakeDownNorth @@ -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/Route44.asm b/maps/Route44.asm index 4f9261a59..31fe9223f 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -41,9 +41,9 @@ UnknownScript_0x19d853: scall UnknownScript_0x19d8e3 UnknownScript_0x19d856: askforphonenumber PHONE_BIRDKEEPER_VANCE - if_equal $1, UnknownScript_0x19d8f3 - if_equal $2, UnknownScript_0x19d8ef - trainertotext BIRD_KEEPER, VANCE1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d8f3 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d8ef + trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0 scall UnknownScript_0x19d8e7 jump UnknownScript_0x19d8eb @@ -185,9 +185,9 @@ UnknownScript_0x19d957: scall UnknownScript_0x19d8e3 UnknownScript_0x19d95a: askforphonenumber PHONE_FISHER_WILTON - if_equal $1, UnknownScript_0x19d8f3 - if_equal $2, UnknownScript_0x19d8ef - trainertotext FISHER, WILTON1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d8f3 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d8ef + trainertotext FISHER, WILTON1, MEM_BUFFER_0 scall UnknownScript_0x19d8e7 jump UnknownScript_0x19d8eb @@ -318,8 +318,7 @@ Route44MaxRepel: itemball MAX_REPEL Route44HiddenElixer: - dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER - + hiddenitem EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER FisherWilton1SeenText: text "Aack! You made me" diff --git a/maps/Route45.asm b/maps/Route45.asm index 38b7f77f2..63db10a95 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -42,15 +42,15 @@ UnknownScript_0x19e0cd: scall UnknownScript_0x19e11f UnknownScript_0x19e0d0: askforphonenumber PHONE_BLACKBELT_KENJI - if_equal $1, UnknownScript_0x19e12f - if_equal $2, UnknownScript_0x19e12b - trainertotext BLACKBELT_T, KENJI3, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19e12f + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19e12b + trainertotext BLACKBELT_T, KENJI3, MEM_BUFFER_0 scall UnknownScript_0x19e123 jump UnknownScript_0x19e127 UnknownScript_0x19e0e4: checkcode VAR_KENJI_BREAK - if_not_equal $1, UnknownScript_0x19e127 + if_not_equal 1, UnknownScript_0x19e127 checkmorn iftrue UnknownScript_0x19e10c checknite @@ -169,9 +169,9 @@ UnknownScript_0x19e1a1: scall UnknownScript_0x19e11f UnknownScript_0x19e1a4: askforphonenumber PHONE_HIKER_PARRY - if_equal $1, UnknownScript_0x19e12f - if_equal $2, UnknownScript_0x19e12b - trainertotext HIKER, PARRY1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19e12f + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19e12b + trainertotext HIKER, PARRY1, MEM_BUFFER_0 scall UnknownScript_0x19e123 jump UnknownScript_0x19e127 @@ -312,8 +312,7 @@ Route45MaxPotion: itemball MAX_POTION Route45HiddenPpUp: - dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP - + hiddenitem EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP HikerErikSeenText: text "Be prepared for" diff --git a/maps/Route46.asm b/maps/Route46.asm index 36dad82d3..6edd26404 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -47,9 +47,9 @@ UnknownScript_0x1a96c3: scall UnknownScript_0x1a9753 UnknownScript_0x1a96c6: askforphonenumber PHONE_PICNICKER_ERIN - if_equal $1, UnknownScript_0x1a9763 - if_equal $2, UnknownScript_0x1a975f - trainertotext PICNICKER, ERIN1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a9763 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a975f + trainertotext PICNICKER, ERIN1, MEM_BUFFER_0 scall UnknownScript_0x1a9757 jump UnknownScript_0x1a975b @@ -256,8 +256,8 @@ Route46_MapEventHeader: .Warps: db 3 - warp_def 7, 33, 1, ROUTE_29_46_GATE - warp_def 8, 33, 2, ROUTE_29_46_GATE + warp_def 7, 33, 1, ROUTE_29_ROUTE_46_GATE + warp_def 8, 33, 2, ROUTE_29_ROUTE_46_GATE warp_def 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE .CoordEvents: diff --git a/maps/Route5.asm b/maps/Route5.asm index 7976fbe79..1e2ea7741 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -46,8 +46,8 @@ Route5_MapEventHeader: .Warps: db 4 warp_def 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE - warp_def 8, 17, 1, ROUTE_5_SAFFRON_CITY_GATE - warp_def 9, 17, 2, ROUTE_5_SAFFRON_CITY_GATE + warp_def 8, 17, 1, ROUTE_5_SAFFRON_GATE + warp_def 9, 17, 2, ROUTE_5_SAFFRON_GATE warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE .CoordEvents: diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronGate.asm index e47ce7628..cf945b7dc 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronGate.asm @@ -1,17 +1,17 @@ const_value set 2 - const ROUTE5SAFFRONCITYGATE_OFFICER + const ROUTE5SAFFRONGATE_OFFICER -Route5SaffronCityGate_MapScriptHeader: +Route5SaffronGate_MapScriptHeader: .SceneScripts: db 0 .MapCallbacks: db 0 -Route5SaffronCityGateOfficerScript: - jumptextfaceplayer Route5SaffronCityGateOfficerText +Route5SaffronGateOfficerScript: + jumptextfaceplayer Route5SaffronGateOfficerText -Route5SaffronCityGateOfficerText: +Route5SaffronGateOfficerText: text "You're from JOHTO," line "aren't you?" @@ -20,7 +20,7 @@ Route5SaffronCityGateOfficerText: cont "don't you agree?" done -Route5SaffronCityGate_MapEventHeader: +Route5SaffronGate_MapEventHeader: ; filler db 0, 0 @@ -39,4 +39,4 @@ Route5SaffronCityGate_MapEventHeader: .ObjectEvents: db 1 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronCityGateOfficerScript, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronGateOfficerScript, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index 1b377ceeb..f98b45310 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -83,8 +83,7 @@ Route9Sign: jumptext Route9SignText Route9HiddenEther: - dwb EVENT_ROUTE_9_HIDDEN_ETHER, ETHER - + hiddenitem EVENT_ROUTE_9_HIDDEN_ETHER, ETHER CamperDeanSeenText: text "I came to explore" diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 355b5591c..86934ba61 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -6,7 +6,7 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HiddenDoors + callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER @@ -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, $01 + changeblock 4, 2, $02 return .WallOpenScript: @@ -40,16 +40,16 @@ 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 MapRuinsOfAlphAerodactylChamberSignpost2Script: - refreshscreen $0 - writebyte $2 + refreshscreen + writebyte UNOWNPUZZLE_AERODACTYL special Special_UnownPuzzle closetext iftrue UnknownScript_0x58df7 @@ -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 @@ -83,7 +83,7 @@ MapRuinsOfAlphAerodactylChamberSignpost3Script: MapRuinsOfAlphAerodactylChamberSignpost4Script: opentext writetext UnknownText_0x58e4f - writebyte $1 + writebyte UNOWNWORDS_LIGHT special Special_DisplayUnownWords closetext end @@ -93,7 +93,7 @@ MapRuinsOfAlphAerodactylChamberSignpost5Script: iftrue UnknownScript_0x58e46 opentext writetext UnknownText_0x58e81 - writebyte $1 + writebyte UNOWNWORDS_LIGHT special Special_DisplayUnownWords closetext end @@ -106,7 +106,7 @@ UnknownScript_0x58e46: end MovementData_0x58e4d: - db $59 ; movement + skyfall_top step_end UnknownText_0x58e4f: @@ -114,8 +114,8 @@ UnknownText_0x58e4f: line "on the walls…" done -; possibly unused.. again? -UnknownText_0x58e70: +; unused +UnusedText_0x58e70: text "It's UNOWN text!" done diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 52915317d..c63ce2fae 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -6,10 +6,10 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HiddenDoors + callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: - special SpecialHoOhChamber + special Special_HoOhChamber checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue .OpenWall end @@ -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, $01 + changeblock 4, 2, $02 return .WallOpenScript: @@ -41,16 +41,16 @@ 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 MapRuinsOfAlphHoOhChamberSignpost2Script: - refreshscreen $0 - writebyte $3 + refreshscreen + writebyte UNOWNPUZZLE_HO_OH special Special_UnownPuzzle closetext iftrue UnknownScript_0x585ba @@ -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 @@ -84,7 +84,7 @@ MapRuinsOfAlphHoOhChamberSignpost3Script: MapRuinsOfAlphHoOhChamberSignpost4Script: opentext writetext UnknownText_0x58612 - writebyte $3 + writebyte UNOWNWORDS_HO_OH special Special_DisplayUnownWords closetext end @@ -94,7 +94,7 @@ MapRuinsOfAlphHoOhChamberSignpost5Script: iftrue UnknownScript_0x58609 opentext writetext UnknownText_0x58644 - writebyte $3 + writebyte UNOWNWORDS_HO_OH special Special_DisplayUnownWords closetext end @@ -107,7 +107,7 @@ UnknownScript_0x58609: end MovementData_0x58610: - db $59 ; movement + skyfall_top step_end UnknownText_0x58612: @@ -115,8 +115,8 @@ UnknownText_0x58612: line "on the walls…" done -; possibly unused -UnknownText_0x58633: +; unused +UnusedText_0x58633: text "It's UNOWN text!" done 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..b6733ec8f 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -10,7 +10,7 @@ RuinsOfAlphKabutoChamber_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HiddenDoors + callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER @@ -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, $01 + changeblock 4, 2, $02 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 @@ -55,8 +55,8 @@ RuinsOfAlphKabutoChamberReceptionistScript: jumptextfaceplayer RuinsOfAlphKabutoChamberReceptionistText MapRuinsOfAlphKabutoChamberSignpost2Script: - refreshscreen $0 - writebyte $0 + refreshscreen + writebyte UNOWNPUZZLE_KABUTO special Special_UnownPuzzle closetext iftrue UnknownScript_0x58778 @@ -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 @@ -86,7 +86,7 @@ ScientistScript_0x587a8: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal 26, UnknownScript_0x587cf + if_equal NUM_UNOWN, UnknownScript_0x587cf checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x587c9 checkevent EVENT_SOLVED_KABUTO_PUZZLE @@ -121,7 +121,7 @@ MapRuinsOfAlphKabutoChamberSignpost3Script: MapRuinsOfAlphKabutoChamberSignpost4Script: opentext writetext UnknownText_0x58aa7 - writebyte $0 + writebyte UNOWNWORDS_ESCAPE special Special_DisplayUnownWords closetext end @@ -131,7 +131,7 @@ MapRuinsOfAlphKabutoChamberSignpost5Script: iftrue UnknownScript_0x587f7 opentext writetext UnknownText_0x58ad9 - writebyte $0 + writebyte UNOWNWORDS_ESCAPE special Special_DisplayUnownWords closetext end @@ -144,7 +144,7 @@ UnknownScript_0x587f7: end MovementData_0x587fe: - db $59 ; movement + skyfall_top step_end RuinsOfAlphKabutoChamberReceptionistText: @@ -202,8 +202,8 @@ UnknownText_0x589b8: cont "this wall here…" done -; possibly unused -UnknownText_0x58a03: +; unused +UnusedText_0x58a03: text "The patterns on" line "the wall appear to" cont "be words!" @@ -226,8 +226,8 @@ UnknownText_0x58aa7: line "on the walls…" done -; possibly unused -UnknownText_0x58ac8: +; unused +UnusedText_0x58ac8: text "It's UNOWN text!" done diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 994f69edd..87edcc536 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -6,10 +6,10 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HiddenDoors + callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: - special SpecialOmanyteChamber + special Special_OmanyteChamber checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue .OpenWall end @@ -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, $01 + changeblock 4, 2, $02 return .WallOpenScript: @@ -41,16 +41,16 @@ 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 MapRuinsOfAlphOmanyteChamberSignpost2Script: - refreshscreen $0 - writebyte $1 + refreshscreen + writebyte UNOWNPUZZLE_OMANYTE special Special_UnownPuzzle closetext iftrue UnknownScript_0x58c36 @@ -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 @@ -84,7 +84,7 @@ MapRuinsOfAlphOmanyteChamberSignpost3Script: MapRuinsOfAlphOmanyteChamberSignpost4Script: opentext writetext UnknownText_0x58c8e - writebyte $2 + writebyte UNOWNWORDS_WATER special Special_DisplayUnownWords closetext end @@ -94,7 +94,7 @@ MapRuinsOfAlphOmanyteChamberSignpost5Script: iftrue UnknownScript_0x58c85 opentext writetext UnknownText_0x58cc0 - writebyte $2 + writebyte UNOWNWORDS_WATER special Special_DisplayUnownWords closetext end @@ -107,7 +107,7 @@ UnknownScript_0x58c85: end MovementData_0x58c8c: - db $59 ; movement + skyfall_top step_end UnknownText_0x58c8e: @@ -115,8 +115,8 @@ UnknownText_0x58c8e: line "on the walls…" done -; possibly unused.. this again? -UnknownText_0x58caf: +; unused +UnusedText_0x58caf: text "It's UNOWN text!" done diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 478a2b9d0..39c85fa05 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -13,7 +13,7 @@ RuinsOfAlphOutside_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .ScientistCallback + callback MAPCALLBACK_OBJECTS, .ScientistCallback .DummyScene0: end @@ -30,17 +30,17 @@ RuinsOfAlphOutside_MapScriptHeader: .MaybeScientist: checkcode VAR_UNOWNCOUNT - if_greater_than $2, .YesScientist + if_greater_than 2, .YesScientist jump .NoScientist .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 @@ -112,7 +112,6 @@ TrainerPsychicNathan: closetext end - TrainerSuperNerdStan: trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script @@ -124,7 +123,6 @@ TrainerSuperNerdStan: closetext end - RuinsOfAlphOutsideSignpost0Script: jumptext UnknownText_0x58325 diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 223b2bd62..920617df8 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -11,7 +11,7 @@ RuinsOfAlphResearchCenter_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .ScientistCallback + callback MAPCALLBACK_OBJECTS, .ScientistCallback .DummyScene0: end @@ -22,11 +22,11 @@ RuinsOfAlphResearchCenter_MapScriptHeader: .ScientistCallback: checkscene - if_equal $1, .ShowScientist + if_equal 1, .ShowScientist 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 @@ -63,7 +63,7 @@ ScientistScript_0x591d1: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal 26, UnknownScript_0x591df + if_equal NUM_UNOWN, UnknownScript_0x591df writetext UnknownText_0x59311 waitbutton closetext @@ -79,7 +79,7 @@ ScientistScript_0x591e5: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal 26, UnknownScript_0x5920b + if_equal NUM_UNOWN, UnknownScript_0x5920b checkflag ENGINE_UNOWN_DEX iftrue UnknownScript_0x59205 checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS @@ -112,7 +112,7 @@ ScientistScript_0x59214: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal 26, UnknownScript_0x5922e + if_equal NUM_UNOWN, UnknownScript_0x5922e checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x59228 writetext UnknownText_0x5954f @@ -137,7 +137,7 @@ MapRuinsOfAlphResearchCenterSignpost1Script: checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x59241 checkcode VAR_UNOWNCOUNT - if_equal 26, UnknownScript_0x59247 + if_equal NUM_UNOWN, UnknownScript_0x59247 UnknownScript_0x59241: writetext UnknownText_0x597b6 waitbutton @@ -155,7 +155,7 @@ MapRuinsOfAlphResearchCenterSignpost2Script: checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x5925a checkcode VAR_UNOWNCOUNT - if_equal 26, UnknownScript_0x59260 + if_equal NUM_UNOWN, UnknownScript_0x59260 UnknownScript_0x5925a: writetext UnknownText_0x5980e waitbutton @@ -169,8 +169,8 @@ UnknownScript_0x59260: closetext end -UnknownScript_0x59269: - jumptext UnknownText_0x59848 +UnreferencedScript_0x59269: + jumptext UnusedText_0x59848 MapRuinsOfAlphResearchCenterSignpost0Script: jumptext UnknownText_0x59886 @@ -308,8 +308,8 @@ UnknownText_0x595cb: cont "kinds of them…" done -; possibly unused -UnknownText_0x59669: +; unused +UnusedText_0x59669: text "We think something" line "caused the cryptic" @@ -320,8 +320,8 @@ UnknownText_0x59669: line "studies on that." done -; possibly unused -UnknownText_0x596d3: +; unused +UnusedText_0x596d3: text "According to my" line "research…" @@ -374,8 +374,8 @@ UnknownText_0x5982d: line "printed out." done -; possibly unused -UnknownText_0x59848: +; unused +UnusedText_0x59848: text "It's a photo of" line "the RESEARCH" diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 490a269b9..d016d61c7 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -14,7 +14,7 @@ SaffronCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_SAFFRON @@ -276,10 +276,10 @@ SaffronCity_MapEventHeader: warp_def 25, 11, 2, SAFFRON_MART warp_def 9, 29, 1, SAFFRON_POKECENTER_1F warp_def 27, 29, 1, MR_PSYCHICS_HOUSE - warp_def 8, 3, 2, SAFFRON_TRAIN_STATION + warp_def 8, 3, 2, SAFFRON_MAGNET_TRAIN_STATION warp_def 18, 21, 1, SILPH_CO_1F warp_def 9, 11, 1, COPYCATS_HOUSE_1F - warp_def 18, 3, 3, ROUTE_5_SAFFRON_CITY_GATE + warp_def 18, 3, 3, ROUTE_5_SAFFRON_GATE warp_def 0, 24, 3, ROUTE_7_SAFFRON_GATE warp_def 0, 25, 4, ROUTE_7_SAFFRON_GATE warp_def 16, 33, 1, ROUTE_6_SAFFRON_GATE diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 008356172..909c2754a 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, MEM_BUFFER_1 jumpstd gymstatue2 UnknownText_0x189cdf: diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index 19c35a37c..471462840 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -1,10 +1,10 @@ const_value set 2 - const SAFFRONTRAINSTATION_OFFICER - const SAFFRONTRAINSTATION_GYM_GUY - const SAFFRONTRAINSTATION_TEACHER - const SAFFRONTRAINSTATION_LASS + const SAFFRONMAGNETTRAINSTATION_OFFICER + const SAFFRONMAGNETTRAINSTATION_GYM_GUY + const SAFFRONMAGNETTRAINSTATION_TEACHER + const SAFFRONMAGNETTRAINSTATION_LASS -SaffronTrainStation_MapScriptHeader: +SaffronMagnetTrainStation_MapScriptHeader: .SceneScripts: db 1 scene_script .DummyScene @@ -34,14 +34,14 @@ OfficerScript_0x18a81e: writetext UnknownText_0x18a917 waitbutton closetext - applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f + applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f applymovement PLAYER, MovementData_0x18a898 - writebyte $1 + writebyte TRUE special Special_MagnetTrain warpcheck newloadmap MAPSETUP_TRAIN applymovement PLAYER, .MovementBoardTheTrain - wait $14 + wait 20 end .MovementBoardTheTrain: @@ -61,9 +61,9 @@ OfficerScript_0x18a81e: end Script_ArriveFromGoldenrod: - applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f + applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f applymovement PLAYER, MovementData_0x18a8a1 - applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a894 + applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a894 opentext writetext UnknownText_0x18a993 waitbutton @@ -86,11 +86,11 @@ UnknownScript_0x18a883: closetext end -SaffronTrainStationTeacherScript: - jumptextfaceplayer SaffronTrainStationTeacherText +SaffronMagnetTrainStationTeacherScript: + jumptextfaceplayer SaffronMagnetTrainStationTeacherText -SaffronTrainStationLassScript: - jumptextfaceplayer SaffronTrainStationLassText +SaffronMagnetTrainStationLassScript: + jumptextfaceplayer SaffronMagnetTrainStationLassText MovementData_0x18a88f: step UP @@ -192,7 +192,7 @@ UnknownText_0x18aa61: line "KANTO and JOHTO?" done -SaffronTrainStationTeacherText: +SaffronMagnetTrainStationTeacherText: text "Before the MAGNET" line "TRAIN STATION was" @@ -204,7 +204,7 @@ SaffronTrainStationTeacherText: cont "to live there." done -SaffronTrainStationLassText: +SaffronMagnetTrainStationLassText: text "Hi. Do you have a" line "rail PASS? I have" @@ -215,7 +215,7 @@ SaffronTrainStationLassText: line "TRAIN have PASSES." done -SaffronTrainStation_MapEventHeader: +SaffronMagnetTrainStation_MapEventHeader: ; filler db 0, 0 @@ -237,5 +237,5 @@ SaffronTrainStation_MapEventHeader: db 4 object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1 - object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION - object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION + object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION + object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SaffronTrainStation.blk b/maps/SaffronMagnetTrainStation.blk index bdca20f29..bdca20f29 100644 --- a/maps/SaffronTrainStation.blk +++ b/maps/SaffronMagnetTrainStation.blk diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 39d6ad8bb..7e11928ae 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -15,7 +15,7 @@ NurseScript_0x18a47d: jumpstd pokecenternurse TeacherScript_0x18a480: - special Mobile_DummyReturnFalse + special Special_Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x18a4a3 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/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 52f1c1b16..0672b7dab 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -4,7 +4,7 @@ SilverCaveOutside_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_SILVER_CAVE @@ -17,7 +17,7 @@ MtSilverSign: jumptext MtSilverSignText SilverCaveOutsideHiddenFullRestore: - dwb EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE MtSilverSignText: text "MT.SILVER" diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 7879184ee..f75946854 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -24,12 +24,10 @@ SilverCaveRoom1UltraBall: itemball ULTRA_BALL SilverCaveRoom1HiddenDireHit: - dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT - + hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT SilverCaveRoom1HiddenUltraBall: - dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL - + hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL SilverCaveRoom1_MapEventHeader: ; filler diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index ec33e2be8..57072f858 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -20,8 +20,7 @@ SilverCaveRoom2PPUp: itemball PP_UP SilverCaveRoom2HiddenMaxPotion: - dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION - + hiddenitem EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION SilverCaveRoom2_MapEventHeader: ; filler diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 7daab6ba8..076f8ebe1 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 @@ -26,19 +26,19 @@ Red: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes disappear SILVERCAVEROOM3_RED pause 15 special Special_FadeInQuickly pause 30 special HealParty - refreshscreen $0 + refreshscreen credits 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..a7bc02439 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -39,7 +39,7 @@ TrainerGruntM1: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes disappear SLOWPOKEWELLB1F_ROCKET1 disappear SLOWPOKEWELLB1F_ROCKET2 disappear SLOWPOKEWELLB1F_ROCKET3 @@ -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 @@ -67,10 +67,10 @@ TrainerGruntM1: clearevent EVENT_AZALEA_TOWN_SLOWPOKES clearevent EVENT_KURTS_HOUSE_SLOWPOKE clearevent EVENT_KURTS_HOUSE_KURT_1 - special FadeOutPalettes + special 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..95d850fb7 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -55,11 +55,11 @@ UnknownScript_0x184947: closetext playsound SFX_WARP_TO special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes 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..6364a44a0 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -13,7 +13,7 @@ TeamRocketBaseB1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .HideSecurityGrunt + callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt .DummyScene: end @@ -30,20 +30,20 @@ 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 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera 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 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_1 end @@ -55,20 +55,20 @@ 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 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera 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 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_1 end @@ -80,21 +80,21 @@ 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 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds 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 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_2 end @@ -106,21 +106,21 @@ 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 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds 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 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_2 end @@ -132,21 +132,21 @@ 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 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds 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 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_3 end @@ -158,21 +158,21 @@ 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 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds 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 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_3 end @@ -184,21 +184,21 @@ 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 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds 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 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_4 end @@ -210,21 +210,21 @@ 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 scall TrainerCameraGrunt1 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds 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 - if_equal $1, NoSecurityCamera + if_equal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_5 end @@ -448,9 +448,9 @@ ExplodingTrap22: end VoltorbExplodingTrap: - special FadeOutPalettes + special Special_FadeOutPalettes cry VOLTORB - special FadeInPalettes + special Special_FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon VOLTORB, 23 @@ -458,9 +458,9 @@ VoltorbExplodingTrap: end GeodudeExplodingTrap: - special FadeOutPalettes + special Special_FadeOutPalettes cry GEODUDE - special FadeInPalettes + special Special_FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon GEODUDE, 21 @@ -468,9 +468,9 @@ GeodudeExplodingTrap: end KoffingExplodingTrap: - special FadeOutPalettes + special Special_FadeOutPalettes cry KOFFING - special FadeInPalettes + special Special_FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon KOFFING, 21 @@ -540,8 +540,7 @@ TeamRocketBaseB1FGuardSpec: itemball GUARD_SPEC TeamRocketBaseB1FHiddenRevive: - dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE - + hiddenitem EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE SecurityCameraMovement1: big_step RIGHT diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 0ed2c67f0..62197eec6 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -24,7 +24,7 @@ TeamRocketBaseB2F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .TransmitterDoorCallback + callback MAPCALLBACK_TILES, .TransmitterDoorCallback .DummyScene0: end @@ -44,18 +44,18 @@ TeamRocketBaseB2F_MapScriptHeader: return .Change: - changeblock $e, $c, $7 + changeblock 14, 12, $07 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 @@ -110,7 +110,7 @@ UnknownScript_0x6cfac: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes disappear TEAMROCKETBASEB2F_ROCKET1 disappear TEAMROCKETBASEB2F_ROCKET_GIRL disappear TEAMROCKETBASEB2F_ROCKET2 @@ -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 @@ -166,16 +166,16 @@ LanceHealsCommon: writetext LanceHealsText1 waitbutton closetext - special FadeOutPalettes - special TrainerRankings_Healings + special Special_FadeOutPalettes + special Special_StubbedTrainerRankings_Healings playsound SFX_FULL_HEAL special HealParty - special FadeInPalettes + special Special_FadeInPalettes opentext 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 @@ -315,7 +315,7 @@ UnknownScript_0x6d184: end TeamRocketBaseB2FLockedDoor: - dw EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER, .Script + conditional_event EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER, .Script .Script: opentext @@ -330,7 +330,7 @@ UnknownScript_0x6d1e8: writetext UnknownText_0x6dd6b waitbutton playsound SFX_ENTER_DOOR - changeblock $e, $c, $7 + changeblock 14, 12, $07 reloadmappart closetext setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER @@ -356,8 +356,7 @@ TeamRocketBaseB2FTMThief: itemball TM_THIEF TeamRocketBaseB2FHiddenFullHeal: - dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL - + hiddenitem EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL MovementData_0x6d212: step RIGHT @@ -414,9 +413,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..38734063a 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -24,7 +24,7 @@ TeamRocketBaseB3F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .CheckGiovanniDoor + callback MAPCALLBACK_TILES, .CheckGiovanniDoor .LanceGetsPassword: priorityjump LanceGetPasswordScript @@ -45,7 +45,7 @@ TeamRocketBaseB3F_MapScriptHeader: return .OpenSesame: - changeblock $a, $8, $7 + changeblock 10, 8, $07 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: @@ -174,7 +174,7 @@ TrainerScientistMitch: end TeamRocketBaseB3FLockedDoor: - dw EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE, .Script + conditional_event EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE, .Script .Script: opentext @@ -194,7 +194,7 @@ TeamRocketBaseB3FLockedDoor: writetext UnknownText_0x6e9a3 waitbutton playsound SFX_ENTER_DOOR - changeblock $a, $8, $7 + changeblock 10, 8, $07 reloadmappart closetext setevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index c24c1606a..3ea686c32 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -10,7 +10,7 @@ TimeCapsule_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .SetWhichChris + callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTimeCapsule: priorityjump .InitializeAndPreparePokecenter2F @@ -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..f439b8a6c 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -18,8 +18,8 @@ TinTower1F_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_OBJECTS, .NPCsCallback - dbw MAPCALLBACK_TILES, .StairsCallback + callback MAPCALLBACK_OBJECTS, .NPCsCallback + callback MAPCALLBACK_TILES, .StairsCallback .FaceSuicune: priorityjump .SuicuneBattle @@ -33,7 +33,7 @@ TinTower1F_MapScriptHeader: iftrue .GotRainbowWing checkevent EVENT_BEAT_ELITE_FOUR iffalse .FaceBeasts - special SpecialBeastsCheck + special Special_BeastsCheck iffalse .FaceBeasts clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 @@ -49,7 +49,7 @@ TinTower1F_MapScriptHeader: iftrue .FoughtSuicune appear TINTOWER1F_SUICUNE writebyte RAIKOU - special SpecialMonCheck + special Special_MonCheck iftrue .NoRaikou appear TINTOWER1F_RAIKOU jump .CheckEntei @@ -58,7 +58,7 @@ TinTower1F_MapScriptHeader: disappear TINTOWER1F_RAIKOU .CheckEntei: writebyte ENTEI - special SpecialMonCheck + special Special_MonCheck iftrue .NoEntei appear TINTOWER1F_ENTEI jump .BeastsDone @@ -79,7 +79,7 @@ TinTower1F_MapScriptHeader: .StairsCallback: checkevent EVENT_GOT_RAINBOW_WING iftrue .DontHideStairs - changeblock $a, $2, $9 + changeblock 10, 2, $09 .DontHideStairs: return @@ -87,7 +87,7 @@ TinTower1F_MapScriptHeader: applymovement PLAYER, TinTowerPlayerMovement1 pause 15 writebyte RAIKOU - special SpecialMonCheck + special Special_MonCheck iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1 spriteface PLAYER, LEFT @@ -100,7 +100,7 @@ TinTower1F_MapScriptHeader: waitsfx .Next1: writebyte ENTEI - special SpecialMonCheck + special Special_MonCheck iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1 spriteface PLAYER, RIGHT @@ -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 @@ -197,11 +197,11 @@ TinTower1FSage5Script: buttonsound verbosegiveitem RAINBOW_WING closetext - refreshscreen $0 + refreshscreen 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/TinTower4F.asm b/maps/TinTower4F.asm index 34d1be488..4faf141cd 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -20,8 +20,7 @@ TinTower4FEscapeRope: itemball ESCAPE_ROPE TinTower4FHiddenMaxPotion: - dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION - + hiddenitem EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION TinTower4F_MapEventHeader: ; filler diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index d8991932c..4bb02de9d 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -12,12 +12,10 @@ TinTower5FRareCandy: itemball RARE_CANDY TinTower5FHiddenFullRestore: - dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE - + hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE TinTower5FHiddenCarbos: - dwb EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS - + hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS TinTower5F_MapEventHeader: ; filler diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 8d5eed029..b04c47800 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -7,7 +7,7 @@ TinTowerRoof_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .HoOh + callback MAPCALLBACK_OBJECTS, .HoOh .HoOh: checkevent EVENT_FOUGHT_HO_OH diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index fe9e43ce4..deffd661b 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -10,7 +10,7 @@ TradeCenter_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .SetWhichChris + callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTradeCenter: priorityjump .InitializeAndPreparePokecenter2F @@ -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/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index c4219a991..a525c39b8 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -20,13 +20,13 @@ TrainerHouseReceptionistScript: iftrue .FoughtTooManyTimes writetext TrainerHouseB1FIntroText buttonsound - special SpecialTrainerHouse + special Special_TrainerHouse iffalse .GetCal3Name - trainertotext CAL, CAL2, $0 + trainertotext CAL, CAL2, MEM_BUFFER_0 jump .GotName .GetCal3Name: - trainertotext CAL, CAL3, $0 + trainertotext CAL, CAL3, MEM_BUFFER_0 .GotName: writetext TrainerHouseB1FYourOpponentIsText buttonsound @@ -42,7 +42,7 @@ TrainerHouseReceptionistScript: writetext TrainerHouseB1FCalBeforeText waitbutton closetext - special SpecialTrainerHouse + special Special_TrainerHouse iffalse .NoSpecialBattle winlosstext TrainerHouseB1FCalBeatenText, 0 setlasttalked TRAINERHOUSEB1F_CHRIS diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index 557a478be..0f47d7cb8 100644 --- a/maps/UndergroundPath.asm +++ b/maps/UndergroundPath.asm @@ -6,12 +6,10 @@ UndergroundPath_MapScriptHeader: db 0 UndergroundPathHiddenFullRestore: - dwb EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE - + hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE UndergroundPathHiddenXSpecial: - dwb EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL - + hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL UndergroundPath_MapEventHeader: ; filler diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 8aa4ddd5e..ec6c30385 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -12,7 +12,7 @@ UnionCaveB2F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Lapras + callback MAPCALLBACK_OBJECTS, .Lapras .Lapras: checkflag ENGINE_UNION_CAVE_LAPRAS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 90baf28b0..63bd8116f 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -12,7 +12,7 @@ VermilionCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_VERMILION @@ -42,7 +42,7 @@ VermilionCitySuperNerdScript: VermilionSnorlax: opentext - special SpecialSnorlaxAwake + special Special_SnorlaxAwake iftrue UnknownScript_0x1aa9ab writetext UnknownText_0x1aab64 waitbutton @@ -68,7 +68,7 @@ VermilionGymBadgeGuy: checkevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY iftrue .AlreadyGotItem checkcode VAR_BADGES - if_equal 16, .AllBadges + if_equal NUM_BADGES, .AllBadges if_greater_than 13, .MostBadges if_greater_than 9, .SomeBadges writetext UnknownText_0x1aabc8 @@ -123,7 +123,7 @@ VermilionCityMartSign: jumpstd martsign VermilionCityHiddenFullHeal: - dwb EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL VermilionCityTeacherText: text "VERMILION PORT is" diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 7c86eba76..ac70f5c95 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, MEM_BUFFER_1 jumpstd gymstatue2 UnknownText_0x192142: diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 8d7af46a8..b1204a0e5 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -11,7 +11,7 @@ VermilionPort_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end @@ -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 @@ -52,7 +52,7 @@ SailorScript_0x74dc4: waitsfx applymovement PLAYER, MovementData_0x74ef1 playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND @@ -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: @@ -195,8 +195,7 @@ SuperNerdScript_0x74ee6: end VermilionPortHiddenIron: - dwb EVENT_VERMILION_PORT_HIDDEN_IRON, IRON - + hiddenitem EVENT_VERMILION_PORT_HIDDEN_IRON, IRON MovementData_0x74ef1: step DOWN diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index ef8bd3ead..d8fc51043 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 @@ -112,12 +112,10 @@ VictoryRoadHPUp: itemball HP_UP VictoryRoadHiddenMaxPotion: - dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION - + hiddenitem EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION VictoryRoadHiddenFullHeal: - dwb EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL - + hiddenitem EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL MovementData_0x74539: step LEFT diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 95011fd5e..f1ae34fab 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -29,7 +29,7 @@ VictoryRoadGateBadgeCheckScript: writetext VictoryRoadGateOfficerText buttonsound checkcode VAR_BADGES - if_greater_than 7, .AllEightBadges + if_greater_than NUM_JOHTO_BADGES - 1, .AllEightBadges writetext VictoryRoadGateNotEnoughBadgesText waitbutton closetext @@ -40,7 +40,7 @@ VictoryRoadGateBadgeCheckScript: writetext VictoryRoadGateEightBadgesText waitbutton closetext - setscene $1 + setscene 1 end VictoryRoadGateLeftBlackBeltScript: diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 34939ff3e..63dd3b92c 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -14,7 +14,7 @@ VioletCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_VIOLET @@ -98,7 +98,7 @@ VioletCityFruitTreeScript: fruittree FRUITTREE_VIOLET_CITY VioletCityHiddenHyperPotion: - dwb EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION VioletCityFollowEarl_MovementData: big_step DOWN diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 84effea16..fc7cb0169 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, MEM_BUFFER_1 jumpstd gymstatue2 UnknownText_0x68473: diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index e4c6e8df6..757ab1f44 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -27,12 +27,12 @@ VioletPokecenter1F_ElmsAideScript: checkcode VAR_PARTYCOUNT if_equal PARTY_LENGTH, .PartyFull giveegg TOGEPI, 5 - stringtotext .eggname, $1 + stringtotext .eggname, MEM_BUFFER_1 scall .AideGivesEgg 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/ViridianCity.asm b/maps/ViridianCity.asm index 5b5e077cb..c29422c52 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -10,7 +10,7 @@ ViridianCity_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_VIRIDIAN diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index bf6a99290..19f8654d9 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, MEM_BUFFER_1 jumpstd gymstatue2 LeaderBlueBeforeText: diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 011b0ac8f..c84725509 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -32,16 +32,13 @@ WhirlIslandB1FBoulder: jumpstd strengthboulder WhirlIslandB1FHiddenRareCandy: - dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY - + hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY WhirlIslandB1FHiddenUltraBall: - dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL - + hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL WhirlIslandB1FHiddenFullRestore: - dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE - + hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE WhirlIslandB1F_MapEventHeader: ; filler diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 39285cc15..7ee64bf74 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -7,7 +7,7 @@ WhirlIslandLugiaChamber_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Lugia + callback MAPCALLBACK_OBJECTS, .Lugia .Lugia: checkevent EVENT_FOUGHT_LUGIA diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index d72451638..9ea754d1a 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -9,7 +9,7 @@ WillsRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .WillsRoomDoors + callback MAPCALLBACK_TILES, .WillsRoomDoors .LockDoor: priorityjump .WillsDoorLocksBehindYou @@ -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..c3440c889 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -14,7 +14,7 @@ WiseTriosRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .WiseTrioCallback + callback MAPCALLBACK_OBJECTS, .WiseTrioCallback .DummyScene0: end @@ -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: diff --git a/maps/blockdata.asm b/maps/blockdata.asm index 9e44798ad..4f0fe925e 100644 --- a/maps/blockdata.asm +++ b/maps/blockdata.asm @@ -175,7 +175,7 @@ BluesHouse_BlockData: PewterNidoranSpeechHouse_BlockData: PewterSnoozeSpeechHouse_BlockData: FuchsiaBillSpeechHouse_BlockData: -LavenderTownSpeechHouse_BlockData: +LavenderSpeechHouse_BlockData: LavenderNameRater_BlockData: Route12SuperRodHouse_BlockData: Route28FamousSpeechHouse_BlockData: @@ -183,7 +183,7 @@ CeladonMansionRoofHouse_BlockData: Route16FuchsiaSpeechHouse_BlockData: ManiasHouse_BlockData: CianwoodPharmacy_BlockData: -CianwoodCityPhotoStudio_BlockData: +CianwoodPhotoStudio_BlockData: CianwoodLugiaSpeechHouse_BlockData: PokeSeersHouse_BlockData: ViridianNicknameSpeechHouse_BlockData: @@ -210,12 +210,12 @@ Route34IlexForestGate_BlockData: Route6SaffronGate_BlockData: Route40BattleTowerGate_BlockData: Route2Gate_BlockData: -Route2946Gate_BlockData: -Route5SaffronCityGate_BlockData: +Route29Route46Gate_BlockData: +Route5SaffronGate_BlockData: INCBIN "maps/NorthSouthGate.blk" -BetaTeakCity_BlockData: - INCBIN "maps/BetaTeakCity.blk" +BetaEcruteakCity_BlockData: + INCBIN "maps/BetaEcruteakCity.blk" BetaCherrygroveCity_BlockData: INCBIN "maps/BetaCherrygroveCity.blk" @@ -276,7 +276,7 @@ Route15FuchsiaGate_BlockData: Route8SaffronGate_BlockData: Route16Gate_BlockData: Route7SaffronGate_BlockData: -Route1718Gate_BlockData: +Route17Route18Gate_BlockData: Route31VioletGate_BlockData: INCBIN "maps/EastWestGate.blk" @@ -372,17 +372,17 @@ BetaPewterMuseumOfScience2F_BlockData: EarlsPokemonAcademy_BlockData: INCBIN "maps/EarlsPokemonAcademy.blk" -BetaCinnabarIslandPokemonLabHallway_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabHallway.blk" +BetaCinnabarPokemonLabHallway_BlockData: + INCBIN "maps/BetaCinnabarPokemonLabHallway.blk" -BetaCinnabarIslandPokemonLabRoom1_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabRoom1.blk" +BetaCinnabarPokemonLabRoom1_BlockData: + INCBIN "maps/BetaCinnabarPokemonLabRoom1.blk" -BetaCinnabarIslandPokemonLabRoom2_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabRoom2.blk" +BetaCinnabarPokemonLabRoom2_BlockData: + INCBIN "maps/BetaCinnabarPokemonLabRoom2.blk" -BetaCinnabarIslandPokemonLabRoom3_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabRoom3.blk" +BetaCinnabarPokemonLabRoom3_BlockData: + INCBIN "maps/BetaCinnabarPokemonLabRoom3.blk" GoldenrodDeptStore1F_BlockData: CeladonDeptStore1F_BlockData: @@ -824,8 +824,8 @@ FastShip1F_BlockData: FastShipB1F_BlockData: INCBIN "maps/FastShipB1F.blk" -BetaSSAquaInsideCutOut_BlockData: - INCBIN "maps/BetaSSAquaInsideCutOut.blk" +BetaFastShipInsideCutOut_BlockData: + INCBIN "maps/BetaFastShipInsideCutOut.blk" FastShipCabins_NNW_NNE_NE_BlockData: INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk" @@ -849,8 +849,8 @@ SafariZoneMainOffice_BlockData: KrissHouse2F_BlockData: INCBIN "maps/KrissHouse2F.blk" -SaffronTrainStation_BlockData: - INCBIN "maps/SaffronTrainStation.blk" +SaffronMagnetTrainStation_BlockData: + INCBIN "maps/SaffronMagnetTrainStation.blk" CeruleanGym_BlockData: INCBIN "maps/CeruleanGym.blk" diff --git a/maps/map_headers.asm b/maps/map_headers.asm index ac4b20ece..8ad8d7333 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -373,7 +373,7 @@ MapGroup_Lavender: map_header LavenderPokecenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header LavenderPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MrFujisHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header LavenderTownSpeechHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header LavenderSpeechHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header LavenderNameRater, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header LavenderMart, TILESET_MART, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SoulHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -424,7 +424,7 @@ MapGroup_Celadon: map_header Route16FuchsiaSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_16, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route16Gate, TILESET_GATE, GATE, ROUTE_16, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route7SaffronGate, TILESET_GATE, GATE, ROUTE_7, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route1718Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route17Route18Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE MapGroup_Cianwood: @@ -435,7 +435,7 @@ MapGroup_Cianwood: map_header CianwoodGym, TILESET_SPROUT_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header CianwoodPokecenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CianwoodPharmacy, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CianwoodCityPhotoStudio, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CianwoodPhotoStudio, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CianwoodLugiaSpeechHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header PokeSeersHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, 1, PALETTE_DAY, FISHGROUP_SHORE @@ -475,7 +475,7 @@ MapGroup_NewBark: map_header Route26HealSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route26DayofWeekSiblingsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route27SandstormHouse, TILESET_HOUSE_1, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route2946Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_DAY, FISHGROUP_SHORE MapGroup_Saffron: @@ -487,12 +487,12 @@ MapGroup_Saffron: map_header SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SaffronPokecenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MrPsychicsHouse, TILESET_HOUSE_1, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header SaffronTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header SaffronMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SilphCo1F, TILESET_POWER_PLANT, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route5SaffronCityGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route5CleanseTagSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 3628babd2..378b3d05a 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -593,7 +593,7 @@ ENDM map_header_2 LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $0, 0 map_header_2 LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $0, 0 map_header_2 MrFujisHouse, MR_FUJIS_HOUSE, $0, 0 - map_header_2 LavenderTownSpeechHouse, LAVENDER_TOWN_SPEECH_HOUSE, $0, 0 + map_header_2 LavenderSpeechHouse, LAVENDER_SPEECH_HOUSE, $0, 0 map_header_2 LavenderNameRater, LAVENDER_NAME_RATER, $0, 0 map_header_2 LavenderMart, LAVENDER_MART, $0, 0 map_header_2 SoulHouse, SOUL_HOUSE, $0, 0 @@ -629,12 +629,12 @@ ENDM map_header_2 Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $0, 0 map_header_2 Route16Gate, ROUTE_16_GATE, $0, 0 map_header_2 Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $0, 0 - map_header_2 Route1718Gate, ROUTE_17_18_GATE, $0, 0 + map_header_2 Route17Route18Gate, ROUTE_17_ROUTE_18_GATE, $0, 0 map_header_2 ManiasHouse, MANIAS_HOUSE, $0, 0 map_header_2 CianwoodGym, CIANWOOD_GYM, $0, 0 map_header_2 CianwoodPokecenter1F, CIANWOOD_POKECENTER_1F, $0, 0 map_header_2 CianwoodPharmacy, CIANWOOD_PHARMACY, $0, 0 - map_header_2 CianwoodCityPhotoStudio, CIANWOOD_CITY_PHOTO_STUDIO, $0, 0 + map_header_2 CianwoodPhotoStudio, CIANWOOD_PHOTO_STUDIO, $0, 0 map_header_2 CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $0, 0 map_header_2 PokeSeersHouse, POKE_SEERS_HOUSE, $0, 0 map_header_2 BattleTower1F, BATTLE_TOWER_1F, $0, 0 @@ -661,19 +661,19 @@ ENDM map_header_2 Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $0, 0 map_header_2 Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $0, 0 map_header_2 Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $0, 0 - map_header_2 Route2946Gate, ROUTE_29_46_GATE, $0, 0 + map_header_2 Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $0, 0 map_header_2 FightingDojo, FIGHTING_DOJO, $0, 0 map_header_2 SaffronGym, SAFFRON_GYM, $0, 0 map_header_2 SaffronMart, SAFFRON_MART, $0, 0 map_header_2 SaffronPokecenter1F, SAFFRON_POKECENTER_1F, $0, 0 map_header_2 SaffronPokecenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $0, 0 map_header_2 MrPsychicsHouse, MR_PSYCHICS_HOUSE, $0, 0 - map_header_2 SaffronTrainStation, SAFFRON_TRAIN_STATION, $0, 0 + map_header_2 SaffronMagnetTrainStation, SAFFRON_MAGNET_TRAIN_STATION, $0, 0 map_header_2 SilphCo1F, SILPH_CO_1F, $0, 0 map_header_2 CopycatsHouse1F, COPYCATS_HOUSE_1F, $0, 0 map_header_2 CopycatsHouse2F, COPYCATS_HOUSE_2F, $0, 0 map_header_2 Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $0, 0 - map_header_2 Route5SaffronCityGate, ROUTE_5_SAFFRON_CITY_GATE, $0, 0 + map_header_2 Route5SaffronGate, ROUTE_5_SAFFRON_GATE, $0, 0 map_header_2 Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $0, 0 map_header_2 CherrygroveMart, CHERRYGROVE_MART, $0, 0 map_header_2 CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $0, 0 |