diff options
| author | yenatch <yenatch@gmail.com> | 2015-10-13 19:23:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-10-13 19:23:12 -0400 |
| commit | d5f94e9ee5a2f5ec8fb26c29d74c02531fc79c5a (patch) | |
| tree | 003a0d9a296095020d110e3cdc6b2127a3e20e38 /engine/specials.asm | |
| parent | 7176eff7aafda5378305a593c459d158ac27601f (diff) | |
| parent | d338a092c5a54d73e3e0a186569cc3b84e61c4ae (diff) | |
Merge pull request #320 from PikalaxALT/master
More labels, including fns responsible for partymon generation
Diffstat (limited to 'engine/specials.asm')
| -rw-r--r-- | engine/specials.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/specials.asm b/engine/specials.asm index 58cf5d646..41b0d9e9a 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -102,9 +102,9 @@ SpecialsPointers:: ; c029 add_special Function24b25 add_special Function24b4e add_special Function24ae8 - add_special Function4d87a - add_special Functionc434 - add_special Functionc422 + add_special Special_CheckForLuckyNumberWinners + add_special Special_CheckLuckyNumberShowFlag + add_special Special_ResetLuckyNumberShowFlag add_special Function4d9d3 add_special Function88018 add_special SpecialNameRater @@ -117,9 +117,9 @@ SpecialsPointers:: ; c029 add_special RunCallback_04 add_special Functionfb841 add_special SpecialSnorlaxAwake - add_special Function7413 - add_special Function7418 - add_special Function741d + add_special Special_YoungerHaircutBrother + add_special Special_OlderHaircutBrother + add_special Special_DaisyMassage add_special Functionc472 add_special ProfOaksPCBoot add_special SpecialGameboyCheck @@ -522,15 +522,15 @@ SpecialCheckPokerus: ; c419 jp ScriptReturnCarry ; c422 -Functionc422: ; c422 +Special_ResetLuckyNumberShowFlag: ; c422 callba Function1152b - ld hl, wdc9d + ld hl, wLuckyNumberShowFlag res 0, [hl] - callba Function5d33 + callba LoadOrRegenerateLuckyIDNumber ret ; c434 -Functionc434: ; c434 +Special_CheckLuckyNumberShowFlag: ; c434 callba Function11542 jp ScriptReturnCarry ; c43d |