diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-09 21:40:05 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-09 21:40:05 +0200 |
| commit | eb59f15799d0b730bb5d792fb142174ade0ad891 (patch) | |
| tree | 4a40bff70a4999b06b654297ee83d6de4e62979e /src/battle_2.c | |
| parent | 7fb4a54e3997a3a77309c819fbde671fe2b2b104 (diff) | |
| parent | 08a5efbd8144d2cb1f4b8da62ba484ffcc9a1f93 (diff) | |
mergin and chill
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 be0d0be72..92c48c427 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -246,7 +246,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); @@ -1651,7 +1651,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; @@ -2418,7 +2418,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); |