diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-09 12:56:39 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-09 12:56:39 -0400 |
| commit | 05925cba37019d93f1c847015f4fbc1de110c200 (patch) | |
| tree | 2a807847987421ce9ce9dfe22061cb6a0fcf0e15 /engine/battle | |
| parent | Merge pull request #67 from SatoMew/master (diff) | |
| parent | Use BANK("Pics #") for Pokémon and trainer pics (diff) | |
| download | pokeyellow-05925cba37019d93f1c847015f4fbc1de110c200.tar.gz pokeyellow-05925cba37019d93f1c847015f4fbc1de110c200.tar.xz pokeyellow-05925cba37019d93f1c847015f4fbc1de110c200.zip | |
Merge remote-tracking branch 'remotes/pokered/master'
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/init_battle.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/init_battle.asm b/engine/battle/init_battle.asm index 6a6331b7..bd8b2e8f 100644 --- a/engine/battle/init_battle.asm +++ b/engine/battle/init_battle.asm @@ -158,7 +158,7 @@ _LoadTrainerPic: ld d, a ; de contains pointer to trainer pic ld a, [wLinkState] and a - ld a, BANK(TrainerPics) ; this is where all the trainer pics are (not counting Red's) + ld a, BANK("Pics 6") ; this is where all the trainer pics are (not counting Red's) jr z, .loadSprite ld a, BANK(RedPicFront) .loadSprite |