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

Rename some call/jump script commands to avoid confusion with jr/jp asm instructions

Browse Source 
Fixes #580
This commit is contained in:
Rangi
2019-03-10 16:39:31 -04:00
parent e002b536af
commit f5c9958aea
164 changed files with 840 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maps/AzaleaTown.asm
View File

@@ -43,7 +43,7 @@ AzaleaTownRivalBattleScene1:
appear AZALEATOWN_SILVER
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1
turnobject PLAYER, DOWN
jump AzaleaTownRivalBattleScript
sjump AzaleaTownRivalBattleScript
AzaleaTownRivalBattleScene2:
turnobject PLAYER, RIGHT
@@ -70,7 +70,7 @@ AzaleaTownRivalBattleScript:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .AfterBattle
sjump .AfterBattle
.Totodile:
winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText
@@ -79,7 +79,7 @@ AzaleaTownRivalBattleScript:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .AfterBattle
sjump .AfterBattle
.Chikorita:
winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText
@@ -88,7 +88,7 @@ AzaleaTownRivalBattleScript:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .AfterBattle
sjump .AfterBattle
.AfterBattle:
playmusic MUSIC_RIVAL_AFTER

28
maps/BattleTower1F.asm
View File

@@ -19,18 +19,18 @@ BattleTower1F_MapScripts:
setval BATTLETOWERACTION_GET_CHALLENGE_STATE ; readmem sBattleTowerChallengeState
special BattleTowerAction
ifequal $0, .SkipEverything
ifequal $2, .priorityjump1
ifequal $2, .LeftWithoutSaving
ifequal $3, .SkipEverything
ifequal $4, .SkipEverything
opentext
writetext Text_WeveBeenWaitingForYou
waitbutton
closetext
priorityjump Script_ResumeBattleTowerChallenge
prioritysjump Script_ResumeBattleTowerChallenge
end
.priorityjump1
priorityjump BattleTower_LeftWithoutSaving
.LeftWithoutSaving
prioritysjump BattleTower_LeftWithoutSaving
setval BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
setval BATTLETOWERACTION_06
@@ -61,7 +61,7 @@ BattleTower1FReceptionistScript:
setval BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
ifnotequal $0, Script_Menu_ChallengeExplanationCancel
jump Script_BattleTowerIntroductionYesNo
sjump Script_BattleTowerIntroductionYesNo
Script_Menu_ChallengeExplanationCancel:
writetext Text_WantToGoIntoABattleRoom
@@ -69,7 +69,7 @@ Script_Menu_ChallengeExplanationCancel:
special Menu_ChallengeExplanationCancel
ifequal 1, Script_ChooseChallenge
ifequal 2, Script_BattleTowerExplanation
jump Script_BattleTowerHopeToServeYouAgain
sjump Script_BattleTowerHopeToServeYouAgain
Script_ChooseChallenge:
setval BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
@@ -95,7 +95,7 @@ Script_ChooseChallenge:
closetext
setval BATTLETOWERACTION_CHOOSEREWARD
special BattleTowerAction
jump Script_WalkToBattleTowerElevator
sjump Script_WalkToBattleTowerElevator
Script_ResumeBattleTowerChallenge:
closetext
@@ -146,7 +146,7 @@ Script_BattleTowerExplanation:
Script_BattleTowerSkipExplanation:
setval BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction
jump Script_Menu_ChallengeExplanationCancel
sjump Script_Menu_ChallengeExplanationCancel
Script_BattleTowerHopeToServeYouAgain:
writetext Text_WeHopeToServeYouAgain
@@ -196,7 +196,7 @@ UnreferencedScript_0x9e4ea:
special BattleTowerAction
ifequal $0, .zero
writetext Text_CantBeRegistered_PreviousRecordDeleted
jump continue
sjump continue
.zero
writetext Text_CantBeRegistered
@@ -216,22 +216,22 @@ continue:
special BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
waitbutton
jump Script_ResumeBattleTowerChallenge
sjump Script_ResumeBattleTowerChallenge
UnreferencedScript_0x9e53b:
writetext Text_FiveDayBattleLimit_Mobile
waitbutton
jump Script_BattleTowerHopeToServeYouAgain
sjump Script_BattleTowerHopeToServeYouAgain
Script_AMonLevelExceeds:
writetext Text_AMonLevelExceeds
waitbutton
jump Script_Menu_ChallengeExplanationCancel
sjump Script_Menu_ChallengeExplanationCancel
Script_MayNotEnterABattleRoomUnderL70:
writetext Text_MayNotEnterABattleRoomUnderL70
waitbutton
jump Script_Menu_ChallengeExplanationCancel
sjump Script_Menu_ChallengeExplanationCancel
Script_MobileError:
special BattleTowerMobileError
@@ -242,7 +242,7 @@ BattleTower_LeftWithoutSaving:
opentext
writetext Text_BattleTower_LeftWithoutSaving
waitbutton
jump Script_BattleTowerHopeToServeYouAgain
sjump Script_BattleTowerHopeToServeYouAgain
BattleTower1FYoungsterScript:
faceplayer

8
maps/BattleTowerBattleRoom.asm
View File

@@ -11,7 +11,7 @@ BattleTowerBattleRoom_MapScripts:
.EnterBattleRoom:
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
priorityjump Script_BattleRoom
prioritysjump Script_BattleRoom
setscene SCENE_FINISHED
.DummyScene:
end
@@ -59,7 +59,7 @@ Script_ContinueAndBattleNextOpponent:
closetext
applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent
applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksAway
jump Script_BattleRoomLoop
sjump Script_BattleRoomLoop
Script_DontBattleNextOpponent:
writetext Text_SaveAndEndTheSession
@@ -87,7 +87,7 @@ Script_DontSaveAndEndTheSession:
special FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, 7, 7
opentext
jump Script_BattleTowerHopeToServeYouAgain
sjump Script_BattleTowerHopeToServeYouAgain
Script_FailedBattleTowerChallenge:
pause 60
@@ -108,7 +108,7 @@ Script_BeatenAllTrainers:
Script_BeatenAllTrainers2:
opentext
writetext Text_CongratulationsYouveBeatenAllTheTrainers
jump Script_GivePlayerHisPrize
sjump Script_GivePlayerHisPrize
UnreferencedScript_0x9f4eb:
setval BATTLETOWERACTION_CHALLENGECANCELED

2
maps/BattleTowerElevator.asm
View File

@@ -9,7 +9,7 @@ BattleTowerElevator_MapScripts:
db 0 ; callbacks
.Scene0:
priorityjump .RideElevator
prioritysjump .RideElevator
setscene SCENE_FINISHED
.Scene1:
end

14
maps/BattleTowerHallway.asm
View File

@@ -9,7 +9,7 @@ BattleTowerHallway_MapScripts:
db 0 ; callbacks
.Scene0:
priorityjump .ChooseBattleRoom
prioritysjump .ChooseBattleRoom
setscene SCENE_FINISHED
.Scene1:
end
@@ -17,7 +17,7 @@ BattleTowerHallway_MapScripts:
.ChooseBattleRoom:
follow BATTLETOWERHALLWAY_RECEPTIONIST, PLAYER
callasm .asm_load_battle_room
jump .WalkToChosenBattleRoom
sjump .WalkToChosenBattleRoom
.asm_load_battle_room
ldh a, [rSVBK]
@@ -45,23 +45,23 @@ BattleTowerHallway_MapScripts:
ifequal 9, .L90L100
ifequal 10, .L90L100
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo1020Room
jump .EnterBattleRoom
sjump .EnterBattleRoom
.L30L40:
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo3040Room
jump .EnterBattleRoom
sjump .EnterBattleRoom
.L50L60:
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo5060Room
jump .EnterBattleRoom
sjump .EnterBattleRoom
.L70L80:
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo7080Room
jump .EnterBattleRoom
sjump .EnterBattleRoom
.L90L100:
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo90100Room
jump .EnterBattleRoom
sjump .EnterBattleRoom
.EnterBattleRoom:
faceobject PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST

2
maps/BillsFamilysHouse.asm
View File

@@ -95,7 +95,7 @@ BillsSisterScript:
.NoRoom:
writetext BillsSisterPhoneFullText
buttonsound
jump .Refused
sjump .Refused
BillsHouseBookshelf1:
jumpstd picturebookshelf

12
maps/BillsHouse.asm
View File

@@ -40,7 +40,7 @@ BillsGrandpa:
ifnotequal LICKITUNG, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
jump .ShowedLickitung
sjump .ShowedLickitung
.GotEverstone:
writetext BillsGrandpaOddishText
@@ -54,7 +54,7 @@ BillsGrandpa:
ifnotequal ODDISH, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
jump .ShowedOddish
sjump .ShowedOddish
.GotLeafStone:
writetext BillsGrandpaStaryuText
@@ -68,7 +68,7 @@ BillsGrandpa:
ifnotequal STARYU, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
jump .ShowedStaryu
sjump .ShowedStaryu
.GotWaterStone:
checkver
@@ -84,7 +84,7 @@ BillsGrandpa:
ifnotequal GROWLITHE, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump .ShowedGrowlitheVulpix
sjump .ShowedGrowlitheVulpix
.AskVulpix:
writetext BillsGrandpaVulpixText
@@ -98,7 +98,7 @@ BillsGrandpa:
ifnotequal VULPIX, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump .ShowedGrowlitheVulpix
sjump .ShowedGrowlitheVulpix
.GotFireStone:
writetext BillsGrandpaPichuText
@@ -112,7 +112,7 @@ BillsGrandpa:
ifnotequal PICHU, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
jump .ShowedPichu
sjump .ShowedPichu
.ShowedLickitung:
checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA

2
maps/BlackthornGym1F.asm
View File

@@ -76,7 +76,7 @@ BlackthornGymClairScript:
setevent EVENT_GOT_TM24_DRAGONBREATH
writetext BlackthornGymClairText_DescribeTM24
buttonsound
jump .GotTM24
sjump .GotTM24
.BagFull:
writetext BlackthornGymClairText_BagFull

6
maps/BlackthornGym2F.asm
View File

@@ -29,15 +29,15 @@ BlackthornGym2F_MapScripts:
.Boulder1:
disappear BLACKTHORNGYM2F_BOULDER1
jump .Fall
sjump .Fall
.Boulder2:
disappear BLACKTHORNGYM2F_BOULDER2
jump .Fall
sjump .Fall
.Boulder3:
disappear BLACKTHORNGYM2F_BOULDER3
jump .Fall
sjump .Fall
.Fall:
pause 30

2
maps/BrunosRoom.asm
View File

@@ -10,7 +10,7 @@ BrunosRoom_MapScripts:
callback MAPCALLBACK_TILES, .BrunosRoomDoors
.LockDoor:
priorityjump .BrunosDoorLocksBehindYou
prioritysjump .BrunosDoorLocksBehindYou
end
.DummyScene:

8
maps/BurnedTower1F.asm
View File

@@ -15,7 +15,7 @@ BurnedTower1F_MapScripts:
callback MAPCALLBACK_TILES, .HoleAndLadder
.EusineScene:
priorityjump .MeetEusine
prioritysjump .MeetEusine
end
.DummyScene1:
@@ -70,7 +70,7 @@ BurnedTowerRivalBattleScript:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .returnfrombattle
sjump .returnfrombattle
.totodile
winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
@@ -79,7 +79,7 @@ BurnedTowerRivalBattleScript:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .returnfrombattle
sjump .returnfrombattle
.chikorita
winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
@@ -88,7 +88,7 @@ BurnedTowerRivalBattleScript:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump .returnfrombattle
sjump .returnfrombattle
.returnfrombattle
playmusic MUSIC_RIVAL_AFTER

2
maps/BurnedTowerB1F.asm
View File

@@ -106,7 +106,7 @@ BurnedTowerB1FEusine:
readvar VAR_FACING
ifequal UP, .Movement2
applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1
jump .Finish
sjump .Finish
.Movement2:
applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement2

12
maps/CeladonDeptStore6F.asm
View File

@@ -43,7 +43,7 @@ CeladonDeptStore6FVendingMachine:
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, CELADONDEPTSTORE6F_FRESH_WATER_PRICE
getitemname STRING_BUFFER_3, FRESH_WATER
jump .VendItem
sjump .VendItem
.SodaPop:
checkmoney YOUR_MONEY, CELADONDEPTSTORE6F_SODA_POP_PRICE
@@ -52,7 +52,7 @@ CeladonDeptStore6FVendingMachine:
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, CELADONDEPTSTORE6F_SODA_POP_PRICE
getitemname STRING_BUFFER_3, SODA_POP
jump .VendItem
sjump .VendItem
.Lemonade:
checkmoney YOUR_MONEY, CELADONDEPTSTORE6F_LEMONADE_PRICE
@@ -61,7 +61,7 @@ CeladonDeptStore6FVendingMachine:
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, CELADONDEPTSTORE6F_LEMONADE_PRICE
getitemname STRING_BUFFER_3, LEMONADE
jump .VendItem
sjump .VendItem
.VendItem:
pause 10
@@ -69,17 +69,17 @@ CeladonDeptStore6FVendingMachine:
writetext CeladonClangText
buttonsound
itemnotify
jump .Start
sjump .Start
.NotEnoughMoney:
writetext CeladonVendingNoMoneyText
waitbutton
jump .Start
sjump .Start
.NotEnoughSpace:
writetext CeladonVendingNoSpaceText
waitbutton
jump .Start
sjump .Start
.MenuHeader:
db MENU_BACKUP_TILES ; flags

18
maps/CeladonGameCornerPrizeRoom.asm
View File

@@ -36,7 +36,7 @@ CeladonPrizeRoom_tmcounterloop:
ifequal 1, .DoubleTeam
ifequal 2, .Psychic
ifequal 3, .HyperBeam
jump CeladonPrizeRoom_CancelPurchaseScript
sjump CeladonPrizeRoom_CancelPurchaseScript
.DoubleTeam:
checkcoins CELADONGAMECORNERPRIZEROOM_TM32_COINS
@@ -47,7 +47,7 @@ CeladonPrizeRoom_tmcounterloop:
giveitem TM_DOUBLE_TEAM
iffalse CeladonPrizeRoom_notenoughroom
takecoins CELADONGAMECORNERPRIZEROOM_TM32_COINS
jump CeladonPrizeRoom_purchased
sjump CeladonPrizeRoom_purchased
.Psychic:
checkcoins CELADONGAMECORNERPRIZEROOM_TM29_COINS
@@ -58,7 +58,7 @@ CeladonPrizeRoom_tmcounterloop:
giveitem TM_PSYCHIC_M
iffalse CeladonPrizeRoom_notenoughroom
takecoins CELADONGAMECORNERPRIZEROOM_TM29_COINS
jump CeladonPrizeRoom_purchased
sjump CeladonPrizeRoom_purchased
.HyperBeam:
checkcoins CELADONGAMECORNERPRIZEROOM_TM15_COINS
@@ -69,7 +69,7 @@ CeladonPrizeRoom_tmcounterloop:
giveitem TM_HYPER_BEAM
iffalse CeladonPrizeRoom_notenoughroom
takecoins CELADONGAMECORNERPRIZEROOM_TM15_COINS
jump CeladonPrizeRoom_purchased
sjump CeladonPrizeRoom_purchased
CeladonPrizeRoom_askbuy:
writetext CeladonPrizeRoom_ConfirmPurchaseText
@@ -81,7 +81,7 @@ CeladonPrizeRoom_purchased:
playsound SFX_TRANSACTION
writetext CeladonPrizeRoom_HereYouGoText
waitbutton
jump CeladonPrizeRoom_tmcounterloop
sjump CeladonPrizeRoom_tmcounterloop
CeladonPrizeRoom_notenoughcoins:
writetext CeladonPrizeRoom_NotEnoughCoinsText
@@ -137,7 +137,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
ifequal 1, .Pikachu
ifequal 2, .Porygon
ifequal 3, .Larvitar
jump CeladonPrizeRoom_CancelPurchaseScript
sjump CeladonPrizeRoom_CancelPurchaseScript
.Pikachu:
checkcoins CELADONGAMECORNERPRIZEROOM_PIKACHU_COINS
@@ -155,7 +155,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
special GameCornerPrizeMonCheckDex
givepoke PIKACHU, 25
takecoins CELADONGAMECORNERPRIZEROOM_PIKACHU_COINS
jump .loop
sjump .loop
.Porygon:
checkcoins CELADONGAMECORNERPRIZEROOM_PORYGON_COINS
@@ -173,7 +173,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
special GameCornerPrizeMonCheckDex
givepoke PORYGON, 15
takecoins CELADONGAMECORNERPRIZEROOM_PORYGON_COINS
jump .loop
sjump .loop
.Larvitar:
checkcoins CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS
@@ -191,7 +191,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
special GameCornerPrizeMonCheckDex
givepoke LARVITAR, 40
takecoins CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS
jump .loop
sjump .loop
.MenuHeader:
db MENU_BACKUP_TILES ; flags

2
maps/CeladonPokecenter1F.asm
View File

@@ -45,7 +45,7 @@ CeladonEusine:
readvar VAR_FACING
ifequal UP, .Location1
applymovement CELADONPOKECENTER1F_EUSINE, .Movement1
jump .Continue
sjump .Continue
.Location1:
applymovement CELADONPOKECENTER1F_EUSINE, .Movement2

2
maps/CeruleanGym.asm
View File

@@ -17,7 +17,7 @@ CeruleanGym_MapScripts:
end
.GruntRunsOut:
priorityjump .GruntRunsOutScript
prioritysjump .GruntRunsOutScript
end
.GruntRunsOutScript:

10
maps/CherrygroveCity.asm
View File

@@ -29,7 +29,7 @@ CherrygroveCityGuideGent:
writetext GuideGentIntroText
yesorno
iffalse .No
jump .Yes
sjump .Yes
.Yes:
writetext GuideGentTourText1
waitbutton
@@ -125,7 +125,7 @@ CherrygroveSilverSceneNorth:
dontrestartmapmusic
reloadmap
iftrue .AfterVictorious
jump .AfterYourDefeat
sjump .AfterYourDefeat
.Totodile:
winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
@@ -136,7 +136,7 @@ CherrygroveSilverSceneNorth:
dontrestartmapmusic
reloadmap
iftrue .AfterVictorious
jump .AfterYourDefeat
sjump .AfterYourDefeat
.Chikorita:
winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
@@ -147,7 +147,7 @@ CherrygroveSilverSceneNorth:
dontrestartmapmusic
reloadmap
iftrue .AfterVictorious
jump .AfterYourDefeat
sjump .AfterYourDefeat
.AfterVictorious:
playmusic MUSIC_RIVAL_AFTER
@@ -155,7 +155,7 @@ CherrygroveSilverSceneNorth:
writetext CherrygroveRivalText_YouWon
waitbutton
closetext
jump .FinishRival
sjump .FinishRival
.AfterYourDefeat:
playmusic MUSIC_RIVAL_AFTER

2
maps/Colosseum.asm
View File

@@ -13,7 +13,7 @@ Colosseum_MapScripts:
callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F
.InitializeColosseum:
priorityjump .InitializeAndPreparePokecenter2F
prioritysjump .InitializeAndPreparePokecenter2F
end
.DummyScene1:

20
maps/CopycatsHouse2F.asm
View File

@@ -17,7 +17,7 @@ CopycatsHouse2F_MapScripts:
iftrue .Female
disappear COPYCATSHOUSE2F_COPYCAT2
appear COPYCATSHOUSE2F_COPYCAT1
jump .Done
sjump .Done
.Female:
disappear COPYCATSHOUSE2F_COPYCAT1
appear COPYCATSHOUSE2F_COPYCAT2
@@ -37,7 +37,7 @@ Copycat:
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_CHRIS
jump .Default_Merge_1
sjump .Default_Merge_1
.Default_Female_1:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@@ -51,7 +51,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Default_Female_2a
writetext CopycatText_Male_1
jump .Default_Merge_2a
sjump .Default_Merge_2a
.Default_Female_2a:
writetext CopycatText_Female_1
@@ -61,7 +61,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Default_Female_3a
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
jump .Default_Merge_3a
sjump .Default_Merge_3a
.Default_Female_3a:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@@ -80,7 +80,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Default_Female_2b
writetext CopycatText_Male_2
jump .Default_Merge_2b
sjump .Default_Merge_2b
.Default_Female_2b:
writetext CopycatText_Female_2
@@ -90,7 +90,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Default_Female_3b
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
jump .Default_Merge_3b
sjump .Default_Merge_3b
.Default_Female_3b:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@@ -112,7 +112,7 @@ Copycat:
takeitem LOST_ITEM
setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT
clearevent EVENT_COPYCATS_HOUSE_2F_DOLL
jump .GivePass
sjump .GivePass
.TryGivePassAgain:
opentext
@@ -133,7 +133,7 @@ Copycat:
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_CHRIS
jump .GotPass_Merge_1
sjump .GotPass_Merge_1
.GotPass_Female_1:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@@ -145,7 +145,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .GotPass_Female_2
writetext CopycatText_Male_3
jump .GotPass_Merge_2
sjump .GotPass_Merge_2
.GotPass_Female_2:
writetext CopycatText_Female_3
@@ -155,7 +155,7 @@ Copycat:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .GotPass_Female_3
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
jump .GotPass_Merge_3
sjump .GotPass_Merge_3
.GotPass_Female_3:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData

2
maps/DanceTheatre.asm
View File

@@ -86,7 +86,7 @@ DanceTheaterSurfGuy:
iffalse .KimonoGirlsUndefeated
checkevent EVENT_BEAT_KIMONO_GIRL_MIKI
iffalse .KimonoGirlsUndefeated
jump .GetSurf
sjump .GetSurf
.KimonoGirlsUndefeated:
checkflag ENGINE_PLAYER_IS_FEMALE

Some files were not shown because too many files have changed in this diff Show More