diff options
Diffstat (limited to 'maps')
395 files changed, 5519 insertions, 8235 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 3675392fc..b23523a47 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -8,11 +8,9 @@ const_value set 2 const AZALEAGYM_GYM_GUY AzaleaGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks AzaleaGymBugsyScript: faceplayer @@ -70,7 +68,7 @@ AzaleaGymActivateRockets: jumpstd radiotowerrockets TrainerTwinsAmyandmay1: - trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript + trainer TWINS, AMYANDMAY1, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript .AfterScript: end_if_just_battled @@ -81,7 +79,7 @@ TrainerTwinsAmyandmay1: end TrainerTwinsAmyandmay2: - trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript + trainer TWINS, AMYANDMAY2, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript .AfterScript: end_if_just_battled @@ -92,7 +90,7 @@ TrainerTwinsAmyandmay2: end TrainerBugCatcherBenny: - trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, BugCatcherBennySeenText, BugCatcherBennyBeatenText, 0, .AfterScript + trainer BUG_CATCHER, BUG_CATCHER_BENNY, EVENT_BEAT_BUG_CATCHER_BENNY, BugCatcherBennySeenText, BugCatcherBennyBeatenText, 0, .AfterScript .AfterScript: end_if_just_battled @@ -103,7 +101,7 @@ TrainerBugCatcherBenny: end TrainerBugCatcherAl: - trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, BugCatcherAlSeenText, BugCatcherAlBeatenText, 0, .AfterScript + trainer BUG_CATCHER, AL, EVENT_BEAT_BUG_CATCHER_AL, BugCatcherAlSeenText, BugCatcherAlBeatenText, 0, .AfterScript .AfterScript: end_if_just_battled @@ -114,7 +112,7 @@ TrainerBugCatcherAl: end TrainerBugCatcherJosh: - trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, BugCatcherJoshSeenText, BugCatcherJoshBeatenText, 0, .AfterScript + trainer BUG_CATCHER, JOSH, EVENT_BEAT_BUG_CATCHER_JOSH, BugCatcherJoshSeenText, BugCatcherJoshBeatenText, 0, .AfterScript .AfterScript: end_if_just_battled @@ -362,24 +360,19 @@ AzaleaGymGuyWinText: done AzaleaGym_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 15, 5, AZALEA_TOWN - warp_def 5, 15, 5, AZALEA_TOWN + db 2 ; warp events + warp_event 4, 15, 5, AZALEA_TOWN + warp_event 5, 15, 5, AZALEA_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue -.ObjectEvents: - db 7 + db 7 ; object events object_event 5, 7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1 object_event 5, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1 object_event 8, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 8ecf94d92..4d8b4997a 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -4,11 +4,9 @@ const_value set 2 const AZALEAMART_BUG_CATCHER AzaleaMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks AzaleaMartClerkScript: opentext @@ -46,22 +44,17 @@ AzaleaMartBugCatcherText: done AzaleaMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, AZALEA_TOWN - warp_def 3, 7, 3, AZALEA_TOWN + db 2 ; warp events + warp_event 2, 7, 3, AZALEA_TOWN + warp_event 3, 7, 3, AZALEA_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1 object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1 object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1 diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index 6e65c2c01..e644e99f1 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -5,12 +5,10 @@ const_value set 2 const AZALEAPOKECENTER1F_POKEFAN_F AzaleaPokecenter1F_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -77,23 +75,18 @@ AzaleaPokecenter1FPokefanFText: done AzaleaPokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 1, AZALEA_TOWN - warp_def 4, 7, 1, AZALEA_TOWN - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 1, AZALEA_TOWN + warp_event 4, 7, 1, AZALEA_TOWN + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1 object_event 9, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1 object_event 6, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 16889aa51..e7940c638 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -13,14 +13,12 @@ const_value set 2 const AZALEATOWN_KURT_OUTSIDE AzaleaTown_MapScripts: -.SceneScripts: - db 3 + db 3 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 scene_script .DummyScene2 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .Flypoint .DummyScene0: @@ -40,7 +38,7 @@ AzaleaTownRivalBattleScene1: moveobject AZALEATOWN_SILVER, 11, 11 spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear AZALEATOWN_SILVER applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1 @@ -50,7 +48,7 @@ AzaleaTownRivalBattleScene1: AzaleaTownRivalBattleScene2: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear AZALEATOWN_SILVER applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement2 @@ -167,7 +165,7 @@ AzaleaTownCelebiScene: waitbutton verbosegiveitem GS_BALL spriteface AZALEATOWN_KURT_OUTSIDE, LEFT - setflag ENGINE_HAVE_EXAMINED_GS_BALL + setflag ENGINE_FOREST_IS_RESTLESS clearevent EVENT_ILEX_FOREST_LASS setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS setscene 0 @@ -211,7 +209,7 @@ WhiteApricornTree: fruittree FRUITTREE_AZALEA_TOWN AzaleaTownHiddenFullHeal: - hiddenitem EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL AzaleaTownRivalBattleApproachMovement1: step LEFT @@ -456,28 +454,24 @@ AzaleaTownIlexForestSignText: done AzaleaTown_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 8 - warp_def 15, 9, 1, AZALEA_POKECENTER_1F - warp_def 21, 13, 1, CHARCOAL_KILN - warp_def 21, 5, 2, AZALEA_MART - warp_def 9, 5, 1, KURTS_HOUSE - warp_def 10, 15, 1, AZALEA_GYM - warp_def 31, 7, 1, SLOWPOKE_WELL_B1F - warp_def 2, 10, 3, ILEX_FOREST_AZALEA_GATE - warp_def 2, 11, 4, ILEX_FOREST_AZALEA_GATE - -.CoordEvents: - db 3 + db 0, 0 ; filler + + db 8 ; warp events + warp_event 15, 9, 1, AZALEA_POKECENTER_1F + warp_event 21, 13, 1, CHARCOAL_KILN + warp_event 21, 5, 2, AZALEA_MART + warp_event 9, 5, 1, KURTS_HOUSE + warp_event 10, 15, 1, AZALEA_GYM + warp_event 31, 7, 1, SLOWPOKE_WELL_B1F + warp_event 2, 10, 3, ILEX_FOREST_AZALEA_GATE + warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE + + db 3 ; coord events coord_event 5, 10, 1, AzaleaTownRivalBattleScene1 coord_event 5, 11, 1, AzaleaTownRivalBattleScene2 coord_event 9, 6, 2, AzaleaTownCelebiScene -.BGEvents: - db 9 + db 9 ; bg events bg_event 19, 9, BGEVENT_READ, AzaleaTownSign bg_event 10, 9, BGEVENT_READ, KurtsHouseSign bg_event 14, 15, BGEVENT_READ, AzaleaGymSign @@ -488,8 +482,7 @@ AzaleaTown_MapEvents: bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal -.ObjectEvents: - db 12 + db 12 ; object events object_event 31, 9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 object_event 15, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index b7113f347..42242bd8c 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -6,20 +6,18 @@ const_value set 2 const BATTLETOWER1F_GRANNY BattleTower1F_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .Scene0 scene_script .Scene1 -.MapCallbacks: - db 0 + db 0 ; callbacks .Scene0: writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS - special Special_BattleTowerAction + special BattleTowerAction iffalse .SkipEverything writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState - special Special_BattleTowerAction + special BattleTowerAction if_equal $0, .SkipEverything if_equal $2, .priorityjump1 if_equal $3, .SkipEverything @@ -34,9 +32,9 @@ BattleTower1F_MapScripts: .priorityjump1 priorityjump BattleTower_LeftWithoutSaving writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction .SkipEverything: setscene 1 .Scene1: @@ -55,54 +53,54 @@ UnknownScript_0x9e3e0: ReceptionistScript_0x9e3e2: writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState - special Special_BattleTowerAction + 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 Special_BattleTowerAction + special BattleTowerAction if_not_equal $0, Script_Menu_ChallengeExplanationCancel jump Script_BattleTowerIntroductionYesNo Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc writetext Text_WantToGoIntoABattleRoom writebyte TRUE - special Special_Menu_ChallengeExplanationCancel + special Menu_ChallengeExplanationCancel if_equal 1, Script_ChooseChallenge if_equal 2, Script_BattleTowerExplanation jump Script_BattleTowerHopeToServeYouAgain Script_ChooseChallenge: ; 0x9e40f writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM - special Special_BattleTowerAction - special Special_CheckForBattleTowerRules + special BattleTowerAction + special CheckForBattleTowerRules if_not_equal FALSE, Script_WaitButton writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel setscene 0 - special Special_TryQuickSave + special TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel setscene 1 writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags] - special Special_BattleTowerAction - special Special_BattleTowerRoomMenu + special BattleTowerAction + special BattleTowerRoomMenu if_equal $a, Script_Menu_ChallengeExplanationCancel if_not_equal $0, Script_MobileError writebyte BATTLETOWERACTION_11 - special Special_BattleTowerAction + special BattleTowerAction writetext Text_RightThisWayToYourBattleRoom waitbutton closetext writebyte BATTLETOWERACTION_CHOOSEREWARD - special Special_BattleTowerAction + special BattleTowerAction jump Script_WalkToBattleTowerElevator Script_ResumeBattleTowerChallenge: closetext writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group - special Special_BattleTowerAction + special BattleTowerAction Script_WalkToBattleTowerElevator: musicfadeout MUSIC_NONE, 8 setmapscene BATTLE_TOWER_BATTLE_ROOM, 0 @@ -111,7 +109,7 @@ Script_WalkToBattleTowerElevator: follow BATTLETOWER1F_RECEPTIONIST, PLAYER applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator writebyte BATTLETOWERACTION_0A - special Special_BattleTowerAction + special BattleTowerAction warpsound disappear BATTLETOWER1F_RECEPTIONIST stopfollow @@ -121,15 +119,15 @@ Script_WalkToBattleTowerElevator: Script_GivePlayerHisPrize: ; 0x9e47a writebyte BATTLETOWERACTION_1C - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_GIVEREWARD - special Special_BattleTowerAction + special BattleTowerAction if_equal POTION, Script_YourPackIsStuffedFull itemtotext USE_SCRIPT_VAR, MEM_BUFFER_1 giveitem ITEM_FROM_MEM, 5 writetext Text_PlayerGotFive writebyte BATTLETOWERACTION_1D - special Special_BattleTowerAction + special BattleTowerAction closetext end @@ -147,7 +145,7 @@ Script_BattleTowerExplanation: ; 0x9e4a5 writetext Text_BattleTowerIntroduction_2 Script_BattleTowerSkipExplanation: writebyte BATTLETOWERACTION_SET_EXPLANATION_READ - special Special_BattleTowerAction + special BattleTowerAction jump Script_Menu_ChallengeExplanationCancel Script_BattleTowerHopeToServeYouAgain: @@ -157,7 +155,7 @@ Script_BattleTowerHopeToServeYouAgain: end UnreferencedScript_0x9e4b6: - special Special_BattleTowerMobileError + special BattleTowerMobileError closetext end @@ -170,11 +168,11 @@ UnreferencedScript_0x9e4be: writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel - special Special_TryQuickSave + special TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel writebyte BATTLETOWERACTION_SET_EXPLANATION_READ - special Special_BattleTowerAction - special Special_Function1700ba + special BattleTowerAction + special Function1700ba if_equal $a, Script_Menu_ChallengeExplanationCancel if_not_equal $0, Script_MobileError writetext Text_ReceivedAListOfLeadersOnTheHonorRoll @@ -187,15 +185,15 @@ UnreferencedScript_0x9e4be: UnreferencedScript_0x9e4ea: writebyte BATTLETOWERACTION_LEVEL_CHECK - special Special_BattleTowerAction + special BattleTowerAction if_not_equal $0, Script_APkmnLevelExceeds writebyte BATTLETOWERACTION_UBERS_CHECK - special Special_BattleTowerAction + special BattleTowerAction if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 - special Special_CheckForBattleTowerRules + special CheckForBattleTowerRules if_not_equal FALSE, Script_WaitButton writebyte BATTLETOWERACTION_05 - special Special_BattleTowerAction + special BattleTowerAction if_equal $0, .zero writetext Text_CantBeRegistered_PreviousRecordDeleted jump continue @@ -209,13 +207,13 @@ continue: yesorno iffalse Script_Menu_ChallengeExplanationCancel setscene 0 - special Special_TryQuickSave + special TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel setscene 1 writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_12 - special Special_BattleTowerAction + special BattleTowerAction writetext Text_RightThisWayToYourBattleRoom waitbutton jump Script_ResumeBattleTowerChallenge @@ -236,7 +234,7 @@ Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549 jump Script_Menu_ChallengeExplanationCancel Script_MobileError: - special Special_BattleTowerMobileError + special BattleTowerMobileError closetext end @@ -794,24 +792,19 @@ Text_BattleTowerBugCatcher: ; 0x9f35b done BattleTower1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 7, 9, 3, BATTLE_TOWER_OUTSIDE - warp_def 8, 9, 4, BATTLE_TOWER_OUTSIDE - warp_def 7, 0, 1, BATTLE_TOWER_ELEVATOR + db 3 ; warp events + warp_event 7, 9, 3, BATTLE_TOWER_OUTSIDE + warp_event 8, 9, 4, BATTLE_TOWER_OUTSIDE + warp_event 7, 0, 1, BATTLE_TOWER_ELEVATOR -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 6, 6, BGEVENT_READ, MapBattleTower1FSignpost0Script -.ObjectEvents: - db 5 + db 5 ; object events object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1 object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1 object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index dd8e08e0f..24011c144 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -3,13 +3,11 @@ const_value set 2 const BATTLETOWERBATTLEROOM_RECEPTIONIST BattleTowerBattleRoom_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .EnterBattleRoom scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .EnterBattleRoom: ; 0x9f419 disappear BATTLETOWERBATTLEROOM_YOUNGSTER @@ -23,7 +21,7 @@ Script_BattleRoom: ; 0x9f421 ; beat all 7 opponents in a row Script_BattleRoomLoop: ; 0x9f425 writebyte BATTLETOWERBATTLEROOM_YOUNGSTER - special Special_LoadOpponentTrainerAndPokemonWithOTSprite + special LoadOpponentTrainerAndPokemonWithOTSprite appear BATTLETOWERBATTLEROOM_YOUNGSTER warpsound waitsfx @@ -32,8 +30,8 @@ Script_BattleRoomLoop: ; 0x9f425 battletowertext BATTLETOWERTEXT_INTRO buttonsound closetext - special Special_BattleTowerBattle ; calls predef startbattle - special Special_FadeOutPalettes + special BattleTowerBattle ; calls predef startbattle + special FadeOutPalettes reloadmap if_not_equal $0, Script_FailedBattleTowerChallenge copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64 @@ -48,10 +46,10 @@ Script_BattleRoomLoop: ; 0x9f425 waitbutton closetext playmusic MUSIC_HEAL - special Special_FadeOutPalettes - special Special_LoadMapPalettes + special FadeOutPalettes + special LoadMapPalettes pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext Text_NextUpOpponentNo @@ -68,35 +66,35 @@ Script_DontBattleNextOpponent: ; 0x9f483 yesorno iffalse Script_DontSaveAndEndTheSession writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave - special Special_BattleTowerAction + special BattleTowerAction playsound SFX_SAVE waitsfx - special Special_FadeOutPalettes + special FadeOutPalettes special Reset Script_DontSaveAndEndTheSession: ; 0x9f4a3 writetext Text_CancelYourBattleRoomChallenge yesorno iffalse Script_ContinueAndBattleNextOpponent writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction closetext - special Special_FadeOutPalettes + special FadeOutPalettes warpfacing UP, BATTLE_TOWER_1F, 7, 7 opentext jump Script_BattleTowerHopeToServeYouAgain Script_FailedBattleTowerChallenge: pause 60 - special Special_BattleTowerFade + special BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, 7, 7 writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction opentext writetext Text_ThanksForVisiting waitbutton @@ -105,7 +103,7 @@ Script_FailedBattleTowerChallenge: Script_BeatenAllTrainers: ; 0x9f4d9 pause 60 - special Special_BattleTowerFade + special BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, 7, 7 Script_BeatenAllTrainers2: opentext @@ -114,7 +112,7 @@ Script_BeatenAllTrainers2: UnreferencedScript_0x9f4eb: writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction opentext writetext Text_TooMuchTimeElapsedNoRegister waitbutton @@ -123,9 +121,9 @@ UnreferencedScript_0x9f4eb: UnreferencedScript_0x9f4f7: writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction opentext writetext Text_ThanksForVisiting writetext Text_WeHopeToServeYouAgain @@ -139,21 +137,16 @@ Text_ReturnedAfterSave_Mobile: done BattleTowerBattleRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 7, 4, BATTLE_TOWER_HALLWAY - warp_def 4, 7, 4, BATTLE_TOWER_HALLWAY + db 2 ; warp events + warp_event 3, 7, 4, BATTLE_TOWER_HALLWAY + warp_event 4, 7, 4, BATTLE_TOWER_HALLWAY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 4, 0, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER object_event 1, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index f9f32dfae..1704c3601 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -2,13 +2,11 @@ const_value set 2 const BATTLETOWERELEVATOR_RECEPTIONIST BattleTowerElevator_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .Scene0 scene_script .Scene1 -.MapCallbacks: - db 0 + db 0 ; callbacks .Scene0: priorityjump .RideElevator @@ -22,7 +20,7 @@ BattleTowerElevator_MapScripts: applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn writebyte BATTLETOWERACTION_0A - special Special_BattleTowerAction + special BattleTowerAction playsound SFX_ELEVATOR earthquake 60 waitsfx @@ -45,20 +43,15 @@ MovementData_BattleTowerElevatorPlayerWalksIn: step_end BattleTowerElevator_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 1, 3, 1, BATTLE_TOWER_HALLWAY - warp_def 2, 3, 1, BATTLE_TOWER_HALLWAY + db 2 ; warp events + warp_event 1, 3, 1, BATTLE_TOWER_HALLWAY + warp_event 2, 3, 1, BATTLE_TOWER_HALLWAY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 1, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 6b50783f5..3cfc923e0 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -2,13 +2,11 @@ const_value set 2 const BATTLETOWERHALLWAY_RECEPTIONIST BattleTowerHallway_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .Scene0 scene_script .Scene1 -.MapCallbacks: - db 0 + db 0 ; callbacks .Scene0: priorityjump .ChooseBattleRoom @@ -77,24 +75,19 @@ BattleTowerHallway_MapScripts: end BattleTowerHallway_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 11, 1, 1, BATTLE_TOWER_ELEVATOR - warp_def 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def 9, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 11, 1, 1, BATTLE_TOWER_ELEVATOR + warp_event 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM + warp_event 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM + warp_event 9, 0, 1, BATTLE_TOWER_BATTLE_ROOM + warp_event 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM + warp_event 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM + + db 0 ; coord events + + db 0 ; bg events + + db 1 ; object events 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 a61717fd0..f9b58af82 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -5,11 +5,9 @@ const_value set 2 const BATTLETOWEROUTSIDE_LASS BattleTowerOutside_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_TILES, .Callback1 callback MAPCALLBACK_OBJECTS, .Callback2 @@ -127,25 +125,20 @@ BattleTowerOutsideText_DoorsOpen: done BattleTowerOutside_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE - warp_def 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE - warp_def 8, 9, 1, BATTLE_TOWER_1F - warp_def 9, 9, 2, BATTLE_TOWER_1F + db 4 ; warp events + warp_event 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE + warp_event 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE + warp_event 8, 9, 1, BATTLE_TOWER_1F + warp_event 9, 9, 2, BATTLE_TOWER_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 10, 10, BGEVENT_READ, MapBattleTowerOutsideSignpost0Script -.ObjectEvents: - db 4 + db 4 ; object events object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 object_event 13, 11, SPRITE_BUENA, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1 object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm new file mode 100644 index 000000000..ff951b05c --- /dev/null +++ b/maps/BillsBrothersHouse.asm @@ -0,0 +1,41 @@ +const_value set 2 + const BILLSBROTHERSHOUSE_POKEFAN_F + const BILLSBROTHERSHOUSE_YOUNGSTER + +BillsBrothersHouse_MapScripts: + db 0 ; scene scripts + + db 0 ; callbacks + +BillsBrotherScript: + jumptextfaceplayer BillsBrotherText + +BillsBrothersHouseYoungsterScript: + jumptextfaceplayer BillsBrothersHouseYoungsterText + +BillsBrotherText: + text "My grandpa is at " + line "my brother BILL's" + cont "on CERULEAN CAPE." + done + +BillsBrothersHouseYoungsterText: + text "I saw these weird," + line "slow #MON on" + cont "CYCLING ROAD." + done + +BillsBrothersHouse_MapEvents: + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, 4, FUCHSIA_CITY + warp_event 3, 7, 4, FUCHSIA_CITY + + db 0 ; coord events + + db 0 ; bg events + + db 2 ; object events + object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1 + object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/BillsFamilysHouse.asm index 33c8dbd17..05c757e71 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -1,16 +1,14 @@ const_value set 2 - const GOLDENRODBILLSHOUSE_BILL - const GOLDENRODBILLSHOUSE_POKEFAN_F - const GOLDENRODBILLSHOUSE_TWIN + const BILLSFAMILYSHOUSE_BILL + const BILLSFAMILYSHOUSE_POKEFAN_F + const BILLSFAMILYSHOUSE_TWIN -GoldenrodBillsHouse_MapScripts: -.SceneScripts: - db 0 +BillsFamilysHouse_MapScripts: + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks -BillsHouseBill: +BillScript: faceplayer opentext checkevent EVENT_GOT_EEVEE @@ -51,7 +49,7 @@ UnknownScript_0x54c1f: closetext end -BillsMom: +BillsMomScript: faceplayer opentext checkevent EVENT_MET_BILL @@ -67,7 +65,7 @@ UnknownScript_0x54c33: closetext end -BillsSister: +BillsSisterScript: faceplayer opentext checkcellnum PHONE_BILL @@ -242,26 +240,21 @@ UnknownText_0x55069: line "system." done -GoldenrodBillsHouse_MapEvents: - ; filler - db 0, 0 +BillsFamilysHouse_MapEvents: + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, GOLDENROD_CITY - warp_def 3, 7, 4, GOLDENROD_CITY + db 2 ; warp events + warp_event 2, 7, 4, GOLDENROD_CITY + warp_event 3, 7, 4, GOLDENROD_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 0, 1, BGEVENT_READ, BillsHouseBookshelf2 bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1 bg_event 7, 1, BGEVENT_READ, BillsHouseRadio -.ObjectEvents: - db 3 - object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsHouseBill, EVENT_MET_BILL - object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMom, -1 - object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSister, -1 + db 3 ; object events + object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL + object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1 + object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index a4f2e0c0e..f27b4a5a3 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -2,16 +2,14 @@ const_value set 2 const BILLSHOUSE_GRAMPS BillsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BillsGrandpa: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .JustShowedSomething checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA iftrue .GotThunderstone @@ -37,7 +35,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal LICKITUNG, .WrongPokemon scall .CorrectPokemon @@ -51,7 +49,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal ODDISH, .WrongPokemon scall .CorrectPokemon @@ -65,7 +63,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal STARYU, .WrongPokemon scall .CorrectPokemon @@ -81,7 +79,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal GROWLITHE, .WrongPokemon scall .CorrectPokemon @@ -95,7 +93,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal VULPIX, .WrongPokemon scall .CorrectPokemon @@ -109,7 +107,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal PICHU, .WrongPokemon scall .CorrectPokemon @@ -123,7 +121,7 @@ BillsGrandpa: verbosegiveitem EVERSTONE iffalse .BagFull setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 closetext end @@ -134,7 +132,7 @@ BillsGrandpa: verbosegiveitem LEAF_STONE iffalse .BagFull setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 closetext end @@ -145,7 +143,7 @@ BillsGrandpa: verbosegiveitem WATER_STONE iffalse .BagFull setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 closetext end @@ -156,7 +154,7 @@ BillsGrandpa: verbosegiveitem FIRE_STONE iffalse .BagFull setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 closetext end @@ -354,20 +352,15 @@ BillsGrandpaPichuText: done BillsHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, ROUTE_25 - warp_def 3, 7, 1, ROUTE_25 + db 2 ; warp events + warp_event 2, 7, 1, ROUTE_25 + warp_event 3, 7, 1, ROUTE_25 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 396599703..edc4e2f66 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -10,11 +10,9 @@ const_value set 2 const BLACKTHORNCITY_COOLTRAINER_F2 BlackthornCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_OBJECTS, .Santos @@ -313,25 +311,21 @@ BlackthornCityTrainerTipsText: done BlackthornCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 8 - warp_def 18, 11, 1, BLACKTHORN_GYM_1F - warp_def 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE - warp_def 29, 23, 1, BLACKTHORN_EMYS_HOUSE - warp_def 15, 29, 2, BLACKTHORN_MART - warp_def 21, 29, 1, BLACKTHORN_POKECENTER_1F - warp_def 9, 31, 1, MOVE_DELETERS_HOUSE - warp_def 36, 9, 2, ICE_PATH_1F - warp_def 20, 1, 1, DRAGONS_DEN_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 7 + db 0, 0 ; filler + + db 8 ; warp events + warp_event 18, 11, 1, BLACKTHORN_GYM_1F + warp_event 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE + warp_event 29, 23, 1, BLACKTHORN_EMYS_HOUSE + warp_event 15, 29, 2, BLACKTHORN_MART + warp_event 21, 29, 1, BLACKTHORN_POKECENTER_1F + warp_event 9, 31, 1, MOVE_DELETERS_HOUSE + warp_event 36, 9, 2, ICE_PATH_1F + warp_event 20, 1, 1, DRAGONS_DEN_1F + + db 0 ; coord events + + db 7 ; bg events bg_event 34, 24, BGEVENT_READ, BlackthornCitySign bg_event 17, 13, BGEVENT_READ, BlackthornGymSign bg_event 7, 31, BGEVENT_READ, MoveDeletersHouseSign @@ -340,8 +334,7 @@ BlackthornCity_MapEvents: bg_event 16, 29, BGEVENT_READ, BlackthornCityMartSign bg_event 22, 29, BGEVENT_READ, BlackthornCityPokecenterSign -.ObjectEvents: - db 9 + db 9 ; object events object_event 18, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM object_event 19, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM object_event 20, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 74621532f..3ee16fefc 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 const BLACKTHORNDRAGONSPEECHHOUSE_EKANS BlackthornDragonSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BlackthornDragonSpeechHouseGrannyScript: jumptextfaceplayer BlackthornDragonSpeechHouseGrannyText @@ -48,21 +46,16 @@ BlackthornDragonSpeechHouseDratiniText: done BlackthornDragonSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, BLACKTHORN_CITY - warp_def 3, 7, 2, BLACKTHORN_CITY + db 2 ; warp events + warp_event 2, 7, 2, BLACKTHORN_CITY + warp_event 3, 7, 2, BLACKTHORN_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1 object_event 5, 5, SPRITE_EKANS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1 diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index d8277c74f..21599704c 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const BLACKTHORNEMYSHOUSE_EMY BlackthornEmysHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Emy: faceplayer @@ -20,22 +18,17 @@ EmysHouseBookshelf: jumpstd magazinebookshelf BlackthornEmysHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, BLACKTHORN_CITY - warp_def 3, 7, 3, BLACKTHORN_CITY + db 2 ; warp events + warp_event 2, 7, 3, BLACKTHORN_CITY + warp_event 3, 7, 3, BLACKTHORN_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, EmysHouseBookshelf bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 25de39246..2f3f22971 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -6,11 +6,9 @@ const_value set 2 const BLACKTHORNGYM1F_GYM_GUY BlackthornGym1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .Boulders .Boulders: @@ -93,7 +91,7 @@ BlackthornGymClairScript: end TrainerCooltrainermPaul: - trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, .Script + trainer COOLTRAINERM, PAUL, EVENT_BEAT_COOLTRAINERM_PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, .Script .Script: end_if_just_battled @@ -104,7 +102,7 @@ TrainerCooltrainermPaul: end TrainerCooltrainermMike: - trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, .Script + trainer COOLTRAINERM, MIKE, EVENT_BEAT_COOLTRAINERM_MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, .Script .Script: end_if_just_battled @@ -115,7 +113,7 @@ TrainerCooltrainermMike: end TrainerCooltrainerfLola: - trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, .Script + trainer COOLTRAINERF, LOLA, EVENT_BEAT_COOLTRAINERF_LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, .Script .Script: end_if_just_battled @@ -387,29 +385,24 @@ BlackthornGymGuyWinText: done BlackthornGym1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 7 - warp_def 4, 17, 1, BLACKTHORN_CITY - warp_def 5, 17, 1, BLACKTHORN_CITY - warp_def 1, 7, 1, BLACKTHORN_GYM_2F - warp_def 7, 9, 2, BLACKTHORN_GYM_2F - warp_def 2, 6, 3, BLACKTHORN_GYM_2F - warp_def 7, 7, 4, BLACKTHORN_GYM_2F - warp_def 7, 6, 5, BLACKTHORN_GYM_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 2 + db 0, 0 ; filler + + db 7 ; warp events + warp_event 4, 17, 1, BLACKTHORN_CITY + warp_event 5, 17, 1, BLACKTHORN_CITY + warp_event 1, 7, 1, BLACKTHORN_GYM_2F + warp_event 7, 9, 2, BLACKTHORN_GYM_2F + warp_event 2, 6, 3, BLACKTHORN_GYM_2F + warp_event 7, 7, 4, BLACKTHORN_GYM_2F + warp_event 7, 6, 5, BLACKTHORN_GYM_2F + + db 0 ; coord events + + db 2 ; bg events bg_event 3, 15, BGEVENT_READ, BlackthornGymStatue bg_event 6, 15, BGEVENT_READ, BlackthornGymStatue -.ObjectEvents: - db 5 + db 5 ; object events object_event 5, 3, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1 object_event 6, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1 object_event 1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 7d08bcebb..2417a14b1 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -9,11 +9,9 @@ const_value set 2 const BLACKTHORNGYM2F_BOULDER6 BlackthornGym2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable .SetUpStoneTable: @@ -59,7 +57,7 @@ BlackthornGymBoulder: jumpstd strengthboulder TrainerCooltrainermCody: - trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script + trainer COOLTRAINERM, CODY, EVENT_BEAT_COOLTRAINERM_CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script .Script: end_if_just_battled @@ -70,7 +68,7 @@ TrainerCooltrainermCody: end TrainerCooltrainerfFran: - trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, .Script + trainer COOLTRAINERF, FRAN, EVENT_BEAT_COOLTRAINERF_FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, .Script .Script: end_if_just_battled @@ -126,25 +124,20 @@ BlackthornGym2FBoulderFellText: done BlackthornGym2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 5 - warp_def 1, 7, 3, BLACKTHORN_GYM_1F - warp_def 7, 9, 4, BLACKTHORN_GYM_1F - warp_def 2, 5, 5, BLACKTHORN_GYM_1F ; hole - warp_def 8, 7, 6, BLACKTHORN_GYM_1F ; hole - warp_def 8, 3, 7, BLACKTHORN_GYM_1F ; hole + db 5 ; warp events + warp_event 1, 7, 3, BLACKTHORN_GYM_1F + warp_event 7, 9, 4, BLACKTHORN_GYM_1F + warp_event 2, 5, 5, BLACKTHORN_GYM_1F ; hole + warp_event 8, 7, 6, BLACKTHORN_GYM_1F ; hole + warp_event 8, 3, 7, BLACKTHORN_GYM_1F ; hole -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 8 + db 8 ; object events object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1 object_event 4, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1 object_event 8, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 4b4b74324..0272436fd 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -4,11 +4,9 @@ const_value set 2 const BLACKTHORNMART_BLACK_BELT BlackthornMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BlackthornMartClerkScript: opentext @@ -47,22 +45,17 @@ BlackthornMartBlackBeltText: done BlackthornMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, BLACKTHORN_CITY - warp_def 3, 7, 4, BLACKTHORN_CITY + db 2 ; warp events + warp_event 2, 7, 4, BLACKTHORN_CITY + warp_event 3, 7, 4, BLACKTHORN_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1 object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1 object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1 diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index 45c925561..e7baf90d9 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 const BLACKTHORNPOKECENTER1F_COOLTRAINER_M BlackthornPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BlackthornPokecenter1FNurseScript: jumpstd pokecenternurse @@ -50,23 +48,18 @@ BlackthornPokecenter1FTwinText: done BlackthornPokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 5, BLACKTHORN_CITY - warp_def 4, 7, 5, BLACKTHORN_CITY - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 5, BLACKTHORN_CITY + warp_event 4, 7, 5, BLACKTHORN_CITY + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1 object_event 5, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1 object_event 1, 4, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index f31fefb9d..e6283bd40 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const BLUESHOUSE_DAISY BluesHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks DaisyScript: faceplayer @@ -19,28 +17,28 @@ DaisyScript: end .ThreePM: - checkflag ENGINE_TEA_IN_BLUES_HOUSE + checkflag ENGINE_DAISYS_GROOMING iftrue .AlreadyGroomedMon writetext DaisyOfferGroomingText yesorno iffalse .Refused writetext DaisyWhichMonText waitbutton - special Special_DaisyMassage + special DaisysGrooming if_equal $0, .Refused if_equal $1, .CantGroomEgg - setflag ENGINE_TEA_IN_BLUES_HOUSE + setflag ENGINE_DAISYS_GROOMING writetext DaisyAlrightText waitbutton closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext GroomedMonLooksContentText - special Special_PlayCurMonCry + special PlayCurMonCry buttonsound writetext DaisyAllDoneText waitbutton @@ -145,20 +143,15 @@ DaisyCantGroomEggText: done BluesHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, PALLET_TOWN - warp_def 3, 7, 2, PALLET_TOWN + db 2 ; warp events + warp_event 2, 7, 2, PALLET_TOWN + warp_event 3, 7, 2, PALLET_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 9ddbb5664..ef1557c03 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -2,13 +2,11 @@ const_value set 2 const BRUNOSROOM_BRUNO BrunosRoom_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .LockDoor scene_script .DummyScene -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .BrunosRoomDoors .LockDoor: @@ -125,22 +123,17 @@ BrunoScript_BrunoDefeatText: done BrunosRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 17, 3, KOGAS_ROOM - warp_def 5, 17, 4, KOGAS_ROOM - warp_def 4, 2, 1, KARENS_ROOM - warp_def 5, 2, 2, KARENS_ROOM + db 4 ; warp events + warp_event 4, 17, 3, KOGAS_ROOM + warp_event 5, 17, 4, KOGAS_ROOM + warp_event 4, 2, 1, KARENS_ROOM + warp_event 5, 2, 2, KARENS_ROOM -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 5, 7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index f8e5ef52f..8d276a634 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -6,14 +6,12 @@ const_value set 2 const BURNEDTOWER1F_POKE_BALL BurnedTower1F_MapScripts: -.SceneScripts: - db 3 + db 3 ; scene scripts scene_script .EusineScene scene_script .DummyScene1 scene_script .DummyScene2 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .HoleAndLadder .EusineScene: @@ -51,7 +49,7 @@ BurnedTower1F_MapScripts: BurnedTowerRivalBattleScript: showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 spriteface BURNEDTOWER1F_SILVER, RIGHT pause 15 @@ -100,7 +98,7 @@ BurnedTowerRivalBattleScript: closetext setscene 2 setevent EVENT_RIVAL_BURNED_TOWER - special Special_FadeOutMusic + special FadeOutMusic pause 15 earthquake 50 showemote EMOTE_SHOCK, PLAYER, 15 @@ -131,10 +129,10 @@ BurnedTower1FRock: jumpstd smashrock BurnedTower1FHiddenEther: - hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER + hiddenitem ETHER, EVENT_BURNED_TOWER_1F_HIDDEN_ETHER BurnedTower1FHiddenUltraBall: - hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem ULTRA_BALL, EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL BurnedTower1FHPUp: itemball HP_UP @@ -278,37 +276,32 @@ BurnedTower1FMortyText: done BurnedTower1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 14 - warp_def 9, 15, 13, ECRUTEAK_CITY - warp_def 10, 15, 13, ECRUTEAK_CITY - warp_def 10, 9, 1, BURNED_TOWER_B1F - warp_def 5, 5, 1, BURNED_TOWER_B1F - warp_def 5, 6, 1, BURNED_TOWER_B1F - warp_def 4, 6, 1, BURNED_TOWER_B1F - warp_def 15, 4, 2, BURNED_TOWER_B1F - warp_def 15, 5, 2, BURNED_TOWER_B1F - warp_def 10, 7, 3, BURNED_TOWER_B1F - warp_def 5, 14, 4, BURNED_TOWER_B1F - warp_def 4, 14, 4, BURNED_TOWER_B1F - warp_def 14, 14, 5, BURNED_TOWER_B1F - warp_def 15, 14, 5, BURNED_TOWER_B1F - warp_def 7, 15, 6, BURNED_TOWER_B1F - -.CoordEvents: - db 1 + db 0, 0 ; filler + + db 14 ; warp events + warp_event 9, 15, 13, ECRUTEAK_CITY + warp_event 10, 15, 13, ECRUTEAK_CITY + warp_event 10, 9, 1, BURNED_TOWER_B1F + warp_event 5, 5, 1, BURNED_TOWER_B1F + warp_event 5, 6, 1, BURNED_TOWER_B1F + warp_event 4, 6, 1, BURNED_TOWER_B1F + warp_event 15, 4, 2, BURNED_TOWER_B1F + warp_event 15, 5, 2, BURNED_TOWER_B1F + warp_event 10, 7, 3, BURNED_TOWER_B1F + warp_event 5, 14, 4, BURNED_TOWER_B1F + warp_event 4, 14, 4, BURNED_TOWER_B1F + warp_event 14, 14, 5, BURNED_TOWER_B1F + warp_event 15, 14, 5, BURNED_TOWER_B1F + warp_event 7, 15, 6, BURNED_TOWER_B1F + + db 1 ; coord events coord_event 11, 9, 1, BurnedTowerRivalBattleScript -.BGEvents: - db 2 + db 2 ; bg events bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther bg_event 13, 11, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall -.ObjectEvents: - db 5 + db 5 ; object events object_event 15, 4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1 object_event 12, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE object_event 8, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 3ad1d60f4..7c0b4d7f3 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -10,13 +10,11 @@ const_value set 2 const BURNEDTOWERB1F_EUSINE BurnedTowerB1F_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .LadderCallback .DummyScene0: @@ -83,7 +81,7 @@ ReleaseTheBeasts: special RestartMapMusic setscene 1 setevent EVENT_RELEASED_THE_BEASTS - special Special_InitRoamMons + special InitRoamMons setmapscene ECRUTEAK_GYM, 1 setmapscene CIANWOOD_CITY, 1 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY @@ -236,27 +234,22 @@ BurnedTowerB1FEusineText: done BurnedTowerB1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 10, 9, 3, BURNED_TOWER_1F - warp_def 17, 7, 7, BURNED_TOWER_1F - warp_def 10, 8, 9, BURNED_TOWER_1F - warp_def 3, 13, 10, BURNED_TOWER_1F - warp_def 17, 14, 12, BURNED_TOWER_1F - warp_def 7, 15, 14, BURNED_TOWER_1F - -.CoordEvents: - db 1 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 10, 9, 3, BURNED_TOWER_1F + warp_event 17, 7, 7, BURNED_TOWER_1F + warp_event 10, 8, 9, BURNED_TOWER_1F + warp_event 3, 13, 10, BURNED_TOWER_1F + warp_event 17, 14, 12, BURNED_TOWER_1F + warp_event 7, 15, 14, BURNED_TOWER_1F + + db 1 ; coord events coord_event 10, 6, 0, ReleaseTheBeasts -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 9 + db 9 ; object events object_event 17, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1 object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index d30baf17d..8d2d04824 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -6,11 +6,9 @@ const_value set 2 const CELADONCAFE_TEACHER CeladonCafe_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonCafeChef: faceplayer @@ -208,24 +206,19 @@ NoRoomForLeftoversText: done CeladonCafe_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 6, 7, 9, CELADON_CITY - warp_def 7, 7, 9, CELADON_CITY + db 2 ; warp events + warp_event 6, 7, 9, CELADON_CITY + warp_event 7, 7, 9, CELADON_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 5, 0, BGEVENT_READ, EatathonContestPoster bg_event 7, 1, BGEVENT_READ, CeladonCafeTrashcan -.ObjectEvents: - db 5 + db 5 ; object events object_event 9, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1 object_event 4, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1 object_event 1, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 8075a5343..e7e62ac4e 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -10,11 +10,9 @@ const_value set 2 const CELADONCITY_LASS CeladonCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -75,7 +73,7 @@ CeladonCityPokecenterSign: jumpstd pokecentersign CeladonCityHiddenPpUp: - hiddenitem EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP + hiddenitem PP_UP, EVENT_CELADON_CITY_HIDDEN_PP_UP CeladonCityFisherText: text "This POLIWRATH is" @@ -235,26 +233,22 @@ CeladonCityTrainerTipsText: done CeladonCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 4, 9, 1, CELADON_DEPT_STORE_1F - warp_def 16, 9, 1, CELADON_MANSION_1F - warp_def 16, 3, 3, CELADON_MANSION_1F - warp_def 17, 3, 3, CELADON_MANSION_1F - warp_def 29, 9, 1, CELADON_POKECENTER_1F - warp_def 18, 19, 1, CELADON_GAME_CORNER - warp_def 23, 19, 1, CELADON_GAME_CORNER_PRIZE_ROOM - warp_def 10, 29, 1, CELADON_GYM - warp_def 25, 29, 1, CELADON_CAFE - -.CoordEvents: - db 0 - -.BGEvents: - db 8 + db 0, 0 ; filler + + db 9 ; warp events + warp_event 4, 9, 1, CELADON_DEPT_STORE_1F + warp_event 16, 9, 1, CELADON_MANSION_1F + warp_event 16, 3, 3, CELADON_MANSION_1F + warp_event 17, 3, 3, CELADON_MANSION_1F + warp_event 29, 9, 1, CELADON_POKECENTER_1F + warp_event 18, 19, 1, CELADON_GAME_CORNER + warp_event 23, 19, 1, CELADON_GAME_CORNER_PRIZE_ROOM + warp_event 10, 29, 1, CELADON_GYM + warp_event 25, 29, 1, CELADON_CAFE + + db 0 ; coord events + + db 8 ; bg events bg_event 23, 21, BGEVENT_READ, CeladonCitySign bg_event 11, 31, BGEVENT_READ, CeladonGymSign bg_event 6, 9, BGEVENT_READ, CeladonCityDeptStoreSign @@ -264,8 +258,7 @@ CeladonCity_MapEvents: bg_event 30, 9, BGEVENT_READ, CeladonCityPokecenterSign bg_event 37, 21, BGEVENT_ITEM, CeladonCityHiddenPpUp -.ObjectEvents: - db 9 + db 9 ; object events object_event 26, 11, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityFisherScript, -1 object_event 27, 11, SPRITE_POLIWAG, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1 object_event 20, 24, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 7f838179d..5eede6743 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -4,11 +4,9 @@ const_value set 2 const CELADONDEPTSTORE1F_TEACHER CeladonDeptStore1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonDeptStore1FReceptionistScript: jumptextfaceplayer CeladonDeptStore1FReceptionistText @@ -74,26 +72,21 @@ CeladonDeptStore1FDirectoryText: done CeladonDeptStore1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 7, 7, 1, CELADON_CITY - warp_def 8, 7, 1, CELADON_CITY - warp_def 15, 0, 2, CELADON_DEPT_STORE_2F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + db 4 ; warp events + warp_event 7, 7, 1, CELADON_CITY + warp_event 8, 7, 1, CELADON_CITY + warp_event 15, 0, 2, CELADON_DEPT_STORE_2F + warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 14, 0, BGEVENT_READ, CeladonDeptStore1FDirectory bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton -.ObjectEvents: - db 3 + db 3 ; object events object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1 object_event 11, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1 object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index eb9bb8dbc..4ec78cb6f 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -5,11 +5,9 @@ const_value set 2 const CELADONDEPTSTORE2F_YOUNGSTER CeladonDeptStore2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x70bad: faceplayer @@ -69,25 +67,20 @@ CeladonDeptStore2FDirectoryText: done CeladonDeptStore2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 12, 0, 1, CELADON_DEPT_STORE_3F - warp_def 15, 0, 3, CELADON_DEPT_STORE_1F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + db 3 ; warp events + warp_event 12, 0, 1, CELADON_DEPT_STORE_3F + warp_event 15, 0, 3, CELADON_DEPT_STORE_1F + warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 14, 0, BGEVENT_READ, CeladonDeptStore2FDirectory bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton -.ObjectEvents: - db 4 + db 4 ; object events object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 object_event 5, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 01cd14f57..4950dee28 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -6,11 +6,9 @@ const_value set 2 const CELADONDEPTSTORE3F_SUPER_NERD CeladonDeptStore3F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x70d29: faceplayer @@ -95,25 +93,20 @@ CeladonDeptStore3FDirectoryText: done CeladonDeptStore3F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 12, 0, 1, CELADON_DEPT_STORE_2F - warp_def 15, 0, 2, CELADON_DEPT_STORE_4F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + db 3 ; warp events + warp_event 12, 0, 1, CELADON_DEPT_STORE_2F + warp_event 15, 0, 2, CELADON_DEPT_STORE_4F + warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 14, 0, BGEVENT_READ, CeladonDeptStore3FDirectory bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton -.ObjectEvents: - db 5 + db 5 ; object events object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1 object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1 object_event 9, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index e3869c990..1d8e8e7fc 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -4,11 +4,9 @@ const_value set 2 const CELADONDEPTSTORE4F_YOUNGSTER CeladonDeptStore4F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x70f0d: faceplayer @@ -51,25 +49,20 @@ CeladonDeptStore4FDirectoryText: done CeladonDeptStore4F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 12, 0, 1, CELADON_DEPT_STORE_5F - warp_def 15, 0, 2, CELADON_DEPT_STORE_3F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + db 3 ; warp events + warp_event 12, 0, 1, CELADON_DEPT_STORE_5F + warp_event 15, 0, 2, CELADON_DEPT_STORE_3F + warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 14, 0, BGEVENT_READ, CeladonDeptStore4FDirectory bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton -.ObjectEvents: - db 3 + db 3 ; object events object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1 object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1 object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index a14e8c7be..63c65acab 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -6,11 +6,9 @@ const_value set 2 const CELADONDEPTSTORE5F_TEACHER CeladonDeptStore5F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x71004: faceplayer @@ -72,25 +70,20 @@ CeladonDeptStore5FDirectoryText: done CeladonDeptStore5F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 12, 0, 1, CELADON_DEPT_STORE_4F - warp_def 15, 0, 1, CELADON_DEPT_STORE_6F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + db 3 ; warp events + warp_event 12, 0, 1, CELADON_DEPT_STORE_4F + warp_event 15, 0, 1, CELADON_DEPT_STORE_6F + warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 14, 0, BGEVENT_READ, CeladonDeptStore5FDirectory bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton -.ObjectEvents: - db 5 + db 5 ; object events object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1 object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1 object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 5a5e37afc..f70a7d725 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -3,11 +3,9 @@ const_value set 2 const CELADONDEPTSTORE6F_YOUNGSTER CeladonDeptStore6F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .HideRooftopStairs .HideRooftopStairs: @@ -24,8 +22,8 @@ CeladonDeptStore6FVendingMachine: opentext writetext CeladonVendingText .Start: - special Special_PlaceMoneyTopRight - loadmenudata .MenuData + special PlaceMoneyTopRight + loadmenuheader .MenuHeader verticalmenu closewindow if_equal 1, .FreshWater @@ -79,13 +77,13 @@ CeladonDeptStore6FVendingMachine: waitbutton jump .Start -.MenuData: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "FRESH WATER ¥200@" @@ -146,19 +144,15 @@ CeladonDeptStore6FDirectoryText: done CeladonDeptStore6F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 15, 0, 2, CELADON_DEPT_STORE_5F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + db 2 ; warp events + warp_event 15, 0, 2, CELADON_DEPT_STORE_5F + warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 6 + db 6 ; bg events bg_event 14, 0, BGEVENT_READ, CeladonDeptStore6FDirectory bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton bg_event 8, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine @@ -166,7 +160,6 @@ CeladonDeptStore6F_MapEvents: bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine -.ObjectEvents: - db 2 + db 2 ; object events object_event 9, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1 object_event 12, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index b5045880b..cbf8f1efa 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -1,9 +1,7 @@ CeladonDeptStoreElevator_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonDeptStoreElevatorScript: opentext @@ -28,20 +26,15 @@ CeladonDeptStoreElevatorData: db -1 ; end CeladonDeptStoreElevator_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 1, 3, -1, CELADON_DEPT_STORE_1F - warp_def 2, 3, -1, CELADON_DEPT_STORE_1F + db 2 ; warp events + warp_event 1, 3, -1, CELADON_DEPT_STORE_1F + warp_event 2, 3, -1, CELADON_DEPT_STORE_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 3, 0, BGEVENT_READ, CeladonDeptStoreElevatorScript -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 5d3382f53..1c213bacf 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -10,11 +10,9 @@ const_value set 2 const CELADONGAMECORNER_GRAMPS CeladonGameCorner_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonGameCornerClerkScript: jumpstd gamecornercoinvendor @@ -115,20 +113,20 @@ CeladonGameCornerLuckySlotMachineScript: if_equal 0, CeladonGameCornerSlotMachineScript refreshscreen writebyte FALSE - special Special_SlotMachine + special SlotMachine closetext end CeladonGameCornerSlotMachineScript: refreshscreen writebyte TRUE - special Special_SlotMachine + special SlotMachine closetext end CeladonGameCornerCardFlipScript: refreshscreen - special Special_CardFlip + special CardFlip closetext end @@ -139,7 +137,7 @@ MapCeladonGameCornerSignpost9Script: opentext writetext UnknownText_0x72567 waitbutton - special Special_CardFlip + special CardFlip closetext end @@ -282,19 +280,15 @@ UnknownText_0x72567: done CeladonGameCorner_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 14, 13, 6, CELADON_CITY - warp_def 15, 13, 6, CELADON_CITY + db 2 ; warp events + warp_event 14, 13, 6, CELADON_CITY + warp_event 15, 13, 6, CELADON_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 38 + db 38 ; bg events bg_event 1, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript bg_event 1, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript bg_event 1, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript @@ -334,8 +328,7 @@ CeladonGameCorner_MapEvents: bg_event 15, 0, BGEVENT_READ, CeladonGameCornerPoster1Script bg_event 9, 0, BGEVENT_READ, CeladonGameCornerPoster2Script -.ObjectEvents: - db 9 + db 9 ; object events object_event 5, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1 object_event 3, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1 object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 1caed4b19..cc64e736e 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -3,11 +3,9 @@ const_value set 2 const CELADONGAMECORNERPRIZEROOM_PHARMACIST CeladonGameCornerPrizeRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonGameCornerPrizeRoomGentlemanScript: jumptextfaceplayer CeladonGameCornerPrizeRoomGentlemanText @@ -24,8 +22,8 @@ CeladonGameCornerPrizeRoomTMVendor: iffalse CeladonPrizeRoom_NoCoinCase writetext CeladonPrizeRoom_AskWhichPrizeText CeladonPrizeRoom_tmcounterloop: - special Special_DisplayCoinCaseBalance - loadmenudata CeladonPrizeRoom_TMMenuDataHeader + special DisplayCoinCaseBalance + loadmenuheader CeladonPrizeRoom_TMMenuHeader verticalmenu closewindow if_equal 1, .doubleteam @@ -102,13 +100,13 @@ CeladonPrizeRoom_NoCoinCase: closetext end -CeladonPrizeRoom_TMMenuDataHeader: +CeladonPrizeRoom_TMMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 15, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "TM32 1500@" @@ -125,8 +123,8 @@ CeladonGameCornerPrizeRoomPokemonVendor: iffalse CeladonPrizeRoom_NoCoinCase .loop writetext CeladonPrizeRoom_AskWhichPrizeText - special Special_DisplayCoinCaseBalance - loadmenudata .MenuDataHeader + special DisplayCoinCaseBalance + loadmenuheader .MenuHeader verticalmenu closewindow if_equal 1, .pikachu @@ -147,7 +145,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: writetext CeladonPrizeRoom_HereYouGoText waitbutton writebyte PIKACHU - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke PIKACHU, 25 takecoins 2222 jump .loop @@ -165,7 +163,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: writetext CeladonPrizeRoom_HereYouGoText waitbutton writebyte PORYGON - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke PORYGON, 15 takecoins 5555 jump .loop @@ -183,18 +181,18 @@ CeladonGameCornerPrizeRoomPokemonVendor: writetext CeladonPrizeRoom_HereYouGoText waitbutton writebyte LARVITAR - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke LARVITAR, 40 takecoins 8888 jump .loop -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 17, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "PIKACHU 2222@" @@ -264,23 +262,18 @@ CeladonPrizeRoom_NoCoinCaseText: done CeladonGameCornerPrizeRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 5, 7, CELADON_CITY - warp_def 3, 5, 7, CELADON_CITY + db 2 ; warp events + warp_event 2, 5, 7, CELADON_CITY + warp_event 3, 5, 7, CELADON_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 2, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor bg_event 4, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor -.ObjectEvents: - db 2 + db 2 ; object events object_event 0, 2, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1 object_event 4, 4, SPRITE_PHARMACIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 53f09324a..1c6e1169c 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -7,11 +7,9 @@ const_value set 2 const CELADONGYM_TWIN2 CeladonGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ErikaScript_0x72a6a: faceplayer @@ -50,7 +48,7 @@ UnknownScript_0x72aae: end TrainerLassMichelle: - trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script + trainer LASS, MICHELLE, EVENT_BEAT_LASS_MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script .Script: end_if_just_battled @@ -61,7 +59,7 @@ TrainerLassMichelle: end TrainerPicnickerTanya: - trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script + trainer PICNICKER, TANYA, EVENT_BEAT_PICNICKER_TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script .Script: end_if_just_battled @@ -72,7 +70,7 @@ TrainerPicnickerTanya: end TrainerBeautyJulia: - trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script + trainer BEAUTY, JULIA, EVENT_BEAT_BEAUTY_JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script .Script: end_if_just_battled @@ -83,7 +81,7 @@ TrainerBeautyJulia: end TrainerTwinsJoandzoe1: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script + trainer TWINS, JOANDZOE1, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script .Script: end_if_just_battled @@ -94,7 +92,7 @@ TrainerTwinsJoandzoe1: end TrainerTwinsJoandzoe2: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script + trainer TWINS, JOANDZOE2, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script .Script: end_if_just_battled @@ -268,24 +266,19 @@ TwinsJoandzoe2AfterBattleText: done CeladonGym_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 17, 8, CELADON_CITY - warp_def 5, 17, 8, CELADON_CITY + db 2 ; warp events + warp_event 4, 17, 8, CELADON_CITY + warp_event 5, 17, 8, CELADON_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 3, 15, BGEVENT_READ, CeladonGymStatue bg_event 6, 15, BGEVENT_READ, CeladonGymStatue -.ObjectEvents: - db 6 + db 6 ; object events object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1 object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1 object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 4f6e0f94d..5d14663a9 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -5,11 +5,9 @@ const_value set 2 const CELADONMANSION1F_GROWLITHE2 CeladonMansion1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonMansionManager: jumptextfaceplayer CeladonMansionManagerText @@ -75,28 +73,23 @@ CeladonMansionManagersSuiteSignText: done CeladonMansion1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 6, 9, 2, CELADON_CITY - warp_def 7, 9, 2, CELADON_CITY - warp_def 3, 0, 3, CELADON_CITY - warp_def 0, 0, 1, CELADON_MANSION_2F - warp_def 7, 0, 4, CELADON_MANSION_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 3 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 6, 9, 2, CELADON_CITY + warp_event 7, 9, 2, CELADON_CITY + warp_event 3, 0, 3, CELADON_CITY + warp_event 0, 0, 1, CELADON_MANSION_2F + warp_event 7, 0, 4, CELADON_MANSION_2F + + db 0 ; coord events + + db 3 ; bg events bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign bg_event 0, 3, BGEVENT_READ, CeladonMansion1fBookshelf bg_event 2, 3, BGEVENT_READ, CeladonMansion1fBookshelf -.ObjectEvents: - db 4 + db 4 ; object events object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1 object_event 2, 6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1 object_event 3, 4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index e463c5b07..231e824c8 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -1,9 +1,7 @@ CeladonMansion2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonMansion2FComputer: jumptext CeladonMansion2FComputerText @@ -50,24 +48,19 @@ CeladonMansion2FSignText: done CeladonMansion2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 0, 4, CELADON_MANSION_1F - warp_def 1, 0, 2, CELADON_MANSION_3F - warp_def 6, 0, 3, CELADON_MANSION_3F - warp_def 7, 0, 5, CELADON_MANSION_1F + db 4 ; warp events + warp_event 0, 0, 4, CELADON_MANSION_1F + warp_event 1, 0, 2, CELADON_MANSION_3F + warp_event 6, 0, 3, CELADON_MANSION_3F + warp_event 7, 0, 5, CELADON_MANSION_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 0, 3, BGEVENT_READ, CeladonMansion2FComputer bg_event 5, 8, BGEVENT_UP, CeladonMansion2FSign bg_event 2, 3, BGEVENT_READ, CeladonMansion2FBookshelf -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index bb6bb2f3f..39ac12d7a 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -5,11 +5,9 @@ const_value set 2 const CELADONMANSION3F_FISHER CeladonMansion3F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CooltrainerMScript_0x71670: faceplayer @@ -28,7 +26,7 @@ UnknownScript_0x7167e: waitsfx writetext UnknownText_0x71760 buttonsound - special Special_Diploma + special Diploma writetext UnknownText_0x71763 waitbutton closetext @@ -49,7 +47,7 @@ UnknownScript_0x716a4: writetext UnknownText_0x717d8 yesorno iffalse UnknownScript_0x716b0 - special Special_PrintDiploma + special PrintDiploma closetext end @@ -190,28 +188,23 @@ UnknownText_0x71996: done CeladonMansion3F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 0, 1, CELADON_MANSION_ROOF - warp_def 1, 0, 2, CELADON_MANSION_2F - warp_def 6, 0, 3, CELADON_MANSION_2F - warp_def 7, 0, 2, CELADON_MANSION_ROOF + db 4 ; warp events + warp_event 0, 0, 1, CELADON_MANSION_ROOF + warp_event 1, 0, 2, CELADON_MANSION_2F + warp_event 6, 0, 3, CELADON_MANSION_2F + warp_event 7, 0, 2, CELADON_MANSION_ROOF -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 5, 8, BGEVENT_UP, MapCeladonMansion3FSignpost0Script bg_event 4, 3, BGEVENT_UP, MapCeladonMansion3FSignpost1Script bg_event 1, 6, BGEVENT_UP, MapCeladonMansion3FSignpost2Script bg_event 1, 3, BGEVENT_UP, MapCeladonMansion3FSignpost3Script -.ObjectEvents: - db 4 + db 4 ; object events object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1 object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1 object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index d3a3c7623..254000bd1 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -2,11 +2,9 @@ const_value set 2 const CELADONMANSIONROOF_FISHER CeladonMansionRoof_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonMansionRoofFisherScript: jumptextfaceplayer CeladonMansionRoofFisherText @@ -34,22 +32,17 @@ UnknownText_0x71aa1: done CeladonMansionRoof_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 1, 1, 1, CELADON_MANSION_3F - warp_def 6, 1, 4, CELADON_MANSION_3F - warp_def 2, 5, 1, CELADON_MANSION_ROOF_HOUSE + db 3 ; warp events + warp_event 1, 1, 1, CELADON_MANSION_3F + warp_event 6, 1, 4, CELADON_MANSION_3F + warp_event 2, 5, 1, CELADON_MANSION_ROOF_HOUSE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 6, 1, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script -.ObjectEvents: - db 1 + db 1 ; object events object_event 7, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index f49d12535..b82709b6c 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const CELADONMANSIONROOFHOUSE_PHARMACIST CeladonMansionRoofHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PharmacistScript_0x71afd: faceplayer @@ -117,20 +115,15 @@ UnknownText_0x71db3: done CeladonMansionRoofHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, CELADON_MANSION_ROOF - warp_def 3, 7, 3, CELADON_MANSION_ROOF + db 2 ; warp events + warp_event 2, 7, 3, CELADON_MANSION_ROOF + warp_event 3, 7, 3, CELADON_MANSION_ROOF -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1 diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index cfe31f624..0590da32d 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -6,11 +6,9 @@ const_value set 2 const CELADONPOKECENTER1F_EUSINE CeladonPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x71e22: jumpstd pokecenternurse @@ -30,9 +28,9 @@ CeladonEusine: writetext CeladonEusineText1 buttonsound writebyte SUICUNE - special Special_MonCheck + special MonCheck iffalse .NoSuicune - special Special_BeastsCheck + special BeastsCheck iftrue .HoOh writetext NoBeastsText waitbutton @@ -146,23 +144,18 @@ NoBeastsText: done CeladonPokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 5, CELADON_CITY - warp_def 4, 7, 5, CELADON_CITY - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 5, CELADON_CITY + warp_event 4, 7, 5, CELADON_CITY + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 5 + db 5 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1 object_event 1, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1 object_event 0, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1 diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm index 06212496b..836369e9a 100644 --- a/maps/CeladonPokecenter2FBeta.asm +++ b/maps/CeladonPokecenter2FBeta.asm @@ -1,23 +1,16 @@ CeladonPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, CELADON_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, 3, CELADON_POKECENTER_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 9980a4487..0e649cba0 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -7,11 +7,9 @@ const_value set 2 const CERULEANCITY_YOUNGSTER CeruleanCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -147,7 +145,7 @@ CeruleanCityMartSign: jumpstd martsign CeruleanCityHiddenBerserkGene: - hiddenitem EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE + hiddenitem BERSERK_GENE, EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY CeruleanCityCooltrainerMText1: text "KANTO's POWER" @@ -276,23 +274,19 @@ CeruleanLockedDoorText: done CeruleanCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 7, 15, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE - warp_def 28, 17, 1, CERULEAN_POLICE_STATION - warp_def 13, 19, 1, CERULEAN_TRADE_SPEECH_HOUSE - warp_def 19, 21, 1, CERULEAN_POKECENTER_1F - warp_def 30, 23, 1, CERULEAN_GYM - warp_def 25, 29, 2, CERULEAN_MART - -.CoordEvents: - db 0 - -.BGEvents: - db 9 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 7, 15, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE + warp_event 28, 17, 1, CERULEAN_POLICE_STATION + warp_event 13, 19, 1, CERULEAN_TRADE_SPEECH_HOUSE + warp_event 19, 21, 1, CERULEAN_POKECENTER_1F + warp_event 30, 23, 1, CERULEAN_GYM + warp_event 25, 29, 2, CERULEAN_MART + + db 0 ; coord events + + db 9 ; bg events bg_event 23, 23, BGEVENT_READ, CeruleanCitySign bg_event 27, 25, BGEVENT_READ, CeruleanGymSign bg_event 11, 29, BGEVENT_READ, CeruleanBikeShopSign @@ -303,8 +297,7 @@ CeruleanCity_MapEvents: bg_event 26, 29, BGEVENT_READ, CeruleanCityMartSign bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene -.ObjectEvents: - db 6 + db 6 ; object events object_event 15, 23, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1 object_event 23, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1 object_event 20, 24, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index b1076ded5..f43cf4d12 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -7,13 +7,11 @@ const_value set 2 const CERULEANGYM_GYM_GUY CeruleanGym_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .GruntRunsOut -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -86,7 +84,7 @@ MistyScript_0x188432: end TrainerSwimmerfDiana: - trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script + trainer SWIMMERF, DIANA, EVENT_BEAT_SWIMMERF_DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script .Script: end_if_just_battled @@ -97,7 +95,7 @@ TrainerSwimmerfDiana: end TrainerSwimmerfBriana: - trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script + trainer SWIMMERF, BRIANA, EVENT_BEAT_SWIMMERF_BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script .Script: end_if_just_battled @@ -108,7 +106,7 @@ TrainerSwimmerfBriana: end TrainerSwimmermParker: - trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script + trainer SWIMMERM, PARKER, EVENT_BEAT_SWIMMERM_PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script .Script: end_if_just_battled @@ -135,7 +133,7 @@ CeruleanGymGuyScript: end CeruleanGymHiddenMachinePart: - hiddenitem EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART + hiddenitem MACHINE_PART, EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM CeruleanGymStatue1: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM @@ -363,25 +361,20 @@ CeruleanGymGuyWinText: done CeruleanGym_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 15, 5, CERULEAN_CITY - warp_def 5, 15, 5, CERULEAN_CITY + db 2 ; warp events + warp_event 4, 15, 5, CERULEAN_CITY + warp_event 5, 15, 5, CERULEAN_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 3, 8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart bg_event 2, 13, BGEVENT_READ, CeruleanGymStatue1 bg_event 6, 13, BGEVENT_READ, CeruleanGymStatue2 -.ObjectEvents: - db 6 + db 6 ; object events object_event 4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 82d9db826..19b60dfdb 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M CeruleanGymBadgeSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeruleanGymBadgeSpeechHousePokefanMScript: jumptextfaceplayer CeruleanGymBadgeSpeechHousePokefanMText @@ -17,20 +15,15 @@ CeruleanGymBadgeSpeechHousePokefanMText: done CeruleanGymBadgeSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, CERULEAN_CITY - warp_def 3, 7, 1, CERULEAN_CITY + db 2 ; warp events + warp_event 2, 7, 1, CERULEAN_CITY + warp_event 3, 7, 1, CERULEAN_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index c89621b6a..d66986a89 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -4,11 +4,9 @@ const_value set 2 const CERULEANMART_COOLTRAINER_F CeruleanMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeruleanMart_Clerk: opentext @@ -46,22 +44,17 @@ CeruleanMart_CooltrainerFText: done CeruleanMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 6, CERULEAN_CITY - warp_def 3, 7, 6, CERULEAN_CITY + db 2 ; warp events + warp_event 2, 7, 6, CERULEAN_CITY + warp_event 3, 7, 6, CERULEAN_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1 object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1 object_event 7, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1 diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 2efd5f743..7988f7154 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -4,17 +4,15 @@ const_value set 2 const CERULEANPOKECENTER1F_GYM_GUY CeruleanPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x18820f: jumpstd pokecenternurse SuperNerdScript_0x188212: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x188221 @@ -63,23 +61,18 @@ CeruleanPokecenter1FGymGuyText: done CeruleanPokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 4, CERULEAN_CITY - warp_def 4, 7, 4, CERULEAN_CITY - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 4, CERULEAN_CITY + warp_event 4, 7, 4, CERULEAN_CITY + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1 object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1 object_event 1, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1 diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm index 467377caa..cbfabf4bf 100644 --- a/maps/CeruleanPokecenter2FBeta.asm +++ b/maps/CeruleanPokecenter2FBeta.asm @@ -1,23 +1,16 @@ CeruleanPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeruleanPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 1, CERULEAN_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, 1, CERULEAN_POKECENTER_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index ca77bf0cd..7adaba556 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -4,11 +4,9 @@ const_value set 2 const CERULEANPOLICESTATION_DIGLETT CeruleanPoliceStation_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeruleanPoliceStationFishingGuruScript: jumptextfaceplayer CeruleanPoliceStationFishingGuruText @@ -44,22 +42,17 @@ CeruleanDiglettText: done CeruleanPoliceStation_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, CERULEAN_CITY - warp_def 3, 7, 2, CERULEAN_CITY + db 2 ; warp events + warp_event 2, 7, 2, CERULEAN_CITY + warp_event 3, 7, 2, CERULEAN_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 5, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1 object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1 object_event 3, 5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 8fdd470ae..785b43cc9 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -5,11 +5,9 @@ const_value set 2 const CERULEANTRADESPEECHHOUSE_ZUBAT CeruleanTradeSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeruleanTradeSpeechHouseGrannyScript: jumptextfaceplayer CeruleanTradeSpeechHouseGrannyText @@ -54,22 +52,17 @@ UnknownText_0x1881b5: done CeruleanTradeSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, CERULEAN_CITY - warp_def 3, 7, 3, CERULEAN_CITY + db 2 ; warp events + warp_event 2, 7, 3, CERULEAN_CITY + warp_event 3, 7, 3, CERULEAN_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1 object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1 object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 3eaa2464b..91ee79e25 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -4,11 +4,9 @@ const_value set 2 const CHARCOALKILN_MOLTRES CharcoalKiln_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CharcoalKilnBoss: faceplayer @@ -149,25 +147,20 @@ FarfetchdText: done CharcoalKiln_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, AZALEA_TOWN - warp_def 3, 7, 2, AZALEA_TOWN + db 2 ; warp events + warp_event 2, 7, 2, AZALEA_TOWN + warp_event 3, 7, 2, AZALEA_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 0, 1, BGEVENT_READ, CharcoalKilnBookshelf bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf bg_event 7, 1, BGEVENT_READ, CharcoalKilnRadio -.ObjectEvents: - db 3 + db 3 ; object events object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS object_event 5, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE object_event 5, 6, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index ac3db17b6..4df1fd299 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -6,13 +6,11 @@ const_value set 2 const CHERRYGROVECITY_FISHER CherrygroveCity_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -105,7 +103,7 @@ CherrygroveSilverSceneSouth: CherrygroveSilverSceneNorth: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear CHERRYGROVECITY_SILVER applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalWalksToYou @@ -547,31 +545,26 @@ GuideGentsHouseSignText: done CherrygroveCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 23, 3, 2, CHERRYGROVE_MART - warp_def 29, 3, 1, CHERRYGROVE_POKECENTER_1F - warp_def 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE - warp_def 25, 9, 1, GUIDE_GENTS_HOUSE - warp_def 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 23, 3, 2, CHERRYGROVE_MART + warp_event 29, 3, 1, CHERRYGROVE_POKECENTER_1F + warp_event 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE + warp_event 25, 9, 1, GUIDE_GENTS_HOUSE + warp_event 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE + + db 2 ; coord events coord_event 33, 6, 1, CherrygroveSilverSceneNorth coord_event 33, 7, 1, CherrygroveSilverSceneSouth -.BGEvents: - db 4 + db 4 ; bg events bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign bg_event 23, 9, BGEVENT_READ, GuideGentsHouseSign bg_event 24, 3, BGEVENT_READ, CherrygroveCityMartSign bg_event 30, 3, BGEVENT_READ, CherrygroveCityPokecenterSign -.ObjectEvents: - db 5 + db 5 ; object events object_event 32, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE object_event 39, 6, SPRITE_SILVER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY object_event 27, 12, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index c79941cb2..8ecad6337 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER CherrygroveEvolutionSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks YoungsterScript_0x196cb2: opentext @@ -42,23 +40,18 @@ UnknownText_0x196cfc: done CherrygroveEvolutionSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, CHERRYGROVE_CITY - warp_def 3, 7, 5, CHERRYGROVE_CITY + db 2 ; warp events + warp_event 2, 7, 5, CHERRYGROVE_CITY + warp_event 3, 7, 5, CHERRYGROVE_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf -.ObjectEvents: - db 2 + db 2 ; object events object_event 3, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1 object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 2709ed1c0..df5c588c6 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER CherrygroveGymSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CherrygroveGymSpeechHousePokefanMScript: jumptextfaceplayer CherrygroveGymSpeechHousePokefanMText @@ -45,23 +43,18 @@ CherrygroveGymSpeechHouseBugCatcherText: done CherrygroveGymSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, CHERRYGROVE_CITY - warp_def 3, 7, 3, CHERRYGROVE_CITY + db 2 ; warp events + warp_event 2, 7, 3, CHERRYGROVE_CITY + warp_event 3, 7, 3, CHERRYGROVE_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf -.ObjectEvents: - db 2 + db 2 ; object events object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1 object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 7a4b6dc0b..7ccc16f59 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -4,11 +4,9 @@ const_value set 2 const CHERRYGROVEMART_YOUNGSTER CherrygroveMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x19680a: opentext @@ -72,22 +70,17 @@ CherrygroveMartYoungsterText: done CherrygroveMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, CHERRYGROVE_CITY - warp_def 3, 7, 1, CHERRYGROVE_CITY + db 2 ; warp events + warp_event 2, 7, 1, CHERRYGROVE_CITY + warp_event 3, 7, 1, CHERRYGROVE_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1 object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1 object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1 diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index 202d87e50..abc16919f 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 const CHERRYGROVEPOKECENTER1F_TEACHER CherrygrovePokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x19696d: jumpstd pokecenternurse @@ -69,23 +67,18 @@ UnknownText_0x196a46: done CherrygrovePokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 2, CHERRYGROVE_CITY - warp_def 4, 7, 2, CHERRYGROVE_CITY - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 2, CHERRYGROVE_CITY + warp_event 4, 7, 2, CHERRYGROVE_CITY + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1 object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1 object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index f05b7aeb3..11fbaf9a2 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -13,13 +13,11 @@ const_value set 2 const CIANWOODCITY_SUICUNE CianwoodCity_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune .DummyScene0: @@ -76,7 +74,7 @@ CianwoodCitySuicuneAndEusine: applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00ec disappear CIANWOODCITY_EUSINE pause 20 - special Special_FadeOutMusic + special FadeOutMusic playmapmusic pause 10 .Done: @@ -145,10 +143,10 @@ CianwoodCityRock: jumpstd smashrock CianwoodCityHiddenRevive: - hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_CIANWOOD_CITY_HIDDEN_REVIVE CianwoodCityHiddenMaxEther: - hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem MAX_ETHER, EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER MovementData_0x1a00da: set_sliding @@ -381,25 +379,21 @@ CianwoodPokeSeerSignText: done CianwoodCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 7 - warp_def 17, 41, 1, MANIAS_HOUSE - 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_PHOTO_STUDIO - warp_def 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE - warp_def 5, 17, 1, POKE_SEERS_HOUSE - -.CoordEvents: - db 1 + db 0, 0 ; filler + + db 7 ; warp events + warp_event 17, 41, 1, MANIAS_HOUSE + warp_event 8, 43, 1, CIANWOOD_GYM + warp_event 23, 43, 1, CIANWOOD_POKECENTER_1F + warp_event 15, 47, 1, CIANWOOD_PHARMACY + warp_event 9, 31, 1, CIANWOOD_PHOTO_STUDIO + warp_event 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE + warp_event 5, 17, 1, POKE_SEERS_HOUSE + + db 1 ; coord events coord_event 11, 16, 1, CianwoodCitySuicuneAndEusine -.BGEvents: - db 8 + db 8 ; bg events bg_event 20, 34, BGEVENT_READ, CianwoodCitySign bg_event 7, 45, BGEVENT_READ, CianwoodGymSign bg_event 24, 43, BGEVENT_READ, CianwoodPokecenterSign @@ -409,8 +403,7 @@ CianwoodCity_MapEvents: bg_event 4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive bg_event 5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther -.ObjectEvents: - db 12 + db 12 ; object events object_event 21, 37, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodCityYoungster, -1 object_event 17, 33, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1 object_event 14, 42, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityLass, -1 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 1ca8a0a5e..fd4109957 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -10,11 +10,9 @@ const_value set 2 const CIANWOODGYM_BOULDER4 CianwoodGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ChuckScript_0x9d60f: faceplayer @@ -87,7 +85,7 @@ CianwoodGymActivateRockets: jumpstd radiotowerrockets TrainerBlackbeltYoshi: - trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script + trainer BLACKBELT_T, YOSHI, EVENT_BEAT_BLACKBELT_YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script .Script: end_if_just_battled @@ -98,7 +96,7 @@ TrainerBlackbeltYoshi: end TrainerBlackbeltLao: - trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, .Script + trainer BLACKBELT_T, LAO, EVENT_BEAT_BLACKBELT_LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, .Script .Script: end_if_just_battled @@ -109,7 +107,7 @@ TrainerBlackbeltLao: end TrainerBlackbeltNob: - trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, .Script + trainer BLACKBELT_T, NOB, EVENT_BEAT_BLACKBELT_NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, .Script .Script: end_if_just_battled @@ -120,7 +118,7 @@ TrainerBlackbeltNob: end TrainerBlackbeltLung: - trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, .Script + trainer BLACKBELT_T, LUNG, EVENT_BEAT_BLACKBELT_LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, .Script .Script: end_if_just_battled @@ -306,24 +304,19 @@ BlackbeltLungAfterText: done CianwoodGym_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 17, 2, CIANWOOD_CITY - warp_def 5, 17, 2, CIANWOOD_CITY + db 2 ; warp events + warp_event 4, 17, 2, CIANWOOD_CITY + warp_event 5, 17, 2, CIANWOOD_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 3, 15, BGEVENT_READ, CianwoodGymStatue bg_event 6, 15, BGEVENT_READ, CianwoodGymStatue -.ObjectEvents: - db 9 + db 9 ; object events object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1 object_event 2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1 object_event 7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 4b3099eec..1049d5280 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -4,11 +4,9 @@ const_value set 2 const CIANWOODLUGIASPEECHHOUSE_TWIN CianwoodLugiaSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CianwoodLugiaSpeechHouseTeacherScript: jumptextfaceplayer CianwoodLugiaSpeechHouseTeacherText @@ -62,24 +60,19 @@ CianwoodLugiaSpeechHouseTwinText: done CianwoodLugiaSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 6, CIANWOOD_CITY - warp_def 3, 7, 6, CIANWOOD_CITY + db 2 ; warp events + warp_event 2, 7, 6, CIANWOOD_CITY + warp_event 3, 7, 6, CIANWOOD_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf -.ObjectEvents: - db 3 + db 3 ; object events object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1 object_event 6, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1 object_event 0, 2, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 696a16610..8bb278e3d 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -2,12 +2,10 @@ const_value set 2 const CIANWOODPHARMACY_PHARMACIST CianwoodPharmacy_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -73,22 +71,17 @@ PharmacistDescribeSecretpotionText: done CianwoodPharmacy_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, CIANWOOD_CITY - warp_def 3, 7, 4, CIANWOOD_CITY + db 2 ; warp events + warp_event 2, 7, 4, CIANWOOD_CITY + warp_event 3, 7, 4, CIANWOOD_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, CianwoodPharmacyBookshelf bg_event 1, 1, BGEVENT_READ, CianwoodPharmacyBookshelf -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1 diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index bbf2eb3d9..956d64948 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -2,11 +2,9 @@ const_value set 2 const CIANWOODPHOTOSTUDIO_FISHING_GURU CianwoodPhotoStudio_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FishingGuruScript_0x9e0e0: faceplayer @@ -16,7 +14,7 @@ FishingGuruScript_0x9e0e0: iffalse UnknownScript_0x9e0f3 writetext UnknownText_0x9e142 waitbutton - special Special_PhotoStudio + special PhotoStudio waitbutton closetext end @@ -49,20 +47,15 @@ UnknownText_0x9e156: done CianwoodPhotoStudio_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, CIANWOOD_CITY - warp_def 3, 7, 5, CIANWOOD_CITY + db 2 ; warp events + warp_event 2, 7, 5, CIANWOOD_CITY + warp_event 3, 7, 5, CIANWOOD_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index 0f97e011b..3b7e41f17 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 const CIANWOODPOKECENTER1F_SUPER_NERD CianwoodPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x9dbcf: jumpstd pokecenternurse @@ -132,23 +130,18 @@ CianwoodPokecenter1FSuperNerdText: done CianwoodPokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 3, CIANWOOD_CITY - warp_def 4, 7, 3, CIANWOOD_CITY - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 3, CIANWOOD_CITY + warp_event 4, 7, 3, CIANWOOD_CITY + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1 object_event 1, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1 object_event 5, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index ed4765d18..021da6387 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -2,11 +2,9 @@ const_value set 2 const CINNABARISLAND_BLUE CinnabarIsland_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -35,7 +33,7 @@ CinnabarIslandPokecenterSign: jumpstd pokecentersign CinnabarIslandHiddenRareCandy: - hiddenitem EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY CinnabarIslandBlueTeleport: teleport_from @@ -128,23 +126,18 @@ CinnabarIslandSignText: done CinnabarIsland_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 11, 11, 1, CINNABAR_POKECENTER_1F + db 1 ; warp events + warp_event 11, 11, 1, CINNABAR_POKECENTER_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 12, 11, BGEVENT_READ, CinnabarIslandPokecenterSign bg_event 9, 11, BGEVENT_READ, CinnabarIslandGymSign bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign bg_event 9, 1, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy -.ObjectEvents: - db 1 + db 1 ; object events object_event 9, 6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index 17fe1b97c..c5f5956e9 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -4,11 +4,9 @@ const_value set 2 const CINNABARPOKECENTER1F_FISHER CinnabarPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x1ab32c: jumpstd pokecenternurse @@ -35,23 +33,18 @@ CinnabarPokecenter1FFisherText: done CinnabarPokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 1, CINNABAR_ISLAND - warp_def 4, 7, 1, CINNABAR_ISLAND - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 1, CINNABAR_ISLAND + warp_event 4, 7, 1, CINNABAR_ISLAND + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1 object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1 object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1 diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm index f2621c43c..559a1425f 100644 --- a/maps/CinnabarPokecenter2FBeta.asm +++ b/maps/CinnabarPokecenter2FBeta.asm @@ -1,23 +1,16 @@ CinnabarPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CinnabarPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, CINNABAR_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, 3, CINNABAR_POKECENTER_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 6f8538bac..7dd4083a9 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -3,14 +3,12 @@ const_value set 2 const COLOSSEUM_CHRIS2 Colosseum_MapScripts: -.SceneScripts: - db 3 + db 3 ; scene scripts scene_script .InitializeColosseum scene_script .DummyScene1 scene_script .DummyScene2 -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_OBJECTS, .SetWhichChris callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F @@ -25,7 +23,7 @@ Colosseum_MapScripts: end .SetWhichChris: - special Special_CableClubCheckWhichChris + special CableClubCheckWhichChris iffalse .Chris2 disappear COLOSSEUM_CHRIS2 appear COLOSSEUM_CHRIS1 @@ -46,7 +44,7 @@ Colosseum_MapScripts: end MapColosseumSignpost1Script: - special Special_Colosseum + special Colosseum newloadmap MAPSETUP_LINKRETURN end @@ -63,23 +61,18 @@ ChrisScript_0x193499: done Colosseum_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 7, 3, POKECENTER_2F - warp_def 5, 7, 3, POKECENTER_2F + db 2 ; warp events + warp_event 4, 7, 3, POKECENTER_2F + warp_event 5, 7, 3, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script bg_event 5, 4, BGEVENT_LEFT, MapColosseumSignpost1Script -.ObjectEvents: - db 2 - object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS - object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT + db 2 ; object events + object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 695329ded..96249fe8d 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -4,11 +4,9 @@ const_value set 2 const COPYCATSHOUSE1F_CLEFAIRY CopycatsHouse1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CopycatsHouse1FPokefanMScript: jumptextfaceplayer CopycatsHouse1FPokefanMText @@ -73,23 +71,18 @@ UnknownText_0x18ae4b: done CopycatsHouse1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 2, 7, 8, SAFFRON_CITY - warp_def 3, 7, 8, SAFFRON_CITY - warp_def 2, 0, 1, COPYCATS_HOUSE_2F + db 3 ; warp events + warp_event 2, 7, 8, SAFFRON_CITY + warp_event 3, 7, 8, SAFFRON_CITY + warp_event 2, 0, 1, COPYCATS_HOUSE_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1 object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1 object_event 6, 6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 74f6af110..722b39dcc 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -7,11 +7,9 @@ const_value set 2 const COPYCATSHOUSE2F_COPYCAT2 ; if player is female CopycatsHouse2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Callback .Callback: @@ -46,7 +44,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Default_Merge_1: - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX checkevent EVENT_RETURNED_MACHINE_PART iftrue .TalkAboutLostItem opentext @@ -70,7 +68,7 @@ Copycat: .Default_Merge_3a: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext CopycatText_QuickMimicking waitbutton @@ -99,7 +97,7 @@ Copycat: .Default_Merge_3b: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext CopycatText_Worried waitbutton @@ -142,7 +140,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .GotPass_Merge_1: - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext checkflag ENGINE_PLAYER_IS_FEMALE iftrue .GotPass_Female_2 @@ -164,7 +162,7 @@ Copycat: .GotPass_Merge_3: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext CopycatText_ItsAScream waitbutton @@ -361,23 +359,18 @@ CopycatsHouse2FDollText: done CopycatsHouse2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 3, 0, 3, COPYCATS_HOUSE_1F + db 1 ; warp events + warp_event 3, 0, 3, COPYCATS_HOUSE_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, CopycatsHouse2FBookshelf bg_event 1, 1, BGEVENT_READ, CopycatsHouse2FBookshelf -.ObjectEvents: - db 6 + db 6 ; object events object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1 object_event 6, 4, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1 object_event 6, 1, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index bb698becd..fa3c4abca 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -10,14 +10,12 @@ const_value set 2 const DANCETHEATRE_GRANNY DanceTheatre_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerKimonoGirlNaoko2: - trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script + trainer KIMONO_GIRL, NAOKO2, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script .Script: end_if_just_battled @@ -28,7 +26,7 @@ TrainerKimonoGirlNaoko2: end TrainerKimonoGirlSayo: - trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, KimonoGirlSayoSeenText, KimonoGirlSayoBeatenText, 0, .Script + trainer KIMONO_GIRL, SAYO, EVENT_BEAT_KIMONO_GIRL_SAYO, KimonoGirlSayoSeenText, KimonoGirlSayoBeatenText, 0, .Script .Script: end_if_just_battled @@ -39,7 +37,7 @@ TrainerKimonoGirlSayo: end TrainerKimonoGirlZuki: - trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, KimonoGirlZukiSeenText, KimonoGirlZukiBeatenText, 0, .Script + trainer KIMONO_GIRL, ZUKI, EVENT_BEAT_KIMONO_GIRL_ZUKI, KimonoGirlZukiSeenText, KimonoGirlZukiBeatenText, 0, .Script .Script: end_if_just_battled @@ -50,7 +48,7 @@ TrainerKimonoGirlZuki: end TrainerKimonoGirlKuni: - trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, KimonoGirlKuniSeenText, KimonoGirlKuniBeatenText, 0, .Script + trainer KIMONO_GIRL, KUNI, EVENT_BEAT_KIMONO_GIRL_KUNI, KimonoGirlKuniSeenText, KimonoGirlKuniBeatenText, 0, .Script .Script: end_if_just_battled @@ -61,7 +59,7 @@ TrainerKimonoGirlKuni: end TrainerKimonoGirlMiki: - trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, KimonoGirlMikiSeenText, KimonoGirlMikiBeatenText, 0, .Script + trainer KIMONO_GIRL, MIKI, EVENT_BEAT_KIMONO_GIRL_MIKI, KimonoGirlMikiSeenText, KimonoGirlMikiBeatenText, 0, .Script .Script: end_if_just_battled @@ -338,24 +336,19 @@ FancyPanelText: done DanceTheatre_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 5, 13, 8, ECRUTEAK_CITY - warp_def 6, 13, 8, ECRUTEAK_CITY + db 2 ; warp events + warp_event 5, 13, 8, ECRUTEAK_CITY + warp_event 6, 13, 8, ECRUTEAK_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 5, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script bg_event 6, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script -.ObjectEvents: - db 9 + db 9 ; object events object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1 object_event 2, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1 object_event 6, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 63ea46aa3..9806a905e 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -4,11 +4,9 @@ const_value set 2 const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2 DarkCaveBlackthornEntrance_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks DarkCaveBlackthornEntrancePharmacistScript: faceplayer @@ -62,22 +60,17 @@ DarkCaveBlackthornEntrancePharmacistText2: done DarkCaveBlackthornEntrance_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 23, 3, 1, ROUTE_45 - warp_def 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE + db 2 ; warp events + warp_event 23, 3, 1, ROUTE_45 + warp_event 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 7, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1 object_event 21, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE object_event 7, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 3eed4f41c..c188057e8 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -9,11 +9,9 @@ const_value set 2 const DARKCAVEVIOLETENTRANCE_POKE_BALL4 DarkCaveVioletEntrance_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks DarkCaveVioletEntrancePotion: itemball POTION @@ -31,27 +29,22 @@ DarkCaveVioletEntranceRock: jumpstd smashrock DarkCaveVioletEntranceHiddenElixer: - hiddenitem EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER + hiddenitem ELIXER, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER DarkCaveVioletEntrance_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 15, 3, ROUTE_31 - warp_def 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE - warp_def 35, 33, 3, ROUTE_46 + db 3 ; warp events + warp_event 3, 15, 3, ROUTE_31 + warp_event 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE + warp_event 35, 33, 3, ROUTE_46 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 26, 3, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer -.ObjectEvents: - db 8 + db 8 ; object events object_event 6, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION object_event 16, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 object_event 27, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 93461c3a8..e6b3ea986 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -3,11 +3,9 @@ const_value set 2 const DAYCARE_GRANNY DayCare_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: @@ -32,7 +30,7 @@ DayCareManScript_Inside: closetext checkcode VAR_PARTYCOUNT if_equal PARTY_LENGTH, .PartyFull - special Special_GiveOddEgg + special GiveOddEgg opentext writetext DayCareText_GotOddEgg playsound SFX_KEY_ITEM @@ -51,7 +49,7 @@ DayCareManScript_Inside: end .AlreadyHaveOddEgg: - special Special_DayCareMan + special DayCareMan waitbutton closetext end @@ -61,7 +59,7 @@ DayCareLadyScript: opentext checkflag ENGINE_DAY_CARE_MAN_HAS_EGG iftrue .HusbandWasLookingForYou - special Special_DayCareLady + special DayCareLady waitbutton closetext end @@ -156,25 +154,20 @@ DayCareText_PartyFull: done DayCare_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 5, 3, ROUTE_34 - warp_def 0, 6, 4, ROUTE_34 - warp_def 2, 7, 5, ROUTE_34 - warp_def 3, 7, 5, ROUTE_34 + db 4 ; warp events + warp_event 0, 5, 3, ROUTE_34 + warp_event 0, 6, 4, ROUTE_34 + warp_event 2, 7, 5, ROUTE_34 + warp_event 3, 7, 5, ROUTE_34 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, DayCareBookshelf bg_event 1, 1, BGEVENT_READ, DayCareBookshelf -.ObjectEvents: - db 2 + db 2 ; object events object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE object_event 5, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1 diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm index e958d81f2..a4bfcf211 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/DayOfWeekSiblingsHouse.asm @@ -1,12 +1,10 @@ const_value set 2 - const ROUTE26DAYOFWEEKSIBLINGSHOUSE_POKEDEX + const DAYOFWEEKSIBLINGSHOUSE_POKEDEX -Route26DayofWeekSiblingsHouse_MapScripts: -.SceneScripts: - db 0 +DayOfWeekSiblingsHouse_MapScripts: + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PokedexScript_0x7b1e4: opentext @@ -70,21 +68,16 @@ UnknownText_0x7b2b9: line "ROUTE 37" done -Route26DayofWeekSiblingsHouse_MapEvents: - ; filler - db 0, 0 +DayOfWeekSiblingsHouse_MapEvents: + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, ROUTE_26 - warp_def 3, 7, 3, ROUTE_26 + db 2 ; warp events + warp_event 2, 7, 3, ROUTE_26 + warp_event 3, 7, 3, ROUTE_26 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index b7ff38465..74ed60bc9 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -2,17 +2,15 @@ const_value set 2 const DIGLETTSCAVE_POKEFAN_M DiglettsCave_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks DiglettsCavePokefanMScript: jumptextfaceplayer DiglettsCavePokefanMText DiglettsCaveHiddenMaxRevive: - hiddenitem EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE + hiddenitem MAX_REVIVE, EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE DiglettsCavePokefanMText: text "A bunch of DIGLETT" @@ -23,25 +21,20 @@ DiglettsCavePokefanMText: done DiglettsCave_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 3, 33, 10, VERMILION_CITY - warp_def 5, 31, 5, DIGLETTS_CAVE - warp_def 15, 5, 5, ROUTE_2 - warp_def 17, 3, 6, DIGLETTS_CAVE - warp_def 17, 33, 2, DIGLETTS_CAVE - warp_def 3, 3, 4, DIGLETTS_CAVE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 3, 33, 10, VERMILION_CITY + warp_event 5, 31, 5, DIGLETTS_CAVE + warp_event 15, 5, 5, ROUTE_2 + warp_event 17, 3, 6, DIGLETTS_CAVE + warp_event 17, 33, 2, DIGLETTS_CAVE + warp_event 3, 3, 4, DIGLETTS_CAVE + + db 0 ; coord events + + db 1 ; bg events bg_event 6, 11, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive -.ObjectEvents: - db 1 + db 1 ; object events object_event 3, 31, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 8be52840d..eb8485e5e 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -5,13 +5,11 @@ const_value set 2 const DRAGONSHRINE_CLAIR DragonShrine_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DragonShrineTest scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DragonShrineTest: priorityjump .DragonShrineTestScript @@ -27,10 +25,10 @@ DragonShrine_MapScripts: writetext DragonShrineElderGreetingText buttonsound .Question1: - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 writetext DragonShrineQuestion1Text buttonsound - loadmenudata DragonShrineQuestion1_MenuDataHeader + loadmenuheader DragonShrineQuestion1_MenuHeader verticalmenu closewindow if_equal 1, .RightAnswer @@ -39,57 +37,57 @@ DragonShrine_MapScripts: end .Question2: - setevent EVENT_DRAGON_SHRINE_QUESTION_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 writetext DragonShrineQuestion2Text buttonsound - loadmenudata DragonShrineQuestion2_MenuDataHeader + loadmenuheader DragonShrineQuestion2_MenuHeader verticalmenu closewindow if_equal 1, .RightAnswer if_equal 2, .RightAnswer if_equal 3, .WrongAnswer .Question3: - setevent EVENT_DRAGON_SHRINE_QUESTION_3 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4 writetext DragonShrineQuestion3Text buttonsound - loadmenudata DragonShrineQuestion3_MenuDataHeader + loadmenuheader DragonShrineQuestion3_MenuHeader verticalmenu closewindow if_equal 1, .WrongAnswer if_equal 2, .RightAnswer if_equal 3, .RightAnswer .Question4: - setevent EVENT_DRAGON_SHRINE_QUESTION_4 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5 writetext DragonShrineQuestion4Text buttonsound - loadmenudata DragonShrineQuestion4_MenuDataHeader + loadmenuheader DragonShrineQuestion4_MenuHeader verticalmenu closewindow if_equal 1, .RightAnswer if_equal 2, .WrongAnswer if_equal 3, .RightAnswer .Question5: - setevent EVENT_DRAGON_SHRINE_QUESTION_5 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6 writetext DragonShrineQuestion5Text buttonsound - loadmenudata DragonShrineQuestion5_MenuDataHeader + loadmenuheader DragonShrineQuestion5_MenuHeader verticalmenu closewindow if_equal 1, .WrongAnswer if_equal 2, .RightAnswer if_equal 3, .WrongAnswer .RightAnswer: - checkevent EVENT_DRAGON_SHRINE_QUESTION_5 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6 iftrue .PassedTheTest writetext DragonShrineRightAnswerText buttonsound - checkevent EVENT_DRAGON_SHRINE_QUESTION_4 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5 iftrue .Question5 - checkevent EVENT_DRAGON_SHRINE_QUESTION_3 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4 iftrue .Question4 - checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 iftrue .Question3 - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .Question2 .WrongAnswer: closetext @@ -105,15 +103,15 @@ DragonShrine_MapScripts: closetext setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG opentext - checkevent EVENT_DRAGON_SHRINE_QUESTION_5 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6 iftrue .Question5 - checkevent EVENT_DRAGON_SHRINE_QUESTION_4 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5 iftrue .Question4 - checkevent EVENT_DRAGON_SHRINE_QUESTION_3 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4 iftrue .Question3 - checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 iftrue .Question2 - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .Question1 .PassedTheTest: writetext DragonShrinePassedTestText @@ -134,7 +132,7 @@ DragonShrine_MapScripts: writetext DragonShrineClairYouPassedText waitbutton closetext - special Special_FadeOutMusic + special FadeOutMusic applymovement DRAGONSHRINE_CLAIR, DragonShrineClairBigStepLeftMovement opentext writetext DragonShrineClairThatCantBeText @@ -188,15 +186,15 @@ DragonShrine_MapScripts: playsound SFX_ENTER_DOOR disappear DRAGONSHRINE_CLAIR waitsfx - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 end DragonShrineElder1Script: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .DontGiveDratiniYet - checkevent EVENT_JUST_RECEIVED_DRATINI + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7 iftrue .ReceivedDratini checkevent EVENT_GOT_DRATINI iffalse .GiveDratini @@ -211,15 +209,15 @@ DragonShrineElder1Script: writetext DragonShrineTakeThisDratiniText waitbutton checkcode VAR_PARTYCOUNT - if_equal 6, .PartyFull + if_equal PARTY_LENGTH, .PartyFull writetext DragonShrinePlayerReceivedDratiniText playsound SFX_CAUGHT_MON waitsfx givepoke DRATINI, 15 checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG - special Special_Dratini + special GiveDratini setevent EVENT_GOT_DRATINI - setevent EVENT_JUST_RECEIVED_DRATINI + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7 writetext DragonShrineSymbolicDragonText waitbutton closetext @@ -265,65 +263,65 @@ DragonShrineElder3Script: closetext end -DragonShrineQuestion1_MenuDataHeader: +DragonShrineQuestion1_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Pal@" db "Underling@" db "Friend@" -DragonShrineQuestion2_MenuDataHeader: +DragonShrineQuestion2_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 9, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Strategy@" db "Raising@" db "Cheating@" -DragonShrineQuestion3_MenuDataHeader: +DragonShrineQuestion3_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 5, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Weak person@" db "Tough person@" db "Anybody@" -DragonShrineQuestion4_MenuDataHeader: +DragonShrineQuestion4_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Love@" db "Violence@" db "Knowledge@" -DragonShrineQuestion5_MenuDataHeader: +DragonShrineQuestion5_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 12, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Tough@" @@ -658,23 +656,18 @@ DragonShrineSpeechlessText: done DragonShrine_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 9, 2, DRAGONS_DEN_B1F - warp_def 5, 9, 2, DRAGONS_DEN_B1F + db 2 ; warp events + warp_event 4, 9, 2, DRAGONS_DEN_B1F + warp_event 5, 9, 2, DRAGONS_DEN_B1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 - 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 + db 4 ; object events + object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 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 0ff616c59..5d6b27646 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -1,26 +1,19 @@ DragonsDen1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks DragonsDen1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 3, 5, 8, BLACKTHORN_CITY - warp_def 3, 3, 4, DRAGONS_DEN_1F - warp_def 5, 15, 1, DRAGONS_DEN_B1F - warp_def 5, 13, 2, DRAGONS_DEN_1F + db 4 ; warp events + warp_event 3, 5, 8, BLACKTHORN_CITY + warp_event 3, 3, 4, DRAGONS_DEN_1F + warp_event 5, 15, 1, DRAGONS_DEN_B1F + warp_event 5, 13, 2, DRAGONS_DEN_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 10b079edf..0ce532235 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -10,13 +10,11 @@ const_value set 2 const DRAGONSDENB1F_POKE_BALL3 DragonsDenB1F_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .CheckSilver .DummyScene0: @@ -76,7 +74,7 @@ DragonsDenB1F_ClairScene: closetext .FinishClair: applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksAway - special Special_FadeOutMusic + special FadeOutMusic pause 30 special RestartMapMusic disappear DRAGONSDENB1F_CLAIR @@ -84,7 +82,7 @@ DragonsDenB1F_ClairScene: end TrainerCooltrainermDarin: - trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, .Script + trainer COOLTRAINERM, DARIN, EVENT_BEAT_COOLTRAINERM_DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, .Script .Script: end_if_just_battled @@ -95,7 +93,7 @@ TrainerCooltrainermDarin: end TrainerCooltrainerfCara: - trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, .Script + trainer COOLTRAINERF, CARA, EVENT_BEAT_COOLTRAINERF_CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, .Script .Script: end_if_just_battled @@ -106,7 +104,7 @@ TrainerCooltrainerfCara: end TrainerTwinsLeaandpia1: - trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, .Script + trainer TWINS, LEAANDPIA1, EVENT_BEAT_TWINS_LEA_AND_PIA, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, .Script .Script: end_if_just_battled @@ -117,7 +115,7 @@ TrainerTwinsLeaandpia1: end TrainerTwinsLeaandpia2: - trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, .Script + trainer TWINS, LEAANDPIA1, EVENT_BEAT_TWINS_LEA_AND_PIA, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, .Script .Script: end_if_just_battled @@ -157,12 +155,12 @@ SilverScript_0x18c97e: playmusic MUSIC_RIVAL_ENCOUNTER faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .SilverTalkAgain writetext SilverText_Training1 waitbutton closetext - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 special RestartMapMusic end @@ -183,13 +181,13 @@ DragonsDenB1FMaxElixer: itemball MAX_ELIXER DragonsDenB1FHiddenRevive: - hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE DragonsDenB1FHiddenMaxPotion: - hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION DragonsDenB1FHiddenMaxElixer: - hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER + hiddenitem MAX_ELIXER, EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER MovementDragonsDen_ClairWalksToYou: slow_step RIGHT @@ -407,27 +405,22 @@ Text_NoRoomForDragonFang: done DragonsDenB1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 20, 3, 3, DRAGONS_DEN_1F - warp_def 19, 29, 1, DRAGON_SHRINE + db 2 ; warp events + warp_event 20, 3, 3, DRAGONS_DEN_1F + warp_event 19, 29, 1, DRAGON_SHRINE -.CoordEvents: - db 1 + db 1 ; coord events coord_event 19, 30, 1, DragonsDenB1F_ClairScene -.BGEvents: - db 4 + db 4 ; bg events bg_event 18, 24, BGEVENT_READ, MapDragonsDenB1FSignpost0Script bg_event 33, 29, BGEVENT_ITEM, DragonsDenB1FHiddenRevive bg_event 21, 17, BGEVENT_ITEM, DragonsDenB1FHiddenMaxPotion bg_event 31, 15, BGEVENT_ITEM, DragonsDenB1FHiddenMaxElixer -.ObjectEvents: - db 9 + db 9 ; object events object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG object_event 14, 30, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR object_event 20, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 1936858dd..8bbef9261 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -7,11 +7,9 @@ const_value set 2 const EARLSPOKEMONACADEMY_POKEDEX EarlsPokemonAcademy_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks AcademyEarl: applymovement EARLSPOKEMONACADEMY_EARL, MovementData_0x68b2d @@ -66,7 +64,7 @@ AcademyBlackboard: opentext writetext AcademyBlackboardText .Loop: - loadmenudata .BlackboardMenuData + loadmenuheader .BlackboardMenuHeader _2dmenu closewindow if_equal 1, .Poison @@ -102,13 +100,13 @@ AcademyBlackboard: waitbutton jump .Loop -.BlackboardMenuData: +.BlackboardMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 11, 8 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags dn 3, 2 ; rows, columns db 5 ; spacing @@ -412,26 +410,21 @@ AcademyStickerMachineText: done EarlsPokemonAcademy_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 15, 3, VIOLET_CITY - warp_def 4, 15, 3, VIOLET_CITY + db 2 ; warp events + warp_event 3, 15, 3, VIOLET_CITY + warp_event 4, 15, 3, VIOLET_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 0, 1, BGEVENT_READ, AcademyBookshelf bg_event 1, 1, BGEVENT_READ, AcademyBookshelf bg_event 3, 0, BGEVENT_READ, AcademyBlackboard bg_event 4, 0, BGEVENT_READ, AcademyBlackboard -.ObjectEvents: - db 6 + db 6 ; object events object_event 4, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1 object_event 3, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 5e3dada98..c23c36c0e 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -8,11 +8,9 @@ const_value set 2 const ECRUTEAKCITY_GRAMPS3 EcruteakCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -88,7 +86,7 @@ EcruteakCityMartSign: jumpstd martsign EcruteakCityHiddenHyperPotion: - hiddenitem EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION UnusedMissingDaughterText: ; This text is neither used nor referenced in the final game. @@ -260,32 +258,28 @@ BurnedTowerSignText: done EcruteakCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 15 - warp_def 35, 26, 1, ROUTE_42_ECRUTEAK_GATE - warp_def 35, 27, 2, ROUTE_42_ECRUTEAK_GATE - warp_def 18, 11, 1, ECRUTEAK_HOUSE - warp_def 20, 2, 1, WISE_TRIOS_ROOM - warp_def 20, 3, 2, WISE_TRIOS_ROOM - warp_def 23, 27, 1, ECRUTEAK_POKECENTER_1F - warp_def 5, 21, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE - warp_def 23, 21, 1, DANCE_THEATRE - warp_def 29, 21, 2, ECRUTEAK_MART - warp_def 6, 27, 1, ECRUTEAK_GYM - warp_def 13, 27, 1, ECRUTEAK_ITEMFINDER_HOUSE - warp_def 37, 7, 1, TIN_TOWER_1F - warp_def 5, 5, 1, BURNED_TOWER_1F - warp_def 0, 18, 3, ROUTE_38_ECRUTEAK_GATE - warp_def 0, 19, 4, ROUTE_38_ECRUTEAK_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 8 + db 0, 0 ; filler + + db 15 ; warp events + warp_event 35, 26, 1, ROUTE_42_ECRUTEAK_GATE + warp_event 35, 27, 2, ROUTE_42_ECRUTEAK_GATE + warp_event 18, 11, 1, ECRUTEAK_TIN_TOWER_ENTRANCE + warp_event 20, 2, 1, WISE_TRIOS_ROOM + warp_event 20, 3, 2, WISE_TRIOS_ROOM + warp_event 23, 27, 1, ECRUTEAK_POKECENTER_1F + warp_event 5, 21, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE + warp_event 23, 21, 1, DANCE_THEATRE + warp_event 29, 21, 2, ECRUTEAK_MART + warp_event 6, 27, 1, ECRUTEAK_GYM + warp_event 13, 27, 1, ECRUTEAK_ITEMFINDER_HOUSE + warp_event 37, 7, 1, TIN_TOWER_1F + warp_event 5, 5, 1, BURNED_TOWER_1F + warp_event 0, 18, 3, ROUTE_38_ECRUTEAK_GATE + warp_event 0, 19, 4, ROUTE_38_ECRUTEAK_GATE + + db 0 ; coord events + + db 8 ; bg events bg_event 15, 21, BGEVENT_READ, EcruteakCitySign bg_event 38, 10, BGEVENT_READ, TinTowerSign bg_event 8, 28, BGEVENT_READ, EcruteakGymSign @@ -295,8 +289,7 @@ EcruteakCity_MapEvents: bg_event 30, 21, BGEVENT_READ, EcruteakCityMartSign bg_event 23, 14, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion -.ObjectEvents: - db 7 + db 7 ; object events object_event 18, 15, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1 object_event 20, 21, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1 object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLassScript, -1 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 70776d1ee..176d6a370 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -8,13 +8,11 @@ const_value set 2 const ECRUTEAKGYM_GRAMPS EcruteakGym_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .ForcedToLeave scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .ForcedToLeave: priorityjump EcruteakGymClosed @@ -43,7 +41,7 @@ MortyScript_0x99d58: setflag ENGINE_FOGBADGE checkcode VAR_BADGES scall EcruteakGymActivateRockets - setmapscene ECRUTEAK_HOUSE, 1 + setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, 1 setevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_2 .FightDone: @@ -91,14 +89,14 @@ EcruteakGymClosed: follow PLAYER, ECRUTEAKGYM_GRAMPS applymovement PLAYER, MovementData_0x99e5f stopfollow - special Special_FadeOutPalettes + special FadeOutPalettes playsound SFX_ENTER_DOOR waitsfx warp ECRUTEAK_CITY, 6, 27 end TrainerSageJeffrey: - trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, .Script + trainer SAGE, JEFFREY, EVENT_BEAT_SAGE_JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, .Script .Script: end_if_just_battled @@ -109,7 +107,7 @@ TrainerSageJeffrey: end TrainerSagePing: - trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, .Script + trainer SAGE, PING, EVENT_BEAT_SAGE_PING, SagePingSeenText, SagePingBeatenText, 0, .Script .Script: end_if_just_battled @@ -120,7 +118,7 @@ TrainerSagePing: end TrainerMediumMartha: - trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, .Script + trainer MEDIUM, MARTHA, EVENT_BEAT_MEDIUM_MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, .Script .Script: end_if_just_battled @@ -131,7 +129,7 @@ TrainerMediumMartha: end TrainerMediumGrace: - trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, .Script + trainer MEDIUM, GRACE, EVENT_BEAT_MEDIUM_GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, .Script .Script: end_if_just_battled @@ -387,55 +385,50 @@ UnknownText_0x9a49c: done EcruteakGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 33 - warp_def 4, 17, 10, ECRUTEAK_CITY - warp_def 5, 17, 10, ECRUTEAK_CITY - warp_def 4, 14, 4, ECRUTEAK_GYM - warp_def 2, 4, 3, ECRUTEAK_GYM - warp_def 3, 4, 3, ECRUTEAK_GYM - warp_def 4, 4, 3, ECRUTEAK_GYM - warp_def 4, 5, 3, ECRUTEAK_GYM - warp_def 6, 7, 3, ECRUTEAK_GYM - warp_def 7, 4, 3, ECRUTEAK_GYM - warp_def 2, 6, 3, ECRUTEAK_GYM - warp_def 3, 6, 3, ECRUTEAK_GYM - warp_def 4, 6, 3, ECRUTEAK_GYM - warp_def 5, 6, 3, ECRUTEAK_GYM - warp_def 7, 6, 3, ECRUTEAK_GYM - warp_def 7, 7, 3, ECRUTEAK_GYM - warp_def 4, 8, 3, ECRUTEAK_GYM - warp_def 5, 8, 3, ECRUTEAK_GYM - warp_def 6, 8, 3, ECRUTEAK_GYM - warp_def 7, 8, 3, ECRUTEAK_GYM - warp_def 2, 8, 3, ECRUTEAK_GYM - warp_def 2, 9, 3, ECRUTEAK_GYM - warp_def 2, 10, 3, ECRUTEAK_GYM - warp_def 2, 11, 3, ECRUTEAK_GYM - warp_def 4, 10, 3, ECRUTEAK_GYM - warp_def 5, 10, 3, ECRUTEAK_GYM - warp_def 2, 12, 3, ECRUTEAK_GYM - warp_def 3, 12, 3, ECRUTEAK_GYM - warp_def 4, 12, 3, ECRUTEAK_GYM - warp_def 5, 12, 3, ECRUTEAK_GYM - warp_def 7, 10, 3, ECRUTEAK_GYM - warp_def 7, 11, 3, ECRUTEAK_GYM - warp_def 7, 12, 3, ECRUTEAK_GYM - warp_def 7, 13, 3, ECRUTEAK_GYM - -.CoordEvents: - db 0 - -.BGEvents: - db 2 + db 0, 0 ; filler + + db 33 ; warp events + warp_event 4, 17, 10, ECRUTEAK_CITY + warp_event 5, 17, 10, ECRUTEAK_CITY + warp_event 4, 14, 4, ECRUTEAK_GYM + warp_event 2, 4, 3, ECRUTEAK_GYM + warp_event 3, 4, 3, ECRUTEAK_GYM + warp_event 4, 4, 3, ECRUTEAK_GYM + warp_event 4, 5, 3, ECRUTEAK_GYM + warp_event 6, 7, 3, ECRUTEAK_GYM + warp_event 7, 4, 3, ECRUTEAK_GYM + warp_event 2, 6, 3, ECRUTEAK_GYM + warp_event 3, 6, 3, ECRUTEAK_GYM + warp_event 4, 6, 3, ECRUTEAK_GYM + warp_event 5, 6, 3, ECRUTEAK_GYM + warp_event 7, 6, 3, ECRUTEAK_GYM + warp_event 7, 7, 3, ECRUTEAK_GYM + warp_event 4, 8, 3, ECRUTEAK_GYM + warp_event 5, 8, 3, ECRUTEAK_GYM + warp_event 6, 8, 3, ECRUTEAK_GYM + warp_event 7, 8, 3, ECRUTEAK_GYM + warp_event 2, 8, 3, ECRUTEAK_GYM + warp_event 2, 9, 3, ECRUTEAK_GYM + warp_event 2, 10, 3, ECRUTEAK_GYM + warp_event 2, 11, 3, ECRUTEAK_GYM + warp_event 4, 10, 3, ECRUTEAK_GYM + warp_event 5, 10, 3, ECRUTEAK_GYM + warp_event 2, 12, 3, ECRUTEAK_GYM + warp_event 3, 12, 3, ECRUTEAK_GYM + warp_event 4, 12, 3, ECRUTEAK_GYM + warp_event 5, 12, 3, ECRUTEAK_GYM + warp_event 7, 10, 3, ECRUTEAK_GYM + warp_event 7, 11, 3, ECRUTEAK_GYM + warp_event 7, 12, 3, ECRUTEAK_GYM + warp_event 7, 13, 3, ECRUTEAK_GYM + + db 0 ; coord events + + db 2 ; bg events bg_event 3, 15, BGEVENT_READ, EcruteakGymStatue bg_event 6, 15, BGEVENT_READ, EcruteakGymStatue -.ObjectEvents: - db 7 + db 7 ; object events object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1 object_event 2, 7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1 object_event 3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 0d956a181..c19aebb38 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -3,11 +3,9 @@ const_value set 2 const ECRUTEAKITEMFINDERHOUSE_POKEDEX EcruteakItemfinderHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks EcruteakItemfinderGuy: faceplayer @@ -163,22 +161,17 @@ EcruteakThreeMonText: done EcruteakItemfinderHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 7, 11, ECRUTEAK_CITY - warp_def 4, 7, 11, ECRUTEAK_CITY + db 2 ; warp events + warp_event 3, 7, 11, ECRUTEAK_CITY + warp_event 4, 7, 11, ECRUTEAK_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 2, 1, BGEVENT_READ, ItemFinderHouseRadio -.ObjectEvents: - db 2 + db 2 ; object events object_event 2, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1 object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 4b39f93eb..9149d06bc 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER EcruteakLugiaSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks EcruteakLugiaSpeechHouseGrampsScript: jumptextfaceplayer EcruteakLugiaSpeechHouseGrampsText @@ -45,22 +43,17 @@ EcruteakLugiaSpeechHouseYoungsterText: done EcruteakLugiaSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 7, 7, ECRUTEAK_CITY - warp_def 4, 7, 7, ECRUTEAK_CITY + db 2 ; warp events + warp_event 3, 7, 7, ECRUTEAK_CITY + warp_event 4, 7, 7, ECRUTEAK_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 2, 1, BGEVENT_READ, LugiaSpeechHouseRadio -.ObjectEvents: - db 2 + db 2 ; object events object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1 object_event 5, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index c69de9a7d..f8d4f10bd 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -4,11 +4,9 @@ const_value set 2 const ECRUTEAKMART_GRANNY EcruteakMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x99c3b: opentext @@ -46,22 +44,17 @@ EcruteakMartGrannyText: done EcruteakMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 9, ECRUTEAK_CITY - warp_def 3, 7, 9, ECRUTEAK_CITY + db 2 ; warp events + warp_event 2, 7, 9, ECRUTEAK_CITY + warp_event 3, 7, 9, ECRUTEAK_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1 object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1 object_event 6, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1 diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index 409181ddc..fc56b0b0d 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -6,13 +6,11 @@ const_value set 2 const ECRUTEAKPOKECENTER1F_BILL EcruteakPokecenter1F_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .MeetBill scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .MeetBill: priorityjump .BillActivatesTimeCapsule @@ -61,7 +59,7 @@ EcruteakPokecenter1FNurseScript: jumpstd pokecenternurse EcruteakPokecenter1FPokefanMScript: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer EcruteakPokecenter1FPokefanMText @@ -207,23 +205,18 @@ EcruteakPokecenter1FGymGuyText: done EcruteakPokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 6, ECRUTEAK_CITY - warp_def 4, 7, 6, ECRUTEAK_CITY - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 6, ECRUTEAK_CITY + warp_event 4, 7, 6, ECRUTEAK_CITY + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 5 + db 5 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1 object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1 object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1 diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakTinTowerEntrance.asm index 436bdd0e3..17ffc7b08 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -1,17 +1,15 @@ const_value set 2 - const ECRUTEAKHOUSE_SAGE1 - const ECRUTEAKHOUSE_SAGE2 - const ECRUTEAKHOUSE_SAGE3 - const ECRUTEAKHOUSE_GRAMPS - -EcruteakHouse_MapScripts: -.SceneScripts: - db 2 + const ECRUTEAKTINTOWERENTRANCE_SAGE1 + const ECRUTEAKTINTOWERENTRANCE_SAGE2 + const ECRUTEAKTINTOWERENTRANCE_SAGE3 + const ECRUTEAKTINTOWERENTRANCE_GRAMPS + +EcruteakTinTowerEntrance_MapScripts: + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .InitializeSages .DummyScene0: @@ -32,7 +30,7 @@ EcruteakHouse_MapScripts: .BlockTower: clearevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_2 - setevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE checkitem CLEAR_BELL iftrue .NoClearBell setscene 0 @@ -40,30 +38,30 @@ EcruteakHouse_MapScripts: return .DontBlockTower: - clearevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + clearevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE return -EcruteakHouse_CoordEvent1: +EcruteakTinTowerEntrance_CoordEvent1: checkevent EVENT_RANG_CLEAR_BELL_2 - iftrue EcruteakHouse_CoordEvent_DontMove - applymovement ECRUTEAKHOUSE_SAGE2, MovementData_0x980c7 - moveobject ECRUTEAKHOUSE_SAGE1, 4, 6 - appear ECRUTEAKHOUSE_SAGE1 + iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove + applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, MovementData_0x980c7 + moveobject ECRUTEAKTINTOWERENTRANCE_SAGE1, 4, 6 + appear ECRUTEAKTINTOWERENTRANCE_SAGE1 pause 5 - disappear ECRUTEAKHOUSE_SAGE2 + disappear ECRUTEAKTINTOWERENTRANCE_SAGE2 end -EcruteakHouse_CoordEvent2: +EcruteakTinTowerEntrance_CoordEvent2: checkevent EVENT_RANG_CLEAR_BELL_1 - iftrue EcruteakHouse_CoordEvent_DontMove - applymovement ECRUTEAKHOUSE_SAGE1, MovementData_0x980cc - moveobject ECRUTEAKHOUSE_SAGE2, 5, 6 - appear ECRUTEAKHOUSE_SAGE2 + iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove + applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, MovementData_0x980cc + moveobject ECRUTEAKTINTOWERENTRANCE_SAGE2, 5, 6 + appear ECRUTEAKTINTOWERENTRANCE_SAGE2 pause 5 - disappear ECRUTEAKHOUSE_SAGE1 + disappear ECRUTEAKTINTOWERENTRANCE_SAGE1 end -EcruteakHouse_CoordEvent_DontMove: +EcruteakTinTowerEntrance_CoordEvent_DontMove: end SageScript_0x98062: @@ -87,7 +85,7 @@ SageScript_0x98062: .CheckForClearBell: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue .AllowedThrough - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .Event000 checkitem CLEAR_BELL iftrue .RingClearBell @@ -103,7 +101,7 @@ SageScript_0x98062: setscene 1 setevent EVENT_RANG_CLEAR_BELL_2 clearevent EVENT_RANG_CLEAR_BELL_1 - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 end .AllowedThrough: @@ -134,8 +132,8 @@ SageScript_0x980b0: closetext end -EcruteakHouseGrampsScript: - jumptextfaceplayer EcruteakHouseGrampsText +EcruteakTinTowerEntranceGrampsScript: + jumptextfaceplayer EcruteakTinTowerEntranceGrampsText MovementData_0x980c7: fix_facing @@ -266,7 +264,7 @@ UnknownText_0x9846f: line "to the top!" done -EcruteakHouseGrampsText: +EcruteakTinTowerEntranceGrampsText: text "Two towers…" line "Two #MON…" @@ -277,29 +275,24 @@ EcruteakHouseGrampsText: line "never to return." done -EcruteakHouse_MapEvents: - ; filler - db 0, 0 +EcruteakTinTowerEntrance_MapEvents: + db 0, 0 ; filler -.Warps: - db 5 - warp_def 4, 17, 3, ECRUTEAK_CITY - warp_def 5, 17, 3, ECRUTEAK_CITY - warp_def 5, 3, 4, ECRUTEAK_HOUSE - warp_def 17, 15, 3, ECRUTEAK_HOUSE - warp_def 17, 3, 3, WISE_TRIOS_ROOM + db 5 ; warp events + warp_event 4, 17, 3, ECRUTEAK_CITY + warp_event 5, 17, 3, ECRUTEAK_CITY + warp_event 5, 3, 4, ECRUTEAK_TIN_TOWER_ENTRANCE + warp_event 17, 15, 3, ECRUTEAK_TIN_TOWER_ENTRANCE + warp_event 17, 3, 3, WISE_TRIOS_ROOM -.CoordEvents: - db 2 - coord_event 4, 7, 0, EcruteakHouse_CoordEvent1 - coord_event 5, 7, 0, EcruteakHouse_CoordEvent2 + db 2 ; coord events + coord_event 4, 7, 0, EcruteakTinTowerEntrance_CoordEvent1 + coord_event 5, 7, 0, EcruteakTinTowerEntrance_CoordEvent2 -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 - object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE - object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHouseGrampsScript, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE + object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceGrampsScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE diff --git a/maps/EcruteakHouse.blk b/maps/EcruteakTinTowerEntrance.blk index 8f74a6559..8f74a6559 100644 --- a/maps/EcruteakHouse.blk +++ b/maps/EcruteakTinTowerEntrance.blk diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 292562f85..28cba0a3f 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -3,11 +3,9 @@ const_value set 2 const ELMSHOUSE_ELMS_SON ElmsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ElmsWife: jumptextfaceplayer ElmsWifeText @@ -84,24 +82,19 @@ ElmsHousePCText: done ElmsHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, NEW_BARK_TOWN - warp_def 3, 7, 4, NEW_BARK_TOWN + db 2 ; warp events + warp_event 2, 7, 4, NEW_BARK_TOWN + warp_event 3, 7, 4, NEW_BARK_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 0, 1, BGEVENT_READ, ElmsHousePC bg_event 6, 1, BGEVENT_READ, ElmsHouseBookshelf bg_event 7, 1, BGEVENT_READ, ElmsHouseBookshelf -.ObjectEvents: - db 2 + db 2 ; object events object_event 1, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1 object_event 5, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 9322aefe8..2f9a46217 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -7,8 +7,7 @@ const_value set 2 const ELMSLAB_OFFICER ElmsLab_MapScripts: -.SceneScripts: - db 6 + db 6 ; scene scripts scene_script .MeetElm scene_script .DummyScene1 scene_script .DummyScene2 @@ -16,8 +15,7 @@ ElmsLab_MapScripts: scene_script .DummyScene4 scene_script .DummyScene5 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .MoveElmCallback .MeetElm: @@ -108,10 +106,10 @@ ElmCheckEverstone: checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE iffalse ElmCheckTogepiEgg writebyte TOGEPI - special Special_FindThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writebyte TOGETIC - special Special_FindThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writetext UnknownText_0x79a40 waitbutton @@ -120,10 +118,10 @@ ElmCheckEverstone: ElmEggHatchedScript: writebyte TOGEPI - special Special_FindThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writebyte TOGETIC - special Special_FindThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript jump ElmCheckGotEggAgain @@ -308,11 +306,11 @@ ElmsLabHealingMachine: end ElmsLabHealingMachine_HealParty: - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty playmusic MUSIC_NONE writebyte HEALMACHINE_ELMS_LAB - special Special_HealMachineAnim + special HealMachineAnim pause 30 special RestartMapMusic closetext @@ -556,7 +554,7 @@ CopScript: opentext writetext ElmsLabOfficerText1 buttonsound - special Special_NameRival + special NameRival writetext ElmsLabOfficerText2 waitbutton closetext @@ -1371,16 +1369,13 @@ ElmsLabPCText: done ElmsLab_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 11, 1, NEW_BARK_TOWN - warp_def 5, 11, 1, NEW_BARK_TOWN + db 2 ; warp events + warp_event 4, 11, 1, NEW_BARK_TOWN + warp_event 5, 11, 1, NEW_BARK_TOWN -.CoordEvents: - db 8 + db 8 ; coord events coord_event 4, 6, 1, LabTryToLeaveScript coord_event 5, 6, 1, LabTryToLeaveScript coord_event 4, 5, 3, MeetCopScript @@ -1390,8 +1385,7 @@ ElmsLab_MapEvents: coord_event 4, 8, 6, AideScript_WalkBalls1 coord_event 5, 8, 6, AideScript_WalkBalls2 -.BGEvents: - db 16 + db 16 ; bg events bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine bg_event 6, 1, BGEVENT_READ, ElmsLabBookshelf bg_event 7, 1, BGEVENT_READ, ElmsLabBookshelf @@ -1409,8 +1403,7 @@ ElmsLab_MapEvents: bg_event 5, 0, BGEVENT_READ, ElmsLabWindow bg_event 3, 5, BGEVENT_DOWN, ElmsLabPC -.ObjectEvents: - db 6 + db 6 ; object events object_event 5, 2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1 object_event 2, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 6dfb2350d..19bb91a37 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -5,14 +5,12 @@ const_value set 2 const FASTSHIP1F_GENTLEMAN FastShip1F_MapScripts: -.SceneScripts: - db 3 + db 3 ; scene scripts scene_script .DummyScene0 scene_script .EnterFastShip scene_script .DummyScene2 -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -68,7 +66,7 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY setmapscene VERMILION_PORT, 1 @@ -81,7 +79,7 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY setmapscene OLIVINE_PORT, 1 @@ -286,34 +284,29 @@ UnknownText_0x754be: done FastShip1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 12 - warp_def 25, 1, -1, FAST_SHIP_1F - warp_def 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE - warp_def 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE - warp_def 19, 8, 3, FAST_SHIP_CABINS_NNW_NNE_NE - warp_def 15, 8, 1, FAST_SHIP_CABINS_SW_SSW_NW - warp_def 15, 15, 2, FAST_SHIP_CABINS_SW_SSW_NW - warp_def 19, 15, 4, FAST_SHIP_CABINS_SW_SSW_NW - warp_def 23, 15, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_def 27, 15, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_def 3, 13, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_def 6, 12, 1, FAST_SHIP_B1F - warp_def 30, 14, 2, FAST_SHIP_B1F - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 12 ; warp events + warp_event 25, 1, -1, FAST_SHIP_1F + warp_event 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE + warp_event 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE + warp_event 19, 8, 3, FAST_SHIP_CABINS_NNW_NNE_NE + warp_event 15, 8, 1, FAST_SHIP_CABINS_SW_SSW_NW + warp_event 15, 15, 2, FAST_SHIP_CABINS_SW_SSW_NW + warp_event 19, 15, 4, FAST_SHIP_CABINS_SW_SSW_NW + warp_event 23, 15, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN + warp_event 27, 15, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN + warp_event 3, 13, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN + warp_event 6, 12, 1, FAST_SHIP_B1F + warp_event 30, 14, 2, FAST_SHIP_B1F + + db 2 ; coord events coord_event 24, 6, 2, WorriedGrandpaSceneLeft coord_event 25, 6, 2, WorriedGrandpaSceneRight -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1 object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1 object_event 22, 17, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailorScript, -1 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index c179b490a..252511f93 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -13,13 +13,11 @@ const_value set 2 const FASTSHIPB1F_YOUNGSTER2 FastShipB1F_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -94,7 +92,7 @@ UnknownScript_0x767a0: end TrainerSailorJeff: - trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script + trainer SAILOR, JEFF, EVENT_BEAT_SAILOR_JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script .Script: end_if_just_battled @@ -105,7 +103,7 @@ TrainerSailorJeff: end TrainerPicnickerDebra: - trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script + trainer PICNICKER, DEBRA, EVENT_BEAT_PICNICKER_DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script .Script: end_if_just_battled @@ -116,7 +114,7 @@ TrainerPicnickerDebra: end TrainerJugglerFritz: - trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script + trainer JUGGLER, FRITZ, EVENT_BEAT_JUGGLER_FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script .Script: end_if_just_battled @@ -127,7 +125,7 @@ TrainerJugglerFritz: end TrainerSailorGarrett: - trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script + trainer SAILOR, GARRETT, EVENT_BEAT_SAILOR_GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script .Script: end_if_just_battled @@ -138,7 +136,7 @@ TrainerSailorGarrett: end TrainerFisherJonah: - trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script + trainer FISHER, JONAH, EVENT_BEAT_FISHER_JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script .Script: end_if_just_battled @@ -149,7 +147,7 @@ TrainerFisherJonah: end TrainerBlackbeltWai: - trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script + trainer BLACKBELT_T, WAI, EVENT_BEAT_BLACKBELT_WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script .Script: end_if_just_battled @@ -160,7 +158,7 @@ TrainerBlackbeltWai: end TrainerSailorKenneth: - trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script + trainer SAILOR, KENNETH, EVENT_BEAT_SAILOR_KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script .Script: end_if_just_battled @@ -171,7 +169,7 @@ TrainerSailorKenneth: end TrainerTeacherShirley: - trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script + trainer TEACHER, SHIRLEY, EVENT_BEAT_TEACHER_SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script .Script: end_if_just_battled @@ -182,7 +180,7 @@ TrainerTeacherShirley: end TrainerSchoolboyNate: - trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script + trainer SCHOOLBOY, NATE, EVENT_BEAT_SCHOOLBOY_NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script .Script: end_if_just_battled @@ -193,7 +191,7 @@ TrainerSchoolboyNate: end TrainerSchoolboyRicky: - trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script + trainer SCHOOLBOY, RICKY, EVENT_BEAT_SCHOOLBOY_RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script .Script: end_if_just_battled @@ -449,25 +447,20 @@ SchoolboyRickyAfterBattleText: done FastShipB1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 5, 11, 11, FAST_SHIP_1F - warp_def 31, 13, 12, FAST_SHIP_1F + db 2 ; warp events + warp_event 5, 11, 11, FAST_SHIP_1F + warp_event 31, 13, 12, FAST_SHIP_1F -.CoordEvents: - db 2 + db 2 ; coord events coord_event 30, 7, 0, UnknownScript_0x7673c coord_event 31, 7, 0, UnknownScript_0x76751 -.BGEvents: - db 1 + db 1 ; bg events bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan -.ObjectEvents: - db 12 + db 12 ; object events object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index a6ff922dd..1314070d4 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -8,14 +8,12 @@ const_value set 2 const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST FastShipCabins_NNW_NNE_NE_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerCooltrainermSean: - trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script + trainer COOLTRAINERM, SEAN, EVENT_BEAT_COOLTRAINERM_SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script .Script: end_if_just_battled @@ -26,7 +24,7 @@ TrainerCooltrainermSean: end TrainerCooltrainerfCarol: - trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, .Script + trainer COOLTRAINERF, CAROL, EVENT_BEAT_COOLTRAINERF_CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, .Script .Script: end_if_just_battled @@ -37,7 +35,7 @@ TrainerCooltrainerfCarol: end TrainerPokemaniacEthan: - trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, .Script + trainer POKEMANIAC, ETHAN, EVENT_BEAT_POKEMANIAC_ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, .Script .Script: end_if_just_battled @@ -48,7 +46,7 @@ TrainerPokemaniacEthan: end TrainerHikerNoland: - trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, .Script + trainer HIKER, NOLAND, EVENT_BEAT_HIKER_NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, .Script .Script: end_if_just_battled @@ -59,7 +57,7 @@ TrainerHikerNoland: end TrainerGentlemanEdward: - trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, .Script + trainer GENTLEMAN, EDWARD, EVENT_BEAT_GENTLEMAN_EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, .Script .Script: end_if_just_battled @@ -70,7 +68,7 @@ TrainerGentlemanEdward: end TrainerBurglarCorey: - trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, .Script + trainer BURGLAR, COREY, EVENT_BEAT_BURGLAR_COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, .Script .Script: end_if_just_battled @@ -267,26 +265,21 @@ BurglarCoreyAfterBattleText: done FastShipCabins_NNW_NNE_NE_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 2, 0, 2, FAST_SHIP_1F - warp_def 2, 12, 3, FAST_SHIP_1F - warp_def 2, 24, 4, FAST_SHIP_1F + db 3 ; warp events + warp_event 2, 0, 2, FAST_SHIP_1F + warp_event 2, 12, 3, FAST_SHIP_1F + warp_event 2, 24, 4, FAST_SHIP_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 6, 13, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan bg_event 7, 19, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan bg_event 7, 31, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan -.ObjectEvents: - db 7 + db 7 ; object events object_event 4, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 5c038275d..fdb1e9a37 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -12,11 +12,9 @@ const_value set 2 const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2 FastShipCabins_SE_SSE_CaptainsCabin_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Unreferenced_0x75ea6: end @@ -48,7 +46,7 @@ SSAquaGranddaughterBefore: writetext SSAquaGranddaughterHasToFindGrandpaText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 applymovement PLAYER, MovementData_0x76004 @@ -56,7 +54,7 @@ SSAquaGranddaughterBefore: appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 spriteface PLAYER, UP spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP - special Special_FadeInQuickly + special FadeInQuickly spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15 applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x7600c @@ -141,7 +139,7 @@ SSAquaGranddaughterAfter: end TrainerPokefanmColin: - trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, .Script + trainer POKEFANM, COLIN, EVENT_BEAT_POKEFANM_COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, .Script .Script: end_if_just_battled @@ -152,7 +150,7 @@ TrainerPokefanmColin: end TrainerTwinsMegandpeg1: - trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, .Script + trainer TWINS, MEGANDPEG1, EVENT_BEAT_TWINS_MEG_AND_PEG, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, .Script .Script: end_if_just_battled @@ -163,7 +161,7 @@ TrainerTwinsMegandpeg1: end TrainerTwinsMegandpeg2: - trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, .Script + trainer TWINS, MEGANDPEG2, EVENT_BEAT_TWINS_MEG_AND_PEG, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, .Script .Script: end_if_just_battled @@ -174,7 +172,7 @@ TrainerTwinsMegandpeg2: end TrainerPsychicRodney: - trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, .Script + trainer PSYCHIC_T, RODNEY, EVENT_BEAT_PSYCHIC_RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, .Script .Script: end_if_just_battled @@ -185,7 +183,7 @@ TrainerPsychicRodney: end TrainerPokefanmJeremy: - trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, .Script + trainer POKEFANM, JEREMY, EVENT_BEAT_POKEFANM_JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, .Script .Script: end_if_just_battled @@ -196,7 +194,7 @@ TrainerPokefanmJeremy: end TrainerPokefanfGeorgia: - trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, .Script + trainer POKEFANF, GEORGIA, EVENT_BEAT_POKEFANF_GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, .Script .Script: end_if_just_battled @@ -207,7 +205,7 @@ TrainerPokefanfGeorgia: end TrainerSupernerdShawn: - trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, .Script + trainer SUPER_NERD, SHAWN, EVENT_BEAT_SUPER_NERD_SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, .Script .Script: end_if_just_battled @@ -463,27 +461,22 @@ SSAquaHasArrivedVermilionText: done FastShipCabins_SE_SSE_CaptainsCabin_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 2, 7, 8, FAST_SHIP_1F - warp_def 3, 7, 8, FAST_SHIP_1F - warp_def 2, 19, 9, FAST_SHIP_1F - warp_def 3, 19, 9, FAST_SHIP_1F - warp_def 2, 33, 10, FAST_SHIP_1F - warp_def 3, 33, 10, FAST_SHIP_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 1 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 2, 7, 8, FAST_SHIP_1F + warp_event 3, 7, 8, FAST_SHIP_1F + warp_event 2, 19, 9, FAST_SHIP_1F + warp_event 3, 19, 9, FAST_SHIP_1F + warp_event 2, 33, 10, FAST_SHIP_1F + warp_event 3, 33, 10, FAST_SHIP_1F + + db 0 ; coord events + + db 1 ; bg events bg_event 4, 25, BGEVENT_READ, FastShipCaptainsCabinTrashcan -.ObjectEvents: - db 11 + db 11 ; object events object_event 3, 25, SPRITE_CAPTAIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1 object_event 2, 17, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN object_event 3, 17, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index d4d35f584..ecdf5e412 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -5,14 +5,12 @@ const_value set 2 const FASTSHIPCABINS_SW_SSW_NW_ROCKER FastShipCabins_SW_SSW_NW_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerFirebreatherLyle: - trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script + trainer FIREBREATHER, LYLE, EVENT_BEAT_FIREBREATHER_LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script .Script: end_if_just_battled @@ -23,7 +21,7 @@ TrainerFirebreatherLyle: end TrainerBugCatcherKen: - trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, BugCatcherKenSeenText, BugCatcherKenBeatenText, 0, .Script + trainer BUG_CATCHER, KEN, EVENT_BEAT_BUG_CATCHER_KEN, BugCatcherKenSeenText, BugCatcherKenBeatenText, 0, .Script .Script: end_if_just_battled @@ -34,7 +32,7 @@ TrainerBugCatcherKen: end TrainerBeautyCassie: - trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, .Script + trainer BEAUTY, CASSIE, EVENT_BEAT_BEAUTY_CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, .Script .Script: end_if_just_battled @@ -45,11 +43,11 @@ TrainerBeautyCassie: end TrainerGuitaristClyde: - trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, .Script + trainer GUITARIST, CLYDE, EVENT_BEAT_GUITARIST_CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, .Script .Script: end_if_just_battled - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile opentext writetext UnknownText_0x75d65 @@ -69,14 +67,14 @@ FastShipBed: writetext FastShipBedText1 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty playmusic MUSIC_HEAL pause 60 special RestartMapMusic - special Special_FadeInQuickly + special FadeInQuickly opentext writetext FastShipBedText2 waitbutton @@ -223,28 +221,23 @@ FastShipArrivedVermilionText: done FastShipCabins_SW_SSW_NW_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 2, 0, 5, FAST_SHIP_1F - warp_def 2, 19, 6, FAST_SHIP_1F - warp_def 3, 19, 6, FAST_SHIP_1F - warp_def 2, 31, 7, FAST_SHIP_1F - warp_def 3, 31, 7, FAST_SHIP_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 3 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 2, 0, 5, FAST_SHIP_1F + warp_event 2, 19, 6, FAST_SHIP_1F + warp_event 3, 19, 6, FAST_SHIP_1F + warp_event 2, 31, 7, FAST_SHIP_1F + warp_event 3, 31, 7, FAST_SHIP_1F + + db 0 ; coord events + + db 3 ; bg events bg_event 7, 1, BGEVENT_READ, FastShipBed bg_event 7, 2, BGEVENT_READ, FastShipBed bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan -.ObjectEvents: - db 4 + db 4 ; object events object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND object_event 1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 46cc7ddeb..ad90b5fd6 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -3,11 +3,9 @@ const_value set 2 const FIGHTINGDOJO_POKE_BALL FightingDojo_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FightingDojoBlackBelt: jumptextfaceplayer FightingDojoBlackBeltText @@ -43,23 +41,18 @@ FightingDojoSign1Text: done FightingDojo_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 11, 1, SAFFRON_CITY - warp_def 5, 11, 1, SAFFRON_CITY + db 2 ; warp events + warp_event 4, 11, 1, SAFFRON_CITY + warp_event 5, 11, 1, SAFFRON_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 4, 0, BGEVENT_READ, MapFightingDojoSignpost0Script bg_event 5, 0, BGEVENT_READ, MapFightingDojoSignpost1Script -.ObjectEvents: - db 2 + db 2 ; object events object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm deleted file mode 100644 index 8a72256b6..000000000 --- a/maps/FuchsiaBillSpeechHouse.asm +++ /dev/null @@ -1,48 +0,0 @@ -const_value set 2 - const FUCHSIABILLSPEECHHOUSE_POKEFAN_F - const FUCHSIABILLSPEECHHOUSE_YOUNGSTER - -FuchsiaBillSpeechHouse_MapScripts: -.SceneScripts: - db 0 - -.MapCallbacks: - db 0 - -FuchsiaBillSpeechHousePokefanFScript: - jumptextfaceplayer FuchsiaBillSpeechHousePokefanFText - -FuchsiaBillSpeechHouseYoungsterScript: - jumptextfaceplayer FuchsiaBillSpeechHouseYoungsterText - -FuchsiaBillSpeechHousePokefanFText: - text "My grandpa is at " - line "my brother BILL's" - cont "on CERULEAN CAPE." - done - -FuchsiaBillSpeechHouseYoungsterText: - text "I saw these weird," - line "slow #MON on" - cont "CYCLING ROAD." - done - -FuchsiaBillSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 4, FUCHSIA_CITY - warp_def 3, 7, 4, FUCHSIA_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHousePokefanFScript, -1 - object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHouseYoungsterScript, -1 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 34a636aaf..c1277cadf 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -5,11 +5,9 @@ const_value set 2 const FUCHSIACITY_FRUIT_TREE FuchsiaCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -125,28 +123,24 @@ NoLitteringSignText: done FuchsiaCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 11 - warp_def 5, 13, 2, FUCHSIA_MART - warp_def 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE - warp_def 8, 27, 1, FUCHSIA_GYM - warp_def 11, 27, 1, FUCHSIA_BILL_SPEECH_HOUSE - warp_def 19, 27, 1, FUCHSIA_POKECENTER_1F - warp_def 27, 27, 1, SAFARI_ZONE_WARDENS_HOME - 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 - -.CoordEvents: - db 0 - -.BGEvents: - db 8 + db 0, 0 ; filler + + db 11 ; warp events + warp_event 5, 13, 2, FUCHSIA_MART + warp_event 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE + warp_event 8, 27, 1, FUCHSIA_GYM + warp_event 11, 27, 1, BILLS_BROTHERS_HOUSE + warp_event 19, 27, 1, FUCHSIA_POKECENTER_1F + warp_event 27, 27, 1, SAFARI_ZONE_WARDENS_HOME + warp_event 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA + warp_event 37, 22, 1, ROUTE_15_FUCHSIA_GATE + warp_event 37, 23, 2, ROUTE_15_FUCHSIA_GATE + warp_event 7, 35, 1, ROUTE_19_FUCHSIA_GATE + warp_event 8, 35, 2, ROUTE_19_FUCHSIA_GATE + + db 0 ; coord events + + db 8 ; bg events bg_event 21, 15, BGEVENT_READ, FuchsiaCitySign bg_event 5, 29, BGEVENT_READ, FuchsiaGymSign bg_event 25, 15, BGEVENT_READ, SafariZoneOfficeSign @@ -156,8 +150,7 @@ FuchsiaCity_MapEvents: bg_event 20, 27, BGEVENT_READ, FuchsiaCityPokecenterSign bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign -.ObjectEvents: - db 4 + db 4 ; object events object_event 23, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1 object_event 13, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 object_event 16, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index a691d1d50..4a1d1ffe8 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -7,11 +7,9 @@ const_value set 2 const FUCHSIAGYM_GYM_GUY FuchsiaGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FuchsiaGymJanineScript: checkflag ENGINE_SOULBADGE @@ -35,7 +33,7 @@ FuchsiaGymJanineScript: variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext Text_ReceivedSoulBadge playsound SFX_GET_BADGE @@ -65,7 +63,7 @@ LassAliceScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_1, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .AliceUnmasked: faceplayer opentext @@ -99,7 +97,7 @@ LassLindaScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_2, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .LindaUnmasked: faceplayer opentext @@ -133,7 +131,7 @@ PicnickerCindyScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_3, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .CindyUnmasked: faceplayer opentext @@ -167,7 +165,7 @@ CamperBarryScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_4, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .BarryUnmasked: faceplayer opentext @@ -381,24 +379,19 @@ FuchsiaGymGuyWinText: done FuchsiaGym_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 17, 3, FUCHSIA_CITY - warp_def 5, 17, 3, FUCHSIA_CITY + db 2 ; warp events + warp_event 4, 17, 3, FUCHSIA_CITY + warp_event 5, 17, 3, FUCHSIA_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 3, 15, BGEVENT_READ, FuchsiaGymStatue bg_event 6, 15, BGEVENT_READ, FuchsiaGymStatue -.ObjectEvents: - db 6 + db 6 ; object events object_event 1, 10, SPRITE_JANINE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1 object_event 5, 7, SPRITE_FUCHSIA_GYM_1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1 object_event 5, 11, SPRITE_FUCHSIA_GYM_2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 4ab7932f3..cfc7eb659 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -4,11 +4,9 @@ const_value set 2 const FUCHSIAMART_COOLTRAINER_F FuchsiaMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x195ce8: opentext @@ -38,22 +36,17 @@ FuchsiaMartCooltrainerFText: done FuchsiaMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, FUCHSIA_CITY - warp_def 3, 7, 1, FUCHSIA_CITY + db 2 ; warp events + warp_event 2, 7, 1, FUCHSIA_CITY + warp_event 3, 7, 1, FUCHSIA_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1 object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1 diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 9bc8775a6..829fab00d 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -5,12 +5,10 @@ const_value set 2 const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR FuchsiaPokecenter1F_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -33,7 +31,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext UnknownText_0x19654e waitbutton @@ -41,7 +39,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX end MovementData_0x196486: @@ -89,23 +87,18 @@ UnknownText_0x19654e: done FuchsiaPokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 5, FUCHSIA_CITY - warp_def 4, 7, 5, FUCHSIA_CITY - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 5, FUCHSIA_CITY + warp_event 4, 7, 5, FUCHSIA_CITY + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1 object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1 object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1 diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm index dc61c55ab..f37dd7e0a 100644 --- a/maps/FuchsiaPokecenter2FBeta.asm +++ b/maps/FuchsiaPokecenter2FBeta.asm @@ -1,23 +1,16 @@ FuchsiaPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FuchsiaPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, FUCHSIA_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, 3, FUCHSIA_POKECENTER_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 48cc677ab..0c681f60b 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -2,11 +2,9 @@ const_value set 2 const GOLDENRODBIKESHOP_CLERK GoldenrodBikeShop_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks UnknownScript_0x5474f: end @@ -103,19 +101,15 @@ UnknownText_0x548ed: done GoldenrodBikeShop_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, GOLDENROD_CITY - warp_def 3, 7, 2, GOLDENROD_CITY + db 2 ; warp events + warp_event 2, 7, 2, GOLDENROD_CITY + warp_event 3, 7, 2, GOLDENROD_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 9 + db 9 ; bg events bg_event 1, 2, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script bg_event 0, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script bg_event 1, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script @@ -126,6 +120,5 @@ GoldenrodBikeShop_MapEvents: bg_event 6, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script bg_event 7, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script -.ObjectEvents: - db 1 + db 1 ; object events object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 89ca2bb0d..045dd05bc 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -16,17 +16,15 @@ const_value set 2 const GOLDENRODCITY_POKEFAN_M2 GoldenrodCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPointAndFloria callback MAPCALLBACK_OBJECTS, .MoveTutor .FlyPointAndFloria: setflag ENGINE_FLYPOINT_GOLDENROD - setflag ENGINE_FLORIA + setflag ENGINE_REACHED_GOLDENROD checkevent EVENT_MET_FLORIA iftrue .FloriaDone clearevent EVENT_FLORIA_AT_SUDOWOODO @@ -52,20 +50,20 @@ GoldenrodCity_MapScripts: .MoveTutorDone: return -MoveTutor: +MoveTutorScript: faceplayer opentext writetext UnknownText_0x199042 yesorno iffalse .Refused - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance writetext UnknownText_0x199090 yesorno iffalse .Refused2 checkcoins 4000 if_equal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x1990ce - loadmenudata .MoveMenuDataHeader + loadmenuheader .MoveMenuHeader verticalmenu closewindow if_equal MOVETUTOR_FLAMETHROWER, .Flamethrower @@ -76,31 +74,31 @@ MoveTutor: .Flamethrower: writebyte MOVETUTOR_FLAMETHROWER writetext UnknownText_0x1991cf - special Special_MoveTutor + special MoveTutor if_equal FALSE, .TeachMove jump .Incompatible .Thunderbolt: writebyte MOVETUTOR_THUNDERBOLT writetext UnknownText_0x1991cf - special Special_MoveTutor + special MoveTutor if_equal FALSE, .TeachMove jump .Incompatible .IceBeam: writebyte MOVETUTOR_ICE_BEAM writetext UnknownText_0x1991cf - special Special_MoveTutor + special MoveTutor if_equal FALSE, .TeachMove jump .Incompatible -.MoveMenuDataHeader: +.MoveMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 15, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "FLAMETHROWER@" @@ -126,7 +124,7 @@ MoveTutor: takecoins 4000 waitsfx playsound SFX_TRANSACTION - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance writetext UnknownText_0x19918b waitbutton closetext @@ -552,32 +550,28 @@ UnknownText_0x1991cf: done GoldenrodCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 15 - warp_def 24, 7, 1, GOLDENROD_GYM - warp_def 29, 29, 1, GOLDENROD_BIKE_SHOP - warp_def 31, 21, 1, GOLDENROD_HAPPINESS_RATER - warp_def 5, 25, 1, GOLDENROD_BILLS_HOUSE - warp_def 9, 13, 2, GOLDENROD_MAGNET_TRAIN_STATION - warp_def 29, 5, 1, GOLDENROD_FLOWER_SHOP - warp_def 33, 9, 1, GOLDENROD_PP_SPEECH_HOUSE - warp_def 15, 7, 1, GOLDENROD_NAME_RATER - warp_def 24, 27, 1, GOLDENROD_DEPT_STORE_1F - warp_def 14, 21, 1, GOLDENROD_GAME_CORNER - warp_def 5, 15, 1, RADIO_TOWER_1F - warp_def 19, 1, 3, ROUTE_35_GOLDENROD_GATE - warp_def 9, 5, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 11, 29, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 15, 27, 1, GOLDENROD_POKECENTER_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 12 + db 0, 0 ; filler + + db 15 ; warp events + warp_event 24, 7, 1, GOLDENROD_GYM + warp_event 29, 29, 1, GOLDENROD_BIKE_SHOP + warp_event 31, 21, 1, GOLDENROD_HAPPINESS_RATER + warp_event 5, 25, 1, BILLS_FAMILYS_HOUSE + warp_event 9, 13, 2, GOLDENROD_MAGNET_TRAIN_STATION + warp_event 29, 5, 1, GOLDENROD_FLOWER_SHOP + warp_event 33, 9, 1, GOLDENROD_PP_SPEECH_HOUSE + warp_event 15, 7, 1, GOLDENROD_NAME_RATER + warp_event 24, 27, 1, GOLDENROD_DEPT_STORE_1F + warp_event 14, 21, 1, GOLDENROD_GAME_CORNER + warp_event 5, 15, 1, RADIO_TOWER_1F + warp_event 19, 1, 3, ROUTE_35_GOLDENROD_GATE + warp_event 9, 5, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_event 11, 29, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_event 15, 27, 1, GOLDENROD_POKECENTER_1F + + db 0 ; coord events + + db 12 ; bg events bg_event 10, 14, BGEVENT_READ, GoldenrodCityStationSign bg_event 4, 17, BGEVENT_READ, GoldenrodCityRadioTowerSign bg_event 26, 27, BGEVENT_READ, GoldenrodDeptStoreSign @@ -591,8 +585,7 @@ GoldenrodCity_MapEvents: bg_event 16, 27, BGEVENT_UP, GoldenrodCityPokecenterSign bg_event 30, 6, BGEVENT_READ, GoldenrodCityFlowerShopSign -.ObjectEvents: - db 15 + db 15 ; object events object_event 7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 30, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS @@ -607,4 +600,4 @@ GoldenrodCity_MapEvents: object_event 29, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 29, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 31, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR + object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutorScript, EVENT_GOLDENROD_CITY_MOVE_TUTOR diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 6f07b6ad4..88aebfdd1 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -5,11 +5,9 @@ const_value set 2 const GOLDENRODDEPTSTORE1F_GENTLEMAN GoldenrodDeptStore1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GoldenrodDeptStore1FReceptionistScript: jumptextfaceplayer GoldenrodDeptStore1FReceptionistText @@ -79,26 +77,21 @@ GoldenrodDeptStore1FDirectoryText: done GoldenrodDeptStore1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 7, 7, 9, GOLDENROD_CITY - warp_def 8, 7, 9, GOLDENROD_CITY - warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_2F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + db 4 ; warp events + warp_event 7, 7, 9, GOLDENROD_CITY + warp_event 8, 7, 9, GOLDENROD_CITY + warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_2F + warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore1FDirectory bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton -.ObjectEvents: - db 4 + db 4 ; object events object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1 object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1 object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index bfe6a398f..bb2090eb9 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -6,11 +6,9 @@ const_value set 2 const GOLDENRODDEPTSTORE2F_GENTLEMAN GoldenrodDeptStore2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x55b5d: faceplayer @@ -101,25 +99,20 @@ GoldenrodDeptStore2FDirectoryText: done GoldenrodDeptStore2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_3F - warp_def 15, 0, 3, GOLDENROD_DEPT_STORE_1F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + db 3 ; warp events + warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_3F + warp_event 15, 0, 3, GOLDENROD_DEPT_STORE_1F + warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore2FDirectory bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton -.ObjectEvents: - db 5 + db 5 ; object events object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1 object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1 object_event 9, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index c495cb440..5ddfe04c7 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -4,11 +4,9 @@ const_value set 2 const GOLDENRODDEPTSTORE3F_ROCKER GoldenrodDeptStore3F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x55db8: faceplayer @@ -57,25 +55,20 @@ GoldenrodDeptStore3FDirectoryText: done GoldenrodDeptStore3F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_2F - warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_4F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + db 3 ; warp events + warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_2F + warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_4F + warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore3FDirectory bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton -.ObjectEvents: - db 3 + db 3 ; object events object_event 6, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1 object_event 12, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1 object_event 2, 5, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 03882b8f2..426996978 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -5,11 +5,9 @@ const_value set 2 const GOLDENRODDEPTSTORE4F_GAMEBOY_KID GoldenrodDeptStore4F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x55ee9: faceplayer @@ -78,25 +76,20 @@ GoldenrodDeptStore4FDirectoryText: done GoldenrodDeptStore4F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_5F - warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_3F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + db 3 ; warp events + warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_5F + warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_3F + warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore4FDirectory bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton -.ObjectEvents: - db 4 + db 4 ; object events object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1 object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1 object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 94da64d2f..6f2577f15 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -7,11 +7,9 @@ const_value set 2 const GOLDENRODDEPTSTORE5F_RECEPTIONIST GoldenrodDeptStore5F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .CheckIfSunday .CheckIfSunday: @@ -63,9 +61,9 @@ ReceptionistScript_0x560ce: opentext checkcode VAR_WEEKDAY if_not_equal SUNDAY, .EventIsOver - checkflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT + checkflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN iftrue .EventIsOver - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness writetext UnknownText_0x56143 buttonsound if_greater_than 150 - 1, .VeryHappy @@ -77,7 +75,7 @@ ReceptionistScript_0x560ce: buttonsound verbosegiveitem TM_RETURN iffalse .Done - setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT + setflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN closetext end @@ -92,7 +90,7 @@ ReceptionistScript_0x560ce: buttonsound verbosegiveitem TM_FRUSTRATION iffalse .Done - setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT + setflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN closetext end @@ -106,12 +104,12 @@ ReceptionistScript_0x560ce: Carrie: faceplayer opentext - special Special_GameboyCheck + special GameboyCheck if_not_equal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver writetext UnknownText_0x56241 waitbutton closetext - special Special_UnlockMysteryGift + special UnlockMysteryGift end .NotGBC: @@ -218,25 +216,20 @@ GoldenrodDeptStore5FDirectoryText: done GoldenrodDeptStore5F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_4F - warp_def 15, 0, 1, GOLDENROD_DEPT_STORE_6F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + db 3 ; warp events + warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_4F + warp_event 15, 0, 1, GOLDENROD_DEPT_STORE_6F + warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore5FDirectory bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton -.ObjectEvents: - db 6 + db 6 ; object events object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1 object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1 object_event 6, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 73cb0f17e..295f5b6ea 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -3,18 +3,16 @@ const_value set 2 const GOLDENRODDEPTSTORE6F_SUPER_NERD GoldenrodDeptStore6F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GoldenrodVendingMachine: opentext writetext GoldenrodVendingText .Start: - special Special_PlaceMoneyTopRight - loadmenudata .MenuData + special PlaceMoneyTopRight + loadmenuheader .MenuHeader verticalmenu closewindow if_equal 1, .FreshWater @@ -68,13 +66,13 @@ GoldenrodVendingMachine: waitbutton jump .Start -.MenuData: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "FRESH WATER ¥200@" @@ -148,20 +146,16 @@ GoldenrodDeptStore6FDirectoryText: done GoldenrodDeptStore6F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_5F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR - warp_def 13, 0, 1, GOLDENROD_DEPT_STORE_ROOF + db 3 ; warp events + warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_5F + warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 13, 0, 1, GOLDENROD_DEPT_STORE_ROOF -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 6 + db 6 ; bg events bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore6FDirectory bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton bg_event 8, 1, BGEVENT_UP, GoldenrodVendingMachine @@ -169,7 +163,6 @@ GoldenrodDeptStore6F_MapEvents: bg_event 10, 1, BGEVENT_UP, GoldenrodVendingMachine bg_event 11, 1, BGEVENT_UP, GoldenrodVendingMachine -.ObjectEvents: - db 2 + db 2 ; object events object_event 10, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1 object_event 8, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 4d0603d0f..098aad19b 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -9,11 +9,9 @@ const_value set 2 const GOLDENRODDEPTSTOREB1F_MACHOP GoldenrodDeptStoreB1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_TILES, UnknownScript_0x7d781 callback MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac @@ -110,23 +108,18 @@ UnknownText_0x7d8bb: done GoldenrodDeptStoreB1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 17, 2, 3, GOLDENROD_UNDERGROUND_WAREHOUSE - warp_def 9, 4, 1, GOLDENROD_DEPT_STORE_ELEVATOR - warp_def 10, 4, 2, GOLDENROD_DEPT_STORE_ELEVATOR + db 3 ; warp events + warp_event 17, 2, 3, GOLDENROD_UNDERGROUND_WAREHOUSE + warp_event 9, 4, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 10, 4, 2, GOLDENROD_DEPT_STORE_ELEVATOR -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 8 + db 8 ; object events object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 6ff041e9f..f76c43b62 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -1,9 +1,7 @@ GoldenrodDeptStoreElevator_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MapGoldenrodDeptStoreElevatorSignpost0Script: opentext @@ -55,20 +53,15 @@ Elevator_0x566e0: db -1 ; end GoldenrodDeptStoreElevator_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 1, 3, -1, GOLDENROD_DEPT_STORE_1F - warp_def 2, 3, -1, GOLDENROD_DEPT_STORE_1F + db 2 ; warp events + warp_event 1, 3, -1, GOLDENROD_DEPT_STORE_1F + warp_event 2, 3, -1, GOLDENROD_DEPT_STORE_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 3, 0, BGEVENT_READ, MapGoldenrodDeptStoreElevatorSignpost0Script -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 55f885e62..d83f760cb 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -9,11 +9,9 @@ const_value set 2 const GOLDENRODDEPTSTOREROOF_BUG_CATCHER GoldenrodDeptStoreRoof_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_TILES, .CheckSaleChangeBlock callback MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk @@ -212,25 +210,20 @@ PokeDollVendingMachineText: done GoldenrodDeptStoreRoof_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 13, 1, 3, GOLDENROD_DEPT_STORE_6F + db 1 ; warp events + warp_event 13, 1, 3, GOLDENROD_DEPT_STORE_6F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 15, 3, BGEVENT_RIGHT, Binoculars1 bg_event 15, 5, BGEVENT_RIGHT, Binoculars2 bg_event 15, 6, BGEVENT_RIGHT, Binoculars3 bg_event 3, 0, BGEVENT_UP, PokeDollVendingMachine -.ObjectEvents: - db 8 + db 8 ; object events object_event 1, 4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF object_event 10, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1 object_event 2, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 38a8edc3f..c80183bb0 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -3,11 +3,9 @@ const_value set 2 const GOLDENRODFLOWERSHOP_FLORIA GoldenrodFlowerShop_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FlowerShopTeacherScript: checkevent EVENT_FOUGHT_SUDOWOODO @@ -160,21 +158,16 @@ UnknownText_0x55604: done GoldenrodFlowerShop_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 6, GOLDENROD_CITY - warp_def 3, 7, 6, GOLDENROD_CITY + db 2 ; warp events + warp_event 2, 7, 6, GOLDENROD_CITY + warp_event 3, 7, 6, GOLDENROD_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1 object_event 5, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index d467e84c3..a83ce3e96 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -13,11 +13,9 @@ const_value set 2 const GOLDENRODGAMECORNER_POKEFAN_M3 GoldenrodGameCorner_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Callback .Callback: @@ -60,8 +58,8 @@ GoldenrodGmeCornerTMVendorScript: iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript writetext GoldenrodGameCornerPrizeVendorWhichPrizeText GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 - special Special_DisplayCoinCaseBalance - loadmenudata GoldenrodGameCornerTMVendorMenuData + special DisplayCoinCaseBalance + loadmenuheader GoldenrodGameCornerTMVendorMenuHeader verticalmenu closewindow if_equal 1, .Thunder @@ -138,13 +136,13 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript: closetext end -GoldenrodGameCornerTMVendorMenuData: +GoldenrodGameCornerTMVendorMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 15, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "TM25 5500@" @@ -161,8 +159,8 @@ GoldenrodGameCornerPrizeMonVendorScript: iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript .loop writetext GoldenrodGameCornerPrizeVendorWhichPrizeText - special Special_DisplayCoinCaseBalance - loadmenudata .MenuDataHeader + special DisplayCoinCaseBalance + loadmenuheader .MenuHeader verticalmenu closewindow if_equal 1, .abra @@ -183,7 +181,7 @@ GoldenrodGameCornerPrizeMonVendorScript: writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton writebyte ABRA - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke ABRA, 5 takecoins 100 jump .loop @@ -201,7 +199,7 @@ GoldenrodGameCornerPrizeMonVendorScript: writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton writebyte CUBONE - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke CUBONE, 15 takecoins 800 jump .loop @@ -219,18 +217,18 @@ GoldenrodGameCornerPrizeMonVendorScript: writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton writebyte WOBBUFFET - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke WOBBUFFET, 15 takecoins 1500 jump .loop -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 17, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "ABRA 100@" @@ -297,20 +295,20 @@ GoldenrodGameCornerSlotsMachineScript: if_equal 0, GoldenrodGameCornerLuckySlotsMachineScript refreshscreen writebyte FALSE - special Special_SlotMachine + special SlotMachine closetext end GoldenrodGameCornerLuckySlotsMachineScript: refreshscreen writebyte TRUE - special Special_SlotMachine + special SlotMachine closetext end GoldenrodGameCornerCardFlipMachineScript: refreshscreen - special Special_CardFlip + special CardFlip closetext end @@ -437,19 +435,15 @@ GoldenrodGameCornerLeftTheirDrinkText: done GoldenrodGameCorner_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 13, 10, GOLDENROD_CITY - warp_def 3, 13, 10, GOLDENROD_CITY + db 2 ; warp events + warp_event 2, 13, 10, GOLDENROD_CITY + warp_event 3, 13, 10, GOLDENROD_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 31 + db 31 ; bg events bg_event 6, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript bg_event 6, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript bg_event 6, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript @@ -482,8 +476,7 @@ GoldenrodGameCorner_MapEvents: bg_event 18, 11, BGEVENT_RIGHT, GoldenrodGameCornerCardFlipMachineScript bg_event 12, 1, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript -.ObjectEvents: - db 12 + db 12 ; object events object_event 3, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1 object_event 16, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1 object_event 18, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index f4eac1b6b..ccfac2120 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -7,13 +7,11 @@ const_value set 2 const GOLDENRODGYM_GYM_GUY GoldenrodGym_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -93,7 +91,7 @@ GoldenrodGymActivateRockets: jumpstd radiotowerrockets TrainerLassCarrie: - trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script + trainer LASS, CARRIE, EVENT_BEAT_LASS_CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script .Script: end_if_just_battled @@ -117,7 +115,7 @@ WhitneyCriesScript: end TrainerLassBridget: - trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, .Script + trainer LASS, BRIDGET, EVENT_BEAT_LASS_BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, .Script .Script: end_if_just_battled @@ -128,7 +126,7 @@ TrainerLassBridget: end TrainerBeautyVictoria: - trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, .Script + trainer BEAUTY, VICTORIA, EVENT_BEAT_BEAUTY_VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, .Script .Script: end_if_just_battled @@ -139,7 +137,7 @@ TrainerBeautyVictoria: end TrainerBeautySamantha: - trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, .Script + trainer BEAUTY, SAMANTHA, EVENT_BEAT_BEAUTY_SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, .Script .Script: end_if_just_battled @@ -380,25 +378,20 @@ GoldenrodGymGuyWinText: done GoldenrodGym_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 17, 1, GOLDENROD_CITY - warp_def 3, 17, 1, GOLDENROD_CITY + db 2 ; warp events + warp_event 2, 17, 1, GOLDENROD_CITY + warp_event 3, 17, 1, GOLDENROD_CITY -.CoordEvents: - db 1 + db 1 ; coord events coord_event 8, 5, 1, WhitneyCriesScript -.BGEvents: - db 2 + db 2 ; bg events bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue bg_event 4, 15, BGEVENT_READ, GoldenrodGymStatue -.ObjectEvents: - db 6 + db 6 ; object events object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1 object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1 object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 4fa8506dc..aa8bbd9f4 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -4,16 +4,14 @@ const_value set 2 const GOLDENRODHAPPINESSRATER_TWIN GoldenrodHappinessRater_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TeacherScript_0x54953: faceplayer opentext - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness writetext UnknownText_0x549a3 buttonsound if_greater_than 250 - 1, UnknownScript_0x54973 @@ -137,25 +135,20 @@ GoldenrodHappinessRaterTwinText: done GoldenrodHappinessRater_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, GOLDENROD_CITY - warp_def 3, 7, 3, GOLDENROD_CITY + db 2 ; warp events + warp_event 2, 7, 3, GOLDENROD_CITY + warp_event 3, 7, 3, GOLDENROD_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 0, 1, BGEVENT_READ, HappinessRatersHouseBookshelf bg_event 1, 1, BGEVENT_READ, HappinessRatersHouseBookshelf bg_event 7, 1, BGEVENT_READ, HappinessRatersHouseRadio -.ObjectEvents: - db 3 + db 3 ; object events object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1 object_event 5, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1 object_event 5, 6, SPRITE_TWIN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index c0f749413..a3117a355 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -3,12 +3,10 @@ const_value set 2 const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN GoldenrodMagnetTrainStation_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -35,7 +33,7 @@ OfficerScript_0x550ec: applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 applymovement PLAYER, MovementData_0x5514f writebyte FALSE - special Special_MagnetTrain + special MagnetTrain warpcheck newloadmap MAPSETUP_TRAIN applymovement PLAYER, .MovementBoardTheTrain @@ -165,24 +163,19 @@ GoldenrodMagnetTrainStationGentlemanText: done GoldenrodMagnetTrainStation_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 8, 17, 5, GOLDENROD_CITY - warp_def 9, 17, 5, GOLDENROD_CITY - warp_def 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION - warp_def 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION - -.CoordEvents: - db 1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 8, 17, 5, GOLDENROD_CITY + warp_event 9, 17, 5, GOLDENROD_CITY + warp_event 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION + warp_event 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION + + db 1 ; coord events coord_event 11, 6, 0, Script_ArriveFromSaffron -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1 object_event 11, 14, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index fc3369a21..d807b7e3e 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -2,16 +2,14 @@ const_value set 2 const GOLDENRODNAMERATER_NAME_RATER GoldenrodNameRater_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GoldenrodNameRater: faceplayer opentext - special Special_NameRater + special NameRater waitbutton closetext end @@ -22,26 +20,21 @@ GoldenrodNameRaterBookshelf: GoldenrodNameRaterRadio: jumpstd radio2 -INCLUDE "data/unused/sweet_honey_text.asm" +INCLUDE "data/text/unused_sweet_honey.asm" GoldenrodNameRater_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 8, GOLDENROD_CITY - warp_def 3, 7, 8, GOLDENROD_CITY + db 2 ; warp events + warp_event 2, 7, 8, GOLDENROD_CITY + warp_event 3, 7, 8, GOLDENROD_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 0, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf bg_event 1, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf bg_event 7, 1, BGEVENT_READ, GoldenrodNameRaterRadio -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 416ed37c7..da2965def 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 const GOLDENRODPPSPEECHHOUSE_LASS GoldenrodPPSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GoldenrodPPSpeechHouseFisherScript: jumptextfaceplayer GoldenrodPPSpeechHouseFisherText @@ -52,24 +50,19 @@ GoldenrodPPSpeechHouseLassText: done GoldenrodPPSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 7, GOLDENROD_CITY - warp_def 3, 7, 7, GOLDENROD_CITY + db 2 ; warp events + warp_event 2, 7, 7, GOLDENROD_CITY + warp_event 3, 7, 7, GOLDENROD_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 0, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1 bg_event 1, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2 bg_event 7, 1, BGEVENT_READ, GoldenrodPPSpeechHouseRadio -.ObjectEvents: - db 2 + db 2 ; object events object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1 object_event 5, 3, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1 diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index f01194311..3765181b2 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -6,18 +6,16 @@ const_value set 2 const GOLDENRODPOKECENTER1F_POKEFAN_F GoldenrodPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x60f91: jumpstd pokecenternurse GoldenrodPokecenter1F_GSBallSceneLeft: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT - special Special_BattleTowerAction + special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end @@ -49,7 +47,7 @@ GoldenrodPokecenter1F_GSBallSceneLeft: GoldenrodPokecenter1F_GSBallSceneRight: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT - special Special_BattleTowerAction + special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end @@ -805,26 +803,21 @@ UnknownText_0x62549: done GoldenrodPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 3, 7, 15, GOLDENROD_CITY - warp_def 4, 7, 15, GOLDENROD_CITY - warp_def 0, 6, 1, GOLDENROD_POKECOM_CENTER_2F_MOBILE - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 3, 7, 15, GOLDENROD_CITY + warp_event 4, 7, 15, GOLDENROD_CITY + warp_event 0, 6, 1, POKECOM_CENTER_ADMIN_ROOM_MOBILE + warp_event 0, 7, 1, POKECENTER_2F + + db 2 ; coord events coord_event 3, 7, 0, GoldenrodPokecenter1F_GSBallSceneLeft coord_event 4, 7, 0, GoldenrodPokecenter1F_GSBallSceneRight -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 5 + db 5 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1 object_event 16, 8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 object_event 6, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1 diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index e8e566666..c55463286 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -10,11 +10,9 @@ const_value set 2 const GOLDENRODUNDERGROUND_GRANNY GoldenrodUnderground_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 3 + db 3 ; callbacks callback MAPCALLBACK_NEWMAP, .ResetSwitches callback MAPCALLBACK_TILES, .CheckBasementKey callback MAPCALLBACK_OBJECTS, .CheckDayOfWeek @@ -111,7 +109,7 @@ GoldenrodUnderground_MapScripts: return TrainerSupernerdEric: - trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script + trainer SUPER_NERD, ERIC, EVENT_BEAT_SUPER_NERD_ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script .Script: end_if_just_battled @@ -122,7 +120,7 @@ TrainerSupernerdEric: end TrainerSupernerdTeru: - trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, .Script + trainer SUPER_NERD, TERU, EVENT_BEAT_SUPER_NERD_TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, .Script .Script: end_if_just_battled @@ -133,7 +131,7 @@ TrainerSupernerdTeru: end TrainerPokemaniacIssac: - trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, .Script + trainer POKEMANIAC, ISSAC, EVENT_BEAT_POKEMANIAC_ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, .Script .Script: end_if_just_battled @@ -144,7 +142,7 @@ TrainerPokemaniacIssac: end TrainerPokemaniacDonald: - trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, .Script + trainer POKEMANIAC, DONALD, EVENT_BEAT_POKEMANIAC_DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, .Script .Script: end_if_just_battled @@ -192,7 +190,7 @@ OlderHaircutBrotherScript: .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c5f9 yesorno iffalse .Refused @@ -200,7 +198,7 @@ OlderHaircutBrotherScript: if_equal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x7c69a buttonsound - special Special_YoungerHaircutBrother + special YoungerHaircutBrother if_equal $0, .Refused if_equal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT @@ -209,40 +207,40 @@ OlderHaircutBrotherScript: jump .else .two - setevent EVENT_GAVE_KURT_APRICORNS - clearevent EVENT_RECEIVED_BALLS_FROM_KURT - clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .three - clearevent EVENT_GAVE_KURT_APRICORNS - setevent EVENT_RECEIVED_BALLS_FROM_KURT - clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .else - clearevent EVENT_GAVE_KURT_APRICORNS - clearevent EVENT_RECEIVED_BALLS_FROM_KURT - setevent EVENT_DRAGON_SHRINE_QUESTION_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .then takemoney YOUR_MONEY, 500 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c6b8 waitbutton closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext UnknownText_0x7c6d8 waitbutton - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x7c2bb - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd @@ -275,7 +273,7 @@ YoungerHaircutBrotherScript: .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c75c yesorno iffalse .Refused @@ -283,7 +281,7 @@ YoungerHaircutBrotherScript: if_equal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x7c7f1 buttonsound - special Special_OlderHaircutBrother + special OlderHaircutBrother if_equal $0, .Refused if_equal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT @@ -292,40 +290,40 @@ YoungerHaircutBrotherScript: jump .else .two - setevent EVENT_GAVE_KURT_APRICORNS - clearevent EVENT_RECEIVED_BALLS_FROM_KURT - clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .three - clearevent EVENT_GAVE_KURT_APRICORNS - setevent EVENT_RECEIVED_BALLS_FROM_KURT - clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .else - clearevent EVENT_GAVE_KURT_APRICORNS - clearevent EVENT_RECEIVED_BALLS_FROM_KURT - setevent EVENT_DRAGON_SHRINE_QUESTION_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .then takemoney YOUR_MONEY, 300 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c80e waitbutton closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext UnknownText_0x7c82a waitbutton - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x7c2bb - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd @@ -349,21 +347,21 @@ YoungerHaircutBrotherScript: UnknownScript_0x7c2bb: writetext HaircutBrosText_SlightlyHappier - special Special_PlayCurMonCry + special PlayCurMonCry waitbutton closetext end UnknownScript_0x7c2c4: writetext HaircutBrosText_Happier - special Special_PlayCurMonCry + special PlayCurMonCry waitbutton closetext end UnknownScript_0x7c2cd: writetext HaircutBrosText_MuchHappier - special Special_PlayCurMonCry + special PlayCurMonCry waitbutton closetext end @@ -409,13 +407,13 @@ MapGoldenrodUndergroundSignpost1Script: jumptext UnknownText_0x7c91a GoldenrodUndergroundHiddenParlyzHeal: - hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL + hiddenitem PARLYZ_HEAL, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL GoldenrodUndergroundHiddenSuperPotion: - hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem SUPER_POTION, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION GoldenrodUndergroundHiddenAntidote: - hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE + hiddenitem ANTIDOTE, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE SupernerdEricSeenText: text "I got booted out" @@ -647,31 +645,26 @@ UnknownText_0x7c91a: done GoldenrodUnderground_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 3, 2, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 3, 34, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 18, 6, 4, GOLDENROD_UNDERGROUND - warp_def 21, 31, 3, GOLDENROD_UNDERGROUND - warp_def 22, 31, 3, GOLDENROD_UNDERGROUND - warp_def 22, 27, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - -.CoordEvents: - db 0 - -.BGEvents: - db 5 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 3, 2, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_event 3, 34, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_event 18, 6, 4, GOLDENROD_UNDERGROUND + warp_event 21, 31, 3, GOLDENROD_UNDERGROUND + warp_event 22, 31, 3, GOLDENROD_UNDERGROUND + warp_event 22, 27, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + + db 0 ; coord events + + db 5 ; bg events bg_event 18, 6, BGEVENT_READ, BasementDoorScript bg_event 19, 6, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script bg_event 6, 13, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal bg_event 4, 18, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion bg_event 17, 8, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote -.ObjectEvents: - db 9 + db 9 ; object events object_event 5, 31, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1 object_event 6, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1 object_event 3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1 diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 621c133fd..6e66d3ef0 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -45,13 +45,11 @@ const_value set 2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER GoldenrodUndergroundSwitchRoomEntrances_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .UpdateDoorPositions .DummyScene0: @@ -121,7 +119,7 @@ TeacherScript_0x7ca7d: UndergroundSilverScene1: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_EXIT_BUILDING appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER @@ -140,7 +138,7 @@ UndergroundSilverScene1: UndergroundSilverScene2: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_EXIT_BUILDING appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER @@ -207,7 +205,7 @@ UndergroundSilverBattleScript: end TrainerGruntM11: - trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_11, EVENT_BEAT_ROCKET_GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, .Script .Script: end_if_just_battled @@ -218,7 +216,7 @@ TrainerGruntM11: end TrainerGruntM25: - trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_25, EVENT_BEAT_ROCKET_GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, .Script .Script: end_if_just_battled @@ -229,7 +227,7 @@ TrainerGruntM25: end TrainerBurglarDuncan: - trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, .Script + trainer BURGLAR, DUNCAN, EVENT_BEAT_BURGLAR_DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, .Script .Script: end_if_just_battled @@ -240,7 +238,7 @@ TrainerBurglarDuncan: end TrainerBurglarEddie: - trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, .Script + trainer BURGLAR, EDDIE, EVENT_BEAT_BURGLAR_EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, .Script .Script: end_if_just_battled @@ -251,7 +249,7 @@ TrainerBurglarEddie: end TrainerGruntM13: - trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_13, EVENT_BEAT_ROCKET_GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, .Script .Script: end_if_just_battled @@ -262,7 +260,7 @@ TrainerGruntM13: end TrainerGruntF3: - trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, .Script + trainer GRUNTF, GRUNTF_3, EVENT_BEAT_ROCKET_GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, .Script .Script: end_if_just_battled @@ -631,10 +629,10 @@ GoldenrodUndergroundSwitchRoomEntrancesFullHeal: itemball FULL_HEAL GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion: - hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive: - hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE UndergroundSilverApproachMovement1: step DOWN @@ -931,28 +929,24 @@ SwitchRoomText_Emergency: done GoldenrodUndergroundSwitchRoomEntrances_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 23, 3, 6, GOLDENROD_UNDERGROUND - warp_def 22, 10, 1, GOLDENROD_UNDERGROUND_WAREHOUSE - warp_def 23, 10, 2, GOLDENROD_UNDERGROUND_WAREHOUSE - warp_def 5, 25, 2, GOLDENROD_UNDERGROUND - warp_def 4, 29, 14, GOLDENROD_CITY - warp_def 5, 29, 14, GOLDENROD_CITY - warp_def 21, 25, 1, GOLDENROD_UNDERGROUND - warp_def 20, 29, 13, GOLDENROD_CITY - warp_def 21, 29, 13, GOLDENROD_CITY - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 9 ; warp events + warp_event 23, 3, 6, GOLDENROD_UNDERGROUND + warp_event 22, 10, 1, GOLDENROD_UNDERGROUND_WAREHOUSE + warp_event 23, 10, 2, GOLDENROD_UNDERGROUND_WAREHOUSE + warp_event 5, 25, 2, GOLDENROD_UNDERGROUND + warp_event 4, 29, 14, GOLDENROD_CITY + warp_event 5, 29, 14, GOLDENROD_CITY + warp_event 21, 25, 1, GOLDENROD_UNDERGROUND + warp_event 20, 29, 13, GOLDENROD_CITY + warp_event 21, 29, 13, GOLDENROD_CITY + + db 2 ; coord events coord_event 19, 4, 0, UndergroundSilverScene1 coord_event 19, 5, 0, UndergroundSilverScene2 -.BGEvents: - db 6 + db 6 ; bg events bg_event 16, 1, BGEVENT_READ, Switch1Script bg_event 10, 1, BGEVENT_READ, Switch2Script bg_event 2, 1, BGEVENT_READ, Switch3Script @@ -960,8 +954,7 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents: bg_event 8, 9, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion bg_event 1, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive -.ObjectEvents: - db 11 + db 11 ; object events object_event 9, 12, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 4, 8, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 17, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index be5aa7e31..f64085b73 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -8,11 +8,9 @@ const_value set 2 const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL3 GoldenrodUndergroundWarehouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .ResetSwitches .ResetSwitches: @@ -36,7 +34,7 @@ GoldenrodUndergroundWarehouse_MapScripts: return TrainerGruntM24: - trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_24, EVENT_BEAT_ROCKET_GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script .Script: end_if_just_battled @@ -47,7 +45,7 @@ TrainerGruntM24: end TrainerGruntM14: - trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_14, EVENT_BEAT_ROCKET_GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, .Script .Script: end_if_just_battled @@ -58,7 +56,7 @@ TrainerGruntM14: end TrainerGruntM15: - trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_15, EVENT_BEAT_ROCKET_GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, .Script .Script: end_if_just_battled @@ -211,23 +209,18 @@ UnknownText_0x7dc8d: done GoldenrodUndergroundWarehouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 2, 12, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 3, 12, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 17, 2, 1, GOLDENROD_DEPT_STORE_B1F + db 3 ; warp events + warp_event 2, 12, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_event 3, 12, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_event 17, 2, 1, GOLDENROD_DEPT_STORE_B1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 7 + db 7 ; object events object_event 9, 8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 136d0da66..42382ec94 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const GUIDEGENTSHOUSE_GRAMPS GuideGentsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GuideGentsHouseGuideGent: jumptextfaceplayer GuideGentsHouseGuideGentText @@ -28,22 +26,17 @@ GuideGentsHouseGuideGentText: done GuideGentsHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, CHERRYGROVE_CITY - warp_def 3, 7, 4, CHERRYGROVE_CITY + db 2 ; warp events + warp_event 2, 7, 4, CHERRYGROVE_CITY + warp_event 3, 7, 4, CHERRYGROVE_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, GuideGentsHouseBookshelf bg_event 1, 1, BGEVENT_READ, GuideGentsHouseBookshelf -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 3f5f6ee10..571a5a964 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -2,13 +2,11 @@ const_value set 2 const HALLOFFAME_LANCE HallOfFame_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .EnterHallOfFame scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .EnterHallOfFame: priorityjump .EnterHallOfFameScript @@ -31,7 +29,7 @@ HallOfFame_MapScripts: setscene 1 pause 15 writebyte HEALMACHINE_HALL_OF_FAME - special Special_HealMachineAnim + special HealMachineAnim setevent EVENT_BEAT_ELITE_FOUR setevent EVENT_TELEPORT_GUY setevent EVENT_RIVAL_SPROUT_TOWER @@ -111,20 +109,15 @@ HallOfFame_LanceText: done HallOfFame_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 13, 3, LANCES_ROOM - warp_def 5, 13, 4, LANCES_ROOM + db 2 ; warp events + warp_event 4, 13, 3, LANCES_ROOM + warp_event 5, 13, 4, LANCES_ROOM -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 4, 12, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index 84abeb680..5f109a654 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -4,11 +4,9 @@ const_value set 2 const ICEPATH1F_POKE_BALL3 IcePath1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks IcePath1FHMWaterfall: itemball HM_WATERFALL @@ -20,24 +18,19 @@ IcePath1FProtein: itemball PROTEIN IcePath1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 19, 1, ROUTE_44 - warp_def 36, 27, 7, BLACKTHORN_CITY - warp_def 37, 5, 1, ICE_PATH_B1F - warp_def 37, 13, 7, ICE_PATH_B1F + db 4 ; warp events + warp_event 4, 19, 1, ROUTE_44 + warp_event 36, 27, 7, BLACKTHORN_CITY + warp_event 37, 5, 1, ICE_PATH_B1F + warp_event 37, 13, 7, ICE_PATH_B1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 2df927ebd..417e71a7f 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -6,11 +6,9 @@ const_value set 2 const ICEPATHB1F_POKE_BALL IcePathB1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable .SetUpStoneTable: @@ -68,7 +66,7 @@ IcePathB1FIron: itemball IRON IcePathB1FHiddenMaxPotion: - hiddenitem EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION IcePathBoulderFellThroughText: text "The boulder fell" @@ -76,29 +74,24 @@ IcePathBoulderFellThroughText: done IcePathB1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 8 - warp_def 3, 15, 3, ICE_PATH_1F - warp_def 17, 3, 1, ICE_PATH_B2F_MAHOGANY_SIDE - warp_def 11, 2, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_def 4, 7, 4, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_def 5, 12, 5, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_def 12, 13, 6, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_def 5, 25, 4, ICE_PATH_1F - warp_def 11, 27, 1, ICE_PATH_B2F_BLACKTHORN_SIDE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 + db 0, 0 ; filler + + db 8 ; warp events + warp_event 3, 15, 3, ICE_PATH_1F + warp_event 17, 3, 1, ICE_PATH_B2F_MAHOGANY_SIDE + warp_event 11, 2, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole + warp_event 4, 7, 4, ICE_PATH_B2F_MAHOGANY_SIDE ; hole + warp_event 5, 12, 5, ICE_PATH_B2F_MAHOGANY_SIDE ; hole + warp_event 12, 13, 6, ICE_PATH_B2F_MAHOGANY_SIDE ; hole + warp_event 5, 25, 4, ICE_PATH_1F + warp_event 11, 27, 1, ICE_PATH_B2F_BLACKTHORN_SIDE + + db 0 ; coord events + + db 1 ; bg events bg_event 17, 30, BGEVENT_ITEM, IcePathB1FHiddenMaxPotion -.ObjectEvents: - db 5 + db 5 ; object events object_event 11, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 object_event 7, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 object_event 8, 9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 1fe814b66..286348a55 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -2,34 +2,27 @@ const_value set 2 const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL IcePathB2FBlackthornSide_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks IcePathB2FBlackthornSideTMRest: itemball TM_REST IcePathB2FBlackthornSideHiddenIceHeal: - hiddenitem EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL + hiddenitem ICE_HEAL, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL IcePathB2FBlackthornSide_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 15, 8, ICE_PATH_B1F - warp_def 3, 3, 2, ICE_PATH_B3F + db 2 ; warp events + warp_event 3, 15, 8, ICE_PATH_B1F + warp_event 3, 3, 2, ICE_PATH_B3F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 2, 10, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal -.ObjectEvents: - db 1 + db 1 ; object events object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index d70dc8492..f4cc310fa 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -7,11 +7,9 @@ const_value set 2 const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2 IcePathB2FMahoganySide_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks IcePathB2FMahoganySideBoulder: jumptext IcePathB2FMahoganySideBoulderText @@ -23,7 +21,7 @@ IcePathB2FMahoganySideMaxPotion: itemball MAX_POTION IcePathB2FMahoganySideHiddenCarbos: - hiddenitem EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS + hiddenitem CARBOS, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS IcePathB2FMahoganySideBoulderText: text "It's immovably" @@ -31,27 +29,22 @@ IcePathB2FMahoganySideBoulderText: done IcePathB2FMahoganySide_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 17, 1, 2, ICE_PATH_B1F - warp_def 9, 11, 1, ICE_PATH_B3F - warp_def 11, 4, 3, ICE_PATH_B1F - warp_def 4, 6, 4, ICE_PATH_B1F - warp_def 4, 12, 5, ICE_PATH_B1F - warp_def 12, 12, 6, ICE_PATH_B1F - -.CoordEvents: - db 0 - -.BGEvents: - db 1 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 17, 1, 2, ICE_PATH_B1F + warp_event 9, 11, 1, ICE_PATH_B3F + warp_event 11, 4, 3, ICE_PATH_B1F + warp_event 4, 6, 4, ICE_PATH_B1F + warp_event 4, 12, 5, ICE_PATH_B1F + warp_event 12, 12, 6, ICE_PATH_B1F + + db 0 ; coord events + + db 1 ; bg events bg_event 0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos -.ObjectEvents: - db 6 + db 6 ; object events 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 diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 40809dbe3..99e96fba6 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -3,11 +3,9 @@ const_value set 2 const ICEPATHB3F_ROCK IcePathB3F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks IcePathB3FNevermeltice: itemball NEVERMELTICE @@ -16,21 +14,16 @@ IcePathB3FRock: jumpstd smashrock IcePathB3F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 5, 2, ICE_PATH_B2F_MAHOGANY_SIDE - warp_def 15, 5, 2, ICE_PATH_B2F_BLACKTHORN_SIDE + db 2 ; warp events + warp_event 3, 5, 2, ICE_PATH_B2F_MAHOGANY_SIDE + warp_event 15, 5, 2, ICE_PATH_B2F_BLACKTHORN_SIDE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 5, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE object_event 6, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 01351cd84..37460e549 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -12,11 +12,9 @@ const_value set 2 const ILEXFOREST_POKE_BALL4 IlexForest_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .FarfetchdCallback .FarfetchdCallback: @@ -388,7 +386,7 @@ IlexForestHeadbuttGuyScript: end TrainerBugCatcherWayne: - trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, BugCatcherWayneSeenText, BugCatcherWayneBeatenText, 0, .Script + trainer BUG_CATCHER, WAYNE, EVENT_BEAT_BUG_CATCHER_WAYNE, BugCatcherWayneSeenText, BugCatcherWayneBeatenText, 0, .Script .Script: end_if_just_battled @@ -414,13 +412,13 @@ IlexForestEther: itemball ETHER IlexForestHiddenEther: - hiddenitem EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER + hiddenitem ETHER, EVENT_ILEX_FOREST_HIDDEN_ETHER IlexForestHiddenSuperPotion: - hiddenitem EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem SUPER_POTION, EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION IlexForestHiddenFullHeal: - hiddenitem EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL IlexForestBoulder: ; unused @@ -459,18 +457,18 @@ MapIlexForestSignpost4Script: closetext pause 20 showemote EMOTE_SHOCK, PLAYER, 20 - special Special_FadeOutMusic + special FadeOutMusic applymovement PLAYER, MovementData_0x6ef58 pause 30 spriteface PLAYER, DOWN pause 20 - clearflag ENGINE_HAVE_EXAMINED_GS_BALL - special Special_CelebiShrineEvent + clearflag ENGINE_FOREST_IS_RESTLESS + special CelebiShrineEvent loadwildmon CELEBI, 30 startbattle reloadmapafterbattle pause 20 - special Special_CheckCaughtCelebi + special CheckCaughtCelebi iffalse .DidntCatchCelebi appear ILEXFOREST_KURT applymovement ILEXFOREST_KURT, MovementData_0x6ef4e @@ -938,28 +936,23 @@ BugCatcherWayneAfterBattleText: done IlexForest_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 1, 5, 3, ROUTE_34_ILEX_FOREST_GATE - warp_def 3, 42, 1, ILEX_FOREST_AZALEA_GATE - warp_def 3, 43, 2, ILEX_FOREST_AZALEA_GATE + db 3 ; warp events + warp_event 1, 5, 3, ROUTE_34_ILEX_FOREST_GATE + warp_event 3, 42, 1, ILEX_FOREST_AZALEA_GATE + warp_event 3, 43, 2, ILEX_FOREST_AZALEA_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 5 + db 5 ; bg events bg_event 3, 17, BGEVENT_READ, MapIlexForestSignpost0Script bg_event 11, 7, BGEVENT_ITEM, IlexForestHiddenEther bg_event 22, 14, BGEVENT_ITEM, IlexForestHiddenSuperPotion bg_event 1, 17, BGEVENT_ITEM, IlexForestHiddenFullHeal bg_event 8, 22, BGEVENT_UP, MapIlexForestSignpost4Script -.ObjectEvents: - db 11 + db 11 ; object events object_event 14, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD object_event 7, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE object_event 5, 28, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index c66483971..8f64f2794 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -3,11 +3,9 @@ const_value set 2 const ILEXFORESTAZALEAGATE_GRANNY IlexForestAzaleaGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks IlexForestAzaleaGateOfficerScript: jumptextfaceplayer IlexForestAzaleaGateOfficerText @@ -31,23 +29,18 @@ IlexForestAzaleaGateGrannyText: done IlexForestAzaleaGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 4, 2, ILEX_FOREST - warp_def 0, 5, 3, ILEX_FOREST - warp_def 9, 4, 7, AZALEA_TOWN - warp_def 9, 5, 8, AZALEA_TOWN + db 4 ; warp events + warp_event 0, 4, 2, ILEX_FOREST + warp_event 0, 5, 3, ILEX_FOREST + warp_event 9, 4, 7, AZALEA_TOWN + warp_event 9, 5, 8, AZALEA_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1 object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1 diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 17a4d0663..702f9692b 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -7,12 +7,10 @@ const_value set 2 const INDIGOPLATEAUPOKECENTER1F_ABRA IndigoPlateauPokecenter1F_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .PrepareElite4 .DummyScene: @@ -58,7 +56,7 @@ PlateauRivalBattle1: appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1 playmusic MUSIC_RIVAL_ENCOUNTER @@ -79,7 +77,7 @@ PlateauRivalBattle2: appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement2 playmusic MUSIC_RIVAL_ENCOUNTER @@ -158,7 +156,7 @@ TeleportGuyScript: waitbutton closetext playsound SFX_WARP_TO - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx warp NEW_BARK_TOWN, 13, 6 end @@ -303,26 +301,21 @@ AbraText: done IndigoPlateauPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 5, 13, 1, ROUTE_23 - warp_def 6, 13, 2, ROUTE_23 - warp_def 0, 13, 1, POKECENTER_2F - warp_def 14, 3, 1, WILLS_ROOM - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 5, 13, 1, ROUTE_23 + warp_event 6, 13, 2, ROUTE_23 + warp_event 0, 13, 1, POKECENTER_2F + warp_event 14, 3, 1, WILLS_ROOM + + db 2 ; coord events coord_event 16, 4, 0, PlateauRivalBattle1 coord_event 17, 4, 0, PlateauRivalBattle2 -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 6 + db 6 ; object events object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1 object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1 object_event 11, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index eef62321d..3b9ff0d3a 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -2,13 +2,11 @@ const_value set 2 const KARENSROOM_KAREN KarensRoom_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .LockDoor scene_script .DummyScene -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .KarensRoomDoors .LockDoor: @@ -133,22 +131,17 @@ KarenScript_KarenDefeatText: done KarensRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 17, 3, BRUNOS_ROOM - warp_def 5, 17, 4, BRUNOS_ROOM - warp_def 4, 2, 1, LANCES_ROOM - warp_def 5, 2, 2, LANCES_ROOM + db 4 ; warp events + warp_event 4, 17, 3, BRUNOS_ROOM + warp_event 5, 17, 4, BRUNOS_ROOM + warp_event 4, 2, 1, LANCES_ROOM + warp_event 5, 2, 2, LANCES_ROOM -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 5, 7, SPRITE_KAREN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index fe1badec4..9c88d1a2c 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -2,13 +2,11 @@ const_value set 2 const KOGASROOM_KOGA KogasRoom_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .LockDoor scene_script .DummyScene -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .KogasRoomDoors .LockDoor: @@ -130,22 +128,17 @@ KogaScript_KogaDefeatText: done KogasRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 17, 2, WILLS_ROOM - warp_def 5, 17, 3, WILLS_ROOM - warp_def 4, 2, 1, BRUNOS_ROOM - warp_def 5, 2, 2, BRUNOS_ROOM + db 4 ; warp events + warp_event 4, 17, 2, WILLS_ROOM + warp_event 5, 17, 3, WILLS_ROOM + warp_event 4, 2, 1, BRUNOS_ROOM + warp_event 5, 2, 2, BRUNOS_ROOM -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 5, 7, SPRITE_KOGA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1 diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm deleted file mode 100644 index 457660d97..000000000 --- a/maps/KrissNeighborsHouse.asm +++ /dev/null @@ -1,122 +0,0 @@ -const_value set 2 - const KRISSNEIGHBORSHOUSE_COOLTRAINER_F - const KRISSNEIGHBORSHOUSE_POKEFAN_F - -KrissNeighborsHouse_MapScripts: -.SceneScripts: - db 0 - -.MapCallbacks: - db 0 - -KrissNeighborsDaughter: - jumptextfaceplayer KrissNeighborsDaughterText - -KrissNeighbor: - jumptextfaceplayer KrissNeighborText - -KrissNeighborsHouseBookshelf: - jumpstd magazinebookshelf - -KrissNeighborsHouseRadio: - checkevent EVENT_GOT_A_POKEMON_FROM_ELM - iftrue .NormalRadio - checkevent EVENT_LISTENED_TO_INITIAL_RADIO - iftrue .AbbreviatedRadio - playmusic MUSIC_POKEMON_TALK - opentext - writetext KrisNeighborRadioText1 - pause 45 - writetext KrisNeighborRadioText2 - pause 45 - writetext KrisNeighborRadioText3 - pause 45 - musicfadeout MUSIC_NEW_BARK_TOWN, 16 - writetext KrisNeighborRadioText4 - pause 45 - closetext - setevent EVENT_LISTENED_TO_INITIAL_RADIO - end -.NormalRadio: - jumpstd radio1 -.AbbreviatedRadio: - opentext - writetext KrisNeighborRadioText4 - pause 45 - closetext - end - -KrissNeighborsDaughterText: - text "PIKACHU is an" - line "evolved #MON." - - para "I was amazed by" - line "PROF.ELM's find-" - cont "ings." - - para "He's so famous for" - line "his research on" - cont "#MON evolution." - - para "…sigh…" - - para "I wish I could be" - line "a researcher like" - cont "him…" - done - -KrissNeighborText: - text "My daughter is" - line "adamant about" - - para "becoming PROF." - line "ELM's assistant." - - para "She really loves" - line "#MON!" - - para "But then, so do I!" - done - -KrisNeighborRadioText1: - text "PROF.OAK'S #MON" - line "TALK! Please tune" - cont "in next time!" - done - -KrisNeighborRadioText2: - text "#MON CHANNEL!" - done - -KrisNeighborRadioText3: - text "This is DJ MARY," - line "your co-host!" - done - -KrisNeighborRadioText4: - text "#MON!" - line "#MON CHANNEL…" - done - -KrissNeighborsHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 3, NEW_BARK_TOWN - warp_def 3, 7, 3, NEW_BARK_TOWN - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 0, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf - bg_event 1, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf - bg_event 7, 1, BGEVENT_READ, KrissNeighborsHouseRadio - -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1 - object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index eb2bbcb89..edb1ebe55 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -6,11 +6,9 @@ const_value set 2 const KURTSHOUSE_TWIN2 KurtsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .KurtCallback .KurtCallback: @@ -44,7 +42,7 @@ KurtScript_0x18e178: writetext UnknownText_0x18e473 waitbutton closetext - special Special_FadeOutMusic + special FadeOutMusic setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET checkcode VAR_FACING if_equal UP, .RunAround @@ -74,7 +72,7 @@ KurtScript_0x18e178: iffalse .NoRoomForBall setevent EVENT_KURT_GAVE_YOU_LURE_BALL .GotLureBall: - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .WaitForApricorns checkevent EVENT_GAVE_KURT_RED_APRICORN iftrue .GiveLevelBall @@ -93,9 +91,9 @@ KurtScript_0x18e178: checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT iftrue .CanGiveGSBallToKurt .NoGSBall: - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .CheckApricorns - checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 iftrue .CheckApricorns writetext UnknownText_0x18e6c9 waitbutton @@ -114,9 +112,9 @@ KurtScript_0x18e178: iftrue .AskApricorn checkitem PNK_APRICORN iftrue .AskApricorn - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .ThatTurnedOutGreat - checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 iftrue .IMakeBallsFromApricorns closetext end @@ -130,8 +128,8 @@ KurtScript_0x18e178: .AskApricorn: writetext UnknownText_0x18e736 buttonsound - setevent EVENT_DRAGON_SHRINE_QUESTION_2 - special Special_SelectApricornForKurt + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 + special SelectApricornForKurt if_equal FALSE, .Cancel if_equal BLU_APRICORN, .Blu if_equal YLW_APRICORN, .Ylw @@ -168,7 +166,7 @@ KurtScript_0x18e178: jump .GaveKurtApricorns .GaveKurtApricorns: - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 setflag ENGINE_KURT_MAKING_BALLS .WaitForApricorns: writetext UnknownText_0x18e779 @@ -183,7 +181,7 @@ KurtScript_0x18e178: end ._ThatTurnedOutGreat: - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 .ThatTurnedOutGreat: writetext UnknownText_0x18e82a waitbutton @@ -291,7 +289,7 @@ KurtScript_0x18e178: setevent EVENT_FOREST_IS_RESTLESS clearevent EVENT_CAN_GIVE_GS_BALL_TO_KURT clearevent EVENT_GAVE_GS_BALL_TO_KURT - special Special_FadeOutMusic + special FadeOutMusic pause 20 showemote EMOTE_SHOCK, KURTSHOUSE_KURT1, 30 checkcode VAR_FACING @@ -347,9 +345,9 @@ KurtScript_ImCheckingItNow: KurtsGranddaughter1: faceplayer - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue KurtsGranddaughter2Subscript - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue KurtsGranddaughterFunScript checkevent EVENT_FOREST_IS_RESTLESS iftrue .Lonely @@ -677,19 +675,15 @@ KurtsHouseCelebiStatueText: done KurtsHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 7, 4, AZALEA_TOWN - warp_def 4, 7, 4, AZALEA_TOWN + db 2 ; warp events + warp_event 3, 7, 4, AZALEA_TOWN + warp_event 4, 7, 4, AZALEA_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 7 + db 7 ; bg events bg_event 6, 1, BGEVENT_READ, KurtsHouseRadio bg_event 8, 0, BGEVENT_READ, KurtsHouseOakPhoto bg_event 9, 0, BGEVENT_READ, KurtsHouseOakPhoto @@ -698,8 +692,7 @@ KurtsHouse_MapEvents: bg_event 3, 1, BGEVENT_READ, KurtsHouseBookshelf bg_event 4, 1, BGEVENT_READ, KurtsHouseCelebiStatue -.ObjectEvents: - db 5 + db 5 ; object events object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1 object_event 5, 3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 object_event 6, 3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index fdbbeb438..ecfe02e59 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -13,13 +13,11 @@ const_value set 2 const LAKEOFRAGE_POKE_BALL2 LakeOfRage_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_OBJECTS, .Wesley @@ -141,12 +139,12 @@ MapLakeOfRageSignpost1Script: UnknownScript_0x700b8: buttonsound - special Special_MagikarpHouseSign + special MagikarpHouseSign closetext end TrainerFisherAndre: - trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, .Script + trainer FISHER, ANDRE, EVENT_BEAT_FISHER_ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, .Script .Script: end_if_just_battled @@ -157,7 +155,7 @@ TrainerFisherAndre: end TrainerFisherRaymond: - trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, .Script + trainer FISHER, RAYMOND, EVENT_BEAT_FISHER_RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, .Script .Script: end_if_just_battled @@ -168,7 +166,7 @@ TrainerFisherRaymond: end TrainerCooltrainermAaron: - trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, .Script + trainer COOLTRAINERM, AARON, EVENT_BEAT_COOLTRAINERM_AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, .Script .Script: end_if_just_battled @@ -179,7 +177,7 @@ TrainerCooltrainermAaron: end TrainerCooltrainerfLois: - trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, .Script + trainer COOLTRAINERF, LOIS, EVENT_BEAT_COOLTRAINERF_LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, .Script .Script: end_if_just_battled @@ -232,13 +230,13 @@ LakeOfRageTMDetect: itemball TM_DETECT LakeOfRageHiddenFullRestore: - hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE LakeOfRageHiddenRareCandy: - hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY LakeOfRageHiddenMaxPotion: - hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION MovementData_0x70155: teleport_from @@ -494,27 +492,22 @@ UnknownText_0x70903: done LakeOfRage_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 7, 3, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE - warp_def 27, 31, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE + db 2 ; warp events + warp_event 7, 3, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE + warp_event 27, 31, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 5 + db 5 ; bg events bg_event 21, 27, BGEVENT_READ, MapLakeOfRageSignpost0Script bg_event 25, 31, BGEVENT_READ, MapLakeOfRageSignpost1Script bg_event 11, 28, BGEVENT_ITEM, LakeOfRageHiddenFullRestore bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion -.ObjectEvents: - db 12 + db 12 ; object events object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE object_event 20, 26, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1 object_event 36, 13, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1 diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index 9d346ab0a..4fa55dd54 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER LakeOfRageHiddenPowerHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks HiddenPowerGuy: faceplayer @@ -68,22 +66,17 @@ HiddenPowerGuyText3: done LakeOfRageHiddenPowerHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, LAKE_OF_RAGE - warp_def 3, 7, 1, LAKE_OF_RAGE + db 2 ; warp events + warp_event 2, 7, 1, LAKE_OF_RAGE + warp_event 3, 7, 1, LAKE_OF_RAGE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, HiddenPowerHouseBookshelf bg_event 1, 1, BGEVENT_READ, HiddenPowerHouseBookshelf -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1 diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index c77d823c0..c5e05a423 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU LakeOfRageMagikarpHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FishingGuruScript_0x19a6ae: faceplayer @@ -40,11 +38,11 @@ UnknownScript_0x19a6d7: UnknownScript_0x19a6e0: writebyte MAGIKARP - special Special_FindThatSpecies + special FindPartyMonThatSpecies iffalse UnknownScript_0x19a6d7 writetext UnknownText_0x19a93e waitbutton - special Special_CheckMagikarpLength + special CheckMagikarpLength if_equal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c if_equal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722 if_equal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716 @@ -207,22 +205,17 @@ UnknownText_0x19aabc: db "@@" LakeOfRageMagikarpHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, LAKE_OF_RAGE - warp_def 3, 7, 2, LAKE_OF_RAGE + db 2 ; warp events + warp_event 2, 7, 2, LAKE_OF_RAGE + warp_event 3, 7, 2, LAKE_OF_RAGE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, MagikarpHouseBookshelf bg_event 1, 1, BGEVENT_READ, MagikarpHouseBookshelf -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index a3336251b..657a45942 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -4,13 +4,11 @@ const_value set 2 const LANCESROOM_OAK LancesRoom_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .LockDoor scene_script .DummyScene -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .LancesRoomDoors .LockDoor: @@ -44,12 +42,12 @@ LancesRoom_MapScripts: end Script_ApproachLanceFromLeft: - special Special_FadeOutMusic + special FadeOutMusic applymovement PLAYER, MovementData_ApproachLanceFromLeft jump LanceScript_0x180e7b Script_ApproachLanceFromRight: - special Special_FadeOutMusic + special FadeOutMusic applymovement PLAYER, MovementData_ApproachLanceFromRight LanceScript_0x180e7b: spriteface LANCESROOM_LANCE, LEFT @@ -125,7 +123,7 @@ LanceScript_0x180e7b: pause 30 closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth - special Special_FadeOutPalettes + special FadeOutPalettes pause 15 warpfacing UP, HALL_OF_FAME, 4, 13 end @@ -338,26 +336,21 @@ UnknownText_0x1813c5: done LancesRoom_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 4, 23, 3, KARENS_ROOM - warp_def 5, 23, 4, KARENS_ROOM - warp_def 4, 1, 1, HALL_OF_FAME - warp_def 5, 1, 2, HALL_OF_FAME - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 4, 23, 3, KARENS_ROOM + warp_event 5, 23, 4, KARENS_ROOM + warp_event 4, 1, 1, HALL_OF_FAME + warp_event 5, 1, 2, HALL_OF_FAME + + db 2 ; coord events coord_event 4, 5, 1, Script_ApproachLanceFromLeft coord_event 5, 5, 1, Script_ApproachLanceFromRight -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1 object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index d16bce5f1..1b2a302e7 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -6,11 +6,9 @@ const_value set 2 const LAVRADIOTOWER1F_SUPER_NERD2 LavRadioTower1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks LavRadioTower1FReceptionistScript: jumptextfaceplayer LavRadioTower1FReceptionistText @@ -222,24 +220,19 @@ UnknownText_0x7f36b: done LavRadioTower1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 7, LAVENDER_TOWN - warp_def 3, 7, 7, LAVENDER_TOWN + db 2 ; warp events + warp_event 2, 7, 7, LAVENDER_TOWN + warp_event 3, 7, 7, LAVENDER_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 11, 0, BGEVENT_READ, MapLavRadioTower1FSignpost0Script bg_event 5, 0, BGEVENT_READ, MapLavRadioTower1FSignpost1Script -.ObjectEvents: - db 5 + db 5 ; object events object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1 object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1 object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index f55db399b..cdbb7e8cb 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -4,11 +4,9 @@ const_value set 2 const LAVENDERMART_ROCKER LavenderMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x7eb1c: opentext @@ -48,22 +46,17 @@ LavenderMartRockerText: done LavenderMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, LAVENDER_TOWN - warp_def 3, 7, 5, LAVENDER_TOWN + db 2 ; warp events + warp_event 2, 7, 5, LAVENDER_TOWN + warp_event 3, 7, 5, LAVENDER_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1 object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1 object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 544c51d5b..d0fe4aff5 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -2,12 +2,10 @@ const_value set 2 const LAVENDERNAMERATER_NAME_RATER LavenderNameRater_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -15,7 +13,7 @@ LavenderNameRater_MapScripts: LavenderNameRater: faceplayer opentext - special Special_NameRater + special NameRater waitbutton closetext end @@ -24,20 +22,15 @@ LavenderNameRaterUnusedBookshelf: jumpstd difficultbookshelf LavenderNameRater_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, LAVENDER_TOWN - warp_def 3, 7, 4, LAVENDER_TOWN + db 2 ; warp events + warp_event 2, 7, 4, LAVENDER_TOWN + warp_event 3, 7, 4, LAVENDER_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1 diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index 7436697ea..250d6e98f 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 const LAVENDERPOKECENTER1F_YOUNGSTER LavenderPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x7e6a0: jumpstd pokecenternurse @@ -81,23 +79,18 @@ UnknownText_0x7e7ed: done LavenderPokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 1, LAVENDER_TOWN - warp_def 4, 7, 1, LAVENDER_TOWN - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 1, LAVENDER_TOWN + warp_event 4, 7, 1, LAVENDER_TOWN + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1 object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1 object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1 diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm index 537f10ea1..7f822b3f8 100644 --- a/maps/LavenderPokecenter2FBeta.asm +++ b/maps/LavenderPokecenter2FBeta.asm @@ -1,23 +1,16 @@ LavenderPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks LavenderPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, LAVENDER_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, 3, LAVENDER_POKECENTER_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index eacb6b4d6..d020861ac 100644 --- a/maps/LavenderSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const LAVENDERSPEECHHOUSE_POKEFAN_F LavenderSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks LavenderSpeechHousePokefanFScript: jumptextfaceplayer LavenderSpeechHousePokefanFText @@ -29,22 +27,17 @@ LavenderSpeechHousePokefanFText: done LavenderSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, LAVENDER_TOWN - warp_def 3, 7, 3, LAVENDER_TOWN + db 2 ; warp events + warp_event 2, 7, 3, LAVENDER_TOWN + warp_event 3, 7, 3, LAVENDER_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf -.ObjectEvents: - db 1 + db 1 ; object events 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 655acb3b3..94075b2c2 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -5,11 +5,9 @@ const_value set 2 const LAVENDERTOWN_YOUNGSTER LavenderTown_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -106,24 +104,20 @@ SoulHouseSignText: done LavenderTown_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 7 - warp_def 5, 5, 1, LAVENDER_POKECENTER_1F - warp_def 5, 9, 1, MR_FUJIS_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 - warp_def 14, 5, 1, LAV_RADIO_TOWER_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 6 + db 0, 0 ; filler + + db 7 ; warp events + warp_event 5, 5, 1, LAVENDER_POKECENTER_1F + warp_event 5, 9, 1, MR_FUJIS_HOUSE + warp_event 3, 13, 1, LAVENDER_SPEECH_HOUSE + warp_event 7, 13, 1, LAVENDER_NAME_RATER + warp_event 1, 5, 2, LAVENDER_MART + warp_event 13, 11, 1, SOUL_HOUSE + warp_event 14, 5, 1, LAV_RADIO_TOWER_1F + + db 0 ; coord events + + db 6 ; bg events bg_event 11, 3, BGEVENT_READ, LavenderTownSign bg_event 15, 7, BGEVENT_READ, KantoRadioStationSign bg_event 3, 9, BGEVENT_READ, VolunteerPokemonHouseSign @@ -131,8 +125,7 @@ LavenderTown_MapEvents: bg_event 6, 5, BGEVENT_READ, LavenderPokecenterSignText bg_event 2, 5, BGEVENT_READ, LavenderMartSignText -.ObjectEvents: - db 4 + db 4 ; object events object_event 12, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1 object_event 2, 15, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1 object_event 14, 12, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 20ab72ab1..860e54c1c 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -8,11 +8,9 @@ const_value set 2 const MAHOGANYGYM_GYM_GUY MahoganyGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PryceScript_0x199a9e: faceplayer @@ -71,7 +69,7 @@ MahoganyGymActivateRockets: jumpstd radiotowerrockets TrainerSkierRoxanne: - trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script + trainer SKIER, ROXANNE, EVENT_BEAT_SKIER_ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script .Script: end_if_just_battled @@ -82,7 +80,7 @@ TrainerSkierRoxanne: end TrainerSkierClarissa: - trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, .Script + trainer SKIER, CLARISSA, EVENT_BEAT_SKIER_CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, .Script .Script: end_if_just_battled @@ -93,7 +91,7 @@ TrainerSkierClarissa: end TrainerBoarderRonald: - trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, .Script + trainer BOARDER, RONALD, EVENT_BEAT_BOARDER_RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, .Script .Script: end_if_just_battled @@ -104,7 +102,7 @@ TrainerBoarderRonald: end TrainerBoarderBrad: - trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, .Script + trainer BOARDER, BRAD, EVENT_BEAT_BOARDER_BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, .Script .Script: end_if_just_battled @@ -115,7 +113,7 @@ TrainerBoarderBrad: end TrainerBoarderDouglas: - trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, .Script + trainer BOARDER, DOUGLAS, EVENT_BEAT_BOARDER_DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, .Script .Script: end_if_just_battled @@ -373,24 +371,19 @@ MahoganyGymGuyWinText: done MahoganyGym_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 17, 3, MAHOGANY_TOWN - warp_def 5, 17, 3, MAHOGANY_TOWN + db 2 ; warp events + warp_event 4, 17, 3, MAHOGANY_TOWN + warp_event 5, 17, 3, MAHOGANY_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 3, 15, BGEVENT_READ, MahoganyGymStatue bg_event 6, 15, BGEVENT_READ, MahoganyGymStatue -.ObjectEvents: - db 7 + db 7 ; object events object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1 object_event 4, 6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1 object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 5b3cfd43c..09748c48e 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -6,13 +6,11 @@ const_value set 2 const MAHOGANYMART1F_GRANNY MahoganyMart1F_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .LanceUncoversStaircase -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase .DummyScene0: @@ -221,23 +219,18 @@ UnknownText_0x6c5ba: done MahoganyMart1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 1, MAHOGANY_TOWN - warp_def 4, 7, 1, MAHOGANY_TOWN - warp_def 7, 3, 1, TEAM_ROCKET_BASE_B1F + db 3 ; warp events + warp_event 3, 7, 1, MAHOGANY_TOWN + warp_event 4, 7, 1, MAHOGANY_TOWN + warp_event 7, 3, 1, TEAM_ROCKET_BASE_B1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 5 + db 5 ; object events object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index 9a0cfdf24..4a2a32f26 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 const MAHOGANYPOKECENTER1F_COOLTRAINER_F MahoganyPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x19a356: jumpstd pokecenternurse @@ -54,23 +52,18 @@ MahoganyPokecenter1FCooltrainerFText: done MahoganyPokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 4, MAHOGANY_TOWN - warp_def 4, 7, 4, MAHOGANY_TOWN - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 4, MAHOGANY_TOWN + warp_event 4, 7, 4, MAHOGANY_TOWN + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19a356, -1 object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1 object_event 1, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index d6ed88a36..fd4734de7 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER MahoganyRedGyaradosSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MahoganyRedGyaradosSpeechHouseBlackBeltScript: jumptextfaceplayer MahoganyRedGyaradosSpeechHouseBlackBeltText @@ -61,21 +59,16 @@ UnknownText_0x199a3d: done MahoganyRedGyaradosSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, MAHOGANY_TOWN - warp_def 3, 7, 2, MAHOGANY_TOWN + db 2 ; warp events + warp_event 2, 7, 2, MAHOGANY_TOWN + warp_event 3, 7, 2, MAHOGANY_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1 object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index d53aabce0..c33ec64ba 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -5,13 +5,11 @@ const_value set 2 const MAHOGANYTOWN_LASS MahoganyTown_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -53,7 +51,7 @@ UnknownScript_0x190039: UnknownScript_0x190040: opentext writetext UnknownText_0x1900b0 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight yesorno iffalse UnknownScript_0x190072 checkmoney YOUR_MONEY, 300 @@ -63,7 +61,7 @@ UnknownScript_0x190040: waitsfx playsound SFX_TRANSACTION takemoney YOUR_MONEY, 300 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x19014a waitbutton closetext @@ -245,31 +243,26 @@ MahoganyGymSignText: done MahoganyTown_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 11, 7, 1, MAHOGANY_MART_1F - warp_def 17, 7, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE - warp_def 6, 13, 1, MAHOGANY_GYM - warp_def 15, 13, 1, MAHOGANY_POKECENTER_1F - warp_def 9, 1, 3, ROUTE_43_MAHOGANY_GATE - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 11, 7, 1, MAHOGANY_MART_1F + warp_event 17, 7, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE + warp_event 6, 13, 1, MAHOGANY_GYM + warp_event 15, 13, 1, MAHOGANY_POKECENTER_1F + warp_event 9, 1, 3, ROUTE_43_MAHOGANY_GATE + + db 2 ; coord events coord_event 19, 8, 0, UnknownScript_0x190013 coord_event 19, 9, 0, UnknownScript_0x190013 -.BGEvents: - db 4 + db 4 ; bg events bg_event 1, 5, BGEVENT_READ, MahoganyTownSign bg_event 9, 7, BGEVENT_READ, MahoganyTownRagecandybarSign bg_event 3, 13, BGEVENT_READ, MahoganyGymSign bg_event 16, 13, BGEVENT_READ, MahoganyTownPokecenterSign -.ObjectEvents: - db 4 + db 4 ; object events object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1 object_event 6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index d5d3febb6..502aad783 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const MANIASHOUSE_ROCKER ManiasHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ManiaScript: faceplayer @@ -18,7 +16,7 @@ ManiaScript: writetext ManiaText_AskLookAfterShuckle yesorno iffalse .refusetotakeshuckie - special Special_GiveShuckle + special GiveShuckle iffalse .partyfull writetext ManiaText_TakeCareOfShuckle buttonsound @@ -31,7 +29,7 @@ ManiaScript: end .alreadyhaveshuckie - checkflag ENGINE_SHUCKLE_GIVEN + checkflag ENGINE_GOT_SHUCKIE_TODAY iffalse .returnshuckie writetext ManiaText_TakeCareOfShuckle waitbutton @@ -54,7 +52,7 @@ ManiaScript: writetext ManiaText_CanIHaveMyMonBack yesorno iffalse .refused - special Special_ReturnShuckle + special ReturnShuckle if_equal SHUCKIE_WRONG_MON, .wrong if_equal SHUCKIE_REFUSED, .refused if_equal SHUCKIE_HAPPY, .superhappy @@ -200,20 +198,15 @@ ManiaText_ShuckleIsYourLastMon: done ManiasHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, CIANWOOD_CITY - warp_def 3, 7, 1, CIANWOOD_CITY + db 2 ; warp events + warp_event 2, 7, 1, CIANWOOD_CITY + warp_event 3, 7, 1, CIANWOOD_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index d65ae1006..65bf3a6ad 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,11 +1,9 @@ MobileBattleRoom_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .InitializeMobileBattleRoom scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .InitializeMobileBattleRoom: priorityjump .InitializeAndPreparePokecenter2F @@ -21,9 +19,9 @@ MobileBattleRoom_MapScripts: MapMobileBattleRoomSignpost0Script: refreshscreen - special Special_Function1037c2 + special Function1037c2 if_equal $1, .one - special Special_Function1037eb + special Function1037eb iffalse .false if_equal $1, .one_ if_equal $2, .two_ @@ -33,24 +31,24 @@ MapMobileBattleRoomSignpost0Script: writetext MobileBattleRoom_HealText pause 20 closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL - special Special_LoadMapPalettes + special LoadMapPalettes pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic refreshscreen .two_ - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty - special Special_Function10383c + special Function10383c iftrue .false .one - special Special_Function10387b + special Function10387b writetext MobileBattleRoom_EstablishingCommsText waitbutton reloadmappart - special Special_Function101225 + special Function101225 .false closetext end @@ -67,20 +65,15 @@ MobileBattleRoom_HealText: done MobileBattleRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 7, 6, POKECENTER_2F - warp_def 5, 7, 6, POKECENTER_2F + db 2 ; warp events + warp_event 4, 7, 6, POKECENTER_2F + warp_event 5, 7, 6, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 4, 2, BGEVENT_UP, MapMobileBattleRoomSignpost0Script -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 53713c9de..31fd04201 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -1,11 +1,9 @@ MobileTradeRoomMobile_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .InitializeMobileTradeRoomMobile scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .InitializeMobileTradeRoomMobile: priorityjump .InitializeAndPreparePokecenter2F @@ -21,11 +19,11 @@ MobileTradeRoomMobile_MapScripts: MapMobileTradeRoomMobileSignpost0Script: refreshscreen - special Special_Function1037c2 + special Function1037c2 writetext MobileTradeRoomMobile_EstablishingCommsText waitbutton reloadmappart - special Special_Function101231 + special Function101231 closetext end @@ -35,20 +33,15 @@ MobileTradeRoomMobile_EstablishingCommsText: done MobileTradeRoomMobile_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 7, 5, POKECENTER_2F - warp_def 5, 7, 5, POKECENTER_2F + db 2 ; warp events + warp_event 4, 7, 5, POKECENTER_2F + warp_event 5, 7, 5, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomMobileSignpost0Script -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 38e5d436d..5b978bc0e 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -2,13 +2,11 @@ const_value set 2 const MOUNTMOON_SILVER MountMoon_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .RivalEncounter scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .RivalEncounter: priorityjump .RivalBattle @@ -20,7 +18,7 @@ MountMoon_MapScripts: .RivalBattle: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 applymovement MOUNTMOON_SILVER, MountMoonSilverMovementBefore playmusic MUSIC_RIVAL_ENCOUNTER @@ -161,26 +159,21 @@ MountMoonSilverTextLoss: done MountMoon_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 8 - warp_def 3, 3, 1, ROUTE_3 - warp_def 15, 15, 1, ROUTE_4 - warp_def 13, 3, 7, MOUNT_MOON - warp_def 15, 11, 8, MOUNT_MOON - warp_def 25, 5, 1, MOUNT_MOON_SQUARE - warp_def 25, 15, 2, MOUNT_MOON_SQUARE - warp_def 25, 3, 3, MOUNT_MOON - warp_def 25, 13, 4, MOUNT_MOON - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 + db 0, 0 ; filler + + db 8 ; warp events + warp_event 3, 3, 1, ROUTE_3 + warp_event 15, 15, 1, ROUTE_4 + warp_event 13, 3, 7, MOUNT_MOON + warp_event 15, 11, 8, MOUNT_MOON + warp_event 25, 5, 1, MOUNT_MOON_SQUARE + warp_event 25, 15, 2, MOUNT_MOON_SQUARE + warp_event 25, 3, 3, MOUNT_MOON + warp_event 25, 13, 4, MOUNT_MOON + + db 0 ; coord events + + db 0 ; bg events + + db 1 ; object events object_event 7, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index b24a98e20..7188a7c00 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -5,11 +5,9 @@ const_value set 2 const MOUNTMOONGIFTSHOP_LASS2 ; day only MountMoonGiftShop_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MountMoonGiftShopClerkScript: faceplayer @@ -28,22 +26,17 @@ MountMoonGiftShopLassText: done MountMoonGiftShop_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 7, 3, MOUNT_MOON_SQUARE - warp_def 4, 7, 3, MOUNT_MOON_SQUARE + db 2 ; warp events + warp_event 3, 7, 3, MOUNT_MOON_SQUARE + warp_event 4, 7, 3, MOUNT_MOON_SQUARE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 4, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 1d9848f3b..b12e7b391 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -4,12 +4,10 @@ const_value set 2 const MOUNTMOONSQUARE_ROCK MountMoonSquare_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_NEWMAP, .DisappearMoonStone callback MAPCALLBACK_OBJECTS, .DisappearRock @@ -75,7 +73,7 @@ ClefairyDance: end MountMoonSquareHiddenMoonStone: - hiddenitem EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE + hiddenitem MOON_STONE, EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE DontLitterSign: jumptext DontLitterSignText @@ -133,26 +131,21 @@ DontLitterSignText: done MountMoonSquare_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 20, 5, 5, MOUNT_MOON - warp_def 22, 11, 6, MOUNT_MOON - warp_def 13, 7, 1, MOUNT_MOON_GIFT_SHOP + db 3 ; warp events + warp_event 20, 5, 5, MOUNT_MOON + warp_event 22, 11, 6, MOUNT_MOON + warp_event 13, 7, 1, MOUNT_MOON_GIFT_SHOP -.CoordEvents: - db 1 + db 1 ; coord events coord_event 7, 11, 0, ClefairyDance -.BGEvents: - db 2 + db 2 ; bg events bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone bg_event 17, 7, BGEVENT_READ, DontLitterSign -.ObjectEvents: - db 3 + db 3 ; object events object_event 6, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY object_event 7, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY object_event 7, 7, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index a67ba1144..fad3d4098 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -11,14 +11,12 @@ const_value set 2 const MOUNTMORTAR1FINSIDE_POKE_BALL7 MountMortar1FInside_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerPokemaniacMiller: - trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script + trainer POKEMANIAC, MILLER, EVENT_BEAT_POKEMANIAC_MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script .Script: end_if_just_battled @@ -29,7 +27,7 @@ TrainerPokemaniacMiller: end TrainerSupernerdMarkus: - trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, .Script + trainer SUPER_NERD, MARKUS, EVENT_BEAT_SUPER_NERD_MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, .Script .Script: end_if_just_battled @@ -64,7 +62,7 @@ MountMortar1FInsideUltraBall: itemball ULTRA_BALL MountMortar1FInsideHiddenMaxRepel: - hiddenitem EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL + hiddenitem MAX_REPEL, EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL PokemaniacMillerSeenText: text "I'm not losing" @@ -117,27 +115,22 @@ SupernerdMarkusAfterBattleText: done MountMortar1FInside_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 11, 47, 5, MOUNT_MORTAR_1F_OUTSIDE - warp_def 29, 47, 6, MOUNT_MORTAR_1F_OUTSIDE - warp_def 5, 39, 8, MOUNT_MORTAR_1F_OUTSIDE - warp_def 33, 41, 9, MOUNT_MORTAR_1F_OUTSIDE - warp_def 3, 19, 1, MOUNT_MORTAR_B1F - warp_def 9, 9, 2, MOUNT_MORTAR_2F_INSIDE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 11, 47, 5, MOUNT_MORTAR_1F_OUTSIDE + warp_event 29, 47, 6, MOUNT_MORTAR_1F_OUTSIDE + warp_event 5, 39, 8, MOUNT_MORTAR_1F_OUTSIDE + warp_event 33, 41, 9, MOUNT_MORTAR_1F_OUTSIDE + warp_event 3, 19, 1, MOUNT_MORTAR_B1F + warp_event 9, 9, 2, MOUNT_MORTAR_2F_INSIDE + + db 0 ; coord events + + db 1 ; bg events bg_event 30, 11, BGEVENT_ITEM, MountMortar1FInsideHiddenMaxRepel -.ObjectEvents: - db 10 + db 10 ; object events object_event 21, 43, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortar1FBoulder, -1 object_event 35, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE object_event 16, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index d38f4f732..1656a7f41 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -3,11 +3,9 @@ const_value set 2 const MOUNTMORTAR1FOUTSIDE_POKE_BALL2 MountMortar1FOutside_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MountMortar1FOutsideEther: itemball ETHER @@ -16,32 +14,27 @@ MountMortar1FOutsideRevive: itemball REVIVE MountMortar1FOutsideHiddenHyperPotion: - hiddenitem EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION MountMortar1FOutside_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 3, 33, 3, ROUTE_42 - warp_def 17, 33, 4, ROUTE_42 - warp_def 37, 33, 5, ROUTE_42 - warp_def 17, 5, 1, MOUNT_MORTAR_2F_INSIDE - warp_def 11, 21, 1, MOUNT_MORTAR_1F_INSIDE - warp_def 29, 21, 2, MOUNT_MORTAR_1F_INSIDE - warp_def 17, 29, 2, MOUNT_MORTAR_B1F - warp_def 7, 13, 3, MOUNT_MORTAR_1F_INSIDE - warp_def 33, 13, 4, MOUNT_MORTAR_1F_INSIDE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 + db 0, 0 ; filler + + db 9 ; warp events + warp_event 3, 33, 3, ROUTE_42 + warp_event 17, 33, 4, ROUTE_42 + warp_event 37, 33, 5, ROUTE_42 + warp_event 17, 5, 1, MOUNT_MORTAR_2F_INSIDE + warp_event 11, 21, 1, MOUNT_MORTAR_1F_INSIDE + warp_event 29, 21, 2, MOUNT_MORTAR_1F_INSIDE + warp_event 17, 29, 2, MOUNT_MORTAR_B1F + warp_event 7, 13, 3, MOUNT_MORTAR_1F_INSIDE + warp_event 33, 13, 4, MOUNT_MORTAR_1F_INSIDE + + db 0 ; coord events + + db 1 ; bg events bg_event 25, 22, BGEVENT_ITEM, MountMortar1FOutsideHiddenHyperPotion -.ObjectEvents: - db 2 + db 2 ; object events object_event 13, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER object_event 31, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 66120731f..2496eaa2c 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -8,14 +8,12 @@ const_value set 2 const MOUNTMORTAR2FINSIDE_SUPER_NERD MountMortar2FInside_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerSupernerdHugh: - trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script + trainer SUPER_NERD, HUGH, EVENT_BEAT_SUPER_NERD_HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script .Script: end_if_just_battled @@ -44,7 +42,7 @@ MountMortar2FInsideEscapeRope: itemball ESCAPE_ROPE MountMortar2FInsideHiddenFullRestore: - hiddenitem EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE SupernerdHughSeenText: text "Yo! MARKUS!" @@ -67,23 +65,18 @@ SupernerdHughAfterBattleText: done MountMortar2FInside_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 17, 33, 4, MOUNT_MORTAR_1F_OUTSIDE - warp_def 3, 5, 6, MOUNT_MORTAR_1F_INSIDE + db 2 ; warp events + warp_event 17, 33, 4, MOUNT_MORTAR_1F_OUTSIDE + warp_event 3, 5, 6, MOUNT_MORTAR_1F_INSIDE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 24, 8, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore -.ObjectEvents: - db 7 + db 7 ; object events object_event 28, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION object_event 2, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY object_event 19, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 7d798c22e..47cea6826 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -8,11 +8,9 @@ const_value set 2 const MOUNTMORTARB1F_POKE_BALL5 MountMortarB1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BlackBeltScript_0x7e1f6: faceplayer @@ -72,7 +70,7 @@ MountMortarB1FPPUp: itemball PP_UP MountMortarB1FHiddenMaxRevive: - hiddenitem EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE + hiddenitem MAX_REVIVE, EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE UnknownText_0x7e24d: text "Hey!" @@ -135,23 +133,18 @@ UnknownText_0x7e3df: done MountMortarB1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 3, 5, MOUNT_MORTAR_1F_INSIDE - warp_def 19, 29, 7, MOUNT_MORTAR_1F_OUTSIDE + db 2 ; warp events + warp_event 3, 3, 5, MOUNT_MORTAR_1F_INSIDE + warp_event 19, 29, 7, MOUNT_MORTAR_1F_OUTSIDE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 4, 6, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive -.ObjectEvents: - db 7 + db 7 ; object events object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS object_event 9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1 diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 0635be308..743acf816 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -2,16 +2,14 @@ const_value set 2 const MOVEDELETERSHOUSE_SUPER_NERD MoveDeletersHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MoveDeleter: faceplayer opentext - special Special_MoveDeletion + special MoveDeletion waitbutton closetext end @@ -20,22 +18,17 @@ MoveDeletersHouseBookshelf: jumpstd difficultbookshelf MoveDeletersHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 6, BLACKTHORN_CITY - warp_def 3, 7, 6, BLACKTHORN_CITY + db 2 ; warp events + warp_event 2, 7, 6, BLACKTHORN_CITY + warp_event 3, 7, 6, BLACKTHORN_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, MoveDeletersHouseBookshelf bg_event 1, 1, BGEVENT_READ, MoveDeletersHouseBookshelf -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 403134bae..881487ff6 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -6,11 +6,9 @@ const_value set 2 const MRFUJISHOUSE_PIDGEY MrFujisHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MrFujisHouseSuperNerdScript: jumptextfaceplayer MrFujisHouseSuperNerdText @@ -80,24 +78,19 @@ MrFujisPidgeyText: done MrFujisHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, LAVENDER_TOWN - warp_def 3, 7, 2, LAVENDER_TOWN + db 2 ; warp events + warp_event 2, 7, 2, LAVENDER_TOWN + warp_event 3, 7, 2, LAVENDER_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, MrFujisHouseBookshelf bg_event 1, 1, BGEVENT_READ, MrFujisHouseBookshelf -.ObjectEvents: - db 5 + db 5 ; object events object_event 4, 1, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1 object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1 object_event 7, 4, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 8ac7d0a09..4a4249cc5 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -3,13 +3,11 @@ const_value set 2 const MRPOKEMONSHOUSE_OAK MrPokemonsHouse_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .MeetMrPokemon scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .MeetMrPokemon: priorityjump .MrPokemonEvent @@ -110,21 +108,21 @@ MrPokemonsHouse_OakScript: writetext MrPokemonsHouse_MrPokemonHealText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes playmusic MUSIC_HEAL - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty pause 60 - special Special_FadeInQuickly + special FadeInQuickly special RestartMapMusic opentext writetext MrPokemonText_ImDependingOnYou waitbutton closetext setevent EVENT_RIVAL_NEW_BARK_TOWN - setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR - clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR + setevent EVENT_PLAYERS_HOUSE_1F_NEIGHBOR + clearevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR setscene 1 setmapscene CHERRYGROVE_CITY, 1 setmapscene ELMS_LAB, 3 @@ -373,26 +371,21 @@ MrPokemonsHouse_StrangeCoinsText: done MrPokemonsHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, ROUTE_30 - warp_def 3, 7, 2, ROUTE_30 + db 2 ; warp events + warp_event 2, 7, 2, ROUTE_30 + warp_event 3, 7, 2, ROUTE_30 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 5 + db 5 ; bg events bg_event 0, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script bg_event 1, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script bg_event 6, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script bg_event 7, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script bg_event 6, 4, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script -.ObjectEvents: - db 2 + db 2 ; object events object_event 3, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1 object_event 6, 5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 042b922d0..b79c08b6e 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const MRPSYCHICSHOUSE_FISHING_GURU MrPsychicsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MrPsychic: faceplayer @@ -48,22 +46,17 @@ MrPsychicText2: done MrPsychicsHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, SAFFRON_CITY - warp_def 3, 7, 5, SAFFRON_CITY + db 2 ; warp events + warp_event 2, 7, 5, SAFFRON_CITY + warp_event 3, 7, 5, SAFFRON_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, MrPsychicsHouseBookshelf bg_event 1, 1, BGEVENT_READ, MrPsychicsHouseBookshelf -.ObjectEvents: - db 1 + db 1 ; object events object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 9429c5845..7ec334903 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -15,11 +15,9 @@ const_value set 2 const NATIONALPARK_POKE_BALL2 NationalPark_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NationalParkLassScript: jumptextfaceplayer NationalParkLassText @@ -72,7 +70,7 @@ GameboyKidScript_0x5c037: end TrainerSchoolboyJack1: - trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, .Script + trainer SCHOOLBOY, JACK1, EVENT_BEAT_SCHOOLBOY_JACK, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK @@ -189,7 +187,7 @@ UnknownScript_0x5c114: end TrainerPokefanmWilliam: - trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, .Script + trainer POKEFANM, WILLIAM, EVENT_BEAT_POKEFANM_WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, .Script .Script: end_if_just_battled @@ -200,7 +198,7 @@ TrainerPokefanmWilliam: end TrainerPokefanfBeverly1: - trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, .Script + trainer POKEFANF, BEVERLY1, EVENT_BEAT_POKEFANF_BEVERLY, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY @@ -279,7 +277,7 @@ UnknownScript_0x5c1ab: end TrainerLassKrise: - trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, .Script + trainer LASS, KRISE, EVENT_BEAT_LASS_KRISE, LassKriseSeenText, LassKriseBeatenText, 0, .Script .Script: end_if_just_battled @@ -305,7 +303,7 @@ NationalParkTMDig: itemball TM_DIG NationalParkHiddenFullHeal: - hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL NationalParkLassText: text "Look! Check out my" @@ -514,28 +512,23 @@ UnknownText_0x5c7c6: done NationalPark_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE - warp_def 33, 19, 2, ROUTE_36_NATIONAL_PARK_GATE - warp_def 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE - warp_def 11, 47, 2, ROUTE_35_NATIONAL_PARK_GATE + db 4 ; warp events + warp_event 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE + warp_event 33, 19, 2, ROUTE_36_NATIONAL_PARK_GATE + warp_event 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE + warp_event 11, 47, 2, ROUTE_35_NATIONAL_PARK_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 14, 44, BGEVENT_READ, MapNationalParkSignpost0Script bg_event 27, 31, BGEVENT_READ, MapNationalParkSignpost1Script bg_event 6, 47, BGEVENT_ITEM, NationalParkHiddenFullHeal bg_event 12, 4, BGEVENT_READ, MapNationalParkSignpost3Script -.ObjectEvents: - db 14 + db 14 ; object events object_event 15, 24, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkLassScript, -1 object_event 14, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1 object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1 diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index c69e55854..d9a431590 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -13,11 +13,9 @@ const_value set 2 const NATIONALPARKBUGCONTEST_POKE_BALL2 NationalParkBugContest_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks YoungsterScript_0x5c8ec: faceplayer @@ -115,7 +113,7 @@ NationalParkBugContestTMDig: itemball TM_DIG NationalParkBugContestHiddenFullHeal: - hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL UnknownText_0x5c94c: text "DON: I'm going to" @@ -221,28 +219,23 @@ UnknownText_0x5cc1d: done NationalParkBugContest_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE - warp_def 33, 19, 1, ROUTE_36_NATIONAL_PARK_GATE - warp_def 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE - warp_def 11, 47, 1, ROUTE_35_NATIONAL_PARK_GATE + db 4 ; warp events + warp_event 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE + warp_event 33, 19, 1, ROUTE_36_NATIONAL_PARK_GATE + warp_event 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE + warp_event 11, 47, 1, ROUTE_35_NATIONAL_PARK_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 14, 44, BGEVENT_READ, MapNationalParkBugContestSignpost0Script bg_event 27, 31, BGEVENT_READ, MapNationalParkBugContestSignpost1Script bg_event 6, 47, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal bg_event 12, 4, BGEVENT_READ, MapNationalParkBugContestSignpost3Script -.ObjectEvents: - db 12 + db 12 ; object events object_event 19, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A object_event 28, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index f4cad71eb..985f7e4cf 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -4,13 +4,11 @@ const_value set 2 const NEWBARKTOWN_SILVER NewBarkTown_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -282,30 +280,25 @@ ElmsHouseSignText: done NewBarkTown_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 6, 3, 1, ELMS_LAB - warp_def 13, 5, 1, KRISS_HOUSE_1F - warp_def 3, 11, 1, KRISS_NEIGHBORS_HOUSE - warp_def 11, 13, 1, ELMS_HOUSE - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 6, 3, 1, ELMS_LAB + warp_event 13, 5, 1, PLAYERS_HOUSE_1F + warp_event 3, 11, 1, PLAYERS_NEIGHBORS_HOUSE + warp_event 11, 13, 1, ELMS_HOUSE + + db 2 ; coord events coord_event 1, 8, 0, NewBarkTown_TeacherStopsYouScene1 coord_event 1, 9, 0, NewBarkTown_TeacherStopsYouScene2 -.BGEvents: - db 4 + db 4 ; bg events bg_event 8, 8, BGEVENT_READ, NewBarkTownSign bg_event 11, 5, BGEVENT_READ, MapNewBarkTownSignpost1Script bg_event 3, 3, BGEVENT_READ, MapNewBarkTownSignpost2Script bg_event 9, 13, BGEVENT_READ, MapNewBarkTownSignpost3Script -.ObjectEvents: - db 3 + db 3 ; object events object_event 6, 8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1 object_event 12, 9, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1 object_event 3, 2, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index d78641c28..bf505711e 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -5,11 +5,9 @@ const_value set 2 const OAKSLAB_SCIENTIST3 OaksLab_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -33,7 +31,7 @@ Oak: .CheckPokedex: writetext OakLabDexCheckText waitbutton - special Special_ProfOaksPCBoot + special ProfOaksPCBoot writetext OakLabGoodbyeText waitbutton closetext @@ -257,19 +255,15 @@ OaksLabPCText: done OaksLab_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 11, 3, PALLET_TOWN - warp_def 5, 11, 3, PALLET_TOWN + db 2 ; warp events + warp_event 4, 11, 3, PALLET_TOWN + warp_event 5, 11, 3, PALLET_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 16 + db 16 ; bg events bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf @@ -287,8 +281,7 @@ OaksLab_MapEvents: bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan bg_event 0, 1, BGEVENT_READ, OaksLabPC -.ObjectEvents: - db 4 + db 4 ; object events object_event 4, 2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1 object_event 1, 8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1 object_event 8, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 269357d21..f651f0e97 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -4,11 +4,9 @@ const_value set 2 const OLIVINECAFE_SAILOR2 OlivineCafe_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SailorScript_0x9c8c1: faceplayer @@ -79,22 +77,17 @@ OlivineCafeSailorText: done OlivineCafe_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 7, OLIVINE_CITY - warp_def 3, 7, 7, OLIVINE_CITY + db 2 ; warp events + warp_event 2, 7, 7, OLIVINE_CITY + warp_event 3, 7, 7, OLIVINE_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1 object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1 object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index e2fd0c4c7..8c418d99d 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -5,13 +5,11 @@ const_value set 2 const OLIVINECITY_OLIVINE_RIVAL OlivineCity_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -27,7 +25,7 @@ OlivineCity_MapScripts: UnknownScript_0x1a8833: spriteface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_ENTER_DOOR appear OLIVINECITY_OLIVINE_RIVAL @@ -45,13 +43,13 @@ UnknownScript_0x1a8833: disappear OLIVINECITY_OLIVINE_RIVAL special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX end UnknownScript_0x1a886b: spriteface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_ENTER_DOOR appear OLIVINECITY_OLIVINE_RIVAL @@ -69,7 +67,7 @@ UnknownScript_0x1a886b: setscene 1 special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX end OlivineCitySailor1Script: @@ -288,30 +286,26 @@ UnknownText_0x1a8cba: done OlivineCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 11 - warp_def 13, 21, 1, OLIVINE_POKECENTER_1F - warp_def 10, 11, 1, OLIVINE_GYM - warp_def 25, 11, 1, OLIVINE_TIMS_HOUSE - warp_def 0, 0, 1, OLIVINE_HOUSE_BETA - warp_def 29, 11, 1, OLIVINE_PUNISHMENT_SPEECH_HOUSE - warp_def 13, 15, 1, OLIVINE_GOOD_ROD_HOUSE - warp_def 7, 21, 1, OLIVINE_CAFE - warp_def 19, 17, 2, OLIVINE_MART - warp_def 29, 27, 1, OLIVINE_LIGHTHOUSE_1F - warp_def 19, 27, 1, OLIVINE_PORT_PASSAGE - warp_def 20, 27, 2, OLIVINE_PORT_PASSAGE - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 11 ; warp events + warp_event 13, 21, 1, OLIVINE_POKECENTER_1F + warp_event 10, 11, 1, OLIVINE_GYM + warp_event 25, 11, 1, OLIVINE_TIMS_HOUSE + warp_event 0, 0, 1, OLIVINE_HOUSE_BETA + warp_event 29, 11, 1, OLIVINE_PUNISHMENT_SPEECH_HOUSE + warp_event 13, 15, 1, OLIVINE_GOOD_ROD_HOUSE + warp_event 7, 21, 1, OLIVINE_CAFE + warp_event 19, 17, 2, OLIVINE_MART + warp_event 29, 27, 1, OLIVINE_LIGHTHOUSE_1F + warp_event 19, 27, 1, OLIVINE_PORT_PASSAGE + warp_event 20, 27, 2, OLIVINE_PORT_PASSAGE + + db 2 ; coord events coord_event 13, 12, 0, UnknownScript_0x1a8833 coord_event 13, 13, 0, UnknownScript_0x1a886b -.BGEvents: - db 7 + db 7 ; bg events bg_event 17, 11, BGEVENT_READ, OlivineCitySign bg_event 20, 24, BGEVENT_READ, OlivineCityPortSign bg_event 7, 11, BGEVENT_READ, OlivineGymSign @@ -320,8 +314,7 @@ OlivineCity_MapEvents: bg_event 14, 21, BGEVENT_READ, OlivineCityPokecenterSign bg_event 20, 17, BGEVENT_READ, OlivineCityMartSign -.ObjectEvents: - db 4 + db 4 ; object events object_event 26, 27, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor1Script, -1 object_event 20, 13, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1 object_event 17, 21, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor2Script, -1 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 3f7c3eced..8bee6f363 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const OLIVINEGOODRODHOUSE_FISHING_GURU OlivineGoodRodHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GoodRodGuru: faceplayer @@ -83,20 +81,15 @@ HaveGoodRodText: done OlivineGoodRodHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 6, OLIVINE_CITY - warp_def 3, 7, 6, OLIVINE_CITY + db 2 ; warp events + warp_event 2, 7, 6, OLIVINE_CITY + warp_event 3, 7, 6, OLIVINE_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 40e2bd711..e8ab40213 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -3,11 +3,9 @@ const_value set 2 const OLIVINEGYM_GYM_GUY OlivineGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks JasmineScript_0x9c12f: faceplayer @@ -198,23 +196,18 @@ OlivineGymGuyPreText: done OlivineGym_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 15, 2, OLIVINE_CITY - warp_def 5, 15, 2, OLIVINE_CITY + db 2 ; warp events + warp_event 4, 15, 2, OLIVINE_CITY + warp_event 5, 15, 2, OLIVINE_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 3, 13, BGEVENT_READ, OlivineGymStatue bg_event 6, 13, BGEVENT_READ, OlivineGymStatue -.ObjectEvents: - db 2 + db 2 ; object events object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 336469c21..3297736e6 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -3,11 +3,9 @@ const_value set 2 const OLIVINEHOUSEBETA_RHYDON OlivineHouseBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks OlivineHouseBetaTeacherScript: jumptextfaceplayer OlivineHouseBetaTeacherText @@ -40,23 +38,18 @@ UnknownText_0x9c5f0: done OlivineHouseBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, OLIVINE_CITY - warp_def 3, 7, 4, OLIVINE_CITY + db 2 ; warp events + warp_event 2, 7, 4, OLIVINE_CITY + warp_event 3, 7, 4, OLIVINE_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, OlivineHouseBetaBookshelf1 bg_event 1, 1, BGEVENT_READ, OlivineHouseBetaBookshelf2 -.ObjectEvents: - db 2 + db 2 ; object events object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1 object_event 6, 4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 769bf13da..bc09e9ef4 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -3,11 +3,9 @@ const_value set 2 const OLIVINELIGHTHOUSE1F_POKEFAN_F OlivineLighthouse1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks OlivineLighthouse1FSailorScript: jumptextfaceplayer OlivineLighthouse1FSailorText @@ -37,24 +35,19 @@ OlivineLighthouse1FPokefanFText: done OlivineLighthouse1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 5 - warp_def 10, 17, 9, OLIVINE_CITY - warp_def 11, 17, 9, OLIVINE_CITY - warp_def 3, 11, 1, OLIVINE_LIGHTHOUSE_2F - warp_def 16, 13, 3, OLIVINE_LIGHTHOUSE_2F - warp_def 17, 13, 4, OLIVINE_LIGHTHOUSE_2F + db 5 ; warp events + warp_event 10, 17, 9, OLIVINE_CITY + warp_event 11, 17, 9, OLIVINE_CITY + warp_event 3, 11, 1, OLIVINE_LIGHTHOUSE_2F + warp_event 16, 13, 3, OLIVINE_LIGHTHOUSE_2F + warp_event 17, 13, 4, OLIVINE_LIGHTHOUSE_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 8, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1 object_event 16, 9, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index d2fd6427f..2bc489c57 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -3,14 +3,12 @@ const_value set 2 const OLIVINELIGHTHOUSE2F_GENTLEMAN OlivineLighthouse2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerGentlemanAlfred: - trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script + trainer GENTLEMAN, ALFRED, EVENT_BEAT_GENTLEMAN_ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script .Script: end_if_just_battled @@ -21,7 +19,7 @@ TrainerGentlemanAlfred: end TrainerSailorHuey1: - trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, 0, .Script + trainer SAILOR, HUEY1, EVENT_BEAT_SAILOR_HUEY, SailorHuey1SeenText, SailorHuey1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_SAILOR_HUEY @@ -205,25 +203,20 @@ UnknownText_0x5b1b6: done OlivineLighthouse2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 3, 11, 3, OLIVINE_LIGHTHOUSE_1F - warp_def 5, 3, 2, OLIVINE_LIGHTHOUSE_3F - warp_def 16, 13, 4, OLIVINE_LIGHTHOUSE_1F - warp_def 17, 13, 5, OLIVINE_LIGHTHOUSE_1F - warp_def 16, 11, 4, OLIVINE_LIGHTHOUSE_3F - warp_def 17, 11, 5, OLIVINE_LIGHTHOUSE_3F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 3, 11, 3, OLIVINE_LIGHTHOUSE_1F + warp_event 5, 3, 2, OLIVINE_LIGHTHOUSE_3F + warp_event 16, 13, 4, OLIVINE_LIGHTHOUSE_1F + warp_event 17, 13, 5, OLIVINE_LIGHTHOUSE_1F + warp_event 16, 11, 4, OLIVINE_LIGHTHOUSE_3F + warp_event 17, 11, 5, OLIVINE_LIGHTHOUSE_3F + + db 0 ; coord events + + db 0 ; bg events + + db 2 ; object events object_event 9, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey1, -1 object_event 17, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 2cd0dc64c..84311e40e 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -5,14 +5,12 @@ const_value set 2 const OLIVINELIGHTHOUSE3F_POKE_BALL OlivineLighthouse3F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperTheo: - trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, BirdKeeperTheoSeenText, BirdKeeperTheoBeatenText, 0, .Script + trainer BIRD_KEEPER, THEO, EVENT_BEAT_BIRD_KEEPER_THEO, BirdKeeperTheoSeenText, BirdKeeperTheoBeatenText, 0, .Script .Script: end_if_just_battled @@ -23,7 +21,7 @@ TrainerBirdKeeperTheo: end TrainerGentlemanPreston: - trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, .Script + trainer GENTLEMAN, PRESTON, EVENT_BEAT_GENTLEMAN_PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, .Script .Script: end_if_just_battled @@ -34,7 +32,7 @@ TrainerGentlemanPreston: end TrainerSailorTerrell: - trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, .Script + trainer SAILOR, TERRELL, EVENT_BEAT_SAILOR_TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, .Script .Script: end_if_just_battled @@ -113,29 +111,24 @@ GentlemanPrestonAfterBattleText: done OlivineLighthouse3F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 13, 3, 1, OLIVINE_LIGHTHOUSE_4F - warp_def 5, 3, 2, OLIVINE_LIGHTHOUSE_2F - warp_def 9, 5, 4, OLIVINE_LIGHTHOUSE_4F - warp_def 16, 11, 5, OLIVINE_LIGHTHOUSE_2F - warp_def 17, 11, 6, OLIVINE_LIGHTHOUSE_2F - warp_def 16, 9, 5, OLIVINE_LIGHTHOUSE_4F - warp_def 17, 9, 6, OLIVINE_LIGHTHOUSE_4F - warp_def 8, 3, 7, OLIVINE_LIGHTHOUSE_4F - warp_def 9, 3, 8, OLIVINE_LIGHTHOUSE_4F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 + db 0, 0 ; filler + + db 9 ; warp events + warp_event 13, 3, 1, OLIVINE_LIGHTHOUSE_4F + warp_event 5, 3, 2, OLIVINE_LIGHTHOUSE_2F + warp_event 9, 5, 4, OLIVINE_LIGHTHOUSE_4F + warp_event 16, 11, 5, OLIVINE_LIGHTHOUSE_2F + warp_event 17, 11, 6, OLIVINE_LIGHTHOUSE_2F + warp_event 16, 9, 5, OLIVINE_LIGHTHOUSE_4F + warp_event 17, 9, 6, OLIVINE_LIGHTHOUSE_4F + warp_event 8, 3, 7, OLIVINE_LIGHTHOUSE_4F + warp_event 9, 3, 8, OLIVINE_LIGHTHOUSE_4F + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events object_event 9, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1 object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 object_event 3, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1 diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 7580d3499..21f59b17a 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -3,14 +3,12 @@ const_value set 2 const OLIVINELIGHTHOUSE4F_LASS OlivineLighthouse4F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerLassConnie: - trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script + trainer LASS, CONNIE1, EVENT_BEAT_LASS_CONNIE, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script .Script: end_if_just_battled @@ -21,7 +19,7 @@ TrainerLassConnie: end TrainerSailorKent: - trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, .Script + trainer SAILOR, KENT, EVENT_BEAT_SAILOR_KENT, SailorKentSeenText, SailorKentBeatenText, 0, .Script .Script: end_if_just_battled @@ -82,29 +80,24 @@ LassConnie1AfterBattleText: done OlivineLighthouse4F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 10 - warp_def 13, 3, 1, OLIVINE_LIGHTHOUSE_3F - warp_def 3, 5, 2, OLIVINE_LIGHTHOUSE_5F - warp_def 9, 7, 3, OLIVINE_LIGHTHOUSE_5F - warp_def 9, 5, 3, OLIVINE_LIGHTHOUSE_3F - warp_def 16, 9, 6, OLIVINE_LIGHTHOUSE_3F - warp_def 17, 9, 7, OLIVINE_LIGHTHOUSE_3F - warp_def 8, 3, 8, OLIVINE_LIGHTHOUSE_3F - warp_def 9, 3, 9, OLIVINE_LIGHTHOUSE_3F - warp_def 16, 7, 4, OLIVINE_LIGHTHOUSE_5F - warp_def 17, 7, 5, OLIVINE_LIGHTHOUSE_5F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 + db 0, 0 ; filler + + db 10 ; warp events + warp_event 13, 3, 1, OLIVINE_LIGHTHOUSE_3F + warp_event 3, 5, 2, OLIVINE_LIGHTHOUSE_5F + warp_event 9, 7, 3, OLIVINE_LIGHTHOUSE_5F + warp_event 9, 5, 3, OLIVINE_LIGHTHOUSE_3F + warp_event 16, 9, 6, OLIVINE_LIGHTHOUSE_3F + warp_event 17, 9, 7, OLIVINE_LIGHTHOUSE_3F + warp_event 8, 3, 8, OLIVINE_LIGHTHOUSE_3F + warp_event 9, 3, 9, OLIVINE_LIGHTHOUSE_3F + warp_event 16, 7, 4, OLIVINE_LIGHTHOUSE_5F + warp_event 17, 7, 5, OLIVINE_LIGHTHOUSE_5F + + db 0 ; coord events + + db 0 ; bg events + + db 2 ; object events object_event 7, 14, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1 object_event 11, 2, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index ccee7f0c7..62767ab5d 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -6,14 +6,12 @@ const_value set 2 const OLIVINELIGHTHOUSE5F_POKE_BALL3 OlivineLighthouse5F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperDenis: - trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, BirdKeeperDenisSeenText, BirdKeeperDenisBeatenText, 0, .Script + trainer BIRD_KEEPER, DENIS, EVENT_BEAT_BIRD_KEEPER_DENIS, BirdKeeperDenisSeenText, BirdKeeperDenisBeatenText, 0, .Script .Script: end_if_just_battled @@ -24,7 +22,7 @@ TrainerBirdKeeperDenis: end TrainerSailorErnest: - trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, .Script + trainer SAILOR, ERNEST, EVENT_BEAT_SAILOR_ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, .Script .Script: end_if_just_battled @@ -44,7 +42,7 @@ OlivineLighthouse5FTMSwagger: itemball TM_SWAGGER OlivineLighthouse5FHiddenHyperPotion: - hiddenitem EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION SailorErnestSeenText: text "I wanted to battle" @@ -91,28 +89,23 @@ BirdKeeperDenisAfterBattleText: done OlivineLighthouse5F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 7 - warp_def 9, 15, 1, OLIVINE_LIGHTHOUSE_6F - warp_def 3, 5, 2, OLIVINE_LIGHTHOUSE_4F - warp_def 9, 7, 3, OLIVINE_LIGHTHOUSE_4F - warp_def 16, 7, 9, OLIVINE_LIGHTHOUSE_4F - warp_def 17, 7, 10, OLIVINE_LIGHTHOUSE_4F - warp_def 16, 5, 2, OLIVINE_LIGHTHOUSE_6F - warp_def 17, 5, 3, OLIVINE_LIGHTHOUSE_6F - -.CoordEvents: - db 0 - -.BGEvents: - db 1 + db 0, 0 ; filler + + db 7 ; warp events + warp_event 9, 15, 1, OLIVINE_LIGHTHOUSE_6F + warp_event 3, 5, 2, OLIVINE_LIGHTHOUSE_4F + warp_event 9, 7, 3, OLIVINE_LIGHTHOUSE_4F + warp_event 16, 7, 9, OLIVINE_LIGHTHOUSE_4F + warp_event 17, 7, 10, OLIVINE_LIGHTHOUSE_4F + warp_event 16, 5, 2, OLIVINE_LIGHTHOUSE_6F + warp_event 17, 5, 3, OLIVINE_LIGHTHOUSE_6F + + db 0 ; coord events + + db 1 ; bg events bg_event 3, 13, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion -.ObjectEvents: - db 5 + db 5 ; object events object_event 8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1 object_event 8, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1 object_event 15, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index d036dc56f..109c84cca 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -4,11 +4,9 @@ const_value set 2 const OLIVINELIGHTHOUSE6F_POKE_BALL OlivineLighthouse6F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks JasmineScript_0x60b91: faceplayer @@ -47,9 +45,9 @@ UnknownScript_0x60bab: closetext special RestartMapMusic cry AMPHAROS - special Special_FadeOutPalettes + special FadeOutPalettes pause 10 - special Special_FadeInPalettes + special FadeInPalettes opentext writetext UnknownText_0x60f3d waitbutton @@ -109,7 +107,7 @@ MonsterScript_0x60c3a: iftrue UnknownScript_0x60c51 writetext UnknownText_0x60f03 writebyte AMPHAROS - special Special_PlaySlowCry + special PlaySlowCry buttonsound writetext UnknownText_0x60f19 waitbutton @@ -121,10 +119,10 @@ UnknownScript_0x60c51: cry AMPHAROS waitbutton closetext - special Special_FadeOutPalettes - special Special_FadeInPalettes - special Special_FadeOutPalettes - special Special_FadeInPalettes + special FadeOutPalettes + special FadeInPalettes + special FadeOutPalettes + special FadeInPalettes end OlivineLighthouse6FSuperPotion: @@ -258,23 +256,18 @@ UnknownText_0x60f3d: done OlivineLighthouse6F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 9, 15, 1, OLIVINE_LIGHTHOUSE_5F - warp_def 16, 5, 6, OLIVINE_LIGHTHOUSE_5F - warp_def 17, 5, 7, OLIVINE_LIGHTHOUSE_5F + db 3 ; warp events + warp_event 9, 15, 1, OLIVINE_LIGHTHOUSE_5F + warp_event 16, 5, 6, OLIVINE_LIGHTHOUSE_5F + warp_event 17, 5, 7, OLIVINE_LIGHTHOUSE_5F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1 object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index ea980fe3c..ff4ed669a 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -4,11 +4,9 @@ const_value set 2 const OLIVINEMART_LASS OlivineMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x9cac7: opentext @@ -46,22 +44,17 @@ OlivineMartLassText: done OlivineMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 8, OLIVINE_CITY - warp_def 3, 7, 8, OLIVINE_CITY + db 2 ; warp events + warp_event 2, 7, 8, OLIVINE_CITY + warp_event 3, 7, 8, OLIVINE_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1 object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1 object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1 diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index 3345636ff..16a774912 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 const OLIVINEPOKECENTER1F_TEACHER OlivinePokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x9c002: jumpstd pokecenternurse @@ -48,23 +46,18 @@ OlivinePokecenter1FTeacherText: done OlivinePokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 1, OLIVINE_CITY - warp_def 4, 7, 1, OLIVINE_CITY - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 1, OLIVINE_CITY + warp_event 4, 7, 1, OLIVINE_CITY + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9c002, -1 object_event 8, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1 object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 0b9b8882a..ce949a4ba 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -8,13 +8,11 @@ const_value set 2 const OLIVINEPORT_COOLTRAINER_F OlivinePort_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .LeaveFastShip -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -27,14 +25,14 @@ OlivinePort_MapScripts: applymovement PLAYER, MovementData_0x74a32 appear OLIVINEPORT_SAILOR1 setscene 0 - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 blackoutmod OLIVINE_CITY end SailorScript_0x748c0: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74919 writetext UnknownText_0x74a55 waitbutton @@ -46,7 +44,7 @@ SailorScript_0x748c0: waitsfx applymovement PLAYER, MovementData_0x74a30 playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7490a @@ -76,9 +74,9 @@ UnknownScript_0x74919: UnknownScript_0x7491f: spriteface OLIVINEPORT_SAILOR3, RIGHT - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x7498b - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue UnknownScript_0x7498b spriteface PLAYER, LEFT opentext @@ -101,7 +99,7 @@ UnknownScript_0x7494e: writetext UnknownText_0x74b11 waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 applymovement PLAYER, MovementData_0x74a37 jump SailorScript_0x748c0 @@ -145,7 +143,7 @@ UnknownScript_0x74992: SailorScript_0x7499c: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74919 checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x749c0 @@ -166,7 +164,7 @@ UnknownScript_0x749c0: writetext UnknownText_0x74b11 waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 checkcode VAR_FACING if_equal RIGHT, UnknownScript_0x749e5 applymovement PLAYER, MovementData_0x74a3f @@ -234,7 +232,7 @@ CooltrainerFScript_0x74a22: end OlivinePortHiddenProtein: - hiddenitem EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN + hiddenitem PROTEIN, EVENT_OLIVINE_PORT_HIDDEN_PROTEIN MovementData_0x74a30: step DOWN @@ -385,24 +383,19 @@ OlivinePortSailorText: done OlivinePort_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 11, 7, 5, OLIVINE_PORT_PASSAGE - warp_def 7, 23, 1, FAST_SHIP_1F + db 2 ; warp events + warp_event 11, 7, 5, OLIVINE_PORT_PASSAGE + warp_event 7, 23, 1, FAST_SHIP_1F -.CoordEvents: - db 1 + db 1 ; coord events coord_event 7, 15, 0, UnknownScript_0x7491f -.BGEvents: - db 1 + db 1 ; bg events bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein -.ObjectEvents: - db 7 + db 7 ; object events object_event 7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY object_event 7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME object_event 6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 5b9615a73..2d8cf9e55 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -2,11 +2,9 @@ const_value set 2 const OLIVINEPORTPASSAGE_POKEFAN_M OlivinePortPassage_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks OlivinePortPassagePokefanMScript: jumptextfaceplayer OlivinePortPassagePokefanMText @@ -20,23 +18,18 @@ OlivinePortPassagePokefanMText: done OlivinePortPassage_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 5 - warp_def 15, 0, 10, OLIVINE_CITY - warp_def 16, 0, 11, OLIVINE_CITY - warp_def 15, 4, 4, OLIVINE_PORT_PASSAGE - warp_def 3, 2, 3, OLIVINE_PORT_PASSAGE - warp_def 3, 14, 1, OLIVINE_PORT + db 5 ; warp events + warp_event 15, 0, 10, OLIVINE_CITY + warp_event 16, 0, 11, OLIVINE_CITY + warp_event 15, 4, 4, OLIVINE_PORT_PASSAGE + warp_event 3, 2, 3, OLIVINE_PORT_PASSAGE + warp_event 3, 14, 1, OLIVINE_PORT -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 17, 1, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index ed0e86e32..6133c8f53 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 const OLIVINEPUNISHMENTSPEECHHOUSE_LASS OlivinePunishmentSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks OlivinePunishmentSpeechHouseDad: jumptextfaceplayer OlivinePunishmentSpeechHouseDadText @@ -40,23 +38,18 @@ OlivinePunishmentSpeechHouseDaughterText: done OlivinePunishmentSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, OLIVINE_CITY - warp_def 3, 7, 5, OLIVINE_CITY + db 2 ; warp events + warp_event 2, 7, 5, OLIVINE_CITY + warp_event 3, 7, 5, OLIVINE_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1 bg_event 1, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf2 -.ObjectEvents: - db 2 + db 2 ; object events object_event 1, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1 object_event 5, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1 diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 5d1b19263..0038bf6b9 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const OLIVINETIMSHOUSE_TIM OlivineTimsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Tim: faceplayer @@ -20,22 +18,17 @@ TimsHouseBookshelf: jumpstd magazinebookshelf OlivineTimsHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, OLIVINE_CITY - warp_def 3, 7, 3, OLIVINE_CITY + db 2 ; warp events + warp_event 2, 7, 3, OLIVINE_CITY + warp_event 3, 7, 3, OLIVINE_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, TimsHouseBookshelf bg_event 1, 1, BGEVENT_READ, TimsHouseBookshelf -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 8e18b6d08..80601f222 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -3,11 +3,9 @@ const_value set 2 const PALLETTOWN_FISHER PalletTown_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -70,26 +68,21 @@ BluesHouseSignText: done PalletTown_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 5, 5, 1, REDS_HOUSE_1F - warp_def 13, 5, 1, BLUES_HOUSE - warp_def 12, 11, 1, OAKS_LAB + db 3 ; warp events + warp_event 5, 5, 1, REDS_HOUSE_1F + warp_event 13, 5, 1, BLUES_HOUSE + warp_event 12, 11, 1, OAKS_LAB -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 7, 9, BGEVENT_READ, PalletTownSign bg_event 3, 5, BGEVENT_READ, RedsHouseSign bg_event 13, 13, BGEVENT_READ, OaksLabSign bg_event 11, 5, BGEVENT_READ, BluesHouseSign -.ObjectEvents: - db 2 + db 2 ; object events object_event 3, 8, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1 object_event 12, 14, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PalletTownFisherScript, -1 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index a4467ec4a..ab10bcdee 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -6,11 +6,9 @@ const_value set 2 const PEWTERCITY_FRUIT_TREE2 PewterCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -153,22 +151,18 @@ PewterCityWelcomeSignText: done PewterCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 29, 13, 1, PEWTER_NIDORAN_SPEECH_HOUSE - warp_def 16, 17, 1, PEWTER_GYM - warp_def 23, 17, 2, PEWTER_MART - warp_def 13, 25, 1, PEWTER_POKECENTER_1F - warp_def 7, 29, 1, PEWTER_SNOOZE_SPEECH_HOUSE - -.CoordEvents: - db 0 - -.BGEvents: - db 7 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 29, 13, 1, PEWTER_NIDORAN_SPEECH_HOUSE + warp_event 16, 17, 1, PEWTER_GYM + warp_event 23, 17, 2, PEWTER_MART + warp_event 13, 25, 1, PEWTER_POKECENTER_1F + warp_event 7, 29, 1, PEWTER_SNOOZE_SPEECH_HOUSE + + db 0 ; coord events + + db 7 ; bg events bg_event 25, 23, BGEVENT_READ, PewterCitySign bg_event 11, 17, BGEVENT_READ, PewterGymSign bg_event 15, 9, BGEVENT_READ, PewterMuseumSign @@ -177,8 +171,7 @@ PewterCity_MapEvents: bg_event 14, 25, BGEVENT_READ, PewterCityPokecenterSign bg_event 24, 17, BGEVENT_READ, PewterCityMartSign -.ObjectEvents: - db 5 + db 5 ; object events object_event 19, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1 object_event 14, 29, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1 object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 9e6395f13..0fa0bcc13 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -4,11 +4,9 @@ const_value set 2 const PEWTERGYM_GYM_GUY PewterGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BrockScript_0x1a2864: faceplayer @@ -41,7 +39,7 @@ BrockScript_0x1a2864: end TrainerCamperJerry: - trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script + trainer CAMPER, JERRY, EVENT_BEAT_CAMPER_JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script .Script: end_if_just_battled @@ -209,24 +207,19 @@ PewterGymGuyWinText: done PewterGym_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 13, 2, PEWTER_CITY - warp_def 5, 13, 2, PEWTER_CITY + db 2 ; warp events + warp_event 4, 13, 2, PEWTER_CITY + warp_event 5, 13, 2, PEWTER_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 2, 11, BGEVENT_READ, PewterGymStatue bg_event 7, 11, BGEVENT_READ, PewterGymStatue -.ObjectEvents: - db 3 + db 3 ; object events object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1 object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index cc5047d7c..f4aa7614e 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -4,11 +4,9 @@ const_value set 2 const PEWTERMART_SUPER_NERD PewterMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x1a2dcb: opentext @@ -46,22 +44,17 @@ PewterMartSuperNerdText: done PewterMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, PEWTER_CITY - warp_def 3, 7, 3, PEWTER_CITY + db 2 ; warp events + warp_event 2, 7, 3, PEWTER_CITY + warp_event 3, 7, 3, PEWTER_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1 object_event 9, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1 object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index b70294cef..4f4424e9e 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M PewterNidoranSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PewterNidoranSpeechHouseSuperNerdScript: jumptextfaceplayer PewterNidoranSpeechHouseSuperNerdText @@ -29,21 +27,16 @@ PewterNidoranText: done PewterNidoranSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, PEWTER_CITY - warp_def 3, 7, 1, PEWTER_CITY + db 2 ; warp events + warp_event 2, 7, 1, PEWTER_CITY + warp_event 3, 7, 1, PEWTER_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 3, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1 object_event 4, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1 diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index 25234385d..1948928b6 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -6,11 +6,9 @@ const_value set 2 const PEWTERPOKECENTER1F_CHRIS PewterPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x1a2ee7: jumpstd pokecenternurse @@ -68,23 +66,18 @@ PewterPokecenter1FBugCatcherText: done PewterPokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 4, PEWTER_CITY - warp_def 4, 7, 4, PEWTER_CITY - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 4, PEWTER_CITY + warp_event 4, 7, 4, PEWTER_CITY + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 5 + db 5 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1 object_event 8, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1 object_event 1, 3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1 diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm index 0e6e7b916..f01010f7a 100644 --- a/maps/PewterPokecenter2FBeta.asm +++ b/maps/PewterPokecenter2FBeta.asm @@ -1,23 +1,16 @@ PewterPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PewterPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, PEWTER_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, 3, PEWTER_POKECENTER_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 43e423cc4..4e76da519 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const PEWTERSNOOZESPEECHHOUSE_GRAMPS PewterSnoozeSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PewterSnoozeSpeechHouseGrampsScript: jumptextfaceplayer PewterSnoozeSpeechHouseGrampsText @@ -21,22 +19,17 @@ PewterSnoozeSpeechHouseGrampsText: done PewterSnoozeSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, PEWTER_CITY - warp_def 3, 7, 5, PEWTER_CITY + db 2 ; warp events + warp_event 2, 7, 5, PEWTER_CITY + warp_event 3, 7, 5, PEWTER_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf bg_event 1, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf -.ObjectEvents: - db 1 + db 1 ; object events object_event 5, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1 diff --git a/maps/KrissHouse1F.asm b/maps/PlayersHouse1F.asm index f94534332..5ac942d53 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -1,18 +1,16 @@ const_value set 2 - const KRISSHOUSE1F_MOM1 - const KRISSHOUSE1F_MOM2 - const KRISSHOUSE1F_MOM3 - const KRISSHOUSE1F_MOM4 - const KRISSHOUSE1F_POKEFAN_F - -KrissHouse1F_MapScripts: -.SceneScripts: - db 2 + const PLAYERSHOUSE1F_MOM1 + const PLAYERSHOUSE1F_MOM2 + const PLAYERSHOUSE1F_MOM3 + const PLAYERSHOUSE1F_MOM4 + const PLAYERSHOUSE1F_POKEFAN_F + +PlayersHouse1F_MapScripts: + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -21,19 +19,19 @@ KrissHouse1F_MapScripts: end UnknownScript_0x7a4d8: - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 UnknownScript_0x7a4db: playmusic MUSIC_MOM - showemote EMOTE_SHOCK, KRISSHOUSE1F_MOM1, 15 + showemote EMOTE_SHOCK, PLAYERSHOUSE1F_MOM1, 15 spriteface PLAYER, LEFT - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x7a4f2 - applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fc + applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fc jump UnknownScript_0x7a4f6 UnknownScript_0x7a4f2: - applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fe + applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fe UnknownScript_0x7a4f6: opentext writetext UnknownText_0x7a604 @@ -44,22 +42,22 @@ UnknownScript_0x7a4f6: setflag ENGINE_PHONE_CARD addcellnum PHONE_MOM setscene 1 - setevent EVENT_KRISS_HOUSE_MOM_1 - clearevent EVENT_KRISS_HOUSE_MOM_2 + setevent EVENT_PLAYERS_HOUSE_MOM_1 + clearevent EVENT_PLAYERS_HOUSE_MOM_2 writetext UnknownText_0x7a6bd buttonsound - special Special_SetDayOfWeek + special SetDayOfWeek UnknownScript_0x7a519: writetext UnknownText_0x7a742 yesorno iffalse UnknownScript_0x7a52a - special Special_InitialSetDSTFlag + special InitialSetDSTFlag yesorno iffalse UnknownScript_0x7a519 jump UnknownScript_0x7a531 UnknownScript_0x7a52a: - special Special_InitialClearDSTFlag + special InitialClearDSTFlag yesorno iffalse UnknownScript_0x7a519 UnknownScript_0x7a531: @@ -82,23 +80,23 @@ UnknownScript_0x7a549: writetext UnknownText_0x7a850 waitbutton closetext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x7a55d - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iffalse UnknownScript_0x7a564 jump UnknownScript_0x7a56b UnknownScript_0x7a55d: - applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a600 + applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a600 jump UnknownScript_0x7a56b UnknownScript_0x7a564: - applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a602 + applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a602 jump UnknownScript_0x7a56b UnknownScript_0x7a56b: special RestartMapMusic - spriteface KRISSHOUSE1F_MOM1, LEFT + spriteface PLAYERSHOUSE1F_MOM1, LEFT end UnknownScript_0x7a572: @@ -114,7 +112,7 @@ UnknownScript_0x7a57e: MomScript_0x7a582: faceplayer - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 checkscene iffalse UnknownScript_0x7a572 opentext @@ -147,7 +145,7 @@ UnknownScript_0x7a5b5: setevent EVENT_FIRST_TIME_BANKING_WITH_MOM UnknownScript_0x7a5b8: setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST - special Special_BankOfMom + special BankOfMom waitbutton closetext end @@ -181,7 +179,7 @@ NeighborScript: writetext NeighborText waitbutton closetext - spriteface KRISSHOUSE1F_POKEFAN_F, RIGHT + spriteface PLAYERSHOUSE1F_POKEFAN_F, RIGHT end TVScript: @@ -385,32 +383,27 @@ TVText: line "rolling too!" done -KrissHouse1F_MapEvents: - ; filler - db 0, 0 +PlayersHouse1F_MapEvents: + db 0, 0 ; filler -.Warps: - db 3 - warp_def 6, 7, 2, NEW_BARK_TOWN - warp_def 7, 7, 2, NEW_BARK_TOWN - warp_def 9, 0, 1, KRISS_HOUSE_2F + db 3 ; warp events + warp_event 6, 7, 2, NEW_BARK_TOWN + warp_event 7, 7, 2, NEW_BARK_TOWN + warp_event 9, 0, 1, PLAYERS_HOUSE_2F -.CoordEvents: - db 2 + db 2 ; coord events coord_event 8, 4, 0, UnknownScript_0x7a4d8 coord_event 9, 4, 0, UnknownScript_0x7a4db -.BGEvents: - db 4 + db 4 ; bg events bg_event 0, 1, BGEVENT_READ, StoveScript bg_event 1, 1, BGEVENT_READ, SinkScript bg_event 2, 1, BGEVENT_READ, FridgeScript bg_event 4, 1, BGEVENT_READ, TVScript -.ObjectEvents: - db 5 - object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 - object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR + db 5 ; object events + object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_1 + object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 + object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 + object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 + object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_PLAYERS_HOUSE_1F_NEIGHBOR diff --git a/maps/KrissHouse1F.blk b/maps/PlayersHouse1F.blk index 8b85e1535..8b85e1535 100644 --- a/maps/KrissHouse1F.blk +++ b/maps/PlayersHouse1F.blk diff --git a/maps/KrissHouse2F.asm b/maps/PlayersHouse2F.asm index dcd63af1e..210c4af79 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -1,15 +1,13 @@ const_value set 2 - const KRISSHOUSE2F_CONSOLE - const KRISSHOUSE2F_DOLL_1 - const KRISSHOUSE2F_DOLL_2 - const KRISSHOUSE2F_BIG_DOLL + const PLAYERSHOUSE2F_CONSOLE + const PLAYERSHOUSE2F_DOLL_1 + const PLAYERSHOUSE2F_DOLL_2 + const PLAYERSHOUSE2F_BIG_DOLL -KrissHouse2F_MapScripts: -.SceneScripts: - db 0 +PlayersHouse2F_MapScripts: + db 0 ; scene scripts -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_NEWMAP, .InitializeRoom callback MAPCALLBACK_TILES, .SetSpawn @@ -18,8 +16,8 @@ KrissHouse2F_MapScripts: end .InitializeRoom: - special Special_ToggleDecorationsVisibility - setevent EVENT_IN_YOUR_ROOM + special ToggleDecorationsVisibility + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8 checkevent EVENT_INITIALIZED_EVENTS iftrue .SkipInitialization jumpstd initializeevents @@ -29,44 +27,44 @@ KrissHouse2F_MapScripts: return .SetSpawn: - special Special_ToggleMaptileDecorations + special ToggleMaptileDecorations return db 0, 0, 0 ; filler -Doll1: +Doll1Script: describedecoration DECODESC_LEFT_DOLL -Doll2: +Doll2Script: describedecoration DECODESC_RIGHT_DOLL -BigDoll: +BigDollScript: describedecoration DECODESC_BIG_DOLL -GameConsole: +GameConsoleScript: describedecoration DECODESC_CONSOLE -KrissHousePoster: - conditional_event EVENT_KRISS_ROOM_POSTER, .Script +PlayersHousePosterScript: + conditional_event EVENT_PLAYERS_ROOM_POSTER, .Script .Script: describedecoration DECODESC_POSTER -KrissHouseRadio: +PlayersHouseRadioScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue .NormalRadio checkevent EVENT_LISTENED_TO_INITIAL_RADIO iftrue .AbbreviatedRadio playmusic MUSIC_POKEMON_TALK opentext - writetext KrisRadioText1 + writetext PlayersRadioText1 pause 45 - writetext KrisRadioText2 + writetext PlayersRadioText2 pause 45 - writetext KrisRadioText3 + writetext PlayersRadioText3 pause 45 musicfadeout MUSIC_NEW_BARK_TOWN, 16 - writetext KrisRadioText4 + writetext PlayersRadioText4 pause 45 closetext setevent EVENT_LISTENED_TO_INITIAL_RADIO @@ -77,17 +75,17 @@ KrissHouseRadio: .AbbreviatedRadio: opentext - writetext KrisRadioText4 + writetext PlayersRadioText4 pause 45 closetext end -KrissHouseBookshelf: +PlayersHouseBookshelfScript: jumpstd picturebookshelf -KrissHousePC: +PlayersHousePCScript: opentext - special Special_KrissHousePC + special PlayersHousePC iftrue .Warp closetext end @@ -95,47 +93,42 @@ KrissHousePC: warp NONE, 0, 0 end -KrisRadioText1: +PlayersRadioText1: text "PROF.OAK'S #MON" line "TALK! Please tune" cont "in next time!" done -KrisRadioText2: +PlayersRadioText2: text "#MON CHANNEL!" done -KrisRadioText3: +PlayersRadioText3: text "This is DJ MARY," line "your co-host!" done -KrisRadioText4: +PlayersRadioText4: text "#MON!" line "#MON CHANNEL…" done -KrissHouse2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def 7, 0, 3, KRISS_HOUSE_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 4 - bg_event 2, 1, BGEVENT_UP, KrissHousePC - bg_event 3, 1, BGEVENT_READ, KrissHouseRadio - bg_event 5, 1, BGEVENT_READ, KrissHouseBookshelf - bg_event 6, 0, BGEVENT_IFSET, KrissHousePoster - -.ObjectEvents: - db 4 - object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE - object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1 - object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2 - object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL +PlayersHouse2F_MapEvents: + db 0, 0 ; filler + + db 1 ; warp events + warp_event 7, 0, 3, PLAYERS_HOUSE_1F + + db 0 ; coord events + + db 4 ; bg events + bg_event 2, 1, BGEVENT_UP, PlayersHousePCScript + bg_event 3, 1, BGEVENT_READ, PlayersHouseRadioScript + bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelfScript + bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript + + db 4 ; object events + object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE + object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1 + object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2 + object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL diff --git a/maps/KrissHouse2F.blk b/maps/PlayersHouse2F.blk index 63d33c2f8..63d33c2f8 100644 --- a/maps/KrissHouse2F.blk +++ b/maps/PlayersHouse2F.blk diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm new file mode 100644 index 000000000..514802636 --- /dev/null +++ b/maps/PlayersNeighborsHouse.asm @@ -0,0 +1,115 @@ +const_value set 2 + const PLAYERSNEIGHBORSHOUSE_COOLTRAINER_F + const PLAYERSNEIGHBORSHOUSE_POKEFAN_F + +PlayersNeighborsHouse_MapScripts: + db 0 ; scene scripts + + db 0 ; callbacks + +PlayersNeighborsDaughterScript: + jumptextfaceplayer PlayersNeighborsDaughterText + +PlayersNeighborScript: + jumptextfaceplayer PlayersNeighborText + +PlayersNeighborsHouseBookshelfScript: + jumpstd magazinebookshelf + +PlayersNeighborsHouseRadioScript: + checkevent EVENT_GOT_A_POKEMON_FROM_ELM + iftrue .NormalRadio + checkevent EVENT_LISTENED_TO_INITIAL_RADIO + iftrue .AbbreviatedRadio + playmusic MUSIC_POKEMON_TALK + opentext + writetext PlayerNeighborRadioText1 + pause 45 + writetext PlayerNeighborRadioText2 + pause 45 + writetext PlayerNeighborRadioText3 + pause 45 + musicfadeout MUSIC_NEW_BARK_TOWN, 16 + writetext PlayerNeighborRadioText4 + pause 45 + closetext + setevent EVENT_LISTENED_TO_INITIAL_RADIO + end +.NormalRadio: + jumpstd radio1 +.AbbreviatedRadio: + opentext + writetext PlayerNeighborRadioText4 + pause 45 + closetext + end + +PlayersNeighborsDaughterText: + text "PIKACHU is an" + line "evolved #MON." + + para "I was amazed by" + line "PROF.ELM's find-" + cont "ings." + + para "He's so famous for" + line "his research on" + cont "#MON evolution." + + para "…sigh…" + + para "I wish I could be" + line "a researcher like" + cont "him…" + done + +PlayersNeighborText: + text "My daughter is" + line "adamant about" + + para "becoming PROF." + line "ELM's assistant." + + para "She really loves" + line "#MON!" + + para "But then, so do I!" + done + +PlayerNeighborRadioText1: + text "PROF.OAK'S #MON" + line "TALK! Please tune" + cont "in next time!" + done + +PlayerNeighborRadioText2: + text "#MON CHANNEL!" + done + +PlayerNeighborRadioText3: + text "This is DJ MARY," + line "your co-host!" + done + +PlayerNeighborRadioText4: + text "#MON!" + line "#MON CHANNEL…" + done + +PlayersNeighborsHouse_MapEvents: + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, 3, NEW_BARK_TOWN + warp_event 3, 7, 3, NEW_BARK_TOWN + + db 0 ; coord events + + db 3 ; bg events + bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript + bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript + bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadioScript + + db 2 ; object events + object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughterScript, -1 + object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborScript, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 89dfe05ba..bef008511 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -2,35 +2,28 @@ const_value set 2 const POKESEERSHOUSE_GRANNY PokeSeersHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SeerScript: faceplayer opentext - special Special_PokeSeer + special PokeSeer waitbutton closetext end PokeSeersHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 7, CIANWOOD_CITY - warp_def 3, 7, 7, CIANWOOD_CITY + db 2 ; warp events + warp_event 2, 7, 7, CIANWOOD_CITY + warp_event 3, 7, 7, CIANWOOD_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1 diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 11a73de07..05b3ca63a 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -5,8 +5,7 @@ const_value set 2 const POKECENTER2F_OFFICER Pokecenter2F_MapScripts: -.SceneScripts: - db 6 + db 6 ; scene scripts scene_script .Scene0 scene_script .Scene1 scene_script .Scene2 @@ -14,14 +13,13 @@ Pokecenter2F_MapScripts: scene_script .Scene4 scene_script .Scene5 -.MapCallbacks: - db 0 + db 0 ; callbacks .Scene0: - special Special_CheckMysteryGift + special CheckMysteryGift if_equal $0, .Scene0Done clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .Scene0Done priorityjump Pokecenter2F_AppearMysteryGiftDeliveryGuy @@ -50,7 +48,7 @@ Pokecenter2F_MapScripts: Pokecenter2F_AppearMysteryGiftDeliveryGuy: appear POKECENTER2F_OFFICER - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 end Script_TradeCenterClosed: @@ -76,28 +74,28 @@ LinkReceptionistScript_Trade: writetext Text_TradeReceptionistIntro yesorno iffalse .Cancel - special Special_Mobile_DummyReturnFalse ; always returns false + special Mobile_DummyReturnFalse ; always returns false iffalse .NoMobile writetext Text_TradeReceptionistMobile - special Special_AskMobileOrCable + special AskMobileOrCable iffalse .Cancel if_equal $1, .Mobile .NoMobile: - special Special_SetBitsForLinkTradeRequest + special SetBitsForLinkTradeRequest writetext Text_PleaseWait - special Special_WaitForLinkedFriend + special WaitForLinkedFriend iffalse .FriendNotReady writetext Text_MustSaveGame yesorno iffalse .DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .DidNotSave writetext Text_PleaseWait - special Special_CheckLinkTimeout + special CheckLinkTimeout iffalse .LinkTimedOut copybytetovar wOtherPlayerLinkMode iffalse .LinkedToFirstGen - special Special_CheckBothSelectedSameRoom + special CheckBothSelectedSameRoom iffalse .IncompatibleRooms writetext Text_PleaseComeIn2 waitbutton @@ -107,21 +105,21 @@ LinkReceptionistScript_Trade: end .FriendNotReady: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end .LinkedToFirstGen: - special Special_FailedLinkToPast + special FailedLinkToPast writetext Text_CantLinkToThePast - special Special_CloseLink + special CloseLink closetext end .IncompatibleRooms: writetext Text_IncompatibleRooms - special Special_CloseLink + special CloseLink closetext end @@ -132,7 +130,7 @@ LinkReceptionistScript_Trade: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit .Cancel: closetext end @@ -151,9 +149,9 @@ LinkReceptionistScript_Trade: writetext Text_MustSaveGame yesorno iffalse .Mobile_DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .Mobile_DidNotSave - special Special_Function1011f1 + special Function1011f1 writetext Text_PleaseComeIn2 waitbutton closetext @@ -178,28 +176,28 @@ LinkReceptionistScript_Battle: writetext Text_BattleReceptionistIntro yesorno iffalse .Cancel - special Special_Mobile_DummyReturnFalse ; always returns false + special Mobile_DummyReturnFalse ; always returns false iffalse .NoMobile writetext Text_BattleReceptionistMobile - special Special_AskMobileOrCable + special AskMobileOrCable iffalse .Cancel if_equal $1, .Mobile .NoMobile: - special Special_SetBitsForBattleRequest + special SetBitsForBattleRequest writetext Text_PleaseWait - special Special_WaitForLinkedFriend + special WaitForLinkedFriend iffalse .FriendNotReady writetext Text_MustSaveGame yesorno iffalse .DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .DidNotSave writetext Text_PleaseWait - special Special_CheckLinkTimeout + special CheckLinkTimeout iffalse .LinkTimedOut copybytetovar wOtherPlayerLinkMode iffalse .LinkedToFirstGen - special Special_CheckBothSelectedSameRoom + special CheckBothSelectedSameRoom iffalse .IncompatibleRooms writetext Text_PleaseComeIn2 waitbutton @@ -209,21 +207,21 @@ LinkReceptionistScript_Battle: end .FriendNotReady: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end .LinkedToFirstGen: - special Special_FailedLinkToPast + special FailedLinkToPast writetext Text_CantLinkToThePast - special Special_CloseLink + special CloseLink closetext end .IncompatibleRooms: writetext Text_IncompatibleRooms - special Special_CloseLink + special CloseLink closetext end @@ -234,7 +232,7 @@ LinkReceptionistScript_Battle: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit .Cancel: closetext end @@ -255,9 +253,9 @@ LinkReceptionistScript_Battle: writetext Text_MustSaveGame yesorno iffalse .Mobile_DidNotSave - special Special_Function103780 + special Function103780 iffalse .Mobile_DidNotSave - special Special_Function1011f1 + special Function1011f1 writetext Text_PleaseComeIn2 waitbutton closetext @@ -271,7 +269,7 @@ LinkReceptionistScript_Battle: end .SelectThreeMons: - special Special_Mobile_SelectThreeMons + special Mobile_SelectThreeMons iffalse .Mobile_DidNotSelect if_equal $1, .Mobile_OK if_equal $2, .Mobile_OK @@ -303,37 +301,37 @@ LinkReceptionistScript_TimeCapsule: iftrue Script_TimeCapsuleClosed checkflag ENGINE_TIME_CAPSULE iftrue Script_TimeCapsuleClosed - special Special_SetBitsForTimeCapsuleRequest + special SetBitsForTimeCapsuleRequest faceplayer opentext writetext Text_TimeCapsuleReceptionistIntro yesorno iffalse .Cancel - special Special_CheckTimeCapsuleCompatibility + special CheckTimeCapsuleCompatibility if_equal $1, .MonTooNew if_equal $2, .MonMoveTooNew if_equal $3, .MonHasMail writetext Text_PleaseWait - special Special_WaitForLinkedFriend + special WaitForLinkedFriend iffalse .FriendNotReady writetext Text_MustSaveGame yesorno iffalse .DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .DidNotSave writetext Text_PleaseWait - special Special_CheckLinkTimeout + special CheckLinkTimeout iffalse .LinkTimedOut copybytetovar wOtherPlayerLinkMode iffalse .OK - special Special_CheckBothSelectedSameRoom + special CheckBothSelectedSameRoom writetext Text_IncompatibleRooms - special Special_CloseLink + special CloseLink closetext end .OK: - special Special_EnterTimeCapsule + special EnterTimeCapsule writetext Text_PleaseComeIn2 waitbutton closetext @@ -342,7 +340,7 @@ LinkReceptionistScript_TimeCapsule: end .FriendNotReady: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end @@ -354,7 +352,7 @@ LinkReceptionistScript_TimeCapsule: .DidNotSave: writetext Text_PleaseComeAgain .Cancel: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit closetext end @@ -374,14 +372,14 @@ LinkReceptionistScript_TimeCapsule: end Script_LeftCableTradeCenter: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkTradeRoom setscene 0 setmapscene TRADE_CENTER, 0 end Script_LeftMobileTradeRoom: - special Special_Function101220 + special Function101220 scall Script_WalkOutOfMobileTradeRoom setscene 0 setmapscene MOBILE_TRADE_ROOM_MOBILE, 0 @@ -394,14 +392,14 @@ Script_WalkOutOfMobileTradeRoom: end Script_LeftCableColosseum: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkBattleRoom setscene 0 setmapscene COLOSSEUM, 0 end Script_LeftMobileBattleRoom: - special Special_Function101220 + special Function101220 scall Script_WalkOutOfMobileBattleRoom setscene 0 setmapscene MOBILE_BATTLE_ROOM, 0 @@ -436,7 +434,7 @@ Pokecenter2F_CheckGender: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_RED << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft setflag ENGINE_KRIS_IN_CABLE_CLUB special ReplaceKrisSprite @@ -463,7 +461,7 @@ Script_WalkOutOfLinkTradeRoom: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_BLUE << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2 @@ -485,7 +483,7 @@ Script_WalkOutOfLinkBattleRoom: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_BLUE << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2 @@ -544,7 +542,7 @@ TimeCapsuleScript_CheckPlayerGender: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_RED << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown faceobject PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST setflag ENGINE_KRIS_IN_CABLE_CLUB @@ -558,7 +556,7 @@ TimeCapsuleScript_CheckPlayerGender: end Script_LeftTimeCapsule: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight @@ -573,7 +571,7 @@ Script_LeftTimeCapsule: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_BLUE << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown @@ -585,7 +583,7 @@ Script_LeftTimeCapsule: MapPokecenter2FSignpost0Script: refreshscreen - special Special_DisplayLinkRecord + special DisplayLinkRecord closetext end @@ -600,7 +598,7 @@ OfficerScript_0x192c9a: writetext Text_MysteryGiftDeliveryGuy_HereYouGo buttonsound waitsfx - special Special_GetMysteryGiftItem + special GetMysteryGiftItem iffalse .BagIsFull itemnotify setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY @@ -1023,27 +1021,22 @@ Text_BrokeStadiumRules: done Pokecenter2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 0, 7, -1, POKECENTER_2F - warp_def 5, 0, 1, TRADE_CENTER - warp_def 9, 0, 1, COLOSSEUM - warp_def 13, 2, 1, TIME_CAPSULE - warp_def 6, 0, 1, MOBILE_TRADE_ROOM_MOBILE - warp_def 10, 0, 1, MOBILE_BATTLE_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 1 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 0, 7, -1, POKECENTER_2F + warp_event 5, 0, 1, TRADE_CENTER + warp_event 9, 0, 1, COLOSSEUM + warp_event 13, 2, 1, TIME_CAPSULE + warp_event 6, 0, 1, MOBILE_TRADE_ROOM_MOBILE + warp_event 10, 0, 1, MOBILE_BATTLE_ROOM + + db 0 ; coord events + + db 1 ; bg events bg_event 7, 3, BGEVENT_READ, MapPokecenter2FSignpost0Script -.ObjectEvents: - db 4 + db 4 ; object events object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1 object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1 object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1 diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm index d45b3ac56..5af6eed77 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/PokecomCenterAdminRoomMobile.asm @@ -1,31 +1,29 @@ const_value set 2 - const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST1 - const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST2 - const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST3 + const POKECOMCENTERADMINROOMMOBILE_SCIENTIST1 + const POKECOMCENTERADMINROOMMOBILE_SCIENTIST2 + const POKECOMCENTERADMINROOMMOBILE_SCIENTIST3 -GoldenrodPokeComCenter2FMobile_MapScripts: -.SceneScripts: - db 0 +PokecomCenterAdminRoomMobile_MapScripts: + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks -GoldenrodPokeComCenter2FMobileScientist1Script: - jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist1Text +PokecomCenterAdminRoomMobileScientist1Script: + jumptextfaceplayer PokecomCenterAdminRoomMobileScientist1Text -GoldenrodPokeComCenter2FMobileScientist2Script: - jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist2Text +PokecomCenterAdminRoomMobileScientist2Script: + jumptextfaceplayer PokecomCenterAdminRoomMobileScientist2Text -GoldenrodPokeComCenter2FMobileScientist3Script: - jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist3Text +PokecomCenterAdminRoomMobileScientist3Script: + jumptextfaceplayer PokecomCenterAdminRoomMobileScientist3Text -MapGoldenrodPokeComCenter2FMobileSignpost0Script: +PokecomCenterAdminRoomMobileSignpost0Script: opentext writetext UnknownText_0x627ee waitbutton UnknownScript_0x625df: reloadmappart - loadmenudata MenuDataHeader_0x62602 + loadmenuheader MenuHeader_0x62602 verticalmenu closewindow if_equal 1, UnknownScript_0x625f0 @@ -48,26 +46,26 @@ UnknownScript_0x62600: closetext end -MenuDataHeader_0x62602: +MenuHeader_0x62602: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 15, 8 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 3 ; items db "# つうしん クラブ@" ; # COM CLUB db "モバイルセンター@" ; MOBILE CENTER db "やめる@" ; QUIT -MapGoldenrodPokeComCenter2FMobileSignpost1Script: +PokecomCenterAdminRoomMobileSignpost1Script: opentext writetext UnknownText_0x62989 waitbutton UnknownScript_0x62629: reloadmappart - loadmenudata MenuDataHeader_0x6264c + loadmenuheader MenuHeader_0x6264c verticalmenu closewindow if_equal 1, UnknownScript_0x6263a @@ -90,23 +88,23 @@ UnknownScript_0x6264a: closetext end -MenuDataHeader_0x6264c: +MenuHeader_0x6264c: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 15, 8 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 3 ; items db "でんわ<WO>つかうとき@" ; Use phone db "でんわ<GA>つながらないとき@" ; Don't use phone db "やめる@" ; QUIT -MapGoldenrodPokeComCenter2FMobileSignpost2Script: +PokecomCenterAdminRoomMobileSignpost2Script: jumptext UnknownText_0x62b26 -GoldenrodPokeComCenter2FMobileScientist1Text: +PokecomCenterAdminRoomMobileScientist1Text: text "#COM CENTER and" line "MOBILE CENTER were" @@ -120,7 +118,7 @@ GoldenrodPokeComCenter2FMobileScientist1Text: line "strangers." done -GoldenrodPokeComCenter2FMobileScientist2Text: +PokecomCenterAdminRoomMobileScientist2Text: text "When you linked" line "with someone by" @@ -137,7 +135,7 @@ GoldenrodPokeComCenter2FMobileScientist2Text: line "got the shakes!" done -GoldenrodPokeComCenter2FMobileScientist3Text: +PokecomCenterAdminRoomMobileScientist3Text: text "They were able to" line "build this huge" @@ -262,26 +260,21 @@ UnknownText_0x62b26: para "<……> <……> <……>" done -GoldenrodPokeComCenter2FMobile_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 0, 31, 3, GOLDENROD_POKECENTER_1F - warp_def 1, 31, 3, GOLDENROD_POKECENTER_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 6, 26, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script - bg_event 6, 28, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script - bg_event 3, 26, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script - -.ObjectEvents: - db 3 - object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist1Script, -1 - object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist2Script, -1 - object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist3Script, -1 +PokecomCenterAdminRoomMobile_MapEvents: + db 0, 0 ; filler + + db 2 ; warp events + warp_event 0, 31, 3, GOLDENROD_POKECENTER_1F + warp_event 1, 31, 3, GOLDENROD_POKECENTER_1F + + db 0 ; coord events + + db 3 ; bg events + bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost0Script + bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost1Script + bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost2Script + + db 3 ; object events + object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist1Script, -1 + object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist2Script, -1 + object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist3Script, -1 diff --git a/maps/GoldenrodPokeComCenter2FMobile.blk b/maps/PokecomCenterAdminRoomMobile.blk index d4fd92414..d4fd92414 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.blk +++ b/maps/PokecomCenterAdminRoomMobile.blk diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 0c8bb70ec..78bd8607a 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -7,11 +7,9 @@ const_value set 2 const POKEMONFANCLUB_ODDISH PokemonFanClub_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GentlemanScript_0x1917e9: faceplayer @@ -297,24 +295,19 @@ UnknownText_0x191e29: done PokemonFanClub_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, VERMILION_CITY - warp_def 3, 7, 3, VERMILION_CITY + db 2 ; warp events + warp_event 2, 7, 3, VERMILION_CITY + warp_event 3, 7, 3, VERMILION_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 7, 0, BGEVENT_READ, MapPokemonFanClubSignpost0Script bg_event 9, 0, BGEVENT_READ, MapPokemonFanClubSignpost1Script -.ObjectEvents: - db 6 + db 6 ; object events object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1 object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1 object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index ef855e40e..fdc17e2a4 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -8,13 +8,11 @@ const_value set 2 const POWERPLANT_FOREST PowerPlant_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -389,25 +387,20 @@ UnknownText_0x189475: done PowerPlant_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 17, 2, ROUTE_10_NORTH - warp_def 3, 17, 2, ROUTE_10_NORTH + db 2 ; warp events + warp_event 2, 17, 2, ROUTE_10_NORTH + warp_event 3, 17, 2, ROUTE_10_NORTH -.CoordEvents: - db 1 + db 1 ; coord events coord_event 5, 12, 1, PowerPlantGuardPhoneScript -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, PowerPlantBookshelf bg_event 1, 1, BGEVENT_READ, PowerPlantBookshelf -.ObjectEvents: - db 7 + db 7 ; object events object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1 object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1 object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 96cd013c6..73fee4d01 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -7,11 +7,9 @@ const_value set 2 const RADIOTOWER1F_COOLTRAINER_F RadioTower1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ReceptionistScript_0x5cd29: faceplayer @@ -34,11 +32,11 @@ GentlemanScript_0x5cd3d: opentext writetext UnknownText_0x5ceba buttonsound - special Special_CheckLuckyNumberShowFlag + special CheckLuckyNumberShowFlag iffalse .skip - special Special_ResetLuckyNumberShowFlag + special ResetLuckyNumberShowFlag .skip - special Special_PrintTodaysLuckyNumber + special PrintTodaysLuckyNumber checkflag ENGINE_LUCKY_NUMBER_SHOW iftrue .GameOver writetext UnknownText_0x5cf3a @@ -53,7 +51,7 @@ GentlemanScript_0x5cd3d: playsound SFX_DEX_FANFARE_20_49 waitsfx buttonsound - special Special_CheckForLuckyNumberWinners + special CheckForLuckyNumberWinners closetext applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce74 opentext @@ -186,7 +184,7 @@ RadioTower1FYoungsterScript: jumptextfaceplayer RadioTower1FYoungsterText TrainerGruntM3: - trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_3, EVENT_BEAT_ROCKET_GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, .Script .Script: end_if_just_battled @@ -473,25 +471,20 @@ UnknownText_0x5d631: done RadioTower1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 2, 7, 11, GOLDENROD_CITY - warp_def 3, 7, 11, GOLDENROD_CITY - warp_def 15, 0, 2, RADIO_TOWER_2F + db 3 ; warp events + warp_event 2, 7, 11, GOLDENROD_CITY + warp_event 3, 7, 11, GOLDENROD_CITY + warp_event 15, 0, 2, RADIO_TOWER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 3, 0, BGEVENT_READ, MapRadioTower1FSignpost0Script bg_event 13, 0, BGEVENT_READ, MapRadioTower1FSignpost1Script -.ObjectEvents: - db 6 + db 6 ; object events object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1 object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 99f4dbe4c..aefb31799 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -12,11 +12,9 @@ const_value set 2 const RADIOTOWER2F_RECEPTIONIST RadioTower2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks UnknownScript_0x5d6fd: end @@ -55,7 +53,7 @@ RadioTower2FBlackBelt2Script: jumptextfaceplayer RadioTower2FBlackBelt2Text TrainerGruntM4: - trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_4, EVENT_BEAT_ROCKET_GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, .Script .Script: end_if_just_battled @@ -66,7 +64,7 @@ TrainerGruntM4: end TrainerGruntM5: - trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_5, EVENT_BEAT_ROCKET_GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, .Script .Script: end_if_just_battled @@ -77,7 +75,7 @@ TrainerGruntM5: end TrainerGruntM6: - trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_6, EVENT_BEAT_ROCKET_GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, .Script .Script: end_if_just_battled @@ -88,7 +86,7 @@ TrainerGruntM6: end TrainerGruntF2: - trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, .Script + trainer GRUNTF, GRUNTF_2, EVENT_BEAT_ROCKET_GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, .Script .Script: end_if_just_battled @@ -117,7 +115,7 @@ Buena: if_equal 30, UnknownScript_0x5d87f playmusic MUSIC_BUENAS_PASSWORD writetext UnknownText_0x5de35 - special Special_AskRememberPassword + special AskRememberPassword iffalse UnknownScript_0x5d81e writetext UnknownText_0x5de84 waitbutton @@ -134,7 +132,7 @@ UnknownScript_0x5d7be: closetext spriteface RADIOTOWER2F_BUENA, DOWN refreshscreen - special Special_BuenasPassword + special BuenasPassword closetext iffalse UnknownScript_0x5d845 opentext @@ -153,7 +151,7 @@ UnknownScript_0x5d7be: writetext UnknownText_0x5e054 waitbutton closetext - special Special_FadeOutMusic + special FadeOutMusic pause 20 special RestartMapMusic checkcode VAR_BLUECARDBALANCE @@ -182,7 +180,7 @@ UnknownScript_0x5d81e: waitbutton closetext spriteface RADIOTOWER2F_BUENA, RIGHT - special Special_FadeOutMusic + special FadeOutMusic pause 20 special RestartMapMusic end @@ -213,7 +211,7 @@ UnknownScript_0x5d845: waitbutton closetext spriteface RADIOTOWER2F_BUENA, RIGHT - special Special_FadeOutMusic + special FadeOutMusic pause 20 special RestartMapMusic end @@ -316,7 +314,7 @@ ReceptionistScript_0x5d8ff: iffalse UnknownScript_0x5d90f writetext UnknownText_0x5e392 buttonsound - special Special_BuenaPrize + special BuenaPrize closetext end @@ -711,19 +709,15 @@ UnknownText_0x5e463: done RadioTower2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 0, 0, 1, RADIO_TOWER_3F - warp_def 15, 0, 3, RADIO_TOWER_1F + db 2 ; warp events + warp_event 0, 0, 1, RADIO_TOWER_3F + warp_event 15, 0, 3, RADIO_TOWER_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 6 + db 6 ; bg events bg_event 3, 0, BGEVENT_READ, MapRadioTower2FSignpost0Script bg_event 5, 0, BGEVENT_READ, MapRadioTower2FSignpost1Script bg_event 9, 1, BGEVENT_READ, RadioTower2FBookshelf @@ -731,8 +725,7 @@ RadioTower2F_MapEvents: bg_event 11, 1, BGEVENT_READ, RadioTower2FBookshelf bg_event 13, 0, BGEVENT_READ, MapRadioTower2FSignpost5Script -.ObjectEvents: - db 11 + db 11 ; object events object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1 object_event 1, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 0efc9e2db..64d5a7ec5 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -8,11 +8,9 @@ const_value set 2 const RADIOTOWER3F_SCIENTIST RadioTower3F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .CardKeyShutterCallback .CardKeyShutterCallback: @@ -83,7 +81,7 @@ UnknownScript_0x5e5a1: end TrainerGruntM7: - trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_7, EVENT_BEAT_ROCKET_GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, .Script .Script: end_if_just_battled @@ -94,7 +92,7 @@ TrainerGruntM7: end TrainerGruntM8: - trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_8, EVENT_BEAT_ROCKET_GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, .Script .Script: end_if_just_battled @@ -105,7 +103,7 @@ TrainerGruntM8: end TrainerGruntM9: - trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_9, EVENT_BEAT_ROCKET_GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, .Script .Script: end_if_just_battled @@ -116,7 +114,7 @@ TrainerGruntM9: end TrainerScientistMarc: - trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, .Script + trainer SCIENTIST, MARC, EVENT_BEAT_SCIENTIST_MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, .Script .Script: end_if_just_battled @@ -329,26 +327,21 @@ UnknownText_0x5eae4: done RadioTower3F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 0, 0, 1, RADIO_TOWER_2F - warp_def 7, 0, 2, RADIO_TOWER_4F - warp_def 17, 0, 4, RADIO_TOWER_4F + db 3 ; warp events + warp_event 0, 0, 1, RADIO_TOWER_2F + warp_event 7, 0, 2, RADIO_TOWER_4F + warp_event 17, 0, 4, RADIO_TOWER_4F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 3, 0, BGEVENT_READ, MapRadioTower3FSignpost0Script bg_event 9, 0, BGEVENT_READ, MapRadioTower3FSignpost1Script bg_event 14, 2, BGEVENT_UP, MapRadioTower3FSignpost2Script -.ObjectEvents: - db 7 + db 7 ; object events object_event 7, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1 object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1 diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 99815f819..3167b3c7b 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -8,11 +8,9 @@ const_value set 2 const RADIOTOWER4F_SCIENTIST RadioTower4F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RadioTower4FFisherScript: jumptextfaceplayer RadioTower4FFisherText @@ -56,7 +54,7 @@ RadioTowerMeowth: end TrainerGruntM10: - trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_10, EVENT_BEAT_ROCKET_GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, .Script .Script: end_if_just_battled @@ -67,7 +65,7 @@ TrainerGruntM10: end TrainerExecutivem2: - trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, .Script + trainer EXECUTIVEM, EXECUTIVEM_2, EVENT_BEAT_ROCKET_EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, .Script .Script: end_if_just_battled @@ -78,7 +76,7 @@ TrainerExecutivem2: end TrainerGruntF4: - trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, .Script + trainer GRUNTF, GRUNTF_4, EVENT_BEAT_ROCKET_GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, .Script .Script: end_if_just_battled @@ -89,7 +87,7 @@ TrainerGruntF4: end TrainerScientistRich: - trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, .Script + trainer SCIENTIST, RICH, EVENT_BEAT_SCIENTIST_RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, .Script .Script: end_if_just_battled @@ -246,26 +244,21 @@ UnknownText_0x5f00d: done RadioTower4F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 0, 1, RADIO_TOWER_5F - warp_def 9, 0, 2, RADIO_TOWER_3F - warp_def 12, 0, 2, RADIO_TOWER_5F - warp_def 17, 0, 3, RADIO_TOWER_3F + db 4 ; warp events + warp_event 0, 0, 1, RADIO_TOWER_5F + warp_event 9, 0, 2, RADIO_TOWER_3F + warp_event 12, 0, 2, RADIO_TOWER_5F + warp_event 17, 0, 3, RADIO_TOWER_3F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 7, 0, BGEVENT_READ, MapRadioTower4FSignpost0Script bg_event 15, 0, BGEVENT_READ, MapRadioTower4FSignpost1Script -.ObjectEvents: - db 7 + db 7 ; object events object_event 6, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER object_event 14, 6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1 object_event 12, 7, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1 diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 009c1e91d..7fe87eeb5 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -6,14 +6,12 @@ const_value set 2 const RADIOTOWER5F_POKE_BALL RadioTower5F_MapScripts: -.SceneScripts: - db 3 + db 3 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 scene_script .DummyScene2 -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -68,7 +66,7 @@ Director: end TrainerExecutivef1: - trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script + trainer EXECUTIVEF, EXECUTIVEF_1, EVENT_BEAT_ROCKET_EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script .Script: end_if_just_battled @@ -95,12 +93,12 @@ RadioTower5FRocketBossScene: writetext RadioTower5FRocketBossAfterText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear RADIOTOWER5F_ROCKET disappear RADIOTOWER5F_ROCKET_GIRL pause 15 - special Special_FadeInQuickly + special FadeInQuickly setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1 setevent EVENT_CLEARED_RADIO_TOWER clearflag ENGINE_ROCKETS_IN_RADIO_TOWER @@ -127,7 +125,7 @@ RadioTower5FRocketBossScene: waitbutton closetext setscene 2 - setmapscene ECRUTEAK_HOUSE, 0 + setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, 0 setevent EVENT_GOT_CLEAR_BELL setevent EVENT_TEAM_ROCKET_DISBANDED jump .UselessJump @@ -421,29 +419,24 @@ SignpostRadioTower5FStudio: done RadioTower5F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 0, 0, 1, RADIO_TOWER_4F - warp_def 12, 0, 3, RADIO_TOWER_4F + db 2 ; warp events + warp_event 0, 0, 1, RADIO_TOWER_4F + warp_event 12, 0, 3, RADIO_TOWER_4F -.CoordEvents: - db 2 + db 2 ; coord events coord_event 0, 3, 0, FakeDirectorScript coord_event 16, 5, 1, RadioTower5FRocketBossScene -.BGEvents: - db 5 + db 5 ; bg events bg_event 3, 0, BGEVENT_READ, MapRadioTower5FSignpost0Script bg_event 11, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script bg_event 15, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script bg_event 16, 1, BGEVENT_READ, RadioTower5FBookshelf bg_event 17, 1, BGEVENT_READ, RadioTower5FBookshelf -.ObjectEvents: - db 5 + db 5 ; object events object_event 3, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1 object_event 13, 5, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 17, 2, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 2f9d2828a..4c7f1addf 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -2,12 +2,10 @@ const_value set 2 const REDSHOUSE1F_REDS_MOM RedsHouse1F_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -75,24 +73,19 @@ RedsHouse1FTVText: done RedsHouse1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 2, 7, 1, PALLET_TOWN - warp_def 3, 7, 1, PALLET_TOWN - warp_def 7, 0, 1, REDS_HOUSE_2F + db 3 ; warp events + warp_event 2, 7, 1, PALLET_TOWN + warp_event 3, 7, 1, PALLET_TOWN + warp_event 7, 0, 1, REDS_HOUSE_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 0, 1, BGEVENT_READ, RedsHouse1FBookshelf bg_event 1, 1, BGEVENT_READ, RedsHouse1FBookshelf bg_event 2, 1, BGEVENT_READ, RedsHouse1FTV -.ObjectEvents: - db 1 + db 1 ; object events object_event 5, 3, SPRITE_REDS_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1 diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index b69790cdd..74445fc3f 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -1,9 +1,7 @@ RedsHouse2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RedsHouse2FN64Script: jumptext RedsHouse2FN64Text @@ -26,20 +24,15 @@ RedsHouse2FPCText: done RedsHouse2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 7, 0, 3, REDS_HOUSE_1F + db 1 ; warp events + warp_event 7, 0, 3, REDS_HOUSE_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 3, 5, BGEVENT_READ, RedsHouse2FN64Script bg_event 0, 1, BGEVENT_READ, RedsHouse2FPCScript -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 570b4b2f5..f0073181c 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -3,11 +3,9 @@ const_value set 2 const ROCKTUNNEL1F_POKE_BALL2 RockTunnel1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RockTunnel1FElixer: itemball ELIXER @@ -16,33 +14,28 @@ RockTunnel1FTMSteelWing: itemball TM_STEEL_WING RockTunnel1FHiddenXAccuracy: - hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY + hiddenitem X_ACCURACY, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY RockTunnel1FHiddenXDefend: - hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND + hiddenitem X_DEFEND, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND RockTunnel1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 15, 3, 1, ROUTE_9 - warp_def 11, 25, 1, ROUTE_10_SOUTH - warp_def 5, 3, 3, ROCK_TUNNEL_B1F - warp_def 15, 9, 2, ROCK_TUNNEL_B1F - warp_def 27, 3, 4, ROCK_TUNNEL_B1F - warp_def 27, 13, 1, ROCK_TUNNEL_B1F - -.CoordEvents: - db 0 - -.BGEvents: - db 2 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 15, 3, 1, ROUTE_9 + warp_event 11, 25, 1, ROUTE_10_SOUTH + warp_event 5, 3, 3, ROCK_TUNNEL_B1F + warp_event 15, 9, 2, ROCK_TUNNEL_B1F + warp_event 27, 3, 4, ROCK_TUNNEL_B1F + warp_event 27, 13, 1, ROCK_TUNNEL_B1F + + db 0 ; coord events + + db 2 ; bg events bg_event 24, 4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy bg_event 21, 15, BGEVENT_ITEM, RockTunnel1FHiddenXDefend -.ObjectEvents: - db 2 + db 2 ; object events object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index d94f1f412..d1b676c00 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -4,11 +4,9 @@ const_value set 2 const ROCKTUNNELB1F_POKE_BALL3 RockTunnelB1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RockTunnelB1FIron: itemball IRON @@ -20,28 +18,23 @@ RockTunnelB1FRevive: itemball REVIVE RockTunnelB1FHiddenMaxPotion: - hiddenitem EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION RockTunnelB1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 3, 3, 6, ROCK_TUNNEL_1F - warp_def 17, 9, 4, ROCK_TUNNEL_1F - warp_def 23, 3, 3, ROCK_TUNNEL_1F - warp_def 25, 23, 5, ROCK_TUNNEL_1F + db 4 ; warp events + warp_event 3, 3, 6, ROCK_TUNNEL_1F + warp_event 17, 9, 4, ROCK_TUNNEL_1F + warp_event 23, 3, 3, ROCK_TUNNEL_1F + warp_event 25, 23, 5, ROCK_TUNNEL_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 4, 14, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion -.ObjectEvents: - db 3 + db 3 ; object events object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON object_event 6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE diff --git a/maps/Route1.asm b/maps/Route1.asm index 8be70d4d6..eb2d407a5 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -4,14 +4,12 @@ const_value set 2 const ROUTE1_FRUIT_TREE Route1_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerSchoolboyDanny: - trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script + trainer SCHOOLBOY, DANNY, EVENT_BEAT_SCHOOLBOY_DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script .Script: end_if_just_battled @@ -22,7 +20,7 @@ TrainerSchoolboyDanny: end TrainerCooltrainerfQuinn: - trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, .Script + trainer COOLTRAINERF, QUINN, EVENT_BEAT_COOLTRAINERF_QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, .Script .Script: end_if_just_battled @@ -81,21 +79,16 @@ Route1SignText: done Route1_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 0 + db 0 ; warp events -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 7, 27, BGEVENT_READ, Route1Sign -.ObjectEvents: - db 3 + db 3 ; object events object_event 4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1 diff --git a/maps/Route10North.asm b/maps/Route10North.asm index feb7dd033..9e16ad2eb 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -1,9 +1,7 @@ Route10North_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PowerPlantSign: jumptext PowerPlantSignText @@ -16,21 +14,16 @@ PowerPlantSignText: done Route10North_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 11, 1, 1, ROUTE_10_POKECENTER_1F - warp_def 3, 9, 1, POWER_PLANT + db 2 ; warp events + warp_event 11, 1, 1, ROUTE_10_POKECENTER_1F + warp_event 3, 9, 1, POWER_PLANT -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 5, 11, BGEVENT_READ, PowerPlantSign bg_event 12, 1, BGEVENT_READ, Route10PokecenterSign -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index 4a75da2ec..6e33641a9 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 const ROUTE10POKECENTER1F_COOLTRAINER_F Route10Pokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x188bd4: jumpstd pokecenternurse @@ -81,23 +79,18 @@ Route10Pokecenter1FCooltrainerFText: done Route10Pokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 1, ROUTE_10_NORTH - warp_def 4, 7, 1, ROUTE_10_NORTH - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 1, ROUTE_10_NORTH + warp_event 4, 7, 1, ROUTE_10_NORTH + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1 object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1 object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm index c3b2d39cc..7b528ba13 100644 --- a/maps/Route10Pokecenter2FBeta.asm +++ b/maps/Route10Pokecenter2FBeta.asm @@ -1,23 +1,16 @@ Route10Pokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route10Pokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, ROUTE_10_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, 3, ROUTE_10_POKECENTER_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Route10South.asm b/maps/Route10South.asm index a03a5d485..f5946ea74 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -3,14 +3,12 @@ const_value set 2 const ROUTE10SOUTH_POKEFAN_M2 Route10South_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerHikerJim: - trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script + trainer HIKER, JIM, EVENT_BEAT_HIKER_JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script .Script: end_if_just_battled @@ -21,7 +19,7 @@ TrainerHikerJim: end TrainerPokefanmRobert: - trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script + trainer POKEFANM, ROBERT, EVENT_BEAT_POKEFANM_ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script .Script: end_if_just_battled @@ -76,21 +74,16 @@ Route10SignText: done Route10South_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 6, 1, 2, ROCK_TUNNEL_1F + db 1 ; warp events + warp_event 6, 1, 2, ROCK_TUNNEL_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 5, 3, BGEVENT_READ, Route10Sign -.ObjectEvents: - db 2 + db 2 ; object events object_event 17, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1 object_event 8, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1 diff --git a/maps/Route11.asm b/maps/Route11.asm index 353877969..8934549fc 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -6,14 +6,12 @@ const_value set 2 const ROUTE11_FRUIT_TREE Route11_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerYoungsterOwen: - trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script + trainer YOUNGSTER, OWEN, EVENT_BEAT_YOUNGSTER_OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script .Script: end_if_just_battled @@ -24,7 +22,7 @@ TrainerYoungsterOwen: end TrainerYoungsterJason: - trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script + trainer YOUNGSTER, JASON, EVENT_BEAT_YOUNGSTER_JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script .Script: end_if_just_battled @@ -35,7 +33,7 @@ TrainerYoungsterJason: end TrainerPsychicHerman: - trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script + trainer PSYCHIC_T, HERMAN, EVENT_BEAT_PSYCHIC_HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script .Script: end_if_just_battled @@ -46,7 +44,7 @@ TrainerPsychicHerman: end TrainerPsychicFidel: - trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script + trainer PSYCHIC_T, FIDEL, EVENT_BEAT_PSYCHIC_FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script .Script: end_if_just_battled @@ -63,7 +61,7 @@ FruitTreeScript_0x68055: fruittree FRUITTREE_ROUTE_11 Route11HiddenRevive: - hiddenitem EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_ROUTE_11_HIDDEN_REVIVE YoungsterOwenSeenText: text "There's no cheat-" @@ -146,22 +144,17 @@ Route11SignText: done Route11_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 0 + db 0 ; warp events -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 3, 7, BGEVENT_READ, Route11Sign bg_event 32, 5, BGEVENT_ITEM, Route11HiddenRevive -.ObjectEvents: - db 5 + db 5 ; object events object_event 22, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterOwen, -1 object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1 object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1 diff --git a/maps/Route12.asm b/maps/Route12.asm index 3aaf37991..a4f56cf01 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -7,14 +7,12 @@ const_value set 2 const ROUTE12_POKE_BALL2 Route12_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerFisherKyle: - trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script + trainer FISHER, KYLE, EVENT_BEAT_FISHER_KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script .Script: end_if_just_battled @@ -25,7 +23,7 @@ TrainerFisherKyle: end TrainerFisherMartin: - trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, .Script + trainer FISHER, MARTIN, EVENT_BEAT_FISHER_MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, .Script .Script: end_if_just_battled @@ -36,7 +34,7 @@ TrainerFisherMartin: end TrainerFisherStephen: - trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, .Script + trainer FISHER, STEPHEN, EVENT_BEAT_FISHER_STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, .Script .Script: end_if_just_battled @@ -47,7 +45,7 @@ TrainerFisherStephen: end TrainerFisherBarney: - trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, .Script + trainer FISHER, BARNEY, EVENT_BEAT_FISHER_BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, .Script .Script: end_if_just_battled @@ -70,7 +68,7 @@ Route12Nugget: itemball NUGGET Route12HiddenElixer: - hiddenitem EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER + hiddenitem ELIXER, EVENT_ROUTE_12_HIDDEN_ELIXER FisherMartinSeenText: text "Patience is the" @@ -167,24 +165,19 @@ FishingSpotSignText: done Route12_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 11, 33, 1, ROUTE_12_SUPER_ROD_HOUSE + db 1 ; warp events + warp_event 11, 33, 1, ROUTE_12_SUPER_ROD_HOUSE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 11, 27, BGEVENT_READ, Route12Sign bg_event 13, 9, BGEVENT_READ, FishingSpotSign bg_event 14, 13, BGEVENT_ITEM, Route12HiddenElixer -.ObjectEvents: - db 6 + db 6 ; object events object_event 5, 13, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1 object_event 14, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherStephen, -1 object_event 10, 38, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerFisherBarney, -1 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index ca39effaf..0c41049e5 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const ROUTE12SUPERRODHOUSE_FISHING_GURU Route12SuperRodHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FishingGuruScript_0x7f484: faceplayer @@ -80,20 +78,15 @@ UnknownText_0x7f5ec: done Route12SuperRodHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, ROUTE_12 - warp_def 3, 7, 1, ROUTE_12 + db 2 ; warp events + warp_event 2, 7, 1, ROUTE_12 + warp_event 3, 7, 1, ROUTE_12 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1 diff --git a/maps/Route13.asm b/maps/Route13.asm index 88753afbb..c97a54830 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -6,14 +6,12 @@ const_value set 2 const ROUTE13_POKEFAN_M3 Route13_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerPokefanmAlex: - trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script + trainer POKEFANM, ALEX, EVENT_BEAT_POKEFANM_ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script .Script: end_if_just_battled @@ -24,7 +22,7 @@ TrainerPokefanmAlex: end TrainerPokefanmJoshua: - trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script + trainer POKEFANM, JOSHUA, EVENT_BEAT_POKEFANM_JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script .Script: end_if_just_battled @@ -35,7 +33,7 @@ TrainerPokefanmJoshua: end TrainerBirdKeeperPerry: - trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, BirdKeeperPerrySeenText, BirdKeeperPerryBeatenText, 0, .Script + trainer BIRD_KEEPER, PERRY, EVENT_BEAT_BIRD_KEEPER_PERRY, BirdKeeperPerrySeenText, BirdKeeperPerryBeatenText, 0, .Script .Script: end_if_just_battled @@ -46,7 +44,7 @@ TrainerBirdKeeperPerry: end TrainerBirdKeeperBret: - trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, BirdKeeperBretSeenText, BirdKeeperBretBeatenText, 0, .Script + trainer BIRD_KEEPER, BRET, EVENT_BEAT_BIRD_KEEPER_BRET, BirdKeeperBretSeenText, BirdKeeperBretBeatenText, 0, .Script .Script: end_if_just_battled @@ -57,7 +55,7 @@ TrainerBirdKeeperBret: end TrainerHikerKenny: - trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script + trainer HIKER, KENNY, EVENT_BEAT_HIKER_KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script .Script: end_if_just_battled @@ -77,7 +75,7 @@ Route13DirectionsSign: jumptext Route13DirectionsSignText Route13HiddenCalcium: - hiddenitem EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM + hiddenitem CALCIUM, EVENT_ROUTE_13_HIDDEN_CALCIUM PokefanmAlexSeenText: text "Bow down before my" @@ -192,24 +190,19 @@ Route13DirectionsSignText: done Route13_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 0 + db 0 ; warp events -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 29, 13, BGEVENT_READ, Route13TrainerTips bg_event 41, 11, BGEVENT_READ, Route13Sign bg_event 17, 13, BGEVENT_READ, Route13DirectionsSign bg_event 30, 13, BGEVENT_ITEM, Route13HiddenCalcium -.ObjectEvents: - db 5 + db 5 ; object events object_event 42, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1 object_event 43, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1 object_event 32, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1 diff --git a/maps/Route14.asm b/maps/Route14.asm index 3f5a58357..aa388dfb9 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -5,11 +5,9 @@ const_value set 2 const ROUTE14_KIM Route14_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Kim: faceplayer @@ -20,7 +18,7 @@ Kim: end TrainerPokefanmCarter: - trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, .Script + trainer POKEFANM, CARTER, EVENT_BEAT_POKEFANM_CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, .Script .Script: end_if_just_battled @@ -31,7 +29,7 @@ TrainerPokefanmCarter: end TrainerBirdKeeperRoy: - trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, BirdKeeperRoySeenText, BirdKeeperRoyBeatenText, 0, .Script + trainer BIRD_KEEPER, ROY, EVENT_BEAT_BIRD_KEEPER_ROY, BirdKeeperRoySeenText, BirdKeeperRoyBeatenText, 0, .Script .Script: end_if_just_battled @@ -42,7 +40,7 @@ TrainerBirdKeeperRoy: end TrainerPokefanmTrevor: - trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, .Script + trainer POKEFANM, TREVOR, EVENT_BEAT_POKEFANM_TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, .Script .Script: end_if_just_battled @@ -116,20 +114,15 @@ PokefanmTrevorAfterBattleText: done Route14_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 0 + db 0 ; warp events -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 11, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmCarter, -1 object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRoy, -1 object_event 6, 11, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1 diff --git a/maps/Route15.asm b/maps/Route15.asm index 58fe79c9b..a3c0521b8 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -8,14 +8,12 @@ const_value set 2 const ROUTE15_POKE_BALL Route15_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerTeacherColette: - trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script + trainer TEACHER, COLETTE, EVENT_BEAT_TEACHER_COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script .Script: end_if_just_battled @@ -26,7 +24,7 @@ TrainerTeacherColette: end TrainerTeacherHillary: - trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script + trainer TEACHER, HILLARY, EVENT_BEAT_TEACHER_HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script .Script: end_if_just_battled @@ -37,7 +35,7 @@ TrainerTeacherHillary: end TrainerSchoolboyKipp: - trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script + trainer SCHOOLBOY, KIPP, EVENT_BEAT_SCHOOLBOY_KIP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script .Script: end_if_just_battled @@ -48,7 +46,7 @@ TrainerSchoolboyKipp: end TrainerSchoolboyTommy: - trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script + trainer SCHOOLBOY, TOMMY, EVENT_BEAT_SCHOOLBOY_TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script .Script: end_if_just_battled @@ -59,7 +57,7 @@ TrainerSchoolboyTommy: end TrainerSchoolboyJohnny: - trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script + trainer SCHOOLBOY, JOHNNY, EVENT_BEAT_SCHOOLBOY_JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script .Script: end_if_just_battled @@ -70,7 +68,7 @@ TrainerSchoolboyJohnny: end TrainerSchoolboyBilly: - trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script + trainer SCHOOLBOY, BILLY, EVENT_BEAT_SCHOOLBOY_BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script .Script: end_if_just_battled @@ -202,23 +200,18 @@ Route15SignText: done Route15_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 4, 3, ROUTE_15_FUCHSIA_GATE - warp_def 2, 5, 4, ROUTE_15_FUCHSIA_GATE + db 2 ; warp events + warp_event 2, 4, 3, ROUTE_15_FUCHSIA_GATE + warp_event 2, 5, 4, ROUTE_15_FUCHSIA_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 19, 9, BGEVENT_READ, Route15Sign -.ObjectEvents: - db 7 + db 7 ; object events object_event 10, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1 object_event 15, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyTommy, -1 object_event 33, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJohnny, -1 diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 80966bd2b..3d31256f7 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -2,11 +2,9 @@ const_value set 2 const ROUTE15FUCHSIAGATE_OFFICER Route15FuchsiaGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route15FuchsiaGateOfficerScript: jumptextfaceplayer Route15FuchsiaGateOfficerText @@ -20,22 +18,17 @@ Route15FuchsiaGateOfficerText: done Route15FuchsiaGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 4, 8, FUCHSIA_CITY - warp_def 0, 5, 9, FUCHSIA_CITY - warp_def 9, 4, 1, ROUTE_15 - warp_def 9, 5, 2, ROUTE_15 + db 4 ; warp events + warp_event 0, 4, 8, FUCHSIA_CITY + warp_event 0, 5, 9, FUCHSIA_CITY + warp_event 9, 4, 1, ROUTE_15 + warp_event 9, 5, 2, ROUTE_15 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1 diff --git a/maps/Route16.asm b/maps/Route16.asm index 0e0fb2dc4..a799803fd 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -1,9 +1,7 @@ Route16_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .AlwaysOnBike .AlwaysOnBike: @@ -29,23 +27,18 @@ CyclingRoadSignText: done Route16_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 1, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE - warp_def 14, 6, 3, ROUTE_16_GATE - warp_def 14, 7, 4, ROUTE_16_GATE - warp_def 9, 6, 1, ROUTE_16_GATE - warp_def 9, 7, 2, ROUTE_16_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 1, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE + warp_event 14, 6, 3, ROUTE_16_GATE + warp_event 14, 7, 4, ROUTE_16_GATE + warp_event 9, 6, 1, ROUTE_16_GATE + warp_event 9, 7, 2, ROUTE_16_GATE + + db 0 ; coord events + + db 1 ; bg events bg_event 5, 5, BGEVENT_READ, CyclingRoadSign -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 1d709e4ea..ffac53705 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -2,11 +2,9 @@ const_value set 2 const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD Route16FuchsiaSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route16FuchsiaSpeechHouseSuperNerdScript: jumptextfaceplayer Route16FuchsiaSpeechHouseSuperNerdText @@ -23,22 +21,17 @@ Route16FuchsiaSpeechHouseSuperNerdText: done Route16FuchsiaSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, ROUTE_16 - warp_def 3, 7, 1, ROUTE_16 + db 2 ; warp events + warp_event 2, 7, 1, ROUTE_16 + warp_event 3, 7, 1, ROUTE_16 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf bg_event 1, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index d59425640..9bfbce366 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -2,12 +2,10 @@ const_value set 2 const ROUTE16GATE_OFFICER Route16Gate_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -61,24 +59,19 @@ UnknownText_0x73496: done Route16Gate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 0, 4, 4, ROUTE_16 - warp_def 0, 5, 5, ROUTE_16 - warp_def 9, 4, 2, ROUTE_16 - warp_def 9, 5, 3, ROUTE_16 - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 0, 4, 4, ROUTE_16 + warp_event 0, 5, 5, ROUTE_16 + warp_event 9, 4, 2, ROUTE_16 + warp_event 9, 5, 3, ROUTE_16 + + db 2 ; coord events coord_event 5, 4, 0, UnknownScript_0x733ed coord_event 5, 5, 0, UnknownScript_0x733ed -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1 diff --git a/maps/Route17.asm b/maps/Route17.asm index b2c1a820d..5fe83bd41 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -5,11 +5,9 @@ const_value set 2 const ROUTE17_BIKER4 Route17_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .AlwaysOnBike .AlwaysOnBike: @@ -18,7 +16,7 @@ Route17_MapScripts: return TrainerBikerCharles: - trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script + trainer BIKER, CHARLES, EVENT_BEAT_BIKER_CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script .Script: end_if_just_battled @@ -29,7 +27,7 @@ TrainerBikerCharles: end TrainerBikerRiley: - trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, .Script + trainer BIKER, RILEY, EVENT_BEAT_BIKER_RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, .Script .Script: end_if_just_battled @@ -40,7 +38,7 @@ TrainerBikerRiley: end TrainerBikerJoel: - trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, .Script + trainer BIKER, JOEL, EVENT_BEAT_BIKER_JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, .Script .Script: end_if_just_battled @@ -51,7 +49,7 @@ TrainerBikerJoel: end TrainerBikerGlenn: - trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, .Script + trainer BIKER, GLENN, EVENT_BEAT_BIKER_GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, .Script .Script: end_if_just_battled @@ -62,10 +60,10 @@ TrainerBikerGlenn: end Route17HiddenMaxEther: - hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem MAX_ETHER, EVENT_ROUTE_17_HIDDEN_MAX_ETHER Route17HiddenMaxElixer: - hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER + hiddenitem MAX_ELIXER, EVENT_ROUTE_17_HIDDEN_MAX_ELIXER BikerRileySeenText: text "Hey, you! You're" @@ -133,24 +131,19 @@ BikerCharlesAfterBattleText: done Route17_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 17, 82, 1, ROUTE_17_ROUTE_18_GATE - warp_def 17, 83, 2, ROUTE_17_ROUTE_18_GATE + db 2 ; warp events + warp_event 17, 82, 1, ROUTE_17_ROUTE_18_GATE + warp_event 17, 83, 2, ROUTE_17_ROUTE_18_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 9, 54, BGEVENT_ITEM, Route17HiddenMaxEther bg_event 8, 77, BGEVENT_ITEM, Route17HiddenMaxElixer -.ObjectEvents: - db 4 + db 4 ; object events object_event 4, 17, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1 object_event 9, 68, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1 object_event 3, 53, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1 diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm index 367a2634b..5b863d524 100644 --- a/maps/Route17Route18Gate.asm +++ b/maps/Route17Route18Gate.asm @@ -2,12 +2,10 @@ const_value set 2 const ROUTE17ROUTE18GATE_OFFICER Route17Route18Gate_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -52,24 +50,19 @@ UnknownText_0x7364d: done Route17Route18Gate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 0, 4, 1, ROUTE_17 - warp_def 0, 5, 2, ROUTE_17 - warp_def 9, 4, 1, ROUTE_18 - warp_def 9, 5, 2, ROUTE_18 - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 0, 4, 1, ROUTE_17 + warp_event 0, 5, 2, ROUTE_17 + warp_event 9, 4, 1, ROUTE_18 + warp_event 9, 5, 2, ROUTE_18 + + db 2 ; coord events coord_event 5, 4, 0, UnknownScript_0x73611 coord_event 5, 5, 0, UnknownScript_0x73611 -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events 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 8cff37f09..51dee07e9 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -3,14 +3,12 @@ const_value set 2 const ROUTE18_YOUNGSTER2 Route18_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperBoris: - trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script + trainer BIRD_KEEPER, BORIS, EVENT_BEAT_BIRD_KEEPER_BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script .Script: end_if_just_battled @@ -21,7 +19,7 @@ TrainerBirdKeeperBoris: end TrainerBirdKeeperBob: - trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, BirdKeeperBobSeenText, BirdKeeperBobBeatenText, 0, .Script + trainer BIRD_KEEPER, BOB, EVENT_BEAT_BIRD_KEEPER_BOB, BirdKeeperBobSeenText, BirdKeeperBobBeatenText, 0, .Script .Script: end_if_just_battled @@ -78,22 +76,17 @@ Route18SignText: done Route18_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 6, 3, ROUTE_17_ROUTE_18_GATE - warp_def 2, 7, 4, ROUTE_17_ROUTE_18_GATE + db 2 ; warp events + warp_event 2, 6, 3, ROUTE_17_ROUTE_18_GATE + warp_event 2, 7, 4, ROUTE_17_ROUTE_18_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 9, 5, BGEVENT_READ, Route18Sign -.ObjectEvents: - db 2 + db 2 ; object events object_event 9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1 object_event 13, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1 diff --git a/maps/Route19.asm b/maps/Route19.asm index 8767a8b3b..123da8374 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -7,11 +7,9 @@ const_value set 2 const ROUTE19_FISHER2 Route19_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .ClearRocks .ClearRocks: @@ -27,7 +25,7 @@ Route19_MapScripts: return TrainerSwimmerfDawn: - trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script + trainer SWIMMERF, DAWN, EVENT_BEAT_SWIMMERF_DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script .Script: end_if_just_battled @@ -38,7 +36,7 @@ TrainerSwimmerfDawn: end TrainerSwimmermHarold: - trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, .Script + trainer SWIMMERM, HAROLD, EVENT_BEAT_SWIMMERM_HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, .Script .Script: end_if_just_battled @@ -49,7 +47,7 @@ TrainerSwimmermHarold: end TrainerSwimmermJerome: - trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, .Script + trainer SWIMMERM, JEROME, EVENT_BEAT_SWIMMERM_JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, .Script .Script: end_if_just_battled @@ -60,7 +58,7 @@ TrainerSwimmermJerome: end TrainerSwimmermTucker: - trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, .Script + trainer SWIMMERM, TUCKER, EVENT_BEAT_SWIMMERM_TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, .Script .Script: end_if_just_battled @@ -235,23 +233,18 @@ CarefulSwimmingSignText: done Route19_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 7, 3, 3, ROUTE_19_FUCHSIA_GATE + db 1 ; warp events + warp_event 7, 3, 3, ROUTE_19_FUCHSIA_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 11, 13, BGEVENT_READ, Route19Sign bg_event 11, 1, BGEVENT_READ, CarefulSwimmingSign -.ObjectEvents: - db 6 + db 6 ; object events object_event 9, 23, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1 object_event 13, 28, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermHarold, -1 object_event 11, 17, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermJerome, -1 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 4446de2e3..ea0a5fa04 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -2,11 +2,9 @@ const_value set 2 const ROUTE19FUCHSIAGATE_OFFICER Route19FuchsiaGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks OfficerScript_0x1ab3f6: faceplayer @@ -46,22 +44,17 @@ UnknownText_0x1ab48a: done Route19FuchsiaGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 10, FUCHSIA_CITY - warp_def 5, 0, 11, FUCHSIA_CITY - warp_def 4, 7, 1, ROUTE_19 - warp_def 5, 7, 1, ROUTE_19 + db 4 ; warp events + warp_event 4, 0, 10, FUCHSIA_CITY + warp_event 5, 0, 11, FUCHSIA_CITY + warp_event 4, 7, 1, ROUTE_19 + warp_event 5, 7, 1, ROUTE_19 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1 diff --git a/maps/Route2.asm b/maps/Route2.asm index 09b885df3..27f3e0c8b 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -9,14 +9,12 @@ const_value set 2 const ROUTE2_FRUIT_TREE Route2_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBugCatcherRob: - trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script + trainer BUG_CATCHER, ROB, EVENT_BEAT_BUG_CATCHER_ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script .Script: end_if_just_battled @@ -27,7 +25,7 @@ TrainerBugCatcherRob: end TrainerBugCatcherEd: - trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, BugCatcherEdSeenText, BugCatcherEdBeatenText, 0, .Script + trainer BUG_CATCHER, ED, EVENT_BEAT_BUG_CATCHER_ED, BugCatcherEdSeenText, BugCatcherEdBeatenText, 0, .Script .Script: end_if_just_battled @@ -38,7 +36,7 @@ TrainerBugCatcherEd: end TrainerBugCatcherDoug: - trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, BugCatcherDougSeenText, BugCatcherDougBeatenText, 0, .Script + trainer BUG_CATCHER, DOUG, EVENT_BEAT_BUG_CATCHER_DOUG, BugCatcherDougSeenText, BugCatcherDougBeatenText, 0, .Script .Script: end_if_just_battled @@ -70,16 +68,16 @@ FruitTreeScript_0x1ac306: fruittree FRUITTREE_ROUTE_2 Route2HiddenMaxEther: - hiddenitem EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem MAX_ETHER, EVENT_ROUTE_2_HIDDEN_MAX_ETHER Route2HiddenFullHeal: - hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_ROUTE_2_HIDDEN_FULL_HEAL Route2HiddenFullRestore: - hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_ROUTE_2_HIDDEN_FULL_RESTORE Route2HiddenRevive: - hiddenitem EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_ROUTE_2_HIDDEN_REVIVE BugCatcherRobSeenText: text "My bug #MON are" @@ -147,22 +145,18 @@ UnknownText_0x1ac49f: done Route2_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 15, 15, 1, ROUTE_2_NUGGET_SPEECH_HOUSE - warp_def 15, 31, 3, ROUTE_2_GATE - warp_def 16, 27, 1, ROUTE_2_GATE - warp_def 17, 27, 2, ROUTE_2_GATE - warp_def 12, 7, 3, DIGLETTS_CAVE - -.CoordEvents: - db 0 - -.BGEvents: - db 6 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 15, 15, 1, ROUTE_2_NUGGET_HOUSE + warp_event 15, 31, 3, ROUTE_2_GATE + warp_event 16, 27, 1, ROUTE_2_GATE + warp_event 17, 27, 2, ROUTE_2_GATE + warp_event 12, 7, 3, DIGLETTS_CAVE + + db 0 ; coord events + + db 6 ; bg events bg_event 7, 51, BGEVENT_READ, Route2Sign bg_event 11, 9, BGEVENT_READ, MapRoute2Signpost1Script bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther @@ -170,8 +164,7 @@ Route2_MapEvents: bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore bg_event 11, 30, BGEVENT_ITEM, Route2HiddenRevive -.ObjectEvents: - db 8 + db 8 ; object events object_event 10, 45, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1 object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1 object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1 diff --git a/maps/Route20.asm b/maps/Route20.asm index e7a776b2b..da7900400 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -4,11 +4,9 @@ const_value set 2 const ROUTE20_SWIMMER_GUY Route20_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .ClearRocks .ClearRocks: @@ -16,7 +14,7 @@ Route20_MapScripts: return TrainerSwimmerfNicole: - trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script + trainer SWIMMERF, NICOLE, EVENT_BEAT_SWIMMERF_NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script .Script: end_if_just_battled @@ -27,7 +25,7 @@ TrainerSwimmerfNicole: end TrainerSwimmerfLori: - trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, .Script + trainer SWIMMERF, LORI, EVENT_BEAT_SWIMMERF_LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, .Script .Script: end_if_just_battled @@ -38,7 +36,7 @@ TrainerSwimmerfLori: end TrainerSwimmermCameron: - trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, .Script + trainer SWIMMERM, CAMERON, EVENT_BEAT_SWIMMERM_CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, .Script .Script: end_if_just_battled @@ -113,22 +111,17 @@ CinnabarGymSignText: done Route20_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 38, 7, 1, SEAFOAM_GYM + db 1 ; warp events + warp_event 38, 7, 1, SEAFOAM_GYM -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 37, 11, BGEVENT_READ, CinnabarGymSign -.ObjectEvents: - db 3 + db 3 ; object events object_event 52, 8, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1 object_event 45, 13, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfLori, -1 object_event 12, 13, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCameron, -1 diff --git a/maps/Route21.asm b/maps/Route21.asm index e6b4eb564..e7bee259d 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -4,14 +4,12 @@ const_value set 2 const ROUTE21_FISHER Route21_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerSwimmermSeth: - trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script + trainer SWIMMERM, SETH, EVENT_BEAT_SWIMMERM_SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script .Script: end_if_just_battled @@ -22,7 +20,7 @@ TrainerSwimmermSeth: end TrainerSwimmerfNikki: - trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, .Script + trainer SWIMMERF, NIKKI, EVENT_BEAT_SWIMMERF_NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, .Script .Script: end_if_just_battled @@ -33,7 +31,7 @@ TrainerSwimmerfNikki: end TrainerFisherArnold: - trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, .Script + trainer FISHER, ARNOLD, EVENT_BEAT_FISHER_ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, .Script .Script: end_if_just_battled @@ -90,20 +88,15 @@ FisherArnoldAfterBattleText: done Route21_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 0 + db 0 ; warp events -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 11, 16, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1 object_event 2, 30, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1 object_event 14, 22, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherArnold, -1 diff --git a/maps/Route22.asm b/maps/Route22.asm index c9d520cb1..b34daae20 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -1,9 +1,7 @@ Route22_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VictoryRoadEntranceSign: jumptext VictoryRoadEntranceSignText @@ -16,19 +14,14 @@ VictoryRoadEntranceSignText: done Route22_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 13, 5, 1, VICTORY_ROAD_GATE + db 1 ; warp events + warp_event 13, 5, 1, VICTORY_ROAD_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 15, 7, BGEVENT_READ, VictoryRoadEntranceSign -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Route23.asm b/maps/Route23.asm index 99c527303..a2149e6b9 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -1,9 +1,7 @@ Route23_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -23,22 +21,17 @@ IndigoPlateauSignText: done Route23_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 9, 5, 1, INDIGO_PLATEAU_POKECENTER_1F - warp_def 10, 5, 2, INDIGO_PLATEAU_POKECENTER_1F - warp_def 9, 13, 10, VICTORY_ROAD - warp_def 10, 13, 10, VICTORY_ROAD + db 4 ; warp events + warp_event 9, 5, 1, INDIGO_PLATEAU_POKECENTER_1F + warp_event 10, 5, 2, INDIGO_PLATEAU_POKECENTER_1F + warp_event 9, 13, 10, VICTORY_ROAD + warp_event 10, 13, 10, VICTORY_ROAD -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 11, 7, BGEVENT_READ, IndigoPlateauSign -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Route24.asm b/maps/Route24.asm index afb4a514e..ada8cdab1 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -2,11 +2,9 @@ const_value set 2 const ROUTE24_ROCKET Route24_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RocketScript_0x1adbfa: faceplayer @@ -24,15 +22,15 @@ RocketScript_0x1adbfa: opentext writetext UnknownText_0x1addc0 buttonsound - special Special_FadeOutMusic + special FadeOutMusic writetext UnknownText_0x1adee1 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear ROUTE24_ROCKET pause 25 - special Special_FadeInQuickly + special FadeInQuickly playmapmusic end @@ -119,18 +117,13 @@ UnknownText_0x1adee1: done Route24_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 0 + db 0 ; warp events -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 8, 7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET diff --git a/maps/Route25.asm b/maps/Route25.asm index 1183600c9..ad9342144 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -12,13 +12,11 @@ const_value set 2 const ROUTE25_POKE_BALL Route25_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -79,7 +77,7 @@ Route25MistyDate2Script: end TrainerSchoolboyDudley: - trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script + trainer SCHOOLBOY, DUDLEY, EVENT_BEAT_SCHOOLBOY_DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script .Script: end_if_just_battled @@ -90,7 +88,7 @@ TrainerSchoolboyDudley: end TrainerLassEllen: - trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script + trainer LASS, ELLEN, EVENT_BEAT_LASS_ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script .Script: end_if_just_battled @@ -101,7 +99,7 @@ TrainerLassEllen: end TrainerSchoolboyJoe: - trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script + trainer SCHOOLBOY, JOE, EVENT_BEAT_SCHOOLBOY_JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script .Script: end_if_just_battled @@ -112,7 +110,7 @@ TrainerSchoolboyJoe: end TrainerLassLaura: - trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script + trainer LASS, LAURA, EVENT_BEAT_LASS_LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script .Script: end_if_just_battled @@ -123,7 +121,7 @@ TrainerLassLaura: end TrainerCamperLloyd: - trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script + trainer CAMPER, LLOYD, EVENT_BEAT_CAMPER_LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script .Script: end_if_just_battled @@ -134,7 +132,7 @@ TrainerCamperLloyd: end TrainerLassShannon: - trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script + trainer LASS, SHANNON, EVENT_BEAT_LASS_SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script .Script: end_if_just_battled @@ -145,7 +143,7 @@ TrainerLassShannon: end TrainerSupernerdPat: - trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script + trainer SUPER_NERD, PAT, EVENT_BEAT_SUPER_NERD_PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script .Script: end_if_just_battled @@ -191,7 +189,7 @@ Route25Protein: itemball PROTEIN Route25HiddenPotion: - hiddenitem EVENT_ROUTE_25_HIDDEN_POTION, POTION + hiddenitem POTION, EVENT_ROUTE_25_HIDDEN_POTION MovementData_0x19efe8: big_step DOWN @@ -430,25 +428,20 @@ BillsHouseSignText: done Route25_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 47, 5, 1, BILLS_HOUSE + db 1 ; warp events + warp_event 47, 5, 1, BILLS_HOUSE -.CoordEvents: - db 2 + db 2 ; coord events coord_event 42, 6, 1, Route25MistyDate1Script coord_event 42, 7, 1, Route25MistyDate2Script -.BGEvents: - db 2 + db 2 ; bg events bg_event 45, 5, BGEVENT_READ, BillsHouseSign bg_event 4, 5, BGEVENT_ITEM, Route25HiddenPotion -.ObjectEvents: - db 11 + db 11 ; object events object_event 46, 9, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND object_event 46, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1 diff --git a/maps/Route26.asm b/maps/Route26.asm index 25b04283b..9c118d700 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -9,14 +9,12 @@ const_value set 2 const ROUTE26_POKE_BALL Route26_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerCooltrainermJake: - trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script + trainer COOLTRAINERM, JAKE, EVENT_BEAT_COOLTRAINERM_JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script .Script: end_if_just_battled @@ -27,7 +25,7 @@ TrainerCooltrainermJake: end TrainerCooltrainermGaven3: - trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, .Script + trainer COOLTRAINERM, GAVEN3, EVENT_BEAT_COOLTRAINERM_GAVEN, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN @@ -120,7 +118,7 @@ TrainerCooltrainermGaven3: end TrainerCooltrainerfJoyce: - trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script + trainer COOLTRAINERF, JOYCE, EVENT_BEAT_COOLTRAINERF_JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script .Script: end_if_just_battled @@ -131,7 +129,7 @@ TrainerCooltrainerfJoyce: end TrainerCooltrainerfBeth1: - trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, .Script + trainer COOLTRAINERF, BETH1, EVENT_BEAT_COOLTRAINERF_BETH, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH @@ -224,7 +222,7 @@ TrainerCooltrainerfBeth1: end TrainerPsychicRichard: - trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script + trainer PSYCHIC_T, RICHARD, EVENT_BEAT_PSYCHIC_RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script .Script: end_if_just_battled @@ -235,7 +233,7 @@ TrainerPsychicRichard: end TrainerFisherScott: - trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script + trainer FISHER, SCOTT, EVENT_BEAT_FISHER_SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script .Script: end_if_just_battled @@ -413,24 +411,19 @@ Route26SignText: done Route26_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 7, 5, 3, VICTORY_ROAD_GATE - warp_def 15, 57, 1, ROUTE_26_HEAL_SPEECH_HOUSE - warp_def 5, 71, 1, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE + db 3 ; warp events + warp_event 7, 5, 3, VICTORY_ROAD_GATE + warp_event 15, 57, 1, ROUTE_26_HEAL_HOUSE + warp_event 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 8, 6, BGEVENT_READ, Route26Sign -.ObjectEvents: - db 8 + db 8 ; object events object_event 14, 24, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermJake, -1 object_event 9, 38, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1 object_event 10, 56, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealHouse.asm index d1759dc9d..453ec4693 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealHouse.asm @@ -1,12 +1,10 @@ const_value set 2 - const ROUTE26HEALSPEECHHOUSE_TEACHER + const ROUTE26HEALHOUSE_TEACHER -Route26HealSpeechHouse_MapScripts: -.SceneScripts: - db 0 +Route26HealHouse_MapScripts: + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TeacherScript_0x7b125: faceplayer @@ -14,13 +12,13 @@ TeacherScript_0x7b125: writetext UnknownText_0x7b14d waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings playmusic MUSIC_HEAL special HealParty pause 60 - special Special_FadeInQuickly + special FadeInQuickly special RestartMapMusic opentext writetext UnknownText_0x7b18b @@ -48,23 +46,18 @@ UnknownText_0x7b18b: para "Keep at it!" done -Route26HealSpeechHouse_MapEvents: - ; filler - db 0, 0 +Route26HealHouse_MapEvents: + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, ROUTE_26 - warp_def 3, 7, 2, ROUTE_26 + db 2 ; warp events + warp_event 2, 7, 2, ROUTE_26 + warp_event 3, 7, 2, ROUTE_26 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, Route26HealHouseBookshelf bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1 diff --git a/maps/Route27.asm b/maps/Route27.asm index 7df5d61a6..2190b9520 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -10,13 +10,11 @@ const_value set 2 const ROUTE27_FISHER Route27_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -49,7 +47,7 @@ Route27FisherScript: jumptextfaceplayer Route27FisherText TrainerPsychicGilbert: - trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, .Script + trainer PSYCHIC_T, GILBERT, EVENT_BEAT_PSYCHIC_GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, .Script .Script: end_if_just_battled @@ -60,7 +58,7 @@ TrainerPsychicGilbert: end TrainerBirdKeeperJose2: - trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, BirdKeeperJose2SeenText, BirdKeeperJose2BeatenText, 0, .Script + trainer BIRD_KEEPER, JOSE2, EVENT_BEAT_BIRD_KEEPER_JOSE2, BirdKeeperJose2SeenText, BirdKeeperJose2BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE @@ -173,7 +171,7 @@ TrainerBirdKeeperJose2: end TrainerCooltrainermBlake: - trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, .Script + trainer COOLTRAINERM, BLAKE, EVENT_BEAT_COOLTRAINERM_BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, .Script .Script: end_if_just_battled @@ -184,7 +182,7 @@ TrainerCooltrainermBlake: end TrainerCooltrainermBrian: - trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, .Script + trainer COOLTRAINERM, BRIAN, EVENT_BEAT_COOLTRAINERM_BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, .Script .Script: end_if_just_battled @@ -195,7 +193,7 @@ TrainerCooltrainermBrian: end TrainerCooltrainerfReena: - trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReenaSeenText, CooltrainerfReenaBeatenText, 0, .Script + trainer COOLTRAINERF, REENA1, EVENT_BEAT_COOLTRAINERF_REENA, CooltrainerfReenaSeenText, CooltrainerfReenaBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA @@ -288,7 +286,7 @@ TrainerCooltrainerfReena: end TrainerCooltrainerfMegan: - trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, .Script + trainer COOLTRAINERF, MEGAN, EVENT_BEAT_COOLTRAINERF_MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, .Script .Script: end_if_just_battled @@ -468,26 +466,21 @@ TohjoFallsSignText: done Route27_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 33, 7, 1, ROUTE_27_SANDSTORM_HOUSE - warp_def 26, 5, 1, TOHJO_FALLS - warp_def 36, 5, 2, TOHJO_FALLS + db 3 ; warp events + warp_event 33, 7, 1, ROUTE_27_SANDSTORM_HOUSE + warp_event 26, 5, 1, TOHJO_FALLS + warp_event 36, 5, 2, TOHJO_FALLS -.CoordEvents: - db 2 + db 2 ; coord events coord_event 18, 10, 0, UnknownScript_0x1a0873 coord_event 19, 10, 0, UnknownScript_0x1a0881 -.BGEvents: - db 1 + db 1 ; bg events bg_event 25, 7, BGEVENT_READ, TohjoFallsSign -.ObjectEvents: - db 9 + db 9 ; object events object_event 48, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1 object_event 58, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1 object_event 72, 10, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 629af1536..cd78cb62c 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -2,18 +2,16 @@ const_value set 2 const ROUTE27SANDSTORMHOUSE_GRANNY Route27SandstormHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SandstormHouseWoman: faceplayer opentext checkevent EVENT_GOT_TM37_SANDSTORM iftrue .AlreadyGotItem - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness writetext SandstormHouseWomanText1 buttonsound if_greater_than 150 - 1, .Loyal @@ -94,22 +92,17 @@ SandstormHouseWomanDisloyalText: done Route27SandstormHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, ROUTE_27 - warp_def 3, 7, 1, ROUTE_27 + db 2 ; warp events + warp_event 2, 7, 1, ROUTE_27 + warp_event 3, 7, 1, ROUTE_27 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, SandstormHouseBookshelf bg_event 1, 1, BGEVENT_READ, SandstormHouseBookshelf -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1 diff --git a/maps/Route28.asm b/maps/Route28.asm index 0599fd9d9..ad729079d 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -1,36 +1,29 @@ Route28_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route28Sign: jumptext Route28SignText Route28HiddenRareCandy: - hiddenitem EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_ROUTE_28_HIDDEN_RARE_CANDY Route28SignText: text "ROUTE 28" done Route28_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 7, 3, 1, ROUTE_28_FAMOUS_SPEECH_HOUSE - warp_def 33, 5, 7, VICTORY_ROAD_GATE + db 2 ; warp events + warp_event 7, 3, 1, ROUTE_28_STEEL_WING_HOUSE + warp_event 33, 5, 7, VICTORY_ROAD_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 31, 5, BGEVENT_READ, Route28Sign bg_event 25, 2, BGEVENT_ITEM, Route28HiddenRareCandy -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28SteelWingHouse.asm index 662e7279b..b3c7856bb 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -1,14 +1,12 @@ const_value set 2 - const ROUTE28FAMOUSSPEECHHOUSE_CELEBRITY - const ROUTE28FAMOUSSPEECHHOUSE_FEAROW + const ROUTE28STEELWINGHOUSE_CELEBRITY + const ROUTE28STEELWINGHOUSE_FEAROW -Route28FamousSpeechHouse_MapScripts: -.SceneScripts: - db 1 +Route28SteelWingHouse_MapScripts: + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -70,24 +68,19 @@ CelebritysFearowText: text "FEAROW: Feero!" done -Route28FamousSpeechHouse_MapEvents: - ; filler - db 0, 0 +Route28SteelWingHouse_MapEvents: + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, ROUTE_28 - warp_def 3, 7, 1, ROUTE_28 + db 2 ; warp events + warp_event 2, 7, 1, ROUTE_28 + warp_event 3, 7, 1, ROUTE_28 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, CelebrityHouseBookshelf bg_event 1, 1, BGEVENT_READ, CelebrityHouseBookshelf -.ObjectEvents: - db 2 + db 2 ; object events object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1 object_event 6, 5, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1 diff --git a/maps/Route29.asm b/maps/Route29.asm index 6c7239d92..0f018ac82 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -9,13 +9,11 @@ const_value set 2 const ROUTE29_POKE_BALL Route29_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Tuscany .DummyScene0: @@ -416,25 +414,20 @@ Route29Sign2Text: done Route29_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 27, 1, 3, ROUTE_29_ROUTE_46_GATE + db 1 ; warp events + warp_event 27, 1, 3, ROUTE_29_ROUTE_46_GATE -.CoordEvents: - db 2 + db 2 ; coord events coord_event 53, 8, 1, Route29Tutorial1 coord_event 53, 9, 1, Route29Tutorial2 -.BGEvents: - db 2 + db 2 ; bg events bg_event 51, 7, BGEVENT_READ, Route29Sign1 bg_event 3, 5, BGEVENT_READ, Route29Sign2 -.ObjectEvents: - db 8 + db 8 ; object events object_event 50, 12, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1 object_event 27, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29YoungsterScript, -1 object_event 15, 11, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1 diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm index f0b69ab5d..ec28965b8 100644 --- a/maps/Route29Route46Gate.asm +++ b/maps/Route29Route46Gate.asm @@ -3,11 +3,9 @@ const_value set 2 const ROUTE29ROUTE46GATE_YOUNGSTER Route29Route46Gate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route29Route46GateOfficerScript: jumptextfaceplayer Route29Route46GateOfficerText @@ -37,23 +35,18 @@ Route29Route46GateYoungsterText: done Route29Route46Gate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 1, ROUTE_46 - warp_def 5, 0, 2, ROUTE_46 - warp_def 4, 7, 1, ROUTE_29 - warp_def 5, 7, 1, ROUTE_29 + db 4 ; warp events + warp_event 4, 0, 1, ROUTE_46 + warp_event 5, 0, 2, ROUTE_46 + warp_event 4, 7, 1, ROUTE_29 + warp_event 5, 7, 1, ROUTE_29 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events 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 60585b267..d3626f169 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -2,11 +2,9 @@ const_value set 2 const ROUTE2GATE_SCIENTIST Route2Gate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route2GateScientistScript: jumptextfaceplayer Route2GateScientistText @@ -26,22 +24,17 @@ Route2GateScientistText: done Route2Gate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 3, ROUTE_2 - warp_def 5, 0, 4, ROUTE_2 - warp_def 4, 7, 2, ROUTE_2 - warp_def 5, 7, 2, ROUTE_2 + db 4 ; warp events + warp_event 4, 0, 3, ROUTE_2 + warp_event 5, 0, 4, ROUTE_2 + warp_event 4, 7, 2, ROUTE_2 + warp_event 5, 7, 2, ROUTE_2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 6, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetHouse.asm index 231b568ed..451d9d177 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -1,12 +1,10 @@ const_value set 2 - const ROUTE2NUGGETSPEECHHOUSE_FISHER + const ROUTE2NUGGETHOUSE_FISHER -Route2NuggetSpeechHouse_MapScripts: -.SceneScripts: - db 0 +Route2NuggetHouse_MapScripts: + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FisherScript_0x9b847: faceplayer @@ -25,7 +23,7 @@ FisherScript_0x9b847: closetext end -Route2NuggetSpeechHouseBookshelf: +Route2NuggetHouseBookshelf: ; unused jumpstd difficultbookshelf @@ -52,21 +50,16 @@ UnknownText_0x9b8e5: line "have to do!" done -Route2NuggetSpeechHouse_MapEvents: - ; filler - db 0, 0 +Route2NuggetHouse_MapEvents: + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, ROUTE_2 - warp_def 3, 7, 1, ROUTE_2 + db 2 ; warp events + warp_event 2, 7, 1, ROUTE_2 + warp_event 3, 7, 1, ROUTE_2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1 diff --git a/maps/Route3.asm b/maps/Route3.asm index 6ce01aeb1..65c8a35d2 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -5,14 +5,12 @@ const_value set 2 const ROUTE3_FISHER2 Route3_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerFirebreatherOtis: - trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script + trainer FIREBREATHER, OTIS, EVENT_BEAT_FIREBREATHER_OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script .Script: end_if_just_battled @@ -23,7 +21,7 @@ TrainerFirebreatherOtis: end TrainerYoungsterWarren: - trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, .Script + trainer YOUNGSTER, WARREN, EVENT_BEAT_YOUNGSTER_WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, .Script .Script: end_if_just_battled @@ -34,7 +32,7 @@ TrainerYoungsterWarren: end TrainerYoungsterJimmy: - trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, .Script + trainer YOUNGSTER, JIMMY, EVENT_BEAT_YOUNGSTER_JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, .Script .Script: end_if_just_battled @@ -45,7 +43,7 @@ TrainerYoungsterJimmy: end TrainerFirebreatherBurt: - trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script + trainer FIREBREATHER, BURT, EVENT_BEAT_FIREBREATHER_BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script .Script: end_if_just_battled @@ -133,22 +131,17 @@ UnknownText_0x1ae163: done Route3_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 52, 1, 1, MOUNT_MOON + db 1 ; warp events + warp_event 52, 1, 1, MOUNT_MOON -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 49, 13, BGEVENT_READ, MapRoute3Signpost0Script -.ObjectEvents: - db 4 + db 4 ; object events object_event 26, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1 object_event 10, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1 object_event 16, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1 diff --git a/maps/Route30.asm b/maps/Route30.asm index df8b593d6..744846670 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -12,11 +12,9 @@ const_value set 2 const ROUTE30_POKE_BALL Route30_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks YoungsterJoey_ImportantBattleScript: waitsfx @@ -39,7 +37,7 @@ YoungsterJoey_ImportantBattleScript: end TrainerYoungsterJoey: - trainer EVENT_BEAT_YOUNGSTER_JOEY, YOUNGSTER, JOEY1, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, .Script + trainer YOUNGSTER, JOEY1, EVENT_BEAT_YOUNGSTER_JOEY, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY @@ -186,7 +184,7 @@ TrainerYoungsterJoey: end TrainerYoungsterMikey: - trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script + trainer YOUNGSTER, MIKEY, EVENT_BEAT_YOUNGSTER_MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script .Script: end_if_just_battled @@ -197,7 +195,7 @@ TrainerYoungsterMikey: end TrainerBugCatcherDon: - trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, BugCatcherDonSeenText, BugCatcherDonBeatenText, 0, .Script + trainer BUG_CATCHER, DON, EVENT_BEAT_BUG_CATCHER_DON, BugCatcherDonSeenText, BugCatcherDonBeatenText, 0, .Script .Script: end_if_just_battled @@ -248,7 +246,7 @@ Route30FruitTree2: fruittree FRUITTREE_ROUTE_30_2 Route30HiddenPotion: - hiddenitem EVENT_ROUTE_30_HIDDEN_POTION, POTION + hiddenitem POTION, EVENT_ROUTE_30_HIDDEN_POTION Route30_JoeysRattataAttacksMovement: fix_facing @@ -407,27 +405,22 @@ YoungsterJoeyText_GiveHPUpAfterBattle: done Route30_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 7, 39, 1, ROUTE_30_BERRY_SPEECH_HOUSE - warp_def 17, 5, 1, MR_POKEMONS_HOUSE + db 2 ; warp events + warp_event 7, 39, 1, ROUTE_30_BERRY_HOUSE + warp_event 17, 5, 1, MR_POKEMONS_HOUSE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 5 + db 5 ; bg events bg_event 9, 43, BGEVENT_READ, Route30Sign bg_event 13, 29, BGEVENT_READ, MrPokemonsHouseDirectionsSign bg_event 15, 5, BGEVENT_READ, MrPokemonsHouseSign bg_event 3, 21, BGEVENT_READ, Route30TrainerTips bg_event 14, 9, BGEVENT_ITEM, Route30HiddenPotion -.ObjectEvents: - db 11 + db 11 ; object events object_event 5, 26, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE object_event 2, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY object_event 5, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerryHouse.asm index 96605b3c8..a6586ce6a 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -1,12 +1,10 @@ const_value set 2 - const ROUTE30BERRYSPEECHHOUSE_POKEFAN_M + const ROUTE30BERRYHOUSE_POKEFAN_M -Route30BerrySpeechHouse_MapScripts: -.SceneScripts: - db 0 +Route30BerryHouse_MapScripts: + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PokefanMScript_0x196d64: faceplayer @@ -25,7 +23,7 @@ UnknownScript_0x196d7d: closetext end -Route30BerrySpeechHouseBookshelf: +Route30BerryHouseBookshelf: jumpstd magazinebookshelf UnknownText_0x196d82: @@ -46,23 +44,18 @@ UnknownText_0x196dec: cont "drop right off." done -Route30BerrySpeechHouse_MapEvents: - ; filler - db 0, 0 +Route30BerryHouse_MapEvents: + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, ROUTE_30 - warp_def 3, 7, 1, ROUTE_30 + db 2 ; warp events + warp_event 2, 7, 1, ROUTE_30 + warp_event 3, 7, 1, ROUTE_30 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, Route30BerryHouseBookshelf + bg_event 1, 1, BGEVENT_READ, Route30BerryHouseBookshelf -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1 diff --git a/maps/Route31.asm b/maps/Route31.asm index f8ea93d2a..3bb7f6871 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -8,11 +8,9 @@ const_value set 2 const ROUTE31_POKE_BALL2 Route31_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .CheckMomCall .CheckMomCall: @@ -25,7 +23,7 @@ Route31_MapScripts: return TrainerBugCatcherWade1: - trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, BugCatcherWade1SeenText, BugCatcherWade1BeatenText, 0, .Script + trainer BUG_CATCHER, WADE1, EVENT_BEAT_BUG_CATCHER_WADE, BugCatcherWade1SeenText, BugCatcherWade1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE @@ -418,25 +416,20 @@ DarkCaveSignText: done Route31_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 4, 6, 3, ROUTE_31_VIOLET_GATE - warp_def 4, 7, 4, ROUTE_31_VIOLET_GATE - warp_def 34, 5, 1, DARK_CAVE_VIOLET_ENTRANCE + db 3 ; warp events + warp_event 4, 6, 3, ROUTE_31_VIOLET_GATE + warp_event 4, 7, 4, ROUTE_31_VIOLET_GATE + warp_event 34, 5, 1, DARK_CAVE_VIOLET_ENTRANCE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 7, 5, BGEVENT_READ, Route31Sign bg_event 31, 5, BGEVENT_READ, DarkCaveSign -.ObjectEvents: - db 7 + db 7 ; object events object_event 17, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1 object_event 9, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1 object_event 21, 13, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherWade1, -1 diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 6d62f9398..a85a0bc44 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -3,11 +3,9 @@ const_value set 2 const ROUTE31VIOLETGATE_COOLTRAINER_F Route31VioletGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route31VioletGateOfficerScript: jumptextfaceplayer Route31VioletGateOfficerText @@ -28,23 +26,18 @@ Route31VioletGateCooltrainerFText: done Route31VioletGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 4, 8, VIOLET_CITY - warp_def 0, 5, 9, VIOLET_CITY - warp_def 9, 4, 1, ROUTE_31 - warp_def 9, 5, 2, ROUTE_31 + db 4 ; warp events + warp_event 0, 4, 8, VIOLET_CITY + warp_event 0, 5, 9, VIOLET_CITY + warp_event 9, 4, 1, ROUTE_31 + warp_event 9, 5, 2, ROUTE_31 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1 object_event 1, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1 diff --git a/maps/Route32.asm b/maps/Route32.asm index afd946c2b..7035fe541 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -15,14 +15,12 @@ const_value set 2 const ROUTE32_POKE_BALL2 Route32_MapScripts: -.SceneScripts: - db 3 + db 3 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 scene_script .DummyScene2 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Frieda .DummyScene0: @@ -144,7 +142,7 @@ _OfferToSellSlowpokeTail: end TrainerCamperRoland: - trainer EVENT_BEAT_CAMPER_ROLAND, CAMPER, ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, .Script + trainer CAMPER, ROLAND, EVENT_BEAT_CAMPER_ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, .Script .Script: end_if_just_battled @@ -155,7 +153,7 @@ TrainerCamperRoland: end TrainerFisherJustin: - trainer EVENT_BEAT_FISHER_JUSTIN, FISHER, JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, .Script + trainer FISHER, JUSTIN, EVENT_BEAT_FISHER_JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, .Script .Script: end_if_just_battled @@ -166,7 +164,7 @@ TrainerFisherJustin: end TrainerFisherRalph1: - trainer EVENT_BEAT_FISHER_RALPH, FISHER, RALPH1, FisherRalph1SeenText, FisherRalph1BeatenText, 0, .Script + trainer FISHER, RALPH1, EVENT_BEAT_FISHER_RALPH, FisherRalph1SeenText, FisherRalph1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_FISHER_RALPH @@ -174,7 +172,7 @@ TrainerFisherRalph1: opentext checkflag ENGINE_RALPH iftrue .Rematch - checkflag ENGINE_SPECIAL_WILDDATA + checkflag ENGINE_FISH_SWARM iftrue .Swarm checkcellnum PHONE_FISHER_RALPH iftrue .NumberAccepted @@ -291,7 +289,7 @@ TrainerFisherRalph1: end TrainerFisherHenry: - trainer EVENT_BEAT_FISHER_HENRY, FISHER, HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, .Script + trainer FISHER, HENRY, EVENT_BEAT_FISHER_HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, .Script .Script: end_if_just_battled @@ -302,7 +300,7 @@ TrainerFisherHenry: end TrainerPicnickerLiz1: - trainer EVENT_BEAT_PICNICKER_LIZ, PICNICKER, LIZ1, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, 0, .Script + trainer PICNICKER, LIZ1, EVENT_BEAT_PICNICKER_LIZ, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_PICNICKER_LIZ @@ -419,7 +417,7 @@ TrainerPicnickerLiz1: end TrainerYoungsterAlbert: - trainer EVENT_BEAT_YOUNGSTER_ALBERT, YOUNGSTER, ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, .Script + trainer YOUNGSTER, ALBERT, EVENT_BEAT_YOUNGSTER_ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, .Script .Script: end_if_just_battled @@ -430,7 +428,7 @@ TrainerYoungsterAlbert: end TrainerYoungsterGordon: - trainer EVENT_BEAT_YOUNGSTER_GORDON, YOUNGSTER, GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, .Script + trainer YOUNGSTER, GORDON, EVENT_BEAT_YOUNGSTER_GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, .Script .Script: end_if_just_battled @@ -441,7 +439,7 @@ TrainerYoungsterGordon: end TrainerBirdKeeperPeter: - trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, BirdKeeperPeterSeenText, BirdKeeperPeterBeatenText, 0, .Script + trainer BIRD_KEEPER, PETER, EVENT_BEAT_BIRD_KEEPER_PETER, BirdKeeperPeterSeenText, BirdKeeperPeterBeatenText, 0, .Script .Script: end_if_just_battled @@ -506,10 +504,10 @@ Route32PokecenterSign: jumpstd pokecentersign Route32HiddenGreatBall: - hiddenitem EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL + hiddenitem GREAT_BALL, EVENT_ROUTE_32_HIDDEN_GREAT_BALL Route32HiddenSuperPotion: - hiddenitem EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem SUPER_POTION, EVENT_ROUTE_32_HIDDEN_SUPER_POTION Movement_Route32CooltrainerMPushesYouBackToViolet: step UP @@ -929,23 +927,19 @@ Route32UnionCaveSignText: done Route32_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 11, 73, 1, ROUTE_32_POKECENTER_1F - warp_def 4, 2, 3, ROUTE_32_RUINS_OF_ALPH_GATE - warp_def 4, 3, 4, ROUTE_32_RUINS_OF_ALPH_GATE - warp_def 6, 79, 4, UNION_CAVE_1F - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 11, 73, 1, ROUTE_32_POKECENTER_1F + warp_event 4, 2, 3, ROUTE_32_RUINS_OF_ALPH_GATE + warp_event 4, 3, 4, ROUTE_32_RUINS_OF_ALPH_GATE + warp_event 6, 79, 4, UNION_CAVE_1F + + db 2 ; coord events coord_event 18, 8, 0, Route32CooltrainerMStopsYouScene coord_event 7, 71, 1, Route32WannaBuyASlowpokeTailScript -.BGEvents: - db 6 + db 6 ; bg events bg_event 13, 5, BGEVENT_READ, Route32Sign bg_event 9, 1, BGEVENT_READ, Route32RuinsSign bg_event 10, 84, BGEVENT_READ, Route32UnionCaveSign @@ -953,8 +947,7 @@ Route32_MapEvents: bg_event 12, 67, BGEVENT_ITEM, Route32HiddenGreatBall bg_event 11, 40, BGEVENT_ITEM, Route32HiddenSuperPotion -.ObjectEvents: - db 14 + db 14 ; object events object_event 8, 49, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1 object_event 12, 56, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherRalph1, -1 object_event 6, 48, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1 diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 5bedc7853..3c852bff5 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -4,11 +4,9 @@ const_value set 2 const ROUTE32POKECENTER1F_COOLTRAINER_F Route32Pokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x69b52: jumpstd pokecenternurse @@ -95,23 +93,18 @@ Route32Pokecenter1FCooltrainerFText: done Route32Pokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 1, ROUTE_32 - warp_def 4, 7, 1, ROUTE_32 - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 1, ROUTE_32 + warp_event 4, 7, 1, ROUTE_32 + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1 object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index 345e46dd4..b2b6af2d0 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -4,11 +4,9 @@ const_value set 2 const ROUTE32RUINSOFALPHGATE_YOUNGSTER Route32RuinsOfAlphGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route32RuinsOfAlphGateOfficerScript: jumptextfaceplayer Route32RuinsOfAlphGateOfficerText @@ -47,24 +45,19 @@ Route32RuinsOfAlphGateYoungsterText: done Route32RuinsOfAlphGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 4, 10, RUINS_OF_ALPH_OUTSIDE - warp_def 0, 5, 11, RUINS_OF_ALPH_OUTSIDE - warp_def 9, 4, 2, ROUTE_32 - warp_def 9, 5, 3, ROUTE_32 + db 4 ; warp events + warp_event 0, 4, 10, RUINS_OF_ALPH_OUTSIDE + warp_event 0, 5, 11, RUINS_OF_ALPH_OUTSIDE + warp_event 9, 4, 2, ROUTE_32 + warp_event 9, 5, 3, ROUTE_32 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1 object_event 8, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1 object_event 1, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1 diff --git a/maps/Route33.asm b/maps/Route33.asm index be2abbf4c..c728f6496 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -4,17 +4,15 @@ const_value set 2 const ROUTE33_FRUIT_TREE Route33_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route33LassScript: jumptextfaceplayer Route33LassText TrainerHikerAnthony: - trainer EVENT_BEAT_HIKER_ANTHONY, HIKER, ANTHONY2, HikerAnthony2SeenText, HikerAnthony2BeatenText, 0, .Script + trainer HIKER, ANTHONY2, EVENT_BEAT_HIKER_ANTHONY, HikerAnthony2SeenText, HikerAnthony2BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_HIKER_ANTHONY @@ -195,22 +193,17 @@ Route33SignText: done Route33_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 11, 9, 3, UNION_CAVE_1F + db 1 ; warp events + warp_event 11, 9, 3, UNION_CAVE_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 11, 11, BGEVENT_READ, Route33Sign -.ObjectEvents: - db 3 + db 3 ; object events object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1 object_event 13, 16, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1 object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1 diff --git a/maps/Route34.asm b/maps/Route34.asm index 786ffb022..bd94515e3 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -14,11 +14,9 @@ const_value set 2 const ROUTE34_POKE_BALL Route34_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: @@ -56,7 +54,7 @@ Route34_MapScripts: DayCareManScript_Outside: faceplayer opentext - special Special_DayCareManOutside + special DayCareManOutside waitbutton closetext if_equal TRUE, .end_fail @@ -77,18 +75,18 @@ DayCareManScript_Outside: DayCareMon1Script: opentext - special Special_DayCareMon1 + special DayCareMon1 closetext end DayCareMon2Script: opentext - special Special_DayCareMon2 + special DayCareMon2 closetext end TrainerCamperTodd1: - trainer EVENT_BEAT_CAMPER_TODD, CAMPER, TODD1, CamperTodd1SeenText, CamperTodd1BeatenText, 0, .Script + trainer CAMPER, TODD1, EVENT_BEAT_CAMPER_TODD, CamperTodd1SeenText, CamperTodd1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_CAMPER_TODD @@ -213,7 +211,7 @@ TrainerCamperTodd1: end TrainerPicnickerGina1: - trainer EVENT_BEAT_PICNICKER_GINA, PICNICKER, GINA1, PicnickerGina1SeenText, PicnickerGina1BeatenText, 0, .Script + trainer PICNICKER, GINA1, EVENT_BEAT_PICNICKER_GINA, PicnickerGina1SeenText, PicnickerGina1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_PICNICKER_GINA @@ -382,7 +380,7 @@ OfficerKeithScript: end TrainerYoungsterSamuel: - trainer EVENT_BEAT_YOUNGSTER_SAMUEL, YOUNGSTER, SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, .Script + trainer YOUNGSTER, SAMUEL, EVENT_BEAT_YOUNGSTER_SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, .Script .Script: end_if_just_battled @@ -393,7 +391,7 @@ TrainerYoungsterSamuel: end TrainerYoungsterIan: - trainer EVENT_BEAT_YOUNGSTER_IAN, YOUNGSTER, IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, .Script + trainer YOUNGSTER, IAN, EVENT_BEAT_YOUNGSTER_IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, .Script .Script: end_if_just_battled @@ -404,7 +402,7 @@ TrainerYoungsterIan: end TrainerPokefanmBrandon: - trainer EVENT_BEAT_POKEFANM_BRANDON, POKEFANM, BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, .Script + trainer POKEFANM, BRANDON, EVENT_BEAT_POKEFANM_BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, .Script .Script: end_if_just_battled @@ -415,7 +413,7 @@ TrainerPokefanmBrandon: end TrainerCooltrainerfIrene: - trainer EVENT_BEAT_COOLTRAINERF_IRENE, COOLTRAINERF, IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, .Script + trainer COOLTRAINERF, IRENE, EVENT_BEAT_COOLTRAINERF_IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, .Script .Script: end_if_just_battled @@ -434,7 +432,7 @@ TrainerCooltrainerfIrene: end TrainerCooltrainerfJenn: - trainer EVENT_BEAT_COOLTRAINERF_JENN, COOLTRAINERF, JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, .Script + trainer COOLTRAINERF, JENN, EVENT_BEAT_COOLTRAINERF_JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, .Script .Script: end_if_just_battled @@ -453,7 +451,7 @@ TrainerCooltrainerfJenn: end TrainerCooltrainerfKate: - trainer EVENT_BEAT_COOLTRAINERF_KATE, COOLTRAINERF, KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, .Script + trainer COOLTRAINERF, KATE, EVENT_BEAT_COOLTRAINERF_KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, .Script .Script: end_if_just_battled @@ -488,10 +486,10 @@ Route34Nugget: itemball NUGGET Route34HiddenRareCandy: - hiddenitem EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_ROUTE_34_HIDDEN_RARE_CANDY Route34HiddenSuperPotion: - hiddenitem EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem SUPER_POTION, EVENT_ROUTE_34_HIDDEN_SUPER_POTION Route34MovementData_DayCareManWalksBackInside: slow_step LEFT @@ -761,30 +759,25 @@ DayCareSignText: done Route34_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 13, 37, 1, ROUTE_34_ILEX_FOREST_GATE - warp_def 14, 37, 2, ROUTE_34_ILEX_FOREST_GATE - warp_def 11, 14, 1, DAY_CARE - warp_def 11, 15, 2, DAY_CARE - warp_def 13, 15, 3, DAY_CARE - -.CoordEvents: - db 0 - -.BGEvents: - db 5 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 13, 37, 1, ROUTE_34_ILEX_FOREST_GATE + warp_event 14, 37, 2, ROUTE_34_ILEX_FOREST_GATE + warp_event 11, 14, 1, DAY_CARE + warp_event 11, 15, 2, DAY_CARE + warp_event 13, 15, 3, DAY_CARE + + db 0 ; coord events + + db 5 ; bg events bg_event 12, 6, BGEVENT_READ, Route34Sign bg_event 13, 33, BGEVENT_READ, Route34TrainerTips bg_event 10, 13, BGEVENT_READ, DayCareSign bg_event 8, 32, BGEVENT_ITEM, Route34HiddenRareCandy bg_event 17, 19, BGEVENT_ITEM, Route34HiddenSuperPotion -.ObjectEvents: - db 13 + db 13 ; object events object_event 13, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1 object_event 15, 32, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1 object_event 11, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterIan, -1 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 38dc04729..f73e488bc 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -5,11 +5,9 @@ const_value set 2 const ROUTE34ILEXFORESTGATE_TEACHER2 Route34IlexForestGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .IsForestRestless .IsForestRestless: @@ -136,25 +134,20 @@ Route34IlexForestGateLassText: done Route34IlexForestGate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 4, 0, 1, ROUTE_34 - warp_def 5, 0, 2, ROUTE_34 - warp_def 4, 7, 1, ILEX_FOREST - warp_def 5, 7, 1, ILEX_FOREST - -.CoordEvents: - db 1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 4, 0, 1, ROUTE_34 + warp_event 5, 0, 2, ROUTE_34 + warp_event 4, 7, 1, ILEX_FOREST + warp_event 5, 7, 1, ILEX_FOREST + + db 1 ; coord events coord_event 4, 7, 0, UnknownScript_0x62d3d -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1 object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS diff --git a/maps/Route35.asm b/maps/Route35.asm index 7d9aa9e53..3a4b59f34 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -12,14 +12,12 @@ const_value set 2 const ROUTE35_POKE_BALL Route35_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperBryan: - trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script + trainer BIRD_KEEPER, BRYAN, EVENT_BEAT_BIRD_KEEPER_BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script .Script: end_if_just_battled @@ -30,7 +28,7 @@ TrainerBirdKeeperBryan: end TrainerJugglerIrwin: - trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, .Script + trainer JUGGLER, IRWIN1, EVENT_BEAT_JUGGLER_IRWIN, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN @@ -85,7 +83,7 @@ Route35RematchM: end TrainerCamperIvan: - trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, .Script + trainer CAMPER, IVAN, EVENT_BEAT_CAMPER_IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, .Script .Script: end_if_just_battled @@ -96,7 +94,7 @@ TrainerCamperIvan: end TrainerCamperElliot: - trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, .Script + trainer CAMPER, ELLIOT, EVENT_BEAT_CAMPER_ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, .Script .Script: end_if_just_battled @@ -107,7 +105,7 @@ TrainerCamperElliot: end TrainerPicnickerBrooke: - trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, .Script + trainer PICNICKER, BROOKE, EVENT_BEAT_PICNICKER_BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, .Script .Script: end_if_just_battled @@ -118,7 +116,7 @@ TrainerPicnickerBrooke: end TrainerPicnickerKim: - trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, .Script + trainer PICNICKER, KIM, EVENT_BEAT_PICNICKER_KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, .Script .Script: end_if_just_battled @@ -129,7 +127,7 @@ TrainerPicnickerKim: end TrainerBugCatcherArnie: - trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, BugCatcherArnieSeenText, BugCatcherArnieBeatenText, 0, .Script + trainer BUG_CATCHER, ARNIE1, EVENT_BEAT_BUG_CATCHER_ARNIE, BugCatcherArnieSeenText, BugCatcherArnieBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE @@ -226,7 +224,7 @@ TrainerBugCatcherArnie: end TrainerFirebreatherWalt: - trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, .Script + trainer FIREBREATHER, WALT, EVENT_BEAT_FIREBREATHER_WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, .Script .Script: end_if_just_battled @@ -463,25 +461,20 @@ Route35SignText: done Route35_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 9, 33, 1, ROUTE_35_GOLDENROD_GATE - warp_def 10, 33, 2, ROUTE_35_GOLDENROD_GATE - warp_def 3, 5, 3, ROUTE_35_NATIONAL_PARK_GATE + db 3 ; warp events + warp_event 9, 33, 1, ROUTE_35_GOLDENROD_GATE + warp_event 10, 33, 2, ROUTE_35_GOLDENROD_GATE + warp_event 3, 5, 3, ROUTE_35_NATIONAL_PARK_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 1, 7, BGEVENT_READ, Route35Sign bg_event 11, 31, BGEVENT_READ, Route35Sign -.ObjectEvents: - db 11 + db 11 ; object events object_event 4, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1 object_event 8, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1 object_event 7, 20, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1 diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index a783781dd..386ac66fe 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -4,11 +4,9 @@ const_value set 2 const ROUTE35GOLDENRODGATE_FISHER Route35GoldenrodGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks OfficerScript_0x69d37: faceplayer @@ -196,24 +194,19 @@ Route35GoldenrodGateFisherText: done Route35GoldenrodGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 1, ROUTE_35 - warp_def 5, 0, 2, ROUTE_35 - warp_def 4, 7, 12, GOLDENROD_CITY - warp_def 5, 7, 12, GOLDENROD_CITY + db 4 ; warp events + warp_event 4, 0, 1, ROUTE_35 + warp_event 5, 0, 2, ROUTE_35 + warp_event 4, 7, 12, GOLDENROD_CITY + warp_event 5, 7, 12, GOLDENROD_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1 object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1 object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1 diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 754591060..8be5b768a 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -4,14 +4,12 @@ const_value set 2 const ROUTE35NATIONALPARKGATE_OFFICER2 Route35NationalParkGate_MapScripts: -.SceneScripts: - db 3 + db 3 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 scene_script .LeaveContestEarly -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable @@ -74,7 +72,7 @@ Route35NationalParkGate_MapScripts: closetext scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47 end @@ -95,7 +93,7 @@ OfficerScript_0x6a204: iffalse Route35NationalParkGate_DeclinedToParticipate checkcode VAR_PARTYCOUNT if_greater_than 1, Route35NationalParkGate_LeaveTheRestBehind - special Special_ContestDropOffMons + special ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER Route35NationalParkGate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER @@ -108,12 +106,12 @@ Route35NationalParkGate_OkayToProceed: writetext UnknownText_0x6a3e2 waitbutton closetext - special Special_GiveParkBalls + special GiveParkBalls scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx - special Special_SelectRandomBugContestContestants + special SelectRandomBugContestContestants warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47 end @@ -134,12 +132,12 @@ Route35NationalParkGate_LeaveTheRestBehind: if_equal 0, Route35NationalParkGate_NoRoomInBox Route35NationalParkGate_LessThanFullParty: ; 6a27d - special Special_CheckFirstMonIsEgg + special CheckFirstMonIsEgg if_equal TRUE, Route35NationalParkGate_FirstMonIsEgg writetext UnknownText_0x6a4c6 yesorno iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind - special Special_ContestDropOffMons + special ContestDropOffMons iftrue Route35NationalParkGate_FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6a537 @@ -438,25 +436,20 @@ UnknownText_0x6a90e: done Route35NationalParkGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 3, 0, 3, NATIONAL_PARK - warp_def 4, 0, 4, NATIONAL_PARK - warp_def 3, 7, 3, ROUTE_35 - warp_def 4, 7, 3, ROUTE_35 + db 4 ; warp events + warp_event 3, 0, 3, NATIONAL_PARK + warp_event 4, 0, 4, NATIONAL_PARK + warp_event 3, 7, 3, ROUTE_35 + warp_event 4, 7, 3, ROUTE_35 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 5, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script -.ObjectEvents: - db 3 + db 3 ; object events object_event 2, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36.asm b/maps/Route36.asm index fceef3306..cad07e31a 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -10,13 +10,11 @@ const_value set 2 const ROUTE36_SUICUNE Route36_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .ArthurCallback .DummyScene0: @@ -94,8 +92,8 @@ DidntCatchSudowoodo: applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN - special Special_LoadUsedSpritesGFX - special Special_RefreshSprites + special LoadUsedSpritesGFX + special RefreshSprites end Route36FloriaScript: @@ -167,7 +165,7 @@ LassScript_0x1940e0: end TrainerSchoolboyAlan1: - trainer EVENT_BEAT_SCHOOLBOY_ALAN, SCHOOLBOY, ALAN1, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, 0, .Script + trainer SCHOOLBOY, ALAN1, EVENT_BEAT_SCHOOLBOY_ALAN, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN @@ -305,7 +303,7 @@ TrainerSchoolboyAlan1: end TrainerPsychicMark: - trainer EVENT_BEAT_PSYCHIC_MARK, PSYCHIC_T, MARK, PsychicMarkSeenText, PsychicMarkBeatenText, 0, .Script + trainer PSYCHIC_T, MARK, EVENT_BEAT_PSYCHIC_MARK, PsychicMarkSeenText, PsychicMarkBeatenText, 0, .Script .Script: end_if_just_battled @@ -660,30 +658,25 @@ Route36TrainerTips2Text: done Route36_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 18, 8, 3, ROUTE_36_NATIONAL_PARK_GATE - warp_def 18, 9, 4, ROUTE_36_NATIONAL_PARK_GATE - warp_def 47, 13, 1, ROUTE_36_RUINS_OF_ALPH_GATE - warp_def 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 18, 8, 3, ROUTE_36_NATIONAL_PARK_GATE + warp_event 18, 9, 4, ROUTE_36_NATIONAL_PARK_GATE + warp_event 47, 13, 1, ROUTE_36_RUINS_OF_ALPH_GATE + warp_event 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE + + db 2 ; coord events coord_event 20, 7, 1, Route36SuicuneScript coord_event 22, 7, 1, Route36SuicuneScript -.BGEvents: - db 4 + db 4 ; bg events bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2 bg_event 45, 11, BGEVENT_READ, RuinsOfAlphNorthSign bg_event 55, 7, BGEVENT_READ, Route36Sign bg_event 21, 7, BGEVENT_READ, Route36TrainerTips1 -.ObjectEvents: - db 9 + db 9 ; object events object_event 20, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1 object_event 31, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1 object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index fa74c7ee5..a635fd8a7 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -13,14 +13,12 @@ const_value set 2 const ROUTE36NATIONALPARKGATE_OFFICER2 Route36NationalParkGate_MapScripts: -.SceneScripts: - db 3 + db 3 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 scene_script .LeaveContestEarly -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable @@ -75,14 +73,14 @@ Route36NationalParkGate_MapScripts: writetext UnknownText_0x6b2c5 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes scall .CopyContestants disappear ROUTE36NATIONALPARKGATE_OFFICER1 appear ROUTE36NATIONALPARKGATE_OFFICER2 applymovement PLAYER, MovementData_0x6add1 pause 15 - special Special_FadeInQuickly + special FadeInQuickly jumpstd bugcontestresults .GoBackToContest: @@ -91,7 +89,7 @@ Route36NationalParkGate_MapScripts: closetext spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 end @@ -156,7 +154,7 @@ Route36OfficerScriptContest: iffalse .DecidedNotToJoinContest checkcode VAR_PARTYCOUNT if_greater_than 1, .LeaveMonsWithOfficer - special Special_ContestDropOffMons + special ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER .ResumeStartingContest: setflag ENGINE_BUG_CONTEST_TIMER @@ -171,12 +169,12 @@ Route36OfficerScriptContest: waitbutton closetext setflag ENGINE_BUG_CONTEST_TIMER - special Special_GiveParkBalls + special GiveParkBalls spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx - special Special_SelectRandomBugContestContestants + special SelectRandomBugContestContestants warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 end @@ -186,12 +184,12 @@ Route36OfficerScriptContest: checkcode VAR_BOXSPACE if_equal 0, .BoxFull .ContinueLeavingMons: - special Special_CheckFirstMonIsEgg + special CheckFirstMonIsEgg if_equal TRUE, .FirstMonIsEgg writetext UnknownText_0x6afb0 yesorno iffalse .RefusedToLeaveMons - special Special_ContestDropOffMons + special ContestDropOffMons iftrue .FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6b021 @@ -308,7 +306,7 @@ Route36ParkGate_DayToText: YoungsterScript_0x6ad06: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad14 writetext UnknownText_0x6b399 waitbutton @@ -324,7 +322,7 @@ UnknownScript_0x6ad14: YoungsterScript_0x6ad1a: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad28 writetext UnknownText_0x6b40f waitbutton @@ -340,7 +338,7 @@ UnknownScript_0x6ad28: RockerScript_0x6ad2e: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad3c writetext UnknownText_0x6b462 waitbutton @@ -356,7 +354,7 @@ UnknownScript_0x6ad3c: PokefanMScript_0x6ad42: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad50 writetext UnknownText_0x6b4da waitbutton @@ -372,7 +370,7 @@ UnknownScript_0x6ad50: YoungsterScript_0x6ad56: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad64 writetext UnknownText_0x6b54e waitbutton @@ -388,7 +386,7 @@ UnknownScript_0x6ad64: YoungsterScript_0x6ad6a: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad78 writetext UnknownText_0x6b5b0 waitbutton @@ -404,7 +402,7 @@ UnknownScript_0x6ad78: LassScript_0x6ad7e: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad8c writetext UnknownText_0x6b64b waitbutton @@ -420,7 +418,7 @@ UnknownScript_0x6ad8c: YoungsterScript_0x6ad92: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ada0 writetext UnknownText_0x6b6b8 waitbutton @@ -436,7 +434,7 @@ UnknownScript_0x6ada0: YoungsterScript_0x6ada6: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6adb4 writetext UnknownText_0x6b71b waitbutton @@ -452,7 +450,7 @@ UnknownScript_0x6adb4: YoungsterScript_0x6adba: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6adc8 writetext UnknownText_0x6b76f waitbutton @@ -850,25 +848,20 @@ UnknownText_0x6b97f: done Route36NationalParkGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 4, 1, NATIONAL_PARK - warp_def 0, 5, 2, NATIONAL_PARK - warp_def 9, 4, 1, ROUTE_36 - warp_def 9, 5, 2, ROUTE_36 + db 4 ; warp events + warp_event 0, 4, 1, NATIONAL_PARK + warp_event 0, 5, 2, NATIONAL_PARK + warp_event 9, 4, 1, ROUTE_36 + warp_event 9, 5, 2, ROUTE_36 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 6, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script -.ObjectEvents: - db 12 + db 12 ; object events object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index c7355dd04..acea3628c 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -3,11 +3,9 @@ const_value set 2 const ROUTE36RUINSOFALPHGATE_GRAMPS Route36RuinsOfAlphGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route36RuinsOfAlphGateOfficerScript: jumptextfaceplayer Route36RuinsOfAlphGateOfficerText @@ -35,23 +33,18 @@ Route36RuinsOfAlphGateGrampsText: done Route36RuinsOfAlphGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 3, ROUTE_36 - warp_def 5, 0, 4, ROUTE_36 - warp_def 4, 7, 9, RUINS_OF_ALPH_OUTSIDE - warp_def 5, 7, 9, RUINS_OF_ALPH_OUTSIDE + db 4 ; warp events + warp_event 4, 0, 3, ROUTE_36 + warp_event 5, 0, 4, ROUTE_36 + warp_event 4, 7, 9, RUINS_OF_ALPH_OUTSIDE + warp_event 5, 7, 9, RUINS_OF_ALPH_OUTSIDE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1 object_event 7, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1 diff --git a/maps/Route37.asm b/maps/Route37.asm index 27dd38893..a57549911 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -8,11 +8,9 @@ const_value set 2 const ROUTE37_FRUIT_TREE3 Route37_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Sunny .Sunny: @@ -26,7 +24,7 @@ Route37_MapScripts: return TrainerTwinsAnnandanne1: - trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script + trainer TWINS, ANNANDANNE1, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script .Script: end_if_just_battled @@ -37,7 +35,7 @@ TrainerTwinsAnnandanne1: end TrainerTwinsAnnandanne2: - trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, .Script + trainer TWINS, ANNANDANNE2, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, .Script .Script: end_if_just_battled @@ -48,7 +46,7 @@ TrainerTwinsAnnandanne2: end TrainerPsychicGreg: - trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, .Script + trainer PSYCHIC_T, GREG, EVENT_BEAT_PSYCHIC_GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, .Script .Script: end_if_just_battled @@ -114,7 +112,7 @@ FruitTreeScript_0x1a8e0d: fruittree FRUITTREE_ROUTE_37_3 Route37HiddenEther: - hiddenitem EVENT_ROUTE_37_HIDDEN_ETHER, ETHER + hiddenitem ETHER, EVENT_ROUTE_37_HIDDEN_ETHER TwinsAnnandanne1SeenText: text "ANN: ANNE and I" @@ -238,22 +236,17 @@ Route37SignText: done Route37_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 0 + db 0 ; warp events -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 5, 3, BGEVENT_READ, Route37Sign bg_event 4, 2, BGEVENT_ITEM, Route37HiddenEther -.ObjectEvents: - db 7 + db 7 ; object events object_event 6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1 object_event 7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1 object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1 diff --git a/maps/Route38.asm b/maps/Route38.asm index c228429ba..7a3c038c1 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -8,14 +8,12 @@ const_value set 2 const ROUTE38_BUENA2 Route38_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperToby: - trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script + trainer BIRD_KEEPER, TOBY, EVENT_BEAT_BIRD_KEEPER_TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script .Script end_if_just_battled @@ -26,7 +24,7 @@ TrainerBirdKeeperToby: end TrainerSailorHarry: - trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script + trainer SAILOR, HARRY, EVENT_BEAT_SAILOR_HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script .Script end_if_just_battled @@ -37,7 +35,7 @@ TrainerSailorHarry: end TrainerLassDana1: - trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .Script + trainer LASS, DANA1, EVENT_BEAT_LASS_DANA, LassDana1SeenText, LassDana1BeatenText, 0, .Script .Script writecode VAR_CALLERID, PHONE_LASS_DANA @@ -175,7 +173,7 @@ TrainerLassDana1: end TrainerSchoolboyChad1: - trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script + trainer SCHOOLBOY, CHAD1, EVENT_BEAT_SCHOOLBOY_CHAD, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script .Script writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD @@ -292,7 +290,7 @@ TrainerSchoolboyChad1: end TrainerBeautyValerie: - trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script + trainer BEAUTY, VALERIE, EVENT_BEAT_BEAUTY_VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script .Script end_if_just_battled @@ -303,7 +301,7 @@ TrainerBeautyValerie: end TrainerBeautyOlivia: - trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script + trainer BEAUTY, OLIVIA, EVENT_BEAT_BEAUTY_OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script .Script end_if_just_battled @@ -473,24 +471,19 @@ Route38TrainerTipsText: done Route38_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 35, 8, 1, ROUTE_38_ECRUTEAK_GATE - warp_def 35, 9, 2, ROUTE_38_ECRUTEAK_GATE + db 2 ; warp events + warp_event 35, 8, 1, ROUTE_38_ECRUTEAK_GATE + warp_event 35, 9, 2, ROUTE_38_ECRUTEAK_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 33, 7, BGEVENT_READ, Route38Sign bg_event 5, 13, BGEVENT_READ, Route38TrainerTips -.ObjectEvents: - db 7 + db 7 ; object events object_event 4, 1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1 object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1 object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index fa7280b57..adf5419d3 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -2,11 +2,9 @@ const_value set 2 const ROUTE38ECRUTEAKGATE_OFFICER Route38EcruteakGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route38EcruteakGateOfficerScript: jumptextfaceplayer Route38EcruteakGateOfficerText @@ -25,22 +23,17 @@ Route38EcruteakGateOfficerText: done Route38EcruteakGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 4, 1, ROUTE_38 - warp_def 0, 5, 2, ROUTE_38 - warp_def 9, 4, 14, ECRUTEAK_CITY - warp_def 9, 5, 15, ECRUTEAK_CITY + db 4 ; warp events + warp_event 0, 4, 1, ROUTE_38 + warp_event 0, 5, 2, ROUTE_38 + warp_event 9, 4, 14, ECRUTEAK_CITY + warp_event 9, 5, 15, ECRUTEAK_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index 36ecda5fc..c93d4a863 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -11,11 +11,9 @@ const_value set 2 const ROUTE39_POKEFAN_F2 Route39_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route39Miltank: opentext @@ -26,7 +24,7 @@ Route39Miltank: end TrainerPokefanmDerek: - trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerekSeenText, PokefanmDerekBeatenText, 0, .Script + trainer POKEFANM, DEREK1, EVENT_BEAT_POKEFANM_DEREK, PokefanmDerekSeenText, PokefanmDerekBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_POKEFANM_DEREK @@ -105,7 +103,7 @@ TrainerPokefanmDerek: end TrainerPokefanfRuth: - trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, .Script + trainer POKEFANF, RUTH, EVENT_BEAT_POKEFANF_RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, .Script .Script: end_if_just_battled @@ -116,7 +114,7 @@ TrainerPokefanfRuth: end TrainerSailorEugene: - trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, .Script + trainer SAILOR, EUGENE, EVENT_BEAT_SAILOR_EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, .Script .Script: end_if_just_battled @@ -127,7 +125,7 @@ TrainerSailorEugene: end TrainerPsychicNorman: - trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, .Script + trainer PSYCHIC_T, NORMAN, EVENT_BEAT_PSYCHIC_NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, .Script .Script: end_if_just_battled @@ -180,7 +178,7 @@ FruitTreeScript_0x1a5bf4: fruittree FRUITTREE_ROUTE_39 Route39HiddenNugget: - hiddenitem EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET + hiddenitem NUGGET, EVENT_ROUTE_39_HIDDEN_NUGGET Route39MiltankText: text "MILTANK: Mooo!" @@ -344,26 +342,21 @@ Route39TrainerTipsText: done Route39_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 1, 3, 1, ROUTE_39_BARN - warp_def 5, 3, 1, ROUTE_39_FARMHOUSE + db 2 ; warp events + warp_event 1, 3, 1, ROUTE_39_BARN + warp_event 5, 3, 1, ROUTE_39_FARMHOUSE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 5, 31, BGEVENT_READ, Route39TrainerTips bg_event 9, 5, BGEVENT_READ, MoomooFarmSign bg_event 15, 7, BGEVENT_READ, Route39Sign bg_event 5, 13, BGEVENT_ITEM, Route39HiddenNugget -.ObjectEvents: - db 10 + db 10 ; object events object_event 13, 29, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1 object_event 10, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek, -1 object_event 11, 19, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 682b2dea1..103d924e6 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -4,11 +4,9 @@ const_value set 2 const ROUTE39BARN_MOOMOO Route39Barn_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TwinScript_0x9cc76: faceplayer @@ -52,7 +50,7 @@ MooMoo: iftrue .HappyCow writetext Text_WeakMoo writebyte MILTANK - special Special_PlaySlowCry + special PlaySlowCry buttonsound writetext Text_ItsCryIsWeak checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO @@ -189,22 +187,17 @@ Text_RefusedToGiveBerry: done Route39Barn_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 7, 1, ROUTE_39 - warp_def 4, 7, 1, ROUTE_39 + db 2 ; warp events + warp_event 3, 7, 1, ROUTE_39 + warp_event 4, 7, 1, ROUTE_39 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1 object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1 object_event 3, 3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 9f46263de..96a19b608 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -3,11 +3,9 @@ const_value set 2 const ROUTE39FARMHOUSE_POKEFAN_F Route39Farmhouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PokefanM_DairyFarmer: faceplayer @@ -24,7 +22,7 @@ FarmerMScript_SellMilk: checkitem MOOMOO_MILK iftrue FarmerMScript_Milking writetext FarmerMText_BuyMilk - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight yesorno iffalse FarmerMScript_NoSale checkmoney YOUR_MONEY, 500 @@ -32,7 +30,7 @@ FarmerMScript_SellMilk: giveitem MOOMOO_MILK iffalse FarmerMScript_NoRoom takemoney YOUR_MONEY, 500 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight waitsfx playsound SFX_TRANSACTION writetext FarmerMText_GotMilk @@ -193,23 +191,18 @@ FarmerFText_SnoreSpeech: done Route39Farmhouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, ROUTE_39 - warp_def 3, 7, 2, ROUTE_39 + db 2 ; warp events + warp_event 2, 7, 2, ROUTE_39 + warp_event 3, 7, 2, ROUTE_39 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, FarmhouseBookshelf bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf -.ObjectEvents: - db 2 + db 2 ; object events object_event 3, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1 object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1 diff --git a/maps/Route4.asm b/maps/Route4.asm index a0bf7c4bc..724a57dec 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -5,14 +5,12 @@ const_value set 2 const ROUTE4_POKE_BALL Route4_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperHank: - trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script + trainer BIRD_KEEPER, HANK, EVENT_BEAT_BIRD_KEEPER_HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script .Script: end_if_just_battled @@ -23,7 +21,7 @@ TrainerBirdKeeperHank: end TrainerPicnickerHope: - trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script + trainer PICNICKER, HOPE, EVENT_BEAT_PICNICKER_HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script .Script: end_if_just_battled @@ -34,7 +32,7 @@ TrainerPicnickerHope: end TrainerPicnickerSharon: - trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script + trainer PICNICKER, SHARON, EVENT_BEAT_PICNICKER_SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script .Script: end_if_just_battled @@ -51,7 +49,7 @@ Route4HPUp: itemball HP_UP Route4HiddenUltraBall: - hiddenitem EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem ULTRA_BALL, EVENT_ROUTE_4_HIDDEN_ULTRA_BALL BirdKeeperHankSeenText: text "I'm raising my" @@ -121,23 +119,18 @@ MtMoonSquareSignText: done Route4_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 2, 5, 2, MOUNT_MOON + db 1 ; warp events + warp_event 2, 5, 2, MOUNT_MOON -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 3, 7, BGEVENT_READ, MtMoonSquareSign bg_event 10, 3, BGEVENT_ITEM, Route4HiddenUltraBall -.ObjectEvents: - db 4 + db 4 ; object events object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1 object_event 9, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1 object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 diff --git a/maps/Route40.asm b/maps/Route40.asm index 77f433c81..53ce2f959 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -13,11 +13,9 @@ const_value set 2 const ROUTE40_STANDING_YOUNGSTER Route40_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .MonicaCallback .MonicaCallback: @@ -32,7 +30,7 @@ Route40_MapScripts: return TrainerSwimmerfElaine: - trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script + trainer SWIMMERF, ELAINE, EVENT_BEAT_SWIMMERF_ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script .Script: end_if_just_battled @@ -43,7 +41,7 @@ TrainerSwimmerfElaine: end TrainerSwimmerfPaula: - trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script + trainer SWIMMERF, PAULA, EVENT_BEAT_SWIMMERF_PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script .Script: end_if_just_battled @@ -54,7 +52,7 @@ TrainerSwimmerfPaula: end TrainerSwimmermSimon: - trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script + trainer SWIMMERM, SIMON, EVENT_BEAT_SWIMMERM_SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script .Script: end_if_just_battled @@ -65,7 +63,7 @@ TrainerSwimmermSimon: end TrainerSwimmermRandall: - trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script + trainer SWIMMERM, RANDALL, EVENT_BEAT_SWIMMERM_RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script .Script: end_if_just_battled @@ -79,7 +77,7 @@ Route40Lass1Script: jumptextfaceplayer Route40Lass1Text PokefanMScript_0x1a61c7: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x1a646a @@ -135,7 +133,7 @@ Route40Rock: jumpstd smashrock Route40HiddenHyperPotion: - hiddenitem EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_ROUTE_40_HIDDEN_HYPER_POTION MovementData_0x1a621c: step RIGHT @@ -338,23 +336,18 @@ Route40SignText: done Route40_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE + db 1 ; warp events + warp_event 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 14, 10, BGEVENT_READ, Route40Sign bg_event 7, 8, BGEVENT_ITEM, Route40HiddenHyperPotion -.ObjectEvents: - db 12 + db 12 ; object events object_event 14, 15, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSimon, -1 object_event 18, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerSwimmermRandall, -1 object_event 3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1 diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index edd8fb7ff..d30401714 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -3,11 +3,9 @@ const_value set 2 const ROUTE40BATTLETOWERGATE_TWIN Route40BattleTowerGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .ShowSailor .ShowSailor: @@ -71,23 +69,18 @@ Route40BattleTowerGateTwinText: done Route40BattleTowerGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 7, 1, ROUTE_40 - warp_def 5, 7, 1, ROUTE_40 - warp_def 4, 0, 1, BATTLE_TOWER_OUTSIDE - warp_def 5, 0, 2, BATTLE_TOWER_OUTSIDE + db 4 ; warp events + warp_event 4, 7, 1, ROUTE_40 + warp_event 5, 7, 1, ROUTE_40 + warp_event 4, 0, 1, BATTLE_TOWER_OUTSIDE + warp_event 5, 0, 2, BATTLE_TOWER_OUTSIDE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 3, 3, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR object_event 7, 5, SPRITE_TWIN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1 diff --git a/maps/Route41.asm b/maps/Route41.asm index 4b66164dd..4307ff3b4 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -11,14 +11,12 @@ const_value set 2 const ROUTE41_SWIMMER_GIRL5 Route41_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerSwimmerfKaylee: - trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script + trainer SWIMMERF, KAYLEE, EVENT_BEAT_SWIMMERF_KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script .Script: end_if_just_battled @@ -29,7 +27,7 @@ TrainerSwimmerfKaylee: end TrainerSwimmerfSusie: - trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script + trainer SWIMMERF, SUSIE, EVENT_BEAT_SWIMMERF_SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script .Script: end_if_just_battled @@ -40,7 +38,7 @@ TrainerSwimmerfSusie: end TrainerSwimmerfDenise: - trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script + trainer SWIMMERF, DENISE, EVENT_BEAT_SWIMMERF_DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script .Script: end_if_just_battled @@ -51,7 +49,7 @@ TrainerSwimmerfDenise: end TrainerSwimmerfKara: - trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script + trainer SWIMMERF, KARA, EVENT_BEAT_SWIMMERF_KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script .Script: end_if_just_battled @@ -62,7 +60,7 @@ TrainerSwimmerfKara: end TrainerSwimmerfWendy: - trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script + trainer SWIMMERF, WENDY, EVENT_BEAT_SWIMMERF_WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script .Script: end_if_just_battled @@ -73,7 +71,7 @@ TrainerSwimmerfWendy: end TrainerSwimmermCharlie: - trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script + trainer SWIMMERM, CHARLIE, EVENT_BEAT_SWIMMERM_CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script .Script: end_if_just_battled @@ -84,7 +82,7 @@ TrainerSwimmermCharlie: end TrainerSwimmermGeorge: - trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script + trainer SWIMMERM, GEORGE, EVENT_BEAT_SWIMMERM_GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script .Script: end_if_just_battled @@ -95,7 +93,7 @@ TrainerSwimmermGeorge: end TrainerSwimmermBerke: - trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script + trainer SWIMMERM, BERKE, EVENT_BEAT_SWIMMERM_BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script .Script: end_if_just_battled @@ -106,7 +104,7 @@ TrainerSwimmermBerke: end TrainerSwimmermKirk: - trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script + trainer SWIMMERM, KIRK, EVENT_BEAT_SWIMMERM_KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script .Script: end_if_just_battled @@ -117,7 +115,7 @@ TrainerSwimmermKirk: end TrainerSwimmermMathew: - trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script + trainer SWIMMERM, MATHEW, EVENT_BEAT_SWIMMERM_MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script .Script: end_if_just_battled @@ -132,7 +130,7 @@ Route41Rock: jumpstd smashrock Route41HiddenMaxEther: - hiddenitem EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem MAX_ETHER, EVENT_ROUTE_41_HIDDEN_MAX_ETHER SwimmermCharlieSeenText: text "The water's warm" @@ -342,25 +340,20 @@ SwimmerfWendyAfterBattleText: done Route41_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 12, 17, 1, WHIRL_ISLAND_NW - warp_def 36, 19, 1, WHIRL_ISLAND_NE - warp_def 12, 37, 1, WHIRL_ISLAND_SW - warp_def 36, 45, 1, WHIRL_ISLAND_SE + db 4 ; warp events + warp_event 12, 17, 1, WHIRL_ISLAND_NW + warp_event 36, 19, 1, WHIRL_ISLAND_NE + warp_event 12, 37, 1, WHIRL_ISLAND_SW + warp_event 36, 45, 1, WHIRL_ISLAND_SE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 9, 35, BGEVENT_ITEM, Route41HiddenMaxEther -.ObjectEvents: - db 10 + db 10 ; object events object_event 32, 6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1 object_event 46, 8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1 object_event 20, 26, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermBerke, -1 diff --git a/maps/Route42.asm b/maps/Route42.asm index 47d45c140..8b1f1d4d1 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -10,13 +10,11 @@ const_value set 2 const ROUTE42_SUICUNE Route42_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -37,7 +35,7 @@ Route42SuicuneScript: end TrainerFisherTully: - trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTullySeenText, FisherTullyBeatenText, 0, .Script + trainer FISHER, TULLY1, EVENT_BEAT_FISHER_TULLY, FisherTullySeenText, FisherTullyBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_FISHER_TULLY @@ -163,7 +161,7 @@ TrainerFisherTully: end TrainerPokemaniacShane: - trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script + trainer POKEMANIAC, SHANE, EVENT_BEAT_POKEMANIAC_SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script .Script: end_if_just_battled @@ -174,7 +172,7 @@ TrainerPokemaniacShane: end TrainerHikerBenjamin: - trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script + trainer HIKER, BENJAMIN, EVENT_BEAT_HIKER_BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script .Script: end_if_just_battled @@ -212,7 +210,7 @@ FruitTreeScript_0x1a9351: fruittree FRUITTREE_ROUTE_42_3 Route42HiddenMaxPotion: - hiddenitem EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_ROUTE_42_HIDDEN_MAX_POTION MovementData_0x1a9356: set_sliding @@ -319,31 +317,26 @@ Route42Sign2Text: done Route42_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 0, 8, 3, ROUTE_42_ECRUTEAK_GATE - warp_def 0, 9, 4, ROUTE_42_ECRUTEAK_GATE - warp_def 10, 5, 1, MOUNT_MORTAR_1F_OUTSIDE - warp_def 28, 9, 2, MOUNT_MORTAR_1F_OUTSIDE - warp_def 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE - -.CoordEvents: - db 1 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 0, 8, 3, ROUTE_42_ECRUTEAK_GATE + warp_event 0, 9, 4, ROUTE_42_ECRUTEAK_GATE + warp_event 10, 5, 1, MOUNT_MORTAR_1F_OUTSIDE + warp_event 28, 9, 2, MOUNT_MORTAR_1F_OUTSIDE + warp_event 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE + + db 1 ; coord events coord_event 24, 14, 1, Route42SuicuneScript -.BGEvents: - db 5 + db 5 ; bg events bg_event 4, 10, BGEVENT_READ, Route42Sign1 bg_event 7, 5, BGEVENT_READ, MtMortarSign1 bg_event 45, 9, BGEVENT_READ, MtMortarSign2 bg_event 54, 8, BGEVENT_READ, Route42Sign2 bg_event 16, 11, BGEVENT_ITEM, Route42HiddenMaxPotion -.ObjectEvents: - db 9 + db 9 ; object events object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully, -1 object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index f873e7fed..2417cd0d8 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -2,11 +2,9 @@ const_value set 2 const ROUTE42ECRUTEAKGATE_OFFICER Route42EcruteakGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route42EcruteakGateOfficerScript: jumptextfaceplayer Route42EcruteakGateOfficerText @@ -20,22 +18,17 @@ Route42EcruteakGateOfficerText: done Route42EcruteakGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 4, 1, ECRUTEAK_CITY - warp_def 0, 5, 2, ECRUTEAK_CITY - warp_def 9, 4, 1, ROUTE_42 - warp_def 9, 5, 2, ROUTE_42 + db 4 ; warp events + warp_event 0, 4, 1, ECRUTEAK_CITY + warp_event 0, 5, 2, ECRUTEAK_CITY + warp_event 9, 4, 1, ROUTE_42 + warp_event 9, 5, 2, ROUTE_42 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1 diff --git a/maps/Route43.asm b/maps/Route43.asm index c1caeeb4a..e1d72d36a 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -9,11 +9,9 @@ const_value set 2 const ROUTE43_POKE_BALL Route43_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .CheckIfRockets .CheckIfRockets: @@ -27,7 +25,7 @@ Route43_MapScripts: return TrainerCamperSpencer: - trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script + trainer CAMPER, SPENCER, EVENT_BEAT_CAMPER_SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script .Script: end_if_just_battled @@ -38,7 +36,7 @@ TrainerCamperSpencer: end TrainerPokemaniacBen: - trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, .Script + trainer POKEMANIAC, BEN, EVENT_BEAT_POKEMANIAC_BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, .Script .Script: end_if_just_battled @@ -49,7 +47,7 @@ TrainerPokemaniacBen: end TrainerPokemaniacBrent: - trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrentSeenText, PokemaniacBrentBeatenText, 0, .Script + trainer POKEMANIAC, BRENT1, EVENT_BEAT_POKEMANIAC_BRENT, PokemaniacBrentSeenText, PokemaniacBrentBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT @@ -154,7 +152,7 @@ TrainerPokemaniacBrent: end TrainerPokemaniacRon: - trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, .Script + trainer POKEMANIAC, RON, EVENT_BEAT_POKEMANIAC_RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, .Script .Script: end_if_just_battled @@ -165,7 +163,7 @@ TrainerPokemaniacRon: end TrainerFisherMarvin: - trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, .Script + trainer FISHER, MARVIN, EVENT_BEAT_FISHER_MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, .Script .Script: end_if_just_battled @@ -176,7 +174,7 @@ TrainerFisherMarvin: end TrainerPicnickerTiffany: - trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffanySeenText, PicnickerTiffanyBeatenText, 0, .Script + trainer PICNICKER, TIFFANY3, EVENT_BEAT_PICNICKER_TIFFANY, PicnickerTiffanySeenText, PicnickerTiffanyBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY @@ -501,28 +499,23 @@ Route43TrainerTipsText: done Route43_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 9, 51, 1, ROUTE_43_MAHOGANY_GATE - warp_def 10, 51, 2, ROUTE_43_MAHOGANY_GATE - warp_def 17, 35, 3, ROUTE_43_GATE - warp_def 17, 31, 1, ROUTE_43_GATE - warp_def 18, 31, 2, ROUTE_43_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 3 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 9, 51, 1, ROUTE_43_MAHOGANY_GATE + warp_event 10, 51, 2, ROUTE_43_MAHOGANY_GATE + warp_event 17, 35, 3, ROUTE_43_GATE + warp_event 17, 31, 1, ROUTE_43_GATE + warp_event 18, 31, 2, ROUTE_43_GATE + + db 0 ; coord events + + db 3 ; bg events bg_event 13, 3, BGEVENT_READ, Route43Sign1 bg_event 11, 49, BGEVENT_READ, Route43Sign2 bg_event 16, 38, BGEVENT_READ, Route43TrainerTips -.ObjectEvents: - db 8 + db 8 ; object events object_event 13, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1 object_event 13, 20, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent, -1 object_event 14, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 51d095e3c..886768431 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -6,13 +6,11 @@ const_value set 2 const ROUTE43GATE_ROCKET2 Route43Gate_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .RocketShakedown scene_script .DummyScene -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .CheckIfRockets .RocketShakedown: @@ -248,24 +246,19 @@ OfficerText_AvoidGrass: done Route43Gate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 4, ROUTE_43 - warp_def 5, 0, 5, ROUTE_43 - warp_def 4, 7, 3, ROUTE_43 - warp_def 5, 7, 3, ROUTE_43 + db 4 ; warp events + warp_event 4, 0, 4, ROUTE_43 + warp_event 5, 0, 5, ROUTE_43 + warp_event 4, 7, 3, ROUTE_43 + warp_event 5, 7, 3, ROUTE_43 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS object_event 7, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index d5c29c18a..0f5243349 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -2,11 +2,9 @@ const_value set 2 const ROUTE43MAHOGANYGATE_OFFICER Route43MahoganyGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route43MahoganyGateOfficer: faceplayer @@ -39,22 +37,17 @@ UnknownText_0x19ab65: done Route43MahoganyGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 1, ROUTE_43 - warp_def 5, 0, 2, ROUTE_43 - warp_def 4, 7, 5, MAHOGANY_TOWN - warp_def 5, 7, 5, MAHOGANY_TOWN + db 4 ; warp events + warp_event 4, 0, 1, ROUTE_43 + warp_event 5, 0, 2, ROUTE_43 + warp_event 4, 7, 5, MAHOGANY_TOWN + warp_event 5, 7, 5, MAHOGANY_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route43MahoganyGateOfficer, -1 diff --git a/maps/Route44.asm b/maps/Route44.asm index df755ae0d..6589956f7 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -12,14 +12,12 @@ const_value set 2 const ROUTE44_POKE_BALL3 Route44_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperVance1: - trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script + trainer BIRD_KEEPER, VANCE1, EVENT_BEAT_BIRD_KEEPER_VANCE, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE @@ -150,7 +148,7 @@ Route44RematchGiftM: end TrainerPsychicPhil: - trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script + trainer PSYCHIC_T, PHIL, EVENT_BEAT_PSYCHIC_PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script .Script: end_if_just_battled @@ -161,7 +159,7 @@ TrainerPsychicPhil: end TrainerFisherWilton1: - trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, 0, .Script + trainer FISHER, WILTON1, EVENT_BEAT_FISHER_WILTON, FisherWilton1SeenText, FisherWilton1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_FISHER_WILTON @@ -256,7 +254,7 @@ TrainerFisherWilton1: jump Route44PackFullM TrainerFisherEdgar: - trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script + trainer FISHER, EDGAR, EVENT_BEAT_FISHER_EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script .Script: end_if_just_battled @@ -267,7 +265,7 @@ TrainerFisherEdgar: end TrainerCooltrainerfCybil: - trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script + trainer COOLTRAINERF, CYBIL, EVENT_BEAT_COOLTRAINERF_CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script .Script: end_if_just_battled @@ -278,7 +276,7 @@ TrainerCooltrainerfCybil: end TrainerPokemaniacZach: - trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script + trainer POKEMANIAC, ZACH, EVENT_BEAT_POKEMANIAC_ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script .Script: end_if_just_battled @@ -289,7 +287,7 @@ TrainerPokemaniacZach: end TrainerCooltrainermAllen: - trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script + trainer COOLTRAINERM, ALLEN, EVENT_BEAT_COOLTRAINERM_ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script .Script: end_if_just_battled @@ -318,7 +316,7 @@ Route44MaxRepel: itemball MAX_REPEL Route44HiddenElixer: - hiddenitem EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER + hiddenitem ELIXER, EVENT_ROUTE_44_HIDDEN_ELIXER FisherWilton1SeenText: text "Aack! You made me" @@ -507,24 +505,19 @@ Route44Sign2Text: done Route44_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 56, 7, 1, ICE_PATH_1F + db 1 ; warp events + warp_event 56, 7, 1, ICE_PATH_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 53, 7, BGEVENT_READ, Route44Sign1 bg_event 6, 10, BGEVENT_READ, Route44Sign2 bg_event 32, 9, BGEVENT_ITEM, Route44HiddenElixer -.ObjectEvents: - db 11 + db 11 ; object events object_event 35, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1 object_event 19, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1 object_event 10, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1 diff --git a/maps/Route45.asm b/maps/Route45.asm index 156d06957..339eed39c 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -14,14 +14,12 @@ const_value set 2 const ROUTE45_YOUNGSTER Route45_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBlackbeltKenji: - trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script + trainer BLACKBELT_T, KENJI3, EVENT_BEAT_BLACKBELT_KENJI, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI @@ -31,7 +29,7 @@ TrainerBlackbeltKenji: iftrue .Registered checkevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready - special Special_SampleKenjiBreakCountdown + special SampleKenjiBreakCountdown writetext BlackbeltKenjiAfterBattleText waitbutton setevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER @@ -61,7 +59,7 @@ TrainerBlackbeltKenji: verbosegiveitem PP_UP iffalse .NoRoom clearevent EVENT_KENJI_ON_BREAK - special Special_SampleKenjiBreakCountdown + special SampleKenjiBreakCountdown jump Route45NumberAcceptedM .Morning: @@ -125,7 +123,7 @@ Route45RematchGiftM: end TrainerHikerErik: - trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script + trainer HIKER, ERIK, EVENT_BEAT_HIKER_ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script .Script: end_if_just_battled @@ -136,7 +134,7 @@ TrainerHikerErik: end TrainerHikerMichael: - trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script + trainer HIKER, MICHAEL, EVENT_BEAT_HIKER_MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script .Script: end_if_just_battled @@ -147,7 +145,7 @@ TrainerHikerMichael: end TrainerHikerParry: - trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, 0, .Script + trainer HIKER, PARRY3, EVENT_BEAT_HIKER_PARRY, HikerParry3SeenText, HikerParry3BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_HIKER_PARRY @@ -233,7 +231,7 @@ TrainerHikerParry: jump Route45NumberAcceptedM TrainerHikerTimothy: - trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script + trainer HIKER, TIMOTHY, EVENT_BEAT_HIKER_TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script .Script: end_if_just_battled @@ -244,7 +242,7 @@ TrainerHikerTimothy: end TrainerCooltrainermRyan: - trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script + trainer COOLTRAINERM, RYAN, EVENT_BEAT_COOLTRAINERM_RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script .Script: end_if_just_battled @@ -255,7 +253,7 @@ TrainerCooltrainermRyan: end TrainerCooltrainerfKelly: - trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script + trainer COOLTRAINERF, KELLY, EVENT_BEAT_COOLTRAINERF_KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script .Script: end_if_just_battled @@ -312,7 +310,7 @@ Route45MaxPotion: itemball MAX_POTION Route45HiddenPpUp: - hiddenitem EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP + hiddenitem PP_UP, EVENT_ROUTE_45_HIDDEN_PP_UP HikerErikSeenText: text "Be prepared for" @@ -532,23 +530,18 @@ Route45SignText: done Route45_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE + db 1 ; warp events + warp_event 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 10, 4, BGEVENT_READ, Route45Sign bg_event 13, 80, BGEVENT_ITEM, Route45HiddenPpUp -.ObjectEvents: - db 13 + db 13 ; object events object_event 10, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerErik, -1 object_event 15, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerMichael, -1 object_event 5, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1 diff --git a/maps/Route46.asm b/maps/Route46.asm index c9e1b94e6..bb0bfd9b3 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -7,14 +7,12 @@ const_value set 2 const ROUTE46_POKE_BALL Route46_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerCamperTed: - trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script + trainer CAMPER, TED, EVENT_BEAT_CAMPER_TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script .Script: end_if_just_battled @@ -25,7 +23,7 @@ TrainerCamperTed: end TrainerPicnickerErin1: - trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, .Script + trainer PICNICKER, ERIN1, EVENT_BEAT_PICNICKER_ERIN, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_PICNICKER_ERIN @@ -148,7 +146,7 @@ Route46RematchGiftF: end TrainerHikerBailey: - trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script + trainer HIKER, BAILEY, EVENT_BEAT_HIKER_BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script .Script: end_if_just_battled @@ -251,24 +249,19 @@ Route46SignText: done Route46_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - 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 + db 3 ; warp events + warp_event 7, 33, 1, ROUTE_29_ROUTE_46_GATE + warp_event 8, 33, 2, ROUTE_29_ROUTE_46_GATE + warp_event 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 9, 27, BGEVENT_READ, Route46Sign -.ObjectEvents: - db 6 + db 6 ; object events object_event 12, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1 object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1 object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 diff --git a/maps/Route5.asm b/maps/Route5.asm index 9bdf8a023..a53bb0f3c 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -2,11 +2,9 @@ const_value set 2 const ROUTE5_POKEFAN_M Route5_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route5PokefanMScript: jumptextfaceplayer Route5PokefanMText @@ -40,24 +38,19 @@ HouseForSaleSignText: done Route5_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE - 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 + db 4 ; warp events + warp_event 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE + warp_event 8, 17, 1, ROUTE_5_SAFFRON_GATE + warp_event 9, 17, 2, ROUTE_5_SAFFRON_GATE + warp_event 10, 11, 1, ROUTE_5_CLEANSE_TAG_HOUSE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 17, 17, BGEVENT_READ, Route5UndergroundPathSign bg_event 10, 11, BGEVENT_READ, HouseForSaleSign -.ObjectEvents: - db 1 + db 1 ; object events object_event 17, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagHouse.asm index d0223f2e1..dc6edf16c 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagHouse.asm @@ -1,38 +1,36 @@ const_value set 2 - const ROUTE5CLEANSETAGSPEECHHOUSE_GRANNY - const ROUTE5CLEANSETAGSPEECHHOUSE_TEACHER + const ROUTE5CLEANSETAGHOUSE_GRANNY + const ROUTE5CLEANSETAGHOUSE_TEACHER -Route5CleanseTagSpeechHouse_MapScripts: -.SceneScripts: - db 0 +Route5CleanseTagHouse_MapScripts: + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks -Route5CleanseTagGrannyScript: +Route5CleanseTagHouseGrannyScript: faceplayer opentext checkevent EVENT_GOT_CLEANSE_TAG iftrue .GotCleanseTag - writetext Route5CleanseTagGrannySinisterShadowText + writetext Route5CleanseTagHouseGrannyText1 buttonsound verbosegiveitem CLEANSE_TAG iffalse .NoRoom setevent EVENT_GOT_CLEANSE_TAG .GotCleanseTag: - writetext Route5CleanseTagGrannyProtectedText + writetext Route5CleanseTagHouseGrannyText2 waitbutton .NoRoom: closetext end -Route5CleanseTagSpeechHouseTeacherScript: - jumptextfaceplayer Route5CleanseTagSpeechHouseTeacherText +Route5CleanseTagHouseTeacherScript: + jumptextfaceplayer Route5CleanseTagHouseTeacherText HouseForSaleBookshelf: jumpstd difficultbookshelf -Route5CleanseTagGrannySinisterShadowText: +Route5CleanseTagHouseGrannyText1: text "Eeyaaaah!" para "I sense a sinister" @@ -43,13 +41,13 @@ Route5CleanseTagGrannySinisterShadowText: line "it off!" done -Route5CleanseTagGrannyProtectedText: +Route5CleanseTagHouseGrannyText2: text "You were in mortal" line "danger, but you" cont "are protected now." done -Route5CleanseTagSpeechHouseTeacherText: +Route5CleanseTagHouseTeacherText: text "My grandma is into" line "warding off what" @@ -60,24 +58,19 @@ Route5CleanseTagSpeechHouseTeacherText: line "startled you." done -Route5CleanseTagSpeechHouse_MapEvents: - ; filler - db 0, 0 +Route5CleanseTagHouse_MapEvents: + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, ROUTE_5 - warp_def 3, 7, 4, ROUTE_5 + db 2 ; warp events + warp_event 2, 7, 4, ROUTE_5 + warp_event 3, 7, 4, ROUTE_5 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, HouseForSaleBookshelf bg_event 1, 1, BGEVENT_READ, HouseForSaleBookshelf -.ObjectEvents: - db 2 - object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagGrannyScript, -1 - object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagSpeechHouseTeacherScript, -1 + db 2 ; object events + object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseGrannyScript, -1 + object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseTeacherScript, -1 diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm index 1f8bb9b94..c10a35d75 100644 --- a/maps/Route5SaffronGate.asm +++ b/maps/Route5SaffronGate.asm @@ -2,11 +2,9 @@ const_value set 2 const ROUTE5SAFFRONGATE_OFFICER Route5SaffronGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route5SaffronGateOfficerScript: jumptextfaceplayer Route5SaffronGateOfficerText @@ -21,22 +19,17 @@ Route5SaffronGateOfficerText: done Route5SaffronGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 2, ROUTE_5 - warp_def 5, 0, 3, ROUTE_5 - warp_def 4, 7, 9, SAFFRON_CITY - warp_def 5, 7, 9, SAFFRON_CITY + db 4 ; warp events + warp_event 4, 0, 2, ROUTE_5 + warp_event 5, 0, 3, ROUTE_5 + warp_event 4, 7, 9, SAFFRON_CITY + warp_event 5, 7, 9, SAFFRON_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events 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 2bdb75ca0..39013b51d 100644 --- a/maps/Route5UndergroundPathEntrance.asm +++ b/maps/Route5UndergroundPathEntrance.asm @@ -2,11 +2,9 @@ const_value set 2 const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER Route5UndergroundPathEntrance_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route5UndergroundPathEntranceTeacherScript: jumptextfaceplayer Route5UndergroundPathEntranceTeacherText @@ -20,21 +18,16 @@ Route5UndergroundPathEntranceTeacherText: done Route5UndergroundPathEntrance_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 1, ROUTE_5 - warp_def 4, 7, 1, ROUTE_5 - warp_def 4, 3, 1, UNDERGROUND_PATH + db 3 ; warp events + warp_event 3, 7, 1, ROUTE_5 + warp_event 4, 7, 1, ROUTE_5 + warp_event 4, 3, 1, UNDERGROUND_PATH -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1 diff --git a/maps/Route6.asm b/maps/Route6.asm index 9a66c5844..fb00e641e 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -4,14 +4,12 @@ const_value set 2 const ROUTE6_POKEFAN_M3 Route6_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerPokefanmRex: - trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script + trainer POKEFANM, REX, EVENT_BEAT_POKEFANM_REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script .Script: end_if_just_battled @@ -22,7 +20,7 @@ TrainerPokefanmRex: end TrainerPokefanmAllan: - trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, .Script + trainer POKEFANM, ALLAN, EVENT_BEAT_POKEFANM_ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, .Script .Script: end_if_just_battled @@ -92,23 +90,18 @@ PokefanmAllanAfterBattleText: done Route6_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 17, 3, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE - warp_def 6, 1, 3, ROUTE_6_SAFFRON_GATE + db 2 ; warp events + warp_event 17, 3, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE + warp_event 6, 1, 3, ROUTE_6_SAFFRON_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 19, 5, BGEVENT_READ, Route6UndergroundPathSign -.ObjectEvents: - db 3 + db 3 ; object events object_event 17, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH object_event 9, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1 object_event 10, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmAllan, -1 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 569180738..dfc8590e8 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -2,12 +2,10 @@ const_value set 2 const ROUTE6SAFFRONGATE_OFFICER Route6SaffronGate_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -58,22 +56,17 @@ Route6SaffronGuardMagnetTrainText: done Route6SaffronGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 12, SAFFRON_CITY - warp_def 5, 0, 13, SAFFRON_CITY - warp_def 4, 7, 2, ROUTE_6 - warp_def 5, 7, 2, ROUTE_6 + db 4 ; warp events + warp_event 4, 0, 12, SAFFRON_CITY + warp_event 5, 0, 13, SAFFRON_CITY + warp_event 4, 7, 2, ROUTE_6 + warp_event 5, 7, 2, ROUTE_6 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1 diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm index aad70ec88..a17861c2b 100644 --- a/maps/Route6UndergroundPathEntrance.asm +++ b/maps/Route6UndergroundPathEntrance.asm @@ -1,25 +1,18 @@ Route6UndergroundPathEntrance_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route6UndergroundPathEntrance_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 1, ROUTE_6 - warp_def 4, 7, 1, ROUTE_6 - warp_def 4, 3, 2, UNDERGROUND_PATH + db 3 ; warp events + warp_event 3, 7, 1, ROUTE_6 + warp_event 4, 7, 1, ROUTE_6 + warp_event 4, 3, 2, UNDERGROUND_PATH -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Route7.asm b/maps/Route7.asm index f10b33ccc..cea61fd24 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -1,9 +1,7 @@ Route7_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route7UndergroundPathSign: jumptext Route7UndergroundPathSignText @@ -35,21 +33,16 @@ Route7LockedDoorText: done Route7_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 15, 6, 1, ROUTE_7_SAFFRON_GATE - warp_def 15, 7, 2, ROUTE_7_SAFFRON_GATE + db 2 ; warp events + warp_event 15, 6, 1, ROUTE_7_SAFFRON_GATE + warp_event 15, 7, 2, ROUTE_7_SAFFRON_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 5, 11, BGEVENT_READ, Route7UndergroundPathSign bg_event 6, 9, BGEVENT_READ, Route7LockedDoor -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 47e7e4042..57b8ff6cc 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -2,11 +2,9 @@ const_value set 2 const ROUTE7SAFFRONGATE_OFFICER Route7SaffronGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route7SaffronGuardScript: faceplayer @@ -46,22 +44,17 @@ Route7SaffronGuardSeriousText: done Route7SaffronGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 4, 1, ROUTE_7 - warp_def 0, 5, 2, ROUTE_7 - warp_def 9, 4, 10, SAFFRON_CITY - warp_def 9, 5, 11, SAFFRON_CITY + db 4 ; warp events + warp_event 0, 4, 1, ROUTE_7 + warp_event 0, 5, 2, ROUTE_7 + warp_event 9, 4, 10, SAFFRON_CITY + warp_event 9, 5, 11, SAFFRON_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route7SaffronGuardScript, -1 diff --git a/maps/Route8.asm b/maps/Route8.asm index 10df64842..a7ab2783b 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -7,14 +7,12 @@ const_value set 2 const ROUTE8_FRUIT_TREE Route8_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBikerDwayne: - trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script + trainer BIKER, DWAYNE, EVENT_BEAT_BIKER_DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script .Script: end_if_just_battled @@ -25,7 +23,7 @@ TrainerBikerDwayne: end TrainerBikerHarris: - trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script + trainer BIKER, HARRIS, EVENT_BEAT_BIKER_HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script .Script: end_if_just_battled @@ -36,7 +34,7 @@ TrainerBikerHarris: end TrainerBikerZeke: - trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script + trainer BIKER, ZEKE, EVENT_BEAT_BIKER_ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script .Script: end_if_just_battled @@ -47,7 +45,7 @@ TrainerBikerZeke: end TrainerSupernerdSam: - trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script + trainer SUPER_NERD, SAM, EVENT_BEAT_SUPER_NERD_SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script .Script: end_if_just_battled @@ -58,7 +56,7 @@ TrainerSupernerdSam: end TrainerSupernerdTom: - trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script + trainer SUPER_NERD, TOM, EVENT_BEAT_SUPER_NERD_TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script .Script: end_if_just_battled @@ -173,24 +171,19 @@ Route8UndergroundPathSignText: done Route8_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 4, 3, ROUTE_8_SAFFRON_GATE - warp_def 4, 5, 4, ROUTE_8_SAFFRON_GATE + db 2 ; warp events + warp_event 4, 4, 3, ROUTE_8_SAFFRON_GATE + warp_event 4, 5, 4, ROUTE_8_SAFFRON_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 11, 7, BGEVENT_READ, Route8UndergroundPathSign bg_event 10, 5, BGEVENT_READ, Route8LockedDoor -.ObjectEvents: - db 6 + db 6 ; object events object_event 10, 8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1 object_event 10, 9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1 object_event 10, 10, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index dc9968b1d..beb0da6a5 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -2,11 +2,9 @@ const_value set 2 const ROUTE8SAFFRONGATE_OFFICER Route8SaffronGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route8SaffronGateOfficerScript: jumptextfaceplayer Route8SaffronGateOfficerText @@ -20,22 +18,17 @@ Route8SaffronGateOfficerText: done Route8SaffronGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 4, 14, SAFFRON_CITY - warp_def 0, 5, 15, SAFFRON_CITY - warp_def 9, 4, 1, ROUTE_8 - warp_def 9, 5, 2, ROUTE_8 + db 4 ; warp events + warp_event 0, 4, 14, SAFFRON_CITY + warp_event 0, 5, 15, SAFFRON_CITY + warp_event 9, 4, 1, ROUTE_8 + warp_event 9, 5, 2, ROUTE_8 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index cd1831f98..d25430d27 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -7,14 +7,12 @@ const_value set 2 const ROUTE9_POKEFAN_M2 Route9_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerCamperDean: - trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script + trainer CAMPER, DEAN, EVENT_BEAT_CAMPER_DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script .Script: end_if_just_battled @@ -25,7 +23,7 @@ TrainerCamperDean: end TrainerPicnickerHeidi: - trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script + trainer PICNICKER, HEIDI, EVENT_BEAT_PICNICKER_HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script .Script: end_if_just_battled @@ -36,7 +34,7 @@ TrainerPicnickerHeidi: end TrainerCamperSid: - trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script + trainer CAMPER, SID, EVENT_BEAT_CAMPER_SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script .Script: end_if_just_battled @@ -47,7 +45,7 @@ TrainerCamperSid: end TrainerPicnickerEdna: - trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script + trainer PICNICKER, EDNA, EVENT_BEAT_PICNICKER_EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script .Script: end_if_just_battled @@ -58,7 +56,7 @@ TrainerPicnickerEdna: end TrainerHikerTim: - trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script + trainer HIKER, TIM, EVENT_BEAT_HIKER_TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script .Script: end_if_just_battled @@ -69,7 +67,7 @@ TrainerHikerTim: end TrainerHikerSidney: - trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script + trainer HIKER, SIDNEY, EVENT_BEAT_HIKER_SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script .Script: end_if_just_battled @@ -83,7 +81,7 @@ Route9Sign: jumptext Route9SignText Route9HiddenEther: - hiddenitem EVENT_ROUTE_9_HIDDEN_ETHER, ETHER + hiddenitem ETHER, EVENT_ROUTE_9_HIDDEN_ETHER CamperDeanSeenText: text "I came to explore" @@ -206,23 +204,18 @@ Route9SignText: done Route9_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 48, 15, 1, ROCK_TUNNEL_1F + db 1 ; warp events + warp_event 48, 15, 1, ROCK_TUNNEL_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 15, 7, BGEVENT_READ, Route9Sign bg_event 41, 15, BGEVENT_ITEM, Route9HiddenEther -.ObjectEvents: - db 6 + db 6 ; object events object_event 23, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperDean, -1 object_event 39, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1 object_event 11, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1 diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 91f2967a3..e1d30e461 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -1,11 +1,9 @@ RuinsOfAlphAerodactylChamber_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .CheckWall scene_script .DummyScene -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: @@ -50,7 +48,7 @@ RuinsOfAlphAerodactylChamber_MapScripts: MapRuinsOfAlphAerodactylChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_AERODACTYL - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x58df7 end @@ -58,7 +56,7 @@ MapRuinsOfAlphAerodactylChamberSignpost2Script: UnknownScript_0x58df7: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_AERODACTYL_PUZZLE - setflag ENGINE_UNLOCKED_UNOWNS_3 + setflag ENGINE_UNLOCKED_UNOWNS_S_TO_W setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 @@ -84,7 +82,7 @@ MapRuinsOfAlphAerodactylChamberSignpost4Script: opentext writetext UnknownText_0x58e4f writebyte UNOWNWORDS_LIGHT - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -94,7 +92,7 @@ MapRuinsOfAlphAerodactylChamberSignpost5Script: opentext writetext UnknownText_0x58e81 writebyte UNOWNWORDS_LIGHT - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -144,22 +142,18 @@ UnknownText_0x58ee7: done RuinsOfAlphAerodactylChamber_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 9, 4, RUINS_OF_ALPH_OUTSIDE - warp_def 4, 9, 4, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 3, 8, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 3, 9, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 0, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 6 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 9, 4, RUINS_OF_ALPH_OUTSIDE + warp_event 4, 9, 4, RUINS_OF_ALPH_OUTSIDE + warp_event 3, 3, 8, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 3, 9, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 0, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM + + db 0 ; coord events + + db 6 ; bg events bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script @@ -167,5 +161,4 @@ RuinsOfAlphAerodactylChamber_MapEvents: bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm index 8be5e878b..be87d0302 100644 --- a/maps/RuinsOfAlphAerodactylItemRoom.asm +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -5,11 +5,9 @@ const_value set 2 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4 RuinsOfAlphAerodactylItemRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphAerodactylItemRoomGoldBerry: itemball GOLD_BERRY @@ -33,26 +31,21 @@ UnknownText_0x59ac1: done RuinsOfAlphAerodactylItemRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 3, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def 4, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def 3, 1, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM - warp_def 4, 1, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM + db 4 ; warp events + warp_event 3, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_event 4, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_event 3, 1, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM + warp_event 4, 1, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script -.ObjectEvents: - db 4 + db 4 ; object events object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm index d991d80bc..2da613f1c 100644 --- a/maps/RuinsOfAlphAerodactylWordRoom.asm +++ b/maps/RuinsOfAlphAerodactylWordRoom.asm @@ -1,25 +1,18 @@ RuinsOfAlphAerodactylWordRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphAerodactylWordRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 9, 5, 3, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM - warp_def 10, 5, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM - warp_def 17, 11, 8, RUINS_OF_ALPH_INNER_CHAMBER + db 3 ; warp events + warp_event 9, 5, 3, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM + warp_event 10, 5, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM + warp_event 17, 11, 8, RUINS_OF_ALPH_INNER_CHAMBER -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 173f35e39..81282300b 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -1,15 +1,13 @@ RuinsOfAlphHoOhChamber_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .CheckWall scene_script .DummyScene -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: - special Special_HoOhChamber + special HoOhChamber checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue .OpenWall end @@ -51,7 +49,7 @@ RuinsOfAlphHoOhChamber_MapScripts: MapRuinsOfAlphHoOhChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_HO_OH - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x585ba end @@ -59,7 +57,7 @@ MapRuinsOfAlphHoOhChamberSignpost2Script: UnknownScript_0x585ba: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_HO_OH_PUZZLE - setflag ENGINE_UNLOCKED_UNOWNS_4 + setflag ENGINE_UNLOCKED_UNOWNS_X_TO_Z setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 @@ -85,7 +83,7 @@ MapRuinsOfAlphHoOhChamberSignpost4Script: opentext writetext UnknownText_0x58612 writebyte UNOWNWORDS_HO_OH - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -95,7 +93,7 @@ MapRuinsOfAlphHoOhChamberSignpost5Script: opentext writetext UnknownText_0x58644 writebyte UNOWNWORDS_HO_OH - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -145,22 +143,18 @@ UnknownText_0x586aa: done RuinsOfAlphHoOhChamber_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 9, 1, RUINS_OF_ALPH_OUTSIDE - warp_def 4, 9, 1, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 3, 2, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 3, 3, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 0, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 6 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 9, 1, RUINS_OF_ALPH_OUTSIDE + warp_event 4, 9, 1, RUINS_OF_ALPH_OUTSIDE + warp_event 3, 3, 2, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 3, 3, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 0, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM + + db 0 ; coord events + + db 6 ; bg events bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script @@ -168,5 +162,4 @@ RuinsOfAlphHoOhChamber_MapEvents: bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm index e8ad02a27..70916792b 100644 --- a/maps/RuinsOfAlphHoOhItemRoom.asm +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -5,11 +5,9 @@ const_value set 2 const RUINSOFALPHHOOHITEMROOM_POKE_BALL4 RuinsOfAlphHoOhItemRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphHoOhItemRoomGoldBerry: itemball GOLD_BERRY @@ -33,26 +31,21 @@ UnknownText_0x59923: done RuinsOfAlphHoOhItemRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 3, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 4, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 3, 1, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM - warp_def 4, 1, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM + db 4 ; warp events + warp_event 3, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_event 4, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_event 3, 1, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM + warp_event 4, 1, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script -.ObjectEvents: - db 4 + db 4 ; object events object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm index a9b3be9cd..8f66f2f7b 100644 --- a/maps/RuinsOfAlphHoOhWordRoom.asm +++ b/maps/RuinsOfAlphHoOhWordRoom.asm @@ -1,25 +1,18 @@ RuinsOfAlphHoOhWordRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphHoOhWordRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 9, 9, 3, RUINS_OF_ALPH_HO_OH_ITEM_ROOM - warp_def 10, 9, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM - warp_def 17, 21, 2, RUINS_OF_ALPH_INNER_CHAMBER + db 3 ; warp events + warp_event 9, 9, 3, RUINS_OF_ALPH_HO_OH_ITEM_ROOM + warp_event 10, 9, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM + warp_event 17, 21, 2, RUINS_OF_ALPH_INNER_CHAMBER -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index 27e696a85..ff9130613 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -4,13 +4,11 @@ const_value set 2 const RUINSOFALPHINNERCHAMBER_GRAMPS RuinsOfAlphInnerChamber_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .UnownAppear -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -77,26 +75,22 @@ RuinsOfAlphInnerChamberStatueText: done RuinsOfAlphInnerChamber_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 10, 13, 5, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 15, 3, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 4, 15, 4, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 15, 3, 3, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 16, 3, 4, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 3, 21, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 4, 21, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 15, 24, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def 16, 24, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER - -.CoordEvents: - db 0 - -.BGEvents: - db 26 + db 0, 0 ; filler + + db 9 ; warp events + warp_event 10, 13, 5, RUINS_OF_ALPH_OUTSIDE + warp_event 3, 15, 3, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_event 4, 15, 4, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_event 15, 3, 3, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_event 16, 3, 4, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_event 3, 21, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_event 4, 21, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_event 15, 24, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_event 16, 24, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER + + db 0 ; coord events + + db 26 ; bg events bg_event 2, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 5, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 8, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue @@ -124,8 +118,7 @@ RuinsOfAlphInnerChamber_MapEvents: bg_event 14, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 17, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue -.ObjectEvents: - db 3 + db 3 ; object events object_event 3, 7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS object_event 14, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS object_event 11, 19, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index df4bcb881..449fdaaaf 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -3,13 +3,11 @@ const_value set 2 const RUINSOFALPHKABUTOCHAMBER_SCIENTIST RuinsOfAlphKabutoChamber_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .CheckWall scene_script .DummyScene -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: @@ -57,7 +55,7 @@ RuinsOfAlphKabutoChamberReceptionistScript: MapRuinsOfAlphKabutoChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_KABUTO - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x58778 end @@ -65,7 +63,7 @@ MapRuinsOfAlphKabutoChamberSignpost2Script: UnknownScript_0x58778: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_KABUTO_PUZZLE - setflag ENGINE_UNLOCKED_UNOWNS_1 + setflag ENGINE_UNLOCKED_UNOWNS_A_TO_K setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 @@ -122,7 +120,7 @@ MapRuinsOfAlphKabutoChamberSignpost4Script: opentext writetext UnknownText_0x58aa7 writebyte UNOWNWORDS_ESCAPE - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -132,7 +130,7 @@ MapRuinsOfAlphKabutoChamberSignpost5Script: opentext writetext UnknownText_0x58ad9 writebyte UNOWNWORDS_ESCAPE - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -256,22 +254,18 @@ UnknownText_0x58b3f: done RuinsOfAlphKabutoChamber_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 9, 2, RUINS_OF_ALPH_OUTSIDE - warp_def 4, 9, 2, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 3, 4, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 3, 5, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 0, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 6 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 9, 2, RUINS_OF_ALPH_OUTSIDE + warp_event 4, 9, 2, RUINS_OF_ALPH_OUTSIDE + warp_event 3, 3, 4, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 3, 5, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 0, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM + + db 0 ; coord events + + db 6 ; bg events bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost2Script @@ -279,7 +273,6 @@ RuinsOfAlphKabutoChamber_MapEvents: bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost4Script bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost5Script -.ObjectEvents: - db 2 + db 2 ; object events object_event 5, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST object_event 3, 1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1 diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm index 3e5d41515..98e471cbf 100644 --- a/maps/RuinsOfAlphKabutoItemRoom.asm +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -5,11 +5,9 @@ const_value set 2 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4 RuinsOfAlphKabutoItemRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphKabutoItemRoomBerry: itemball BERRY @@ -33,26 +31,21 @@ UnknownText_0x599ad: done RuinsOfAlphKabutoItemRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 3, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 4, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 3, 1, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM - warp_def 4, 1, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM + db 4 ; warp events + warp_event 3, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_event 4, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_event 3, 1, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM + warp_event 4, 1, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script -.ObjectEvents: - db 4 + db 4 ; object events object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm index ad29b5760..79f8c98b6 100644 --- a/maps/RuinsOfAlphKabutoWordRoom.asm +++ b/maps/RuinsOfAlphKabutoWordRoom.asm @@ -1,25 +1,18 @@ RuinsOfAlphKabutoWordRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphKabutoWordRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 9, 5, 3, RUINS_OF_ALPH_KABUTO_ITEM_ROOM - warp_def 10, 5, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM - warp_def 17, 11, 4, RUINS_OF_ALPH_INNER_CHAMBER + db 3 ; warp events + warp_event 9, 5, 3, RUINS_OF_ALPH_KABUTO_ITEM_ROOM + warp_event 10, 5, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM + warp_event 17, 11, 4, RUINS_OF_ALPH_INNER_CHAMBER -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index e9c937526..490215ea3 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -1,15 +1,13 @@ RuinsOfAlphOmanyteChamber_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .CheckWall scene_script .DummyScene -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: - special Special_OmanyteChamber + special OmanyteChamber checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue .OpenWall end @@ -51,7 +49,7 @@ RuinsOfAlphOmanyteChamber_MapScripts: MapRuinsOfAlphOmanyteChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_OMANYTE - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x58c36 end @@ -59,7 +57,7 @@ MapRuinsOfAlphOmanyteChamberSignpost2Script: UnknownScript_0x58c36: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_OMANYTE_PUZZLE - setflag ENGINE_UNLOCKED_UNOWNS_2 + setflag ENGINE_UNLOCKED_UNOWNS_L_TO_R setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 @@ -85,7 +83,7 @@ MapRuinsOfAlphOmanyteChamberSignpost4Script: opentext writetext UnknownText_0x58c8e writebyte UNOWNWORDS_WATER - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -95,7 +93,7 @@ MapRuinsOfAlphOmanyteChamberSignpost5Script: opentext writetext UnknownText_0x58cc0 writebyte UNOWNWORDS_WATER - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -145,22 +143,18 @@ UnknownText_0x58d26: done RuinsOfAlphOmanyteChamber_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 9, 3, RUINS_OF_ALPH_OUTSIDE - warp_def 4, 9, 3, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 3, 6, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 3, 7, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 0, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 6 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 9, 3, RUINS_OF_ALPH_OUTSIDE + warp_event 4, 9, 3, RUINS_OF_ALPH_OUTSIDE + warp_event 3, 3, 6, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 3, 7, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 4, 0, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM + + db 0 ; coord events + + db 6 ; bg events bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script @@ -168,5 +162,4 @@ RuinsOfAlphOmanyteChamber_MapEvents: bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm index 3f4570b2b..4ad567450 100644 --- a/maps/RuinsOfAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -5,11 +5,9 @@ const_value set 2 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4 RuinsOfAlphOmanyteItemRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphOmanyteItemRoomMysteryberry: itemball MYSTERYBERRY @@ -33,26 +31,21 @@ UnknownText_0x59a37: done RuinsOfAlphOmanyteItemRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 3, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 4, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 3, 1, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM - warp_def 4, 1, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM + db 4 ; warp events + warp_event 3, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_event 4, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_event 3, 1, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM + warp_event 4, 1, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script -.ObjectEvents: - db 4 + db 4 ; object events object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm index b2f68e0a3..c0bc8c777 100644 --- a/maps/RuinsOfAlphOmanyteWordRoom.asm +++ b/maps/RuinsOfAlphOmanyteWordRoom.asm @@ -1,25 +1,18 @@ RuinsOfAlphOmanyteWordRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphOmanyteWordRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 9, 7, 3, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM - warp_def 10, 7, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM - warp_def 17, 13, 6, RUINS_OF_ALPH_INNER_CHAMBER + db 3 ; warp events + warp_event 9, 7, 3, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM + warp_event 10, 7, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM + warp_event 17, 13, 6, RUINS_OF_ALPH_INNER_CHAMBER -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 3c674d8c8..068a60a51 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -6,13 +6,11 @@ const_value set 2 const RUINSOFALPHOUTSIDE_YOUNGSTER3 RuinsOfAlphOutside_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .ScientistCallback .DummyScene0: @@ -102,7 +100,7 @@ YoungsterScript_0x5807e: end TrainerPsychicNathan: - trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, .Script + trainer PSYCHIC_T, NATHAN, EVENT_BEAT_PSYCHIC_NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, .Script .Script: end_if_just_battled @@ -113,7 +111,7 @@ TrainerPsychicNathan: end TrainerSuperNerdStan: - trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script + trainer SUPER_NERD, STAN, EVENT_BEAT_SUPER_NERD_STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script .Script: end_if_just_battled @@ -281,36 +279,31 @@ UnknownText_0x5848e: done RuinsOfAlphOutside_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 11 - warp_def 2, 17, 1, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 14, 7, 1, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 2, 29, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 16, 33, 1, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def 10, 13, 1, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 17, 11, 1, RUINS_OF_ALPH_RESEARCH_CENTER - warp_def 6, 19, 1, UNION_CAVE_B1F - warp_def 6, 27, 2, UNION_CAVE_B1F - warp_def 7, 5, 3, ROUTE_36_RUINS_OF_ALPH_GATE - warp_def 13, 20, 1, ROUTE_32_RUINS_OF_ALPH_GATE - warp_def 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 11 ; warp events + warp_event 2, 17, 1, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_event 14, 7, 1, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_event 2, 29, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_event 16, 33, 1, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_event 10, 13, 1, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 17, 11, 1, RUINS_OF_ALPH_RESEARCH_CENTER + warp_event 6, 19, 1, UNION_CAVE_B1F + warp_event 6, 27, 2, UNION_CAVE_B1F + warp_event 7, 5, 3, ROUTE_36_RUINS_OF_ALPH_GATE + warp_event 13, 20, 1, ROUTE_32_RUINS_OF_ALPH_GATE + warp_event 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE + + db 2 ; coord events coord_event 11, 14, 1, RuinsOfAlphOutsideScientistScene1 coord_event 10, 15, 1, RuinsOfAlphOutsideScientistScene2 -.BGEvents: - db 3 + db 3 ; bg events bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script bg_event 12, 16, BGEVENT_READ, RuinsOfAlphOutsideSignpost1Script bg_event 18, 12, BGEVENT_READ, RuinsOfAlphOutsideSignpost2Script -.ObjectEvents: - db 5 + db 5 ; object events object_event 4, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1 object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST object_event 13, 17, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 1595ce59a..325f9dd9e 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -4,13 +4,11 @@ const_value set 2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 RuinsOfAlphResearchCenter_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .GetUnownDex -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .ScientistCallback .DummyScene0: @@ -165,7 +163,7 @@ UnknownScript_0x5925a: UnknownScript_0x59260: writetext UnknownText_0x5982d waitbutton - special Special_UnownPrinter + special UnownPrinter closetext end @@ -393,25 +391,20 @@ UnknownText_0x59886: done RuinsOfAlphResearchCenter_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 6, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 7, 6, RUINS_OF_ALPH_OUTSIDE + db 2 ; warp events + warp_event 2, 7, 6, RUINS_OF_ALPH_OUTSIDE + warp_event 3, 7, 6, RUINS_OF_ALPH_OUTSIDE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 6, 5, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script bg_event 3, 4, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script bg_event 7, 1, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script -.ObjectEvents: - db 3 + db 3 ; object events object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1 object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1 object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index a96f55dea..93c28b0e0 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -1,24 +1,17 @@ SafariZoneBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SafariZoneBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 9, 23, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA - warp_def 10, 23, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA + db 2 ; warp events + warp_event 9, 23, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA + warp_event 10, 23, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index 562775013..f0d39e723 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -1,26 +1,19 @@ SafariZoneFuchsiaGateBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SafariZoneFuchsiaGateBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 1, SAFARI_ZONE_BETA - warp_def 5, 0, 2, SAFARI_ZONE_BETA - warp_def 4, 7, 7, FUCHSIA_CITY - warp_def 5, 7, 7, FUCHSIA_CITY + db 4 ; warp events + warp_event 4, 0, 1, SAFARI_ZONE_BETA + warp_event 5, 0, 2, SAFARI_ZONE_BETA + warp_event 4, 7, 7, FUCHSIA_CITY + warp_event 5, 7, 7, FUCHSIA_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index 1ee13106f..0c2deae10 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -1,24 +1,17 @@ SafariZoneMainOffice_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SafariZoneMainOffice_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, FUCHSIA_CITY - warp_def 3, 7, 2, FUCHSIA_CITY + db 2 ; warp events + warp_event 2, 7, 2, FUCHSIA_CITY + warp_event 3, 7, 2, FUCHSIA_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index e7295d594..2717a0c8d 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -2,11 +2,9 @@ const_value set 2 const SAFARIZONEWARDENSHOME_LASS SafariZoneWardensHome_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WardensGranddaughter: faceplayer @@ -77,24 +75,19 @@ SafariZonePhotoText: done SafariZoneWardensHome_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 6, FUCHSIA_CITY - warp_def 3, 7, 6, FUCHSIA_CITY + db 2 ; warp events + warp_event 2, 7, 6, FUCHSIA_CITY + warp_event 3, 7, 6, FUCHSIA_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 0, 1, BGEVENT_READ, WardensHomeBookshelf bg_event 1, 1, BGEVENT_READ, WardensHomeBookshelf bg_event 7, 0, BGEVENT_READ, WardenPhoto bg_event 9, 0, BGEVENT_READ, SafariZonePhoto -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index d4c470571..bca1d0dde 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -9,11 +9,9 @@ const_value set 2 const SAFFRONCITY_LASS2 SaffronCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -266,32 +264,28 @@ SaffronCityMagnetTrainStationSignText: done SaffronCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 15 - warp_def 26, 3, 1, FIGHTING_DOJO - warp_def 34, 3, 1, SAFFRON_GYM - 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_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_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 - warp_def 17, 33, 2, ROUTE_6_SAFFRON_GATE - warp_def 39, 22, 1, ROUTE_8_SAFFRON_GATE - warp_def 39, 23, 2, ROUTE_8_SAFFRON_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 8 + db 0, 0 ; filler + + db 15 ; warp events + warp_event 26, 3, 1, FIGHTING_DOJO + warp_event 34, 3, 1, SAFFRON_GYM + warp_event 25, 11, 2, SAFFRON_MART + warp_event 9, 29, 1, SAFFRON_POKECENTER_1F + warp_event 27, 29, 1, MR_PSYCHICS_HOUSE + warp_event 8, 3, 2, SAFFRON_MAGNET_TRAIN_STATION + warp_event 18, 21, 1, SILPH_CO_1F + warp_event 9, 11, 1, COPYCATS_HOUSE_1F + warp_event 18, 3, 3, ROUTE_5_SAFFRON_GATE + warp_event 0, 24, 3, ROUTE_7_SAFFRON_GATE + warp_event 0, 25, 4, ROUTE_7_SAFFRON_GATE + warp_event 16, 33, 1, ROUTE_6_SAFFRON_GATE + warp_event 17, 33, 2, ROUTE_6_SAFFRON_GATE + warp_event 39, 22, 1, ROUTE_8_SAFFRON_GATE + warp_event 39, 23, 2, ROUTE_8_SAFFRON_GATE + + db 0 ; coord events + + db 8 ; bg events bg_event 21, 5, BGEVENT_READ, SaffronCitySign bg_event 33, 5, BGEVENT_READ, SaffronGymSign bg_event 25, 5, BGEVENT_READ, FightingDojoSign @@ -301,8 +295,7 @@ SaffronCity_MapEvents: bg_event 10, 29, BGEVENT_READ, SaffronCityPokecenterSign bg_event 26, 11, BGEVENT_READ, SaffronCityMartSign -.ObjectEvents: - db 8 + db 8 ; object events object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1 object_event 19, 30, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1 object_event 32, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index a2ba7497d..9cceafe44 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -7,11 +7,9 @@ const_value set 2 const SAFFRONGYM_GYM_GUY SaffronGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SabrinaScript_0x189c2e: faceplayer @@ -47,7 +45,7 @@ SabrinaScript_0x189c2e: end TrainerMediumRebecca: - trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script + trainer MEDIUM, REBECCA, EVENT_BEAT_MEDIUM_REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script .Script: end_if_just_battled @@ -58,7 +56,7 @@ TrainerMediumRebecca: end TrainerPsychicFranklin: - trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script + trainer PSYCHIC_T, FRANKLIN, EVENT_BEAT_PSYCHIC_FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script .Script: end_if_just_battled @@ -69,7 +67,7 @@ TrainerPsychicFranklin: end TrainerMediumDoris: - trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script + trainer MEDIUM, DORIS, EVENT_BEAT_MEDIUM_DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script .Script: end_if_just_battled @@ -80,7 +78,7 @@ TrainerMediumDoris: end TrainerPsychicJared: - trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script + trainer PSYCHIC_T, JARED, EVENT_BEAT_PSYCHIC_JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script .Script: end_if_just_battled @@ -291,53 +289,48 @@ SaffronGymGuyWinText: done SaffronGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 32 - warp_def 8, 17, 2, SAFFRON_CITY - warp_def 9, 17, 2, SAFFRON_CITY - warp_def 11, 15, 18, SAFFRON_GYM - warp_def 19, 15, 19, SAFFRON_GYM - warp_def 19, 11, 20, SAFFRON_GYM - warp_def 1, 11, 21, SAFFRON_GYM - warp_def 5, 3, 22, SAFFRON_GYM - warp_def 11, 5, 23, SAFFRON_GYM - warp_def 1, 15, 24, SAFFRON_GYM - warp_def 19, 3, 25, SAFFRON_GYM - warp_def 15, 17, 26, SAFFRON_GYM - warp_def 5, 17, 27, SAFFRON_GYM - warp_def 5, 9, 28, SAFFRON_GYM - warp_def 9, 3, 29, SAFFRON_GYM - warp_def 15, 9, 30, SAFFRON_GYM - warp_def 15, 5, 31, SAFFRON_GYM - warp_def 1, 5, 32, SAFFRON_GYM - warp_def 19, 17, 3, SAFFRON_GYM - warp_def 19, 9, 4, SAFFRON_GYM - warp_def 1, 9, 5, SAFFRON_GYM - warp_def 5, 5, 6, SAFFRON_GYM - warp_def 11, 3, 7, SAFFRON_GYM - warp_def 1, 17, 8, SAFFRON_GYM - warp_def 19, 5, 9, SAFFRON_GYM - warp_def 15, 15, 10, SAFFRON_GYM - warp_def 5, 15, 11, SAFFRON_GYM - warp_def 5, 11, 12, SAFFRON_GYM - warp_def 9, 5, 13, SAFFRON_GYM - warp_def 15, 11, 14, SAFFRON_GYM - warp_def 15, 3, 15, SAFFRON_GYM - warp_def 1, 3, 16, SAFFRON_GYM - warp_def 11, 9, 17, SAFFRON_GYM - -.CoordEvents: - db 0 - -.BGEvents: - db 1 + db 0, 0 ; filler + + db 32 ; warp events + warp_event 8, 17, 2, SAFFRON_CITY + warp_event 9, 17, 2, SAFFRON_CITY + warp_event 11, 15, 18, SAFFRON_GYM + warp_event 19, 15, 19, SAFFRON_GYM + warp_event 19, 11, 20, SAFFRON_GYM + warp_event 1, 11, 21, SAFFRON_GYM + warp_event 5, 3, 22, SAFFRON_GYM + warp_event 11, 5, 23, SAFFRON_GYM + warp_event 1, 15, 24, SAFFRON_GYM + warp_event 19, 3, 25, SAFFRON_GYM + warp_event 15, 17, 26, SAFFRON_GYM + warp_event 5, 17, 27, SAFFRON_GYM + warp_event 5, 9, 28, SAFFRON_GYM + warp_event 9, 3, 29, SAFFRON_GYM + warp_event 15, 9, 30, SAFFRON_GYM + warp_event 15, 5, 31, SAFFRON_GYM + warp_event 1, 5, 32, SAFFRON_GYM + warp_event 19, 17, 3, SAFFRON_GYM + warp_event 19, 9, 4, SAFFRON_GYM + warp_event 1, 9, 5, SAFFRON_GYM + warp_event 5, 5, 6, SAFFRON_GYM + warp_event 11, 3, 7, SAFFRON_GYM + warp_event 1, 17, 8, SAFFRON_GYM + warp_event 19, 5, 9, SAFFRON_GYM + warp_event 15, 15, 10, SAFFRON_GYM + warp_event 5, 15, 11, SAFFRON_GYM + warp_event 5, 11, 12, SAFFRON_GYM + warp_event 9, 5, 13, SAFFRON_GYM + warp_event 15, 11, 14, SAFFRON_GYM + warp_event 15, 3, 15, SAFFRON_GYM + warp_event 1, 3, 16, SAFFRON_GYM + warp_event 11, 9, 17, SAFFRON_GYM + + db 0 ; coord events + + db 1 ; bg events bg_event 8, 15, BGEVENT_READ, SaffronGymStatue -.ObjectEvents: - db 6 + db 6 ; object events object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1 object_event 17, 16, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1 object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index 0d69d2017..69a7a3559 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -5,12 +5,10 @@ const_value set 2 const SAFFRONMAGNETTRAINSTATION_LASS SaffronMagnetTrainStation_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -37,7 +35,7 @@ OfficerScript_0x18a81e: applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f applymovement PLAYER, MovementData_0x18a898 writebyte TRUE - special Special_MagnetTrain + special MagnetTrain warpcheck newloadmap MAPSETUP_TRAIN applymovement PLAYER, .MovementBoardTheTrain @@ -216,25 +214,20 @@ SaffronMagnetTrainStationLassText: done SaffronMagnetTrainStation_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 8, 17, 6, SAFFRON_CITY - warp_def 9, 17, 6, SAFFRON_CITY - warp_def 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION - warp_def 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION - -.CoordEvents: - db 1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 8, 17, 6, SAFFRON_CITY + warp_event 9, 17, 6, SAFFRON_CITY + warp_event 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION + warp_event 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION + + db 1 ; coord events coord_event 11, 6, 0, Script_ArriveFromGoldenrod -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events 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, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index d7619320c..65fbf100e 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -4,11 +4,9 @@ const_value set 2 const SAFFRONMART_COOLTRAINER_F SaffronMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x18a3bf: opentext @@ -38,22 +36,17 @@ SaffronMartCooltrainerFText: done SaffronMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, SAFFRON_CITY - warp_def 3, 7, 3, SAFFRON_CITY + db 2 ; warp events + warp_event 2, 7, 3, SAFFRON_CITY + warp_event 3, 7, 3, SAFFRON_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1 object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1 diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index d53fdb684..b72315b15 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -5,17 +5,15 @@ const_value set 2 const SAFFRONPOKECENTER1F_YOUNGSTER SaffronPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x18a47d: jumpstd pokecenternurse TeacherScript_0x18a480: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x18a4a3 @@ -112,23 +110,18 @@ SaffronPokecenter1FYoungsterText: done SaffronPokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 4, SAFFRON_CITY - warp_def 4, 7, 4, SAFFRON_CITY - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 4, SAFFRON_CITY + warp_event 4, 7, 4, SAFFRON_CITY + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1 object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1 object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1 diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm index ebc2bb6c8..11d07cc3f 100644 --- a/maps/SaffronPokecenter2FBeta.asm +++ b/maps/SaffronPokecenter2FBeta.asm @@ -1,23 +1,16 @@ SaffronPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SaffronPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, SAFFRON_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, 3, SAFFRON_POKECENTER_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 885d04c60..8931fdf8a 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -3,12 +3,10 @@ const_value set 2 const SEAFOAMGYM_GYM_GUY SeafoamGym_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -158,20 +156,15 @@ SeafoamGymGuyWinText2: done SeafoamGym_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 5, 5, 1, ROUTE_20 + db 1 ; warp events + warp_event 5, 5, 1, ROUTE_20 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1 object_event 6, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 83c75ef6c..eefb4d50e 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -3,11 +3,9 @@ const_value set 2 const SILPHCO1F_OFFICER SilphCo1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SilphCoReceptionist: jumptextfaceplayer SilphCoReceptionistText @@ -56,21 +54,16 @@ UnknownText_0x18aca8: done SilphCo1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 7, SAFFRON_CITY - warp_def 3, 7, 7, SAFFRON_CITY + db 2 ; warp events + warp_event 2, 7, 7, SAFFRON_CITY + warp_event 3, 7, 7, SAFFRON_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1 object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index d218da44c..e506fc8f4 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -3,11 +3,9 @@ const_value set 2 const SILVERCAVEITEMROOMS_POKE_BALL2 SilverCaveItemRooms_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SilverCaveItemRoomsMaxRevive: itemball MAX_REVIVE @@ -16,21 +14,16 @@ SilverCaveItemRoomsFullRestore: itemball FULL_RESTORE SilverCaveItemRooms_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 13, 3, 3, SILVER_CAVE_ROOM_2 - warp_def 7, 15, 4, SILVER_CAVE_ROOM_2 + db 2 ; warp events + warp_event 13, 3, 3, SILVER_CAVE_ROOM_2 + warp_event 7, 15, 4, SILVER_CAVE_ROOM_2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE object_event 15, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 3e51cf7b2..6f1487619 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -1,9 +1,7 @@ SilverCaveOutside_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -17,29 +15,24 @@ MtSilverSign: jumptext MtSilverSignText SilverCaveOutsideHiddenFullRestore: - hiddenitem EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE MtSilverSignText: text "MT.SILVER" done SilverCaveOutside_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 23, 19, 1, SILVER_CAVE_POKECENTER_1F - warp_def 18, 11, 1, SILVER_CAVE_ROOM_1 + db 2 ; warp events + warp_event 23, 19, 1, SILVER_CAVE_POKECENTER_1F + warp_event 18, 11, 1, SILVER_CAVE_ROOM_1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 24, 19, BGEVENT_READ, MtSilverPokecenterSign bg_event 17, 13, BGEVENT_READ, MtSilverSign bg_event 9, 25, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index 76b1e744f..5ee974367 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -3,11 +3,9 @@ const_value set 2 const SILVERCAVEPOKECENTER1F_GRANNY SilverCavePokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x1ae59a: jumpstd pokecenternurse @@ -30,22 +28,17 @@ SilverCavePokecenter1FGrannyText: done SilverCavePokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 1, SILVER_CAVE_OUTSIDE - warp_def 4, 7, 1, SILVER_CAVE_OUTSIDE - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 1, SILVER_CAVE_OUTSIDE + warp_event 4, 7, 1, SILVER_CAVE_OUTSIDE + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1 object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index fd04a1a6d..e2ff6115b 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -5,11 +5,9 @@ const_value set 2 const SILVERCAVEROOM1_POKE_BALL4 SilverCaveRoom1_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SilverCaveRoom1MaxElixer: itemball MAX_ELIXER @@ -24,30 +22,25 @@ SilverCaveRoom1UltraBall: itemball ULTRA_BALL SilverCaveRoom1HiddenDireHit: - hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT + hiddenitem DIRE_HIT, EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT SilverCaveRoom1HiddenUltraBall: - hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem ULTRA_BALL, EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL SilverCaveRoom1_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 9, 33, 2, SILVER_CAVE_OUTSIDE - warp_def 15, 1, 1, SILVER_CAVE_ROOM_2 + db 2 ; warp events + warp_event 9, 33, 2, SILVER_CAVE_OUTSIDE + warp_event 15, 1, 1, SILVER_CAVE_ROOM_2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 16, 23, BGEVENT_ITEM, SilverCaveRoom1HiddenDireHit bg_event 17, 12, BGEVENT_ITEM, SilverCaveRoom1HiddenUltraBall -.ObjectEvents: - db 4 + db 4 ; object events object_event 4, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER object_event 15, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN object_event 5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index eb6b9fd69..0fd5ceae1 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -4,11 +4,9 @@ const_value set 2 const SILVERCAVEROOM2_POKE_BALL3 SilverCaveRoom2_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SilverCaveRoom2Calcium: itemball CALCIUM @@ -20,28 +18,23 @@ SilverCaveRoom2PPUp: itemball PP_UP SilverCaveRoom2HiddenMaxPotion: - hiddenitem EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION SilverCaveRoom2_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 17, 31, 2, SILVER_CAVE_ROOM_1 - warp_def 11, 5, 1, SILVER_CAVE_ROOM_3 - warp_def 13, 21, 1, SILVER_CAVE_ITEM_ROOMS - warp_def 23, 3, 2, SILVER_CAVE_ITEM_ROOMS + db 4 ; warp events + warp_event 17, 31, 2, SILVER_CAVE_ROOM_1 + warp_event 11, 5, 1, SILVER_CAVE_ROOM_3 + warp_event 13, 21, 1, SILVER_CAVE_ITEM_ROOMS + warp_event 23, 3, 2, SILVER_CAVE_ITEM_ROOMS -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 14, 31, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion -.ObjectEvents: - db 3 + db 3 ; object events object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 705ca0cc1..12f5eeb87 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -2,14 +2,12 @@ const_value set 2 const SILVERCAVEROOM3_RED SilverCaveRoom3_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Red: - special Special_FadeOutMusic + special FadeOutMusic faceplayer opentext writetext .Text1 @@ -20,16 +18,16 @@ Red: startbattle dontrestartmapmusic reloadmapafterbattle - special Special_FadeOutMusic + special FadeOutMusic opentext writetext .Text3 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear SILVERCAVEROOM3_RED pause 15 - special Special_FadeInQuickly + special FadeInQuickly pause 30 special HealParty refreshscreen @@ -51,19 +49,14 @@ Red: done SilverCaveRoom3_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 9, 33, 2, SILVER_CAVE_ROOM_2 + db 1 ; warp events + warp_event 9, 33, 2, SILVER_CAVE_ROOM_2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 9, 10, SPRITE_RED, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 4937a259f..b64976027 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -10,17 +10,15 @@ const_value set 2 const SLOWPOKEWELLB1F_POKE_BALL SlowpokeWellB1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SlowpokeWellB1FKurtScript: jumptextfaceplayer SlowpokeWellB1FKurtText TrainerGruntM29: - trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_29, EVENT_BEAT_ROCKET_GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, .Script .Script: end_if_just_battled @@ -31,21 +29,21 @@ TrainerGruntM29: end TrainerGruntM1: - trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_1, EVENT_BEAT_ROCKET_GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, .Script .Script: opentext writetext TrainerGruntM1WhenTalkText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear SLOWPOKEWELLB1F_ROCKET1 disappear SLOWPOKEWELLB1F_ROCKET2 disappear SLOWPOKEWELLB1F_ROCKET3 disappear SLOWPOKEWELLB1F_ROCKET_GIRL pause 15 - special Special_FadeInQuickly + special FadeInQuickly disappear SLOWPOKEWELLB1F_KURT moveobject SLOWPOKEWELLB1F_KURT, 11, 6 appear SLOWPOKEWELLB1F_KURT @@ -67,14 +65,14 @@ TrainerGruntM1: clearevent EVENT_AZALEA_TOWN_SLOWPOKES clearevent EVENT_KURTS_HOUSE_SLOWPOKE clearevent EVENT_KURTS_HOUSE_KURT_1 - special Special_FadeOutPalettes + special FadeOutPalettes special HealParty pause 15 warp KURTS_HOUSE, 3, 3 end TrainerGruntM2: - trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_2, EVENT_BEAT_ROCKET_GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, .Script .Script: end_if_just_battled @@ -85,7 +83,7 @@ TrainerGruntM2: end TrainerGruntF1: - trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, .Script + trainer GRUNTF, GRUNTF_1, EVENT_BEAT_ROCKET_GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, .Script .Script: end_if_just_battled @@ -321,22 +319,17 @@ SlowpokeWellB1FTaillessSlowpokeText: done SlowpokeWellB1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 17, 15, 6, AZALEA_TOWN - warp_def 7, 11, 1, SLOWPOKE_WELL_B2F + db 2 ; warp events + warp_event 17, 15, 6, AZALEA_TOWN + warp_event 7, 11, 1, SLOWPOKE_WELL_B2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 9 + db 9 ; object events object_event 15, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS object_event 5, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index c8559cc9c..73bea004b 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -3,11 +3,9 @@ const_value set 2 const SLOWPOKEWELLB2F_POKE_BALL SlowpokeWellB2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GymGuyScript_0x5ad0b: faceplayer @@ -62,20 +60,15 @@ UnknownText_0x5adf2: done SlowpokeWellB2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 9, 11, 2, SLOWPOKE_WELL_B1F + db 1 ; warp events + warp_event 9, 11, 2, SLOWPOKE_WELL_B1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1 object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 15ac8e2b3..ee4d394e2 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -5,11 +5,9 @@ const_value set 2 const SOULHOUSE_GRANNY SoulHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MrFuji: jumptextfaceplayer MrFujiText @@ -73,22 +71,17 @@ SoulHouseGrannyText: done SoulHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 7, 6, LAVENDER_TOWN - warp_def 5, 7, 6, LAVENDER_TOWN + db 2 ; warp events + warp_event 4, 7, 6, LAVENDER_TOWN + warp_event 5, 7, 6, LAVENDER_TOWN -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 4, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1 object_event 7, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1 object_event 2, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 3f9887fe2..93ac9bec8 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -7,11 +7,9 @@ const_value set 2 const SPROUTTOWER1F_POKE_BALL SproutTower1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SproutTower1FSage1Script: jumptextfaceplayer SproutTower1FSage1Text @@ -26,7 +24,7 @@ SproutTower1FTeacherScript: jumptextfaceplayer SproutTower1FTeacherText TrainerSageChow: - trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script + trainer SAGE, CHOW, EVENT_BEAT_SAGE_CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script .Script: end_if_just_battled @@ -103,27 +101,22 @@ UnknownText_0x1846d6: done SproutTower1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 9, 15, 7, VIOLET_CITY - warp_def 10, 15, 7, VIOLET_CITY - warp_def 6, 4, 1, SPROUT_TOWER_2F - warp_def 2, 6, 2, SPROUT_TOWER_2F - warp_def 17, 3, 3, SPROUT_TOWER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 2 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 9, 15, 7, VIOLET_CITY + warp_event 10, 15, 7, VIOLET_CITY + warp_event 6, 4, 1, SPROUT_TOWER_2F + warp_event 2, 6, 2, SPROUT_TOWER_2F + warp_event 17, 3, 3, SPROUT_TOWER_2F + + db 0 ; coord events + + db 2 ; bg events bg_event 7, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script bg_event 12, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script -.ObjectEvents: - db 6 + db 6 ; object events object_event 7, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1 object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1 object_event 11, 12, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1 diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index cd0c46fd7..63b7d6d3b 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -4,14 +4,12 @@ const_value set 2 const SPROUTTOWER2F_POKE_BALL SproutTower2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerSageNico: - trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script + trainer SAGE, NICO, EVENT_BEAT_SAGE_NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script .Script: end_if_just_battled @@ -22,7 +20,7 @@ TrainerSageNico: end TrainerSageEdmond: - trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, .Script + trainer SAGE, EDMOND, EVENT_BEAT_SAGE_EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, .Script .Script: end_if_just_battled @@ -85,25 +83,20 @@ UnknownText_0x1848c8: done SproutTower2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 6, 4, 3, SPROUT_TOWER_1F - warp_def 2, 6, 4, SPROUT_TOWER_1F - warp_def 17, 3, 5, SPROUT_TOWER_1F - warp_def 10, 14, 1, SPROUT_TOWER_3F + db 4 ; warp events + warp_event 6, 4, 3, SPROUT_TOWER_1F + warp_event 2, 6, 4, SPROUT_TOWER_1F + warp_event 17, 3, 5, SPROUT_TOWER_1F + warp_event 10, 14, 1, SPROUT_TOWER_3F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 12, 15, BGEVENT_READ, MapSproutTower2FSignpost0Script -.ObjectEvents: - db 3 + db 3 ; object events object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1 object_event 9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1 object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 2b459c55d..6f62df3c6 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -8,13 +8,11 @@ const_value set 2 const SPROUTTOWER3F_SILVER SproutTower3F_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -25,7 +23,7 @@ SproutTower3F_MapScripts: UnknownScript_0x184947: spriteface PLAYER, UP showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic playsound SFX_TACKLE playsound SFX_ELEVATOR earthquake 79 @@ -54,11 +52,11 @@ UnknownScript_0x184947: pause 15 closetext playsound SFX_WARP_TO - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear SPROUTTOWER3F_SILVER waitsfx - special Special_FadeInQuickly + special FadeInQuickly setscene 1 special RestartMapMusic end @@ -93,7 +91,7 @@ UnknownScript_0x1849d1: end TrainerSageJin: - trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, .Script + trainer SAGE, JIN, EVENT_BEAT_SAGE_JIN, SageJinSeenText, SageJinBeatenText, 0, .Script .Script: end_if_just_battled @@ -104,7 +102,7 @@ TrainerSageJin: end TrainerSageTroy: - trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script + trainer SAGE, TROY, EVENT_BEAT_SAGE_TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script .Script: end_if_just_battled @@ -115,7 +113,7 @@ TrainerSageTroy: end TrainerSageNeal: - trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script + trainer SAGE, NEAL, EVENT_BEAT_SAGE_NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script .Script: end_if_just_battled @@ -330,19 +328,15 @@ UnknownText_0x184f61: done SproutTower3F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 10, 14, 4, SPROUT_TOWER_2F + db 1 ; warp events + warp_event 10, 14, 4, SPROUT_TOWER_2F -.CoordEvents: - db 1 + db 1 ; coord events coord_event 11, 9, 0, UnknownScript_0x184947 -.BGEvents: - db 6 + db 6 ; bg events bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script bg_event 11, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script bg_event 9, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script @@ -350,8 +344,7 @@ SproutTower3F_MapEvents: bg_event 5, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script bg_event 14, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script -.ObjectEvents: - db 7 + db 7 ; object events object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1 object_event 8, 8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1 object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 7ecb7b71a..725d8738b 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -7,12 +7,10 @@ const_value set 2 const TEAMROCKETBASEB1F_POKE_BALL3 TeamRocketBaseB1F_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt .DummyScene: @@ -448,9 +446,9 @@ ExplodingTrap22: end VoltorbExplodingTrap: - special Special_FadeOutPalettes + special FadeOutPalettes cry VOLTORB - special Special_FadeInPalettes + special FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon VOLTORB, 23 @@ -458,9 +456,9 @@ VoltorbExplodingTrap: end GeodudeExplodingTrap: - special Special_FadeOutPalettes + special FadeOutPalettes cry GEODUDE - special Special_FadeInPalettes + special FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon GEODUDE, 21 @@ -468,9 +466,9 @@ GeodudeExplodingTrap: end KoffingExplodingTrap: - special Special_FadeOutPalettes + special FadeOutPalettes cry KOFFING - special Special_FadeInPalettes + special FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon KOFFING, 21 @@ -481,7 +479,7 @@ NoExplodingTrap: end TrainerScientistJed: - trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, 0, .Script + trainer SCIENTIST, JED, EVENT_BEAT_SCIENTIST_JED, ScientistJedSeenText, ScientistJedBeatenText, 0, .Script .Script: end_if_just_battled @@ -492,7 +490,7 @@ TrainerScientistJed: end TrainerGruntM16: - trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_16, EVENT_BEAT_ROCKET_GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, .Script .Script: end_if_just_battled @@ -540,7 +538,7 @@ TeamRocketBaseB1FGuardSpec: itemball GUARD_SPEC TeamRocketBaseB1FHiddenRevive: - hiddenitem EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE SecurityCameraMovement1: big_step RIGHT @@ -727,18 +725,15 @@ UnknownText_0x6cdd0: done TeamRocketBaseB1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 27, 2, 3, MAHOGANY_MART_1F - warp_def 3, 14, 1, TEAM_ROCKET_BASE_B2F - warp_def 5, 15, 4, TEAM_ROCKET_BASE_B1F - warp_def 25, 2, 3, TEAM_ROCKET_BASE_B1F - -.CoordEvents: - db 30 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 27, 2, 3, MAHOGANY_MART_1F + warp_event 3, 14, 1, TEAM_ROCKET_BASE_B2F + warp_event 5, 15, 4, TEAM_ROCKET_BASE_B1F + warp_event 25, 2, 3, TEAM_ROCKET_BASE_B1F + + db 30 ; coord events ; There are five security cameras in the base. ; Walking in front of one triggers two Rocket Grunts. coord_event 24, 2, 0, SecurityCamera1a @@ -774,8 +769,7 @@ TeamRocketBaseB1F_MapEvents: coord_event 4, 13, 0, ExplodingTrap21 coord_event 5, 13, 0, ExplodingTrap22 -.BGEvents: - db 9 + db 9 ; bg events bg_event 19, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script bg_event 24, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script bg_event 6, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script @@ -786,8 +780,7 @@ TeamRocketBaseB1F_MapEvents: bg_event 21, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script bg_event 3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive -.ObjectEvents: - db 6 + db 6 ; object events object_event 0, 0, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 18, 12, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index f31110476..de8707b70 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -15,15 +15,13 @@ const_value set 2 const TEAMROCKETBASEB2F_POKE_BALL TeamRocketBaseB2F_MapScripts: -.SceneScripts: - db 4 + db 4 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 scene_script .DummyScene2 scene_script .DummyScene3 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .TransmitterDoorCallback .DummyScene0: @@ -109,7 +107,7 @@ UnknownScript_0x6cfac: writetext UnknownText_0x6d4c6 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear TEAMROCKETBASEB2F_ROCKET1 disappear TEAMROCKETBASEB2F_ROCKET_GIRL @@ -117,7 +115,7 @@ UnknownScript_0x6cfac: disappear TEAMROCKETBASEB2F_ROCKET3 disappear TEAMROCKETBASEB2F_ROCKET4 pause 15 - special Special_FadeInQuickly + special FadeInQuickly setscene 2 clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE spriteface TEAMROCKETBASEB2F_LANCE, DOWN @@ -166,11 +164,11 @@ LanceHealsCommon: writetext LanceHealsText1 waitbutton closetext - special Special_FadeOutPalettes - special Special_StubbedTrainerRankings_Healings + special FadeOutPalettes + special StubbedTrainerRankings_Healings playsound SFX_FULL_HEAL special HealParty - special Special_FadeInPalettes + special FadeInPalettes opentext writetext LanceHealsText2 waitbutton @@ -189,7 +187,7 @@ LanceHealsCommon: end TrainerGruntM17: - trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_17, EVENT_BEAT_ROCKET_GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script .Script: end_if_just_battled @@ -200,7 +198,7 @@ TrainerGruntM17: end TrainerGruntM18: - trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_18, EVENT_BEAT_ROCKET_GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script .Script: end_if_just_battled @@ -211,7 +209,7 @@ TrainerGruntM18: end TrainerGruntM19: - trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_19, EVENT_BEAT_ROCKET_GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script .Script: end_if_just_battled @@ -356,7 +354,7 @@ TeamRocketBaseB2FTMThief: itemball TM_THIEF TeamRocketBaseB2FHiddenFullHeal: - hiddenitem EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL MovementData_0x6d212: step RIGHT @@ -909,19 +907,16 @@ UnknownText_0x6de03: done TeamRocketBaseB2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 14, 2, TEAM_ROCKET_BASE_B1F - warp_def 3, 2, 1, TEAM_ROCKET_BASE_B3F - warp_def 27, 2, 2, TEAM_ROCKET_BASE_B3F - warp_def 3, 6, 3, TEAM_ROCKET_BASE_B3F - warp_def 27, 14, 4, TEAM_ROCKET_BASE_B3F - -.CoordEvents: - db 9 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 14, 2, TEAM_ROCKET_BASE_B1F + warp_event 3, 2, 1, TEAM_ROCKET_BASE_B3F + warp_event 27, 2, 2, TEAM_ROCKET_BASE_B3F + warp_event 3, 6, 3, TEAM_ROCKET_BASE_B3F + warp_event 27, 14, 4, TEAM_ROCKET_BASE_B3F + + db 9 ; coord events coord_event 5, 14, 0, LanceHealsScript1 coord_event 4, 13, 0, LanceHealsScript2 coord_event 14, 11, 1, UnknownScript_0x6cf95 @@ -932,8 +927,7 @@ TeamRocketBaseB2F_MapEvents: coord_event 12, 10, 2, UnknownScript_0x6d07a coord_event 12, 11, 2, UnknownScript_0x6d07a -.BGEvents: - db 23 + db 23 ; bg events bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor bg_event 15, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript @@ -958,8 +952,7 @@ TeamRocketBaseB2F_MapEvents: bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal -.ObjectEvents: - db 14 + db 14 ; object events object_event 20, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE object_event 20, 16, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 3f7fe5d39..42cc78777 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -15,15 +15,13 @@ const_value set 2 const TEAMROCKETBASEB3F_POKE_BALL5 TeamRocketBaseB3F_MapScripts: -.SceneScripts: - db 4 + db 4 ; scene scripts scene_script .LanceGetsPassword scene_script .DummyScene1 scene_script .DummyScene2 scene_script .DummyScene3 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .CheckGiovanniDoor .LanceGetsPassword: @@ -66,7 +64,7 @@ LanceGetPasswordScript: RocketBaseRival: spriteface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic appear TEAMROCKETBASEB3F_SILVER applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalEnterMovement spriteface PLAYER, LEFT @@ -128,7 +126,7 @@ RocketBaseMurkrow: end SlowpokeTailGrunt: - trainer EVENT_BEAT_ROCKET_GRUNTF_5, GRUNTF, GRUNTF_5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script + trainer GRUNTF, GRUNTF_5, EVENT_BEAT_ROCKET_GRUNTF_5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script GruntF5Script: end_if_just_battled @@ -140,7 +138,7 @@ GruntF5Script: end RaticateTailGrunt: - trainer EVENT_BEAT_ROCKET_GRUNTM_28, GRUNTM, GRUNTM_28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script + trainer GRUNTM, GRUNTM_28, EVENT_BEAT_ROCKET_GRUNTM_28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script GruntM28Script: end_if_just_battled @@ -152,7 +150,7 @@ GruntM28Script: end TrainerScientistRoss: - trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, .Script + trainer SCIENTIST, ROSS, EVENT_BEAT_SCIENTIST_ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, .Script .Script: end_if_just_battled @@ -163,7 +161,7 @@ TrainerScientistRoss: end TrainerScientistMitch: - trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, .Script + trainer SCIENTIST, MITCH, EVENT_BEAT_SCIENTIST_MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, .Script .Script: end_if_just_battled @@ -566,24 +564,20 @@ UnknownText_0x6e9a3: done TeamRocketBaseB3F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 3, 2, 2, TEAM_ROCKET_BASE_B2F - warp_def 27, 2, 3, TEAM_ROCKET_BASE_B2F - warp_def 3, 6, 4, TEAM_ROCKET_BASE_B2F - warp_def 27, 14, 5, TEAM_ROCKET_BASE_B2F - -.CoordEvents: - db 3 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 3, 2, 2, TEAM_ROCKET_BASE_B2F + warp_event 27, 2, 3, TEAM_ROCKET_BASE_B2F + warp_event 3, 6, 4, TEAM_ROCKET_BASE_B2F + warp_event 27, 14, 5, TEAM_ROCKET_BASE_B2F + + db 3 ; coord events coord_event 10, 8, 2, UnknownScript_0x6e04b coord_event 11, 8, 2, UnknownScript_0x6e052 coord_event 8, 10, 1, RocketBaseRival -.BGEvents: - db 10 + db 10 ; bg events bg_event 10, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor bg_event 11, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor bg_event 10, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript @@ -595,8 +589,7 @@ TeamRocketBaseB3F_MapEvents: bg_event 6, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript bg_event 7, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript -.ObjectEvents: - db 14 + db 14 ; object events object_event 25, 14, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS object_event 8, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE object_event 7, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index cb3d5f3a8..1f34782f9 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -3,13 +3,11 @@ const_value set 2 const TIMECAPSULE_CHRIS2 TimeCapsule_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .InitializeTimeCapsule scene_script .DummyScene -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTimeCapsule: @@ -20,7 +18,7 @@ TimeCapsule_MapScripts: end .SetWhichChris: - special Special_CableClubCheckWhichChris + special CableClubCheckWhichChris iffalse .Chris2 disappear TIMECAPSULE_CHRIS2 appear TIMECAPSULE_CHRIS1 @@ -37,7 +35,7 @@ TimeCapsule_MapScripts: end MapTimeCapsuleSignpost1Script: - special Special_TimeCapsule + special TimeCapsule newloadmap MAPSETUP_LINKRETURN end @@ -54,23 +52,18 @@ UnknownText_0x193521: done TimeCapsule_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 7, 4, POKECENTER_2F - warp_def 5, 7, 4, POKECENTER_2F + db 2 ; warp events + warp_event 4, 7, 4, POKECENTER_2F + warp_event 5, 7, 4, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 4, 4, BGEVENT_RIGHT, MapTimeCapsuleSignpost1Script bg_event 5, 4, BGEVENT_LEFT, MapTimeCapsuleSignpost1Script -.ObjectEvents: - db 2 - object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS - object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT + db 2 ; object events + object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index cd20d59b2..8689abb0b 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -11,13 +11,11 @@ const_value set 2 const TINTOWER1F_SAGE6 TinTower1F_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .FaceSuicune scene_script .DummyScene -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_OBJECTS, .NPCsCallback callback MAPCALLBACK_TILES, .StairsCallback @@ -33,7 +31,7 @@ TinTower1F_MapScripts: iftrue .GotRainbowWing checkevent EVENT_BEAT_ELITE_FOUR iffalse .FaceBeasts - special Special_BeastsCheck + special BeastsCheck iffalse .FaceBeasts clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 @@ -49,7 +47,7 @@ TinTower1F_MapScripts: iftrue .FoughtSuicune appear TINTOWER1F_SUICUNE writebyte RAIKOU - special Special_MonCheck + special MonCheck iftrue .NoRaikou appear TINTOWER1F_RAIKOU jump .CheckEntei @@ -58,7 +56,7 @@ TinTower1F_MapScripts: disappear TINTOWER1F_RAIKOU .CheckEntei: writebyte ENTEI - special Special_MonCheck + special MonCheck iftrue .NoEntei appear TINTOWER1F_ENTEI jump .BeastsDone @@ -87,7 +85,7 @@ TinTower1F_MapScripts: applymovement PLAYER, TinTowerPlayerMovement1 pause 15 writebyte RAIKOU - special Special_MonCheck + special MonCheck iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1 spriteface PLAYER, LEFT @@ -100,7 +98,7 @@ TinTower1F_MapScripts: waitsfx .Next1: writebyte ENTEI - special Special_MonCheck + special MonCheck iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1 spriteface PLAYER, RIGHT @@ -164,7 +162,7 @@ TinTower1F_MapScripts: playsound SFX_EXIT_BUILDING disappear TINTOWER1F_EUSINE waitsfx - special Special_FadeOutMusic + special FadeOutMusic pause 20 playmapmusic end @@ -523,23 +521,18 @@ TinTower1FSage6Text2: done TinTower1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 9, 15, 12, ECRUTEAK_CITY - warp_def 10, 15, 12, ECRUTEAK_CITY - warp_def 10, 2, 2, TIN_TOWER_2F + db 3 ; warp events + warp_event 9, 15, 12, ECRUTEAK_CITY + warp_event 10, 15, 12, ECRUTEAK_CITY + warp_event 10, 2, 2, TIN_TOWER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 10 + db 10 ; object events object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index 02012d6f8..a3a9447af 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -1,24 +1,17 @@ TinTower2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 10, 14, 1, TIN_TOWER_3F - warp_def 10, 2, 3, TIN_TOWER_1F + db 2 ; warp events + warp_event 10, 14, 1, TIN_TOWER_3F + warp_event 10, 2, 3, TIN_TOWER_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 505073594..20ec2c389 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -2,30 +2,23 @@ const_value set 2 const TINTOWER3F_POKE_BALL TinTower3F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower3FFullHeal: itemball FULL_HEAL TinTower3F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 10, 14, 1, TIN_TOWER_2F - warp_def 16, 2, 2, TIN_TOWER_4F + db 2 ; warp events + warp_event 10, 14, 1, TIN_TOWER_2F + warp_event 16, 2, 2, TIN_TOWER_4F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 3, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 67fd4fda6..9881b6f6c 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -4,11 +4,9 @@ const_value set 2 const TINTOWER4F_POKE_BALL3 TinTower4F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower4FUltraBall: itemball ULTRA_BALL @@ -20,28 +18,23 @@ TinTower4FEscapeRope: itemball ESCAPE_ROPE TinTower4FHiddenMaxPotion: - hiddenitem EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION TinTower4F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 2, 4, 2, TIN_TOWER_5F - warp_def 16, 2, 2, TIN_TOWER_3F - warp_def 2, 14, 3, TIN_TOWER_5F - warp_def 17, 15, 4, TIN_TOWER_5F + db 4 ; warp events + warp_event 2, 4, 2, TIN_TOWER_5F + warp_event 16, 2, 2, TIN_TOWER_3F + warp_event 2, 14, 3, TIN_TOWER_5F + warp_event 17, 15, 4, TIN_TOWER_5F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 11, 6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion -.ObjectEvents: - db 3 + db 3 ; object events object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index ee2980b33..0ffbf5c34 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -2,40 +2,33 @@ const_value set 2 const TINTOWER5F_POKE_BALL TinTower5F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower5FRareCandy: itemball RARE_CANDY TinTower5FHiddenFullRestore: - hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE TinTower5FHiddenCarbos: - hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS + hiddenitem CARBOS, EVENT_TIN_TOWER_5F_HIDDEN_CARBOS TinTower5F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 11, 15, 2, TIN_TOWER_6F - warp_def 2, 4, 1, TIN_TOWER_4F - warp_def 2, 14, 3, TIN_TOWER_4F - warp_def 17, 15, 4, TIN_TOWER_4F + db 4 ; warp events + warp_event 11, 15, 2, TIN_TOWER_6F + warp_event 2, 4, 1, TIN_TOWER_4F + warp_event 2, 14, 3, TIN_TOWER_4F + warp_event 17, 15, 4, TIN_TOWER_4F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 16, 14, BGEVENT_ITEM, TinTower5FHiddenFullRestore bg_event 3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos -.ObjectEvents: - db 1 + db 1 ; object events object_event 9, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 5d587373d..162a0313e 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -2,30 +2,23 @@ const_value set 2 const TINTOWER6F_POKE_BALL TinTower6F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower6FMaxPotion: itemball MAX_POTION TinTower6F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 9, 1, TIN_TOWER_7F - warp_def 11, 15, 1, TIN_TOWER_5F + db 2 ; warp events + warp_event 3, 9, 1, TIN_TOWER_7F + warp_event 11, 15, 1, TIN_TOWER_5F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 8, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index ab10bf4c2..1f984e14b 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -2,33 +2,26 @@ const_value set 2 const TINTOWER7F_POKE_BALL TinTower7F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower7FMaxRevive: itemball MAX_REVIVE TinTower7F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 5 - warp_def 3, 9, 1, TIN_TOWER_6F - warp_def 10, 15, 1, TIN_TOWER_8F - warp_def 12, 7, 4, TIN_TOWER_7F - warp_def 8, 3, 3, TIN_TOWER_7F - warp_def 6, 9, 5, TIN_TOWER_9F + db 5 ; warp events + warp_event 3, 9, 1, TIN_TOWER_6F + warp_event 10, 15, 1, TIN_TOWER_8F + warp_event 12, 7, 4, TIN_TOWER_7F + warp_event 8, 3, 3, TIN_TOWER_7F + warp_event 6, 9, 5, TIN_TOWER_9F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 16, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 4e10ac13f..c95d4b471 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -4,11 +4,9 @@ const_value set 2 const TINTOWER8F_POKE_BALL3 TinTower8F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower8FNugget: itemball NUGGET @@ -20,26 +18,21 @@ TinTower8FFullRestore: itemball FULL_RESTORE TinTower8F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 2, 5, 2, TIN_TOWER_7F - warp_def 2, 11, 1, TIN_TOWER_9F - warp_def 16, 7, 2, TIN_TOWER_9F - warp_def 10, 3, 3, TIN_TOWER_9F - warp_def 14, 15, 6, TIN_TOWER_9F - warp_def 6, 9, 7, TIN_TOWER_9F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 2, 5, 2, TIN_TOWER_7F + warp_event 2, 11, 1, TIN_TOWER_9F + warp_event 16, 7, 2, TIN_TOWER_9F + warp_event 10, 3, 3, TIN_TOWER_9F + warp_event 14, 15, 6, TIN_TOWER_9F + warp_event 6, 9, 7, TIN_TOWER_9F + + db 0 ; coord events + + db 0 ; bg events + + db 3 ; object events object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index a540b891f..b794dea52 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -2,11 +2,9 @@ const_value set 2 const TINTOWER9F_POKE_BALL TinTower9F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower9FHPUp: itemball HP_UP @@ -22,25 +20,20 @@ TinTower9FUnusedLugiaText: done TinTower9F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 7 - warp_def 12, 3, 2, TIN_TOWER_8F - warp_def 2, 5, 3, TIN_TOWER_8F - warp_def 12, 7, 4, TIN_TOWER_8F - warp_def 7, 9, 1, TIN_TOWER_ROOF - warp_def 16, 7, 5, TIN_TOWER_7F - warp_def 6, 13, 5, TIN_TOWER_8F - warp_def 8, 13, 6, TIN_TOWER_8F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 + db 0, 0 ; filler + + db 7 ; warp events + warp_event 12, 3, 2, TIN_TOWER_8F + warp_event 2, 5, 3, TIN_TOWER_8F + warp_event 12, 7, 4, TIN_TOWER_8F + warp_event 7, 9, 1, TIN_TOWER_ROOF + warp_event 16, 7, 5, TIN_TOWER_7F + warp_event 6, 13, 5, TIN_TOWER_8F + warp_event 8, 13, 6, TIN_TOWER_8F + + db 0 ; coord events + + db 0 ; bg events + + db 1 ; object events object_event 9, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 3cfca7cf9..92dde683d 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -2,11 +2,9 @@ const_value set 2 const TINTOWERROOF_HO_OH TinTowerRoof_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .HoOh .HoOh: @@ -45,19 +43,14 @@ HoOhText: done TinTowerRoof_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 9, 13, 4, TIN_TOWER_9F + db 1 ; warp events + warp_event 9, 13, 4, TIN_TOWER_9F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 9, 5, SPRITE_HO_OH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index c9982b094..561e7e1e2 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -2,30 +2,23 @@ const_value set 2 const TOHJOFALLS_POKE_BALL TohjoFalls_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TohjoFallsMoonStone: itemball MOON_STONE TohjoFalls_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 13, 15, 2, ROUTE_27 - warp_def 25, 15, 3, ROUTE_27 + db 2 ; warp events + warp_event 13, 15, 2, ROUTE_27 + warp_event 25, 15, 3, ROUTE_27 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 62232df4f..8bf282bbf 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -3,13 +3,11 @@ const_value set 2 const TRADECENTER_CHRIS2 TradeCenter_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .InitializeTradeCenter scene_script .DummyScene -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTradeCenter: @@ -20,7 +18,7 @@ TradeCenter_MapScripts: end .SetWhichChris: - special Special_CableClubCheckWhichChris + special CableClubCheckWhichChris iffalse .Chris2 disappear TRADECENTER_CHRIS2 appear TRADECENTER_CHRIS1 @@ -37,7 +35,7 @@ TradeCenter_MapScripts: end MapTradeCenterSignpost1Script: - special Special_TradeCenter + special TradeCenter newloadmap MAPSETUP_LINKRETURN end @@ -54,23 +52,18 @@ ChrisScript_0x19340b: done TradeCenter_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 7, 2, POKECENTER_2F - warp_def 5, 7, 2, POKECENTER_2F + db 2 ; warp events + warp_event 4, 7, 2, POKECENTER_2F + warp_event 5, 7, 2, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script bg_event 5, 4, BGEVENT_LEFT, MapTradeCenterSignpost1Script -.ObjectEvents: - db 2 - object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS - object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT + db 2 ; object events + object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index d3fcfca04..8714c17f7 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -6,11 +6,9 @@ const_value set 2 const TRAINERHOUSE1F_GENTLEMAN TrainerHouse1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerHouse1FReceptionistScript: jumptextfaceplayer TrainerHouse1FReceptionistText @@ -138,26 +136,21 @@ UnknownText_0x9b2c1: done TrainerHouse1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 2, 13, 3, VIRIDIAN_CITY - warp_def 3, 13, 3, VIRIDIAN_CITY - warp_def 8, 2, 1, TRAINER_HOUSE_B1F + db 3 ; warp events + warp_event 2, 13, 3, VIRIDIAN_CITY + warp_event 3, 13, 3, VIRIDIAN_CITY + warp_event 8, 2, 1, TRAINER_HOUSE_B1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 5, 0, BGEVENT_READ, MapTrainerHouse1FSignpost0Script bg_event 7, 0, BGEVENT_READ, MapTrainerHouse1FSignpost1Script bg_event 7, 10, BGEVENT_READ, MapTrainerHouse1FSignpost2Script -.ObjectEvents: - db 5 + db 5 ; object events object_event 0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1 object_event 7, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1 object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index bb6fd4316..3fc986b3a 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -3,12 +3,10 @@ const_value set 2 const TRAINERHOUSEB1F_CHRIS TrainerHouseB1F_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -20,7 +18,7 @@ TrainerHouseReceptionistScript: iftrue .FoughtTooManyTimes writetext TrainerHouseB1FIntroText buttonsound - special Special_TrainerHouse + special TrainerHouse iffalse .GetCal3Name trainertotext CAL, CAL2, MEM_BUFFER_0 jump .GotName @@ -42,7 +40,7 @@ TrainerHouseReceptionistScript: writetext TrainerHouseB1FCalBeforeText waitbutton closetext - special Special_TrainerHouse + special TrainerHouse iffalse .NoSpecialBattle winlosstext TrainerHouseB1FCalBeatenText, 0 setlasttalked TRAINERHOUSEB1F_CHRIS @@ -170,21 +168,16 @@ TrainerHouseB1FCalBeforeText: done TrainerHouseB1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 9, 4, 3, TRAINER_HOUSE_1F + db 1 ; warp events + warp_event 9, 4, 3, TRAINER_HOUSE_1F -.CoordEvents: - db 1 + db 1 ; coord events coord_event 7, 3, 0, TrainerHouseReceptionistScript -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 7, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 object_event 6, 11, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index 6834c043e..7ed7f76f4 100644 --- a/maps/UndergroundPath.asm +++ b/maps/UndergroundPath.asm @@ -1,32 +1,25 @@ UndergroundPath_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks UndergroundPathHiddenFullRestore: - hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE UndergroundPathHiddenXSpecial: - hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL + hiddenitem X_SPECIAL, EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL UndergroundPath_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 2, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE - warp_def 3, 24, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE + db 2 ; warp events + warp_event 3, 2, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE + warp_event 3, 24, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 3, 9, BGEVENT_ITEM, UndergroundPathHiddenFullRestore bg_event 1, 19, BGEVENT_ITEM, UndergroundPathHiddenXSpecial -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 77ed8bbb6..8aaa3bf3a 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -10,14 +10,12 @@ const_value set 2 const UNIONCAVE1F_POKE_BALL4 UnionCave1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerPokemaniacLarry: - trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script + trainer POKEMANIAC, LARRY, EVENT_BEAT_POKEMANIAC_LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script .Script: end_if_just_battled @@ -28,7 +26,7 @@ TrainerPokemaniacLarry: end TrainerHikerRussell: - trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, .Script + trainer HIKER, RUSSELL, EVENT_BEAT_HIKER_RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, .Script .Script: end_if_just_battled @@ -39,7 +37,7 @@ TrainerHikerRussell: end TrainerHikerDaniel: - trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, .Script + trainer HIKER, DANIEL, EVENT_BEAT_HIKER_DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, .Script .Script: end_if_just_battled @@ -50,7 +48,7 @@ TrainerHikerDaniel: end TrainerFirebreatherBill: - trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, .Script + trainer FIREBREATHER, BILL, EVENT_BEAT_FIREBREATHER_BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, .Script .Script: end_if_just_battled @@ -61,7 +59,7 @@ TrainerFirebreatherBill: end TrainerFirebreatherRay: - trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, .Script + trainer FIREBREATHER, RAY, EVENT_BEAT_FIREBREATHER_RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, .Script .Script: end_if_just_battled @@ -200,24 +198,19 @@ UnknownText_0x59f29: done UnionCave1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 5, 19, 3, UNION_CAVE_B1F - warp_def 3, 33, 4, UNION_CAVE_B1F - warp_def 17, 31, 1, ROUTE_33 - warp_def 17, 3, 4, ROUTE_32 + db 4 ; warp events + warp_event 5, 19, 3, UNION_CAVE_B1F + warp_event 3, 33, 4, UNION_CAVE_B1F + warp_event 17, 31, 1, ROUTE_33 + warp_event 17, 3, 4, ROUTE_32 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 9 + db 9 ; object events object_event 3, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1 object_event 4, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1 object_event 11, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1 diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 980855221..339572a07 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -8,14 +8,12 @@ const_value set 2 const UNIONCAVEB1F_POKE_BALL2 UnionCaveB1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerPokemaniacAndrew: - trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script + trainer POKEMANIAC, ANDREW, EVENT_BEAT_POKEMANIAC_ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script .Script: end_if_just_battled @@ -26,7 +24,7 @@ TrainerPokemaniacAndrew: end TrainerPokemaniacCalvin: - trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, .Script + trainer POKEMANIAC, CALVIN, EVENT_BEAT_POKEMANIAC_CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, .Script .Script: end_if_just_battled @@ -37,7 +35,7 @@ TrainerPokemaniacCalvin: end TrainerHikerPhillip: - trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, .Script + trainer HIKER, PHILLIP, EVENT_BEAT_HIKER_PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, .Script .Script: end_if_just_battled @@ -48,7 +46,7 @@ TrainerHikerPhillip: end TrainerHikerLeonard: - trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, .Script + trainer HIKER, LEONARD, EVENT_BEAT_HIKER_LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, .Script .Script: end_if_just_battled @@ -153,25 +151,20 @@ PokemaniacCalvinAfterBattleText: done UnionCaveB1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 5 - warp_def 3, 3, 7, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 11, 8, RUINS_OF_ALPH_OUTSIDE - warp_def 7, 19, 1, UNION_CAVE_1F - warp_def 3, 33, 2, UNION_CAVE_1F - warp_def 17, 31, 1, UNION_CAVE_B2F + db 5 ; warp events + warp_event 3, 3, 7, RUINS_OF_ALPH_OUTSIDE + warp_event 3, 11, 8, RUINS_OF_ALPH_OUTSIDE + warp_event 7, 19, 1, UNION_CAVE_1F + warp_event 3, 33, 2, UNION_CAVE_1F + warp_event 17, 31, 1, UNION_CAVE_B2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 7 + db 7 ; object events object_event 9, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerPhillip, -1 object_event 16, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1 object_event 5, 32, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1 diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 5f2baabf2..791b6cb8c 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -7,11 +7,9 @@ const_value set 2 const UNIONCAVEB2F_LAPRAS UnionCaveB2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Lapras .Lapras: @@ -38,7 +36,7 @@ UnionCaveLapras: end TrainerCooltrainermNick: - trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script + trainer COOLTRAINERM, NICK, EVENT_BEAT_COOLTRAINERM_NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script .Script: end_if_just_battled @@ -49,7 +47,7 @@ TrainerCooltrainermNick: end TrainerCooltrainerfGwen: - trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script + trainer COOLTRAINERF, GWEN, EVENT_BEAT_COOLTRAINERF_GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script .Script: end_if_just_battled @@ -60,7 +58,7 @@ TrainerCooltrainerfGwen: end TrainerCooltrainerfEmma: - trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script + trainer COOLTRAINERF, EMMA, EVENT_BEAT_COOLTRAINERF_EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script .Script: end_if_just_battled @@ -142,21 +140,16 @@ CooltrainerfEmmaAfterBattleText: done UnionCaveB2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 5, 3, 5, UNION_CAVE_B1F + db 1 ; warp events + warp_event 5, 3, 5, UNION_CAVE_B1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 6 + db 6 ; object events object_event 15, 19, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermNick, -1 object_event 5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 2430b97d3..abdca0cba 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -7,11 +7,9 @@ const_value set 2 const VERMILIONCITY_POKEFAN_M VermilionCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -42,7 +40,7 @@ VermilionCitySuperNerdScript: VermilionSnorlax: opentext - special Special_SnorlaxAwake + special SnorlaxAwake iftrue UnknownScript_0x1aa9ab writetext UnknownText_0x1aab64 waitbutton @@ -123,7 +121,7 @@ VermilionCityMartSign: jumpstd martsign VermilionCityHiddenFullHeal: - hiddenitem EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL VermilionCityTeacherText: text "VERMILION PORT is" @@ -268,27 +266,23 @@ VermilionCityPortSignText: done VermilionCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 10 - warp_def 5, 5, 1, VERMILION_HOUSE_FISHING_SPEECH_HOUSE - warp_def 9, 5, 1, VERMILION_POKECENTER_1F - warp_def 7, 13, 1, POKEMON_FAN_CLUB - warp_def 13, 13, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE - warp_def 21, 13, 2, VERMILION_MART - warp_def 21, 17, 1, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE - warp_def 10, 19, 1, VERMILION_GYM - warp_def 19, 31, 1, VERMILION_PORT_PASSAGE - warp_def 20, 31, 2, VERMILION_PORT_PASSAGE - warp_def 34, 7, 1, DIGLETTS_CAVE - -.CoordEvents: - db 0 - -.BGEvents: - db 8 + db 0, 0 ; filler + + db 10 ; warp events + warp_event 5, 5, 1, VERMILION_FISHING_SPEECH_HOUSE + warp_event 9, 5, 1, VERMILION_POKECENTER_1F + warp_event 7, 13, 1, POKEMON_FAN_CLUB + warp_event 13, 13, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE + warp_event 21, 13, 2, VERMILION_MART + warp_event 21, 17, 1, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE + warp_event 10, 19, 1, VERMILION_GYM + warp_event 19, 31, 1, VERMILION_PORT_PASSAGE + warp_event 20, 31, 2, VERMILION_PORT_PASSAGE + warp_event 34, 7, 1, DIGLETTS_CAVE + + db 0 ; coord events + + db 8 ; bg events bg_event 25, 3, BGEVENT_READ, VermilionCitySign bg_event 5, 19, BGEVENT_READ, VermilionGymSign bg_event 5, 13, BGEVENT_READ, PokemonFanClubSign @@ -298,8 +292,7 @@ VermilionCity_MapEvents: bg_event 22, 13, BGEVENT_READ, VermilionCityMartSign bg_event 12, 19, BGEVENT_ITEM, VermilionCityHiddenFullHeal -.ObjectEvents: - db 6 + db 6 ; object events object_event 18, 9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1 object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1 object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1 diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm new file mode 100644 index 000000000..efcc6fde3 --- /dev/null +++ b/maps/VermilionDiglettsCaveSpeechHouse.asm @@ -0,0 +1,33 @@ +const_value set 2 + const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN + +VermilionDiglettsCaveSpeechHouse_MapScripts: + db 0 ; scene scripts + + db 0 ; callbacks + +VermilionDiglettsCaveSpeechHouseGentlemanScript: + jumptextfaceplayer VermilionDiglettsCaveSpeechHouseGentlemanText + +VermilionDiglettsCaveSpeechHouseGentlemanText: + text "Over many years," + line "DIGLETT dug a" + cont "large tunnel." + + para "That tunnel goes" + line "to a distant town." + done + +VermilionDiglettsCaveSpeechHouse_MapEvents: + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, 6, VERMILION_CITY + warp_event 3, 7, 6, VERMILION_CITY + + db 0 ; coord events + + db 0 ; bg events + + db 1 ; object events + object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionDiglettsCaveSpeechHouseGentlemanScript, -1 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm index 72ed1ba4a..b55b2ca11 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -1,12 +1,10 @@ const_value set 2 - const VERMILIONHOUSEFISHINGSPEECHHOUSE_FISHING_GURU + const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU -VermilionHouseFishingSpeechHouse_MapScripts: -.SceneScripts: - db 0 +VermilionFishingSpeechHouse_MapScripts: + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FishingDude: jumptextfaceplayer FishingDudeText @@ -50,22 +48,17 @@ FishingDudesHousePhotoText: line "great time…" done -VermilionHouseFishingSpeechHouse_MapEvents: - ; filler - db 0, 0 +VermilionFishingSpeechHouse_MapEvents: + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, VERMILION_CITY - warp_def 3, 7, 1, VERMILION_CITY + db 2 ; warp events + warp_event 2, 7, 1, VERMILION_CITY + warp_event 3, 7, 1, VERMILION_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 3, 0, BGEVENT_READ, FishingDudesHousePhoto -.ObjectEvents: - db 1 + db 1 ; object events object_event 2, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 31f19615d..0432ca163 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -6,11 +6,9 @@ const_value set 2 const VERMILIONGYM_GYM_GUY VermilionGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SurgeScript_0x1920a5: faceplayer @@ -45,7 +43,7 @@ SurgeScript_0x1920a5: end TrainerGentlemanGregory: - trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script + trainer GENTLEMAN, GREGORY, EVENT_BEAT_GENTLEMAN_GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script .Script: end_if_just_battled @@ -56,7 +54,7 @@ TrainerGentlemanGregory: end TrainerGuitaristVincent: - trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script + trainer GUITARIST, VINCENT, EVENT_BEAT_GUITARIST_VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script .Script: end_if_just_battled @@ -67,7 +65,7 @@ TrainerGuitaristVincent: end TrainerJugglerHorton: - trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script + trainer JUGGLER, HORTON, EVENT_BEAT_JUGGLER_HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script .Script: end_if_just_battled @@ -261,19 +259,15 @@ UnknownText_0x19261e: done VermilionGym_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 17, 7, VERMILION_CITY - warp_def 5, 17, 7, VERMILION_CITY + db 2 ; warp events + warp_event 4, 17, 7, VERMILION_CITY + warp_event 5, 17, 7, VERMILION_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 17 + db 17 ; bg events bg_event 1, 7, BGEVENT_READ, MapVermilionGymSignpost14Script bg_event 3, 7, BGEVENT_READ, MapVermilionGymSignpost14Script bg_event 5, 7, BGEVENT_READ, MapVermilionGymSignpost14Script @@ -292,8 +286,7 @@ VermilionGym_MapEvents: bg_event 3, 15, BGEVENT_READ, VermilionGymStatue bg_event 6, 15, BGEVENT_READ, VermilionGymStatue -.ObjectEvents: - db 5 + db 5 ; object events object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1 object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm deleted file mode 100644 index 718d5e005..000000000 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ /dev/null @@ -1,40 +0,0 @@ -const_value set 2 - const VERMILIONHOUSEDIGLETTSCAVESPEECHHOUSE_GENTLEMAN - -VermilionHouseDiglettsCaveSpeechHouse_MapScripts: -.SceneScripts: - db 0 - -.MapCallbacks: - db 0 - -VermilionHouseDiglettsCaveSpeechHouseGentlemanScript: - jumptextfaceplayer VermilionHouseDiglettsCaveSpeechHouseGentlemanText - -VermilionHouseDiglettsCaveSpeechHouseGentlemanText: - text "Over many years," - line "DIGLETT dug a" - cont "large tunnel." - - para "That tunnel goes" - line "to a distant town." - done - -VermilionHouseDiglettsCaveSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 6, VERMILION_CITY - warp_def 3, 7, 6, VERMILION_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionHouseDiglettsCaveSpeechHouseGentlemanScript, -1 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index e2ba0b77c..596b8407f 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -3,11 +3,9 @@ const_value set 2 const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER VermilionMagnetTrainSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VermilionMagnetTrainSpeechHousePokefanFScript: jumptextfaceplayer VermilionMagnetTrainSpeechHousePokefanFText @@ -34,23 +32,18 @@ VermilionMagnetTrainSpeechHouseYoungsterText: done VermilionMagnetTrainSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, VERMILION_CITY - warp_def 3, 7, 4, VERMILION_CITY + db 2 ; warp events + warp_event 2, 7, 4, VERMILION_CITY + warp_event 3, 7, 4, VERMILION_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 0, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf bg_event 1, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf -.ObjectEvents: - db 2 + db 2 ; object events object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1 object_event 0, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index b72ea6aec..0de709e44 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -4,11 +4,9 @@ const_value set 2 const VERMILIONMART_BUENA VermilionMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x191f7e: opentext @@ -37,22 +35,17 @@ VermilionMartBuenaText: done VermilionMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, VERMILION_CITY - warp_def 3, 7, 5, VERMILION_CITY + db 2 ; warp events + warp_event 2, 7, 5, VERMILION_CITY + warp_event 3, 7, 5, VERMILION_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1 object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1 object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1 diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index 43821efdc..0c3712b3a 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 const VERMILIONPOKECENTER1F_BUG_CATCHER VermilionPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x191603: jumpstd pokecenternurse @@ -77,23 +75,18 @@ VermilionPokecenter1FBugCatcherText: done VermilionPokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 2, VERMILION_CITY - warp_def 4, 7, 2, VERMILION_CITY - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 2, VERMILION_CITY + warp_event 4, 7, 2, VERMILION_CITY + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x191603, -1 object_event 7, 2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1 object_event 6, 5, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1 diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm index a82bd9e48..e8ed5dbd1 100644 --- a/maps/VermilionPokecenter2FBeta.asm +++ b/maps/VermilionPokecenter2FBeta.asm @@ -1,23 +1,16 @@ VermilionPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VermilionPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, VERMILION_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, 3, VERMILION_POKECENTER_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index f698ef9ea..7a8faa118 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -4,13 +4,11 @@ const_value set 2 const VERMILIONPORT_SUPER_NERD VermilionPort_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .LeaveFastShip -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -33,14 +31,14 @@ VermilionPort_MapScripts: setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP clearevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M setevent EVENT_FAST_SHIP_FIRST_TIME - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 blackoutmod VERMILION_CITY end SailorScript_0x74dc4: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74e1a writetext UnknownText_0x74f06 waitbutton @@ -52,7 +50,7 @@ SailorScript_0x74dc4: waitsfx applymovement PLAYER, MovementData_0x74ef1 playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND @@ -80,9 +78,9 @@ UnknownScript_0x74e1a: UnknownScript_0x74e20: spriteface VERMILIONPORT_SAILOR2, RIGHT - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74e86 - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue UnknownScript_0x74e86 spriteface PLAYER, LEFT opentext @@ -102,7 +100,7 @@ UnknownScript_0x74e20: writetext UnknownText_0x74fc2 waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 applymovement PLAYER, MovementData_0x74ef8 jump SailorScript_0x74dc4 @@ -146,7 +144,7 @@ UnknownScript_0x74e8d: SailorScript_0x74e97: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74e1a checkcode VAR_WEEKDAY if_equal MONDAY, .NextShipWednesday @@ -164,7 +162,7 @@ SailorScript_0x74e97: writetext UnknownText_0x74fc2 waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 applymovement PLAYER, MovementData_0x74efe jump SailorScript_0x74dc4 @@ -195,7 +193,7 @@ SuperNerdScript_0x74ee6: end VermilionPortHiddenIron: - hiddenitem EVENT_VERMILION_PORT_HIDDEN_IRON, IRON + hiddenitem IRON, EVENT_VERMILION_PORT_HIDDEN_IRON MovementData_0x74ef1: step DOWN @@ -299,24 +297,19 @@ UnknownText_0x750a6: done VermilionPort_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 9, 5, 5, VERMILION_PORT_PASSAGE - warp_def 7, 17, 1, FAST_SHIP_1F + db 2 ; warp events + warp_event 9, 5, 5, VERMILION_PORT_PASSAGE + warp_event 7, 17, 1, FAST_SHIP_1F -.CoordEvents: - db 1 + db 1 ; coord events coord_event 7, 11, 0, UnknownScript_0x74e20 -.BGEvents: - db 1 + db 1 ; bg events bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron -.ObjectEvents: - db 3 + db 3 ; object events object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1 object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 1e078e525..1364202a4 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -2,11 +2,9 @@ const_value set 2 const VERMILIONPORTPASSAGE_TEACHER VermilionPortPassage_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VermilionPortPassageTeacherScript: jumptextfaceplayer VermilionPortPassageTeacherText @@ -19,23 +17,18 @@ VermilionPortPassageTeacherText: done VermilionPortPassage_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 5 - warp_def 15, 0, 8, VERMILION_CITY - warp_def 16, 0, 9, VERMILION_CITY - warp_def 15, 4, 4, VERMILION_PORT_PASSAGE - warp_def 3, 2, 3, VERMILION_PORT_PASSAGE - warp_def 3, 14, 1, VERMILION_PORT + db 5 ; warp events + warp_event 15, 0, 8, VERMILION_CITY + warp_event 16, 0, 9, VERMILION_CITY + warp_event 15, 4, 4, VERMILION_PORT_PASSAGE + warp_event 3, 2, 3, VERMILION_PORT_PASSAGE + warp_event 3, 14, 1, VERMILION_PORT -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 17, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index e0389faeb..34aa49a5a 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -7,13 +7,11 @@ const_value set 2 const VICTORYROAD_POKE_BALL5 VictoryRoad_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -25,7 +23,7 @@ UnknownScript_0x74492: moveobject VICTORYROAD_SILVER, 18, 11 spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear VICTORYROAD_SILVER applymovement VICTORYROAD_SILVER, MovementData_0x74539 @@ -39,7 +37,7 @@ UnknownScript_0x74492: UnknownScript_0x744b5: spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear VICTORYROAD_SILVER applymovement VICTORYROAD_SILVER, MovementData_0x74542 @@ -112,10 +110,10 @@ VictoryRoadHPUp: itemball HP_UP VictoryRoadHiddenMaxPotion: - hiddenitem EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION VictoryRoadHiddenFullHeal: - hiddenitem EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL MovementData_0x74539: step LEFT @@ -239,34 +237,29 @@ UnknownText_0x747aa: done VictoryRoad_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 10 - warp_def 9, 67, 5, VICTORY_ROAD_GATE - warp_def 1, 49, 3, VICTORY_ROAD - warp_def 1, 35, 2, VICTORY_ROAD - warp_def 13, 31, 5, VICTORY_ROAD - warp_def 13, 17, 4, VICTORY_ROAD - warp_def 17, 33, 7, VICTORY_ROAD - warp_def 17, 19, 6, VICTORY_ROAD - warp_def 0, 11, 9, VICTORY_ROAD - warp_def 0, 27, 8, VICTORY_ROAD - warp_def 13, 5, 3, ROUTE_23 - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 10 ; warp events + warp_event 9, 67, 5, VICTORY_ROAD_GATE + warp_event 1, 49, 3, VICTORY_ROAD + warp_event 1, 35, 2, VICTORY_ROAD + warp_event 13, 31, 5, VICTORY_ROAD + warp_event 13, 17, 4, VICTORY_ROAD + warp_event 17, 33, 7, VICTORY_ROAD + warp_event 17, 19, 6, VICTORY_ROAD + warp_event 0, 11, 9, VICTORY_ROAD + warp_event 0, 27, 8, VICTORY_ROAD + warp_event 13, 5, 3, ROUTE_23 + + db 2 ; coord events coord_event 12, 8, 0, UnknownScript_0x74492 coord_event 13, 8, 0, UnknownScript_0x744b5 -.BGEvents: - db 2 + db 2 ; bg events bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion bg_event 3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal -.ObjectEvents: - db 6 + db 6 ; object events object_event 18, 13, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index b466a32b6..3f5054dd5 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -4,13 +4,11 @@ const_value set 2 const VICTORYROADGATE_BLACK_BELT2 VictoryRoadGate_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -98,29 +96,24 @@ VictoryRoadGateRightBlackBeltText: done VictoryRoadGate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 8 - warp_def 17, 7, 1, ROUTE_22 - warp_def 18, 7, 1, ROUTE_22 - warp_def 9, 17, 1, ROUTE_26 - warp_def 10, 17, 1, ROUTE_26 - warp_def 9, 0, 1, VICTORY_ROAD - warp_def 10, 0, 1, VICTORY_ROAD - warp_def 1, 7, 2, ROUTE_28 - warp_def 2, 7, 2, ROUTE_28 - -.CoordEvents: - db 1 + db 0, 0 ; filler + + db 8 ; warp events + warp_event 17, 7, 1, ROUTE_22 + warp_event 18, 7, 1, ROUTE_22 + warp_event 9, 17, 1, ROUTE_26 + warp_event 10, 17, 1, ROUTE_26 + warp_event 9, 0, 1, VICTORY_ROAD + warp_event 10, 0, 1, VICTORY_ROAD + warp_event 1, 7, 2, ROUTE_28 + warp_event 2, 7, 2, ROUTE_28 + + db 1 ; coord events coord_event 10, 11, 0, VictoryRoadGateBadgeCheckScene -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 8, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1 object_event 7, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER object_event 12, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 6890ffa8a..cc4eba2b5 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -9,11 +9,9 @@ const_value set 2 const VIOLETCITY_POKE_BALL2 VioletCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -98,7 +96,7 @@ VioletCityFruitTreeScript: fruittree FRUITTREE_VIOLET_CITY VioletCityHiddenHyperPotion: - hiddenitem EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION VioletCityFollowEarl_MovementData: big_step DOWN @@ -279,26 +277,22 @@ EarlsPokemonAcademySignText: done VioletCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 9, 17, 2, VIOLET_MART - warp_def 18, 17, 1, VIOLET_GYM - warp_def 30, 17, 1, EARLS_POKEMON_ACADEMY - warp_def 3, 15, 1, VIOLET_NICKNAME_SPEECH_HOUSE - warp_def 31, 25, 1, VIOLET_POKECENTER_1F - warp_def 21, 29, 1, VIOLET_KYLES_HOUSE - warp_def 23, 5, 1, SPROUT_TOWER_1F - warp_def 39, 24, 1, ROUTE_31_VIOLET_GATE - warp_def 39, 25, 2, ROUTE_31_VIOLET_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 7 + db 0, 0 ; filler + + db 9 ; warp events + warp_event 9, 17, 2, VIOLET_MART + warp_event 18, 17, 1, VIOLET_GYM + warp_event 30, 17, 1, EARLS_POKEMON_ACADEMY + warp_event 3, 15, 1, VIOLET_NICKNAME_SPEECH_HOUSE + warp_event 31, 25, 1, VIOLET_POKECENTER_1F + warp_event 21, 29, 1, VIOLET_KYLES_HOUSE + warp_event 23, 5, 1, SPROUT_TOWER_1F + warp_event 39, 24, 1, ROUTE_31_VIOLET_GATE + warp_event 39, 25, 2, ROUTE_31_VIOLET_GATE + + db 0 ; coord events + + db 7 ; bg events bg_event 24, 20, BGEVENT_READ, VioletCitySign bg_event 15, 17, BGEVENT_READ, VioletGymSign bg_event 24, 8, BGEVENT_READ, SproutTowerSign @@ -307,8 +301,7 @@ VioletCity_MapEvents: bg_event 10, 17, BGEVENT_READ, VioletCityMartSign bg_event 37, 14, BGEVENT_ITEM, VioletCityHiddenHyperPotion -.ObjectEvents: - db 8 + db 8 ; object events object_event 13, 16, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL object_event 28, 28, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityLassScript, -1 object_event 24, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 12480e21f..1b8b3414a 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -5,11 +5,9 @@ const_value set 2 const VIOLETGYM_GYM_GUY VioletGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FalknerScript_0x683c2: faceplayer @@ -67,7 +65,7 @@ VioletGymActivateRockets: jumpstd radiotowerrockets TrainerBirdKeeperRod: - trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, BirdKeeperRodSeenText, BirdKeeperRodBeatenText, 0, .Script + trainer BIRD_KEEPER, ROD, EVENT_BEAT_BIRD_KEEPER_ROD, BirdKeeperRodSeenText, BirdKeeperRodBeatenText, 0, .Script .Script: end_if_just_battled @@ -78,7 +76,7 @@ TrainerBirdKeeperRod: end TrainerBirdKeeperAbe: - trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, BirdKeeperAbeSeenText, BirdKeeperAbeBeatenText, 0, .Script + trainer BIRD_KEEPER, ABE, EVENT_BEAT_BIRD_KEEPER_ABE, BirdKeeperAbeSeenText, BirdKeeperAbeBeatenText, 0, .Script .Script: end_if_just_battled @@ -282,24 +280,19 @@ VioletGymGuyWinText: done VioletGym_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 15, 2, VIOLET_CITY - warp_def 5, 15, 2, VIOLET_CITY + db 2 ; warp events + warp_event 4, 15, 2, VIOLET_CITY + warp_event 5, 15, 2, VIOLET_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 3, 13, BGEVENT_READ, VioletGymStatue bg_event 6, 13, BGEVENT_READ, VioletGymStatue -.ObjectEvents: - db 4 + db 4 ; object events object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1 object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1 diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index 4d903cb70..be3ae329b 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -3,11 +3,9 @@ const_value set 2 const VIOLETKYLESHOUSE_KYLE VioletKylesHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VioletKylesHousePokefanMScript: jumptextfaceplayer VioletKylesHousePokefanMText @@ -33,21 +31,16 @@ VioletKylesHousePokefanMText: done VioletKylesHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 7, 6, VIOLET_CITY - warp_def 4, 7, 6, VIOLET_CITY + db 2 ; warp events + warp_event 3, 7, 6, VIOLET_CITY + warp_event 4, 7, 6, VIOLET_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 + db 2 ; object events object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1 object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index e1a86e0c7..006a28208 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -4,11 +4,9 @@ const_value set 2 const VIOLETMART_COOLTRAINER_M VioletMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x68295: opentext @@ -49,22 +47,17 @@ VioletMartCooltrainerMText: done VioletMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, VIOLET_CITY - warp_def 3, 7, 1, VIOLET_CITY + db 2 ; warp events + warp_event 2, 7, 1, VIOLET_CITY + warp_event 3, 7, 1, VIOLET_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1 object_event 7, 6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1 object_event 5, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 7ec074324..90d137801 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -4,11 +4,9 @@ const_value set 2 const VIOLETNICKNAMESPEECHHOUSE_BIRD VioletNicknameSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VioletNicknameSpeechHouseTeacherScript: jumptextfaceplayer VioletNicknameSpeechHouseTeacherText @@ -45,22 +43,17 @@ UnknownText_0x6947c: done VioletNicknameSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 7, 4, VIOLET_CITY - warp_def 4, 7, 4, VIOLET_CITY + db 2 ; warp events + warp_event 3, 7, 4, VIOLET_CITY + warp_event 4, 7, 4, VIOLET_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1 object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1 object_event 5, 2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1 diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 9413849b8..39171fa21 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -6,11 +6,9 @@ const_value set 2 const VIOLETPOKECENTER1F_SCIENTIST VioletPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VioletPokecenterNurse: jumpstd pokecenternurse @@ -216,23 +214,18 @@ VioletPokecenter1FYoungsterText: done VioletPokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 5, VIOLET_CITY - warp_def 4, 7, 5, VIOLET_CITY - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 5, VIOLET_CITY + warp_event 4, 7, 5, VIOLET_CITY + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 5 + db 5 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1 object_event 7, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1 object_event 1, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1 diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 54899e2a4..435c21546 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -5,11 +5,9 @@ const_value set 2 const VIRIDIANCITY_YOUNGSTER ViridianCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -216,22 +214,18 @@ TrainerHouseSignText: done ViridianCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 32, 7, 1, VIRIDIAN_GYM - warp_def 21, 9, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE - warp_def 23, 15, 1, TRAINER_HOUSE_1F - warp_def 29, 19, 2, VIRIDIAN_MART - warp_def 23, 25, 1, VIRIDIAN_POKECENTER_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 6 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 32, 7, 1, VIRIDIAN_GYM + warp_event 21, 9, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE + warp_event 23, 15, 1, TRAINER_HOUSE_1F + warp_event 29, 19, 2, VIRIDIAN_MART + warp_event 23, 25, 1, VIRIDIAN_POKECENTER_1F + + db 0 ; coord events + + db 6 ; bg events bg_event 17, 17, BGEVENT_READ, ViridianCitySign bg_event 27, 7, BGEVENT_READ, ViridianGymSign bg_event 19, 1, BGEVENT_READ, ViridianCityWelcomeSign @@ -239,8 +233,7 @@ ViridianCity_MapEvents: bg_event 24, 25, BGEVENT_READ, ViridianCityPokecenterSign bg_event 30, 19, BGEVENT_READ, ViridianCityMartSign -.ObjectEvents: - db 4 + db 4 ; object events object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianCityCoffeeGramps, -1 object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianCityGrampsNearGym, -1 object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianCityDreamEaterFisher, -1 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index ed47a099e..f194f434c 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -3,11 +3,9 @@ const_value set 2 const VIRIDIANGYM_GYM_GUY ViridianGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ViridianGymBlueScript: faceplayer @@ -170,23 +168,18 @@ ViridianGymGuyWinText: done ViridianGym_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 17, 1, VIRIDIAN_CITY - warp_def 5, 17, 1, VIRIDIAN_CITY + db 2 ; warp events + warp_event 4, 17, 1, VIRIDIAN_CITY + warp_event 5, 17, 1, VIRIDIAN_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 3, 13, BGEVENT_READ, ViridianGymStatue bg_event 6, 13, BGEVENT_READ, ViridianGymStatue -.ObjectEvents: - db 2 + db 2 ; object events object_event 5, 3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 275b57e2d..be8e454b9 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -4,11 +4,9 @@ const_value set 2 const VIRIDIANMART_COOLTRAINER_M ViridianMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x9b5e7: opentext @@ -37,22 +35,17 @@ ViridianMartCooltrainerMText: done ViridianMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, VIRIDIAN_CITY - warp_def 3, 7, 4, VIRIDIAN_CITY + db 2 ; warp events + warp_event 2, 7, 4, VIRIDIAN_CITY + warp_event 3, 7, 4, VIRIDIAN_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1 object_event 7, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1 object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 10d2c52e5..c7115761d 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -5,11 +5,9 @@ const_value set 2 const VIRIDIANNICKNAMESPEECHHOUSE_RATTEY ViridianNicknameSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ViridianNicknameSpeechHousePokefanMScript: jumptextfaceplayer ViridianNicknameSpeechHousePokefanMText @@ -62,22 +60,17 @@ RatteyText: done ViridianNicknameSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, VIRIDIAN_CITY - warp_def 3, 7, 2, VIRIDIAN_CITY + db 2 ; warp events + warp_event 2, 7, 2, VIRIDIAN_CITY + warp_event 3, 7, 2, VIRIDIAN_CITY -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 2, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1 object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1 object_event 5, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1 diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index 86f767a5f..296fee253 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -5,11 +5,9 @@ const_value set 2 const VIRIDIANPOKECENTER1F_BUG_CATCHER ViridianPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x9b690: jumpstd pokecenternurse @@ -72,23 +70,18 @@ ViridianPokecenter1FBugCatcherText: done ViridianPokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 5, VIRIDIAN_CITY - warp_def 4, 7, 5, VIRIDIAN_CITY - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, 5, VIRIDIAN_CITY + warp_event 4, 7, 5, VIRIDIAN_CITY + warp_event 0, 7, 1, POKECENTER_2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9b690, -1 object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1 object_event 5, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1 diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm index 3a00d3be1..ea714aa9e 100644 --- a/maps/ViridianPokecenter2FBeta.asm +++ b/maps/ViridianPokecenter2FBeta.asm @@ -1,23 +1,16 @@ ViridianPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ViridianPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, VIRIDIAN_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, 3, VIRIDIAN_POKECENTER_1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 8b816062f..f5b474fc4 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -7,11 +7,9 @@ const_value set 2 const WHIRLISLANDB1F_BOULDER WhirlIslandB1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandB1FFullRestore: itemball FULL_RESTORE @@ -32,41 +30,36 @@ WhirlIslandB1FBoulder: jumpstd strengthboulder WhirlIslandB1FHiddenRareCandy: - hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY WhirlIslandB1FHiddenUltraBall: - hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem ULTRA_BALL, EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL WhirlIslandB1FHiddenFullRestore: - hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE WhirlIslandB1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 5, 5, 2, WHIRL_ISLAND_NW - warp_def 35, 3, 2, WHIRL_ISLAND_NE - warp_def 29, 9, 3, WHIRL_ISLAND_NE - warp_def 9, 31, 3, WHIRL_ISLAND_SW - warp_def 23, 31, 2, WHIRL_ISLAND_SW - warp_def 31, 29, 2, WHIRL_ISLAND_SE - warp_def 25, 21, 1, WHIRL_ISLAND_B2F - warp_def 13, 27, 2, WHIRL_ISLAND_B2F - warp_def 17, 21, 1, WHIRL_ISLAND_CAVE - -.CoordEvents: - db 0 - -.BGEvents: - db 3 + db 0, 0 ; filler + + db 9 ; warp events + warp_event 5, 5, 2, WHIRL_ISLAND_NW + warp_event 35, 3, 2, WHIRL_ISLAND_NE + warp_event 29, 9, 3, WHIRL_ISLAND_NE + warp_event 9, 31, 3, WHIRL_ISLAND_SW + warp_event 23, 31, 2, WHIRL_ISLAND_SW + warp_event 31, 29, 2, WHIRL_ISLAND_SE + warp_event 25, 21, 1, WHIRL_ISLAND_B2F + warp_event 13, 27, 2, WHIRL_ISLAND_B2F + warp_event 17, 21, 1, WHIRL_ISLAND_CAVE + + db 0 ; coord events + + db 3 ; bg events bg_event 30, 4, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy bg_event 36, 18, BGEVENT_ITEM, WhirlIslandB1FHiddenUltraBall bg_event 2, 23, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore -.ObjectEvents: - db 6 + db 6 ; object events object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE object_event 2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS object_event 33, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index d589b7d05..2e5071631 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -4,11 +4,9 @@ const_value set 2 const WHIRLISLANDB2F_POKE_BALL3 WhirlIslandB2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandB2FFullRestore: itemball FULL_RESTORE @@ -20,24 +18,19 @@ WhirlIslandB2FMaxElixer: itemball MAX_ELIXER WhirlIslandB2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 11, 5, 7, WHIRL_ISLAND_B1F - warp_def 7, 11, 8, WHIRL_ISLAND_B1F - warp_def 7, 25, 1, WHIRL_ISLAND_LUGIA_CHAMBER - warp_def 13, 31, 5, WHIRL_ISLAND_SW + db 4 ; warp events + warp_event 11, 5, 7, WHIRL_ISLAND_B1F + warp_event 7, 11, 8, WHIRL_ISLAND_B1F + warp_event 7, 25, 1, WHIRL_ISLAND_LUGIA_CHAMBER + warp_event 13, 31, 5, WHIRL_ISLAND_SW -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 29c8500bb..98312ad5a 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -1,24 +1,17 @@ WhirlIslandCave_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandCave_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 7, 5, 9, WHIRL_ISLAND_B1F - warp_def 3, 13, 4, WHIRL_ISLAND_NW + db 2 ; warp events + warp_event 7, 5, 9, WHIRL_ISLAND_B1F + warp_event 3, 13, 4, WHIRL_ISLAND_NW -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index aa0a15c1e..162cdc88f 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -2,11 +2,9 @@ const_value set 2 const WHIRLISLANDLUGIACHAMBER_LUGIA WhirlIslandLugiaChamber_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Lugia .Lugia: @@ -44,19 +42,14 @@ LugiaText: done WhirlIslandLugiaChamber_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 9, 13, 3, WHIRL_ISLAND_B2F + db 1 ; warp events + warp_event 9, 13, 3, WHIRL_ISLAND_B2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 9, 5, SPRITE_LUGIA, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index b022a4c72..9fc721d77 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -2,31 +2,24 @@ const_value set 2 const WHIRLISLANDNE_POKE_BALL WhirlIslandNE_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandNEUltraBall: itemball ULTRA_BALL WhirlIslandNE_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 13, 2, ROUTE_41 - warp_def 17, 3, 2, WHIRL_ISLAND_B1F - warp_def 13, 11, 3, WHIRL_ISLAND_B1F + db 3 ; warp events + warp_event 3, 13, 2, ROUTE_41 + warp_event 17, 3, 2, WHIRL_ISLAND_B1F + warp_event 13, 11, 3, WHIRL_ISLAND_B1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 11, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index e8475c19b..38a413e96 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -1,26 +1,19 @@ WhirlIslandNW_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandNW_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 5, 7, 1, ROUTE_41 - warp_def 5, 3, 1, WHIRL_ISLAND_B1F - warp_def 3, 15, 4, WHIRL_ISLAND_SW - warp_def 7, 15, 2, WHIRL_ISLAND_CAVE + db 4 ; warp events + warp_event 5, 7, 1, ROUTE_41 + warp_event 5, 3, 1, WHIRL_ISLAND_B1F + warp_event 3, 15, 4, WHIRL_ISLAND_SW + warp_event 7, 15, 2, WHIRL_ISLAND_CAVE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index 3e7edc484..51b21821a 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -1,24 +1,17 @@ WhirlIslandSE_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandSE_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 5, 13, 4, ROUTE_41 - warp_def 5, 3, 6, WHIRL_ISLAND_B1F + db 2 ; warp events + warp_event 5, 13, 4, ROUTE_41 + warp_event 5, 3, 6, WHIRL_ISLAND_B1F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index b80b00b6a..58878cb34 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -2,33 +2,26 @@ const_value set 2 const WHIRLISLANDSW_POKE_BALL WhirlIslandSW_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandSWUltraBall: itemball ULTRA_BALL WhirlIslandSW_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 5 - warp_def 5, 7, 3, ROUTE_41 - warp_def 17, 3, 5, WHIRL_ISLAND_B1F - warp_def 3, 3, 4, WHIRL_ISLAND_B1F - warp_def 3, 15, 3, WHIRL_ISLAND_NW - warp_def 17, 15, 4, WHIRL_ISLAND_B2F + db 5 ; warp events + warp_event 5, 7, 3, ROUTE_41 + warp_event 17, 3, 5, WHIRL_ISLAND_B1F + warp_event 3, 3, 4, WHIRL_ISLAND_B1F + warp_event 3, 15, 3, WHIRL_ISLAND_NW + warp_event 17, 15, 4, WHIRL_ISLAND_B2F -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 1b0522ce9..e56a5777f 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -2,13 +2,11 @@ const_value set 2 const WILLSROOM_WILL WillsRoom_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .LockDoor scene_script .DummyScene -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .WillsRoomDoors .LockDoor: @@ -129,21 +127,16 @@ WillScript_WillDefeatText: done WillsRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 5, 17, 4, INDIGO_PLATEAU_POKECENTER_1F - warp_def 4, 2, 1, KOGAS_ROOM - warp_def 5, 2, 2, KOGAS_ROOM + db 3 ; warp events + warp_event 5, 17, 4, INDIGO_PLATEAU_POKECENTER_1F + warp_event 4, 2, 1, KOGAS_ROOM + warp_event 5, 2, 2, KOGAS_ROOM -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 + db 1 ; object events object_event 5, 7, SPRITE_WILL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index ef30655c2..d92e48c4a 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -7,13 +7,11 @@ const_value set 2 const WISETRIOSROOM_SAGE6 WiseTriosRoom_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .WiseTrioCallback .DummyScene0: @@ -69,7 +67,7 @@ UnknownScript_0x985a3: end TrainerSageGaku: - trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, .Script + trainer SAGE, GAKU, EVENT_BEAT_SAGE_GAKU, SageGakuSeenText, SageGakuBeatenText, 0, .Script .Script: opentext @@ -79,7 +77,7 @@ TrainerSageGaku: end TrainerSageMasa: - trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, .Script + trainer SAGE, MASA, EVENT_BEAT_SAGE_MASA, SageMasaSeenText, SageMasaBeatenText, 0, .Script .Script: opentext @@ -89,7 +87,7 @@ TrainerSageMasa: end TrainerSageKoji: - trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, 0, .Script + trainer SAGE, KOJI, EVENT_BEAT_SAGE_KOJI, SageKojiSeenText, SageKojiBeatenText, 0, .Script .Script: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER @@ -345,24 +343,19 @@ UnknownText_0x98db5: done WiseTriosRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 7, 4, 4, ECRUTEAK_CITY - warp_def 7, 5, 5, ECRUTEAK_CITY - warp_def 1, 4, 5, ECRUTEAK_HOUSE + db 3 ; warp events + warp_event 7, 4, 4, ECRUTEAK_CITY + warp_event 7, 5, 5, ECRUTEAK_CITY + warp_event 1, 4, 5, ECRUTEAK_TIN_TOWER_ENTRANCE -.CoordEvents: - db 1 + db 1 ; coord events coord_event 7, 4, 0, UnknownScript_0x985a3 -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 6 + db 6 ; object events object_event 6, 2, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 object_event 7, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 |