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

Merge branch 'master' of github.com:pret/pokecrystal

Browse Source
This commit is contained in:
surskitty
2018-01-23 00:02:56 -05:00
parent 4162705db9 c60f1331fe
commit fbc6fe4722
1232 changed files with 20484 additions and 19794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maps/AzaleaGym.asm
View File

@@ -7,7 +7,7 @@ const_value set 2
const AZALEAGYM_TWIN2
const AZALEAGYM_GYM_GUY
AzaleaGym_MapScriptHeader:
AzaleaGym_MapScripts:
.SceneScripts:
db 0
@@ -23,7 +23,7 @@ AzaleaGymBugsyScript:
waitbutton
closetext
winlosstext BugsyText_ResearchIncomplete, 0
loadtrainer BUGSY, 1
loadtrainer BUGSY, BUGSY1
startbattle
reloadmapafterbattle
setevent EVENT_BEAT_BUGSY
@@ -146,7 +146,7 @@ AzaleaGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext BUGSY, 1, $1
trainertotext BUGSY, BUGSY1, MEM_BUFFER_1
jumpstd gymstatue2
BugsyText_INeverLose:
@@ -361,7 +361,7 @@ AzaleaGymGuyWinText:
cont "#MON is bright!"
done
AzaleaGym_MapEventHeader:
AzaleaGym_MapEvents:
; filler
db 0, 0

4
maps/AzaleaMart.asm
View File

@@ -3,7 +3,7 @@ const_value set 2
const AZALEAMART_COOLTRAINER_M
const AZALEAMART_BUG_CATCHER
AzaleaMart_MapScriptHeader:
AzaleaMart_MapScripts:
.SceneScripts:
db 0
@@ -45,7 +45,7 @@ AzaleaMartBugCatcherText:
cont "times."
done
AzaleaMart_MapEventHeader:
AzaleaMart_MapEvents:
; filler
db 0, 0

4
maps/AzaleaPokecenter1F.asm
View File

@@ -4,7 +4,7 @@ const_value set 2
const AZALEAPOKECENTER1F_FISHING_GURU
const AZALEAPOKECENTER1F_POKEFAN_F
AzaleaPokecenter1F_MapScriptHeader:
AzaleaPokecenter1F_MapScripts:
.SceneScripts:
db 1
scene_script .DummyScene
@@ -76,7 +76,7 @@ AzaleaPokecenter1FPokefanFText:
line "APRICORNS."
done
AzaleaPokecenter1F_MapEventHeader:
AzaleaPokecenter1F_MapEvents:
; filler
db 0, 0

18
maps/AzaleaTown.asm
View File

@@ -12,7 +12,7 @@ const_value set 2
const AZALEATOWN_AZALEA_ROCKET3
const AZALEATOWN_KURT_OUTSIDE
AzaleaTown_MapScriptHeader:
AzaleaTown_MapScripts:
.SceneScripts:
db 3
scene_script .DummyScene0
@@ -21,7 +21,7 @@ AzaleaTown_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .Flypoint
callback MAPCALLBACK_NEWMAP, .Flypoint
.DummyScene0:
end
@@ -37,7 +37,7 @@ AzaleaTown_MapScriptHeader:
return
AzaleaTownRivalBattleScene1:
moveobject AZALEATOWN_SILVER, $b, $b
moveobject AZALEATOWN_SILVER, 11, 11
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
@@ -102,7 +102,7 @@ AzaleaTownRivalBattleScript:
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
playsound SFX_EXIT_BUILDING
disappear AZALEATOWN_SILVER
setscene $0
setscene 0
waitsfx
playmapmusic
end
@@ -170,7 +170,7 @@ AzaleaTownCelebiScene:
setflag ENGINE_HAVE_EXAMINED_GS_BALL
clearevent EVENT_ILEX_FOREST_LASS
setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
setscene $0
setscene 0
closetext
end
@@ -211,7 +211,7 @@ WhiteApricornTree:
fruittree FRUITTREE_AZALEA_TOWN
AzaleaTownHiddenFullHeal:
dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL
hiddenitem EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL
AzaleaTownRivalBattleApproachMovement1:
step LEFT
@@ -376,11 +376,11 @@ AzaleaTownYoungsterText:
AzaleaTownSlowpokeText1:
text "SLOWPOKE: …"
para "<......> <......> <......>"
para "<……> <……> <……>"
done
AzaleaTownSlowpokeText2:
text "<......> <......>Yawn?"
text "<……> <……>Yawn?"
done
WoosterText:
@@ -455,7 +455,7 @@ AzaleaTownIlexForestSignText:
line "gate."
done
AzaleaTown_MapEventHeader:
AzaleaTown_MapEvents:
; filler
db 0, 0

88
maps/BattleTower1F.asm
View File

@@ -5,7 +5,7 @@ const_value set 2
const BATTLETOWER1F_BUG_CATCHER
const BATTLETOWER1F_GRANNY
BattleTower1F_MapScriptHeader:
BattleTower1F_MapScripts:
.SceneScripts:
db 2
scene_script .Scene0
@@ -16,10 +16,10 @@ BattleTower1F_MapScriptHeader:
.Scene0:
writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS
special BattleTowerAction
special Special_BattleTowerAction
iffalse .SkipEverything
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction
special Special_BattleTowerAction
if_equal $0, .SkipEverything
if_equal $2, .priorityjump1
if_equal $3, .SkipEverything
@@ -34,11 +34,11 @@ BattleTower1F_MapScriptHeader:
.priorityjump1
priorityjump BattleTower_LeftWithoutSaving
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_06
special BattleTowerAction
special Special_BattleTowerAction
.SkipEverything:
setscene $1
setscene 1
.Scene1:
end
@@ -55,63 +55,63 @@ UnknownScript_0x9e3e0:
ReceptionistScript_0x9e3e2:
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction
special Special_BattleTowerAction
if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
opentext
writetext Text_BattleTowerWelcomesYou
buttonsound
writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
special Special_BattleTowerAction
if_not_equal $0, Script_Menu_ChallengeExplanationCancel
jump Script_BattleTowerIntroductionYesNo
Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc
writetext Text_WantToGoIntoABattleRoom
writebyte $1
writebyte TRUE
special Special_Menu_ChallengeExplanationCancel
if_equal $1, Script_ChooseChallenge
if_equal $2, Script_BattleTowerExplanation
if_equal 1, Script_ChooseChallenge
if_equal 2, Script_BattleTowerExplanation
jump Script_BattleTowerHopeToServeYouAgain
Script_ChooseChallenge: ; 0x9e40f
writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
special BattleTowerAction
special SpecialCheckForBattleTowerRules
if_not_equal $0, Script_WaitButton
special Special_BattleTowerAction
special Special_CheckForBattleTowerRules
if_not_equal FALSE, Script_WaitButton
writetext Text_SaveBeforeEnteringBattleRoom
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
setscene $0
setscene 0
special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
setscene $1
setscene 1
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
special BattleTowerRoomMenu
special Special_BattleTowerAction
special Special_BattleTowerRoomMenu
if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, Script_MobileError
writebyte BATTLETOWERACTION_11
special BattleTowerAction
special Special_BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
waitbutton
closetext
writebyte BATTLETOWERACTION_CHOOSEREWARD
special BattleTowerAction
special Special_BattleTowerAction
jump Script_WalkToBattleTowerElevator
Script_ResumeBattleTowerChallenge:
closetext
writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group
special BattleTowerAction
special Special_BattleTowerAction
Script_WalkToBattleTowerElevator:
musicfadeout MUSIC_NONE, 8
setmapscene BATTLE_TOWER_BATTLE_ROOM, $0
setmapscene BATTLE_TOWER_ELEVATOR, $0
setmapscene BATTLE_TOWER_HALLWAY, $0
setmapscene BATTLE_TOWER_BATTLE_ROOM, 0
setmapscene BATTLE_TOWER_ELEVATOR, 0
setmapscene BATTLE_TOWER_HALLWAY, 0
follow BATTLETOWER1F_RECEPTIONIST, PLAYER
applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
writebyte BATTLETOWERACTION_0A
special BattleTowerAction
special Special_BattleTowerAction
warpsound
disappear BATTLETOWER1F_RECEPTIONIST
stopfollow
@@ -121,15 +121,15 @@ Script_WalkToBattleTowerElevator:
Script_GivePlayerHisPrize: ; 0x9e47a
writebyte BATTLETOWERACTION_1C
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_GIVEREWARD
special BattleTowerAction
special Special_BattleTowerAction
if_equal POTION, Script_YourPackIsStuffedFull
itemtotext $0, $1
itemtotext USE_SCRIPT_VAR, MEM_BUFFER_1
giveitem ITEM_FROM_MEM, 5
writetext Text_PlayerGotFive
writebyte BATTLETOWERACTION_1D
special BattleTowerAction
special Special_BattleTowerAction
closetext
end
@@ -147,7 +147,7 @@ Script_BattleTowerExplanation: ; 0x9e4a5
writetext Text_BattleTowerIntroduction_2
Script_BattleTowerSkipExplanation:
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction
special Special_BattleTowerAction
jump Script_Menu_ChallengeExplanationCancel
Script_BattleTowerHopeToServeYouAgain:
@@ -157,7 +157,7 @@ Script_BattleTowerHopeToServeYouAgain:
end
UnreferencedScript_0x9e4b6:
special BattleTowerMobileError
special Special_BattleTowerMobileError
closetext
end
@@ -173,8 +173,8 @@ UnreferencedScript_0x9e4be:
special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction
special Function1700ba
special Special_BattleTowerAction
special Special_Function1700ba
if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, Script_MobileError
writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
@@ -187,15 +187,15 @@ UnreferencedScript_0x9e4be:
UnreferencedScript_0x9e4ea:
writebyte BATTLETOWERACTION_LEVEL_CHECK
special BattleTowerAction
special Special_BattleTowerAction
if_not_equal $0, Script_APkmnLevelExceeds
writebyte BATTLETOWERACTION_UBERS_CHECK
special BattleTowerAction
special Special_BattleTowerAction
if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70
special SpecialCheckForBattleTowerRules
if_not_equal $0, Script_WaitButton
special Special_CheckForBattleTowerRules
if_not_equal FALSE, Script_WaitButton
writebyte BATTLETOWERACTION_05
special BattleTowerAction
special Special_BattleTowerAction
if_equal $0, .zero
writetext Text_CantBeRegistered_PreviousRecordDeleted
jump continue
@@ -208,14 +208,14 @@ continue:
writetext Text_SaveBeforeReentry
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
setscene $0
setscene 0
special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
setscene $1
setscene 1
writebyte BATTLETOWERACTION_06
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_12
special BattleTowerAction
special Special_BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
waitbutton
jump Script_ResumeBattleTowerChallenge
@@ -236,7 +236,7 @@ Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549
jump Script_Menu_ChallengeExplanationCancel
Script_MobileError:
special BattleTowerMobileError
special Special_BattleTowerMobileError
closetext
end
@@ -793,7 +793,7 @@ Text_BattleTowerBugCatcher: ; 0x9f35b
line "any fire #MON…"
done
BattleTower1F_MapEventHeader:
BattleTower1F_MapEvents:
; filler
db 0, 0

52
maps/BattleTowerBattleRoom.asm
View File

@@ -2,7 +2,7 @@ const_value set 2
const BATTLETOWERBATTLEROOM_YOUNGSTER
const BATTLETOWERBATTLEROOM_RECEPTIONIST
BattleTowerBattleRoom_MapScriptHeader:
BattleTowerBattleRoom_MapScripts:
.SceneScripts:
db 2
scene_script .EnterBattleRoom
@@ -14,7 +14,7 @@ BattleTowerBattleRoom_MapScriptHeader:
.EnterBattleRoom: ; 0x9f419
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
priorityjump Script_BattleRoom
setscene $1
setscene 1
.DummyScene:
end
@@ -23,21 +23,21 @@ Script_BattleRoom: ; 0x9f421
; beat all 7 opponents in a row
Script_BattleRoomLoop: ; 0x9f425
writebyte BATTLETOWERBATTLEROOM_YOUNGSTER
special Function_LoadOpponentTrainerAndPokemonsWithOTSprite
special Special_LoadOpponentTrainerAndPokemonWithOTSprite
appear BATTLETOWERBATTLEROOM_YOUNGSTER
warpsound
waitsfx
applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksIn
opentext
battletowertext 1
battletowertext BATTLETOWERTEXT_INTRO
buttonsound
closetext
special BattleTowerBattle ; calls predef startbattle
special FadeOutPalettes
special Special_BattleTowerBattle ; calls predef startbattle
special Special_FadeOutPalettes
reloadmap
if_not_equal $0, Script_FailedBattleTowerChallenge
copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
if_equal BATTLETOWER_NROFTRAINERS, Script_BeatenAllTrainers
if_equal BATTLETOWER_STREAK_LENGTH, Script_BeatenAllTrainers
applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksOut
warpsound
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
@@ -48,10 +48,10 @@ Script_BattleRoomLoop: ; 0x9f425
waitbutton
closetext
playmusic MUSIC_HEAL
special FadeOutPalettes
special LoadMapPalettes
special Special_FadeOutPalettes
special Special_LoadMapPalettes
pause 60
special FadeInPalettes
special Special_FadeInPalettes
special RestartMapMusic
opentext
writetext Text_NextUpOpponentNo
@@ -68,35 +68,35 @@ Script_DontBattleNextOpponent: ; 0x9f483
yesorno
iffalse Script_DontSaveAndEndTheSession
writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave
special BattleTowerAction
special Special_BattleTowerAction
playsound SFX_SAVE
waitsfx
special FadeOutPalettes
special Special_FadeOutPalettes
special Reset
Script_DontSaveAndEndTheSession: ; 0x9f4a3
writetext Text_CancelYourBattleRoomChallenge
yesorno
iffalse Script_ContinueAndBattleNextOpponent
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_06
special BattleTowerAction
special Special_BattleTowerAction
closetext
special FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, $7, $7
special Special_FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, 7, 7
opentext
jump Script_BattleTowerHopeToServeYouAgain
Script_FailedBattleTowerChallenge:
pause 60
special Special_BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, $7, $7
warpfacing UP, BATTLE_TOWER_1F, 7, 7
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
special Special_BattleTowerAction
opentext
writetext Text_ThanksForVisiting
waitbutton
@@ -106,7 +106,7 @@ Script_FailedBattleTowerChallenge:
Script_BeatenAllTrainers: ; 0x9f4d9
pause 60
special Special_BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, $7, $7
warpfacing UP, BATTLE_TOWER_1F, 7, 7
Script_BeatenAllTrainers2:
opentext
writetext Text_CongratulationsYouveBeatenAllTheTrainers
@@ -114,7 +114,7 @@ Script_BeatenAllTrainers2:
UnreferencedScript_0x9f4eb:
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
special Special_BattleTowerAction
opentext
writetext Text_TooMuchTimeElapsedNoRegister
waitbutton
@@ -123,9 +123,9 @@ UnreferencedScript_0x9f4eb:
UnreferencedScript_0x9f4f7:
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_06
special BattleTowerAction
special Special_BattleTowerAction
opentext
writetext Text_ThanksForVisiting
writetext Text_WeHopeToServeYouAgain
@@ -133,14 +133,12 @@ UnreferencedScript_0x9f4f7:
closetext
end
Text_ReturnedAfterSave_Mobile:
text "You'll be returned"
line "after you SAVE."
done
BattleTowerBattleRoom_MapEventHeader:
BattleTowerBattleRoom_MapEvents:
; filler
db 0, 0

8
maps/BattleTowerElevator.asm
View File

@@ -1,7 +1,7 @@
const_value set 2
const BATTLETOWERELEVATOR_RECEPTIONIST
BattleTowerElevator_MapScriptHeader:
BattleTowerElevator_MapScripts:
.SceneScripts:
db 2
scene_script .Scene0
@@ -12,7 +12,7 @@ BattleTowerElevator_MapScriptHeader:
.Scene0:
priorityjump .RideElevator
setscene $1
setscene 1
.Scene1:
end
@@ -22,7 +22,7 @@ BattleTowerElevator_MapScriptHeader:
applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn
applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn
writebyte BATTLETOWERACTION_0A
special BattleTowerAction
special Special_BattleTowerAction
playsound SFX_ELEVATOR
earthquake 60
waitsfx
@@ -44,7 +44,7 @@ MovementData_BattleTowerElevatorPlayerWalksIn:
turn_head DOWN
step_end
BattleTowerElevator_MapEventHeader:
BattleTowerElevator_MapEvents:
; filler
db 0, 0

10
maps/BattleTowerHallway.asm
View File

@@ -1,7 +1,7 @@
const_value set 2
const BATTLETOWERHALLWAY_RECEPTIONIST
BattleTowerHallway_MapScriptHeader:
BattleTowerHallway_MapScripts:
.SceneScripts:
db 2
scene_script .Scene0
@@ -12,7 +12,7 @@ BattleTowerHallway_MapScriptHeader:
.Scene0:
priorityjump .ChooseBattleRoom
setscene $1
setscene 1
.Scene1:
end
@@ -21,7 +21,6 @@ BattleTowerHallway_MapScriptHeader:
callasm .asm_load_battle_room
jump .WalkToChosenBattleRoom
.asm_load_battle_room
ld a, [rSVBK]
push af
@@ -35,7 +34,6 @@ BattleTowerHallway_MapScriptHeader:
ld [rSVBK], a
ret
; enter different rooms for different levels to battle against
; at least it should look like that
; because all warps lead to the same room
@@ -78,7 +76,7 @@ BattleTowerHallway_MapScriptHeader:
warpcheck
end
BattleTowerHallway_MapEventHeader:
BattleTowerHallway_MapEvents:
; filler
db 0, 0
@@ -99,4 +97,4 @@ BattleTowerHallway_MapEventHeader:
.ObjectEvents:
db 1
object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1
object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1

8
maps/BattleTowerOutside.asm
View File

@@ -4,14 +4,14 @@ const_value set 2
const BATTLETOWEROUTSIDE_SAILOR
const BATTLETOWEROUTSIDE_LASS
BattleTowerOutside_MapScriptHeader:
BattleTowerOutside_MapScripts:
.SceneScripts:
db 0
.MapCallbacks:
db 2
dbw MAPCALLBACK_TILES, .Callback1
dbw MAPCALLBACK_OBJECTS, .Callback2
callback MAPCALLBACK_TILES, .Callback1
callback MAPCALLBACK_OBJECTS, .Callback2
.Callback1:
return
@@ -126,7 +126,7 @@ BattleTowerOutsideText_DoorsOpen:
text "It's open!"
done
BattleTowerOutside_MapEventHeader:
BattleTowerOutside_MapEvents:
; filler
db 0, 0

4
maps/BillsHouse.asm
View File

@@ -1,7 +1,7 @@
const_value set 2
const BILLSHOUSE_GRAMPS
BillsHouse_MapScriptHeader:
BillsHouse_MapScripts:
.SceneScripts:
db 0
@@ -353,7 +353,7 @@ BillsGrandpaPichuText:
line "evolves."
done
BillsHouse_MapEventHeader:
BillsHouse_MapEvents:
; filler
db 0, 0

8
maps/BlackthornCity.asm
View File

@@ -9,14 +9,14 @@ const_value set 2
const BLACKTHORNCITY_SANTOS
const BLACKTHORNCITY_COOLTRAINER_F2
BlackthornCity_MapScriptHeader:
BlackthornCity_MapScripts:
.SceneScripts:
db 0
.MapCallbacks:
db 2
dbw MAPCALLBACK_NEWMAP, .FlyPoint
dbw MAPCALLBACK_OBJECTS, .Santos
callback MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_OBJECTS, .Santos
.FlyPoint:
setflag ENGINE_FLYPOINT_BLACKTHORN
@@ -312,7 +312,7 @@ BlackthornCityTrainerTipsText:
cont "problem."
done
BlackthornCity_MapEventHeader:
BlackthornCity_MapEvents:
; filler
db 0, 0

4
maps/BlackthornDragonSpeechHouse.asm
View File

@@ -2,7 +2,7 @@ const_value set 2
const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY
const BLACKTHORNDRAGONSPEECHHOUSE_EKANS
BlackthornDragonSpeechHouse_MapScriptHeader:
BlackthornDragonSpeechHouse_MapScripts:
.SceneScripts:
db 0
@@ -47,7 +47,7 @@ BlackthornDragonSpeechHouseDratiniText:
text "DRATINI: Draa!"
done
BlackthornDragonSpeechHouse_MapEventHeader:
BlackthornDragonSpeechHouse_MapEvents:
; filler
db 0, 0

4
maps/BlackthornEmysHouse.asm
View File

@@ -1,7 +1,7 @@
const_value set 2
const BLACKTHORNEMYSHOUSE_EMY
BlackthornEmysHouse_MapScriptHeader:
BlackthornEmysHouse_MapScripts:
.SceneScripts:
db 0
@@ -19,7 +19,7 @@ Emy:
EmysHouseBookshelf:
jumpstd magazinebookshelf
BlackthornEmysHouse_MapEventHeader:
BlackthornEmysHouse_MapEvents:
; filler
db 0, 0

18
maps/BlackthornGym1F.asm
View File

@@ -5,26 +5,26 @@ const_value set 2
const BLACKTHORNGYM1F_COOLTRAINER_F
const BLACKTHORNGYM1F_GYM_GUY
BlackthornGym1F_MapScriptHeader:
BlackthornGym1F_MapScripts:
.SceneScripts:
db 0
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .Boulders
callback MAPCALLBACK_TILES, .Boulders
.Boulders:
checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1
iffalse .skip1
changeblock $8, $2, $3b
changeblock 8, 2, $3b ; fallen boulder 2
.skip1
checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_2
iffalse .skip2
changeblock $2, $4, $3a
changeblock 2, 4, $3a ; fallen boulder 1
.skip2
checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_3
iffalse .skip3
changeblock $8, $6, $3b
changeblock 8, 6, $3b ; fallen boulder 2
.skip3
return
@@ -39,7 +39,7 @@ BlackthornGymClairScript:
waitbutton
closetext
winlosstext ClairWinText, 0
loadtrainer CLAIR, 1
loadtrainer CLAIR, CLAIR1
startbattle
reloadmapafterbattle
setevent EVENT_BEAT_CLAIR
@@ -70,7 +70,7 @@ BlackthornGymClairScript:
buttonsound
giveitem TM_DRAGONBREATH
iffalse .BagFull
itemtotext TM_DRAGONBREATH, $0
itemtotext TM_DRAGONBREATH, MEM_BUFFER_0
writetext BlackthornGymText_ReceivedTM24
playsound SFX_ITEM
waitsfx
@@ -146,7 +146,7 @@ BlackthornGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
trainertotext CLAIR, 1, $1
trainertotext CLAIR, CLAIR1, MEM_BUFFER_1
jumpstd gymstatue2
ClairIntroText:
@@ -386,7 +386,7 @@ BlackthornGymGuyWinText:
cont "#MON CHAMPION!"
done
BlackthornGym1F_MapEventHeader:
BlackthornGym1F_MapEvents:
; filler
db 0, 0

30
maps/BlackthornGym2F.asm
View File

@@ -8,37 +8,36 @@ const_value set 2
const BLACKTHORNGYM2F_BOULDER5
const BLACKTHORNGYM2F_BOULDER6
BlackthornGym2F_MapScriptHeader:
BlackthornGym2F_MapScripts:
.SceneScripts:
db 0
.MapCallbacks:
db 1
dbw MAPCALLBACK_CMDQUEUE, .Boulders
callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
.Boulders:
writecmdqueue .BoulderCmdQueue
.SetUpStoneTable:
writecmdqueue .CommandQueue
return
.BoulderCmdQueue:
dbw CMDQUEUE_STONETABLE, .BoulderTable ; check if any stones are sitting on a warp
dw 0 ; filler
.CommandQueue:
cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp
.BoulderTable:
stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Disappear4
stonetable 3, BLACKTHORNGYM2F_BOULDER2, .Disappear5
stonetable 4, BLACKTHORNGYM2F_BOULDER3, .Disappear6
.StoneTable:
stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Boulder1
stonetable 3, BLACKTHORNGYM2F_BOULDER2, .Boulder2
stonetable 4, BLACKTHORNGYM2F_BOULDER3, .Boulder3
db -1 ; end
.Disappear4:
.Boulder1:
disappear BLACKTHORNGYM2F_BOULDER1
jump .Fall
.Disappear5:
.Boulder2:
disappear BLACKTHORNGYM2F_BOULDER2
jump .Fall
.Disappear6:
.Boulder3:
disappear BLACKTHORNGYM2F_BOULDER3
jump .Fall
@@ -56,7 +55,6 @@ BlackthornGym2F_MapScriptHeader:
earthquake 80
end
BlackthornGymBoulder:
jumpstd strengthboulder
@@ -127,7 +125,7 @@ BlackthornGym2FBoulderFellText:
line "through!"
done
BlackthornGym2F_MapEventHeader:
BlackthornGym2F_MapEvents:
; filler
db 0, 0

4
maps/BlackthornMart.asm
View File

@@ -3,7 +3,7 @@ const_value set 2
const BLACKTHORNMART_COOLTRAINER_M
const BLACKTHORNMART_BLACK_BELT
BlackthornMart_MapScriptHeader:
BlackthornMart_MapScripts:
.SceneScripts:
db 0
@@ -46,7 +46,7 @@ BlackthornMartBlackBeltText:
cont "REPEL sprays."
done
BlackthornMart_MapEventHeader:
BlackthornMart_MapEvents:
; filler
db 0, 0

4
maps/BlackthornPokecenter1F.asm
View File

@@ -4,7 +4,7 @@ const_value set 2
const BLACKTHORNPOKECENTER1F_TWIN
const BLACKTHORNPOKECENTER1F_COOLTRAINER_M
BlackthornPokecenter1F_MapScriptHeader:
BlackthornPokecenter1F_MapScripts:
.SceneScripts:
db 0
@@ -49,7 +49,7 @@ BlackthornPokecenter1FTwinText:
cont "forget an HM move."
done
BlackthornPokecenter1F_MapEventHeader:
BlackthornPokecenter1F_MapEvents:
; filler
db 0, 0

14
maps/BluesHouse.asm
View File

@@ -1,7 +1,7 @@
const_value set 2
const BLUESHOUSE_DAISY
BluesHouse_MapScriptHeader:
BluesHouse_MapScripts:
.SceneScripts:
db 0
@@ -27,20 +27,20 @@ DaisyScript:
writetext DaisyWhichMonText
waitbutton
special Special_DaisyMassage
if_equal 0, .Refused
if_equal 1, .CantGroomEgg
if_equal $0, .Refused
if_equal $1, .CantGroomEgg
setflag ENGINE_TEA_IN_BLUES_HOUSE
writetext DaisyAlrightText
waitbutton
closetext
special FadeOutPalettes
special Special_FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
special FadeInPalettes
special Special_FadeInPalettes
special RestartMapMusic
opentext
writetext GroomedMonLooksContentText
special PlayCurMonCry
special Special_PlayCurMonCry
buttonsound
writetext DaisyAllDoneText
waitbutton
@@ -144,7 +144,7 @@ DaisyCantGroomEggText:
cont "groom an EGG."
done
BluesHouse_MapEventHeader:
BluesHouse_MapEvents:
; filler
db 0, 0

34
maps/BrunosRoom.asm
View File

@@ -1,7 +1,7 @@
const_value set 2
const BRUNOSROOM_BRUNO
BrunosRoom_MapScriptHeader:
BrunosRoom_MapScripts:
.SceneScripts:
db 2
scene_script .LockDoor
@@ -9,7 +9,7 @@ BrunosRoom_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .BrunosRoomDoors
callback MAPCALLBACK_TILES, .BrunosRoomDoors
.LockDoor:
priorityjump .BrunosDoorLocksBehindYou
@@ -20,24 +20,24 @@ BrunosRoom_MapScriptHeader:
.BrunosRoomDoors:
checkevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
iffalse .KeepDoorClosed
changeblock $4, $e, $2a
.KeepDoorClosed:
iffalse .KeepEntranceOpen
changeblock 4, 14, $2a ; wall
.KeepEntranceOpen:
checkevent EVENT_BRUNOS_ROOM_EXIT_OPEN
iffalse .OpenDoor
changeblock $4, $2, $16
.OpenDoor:
iffalse .KeepExitClosed
changeblock 4, 2, $16 ; open door
.KeepExitClosed:
return
.BrunosDoorLocksBehindYou:
applymovement PLAYER, MovementData_0x1809f9
applymovement PLAYER, BrunosRoom_EnterMovement
refreshscreen $86
playsound SFX_STRENGTH
earthquake 80
changeblock $4, $e, $2a
changeblock 4, 14, $2a ; wall
reloadmappart
closetext
setscene $1
setscene 1
setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
waitsfx
end
@@ -46,12 +46,12 @@ BrunoScript_Battle:
faceplayer
opentext
checkevent EVENT_BEAT_ELITE_4_BRUNO
iftrue UnknownScript_0x1809f3
iftrue BrunoScript_AfterBattle
writetext BrunoScript_BrunoBeforeText
waitbutton
closetext
winlosstext BrunoScript_BrunoBeatenText, 0
loadtrainer BRUNO, 1
loadtrainer BRUNO, BRUNO1
startbattle
reloadmapafterbattle
setevent EVENT_BEAT_ELITE_4_BRUNO
@@ -60,20 +60,20 @@ BrunoScript_Battle:
waitbutton
closetext
playsound SFX_ENTER_DOOR
changeblock $4, $2, $16
changeblock 4, 2, $16 ; open door
reloadmappart
closetext
setevent EVENT_BRUNOS_ROOM_EXIT_OPEN
waitsfx
end
UnknownScript_0x1809f3:
BrunoScript_AfterBattle:
writetext BrunoScript_BrunoDefeatText
waitbutton
closetext
end
MovementData_0x1809f9:
BrunosRoom_EnterMovement:
step UP
step UP
step UP
@@ -124,7 +124,7 @@ BrunoScript_BrunoDefeatText:
line "challenge!"
done
BrunosRoom_MapEventHeader:
BrunosRoom_MapEvents:
; filler
db 0, 0

34
maps/BurnedTower1F.asm
View File

@@ -5,7 +5,7 @@ const_value set 2
const BURNEDTOWER1F_MORTY
const BURNEDTOWER1F_POKE_BALL
BurnedTower1F_MapScriptHeader:
BurnedTower1F_MapScripts:
.SceneScripts:
db 3
scene_script .EusineScene
@@ -14,7 +14,7 @@ BurnedTower1F_MapScriptHeader:
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .HoleAndLadder
callback MAPCALLBACK_TILES, .HoleAndLadder
.EusineScene:
priorityjump .MeetEusine
@@ -28,13 +28,13 @@ BurnedTower1F_MapScriptHeader:
.HoleAndLadder:
checkevent EVENT_HOLE_IN_BURNED_TOWER
iftrue .Next
changeblock $a, $8, $32 ; hole
.Next:
iftrue .KeepHoleOpen
changeblock 10, 8, $32 ; floor
.KeepHoleOpen:
checkevent EVENT_RELEASED_THE_BEASTS
iftrue .Done
changeblock $6, $e, $9 ; ladder
.Done:
iftrue .HideBasement
changeblock 6, 14, $09 ; ladder
.HideBasement:
return
.MeetEusine:
@@ -45,8 +45,8 @@ BurnedTower1F_MapScriptHeader:
writetext BurnedTower1FEusineIntroText
waitbutton
closetext
moveobject BURNEDTOWER1F_EUSINE, $9, $e
setscene $1
moveobject BURNEDTOWER1F_EUSINE, 9, 14
setscene 1
end
BurnedTowerRivalBattleScript:
@@ -98,7 +98,7 @@ BurnedTowerRivalBattleScript:
writetext BurnedTowerSilver_AfterText1
waitbutton
closetext
setscene $2
setscene 2
setevent EVENT_RIVAL_BURNED_TOWER
special Special_FadeOutMusic
pause 15
@@ -106,7 +106,7 @@ BurnedTowerRivalBattleScript:
showemote EMOTE_SHOCK, PLAYER, 15
playsound SFX_ENTER_DOOR
waitsfx
changeblock $a, $8, $25
changeblock 10, 8, $25 ; hole
reloadmappart
pause 15
applymovement PLAYER, BurnedTower1FMovement_PlayerStartsToFall
@@ -131,12 +131,10 @@ BurnedTower1FRock:
jumpstd smashrock
BurnedTower1FHiddenEther:
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER
hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER
BurnedTower1FHiddenUltraBall:
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
BurnedTower1FHPUp:
itemball HP_UP
@@ -162,7 +160,7 @@ BurnedTower1FEusineMovement:
step_end
BurnedTowerSilver_BeforeText:
text "<......> <......> <......>"
text "<……> <……> <……>"
para "…Oh, it's you."
@@ -279,7 +277,7 @@ BurnedTower1FMortyText:
line "TOWER with him."
done
BurnedTower1F_MapEventHeader:
BurnedTower1F_MapEvents:
; filler
db 0, 0

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