diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-12-05 12:42:30 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-12-05 12:42:30 -0600 |
| commit | 19fbf024ff7e5bedc0f297a44c7df298a9bd0ef4 (patch) | |
| tree | e9a928ac0d8eaaca476d8704b95fbf5f6838d994 /src/battle_controller_safari.c | |
| parent | caa13f877797edbb7a1e13bf00b537bafbd4315a (diff) | |
| parent | 00896cb3b5813cb843e5e1abd4cbc9ff0ad3a632 (diff) | |
fix merge conflicts
Diffstat (limited to 'src/battle_controller_safari.c')
| -rw-r--r-- | src/battle_controller_safari.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 635f5fef1..2ec14cab5 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -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; } |