diff options
| author | entrpntr <12521136+entrpntr@users.noreply.github.com> | 2020-06-12 10:04:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-12 10:04:31 -0400 |
| commit | f8a6b98eedbcdf3aa89209897c80452037355754 (patch) | |
| tree | 4e89b30f492cff405d8fcea0886faadff94d1804 /engine/gfx/sprite_anims.asm | |
| parent | f2e472b14173521b0f73fa917e5fb75a54a000dd (diff) | |
| parent | 0c0f9b42bc1426f2dcdff9f9016bb3fa946b4d49 (diff) | |
Merge pull request #48 from entrpntr/bank39
Disassemble bank $39, kill the baserom dependency
Diffstat (limited to 'engine/gfx/sprite_anims.asm')
| -rw-r--r-- | engine/gfx/sprite_anims.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm index a6e717e8..b32a3d27 100644 --- a/engine/gfx/sprite_anims.asm +++ b/engine/gfx/sprite_anims.asm @@ -20,8 +20,8 @@ DoAnimFrame: dw .GSIntroBubble dw .GSIntroShellder dw .GSIntroMagikarp + dw .UnusedLapras dw .GSIntroLapras - dw .GSIntroLapras2 dw .GSIntroNote dw .GSIntroJigglypuff dw .GSIntroPikachu @@ -227,7 +227,7 @@ DoAnimFrame: call DeinitializeSprite ret -.GSIntroLapras +.UnusedLapras ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld a, [hl] @@ -251,7 +251,7 @@ DoAnimFrame: call DeinitializeSprite ret -.GSIntroLapras2 +.GSIntroLapras call .AnonymousJumptable jp hl @@ -309,8 +309,8 @@ DoAnimFrame: .asm_8d602 call DeinitializeSprite - ld a, $1 - ld [wBattleMonLevel], a + ld a, 1 + ld [wcb19], a ret .Function8d60b @@ -392,7 +392,7 @@ DoAnimFrame: dw .Function8d680 .Function8d673 - ld a, [wBattleMonLevel] + ld a, [wcb19] and a ret z call .IncrementJumptableIndex @@ -479,7 +479,7 @@ DoAnimFrame: .asm_8d6e9 ld a, 1 - ld [wBattleMonLevel], a + ld [wcb19], a call .IncrementJumptableIndex ret @@ -562,7 +562,7 @@ DoAnimFrame: jr z, .asm_8d761 dec [hl] dec [hl] - ld a, [wBattleMonLevel] + ld a, [wcb19] and a ret nz dec [hl] @@ -997,7 +997,7 @@ ENDC .asm_8d968 ld a, 1 - ld [wce64], a + ld [wIntroSceneFrameCounter], a call DeinitializeSprite ret |