diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
| commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
| tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /maps | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
| parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) | |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'maps')
440 files changed, 2273 insertions, 4623 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 1e36df96f..3675392fc 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -7,7 +7,7 @@ const_value set 2 const AZALEAGYM_TWIN2 const AZALEAGYM_GYM_GUY -AzaleaGym_MapScriptHeader: +AzaleaGym_MapScripts: .SceneScripts: db 0 @@ -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: @@ -361,7 +361,7 @@ AzaleaGymGuyWinText: cont "#MON is bright!" done -AzaleaGym_MapEventHeader: +AzaleaGym_MapEvents: ; filler db 0, 0 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 8d9374955..8ecf94d92 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -3,7 +3,7 @@ const_value set 2 const AZALEAMART_COOLTRAINER_M const AZALEAMART_BUG_CATCHER -AzaleaMart_MapScriptHeader: +AzaleaMart_MapScripts: .SceneScripts: db 0 @@ -45,7 +45,7 @@ AzaleaMartBugCatcherText: cont "times." done -AzaleaMart_MapEventHeader: +AzaleaMart_MapEvents: ; filler db 0, 0 diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index e4d950442..6e65c2c01 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const AZALEAPOKECENTER1F_FISHING_GURU const AZALEAPOKECENTER1F_POKEFAN_F -AzaleaPokecenter1F_MapScriptHeader: +AzaleaPokecenter1F_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -76,7 +76,7 @@ AzaleaPokecenter1FPokefanFText: line "APRICORNS." done -AzaleaPokecenter1F_MapEventHeader: +AzaleaPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index ba1ee1a2c..16889aa51 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -12,7 +12,7 @@ const_value set 2 const AZALEATOWN_AZALEA_ROCKET3 const AZALEATOWN_KURT_OUTSIDE -AzaleaTown_MapScriptHeader: +AzaleaTown_MapScripts: .SceneScripts: db 3 scene_script .DummyScene0 @@ -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 @@ -376,11 +376,11 @@ AzaleaTownYoungsterText: AzaleaTownSlowpokeText1: text "SLOWPOKE: …" - para "<......> <......> <......>" + para "<……> <……> <……>" done AzaleaTownSlowpokeText2: - text "<......> <......>Yawn?" + text "<……> <……>Yawn?" done WoosterText: @@ -455,7 +455,7 @@ AzaleaTownIlexForestSignText: line "gate." done -AzaleaTown_MapEventHeader: +AzaleaTown_MapEvents: ; filler db 0, 0 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 0e44eab3a..b7113f347 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -5,7 +5,7 @@ const_value set 2 const BATTLETOWER1F_BUG_CATCHER const BATTLETOWER1F_GRANNY -BattleTower1F_MapScriptHeader: +BattleTower1F_MapScripts: .SceneScripts: db 2 scene_script .Scene0 @@ -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 @@ -793,7 +793,7 @@ Text_BattleTowerBugCatcher: ; 0x9f35b line "any fire #MON…" done -BattleTower1F_MapEventHeader: +BattleTower1F_MapEvents: ; filler db 0, 0 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index acd8bfa66..dd8e08e0f 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -2,7 +2,7 @@ const_value set 2 const BATTLETOWERBATTLEROOM_YOUNGSTER const BATTLETOWERBATTLEROOM_RECEPTIONIST -BattleTowerBattleRoom_MapScriptHeader: +BattleTowerBattleRoom_MapScripts: .SceneScripts: db 2 scene_script .EnterBattleRoom @@ -14,7 +14,7 @@ BattleTowerBattleRoom_MapScriptHeader: .EnterBattleRoom: ; 0x9f419 disappear BATTLETOWERBATTLEROOM_YOUNGSTER priorityjump Script_BattleRoom - setscene $1 + setscene 1 .DummyScene: end @@ -23,21 +23,21 @@ 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 - if_equal BATTLETOWER_NROFTRAINERS, Script_BeatenAllTrainers + if_equal BATTLETOWER_STREAK_LENGTH, Script_BeatenAllTrainers applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksOut warpsound disappear BATTLETOWERBATTLEROOM_YOUNGSTER @@ -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,14 +133,12 @@ UnreferencedScript_0x9f4f7: closetext end - Text_ReturnedAfterSave_Mobile: text "You'll be returned" line "after you SAVE." done - -BattleTowerBattleRoom_MapEventHeader: +BattleTowerBattleRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 2327b31fa..f9f32dfae 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -1,7 +1,7 @@ const_value set 2 const BATTLETOWERELEVATOR_RECEPTIONIST -BattleTowerElevator_MapScriptHeader: +BattleTowerElevator_MapScripts: .SceneScripts: db 2 scene_script .Scene0 @@ -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 @@ -44,7 +44,7 @@ MovementData_BattleTowerElevatorPlayerWalksIn: turn_head DOWN step_end -BattleTowerElevator_MapEventHeader: +BattleTowerElevator_MapEvents: ; filler db 0, 0 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 41a3beb83..6b50783f5 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -1,7 +1,7 @@ const_value set 2 const BATTLETOWERHALLWAY_RECEPTIONIST -BattleTowerHallway_MapScriptHeader: +BattleTowerHallway_MapScripts: .SceneScripts: db 2 scene_script .Scene0 @@ -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 @@ -78,7 +76,7 @@ BattleTowerHallway_MapScriptHeader: warpcheck end -BattleTowerHallway_MapEventHeader: +BattleTowerHallway_MapEvents: ; filler db 0, 0 @@ -99,4 +97,4 @@ BattleTowerHallway_MapEventHeader: .ObjectEvents: db 1 - object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1 + object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 6ed01da6f..a61717fd0 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -4,14 +4,14 @@ const_value set 2 const BATTLETOWEROUTSIDE_SAILOR const BATTLETOWEROUTSIDE_LASS -BattleTowerOutside_MapScriptHeader: +BattleTowerOutside_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 2 - dbw MAPCALLBACK_TILES, .Callback1 - dbw MAPCALLBACK_OBJECTS, .Callback2 + callback MAPCALLBACK_TILES, .Callback1 + callback MAPCALLBACK_OBJECTS, .Callback2 .Callback1: return @@ -126,7 +126,7 @@ BattleTowerOutsideText_DoorsOpen: text "It's open!" done -BattleTowerOutside_MapEventHeader: +BattleTowerOutside_MapEvents: ; filler db 0, 0 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 0dc2a7cd0..a4f2e0c0e 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const BILLSHOUSE_GRAMPS -BillsHouse_MapScriptHeader: +BillsHouse_MapScripts: .SceneScripts: db 0 @@ -353,7 +353,7 @@ BillsGrandpaPichuText: line "evolves." done -BillsHouse_MapEventHeader: +BillsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index c5cd10235..396599703 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -9,14 +9,14 @@ const_value set 2 const BLACKTHORNCITY_SANTOS const BLACKTHORNCITY_COOLTRAINER_F2 -BlackthornCity_MapScriptHeader: +BlackthornCity_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 2 - dbw MAPCALLBACK_NEWMAP, .FlyPoint - dbw MAPCALLBACK_OBJECTS, .Santos + callback MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_OBJECTS, .Santos .FlyPoint: setflag ENGINE_FLYPOINT_BLACKTHORN @@ -312,7 +312,7 @@ BlackthornCityTrainerTipsText: cont "problem." done -BlackthornCity_MapEventHeader: +BlackthornCity_MapEvents: ; filler db 0, 0 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 2e8bbfa0b..74621532f 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY const BLACKTHORNDRAGONSPEECHHOUSE_EKANS -BlackthornDragonSpeechHouse_MapScriptHeader: +BlackthornDragonSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -47,7 +47,7 @@ BlackthornDragonSpeechHouseDratiniText: text "DRATINI: Draa!" done -BlackthornDragonSpeechHouse_MapEventHeader: +BlackthornDragonSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index c74db5f89..d8277c74f 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const BLACKTHORNEMYSHOUSE_EMY -BlackthornEmysHouse_MapScriptHeader: +BlackthornEmysHouse_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ Emy: EmysHouseBookshelf: jumpstd magazinebookshelf -BlackthornEmysHouse_MapEventHeader: +BlackthornEmysHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index c640c2c06..25de39246 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -5,26 +5,26 @@ const_value set 2 const BLACKTHORNGYM1F_COOLTRAINER_F const BLACKTHORNGYM1F_GYM_GUY -BlackthornGym1F_MapScriptHeader: +BlackthornGym1F_MapScripts: .SceneScripts: db 0 .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 ; fallen boulder 2 .skip1 checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_2 iffalse .skip2 - changeblock $2, $4, $3a + changeblock 2, 4, $3a ; fallen boulder 1 .skip2 checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_3 iffalse .skip3 - changeblock $8, $6, $3b + changeblock 8, 6, $3b ; fallen boulder 2 .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: @@ -386,7 +386,7 @@ BlackthornGymGuyWinText: cont "#MON CHAMPION!" done -BlackthornGym1F_MapEventHeader: +BlackthornGym1F_MapEvents: ; filler db 0, 0 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 6aa55a0e5..7d08bcebb 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -8,37 +8,36 @@ const_value set 2 const BLACKTHORNGYM2F_BOULDER5 const BLACKTHORNGYM2F_BOULDER6 -BlackthornGym2F_MapScriptHeader: +BlackthornGym2F_MapScripts: .SceneScripts: db 0 .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 @@ -127,7 +125,7 @@ BlackthornGym2FBoulderFellText: line "through!" done -BlackthornGym2F_MapEventHeader: +BlackthornGym2F_MapEvents: ; filler db 0, 0 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index d6bf89c2c..4b4b74324 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -3,7 +3,7 @@ const_value set 2 const BLACKTHORNMART_COOLTRAINER_M const BLACKTHORNMART_BLACK_BELT -BlackthornMart_MapScriptHeader: +BlackthornMart_MapScripts: .SceneScripts: db 0 @@ -46,7 +46,7 @@ BlackthornMartBlackBeltText: cont "REPEL sprays." done -BlackthornMart_MapEventHeader: +BlackthornMart_MapEvents: ; filler db 0, 0 diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index af2a4e00b..45c925561 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const BLACKTHORNPOKECENTER1F_TWIN const BLACKTHORNPOKECENTER1F_COOLTRAINER_M -BlackthornPokecenter1F_MapScriptHeader: +BlackthornPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -49,7 +49,7 @@ BlackthornPokecenter1FTwinText: cont "forget an HM move." done -BlackthornPokecenter1F_MapEventHeader: +BlackthornPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 9a40a68f6..f31fefb9d 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const BLUESHOUSE_DAISY -BluesHouse_MapScriptHeader: +BluesHouse_MapScripts: .SceneScripts: db 0 @@ -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 @@ -144,7 +144,7 @@ DaisyCantGroomEggText: cont "groom an EGG." done -BluesHouse_MapEventHeader: +BluesHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 784f06185..9ddbb5664 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -1,7 +1,7 @@ const_value set 2 const BRUNOSROOM_BRUNO -BrunosRoom_MapScriptHeader: +BrunosRoom_MapScripts: .SceneScripts: db 2 scene_script .LockDoor @@ -9,7 +9,7 @@ BrunosRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .BrunosRoomDoors + callback MAPCALLBACK_TILES, .BrunosRoomDoors .LockDoor: priorityjump .BrunosDoorLocksBehindYou @@ -20,24 +20,24 @@ BrunosRoom_MapScriptHeader: .BrunosRoomDoors: checkevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED - iffalse .KeepDoorClosed - changeblock $4, $e, $2a -.KeepDoorClosed: + iffalse .KeepEntranceOpen + changeblock 4, 14, $2a ; wall +.KeepEntranceOpen: checkevent EVENT_BRUNOS_ROOM_EXIT_OPEN - iffalse .OpenDoor - changeblock $4, $2, $16 -.OpenDoor: + iffalse .KeepExitClosed + changeblock 4, 2, $16 ; open door +.KeepExitClosed: return .BrunosDoorLocksBehindYou: - applymovement PLAYER, MovementData_0x1809f9 + applymovement PLAYER, BrunosRoom_EnterMovement refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock $4, $e, $2a + changeblock 4, 14, $2a ; wall reloadmappart closetext - setscene $1 + setscene 1 setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -46,12 +46,12 @@ BrunoScript_Battle: faceplayer opentext checkevent EVENT_BEAT_ELITE_4_BRUNO - iftrue UnknownScript_0x1809f3 + iftrue BrunoScript_AfterBattle writetext BrunoScript_BrunoBeforeText waitbutton closetext winlosstext BrunoScript_BrunoBeatenText, 0 - loadtrainer BRUNO, 1 + loadtrainer BRUNO, BRUNO1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_BRUNO @@ -60,20 +60,20 @@ BrunoScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock $4, $2, $16 + changeblock 4, 2, $16 ; open door reloadmappart closetext setevent EVENT_BRUNOS_ROOM_EXIT_OPEN waitsfx end -UnknownScript_0x1809f3: +BrunoScript_AfterBattle: writetext BrunoScript_BrunoDefeatText waitbutton closetext end -MovementData_0x1809f9: +BrunosRoom_EnterMovement: step UP step UP step UP @@ -124,7 +124,7 @@ BrunoScript_BrunoDefeatText: line "challenge!" done -BrunosRoom_MapEventHeader: +BrunosRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 69b71d9e3..f8e5ef52f 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -5,7 +5,7 @@ const_value set 2 const BURNEDTOWER1F_MORTY const BURNEDTOWER1F_POKE_BALL -BurnedTower1F_MapScriptHeader: +BurnedTower1F_MapScripts: .SceneScripts: db 3 scene_script .EusineScene @@ -14,7 +14,7 @@ BurnedTower1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .HoleAndLadder + callback MAPCALLBACK_TILES, .HoleAndLadder .EusineScene: priorityjump .MeetEusine @@ -28,13 +28,13 @@ BurnedTower1F_MapScriptHeader: .HoleAndLadder: checkevent EVENT_HOLE_IN_BURNED_TOWER - iftrue .Next - changeblock $a, $8, $32 ; hole -.Next: + iftrue .KeepHoleOpen + changeblock 10, 8, $32 ; floor +.KeepHoleOpen: checkevent EVENT_RELEASED_THE_BEASTS - iftrue .Done - changeblock $6, $e, $9 ; ladder -.Done: + iftrue .HideBasement + changeblock 6, 14, $09 ; ladder +.HideBasement: return .MeetEusine: @@ -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 ; hole 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 @@ -162,7 +160,7 @@ BurnedTower1FEusineMovement: step_end BurnedTowerSilver_BeforeText: - text "<......> <......> <......>" + text "<……> <……> <……>" para "…Oh, it's you." @@ -279,7 +277,7 @@ BurnedTower1FMortyText: line "TOWER with him." done -BurnedTower1F_MapEventHeader: +BurnedTower1F_MapEvents: ; filler db 0, 0 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 07f5c3d6e..3ad1d60f4 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -9,7 +9,7 @@ const_value set 2 const BURNEDTOWERB1F_POKE_BALL const BURNEDTOWERB1F_EUSINE -BurnedTowerB1F_MapScriptHeader: +BurnedTowerB1F_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -17,7 +17,7 @@ BurnedTowerB1F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .LadderCallback + callback MAPCALLBACK_TILES, .LadderCallback .DummyScene0: end @@ -27,9 +27,9 @@ BurnedTowerB1F_MapScriptHeader: .LadderCallback: checkevent EVENT_RELEASED_THE_BEASTS - iftrue .NoChange - changeblock $6, $e, $2 -.NoChange: + iftrue .HideLadder + changeblock 6, 14, $02 ; floor +.HideLadder: return ReleaseTheBeasts: @@ -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 ; ladder 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 @@ -235,7 +235,7 @@ BurnedTowerB1FEusineText: para "Farewell!" done -BurnedTowerB1F_MapEventHeader: +BurnedTowerB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index de89b1953..d30baf17d 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -5,7 +5,7 @@ const_value set 2 const CELADONCAFE_FISHER3 const CELADONCAFE_TEACHER -CeladonCafe_MapScriptHeader: +CeladonCafe_MapScripts: .SceneScripts: db 0 @@ -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 @@ -207,7 +207,7 @@ NoRoomForLeftoversText: line "hold another item…" done -CeladonCafe_MapEventHeader: +CeladonCafe_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index bfc5265ea..8075a5343 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -9,13 +9,13 @@ const_value set 2 const CELADONCITY_TEACHER2 const CELADONCITY_LASS -CeladonCity_MapScriptHeader: +CeladonCity_MapScripts: .SceneScripts: db 0 .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" @@ -234,7 +234,7 @@ CeladonCityTrainerTipsText: cont "STORE!" done -CeladonCity_MapEventHeader: +CeladonCity_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 7bf379a0e..7f838179d 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -3,7 +3,7 @@ const_value set 2 const CELADONDEPTSTORE1F_GENTLEMAN const CELADONDEPTSTORE1F_TEACHER -CeladonDeptStore1F_MapScriptHeader: +CeladonDeptStore1F_MapScripts: .SceneScripts: db 0 @@ -73,7 +73,7 @@ CeladonDeptStore1FDirectoryText: line " SQUARE" done -CeladonDeptStore1F_MapEventHeader: +CeladonDeptStore1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index db93e4ee7..eb9bb8dbc 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -4,7 +4,7 @@ const_value set 2 const CELADONDEPTSTORE2F_POKEFAN_M const CELADONDEPTSTORE2F_YOUNGSTER -CeladonDeptStore2F_MapScriptHeader: +CeladonDeptStore2F_MapScripts: .SceneScripts: db 0 @@ -68,7 +68,7 @@ CeladonDeptStore2FDirectoryText: line " MARKET" done -CeladonDeptStore2F_MapEventHeader: +CeladonDeptStore2F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index cf941d4c8..01cd14f57 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -5,7 +5,7 @@ const_value set 2 const CELADONDEPTSTORE3F_GAMEBOY_KID2 const CELADONDEPTSTORE3F_SUPER_NERD -CeladonDeptStore3F_MapScriptHeader: +CeladonDeptStore3F_MapScripts: .SceneScripts: db 0 @@ -94,7 +94,7 @@ CeladonDeptStore3FDirectoryText: line "Stronger!" done -CeladonDeptStore3F_MapEventHeader: +CeladonDeptStore3F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index dff331264..e3869c990 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -3,7 +3,7 @@ const_value set 2 const CELADONDEPTSTORE4F_SUPER_NERD const CELADONDEPTSTORE4F_YOUNGSTER -CeladonDeptStore4F_MapScriptHeader: +CeladonDeptStore4F_MapScripts: .SceneScripts: db 0 @@ -50,7 +50,7 @@ CeladonDeptStore4FDirectoryText: para "4F: WISEMAN GIFTS" done -CeladonDeptStore4F_MapEventHeader: +CeladonDeptStore4F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index b0fa491b5..a14e8c7be 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -5,7 +5,7 @@ const_value set 2 const CELADONDEPTSTORE5F_SAILOR const CELADONDEPTSTORE5F_TEACHER -CeladonDeptStore5F_MapScriptHeader: +CeladonDeptStore5F_MapScripts: .SceneScripts: db 0 @@ -71,7 +71,7 @@ CeladonDeptStore5FDirectoryText: text "5F: DRUG STORE" done -CeladonDeptStore5F_MapEventHeader: +CeladonDeptStore5F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index c94ef993e..5a5e37afc 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -2,16 +2,16 @@ const_value set 2 const CELADONDEPTSTORE6F_SUPER_NERD const CELADONDEPTSTORE6F_YOUNGSTER -CeladonDeptStore6F_MapScriptHeader: +CeladonDeptStore6F_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .Callback + callback MAPCALLBACK_TILES, .HideRooftopStairs -.Callback: - changeblock $c, $0, $3 +.HideRooftopStairs: + changeblock 12, 0, $03 ; wall 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: @@ -80,21 +80,19 @@ CeladonDeptStore6FVendingMachine: jump .Start .MenuData: - db $40 ; flags - db 02, 00 ; start coords - db 11, 19 ; end coords + db MENU_BACKUP_TILES ; flags + menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "FRESH WATER ¥200@" db "SODA POP ¥300@" db "LEMONADE ¥350@" db "CANCEL@" - CeladonDeptStore6FDirectory: jumptext CeladonDeptStore6FDirectoryText @@ -112,7 +110,7 @@ CeladonClangText: para "@" text_from_ram StringBuffer3 - text "" + text_start line "popped out." done @@ -147,7 +145,7 @@ CeladonDeptStore6FDirectoryText: line "VENDING MACHINES" done -CeladonDeptStore6F_MapEventHeader: +CeladonDeptStore6F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index d199bb734..b5045880b 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -1,4 +1,4 @@ -CeladonDeptStoreElevator_MapScriptHeader: +CeladonDeptStoreElevator_MapScripts: .SceneScripts: db 0 @@ -25,9 +25,9 @@ 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: +CeladonDeptStoreElevator_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index d35b1a45b..5d3382f53 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -9,7 +9,7 @@ const_value set 2 const CELADONGAMECORNER_GYM_GUY const CELADONGAMECORNER_GRAMPS -CeladonGameCorner_MapScriptHeader: +CeladonGameCorner_MapScripts: .SceneScripts: db 0 @@ -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 @@ -281,7 +281,7 @@ UnknownText_0x72567: para "Huh? It's empty!" done -CeladonGameCorner_MapEventHeader: +CeladonGameCorner_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 7f74c684f..1caed4b19 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -2,7 +2,7 @@ const_value set 2 const CELADONGAMECORNERPRIZEROOM_GENTLEMAN const CELADONGAMECORNERPRIZEROOM_PHARMACIST -CeladonGameCornerPrizeRoom_MapScriptHeader: +CeladonGameCornerPrizeRoom_MapScripts: .SceneScripts: db 0 @@ -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,24 +102,21 @@ CeladonPrizeRoom_NoCoinCase: closetext end - CeladonPrizeRoom_TMMenuDataHeader: - db $40 ; flags - db 02, 00 ; start coords - db 11, 15 ; end coords + db MENU_BACKUP_TILES ; flags + menu_coords 0, 2, 15, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "TM32 1500@" db "TM29 3500@" 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,23 +188,20 @@ GoldenrodGameCornerPokemonVendor: takecoins 8888 jump .loop - .MenuDataHeader: - db $40 ; flags - db 02, 00 ; start coords - db 11, 17 ; end coords + db MENU_BACKUP_TILES ; flags + menu_coords 0, 2, 17, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "PIKACHU 2222@" db "PORYGON 5555@" db "LARVITAR 8888@" db "CANCEL@" - CeladonGameCornerPrizeRoomGentlemanText: text "I wanted PORYGON," line "but I was short by" @@ -269,7 +263,7 @@ CeladonPrizeRoom_NoCoinCaseText: line "a COIN CASE." done -CeladonGameCornerPrizeRoom_MapEventHeader: +CeladonGameCornerPrizeRoom_MapEvents: ; filler db 0, 0 @@ -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..53f09324a 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -6,7 +6,7 @@ const_value set 2 const CELADONGYM_TWIN1 const CELADONGYM_TWIN2 -CeladonGym_MapScriptHeader: +CeladonGym_MapScripts: .SceneScripts: db 0 @@ -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: @@ -267,7 +267,7 @@ TwinsJoandzoe2AfterBattleText: line "much stronger!" done -CeladonGym_MapEventHeader: +CeladonGym_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 892401afe..4f6e0f94d 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -4,7 +4,7 @@ const_value set 2 const CELADONMANSION1F_CLEFAIRY const CELADONMANSION1F_GROWLITHE2 -CeladonMansion1F_MapScriptHeader: +CeladonMansion1F_MapScripts: .SceneScripts: db 0 @@ -74,7 +74,7 @@ CeladonMansionManagersSuiteSignText: line "MANAGER'S SUITE" done -CeladonMansion1F_MapEventHeader: +CeladonMansion1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index 7af437c21..e463c5b07 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -1,4 +1,4 @@ -CeladonMansion2F_MapScriptHeader: +CeladonMansion2F_MapScripts: .SceneScripts: db 0 @@ -49,7 +49,7 @@ CeladonMansion2FSignText: line "MEETING ROOM" done -CeladonMansion2F_MapEventHeader: +CeladonMansion2F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 5274b5b38..bb6bb2f3f 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -4,7 +4,7 @@ const_value set 2 const CELADONMANSION3F_SUPER_NERD const CELADONMANSION3F_FISHER -CeladonMansion3F_MapScriptHeader: +CeladonMansion3F_MapScripts: .SceneScripts: db 0 @@ -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 @@ -189,7 +189,7 @@ UnknownText_0x71996: cont "a # DOLL." done -CeladonMansion3F_MapEventHeader: +CeladonMansion3F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index bf53f8b4f..d3a3c7623 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -1,7 +1,7 @@ const_value set 2 const CELADONMANSIONROOF_FISHER -CeladonMansionRoof_MapScriptHeader: +CeladonMansionRoof_MapScripts: .SceneScripts: db 0 @@ -33,7 +33,7 @@ UnknownText_0x71aa1: line "moustache!" done -CeladonMansionRoof_MapEventHeader: +CeladonMansionRoof_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 6fdd96afe..f49d12535 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const CELADONMANSIONROOFHOUSE_PHARMACIST -CeladonMansionRoofHouse_MapScriptHeader: +CeladonMansionRoofHouse_MapScripts: .SceneScripts: db 0 @@ -116,7 +116,7 @@ UnknownText_0x71db3: line "victim's HP." done -CeladonMansionRoofHouse_MapEventHeader: +CeladonMansionRoofHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 2c2a594e6..cfe31f624 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const CELADONPOKECENTER1F_COOLTRAINER_F const CELADONPOKECENTER1F_EUSINE -CeladonPokecenter1F_MapScriptHeader: +CeladonPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -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…" @@ -145,7 +145,7 @@ NoBeastsText: line "you, <PLAYER>!" done -CeladonPokecenter1F_MapEventHeader: +CeladonPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm index 2dcb0e1eb..06212496b 100644 --- a/maps/CeladonPokecenter2FBeta.asm +++ b/maps/CeladonPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -CeladonPokecenter2FBeta_MapScriptHeader: +CeladonPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -CeladonPokecenter2FBeta_MapEventHeader: +CeladonPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 47a991d21..9980a4487 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -6,13 +6,13 @@ const_value set 2 const CERULEANCITY_FISHER const CERULEANCITY_YOUNGSTER -CeruleanCity_MapScriptHeader: +CeruleanCity_MapScripts: .SceneScripts: db 0 .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" @@ -275,7 +275,7 @@ CeruleanLockedDoorText: text "It's locked…" done -CeruleanCity_MapEventHeader: +CeruleanCity_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 59a1b72b9..b1076ded5 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -6,7 +6,7 @@ const_value set 2 const CERULEANGYM_SWIMMER_GUY const CERULEANGYM_GYM_GUY -CeruleanGym_MapScriptHeader: +CeruleanGym_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -363,7 +362,7 @@ CeruleanGymGuyWinText: cont "great battle!" done -CeruleanGym_MapEventHeader: +CeruleanGym_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 5c8beb81b..82d9db826 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M -CeruleanGymBadgeSpeechHouse_MapScriptHeader: +CeruleanGymBadgeSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -16,7 +16,7 @@ CeruleanGymBadgeSpeechHousePokefanMText: line "KANTO GYM BADGES?" done -CeruleanGymBadgeSpeechHouse_MapEventHeader: +CeruleanGymBadgeSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index b9d2226ff..c89621b6a 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -3,7 +3,7 @@ const_value set 2 const CERULEANMART_COOLTRAINER_M const CERULEANMART_COOLTRAINER_F -CeruleanMart_MapScriptHeader: +CeruleanMart_MapScripts: .SceneScripts: db 0 @@ -45,7 +45,7 @@ CeruleanMart_CooltrainerFText: cont "CERULEAN's CAPE." done -CeruleanMart_MapEventHeader: +CeruleanMart_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 2e03275d4..2efd5f743 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -3,7 +3,7 @@ const_value set 2 const CERULEANPOKECENTER1F_SUPER_NERD const CERULEANPOKECENTER1F_GYM_GUY -CeruleanPokecenter1F_MapScriptHeader: +CeruleanPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -14,7 +14,7 @@ NurseScript_0x18820f: jumpstd pokecenternurse SuperNerdScript_0x188212: - special Mobile_DummyReturnFalse + special Special_Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x188221 @@ -62,7 +62,7 @@ CeruleanPokecenter1FGymGuyText: line "JOHTO accessible." done -CeruleanPokecenter1F_MapEventHeader: +CeruleanPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm index a0c49e759..467377caa 100644 --- a/maps/CeruleanPokecenter2FBeta.asm +++ b/maps/CeruleanPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -CeruleanPokecenter2FBeta_MapScriptHeader: +CeruleanPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -CeruleanPokecenter2FBeta_MapEventHeader: +CeruleanPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 77ff3baf8..ca77bf0cd 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -3,7 +3,7 @@ const_value set 2 const CERULEANPOLICESTATION_POKEFAN_F const CERULEANPOLICESTATION_DIGLETT -CeruleanPoliceStation_MapScriptHeader: +CeruleanPoliceStation_MapScripts: .SceneScripts: db 0 @@ -43,7 +43,7 @@ CeruleanDiglettText: text "DIGLETT: Dug dug." done -CeruleanPoliceStation_MapEventHeader: +CeruleanPoliceStation_MapEvents: ; filler db 0, 0 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 289358996..8fdd470ae 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -4,7 +4,7 @@ const_value set 2 const CERULEANTRADESPEECHHOUSE_RHYDON const CERULEANTRADESPEECHHOUSE_ZUBAT -CeruleanTradeSpeechHouse_MapScriptHeader: +CeruleanTradeSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -53,7 +53,7 @@ UnknownText_0x1881b5: text "ZUBAT: Zuba zubaa." done -CeruleanTradeSpeechHouse_MapEventHeader: +CeruleanTradeSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 2b5942001..3eaa2464b 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -3,7 +3,7 @@ const_value set 2 const CHARCOALKILN_YOUNGSTER const CHARCOALKILN_MOLTRES -CharcoalKiln_MapScriptHeader: +CharcoalKiln_MapScripts: .SceneScripts: db 0 @@ -148,7 +148,7 @@ FarfetchdText: text "FARFETCH'D: Kwaa!" done -CharcoalKiln_MapEventHeader: +CharcoalKiln_MapEvents: ; filler db 0, 0 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index d87d52165..ac3db17b6 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -5,7 +5,7 @@ const_value set 2 const CHERRYGROVECITY_YOUNGSTER const CHERRYGROVECITY_FISHER -CherrygroveCity_MapScriptHeader: +CherrygroveCity_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -433,7 +433,7 @@ GuideGentNoText: done UnknownText_0x19c4e2: - text "<......> <......> <......>" + text "<……> <……> <……>" para "You got a #MON" line "at the LAB." @@ -441,7 +441,7 @@ UnknownText_0x19c4e2: para "What a waste." line "A wimp like you." - para "<......> <......> <......>" + para "<……> <……> <……>" para "Don't you get what" line "I'm saying?" @@ -459,7 +459,7 @@ SilverCherrygroveWinText: done CherrygroveRivalText_YouLost: - text "<......> <......> <......>" + text "<……> <……> <……>" para "My name's ???." @@ -475,7 +475,7 @@ SilverCherrygroveLossText: done CherrygroveRivalText_YouWon: - text "<......> <......> <......>" + text "<……> <……> <……>" para "My name's ???." @@ -546,7 +546,7 @@ GuideGentsHouseSignText: text "GUIDE GENT'S HOUSE" done -CherrygroveCity_MapEventHeader: +CherrygroveCity_MapEvents: ; filler db 0, 0 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index 1b32f92b2..c79941cb2 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER -CherrygroveEvolutionSpeechHouse_MapScriptHeader: +CherrygroveEvolutionSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -41,7 +41,7 @@ UnknownText_0x196cfc: line "if one did that!" done -CherrygroveEvolutionSpeechHouse_MapEventHeader: +CherrygroveEvolutionSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 084092251..2709ed1c0 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER -CherrygroveGymSpeechHouse_MapScriptHeader: +CherrygroveGymSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -44,7 +44,7 @@ CherrygroveGymSpeechHouseBugCatcherText: line "them tougher!" done -CherrygroveGymSpeechHouse_MapEventHeader: +CherrygroveGymSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index caee8ba37..7a4b6dc0b 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -3,7 +3,7 @@ const_value set 2 const CHERRYGROVEMART_COOLTRAINER_M const CHERRYGROVEMART_YOUNGSTER -CherrygroveMart_MapScriptHeader: +CherrygroveMart_MapScripts: .SceneScripts: db 0 @@ -71,7 +71,7 @@ CherrygroveMartYoungsterText: line "ANTIDOTE with you." done -CherrygroveMart_MapEventHeader: +CherrygroveMart_MapEvents: ; filler db 0, 0 diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index 30e6c179c..202d87e50 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const CHERRYGROVEPOKECENTER1F_GENTLEMAN const CHERRYGROVEPOKECENTER1F_TEACHER -CherrygrovePokecenter1F_MapScriptHeader: +CherrygrovePokecenter1F_MapScripts: .SceneScripts: db 0 @@ -68,7 +68,7 @@ UnknownText_0x196a46: line "there already!" done -CherrygrovePokecenter1F_MapEventHeader: +CherrygrovePokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 86c958205..f05b7aeb3 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -12,7 +12,7 @@ const_value set 2 const CIANWOODCITY_EUSINE const CIANWOODCITY_SUICUNE -CianwoodCity_MapScriptHeader: +CianwoodCity_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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: @@ -380,7 +380,7 @@ CianwoodPokeSeerSignText: line "AHEAD" done -CianwoodCity_MapEventHeader: +CianwoodCity_MapEvents: ; filler db 0, 0 @@ -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..1ca8a0a5e 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -9,7 +9,7 @@ const_value set 2 const CIANWOODGYM_BOULDER3 const CIANWOODGYM_BOULDER4 -CianwoodGym_MapScriptHeader: +CianwoodGym_MapScripts: .SceneScripts: db 0 @@ -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: @@ -305,7 +305,7 @@ BlackbeltLungAfterText: cont "shattered…" done -CianwoodGym_MapEventHeader: +CianwoodGym_MapEvents: ; filler db 0, 0 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 9a0cf5b7a..4b3099eec 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const CIANWOODLUGIASPEECHHOUSE_LASS const CIANWOODLUGIASPEECHHOUSE_TWIN -CianwoodLugiaSpeechHouse_MapScriptHeader: +CianwoodLugiaSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -61,7 +61,7 @@ CianwoodLugiaSpeechHouseTwinText: cont "get past them." done -CianwoodLugiaSpeechHouse_MapEventHeader: +CianwoodLugiaSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 629294333..696a16610 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -1,7 +1,7 @@ const_value set 2 const CIANWOODPHARMACY_PHARMACIST -CianwoodPharmacy_MapScriptHeader: +CianwoodPharmacy_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -72,7 +72,7 @@ PharmacistDescribeSecretpotionText: line "an emergency." done -CianwoodPharmacy_MapEventHeader: +CianwoodPharmacy_MapEvents: ; filler db 0, 0 diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index 3a20c63e6..bbf2eb3d9 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_MapScripts: .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_MapEvents: ; filler db 0, 0 diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index 3bf9a1b3a..0f97e011b 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const CIANWOODPOKECENTER1F_GYM_GUY const CIANWOODPOKECENTER1F_SUPER_NERD -CianwoodPokecenter1F_MapScriptHeader: +CianwoodPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -131,7 +131,7 @@ CianwoodPokecenter1FSuperNerdText: line "off my #MON!" done -CianwoodPokecenter1F_MapEventHeader: +CianwoodPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 50b26a8f5..ed4765d18 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -1,13 +1,13 @@ const_value set 2 const CINNABARISLAND_BLUE -CinnabarIsland_MapScriptHeader: +CinnabarIsland_MapScripts: .SceneScripts: db 0 .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 @@ -127,7 +127,7 @@ CinnabarIslandSignText: line "Burning Desire" done -CinnabarIsland_MapEventHeader: +CinnabarIsland_MapEvents: ; filler db 0, 0 diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index e74bd85ab..17fe1b97c 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -3,7 +3,7 @@ const_value set 2 const CINNABARPOKECENTER1F_COOLTRAINER_F const CINNABARPOKECENTER1F_FISHER -CinnabarPokecenter1F_MapScriptHeader: +CinnabarPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -34,7 +34,7 @@ CinnabarPokecenter1FFisherText: cont "erupted." done -CinnabarPokecenter1F_MapEventHeader: +CinnabarPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm index 1e110c8fe..f2621c43c 100644 --- a/maps/CinnabarPokecenter2FBeta.asm +++ b/maps/CinnabarPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -CinnabarPokecenter2FBeta_MapScriptHeader: +CinnabarPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -CinnabarPokecenter2FBeta_MapEventHeader: +CinnabarPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 647e16541..6f8538bac 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -2,7 +2,7 @@ const_value set 2 const COLOSSEUM_CHRIS1 const COLOSSEUM_CHRIS2 -Colosseum_MapScriptHeader: +Colosseum_MapScripts: .SceneScripts: db 3 scene_script .InitializeColosseum @@ -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: @@ -62,7 +62,7 @@ ChrisScript_0x193499: line "ready." done -Colosseum_MapEventHeader: +Colosseum_MapEvents: ; filler db 0, 0 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 925f7683a..695329ded 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -3,7 +3,7 @@ const_value set 2 const COPYCATSHOUSE1F_POKEFAN_F const COPYCATSHOUSE1F_CLEFAIRY -CopycatsHouse1F_MapScriptHeader: +CopycatsHouse1F_MapScripts: .SceneScripts: db 0 @@ -72,7 +72,7 @@ UnknownText_0x18ae4b: text "BLISSEY: Bliisii!" done -CopycatsHouse1F_MapEventHeader: +CopycatsHouse1F_MapEvents: ; filler db 0, 0 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 5456973dc..74f6af110 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -6,13 +6,13 @@ const_value set 2 const COPYCATSHOUSE2F_BIRDDOLL const COPYCATSHOUSE2F_COPYCAT2 ; if player is female -CopycatsHouse2F_MapScriptHeader: +CopycatsHouse2F_MapScripts: .SceneScripts: db 0 .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 @@ -360,7 +360,7 @@ CopycatsHouse2FDollText: para "It's only a doll…" done -CopycatsHouse2F_MapEventHeader: +CopycatsHouse2F_MapEvents: ; filler db 0, 0 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index c4ec8bbe2..bb698becd 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -9,7 +9,7 @@ const_value set 2 const DANCETHEATRE_COOLTRAINER_M const DANCETHEATRE_GRANNY -DanceTheatre_MapScriptHeader: +DanceTheatre_MapScripts: .SceneScripts: db 0 @@ -337,7 +337,7 @@ FancyPanelText: cont "with flowers." done -DanceTheatre_MapEventHeader: +DanceTheatre_MapEvents: ; filler db 0, 0 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index bd6272298..63ea46aa3 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -3,7 +3,7 @@ const_value set 2 const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1 const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2 -DarkCaveBlackthornEntrance_MapScriptHeader: +DarkCaveBlackthornEntrance_MapScripts: .SceneScripts: db 0 @@ -61,7 +61,7 @@ DarkCaveBlackthornEntrancePharmacistText2: cont "type moves." done -DarkCaveBlackthornEntrance_MapEventHeader: +DarkCaveBlackthornEntrance_MapEvents: ; filler db 0, 0 diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index b1e629a54..3eed4f41c 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -8,7 +8,7 @@ const_value set 2 const DARKCAVEVIOLETENTRANCE_POKE_BALL3 const DARKCAVEVIOLETENTRANCE_POKE_BALL4 -DarkCaveVioletEntrance_MapScriptHeader: +DarkCaveVioletEntrance_MapScripts: .SceneScripts: db 0 @@ -31,10 +31,9 @@ DarkCaveVioletEntranceRock: jumpstd smashrock DarkCaveVioletEntranceHiddenElixer: - dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER + hiddenitem EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER - -DarkCaveVioletEntrance_MapEventHeader: +DarkCaveVioletEntrance_MapEvents: ; filler db 0, 0 diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 0d06cea93..93461c3a8 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -2,13 +2,13 @@ const_value set 2 const DAYCARE_GRAMPS const DAYCARE_GRANNY -DayCare_MapScriptHeader: +DayCare_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .EggCheckCallback + callback MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: checkflag ENGINE_DAY_CARE_MAN_HAS_EGG @@ -155,7 +155,7 @@ DayCareText_PartyFull: line "this." done -DayCare_MapEventHeader: +DayCare_MapEvents: ; filler db 0, 0 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 04277b792..b7ff38465 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -1,7 +1,7 @@ const_value set 2 const DIGLETTSCAVE_POKEFAN_M -DiglettsCave_MapScriptHeader: +DiglettsCave_MapScripts: .SceneScripts: db 0 @@ -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" @@ -23,7 +22,7 @@ DiglettsCavePokefanMText: line "shocking." done -DiglettsCave_MapEventHeader: +DiglettsCave_MapEvents: ; filler db 0, 0 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 1df424ca1..8be52840d 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -4,7 +4,7 @@ const_value set 2 const DRAGONSHRINE_ELDER3 const DRAGONSHRINE_CLAIR -DragonShrine_MapScriptHeader: +DragonShrine_MapScripts: .SceneScripts: db 2 scene_script .DragonShrineTest @@ -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,146 +202,135 @@ 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: - db $40 ; flags - db 04, 08 ; start coords - db 11, 19 ; end coords +DragonShrineQuestion1_MenuDataHeader: + db MENU_BACKUP_TILES ; flags + menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Pal@" db "Underling@" db "Friend@" - -MenuDataHeader_0x18d234: - db $40 ; flags - db 04, 09 ; start coords - db 11, 19 ; end coords +DragonShrineQuestion2_MenuDataHeader: + db MENU_BACKUP_TILES ; flags + menu_coords 9, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Strategy@" db "Raising@" db "Cheating@" - -MenuDataHeader_0x18d258: - db $40 ; flags - db 04, 05 ; start coords - db 11, 19 ; end coords +DragonShrineQuestion3_MenuDataHeader: + db MENU_BACKUP_TILES ; flags + menu_coords 5, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Weak person@" db "Tough person@" db "Anybody@" - -MenuDataHeader_0x18d283: - db $40 ; flags - db 04, 08 ; start coords - db 11, 19 ; end coords +DragonShrineQuestion4_MenuDataHeader: + db MENU_BACKUP_TILES ; flags + menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Love@" db "Violence@" db "Knowledge@" - -MenuDataHeader_0x18d2a5: - db $40 ; flags - db 04, 12 ; start coords - db 11, 19 ; end coords +DragonShrineQuestion5_MenuDataHeader: + db MENU_BACKUP_TILES ; flags + menu_coords 12, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Tough@" 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,11 +653,11 @@ UnknownText_0x18da0b: line "question." done -UnknownText_0x18dab4: - text $56, $56, $56, $56, $56, $56 +DragonShrineSpeechlessText: + text "<……><……><……><……><……><……>" done -DragonShrine_MapEventHeader: +DragonShrine_MapEvents: ; filler db 0, 0 @@ -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/DragonsDen1F.asm b/maps/DragonsDen1F.asm index 8ab1c9bb4..0ff616c59 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -1,11 +1,11 @@ -DragonsDen1F_MapScriptHeader: +DragonsDen1F_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -DragonsDen1F_MapEventHeader: +DragonsDen1F_MapEvents: ; filler db 0, 0 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 8f87735db..10b079edf 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -9,7 +9,7 @@ const_value set 2 const DRAGONSDENB1F_POKE_BALL2 const DRAGONSDENB1F_POKE_BALL3 -DragonsDenB1F_MapScriptHeader: +DragonsDenB1F_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -406,7 +406,7 @@ Text_NoRoomForDragonFang: cont "items." done -DragonsDenB1F_MapEventHeader: +DragonsDenB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 3ed66a713..1936858dd 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -6,7 +6,7 @@ const_value set 2 const EARLSPOKEMONACADEMY_YOUNGSTER2 const EARLSPOKEMONACADEMY_POKEDEX -EarlsPokemonAcademy_MapScriptHeader: +EarlsPokemonAcademy_MapScripts: .SceneScripts: db 0 @@ -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 @@ -103,14 +103,13 @@ AcademyBlackboard: jump .Loop .BlackboardMenuData: - db $40 ; flags - db 00, 00 ; start coords - db 08, 11 ; end coords + db MENU_BACKUP_TILES ; flags + menu_coords 0, 0, 11, 8 dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags dn 3, 2 ; rows, columns db 5 ; spacing dba .Text @@ -412,7 +411,7 @@ AcademyStickerMachineText: para "stickers!" done -EarlsPokemonAcademy_MapEventHeader: +EarlsPokemonAcademy_MapEvents: ; filler db 0, 0 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 322b403f6..5e3dada98 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -7,13 +7,13 @@ const_value set 2 const ECRUTEAKCITY_YOUNGSTER const ECRUTEAKCITY_GRAMPS3 -EcruteakCity_MapScriptHeader: +EcruteakCity_MapScripts: .SceneScripts: db 0 .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. @@ -259,7 +259,7 @@ BurnedTowerSignText: line "as it is unsafe." done -EcruteakCity_MapEventHeader: +EcruteakCity_MapEvents: ; filler db 0, 0 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 491aaff7b..70776d1ee 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -7,7 +7,7 @@ const_value set 2 const ECRUTEAKGYM_GYM_GUY const ECRUTEAKGYM_GRAMPS -EcruteakGym_MapScriptHeader: +EcruteakGym_MapScripts: .SceneScripts: db 2 scene_script .ForcedToLeave @@ -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: @@ -386,7 +386,7 @@ UnknownText_0x9a49c: para "Hohohoho." done -EcruteakGym_MapEventHeader: +EcruteakGym_MapEvents: ; filler db 0, 0 diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 274cc99e3..436bdd0e3 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -4,7 +4,7 @@ const_value set 2 const ECRUTEAKHOUSE_SAGE3 const ECRUTEAKHOUSE_GRAMPS -EcruteakHouse_MapScriptHeader: +EcruteakHouse_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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!" @@ -277,7 +277,7 @@ EcruteakHouseGrampsText: line "never to return." done -EcruteakHouse_MapEventHeader: +EcruteakHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 011976f7e..0d956a181 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M const ECRUTEAKITEMFINDERHOUSE_POKEDEX -EcruteakItemfinderHouse_MapScriptHeader: +EcruteakItemfinderHouse_MapScripts: .SceneScripts: db 0 @@ -162,7 +162,7 @@ EcruteakThreeMonText: line "grassland." done -EcruteakItemfinderHouse_MapEventHeader: +EcruteakItemfinderHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index e33ce1bf4..4b39f93eb 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER -EcruteakLugiaSpeechHouse_MapScriptHeader: +EcruteakLugiaSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -44,7 +44,7 @@ EcruteakLugiaSpeechHouseYoungsterText: line "must be powerful." done -EcruteakLugiaSpeechHouse_MapEventHeader: +EcruteakLugiaSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 6859ce5b9..c69de9a7d 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -3,7 +3,7 @@ const_value set 2 const ECRUTEAKMART_SUPER_NERD const ECRUTEAKMART_GRANNY -EcruteakMart_MapScriptHeader: +EcruteakMart_MapScripts: .SceneScripts: db 0 @@ -45,7 +45,7 @@ EcruteakMartGrannyText: line "right up." done -EcruteakMart_MapEventHeader: +EcruteakMart_MapEvents: ; filler db 0, 0 diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index da661209f..409181ddc 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const ECRUTEAKPOKECENTER1F_GYM_GUY const ECRUTEAKPOKECENTER1F_BILL -EcruteakPokecenter1F_MapScriptHeader: +EcruteakPokecenter1F_MapScripts: .SceneScripts: db 2 scene_script .MeetBill @@ -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 @@ -206,7 +206,7 @@ EcruteakPokecenter1FGymGuyText: line "acy. I know it!" done -EcruteakPokecenter1F_MapEventHeader: +EcruteakPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 72e3f68e2..292562f85 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ELMSHOUSE_ELMS_WIFE const ELMSHOUSE_ELMS_SON -ElmsHouse_MapScriptHeader: +ElmsHouse_MapScripts: .SceneScripts: db 0 @@ -83,7 +83,7 @@ ElmsHousePCText: cont "search papers." done -ElmsHouse_MapEventHeader: +ElmsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 13c8b367e..9322aefe8 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -6,7 +6,7 @@ const_value set 2 const ELMSLAB_POKE_BALL3 const ELMSLAB_OFFICER -ElmsLab_MapScriptHeader: +ElmsLab_MapScripts: .SceneScripts: db 6 scene_script .MeetElm @@ -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…" @@ -1370,7 +1370,7 @@ ElmsLabPCText: line "screen…" done -ElmsLab_MapEventHeader: +ElmsLab_MapEvents: ; filler db 0, 0 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 869cb147c..6dfb2350d 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -4,7 +4,7 @@ const_value set 2 const FASTSHIP1F_SAILOR3 const FASTSHIP1F_GENTLEMAN -FastShip1F_MapScriptHeader: +FastShip1F_MapScripts: .SceneScripts: db 3 scene_script .DummyScene0 @@ -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: @@ -285,7 +285,7 @@ UnknownText_0x754be: cont "VERMILION CITY." done -FastShip1F_MapEventHeader: +FastShip1F_MapEvents: ; filler db 0, 0 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 498e65f70..c179b490a 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -12,7 +12,7 @@ const_value set 2 const FASTSHIPB1F_YOUNGSTER1 const FASTSHIPB1F_YOUNGSTER2 -FastShipB1F_MapScriptHeader: +FastShipB1F_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -448,7 +448,7 @@ SchoolboyRickyAfterBattleText: cont "stone panels." done -FastShipB1F_MapEventHeader: +FastShipB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 1bd1c91f1..a6ff922dd 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -7,7 +7,7 @@ const_value set 2 const FASTSHIPCABINS_NNW_NNE_NE_GENTLEMAN const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST -FastShipCabins_NNW_NNE_NE_MapScriptHeader: +FastShipCabins_NNW_NNE_NE_MapScripts: .SceneScripts: db 0 @@ -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 @@ -266,7 +266,7 @@ BurglarCoreyAfterBattleText: line "lost it…" done -FastShipCabins_NNW_NNE_NE_MapEventHeader: +FastShipCabins_NNW_NNE_NE_MapEvents: ; filler db 0, 0 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index efccd7d92..5c038275d 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -11,14 +11,14 @@ const_value set 2 const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_POKEFAN_F const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2 -FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader: +FastShipCabins_SE_SSE_CaptainsCabin_MapScripts: .SceneScripts: db 0 .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: @@ -462,7 +462,7 @@ SSAquaHasArrivedVermilionText: cont "VERMILION CITY." done -FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: +FastShipCabins_SE_SSE_CaptainsCabin_MapEvents: ; filler db 0, 0 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 8af9a2e3f..d4d35f584 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -4,7 +4,7 @@ const_value set 2 const FASTSHIPCABINS_SW_SSW_NW_BUENA const FASTSHIPCABINS_SW_SSW_NW_ROCKER -FastShipCabins_SW_SSW_NW_MapScriptHeader: +FastShipCabins_SW_SSW_NW_MapScripts: .SceneScripts: db 0 @@ -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 @@ -222,7 +222,7 @@ FastShipArrivedVermilionText: cont "VERMILION CITY." done -FastShipCabins_SW_SSW_NW_MapEventHeader: +FastShipCabins_SW_SSW_NW_MapEvents: ; filler db 0, 0 diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 01cdea5b5..46cc7ddeb 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -2,7 +2,7 @@ const_value set 2 const FIGHTINGDOJO_BLACK_BELT const FIGHTINGDOJO_POKE_BALL -FightingDojo_MapScriptHeader: +FightingDojo_MapScripts: .SceneScripts: db 0 @@ -42,7 +42,7 @@ FightingDojoSign1Text: line "side!" done -FightingDojo_MapEventHeader: +FightingDojo_MapEvents: ; filler db 0, 0 diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index a1e468976..8a72256b6 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const FUCHSIABILLSPEECHHOUSE_POKEFAN_F const FUCHSIABILLSPEECHHOUSE_YOUNGSTER -FuchsiaBillSpeechHouse_MapScriptHeader: +FuchsiaBillSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -27,7 +27,7 @@ FuchsiaBillSpeechHouseYoungsterText: cont "CYCLING ROAD." done -FuchsiaBillSpeechHouse_MapEventHeader: +FuchsiaBillSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 79824c76d..34a636aaf 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -4,13 +4,13 @@ const_value set 2 const FUCHSIACITY_TEACHER const FUCHSIACITY_FRUIT_TREE -FuchsiaCity_MapScriptHeader: +FuchsiaCity_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_FUCHSIA @@ -124,7 +124,7 @@ NoLitteringSignText: line "waste with you." done -FuchsiaCity_MapEventHeader: +FuchsiaCity_MapEvents: ; filler db 0, 0 @@ -139,8 +139,8 @@ FuchsiaCity_MapEventHeader: warp_def 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA warp_def 37, 22, 1, ROUTE_15_FUCHSIA_GATE warp_def 37, 23, 2, ROUTE_15_FUCHSIA_GATE - warp_def 7, 35, 1, ROUTE_19___FUCHSIA_GATE - warp_def 8, 35, 2, ROUTE_19___FUCHSIA_GATE + warp_def 7, 35, 1, ROUTE_19_FUCHSIA_GATE + warp_def 8, 35, 2, ROUTE_19_FUCHSIA_GATE .CoordEvents: db 0 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 8aaf6e364..a691d1d50 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -6,7 +6,7 @@ const_value set 2 const FUCHSIAGYM_FUCHSIA_GYM_4 const FUCHSIAGYM_GYM_GUY -FuchsiaGym_MapScriptHeader: +FuchsiaGym_MapScripts: .SceneScripts: db 0 @@ -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: @@ -380,7 +380,7 @@ FuchsiaGymGuyWinText: cont "from JOHTO!" done -FuchsiaGym_MapEventHeader: +FuchsiaGym_MapEvents: ; filler db 0, 0 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 48ffdba5f..4ab7932f3 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -3,7 +3,7 @@ const_value set 2 const FUCHSIAMART_FISHER const FUCHSIAMART_COOLTRAINER_F -FuchsiaMart_MapScriptHeader: +FuchsiaMart_MapScripts: .SceneScripts: db 0 @@ -37,7 +37,7 @@ FuchsiaMartCooltrainerFText: cont "town." done -FuchsiaMart_MapEventHeader: +FuchsiaMart_MapEvents: ; filler db 0, 0 diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index eca4aa8e0..9bc8775a6 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const FUCHSIAPOKECENTER1F_COOLTRAINER_F const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR -FuchsiaPokecenter1F_MapScriptHeader: +FuchsiaPokecenter1F_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -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: @@ -88,7 +88,7 @@ UnknownText_0x19654e: line "like her now!" done -FuchsiaPokecenter1F_MapEventHeader: +FuchsiaPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm index 619022047..dc61c55ab 100644 --- a/maps/FuchsiaPokecenter2FBeta.asm +++ b/maps/FuchsiaPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -FuchsiaPokecenter2FBeta_MapScriptHeader: +FuchsiaPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -FuchsiaPokecenter2FBeta_MapEventHeader: +FuchsiaPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index c8838afe5..48cc677ab 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -1,7 +1,7 @@ const_value set 2 const GOLDENRODBIKESHOP_CLERK -GoldenrodBikeShop_MapScriptHeader: +GoldenrodBikeShop_MapScripts: .SceneScripts: db 0 @@ -102,7 +102,7 @@ UnknownText_0x548ed: line "BICYCLE!" done -GoldenrodBikeShop_MapEventHeader: +GoldenrodBikeShop_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 2032c5b1e..33c8dbd17 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const GOLDENRODBILLSHOUSE_POKEFAN_F const GOLDENRODBILLSHOUSE_TWIN -GoldenrodBillsHouse_MapScriptHeader: +GoldenrodBillsHouse_MapScripts: .SceneScripts: db 0 @@ -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 @@ -242,7 +242,7 @@ UnknownText_0x55069: line "system." done -GoldenrodBillsHouse_MapEventHeader: +GoldenrodBillsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 8e324a9bb..89ca2bb0d 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -15,14 +15,14 @@ const_value set 2 const GOLDENRODCITY_ROCKET6 const GOLDENRODCITY_POKEFAN_M2 -GoldenrodCity_MapScriptHeader: +GoldenrodCity_MapScripts: .SceneScripts: db 0 .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,54 +63,51 @@ 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 $40 ; flags - db 02, 00 ; start coords - db 11, 15 ; end coords + db MENU_BACKUP_TILES ; flags + menu_coords 0, 2, 15, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "FLAMETHROWER@" db "THUNDERBOLT@" db "ICE BEAM@" db "CANCEL@" - .Refused: writetext UnknownText_0x1990b4 waitbutton @@ -551,10 +548,10 @@ UnknownText_0x1991ac: done UnknownText_0x1991cf: - text "" + text_start done -GoldenrodCity_MapEventHeader: +GoldenrodCity_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 27bf60e58..6f07b6ad4 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -4,7 +4,7 @@ const_value set 2 const GOLDENRODDEPTSTORE1F_BUG_CATCHER const GOLDENRODDEPTSTORE1F_GENTLEMAN -GoldenrodDeptStore1F_MapScriptHeader: +GoldenrodDeptStore1F_MapScripts: .SceneScripts: db 0 @@ -78,7 +78,7 @@ GoldenrodDeptStore1FDirectoryText: para "ROOFTOP LOOKOUT" done -GoldenrodDeptStore1F_MapEventHeader: +GoldenrodDeptStore1F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index b22e89026..bfe6a398f 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -5,7 +5,7 @@ const_value set 2 const GOLDENRODDEPTSTORE2F_COOLTRAINER_F const GOLDENRODDEPTSTORE2F_GENTLEMAN -GoldenrodDeptStore2F_MapScriptHeader: +GoldenrodDeptStore2F_MapScripts: .SceneScripts: db 0 @@ -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" @@ -100,7 +100,7 @@ GoldenrodDeptStore2FDirectoryText: line " MARKET" done -GoldenrodDeptStore2F_MapEventHeader: +GoldenrodDeptStore2F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 27bc44953..c495cb440 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -3,7 +3,7 @@ const_value set 2 const GOLDENRODDEPTSTORE3F_SUPER_NERD const GOLDENRODDEPTSTORE3F_ROCKER -GoldenrodDeptStore3F_MapScriptHeader: +GoldenrodDeptStore3F_MapScripts: .SceneScripts: db 0 @@ -56,7 +56,7 @@ GoldenrodDeptStore3FDirectoryText: line " COLLECTION" done -GoldenrodDeptStore3F_MapEventHeader: +GoldenrodDeptStore3F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 94705ac98..03882b8f2 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -4,7 +4,7 @@ const_value set 2 const GOLDENRODDEPTSTORE4F_BUG_CATCHER const GOLDENRODDEPTSTORE4F_GAMEBOY_KID -GoldenrodDeptStore4F_MapScriptHeader: +GoldenrodDeptStore4F_MapScripts: .SceneScripts: db 0 @@ -77,7 +77,7 @@ GoldenrodDeptStore4FDirectoryText: para "4F MEDICINE BOX" done -GoldenrodDeptStore4F_MapEventHeader: +GoldenrodDeptStore4F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 70e7ab046..94da64d2f 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -6,13 +6,13 @@ const_value set 2 const GOLDENRODDEPTSTORE5F_CARRIE const GOLDENRODDEPTSTORE5F_RECEPTIONIST -GoldenrodDeptStore5F_MapScriptHeader: +GoldenrodDeptStore5F_MapScripts: .SceneScripts: db 0 .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 @@ -217,7 +217,7 @@ GoldenrodDeptStore5FDirectoryText: para "5F TM CORNER" done -GoldenrodDeptStore5F_MapEventHeader: +GoldenrodDeptStore5F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 82d04ccc8..73cb0f17e 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -2,7 +2,7 @@ const_value set 2 const GOLDENRODDEPTSTORE6F_LASS const GOLDENRODDEPTSTORE6F_SUPER_NERD -GoldenrodDeptStore6F_MapScriptHeader: +GoldenrodDeptStore6F_MapScripts: .SceneScripts: db 0 @@ -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: @@ -69,21 +69,19 @@ GoldenrodVendingMachine: jump .Start .MenuData: - db $40 ; flags - db 02, 00 ; start coords - db 11, 19 ; end coords + db MENU_BACKUP_TILES ; flags + menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "FRESH WATER ¥200@" db "SODA POP ¥300@" 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_start + cont "popped out!" done GoldenrodVendingNoMoneyText: @@ -149,7 +147,7 @@ GoldenrodDeptStore6FDirectoryText: para "6F TRANQUIL SQUARE" done -GoldenrodDeptStore6F_MapEventHeader: +GoldenrodDeptStore6F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index da3dd0765..4d0603d0f 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -8,14 +8,14 @@ const_value set 2 const GOLDENRODDEPTSTOREB1F_BLACK_BELT3 const GOLDENRODDEPTSTOREB1F_MACHOP -GoldenrodDeptStoreB1F_MapScriptHeader: +GoldenrodDeptStoreB1F_MapScripts: .SceneScripts: db 0 .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 ; floor 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 ; floor return .Layout2: - changeblock $4, $a, $d + changeblock 4, 10, $0d ; floor return .Layout3: - changeblock $a, $c, $d + changeblock 10, 12, $0d ; floor return UnknownScript_0x7d7ac: @@ -109,7 +109,7 @@ UnknownText_0x7d8bb: text "MACHOKE: Maaacho!" done -GoldenrodDeptStoreB1F_MapEventHeader: +GoldenrodDeptStoreB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 9b6a2158b..6ff041e9f 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -1,4 +1,4 @@ -GoldenrodDeptStoreElevator_MapScriptHeader: +GoldenrodDeptStoreElevator_MapScripts: .SceneScripts: db 0 @@ -43,7 +43,6 @@ MapGoldenrodDeptStoreElevatorSignpost0Script: .Done: end - Elevator_0x566e0: db 7 ; floors elevfloor FLOOR_B1F, 2, GOLDENROD_DEPT_STORE_B1F @@ -55,8 +54,7 @@ Elevator_0x566e0: elevfloor FLOOR_6F, 2, GOLDENROD_DEPT_STORE_6F db -1 ; end - -GoldenrodDeptStoreElevator_MapEventHeader: +GoldenrodDeptStoreElevator_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index b384d43f1..55f885e62 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -8,23 +8,23 @@ const_value set 2 const GOLDENRODDEPTSTOREROOF_TEACHER const GOLDENRODDEPTSTOREROOF_BUG_CATCHER -GoldenrodDeptStoreRoof_MapScriptHeader: +GoldenrodDeptStoreRoof_MapScripts: .SceneScripts: db 0 .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 - iftrue .ChangeBlock + iftrue .SaleIsOn return -.ChangeBlock: - changeblock $0, $2, $3f - changeblock $0, $4, $f +.SaleIsOn: + changeblock 0, 2, $3f ; cardboard boxes + changeblock 0, 4, $0f ; vendor booth return .CheckSaleChangeClerk: @@ -211,7 +211,7 @@ PokeDollVendingMachineText: line "empty…" done -GoldenrodDeptStoreRoof_MapEventHeader: +GoldenrodDeptStoreRoof_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index e35ac3352..38a8edc3f 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -2,7 +2,7 @@ const_value set 2 const GOLDENRODFLOWERSHOP_TEACHER const GOLDENRODFLOWERSHOP_FLORIA -GoldenrodFlowerShop_MapScriptHeader: +GoldenrodFlowerShop_MapScripts: .SceneScripts: db 0 @@ -159,7 +159,7 @@ UnknownText_0x55604: line "#MON!" done -GoldenrodFlowerShop_MapEventHeader: +GoldenrodFlowerShop_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index fc0216504..d467e84c3 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -12,13 +12,13 @@ const_value set 2 const GOLDENRODGAMECORNER_POKEFAN_M2 const GOLDENRODGAMECORNER_POKEFAN_M3 -GoldenrodGameCorner_MapScriptHeader: +GoldenrodGameCorner_MapScripts: .SceneScripts: db 0 .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,23 +138,20 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript: closetext end - GoldenrodGameCornerTMVendorMenuData: - db $40 ; flags - db 02, 00 ; start coords - db 11, 15 ; end coords + db MENU_BACKUP_TILES ; flags + menu_coords 0, 2, 15, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "TM25 5500@" db "TM14 5500@" 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,23 +224,20 @@ GoldenrodGameCornerPrizeMonVendorScript: takecoins 1500 jump .loop - .MenuDataHeader: - db $40 ; flags - db 02, 00 ; start coords - db 11, 17 ; end coords + db MENU_BACKUP_TILES ; flags + menu_coords 0, 2, 17, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "ABRA 100@" db "CUBONE 800@" 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 @@ -442,7 +436,7 @@ GoldenrodGameCornerLeftTheirDrinkText: para "It smells sweet." done -GoldenrodGameCorner_MapEventHeader: +GoldenrodGameCorner_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 4446e653a..f4eac1b6b 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -6,7 +6,7 @@ const_value set 2 const GOLDENRODGYM_BUENA2 const GOLDENRODGYM_GYM_GUY -GoldenrodGym_MapScriptHeader: +GoldenrodGym_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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: @@ -379,7 +379,7 @@ GoldenrodGymGuyWinText: cont "the ladies here." done -GoldenrodGym_MapEventHeader: +GoldenrodGym_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 667698662..4fa8506dc 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -3,7 +3,7 @@ const_value set 2 const GOLDENRODHAPPINESSRATER_POKEFAN_M const GOLDENRODHAPPINESSRATER_TWIN -GoldenrodHappinessRater_MapScriptHeader: +GoldenrodHappinessRater_MapScripts: .SceneScripts: db 0 @@ -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: @@ -136,7 +136,7 @@ GoldenrodHappinessRaterTwinText: cont "acts really glad!" done -GoldenrodHappinessRater_MapEventHeader: +GoldenrodHappinessRater_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 8b114fd1c..c0f749413 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -2,7 +2,7 @@ const_value set 2 const GOLDENRODMAGNETTRAINSTATION_OFFICER const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN -GoldenrodMagnetTrainStation_MapScriptHeader: +GoldenrodMagnetTrainStation_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -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: @@ -164,7 +164,7 @@ GoldenrodMagnetTrainStationGentlemanText: cont "to KANTO." done -GoldenrodMagnetTrainStation_MapEventHeader: +GoldenrodMagnetTrainStation_MapEvents: ; filler db 0, 0 @@ -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..fc3369a21 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -1,7 +1,7 @@ const_value set 2 const GOLDENRODNAMERATER_NAME_RATER -GoldenrodNameRater_MapScriptHeader: +GoldenrodNameRater_MapScripts: .SceneScripts: db 0 @@ -11,7 +11,7 @@ GoldenrodNameRater_MapScriptHeader: GoldenrodNameRater: faceplayer opentext - special SpecialNameRater + special Special_NameRater waitbutton closetext end @@ -22,9 +22,9 @@ GoldenrodNameRaterBookshelf: GoldenrodNameRaterRadio: jumpstd radio2 -INCLUDE "text/unused_sweet_honey.asm" +INCLUDE "data/unused/sweet_honey_text.asm" -GoldenrodNameRater_MapEventHeader: +GoldenrodNameRater_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index d8e898a79..416ed37c7 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const GOLDENRODPPSPEECHHOUSE_FISHER const GOLDENRODPPSPEECHHOUSE_LASS -GoldenrodPPSpeechHouse_MapScriptHeader: +GoldenrodPPSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -51,7 +51,7 @@ GoldenrodPPSpeechHouseLassText: cont "an item." done -GoldenrodPPSpeechHouse_MapEventHeader: +GoldenrodPPSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index a3e639409..d45b3ac56 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -3,7 +3,7 @@ const_value set 2 const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST2 const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST3 -GoldenrodPokeComCenter2FMobile_MapScriptHeader: +GoldenrodPokeComCenter2FMobile_MapScripts: .SceneScripts: db 0 @@ -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,22 +48,19 @@ UnknownScript_0x62600: closetext end - MenuDataHeader_0x62602: - db $40 ; flags - db 00, 00 ; start coords - db 08, 15 ; end coords + db MENU_BACKUP_TILES ; flags + menu_coords 0, 0, 15, 8 dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 3 ; items - db "# つうしん クラブ@" ; # COM CLUB + db "# つうしん クラブ@" ; # COM CLUB 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,22 +90,19 @@ UnknownScript_0x6264a: closetext end - MenuDataHeader_0x6264c: - db $40 ; flags - db 00, 00 ; start coords - db 08, 15 ; end coords + db MENU_BACKUP_TILES ; flags + menu_coords 0, 0, 15, 8 dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 3 ; items - db "でんわ", $1f,"つかうとき@" ; Use phone - db "でんわ", $4a,"つながらないとき@" ; Don't use phone + db "でんわ<WO>つかうとき@" ; Use phone + db "でんわ<GA>つながらないとき@" ; Don't use phone db "やめる@" ; QUIT - MapGoldenrodPokeComCenter2FMobileSignpost2Script: jumptext UnknownText_0x62b26 @@ -245,7 +239,7 @@ UnknownText_0x62b26: line "OFFICE received an" cont "e-mail. It says…" - para "<......> <......> <......>" + para "<……> <……> <……>" para "To the #COM" line "CENTER staff…" @@ -265,10 +259,10 @@ UnknownText_0x62b26: para "the world can link" line "without barriers!" - para "<......> <......> <......>" + para "<……> <……> <……>" done -GoldenrodPokeComCenter2FMobile_MapEventHeader: +GoldenrodPokeComCenter2FMobile_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 617d54327..f01194311 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const GOLDENRODPOKECENTER1F_LASS const GOLDENRODPOKECENTER1F_POKEFAN_F -GoldenrodPokecenter1F_MapScriptHeader: +GoldenrodPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -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 @@ -804,7 +804,7 @@ UnknownText_0x62549: line "the EON MAIL." done -GoldenrodPokecenter1F_MapEventHeader: +GoldenrodPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index debf98bfa..e8e566666 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -9,15 +9,15 @@ const_value set 2 const GOLDENRODUNDERGROUND_SUPER_NERD6 const GOLDENRODUNDERGROUND_GRANNY -GoldenrodUnderground_MapScriptHeader: +GoldenrodUnderground_MapScripts: .SceneScripts: db 0 .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 ; locked door 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 ; unlocked door 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" @@ -646,7 +646,7 @@ UnknownText_0x7c91a: line "THIS POINT" done -GoldenrodUnderground_MapEventHeader: +GoldenrodUnderground_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index f3b7f4946..621c133fd 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -1,3 +1,4 @@ +; block ids UNDERGROUND_DOOR_CLOSED1 EQU $2a UNDERGROUND_DOOR_CLOSED2 EQU $3e UNDERGROUND_DOOR_CLOSED3 EQU $3f @@ -43,7 +44,7 @@ const_value set 2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_POKE_BALL2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER -GoldenrodUndergroundSwitchRoomEntrances_MapScriptHeader: +GoldenrodUndergroundSwitchRoomEntrances_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -51,7 +52,7 @@ GoldenrodUndergroundSwitchRoomEntrances_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .UpdateDoorPositions + callback MAPCALLBACK_TILES, .UpdateDoorPositions .DummyScene0: end @@ -630,10 +631,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 @@ -929,7 +930,7 @@ SwitchRoomText_Emergency: line "EMERGENCY." done -GoldenrodUndergroundSwitchRoomEntrances_MapEventHeader: +GoldenrodUndergroundSwitchRoomEntrances_MapEvents: ; filler db 0, 0 diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 03841736b..be5aa7e31 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -7,13 +7,13 @@ const_value set 2 const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL2 const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL3 -GoldenrodUndergroundWarehouse_MapScriptHeader: +GoldenrodUndergroundWarehouse_MapScripts: .SceneScripts: db 0 .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 @@ -210,7 +210,7 @@ UnknownText_0x7dc8d: line "MON nationwide!" done -GoldenrodUndergroundWarehouse_MapEventHeader: +GoldenrodUndergroundWarehouse_MapEvents: ; filler db 0, 0 diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index ee9ef7533..136d0da66 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const GUIDEGENTSHOUSE_GRAMPS -GuideGentsHouse_MapScriptHeader: +GuideGentsHouse_MapScripts: .SceneScripts: db 0 @@ -27,7 +27,7 @@ GuideGentsHouseGuideGentText: line "with kindness!" done -GuideGentsHouse_MapEventHeader: +GuideGentsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index c9bfdac9d..3f5f6ee10 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -1,7 +1,7 @@ const_value set 2 const HALLOFFAME_LANCE -HallOfFame_MapScriptHeader: +HallOfFame_MapScripts: .SceneScripts: db 2 scene_script .EnterHallOfFame @@ -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 @@ -110,7 +110,7 @@ HallOfFame_LanceText: line "as CHAMPIONS!" done -HallOfFame_MapEventHeader: +HallOfFame_MapEvents: ; filler db 0, 0 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index ac49f10aa..84abeb680 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -3,7 +3,7 @@ const_value set 2 const ICEPATH1F_POKE_BALL2 const ICEPATH1F_POKE_BALL3 -IcePath1F_MapScriptHeader: +IcePath1F_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ IcePath1FPPUp: IcePath1FProtein: itemball PROTEIN -IcePath1F_MapEventHeader: +IcePath1F_MapEvents: ; filler db 0, 0 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 78c5dc659..2df927ebd 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -5,28 +5,27 @@ const_value set 2 const ICEPATHB1F_BOULDER4 const ICEPATHB1F_POKE_BALL -IcePathB1F_MapScriptHeader: +IcePathB1F_MapScripts: .SceneScripts: db 0 .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,16 +68,14 @@ 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: +IcePathB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index c171147cd..1fe814b66 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -1,7 +1,7 @@ const_value set 2 const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL -IcePathB2FBlackthornSide_MapScriptHeader: +IcePathB2FBlackthornSide_MapScripts: .SceneScripts: db 0 @@ -12,10 +12,9 @@ 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: +IcePathB2FBlackthornSide_MapEvents: ; filler db 0, 0 diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 80ae7f938..d70dc8492 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -6,15 +6,15 @@ const_value set 2 const ICEPATHB2FMAHOGANYSIDE_POKE_BALL1 const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2 -IcePathB2FMahoganySide_MapScriptHeader: +IcePathB2FMahoganySide_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -BoulderScript_0x7e5a3: - jumptext UnknownText_0x7e5ad +IcePathB2FMahoganySideBoulder: + jumptext IcePathB2FMahoganySideBoulderText IcePathB2FMahoganySideFullHeal: itemball FULL_HEAL @@ -23,15 +23,14 @@ 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 -IcePathB2FMahoganySide_MapEventHeader: +IcePathB2FMahoganySide_MapEvents: ; filler db 0, 0 @@ -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/IcePathB3F.asm b/maps/IcePathB3F.asm index cfdf2387b..40809dbe3 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -2,7 +2,7 @@ const_value set 2 const ICEPATHB3F_POKE_BALL const ICEPATHB3F_ROCK -IcePathB3F_MapScriptHeader: +IcePathB3F_MapScripts: .SceneScripts: db 0 @@ -15,7 +15,7 @@ IcePathB3FNevermeltice: IcePathB3FRock: jumpstd smashrock -IcePathB3F_MapEventHeader: +IcePathB3F_MapEvents: ; filler db 0, 0 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 7bbba6562..01351cd84 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -11,13 +11,13 @@ const_value set 2 const ILEXFOREST_POKE_BALL3 const ILEXFOREST_POKE_BALL4 -IlexForest_MapScriptHeader: +IlexForest_MapScripts: .SceneScripts: db 0 .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 @@ -939,7 +937,7 @@ BugCatcherWayneAfterBattleText: cont "places too." done -IlexForest_MapEventHeader: +IlexForest_MapEvents: ; filler db 0, 0 diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 0bb508be3..c66483971 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ILEXFORESTAZALEAGATE_OFFICER const ILEXFORESTAZALEAGATE_GRANNY -IlexForestAzaleaGate_MapScriptHeader: +IlexForestAzaleaGate_MapScripts: .SceneScripts: db 0 @@ -30,7 +30,7 @@ IlexForestAzaleaGateGrannyText: line "mischief!" done -IlexForestAzaleaGate_MapEventHeader: +IlexForestAzaleaGate_MapEvents: ; filler db 0, 0 diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 879e1dd8b..17a4d0663 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -6,25 +6,25 @@ const_value set 2 const INDIGOPLATEAUPOKECENTER1F_GRAMPS const INDIGOPLATEAUPOKECENTER1F_ABRA -IndigoPlateauPokecenter1F_MapScriptHeader: +IndigoPlateauPokecenter1F_MapScripts: .SceneScripts: db 1 scene_script .DummyScene .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: @@ -302,7 +302,7 @@ AbraText: text "ABRA: Aabra…" done -IndigoPlateauPokecenter1F_MapEventHeader: +IndigoPlateauPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index cba4aed9a..eef62321d 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -1,7 +1,7 @@ const_value set 2 const KARENSROOM_KAREN -KarensRoom_MapScriptHeader: +KarensRoom_MapScripts: .SceneScripts: db 2 scene_script .LockDoor @@ -9,7 +9,7 @@ KarensRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .KarensRoomDoors + callback MAPCALLBACK_TILES, .KarensRoomDoors .LockDoor: priorityjump .KarensDoorLocksBehindYou @@ -20,24 +20,24 @@ KarensRoom_MapScriptHeader: .KarensRoomDoors: checkevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED - iffalse .KeepDoorsClosed - changeblock $4, $e, $2a -.KeepDoorsClosed: + iffalse .KeepEntranceOpen + changeblock 4, 14, $2a ; wall +.KeepEntranceOpen: checkevent EVENT_KARENS_ROOM_EXIT_OPEN - iffalse .OpenDoors - changeblock $4, $2, $16 -.OpenDoors: + iffalse .KeepExitClosed + changeblock 4, 2, $16 ; open door +.KeepExitClosed: return .KarensDoorLocksBehindYou: - applymovement PLAYER, MovementData_0x180c22 + applymovement PLAYER, KarensMovementData_0x18078e refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock $4, $e, $2a + changeblock 4, 14, $2a ; wall reloadmappart closetext - setscene $1 + setscene 1 setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -46,12 +46,12 @@ KarenScript_Battle: faceplayer opentext checkevent EVENT_BEAT_ELITE_4_KAREN - iftrue UnknownScript_0x180c1c + iftrue KarenScript_AfterBattle writetext KarenScript_KarenBeforeText waitbutton closetext winlosstext KarenScript_KarenBeatenText, 0 - loadtrainer KAREN, 1 + loadtrainer KAREN, KAREN1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_KAREN @@ -60,20 +60,20 @@ KarenScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock $4, $2, $16 + changeblock 4, 2, $16 ; open door reloadmappart closetext setevent EVENT_KARENS_ROOM_EXIT_OPEN waitsfx end -UnknownScript_0x180c1c: +KarenScript_AfterBattle: writetext KarenScript_KarenDefeatText waitbutton closetext end -MovementData_0x180c22: +KarensMovementData_0x18078e: step UP step UP step UP @@ -132,7 +132,7 @@ KarenScript_KarenDefeatText: line "PION is waiting." done -KarensRoom_MapEventHeader: +KarensRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index d621ed342..fe1badec4 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -1,7 +1,7 @@ const_value set 2 const KOGASROOM_KOGA -KogasRoom_MapScriptHeader: +KogasRoom_MapScripts: .SceneScripts: db 2 scene_script .LockDoor @@ -9,7 +9,7 @@ KogasRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .KogasRoomDoors + callback MAPCALLBACK_TILES, .KogasRoomDoors .LockDoor: priorityjump .KogasDoorLocksBehindYou @@ -20,24 +20,24 @@ KogasRoom_MapScriptHeader: .KogasRoomDoors: checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED - iffalse .KeepDoorsClosed - changeblock $4, $e, $2a -.KeepDoorsClosed: + iffalse .KeepEntranceOpen + changeblock 4, 14, $2a ; wall +.KeepEntranceOpen: checkevent EVENT_KOGAS_ROOM_EXIT_OPEN - iffalse .OpenDoors - changeblock $4, $2, $16 -.OpenDoors: + iffalse .KeepExitClosed + changeblock 4, 2, $16 ; open door +.KeepExitClosed: return .KogasDoorLocksBehindYou: - applymovement PLAYER, MovementData_0x18078e + applymovement PLAYER, KogasMovementData_0x18078e refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock $4, $e, $2a + changeblock 4, 14, $2a ; wall reloadmappart closetext - setscene $1 + setscene 1 setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -46,12 +46,12 @@ KogaScript_Battle: faceplayer opentext checkevent EVENT_BEAT_ELITE_4_KOGA - iftrue UnknownScript_0x180788 + iftrue KogaScript_AfterBattle writetext KogaScript_KogaBeforeText waitbutton closetext winlosstext KogaScript_KogaBeatenText, 0 - loadtrainer KOGA, 1 + loadtrainer KOGA, KOGA1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_KOGA @@ -60,20 +60,20 @@ KogaScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock $4, $2, $16 + changeblock 4, 2, $16 ; open door reloadmappart closetext setevent EVENT_KOGAS_ROOM_EXIT_OPEN waitsfx end -UnknownScript_0x180788: +KogaScript_AfterBattle: writetext KogaScript_KogaDefeatText waitbutton closetext end -MovementData_0x18078e: +KogasMovementData_0x18078e: step UP step UP step UP @@ -129,7 +129,7 @@ KogaScript_KogaDefeatText: cont "abilities to test!" done -KogasRoom_MapEventHeader: +KogasRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 24092cc4f..f94534332 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -5,7 +5,7 @@ const_value set 2 const KRISSHOUSE1F_MOM4 const KRISSHOUSE1F_POKEFAN_F -KrissHouse1F_MapScriptHeader: +KrissHouse1F_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -385,7 +385,7 @@ TVText: line "rolling too!" done -KrissHouse1F_MapEventHeader: +KrissHouse1F_MapEvents: ; filler db 0, 0 diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 65d5fdaee..dcd63af1e 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -4,54 +4,53 @@ const_value set 2 const KRISSHOUSE2F_DOLL_2 const KRISSHOUSE2F_BIG_DOLL -KrissHouse2F_MapScriptHeader: +KrissHouse2F_MapScripts: .SceneScripts: db 0 .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: @@ -116,7 +115,7 @@ KrisRadioText4: line "#MON CHANNEL…" done -KrissHouse2F_MapEventHeader: +KrissHouse2F_MapEvents: ; filler db 0, 0 diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 0cd9f77dc..457660d97 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const KRISSNEIGHBORSHOUSE_COOLTRAINER_F const KRISSNEIGHBORSHOUSE_POKEFAN_F -KrissNeighborsHouse_MapScriptHeader: +KrissNeighborsHouse_MapScripts: .SceneScripts: db 0 @@ -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 @@ -98,7 +98,7 @@ KrisNeighborRadioText4: line "#MON CHANNEL…" done -KrissNeighborsHouse_MapEventHeader: +KrissNeighborsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 6c1d6a9eb..eb2bbcb89 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -5,13 +5,13 @@ const_value set 2 const KURTSHOUSE_KURT2 const KURTSHOUSE_TWIN2 -KurtsHouse_MapScriptHeader: +KurtsHouse_MapScripts: .SceneScripts: db 0 .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: @@ -676,7 +676,7 @@ KurtsHouseCelebiStatueText: cont "tector." done -KurtsHouse_MapEventHeader: +KurtsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 50e7f05d0..fdbbeb438 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -12,7 +12,7 @@ const_value set 2 const LAKEOFRAGE_POKE_BALL1 const LAKEOFRAGE_POKE_BALL2 -LakeOfRage_MapScriptHeader: +LakeOfRage_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -496,7 +493,7 @@ UnknownText_0x70903: line "HOUSE" done -LakeOfRage_MapEventHeader: +LakeOfRage_MapEvents: ; filler db 0, 0 diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index 1d41eaa43..9d346ab0a 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER -LakeOfRageHiddenPowerHouse_MapScriptHeader: +LakeOfRageHiddenPowerHouse_MapScripts: .SceneScripts: db 0 @@ -67,7 +67,7 @@ HiddenPowerGuyText3: text "I am meditating…" done -LakeOfRageHiddenPowerHouse_MapEventHeader: +LakeOfRageHiddenPowerHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index cc494c8c5..c77d823c0 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU -LakeOfRageMagikarpHouse_MapScriptHeader: +LakeOfRageMagikarpHouse_MapScripts: .SceneScripts: db 0 @@ -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: @@ -205,7 +206,7 @@ UnknownText_0x19aabc: text_from_ram StringBuffer4 db "@@" -LakeOfRageMagikarpHouse_MapEventHeader: +LakeOfRageMagikarpHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index f185af0dc..a3336251b 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -3,7 +3,7 @@ const_value set 2 const LANCESROOM_MARY const LANCESROOM_OAK -LancesRoom_MapScriptHeader: +LancesRoom_MapScripts: .SceneScripts: db 2 scene_script .LockDoor @@ -11,7 +11,7 @@ LancesRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .LancesRoomDoors + callback MAPCALLBACK_TILES, .LancesRoomDoors .LockDoor: priorityjump .LancesDoorLocksBehindYou @@ -22,13 +22,13 @@ LancesRoom_MapScriptHeader: .LancesRoomDoors: checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED - iffalse .KeepDoorsClosed - changeblock $4, $16, $34 -.KeepDoorsClosed: + iffalse .KeepEntranceOpen + changeblock 4, 22, $34 ; wall +.KeepEntranceOpen: checkevent EVENT_LANCES_ROOM_EXIT_OPEN - iffalse .OpenDoors - changeblock $4, $0, $b -.OpenDoors: + iffalse .KeepExitClosed + changeblock 4, 0, $0b ; open door +.KeepExitClosed: return .LancesDoorLocksBehindYou: @@ -36,10 +36,10 @@ LancesRoom_MapScriptHeader: refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock $4, $16, $34 + changeblock 4, 22, $34 ; wall 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 ; open door 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: @@ -337,7 +337,7 @@ UnknownText_0x1813c5: cont "the interview!" done -LancesRoom_MapEventHeader: +LancesRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 424a802c9..d16bce5f1 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -5,7 +5,7 @@ const_value set 2 const LAVRADIOTOWER1F_GENTLEMAN const LAVRADIOTOWER1F_SUPER_NERD2 -LavRadioTower1F_MapScriptHeader: +LavRadioTower1F_MapScripts: .SceneScripts: db 0 @@ -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: @@ -221,7 +221,7 @@ UnknownText_0x7f36b: line "reference library." done -LavRadioTower1F_MapEventHeader: +LavRadioTower1F_MapEvents: ; filler db 0, 0 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 34c8572de..f55db399b 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -3,7 +3,7 @@ const_value set 2 const LAVENDERMART_POKEFAN_M const LAVENDERMART_ROCKER -LavenderMart_MapScriptHeader: +LavenderMart_MapScripts: .SceneScripts: db 0 @@ -47,7 +47,7 @@ LavenderMartRockerText: line "I had some." done -LavenderMart_MapEventHeader: +LavenderMart_MapEvents: ; filler db 0, 0 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index d41354143..544c51d5b 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -1,7 +1,7 @@ const_value set 2 const LAVENDERNAMERATER_NAME_RATER -LavenderNameRater_MapScriptHeader: +LavenderNameRater_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -15,7 +15,7 @@ LavenderNameRater_MapScriptHeader: LavenderNameRater: faceplayer opentext - special SpecialNameRater + special Special_NameRater waitbutton closetext end @@ -23,7 +23,7 @@ LavenderNameRater: LavenderNameRaterUnusedBookshelf: jumpstd difficultbookshelf -LavenderNameRater_MapEventHeader: +LavenderNameRater_MapEvents: ; filler db 0, 0 diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index 307eabe1c..7436697ea 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const LAVENDERPOKECENTER1F_TEACHER const LAVENDERPOKECENTER1F_YOUNGSTER -LavenderPokecenter1F_MapScriptHeader: +LavenderPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -80,7 +80,7 @@ UnknownText_0x7e7ed: cont "smoothly again." done -LavenderPokecenter1F_MapEventHeader: +LavenderPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm index bacb7e91b..537f10ea1 100644 --- a/maps/LavenderPokecenter2FBeta.asm +++ b/maps/LavenderPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -LavenderPokecenter2FBeta_MapScriptHeader: +LavenderPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -LavenderPokecenter2FBeta_MapEventHeader: +LavenderPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index 1cb093dda..eacb6b4d6 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_MapScripts: .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_MapEvents: ; 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..655acb3b3 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -4,13 +4,13 @@ const_value set 2 const LAVENDERTOWN_GRAMPS const LAVENDERTOWN_YOUNGSTER -LavenderTown_MapScriptHeader: +LavenderTown_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_LAVENDER @@ -105,7 +105,7 @@ SoulHouseSignText: line "#MON Rest Easy" done -LavenderTown_MapEventHeader: +LavenderTown_MapEvents: ; filler db 0, 0 @@ -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..20ab72ab1 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -7,7 +7,7 @@ const_value set 2 const MAHOGANYGYM_ROCKER3 const MAHOGANYGYM_GYM_GUY -MahoganyGym_MapScriptHeader: +MahoganyGym_MapScripts: .SceneScripts: db 0 @@ -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: @@ -372,7 +372,7 @@ MahoganyGymGuyWinText: line "eration gap!" done -MahoganyGym_MapEventHeader: +MahoganyGym_MapEvents: ; filler db 0, 0 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index a25277fd9..5b3cfd43c 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -5,7 +5,7 @@ const_value set 2 const MAHOGANYMART1F_DRAGON const MAHOGANYMART1F_GRANNY -MahoganyMart1F_MapScriptHeader: +MahoganyMart1F_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 ; stairs 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 ; stairs 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 @@ -220,7 +220,7 @@ UnknownText_0x6c5ba: line "I'll go first." done -MahoganyMart1F_MapEventHeader: +MahoganyMart1F_MapEvents: ; filler db 0, 0 diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index 055a4b566..9a0cfdf24 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const MAHOGANYPOKECENTER1F_YOUNGSTER const MAHOGANYPOKECENTER1F_COOLTRAINER_F -MahoganyPokecenter1F_MapScriptHeader: +MahoganyPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -53,7 +53,7 @@ MahoganyPokecenter1FCooltrainerFText: cont "more slowly." done -MahoganyPokecenter1F_MapEventHeader: +MahoganyPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 8d90d58a6..d6ed88a36 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const MAHOGANYREDGYARADOSSPEECHHOUSE_BLACK_BELT const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER -MahoganyRedGyaradosSpeechHouse_MapScriptHeader: +MahoganyRedGyaradosSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -60,7 +60,7 @@ UnknownText_0x199a3d: line "It's creepy." done -MahoganyRedGyaradosSpeechHouse_MapEventHeader: +MahoganyRedGyaradosSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index ba907383d..d53aabce0 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -4,7 +4,7 @@ const_value set 2 const MAHOGANYTOWN_FISHER const MAHOGANYTOWN_LASS -MahoganyTown_MapScriptHeader: +MahoganyTown_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -244,7 +244,7 @@ MahoganyGymSignText: line "Winter's Harshness" done -MahoganyTown_MapEventHeader: +MahoganyTown_MapEvents: ; filler db 0, 0 diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index d60d1081d..d5d3febb6 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const MANIASHOUSE_ROCKER -ManiasHouse_MapScriptHeader: +ManiasHouse_MapScripts: .SceneScripts: db 0 @@ -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 @@ -198,7 +199,7 @@ ManiaText_ShuckleIsYourLastMon: line "in battle?" done -ManiasHouse_MapEventHeader: +ManiasHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 870321f3d..d65ae1006 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,4 +1,4 @@ -MobileBattleRoom_MapScriptHeader: +MobileBattleRoom_MapScripts: .SceneScripts: db 2 scene_script .InitializeMobileBattleRoom @@ -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 @@ -66,7 +66,7 @@ MobileBattleRoom_HealText: cont "before battle." done -MobileBattleRoom_MapEventHeader: +MobileBattleRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 1003d4ea5..53713c9de 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -1,4 +1,4 @@ -MobileTradeRoomMobile_MapScriptHeader: +MobileTradeRoomMobile_MapScripts: .SceneScripts: db 2 scene_script .InitializeMobileTradeRoomMobile @@ -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 @@ -34,7 +34,7 @@ MobileTradeRoomMobile_EstablishingCommsText: line "communications…" done -MobileTradeRoomMobile_MapEventHeader: +MobileTradeRoomMobile_MapEvents: ; filler db 0, 0 diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 73306f424..38e5d436d 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -1,7 +1,7 @@ const_value set 2 const MOUNTMOON_SILVER -MountMoon_MapScriptHeader: +MountMoon_MapScripts: .SceneScripts: db 2 scene_script .RivalEncounter @@ -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 @@ -88,7 +88,7 @@ MountMoonSilverMovementAfter: step_end MountMoonSilverTextBefore: - text "<......> <......> <......>" + text "<……> <……> <……>" para "It's been a while," line "<PLAYER>." @@ -108,7 +108,7 @@ MountMoonSilverTextBefore: done MountMoonSilverTextWin: - text "<......> <......> <......>" + text "<……> <……> <……>" para "I thought I raised" line "my #MON to be" @@ -121,7 +121,7 @@ MountMoonSilverTextWin: done MountMoonSilverTextAfter: - text "<......> <......> <......>" + text "<……> <……> <……>" para "…You won, fair" line "and square." @@ -147,7 +147,7 @@ MountMoonSilverTextAfter: done MountMoonSilverTextLoss: - text "<......> <......> <......>" + text "<……> <……> <……>" para "I've repaid my" line "debt to you." @@ -160,7 +160,7 @@ MountMoonSilverTextLoss: cont "greatest trainer." done -MountMoon_MapEventHeader: +MountMoon_MapEvents: ; filler db 0, 0 diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index ade5a35ff..b24a98e20 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -4,7 +4,7 @@ const_value set 2 const MOUNTMOONGIFTSHOP_LASS1 ; morning only const MOUNTMOONGIFTSHOP_LASS2 ; day only -MountMoonGiftShop_MapScriptHeader: +MountMoonGiftShop_MapScripts: .SceneScripts: db 0 @@ -27,7 +27,7 @@ MountMoonGiftShopLassText: cont "come out to play." done -MountMoonGiftShop_MapEventHeader: +MountMoonGiftShop_MapEvents: ; filler db 0, 0 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 3e13b58ea..1d9848f3b 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -3,15 +3,15 @@ const_value set 2 const MOUNTMOONSQUARE_FAIRY2 const MOUNTMOONSQUARE_ROCK -MountMoonSquare_MapScriptHeader: +MountMoonSquare_MapScripts: .SceneScripts: db 1 scene_script .DummyScene .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 @@ -133,7 +132,7 @@ DontLitterSignText: line "DON'T LITTER" done -MountMoonSquare_MapEventHeader: +MountMoonSquare_MapEvents: ; filler db 0, 0 diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 659d7a54d..a67ba1144 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -10,7 +10,7 @@ const_value set 2 const MOUNTMORTAR1FINSIDE_POKE_BALL6 const MOUNTMORTAR1FINSIDE_POKE_BALL7 -MountMortar1FInside_MapScriptHeader: +MountMortar1FInside_MapScripts: .SceneScripts: db 0 @@ -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" @@ -117,7 +116,7 @@ SupernerdMarkusAfterBattleText: line "WATERFALL?" done -MountMortar1FInside_MapEventHeader: +MountMortar1FInside_MapEvents: ; filler db 0, 0 diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index faa9930d2..d38f4f732 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -2,7 +2,7 @@ const_value set 2 const MOUNTMORTAR1FOUTSIDE_POKE_BALL1 const MOUNTMORTAR1FOUTSIDE_POKE_BALL2 -MountMortar1FOutside_MapScriptHeader: +MountMortar1FOutside_MapScripts: .SceneScripts: db 0 @@ -16,10 +16,9 @@ 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: +MountMortar1FOutside_MapEvents: ; filler db 0, 0 diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 106e51f5a..66120731f 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -7,7 +7,7 @@ const_value set 2 const MOUNTMORTAR2FINSIDE_POKE_BALL6 const MOUNTMORTAR2FINSIDE_SUPER_NERD -MountMortar2FInside_MapScriptHeader: +MountMortar2FInside_MapScripts: .SceneScripts: db 0 @@ -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!" @@ -67,7 +66,7 @@ SupernerdHughAfterBattleText: line "use STRENGTH?" done -MountMortar2FInside_MapEventHeader: +MountMortar2FInside_MapEvents: ; filler db 0, 0 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index ad00662f8..7d798c22e 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -7,7 +7,7 @@ const_value set 2 const MOUNTMORTARB1F_POKE_BALL4 const MOUNTMORTARB1F_POKE_BALL5 -MountMortarB1F_MapScriptHeader: +MountMortarB1F_MapScripts: .SceneScripts: db 0 @@ -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!" @@ -135,7 +134,7 @@ UnknownText_0x7e3df: line "in your party!" done -MountMortarB1F_MapEventHeader: +MountMortarB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index a6a50d2dd..0635be308 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const MOVEDELETERSHOUSE_SUPER_NERD -MoveDeletersHouse_MapScriptHeader: +MoveDeletersHouse_MapScripts: .SceneScripts: db 0 @@ -11,7 +11,7 @@ MoveDeletersHouse_MapScriptHeader: MoveDeleter: faceplayer opentext - special MoveDeletion + special Special_MoveDeletion waitbutton closetext end @@ -19,7 +19,7 @@ MoveDeleter: MoveDeletersHouseBookshelf: jumpstd difficultbookshelf -MoveDeletersHouse_MapEventHeader: +MoveDeletersHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 856b62503..403134bae 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -5,7 +5,7 @@ const_value set 2 const MRFUJISHOUSE_NIDORINO const MRFUJISHOUSE_PIDGEY -MrFujisHouse_MapScriptHeader: +MrFujisHouse_MapScripts: .SceneScripts: db 0 @@ -79,7 +79,7 @@ MrFujisPidgeyText: text "PIDGEY: Pijji!" done -MrFujisHouse_MapEventHeader: +MrFujisHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index f808d44c8..8ac7d0a09 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const MRPOKEMONSHOUSE_GENTLEMAN const MRPOKEMONSHOUSE_OAK -MrPokemonsHouse_MapScriptHeader: +MrPokemonsHouse_MapScripts: .SceneScripts: db 2 scene_script .MeetMrPokemon @@ -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: @@ -372,7 +372,7 @@ MrPokemonsHouse_StrangeCoinsText: line "another country…" done -MrPokemonsHouse_MapEventHeader: +MrPokemonsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 75bd52ae5..042b922d0 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const MRPSYCHICSHOUSE_FISHING_GURU -MrPsychicsHouse_MapScriptHeader: +MrPsychicsHouse_MapScripts: .SceneScripts: db 0 @@ -47,7 +47,7 @@ MrPsychicText2: line "target's SPCL.DEF." done -MrPsychicsHouse_MapEventHeader: +MrPsychicsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index fe1547ea5..9429c5845 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -14,7 +14,7 @@ const_value set 2 const NATIONALPARK_GAMEBOY_KID const NATIONALPARK_POKE_BALL2 -NationalPark_MapScriptHeader: +NationalPark_MapScripts: .SceneScripts: db 0 @@ -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" @@ -514,7 +513,7 @@ UnknownText_0x5c7c6: cont "pressing START." done -NationalPark_MapEventHeader: +NationalPark_MapEvents: ; filler db 0, 0 diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 5d7831529..c69e55854 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -12,7 +12,7 @@ const_value set 2 const NATIONALPARKBUGCONTEST_POKE_BALL1 const NATIONALPARKBUGCONTEST_POKE_BALL2 -NationalParkBugContest_MapScriptHeader: +NationalParkBugContest_MapScripts: .SceneScripts: db 0 @@ -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" @@ -221,7 +220,7 @@ UnknownText_0x5cc1d: cont "pressing START." done -NationalParkBugContest_MapEventHeader: +NationalParkBugContest_MapEvents: ; filler db 0, 0 diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 56b5f14db..f4cad71eb 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -3,7 +3,7 @@ const_value set 2 const NEWBARKTOWN_FISHER const NEWBARKTOWN_SILVER -NewBarkTown_MapScriptHeader: +NewBarkTown_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -11,7 +11,7 @@ NewBarkTown_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end @@ -249,7 +249,7 @@ Text_ElmDiscoveredNewMon: done NewBarkTownRivalText1: - text "<......>" + text "<……>" para "So this is the" line "famous ELM #MON" @@ -281,7 +281,7 @@ ElmsHouseSignText: text "ELM'S HOUSE" done -NewBarkTown_MapEventHeader: +NewBarkTown_MapEvents: ; filler db 0, 0 diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 17da0485d..d78641c28 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -4,7 +4,7 @@ const_value set 2 const OAKSLAB_SCIENTIST2 const OAKSLAB_SCIENTIST3 -OaksLab_MapScriptHeader: +OaksLab_MapScripts: .SceneScripts: db 0 @@ -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 @@ -256,7 +256,7 @@ OaksLabPCText: line "TOWN 8-)" done -OaksLab_MapEventHeader: +OaksLab_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 1aea5f518..269357d21 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -3,7 +3,7 @@ const_value set 2 const OLIVINECAFE_FISHING_GURU const OLIVINECAFE_SAILOR2 -OlivineCafe_MapScriptHeader: +OlivineCafe_MapScripts: .SceneScripts: db 0 @@ -78,7 +78,7 @@ OlivineCafeSailorText: line "stop eating!" done -OlivineCafe_MapEventHeader: +OlivineCafe_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 2e5129bc5..e2fd0c4c7 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -4,7 +4,7 @@ const_value set 2 const OLIVINECITY_SAILOR2 const OLIVINECITY_OLIVINE_RIVAL -OlivineCity_MapScriptHeader: +OlivineCity_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -287,7 +287,7 @@ UnknownText_0x1a8cba: text "BATTLE TOWER AHEAD" done -OlivineCity_MapEventHeader: +OlivineCity_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 4e5285c77..3f7c3eced 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const OLIVINEGOODRODHOUSE_FISHING_GURU -OlivineGoodRodHouse_MapScriptHeader: +OlivineGoodRodHouse_MapScripts: .SceneScripts: db 0 @@ -82,7 +82,7 @@ HaveGoodRodText: line "Land the big one?" done -OlivineGoodRodHouse_MapEventHeader: +OlivineGoodRodHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index cb87bdd85..40e2bd711 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINEGYM_JASMINE const OLIVINEGYM_GYM_GUY -OlivineGym_MapScriptHeader: +OlivineGym_MapScripts: .SceneScripts: db 0 @@ -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: @@ -197,7 +197,7 @@ OlivineGymGuyPreText: cont "sionate." done -OlivineGym_MapEventHeader: +OlivineGym_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index d1171bbef..336469c21 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINEHOUSEBETA_TEACHER const OLIVINEHOUSEBETA_RHYDON -OlivineHouseBeta_MapScriptHeader: +OlivineHouseBeta_MapScripts: .SceneScripts: db 0 @@ -39,7 +39,7 @@ UnknownText_0x9c5f0: text "RHYDON: Gugooh!" done -OlivineHouseBeta_MapEventHeader: +OlivineHouseBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 3fd387dcf..769bf13da 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINELIGHTHOUSE1F_SAILOR const OLIVINELIGHTHOUSE1F_POKEFAN_F -OlivineLighthouse1F_MapScriptHeader: +OlivineLighthouse1F_MapScripts: .SceneScripts: db 0 @@ -36,7 +36,7 @@ OlivineLighthouse1FPokefanFText: cont "those #MON." done -OlivineLighthouse1F_MapEventHeader: +OlivineLighthouse1F_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 0961a4427..d2fd6427f 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINELIGHTHOUSE2F_SAILOR const OLIVINELIGHTHOUSE2F_GENTLEMAN -OlivineLighthouse2F_MapScriptHeader: +OlivineLighthouse2F_MapScripts: .SceneScripts: db 0 @@ -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" @@ -204,7 +204,7 @@ UnknownText_0x5b1b6: cont "before." done -OlivineLighthouse2F_MapEventHeader: +OlivineLighthouse2F_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 2c6662029..2cd0dc64c 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -4,7 +4,7 @@ const_value set 2 const OLIVINELIGHTHOUSE3F_YOUNGSTER const OLIVINELIGHTHOUSE3F_POKE_BALL -OlivineLighthouse3F_MapScriptHeader: +OlivineLighthouse3F_MapScripts: .SceneScripts: db 0 @@ -112,7 +112,7 @@ GentlemanPrestonAfterBattleText: cont "like ONIX." done -OlivineLighthouse3F_MapEventHeader: +OlivineLighthouse3F_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 34d03971d..7580d3499 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINELIGHTHOUSE4F_SAILOR const OLIVINELIGHTHOUSE4F_LASS -OlivineLighthouse4F_MapScriptHeader: +OlivineLighthouse4F_MapScripts: .SceneScripts: db 0 @@ -81,7 +81,7 @@ LassConnie1AfterBattleText: line "back to the GYM." done -OlivineLighthouse4F_MapEventHeader: +OlivineLighthouse4F_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index e7c4a7884..ccee7f0c7 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -5,7 +5,7 @@ const_value set 2 const OLIVINELIGHTHOUSE5F_POKE_BALL2 const OLIVINELIGHTHOUSE5F_POKE_BALL3 -OlivineLighthouse5F_MapScriptHeader: +OlivineLighthouse5F_MapScripts: .SceneScripts: db 0 @@ -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" @@ -91,7 +90,7 @@ BirdKeeperDenisAfterBattleText: cont "across the sea…" done -OlivineLighthouse5F_MapEventHeader: +OlivineLighthouse5F_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 686764bfd..d036dc56f 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -3,7 +3,7 @@ const_value set 2 const OLIVINELIGHTHOUSE6F_MONSTER const OLIVINELIGHTHOUSE6F_POKE_BALL -OlivineLighthouse6F_MapScriptHeader: +OlivineLighthouse6F_MapScripts: .SceneScripts: db 0 @@ -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: @@ -257,7 +257,7 @@ UnknownText_0x60f3d: line "Palulu!" done -OlivineLighthouse6F_MapEventHeader: +OlivineLighthouse6F_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index b486e0867..ea980fe3c 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -3,7 +3,7 @@ const_value set 2 const OLIVINEMART_COOLTRAINER_F const OLIVINEMART_LASS -OlivineMart_MapScriptHeader: +OlivineMart_MapScripts: .SceneScripts: db 0 @@ -45,7 +45,7 @@ OlivineMartLassText: line "It's a secret!" done -OlivineMart_MapEventHeader: +OlivineMart_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index 81f172258..3345636ff 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const OLIVINEPOKECENTER1F_FISHER const OLIVINEPOKECENTER1F_TEACHER -OlivinePokecenter1F_MapScriptHeader: +OlivinePokecenter1F_MapScripts: .SceneScripts: db 0 @@ -47,7 +47,7 @@ OlivinePokecenter1FTeacherText: cont "rare #MON." done -OlivinePokecenter1F_MapEventHeader: +OlivinePokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index f34281e43..0b9b8882a 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -7,7 +7,7 @@ const_value set 2 const OLIVINEPORT_YOUNGSTER const OLIVINEPORT_COOLTRAINER_F -OlivinePort_MapScriptHeader: +OlivinePort_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -385,7 +384,7 @@ OlivinePortSailorText: line "allowed in." done -OlivinePort_MapEventHeader: +OlivinePort_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index e79db48cc..5b9615a73 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -1,7 +1,7 @@ const_value set 2 const OLIVINEPORTPASSAGE_POKEFAN_M -OlivinePortPassage_MapScriptHeader: +OlivinePortPassage_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ OlivinePortPassagePokefanMText: line "days." done -OlivinePortPassage_MapEventHeader: +OlivinePortPassage_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index b1217a545..ed0e86e32 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const OLIVINEPUNISHMENTSPEECHHOUSE_POKEFAN_M const OLIVINEPUNISHMENTSPEECHHOUSE_LASS -OlivinePunishmentSpeechHouse_MapScriptHeader: +OlivinePunishmentSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -39,7 +39,7 @@ OlivinePunishmentSpeechHouseDaughterText: cont "always scares me." done -OlivinePunishmentSpeechHouse_MapEventHeader: +OlivinePunishmentSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 33c5a746c..5d1b19263 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const OLIVINETIMSHOUSE_TIM -OlivineTimsHouse_MapScriptHeader: +OlivineTimsHouse_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ Tim: TimsHouseBookshelf: jumpstd magazinebookshelf -OlivineTimsHouse_MapEventHeader: +OlivineTimsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index f11cf6d65..8e18b6d08 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -2,13 +2,13 @@ const_value set 2 const PALLETTOWN_TEACHER const PALLETTOWN_FISHER -PalletTown_MapScriptHeader: +PalletTown_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_PALLET @@ -69,7 +69,7 @@ BluesHouseSignText: text "BLUE'S HOUSE" done -PalletTown_MapEventHeader: +PalletTown_MapEvents: ; filler db 0, 0 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 44ea440a7..a4467ec4a 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -5,13 +5,13 @@ const_value set 2 const PEWTERCITY_FRUIT_TREE1 const PEWTERCITY_FRUIT_TREE2 -PewterCity_MapScriptHeader: +PewterCity_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_PEWTER @@ -152,7 +152,7 @@ PewterCityWelcomeSignText: line "PEWTER CITY!" done -PewterCity_MapEventHeader: +PewterCity_MapEvents: ; filler db 0, 0 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index ca94d9e9f..9e6395f13 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -3,7 +3,7 @@ const_value set 2 const PEWTERGYM_YOUNGSTER const PEWTERGYM_GYM_GUY -PewterGym_MapScriptHeader: +PewterGym_MapScripts: .SceneScripts: db 0 @@ -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: @@ -208,7 +208,7 @@ PewterGymGuyWinText: line "that seriously." done -PewterGym_MapEventHeader: +PewterGym_MapEvents: ; filler db 0, 0 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index f34ac5a46..cc5047d7c 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -3,7 +3,7 @@ const_value set 2 const PEWTERMART_YOUNGSTER const PEWTERMART_SUPER_NERD -PewterMart_MapScriptHeader: +PewterMart_MapScripts: .SceneScripts: db 0 @@ -45,7 +45,7 @@ PewterMartSuperNerdText: line "excellent." done -PewterMart_MapEventHeader: +PewterMart_MapEvents: ; filler db 0, 0 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index f6b96845b..b70294cef 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M -PewterNidoranSpeechHouse_MapScriptHeader: +PewterNidoranSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -28,7 +28,7 @@ PewterNidoranText: text "NIDORAN: Gau gau!" done -PewterNidoranSpeechHouse_MapEventHeader: +PewterNidoranSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index b587e3b0d..25234385d 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const PEWTERPOKECENTER1F_BUG_CATCHER const PEWTERPOKECENTER1F_CHRIS -PewterPokecenter1F_MapScriptHeader: +PewterPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -67,7 +67,7 @@ PewterPokecenter1FBugCatcherText: line "#MON is asleep." done -PewterPokecenter1F_MapEventHeader: +PewterPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm index 6e7809106..0e6e7b916 100644 --- a/maps/PewterPokecenter2FBeta.asm +++ b/maps/PewterPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -PewterPokecenter2FBeta_MapScriptHeader: +PewterPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -PewterPokecenter2FBeta_MapEventHeader: +PewterPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 2f9bd429b..43e423cc4 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const PEWTERSNOOZESPEECHHOUSE_GRAMPS -PewterSnoozeSpeechHouse_MapScriptHeader: +PewterSnoozeSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -20,7 +20,7 @@ PewterSnoozeSpeechHouseGrampsText: cont "…Zzzz…" done -PewterSnoozeSpeechHouse_MapEventHeader: +PewterSnoozeSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 9b9052ee8..89dfe05ba 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const POKESEERSHOUSE_GRANNY -PokeSeersHouse_MapScriptHeader: +PokeSeersHouse_MapScripts: .SceneScripts: db 0 @@ -11,12 +11,12 @@ PokeSeersHouse_MapScriptHeader: SeerScript: faceplayer opentext - special SpecialPokeSeer + special Special_PokeSeer waitbutton closetext end -PokeSeersHouse_MapEventHeader: +PokeSeersHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index ece34605d..11a73de07 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -4,7 +4,7 @@ const_value set 2 const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST const POKECENTER2F_OFFICER -Pokecenter2F_MapScriptHeader: +Pokecenter2F_MapScripts: .SceneScripts: db 6 scene_script .Scene0 @@ -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 @@ -915,7 +915,7 @@ Text_PleaseEnter: Text_RejectNewMon: text "Sorry--@" text_from_ram StringBuffer1 - text "" + text_start line "can't be taken." prompt @@ -1022,7 +1022,7 @@ Text_BrokeStadiumRules: line "when you're ready." done -Pokecenter2F_MapEventHeader: +Pokecenter2F_MapEvents: ; filler db 0, 0 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 4740f745b..0c8bb70ec 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -6,7 +6,7 @@ const_value set 2 const POKEMONFANCLUB_FAIRY const POKEMONFANCLUB_ODDISH -PokemonFanClub_MapScriptHeader: +PokemonFanClub_MapScripts: .SceneScripts: db 0 @@ -296,7 +296,7 @@ UnknownText_0x191e29: line "brag right back!" done -PokemonFanClub_MapEventHeader: +PokemonFanClub_MapEvents: ; filler db 0, 0 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 371ef6c58..ef855e40e 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -7,7 +7,7 @@ const_value set 2 const POWERPLANT_FISHER const POWERPLANT_FOREST -PowerPlant_MapScriptHeader: +PowerPlant_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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: @@ -388,7 +388,7 @@ UnknownText_0x189475: line "electricity out!" done -PowerPlant_MapEventHeader: +PowerPlant_MapEvents: ; filler db 0, 0 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index febce1a36..96cd013c6 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -6,7 +6,7 @@ const_value set 2 const RADIOTOWER1F_GENTLEMAN const RADIOTOWER1F_COOLTRAINER_F -RadioTower1F_MapScriptHeader: +RadioTower1F_MapScripts: .SceneScripts: db 0 @@ -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: @@ -472,7 +472,7 @@ UnknownText_0x5d631: cont "ent ID numbers!" done -RadioTower1F_MapEventHeader: +RadioTower1F_MapEvents: ; filler db 0, 0 diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 7942063f9..99f4dbe4c 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -11,7 +11,7 @@ const_value set 2 const RADIOTOWER2F_BUENA const RADIOTOWER2F_RECEPTIONIST -RadioTower2F_MapScriptHeader: +RadioTower2F_MapScripts: .SceneScripts: db 0 @@ -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 @@ -710,7 +710,7 @@ UnknownText_0x5e463: line "#MON Radio" done -RadioTower2F_MapEventHeader: +RadioTower2F_MapEvents: ; filler db 0, 0 diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 5a0e360c5..0efc9e2db 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -7,13 +7,13 @@ const_value set 2 const RADIOTOWER3F_ROCKET3 const RADIOTOWER3F_SCIENTIST -RadioTower3F_MapScriptHeader: +RadioTower3F_MapScripts: .SceneScripts: db 0 .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 ; open shutter + changeblock 14, 4, $01 ; floor 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 ; open shutter + changeblock 14, 4, $01 ; floor reloadmappart closetext waitsfx @@ -328,7 +328,7 @@ UnknownText_0x5eae4: line "Host DJ BEN" done -RadioTower3F_MapEventHeader: +RadioTower3F_MapEvents: ; filler db 0, 0 diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 3beb7211c..99815f819 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -7,7 +7,7 @@ const_value set 2 const RADIOTOWER4F_ROCKET_GIRL const RADIOTOWER4F_SCIENTIST -RadioTower4F_MapScriptHeader: +RadioTower4F_MapScripts: .SceneScripts: db 0 @@ -245,7 +245,7 @@ UnknownText_0x5f00d: text "4F STUDIO 2" done -RadioTower4F_MapEventHeader: +RadioTower4F_MapEvents: ; filler db 0, 0 diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index c73d53de2..009c1e91d 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -5,7 +5,7 @@ const_value set 2 const RADIOTOWER5F_ROCKER const RADIOTOWER5F_POKE_BALL -RadioTower5F_MapScriptHeader: +RadioTower5F_MapScripts: .SceneScripts: db 3 scene_script .DummyScene0 @@ -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 @@ -420,7 +420,7 @@ SignpostRadioTower5FStudio: text "5F STUDIO 1" done -RadioTower5F_MapEventHeader: +RadioTower5F_MapEvents: ; filler db 0, 0 diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 07f23a582..2f9d2828a 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -1,7 +1,7 @@ const_value set 2 const REDSHOUSE1F_REDS_MOM -RedsHouse1F_MapScriptHeader: +RedsHouse1F_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -74,7 +74,7 @@ RedsHouse1FTVText: cont "in JOHTO…" done -RedsHouse1F_MapEventHeader: +RedsHouse1F_MapEvents: ; filler db 0, 0 diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 073985eaa..b69790cdd 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -1,4 +1,4 @@ -RedsHouse2F_MapScriptHeader: +RedsHouse2F_MapScripts: .SceneScripts: db 0 @@ -25,7 +25,7 @@ RedsHouse2FPCText: cont "in a long time…" done -RedsHouse2F_MapEventHeader: +RedsHouse2F_MapEvents: ; filler db 0, 0 diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 3f2f57f20..570b4b2f5 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -2,7 +2,7 @@ const_value set 2 const ROCKTUNNEL1F_POKE_BALL1 const ROCKTUNNEL1F_POKE_BALL2 -RockTunnel1F_MapScriptHeader: +RockTunnel1F_MapScripts: .SceneScripts: db 0 @@ -16,14 +16,12 @@ 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: +RockTunnel1F_MapEvents: ; filler db 0, 0 diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 6d20a92f2..d94f1f412 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -3,7 +3,7 @@ const_value set 2 const ROCKTUNNELB1F_POKE_BALL2 const ROCKTUNNELB1F_POKE_BALL3 -RockTunnelB1F_MapScriptHeader: +RockTunnelB1F_MapScripts: .SceneScripts: db 0 @@ -20,10 +20,9 @@ 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: +RockTunnelB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/Route1.asm b/maps/Route1.asm index d079ba955..8be70d4d6 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE1_COOLTRAINER_F const ROUTE1_FRUIT_TREE -Route1_MapScriptHeader: +Route1_MapScripts: .SceneScripts: db 0 @@ -80,7 +80,7 @@ Route1SignText: line "VIRIDIAN CITY" done -Route1_MapEventHeader: +Route1_MapEvents: ; filler db 0, 0 diff --git a/maps/Route10North.asm b/maps/Route10North.asm index 918d3af57..feb7dd033 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -1,4 +1,4 @@ -Route10North_MapScriptHeader: +Route10North_MapScripts: .SceneScripts: db 0 @@ -15,7 +15,7 @@ PowerPlantSignText: text "KANTO POWER PLANT" done -Route10North_MapEventHeader: +Route10North_MapEvents: ; filler db 0, 0 diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index c0bd2b5ec..4a75da2ec 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE10POKECENTER1F_GYM_GUY const ROUTE10POKECENTER1F_COOLTRAINER_F -Route10Pokecenter1F_MapScriptHeader: +Route10Pokecenter1F_MapScripts: .SceneScripts: db 0 @@ -80,7 +80,7 @@ Route10Pokecenter1FCooltrainerFText: line "PLANT." done -Route10Pokecenter1F_MapEventHeader: +Route10Pokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm index 5a13e4025..c3b2d39cc 100644 --- a/maps/Route10Pokecenter2FBeta.asm +++ b/maps/Route10Pokecenter2FBeta.asm @@ -1,11 +1,11 @@ -Route10Pokecenter2FBeta_MapScriptHeader: +Route10Pokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -Route10Pokecenter2FBeta_MapEventHeader: +Route10Pokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 2c904beff..a03a5d485 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE10SOUTH_POKEFAN_M1 const ROUTE10SOUTH_POKEFAN_M2 -Route10South_MapScriptHeader: +Route10South_MapScripts: .SceneScripts: db 0 @@ -75,7 +75,7 @@ Route10SignText: line "LAVENDER TOWN" done -Route10South_MapEventHeader: +Route10South_MapEvents: ; filler db 0, 0 diff --git a/maps/Route11.asm b/maps/Route11.asm index 903cf1009..353877969 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -5,7 +5,7 @@ const_value set 2 const ROUTE11_YOUNGSTER4 const ROUTE11_FRUIT_TREE -Route11_MapScriptHeader: +Route11_MapScripts: .SceneScripts: db 0 @@ -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-" @@ -146,7 +145,7 @@ Route11SignText: text "ROUTE 11" done -Route11_MapEventHeader: +Route11_MapEvents: ; filler db 0, 0 diff --git a/maps/Route12.asm b/maps/Route12.asm index 240ff0bb5..3aaf37991 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -6,7 +6,7 @@ const_value set 2 const ROUTE12_POKE_BALL1 const ROUTE12_POKE_BALL2 -Route12_MapScriptHeader: +Route12_MapScripts: .SceneScripts: db 0 @@ -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" @@ -167,7 +166,7 @@ FishingSpotSignText: text "FISHING SPOT" done -Route12_MapEventHeader: +Route12_MapEvents: ; filler db 0, 0 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index b951102e1..ca39effaf 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE12SUPERRODHOUSE_FISHING_GURU -Route12SuperRodHouse_MapScriptHeader: +Route12SuperRodHouse_MapScripts: .SceneScripts: db 0 @@ -79,7 +79,7 @@ UnknownText_0x7f5ec: line "deceived me?" done -Route12SuperRodHouse_MapEventHeader: +Route12SuperRodHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route13.asm b/maps/Route13.asm index 59107f67f..88753afbb 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -5,7 +5,7 @@ const_value set 2 const ROUTE13_POKEFAN_M2 const ROUTE13_POKEFAN_M3 -Route13_MapScriptHeader: +Route13_MapScripts: .SceneScripts: db 0 @@ -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" @@ -192,7 +191,7 @@ Route13DirectionsSignText: line "CITY" done -Route13_MapEventHeader: +Route13_MapEvents: ; filler db 0, 0 diff --git a/maps/Route14.asm b/maps/Route14.asm index e16f62e91..3f5a58357 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE14_POKEFAN_M2 const ROUTE14_KIM -Route14_MapScriptHeader: +Route14_MapScripts: .SceneScripts: db 0 @@ -115,7 +115,7 @@ PokefanmTrevorAfterBattleText: line "got my #MON…" done -Route14_MapEventHeader: +Route14_MapEvents: ; filler db 0, 0 diff --git a/maps/Route15.asm b/maps/Route15.asm index 59232fd8f..58fe79c9b 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -7,7 +7,7 @@ const_value set 2 const ROUTE15_TEACHER2 const ROUTE15_POKE_BALL -Route15_MapScriptHeader: +Route15_MapScripts: .SceneScripts: db 0 @@ -201,7 +201,7 @@ Route15SignText: line "LAVENDER TOWN" done -Route15_MapEventHeader: +Route15_MapEvents: ; filler db 0, 0 diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 292131d91..80966bd2b 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE15FUCHSIAGATE_OFFICER -Route15FuchsiaGate_MapScriptHeader: +Route15FuchsiaGate_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ Route15FuchsiaGateOfficerText: line "Don't give up!" done -Route15FuchsiaGate_MapEventHeader: +Route15FuchsiaGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route16.asm b/maps/Route16.asm index e08bf0a25..0e0fb2dc4 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -1,16 +1,16 @@ -Route16_MapScriptHeader: +Route16_MapScripts: .SceneScripts: db 0 .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 @@ -28,7 +28,7 @@ CyclingRoadSignText: line "ALL THE WAY!" done -Route16_MapEventHeader: +Route16_MapEvents: ; filler db 0, 0 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 8f48fe4b3..1d709e4ea 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD -Route16FuchsiaSpeechHouse_MapScriptHeader: +Route16FuchsiaSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -22,7 +22,7 @@ Route16FuchsiaSpeechHouseSuperNerdText: line "FUCHSIA CITY." done -Route16FuchsiaSpeechHouse_MapEventHeader: +Route16FuchsiaSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index eb57b0662..d59425640 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE16GATE_OFFICER -Route16Gate_MapScriptHeader: +Route16Gate_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -60,7 +60,7 @@ UnknownText_0x73496: line "BICYCLE." done -Route16Gate_MapEventHeader: +Route16Gate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route17.asm b/maps/Route17.asm index c8be61da2..b2c1a820d 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -4,13 +4,13 @@ const_value set 2 const ROUTE17_BIKER3 const ROUTE17_BIKER4 -Route17_MapScriptHeader: +Route17_MapScripts: .SceneScripts: db 0 .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" @@ -134,14 +132,14 @@ BikerCharlesAfterBattleText: cont "Take it easy!" done -Route17_MapEventHeader: +Route17_MapEvents: ; filler db 0, 0 .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..367a2634b 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_MapScripts: .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_MapEvents: ; 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..8cff37f09 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE18_YOUNGSTER1 const ROUTE18_YOUNGSTER2 -Route18_MapScriptHeader: +Route18_MapScripts: .SceneScripts: db 0 @@ -77,14 +77,14 @@ Route18SignText: line "FUCHSIA CITY" done -Route18_MapEventHeader: +Route18_MapEvents: ; filler db 0, 0 .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..8767a8b3b 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -6,23 +6,23 @@ const_value set 2 const ROUTE19_FISHER1 const ROUTE19_FISHER2 -Route19_MapScriptHeader: +Route19_MapScripts: .SceneScripts: db 0 .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 ; rock + changeblock 8, 6, $7a ; rock + changeblock 10, 6, $7a ; rock + changeblock 12, 8, $7a ; rock + changeblock 4, 8, $7a ; rock + changeblock 10, 10, $7a ; rock .Done: return @@ -234,13 +234,13 @@ CarefulSwimmingSignText: para "FUCHSIA POLICE" done -Route19_MapEventHeader: +Route19_MapEvents: ; filler db 0, 0 .Warps: db 1 - warp_def 7, 3, 3, ROUTE_19___FUCHSIA_GATE + warp_def 7, 3, 3, ROUTE_19_FUCHSIA_GATE .CoordEvents: db 0 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index c366c63d5..4446de2e3 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE19FUCHSIAGATE_OFFICER -Route19FuchsiaGate_MapScriptHeader: +Route19FuchsiaGate_MapScripts: .SceneScripts: db 0 @@ -45,7 +45,7 @@ UnknownText_0x1ab48a: line "That's great!" done -Route19FuchsiaGate_MapEventHeader: +Route19FuchsiaGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route2.asm b/maps/Route2.asm index 47abdc9f5..09b885df3 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -8,7 +8,7 @@ const_value set 2 const ROUTE2_POKE_BALL4 const ROUTE2_FRUIT_TREE -Route2_MapScriptHeader: +Route2_MapScripts: .SceneScripts: db 0 @@ -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" @@ -146,7 +146,7 @@ UnknownText_0x1ac49f: text "DIGLETT'S CAVE" done -Route2_MapEventHeader: +Route2_MapEvents: ; filler db 0, 0 diff --git a/maps/Route20.asm b/maps/Route20.asm index 7137999fe..e7a776b2b 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -3,13 +3,13 @@ const_value set 2 const ROUTE20_SWIMMER_GIRL2 const ROUTE20_SWIMMER_GUY -Route20_MapScriptHeader: +Route20_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .ClearRocks + callback MAPCALLBACK_NEWMAP, .ClearRocks .ClearRocks: setevent EVENT_CINNABAR_ROCKS_CLEARED @@ -112,7 +112,7 @@ CinnabarGymSignText: line "LEADER: BLAINE" done -Route20_MapEventHeader: +Route20_MapEvents: ; filler db 0, 0 diff --git a/maps/Route21.asm b/maps/Route21.asm index 97acd08ec..e6b4eb564 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE21_SWIMMER_GUY const ROUTE21_FISHER -Route21_MapScriptHeader: +Route21_MapScripts: .SceneScripts: db 0 @@ -89,7 +89,7 @@ FisherArnoldAfterBattleText: line "to fishing…" done -Route21_MapEventHeader: +Route21_MapEvents: ; filler db 0, 0 diff --git a/maps/Route22.asm b/maps/Route22.asm index 3c5aead91..c9d520cb1 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -1,4 +1,4 @@ -Route22_MapScriptHeader: +Route22_MapScripts: .SceneScripts: db 0 @@ -15,7 +15,7 @@ VictoryRoadEntranceSignText: line "ENTRANCE" done -Route22_MapEventHeader: +Route22_MapEvents: ; filler db 0, 0 diff --git a/maps/Route23.asm b/maps/Route23.asm index 87ba72d9c..99c527303 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -1,10 +1,10 @@ -Route23_MapScriptHeader: +Route23_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_INDIGO_PLATEAU @@ -22,7 +22,7 @@ IndigoPlateauSignText: para "#MON LEAGUE HQ" done -Route23_MapEventHeader: +Route23_MapEvents: ; filler db 0, 0 diff --git a/maps/Route24.asm b/maps/Route24.asm index 07740a467..afb4a514e 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE24_ROCKET -Route24_MapScriptHeader: +Route24_MapScripts: .SceneScripts: db 0 @@ -29,7 +29,7 @@ RocketScript_0x1adbfa: waitbutton closetext special Special_FadeBlackQuickly - special Special_ReloadSpritesNoPalettes + special ReloadSpritesNoPalettes disappear ROUTE24_ROCKET pause 25 special Special_FadeInQuickly @@ -118,7 +118,7 @@ UnknownText_0x1adee1: cont "from, me?" done -Route24_MapEventHeader: +Route24_MapEvents: ; filler db 0, 0 diff --git a/maps/Route25.asm b/maps/Route25.asm index ce37fe894..616a8ff8f 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -11,7 +11,7 @@ const_value set 2 const ROUTE25_COOLTRAINER_M2 const ROUTE25_POKE_BALL -Route25_MapScriptHeader: +Route25_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -430,7 +429,7 @@ BillsHouseSignText: text "BILL'S HOUSE" done -Route25_MapEventHeader: +Route25_MapEvents: ; filler db 0, 0 diff --git a/maps/Route26.asm b/maps/Route26.asm index 4af45fe1f..293a0add7 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -8,7 +8,7 @@ const_value set 2 const ROUTE26_FRUIT_TREE const ROUTE26_POKE_BALL -Route26_MapScriptHeader: +Route26_MapScripts: .SceneScripts: db 0 @@ -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 @@ -412,7 +412,7 @@ Route26SignText: line "RECEPTION GATE" done -Route26_MapEventHeader: +Route26_MapEvents: ; filler db 0, 0 diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index d304ce29f..e958d81f2 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE26DAYOFWEEKSIBLINGSHOUSE_POKEDEX -Route26DayofWeekSiblingsHouse_MapScriptHeader: +Route26DayofWeekSiblingsHouse_MapScripts: .SceneScripts: db 0 @@ -70,7 +70,7 @@ UnknownText_0x7b2b9: line "ROUTE 37" done -Route26DayofWeekSiblingsHouse_MapEventHeader: +Route26DayofWeekSiblingsHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 15f888fb6..d1759dc9d 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE26HEALSPEECHHOUSE_TEACHER -Route26HealSpeechHouse_MapScriptHeader: +Route26HealSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -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 @@ -48,7 +48,7 @@ UnknownText_0x7b18b: para "Keep at it!" done -Route26HealSpeechHouse_MapEventHeader: +Route26HealSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route27.asm b/maps/Route27.asm index 3afac9155..513466a18 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -9,7 +9,7 @@ const_value set 2 const ROUTE27_POKE_BALL2 const ROUTE27_FISHER -Route27_MapScriptHeader: +Route27_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -467,7 +467,7 @@ TohjoFallsSignText: line "KANTO AND JOHTO" done -Route27_MapEventHeader: +Route27_MapEvents: ; filler db 0, 0 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index e66f41f4e..629af1536 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE27SANDSTORMHOUSE_GRANNY -Route27SandstormHouse_MapScriptHeader: +Route27SandstormHouse_MapScripts: .SceneScripts: db 0 @@ -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: @@ -93,7 +93,7 @@ SandstormHouseWomanDisloyalText: cont "and trainers." done -Route27SandstormHouse_MapEventHeader: +Route27SandstormHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route28.asm b/maps/Route28.asm index 8b76bc407..0599fd9d9 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -1,4 +1,4 @@ -Route28_MapScriptHeader: +Route28_MapScripts: .SceneScripts: db 0 @@ -9,14 +9,13 @@ 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" done -Route28_MapEventHeader: +Route28_MapEvents: ; filler db 0, 0 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index fe833982d..662e7279b 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE28FAMOUSSPEECHHOUSE_CELEBRITY const ROUTE28FAMOUSSPEECHHOUSE_FEAROW -Route28FamousSpeechHouse_MapScriptHeader: +Route28FamousSpeechHouse_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -70,7 +70,7 @@ CelebritysFearowText: text "FEAROW: Feero!" done -Route28FamousSpeechHouse_MapEventHeader: +Route28FamousSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route29.asm b/maps/Route29.asm index cd91a1f3e..6c7239d92 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -8,7 +8,7 @@ const_value set 2 const ROUTE29_TUSCANY const ROUTE29_POKE_BALL -Route29_MapScriptHeader: +Route29_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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" @@ -415,13 +415,13 @@ Route29Sign2Text: line "NEW BARK TOWN" done -Route29_MapEventHeader: +Route29_MapEvents: ; filler db 0, 0 .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..f0b69ab5d 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_MapScripts: .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_MapEvents: ; 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/Route2Gate.asm b/maps/Route2Gate.asm index 7607bc1fc..60585b267 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE2GATE_SCIENTIST -Route2Gate_MapScriptHeader: +Route2Gate_MapScripts: .SceneScripts: db 0 @@ -25,7 +25,7 @@ Route2GateScientistText: cont "TOWN." done -Route2Gate_MapEventHeader: +Route2Gate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index e42337e6a..231b568ed 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE2NUGGETSPEECHHOUSE_FISHER -Route2NuggetSpeechHouse_MapScriptHeader: +Route2NuggetSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -52,7 +52,7 @@ UnknownText_0x9b8e5: line "have to do!" done -Route2NuggetSpeechHouse_MapEventHeader: +Route2NuggetSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route3.asm b/maps/Route3.asm index e0498e167..6ce01aeb1 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE3_YOUNGSTER2 const ROUTE3_FISHER2 -Route3_MapScriptHeader: +Route3_MapScripts: .SceneScripts: db 0 @@ -132,7 +132,7 @@ UnknownText_0x1ae163: line "stairs." done -Route3_MapEventHeader: +Route3_MapEvents: ; filler db 0, 0 diff --git a/maps/Route30.asm b/maps/Route30.asm index 74db65a31..df8b593d6 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -11,7 +11,7 @@ const_value set 2 const ROUTE30_COOLTRAINER_F const ROUTE30_POKE_BALL -Route30_MapScriptHeader: +Route30_MapScripts: .SceneScripts: db 0 @@ -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 @@ -407,7 +406,7 @@ YoungsterJoeyText_GiveHPUpAfterBattle: line "tougher too." done -Route30_MapEventHeader: +Route30_MapEvents: ; filler db 0, 0 diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index a912fd529..96605b3c8 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE30BERRYSPEECHHOUSE_POKEFAN_M -Route30BerrySpeechHouse_MapScriptHeader: +Route30BerrySpeechHouse_MapScripts: .SceneScripts: db 0 @@ -46,7 +46,7 @@ UnknownText_0x196dec: cont "drop right off." done -Route30BerrySpeechHouse_MapEventHeader: +Route30BerrySpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route31.asm b/maps/Route31.asm index e5498917f..f8ea93d2a 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -7,13 +7,13 @@ const_value set 2 const ROUTE31_POKE_BALL1 const ROUTE31_POKE_BALL2 -Route31_MapScriptHeader: +Route31_MapScripts: .SceneScripts: db 0 .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 @@ -416,7 +417,7 @@ DarkCaveSignText: text "DARK CAVE" done -Route31_MapEventHeader: +Route31_MapEvents: ; filler db 0, 0 diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 4195528ff..6d62f9398 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE31VIOLETGATE_OFFICER const ROUTE31VIOLETGATE_COOLTRAINER_F -Route31VioletGate_MapScriptHeader: +Route31VioletGate_MapScripts: .SceneScripts: db 0 @@ -27,7 +27,7 @@ Route31VioletGateCooltrainerFText: cont "phone home!" done -Route31VioletGate_MapEventHeader: +Route31VioletGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route32.asm b/maps/Route32.asm index 659ea40db..afd946c2b 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -14,7 +14,7 @@ const_value set 2 const ROUTE32_FRIEDA const ROUTE32_POKE_BALL2 -Route32_MapScriptHeader: +Route32_MapScripts: .SceneScripts: db 3 scene_script .DummyScene0 @@ -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" @@ -930,7 +928,7 @@ Route32UnionCaveSignText: line "AHEAD" done -Route32_MapEventHeader: +Route32_MapEvents: ; filler db 0, 0 diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index a29d79b8d..5bedc7853 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE32POKECENTER1F_FISHING_GURU const ROUTE32POKECENTER1F_COOLTRAINER_F -Route32Pokecenter1F_MapScriptHeader: +Route32Pokecenter1F_MapScripts: .SceneScripts: db 0 @@ -94,7 +94,7 @@ Route32Pokecenter1FCooltrainerFText: cont "power…" done -Route32Pokecenter1F_MapEventHeader: +Route32Pokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index 6bfa8ec27..345e46dd4 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE32RUINSOFALPHGATE_POKEFAN_M const ROUTE32RUINSOFALPHGATE_YOUNGSTER -Route32RuinsOfAlphGate_MapScriptHeader: +Route32RuinsOfAlphGate_MapScripts: .SceneScripts: db 0 @@ -46,7 +46,7 @@ Route32RuinsOfAlphGateYoungsterText: cont "what they are." done -Route32RuinsOfAlphGate_MapEventHeader: +Route32RuinsOfAlphGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route33.asm b/maps/Route33.asm index fbc7b3190..be2abbf4c 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE33_LASS const ROUTE33_FRUIT_TREE -Route33_MapScriptHeader: +Route33_MapScripts: .SceneScripts: db 0 @@ -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 @@ -194,7 +194,7 @@ Route33SignText: text "ROUTE 33" done -Route33_MapEventHeader: +Route33_MapEvents: ; filler db 0, 0 diff --git a/maps/Route34.asm b/maps/Route34.asm index 144973036..786ffb022 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -13,13 +13,13 @@ const_value set 2 const ROUTE34_COOLTRAINER_F3 const ROUTE34_POKE_BALL -Route34_MapScriptHeader: +Route34_MapScripts: .SceneScripts: db 0 .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 @@ -762,7 +760,7 @@ DayCareSignText: line "#MON FOR YOU!" done -Route34_MapEventHeader: +Route34_MapEvents: ; filler db 0, 0 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 18b010bff..38dc04729 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -4,13 +4,13 @@ const_value set 2 const ROUTE34ILEXFORESTGATE_LASS const ROUTE34ILEXFORESTGATE_TEACHER2 -Route34IlexForestGate_MapScriptHeader: +Route34IlexForestGate_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .IsForestRestless + callback MAPCALLBACK_OBJECTS, .IsForestRestless .IsForestRestless: checkevent EVENT_FOREST_IS_RESTLESS @@ -135,7 +135,7 @@ Route34IlexForestGateLassText: cont "type #MON." done -Route34IlexForestGate_MapEventHeader: +Route34IlexForestGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route35.asm b/maps/Route35.asm index becb45ad0..467fb6c5a 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -11,7 +11,7 @@ const_value set 2 const ROUTE35_FRUIT_TREE const ROUTE35_POKE_BALL -Route35_MapScriptHeader: +Route35_MapScripts: .SceneScripts: db 0 @@ -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 @@ -462,7 +462,7 @@ Route35SignText: text "ROUTE 35" done -Route35_MapEventHeader: +Route35_MapEvents: ; filler db 0, 0 diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 77820e889..a783781dd 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE35GOLDENRODGATE_POKEFAN_F const ROUTE35GOLDENRODGATE_FISHER -Route35GoldenrodGate_MapScriptHeader: +Route35GoldenrodGate_MapScripts: .SceneScripts: db 0 @@ -195,7 +195,7 @@ Route35GoldenrodGateFisherText: line "different kinds." done -Route35GoldenrodGate_MapEventHeader: +Route35GoldenrodGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index cf68bbcc2..754591060 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE35NATIONALPARKGATE_YOUNGSTER const ROUTE35NATIONALPARKGATE_OFFICER2 -Route35NationalParkGate_MapScriptHeader: +Route35NationalParkGate_MapScripts: .SceneScripts: db 3 scene_script .DummyScene0 @@ -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 @@ -374,7 +374,7 @@ UnknownText_0x6a71f: UnknownText_0x6a79a: text "You still have @" text_from_ram StringBuffer3 - text "" + text_start line "minute(s) left." para "Do you want to" @@ -437,7 +437,7 @@ UnknownText_0x6a90e: line "the contest." done -Route35NationalParkGate_MapEventHeader: +Route35NationalParkGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route36.asm b/maps/Route36.asm index 4076725b4..fceef3306 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -9,7 +9,7 @@ const_value set 2 const ROUTE36_FLORIA const ROUTE36_SUICUNE -Route36_MapScriptHeader: +Route36_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -659,7 +659,7 @@ Route36TrainerTips2Text: line "landmarks." done -Route36_MapEventHeader: +Route36_MapEvents: ; filler db 0, 0 diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 88d7abb14..fa74c7ee5 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -12,7 +12,7 @@ const_value set 2 const ROUTE36NATIONALPARKGATE_YOUNGSTER7 const ROUTE36NATIONALPARKGATE_OFFICER2 -Route36NationalParkGate_MapScriptHeader: +Route36NationalParkGate_MapScripts: .SceneScripts: db 3 scene_script .DummyScene0 @@ -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 @@ -624,7 +624,7 @@ UnknownText_0x6b209: UnknownText_0x6b284: text "You still have @" text_from_ram StringBuffer3 - text "" + text_start line "minute(s) left." para "Do you want to" @@ -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" @@ -850,7 +849,7 @@ UnknownText_0x6b97f: cont "for you." done -Route36NationalParkGate_MapEventHeader: +Route36NationalParkGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index 316b2d4b4..c7355dd04 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE36RUINSOFALPHGATE_OFFICER const ROUTE36RUINSOFALPHGATE_GRAMPS -Route36RuinsOfAlphGate_MapScriptHeader: +Route36RuinsOfAlphGate_MapScripts: .SceneScripts: db 0 @@ -34,7 +34,7 @@ Route36RuinsOfAlphGateGrampsText: line "RUINS OF ALPH." done -Route36RuinsOfAlphGate_MapEventHeader: +Route36RuinsOfAlphGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route37.asm b/maps/Route37.asm index 190656869..27dd38893 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -7,13 +7,13 @@ const_value set 2 const ROUTE37_FRUIT_TREE2 const ROUTE37_FRUIT_TREE3 -Route37_MapScriptHeader: +Route37_MapScripts: .SceneScripts: db 0 .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" @@ -238,7 +237,7 @@ Route37SignText: text "ROUTE 37" done -Route37_MapEventHeader: +Route37_MapEvents: ; filler db 0, 0 diff --git a/maps/Route38.asm b/maps/Route38.asm index 526bf3e36..c228429ba 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -7,7 +7,7 @@ const_value set 2 const ROUTE38_FRUIT_TREE const ROUTE38_BUENA2 -Route38_MapScriptHeader: +Route38_MapScripts: .SceneScripts: db 0 @@ -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 @@ -472,7 +472,7 @@ Route38TrainerTipsText: cont "its evolution." done -Route38_MapEventHeader: +Route38_MapEvents: ; filler db 0, 0 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 8e117196c..fa7280b57 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE38ECRUTEAKGATE_OFFICER -Route38EcruteakGate_MapScriptHeader: +Route38EcruteakGate_MapScripts: .SceneScripts: db 0 @@ -24,7 +24,7 @@ Route38EcruteakGateOfficerText: line "way to get here." done -Route38EcruteakGate_MapEventHeader: +Route38EcruteakGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route39.asm b/maps/Route39.asm index 6545dd77d..9af608cbc 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -10,7 +10,7 @@ const_value set 2 const ROUTE39_FRUIT_TREE const ROUTE39_POKEFAN_F2 -Route39_MapScriptHeader: +Route39_MapScripts: .SceneScripts: db 0 @@ -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!" @@ -344,7 +343,7 @@ Route39TrainerTipsText: line "any tree you see!" done -Route39_MapEventHeader: +Route39_MapEvents: ; filler db 0, 0 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index a7cfe5405..682b2dea1 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE39BARN_TWIN2 const ROUTE39BARN_MOOMOO -Route39Barn_MapScriptHeader: +Route39Barn_MapScripts: .SceneScripts: db 0 @@ -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 @@ -188,7 +188,7 @@ Text_RefusedToGiveBerry: para "MILTANK looks sad." done -Route39Barn_MapEventHeader: +Route39Barn_MapEvents: ; filler db 0, 0 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 77531a70d..9f46263de 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE39FARMHOUSE_POKEFAN_M const ROUTE39FARMHOUSE_POKEFAN_F -Route39Farmhouse_MapScriptHeader: +Route39Farmhouse_MapScripts: .SceneScripts: db 0 @@ -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 @@ -192,7 +192,7 @@ FarmerFText_SnoreSpeech: cont "it, hon." done -Route39Farmhouse_MapEventHeader: +Route39Farmhouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route4.asm b/maps/Route4.asm index bd6ea62e5..a0bf7c4bc 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE4_LASS2 const ROUTE4_POKE_BALL -Route4_MapScriptHeader: +Route4_MapScripts: .SceneScripts: db 0 @@ -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" @@ -121,7 +120,7 @@ MtMoonSquareSignText: line "stairs." done -Route4_MapEventHeader: +Route4_MapEvents: ; filler db 0, 0 diff --git a/maps/Route40.asm b/maps/Route40.asm index 73f089bd2..9124da140 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -12,13 +12,13 @@ const_value set 2 const ROUTE40_LASS2 const ROUTE40_STANDING_YOUNGSTER -Route40_MapScriptHeader: +Route40_MapScripts: .SceneScripts: db 0 .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 @@ -337,7 +337,7 @@ Route40SignText: line "OLIVINE CITY" done -Route40_MapEventHeader: +Route40_MapEvents: ; filler db 0, 0 diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index f37b78669..edd8fb7ff 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -2,13 +2,13 @@ const_value set 2 const ROUTE40BATTLETOWERGATE_ROCKER const ROUTE40BATTLETOWERGATE_TWIN -Route40BattleTowerGate_MapScriptHeader: +Route40BattleTowerGate_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .ShowSailor + callback MAPCALLBACK_OBJECTS, .ShowSailor .ShowSailor: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR @@ -70,7 +70,7 @@ Route40BattleTowerGateTwinText: line "them now!" done -Route40BattleTowerGate_MapEventHeader: +Route40BattleTowerGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route41.asm b/maps/Route41.asm index 95618e692..4b66164dd 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -10,7 +10,7 @@ const_value set 2 const ROUTE41_SWIMMER_GIRL4 const ROUTE41_SWIMMER_GIRL5 -Route41_MapScriptHeader: +Route41_MapScripts: .SceneScripts: db 0 @@ -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" @@ -341,7 +341,7 @@ SwimmerfWendyAfterBattleText: line "it's scary." done -Route41_MapEventHeader: +Route41_MapEvents: ; filler db 0, 0 diff --git a/maps/Route42.asm b/maps/Route42.asm index ccf174b17..c9d9ac30e 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -9,7 +9,7 @@ const_value set 2 const ROUTE42_POKE_BALL2 const ROUTE42_SUICUNE -Route42_MapScriptHeader: +Route42_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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: @@ -319,7 +318,7 @@ Route42Sign2Text: line "MAHOGANY TOWN" done -Route42_MapEventHeader: +Route42_MapEvents: ; filler db 0, 0 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 89bf4b494..f873e7fed 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE42ECRUTEAKGATE_OFFICER -Route42EcruteakGate_MapScriptHeader: +Route42EcruteakGate_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ Route42EcruteakGateOfficerText: line "get lost in there." done -Route42EcruteakGate_MapEventHeader: +Route42EcruteakGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route43.asm b/maps/Route43.asm index b76ebaead..890acfaf8 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -8,22 +8,22 @@ const_value set 2 const ROUTE43_FRUIT_TREE const ROUTE43_POKE_BALL -Route43_MapScriptHeader: +Route43_MapScripts: .SceneScripts: db 0 .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 @@ -500,7 +500,7 @@ Route43TrainerTipsText: line "#MON's type." done -Route43_MapEventHeader: +Route43_MapEvents: ; filler db 0, 0 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 58bb163ef..51d095e3c 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -5,7 +5,7 @@ const_value set 2 const ROUTE43GATE_ROCKET1 const ROUTE43GATE_ROCKET2 -Route43Gate_MapScriptHeader: +Route43Gate_MapScripts: .SceneScripts: db 2 scene_script .RocketShakedown @@ -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 @@ -247,7 +247,7 @@ OfficerText_AvoidGrass: cont "the grass." done -Route43Gate_MapEventHeader: +Route43Gate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 5cbd1d617..d3d2758ea 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE43MAHOGANYGATE_OFFICER -Route43MahoganyGate_MapScriptHeader: +Route43MahoganyGate_MapScripts: .SceneScripts: db 0 @@ -38,7 +38,7 @@ UnknownText_0x19ab65: cont "days." done -Route43MahoganyGate_MapEventHeader: +Route43MahoganyGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route44.asm b/maps/Route44.asm index 4f9261a59..6ab469c04 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -11,7 +11,7 @@ const_value set 2 const ROUTE44_POKE_BALL2 const ROUTE44_POKE_BALL3 -Route44_MapScriptHeader: +Route44_MapScripts: .SceneScripts: db 0 @@ -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" @@ -507,7 +506,7 @@ Route44Sign2Text: line "BLACKTHORN CITY" done -Route44_MapEventHeader: +Route44_MapEvents: ; filler db 0, 0 diff --git a/maps/Route45.asm b/maps/Route45.asm index 38b7f77f2..2b026b8d4 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -13,7 +13,7 @@ const_value set 2 const ROUTE45_POKE_BALL4 const ROUTE45_YOUNGSTER -Route45_MapScriptHeader: +Route45_MapScripts: .SceneScripts: db 0 @@ -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" @@ -532,7 +531,7 @@ Route45SignText: line "MOUNTAIN RD. AHEAD" done -Route45_MapEventHeader: +Route45_MapEvents: ; filler db 0, 0 diff --git a/maps/Route46.asm b/maps/Route46.asm index 36dad82d3..777e63501 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -6,7 +6,7 @@ const_value set 2 const ROUTE46_FRUIT_TREE2 const ROUTE46_POKE_BALL -Route46_MapScriptHeader: +Route46_MapScripts: .SceneScripts: db 0 @@ -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 @@ -250,14 +250,14 @@ Route46SignText: line "MOUNTAIN RD. AHEAD" done -Route46_MapEventHeader: +Route46_MapEvents: ; filler db 0, 0 .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..9bdf8a023 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE5_POKEFAN_M -Route5_MapScriptHeader: +Route5_MapScripts: .SceneScripts: db 0 @@ -39,15 +39,15 @@ HouseForSaleSignText: line "Nobody lives here." done -Route5_MapEventHeader: +Route5_MapEvents: ; filler db 0, 0 .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/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 320ddef89..f044a48b0 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE5CLEANSETAGSPEECHHOUSE_GRANNY const ROUTE5CLEANSETAGSPEECHHOUSE_TEACHER -Route5CleanseTagSpeechHouse_MapScriptHeader: +Route5CleanseTagSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -60,7 +60,7 @@ Route5CleanseTagSpeechHouseTeacherText: line "startled you." done -Route5CleanseTagSpeechHouse_MapEventHeader: +Route5CleanseTagSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronGate.asm index e47ce7628..1f8bb9b94 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_MapScripts: .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_MapEvents: ; 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/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm index 954b16ecb..2bdb75ca0 100644 --- a/maps/Route5UndergroundPathEntrance.asm +++ b/maps/Route5UndergroundPathEntrance.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER -Route5UndergroundPathEntrance_MapScriptHeader: +Route5UndergroundPathEntrance_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ Route5UndergroundPathEntranceTeacherText: line "love to visit!" done -Route5UndergroundPathEntrance_MapEventHeader: +Route5UndergroundPathEntrance_MapEvents: ; filler db 0, 0 diff --git a/maps/Route6.asm b/maps/Route6.asm index d19033031..9a66c5844 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE6_POKEFAN_M2 const ROUTE6_POKEFAN_M3 -Route6_MapScriptHeader: +Route6_MapScripts: .SceneScripts: db 0 @@ -91,7 +91,7 @@ PokefanmAllanAfterBattleText: cont "your heart melt?" done -Route6_MapEventHeader: +Route6_MapEvents: ; filler db 0, 0 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 713e1476e..b2dbf0e6c 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE6SAFFRONGATE_OFFICER -Route6SaffronGate_MapScriptHeader: +Route6SaffronGate_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -57,7 +57,7 @@ UnknownText_0x1927cb: line "FRON." done -Route6SaffronGate_MapEventHeader: +Route6SaffronGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm index 126406e10..aad70ec88 100644 --- a/maps/Route6UndergroundPathEntrance.asm +++ b/maps/Route6UndergroundPathEntrance.asm @@ -1,11 +1,11 @@ -Route6UndergroundPathEntrance_MapScriptHeader: +Route6UndergroundPathEntrance_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -Route6UndergroundPathEntrance_MapEventHeader: +Route6UndergroundPathEntrance_MapEvents: ; filler db 0, 0 diff --git a/maps/Route7.asm b/maps/Route7.asm index 54887e894..f10b33ccc 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -1,4 +1,4 @@ -Route7_MapScriptHeader: +Route7_MapScripts: .SceneScripts: db 0 @@ -34,7 +34,7 @@ Route7LockedDoorText: text "It's locked…" done -Route7_MapEventHeader: +Route7_MapEvents: ; filler db 0, 0 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index c72a3a571..bd0c2fced 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE7SAFFRONGATE_OFFICER -Route7SaffronGate_MapScriptHeader: +Route7SaffronGate_MapScripts: .SceneScripts: db 0 @@ -45,7 +45,7 @@ UnknownText_0x73592: line "through." done -Route7SaffronGate_MapEventHeader: +Route7SaffronGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route8.asm b/maps/Route8.asm index 1ad467aba..10df64842 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -6,7 +6,7 @@ const_value set 2 const ROUTE8_SUPER_NERD2 const ROUTE8_FRUIT_TREE -Route8_MapScriptHeader: +Route8_MapScripts: .SceneScripts: db 0 @@ -172,7 +172,7 @@ Route8UndergroundPathSignText: line "read…" done -Route8_MapEventHeader: +Route8_MapEvents: ; filler db 0, 0 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index 7dc6507ed..dc9968b1d 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE8SAFFRONGATE_OFFICER -Route8SaffronGate_MapScriptHeader: +Route8SaffronGate_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ Route8SaffronGateOfficerText: line "RADIO TOWER there." done -Route8SaffronGate_MapEventHeader: +Route8SaffronGate_MapEvents: ; filler db 0, 0 diff --git a/maps/Route9.asm b/maps/Route9.asm index 1b377ceeb..cd1831f98 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -6,7 +6,7 @@ const_value set 2 const ROUTE9_POKEFAN_M1 const ROUTE9_POKEFAN_M2 -Route9_MapScriptHeader: +Route9_MapScripts: .SceneScripts: db 0 @@ -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" @@ -206,7 +205,7 @@ Route9SignText: line "ROCK TUNNEL" done -Route9_MapEventHeader: +Route9_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 355b5591c..91f2967a3 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -1,4 +1,4 @@ -RuinsOfAlphAerodactylChamber_MapScriptHeader: +RuinsOfAlphAerodactylChamber_MapScripts: .SceneScripts: db 2 scene_script .CheckWall @@ -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 ; closed wall .WallOpen: checkevent EVENT_SOLVED_AERODACTYL_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock $2, $2, $1 - changeblock $4, $2, $2 + changeblock 2, 2, $01 ; left floor + changeblock 4, 2, $02 ; right floor 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 ; open wall 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 ; left hole + changeblock 4, 2, $19 ; right hole 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 @@ -143,7 +143,7 @@ UnknownText_0x58ee7: line "fangs." done -RuinsOfAlphAerodactylChamber_MapEventHeader: +RuinsOfAlphAerodactylChamber_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm index 8e2822d0b..8be5e878b 100644 --- a/maps/RuinsOfAlphAerodactylItemRoom.asm +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -4,7 +4,7 @@ const_value set 2 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4 -RuinsOfAlphAerodactylItemRoom_MapScriptHeader: +RuinsOfAlphAerodactylItemRoom_MapScripts: .SceneScripts: db 0 @@ -32,7 +32,7 @@ UnknownText_0x59ac1: cont "MON." done -RuinsOfAlphAerodactylItemRoom_MapEventHeader: +RuinsOfAlphAerodactylItemRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm index b19ad5cc2..d991d80bc 100644 --- a/maps/RuinsOfAlphAerodactylWordRoom.asm +++ b/maps/RuinsOfAlphAerodactylWordRoom.asm @@ -1,11 +1,11 @@ -RuinsOfAlphAerodactylWordRoom_MapScriptHeader: +RuinsOfAlphAerodactylWordRoom_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -RuinsOfAlphAerodactylWordRoom_MapEventHeader: +RuinsOfAlphAerodactylWordRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 52915317d..173f35e39 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -1,4 +1,4 @@ -RuinsOfAlphHoOhChamber_MapScriptHeader: +RuinsOfAlphHoOhChamber_MapScripts: .SceneScripts: db 2 scene_script .CheckWall @@ -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 ; closed wall .WallOpen: checkevent EVENT_SOLVED_HO_OH_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock $2, $2, $1 - changeblock $4, $2, $2 + changeblock 2, 2, $01 ; left floor + changeblock 4, 2, $02 ; right floor 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 ; open wall 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 ; left hole + changeblock 4, 2, $19 ; right hole 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 @@ -144,7 +144,7 @@ UnknownText_0x586aa: line "wings." done -RuinsOfAlphHoOhChamber_MapEventHeader: +RuinsOfAlphHoOhChamber_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm index 01c34011e..e8ad02a27 100644 --- a/maps/RuinsOfAlphHoOhItemRoom.asm +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -4,7 +4,7 @@ const_value set 2 const RUINSOFALPHHOOHITEMROOM_POKE_BALL3 const RUINSOFALPHHOOHITEMROOM_POKE_BALL4 -RuinsOfAlphHoOhItemRoom_MapScriptHeader: +RuinsOfAlphHoOhItemRoom_MapScripts: .SceneScripts: db 0 @@ -32,7 +32,7 @@ UnknownText_0x59923: cont "MON." done -RuinsOfAlphHoOhItemRoom_MapEventHeader: +RuinsOfAlphHoOhItemRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm index 079c7859f..a9b3be9cd 100644 --- a/maps/RuinsOfAlphHoOhWordRoom.asm +++ b/maps/RuinsOfAlphHoOhWordRoom.asm @@ -1,11 +1,11 @@ -RuinsOfAlphHoOhWordRoom_MapScriptHeader: +RuinsOfAlphHoOhWordRoom_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -RuinsOfAlphHoOhWordRoom_MapEventHeader: +RuinsOfAlphHoOhWordRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index e0f9b4ad8..27e696a85 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -3,7 +3,7 @@ const_value set 2 const RUINSOFALPHINNERCHAMBER_TEACHER const RUINSOFALPHINNERCHAMBER_GRAMPS -RuinsOfAlphInnerChamber_MapScriptHeader: +RuinsOfAlphInnerChamber_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -76,7 +76,7 @@ RuinsOfAlphInnerChamberStatueText: cont "MON." done -RuinsOfAlphInnerChamber_MapEventHeader: +RuinsOfAlphInnerChamber_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index e4f3f16c5..df4bcb881 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -2,7 +2,7 @@ const_value set 2 const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST const RUINSOFALPHKABUTOCHAMBER_SCIENTIST -RuinsOfAlphKabutoChamber_MapScriptHeader: +RuinsOfAlphKabutoChamber_MapScripts: .SceneScripts: db 2 scene_script .CheckWall @@ -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 ; closed wall .WallOpen: checkevent EVENT_SOLVED_KABUTO_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock $2, $2, $1 - changeblock $4, $2, $2 + changeblock 2, 2, $01 ; left floor + changeblock 4, 2, $02 ; right floor 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 ; open wall 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 ; left hole + changeblock 4, 2, $19 ; right hole 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 @@ -255,7 +255,7 @@ UnknownText_0x58b3f: line "scanned the area." done -RuinsOfAlphKabutoChamber_MapEventHeader: +RuinsOfAlphKabutoChamber_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm index 910f5837c..3e5d41515 100644 --- a/maps/RuinsOfAlphKabutoItemRoom.asm +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -4,7 +4,7 @@ const_value set 2 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4 -RuinsOfAlphKabutoItemRoom_MapScriptHeader: +RuinsOfAlphKabutoItemRoom_MapScripts: .SceneScripts: db 0 @@ -32,7 +32,7 @@ UnknownText_0x599ad: cont "MON." done -RuinsOfAlphKabutoItemRoom_MapEventHeader: +RuinsOfAlphKabutoItemRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm index fc6c21f9a..ad29b5760 100644 --- a/maps/RuinsOfAlphKabutoWordRoom.asm +++ b/maps/RuinsOfAlphKabutoWordRoom.asm @@ -1,11 +1,11 @@ -RuinsOfAlphKabutoWordRoom_MapScriptHeader: +RuinsOfAlphKabutoWordRoom_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -RuinsOfAlphKabutoWordRoom_MapEventHeader: +RuinsOfAlphKabutoWordRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 994f69edd..e9c937526 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -1,4 +1,4 @@ -RuinsOfAlphOmanyteChamber_MapScriptHeader: +RuinsOfAlphOmanyteChamber_MapScripts: .SceneScripts: db 2 scene_script .CheckWall @@ -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 ; closed wall .WallOpen: checkevent EVENT_SOLVED_OMANYTE_PUZZLE iffalse .FloorClosed return .FloorClosed: - changeblock $2, $2, $1 - changeblock $4, $2, $2 + changeblock 2, 2, $01 ; left floor + changeblock 4, 2, $02 ; right floor 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 ; open wall 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 ; left hole + changeblock 4, 2, $19 ; right hole 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 @@ -144,7 +144,7 @@ UnknownText_0x58d26: line "its ten tentacles." done -RuinsOfAlphOmanyteChamber_MapEventHeader: +RuinsOfAlphOmanyteChamber_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm index 292dbac4d..3f4570b2b 100644 --- a/maps/RuinsOfAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -4,7 +4,7 @@ const_value set 2 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4 -RuinsOfAlphOmanyteItemRoom_MapScriptHeader: +RuinsOfAlphOmanyteItemRoom_MapScripts: .SceneScripts: db 0 @@ -32,7 +32,7 @@ UnknownText_0x59a37: cont "MON." done -RuinsOfAlphOmanyteItemRoom_MapEventHeader: +RuinsOfAlphOmanyteItemRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm index 4ed4e32bc..b2f68e0a3 100644 --- a/maps/RuinsOfAlphOmanyteWordRoom.asm +++ b/maps/RuinsOfAlphOmanyteWordRoom.asm @@ -1,11 +1,11 @@ -RuinsOfAlphOmanyteWordRoom_MapScriptHeader: +RuinsOfAlphOmanyteWordRoom_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -RuinsOfAlphOmanyteWordRoom_MapEventHeader: +RuinsOfAlphOmanyteWordRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 478a2b9d0..3c674d8c8 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -5,7 +5,7 @@ const_value set 2 const RUINSOFALPHOUTSIDE_YOUNGSTER2 const RUINSOFALPHOUTSIDE_YOUNGSTER3 -RuinsOfAlphOutside_MapScriptHeader: +RuinsOfAlphOutside_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -282,7 +280,7 @@ UnknownText_0x5848e: line "message!" done -RuinsOfAlphOutside_MapEventHeader: +RuinsOfAlphOutside_MapEvents: ; filler db 0, 0 diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 223b2bd62..1595ce59a 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -3,7 +3,7 @@ const_value set 2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 -RuinsOfAlphResearchCenter_MapScriptHeader: +RuinsOfAlphResearchCenter_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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" @@ -392,7 +392,7 @@ UnknownText_0x59886: cont "Ancients…" done -RuinsOfAlphResearchCenter_MapEventHeader: +RuinsOfAlphResearchCenter_MapEvents: ; filler db 0, 0 diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index d1b4e6f1a..a96f55dea 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -1,11 +1,11 @@ -SafariZoneBeta_MapScriptHeader: +SafariZoneBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -SafariZoneBeta_MapEventHeader: +SafariZoneBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index e2ba63f2e..562775013 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -1,11 +1,11 @@ -SafariZoneFuchsiaGateBeta_MapScriptHeader: +SafariZoneFuchsiaGateBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -SafariZoneFuchsiaGateBeta_MapEventHeader: +SafariZoneFuchsiaGateBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index 2c7ac5e3d..1ee13106f 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -1,11 +1,11 @@ -SafariZoneMainOffice_MapScriptHeader: +SafariZoneMainOffice_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -SafariZoneMainOffice_MapEventHeader: +SafariZoneMainOffice_MapEvents: ; filler db 0, 0 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 487dff77d..e7295d594 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -1,7 +1,7 @@ const_value set 2 const SAFARIZONEWARDENSHOME_LASS -SafariZoneWardensHome_MapScriptHeader: +SafariZoneWardensHome_MapScripts: .SceneScripts: db 0 @@ -76,7 +76,7 @@ SafariZonePhotoText: line "frolicking in it." done -SafariZoneWardensHome_MapEventHeader: +SafariZoneWardensHome_MapEvents: ; filler db 0, 0 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 490a269b9..d4c470571 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -8,13 +8,13 @@ const_value set 2 const SAFFRONCITY_YOUNGSTER2 const SAFFRONCITY_LASS2 -SaffronCity_MapScriptHeader: +SaffronCity_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_SAFFRON @@ -265,7 +265,7 @@ SaffronCityMagnetTrainStationSignText: cont "STATION" done -SaffronCity_MapEventHeader: +SaffronCity_MapEvents: ; filler db 0, 0 @@ -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..a2ba7497d 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -6,7 +6,7 @@ const_value set 2 const SAFFRONGYM_YOUNGSTER2 const SAFFRONGYM_GYM_GUY -SaffronGym_MapScriptHeader: +SaffronGym_MapScripts: .SceneScripts: db 0 @@ -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: @@ -290,7 +290,7 @@ SaffronGymGuyWinText: line "fantastic battle!" done -SaffronGym_MapEventHeader: +SaffronGym_MapEvents: ; filler db 0, 0 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index 19c35a37c..0d69d2017 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_MapScripts: .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_MapEvents: ; 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/SaffronMart.asm b/maps/SaffronMart.asm index 34f936298..d7619320c 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -3,7 +3,7 @@ const_value set 2 const SAFFRONMART_COOLTRAINER_M const SAFFRONMART_COOLTRAINER_F -SaffronMart_MapScriptHeader: +SaffronMart_MapScripts: .SceneScripts: db 0 @@ -37,7 +37,7 @@ SaffronMartCooltrainerFText: line "how sometime?" done -SaffronMart_MapEventHeader: +SaffronMart_MapEvents: ; filler db 0, 0 diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 39d6ad8bb..d53fdb684 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const SAFFRONPOKECENTER1F_FISHER const SAFFRONPOKECENTER1F_YOUNGSTER -SaffronPokecenter1F_MapScriptHeader: +SaffronPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -15,7 +15,7 @@ NurseScript_0x18a47d: jumpstd pokecenternurse TeacherScript_0x18a480: - special Mobile_DummyReturnFalse + special Special_Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x18a4a3 @@ -111,7 +111,7 @@ SaffronPokecenter1FYoungsterText: line "SAFFRON." done -SaffronPokecenter1F_MapEventHeader: +SaffronPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm index fd0835f50..ebc2bb6c8 100644 --- a/maps/SaffronPokecenter2FBeta.asm +++ b/maps/SaffronPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -SaffronPokecenter2FBeta_MapScriptHeader: +SaffronPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -SaffronPokecenter2FBeta_MapEventHeader: +SaffronPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index f08ba0b8f..885d04c60 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -2,7 +2,7 @@ const_value set 2 const SEAFOAMGYM_BLAINE const SEAFOAMGYM_GYM_GUY -SeafoamGym_MapScriptHeader: +SeafoamGym_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -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 @@ -157,7 +157,7 @@ SeafoamGymGuyWinText2: line "for a building." done -SeafoamGym_MapEventHeader: +SeafoamGym_MapEvents: ; filler db 0, 0 diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index f714ba24c..83c75ef6c 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -2,7 +2,7 @@ const_value set 2 const SILPHCO1F_RECEPTIONIST const SILPHCO1F_OFFICER -SilphCo1F_MapScriptHeader: +SilphCo1F_MapScripts: .SceneScripts: db 0 @@ -55,7 +55,7 @@ UnknownText_0x18aca8: line "anywhere yet." done -SilphCo1F_MapEventHeader: +SilphCo1F_MapEvents: ; filler db 0, 0 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 6a381bf3b..d218da44c 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -2,7 +2,7 @@ const_value set 2 const SILVERCAVEITEMROOMS_POKE_BALL1 const SILVERCAVEITEMROOMS_POKE_BALL2 -SilverCaveItemRooms_MapScriptHeader: +SilverCaveItemRooms_MapScripts: .SceneScripts: db 0 @@ -15,7 +15,7 @@ SilverCaveItemRoomsMaxRevive: SilverCaveItemRoomsFullRestore: itemball FULL_RESTORE -SilverCaveItemRooms_MapEventHeader: +SilverCaveItemRooms_MapEvents: ; filler db 0, 0 diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 52f1c1b16..3e51cf7b2 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -1,10 +1,10 @@ -SilverCaveOutside_MapScriptHeader: +SilverCaveOutside_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_SILVER_CAVE @@ -17,13 +17,13 @@ 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" done -SilverCaveOutside_MapEventHeader: +SilverCaveOutside_MapEvents: ; filler db 0, 0 diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index 4363edcfc..76b1e744f 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -2,7 +2,7 @@ const_value set 2 const SILVERCAVEPOKECENTER1F_NURSE const SILVERCAVEPOKECENTER1F_GRANNY -SilverCavePokecenter1F_MapScriptHeader: +SilverCavePokecenter1F_MapScripts: .SceneScripts: db 0 @@ -29,7 +29,7 @@ SilverCavePokecenter1FGrannyText: line "anywhere…" done -SilverCavePokecenter1F_MapEventHeader: +SilverCavePokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 7879184ee..fd04a1a6d 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -4,7 +4,7 @@ const_value set 2 const SILVERCAVEROOM1_POKE_BALL3 const SILVERCAVEROOM1_POKE_BALL4 -SilverCaveRoom1_MapScriptHeader: +SilverCaveRoom1_MapScripts: .SceneScripts: db 0 @@ -24,14 +24,12 @@ 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: +SilverCaveRoom1_MapEvents: ; filler db 0, 0 diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index ec33e2be8..eb6b9fd69 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -3,7 +3,7 @@ const_value set 2 const SILVERCAVEROOM2_POKE_BALL2 const SILVERCAVEROOM2_POKE_BALL3 -SilverCaveRoom2_MapScriptHeader: +SilverCaveRoom2_MapScripts: .SceneScripts: db 0 @@ -20,10 +20,9 @@ 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: +SilverCaveRoom2_MapEvents: ; filler db 0, 0 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 7daab6ba8..705ca0cc1 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -1,7 +1,7 @@ const_value set 2 const SILVERCAVEROOM3_RED -SilverCaveRoom3_MapScriptHeader: +SilverCaveRoom3_MapScripts: .SceneScripts: db 0 @@ -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,11 +46,11 @@ Red: done .Text3: - text $56 - line $56 + text "<……>" + line "<……>" done -SilverCaveRoom3_MapEventHeader: +SilverCaveRoom3_MapEvents: ; filler db 0, 0 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index c4357abf1..4937a259f 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -9,7 +9,7 @@ const_value set 2 const SLOWPOKEWELLB1F_BOULDER const SLOWPOKEWELLB1F_POKE_BALL -SlowpokeWellB1F_MapScriptHeader: +SlowpokeWellB1F_MapScripts: .SceneScripts: db 0 @@ -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: @@ -320,7 +320,7 @@ SlowpokeWellB1FTaillessSlowpokeText: line "its TAIL cut off…" done -SlowpokeWellB1F_MapEventHeader: +SlowpokeWellB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index c30261b25..70fef8c70 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -2,7 +2,7 @@ const_value set 2 const SLOWPOKEWELLB2F_GYM_GUY const SLOWPOKEWELLB2F_POKE_BALL -SlowpokeWellB2F_MapScriptHeader: +SlowpokeWellB2F_MapScripts: .SceneScripts: db 0 @@ -61,7 +61,7 @@ UnknownText_0x5adf2: cont "one evolve." done -SlowpokeWellB2F_MapEventHeader: +SlowpokeWellB2F_MapEvents: ; filler db 0, 0 diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 4bd994c93..15ac8e2b3 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -4,7 +4,7 @@ const_value set 2 const SOULHOUSE_LASS const SOULHOUSE_GRANNY -SoulHouse_MapScriptHeader: +SoulHouse_MapScripts: .SceneScripts: db 0 @@ -72,7 +72,7 @@ SoulHouseGrannyText: line "my grandchildren…" done -SoulHouse_MapEventHeader: +SoulHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index cafee1eea..3f9887fe2 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -6,7 +6,7 @@ const_value set 2 const SPROUTTOWER1F_SAGE3 const SPROUTTOWER1F_POKE_BALL -SproutTower1F_MapScriptHeader: +SproutTower1F_MapScripts: .SceneScripts: db 0 @@ -102,7 +102,7 @@ UnknownText_0x1846d6: line "distinguished." done -SproutTower1F_MapEventHeader: +SproutTower1F_MapEvents: ; filler db 0, 0 diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index bf3611ead..cd0c46fd7 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -3,7 +3,7 @@ const_value set 2 const SPROUTTOWER2F_SAGE2 const SPROUTTOWER2F_POKE_BALL -SproutTower2F_MapScriptHeader: +SproutTower2F_MapScripts: .SceneScripts: db 0 @@ -84,7 +84,7 @@ UnknownText_0x1848c8: line "distinguished." done -SproutTower2F_MapEventHeader: +SproutTower2F_MapEvents: ; filler db 0, 0 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 33dd4dcd8..2b459c55d 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -7,7 +7,7 @@ const_value set 2 const SPROUTTOWER3F_POKE_BALL2 const SPROUTTOWER3F_SILVER -SproutTower3F_MapScriptHeader: +SproutTower3F_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -329,7 +329,7 @@ UnknownText_0x184f61: line "distinguished." done -SproutTower3F_MapEventHeader: +SproutTower3F_MapEvents: ; filler db 0, 0 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 464215210..7ecb7b71a 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -6,14 +6,14 @@ const_value set 2 const TEAMROCKETBASEB1F_POKE_BALL2 const TEAMROCKETBASEB1F_POKE_BALL3 -TeamRocketBaseB1F_MapScriptHeader: +TeamRocketBaseB1F_MapScripts: .SceneScripts: db 1 scene_script .DummyScene .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 @@ -727,7 +726,7 @@ UnknownText_0x6cdd0: line "turned off." done -TeamRocketBaseB1F_MapEventHeader: +TeamRocketBaseB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 0ed2c67f0..abfd227a1 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -14,7 +14,7 @@ const_value set 2 const TEAMROCKETBASEB2F_ROCKET4 const TEAMROCKETBASEB2F_POKE_BALL -TeamRocketBaseB2F_MapScriptHeader: +TeamRocketBaseB2F_MapScripts: .SceneScripts: db 4 scene_script .DummyScene0 @@ -24,7 +24,7 @@ TeamRocketBaseB2F_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .TransmitterDoorCallback + callback MAPCALLBACK_TILES, .TransmitterDoorCallback .DummyScene0: end @@ -40,22 +40,22 @@ TeamRocketBaseB2F_MapScriptHeader: .TransmitterDoorCallback: checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER - iftrue .Change + iftrue .OpenDoor return -.Change: - changeblock $e, $c, $7 +.OpenDoor: + changeblock 14, 12, $07 ; floor 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 ; floor 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 @@ -909,7 +908,7 @@ UnknownText_0x6de03: line "broadcast." done -TeamRocketBaseB2F_MapEventHeader: +TeamRocketBaseB2F_MapEvents: ; filler db 0, 0 diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 63729ce63..3f7fe5d39 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -14,7 +14,7 @@ const_value set 2 const TEAMROCKETBASEB3F_POKE_BALL4 const TEAMROCKETBASEB3F_POKE_BALL5 -TeamRocketBaseB3F_MapScriptHeader: +TeamRocketBaseB3F_MapScripts: .SceneScripts: db 4 scene_script .LanceGetsPassword @@ -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 ; floor 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 ; floor reloadmappart closetext setevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE @@ -565,7 +565,7 @@ UnknownText_0x6e9a3: para "The door opened!" done -TeamRocketBaseB3F_MapEventHeader: +TeamRocketBaseB3F_MapEvents: ; filler db 0, 0 diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index c24c1606a..cb3d5f3a8 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -2,7 +2,7 @@ const_value set 2 const TIMECAPSULE_CHRIS1 const TIMECAPSULE_CHRIS2 -TimeCapsule_MapScriptHeader: +TimeCapsule_MapScripts: .SceneScripts: db 2 scene_script .InitializeTimeCapsule @@ -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: @@ -53,7 +53,7 @@ UnknownText_0x193521: line "ready." done -TimeCapsule_MapEventHeader: +TimeCapsule_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index ab23a7b3e..cd20d59b2 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -10,7 +10,7 @@ const_value set 2 const TINTOWER1F_SAGE5 const TINTOWER1F_SAGE6 -TinTower1F_MapScriptHeader: +TinTower1F_MapScripts: .SceneScripts: db 2 scene_script .FaceSuicune @@ -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 ; floor .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 ; stairs reloadmappart setevent EVENT_GOT_RAINBOW_WING closetext @@ -522,7 +522,7 @@ TinTower1FSage6Text2: line "with SUICUNE." done -TinTower1F_MapEventHeader: +TinTower1F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index d980cc891..02012d6f8 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -1,11 +1,11 @@ -TinTower2F_MapScriptHeader: +TinTower2F_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -TinTower2F_MapEventHeader: +TinTower2F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 7e6263538..505073594 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -1,7 +1,7 @@ const_value set 2 const TINTOWER3F_POKE_BALL -TinTower3F_MapScriptHeader: +TinTower3F_MapScripts: .SceneScripts: db 0 @@ -11,7 +11,7 @@ TinTower3F_MapScriptHeader: TinTower3FFullHeal: itemball FULL_HEAL -TinTower3F_MapEventHeader: +TinTower3F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 34d1be488..67fd4fda6 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -3,7 +3,7 @@ const_value set 2 const TINTOWER4F_POKE_BALL2 const TINTOWER4F_POKE_BALL3 -TinTower4F_MapScriptHeader: +TinTower4F_MapScripts: .SceneScripts: db 0 @@ -20,10 +20,9 @@ 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: +TinTower4F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index d8991932c..ee2980b33 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -1,7 +1,7 @@ const_value set 2 const TINTOWER5F_POKE_BALL -TinTower5F_MapScriptHeader: +TinTower5F_MapScripts: .SceneScripts: db 0 @@ -12,14 +12,12 @@ 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: +TinTower5F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 025ee8988..5d587373d 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -1,7 +1,7 @@ const_value set 2 const TINTOWER6F_POKE_BALL -TinTower6F_MapScriptHeader: +TinTower6F_MapScripts: .SceneScripts: db 0 @@ -11,7 +11,7 @@ TinTower6F_MapScriptHeader: TinTower6FMaxPotion: itemball MAX_POTION -TinTower6F_MapEventHeader: +TinTower6F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 981e247d1..ab10bf4c2 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -1,7 +1,7 @@ const_value set 2 const TINTOWER7F_POKE_BALL -TinTower7F_MapScriptHeader: +TinTower7F_MapScripts: .SceneScripts: db 0 @@ -11,7 +11,7 @@ TinTower7F_MapScriptHeader: TinTower7FMaxRevive: itemball MAX_REVIVE -TinTower7F_MapEventHeader: +TinTower7F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index d8413bd0b..4e10ac13f 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -3,7 +3,7 @@ const_value set 2 const TINTOWER8F_POKE_BALL2 const TINTOWER8F_POKE_BALL3 -TinTower8F_MapScriptHeader: +TinTower8F_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ TinTower8FMaxElixer: TinTower8FFullRestore: itemball FULL_RESTORE -TinTower8F_MapEventHeader: +TinTower8F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 5b3280474..a540b891f 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -1,7 +1,7 @@ const_value set 2 const TINTOWER9F_POKE_BALL -TinTower9F_MapScriptHeader: +TinTower9F_MapScripts: .SceneScripts: db 0 @@ -21,7 +21,7 @@ TinTower9FUnusedLugiaText: text "LUGIA: Gyaaan!" done -TinTower9F_MapEventHeader: +TinTower9F_MapEvents: ; filler db 0, 0 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 8d5eed029..3cfca7cf9 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -1,13 +1,13 @@ const_value set 2 const TINTOWERROOF_HO_OH -TinTowerRoof_MapScriptHeader: +TinTowerRoof_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .HoOh + callback MAPCALLBACK_OBJECTS, .HoOh .HoOh: checkevent EVENT_FOUGHT_HO_OH @@ -44,7 +44,7 @@ HoOhText: text "Shaoooh!" done -TinTowerRoof_MapEventHeader: +TinTowerRoof_MapEvents: ; filler db 0, 0 diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 18d55bd3a..c9982b094 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -1,7 +1,7 @@ const_value set 2 const TOHJOFALLS_POKE_BALL -TohjoFalls_MapScriptHeader: +TohjoFalls_MapScripts: .SceneScripts: db 0 @@ -11,7 +11,7 @@ TohjoFalls_MapScriptHeader: TohjoFallsMoonStone: itemball MOON_STONE -TohjoFalls_MapEventHeader: +TohjoFalls_MapEvents: ; filler db 0, 0 diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index fe9e43ce4..62232df4f 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -2,7 +2,7 @@ const_value set 2 const TRADECENTER_CHRIS1 const TRADECENTER_CHRIS2 -TradeCenter_MapScriptHeader: +TradeCenter_MapScripts: .SceneScripts: db 2 scene_script .InitializeTradeCenter @@ -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: @@ -53,7 +53,7 @@ ChrisScript_0x19340b: line "ready." done -TradeCenter_MapEventHeader: +TradeCenter_MapEvents: ; filler db 0, 0 diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index bcfb08bb0..d3fcfca04 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -5,7 +5,7 @@ const_value set 2 const TRAINERHOUSE1F_YOUNGSTER const TRAINERHOUSE1F_GENTLEMAN -TrainerHouse1F_MapScriptHeader: +TrainerHouse1F_MapScripts: .SceneScripts: db 0 @@ -137,7 +137,7 @@ UnknownText_0x9b2c1: line "illegible…" done -TrainerHouse1F_MapEventHeader: +TrainerHouse1F_MapEvents: ; filler db 0, 0 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index c4219a991..bb6fd4316 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -2,7 +2,7 @@ const_value set 2 const TRAINERHOUSEB1F_RECEPTIONIST const TRAINERHOUSEB1F_CHRIS -TrainerHouseB1F_MapScriptHeader: +TrainerHouseB1F_MapScripts: .SceneScripts: db 1 scene_script .DummyScene @@ -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 @@ -169,7 +169,7 @@ TrainerHouseB1FCalBeforeText: cont "could battle you." done -TrainerHouseB1F_MapEventHeader: +TrainerHouseB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index 557a478be..6834c043e 100644 --- a/maps/UndergroundPath.asm +++ b/maps/UndergroundPath.asm @@ -1,4 +1,4 @@ -UndergroundPath_MapScriptHeader: +UndergroundPath_MapScripts: .SceneScripts: db 0 @@ -6,14 +6,12 @@ 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: +UndergroundPath_MapEvents: ; filler db 0, 0 diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index dfc9a9f65..77ed8bbb6 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -9,7 +9,7 @@ const_value set 2 const UNIONCAVE1F_POKE_BALL3 const UNIONCAVE1F_POKE_BALL4 -UnionCave1F_MapScriptHeader: +UnionCave1F_MapScripts: .SceneScripts: db 0 @@ -199,7 +199,7 @@ UnknownText_0x59f29: text "UNION CAVE" done -UnionCave1F_MapEventHeader: +UnionCave1F_MapEvents: ; filler db 0, 0 diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index b232aa6e4..980855221 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -7,7 +7,7 @@ const_value set 2 const UNIONCAVEB1F_BOULDER const UNIONCAVEB1F_POKE_BALL2 -UnionCaveB1F_MapScriptHeader: +UnionCaveB1F_MapScripts: .SceneScripts: db 0 @@ -152,7 +152,7 @@ PokemaniacCalvinAfterBattleText: cont "PROF.ELM." done -UnionCaveB1F_MapEventHeader: +UnionCaveB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 8aa4ddd5e..5f2baabf2 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -6,13 +6,13 @@ const_value set 2 const UNIONCAVEB2F_POKE_BALL2 const UNIONCAVEB2F_LAPRAS -UnionCaveB2F_MapScriptHeader: +UnionCaveB2F_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Lapras + callback MAPCALLBACK_OBJECTS, .Lapras .Lapras: checkflag ENGINE_UNION_CAVE_LAPRAS @@ -141,7 +141,7 @@ CooltrainerfEmmaAfterBattleText: line "that #MON…" done -UnionCaveB2F_MapEventHeader: +UnionCaveB2F_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 90baf28b0..2430b97d3 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -6,13 +6,13 @@ const_value set 2 const VERMILIONCITY_BIG_SNORLAX const VERMILIONCITY_POKEFAN_M -VermilionCity_MapScriptHeader: +VermilionCity_MapScripts: .SceneScripts: db 0 .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" @@ -267,7 +267,7 @@ VermilionCityPortSignText: line "ENTRANCE" done -VermilionCity_MapEventHeader: +VermilionCity_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 7c86eba76..31f19615d 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -5,7 +5,7 @@ const_value set 2 const VERMILIONGYM_SUPER_NERD const VERMILIONGYM_GYM_GUY -VermilionGym_MapScriptHeader: +VermilionGym_MapScripts: .SceneScripts: db 0 @@ -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: @@ -260,7 +260,7 @@ UnknownText_0x19261e: line "but trash." done -VermilionGym_MapEventHeader: +VermilionGym_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index 5682dc084..718d5e005 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const VERMILIONHOUSEDIGLETTSCAVESPEECHHOUSE_GENTLEMAN -VermilionHouseDiglettsCaveSpeechHouse_MapScriptHeader: +VermilionHouseDiglettsCaveSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -20,7 +20,7 @@ VermilionHouseDiglettsCaveSpeechHouseGentlemanText: line "to a distant town." done -VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: +VermilionHouseDiglettsCaveSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index c2d3fd2f2..72ed1ba4a 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const VERMILIONHOUSEFISHINGSPEECHHOUSE_FISHING_GURU -VermilionHouseFishingSpeechHouse_MapScriptHeader: +VermilionHouseFishingSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -50,7 +50,7 @@ FishingDudesHousePhotoText: line "great time…" done -VermilionHouseFishingSpeechHouse_MapEventHeader: +VermilionHouseFishingSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index d1eae85c3..e2ba0b77c 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER -VermilionMagnetTrainSpeechHouse_MapScriptHeader: +VermilionMagnetTrainSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -33,7 +33,7 @@ VermilionMagnetTrainSpeechHouseYoungsterText: cont "the MAGNET TRAIN." done -VermilionMagnetTrainSpeechHouse_MapEventHeader: +VermilionMagnetTrainSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 87cb81e66..b72ea6aec 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -3,7 +3,7 @@ const_value set 2 const VERMILIONMART_SUPER_NERD const VERMILIONMART_BUENA -VermilionMart_MapScriptHeader: +VermilionMart_MapScripts: .SceneScripts: db 0 @@ -36,7 +36,7 @@ VermilionMartBuenaText: cont "SAFFRON." done -VermilionMart_MapEventHeader: +VermilionMart_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index 354716b85..43821efdc 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const VERMILIONPOKECENTER1F_SAILOR const VERMILIONPOKECENTER1F_BUG_CATCHER -VermilionPokecenter1F_MapScriptHeader: +VermilionPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -76,7 +76,7 @@ VermilionPokecenter1FBugCatcherText: line "got them in JOHTO." done -VermilionPokecenter1F_MapEventHeader: +VermilionPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm index 281198a7d..a82bd9e48 100644 --- a/maps/VermilionPokecenter2FBeta.asm +++ b/maps/VermilionPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -VermilionPokecenter2FBeta_MapScriptHeader: +VermilionPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -VermilionPokecenter2FBeta_MapEventHeader: +VermilionPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 8d7af46a8..c71739ef6 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -3,7 +3,7 @@ const_value set 2 const VERMILIONPORT_SAILOR2 const VERMILIONPORT_SUPER_NERD -VermilionPort_MapScriptHeader: +VermilionPort_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -299,7 +298,7 @@ UnknownText_0x750a6: cont "there." done -VermilionPort_MapEventHeader: +VermilionPort_MapEvents: ; filler db 0, 0 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index e728d387a..1e078e525 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -1,7 +1,7 @@ const_value set 2 const VERMILIONPORTPASSAGE_TEACHER -VermilionPortPassage_MapScriptHeader: +VermilionPortPassage_MapScripts: .SceneScripts: db 0 @@ -18,7 +18,7 @@ VermilionPortPassageTeacherText: cont "every week." done -VermilionPortPassage_MapEventHeader: +VermilionPortPassage_MapEvents: ; filler db 0, 0 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index ef8bd3ead..e0389faeb 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -6,7 +6,7 @@ const_value set 2 const VICTORYROAD_POKE_BALL4 const VICTORYROAD_POKE_BALL5 -VictoryRoad_MapScriptHeader: +VictoryRoad_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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 @@ -240,7 +238,7 @@ UnknownText_0x747aa: line "thing else." done -VictoryRoad_MapEventHeader: +VictoryRoad_MapEvents: ; filler db 0, 0 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 95011fd5e..b466a32b6 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -3,7 +3,7 @@ const_value set 2 const VICTORYROADGATE_BLACK_BELT1 const VICTORYROADGATE_BLACK_BELT2 -VictoryRoadGate_MapScriptHeader: +VictoryRoadGate_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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: @@ -97,7 +97,7 @@ VictoryRoadGateRightBlackBeltText: line "ready for you!" done -VictoryRoadGate_MapEventHeader: +VictoryRoadGate_MapEvents: ; filler db 0, 0 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 34939ff3e..6890ffa8a 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -8,13 +8,13 @@ const_value set 2 const VIOLETCITY_POKE_BALL1 const VIOLETCITY_POKE_BALL2 -VioletCity_MapScriptHeader: +VioletCity_MapScripts: .SceneScripts: db 0 .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 @@ -278,7 +278,7 @@ EarlsPokemonAcademySignText: line "ACADEMY" done -VioletCity_MapEventHeader: +VioletCity_MapEvents: ; filler db 0, 0 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 84effea16..12480e21f 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -4,7 +4,7 @@ const_value set 2 const VIOLETGYM_YOUNGSTER2 const VIOLETGYM_GYM_GUY -VioletGym_MapScriptHeader: +VioletGym_MapScripts: .SceneScripts: db 0 @@ -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: @@ -281,7 +281,7 @@ VioletGymGuyWinText: line "time at all!" done -VioletGym_MapEventHeader: +VioletGym_MapEvents: ; filler db 0, 0 diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index 2fa0e84b3..4d903cb70 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const VIOLETKYLESHOUSE_POKEFAN_M const VIOLETKYLESHOUSE_KYLE -VioletKylesHouse_MapScriptHeader: +VioletKylesHouse_MapScripts: .SceneScripts: db 0 @@ -32,7 +32,7 @@ VioletKylesHousePokefanMText: line "disobey you." done -VioletKylesHouse_MapEventHeader: +VioletKylesHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index ffb19d838..e1a86e0c7 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -3,7 +3,7 @@ const_value set 2 const VIOLETMART_GRANNY const VIOLETMART_COOLTRAINER_M -VioletMart_MapScriptHeader: +VioletMart_MapScripts: .SceneScripts: db 0 @@ -48,7 +48,7 @@ VioletMartCooltrainerMText: line "items." done -VioletMart_MapEventHeader: +VioletMart_MapEvents: ; filler db 0, 0 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index ae047457a..7ec074324 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -3,7 +3,7 @@ const_value set 2 const VIOLETNICKNAMESPEECHHOUSE_LASS const VIOLETNICKNAMESPEECHHOUSE_BIRD -VioletNicknameSpeechHouse_MapScriptHeader: +VioletNicknameSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -44,7 +44,7 @@ UnknownText_0x6947c: text "STRAWBERRY: Pijji!" done -VioletNicknameSpeechHouse_MapEventHeader: +VioletNicknameSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index e4c6e8df6..9413849b8 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const VIOLETPOKECENTER1F_YOUNGSTER const VIOLETPOKECENTER1F_SCIENTIST -VioletPokecenter1F_MapScriptHeader: +VioletPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -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 @@ -215,7 +215,7 @@ VioletPokecenter1FYoungsterText: line "they please." done -VioletPokecenter1F_MapEventHeader: +VioletPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 5b5e077cb..1825c1bc7 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -4,13 +4,13 @@ const_value set 2 const VIRIDIANCITY_FISHER const VIRIDIANCITY_YOUNGSTER -ViridianCity_MapScriptHeader: +ViridianCity_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: setflag ENGINE_FLYPOINT_VIRIDIAN @@ -215,7 +215,7 @@ TrainerHouseSignText: line "Trainer Battles" done -ViridianCity_MapEventHeader: +ViridianCity_MapEvents: ; filler db 0, 0 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index bf6a99290..ed47a099e 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -2,7 +2,7 @@ const_value set 2 const VIRIDIANGYM_BLUE const VIRIDIANGYM_GYM_GUY -ViridianGym_MapScriptHeader: +ViridianGym_MapScripts: .SceneScripts: db 0 @@ -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: @@ -169,7 +169,7 @@ ViridianGymGuyWinText: line "tears to my eyes." done -ViridianGym_MapEventHeader: +ViridianGym_MapEvents: ; filler db 0, 0 diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 049ee3e35..275b57e2d 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -3,7 +3,7 @@ const_value set 2 const VIRIDIANMART_LASS const VIRIDIANMART_COOLTRAINER_M -ViridianMart_MapScriptHeader: +ViridianMart_MapScripts: .SceneScripts: db 0 @@ -36,7 +36,7 @@ ViridianMartCooltrainerMText: line "south of here." done -ViridianMart_MapEventHeader: +ViridianMart_MapEvents: ; filler db 0, 0 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 8403fbc1c..10d2c52e5 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -4,7 +4,7 @@ const_value set 2 const VIRIDIANNICKNAMESPEECHHOUSE_SPEARY const VIRIDIANNICKNAMESPEECHHOUSE_RATTEY -ViridianNicknameSpeechHouse_MapScriptHeader: +ViridianNicknameSpeechHouse_MapScripts: .SceneScripts: db 0 @@ -61,7 +61,7 @@ RatteyText: text "RATTEY: Kikiii!" done -ViridianNicknameSpeechHouse_MapEventHeader: +ViridianNicknameSpeechHouse_MapEvents: ; filler db 0, 0 diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index 54ca8d696..86f767a5f 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const VIRIDIANPOKECENTER1F_COOLTRAINER_F const VIRIDIANPOKECENTER1F_BUG_CATCHER -ViridianPokecenter1F_MapScriptHeader: +ViridianPokecenter1F_MapScripts: .SceneScripts: db 0 @@ -71,7 +71,7 @@ ViridianPokecenter1FBugCatcherText: line "come a GYM LEADER." done -ViridianPokecenter1F_MapEventHeader: +ViridianPokecenter1F_MapEvents: ; filler db 0, 0 diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm index 2b119c1bb..3a00d3be1 100644 --- a/maps/ViridianPokecenter2FBeta.asm +++ b/maps/ViridianPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -ViridianPokecenter2FBeta_MapScriptHeader: +ViridianPokecenter2FBeta_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -ViridianPokecenter2FBeta_MapEventHeader: +ViridianPokecenter2FBeta_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 011b0ac8f..8b816062f 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -6,7 +6,7 @@ const_value set 2 const WHIRLISLANDB1F_POKE_BALL5 const WHIRLISLANDB1F_BOULDER -WhirlIslandB1F_MapScriptHeader: +WhirlIslandB1F_MapScripts: .SceneScripts: db 0 @@ -32,18 +32,15 @@ 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: +WhirlIslandB1F_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index 34632a517..d589b7d05 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -3,7 +3,7 @@ const_value set 2 const WHIRLISLANDB2F_POKE_BALL2 const WHIRLISLANDB2F_POKE_BALL3 -WhirlIslandB2F_MapScriptHeader: +WhirlIslandB2F_MapScripts: .SceneScripts: db 0 @@ -19,7 +19,7 @@ WhirlIslandB2FMaxRevive: WhirlIslandB2FMaxElixer: itemball MAX_ELIXER -WhirlIslandB2F_MapEventHeader: +WhirlIslandB2F_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 4c3af9b8c..29c8500bb 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -1,11 +1,11 @@ -WhirlIslandCave_MapScriptHeader: +WhirlIslandCave_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -WhirlIslandCave_MapEventHeader: +WhirlIslandCave_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 39285cc15..aa0a15c1e 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -1,13 +1,13 @@ const_value set 2 const WHIRLISLANDLUGIACHAMBER_LUGIA -WhirlIslandLugiaChamber_MapScriptHeader: +WhirlIslandLugiaChamber_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Lugia + callback MAPCALLBACK_OBJECTS, .Lugia .Lugia: checkevent EVENT_FOUGHT_LUGIA @@ -43,7 +43,7 @@ LugiaText: text "Gyaaas!" done -WhirlIslandLugiaChamber_MapEventHeader: +WhirlIslandLugiaChamber_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 7ed3e883c..b022a4c72 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -1,7 +1,7 @@ const_value set 2 const WHIRLISLANDNE_POKE_BALL -WhirlIslandNE_MapScriptHeader: +WhirlIslandNE_MapScripts: .SceneScripts: db 0 @@ -11,7 +11,7 @@ WhirlIslandNE_MapScriptHeader: WhirlIslandNEUltraBall: itemball ULTRA_BALL -WhirlIslandNE_MapEventHeader: +WhirlIslandNE_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index ed40fe8d5..e8475c19b 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -1,11 +1,11 @@ -WhirlIslandNW_MapScriptHeader: +WhirlIslandNW_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -WhirlIslandNW_MapEventHeader: +WhirlIslandNW_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index edc3aa418..3e7edc484 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -1,11 +1,11 @@ -WhirlIslandSE_MapScriptHeader: +WhirlIslandSE_MapScripts: .SceneScripts: db 0 .MapCallbacks: db 0 -WhirlIslandSE_MapEventHeader: +WhirlIslandSE_MapEvents: ; filler db 0, 0 diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index e1c212d75..b80b00b6a 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -1,7 +1,7 @@ const_value set 2 const WHIRLISLANDSW_POKE_BALL -WhirlIslandSW_MapScriptHeader: +WhirlIslandSW_MapScripts: .SceneScripts: db 0 @@ -11,7 +11,7 @@ WhirlIslandSW_MapScriptHeader: WhirlIslandSWUltraBall: itemball ULTRA_BALL -WhirlIslandSW_MapEventHeader: +WhirlIslandSW_MapEvents: ; filler db 0, 0 diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index d72451638..1b0522ce9 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -1,7 +1,7 @@ const_value set 2 const WILLSROOM_WILL -WillsRoom_MapScriptHeader: +WillsRoom_MapScripts: .SceneScripts: db 2 scene_script .LockDoor @@ -9,7 +9,7 @@ WillsRoom_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_TILES, .WillsRoomDoors + callback MAPCALLBACK_TILES, .WillsRoomDoors .LockDoor: priorityjump .WillsDoorLocksBehindYou @@ -20,24 +20,24 @@ WillsRoom_MapScriptHeader: .WillsRoomDoors: checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED - iffalse .KeepDoorsClosed - changeblock $4, $e, $2a -.KeepDoorsClosed: + iffalse .KeepEntranceOpen + changeblock 4, 14, $2a ; wall +.KeepEntranceOpen: checkevent EVENT_WILLS_ROOM_EXIT_OPEN - iffalse .OpenDoors - changeblock $4, $2, $16 -.OpenDoors: + iffalse .KeepExitClosed + changeblock 4, 2, $16 ; open door +.KeepExitClosed: return .WillsDoorLocksBehindYou: - applymovement PLAYER, MovementData_0x18052c + applymovement PLAYER, WillsRoom_EnterMovement refreshscreen $86 playsound SFX_STRENGTH earthquake 80 - changeblock $4, $e, $2a + changeblock 4, 14, $2a ; wall reloadmappart closetext - setscene $1 + setscene 1 setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -46,12 +46,12 @@ WillScript_Battle: faceplayer opentext checkevent EVENT_BEAT_ELITE_4_WILL - iftrue WillScript_0x180526 + iftrue WillScript_AfterBattle writetext WillScript_WillBeforeText waitbutton closetext winlosstext WillScript_WillBeatenText, 0 - loadtrainer WILL, 1 + loadtrainer WILL, WILL1 startbattle reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_WILL @@ -60,20 +60,20 @@ WillScript_Battle: waitbutton closetext playsound SFX_ENTER_DOOR - changeblock $4, $2, $16 + changeblock 4, 2, $16 ; open door reloadmappart closetext setevent EVENT_WILLS_ROOM_EXIT_OPEN waitsfx end -WillScript_0x180526: +WillScript_AfterBattle: writetext WillScript_WillDefeatText waitbutton closetext end -MovementData_0x18052c: +WillsRoom_EnterMovement: step UP step UP step UP @@ -128,7 +128,7 @@ WillScript_WillDefeatText: line "of the ELITE FOUR." done -WillsRoom_MapEventHeader: +WillsRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index ab072fb36..ef30655c2 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -6,7 +6,7 @@ const_value set 2 const WISETRIOSROOM_SAGE5 const WISETRIOSROOM_SAGE6 -WiseTriosRoom_MapScriptHeader: +WiseTriosRoom_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -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: @@ -344,7 +344,7 @@ UnknownText_0x98db5: line "you to the test." done -WiseTriosRoom_MapEventHeader: +WiseTriosRoom_MapEvents: ; filler db 0, 0 diff --git a/maps/blockdata.asm b/maps/blockdata.asm deleted file mode 100644 index 9e44798ad..000000000 --- a/maps/blockdata.asm +++ /dev/null @@ -1,1047 +0,0 @@ -SECTION "Map Blockdata 1", ROMX - -Route32_BlockData: - INCBIN "maps/Route32.blk" - -Route40_BlockData: - INCBIN "maps/Route40.blk" - -Route36_BlockData: - INCBIN "maps/Route36.blk" - -Route44_BlockData: - INCBIN "maps/Route44.blk" - -Route28_BlockData: - INCBIN "maps/Route28.blk" - -BetaHerosHouse_BlockData: - INCBIN "maps/BetaHerosHouse.blk" - -CeladonCity_BlockData: - INCBIN "maps/CeladonCity.blk" - -SaffronCity_BlockData: - INCBIN "maps/SaffronCity.blk" - -Route2_BlockData: - INCBIN "maps/Route2.blk" - -ElmsHouse_BlockData: - INCBIN "maps/ElmsHouse.blk" - -BetaSproutTower1_BlockData: - INCBIN "maps/BetaSproutTower1.blk" - -Route11_BlockData: - INCBIN "maps/Route11.blk" - -BetaSproutTower5_BlockData: - INCBIN "maps/BetaSproutTower5.blk" - -Route15_BlockData: - INCBIN "maps/Route15.blk" - -BetaSproutTower9_BlockData: - INCBIN "maps/BetaSproutTower9.blk" - -Route19_BlockData: - INCBIN "maps/Route19.blk" - -BetaBlackthornCity_BlockData: - INCBIN "maps/BetaBlackthornCity.blk" - -Route10South_BlockData: - INCBIN "maps/Route10South.blk" - -Pokecenter2F_BlockData: -CinnabarPokecenter2FBeta_BlockData: -CeruleanPokecenter2FBeta_BlockData: -Route10Pokecenter2FBeta_BlockData: -VermilionPokecenter2FBeta_BlockData: -PewterPokecenter2FBeta_BlockData: -FuchsiaPokecenter2FBeta_BlockData: -LavenderPokecenter2FBeta_BlockData: -CeladonPokecenter2FBeta_BlockData: -ViridianPokecenter2FBeta_BlockData: -SaffronPokecenter2FBeta_BlockData: - INCBIN "maps/Pokecenter2F.blk" - -Route41_BlockData: - INCBIN "maps/Route41.blk" - -Route33_BlockData: - INCBIN "maps/Route33.blk" - -Route45_BlockData: - INCBIN "maps/Route45.blk" - -Route29_BlockData: - INCBIN "maps/Route29.blk" - -Route37_BlockData: - INCBIN "maps/Route37.blk" - -LavenderTown_BlockData: - INCBIN "maps/LavenderTown.blk" - -PalletTown_BlockData: - INCBIN "maps/PalletTown.blk" - -Route25_BlockData: - INCBIN "maps/Route25.blk" - -Route24_BlockData: - INCBIN "maps/Route24.blk" - -BetaVioletCity_BlockData: - INCBIN "maps/BetaVioletCity.blk" - -Route3_BlockData: - INCBIN "maps/Route3.blk" - -PewterCity_BlockData: - INCBIN "maps/PewterCity.blk" - -BetaIlexForest_BlockData: - INCBIN "maps/BetaIlexForest.blk" - -BetaSproutTower2_BlockData: - INCBIN "maps/BetaSproutTower2.blk" - -Route12_BlockData: - INCBIN "maps/Route12.blk" - -BetaGoldenrodCity_BlockData: - INCBIN "maps/BetaGoldenrodCity.blk" - -Route20_BlockData: - INCBIN "maps/Route20.blk" - -BetaSproutTower6_BlockData: - INCBIN "maps/BetaSproutTower6.blk" - -BetaPokecenterMainHouse_BlockData: - INCBIN "maps/BetaPokecenterMainHouse.blk" - -Route30_BlockData: - INCBIN "maps/Route30.blk" - -Route26_BlockData: - INCBIN "maps/Route26.blk" - -Route42_BlockData: - INCBIN "maps/Route42.blk" - -Route34_BlockData: - INCBIN "maps/Route34.blk" - -Route46_BlockData: - INCBIN "maps/Route46.blk" - -FuchsiaCity_BlockData: - INCBIN "maps/FuchsiaCity.blk" - -Route38_BlockData: - INCBIN "maps/Route38.blk" - -BetaCianwoodCity_BlockData: - INCBIN "maps/BetaCianwoodCity.blk" - -OlivineTimsHouse_BlockData: -OlivineHouseBeta_BlockData: -OlivinePunishmentSpeechHouse_BlockData: -OlivineGoodRodHouse_BlockData: -Route39Farmhouse_BlockData: -MahoganyRedGyaradosSpeechHouse_BlockData: -BlackthornDragonSpeechHouse_BlockData: -BlackthornEmysHouse_BlockData: -MoveDeletersHouse_BlockData: -CeruleanGymBadgeSpeechHouse_BlockData: -CeruleanPoliceStation_BlockData: -CeruleanTradeSpeechHouse_BlockData: -BillsHouse_BlockData: -CharcoalKiln_BlockData: -LakeOfRageHiddenPowerHouse_BlockData: -LakeOfRageMagikarpHouse_BlockData: -GoldenrodHappinessRater_BlockData: -GoldenrodBillsHouse_BlockData: -GoldenrodPPSpeechHouse_BlockData: -GoldenrodNameRater_BlockData: -VermilionHouseFishingSpeechHouse_BlockData: -VermilionMagnetTrainSpeechHouse_BlockData: -VermilionHouseDiglettsCaveSpeechHouse_BlockData: -BluesHouse_BlockData: -PewterNidoranSpeechHouse_BlockData: -PewterSnoozeSpeechHouse_BlockData: -FuchsiaBillSpeechHouse_BlockData: -LavenderTownSpeechHouse_BlockData: -LavenderNameRater_BlockData: -Route12SuperRodHouse_BlockData: -Route28FamousSpeechHouse_BlockData: -CeladonMansionRoofHouse_BlockData: -Route16FuchsiaSpeechHouse_BlockData: -ManiasHouse_BlockData: -CianwoodPharmacy_BlockData: -CianwoodCityPhotoStudio_BlockData: -CianwoodLugiaSpeechHouse_BlockData: -PokeSeersHouse_BlockData: -ViridianNicknameSpeechHouse_BlockData: -Route2NuggetSpeechHouse_BlockData: -KrissNeighborsHouse_BlockData: -Route26HealSpeechHouse_BlockData: -Route26DayofWeekSiblingsHouse_BlockData: -Route27SandstormHouse_BlockData: -MrPsychicsHouse_BlockData: -Route5CleanseTagSpeechHouse_BlockData: -CherrygroveGymSpeechHouse_BlockData: -GuideGentsHouse_BlockData: -CherrygroveEvolutionSpeechHouse_BlockData: -Route30BerrySpeechHouse_BlockData: - INCBIN "maps/House1.blk" - -SafariZoneFuchsiaGateBeta_BlockData: -Route19FuchsiaGate_BlockData: -Route43MahoganyGate_BlockData: -Route43Gate_BlockData: -Route35GoldenrodGate_BlockData: -Route36RuinsOfAlphGate_BlockData: -Route34IlexForestGate_BlockData: -Route6SaffronGate_BlockData: -Route40BattleTowerGate_BlockData: -Route2Gate_BlockData: -Route2946Gate_BlockData: -Route5SaffronCityGate_BlockData: - INCBIN "maps/NorthSouthGate.blk" - -BetaTeakCity_BlockData: - INCBIN "maps/BetaTeakCity.blk" - -BetaCherrygroveCity_BlockData: - INCBIN "maps/BetaCherrygroveCity.blk" - -CinnabarIsland_BlockData: - INCBIN "maps/CinnabarIsland.blk" - -Route4_BlockData: - INCBIN "maps/Route4.blk" - -Route8_BlockData: - INCBIN "maps/Route8.blk" - -BetaSproutTower3_BlockData: - INCBIN "maps/BetaSproutTower3.blk" - -ViridianCity_BlockData: - INCBIN "maps/ViridianCity.blk" - -Route13_BlockData: - INCBIN "maps/Route13.blk" - -Route21_BlockData: - INCBIN "maps/Route21.blk" - -BetaSproutTower7_BlockData: - INCBIN "maps/BetaSproutTower7.blk" - -Route17_BlockData: - INCBIN "maps/Route17.blk" - -BetaMahoganyTown_BlockData: - INCBIN "maps/BetaMahoganyTown.blk" - -Route31_BlockData: - INCBIN "maps/Route31.blk" - -Route27_BlockData: - INCBIN "maps/Route27.blk" - -Route35_BlockData: - INCBIN "maps/Route35.blk" - -Route43_BlockData: - INCBIN "maps/Route43.blk" - -Route39_BlockData: - INCBIN "maps/Route39.blk" - -KrissHouse1F_BlockData: - INCBIN "maps/KrissHouse1F.blk" - -Route38EcruteakGate_BlockData: -Route42EcruteakGate_BlockData: -Route32RuinsOfAlphGate_BlockData: -IlexForestAzaleaGate_BlockData: -Route15FuchsiaGate_BlockData: -Route8SaffronGate_BlockData: -Route16Gate_BlockData: -Route7SaffronGate_BlockData: -Route1718Gate_BlockData: -Route31VioletGate_BlockData: - INCBIN "maps/EastWestGate.blk" - -BetaAzaleaTown_BlockData: - INCBIN "maps/BetaAzaleaTown.blk" - -VermilionCity_BlockData: - INCBIN "maps/VermilionCity.blk" - -BetaOlivineCity_BlockData: - INCBIN "maps/BetaOlivineCity.blk" - -BetaNewBarkTown_BlockData: - INCBIN "maps/BetaNewBarkTown.blk" - -ElmsLab_BlockData: - INCBIN "maps/ElmsLab.blk" - -CeruleanCity_BlockData: - INCBIN "maps/CeruleanCity.blk" - -Route1_BlockData: - INCBIN "maps/Route1.blk" - -Route5_BlockData: - INCBIN "maps/Route5.blk" - -Route9_BlockData: - INCBIN "maps/Route9.blk" - -Route22_BlockData: - INCBIN "maps/Route22.blk" - - -SECTION "Map Blockdata 2", ROMX - -Route14_BlockData: - INCBIN "maps/Route14.blk" - -BetaSproutTower8_BlockData: - INCBIN "maps/BetaSproutTower8.blk" - -OlivineMart_BlockData: -EcruteakMart_BlockData: -BlackthornMart_BlockData: -CeruleanMart_BlockData: -AzaleaMart_BlockData: -VioletMart_BlockData: -VermilionMart_BlockData: -PewterMart_BlockData: -FuchsiaMart_BlockData: -LavenderMart_BlockData: -ViridianMart_BlockData: -SaffronMart_BlockData: -CherrygroveMart_BlockData: - INCBIN "maps/Mart.blk" - -Route10North_BlockData: - INCBIN "maps/Route10North.blk" - -BetaLakeOfRage_BlockData: - INCBIN "maps/BetaLakeOfRage.blk" - -OlivinePokecenter1F_BlockData: -MahoganyPokecenter1F_BlockData: -EcruteakPokecenter1F_BlockData: -BlackthornPokecenter1F_BlockData: -CinnabarPokecenter1F_BlockData: -CeruleanPokecenter1F_BlockData: -Route10Pokecenter1F_BlockData: -AzaleaPokecenter1F_BlockData: -VioletPokecenter1F_BlockData: -Route32Pokecenter1F_BlockData: -GoldenrodPokecenter1F_BlockData: -VermilionPokecenter1F_BlockData: -PewterPokecenter1F_BlockData: -FuchsiaPokecenter1F_BlockData: -LavenderPokecenter1F_BlockData: -SilverCavePokecenter1F_BlockData: -CeladonPokecenter1F_BlockData: -CianwoodPokecenter1F_BlockData: -ViridianPokecenter1F_BlockData: -SaffronPokecenter1F_BlockData: -CherrygrovePokecenter1F_BlockData: - INCBIN "maps/Pokecenter1F.blk" - -BetaPewterMuseumOfScience1F_BlockData: - INCBIN "maps/BetaPewterMuseumOfScience1F.blk" - -BetaPewterMuseumOfScience2F_BlockData: - INCBIN "maps/BetaPewterMuseumOfScience2F.blk" - -EarlsPokemonAcademy_BlockData: - INCBIN "maps/EarlsPokemonAcademy.blk" - -BetaCinnabarIslandPokemonLabHallway_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabHallway.blk" - -BetaCinnabarIslandPokemonLabRoom1_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabRoom1.blk" - -BetaCinnabarIslandPokemonLabRoom2_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabRoom2.blk" - -BetaCinnabarIslandPokemonLabRoom3_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabRoom3.blk" - -GoldenrodDeptStore1F_BlockData: -CeladonDeptStore1F_BlockData: - INCBIN "maps/DeptStore1F.blk" - -GoldenrodDeptStore2F_BlockData: -CeladonDeptStore2F_BlockData: - INCBIN "maps/DeptStore2F.blk" - -GoldenrodDeptStore3F_BlockData: -CeladonDeptStore3F_BlockData: - INCBIN "maps/DeptStore3F.blk" - -GoldenrodDeptStore4F_BlockData: -CeladonDeptStore4F_BlockData: - INCBIN "maps/DeptStore4F.blk" - -GoldenrodDeptStore5F_BlockData: -CeladonDeptStore5F_BlockData: - INCBIN "maps/DeptStore5F.blk" - -GoldenrodDeptStore6F_BlockData: -CeladonDeptStore6F_BlockData: - INCBIN "maps/DeptStore6F.blk" - -GoldenrodDeptStoreElevator_BlockData: -CeladonDeptStoreElevator_BlockData: - INCBIN "maps/DeptStoreElevator.blk" - -CeladonMansion1F_BlockData: - INCBIN "maps/CeladonMansion1F.blk" - -CeladonMansion2F_BlockData: - INCBIN "maps/CeladonMansion2F.blk" - -CeladonMansion3F_BlockData: - INCBIN "maps/CeladonMansion3F.blk" - -CeladonMansionRoof_BlockData: - INCBIN "maps/CeladonMansionRoof.blk" - -BetaHouse_BlockData: - INCBIN "maps/BetaHouse.blk" - -CeladonGameCorner_BlockData: - INCBIN "maps/CeladonGameCorner.blk" - -CeladonGameCornerPrizeRoom_BlockData: - INCBIN "maps/CeladonGameCornerPrizeRoom.blk" - -Colosseum_BlockData: - INCBIN "maps/Colosseum.blk" - -TradeCenter_BlockData: -TimeCapsule_BlockData: - INCBIN "maps/TradeCenter.blk" - -EcruteakLugiaSpeechHouse_BlockData: -EcruteakItemfinderHouse_BlockData: -VioletNicknameSpeechHouse_BlockData: -VioletKylesHouse_BlockData: - INCBIN "maps/House2.blk" - -BetaCave_BlockData: - INCBIN "maps/BetaCave.blk" - -UnionCaveB1F_BlockData: - INCBIN "maps/UnionCaveB1F.blk" - -UnionCaveB2F_BlockData: - INCBIN "maps/UnionCaveB2F.blk" - -UnionCave1F_BlockData: - INCBIN "maps/UnionCave1F.blk" - -NationalPark_BlockData: -NationalParkBugContest_BlockData: - INCBIN "maps/NationalPark.blk" - -Route5UndergroundPathEntrance_BlockData: -Route6UndergroundPathEntrance_BlockData: - INCBIN "maps/UndergroundPathEntrance.blk" - -BetaPokecenterTradeStation_BlockData: - INCBIN "maps/BetaPokecenterTradeStation.blk" - -KurtsHouse_BlockData: - INCBIN "maps/KurtsHouse.blk" - -GoldenrodMagnetTrainStation_BlockData: - INCBIN "maps/GoldenrodMagnetTrainStation.blk" - -RuinsOfAlphOutside_BlockData: - INCBIN "maps/RuinsOfAlphOutside.blk" - -BetaRuinsOfAlphUnsolvedPuzzleRoom_BlockData: - INCBIN "maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk" - -RuinsOfAlphInnerChamber_BlockData: - INCBIN "maps/RuinsOfAlphInnerChamber.blk" - -RuinsOfAlphHoOhChamber_BlockData: -RuinsOfAlphKabutoChamber_BlockData: -RuinsOfAlphOmanyteChamber_BlockData: -RuinsOfAlphAerodactylChamber_BlockData: - INCBIN "maps/RuinsOfAlphPuzzleChamber.blk" - -SproutTower1F_BlockData: - INCBIN "maps/SproutTower1F.blk" - -BetaSproutTowerCutOut1_BlockData: - INCBIN "maps/BetaSproutTowerCutOut1.blk" - -SproutTower2F_BlockData: - INCBIN "maps/SproutTower2F.blk" - -BetaSproutTowerCutOut2_BlockData: - INCBIN "maps/BetaSproutTowerCutOut2.blk" - -SproutTower3F_BlockData: - INCBIN "maps/SproutTower3F.blk" - -BetaSproutTowerCutOut3_BlockData: - INCBIN "maps/BetaSproutTowerCutOut3.blk" - -RadioTower1F_BlockData: - INCBIN "maps/RadioTower1F.blk" - -RadioTower2F_BlockData: - INCBIN "maps/RadioTower2F.blk" - -RadioTower3F_BlockData: - INCBIN "maps/RadioTower3F.blk" - -RadioTower4F_BlockData: - INCBIN "maps/RadioTower4F.blk" - -RadioTower5F_BlockData: - INCBIN "maps/RadioTower5F.blk" - -NewBarkTown_BlockData: - INCBIN "maps/NewBarkTown.blk" - -CherrygroveCity_BlockData: - INCBIN "maps/CherrygroveCity.blk" - -VioletCity_BlockData: - INCBIN "maps/VioletCity.blk" - -AzaleaTown_BlockData: - INCBIN "maps/AzaleaTown.blk" - -CianwoodCity_BlockData: - INCBIN "maps/CianwoodCity.blk" - -GoldenrodCity_BlockData: - INCBIN "maps/GoldenrodCity.blk" - -OlivineCity_BlockData: - INCBIN "maps/OlivineCity.blk" - -EcruteakCity_BlockData: - INCBIN "maps/EcruteakCity.blk" - -MahoganyTown_BlockData: - INCBIN "maps/MahoganyTown.blk" - -LakeOfRage_BlockData: - INCBIN "maps/LakeOfRage.blk" - -BlackthornCity_BlockData: - INCBIN "maps/BlackthornCity.blk" - -SilverCaveOutside_BlockData: - INCBIN "maps/SilverCaveOutside.blk" - -Route6_BlockData: - INCBIN "maps/Route6.blk" - -Route7_BlockData: - INCBIN "maps/Route7.blk" - -Route16_BlockData: - INCBIN "maps/Route16.blk" - -Route18_BlockData: - INCBIN "maps/Route18.blk" - -GoldenrodUnderground_BlockData: - INCBIN "maps/GoldenrodUnderground.blk" - -GoldenrodUndergroundSwitchRoomEntrances_BlockData: - INCBIN "maps/GoldenrodUndergroundSwitchRoomEntrances.blk" - -GoldenrodDeptStoreB1F_BlockData: - INCBIN "maps/GoldenrodDeptStoreB1F.blk" - -GoldenrodUndergroundWarehouse_BlockData: - INCBIN "maps/GoldenrodUndergroundWarehouse.blk" - -BetaElevator_BlockData: - INCBIN "maps/BetaElevator.blk" - -TinTower1F_BlockData: - INCBIN "maps/TinTower1F.blk" - -TinTower2F_BlockData: - INCBIN "maps/TinTower2F.blk" - -TinTower3F_BlockData: - INCBIN "maps/TinTower3F.blk" - -TinTower4F_BlockData: - INCBIN "maps/TinTower4F.blk" - -TinTower5F_BlockData: - INCBIN "maps/TinTower5F.blk" - -TinTower6F_BlockData: - INCBIN "maps/TinTower6F.blk" - -TinTower7F_BlockData: - INCBIN "maps/TinTower7F.blk" - -TinTower8F_BlockData: - INCBIN "maps/TinTower8F.blk" - -TinTower9F_BlockData: - INCBIN "maps/TinTower9F.blk" - -TinTowerRoof_BlockData: - INCBIN "maps/TinTowerRoof.blk" - -BurnedTower1F_BlockData: - INCBIN "maps/BurnedTower1F.blk" - -BurnedTowerB1F_BlockData: - INCBIN "maps/BurnedTowerB1F.blk" - -BetaCaveTestMap_BlockData: - INCBIN "maps/BetaCaveTestMap.blk" - -MountMortar1FOutside_BlockData: - INCBIN "maps/MountMortar1FOutside.blk" - -MountMortar1FInside_BlockData: - INCBIN "maps/MountMortar1FInside.blk" - -MountMortar2FInside_BlockData: - INCBIN "maps/MountMortar2FInside.blk" - -MountMortarB1F_BlockData: - INCBIN "maps/MountMortarB1F.blk" - -IcePath1F_BlockData: - INCBIN "maps/IcePath1F.blk" - -IcePathB1F_BlockData: - INCBIN "maps/IcePathB1F.blk" - -IcePathB2FMahoganySide_BlockData: - INCBIN "maps/IcePathB2FMahoganySide.blk" - -IcePathB2FBlackthornSide_BlockData: - INCBIN "maps/IcePathB2FBlackthornSide.blk" - -IcePathB3F_BlockData: - INCBIN "maps/IcePathB3F.blk" - -WhirlIslandNW_BlockData: - INCBIN "maps/WhirlIslandNW.blk" - -WhirlIslandNE_BlockData: - INCBIN "maps/WhirlIslandNE.blk" - -WhirlIslandSW_BlockData: - INCBIN "maps/WhirlIslandSW.blk" - -WhirlIslandCave_BlockData: - INCBIN "maps/WhirlIslandCave.blk" - -WhirlIslandSE_BlockData: - INCBIN "maps/WhirlIslandSE.blk" - -WhirlIslandB1F_BlockData: - INCBIN "maps/WhirlIslandB1F.blk" - -WhirlIslandB2F_BlockData: - INCBIN "maps/WhirlIslandB2F.blk" - -WhirlIslandLugiaChamber_BlockData: - INCBIN "maps/WhirlIslandLugiaChamber.blk" - -SilverCaveRoom1_BlockData: - INCBIN "maps/SilverCaveRoom1.blk" - -SilverCaveRoom2_BlockData: - INCBIN "maps/SilverCaveRoom2.blk" - -SilverCaveRoom3_BlockData: - INCBIN "maps/SilverCaveRoom3.blk" - -BetaRocketHideout1_BlockData: - INCBIN "maps/BetaRocketHideout1.blk" - -BetaRocketHideout2_BlockData: - INCBIN "maps/BetaRocketHideout2.blk" - -BetaEmptyHouse_BlockData: - INCBIN "maps/BetaEmptyHouse.blk" - -BetaRocketHideout3_BlockData: - INCBIN "maps/BetaRocketHideout3.blk" - -MahoganyMart1F_BlockData: -MountMoonGiftShop_BlockData: - INCBIN "maps/GiftShop.blk" - -TeamRocketBaseB1F_BlockData: - INCBIN "maps/TeamRocketBaseB1F.blk" - -TeamRocketBaseB2F_BlockData: - INCBIN "maps/TeamRocketBaseB2F.blk" - -TeamRocketBaseB3F_BlockData: - INCBIN "maps/TeamRocketBaseB3F.blk" - -BetaRoute23EarlyVersion_BlockData: - INCBIN "maps/BetaRoute23EarlyVersion.blk" - -IndigoPlateauPokecenter1F_BlockData: - INCBIN "maps/IndigoPlateauPokecenter1F.blk" - -WillsRoom_BlockData: - INCBIN "maps/WillsRoom.blk" - -KogasRoom_BlockData: - INCBIN "maps/KogasRoom.blk" - -BrunosRoom_BlockData: - INCBIN "maps/BrunosRoom.blk" - -KarensRoom_BlockData: - INCBIN "maps/KarensRoom.blk" - -AzaleaGym_BlockData: - INCBIN "maps/AzaleaGym.blk" - -VioletGym_BlockData: - INCBIN "maps/VioletGym.blk" - -GoldenrodGym_BlockData: - INCBIN "maps/GoldenrodGym.blk" - -EcruteakGym_BlockData: - INCBIN "maps/EcruteakGym.blk" - -MahoganyGym_BlockData: - INCBIN "maps/MahoganyGym.blk" - -OlivineGym_BlockData: - INCBIN "maps/OlivineGym.blk" - -BetaUnknown_BlockData: - INCBIN "maps/BetaUnknown.blk" - -CianwoodGym_BlockData: - INCBIN "maps/CianwoodGym.blk" - -BlackthornGym1F_BlockData: - INCBIN "maps/BlackthornGym1F.blk" - -BlackthornGym2F_BlockData: - INCBIN "maps/BlackthornGym2F.blk" - -OlivineLighthouse1F_BlockData: - INCBIN "maps/OlivineLighthouse1F.blk" - -OlivineLighthouse2F_BlockData: - INCBIN "maps/OlivineLighthouse2F.blk" - -OlivineLighthouse3F_BlockData: - INCBIN "maps/OlivineLighthouse3F.blk" - -OlivineLighthouse4F_BlockData: - INCBIN "maps/OlivineLighthouse4F.blk" - -OlivineLighthouse5F_BlockData: - INCBIN "maps/OlivineLighthouse5F.blk" - -OlivineLighthouse6F_BlockData: - INCBIN "maps/OlivineLighthouse6F.blk" - - -SECTION "Map Blockdata 3", ROMX - -BetaCave2_BlockData: - INCBIN "maps/BetaCave2.blk" - -SlowpokeWellB1F_BlockData: - INCBIN "maps/SlowpokeWellB1F.blk" - -SlowpokeWellB2F_BlockData: - INCBIN "maps/SlowpokeWellB2F.blk" - -IlexForest_BlockData: - INCBIN "maps/IlexForest.blk" - -DarkCaveVioletEntrance_BlockData: - INCBIN "maps/DarkCaveVioletEntrance.blk" - -DarkCaveBlackthornEntrance_BlockData: - INCBIN "maps/DarkCaveBlackthornEntrance.blk" - -RuinsOfAlphResearchCenter_BlockData: - INCBIN "maps/RuinsOfAlphResearchCenter.blk" - -GoldenrodBikeShop_BlockData: - INCBIN "maps/GoldenrodBikeShop.blk" - -DanceTheatre_BlockData: - INCBIN "maps/DanceTheatre.blk" - -EcruteakHouse_BlockData: - INCBIN "maps/EcruteakHouse.blk" - -GoldenrodGameCorner_BlockData: - INCBIN "maps/GoldenrodGameCorner.blk" - -Route35NationalParkGate_BlockData: - INCBIN "maps/Route35NationalParkGate.blk" - -Route36NationalParkGate_BlockData: - INCBIN "maps/Route36NationalParkGate.blk" - -FastShip1F_BlockData: - INCBIN "maps/FastShip1F.blk" - -FastShipB1F_BlockData: - INCBIN "maps/FastShipB1F.blk" - -BetaSSAquaInsideCutOut_BlockData: - INCBIN "maps/BetaSSAquaInsideCutOut.blk" - -FastShipCabins_NNW_NNE_NE_BlockData: - INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk" - -FastShipCabins_SW_SSW_NW_BlockData: - INCBIN "maps/FastShipCabins_SW_SSW_NW.blk" - -FastShipCabins_SE_SSE_CaptainsCabin_BlockData: - INCBIN "maps/FastShipCabins_SE_SSE_CaptainsCabin.blk" - -OlivinePort_BlockData: - INCBIN "maps/OlivinePort.blk" - -VermilionPort_BlockData: - INCBIN "maps/VermilionPort.blk" - -OlivineCafe_BlockData: -SafariZoneMainOffice_BlockData: - INCBIN "maps/OlivineCafe.blk" - -KrissHouse2F_BlockData: - INCBIN "maps/KrissHouse2F.blk" - -SaffronTrainStation_BlockData: - INCBIN "maps/SaffronTrainStation.blk" - -CeruleanGym_BlockData: - INCBIN "maps/CeruleanGym.blk" - -VermilionGym_BlockData: - INCBIN "maps/VermilionGym.blk" - -SaffronGym_BlockData: - INCBIN "maps/SaffronGym.blk" - -PowerPlant_BlockData: - INCBIN "maps/PowerPlant.blk" - -PokemonFanClub_BlockData: -SafariZoneWardensHome_BlockData: - INCBIN "maps/PokemonFanClub.blk" - -FightingDojo_BlockData: - INCBIN "maps/FightingDojo.blk" - -SilphCo1F_BlockData: - INCBIN "maps/SilphCo1F.blk" - -ViridianGym_BlockData: - INCBIN "maps/ViridianGym.blk" - -TrainerHouse1F_BlockData: - INCBIN "maps/TrainerHouse1F.blk" - -TrainerHouseB1F_BlockData: - INCBIN "maps/TrainerHouseB1F.blk" - -RedsHouse1F_BlockData: - INCBIN "maps/RedsHouse1F.blk" - -RedsHouse2F_BlockData: - INCBIN "maps/RedsHouse2F.blk" - -OaksLab_BlockData: - INCBIN "maps/OaksLab.blk" - -MrFujisHouse_BlockData: - INCBIN "maps/MrFujisHouse.blk" - -LavRadioTower1F_BlockData: - INCBIN "maps/LavRadioTower1F.blk" - -SilverCaveItemRooms_BlockData: - INCBIN "maps/SilverCaveItemRooms.blk" - -DayCare_BlockData: - INCBIN "maps/DayCare.blk" - -SoulHouse_BlockData: - INCBIN "maps/SoulHouse.blk" - -PewterGym_BlockData: - INCBIN "maps/PewterGym.blk" - -CeladonGym_BlockData: - INCBIN "maps/CeladonGym.blk" - -BetaHouse2_BlockData: - INCBIN "maps/BetaHouse2.blk" - -CeladonCafe_BlockData: - INCBIN "maps/CeladonCafe.blk" - -BetaCeladonMansion_BlockData: - INCBIN "maps/BetaCeladonMansion.blk" - -RockTunnel1F_BlockData: - INCBIN "maps/RockTunnel1F.blk" - -RockTunnelB1F_BlockData: - INCBIN "maps/RockTunnelB1F.blk" - -DiglettsCave_BlockData: - INCBIN "maps/DiglettsCave.blk" - -MountMoon_BlockData: - INCBIN "maps/MountMoon.blk" - -SeafoamGym_BlockData: - INCBIN "maps/SeafoamGym.blk" - -MrPokemonsHouse_BlockData: - INCBIN "maps/MrPokemonsHouse.blk" - -VictoryRoadGate_BlockData: - INCBIN "maps/VictoryRoadGate.blk" - -OlivinePortPassage_BlockData: -VermilionPortPassage_BlockData: - INCBIN "maps/PortPassage.blk" - -FuchsiaGym_BlockData: - INCBIN "maps/FuchsiaGym.blk" - -SafariZoneBeta_BlockData: - INCBIN "maps/SafariZoneBeta.blk" - -UndergroundPath_BlockData: - INCBIN "maps/UndergroundPath.blk" - -Route39Barn_BlockData: - INCBIN "maps/Route39Barn.blk" - -VictoryRoad_BlockData: - INCBIN "maps/VictoryRoad.blk" - -Route23_BlockData: - INCBIN "maps/Route23.blk" - -LancesRoom_BlockData: - INCBIN "maps/LancesRoom.blk" - -HallOfFame_BlockData: - INCBIN "maps/HallOfFame.blk" - -CopycatsHouse1F_BlockData: - INCBIN "maps/CopycatsHouse1F.blk" - -CopycatsHouse2F_BlockData: - INCBIN "maps/CopycatsHouse2F.blk" - -GoldenrodFlowerShop_BlockData: - INCBIN "maps/GoldenrodFlowerShop.blk" - -MountMoonSquare_BlockData: - INCBIN "maps/MountMoonSquare.blk" - -WiseTriosRoom_BlockData: - INCBIN "maps/WiseTriosRoom.blk" - -DragonsDen1F_BlockData: - INCBIN "maps/DragonsDen1F.blk" - -DragonsDenB1F_BlockData: - INCBIN "maps/DragonsDenB1F.blk" - -TohjoFalls_BlockData: - INCBIN "maps/TohjoFalls.blk" - -RuinsOfAlphHoOhItemRoom_BlockData: -RuinsOfAlphKabutoItemRoom_BlockData: -RuinsOfAlphOmanyteItemRoom_BlockData: -RuinsOfAlphAerodactylItemRoom_BlockData: - INCBIN "maps/RuinsOfAlphItemRoom.blk" - -RuinsOfAlphHoOhWordRoom_BlockData: - INCBIN "maps/RuinsOfAlphHoOhWordRoom.blk" - -RuinsOfAlphKabutoWordRoom_BlockData: - INCBIN "maps/RuinsOfAlphKabutoWordRoom.blk" - -RuinsOfAlphOmanyteWordRoom_BlockData: - INCBIN "maps/RuinsOfAlphOmanyteWordRoom.blk" - -RuinsOfAlphAerodactylWordRoom_BlockData: - INCBIN "maps/RuinsOfAlphAerodactylWordRoom.blk" - -DragonShrine_BlockData: - INCBIN "maps/DragonShrine.blk" - -BattleTower1F_BlockData: - INCBIN "maps/BattleTower1F.blk" - -BattleTowerBattleRoom_BlockData: - INCBIN "maps/BattleTowerBattleRoom.blk" - -GoldenrodPokeComCenter2FMobile_BlockData: - INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk" - -MobileTradeRoomMobile_BlockData: - INCBIN "maps/MobileTradeRoomMobile.blk" - -MobileBattleRoom_BlockData: - INCBIN "maps/MobileBattleRoom.blk" - -BattleTowerHallway_BlockData: - INCBIN "maps/BattleTowerHallway.blk" - -BattleTowerElevator_BlockData: - INCBIN "maps/BattleTowerElevator.blk" - -BattleTowerOutside_BlockData: - INCBIN "maps/BattleTowerOutside.blk" - -BetaBlank_BlockData: - INCBIN "maps/BetaBlank.blk" - -GoldenrodDeptStoreRoof_BlockData: - INCBIN "maps/GoldenrodDeptStoreRoof.blk" diff --git a/maps/map_headers.asm b/maps/map_headers.asm deleted file mode 100644 index ac4b20ece..000000000 --- a/maps/map_headers.asm +++ /dev/null @@ -1,510 +0,0 @@ -map_header: MACRO -;\1: map label -;\2: tileset: a TILESET_* constant -;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON -;\4: location: from constants/landmark_constants.asm -;\5: music: a MUSIC_* constant -;\6: phone service flag: 1 to prevent phone calls -;\7: time of day: a PALETTE_* constant -;\8: fishing group: a FISHGROUP_* constant -\1_MapHeader: - db BANK(\1_SecondMapHeader), \2, \3 - dw \1_SecondMapHeader - db \4, \5 - dn \6, \7 - db \8 -ENDM - -MapGroupPointers:: -; pointers to the first map header of each map group - dw MapGroup_Olivine ; 1 - dw MapGroup_Mahogany ; 2 - dw MapGroup_Dungeons ; 3 - dw MapGroup_Ecruteak ; 4 - dw MapGroup_Blackthorn ; 5 - dw MapGroup_Cinnabar ; 6 - dw MapGroup_Cerulean ; 7 - dw MapGroup_Azalea ; 8 - dw MapGroup_LakeOfRage ; 9 - dw MapGroup_Violet ; 10 - dw MapGroup_Goldenrod ; 11 - dw MapGroup_Vermilion ; 12 - dw MapGroup_Pallet ; 13 - dw MapGroup_Pewter ; 14 - dw MapGroup_FastShip ; 15 - dw MapGroup_Indigo ; 16 - dw MapGroup_Fuchsia ; 17 - dw MapGroup_Lavender ; 18 - dw MapGroup_Silver ; 19 - dw MapGroup_CableClub ; 20 - dw MapGroup_Celadon ; 21 - dw MapGroup_Cianwood ; 22 - dw MapGroup_Viridian ; 23 - dw MapGroup_NewBark ; 24 - dw MapGroup_Saffron ; 25 - dw MapGroup_Cherrygrove ; 26 - -MapGroup_Olivine: - map_header OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivineGym, TILESET_OLIVINE_GYM, INDOOR, OLIVINE_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivineTimsHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivineHouseBeta, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivinePunishmentSpeechHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivineGoodRodHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivineCafe, TILESET_GAME_CORNER, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivineMart, TILESET_MART, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route39Barn, TILESET_KURTS_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route39Farmhouse, TILESET_HOUSE_1, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route38, TILESET_JOHTO_1, ROUTE, ROUTE_38, MUSIC_ROUTE_37, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header Route39, TILESET_JOHTO_1, ROUTE, ROUTE_39, MUSIC_ROUTE_37, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header OlivineCity, TILESET_JOHTO_1, TOWN, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE - - -MapGroup_Mahogany: - map_header MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE_1, INDOOR, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header MahoganyGym, TILESET_GYM_1, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route42EcruteakGate, TILESET_GATE, GATE, ROUTE_42, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route42, TILESET_JOHTO_1, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_LAKE - map_header Route44, TILESET_JOHTO_1, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_POND - map_header MahoganyTown, TILESET_JOHTO_1, TOWN, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE - - -MapGroup_Dungeons: - map_header SproutTower1F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header SproutTower2F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header SproutTower3F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower1F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower2F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower3F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower4F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower5F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower6F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower7F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower8F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTower9F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header BurnedTower1F, TILESET_SPROUT_TOWER, DUNGEON, BURNED_TOWER, MUSIC_BURNED_TOWER, 1, PALETTE_NITE, FISHGROUP_SHORE - map_header BurnedTowerB1F, TILESET_CAVE, CAVE, BURNED_TOWER, MUSIC_BURNED_TOWER, 1, PALETTE_NITE, FISHGROUP_SHORE - map_header NationalPark, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_NATIONAL_PARK, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header NationalParkBugContest, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header RadioTower1F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RadioTower2F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsOfAlphOutside, TILESET_JOHTO_1, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 0, PALETTE_AUTO, FISHGROUP_POND - map_header RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsOfAlphOmanyteChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsOfAlphAerodactylChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsOfAlphInnerChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_RUINS_OF_ALPH_INTERIOR, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsOfAlphResearchCenter, TILESET_POWER_PLANT, INDOOR, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsOfAlphHoOhItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsOfAlphKabutoItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsOfAlphOmanyteItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsOfAlphAerodactylItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsOfAlphHoOhWordRoom, TILESET_HO_OH_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsOfAlphKabutoWordRoom, TILESET_KABUTO_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsOfAlphOmanyteWordRoom, TILESET_OMANYTE_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsOfAlphAerodactylWordRoom, TILESET_AERODACTYL_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header UnionCave1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header UnionCaveB1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header UnionCaveB2F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_SHORE - map_header SlowpokeWellB1F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header SlowpokeWellB2F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header OlivineLighthouse1F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivineLighthouse2F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivineLighthouse3F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header MahoganyMart1F, TILESET_KURTS_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header TeamRocketBaseB2F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header TeamRocketBaseB3F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header IlexForest, TILESET_ILEX_FOREST, CAVE, ILEX_FOREST, MUSIC_UNION_CAVE, 0, PALETTE_NITE, FISHGROUP_POND - map_header GoldenrodUnderground, TILESET_GATE, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodUndergroundSwitchRoomEntrances, TILESET_GYM_1, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodDeptStoreB1F, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodUndergroundWarehouse, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header MountMortar1FOutside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header MountMortar1FInside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header MountMortar2FInside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header MountMortarB1F, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header IcePath1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, 1, PALETTE_NITE, FISHGROUP_DRATINI - map_header IcePathB1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, 1, PALETTE_NITE, FISHGROUP_DRATINI - map_header IcePathB2FMahoganySide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, 1, PALETTE_NITE, FISHGROUP_DRATINI - map_header IcePathB2FBlackthornSide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, 1, PALETTE_NITE, FISHGROUP_DRATINI - map_header IcePathB3F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, 1, PALETTE_NITE, FISHGROUP_DRATINI - map_header WhirlIslandNW, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header WhirlIslandNE, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header WhirlIslandSW, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header WhirlIslandCave, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header WhirlIslandSE, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header WhirlIslandB1F, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header WhirlIslandB2F, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header WhirlIslandLugiaChamber, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, 1, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_header SilverCaveRoom1, TILESET_WHIRL_ISLANDS, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, 1, PALETTE_DARK, FISHGROUP_LAKE - map_header SilverCaveRoom2, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header SilverCaveRoom3, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, 1, PALETTE_DAY, FISHGROUP_LAKE - map_header SilverCaveItemRooms, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header DarkCaveVioletEntrance, TILESET_WHIRL_ISLANDS, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, 1, PALETTE_DARK, FISHGROUP_LAKE - map_header DarkCaveBlackthornEntrance, TILESET_WHIRL_ISLANDS, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, 1, PALETTE_DARK, FISHGROUP_LAKE - map_header DragonsDen1F, TILESET_CAVE, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, 1, PALETTE_NITE, FISHGROUP_DRATINI - map_header DragonsDenB1F, TILESET_JOHTO_1, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, 1, PALETTE_NITE, FISHGROUP_DRATINI - map_header DragonShrine, TILESET_LAB, INDOOR, DRAGONS_DEN, MUSIC_DRAGONS_DEN, 1, PALETTE_NITE, FISHGROUP_SHORE - map_header TohjoFalls, TILESET_CAVE, CAVE, TOHJO_FALLS, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE - map_header DiglettsCave, TILESET_CAVE, CAVE, DIGLETTS_CAVE, MUSIC_MT_MOON, 1, PALETTE_NITE, FISHGROUP_SHORE - map_header MountMoon, TILESET_CAVE, CAVE, MT_MOON, MUSIC_MT_MOON, 1, PALETTE_NITE, FISHGROUP_SHORE - map_header UndergroundPath, TILESET_UNDERGROUND, GATE, UNDERGROUND_PATH, MUSIC_MT_MOON, 0, PALETTE_NITE, FISHGROUP_SHORE - map_header RockTunnel1F, TILESET_WHIRL_ISLANDS, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, 1, PALETTE_DARK, FISHGROUP_SHORE - map_header RockTunnelB1F, TILESET_WHIRL_ISLANDS, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, 1, PALETTE_DARK, FISHGROUP_SHORE - map_header SafariZoneFuchsiaGateBeta, TILESET_GATE, INDOOR, FUCHSIA_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header SafariZoneBeta, TILESET_PARK, CAVE, FUCHSIA_CITY, MUSIC_EVOLUTION, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, 1, PALETTE_NITE, FISHGROUP_SHORE - - -MapGroup_Ecruteak: - map_header EcruteakHouse, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header WiseTriosRoom, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header EcruteakLugiaSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header DanceTheatre, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header EcruteakGym, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header EcruteakItemfinderHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header EcruteakCity, TILESET_JOHTO_1, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, FISHGROUP_POND - - -MapGroup_Blackthorn: - map_header BlackthornGym1F, TILESET_GYM_1, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header BlackthornGym2F, TILESET_GYM_1, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header BlackthornDragonSpeechHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header BlackthornEmysHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header BlackthornMart, TILESET_MART, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header BlackthornPokecenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header MoveDeletersHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route45, TILESET_JOHTO_1, ROUTE, ROUTE_45, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_DRATINI_2 - map_header Route46, TILESET_JOHTO_1, ROUTE, ROUTE_46, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header BlackthornCity, TILESET_JOHTO_1, TOWN, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_AUTO, FISHGROUP_POND - - -MapGroup_Cinnabar: - map_header CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CinnabarPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route19FuchsiaGate, TILESET_GATE, GATE, ROUTE_19, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header SeafoamGym, TILESET_CAVE, INDOOR, SEAFOAM_ISLANDS, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header Route19, TILESET_KANTO, ROUTE, ROUTE_19, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header Route20, TILESET_KANTO, ROUTE, ROUTE_20, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_OCEAN - map_header Route21, TILESET_KANTO, ROUTE, ROUTE_21, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_OCEAN - map_header CinnabarIsland, TILESET_KANTO, TOWN, CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_OCEAN - - -MapGroup_Cerulean: - map_header CeruleanGymBadgeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeruleanPoliceStation, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeruleanTradeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeruleanPokecenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeruleanPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeruleanGym, TILESET_PORT, INDOOR, CERULEAN_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_NONE - map_header CeruleanMart, TILESET_MART, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route10Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route10Pokecenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header PowerPlant, TILESET_POWER_PLANT, INDOOR, POWER_PLANT, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header BillsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_25, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route4, TILESET_KANTO, ROUTE, ROUTE_4, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_NONE - map_header Route9, TILESET_KANTO, ROUTE, ROUTE_9, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_LAKE - map_header Route10North, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_LAKE - map_header Route24, TILESET_KANTO, ROUTE, ROUTE_24, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_LAKE - map_header Route25, TILESET_KANTO, ROUTE, ROUTE_25, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_LAKE - map_header CeruleanCity, TILESET_KANTO, TOWN, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_NONE - - -MapGroup_Azalea: - map_header AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CharcoalKiln, TILESET_HOUSE_1, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header KurtsHouse, TILESET_KURTS_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header AzaleaGym, TILESET_GYM_1, INDOOR, AZALEA_TOWN, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header Route33, TILESET_JOHTO_2, ROUTE, ROUTE_33, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header AzaleaTown, TILESET_JOHTO_2, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_AUTO, FISHGROUP_SHORE - - -MapGroup_LakeOfRage: - map_header LakeOfRageHiddenPowerHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header LakeOfRageMagikarpHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route43MahoganyGate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route43Gate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route43, TILESET_JOHTO_1, ROUTE, ROUTE_43, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_POND - map_header LakeOfRage, TILESET_JOHTO_1, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_GYARADOS - - -MapGroup_Violet: - map_header Route32, TILESET_JOHTO_1, ROUTE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_QWILFISH - map_header Route35, TILESET_JOHTO_1, ROUTE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_POND - map_header Route36, TILESET_JOHTO_1, ROUTE, ROUTE_36, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header Route37, TILESET_JOHTO_1, ROUTE, ROUTE_37, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header VioletCity, TILESET_JOHTO_1, TOWN, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_AUTO, FISHGROUP_POND - map_header VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VioletGym, TILESET_GYM_1, INDOOR, VIOLET_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VioletNicknameSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VioletKylesHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route35NationalParkGate, TILESET_GATE, INDOOR, ROUTE_35, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route36RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_36, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route36NationalParkGate, TILESET_GATE, INDOOR, ROUTE_36, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - - -MapGroup_Goldenrod: - map_header Route34, TILESET_JOHTO_2, ROUTE, ROUTE_34, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header GoldenrodCity, TILESET_JOHTO_2, TOWN, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header GoldenrodGym, TILESET_GYM_1, INDOOR, GOLDENROD_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodBikeShop, TILESET_OLIVINE_GYM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodHappinessRater, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodBillsHouse, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodFlowerShop, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodPPSpeechHouse, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodNameRater, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodDeptStore1F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodDeptStore2F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodDeptStore3F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodDeptStore4F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodDeptStore5F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodDeptStore6F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodDeptStoreElevator, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodPokeComCenter2FMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header DayCare, TILESET_HOUSE_1, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - - -MapGroup_Vermilion: - map_header Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_POND - map_header Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_AUTO, FISHGROUP_OCEAN - map_header VermilionHouseFishingSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header PokemonFanClub, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VermilionMagnetTrainSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VermilionHouseDiglettsCaveSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VermilionGym, TILESET_GAME_CORNER, INDOOR, VERMILION_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header Route6SaffronGate, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE - - -MapGroup_Pallet: - map_header Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_AUTO, FISHGROUP_OCEAN - map_header RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header RedsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header BluesHouse, TILESET_HOUSE_1, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, 0, PALETTE_DAY, FISHGROUP_SHORE - - -MapGroup_Pewter: - map_header Route3, TILESET_KANTO, ROUTE, ROUTE_3, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header PewterCity, TILESET_KANTO, TOWN, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header PewterNidoranSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header PewterGym, TILESET_SPROUT_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header PewterPokecenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header PewterSnoozeSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - - -MapGroup_FastShip: - map_header OlivinePort, TILESET_PORT, ROUTE, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_AUTO, FISHGROUP_OCEAN - map_header VermilionPort, TILESET_PORT, ROUTE, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_AUTO, FISHGROUP_OCEAN - map_header FastShip1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header FastShipCabins_NNW_NNE_NE, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header FastShipCabins_SW_SSW_NW, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header FastShipCabins_SE_SSE_CaptainsCabin, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header FastShipB1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header MountMoonGiftShop, TILESET_KURTS_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TinTowerRoof, TILESET_SPROUT_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_AUTO, FISHGROUP_SHORE - - -MapGroup_Indigo: - map_header Route23, TILESET_KANTO, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header WillsRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header KogasRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header BrunosRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header KarensRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header LancesRoom, TILESET_OLIVINE_GYM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header HallOfFame, TILESET_ICE_PATH, INDOOR, INDIGO_PLATEAU, MUSIC_NEW_BARK_TOWN, 1, PALETTE_DAY, FISHGROUP_SHORE - - -MapGroup_Fuchsia: - map_header Route13, TILESET_KANTO, ROUTE, ROUTE_13, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM - map_header Route14, TILESET_KANTO, ROUTE, ROUTE_14, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header Route15, TILESET_KANTO, ROUTE, ROUTE_15, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header Route18, TILESET_KANTO, ROUTE, ROUTE_18, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header FuchsiaCity, TILESET_KANTO, TOWN, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_AUTO, FISHGROUP_GYARADOS - map_header FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header FuchsiaBillSpeechHouse, TILESET_HOUSE_1, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header SafariZoneWardensHome, TILESET_HOUSE_1, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route15FuchsiaGate, TILESET_GATE, GATE, ROUTE_15, MUSIC_ROUTE_12, 0, PALETTE_DAY, FISHGROUP_SHORE - - -MapGroup_Lavender: - map_header Route8, TILESET_KANTO, ROUTE, ROUTE_8, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header Route12, TILESET_KANTO, ROUTE, ROUTE_12, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM - map_header Route10South, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_LAKE - map_header LavenderTown, TILESET_KANTO, TOWN, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_AUTO, FISHGROUP_SHORE - 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 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 - map_header LavRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LAV_RADIO_TOWER, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route8SaffronGate, TILESET_GATE, GATE, ROUTE_8, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route12SuperRodHouse, TILESET_HOUSE_1, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - - -MapGroup_Silver: - map_header Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_POND - map_header SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_POND - map_header SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route28FamousSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - - -MapGroup_CableClub: - map_header Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header TimeCapsule, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header MobileTradeRoomMobile, TILESET_CELADON_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header MobileBattleRoom, TILESET_CELADON_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - - -MapGroup_Celadon: - map_header Route7, TILESET_KANTO, ROUTE, ROUTE_7, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header Route16, TILESET_KANTO, ROUTE, ROUTE_16, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header Route17, TILESET_KANTO, ROUTE, ROUTE_17, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_NONE - map_header CeladonCity, TILESET_KANTO, TOWN, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_AUTO, FISHGROUP_NONE - map_header CeladonDeptStore1F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonDeptStore2F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonDeptStore3F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonDeptStore4F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonDeptStore5F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonDeptStore6F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonDeptStoreElevator, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonMansion1F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonMansion2F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonMansion3F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonMansionRoof, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonMansionRoofHouse, TILESET_HOUSE_1, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonPokecenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonGameCorner, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_GAME_CORNER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonGameCornerPrizeRoom, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonGym, TILESET_TRAIN_STATION, INDOOR, CELADON_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonCafe, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - 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 - - -MapGroup_Cianwood: - map_header Route40, TILESET_JOHTO_1, ROUTE, ROUTE_40, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header Route41, TILESET_JOHTO_1, ROUTE, ROUTE_41, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_OCEAN - map_header CianwoodCity, TILESET_JOHTO_1, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header ManiasHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - 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 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 - map_header BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, 0, PALETTE_AUTO, FISHGROUP_SHORE - - -MapGroup_Viridian: - map_header Route2, TILESET_KANTO, ROUTE, ROUTE_2, MUSIC_ROUTE_2, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header Route22, TILESET_KANTO, ROUTE, ROUTE_22, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_POND - map_header ViridianCity, TILESET_KANTO, TOWN, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_POND - map_header ViridianGym, TILESET_TRAIN_STATION, INDOOR, VIRIDIAN_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header ViridianNicknameSpeechHouse, TILESET_HOUSE_1, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TrainerHouse1F, TILESET_HOUSE_1, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header TrainerHouseB1F, TILESET_POWER_PLANT, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route2NuggetSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, 0, PALETTE_DAY, FISHGROUP_SHORE - - -MapGroup_NewBark: - map_header Route26, TILESET_JOHTO_1, ROUTE, ROUTE_26, MUSIC_ROUTE_26, 0, PALETTE_AUTO, FISHGROUP_OCEAN - map_header Route27, TILESET_JOHTO_1, ROUTE, ROUTE_27, MUSIC_ROUTE_26, 0, PALETTE_AUTO, FISHGROUP_OCEAN - map_header Route29, TILESET_JOHTO_1, ROUTE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header NewBarkTown, TILESET_JOHTO_1, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_AUTO, FISHGROUP_OCEAN - map_header ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header KrissHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header KrissHouse2F, TILESET_PLAYERS_HOUSE_2F, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header KrissNeighborsHouse, TILESET_HOUSE_1, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - 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 - - -MapGroup_Saffron: - map_header Route5, TILESET_KANTO, ROUTE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header SaffronCity, TILESET_KANTO, TOWN, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header FightingDojo, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header SaffronGym, TILESET_UNDERGROUND, INDOOR, SAFFRON_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header SaffronMart, TILESET_MART, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - 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 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 Route5CleanseTagSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - - -MapGroup_Cherrygrove: - map_header Route30, TILESET_JOHTO_1, ROUTE, ROUTE_30, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_POND - map_header Route31, TILESET_JOHTO_1, ROUTE, ROUTE_31, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_POND - map_header CherrygroveCity, TILESET_JOHTO_1, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header CherrygroveMart, TILESET_MART, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CherrygrovePokecenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CherrygroveGymSpeechHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GuideGentsHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CherrygroveEvolutionSpeechHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route30BerrySpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header MrPokemonsHouse, TILESET_POWER_PLANT, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route31VioletGate, TILESET_GATE, GATE, ROUTE_31, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm deleted file mode 100644 index 3628babd2..000000000 --- a/maps/second_map_headers.asm +++ /dev/null @@ -1,685 +0,0 @@ -map_header_2: MACRO -;\1: map label -;\2: map id -;\3: border block -;\4: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none -\1_SecondMapHeader:: - db \3 - db \2_HEIGHT, \2_WIDTH - db BANK(\1_BlockData) - dw \1_BlockData - db BANK(\1_MapScriptHeader) - dw \1_MapScriptHeader - dw \1_MapEventHeader - db \4 -ENDM - -connection: MACRO -if "\1" == "north" -;\2: map id -;\3: map label (eventually will be rolled into map id) -;\4: x -;\5: offset? -;\6: strip length -;\7: this map id - map \2 - dw \3_BlockData + \2_WIDTH * (\2_HEIGHT - 3) + \5 - dw OverworldMap + \4 + 3 - db \6 - db \2_WIDTH - db \2_HEIGHT * 2 - 1 - db (\4 - \5) * -2 - dw OverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1 -endc - -if "\1" == "south" -;\2: map id -;\3: map label (eventually will be rolled into map id) -;\4: x -;\5: offset? -;\6: strip length -;\7: this map id - map \2 - dw \3_BlockData + \5 - dw OverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3 - db \6 - db \2_WIDTH - db 0 - db (\4 - \5) * -2 - dw OverworldMap + \2_WIDTH + 7 -endc - -if "\1" == "west" -;\2: map id -;\3: map label (eventually will be rolled into map id) -;\4: y -;\5: offset? -;\6: strip length -;\7: this map id - map \2 - dw \3_BlockData + (\2_WIDTH * \5) + \2_WIDTH - 3 - dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3) - db \6 - db \2_WIDTH - db (\4 - \5) * -2 - db \2_WIDTH * 2 - 1 - dw OverworldMap + \2_WIDTH * 2 + 6 -endc - -if "\1" == "east" -;\2: map id -;\3: map label (eventually will be rolled into map id) -;\4: y -;\5: offset? -;\6: strip length -;\7: this map id - map \2 - dw \3_BlockData + (\2_WIDTH * \5) - dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3 - db \6 - db \2_WIDTH - db (\4 - \5) * -2 - db 0 - dw OverworldMap + \2_WIDTH + 7 -endc -ENDM - - - map_header_2 NewBarkTown, NEW_BARK_TOWN, $5, WEST | EAST - connection west, ROUTE_29, Route29, 0, 0, 9, NEW_BARK_TOWN - connection east, ROUTE_27, Route27, 0, 0, 9, NEW_BARK_TOWN - - map_header_2 CherrygroveCity, CHERRYGROVE_CITY, $35, NORTH | EAST - connection north, ROUTE_30, Route30, 5, 0, 10, CHERRYGROVE_CITY - connection east, ROUTE_29, Route29, 0, 0, 9, CHERRYGROVE_CITY - - map_header_2 VioletCity, VIOLET_CITY, $5, SOUTH | WEST | EAST - connection south, ROUTE_32, Route32, 0, 0, 10, VIOLET_CITY - connection west, ROUTE_36, Route36, 0, 0, 9, VIOLET_CITY - connection east, ROUTE_31, Route31, 9, 0, 9, VIOLET_CITY - - map_header_2 AzaleaTown, AZALEA_TOWN, $5, WEST | EAST - connection west, ROUTE_34, Route34, -3, 15, 12, AZALEA_TOWN - connection east, ROUTE_33, Route33, 0, 0, 9, AZALEA_TOWN - - map_header_2 CianwoodCity, CIANWOOD_CITY, $35, EAST - connection east, ROUTE_41, Route41, 0, 0, 27, CIANWOOD_CITY - - map_header_2 GoldenrodCity, GOLDENROD_CITY, $35, NORTH | SOUTH - connection north, ROUTE_35, Route35, 5, 0, 10, GOLDENROD_CITY - connection south, ROUTE_34, Route34, 5, 0, 10, GOLDENROD_CITY - - map_header_2 OlivineCity, OLIVINE_CITY, $35, NORTH | WEST - connection north, ROUTE_39, Route39, 5, 0, 10, OLIVINE_CITY - connection west, ROUTE_40, Route40, 9, 0, 12, OLIVINE_CITY - - map_header_2 EcruteakCity, ECRUTEAK_CITY, $5, SOUTH | WEST | EAST - connection south, ROUTE_37, Route37, 5, 0, 10, ECRUTEAK_CITY - connection west, ROUTE_38, Route38, 5, 0, 9, ECRUTEAK_CITY - connection east, ROUTE_42, Route42, 9, 0, 9, ECRUTEAK_CITY - - map_header_2 MahoganyTown, MAHOGANY_TOWN, $71, NORTH | WEST | EAST - connection north, ROUTE_43, Route43, 0, 0, 10, MAHOGANY_TOWN - connection west, ROUTE_42, Route42, 0, 0, 9, MAHOGANY_TOWN - connection east, ROUTE_44, Route44, 0, 0, 9, MAHOGANY_TOWN - - map_header_2 LakeOfRage, LAKE_OF_RAGE, $5, SOUTH - connection south, ROUTE_43, Route43, 5, 0, 10, LAKE_OF_RAGE - - map_header_2 BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST - connection south, ROUTE_45, Route45, 0, 0, 10, BLACKTHORN_CITY - connection west, ROUTE_44, Route44, 9, 0, 9, BLACKTHORN_CITY - - map_header_2 SilverCaveOutside, SILVER_CAVE_OUTSIDE, $2c, EAST - connection east, ROUTE_28, Route28, 9, 0, 9, SILVER_CAVE_OUTSIDE - - map_header_2 Route26, ROUTE_26, $5, WEST - connection west, ROUTE_27, Route27, 45, 0, 9, ROUTE_26 - - map_header_2 Route27, ROUTE_27, $35, WEST | EAST - connection west, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_27 - connection east, ROUTE_26, Route26, -3, 42, 12, ROUTE_27 - - map_header_2 Route28, ROUTE_28, $2c, WEST - connection west, SILVER_CAVE_OUTSIDE, SilverCaveOutside, -3, 6, 12, ROUTE_28 - - map_header_2 Route29, ROUTE_29, $5, NORTH | WEST | EAST - connection north, ROUTE_46, Route46, 10, 0, 10, ROUTE_29 - connection west, CHERRYGROVE_CITY, CherrygroveCity, 0, 0, 9, ROUTE_29 - connection east, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_29 - - map_header_2 Route30, ROUTE_30, $5, NORTH | SOUTH - connection north, ROUTE_31, Route31, -3, 7, 13, ROUTE_30 - connection south, CHERRYGROVE_CITY, CherrygroveCity, -3, 2, 16, ROUTE_30 - - map_header_2 Route31, ROUTE_31, $5, SOUTH | WEST - connection south, ROUTE_30, Route30, 10, 0, 10, ROUTE_31 - connection west, VIOLET_CITY, VioletCity, -3, 6, 12, ROUTE_31 - - map_header_2 Route32, ROUTE_32, $5, NORTH | SOUTH - connection north, VIOLET_CITY, VioletCity, 0, 0, 13, ROUTE_32 - connection south, ROUTE_33, Route33, 0, 0, 10, ROUTE_32 - - map_header_2 Route33, ROUTE_33, $5, NORTH | WEST - connection north, ROUTE_32, Route32, 0, 0, 10, ROUTE_33 - connection west, AZALEA_TOWN, AzaleaTown, 0, 0, 9, ROUTE_33 - - map_header_2 Route34, ROUTE_34, $5, NORTH | EAST - connection north, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_34 - connection east, AZALEA_TOWN, AzaleaTown, 18, 0, 9, ROUTE_34 - - map_header_2 Route35, ROUTE_35, $5, NORTH | SOUTH - connection north, ROUTE_36, Route36, 0, 0, 13, ROUTE_35 - connection south, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_35 - - map_header_2 Route36, ROUTE_36, $5, NORTH | SOUTH | EAST - connection north, ROUTE_37, Route37, 10, 0, 10, ROUTE_36 - connection south, ROUTE_35, Route35, 0, 0, 10, ROUTE_36 - connection east, VIOLET_CITY, VioletCity, 0, 0, 12, ROUTE_36 - - map_header_2 Route37, ROUTE_37, $5, NORTH | SOUTH - connection north, ECRUTEAK_CITY, EcruteakCity, -3, 2, 16, ROUTE_37 - connection south, ROUTE_36, Route36, -3, 7, 16, ROUTE_37 - - map_header_2 Route38, ROUTE_38, $5, WEST | EAST - connection west, ROUTE_39, Route39, 0, 0, 12, ROUTE_38 - connection east, ECRUTEAK_CITY, EcruteakCity, -3, 2, 15, ROUTE_38 - - map_header_2 Route39, ROUTE_39, $5, SOUTH | EAST - connection south, OLIVINE_CITY, OlivineCity, -3, 2, 16, ROUTE_39 - connection east, ROUTE_38, Route38, 0, 0, 9, ROUTE_39 - - map_header_2 Route40, ROUTE_40, $35, SOUTH | EAST - connection south, ROUTE_41, Route41, -3, 12, 13, ROUTE_40 - connection east, OLIVINE_CITY, OlivineCity, -3, 6, 12, ROUTE_40 - - map_header_2 Route41, ROUTE_41, $35, NORTH | WEST - connection north, ROUTE_40, Route40, 15, 0, 10, ROUTE_41 - connection west, CIANWOOD_CITY, CianwoodCity, 0, 0, 27, ROUTE_41 - - map_header_2 Route42, ROUTE_42, $5, WEST | EAST - connection west, ECRUTEAK_CITY, EcruteakCity, -3, 6, 12, ROUTE_42 - connection east, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_42 - - map_header_2 Route43, ROUTE_43, $5, NORTH | SOUTH - connection north, LAKE_OF_RAGE, LakeOfRage, -3, 2, 16, ROUTE_43 - connection south, MAHOGANY_TOWN, MahoganyTown, 0, 0, 10, ROUTE_43 - - map_header_2 Route44, ROUTE_44, $71, WEST | EAST - connection west, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_44 - connection east, BLACKTHORN_CITY, BlackthornCity, -3, 6, 12, ROUTE_44 - - map_header_2 Route45, ROUTE_45, $71, NORTH | WEST - connection north, BLACKTHORN_CITY, BlackthornCity, 0, 0, 13, ROUTE_45 - connection west, ROUTE_46, Route46, 36, 0, 12, ROUTE_45 - - map_header_2 Route46, ROUTE_46, $5, SOUTH | EAST - connection south, ROUTE_29, Route29, -3, 7, 16, ROUTE_46 - connection east, ROUTE_45, Route45, -3, 33, 12, ROUTE_46 - - map_header_2 PewterCity, PEWTER_CITY, $f, SOUTH | EAST - connection south, ROUTE_2, Route2, 5, 0, 10, PEWTER_CITY - connection east, ROUTE_3, Route3, 5, 0, 9, PEWTER_CITY - - map_header_2 Route2, ROUTE_2, $f, NORTH | SOUTH - connection north, PEWTER_CITY, PewterCity, -3, 2, 16, ROUTE_2 - connection south, VIRIDIAN_CITY, ViridianCity, -3, 2, 16, ROUTE_2 - - map_header_2 ViridianCity, VIRIDIAN_CITY, $f, NORTH | SOUTH | WEST - connection north, ROUTE_2, Route2, 5, 0, 10, VIRIDIAN_CITY - connection south, ROUTE_1, Route1, 10, 0, 10, VIRIDIAN_CITY - connection west, ROUTE_22, Route22, 4, 0, 9, VIRIDIAN_CITY - - map_header_2 Route22, ROUTE_22, $2c, EAST - connection east, VIRIDIAN_CITY, ViridianCity, -3, 1, 15, ROUTE_22 - - map_header_2 Route1, ROUTE_1, $f, NORTH | SOUTH - connection north, VIRIDIAN_CITY, ViridianCity, -3, 7, 13, ROUTE_1 - connection south, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_1 - - map_header_2 PalletTown, PALLET_TOWN, $f, NORTH | SOUTH - connection north, ROUTE_1, Route1, 0, 0, 10, PALLET_TOWN - connection south, ROUTE_21, Route21, 0, 0, 10, PALLET_TOWN - - map_header_2 Route21, ROUTE_21, $43, NORTH | SOUTH - connection north, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_21 - connection south, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 10, ROUTE_21 - - map_header_2 CinnabarIsland, CINNABAR_ISLAND, $43, NORTH | EAST - connection north, ROUTE_21, Route21, 0, 0, 10, CINNABAR_ISLAND - connection east, ROUTE_20, Route20, 0, 0, 9, CINNABAR_ISLAND - - map_header_2 Route20, ROUTE_20, $43, WEST | EAST - connection west, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 9, ROUTE_20 - connection east, ROUTE_19, Route19, -3, 6, 12, ROUTE_20 - - map_header_2 Route19, ROUTE_19, $43, NORTH | WEST - connection north, FUCHSIA_CITY, FuchsiaCity, 0, 0, 13, ROUTE_19 - connection west, ROUTE_20, Route20, 9, 0, 9, ROUTE_19 - - map_header_2 FuchsiaCity, FUCHSIA_CITY, $f, SOUTH | WEST | EAST - connection south, ROUTE_19, Route19, 0, 0, 10, FUCHSIA_CITY - connection west, ROUTE_18, Route18, 7, 0, 9, FUCHSIA_CITY - connection east, ROUTE_15, Route15, 9, 0, 9, FUCHSIA_CITY - - map_header_2 Route18, ROUTE_18, $43, WEST | EAST - connection west, ROUTE_17, Route17, -3, 35, 10, ROUTE_18 - connection east, FUCHSIA_CITY, FuchsiaCity, -3, 4, 14, ROUTE_18 - - map_header_2 Route17, ROUTE_17, $43, NORTH | EAST - connection north, ROUTE_16, Route16, 0, 0, 10, ROUTE_17 - connection east, ROUTE_18, Route18, 38, 0, 9, ROUTE_17 - - map_header_2 Route16, ROUTE_16, $f, SOUTH | EAST - connection south, ROUTE_17, Route17, 0, 0, 10, ROUTE_16 - connection east, CELADON_CITY, CeladonCity, -3, 6, 12, ROUTE_16 - - map_header_2 CeladonCity, CELADON_CITY, $f, WEST | EAST - connection west, ROUTE_16, Route16, 9, 0, 9, CELADON_CITY - connection east, ROUTE_7, Route7, 5, 0, 9, CELADON_CITY - - map_header_2 Route7, ROUTE_7, $f, WEST | EAST - connection west, CELADON_CITY, CeladonCity, -3, 2, 15, ROUTE_7 - connection east, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_7 - - map_header_2 Route15, ROUTE_15, $f, WEST | EAST - connection west, FUCHSIA_CITY, FuchsiaCity, -3, 6, 12, ROUTE_15 - connection east, ROUTE_14, Route14, -3, 6, 12, ROUTE_15 - - map_header_2 Route14, ROUTE_14, $43, NORTH | WEST - connection north, ROUTE_13, Route13, 0, 0, 13, ROUTE_14 - connection west, ROUTE_15, Route15, 9, 0, 9, ROUTE_14 - - map_header_2 Route13, ROUTE_13, $43, NORTH | SOUTH - connection north, ROUTE_12, Route12, 20, 0, 10, ROUTE_13 - connection south, ROUTE_14, Route14, 0, 0, 10, ROUTE_13 - - map_header_2 Route12, ROUTE_12, $43, NORTH | SOUTH | WEST - connection north, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_12 - connection south, ROUTE_13, Route13, -3, 17, 13, ROUTE_12 - connection west, ROUTE_11, Route11, 9, 0, 9, ROUTE_12 - - map_header_2 Route11, ROUTE_11, $f, WEST | EAST - connection west, VERMILION_CITY, VermilionCity, 0, 0, 12, ROUTE_11 - connection east, ROUTE_12, Route12, -3, 6, 15, ROUTE_11 - - map_header_2 LavenderTown, LAVENDER_TOWN, $2c, NORTH | SOUTH | WEST - connection north, ROUTE_10_SOUTH, Route10South, 0, 0, 10, LAVENDER_TOWN - connection south, ROUTE_12, Route12, 0, 0, 10, LAVENDER_TOWN - connection west, ROUTE_8, Route8, 0, 0, 9, LAVENDER_TOWN - - map_header_2 VermilionCity, VERMILION_CITY, $43, NORTH | EAST - connection north, ROUTE_6, Route6, 5, 0, 10, VERMILION_CITY - connection east, ROUTE_11, Route11, 0, 0, 9, VERMILION_CITY - - map_header_2 Route6, ROUTE_6, $f, NORTH | SOUTH - connection north, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_6 - connection south, VERMILION_CITY, VermilionCity, -3, 2, 16, ROUTE_6 - - map_header_2 SaffronCity, SAFFRON_CITY, $f, NORTH | SOUTH | WEST | EAST - connection north, ROUTE_5, Route5, 5, 0, 10, SAFFRON_CITY - connection south, ROUTE_6, Route6, 5, 0, 10, SAFFRON_CITY - connection west, ROUTE_7, Route7, 9, 0, 9, SAFFRON_CITY - connection east, ROUTE_8, Route8, 9, 0, 9, SAFFRON_CITY - - map_header_2 Route5, ROUTE_5, $f, NORTH | SOUTH - connection north, CERULEAN_CITY, CeruleanCity, -3, 2, 16, ROUTE_5 - connection south, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_5 - - map_header_2 CeruleanCity, CERULEAN_CITY, $f, NORTH | SOUTH | WEST | EAST - connection north, ROUTE_24, Route24, 6, 0, 10, CERULEAN_CITY - connection south, ROUTE_5, Route5, 5, 0, 10, CERULEAN_CITY - connection west, ROUTE_4, Route4, 5, 0, 9, CERULEAN_CITY - connection east, ROUTE_9, Route9, 9, 0, 9, CERULEAN_CITY - - map_header_2 Route9, ROUTE_9, $2c, SOUTH | WEST - connection south, ROUTE_10_NORTH, Route10North, 20, 0, 10, ROUTE_9 - connection west, CERULEAN_CITY, CeruleanCity, -3, 6, 12, ROUTE_9 - - map_header_2 Route24, ROUTE_24, $2c, NORTH | SOUTH - connection north, ROUTE_25, Route25, 0, 0, 13, ROUTE_24 - connection south, CERULEAN_CITY, CeruleanCity, -3, 3, 16, ROUTE_24 - - map_header_2 Route25, ROUTE_25, $2c, SOUTH - connection south, ROUTE_24, Route24, 0, 0, 10, ROUTE_25 - - map_header_2 Route3, ROUTE_3, $2c, WEST | EAST - connection west, PEWTER_CITY, PewterCity, -3, 2, 15, ROUTE_3 - connection east, ROUTE_4, Route4, 0, 0, 9, ROUTE_3 - - map_header_2 Route4, ROUTE_4, $2c, WEST | EAST - connection west, ROUTE_3, Route3, 0, 0, 9, ROUTE_4 - connection east, CERULEAN_CITY, CeruleanCity, -3, 2, 15, ROUTE_4 - - map_header_2 Route8, ROUTE_8, $2c, WEST | EAST - connection west, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_8 - connection east, LAVENDER_TOWN, LavenderTown, 0, 0, 9, ROUTE_8 - - map_header_2 Route10North, ROUTE_10_NORTH, $2c, NORTH | SOUTH - connection north, ROUTE_9, Route9, -3, 17, 13, ROUTE_10_NORTH - connection south, ROUTE_10_SOUTH, Route10South, 0, 0, 10, ROUTE_10_NORTH - - map_header_2 Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH - connection north, ROUTE_10_NORTH, Route10North, 0, 0, 10, ROUTE_10_SOUTH - connection south, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_10_SOUTH - - map_header_2 Route23, ROUTE_23, $f, 0 - map_header_2 SproutTower1F, SPROUT_TOWER_1F, $0, 0 - map_header_2 SproutTower2F, SPROUT_TOWER_2F, $0, 0 - map_header_2 SproutTower3F, SPROUT_TOWER_3F, $0, 0 - map_header_2 TinTower1F, TIN_TOWER_1F, $0, 0 - map_header_2 TinTower2F, TIN_TOWER_2F, $0, 0 - map_header_2 TinTower3F, TIN_TOWER_3F, $0, 0 - map_header_2 TinTower4F, TIN_TOWER_4F, $0, 0 - map_header_2 TinTower5F, TIN_TOWER_5F, $0, 0 - map_header_2 TinTower6F, TIN_TOWER_6F, $0, 0 - map_header_2 TinTower7F, TIN_TOWER_7F, $0, 0 - map_header_2 TinTower8F, TIN_TOWER_8F, $0, 0 - map_header_2 TinTower9F, TIN_TOWER_9F, $0, 0 - map_header_2 BurnedTower1F, BURNED_TOWER_1F, $0, 0 - map_header_2 BurnedTowerB1F, BURNED_TOWER_B1F, $9, 0 - map_header_2 NationalPark, NATIONAL_PARK, $0, 0 - map_header_2 NationalParkBugContest, NATIONAL_PARK_BUG_CONTEST, $0, 0 - map_header_2 RadioTower1F, RADIO_TOWER_1F, $0, 0 - map_header_2 RadioTower2F, RADIO_TOWER_2F, $0, 0 - map_header_2 RadioTower3F, RADIO_TOWER_3F, $0, 0 - map_header_2 RadioTower4F, RADIO_TOWER_4F, $0, 0 - map_header_2 RadioTower5F, RADIO_TOWER_5F, $0, 0 - map_header_2 RuinsOfAlphOutside, RUINS_OF_ALPH_OUTSIDE, $5, 0 - map_header_2 RuinsOfAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $0, 0 - map_header_2 RuinsOfAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $0, 0 - map_header_2 RuinsOfAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $0, 0 - map_header_2 RuinsOfAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $0, 0 - map_header_2 RuinsOfAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $0, 0 - map_header_2 RuinsOfAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $0, 0 - map_header_2 RuinsOfAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $0, 0 - map_header_2 RuinsOfAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $0, 0 - map_header_2 RuinsOfAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $0, 0 - map_header_2 RuinsOfAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $0, 0 - map_header_2 RuinsOfAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $0, 0 - map_header_2 RuinsOfAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $0, 0 - map_header_2 RuinsOfAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $0, 0 - map_header_2 RuinsOfAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $0, 0 - map_header_2 UnionCave1F, UNION_CAVE_1F, $9, 0 - map_header_2 UnionCaveB1F, UNION_CAVE_B1F, $9, 0 - map_header_2 UnionCaveB2F, UNION_CAVE_B2F, $9, 0 - map_header_2 SlowpokeWellB1F, SLOWPOKE_WELL_B1F, $9, 0 - map_header_2 SlowpokeWellB2F, SLOWPOKE_WELL_B2F, $9, 0 - map_header_2 OlivineLighthouse1F, OLIVINE_LIGHTHOUSE_1F, $0, 0 - map_header_2 OlivineLighthouse2F, OLIVINE_LIGHTHOUSE_2F, $0, 0 - map_header_2 OlivineLighthouse3F, OLIVINE_LIGHTHOUSE_3F, $0, 0 - map_header_2 OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $0, 0 - map_header_2 OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $0, 0 - map_header_2 OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $0, 0 - map_header_2 MahoganyMart1F, MAHOGANY_MART_1F, $0, 0 - map_header_2 TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $0, 0 - map_header_2 TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $0, 0 - map_header_2 TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $0, 0 - map_header_2 IlexForest, ILEX_FOREST, $5, 0 - map_header_2 GoldenrodUnderground, GOLDENROD_UNDERGROUND, $0, 0 - map_header_2 GoldenrodUndergroundSwitchRoomEntrances, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, $0, 0 - map_header_2 GoldenrodDeptStoreB1F, GOLDENROD_DEPT_STORE_B1F, $0, 0 - map_header_2 GoldenrodUndergroundWarehouse, GOLDENROD_UNDERGROUND_WAREHOUSE, $0, 0 - map_header_2 MountMortar1FOutside, MOUNT_MORTAR_1F_OUTSIDE, $9, 0 - map_header_2 MountMortar1FInside, MOUNT_MORTAR_1F_INSIDE, $9, 0 - map_header_2 MountMortar2FInside, MOUNT_MORTAR_2F_INSIDE, $9, 0 - map_header_2 MountMortarB1F, MOUNT_MORTAR_B1F, $9, 0 - map_header_2 IcePath1F, ICE_PATH_1F, $9, 0 - map_header_2 IcePathB1F, ICE_PATH_B1F, $19, 0 - map_header_2 IcePathB2FMahoganySide, ICE_PATH_B2F_MAHOGANY_SIDE, $19, 0 - map_header_2 IcePathB2FBlackthornSide, ICE_PATH_B2F_BLACKTHORN_SIDE, $19, 0 - map_header_2 IcePathB3F, ICE_PATH_B3F, $19, 0 - map_header_2 WhirlIslandNW, WHIRL_ISLAND_NW, $9, 0 - map_header_2 WhirlIslandNE, WHIRL_ISLAND_NE, $9, 0 - map_header_2 WhirlIslandSW, WHIRL_ISLAND_SW, $9, 0 - map_header_2 WhirlIslandCave, WHIRL_ISLAND_CAVE, $9, 0 - map_header_2 WhirlIslandSE, WHIRL_ISLAND_SE, $f, 0 - map_header_2 WhirlIslandB1F, WHIRL_ISLAND_B1F, $9, 0 - map_header_2 WhirlIslandB2F, WHIRL_ISLAND_B2F, $2e, 0 - map_header_2 WhirlIslandLugiaChamber, WHIRL_ISLAND_LUGIA_CHAMBER, $f, 0 - map_header_2 SilverCaveRoom1, SILVER_CAVE_ROOM_1, $9, 0 - map_header_2 SilverCaveRoom2, SILVER_CAVE_ROOM_2, $9, 0 - map_header_2 SilverCaveRoom3, SILVER_CAVE_ROOM_3, $9, 0 - map_header_2 SilverCaveItemRooms, SILVER_CAVE_ITEM_ROOMS, $9, 0 - map_header_2 DarkCaveVioletEntrance, DARK_CAVE_VIOLET_ENTRANCE, $9, 0 - map_header_2 DarkCaveBlackthornEntrance, DARK_CAVE_BLACKTHORN_ENTRANCE, $9, 0 - map_header_2 DragonsDen1F, DRAGONS_DEN_1F, $9, 0 - map_header_2 DragonsDenB1F, DRAGONS_DEN_B1F, $71, 0 - map_header_2 DragonShrine, DRAGON_SHRINE, $0, 0 - map_header_2 TohjoFalls, TOHJO_FALLS, $9, 0 - map_header_2 OlivinePokecenter1F, OLIVINE_POKECENTER_1F, $0, 0 - map_header_2 OlivineGym, OLIVINE_GYM, $0, 0 - map_header_2 OlivineTimsHouse, OLIVINE_TIMS_HOUSE, $0, 0 - map_header_2 OlivineHouseBeta, OLIVINE_HOUSE_BETA, $0, 0 - map_header_2 OlivinePunishmentSpeechHouse, OLIVINE_PUNISHMENT_SPEECH_HOUSE, $0, 0 - map_header_2 OlivineGoodRodHouse, OLIVINE_GOOD_ROD_HOUSE, $0, 0 - map_header_2 OlivineCafe, OLIVINE_CAFE, $0, 0 - map_header_2 OlivineMart, OLIVINE_MART, $0, 0 - map_header_2 Route38EcruteakGate, ROUTE_38_ECRUTEAK_GATE, $0, 0 - map_header_2 Route39Barn, ROUTE_39_BARN, $0, 0 - map_header_2 Route39Farmhouse, ROUTE_39_FARMHOUSE, $0, 0 - map_header_2 MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $0, 0 - map_header_2 MahoganyGym, MAHOGANY_GYM, $0, 0 - map_header_2 MahoganyPokecenter1F, MAHOGANY_POKECENTER_1F, $0, 0 - map_header_2 Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $0, 0 - map_header_2 DiglettsCave, DIGLETTS_CAVE, $9, 0 - map_header_2 MountMoon, MOUNT_MOON, $9, 0 - map_header_2 UndergroundPath, UNDERGROUND_PATH, $0, 0 - map_header_2 RockTunnel1F, ROCK_TUNNEL_1F, $9, 0 - map_header_2 RockTunnelB1F, ROCK_TUNNEL_B1F, $9, 0 - map_header_2 SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $0, 0 - map_header_2 SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0 - map_header_2 VictoryRoad, VICTORY_ROAD, $1d, 0 - map_header_2 EcruteakHouse, ECRUTEAK_HOUSE, $0, 0 - map_header_2 WiseTriosRoom, WISE_TRIOS_ROOM, $0, 0 - map_header_2 EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $0, 0 - map_header_2 EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $0, 0 - map_header_2 DanceTheatre, DANCE_THEATRE, $0, 0 - map_header_2 EcruteakMart, ECRUTEAK_MART, $0, 0 - map_header_2 EcruteakGym, ECRUTEAK_GYM, $0, 0 - map_header_2 EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $0, 0 - map_header_2 BlackthornGym1F, BLACKTHORN_GYM_1F, $0, 0 - map_header_2 BlackthornGym2F, BLACKTHORN_GYM_2F, $0, 0 - map_header_2 BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $0, 0 - map_header_2 BlackthornEmysHouse, BLACKTHORN_EMYS_HOUSE, $0, 0 - map_header_2 BlackthornMart, BLACKTHORN_MART, $0, 0 - map_header_2 BlackthornPokecenter1F, BLACKTHORN_POKECENTER_1F, $0, 0 - map_header_2 MoveDeletersHouse, MOVE_DELETERS_HOUSE, $0, 0 - map_header_2 CinnabarPokecenter1F, CINNABAR_POKECENTER_1F, $0, 0 - map_header_2 CinnabarPokecenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $0, 0 - map_header_2 Route19FuchsiaGate, ROUTE_19___FUCHSIA_GATE, $0, 0 - map_header_2 SeafoamGym, SEAFOAM_GYM, $9, 0 - map_header_2 CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $0, 0 - map_header_2 CeruleanPoliceStation, CERULEAN_POLICE_STATION, $0, 0 - map_header_2 CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $0, 0 - map_header_2 CeruleanPokecenter1F, CERULEAN_POKECENTER_1F, $0, 0 - map_header_2 CeruleanPokecenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $0, 0 - map_header_2 CeruleanGym, CERULEAN_GYM, $0, 0 - map_header_2 CeruleanMart, CERULEAN_MART, $0, 0 - map_header_2 Route10Pokecenter1F, ROUTE_10_POKECENTER_1F, $0, 0 - map_header_2 Route10Pokecenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $0, 0 - map_header_2 PowerPlant, POWER_PLANT, $0, 0 - map_header_2 BillsHouse, BILLS_HOUSE, $0, 0 - map_header_2 AzaleaPokecenter1F, AZALEA_POKECENTER_1F, $0, 0 - map_header_2 CharcoalKiln, CHARCOAL_KILN, $0, 0 - map_header_2 AzaleaMart, AZALEA_MART, $0, 0 - map_header_2 KurtsHouse, KURTS_HOUSE, $0, 0 - map_header_2 AzaleaGym, AZALEA_GYM, $0, 0 - map_header_2 LakeOfRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $0, 0 - map_header_2 LakeOfRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $0, 0 - map_header_2 Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $0, 0 - map_header_2 Route43Gate, ROUTE_43_GATE, $0, 0 - map_header_2 VioletMart, VIOLET_MART, $0, 0 - map_header_2 VioletGym, VIOLET_GYM, $0, 0 - map_header_2 EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $0, 0 - map_header_2 VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $0, 0 - map_header_2 VioletPokecenter1F, VIOLET_POKECENTER_1F, $0, 0 - map_header_2 VioletKylesHouse, VIOLET_KYLES_HOUSE, $0, 0 - map_header_2 Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $0, 0 - map_header_2 Route32Pokecenter1F, ROUTE_32_POKECENTER_1F, $0, 0 - map_header_2 Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $0, 0 - map_header_2 Route35NationalParkGate, ROUTE_35_NATIONAL_PARK_GATE, $0, 0 - map_header_2 Route36RuinsOfAlphGate, ROUTE_36_RUINS_OF_ALPH_GATE, $0, 0 - map_header_2 Route36NationalParkGate, ROUTE_36_NATIONAL_PARK_GATE, $0, 0 - map_header_2 GoldenrodGym, GOLDENROD_GYM, $0, 0 - map_header_2 GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $0, 0 - map_header_2 GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $0, 0 - map_header_2 GoldenrodBillsHouse, GOLDENROD_BILLS_HOUSE, $0, 0 - map_header_2 GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $0, 0 - map_header_2 GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $0, 0 - map_header_2 GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $0, 0 - map_header_2 GoldenrodNameRater, GOLDENROD_NAME_RATER, $0, 0 - map_header_2 GoldenrodDeptStore1F, GOLDENROD_DEPT_STORE_1F, $0, 0 - map_header_2 GoldenrodDeptStore2F, GOLDENROD_DEPT_STORE_2F, $0, 0 - map_header_2 GoldenrodDeptStore3F, GOLDENROD_DEPT_STORE_3F, $0, 0 - map_header_2 GoldenrodDeptStore4F, GOLDENROD_DEPT_STORE_4F, $0, 0 - map_header_2 GoldenrodDeptStore5F, GOLDENROD_DEPT_STORE_5F, $0, 0 - map_header_2 GoldenrodDeptStore6F, GOLDENROD_DEPT_STORE_6F, $0, 0 - map_header_2 GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $0, 0 - map_header_2 GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0 - map_header_2 GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $0, 0 - map_header_2 GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $0, 0 - map_header_2 GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $0, 0 - map_header_2 IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $0, 0 - map_header_2 Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $0, 0 - map_header_2 DayCare, DAY_CARE, $0, 0 - map_header_2 VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $0, 0 - map_header_2 VermilionPokecenter1F, VERMILION_POKECENTER_1F, $0, 0 - map_header_2 VermilionPokecenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, 0 - map_header_2 PokemonFanClub, POKEMON_FAN_CLUB, $0, 0 - map_header_2 VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $0, 0 - map_header_2 VermilionMart, VERMILION_MART, $0, 0 - map_header_2 VermilionHouseDiglettsCaveSpeechHouse, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, $0, 0 - map_header_2 VermilionGym, VERMILION_GYM, $0, 0 - map_header_2 Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $0, 0 - map_header_2 Route6UndergroundPathEntrance, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, $0, 0 - map_header_2 RedsHouse1F, REDS_HOUSE_1F, $0, 0 - map_header_2 RedsHouse2F, REDS_HOUSE_2F, $0, 0 - map_header_2 BluesHouse, BLUES_HOUSE, $0, 0 - map_header_2 OaksLab, OAKS_LAB, $0, 0 - map_header_2 PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $0, 0 - map_header_2 PewterGym, PEWTER_GYM, $0, 0 - map_header_2 PewterMart, PEWTER_MART, $0, 0 - map_header_2 PewterPokecenter1F, PEWTER_POKECENTER_1F, $0, 0 - map_header_2 PewterPokecenter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, 0 - map_header_2 PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $0, 0 - map_header_2 OlivinePort, OLIVINE_PORT, $a, 0 - map_header_2 VermilionPort, VERMILION_PORT, $a, 0 - map_header_2 FastShip1F, FAST_SHIP_1F, $0, 0 - map_header_2 FastShipCabins_NNW_NNE_NE, FAST_SHIP_CABINS_NNW_NNE_NE, $0, 0 - map_header_2 FastShipCabins_SW_SSW_NW, FAST_SHIP_CABINS_SW_SSW_NW, $0, 0 - map_header_2 FastShipCabins_SE_SSE_CaptainsCabin, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, $0, 0 - map_header_2 FastShipB1F, FAST_SHIP_B1F, $0, 0 - map_header_2 OlivinePortPassage, OLIVINE_PORT_PASSAGE, $0, 0 - map_header_2 VermilionPortPassage, VERMILION_PORT_PASSAGE, $0, 0 - map_header_2 MountMoonSquare, MOUNT_MOON_SQUARE, $2d, 0 - map_header_2 MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $0, 0 - map_header_2 TinTowerRoof, TIN_TOWER_ROOF, $0, 0 - map_header_2 IndigoPlateauPokecenter1F, INDIGO_PLATEAU_POKECENTER_1F, $0, 0 - map_header_2 WillsRoom, WILLS_ROOM, $0, 0 - map_header_2 KogasRoom, KOGAS_ROOM, $0, 0 - map_header_2 BrunosRoom, BRUNOS_ROOM, $0, 0 - map_header_2 KarensRoom, KARENS_ROOM, $0, 0 - map_header_2 LancesRoom, LANCES_ROOM, $0, 0 - map_header_2 HallOfFame, HALL_OF_FAME, $0, 0 - map_header_2 FuchsiaMart, FUCHSIA_MART, $0, 0 - map_header_2 SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $0, 0 - map_header_2 FuchsiaGym, FUCHSIA_GYM, $0, 0 - map_header_2 FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $0, 0 - map_header_2 FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $0, 0 - map_header_2 FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $0, 0 - map_header_2 SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $0, 0 - map_header_2 Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $0, 0 - 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 LavenderNameRater, LAVENDER_NAME_RATER, $0, 0 - map_header_2 LavenderMart, LAVENDER_MART, $0, 0 - map_header_2 SoulHouse, SOUL_HOUSE, $0, 0 - map_header_2 LavRadioTower1F, LAV_RADIO_TOWER_1F, $0, 0 - map_header_2 Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $0, 0 - map_header_2 Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $0, 0 - map_header_2 SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $0, 0 - map_header_2 Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $0, 0 - map_header_2 Pokecenter2F, POKECENTER_2F, $0, 0 - map_header_2 TradeCenter, TRADE_CENTER, $0, 0 - map_header_2 Colosseum, COLOSSEUM, $0, 0 - map_header_2 TimeCapsule, TIME_CAPSULE, $0, 0 - map_header_2 MobileTradeRoomMobile, MOBILE_TRADE_ROOM_MOBILE, $0, 0 - map_header_2 MobileBattleRoom, MOBILE_BATTLE_ROOM, $0, 0 - map_header_2 CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $0, 0 - map_header_2 CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $0, 0 - map_header_2 CeladonDeptStore3F, CELADON_DEPT_STORE_3F, $0, 0 - map_header_2 CeladonDeptStore4F, CELADON_DEPT_STORE_4F, $0, 0 - map_header_2 CeladonDeptStore5F, CELADON_DEPT_STORE_5F, $0, 0 - map_header_2 CeladonDeptStore6F, CELADON_DEPT_STORE_6F, $0, 0 - map_header_2 CeladonDeptStoreElevator, CELADON_DEPT_STORE_ELEVATOR, $0, 0 - map_header_2 CeladonMansion1F, CELADON_MANSION_1F, $0, 0 - map_header_2 CeladonMansion2F, CELADON_MANSION_2F, $0, 0 - map_header_2 CeladonMansion3F, CELADON_MANSION_3F, $0, 0 - map_header_2 CeladonMansionRoof, CELADON_MANSION_ROOF, $1, 0 - map_header_2 CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $0, 0 - map_header_2 CeladonPokecenter1F, CELADON_POKECENTER_1F, $0, 0 - map_header_2 CeladonPokecenter2FBeta, CELADON_POKECENTER_2F_BETA, $0, 0 - map_header_2 CeladonGameCorner, CELADON_GAME_CORNER, $0, 0 - map_header_2 CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $0, 0 - map_header_2 CeladonGym, CELADON_GYM, $0, 0 - map_header_2 CeladonCafe, CELADON_CAFE, $0, 0 - 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 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 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 - map_header_2 BattleTowerBattleRoom, BATTLE_TOWER_BATTLE_ROOM, $0, 0 - map_header_2 BattleTowerElevator, BATTLE_TOWER_ELEVATOR, $0, 0 - map_header_2 BattleTowerHallway, BATTLE_TOWER_HALLWAY, $0, 0 - map_header_2 Route40BattleTowerGate, ROUTE_40_BATTLE_TOWER_GATE, $0, 0 - map_header_2 BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $5, 0 - map_header_2 ViridianGym, VIRIDIAN_GYM, $0, 0 - map_header_2 ViridianNicknameSpeechHouse, VIRIDIAN_NICKNAME_SPEECH_HOUSE, $0, 0 - map_header_2 TrainerHouse1F, TRAINER_HOUSE_1F, $0, 0 - map_header_2 TrainerHouseB1F, TRAINER_HOUSE_B1F, $0, 0 - map_header_2 ViridianMart, VIRIDIAN_MART, $0, 0 - map_header_2 ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $0, 0 - map_header_2 ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $0, 0 - map_header_2 Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $0, 0 - map_header_2 Route2Gate, ROUTE_2_GATE, $0, 0 - map_header_2 VictoryRoadGate, VICTORY_ROAD_GATE, $0, 0 - map_header_2 ElmsLab, ELMS_LAB, $0, 0 - map_header_2 KrissHouse1F, KRISS_HOUSE_1F, $0, 0 - map_header_2 KrissHouse2F, KRISS_HOUSE_2F, $0, 0 - map_header_2 KrissNeighborsHouse, KRISS_NEIGHBORS_HOUSE, $0, 0 - map_header_2 ElmsHouse, ELMS_HOUSE, $0, 0 - 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 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 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 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 - map_header_2 CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $0, 0 - map_header_2 GuideGentsHouse, GUIDE_GENTS_HOUSE, $0, 0 - map_header_2 CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $0, 0 - map_header_2 Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $0, 0 - map_header_2 MrPokemonsHouse, MR_POKEMONS_HOUSE, $0, 0 - map_header_2 Route31VioletGate, ROUTE_31_VIOLET_GATE, $0, 0 diff --git a/maps/BetaAzaleaTown.blk b/maps/unused/BetaAzaleaTown.blk index 8faa18369..8faa18369 100644 --- a/maps/BetaAzaleaTown.blk +++ b/maps/unused/BetaAzaleaTown.blk diff --git a/maps/BetaBlackthornCity.blk b/maps/unused/BetaBlackthornCity.blk index c6fc4f210..c6fc4f210 100644 --- a/maps/BetaBlackthornCity.blk +++ b/maps/unused/BetaBlackthornCity.blk diff --git a/maps/BetaBlank.blk b/maps/unused/BetaBlank.blk index e53405655..e53405655 100644 --- a/maps/BetaBlank.blk +++ b/maps/unused/BetaBlank.blk diff --git a/maps/BetaCave.blk b/maps/unused/BetaCave.blk index b103c2532..b103c2532 100644 --- a/maps/BetaCave.blk +++ b/maps/unused/BetaCave.blk diff --git a/maps/BetaCave2.blk b/maps/unused/BetaCave2.blk index a2722d010..a2722d010 100644 --- a/maps/BetaCave2.blk +++ b/maps/unused/BetaCave2.blk diff --git a/maps/BetaCaveTestMap.blk b/maps/unused/BetaCaveTestMap.blk index eba6c84c8..eba6c84c8 100644 --- a/maps/BetaCaveTestMap.blk +++ b/maps/unused/BetaCaveTestMap.blk diff --git a/maps/BetaCeladonMansion.blk b/maps/unused/BetaCeladonMansion.blk index 8d3e219df..8d3e219df 100644 --- a/maps/BetaCeladonMansion.blk +++ b/maps/unused/BetaCeladonMansion.blk diff --git a/maps/BetaCherrygroveCity.blk b/maps/unused/BetaCherrygroveCity.blk index 440952f6f..440952f6f 100644 --- a/maps/BetaCherrygroveCity.blk +++ b/maps/unused/BetaCherrygroveCity.blk diff --git a/maps/BetaCianwoodCity.blk b/maps/unused/BetaCianwoodCity.blk index d946e1de7..d946e1de7 100644 --- a/maps/BetaCianwoodCity.blk +++ b/maps/unused/BetaCianwoodCity.blk diff --git a/maps/BetaCinnabarIslandPokemonLabHallway.blk b/maps/unused/BetaCinnabarPokemonLabHallway.blk index 7a6502a26..7a6502a26 100644 --- a/maps/BetaCinnabarIslandPokemonLabHallway.blk +++ b/maps/unused/BetaCinnabarPokemonLabHallway.blk diff --git a/maps/BetaCinnabarIslandPokemonLabRoom1.blk b/maps/unused/BetaCinnabarPokemonLabRoom1.blk index ef77b6561..ef77b6561 100644 --- a/maps/BetaCinnabarIslandPokemonLabRoom1.blk +++ b/maps/unused/BetaCinnabarPokemonLabRoom1.blk diff --git a/maps/BetaCinnabarIslandPokemonLabRoom2.blk b/maps/unused/BetaCinnabarPokemonLabRoom2.blk index 822db175b..822db175b 100644 --- a/maps/BetaCinnabarIslandPokemonLabRoom2.blk +++ b/maps/unused/BetaCinnabarPokemonLabRoom2.blk diff --git a/maps/BetaCinnabarIslandPokemonLabRoom3.blk b/maps/unused/BetaCinnabarPokemonLabRoom3.blk index d9a64a5da..d9a64a5da 100644 --- a/maps/BetaCinnabarIslandPokemonLabRoom3.blk +++ b/maps/unused/BetaCinnabarPokemonLabRoom3.blk diff --git a/maps/BetaTeakCity.blk b/maps/unused/BetaEcruteakCity.blk index ce448c2ef..ce448c2ef 100644 --- a/maps/BetaTeakCity.blk +++ b/maps/unused/BetaEcruteakCity.blk diff --git a/maps/BetaElevator.blk b/maps/unused/BetaElevator.blk index 32fb22697..32fb22697 100644 --- a/maps/BetaElevator.blk +++ b/maps/unused/BetaElevator.blk diff --git a/maps/BetaEmptyHouse.blk b/maps/unused/BetaEmptyHouse.blk index dcec62794..dcec62794 100644 --- a/maps/BetaEmptyHouse.blk +++ b/maps/unused/BetaEmptyHouse.blk diff --git a/maps/BetaSSAquaInsideCutOut.blk b/maps/unused/BetaFastShipInsideCutOut.blk index b385b0198..b385b0198 100644 --- a/maps/BetaSSAquaInsideCutOut.blk +++ b/maps/unused/BetaFastShipInsideCutOut.blk diff --git a/maps/BetaGoldenrodCity.blk b/maps/unused/BetaGoldenrodCity.blk index 1a156122d..1a156122d 100644 --- a/maps/BetaGoldenrodCity.blk +++ b/maps/unused/BetaGoldenrodCity.blk diff --git a/maps/BetaHerosHouse.blk b/maps/unused/BetaHerosHouse.blk index b5b53b4bd..b5b53b4bd 100644 --- a/maps/BetaHerosHouse.blk +++ b/maps/unused/BetaHerosHouse.blk diff --git a/maps/BetaHouse.blk b/maps/unused/BetaHouse.blk index 187a3cd32..187a3cd32 100644 --- a/maps/BetaHouse.blk +++ b/maps/unused/BetaHouse.blk diff --git a/maps/BetaHouse2.blk b/maps/unused/BetaHouse2.blk index 993ea3a8d..993ea3a8d 100644 --- a/maps/BetaHouse2.blk +++ b/maps/unused/BetaHouse2.blk diff --git a/maps/BetaIlexForest.blk b/maps/unused/BetaIlexForest.blk index 3cde14007..3cde14007 100644 --- a/maps/BetaIlexForest.blk +++ b/maps/unused/BetaIlexForest.blk diff --git a/maps/BetaLakeOfRage.blk b/maps/unused/BetaLakeOfRage.blk index d1d63a0d4..d1d63a0d4 100644 --- a/maps/BetaLakeOfRage.blk +++ b/maps/unused/BetaLakeOfRage.blk diff --git a/maps/BetaMahoganyTown.blk b/maps/unused/BetaMahoganyTown.blk index 6b4c62e10..6b4c62e10 100644 --- a/maps/BetaMahoganyTown.blk +++ b/maps/unused/BetaMahoganyTown.blk diff --git a/maps/BetaNewBarkTown.blk b/maps/unused/BetaNewBarkTown.blk index 395c91f1b..395c91f1b 100644 --- a/maps/BetaNewBarkTown.blk +++ b/maps/unused/BetaNewBarkTown.blk diff --git a/maps/BetaOlivineCity.blk b/maps/unused/BetaOlivineCity.blk index 749f05a5c..749f05a5c 100644 --- a/maps/BetaOlivineCity.blk +++ b/maps/unused/BetaOlivineCity.blk diff --git a/maps/BetaPewterMuseumOfScience1F.blk b/maps/unused/BetaPewterMuseumOfScience1F.blk index 1eec02a37..1eec02a37 100644 --- a/maps/BetaPewterMuseumOfScience1F.blk +++ b/maps/unused/BetaPewterMuseumOfScience1F.blk diff --git a/maps/BetaPewterMuseumOfScience2F.blk b/maps/unused/BetaPewterMuseumOfScience2F.blk index ac5622246..ac5622246 100644 --- a/maps/BetaPewterMuseumOfScience2F.blk +++ b/maps/unused/BetaPewterMuseumOfScience2F.blk diff --git a/maps/BetaPokecenterMainHouse.blk b/maps/unused/BetaPokecenterMainHouse.blk index 261350738..261350738 100644 --- a/maps/BetaPokecenterMainHouse.blk +++ b/maps/unused/BetaPokecenterMainHouse.blk diff --git a/maps/BetaPokecenterTradeStation.blk b/maps/unused/BetaPokecenterTradeStation.blk index 555abfa07..555abfa07 100644 --- a/maps/BetaPokecenterTradeStation.blk +++ b/maps/unused/BetaPokecenterTradeStation.blk diff --git a/maps/BetaRocketHideout1.blk b/maps/unused/BetaRocketHideout1.blk index 988208073..988208073 100644 --- a/maps/BetaRocketHideout1.blk +++ b/maps/unused/BetaRocketHideout1.blk diff --git a/maps/BetaRocketHideout2.blk b/maps/unused/BetaRocketHideout2.blk index b17106cca..b17106cca 100644 --- a/maps/BetaRocketHideout2.blk +++ b/maps/unused/BetaRocketHideout2.blk diff --git a/maps/BetaRocketHideout3.blk b/maps/unused/BetaRocketHideout3.blk index b73d3afeb..b73d3afeb 100644 --- a/maps/BetaRocketHideout3.blk +++ b/maps/unused/BetaRocketHideout3.blk diff --git a/maps/BetaRoute23EarlyVersion.blk b/maps/unused/BetaRoute23EarlyVersion.blk index a62533dd4..a62533dd4 100644 --- a/maps/BetaRoute23EarlyVersion.blk +++ b/maps/unused/BetaRoute23EarlyVersion.blk diff --git a/maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk b/maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk index a3aa06bd6..a3aa06bd6 100644 --- a/maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk +++ b/maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk diff --git a/maps/BetaSproutTower1.blk b/maps/unused/BetaSproutTower1.blk index 6c0b2ea41..6c0b2ea41 100644 --- a/maps/BetaSproutTower1.blk +++ b/maps/unused/BetaSproutTower1.blk diff --git a/maps/BetaSproutTower2.blk b/maps/unused/BetaSproutTower2.blk index a13cec16b..a13cec16b 100644 --- a/maps/BetaSproutTower2.blk +++ b/maps/unused/BetaSproutTower2.blk diff --git a/maps/BetaSproutTower3.blk b/maps/unused/BetaSproutTower3.blk index 846bb9016..846bb9016 100644 --- a/maps/BetaSproutTower3.blk +++ b/maps/unused/BetaSproutTower3.blk diff --git a/maps/BetaSproutTower5.blk b/maps/unused/BetaSproutTower5.blk index baaeaa926..baaeaa926 100644 --- a/maps/BetaSproutTower5.blk +++ b/maps/unused/BetaSproutTower5.blk diff --git a/maps/BetaSproutTower6.blk b/maps/unused/BetaSproutTower6.blk index ea9395657..ea9395657 100644 --- a/maps/BetaSproutTower6.blk +++ b/maps/unused/BetaSproutTower6.blk diff --git a/maps/BetaSproutTower7.blk b/maps/unused/BetaSproutTower7.blk index bfa5da286..bfa5da286 100644 --- a/maps/BetaSproutTower7.blk +++ b/maps/unused/BetaSproutTower7.blk diff --git a/maps/BetaSproutTower8.blk b/maps/unused/BetaSproutTower8.blk index 254c0c565..254c0c565 100644 --- a/maps/BetaSproutTower8.blk +++ b/maps/unused/BetaSproutTower8.blk diff --git a/maps/BetaSproutTower9.blk b/maps/unused/BetaSproutTower9.blk index f5737b226..f5737b226 100644 --- a/maps/BetaSproutTower9.blk +++ b/maps/unused/BetaSproutTower9.blk diff --git a/maps/BetaSproutTowerCutOut1.blk b/maps/unused/BetaSproutTowerCutOut1.blk index 21808bb71..21808bb71 100644 --- a/maps/BetaSproutTowerCutOut1.blk +++ b/maps/unused/BetaSproutTowerCutOut1.blk diff --git a/maps/BetaSproutTowerCutOut2.blk b/maps/unused/BetaSproutTowerCutOut2.blk index 21808bb71..21808bb71 100644 --- a/maps/BetaSproutTowerCutOut2.blk +++ b/maps/unused/BetaSproutTowerCutOut2.blk diff --git a/maps/BetaSproutTowerCutOut3.blk b/maps/unused/BetaSproutTowerCutOut3.blk index 21808bb71..21808bb71 100644 --- a/maps/BetaSproutTowerCutOut3.blk +++ b/maps/unused/BetaSproutTowerCutOut3.blk diff --git a/maps/BetaUnknown.blk b/maps/unused/BetaUnknown.blk index c3063adc7..c3063adc7 100644 --- a/maps/BetaUnknown.blk +++ b/maps/unused/BetaUnknown.blk diff --git a/maps/BetaVioletCity.blk b/maps/unused/BetaVioletCity.blk index 963dbb2ed..963dbb2ed 100644 --- a/maps/BetaVioletCity.blk +++ b/maps/unused/BetaVioletCity.blk |