diff options
Diffstat (limited to 'maps')
28 files changed, 172 insertions, 172 deletions
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 1c5b6516e..bdeef6fb6 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -10,27 +10,27 @@ BattleTower1F_MapScriptHeader: db 0 .Trigger0: - writebyte BATTLE_TOWER_ACTION_09 + writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS special BattleTowerAction iffalse .SkipEverything - writebyte BATTLE_TOWER_ACTION_02 + writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState special BattleTowerAction if_equal $0, .SkipEverything if_equal $2, .priorityjump1 if_equal $3, .SkipEverything if_equal $4, .SkipEverything loadfont - writetext UnknownText_0x9f037 + writetext Text_WeveBeenWaitingForYou waitbutton closetext - priorityjump UnknownScript_0x9e44e + priorityjump Script_ResumeBattleTowerChallenge end .priorityjump1: priorityjump BattleTower_LeftWithoutSaving - writebyte BATTLE_TOWER_ACTION_04 + writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_06 + writebyte BATTLETOWERACTION_06 special BattleTowerAction .SkipEverything: dotrigger $1 @@ -49,13 +49,13 @@ UnknownScript_0x9e3e0: end ReceptionistScript_0x9e3e2: - writebyte BATTLE_TOWER_ACTION_02 + writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState special BattleTowerAction - if_equal $3, BattleTowerBattleRoomScript_0x9f4e4 ; maps/BattleTowerBattleRoom.asm + if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm loadfont writetext Text_BattleTowerWelcomesYou keeptextopen - writebyte BATTLE_TOWER_ACTION_00 + writebyte BATTLETOWERACTION_00 ; if new save file: bit 1, [sbe4f] special BattleTowerAction if_not_equal $0, Script_Menu_ChallengeExplanationCancel jump Script_BattleTowerIntroductionYesNo @@ -66,10 +66,10 @@ Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc special Special_Menu_ChallengeExplanationCancel if_equal $1, Script_ChoseChallenge if_equal $2, Script_BattleTowerExplanation - jump UnknownScript_0x9e4b0 + jump Script_BattleTowerHopeToServeYouAgain Script_ChoseChallenge: ; 0x9e40f - writebyte BATTLE_TOWER_ACTION_1A ; ResetBattleTowerTrainerSRAM + writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM special BattleTowerAction special SpecialCheckForBattleTowerRules if_not_equal $0, Script_WaitButton @@ -80,50 +80,50 @@ Script_ChoseChallenge: ; 0x9e40f special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel dotrigger $1 - writebyte BATTLE_TOWER_ACTION_01 + writebyte BATTLETOWERACTION_01 ; set 1, [sbe4f] special BattleTowerAction special Function1700b0 if_equal $a, Script_Menu_ChallengeExplanationCancel if_not_equal $0, UnknownScript_0x9e550 - writebyte BATTLE_TOWER_ACTION_11 + writebyte BATTLETOWERACTION_11 special BattleTowerAction writetext Text_RightThisWayToYourBattleRoom waitbutton closetext - writebyte BATTLE_TOWER_ACTION_1E + writebyte BATTLETOWERACTION_1E special BattleTowerAction - jump UnknownScript_0x9e454 + jump Script_WalkToBattleTowerElevator -UnknownScript_0x9e44e: +Script_ResumeBattleTowerChallenge: closetext - writebyte BATTLE_TOWER_ACTION_08 + writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group special BattleTowerAction -UnknownScript_0x9e454: - musicfadeout MUSIC_NONE, $8 +Script_WalkToBattleTowerElevator: + musicfadeout MUSIC_NONE, 8 domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0 domaptrigger BATTLE_TOWER_ELEVATOR, $0 domaptrigger BATTLE_TOWER_HALLWAY, $0 follow $2, PLAYER - applymovement $2, MovementData_0x9e571 - writebyte BATTLE_TOWER_ACTION_0A + applymovement $2, MovementData_BattleTower1FWalkToElevator + writebyte BATTLETOWERACTION_0A special BattleTowerAction warpsound disappear $2 stopfollow - applymovement PLAYER, MovementData_0x9e576 + applymovement PLAYER, MovementData_BattleTowerHallwayPlayerEntersBattleRoom warpcheck end Script_GivePlayerHisPrize: ; 0x9e47a - writebyte BATTLE_TOWER_ACTION_1C + writebyte BATTLETOWERACTION_1C special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_1B + writebyte BATTLETOWERACTION_1B special BattleTowerAction if_equal POTION, Script_YourPackIsStuffedFull itemtotext $0, $1 giveitem ITEM_FROM_MEM, 5 writetext Text_PlayerGotFive - writebyte BATTLE_TOWER_ACTION_1D + writebyte BATTLETOWERACTION_1D special BattleTowerAction closetext end @@ -137,21 +137,21 @@ Script_YourPackIsStuffedFull: ; 0x9e498 Script_BattleTowerIntroductionYesNo: ; 0x9e49e writetext Text_WouldYouLikeToHearAboutTheBattleTower yesorno - iffalse UnknownScript_0x9e4a8 + iffalse Script_BattleTowerSkipExplanation Script_BattleTowerExplanation: ; 0x9e4a5 writetext Text_BattleTowerIntroduction_2 -UnknownScript_0x9e4a8: - writebyte BATTLE_TOWER_ACTION_01 +Script_BattleTowerSkipExplanation: + writebyte BATTLETOWERACTION_01 special BattleTowerAction jump Script_Menu_ChallengeExplanationCancel -UnknownScript_0x9e4b0: +Script_BattleTowerHopeToServeYouAgain: writetext Text_WeHopeToServeYouAgain waitbutton closetext end -UnknownScript_0x9e4b6: +UnreferencedScript_0x9e4b6: special Function17f53d closetext end @@ -162,13 +162,13 @@ Script_WaitButton: ; 0x9e4bb end -UnknownScript_0x9e4be: +UnreferencedScript_0x9e4be: writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - writebyte BATTLE_TOWER_ACTION_01 + writebyte BATTLETOWERACTION_01 special BattleTowerAction special Function1700ba if_equal $a, Script_Menu_ChallengeExplanationCancel @@ -181,45 +181,45 @@ UnknownScript_0x9e4be: closetext end -UnknownScript_0x9e4ea: - writebyte BATTLE_TOWER_ACTION_18 +UnreferencedScript_0x9e4ea: + writebyte BATTLETOWERACTION_18 special BattleTowerAction if_not_equal $0, Script_APkmnLevelExceeds - writebyte BATTLE_TOWER_ACTION_19 + writebyte BATTLETOWERACTION_19 special BattleTowerAction if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 special SpecialCheckForBattleTowerRules if_not_equal $0, Script_WaitButton - writebyte BATTLE_TOWER_ACTION_05 + writebyte BATTLETOWERACTION_05 special BattleTowerAction - if_equal $0, UnknownScript_0x9e512 - writetext UnknownText_0x9ecb0 - jump UnknownScript_0x9e515 + if_equal $0, .zero + writetext Text_CantBeRegistered_PreviousRecordDeleted + jump continue -UnknownScript_0x9e512: - writetext UnknownText_0x9ec6d -UnknownScript_0x9e515: +.zero: + writetext Text_CantBeRegistered +continue: yesorno iffalse Script_Menu_ChallengeExplanationCancel - writetext UnknownText_0x9ef79 + writetext Text_SaveBeforeReentry yesorno iffalse Script_Menu_ChallengeExplanationCancel dotrigger $0 special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel dotrigger $1 - writebyte BATTLE_TOWER_ACTION_06 + writebyte BATTLETOWERACTION_06 special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_12 + writebyte BATTLETOWERACTION_12 special BattleTowerAction writetext Text_RightThisWayToYourBattleRoom waitbutton - jump UnknownScript_0x9e44e + jump Script_ResumeBattleTowerChallenge -UnknownScript_0x9e53b: - writetext UnknownText_0x9f076 +UnreferencedScript_0x9e53b: + writetext Text_FiveDayBattleLimit_Mobile waitbutton - jump UnknownScript_0x9e4b0 + jump Script_BattleTowerHopeToServeYouAgain Script_APkmnLevelExceeds: ; 0x9e542 writetext Text_APkmnLevelExceeds @@ -240,7 +240,7 @@ BattleTower_LeftWithoutSaving: loadfont writetext Text_BattleTower_LeftWithoutSaving waitbutton - jump UnknownScript_0x9e4b0 + jump Script_BattleTowerHopeToServeYouAgain YoungsterScript_0x9e55d: faceplayer @@ -260,24 +260,24 @@ BugCatcherScript_0x9e56b: GrannyScript_0x9e56e: jumptextfaceplayer Text_BattleTowerGranny -MovementData_0x9e571: +MovementData_BattleTower1FWalkToElevator: step_up step_up step_up step_up step_up -MovementData_0x9e576: +MovementData_BattleTowerHallwayPlayerEntersBattleRoom: step_up step_end -MovementData_0x9e578: +MovementData_BattleTowerElevatorExitElevator: step_down step_end -MovementData_0x9e57a: +MovementData_BattleTowerHallwayWalkTo1020Room: step_right step_right -MovementData_0x9e57c: +MovementData_BattleTowerHallwayWalkTo3040Room: step_right step_right step_up @@ -285,13 +285,13 @@ MovementData_0x9e57c: turn_head_left step_end -MovementData_0x9e582: +MovementData_BattleTowerHallwayWalkTo90100Room: step_left step_left -MovementData_0x9e584: +MovementData_BattleTowerHallwayWalkTo7080Room: step_left step_left -MovementData_0x9e586: +MovementData_BattleTowerHallwayWalkTo5060Room: step_left step_left step_up @@ -299,7 +299,7 @@ MovementData_0x9e586: turn_head_right step_end -MovementData_0x9e58c: +MovementData_BattleTowerBattleRoomPlayerWalksIn: step_up step_up step_up @@ -307,28 +307,28 @@ MovementData_0x9e58c: turn_head_right step_end -MovementData_0x9e592: +MovementData_BattleTowerBattleRoomOpponentWalksIn: slow_step_down slow_step_down slow_step_down turn_head_left step_end -MovementData_0x9e597: +MovementData_BattleTowerBattleRoomOpponentWalksOut: turn_head_up slow_step_up slow_step_up slow_step_up step_end -MovementData_0x9e59c: +MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer: slow_step_right slow_step_right slow_step_up slow_step_up step_end -MovementData_0x9e5a1: +MovementData_BattleTowerBattleRoomReceptionistWalksAway: slow_step_down slow_step_down slow_step_left @@ -336,11 +336,11 @@ MovementData_0x9e5a1: turn_head_right step_end -MovementData_0x9e5a7: +MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist: turn_head_down step_end -MovementData_0x9e5a9: +MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent: turn_head_right step_end @@ -482,7 +482,7 @@ Text_ThanksForVisiting: ; 0x9ea49 line "visiting!" done -UnknownText_0x9ea5f: +Text_BeatenAllTheTrainers_Mobile: text "Congratulations!" para "You've beaten all" @@ -512,7 +512,7 @@ Text_CongratulationsYouveBeatenAllTheTrainers: ; 0x9eaef para "" done -UnknownText_0x9eb45: +Text_AskRegisterRecord_Mobile: text "Would you like to" line "register your" @@ -560,7 +560,7 @@ Text_WouldYouLikeToHearAboutTheBattleTower: ; 0x9ec3d cont "BATTLE TOWER?" done -UnknownText_0x9ec6d: +Text_CantBeRegistered: text "Your record from" line "the previous" @@ -568,7 +568,7 @@ UnknownText_0x9ec6d: line "be registered. OK?" done -UnknownText_0x9ecb0: +Text_CantBeRegistered_PreviousRecordDeleted: text "Your record from" line "the previous" @@ -637,7 +637,7 @@ Text_NextUpOpponentNo: ; 0x9eebc text ". Ready?" done -UnknownText_0x9eee0: +Text_SaveBeforeConnecting_Mobile: text "Your session will" line "be SAVED before" @@ -658,7 +658,7 @@ Text_SaveAndEndTheSession: ; 0x9ef5e line "session?" done -UnknownText_0x9ef79: +Text_SaveBeforeReentry: text "Your record will" line "be SAVED before" @@ -671,7 +671,7 @@ Text_CancelYourBattleRoomChallenge: ; 0x9efbf line "ROOM challenge?" done -UnknownText_0x9efe3: +Text_RegisterRecordOnFile_Mobile: text "We have your" line "previous record on" @@ -680,7 +680,7 @@ UnknownText_0x9efe3: cont "it at the CENTER?" done -UnknownText_0x9f037: +Text_WeveBeenWaitingForYou: text "We've been waiting" line "for you. This way" @@ -688,7 +688,7 @@ UnknownText_0x9f037: line "please." done -UnknownText_0x9f076: +Text_FiveDayBattleLimit_Mobile: text "You may enter only" line "five BATTLE ROOMS" cont "each day." @@ -713,7 +713,7 @@ Text_TooMuchTimeElapsedNoRegister: ; 0x9f0c1 done ; a dupe? -UnknownText_0x9f151: +Text_RegisterRecordTimedOut_Mobile: text "Sorry, but it's" line "not possible to" diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 53e6b7914..03c0a90e2 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -3,21 +3,21 @@ BattleTowerBattleRoom_MapScriptHeader: db 2 ; triggers - dw Script_EnterBattleRoom, 0 - dw UnknownScript_0x9f420, 0 + dw .EnterBattleRoom, 0 + dw .DummyTrigger, 0 .MapCallbacks: db 0 -Script_EnterBattleRoom: ; 0x9f419 +.EnterBattleRoom: ; 0x9f419 disappear $2 priorityjump Script_BattleRoom dotrigger $1 -UnknownScript_0x9f420: +.DummyTrigger: end Script_BattleRoom: ; 0x9f421 - applymovement PLAYER, MovementData_0x9e58c + applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerWalksIn ; beat all 7 opponents in a row Script_BattleRoomLoop: ; 0x9f425 writebyte $2 @@ -25,31 +25,31 @@ Script_BattleRoomLoop: ; 0x9f425 appear $2 warpsound waitsfx - applymovement $2, MovementData_0x9e592 + applymovement $2, MovementData_BattleTowerBattleRoomOpponentWalksIn loadfont battletowertext 1 keeptextopen closetext special BattleTowerBattle ; calls predef startbattle - special RotatePalettesRightPalettes + special FadeOutPalettes reloadmap if_not_equal $0, Script_FailedBattleTowerChallenge copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64 if_equal BATTLETOWER_NROFTRAINERS, Script_BeatenAllTrainers - applymovement $2, MovementData_0x9e597 + applymovement $2, MovementData_BattleTowerBattleRoomOpponentWalksOut warpsound disappear $2 - applymovement $3, MovementData_0x9e59c - applymovement PLAYER, MovementData_0x9e5a7 + applymovement $3, MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer + applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist loadfont writetext Text_YourPkmnWillBeHealedToFullHealth waitbutton closetext playmusic MUSIC_HEAL - special RotatePalettesRightPalettes + special FadeOutPalettes special LoadMapPalettes pause 60 - special RotatePalettesLeftPalettes + special FadeInPalettes special RestartMapMusic loadfont writetext Text_NextUpOpponentNo @@ -57,43 +57,43 @@ Script_BattleRoomLoop: ; 0x9f425 iffalse Script_DontBattleNextOpponent Script_ContinueAndBattleNextOpponent: ; 0x9f477 closetext - applymovement PLAYER, MovementData_0x9e5a9 - applymovement $3, MovementData_0x9e5a1 + applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent + applymovement $3, MovementData_BattleTowerBattleRoomReceptionistWalksAway jump Script_BattleRoomLoop Script_DontBattleNextOpponent: ; 0x9f483 writetext Text_SaveAndEndTheSession yesorno iffalse Script_DontSaveAndEndTheSession - writebyte BATTLE_TOWER_ACTION_07 + writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_1F + writebyte BATTLETOWERACTION_CHOOSEREWARD ; choose reward special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_03 + writebyte BATTLETOWERACTION_03 ; quicksave special BattleTowerAction playsound SFX_SAVE waitsfx - special RotatePalettesRightPalettes + special FadeOutPalettes special Reset Script_DontSaveAndEndTheSession: ; 0x9f4a3 writetext Text_CancelYourBattleRoomChallenge yesorno iffalse Script_ContinueAndBattleNextOpponent - writebyte BATTLE_TOWER_ACTION_04 + writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_06 + writebyte BATTLETOWERACTION_06 special BattleTowerAction closetext - special RotatePalettesRightPalettes + special FadeOutPalettes warpfacing UP, BATTLE_TOWER_1F, $7, $7 loadfont - jump UnknownScript_0x9e4b0 + jump Script_BattleTowerHopeToServeYouAgain Script_FailedBattleTowerChallenge: pause 60 special Special_BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, $7, $7 - writebyte BATTLE_TOWER_ACTION_04 + writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction loadfont writetext Text_ThanksForVisiting @@ -105,13 +105,13 @@ Script_BeatenAllTrainers: ; 0x9f4d9 pause 60 special Special_BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, $7, $7 -BattleTowerBattleRoomScript_0x9f4e4: +Script_BeatenAllTrainers2: loadfont writetext Text_CongratulationsYouveBeatenAllTheTrainers jump Script_GivePlayerHisPrize -UnknownScript_0x9f4eb: - writebyte BATTLE_TOWER_ACTION_04 +UnreferencedScript_0x9f4eb: + writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction loadfont writetext Text_TooMuchTimeElapsedNoRegister @@ -119,10 +119,10 @@ UnknownScript_0x9f4eb: closetext end -UnknownScript_0x9f4f7: - writebyte BATTLE_TOWER_ACTION_04 +UnreferencedScript_0x9f4f7: + writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_06 + writebyte BATTLETOWERACTION_06 special BattleTowerAction loadfont writetext Text_ThanksForVisiting @@ -132,7 +132,7 @@ UnknownScript_0x9f4f7: end -UnknownText_0x9f50b: +Text_ReturnedAfterSave_Mobile: text "You'll be returned" line "after you SAVE." done diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 158e42487..919857fba 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -3,43 +3,43 @@ BattleTowerElevator_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x9f562, 0 - dw UnknownScript_0x9f567, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 .MapCallbacks: db 0 -UnknownScript_0x9f562: - priorityjump UnknownScript_0x9f568 +.Trigger0: + priorityjump .RideElevator dotrigger $1 -UnknownScript_0x9f567: +.Trigger1: end -UnknownScript_0x9f568: +.RideElevator: follow $2, PLAYER - applymovement $2, MovementData_0x9f58f - applymovement PLAYER, MovementData_0x9f592 - writebyte BATTLE_TOWER_ACTION_0A + applymovement $2, MovementData_BattleTowerElevatorReceptionistWalksIn + applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn + writebyte BATTLETOWERACTION_0A special BattleTowerAction playsound SFX_ELEVATOR earthquake 60 waitsfx follow $2, PLAYER - applymovement $2, MovementData_0x9e578 + applymovement $2, MovementData_BattleTowerElevatorExitElevator stopfollow warpsound disappear $2 - applymovement PLAYER, MovementData_0x9e578 + applymovement PLAYER, MovementData_BattleTowerElevatorExitElevator warpcheck end -MovementData_0x9f58f: +MovementData_BattleTowerElevatorReceptionistWalksIn: step_right turn_head_down step_end -MovementData_0x9f592: +MovementData_BattleTowerElevatorPlayerWalksIn: turn_head_down step_end @@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_0x9f58f, -1 + person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 717359117..b557cb17e 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -47,23 +47,23 @@ BattleTowerHallway_MapScriptHeader: if_equal 8, .L70L80 if_equal 9, .L90L100 if_equal 10, .L90L100 - applymovement $2, MovementData_0x9e57a + applymovement $2, MovementData_BattleTowerHallwayWalkTo1020Room jump .EnterBattleRoom .L30L40: ; 0x9f603 - applymovement $2, MovementData_0x9e57c + applymovement $2, MovementData_BattleTowerHallwayWalkTo3040Room jump .EnterBattleRoom .L50L60: ; 0x9f60a - applymovement $2, MovementData_0x9e586 + applymovement $2, MovementData_BattleTowerHallwayWalkTo5060Room jump .EnterBattleRoom .L70L80: ; 0x9f611 - applymovement $2, MovementData_0x9e584 + applymovement $2, MovementData_BattleTowerHallwayWalkTo7080Room jump .EnterBattleRoom .L90L100: ; 0x9f618 - applymovement $2, MovementData_0x9e582 + applymovement $2, MovementData_BattleTowerHallwayWalkTo90100Room jump .EnterBattleRoom .EnterBattleRoom: ; 0x9f61f @@ -73,7 +73,7 @@ BattleTowerHallway_MapScriptHeader: waitbutton closetext stopfollow - applymovement PLAYER, MovementData_0x9e576 + applymovement PLAYER, MovementData_BattleTowerHallwayPlayerEntersBattleRoom warpcheck end diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index fca3a3e06..77409fde8 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -30,10 +30,10 @@ UnknownScript_0x19b0de: writetext UnknownText_0x19b266 waitbutton closetext - special RotatePalettesRightPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special RotatePalettesLeftPalettes + special FadeInPalettes special RestartMapMusic loadfont writetext UnknownText_0x19b296 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 23f95fcea..3509923b1 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -84,7 +84,7 @@ UnknownScript_0x99dc6: follow PLAYER, $8 applymovement PLAYER, MovementData_0x99e5f stopfollow - special RotatePalettesRightPalettes + special FadeOutPalettes playsound SFX_ENTER_DOOR waitsfx warp ECRUTEAK_CITY, $6, $1b diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 04ec4e9d7..c56df9dee 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -64,7 +64,7 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special RotatePalettesRightPalettes + special FadeOutPalettes waitsfx setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY domaptrigger VERMILION_PORT, $1 @@ -77,7 +77,7 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special RotatePalettesRightPalettes + special FadeOutPalettes waitsfx setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY domaptrigger OLIVINE_PORT, $1 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 049b7cc47..c6c9e70f8 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -43,7 +43,7 @@ TwinScript_0x75ebb: appear $4 spriteface PLAYER, UP spriteface $4, UP - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly spriteface $3, DOWN showemote EMOTE_SHOCK, $3, 15 applymovement $4, MovementData_0x7600c diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 0ce295648..5f78f7952 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -70,7 +70,7 @@ FastShipBed: playmusic MUSIC_HEAL pause 60 special RestartMapMusic - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly loadfont writetext FastShipBedText2 waitbutton diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index f33cd06be..bfe4aa3e9 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -9,7 +9,7 @@ NurseScript_0x60f91: jumpstd pokecenternurse GoldenrodPokeCenter1F_GSBallTriggerLeft: - writebyte BATTLE_TOWER_ACTION_0B + writebyte BATTLETOWERACTION_CHECKMOBILEEVENT special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end @@ -41,7 +41,7 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft: end GoldenrodPokeCenter1F_GSBallTriggerRight: - writebyte BATTLE_TOWER_ACTION_0B + writebyte BATTLETOWERACTION_CHECKMOBILEEVENT special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 7676e242e..40a5f6518 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -154,7 +154,7 @@ TeleportGuyScript: waitbutton closetext playsound SFX_WARP_TO - special RotatePalettesRightPalettes + special FadeOutPalettes waitsfx warp NEW_BARK_TOWN, $d, $6 end diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index d92d14c7e..5d08bd68c 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -125,7 +125,7 @@ LanceScript_0x180e7b: pause 30 closetext applymovement $3, MovementData_0x180f5b - special RotatePalettesRightPalettes + special FadeOutPalettes pause 15 warpfacing UP, HALL_OF_FAME, $4, $d end diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 90eefc1ae..281482ff5 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -35,11 +35,11 @@ MapMobileBattleRoomSignpost0Script: writetext MobileBattleRoom_HealText pause 20 closetext - special RotatePalettesRightPalettes + special FadeOutPalettes playmusic MUSIC_HEAL special LoadMapPalettes pause 60 - special RotatePalettesLeftPalettes + special FadeInPalettes special RestartMapMusic refreshscreen $0 .two_: diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index e8187a03e..0f52116a4 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -114,7 +114,7 @@ UnknownScript_0x196ec9: special Mobile_HealParty special HealParty pause 60 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly special RestartMapMusic loadfont writetext UnknownText_0x197134 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 3a2ac17f3..7cf2ea64c 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -42,9 +42,9 @@ UnknownScript_0x60bab: closetext special RestartMapMusic cry AMPHAROS - special RotatePalettesRightPalettes + special FadeOutPalettes pause 10 - special RotatePalettesLeftPalettes + special FadeInPalettes loadfont writetext UnknownText_0x60f3d waitbutton @@ -116,10 +116,10 @@ UnknownScript_0x60c51: cry AMPHAROS waitbutton closetext - special RotatePalettesRightPalettes - special RotatePalettesLeftPalettes - special RotatePalettesRightPalettes - special RotatePalettesLeftPalettes + special FadeOutPalettes + special FadeInPalettes + special FadeOutPalettes + special FadeInPalettes end ItemFragment_0x60c66: diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 69bf62fc7..8066eddd5 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -39,7 +39,7 @@ SailorScript_0x748c0: waitsfx applymovement PLAYER, MovementData_0x74a30 playsound SFX_EXIT_BUILDING - special RotatePalettesRightPalettes + special FadeOutPalettes waitsfx checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7490a diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 962483ee5..1c96c0124 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -95,7 +95,7 @@ UnknownScript_0x6006e: disappear $3 disappear $4 pause 15 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1 setevent EVENT_CLEARED_RADIO_TOWER clearflag ENGINE_ROCKETS_IN_RADIO_TOWER diff --git a/maps/Route24.asm b/maps/Route24.asm index b397f4664..a45a51902 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -29,7 +29,7 @@ RocketScript_0x1adbfa: special Special_ReloadSpritesNoPalettes disappear $2 pause 25 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly playmapmusic end diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 42e51c9a0..7fc8f5330 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -17,7 +17,7 @@ TeacherScript_0x7b125: playmusic MUSIC_HEAL special HealParty pause 60 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly special RestartMapMusic loadfont writetext UnknownText_0x7b18b diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index 732bf6a9d..ba0a387ba 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -75,7 +75,7 @@ Route35NationalParkgate_GoBackIn: closetext scall Route35NationalParkgate_EnterContest playsound SFX_ENTER_DOOR - special RotatePalettesRightPalettes + special FadeOutPalettes waitsfx warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f end @@ -112,7 +112,7 @@ Route35NationalParkgate_OkayToProceed: special Special_GiveParkBalls scall Route35NationalParkgate_EnterContest playsound SFX_ENTER_DOOR - special RotatePalettesRightPalettes + special FadeOutPalettes waitsfx special Special_SelectRandomBugContestContestants warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index ff31456af..f8e57dc90 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -74,7 +74,7 @@ Route36NationalParkgate_MapScriptHeader: appear $d applymovement PLAYER, MovementData_0x6add1 pause 15 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly jumpstd bugcontestresults .GoBackToContest: @@ -83,7 +83,7 @@ Route36NationalParkgate_MapScriptHeader: closetext spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special RotatePalettesRightPalettes + special FadeOutPalettes waitsfx warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 end @@ -166,7 +166,7 @@ Route36OfficerScriptContest: special Special_GiveParkBalls spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special RotatePalettesRightPalettes + special FadeOutPalettes waitsfx special Special_SelectRandomBugContestContestants warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index d645de38a..14b5413b1 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -26,7 +26,7 @@ RedScript_0x18c603: special Special_ReloadSpritesNoPalettes disappear $2 pause 15 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly pause 30 special HealParty refreshscreen $0 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 4153c3a56..fd79ee7f9 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -34,7 +34,7 @@ GruntM1Script: disappear $4 disappear $5 pause 15 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly disappear $8 moveperson $8, $b, $6 appear $8 @@ -56,7 +56,7 @@ GruntM1Script: clearevent EVENT_AZALEA_TOWN_SLOWPOKES clearevent EVENT_KURTS_HOUSE_SLOWPOKE clearevent EVENT_KURTS_HOUSE_KURT_1 - special RotatePalettesRightPalettes + special FadeOutPalettes special HealParty pause 15 warp KURTS_HOUSE, $3, $3 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 15649fc8c..218ff1993 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -51,7 +51,7 @@ UnknownScript_0x184947: special Special_ReloadSpritesNoPalettes disappear $8 waitsfx - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly dotrigger $1 special RestartMapMusic end diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 05380185f..cf07a06df 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -445,9 +445,9 @@ ExplodingTrap22: end VoltorbExplodingTrap: - special RotatePalettesRightPalettes + special FadeOutPalettes cry VOLTORB - special RotatePalettesLeftPalettes + special FadeInPalettes setlasttalked $ff writecode VAR_BATTLETYPE, BATTLETYPE_TRAP scriptedpokedata VOLTORB, 23 @@ -455,9 +455,9 @@ VoltorbExplodingTrap: end GeodudeExplodingTrap: - special RotatePalettesRightPalettes + special FadeOutPalettes cry GEODUDE - special RotatePalettesLeftPalettes + special FadeInPalettes setlasttalked $ff writecode VAR_BATTLETYPE, BATTLETYPE_TRAP scriptedpokedata GEODUDE, 21 @@ -465,9 +465,9 @@ GeodudeExplodingTrap: end KoffingExplodingTrap: - special RotatePalettesRightPalettes + special FadeOutPalettes cry KOFFING - special RotatePalettesLeftPalettes + special FadeInPalettes setlasttalked $ff writecode VAR_BATTLETYPE, BATTLETYPE_TRAP scriptedpokedata KOFFING, 21 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 909a6d08c..976cddfe2 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -106,7 +106,7 @@ UnknownScript_0x6cfac: disappear $d disappear $e pause 15 - special Special_RotatePalettesLeftQuickly + special Special_FadeInQuickly dotrigger $2 clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE spriteface $4, DOWN @@ -155,11 +155,11 @@ UnknownScript_0x6d091: writetext UnknownText_0x6da97 waitbutton closetext - special RotatePalettesRightPalettes + special FadeOutPalettes special Mobile_HealParty playsound SFX_FULL_HEAL special HealParty - special RotatePalettesLeftPalettes + special FadeInPalettes loadfont writetext UnknownText_0x6daf7 waitbutton diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index e5e963e0c..72efec242 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -51,7 +51,7 @@ SailorScript_0x74dc4: waitsfx applymovement PLAYER, MovementData_0x74ef1 playsound SFX_EXIT_BUILDING - special RotatePalettesRightPalettes + special FadeOutPalettes waitsfx setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 669947d5b..261df3c11 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -226,10 +226,10 @@ OlderHaircutBrotherScript: writetext UnknownText_0x7c6b8 waitbutton closetext - special RotatePalettesRightPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special RotatePalettesLeftPalettes + special FadeInPalettes special RestartMapMusic loadfont writetext UnknownText_0x7c6d8 @@ -309,10 +309,10 @@ YoungerHaircutBrotherScript: writetext UnknownText_0x7c80e waitbutton closetext - special RotatePalettesRightPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special RotatePalettesLeftPalettes + special FadeInPalettes special RestartMapMusic loadfont writetext UnknownText_0x7c82a |