diff options
| author | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
| commit | 7aef59841489ea449b9a34d424c681a4b48b88ab (patch) | |
| tree | 72d46f1cc076564f62b11f5379960cd745a7fc9a /engine/pokedex.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'engine/pokedex.asm')
| -rw-r--r-- | engine/pokedex.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 0ba14cd79..761b38874 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -2407,7 +2407,7 @@ Pokedex_LoadSelectedMonTiles: ; 4143b predef GetFrontpic ret -.QuestionMark +.QuestionMark: ld a, BANK(sScratch) call GetSRAMBank callba LoadQuestionMarkPic @@ -2481,12 +2481,12 @@ Pokedex_LoadGFX: ; 414b7 callba LoadSGBPokedexGFX jr .LoadPokedexSlowpokeLZ -.LoadPokedexLZ +.LoadPokedexLZ: ld hl, PokedexLZ ld de, VTiles2 tile $31 call Decompress -.LoadPokedexSlowpokeLZ +.LoadPokedexSlowpokeLZ: ld hl, PokedexSlowpokeLZ ld de, VTiles0 call Decompress @@ -2614,7 +2614,7 @@ Pokedex_SetBGMapMode_3ifDMG_4ifCGB: ; 41aeb (10:5aeb) and a jr z, .DMG call Pokedex_SetBGMapMode4 -.DMG +.DMG: call Pokedex_SetBGMapMode3 ret |