pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove Mobile, Battle Tower, Mystery Gift, and Odd Egg (#1)

Browse Source
This commit is contained in:
xCrystal
2023-07-24 21:13:11 +02:00
parent 74b8214272
commit fc7f2d4e0e
201 changed files with 101 additions and 73760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
maps/BattleTower1F.asm
View File

@@ -14,10 +14,8 @@ BattleTower1F_MapScripts:
BattleTower1FCheckStateScene:
setval BATTLETOWERACTION_CHECKSAVEFILEISYOURS
special BattleTowerAction
iffalse .SkipEverything
setval BATTLETOWERACTION_GET_CHALLENGE_STATE ; readmem sBattleTowerChallengeState
special BattleTowerAction
ifequal $0, .SkipEverything
ifequal $2, .LeftWithoutSaving
ifequal $3, .SkipEverything
@@ -32,9 +30,7 @@ BattleTower1FCheckStateScene:
.LeftWithoutSaving
sdefer BattleTower_LeftWithoutSaving
setval BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
setval BATTLETOWERACTION_06
special BattleTowerAction
.SkipEverything:
setscene SCENE_BATTLETOWER1F_NOOP
; fallthrough
@@ -54,28 +50,23 @@ BattleTower1FRulesSign:
BattleTower1FReceptionistScript:
setval BATTLETOWERACTION_GET_CHALLENGE_STATE ; readmem sBattleTowerChallengeState
special BattleTowerAction
ifequal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
opentext
writetext Text_BattleTowerWelcomesYou
promptbutton
setval BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
ifnotequal $0, Script_Menu_ChallengeExplanationCancel
sjump Script_BattleTowerIntroductionYesNo
Script_Menu_ChallengeExplanationCancel:
writetext Text_WantToGoIntoABattleRoom
setval TRUE
special Menu_ChallengeExplanationCancel
ifequal 1, Script_ChooseChallenge
ifequal 2, Script_BattleTowerExplanation
sjump Script_BattleTowerHopeToServeYouAgain
Script_ChooseChallenge:
setval BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
special BattleTowerAction
special CheckForBattleTowerRules
ifnotequal FALSE, Script_WaitButton
writetext Text_SaveBeforeEnteringBattleRoom
yesorno
@@ -85,23 +76,18 @@ Script_ChooseChallenge:
iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_BATTLETOWER1F_NOOP
setval BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
special BattleTowerRoomMenu
ifequal $a, Script_Menu_ChallengeExplanationCancel
ifnotequal $0, Script_MobileError
setval BATTLETOWERACTION_11
special BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
waitbutton
closetext
setval BATTLETOWERACTION_CHOOSEREWARD
special BattleTowerAction
sjump Script_WalkToBattleTowerElevator
Script_ResumeBattleTowerChallenge:
closetext
setval BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group
special BattleTowerAction
Script_WalkToBattleTowerElevator:
musicfadeout MUSIC_NONE, 8
setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_BATTLETOWERBATTLEROOM_ENTER
@@ -110,7 +96,6 @@ Script_WalkToBattleTowerElevator:
follow BATTLETOWER1F_RECEPTIONIST, PLAYER
applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
setval BATTLETOWERACTION_0A
special BattleTowerAction
warpsound
disappear BATTLETOWER1F_RECEPTIONIST
stopfollow
@@ -120,15 +105,12 @@ Script_WalkToBattleTowerElevator:
Script_GivePlayerHisPrize:
setval BATTLETOWERACTION_1C
special BattleTowerAction
setval BATTLETOWERACTION_GIVEREWARD
special BattleTowerAction
ifequal POTION, Script_YourPackIsStuffedFull
getitemname STRING_BUFFER_4, USE_SCRIPT_VAR
giveitem ITEM_FROM_MEM, 5
writetext Text_PlayerGotFive
setval BATTLETOWERACTION_1D
special BattleTowerAction
closetext
end
@@ -146,7 +128,6 @@ Script_BattleTowerExplanation:
writetext Text_BattleTowerIntroduction_2
Script_BattleTowerSkipExplanation:
setval BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction
sjump Script_Menu_ChallengeExplanationCancel
Script_BattleTowerHopeToServeYouAgain:
@@ -155,11 +136,6 @@ Script_BattleTowerHopeToServeYouAgain:
closetext
end
Script_MobileError2: ; unreferenced
special BattleTowerMobileError
closetext
end
Script_WaitButton:
waitbutton
closetext
@@ -172,8 +148,6 @@ Script_ChooseChallenge2: ; unreferenced
special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
setval BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction
special Function1700ba
ifequal $a, Script_Menu_ChallengeExplanationCancel
ifnotequal $0, Script_MobileError
writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
@@ -186,15 +160,11 @@ Script_ChooseChallenge2: ; unreferenced
Script_StartChallenge: ; unreferenced
setval BATTLETOWERACTION_LEVEL_CHECK
special BattleTowerAction
ifnotequal $0, Script_AMonLevelExceeds
setval BATTLETOWERACTION_UBERS_CHECK
special BattleTowerAction
ifnotequal $0, Script_MayNotEnterABattleRoomUnderL70
special CheckForBattleTowerRules
ifnotequal FALSE, Script_WaitButton
setval BATTLETOWERACTION_05
special BattleTowerAction
ifequal $0, .zero
writetext Text_CantBeRegistered_PreviousRecordDeleted
sjump .continue
@@ -212,9 +182,7 @@ Script_StartChallenge: ; unreferenced
iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_BATTLETOWER1F_NOOP
setval BATTLETOWERACTION_06
special BattleTowerAction
setval BATTLETOWERACTION_12
special BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
waitbutton
sjump Script_ResumeBattleTowerChallenge
@@ -235,7 +203,6 @@ Script_MayNotEnterABattleRoomUnderL70:
sjump Script_Menu_ChallengeExplanationCancel
Script_MobileError:
special BattleTowerMobileError
closetext
end
@@ -740,7 +707,6 @@ Text_AMonLevelExceeds:
done
Text_MayNotEnterABattleRoomUnderL70:
text_ram wcd49
text " may not"
line "enter a BATTLE"
cont "ROOM under L70."

25
maps/BattleTowerBattleRoom.asm
View File

@@ -21,8 +21,6 @@ Script_BattleRoom:
applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerWalksIn
; beat all 7 opponents in a row
Script_BattleRoomLoop:
setval BATTLETOWERBATTLEROOM_YOUNGSTER
special LoadOpponentTrainerAndPokemonWithOTSprite
appear BATTLETOWERBATTLEROOM_YOUNGSTER
warpsound
waitsfx
@@ -31,12 +29,9 @@ Script_BattleRoomLoop:
battletowertext BATTLETOWERTEXT_INTRO
promptbutton
closetext
special BattleTowerBattle ; predef StartBattle
special FadeOutPalettes
reloadmap
ifnotequal $0, Script_FailedBattleTowerChallenge
readmem wNrOfBeatenBattleTowerTrainers
ifequal BATTLETOWER_STREAK_LENGTH, Script_BeatenAllTrainers
applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksOut
warpsound
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
@@ -66,12 +61,6 @@ Script_DontBattleNextOpponent:
writetext Text_SaveAndEndTheSession
yesorno
iffalse Script_DontSaveAndEndTheSession
setval BATTLETOWERACTION_SAVELEVELGROUP ; save level group
special BattleTowerAction
setval BATTLETOWERACTION_SAVEOPTIONS ; choose reward
special BattleTowerAction
setval BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave
special BattleTowerAction
playsound SFX_SAVE
waitsfx
special FadeOutPalettes
@@ -80,10 +69,6 @@ Script_DontSaveAndEndTheSession:
writetext Text_CancelYourBattleRoomChallenge
yesorno
iffalse Script_ContinueAndBattleNextOpponent
setval BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
setval BATTLETOWERACTION_06
special BattleTowerAction
closetext
special FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, 7, 7
@@ -92,10 +77,7 @@ Script_DontSaveAndEndTheSession:
Script_FailedBattleTowerChallenge:
pause 60
special BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, 7, 7
setval BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
opentext
writetext Text_ThanksForVisiting
waitbutton
@@ -104,7 +86,6 @@ Script_FailedBattleTowerChallenge:
Script_BeatenAllTrainers:
pause 60
special BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, 7, 7
Script_BeatenAllTrainers2:
opentext
@@ -112,8 +93,6 @@ Script_BeatenAllTrainers2:
sjump Script_GivePlayerHisPrize
Script_TooMuchTimeElapsedNoRegister: ; unreferenced
setval BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
opentext
writetext Text_TooMuchTimeElapsedNoRegister
waitbutton
@@ -121,10 +100,6 @@ Script_TooMuchTimeElapsedNoRegister: ; unreferenced
end
Script_ChallengeCanceled: ; unreferenced
setval BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
setval BATTLETOWERACTION_06
special BattleTowerAction
opentext
writetext Text_ThanksForVisiting
writetext Text_WeHopeToServeYouAgain

2
maps/BattleTowerElevator.asm
View File

@@ -19,8 +19,6 @@ BattleTowerElevatorRideElevatorScript:
follow BATTLETOWERELEVATOR_RECEPTIONIST, PLAYER
applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn
applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn
setval BATTLETOWERACTION_0A
special BattleTowerAction
playsound SFX_ELEVATOR
earthquake 60
waitsfx

10
maps/BattleTowerHallway.asm
View File

@@ -21,16 +21,8 @@ BattleTowerHallwayChooseBattleRoomScript:
sjump .WalkToChosenBattleRoom
.asm_load_battle_room
ldh a, [rSVBK]
push af
ld a, BANK(wBTChoiceOfLvlGroup)
ldh [rSVBK], a
ld a, [wBTChoiceOfLvlGroup]
ld a, 10
ld [wScriptVar], a
pop af
ldh [rSVBK], a
ret
; enter different rooms for different levels to battle against

2
maps/CeruleanPokecenter1F.asm
View File

@@ -12,8 +12,6 @@ CeruleanPokecenter1FNurseScript:
jumpstd PokecenterNurseScript
CeruleanPokecenter1FSuperNerdScript:
special Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer CeruleanPokecenter1FSuperNerdText
.mobile

1
maps/DayCare.asm
View File

@@ -30,7 +30,6 @@ DayCareManScript_Inside:
closetext
readvar VAR_PARTYCOUNT
ifequal PARTY_LENGTH, .PartyFull
special GiveOddEgg
opentext
writetext DayCareText_GotOddEgg
playsound SFX_KEY_ITEM

2
maps/EcruteakPokecenter1F.asm
View File

@@ -59,8 +59,6 @@ EcruteakPokecenter1FNurseScript:
jumpstd PokecenterNurseScript
EcruteakPokecenter1FPokefanMScript:
special Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer EcruteakPokecenter1FPokefanMText
.mobile

1
maps/ElmsLab.asm
View File

@@ -307,7 +307,6 @@ ElmsLabHealingMachine:
end
ElmsLabHealingMachine_HealParty:
special StubbedTrainerRankings_Healings
special HealParty
playmusic MUSIC_NONE
setval HEALMACHINE_ELMS_LAB

3
maps/FastShipCabins_SW_SSW_NW.asm
View File

@@ -47,8 +47,6 @@ TrainerGuitaristClyde:
.Script:
endifjustbattled
special Mobile_DummyReturnFalse
iftrue .mobile
opentext
writetext GuitaristClydeAfterBattleText
waitbutton
@@ -69,7 +67,6 @@ FastShipBed:
closetext
special FadeBlackQuickly
special ReloadSpritesNoPalettes
special StubbedTrainerRankings_Healings
special HealParty
playmusic MUSIC_HEAL
pause 60

1
maps/GoldenrodDeptStore5F.asm
View File

@@ -109,7 +109,6 @@ Carrie:
writetext GoldenrodDeptStore5FCarrieMysteryGiftExplanationText
waitbutton
closetext
special UnlockMysteryGift
end
.NotGBC:

4
maps/GoldenrodPokecenter1F.asm
View File

@@ -15,8 +15,6 @@ GoldenrodPokecenter1FNurseScript:
jumpstd PokecenterNurseScript
GoldenrodPokecenter1F_GSBallSceneLeft:
setval BATTLETOWERACTION_CHECKMOBILEEVENT
special BattleTowerAction
ifequal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end
@@ -47,8 +45,6 @@ GoldenrodPokecenter1F_GSBallSceneLeft:
end
GoldenrodPokecenter1F_GSBallSceneRight:
setval BATTLETOWERACTION_CHECKMOBILEEVENT
special BattleTowerAction
ifequal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end

7
maps/MobileBattleRoom.asm
View File

@@ -19,9 +19,6 @@ MobileBattleRoomInitializeAndPreparePokecenter2FScript:
MobileBattleRoomConsoleScript:
refreshscreen
special Function1037c2
ifequal $1, .one
special Function1037eb
iffalse .false
ifequal $1, .one_
ifequal $2, .two_
@@ -39,16 +36,12 @@ MobileBattleRoomConsoleScript:
special RestartMapMusic
refreshscreen
.two_
special StubbedTrainerRankings_Healings
special HealParty
special Function10383c
iftrue .false
.one
special Function10387b
writetext MobileBattleRoom_EstablishingCommsText
waitbutton
reloadmappart
special Function101225
.false
closetext
end

2
maps/MobileTradeRoom.asm
View File

@@ -19,11 +19,9 @@ MobileTradeRoomInitializeAndPreparePokecenter2FScript:
MobileTradeRoomConsoleScript:
refreshscreen
special Function1037c2
writetext MobileTradeRoom_EstablishingCommsText
waitbutton
reloadmappart
special Function101231
closetext
end

1
maps/MrPokemonsHouse.asm
View File

@@ -111,7 +111,6 @@ MrPokemonsHouse_OakScript:
special FadeBlackQuickly
special ReloadSpritesNoPalettes
playmusic MUSIC_HEAL
special StubbedTrainerRankings_Healings
special HealParty
pause 60
special FadeInQuickly

32
maps/Pokecenter2F.asm
View File

@@ -16,7 +16,6 @@ Pokecenter2F_MapScripts:
def_callbacks
Pokecenter2FCheckMysteryGiftScene:
special CheckMysteryGift
ifequal $0, .done
clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
@@ -73,13 +72,6 @@ LinkReceptionistScript_Trade:
writetext Text_TradeReceptionistIntro
yesorno
iffalse .Cancel
special Mobile_DummyReturnFalse ; always returns false
iffalse .NoMobile
writetext Text_TradeReceptionistMobile
special AskMobileOrCable
iffalse .Cancel
ifequal $1, .Mobile
.NoMobile:
special SetBitsForLinkTradeRequest
writetext Text_PleaseWait
special WaitForLinkedFriend
@@ -150,7 +142,6 @@ LinkReceptionistScript_Trade:
iffalse .Mobile_DidNotSave
special TryQuickSave
iffalse .Mobile_DidNotSave
special Function1011f1
writetext Text_PleaseComeIn
waitbutton
closetext
@@ -175,13 +166,6 @@ LinkReceptionistScript_Battle:
writetext Text_BattleReceptionistIntro
yesorno
iffalse .Cancel
special Mobile_DummyReturnFalse ; always returns false
iffalse .NoMobile
writetext Text_BattleReceptionistMobile
special AskMobileOrCable
iffalse .Cancel
ifequal $1, .Mobile
.NoMobile:
special SetBitsForBattleRequest
writetext Text_PleaseWait
special WaitForLinkedFriend
@@ -252,9 +236,6 @@ LinkReceptionistScript_Battle:
writetext Text_MustSaveGame
yesorno
iffalse .Mobile_DidNotSave
special Function103780
iffalse .Mobile_DidNotSave
special Function1011f1
writetext Text_PleaseComeIn
waitbutton
closetext
@@ -268,16 +249,6 @@ LinkReceptionistScript_Battle:
end
.SelectThreeMons:
special Mobile_SelectThreeMons
iffalse .Mobile_DidNotSelect
ifequal $1, .Mobile_OK
ifequal $2, .Mobile_OK
ifequal $3, .Mobile_InvalidParty
sjump .Mobile_DidNotSelect
.Mobile_InvalidParty:
writetext Text_BrokeStadiumRules
waitbutton
.Mobile_DidNotSelect:
closetext
setval FALSE
@@ -378,7 +349,6 @@ Script_LeftCableTradeCenter:
end
Script_LeftMobileTradeRoom:
special Function101220
scall Script_WalkOutOfMobileTradeRoom
setscene SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
setmapscene MOBILE_TRADE_ROOM, SCENE_MOBILETRADEROOM_INITIALIZE
@@ -398,7 +368,6 @@ Script_LeftCableColosseum:
end
Script_LeftMobileBattleRoom:
special Function101220
scall Script_WalkOutOfMobileBattleRoom
setscene SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
setmapscene MOBILE_BATTLE_ROOM, SCENE_MOBILEBATTLEROOM_INITIALIZE
@@ -597,7 +566,6 @@ Pokecenter2FOfficerScript:
writetext Text_MysteryGiftDeliveryGuy_HereYouGo
promptbutton
waitsfx
special GetMysteryGiftItem
iffalse .BagIsFull
itemnotify
setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY

1
maps/Route26HealHouse.asm
View File

@@ -14,7 +14,6 @@ Route26HealHouseTeacherScript:
closetext
special FadeBlackQuickly
special ReloadSpritesNoPalettes
special StubbedTrainerRankings_Healings
playmusic MUSIC_HEAL
special HealParty
pause 60

5
maps/Route40.asm
View File

@@ -77,13 +77,8 @@ Route40Lass1Script:
jumptextfaceplayer Route40Lass1Text
Route40PokefanMScript:
special Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer Route40PokefanMText
.mobile
jumptextfaceplayer Route40PokefanMText_Mobile
Route40Lass2Script:
jumptextfaceplayer Route40Lass2Text

5
maps/SaffronPokecenter1F.asm
View File

@@ -13,13 +13,8 @@ SaffronPokecenter1FNurseScript:
jumpstd PokecenterNurseScript
SaffronPokecenter1FTeacherScript:
special Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer SaffronPokecenter1FTeacherText
.mobile
jumptextfaceplayer SaffronPokecenter1FTeacherMobileText
SaffronPokecenter1FFisherScript:
faceplayer
opentext

1
maps/TeamRocketBaseB2F.asm
View File

@@ -165,7 +165,6 @@ LanceHealsCommon:
waitbutton
closetext
special FadeOutPalettes
special StubbedTrainerRankings_Healings
playsound SFX_FULL_HEAL
special HealParty
special FadeInPalettes

2
maps/TrainerHouseB1F.asm
View File

@@ -18,7 +18,6 @@ TrainerHouseReceptionistScript:
iftrue .FoughtTooManyTimes
writetext TrainerHouseB1FIntroText
promptbutton
special TrainerHouse
iffalse .GetCal3Name
gettrainername STRING_BUFFER_3, CAL, CAL2
sjump .GotName
@@ -40,7 +39,6 @@ TrainerHouseReceptionistScript:
writetext TrainerHouseB1FCalBeforeText
waitbutton
closetext
special TrainerHouse
iffalse .NoSpecialBattle
winlosstext TrainerHouseB1FCalBeatenText, 0
setlasttalked TRAINERHOUSEB1F_CHRIS