diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/engine_flags.asm | 2 | ||||
| -rw-r--r-- | data/events/happiness_probabilities.asm | 16 | ||||
| -rw-r--r-- | data/special_pointers.asm | 130 | ||||
| -rwxr-xr-x | data/text/common_1.asm | 6 |
4 files changed, 142 insertions, 12 deletions
diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 41c5597f..87e15afb 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -105,7 +105,7 @@ EngineFlags: engine_flag wDailyFlags1, DAILYFLAGS1_KURT_MAKING_BALLS_F engine_flag wDailyFlags1, DAILYFLAGS1_BUG_CONTEST_F ; $50 - engine_flag wDailyFlags1, DAILYFLAGS1_FISH_SWARM_F + engine_flag wDailyFlags1, DAILYFLAGS1_SWARM_F engine_flag wDailyFlags1, DAILYFLAGS1_TIME_CAPSULE_F engine_flag wDailyFlags1, DAILYFLAGS1_ALL_FRUIT_TREES_F engine_flag wDailyFlags1, DAILYFLAGS1_GOT_SHUCKIE_TODAY_F diff --git a/data/events/happiness_probabilities.asm b/data/events/happiness_probabilities.asm index 0dc08ac7..7a80f989 100644 --- a/data/events/happiness_probabilities.asm +++ b/data/events/happiness_probabilities.asm @@ -1,12 +1,12 @@ -HappinessData_YoungerHaircutBrother: - db $4c, 2, HAPPINESS_YOUNGCUT1 ; 30% chance - db $80, 3, HAPPINESS_YOUNGCUT2 ; 20% chance - db $ff, 4, HAPPINESS_YOUNGCUT3 ; 50% chance - HappinessData_OlderHaircutBrother: - db $9a, 2, HAPPINESS_OLDERCUT1 ; 60% chance - db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance - db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance + db $4c, 2, HAPPINESS_OLDERCUT1 ; 30% chance + db $80, 3, HAPPINESS_OLDERCUT2 ; 20% chance + db $ff, 4, HAPPINESS_OLDERCUT3 ; 50% chance + +HappinessData_YoungerHaircutBrother: + db $9a, 2, HAPPINESS_YOUNGCUT1 ; 60% chance + db $4c, 3, HAPPINESS_YOUNGCUT2 ; 10% chance + db $ff, 4, HAPPINESS_YOUNGCUT3 ; 30% chance HappinessData_DaisysGrooming: db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance diff --git a/data/special_pointers.asm b/data/special_pointers.asm new file mode 100644 index 00000000..03492518 --- /dev/null +++ b/data/special_pointers.asm @@ -0,0 +1,130 @@ +; Special routines can be used with the "special" map script command. +; They often use wScriptVar for arguments and return values. + +add_special: MACRO +; Some ROM0 specials have a nonzero bank. +\1Special:: +IF _NARG == 1 + dba \1 +ELSE + dbw \2, \1 +ENDC +ENDM + +SpecialsPointers:: + add_special WarpToSpawnPoint ; $0 + +; Communications + add_special SetBitsForLinkTradeRequest + add_special WaitForLinkedFriend + add_special CheckLinkTimeout + add_special TryQuickSave + add_special CheckBothSelectedSameRoom + add_special FailedLinkToPast + add_special CloseLink + add_special WaitForOtherPlayerToExit ; $8 + add_special SetBitsForBattleRequest + add_special SetBitsForTimeCapsuleRequest + add_special CheckTimeCapsuleCompatibility + add_special EnterTimeCapsule + add_special TradeCenter + add_special Colosseum + add_special TimeCapsule + add_special CableClubCheckWhichChris ; $10 + add_special CheckMysteryGift + add_special GetMysteryGiftItem + add_special UnlockMysteryGift + +; Map events + add_special BugContestJudging + add_special CheckPartyFullAfterContest + add_special ContestDropOffMons + add_special ContestReturnMons + add_special GiveParkBalls ; $18 + add_special CheckMagikarpLength + add_special MagikarpHouseSign + add_special HealParty ; this is both a special and a predef + add_special PokemonCenterPC + add_special PlayersHousePC + add_special DayCareMan + add_special DayCareLady + add_special DayCareManOutside ; $20 + add_special MoveDeletion + add_special BankOfMom + add_special MagnetTrain + add_special NameRival + add_special SetDayOfWeek + add_special OverworldTownMap + add_special UnownPrinter + add_special MapRadio ; $28 + add_special UnownPuzzle + add_special SlotMachine + add_special CardFlip + add_special DummyNonfunctionalGameCornerGame + add_special ClearBGPalettesBufferScreen + add_special FadeOutPalettes + add_special FadeBlackQuickly + add_special FadeInPalettes ; $30 + add_special FadeInQuickly + add_special ReloadSpritesNoPalettes, 2 + add_special ClearBGPalettes + add_special UpdateTimePals + add_special ClearTilemap + add_special UpdateSprites + add_special ReplaceChrisSprite + add_special GameCornerPrizeMonCheckDex ; $38 + add_special UnusedSetSeenMon + add_special WaitSFX, 3 + add_special PlayMapMusic + add_special RestartMapMusic + add_special HealMachineAnim + add_special SurfStartStep + add_special FindPartyMonAboveLevel + add_special FindPartyMonAtLeastThatHappy ; $40 + add_special FindPartyMonThatSpecies + add_special FindPartyMonThatSpeciesYourTrainerID + add_special UnusedCheckUnusedTwoDayTimer + add_special DayCareMon1 + add_special DayCareMon2 + add_special SelectRandomBugContestContestants + add_special ActivateFishingSwarm + add_special ToggleMaptileDecorations ; $48 + add_special ToggleDecorationsVisibility + add_special GiveShuckle + add_special ReturnShuckle + add_special BillsGrandfather + add_special CheckPokerus + add_special DisplayCoinCaseBalance + add_special DisplayMoneyAndCoinBalance + add_special PlaceMoneyTopRight ; $50 + add_special CheckForLuckyNumberWinners + add_special CheckLuckyNumberShowFlag + add_special ResetLuckyNumberShowFlag + add_special PrintTodaysLuckyNumber + add_special SelectApricornForKurt + add_special NameRater + add_special DisplayLinkRecord + add_special GetFirstPokemonHappiness ; $58 + add_special CheckFirstMonIsEgg + add_special RandomUnseenWildMon + add_special RandomPhoneWildMon + add_special RandomPhoneMon + add_special LoadUsedSpritesGFX + add_special PlaySlowCry + add_special SnorlaxAwake + add_special OlderHaircutBrother ; $60 + add_special YoungerHaircutBrother + add_special DaisysGrooming + add_special PlayCurMonCry + add_special ProfOaksPCBoot + add_special GameboyCheck + add_special TrainerHouse + add_special PhotoStudio + add_special InitRoamMons ; $68 + add_special FadeOutMusic + add_special Diploma + add_special PrintDiploma + add_special InitialSetDSTFlag + add_special InitialClearDSTFlag + add_special MrChrono + add_special DummySpecial_c389 diff --git a/data/text/common_1.asm b/data/text/common_1.asm index 169cc9a9..a1c9fdb2 100755 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm @@ -1012,7 +1012,7 @@ _SavingRecordText:: line "DON'T TURN OFF!" done -ReceivedMysteryGiftText_:: +_ReceiveItemText:: text_ram wPlayerName text " received" line "@" @@ -1022,11 +1022,11 @@ ReceivedMysteryGiftText_:: text_promptbutton db "@" -NoCoinsText_:: +_NoCoinsText:: text "You have no coins." prompt -NoCoinCaseText_:: +_NoCoinCaseText:: text "You don't have a" line "COIN CASE." prompt |