diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-08 02:27:20 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-08 02:27:20 -0500 |
| commit | b93d9238261edc6250f5f7bebe8b54643359729a (patch) | |
| tree | 7f7a15f04f40a5c811dac3546a98d3ecd7858c81 /src/battle_tower.c | |
| parent | eac70acab65dea005da2299e4bb209aff1ded60f (diff) | |
| parent | bd157b301dea3526a4c373737dc8167d9a02b168 (diff) | |
Merge branch 'master' into move-tutor
Diffstat (limited to 'src/battle_tower.c')
| -rw-r--r-- | src/battle_tower.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_tower.c b/src/battle_tower.c index 06aaef48d..46aab4bac 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -51,7 +51,7 @@ static void AwardBattleTowerRibbons(void); static void SaveBattleTowerProgress(void); static void sub_8163914(void); static void nullsub_61(void); -static void nullsub_116(void); +static void SpriteCB_Null6(void); static void sub_81642A0(void); static void sub_8164828(void); static void sub_8164B74(void); @@ -1061,7 +1061,7 @@ static void (* const gUnknown_085DF96C[])(void) = SaveBattleTowerProgress, sub_8163914, nullsub_61, - nullsub_116, + SpriteCB_Null6, sub_81642A0, sub_8164828, sub_8164B74, @@ -2437,7 +2437,7 @@ static void nullsub_61(void) } -static void nullsub_116(void) +static void SpriteCB_Null6(void) { } |