diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2019-02-05 14:35:42 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2019-02-05 14:35:42 -0600 |
| commit | bc4cc9f78a705636228c39311bb6e3c393f090d3 (patch) | |
| tree | d2b59408df53676ffb65e217cc1a62cbcba05f97 /src/battle_intro.c | |
| parent | 37e86d75788f4ed364db19aabce11e6e054a1084 (diff) | |
| parent | b0ee1009759ed1c46da81b1fb8410e2b75e42bb2 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'src/battle_intro.c')
| -rw-r--r-- | src/battle_intro.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_intro.c b/src/battle_intro.c index 21e83ed29..043cf855a 100644 --- a/src/battle_intro.c +++ b/src/battle_intro.c @@ -463,10 +463,10 @@ static void BattleIntroSlideLink(u8 taskId) if (--gTasks[taskId].data[2] == 0) { gTasks[taskId].data[0]++; - gSprites[gBattleStruct->field_7D].oam.objMode = ST_OAM_OBJ_WINDOW; - gSprites[gBattleStruct->field_7D].callback = sub_8038B74; - gSprites[gBattleStruct->field_7E].oam.objMode = ST_OAM_OBJ_WINDOW; - gSprites[gBattleStruct->field_7E].callback = sub_8038B74; + gSprites[gBattleStruct->linkBattleVsSpriteId_V].oam.objMode = ST_OAM_OBJ_WINDOW; + gSprites[gBattleStruct->linkBattleVsSpriteId_V].callback = sub_8038B74; + gSprites[gBattleStruct->linkBattleVsSpriteId_S].oam.objMode = ST_OAM_OBJ_WINDOW; + gSprites[gBattleStruct->linkBattleVsSpriteId_S].callback = sub_8038B74; SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2); } |