diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-09 15:33:42 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-09 15:33:42 -0400 |
| commit | 2145af4a3ef133e4084015792b7d541f3e653edc (patch) | |
| tree | cd8d917a74a14a6c4a8deaa88fff9adf10664896 /src/battle_2.c | |
| parent | 96f4b6d118179daa948201871385ba7750830c59 (diff) | |
| parent | 08a5efbd8144d2cb1f4b8da62ba484ffcc9a1f93 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into use_build
Diffstat (limited to 'src/battle_2.c')
| -rw-r--r-- | src/battle_2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index fd7cf6863..0462615b8 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -245,7 +245,7 @@ static void sub_8038F34(void); static void sub_80392A8(void); static void sub_803937C(void); static void sub_803939C(void); -static void oac_poke_opponent(struct Sprite *sprite); +void oac_poke_opponent(struct Sprite *sprite); static void sub_803980C(struct Sprite *sprite); static void sub_8039838(struct Sprite *sprite); static void sub_8039894(struct Sprite *sprite); @@ -1650,7 +1650,7 @@ void CB2_QuitRecordedBattle(void) } } -static void sub_8038528(struct Sprite* sprite) +void sub_8038528(struct Sprite* sprite) { sprite->data0 = 0; sprite->callback = sub_8038538; @@ -2417,7 +2417,7 @@ u32 sub_80397C4(u32 setId, u32 tableId) #define tBank data0 #define tSpeciesId data2 -static void oac_poke_opponent(struct Sprite *sprite) +void oac_poke_opponent(struct Sprite *sprite) { sprite->callback = sub_803980C; StartSpriteAnimIfDifferent(sprite, 0); |