diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-16 20:50:52 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-11-17 08:16:28 -0600 |
| commit | 5393b42f7ccfd10986a9a253e29ce54fae847a78 (patch) | |
| tree | c64dd6c7ac6fde43dc511879dc2af33a1a8ef2c5 | |
| parent | f6ab6934aeba7027e8e4da177f9cbfac1bf1f8f6 (diff) | |
Remove SpriteCB_Null name
| -rw-r--r-- | include/constants/battle_tower.h | 2 | ||||
| -rw-r--r-- | src/battle_tower.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/constants/battle_tower.h b/include/constants/battle_tower.h index 73a4af5a5..508656fab 100644 --- a/include/constants/battle_tower.h +++ b/include/constants/battle_tower.h @@ -10,7 +10,7 @@ #define BATTLE_TOWER_FUNC_SAVE 6 #define BATTLE_TOWER_FUNC_7 7 #define BATTLE_TOWER_FUNC_NOP 8 -#define BATTLE_TOWER_FUNC_NOP_SPRITE 9 +#define BATTLE_TOWER_FUNC_NOP2 9 #define BATTLE_TOWER_FUNC_10 10 #define BATTLE_TOWER_FUNC_11 11 #define BATTLE_TOWER_FUNC_12 12 diff --git a/src/battle_tower.c b/src/battle_tower.c index 9c838a473..27fdc9d6e 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -53,7 +53,7 @@ static void AwardBattleTowerRibbons(void); static void SaveBattleTowerProgress(void); static void sub_8163914(void); static void nullsub_61(void); -static void SpriteCB_Null6(void); +static void nullsub_116(void); static void sub_81642A0(void); static void sub_8164828(void); static void sub_8164B74(void); @@ -1063,7 +1063,7 @@ static void (* const sBattleTowerFuncs[])(void) = [BATTLE_TOWER_FUNC_SAVE] = SaveBattleTowerProgress, [BATTLE_TOWER_FUNC_7] = sub_8163914, [BATTLE_TOWER_FUNC_NOP] = nullsub_61, - [BATTLE_TOWER_FUNC_NOP_SPRITE] = SpriteCB_Null6, + [BATTLE_TOWER_FUNC_NOP2] = nullsub_116, [BATTLE_TOWER_FUNC_10] = sub_81642A0, [BATTLE_TOWER_FUNC_11] = sub_8164828, [BATTLE_TOWER_FUNC_12] = sub_8164B74, @@ -2439,7 +2439,7 @@ static void nullsub_61(void) } -static void SpriteCB_Null6(void) +static void nullsub_116(void) { } |