mergin and chill

This commit is contained in:
DizzyEggg
2017-10-09 21:40:05 +02:00
78 changed files with 15158 additions and 649 deletions
+3 -3
View File
@@ -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);