diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-04-22 07:58:56 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-22 07:58:56 -0700 |
commit | e739b7087b8d06149e1a067ead971c1e6cbf385d (patch) | |
tree | 88e9deccdeb7580d09728850c9f8808e8bdf7df5 /src/battle | |
parent | 18f6c5c9d460c019453227abe033d84f1feb6310 (diff) | |
parent | f54ccdc7ca5007edb196bcf4657d36f9bb5c295c (diff) |
Merge pull request #596 from PikalaxALT/watanabe
Watanabe
Diffstat (limited to 'src/battle')
-rw-r--r-- | src/battle/battle_2.c | 4 | ||||
-rw-r--r-- | src/battle/battle_bg.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index b07ad0b2d..da566628d 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -2233,7 +2233,7 @@ extern const struct Pokeblock gUnknown_Debug_821F5AC[]; extern u8 gUnknown_020297ED; -extern void unref_sub_800D684(void); +extern void debug_sub_800D684(void); void debug_sub_801174C(void) { @@ -2408,7 +2408,7 @@ void debug_sub_801174C(void) } gMain.savedCallback = debug_sub_80108B8; - SetMainCallback2(unref_sub_800D684); + SetMainCallback2(debug_sub_800D684); ClearBag(); diff --git a/src/battle/battle_bg.c b/src/battle/battle_bg.c index 7474af74b..5a2a1efa3 100644 --- a/src/battle/battle_bg.c +++ b/src/battle/battle_bg.c @@ -211,7 +211,7 @@ const struct BattleBackground gBattleTerrainTable[] = { static void sub_800D6C4(void); -void unref_sub_800D684(void) +void debug_sub_800D684(void) { u8 spriteId; ResetSpriteData(); |