diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-19 11:00:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 11:00:32 -0400 |
| commit | 33b65b547000387fcdce9fe497da9b217544ece6 (patch) | |
| tree | 0c1754c67d188776ee1942fcca503ad8e1e19f05 /src/field_specials.c | |
| parent | 715c2ff3ad3a7842a97a2b221f4c02135a813139 (diff) | |
| parent | a8403c07790b1031c96ff35a1701e1684919ed95 (diff) | |
Merge pull request #307 from PikalaxALT/field_control_avatar
Field control avatar
Diffstat (limited to 'src/field_specials.c')
| -rw-r--r-- | src/field_specials.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index 474fcd081..59c026b78 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -547,11 +547,11 @@ void NullFieldSpecial(void) } -void sub_80CADC4(void) +void DoPicboxCancel(void) { u8 t = EOS; AddTextPrinterParameterized(0, 2, &t, 0, 1, 0, NULL); - sub_809D424(); + PicboxCancel(); } void SetVermilionTrashCans(void) @@ -1545,7 +1545,7 @@ void SetSeenMon(void) GetSetPokedexFlag(SpeciesToNationalPokedexNum(gSpecialVar_0x8004), 2); } -void sub_80CBDE8(void) +void ResetContextNpcTextColor(void) { gSelectedObjectEvent = 0; gSpecialVar_TextColor = 0xFF; @@ -2435,7 +2435,7 @@ static void Task_WaitDeoxysFieldEffect(u8 taskId) } } -void BirthIslandDeoxysStepCounter(void) +void IncrementBirthIslandRockStepCount(void) { u16 count = VarGet(VAR_DEOXYS_INTERACTION_STEP_COUNTER); if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BIRTH_ISLAND_EXTERIOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BIRTH_ISLAND_EXTERIOR)) |