Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)

Browse Source 
# Conflicts:
#	data/items/descriptions.asm
#	data/sprite_anims/framesets.asm
#	engine/crystal_colors.asm
#	engine/events/kurt.asm
#	engine/events/special.asm
#	engine/events/std_scripts.asm
#	engine/events_3.asm
#	engine/item_effects.asm
#	engine/namingscreen.asm
#	engine/scripting.asm
#	engine/stats_screen.asm
#	engine/trade_animation.asm
#	home/audio.asm
#	main.asm
#	maps/BattleTower1F.asm
#	maps/BattleTowerBattleRoom.asm
#	maps/BurnedTowerB1F.asm
#	maps/ElmsLab.asm
#	maps/GoldenrodDeptStore5F.asm
#	maps/GoldenrodUnderground.asm
#	maps/HallOfFame.asm
#	maps/MahoganyTown.asm
#	maps/ManiasHouse.asm
#	maps/MobileBattleRoom.asm
#	maps/MobileTradeRoomMobile.asm
#	maps/RadioTower2F.asm
#	maps/Route35NationalParkGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/Route39Farmhouse.asm
#	tilesets/palette_maps.asm
This commit is contained in:
Remy Oukaour
2018-01-14 22:56:36 -05:00
parent 8e1e583640 2c789b64b1
commit 5c28d05bb4
249 changed files with 1382 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

230
engine/specials.asm
View File

@@ -15,7 +15,7 @@ Special:: ; c01b
; c029
SpecialsPointers:: ; c029
add_special WarpToSpawnPoint
add_special Special_WarpToSpawnPoint
; Communications
add_special Special_SetBitsForLinkTradeRequest
@@ -25,7 +25,7 @@ SpecialsPointers:: ; c029
add_special Special_CheckBothSelectedSameRoom
add_special Special_FailedLinkToPast
add_special Special_CloseLink
add_special WaitForOtherPlayerToExit
add_special Special_WaitForOtherPlayerToExit
add_special Special_SetBitsForBattleRequest
add_special Special_SetBitsForTimeCapsuleRequest
add_special Special_CheckTimeCapsuleCompatibility
@@ -39,160 +39,160 @@ SpecialsPointers:: ; c029
add_special Special_UnlockMysteryGift
; Map Events
add_special BugContestJudging
add_special CheckPartyFullAfterContest
add_special ContestDropOffMons
add_special ContestReturnMons
add_special Special_BugContestJudging
add_special Special_CheckPartyFullAfterContest
add_special Special_ContestDropOffMons
add_special Special_ContestReturnMons
add_special Special_GiveParkBalls
add_special Special_CheckMagikarpLength
add_special Special_MagikarpHouseSign
add_special HealParty
add_special PokemonCenterPC
add_special HealParty ; this is both a special and a predef
add_special Special_PokemonCenterPC
add_special Special_KrissHousePC
add_special Special_DayCareMan
add_special Special_DayCareLady
add_special Special_DayCareManOutside
add_special MoveDeletion
add_special Special_MoveDeletion
add_special Special_BankOfMom
add_special Special_MagnetTrain
add_special SpecialNameRival
add_special Special_NameRival
add_special Special_SetDayOfWeek
add_special Special_TownMap
add_special Special_UnownPrinter
add_special MapRadio
add_special Special_MapRadio
add_special Special_UnownPuzzle
add_special Special_SlotMachine
add_special Special_CardFlip
add_special Special_DummyNonfunctionalGameCornerGame
add_special Special_ClearBGPalettesBufferScreen
add_special FadeOutPalettes
add_special Special_FadeOutPalettes
add_special Special_BattleTowerFade
add_special Special_FadeBlackQuickly
add_special FadeInPalettes
add_special Special_FadeInPalettes
add_special Special_FadeInQuickly
add_special Special_ReloadSpritesNoPalettes
add_special ClearBGPalettes
add_special UpdateTimePals
add_special ClearTileMap
add_special UpdateSprites
add_special ReplaceKrisSprite
add_special ReloadSpritesNoPalettes ; bank 0
add_special ClearBGPalettes ; bank 0
add_special UpdateTimePals ; bank 0
add_special ClearTileMap ; bank 0
add_special UpdateSprites ; bank 0
add_special ReplaceKrisSprite ; bank 0
add_special Special_GameCornerPrizeMonCheckDex
add_special SpecialSeenMon
add_special WaitSFX
add_special PlayMapMusic
add_special RestartMapMusic
add_special HealMachineAnim
add_special UnusedSpecial_SeenMon
add_special WaitSFX ; bank 0
add_special PlayMapMusic ; bank 0
add_special RestartMapMusic ; bank 0
add_special Special_HealMachineAnim
add_special Special_SurfStartStep
add_special Special_FindGreaterThanThatLevel
add_special Special_FindAtLeastThatHappy
add_special Special_FindThatSpecies
add_special Special_FindThatSpeciesYourTrainerID
add_special Special_CheckUnusedTwoDayTimer ; unreferenced
add_special UnusedSpecial_CheckUnusedTwoDayTimer
add_special Special_DayCareMon1
add_special Special_DayCareMon2
add_special Special_SelectRandomBugContestContestants
add_special Special_ActivateFishingSwarm
add_special ToggleMaptileDecorations
add_special ToggleDecorationsVisibility
add_special SpecialGiveShuckle
add_special SpecialReturnShuckle
add_special Special_ToggleMaptileDecorations
add_special Special_ToggleDecorationsVisibility
add_special Special_GiveShuckle
add_special Special_ReturnShuckle
add_special Special_BillsGrandfather
add_special SpecialCheckPokerus
add_special Special_CheckPokerus
add_special Special_DisplayCoinCaseBalance
add_special Special_DisplayMoneyAndCoinBalance
add_special PlaceMoneyTopRight
add_special Special_PlaceMoneyTopRight
add_special Special_CheckForLuckyNumberWinners
add_special Special_CheckLuckyNumberShowFlag
add_special Special_ResetLuckyNumberShowFlag
add_special Special_PrintTodaysLuckyNumber
add_special Special_SelectApricornForKurt
add_special SpecialNameRater
add_special Special_NameRater
add_special Special_DisplayLinkRecord
add_special GetFirstPokemonHappiness
add_special CheckFirstMonIsEgg
add_special RandomUnseenWildMon
add_special RandomPhoneWildMon
add_special RandomPhoneMon
add_special MapCallbackSprites_LoadUsedSpritesGFX
add_special PlaySlowCry
add_special SpecialSnorlaxAwake
add_special Special_GetFirstPokemonHappiness
add_special Special_CheckFirstMonIsEgg
add_special Special_RandomUnseenWildMon
add_special Special_RandomPhoneWildMon
add_special Special_RandomPhoneMon
add_special Special_LoadUsedSpritesGFX
add_special Special_PlaySlowCry
add_special Special_SnorlaxAwake
add_special Special_YoungerHaircutBrother
add_special Special_OlderHaircutBrother
add_special Special_DaisyMassage
add_special PlayCurMonCry
add_special ProfOaksPCBoot
add_special SpecialGameboyCheck
add_special SpecialTrainerHouse
add_special PhotoStudio
add_special InitRoamMons
add_special Special_PlayCurMonCry
add_special Special_ProfOaksPCBoot
add_special Special_GameboyCheck
add_special Special_TrainerHouse
add_special Special_PhotoStudio
add_special Special_InitRoamMons
add_special Special_FadeOutMusic
add_special Diploma
add_special PrintDiploma
add_special Special_Diploma
add_special Special_PrintDiploma
; Crystal
add_special Function11ac3e
add_special Function11b444
add_special Function11b5e8
add_special Function11b7e5
add_special Function11b879
add_special Function11b920
add_special Function11b93b
add_special BattleTowerRoomMenu
add_special Function1700ba
add_special Function170114
add_special BattleTowerBattle
add_special Function1704e1
add_special EmptySpecial_17021d
add_special Function_LoadOpponentTrainerAndPokemonsWithOTSprite
add_special Function11ba38
add_special SpecialCheckForBattleTowerRules
add_special Special_Function11ac3e
add_special Special_Function11b444
add_special Special_Function11b5e8
add_special Special_Function11b7e5
add_special Special_Function11b879
add_special Special_Function11b920
add_special Special_Function11b93b
add_special Special_BattleTowerRoomMenu
add_special Special_Function1700ba
add_special Special_Function170114
add_special Special_BattleTowerBattle
add_special UnusedSpecial_Function1704e1
add_special DummySpecial_17021d
add_special Special_LoadOpponentTrainerAndPokemonWithOTSprite
add_special Special_Function11ba38
add_special Special_CheckForBattleTowerRules
add_special Special_GiveOddEgg
add_special Reset
add_special Function1011f1
add_special Function101220
add_special Function101225
add_special Function101231
add_special Reset ; bank 0
add_special Special_Function1011f1
add_special Special_Function101220
add_special Special_Function101225
add_special Special_Function101231
add_special Special_MoveTutor
add_special SpecialOmanyteChamber
add_special Function11c1ab
add_special BattleTowerAction
add_special Special_OmanyteChamber
add_special Special_Function11c1ab
add_special Special_BattleTowerAction
add_special Special_DisplayUnownWords
add_special Special_Menu_ChallengeExplanationCancel
add_special Function17d2b6
add_special Function17d2ce
add_special BattleTowerMobileError
add_special AskMobileOrCable
add_special SpecialHoOhChamber
add_special Function102142
add_special Special_Function17d2b6
add_special Special_Function17d2ce
add_special Special_BattleTowerMobileError
add_special Special_AskMobileOrCable
add_special Special_HoOhChamber
add_special Special_Function102142
add_special Special_CelebiShrineEvent
add_special CheckCaughtCelebi
add_special SpecialPokeSeer
add_special SpecialBuenasPassword
add_special SpecialBuenaPrize
add_special SpecialDratini
add_special Special_CheckCaughtCelebi
add_special Special_PokeSeer
add_special Special_BuenasPassword
add_special Special_BuenaPrize
add_special Special_Dratini
add_special Special_SampleKenjiBreakCountdown
add_special SpecialBeastsCheck
add_special SpecialMonCheck
add_special Special_BeastsCheck
add_special Special_MonCheck
add_special Special_SetPlayerPalette
add_special ret_170bd2
add_special Mobile_SelectThreeMons
add_special Function1037eb
add_special Function10383c
add_special TrainerRankings_Healings
add_special RefreshSprites
add_special Function1037c2
add_special Mobile_DummyReturnFalse
add_special Function103780
add_special Function10387b
add_special AskRememberPassword
add_special LoadMapPalettes
add_special FindItemInPCOrBag
add_special DummySpecial_170bd2
add_special Special_Mobile_SelectThreeMons
add_special Special_Function1037eb
add_special Special_Function10383c
add_special Special_StubbedTrainerRankings_Healings
add_special Special_RefreshSprites
add_special Special_Function1037c2
add_special Special_Mobile_DummyReturnFalse
add_special Special_Function103780
add_special Special_Function10387b
add_special Special_AskRememberPassword
add_special Special_LoadMapPalettes
add_special UnusedSpecial_FindItemInPCOrBag
add_special Special_InitialSetDSTFlag
add_special Special_InitialClearDSTFlag
add_special SpecialNone
add_special DummySpecial_c224
; c224
SpecialNone: ; c224
DummySpecial_c224: ; c224
ret
; c225
@@ -214,12 +214,12 @@ Special_GameCornerPrizeMonCheckDex: ; c230
call FadeToMenu
ld a, [ScriptVar]
ld [wd265], a
farcall NewPokedexEntry
farcall Predef_NewPokedexEntry
call ExitAllMenus
ret
; c252
SpecialSeenMon: ; c252
UnusedSpecial_SeenMon: ; c252
ld a, [ScriptVar]
dec a
call SetSeenMon
@@ -265,7 +265,7 @@ FoundNone: ; c298
ret
; c29d
SpecialNameRival: ; 0xc29d
Special_NameRival: ; 0xc29d
ld b, $2 ; rival
ld de, RivalName
farcall _NamingScreen
@@ -279,7 +279,7 @@ SpecialNameRival: ; 0xc29d
DefaultRivalName: ; 0xc2b2
db "SILVER@"
SpecialNameRater: ; c2b9
Special_NameRater: ; c2b9
farcall NameRater
ret
; c2c0
@@ -363,14 +363,14 @@ Special_GetMysteryGiftItem: ; c309
db "@"
; 0xc34a
BugContestJudging: ; c34a
farcall _BugContestJudging
Special_BugContestJudging: ; c34a
farcall _Special_BugContestJudging
ld a, b
ld [ScriptVar], a
ret
; c355
MapRadio: ; c355
Special_MapRadio: ; c355
ld a, [ScriptVar]
ld e, a
farcall PlayRadio
@@ -483,7 +483,7 @@ ScriptReturnCarry: ; c3e2
ret
; c3ef
Special_CheckUnusedTwoDayTimer: ; c3ef
UnusedSpecial_CheckUnusedTwoDayTimer: ; c3ef
farcall CheckUnusedTwoDayTimer
ld a, [wUnusedTwoDayTimer]
ld [ScriptVar], a
@@ -517,7 +517,7 @@ StoreSwarmMapIndices:: ; c403
; c419
SpecialCheckPokerus: ; c419
Special_CheckPokerus: ; c419
; Check if a monster in your party has Pokerus
farcall CheckPokerus
jp ScriptReturnCarry
@@ -536,7 +536,7 @@ Special_CheckLuckyNumberShowFlag: ; c434
jp ScriptReturnCarry
; c43d
SpecialSnorlaxAwake: ; 0xc43d
Special_SnorlaxAwake: ; 0xc43d
; Check if the Poké Flute channel is playing, and if the player is standing
; next to Snorlax.
@@ -587,13 +587,13 @@ SpecialSnorlaxAwake: ; 0xc43d
db -1
PlayCurMonCry: ; c472
Special_PlayCurMonCry: ; c472
ld a, [CurPartySpecies]
jp PlayCry
; c478
SpecialGameboyCheck: ; c478
Special_GameboyCheck: ; c478
ld a, [hCGB]
and a
jr nz, .cgb
@@ -625,21 +625,21 @@ Special_FadeOutMusic: ; c48f
ret
; c49f
Diploma: ; c49f
Special_Diploma: ; c49f
call FadeToMenu
farcall _Diploma
call ExitAllMenus
ret
; c4ac
PrintDiploma: ; c4ac
Special_PrintDiploma: ; c4ac
call FadeToMenu
farcall _PrintDiploma
call ExitAllMenus
ret
; c4b9
SpecialTrainerHouse: ; 0xc4b9
Special_TrainerHouse: ; 0xc4b9
ld a, BANK(sMysteryGiftTrainerHouseFlag)
call GetSRAMBank
ld a, [sMysteryGiftTrainerHouseFlag]