diff options
| -rw-r--r-- | data/special_pointers.asm | 50 | ||||
| -rw-r--r-- | engine/events/dratini.asm | 2 | ||||
| -rw-r--r-- | maps/DragonShrine.asm | 4 |
3 files changed, 28 insertions, 28 deletions
diff --git a/data/special_pointers.asm b/data/special_pointers.asm index 2c049c77f..f16dcdf30 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -7,7 +7,7 @@ add_special: MACRO ENDM SpecialsPointers:: ; c029 - add_special WarpToSpawnPoint + add_special WarpToSpawnPoint ; $0 ; Communications add_special SetBitsForLinkTradeRequest @@ -17,7 +17,7 @@ SpecialsPointers:: ; c029 add_special CheckBothSelectedSameRoom add_special FailedLinkToPast add_special CloseLink - add_special WaitForOtherPlayerToExit + add_special WaitForOtherPlayerToExit ; $8 add_special SetBitsForBattleRequest add_special SetBitsForTimeCapsuleRequest add_special CheckTimeCapsuleCompatibility @@ -25,17 +25,17 @@ SpecialsPointers:: ; c029 add_special TradeCenter add_special Colosseum add_special TimeCapsule - add_special CableClubCheckWhichChris + add_special CableClubCheckWhichChris ; $10 add_special CheckMysteryGift add_special GetMysteryGiftItem add_special UnlockMysteryGift -; Map Events +; Map events add_special BugContestJudging add_special CheckPartyFullAfterContest add_special ContestDropOffMons add_special ContestReturnMons - add_special GiveParkBalls + add_special GiveParkBalls ; $18 add_special CheckMagikarpLength add_special MagikarpHouseSign add_special HealParty ; this is both a special and a predef @@ -43,7 +43,7 @@ SpecialsPointers:: ; c029 add_special PlayersHousePC add_special DayCareMan add_special DayCareLady - add_special DayCareManOutside + add_special DayCareManOutside ; $20 add_special MoveDeletion add_special BankOfMom add_special MagnetTrain @@ -51,7 +51,7 @@ SpecialsPointers:: ; c029 add_special SetDayOfWeek add_special OverworldTownMap add_special UnownPrinter - add_special MapRadio + add_special MapRadio ; $28 add_special UnownPuzzle add_special SlotMachine add_special CardFlip @@ -59,7 +59,7 @@ SpecialsPointers:: ; c029 add_special ClearBGPalettesBufferScreen add_special FadeOutPalettes add_special BattleTowerFade - add_special FadeBlackQuickly + add_special FadeBlackQuickly ; $30 add_special FadeInPalettes add_special FadeInQuickly add_special ReloadSpritesNoPalettes ; bank 0 @@ -67,7 +67,7 @@ SpecialsPointers:: ; c029 add_special UpdateTimePals ; bank 0 add_special ClearTileMap ; bank 0 add_special UpdateSprites ; bank 0 - add_special ReplaceKrisSprite ; bank 0 + add_special ReplaceKrisSprite ; $38 ; bank 0 add_special GameCornerPrizeMonCheckDex add_special UnusedSetSeenMon add_special WaitSFX ; bank 0 @@ -75,7 +75,7 @@ SpecialsPointers:: ; c029 add_special RestartMapMusic ; bank 0 add_special HealMachineAnim add_special SurfStartStep - add_special FindPartyMonGreaterThanThatLevel + add_special FindPartyMonGreaterThanThatLevel ; $40 add_special FindPartyMonAtLeastThatHappy add_special FindPartyMonThatSpecies add_special FindPartyMonThatSpeciesYourTrainerID @@ -83,7 +83,7 @@ SpecialsPointers:: ; c029 add_special DayCareMon1 add_special DayCareMon2 add_special SelectRandomBugContestContestants - add_special ActivateFishingSwarm + add_special ActivateFishingSwarm ; $48 add_special ToggleMaptileDecorations add_special ToggleDecorationsVisibility add_special GiveShuckle @@ -91,7 +91,7 @@ SpecialsPointers:: ; c029 add_special BillsGrandfather add_special CheckPokerus add_special DisplayCoinCaseBalance - add_special DisplayMoneyAndCoinBalance + add_special DisplayMoneyAndCoinBalance ; $50 add_special PlaceMoneyTopRight add_special CheckForLuckyNumberWinners add_special CheckLuckyNumberShowFlag @@ -99,7 +99,7 @@ SpecialsPointers:: ; c029 add_special PrintTodaysLuckyNumber add_special SelectApricornForKurt add_special NameRater - add_special DisplayLinkRecord + add_special DisplayLinkRecord ; $58 add_special GetFirstPokemonHappiness add_special CheckFirstMonIsEgg add_special RandomUnseenWildMon @@ -107,7 +107,7 @@ SpecialsPointers:: ; c029 add_special RandomPhoneMon add_special LoadUsedSpritesGFX add_special PlaySlowCry - add_special SnorlaxAwake + add_special SnorlaxAwake ; $60 add_special YoungerHaircutBrother add_special OlderHaircutBrother add_special DaisysGrooming @@ -115,17 +115,17 @@ SpecialsPointers:: ; c029 add_special ProfOaksPCBoot add_special GameboyCheck add_special TrainerHouse - add_special PhotoStudio + add_special PhotoStudio ; $68 add_special InitRoamMons add_special FadeOutMusic add_special Diploma add_special PrintDiploma - ; Crystal +; Crystal only add_special Function11ac3e add_special Function11b444 add_special Function11b5e8 - add_special Function11b7e5 + add_special Function11b7e5 ; $70 add_special Function11b879 add_special Function11b920 add_special Function11b93b @@ -133,7 +133,7 @@ SpecialsPointers:: ; c029 add_special Function1700ba add_special Function170114 add_special BattleTowerBattle - add_special Function1704e1 + add_special Function1704e1 ; $78 add_special DummySpecial_17021d add_special LoadOpponentTrainerAndPokemonWithOTSprite add_special Function11ba38 @@ -141,7 +141,7 @@ SpecialsPointers:: ; c029 add_special GiveOddEgg add_special Reset ; bank 0 add_special Function1011f1 - add_special Function101220 + add_special Function101220 ; $80 add_special Function101225 add_special Function101231 add_special MoveTutor @@ -149,7 +149,7 @@ SpecialsPointers:: ; c029 add_special Function11c1ab add_special BattleTowerAction add_special DisplayUnownWords - add_special Menu_ChallengeExplanationCancel + add_special Menu_ChallengeExplanationCancel ; $88 add_special Function17d2b6 add_special Function17d2ce add_special BattleTowerMobileError @@ -157,15 +157,15 @@ SpecialsPointers:: ; c029 add_special HoOhChamber add_special Function102142 add_special CelebiShrineEvent - add_special CheckCaughtCelebi + add_special CheckCaughtCelebi ; $90 add_special PokeSeer add_special BuenasPassword add_special BuenaPrize - add_special Dratini + add_special GiveDratini add_special SampleKenjiBreakCountdown add_special BeastsCheck add_special MonCheck - add_special SetPlayerPalette + add_special SetPlayerPalette ; $98 add_special DummySpecial_170bd2 add_special Mobile_SelectThreeMons add_special Function1037eb @@ -173,7 +173,7 @@ SpecialsPointers:: ; c029 add_special StubbedTrainerRankings_Healings add_special RefreshSprites add_special Function1037c2 - add_special Mobile_DummyReturnFalse + add_special Mobile_DummyReturnFalse ; $a0 add_special Function103780 add_special Function10387b add_special AskRememberPassword @@ -181,5 +181,5 @@ SpecialsPointers:: ; c029 add_special UnusedFindItemInPCOrBag add_special InitialSetDSTFlag add_special InitialClearDSTFlag - add_special DummySpecial_c224 + add_special DummySpecial_c224 ; $a8 ; c224 diff --git a/engine/events/dratini.asm b/engine/events/dratini.asm index 620a5a707..70179bc09 100644 --- a/engine/events/dratini.asm +++ b/engine/events/dratini.asm @@ -1,4 +1,4 @@ -Dratini: ; 0x8b170 +GiveDratini: ; 0x8b170 ; if ScriptVar is 0 or 1, change the moveset of the last Dratini in the party. ; 0: give it a special moveset with Extremespeed. ; 1: give it the normal moveset of a level 15 Dratini. diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 7211df60a..eb8485e5e 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -209,13 +209,13 @@ DragonShrineElder1Script: writetext DragonShrineTakeThisDratiniText waitbutton checkcode VAR_PARTYCOUNT - if_equal 6, .PartyFull + if_equal PARTY_LENGTH, .PartyFull writetext DragonShrinePlayerReceivedDratiniText playsound SFX_CAUGHT_MON waitsfx givepoke DRATINI, 15 checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG - special Dratini + special GiveDratini setevent EVENT_GOT_DRATINI setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7 writetext DragonShrineSymbolicDragonText |