diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-15 00:08:48 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-15 00:08:48 -0600 |
| commit | e3c366df6489c92a6ac5778b458b815cc8eab75d (patch) | |
| tree | 89c80f554da617d89641af8a707ccf9c96d5707c /src/battle_controller_safari.c | |
| parent | 8e9428c482d33ac59b5c29d89db0bd5a2e6fdef3 (diff) | |
| parent | c9f196cdfea08eefffd39ebc77a150f197e1250e (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'src/battle_controller_safari.c')
| -rw-r--r-- | src/battle_controller_safari.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 635f5fef1..db4670523 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -8,7 +8,7 @@ #include "link.h" #include "util.h" #include "main.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "window.h" #include "m4a.h" @@ -384,7 +384,7 @@ static void SafariHandleDrawTrainerPic(void) 30); gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank; gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240; - gSprites[gBankSpriteIds[gActiveBank]].data0 = -2; + gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2; gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC; gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy; } |