diff options
| -rw-r--r-- | home.asm | 42 | ||||
| -rwxr-xr-x | home/sprite_anims.asm | 42 | ||||
| -rw-r--r-- | wram.asm | 2 |
3 files changed, 44 insertions, 42 deletions
@@ -267,45 +267,5 @@ INCLUDE "home/mon_data.asm" INCLUDE "home/print_bcd.asm" INCLUDE "home/mon_data_2.asm" INCLUDE "home/battle.asm" - -PushLYOverrides:: ; 3d0d - ldh a, [hLCDCPointer] - and a - ret z - ld a, wLYOverridesBuffer % $100 - ld [wRequested2bppSource], a - ld a, wLYOverridesBuffer / $100 - ld [wRequested2bppSource + 1], a - ld a, wLYOverrides % $100 - ld [wRequested2bppDest], a - ld a, wLYOverrides / $100 - ld [wRequested2bppDest + 1], a - ld a, $9 - ld [wRequested2bpp], a - ret - -InitAnimatedObjectStruct:: - ld [wAnimatedObjectStructIDBuffer], a - ldh a, [hROMBank] - push af - ld a, BANK(InitAnimatedObjectStruct_) ; $23 - rst Bankswitch - ld a, [wAnimatedObjectStructIDBuffer] - call InitAnimatedObjectStruct_ ; $51f7 - pop af - rst Bankswitch - ret - -ReinitAnimatedObjectFrame:: - ld [wAnimatedObjectStructIDBuffer], a - ldh a, [hROMBank] - push af - ld a, BANK(ReinitAnimatedObjectFrame_) ; $23 - rst Bankswitch - ld a, [wAnimatedObjectStructIDBuffer] - call ReinitAnimatedObjectFrame_ ; $5332 - pop af - rst Bankswitch - ret - +INCLUDE "home/sprite_anims.asm" INCLUDE "home/audio.asm" diff --git a/home/sprite_anims.asm b/home/sprite_anims.asm new file mode 100755 index 00000000..190f4a4f --- /dev/null +++ b/home/sprite_anims.asm @@ -0,0 +1,42 @@ +PushLYOverrides:: + ldh a, [hLCDCPointer] + and a + ret z + + ld a, LOW(wLYOverridesBackup) + ld [wRequested2bppSource], a + ld a, HIGH(wLYOverridesBackup) + ld [wRequested2bppSource + 1], a + + ld a, LOW(wLYOverrides) + ld [wRequested2bppDest], a + ld a, HIGH(wLYOverrides) + ld [wRequested2bppDest + 1], a + + ld a, (wLYOverridesEnd - wLYOverrides) / 28 + ld [wRequested2bpp], a + ret + +InitAnimatedObjectStruct:: + ld [wAnimatedObjectStructIDBuffer], a + ldh a, [hROMBank] + push af + ld a, BANK(InitAnimatedObjectStruct_) ; $23 + rst Bankswitch + ld a, [wAnimatedObjectStructIDBuffer] + call InitAnimatedObjectStruct_ ; $51f7 + pop af + rst Bankswitch + ret + +ReinitAnimatedObjectFrame:: + ld [wAnimatedObjectStructIDBuffer], a + ldh a, [hROMBank] + push af + ld a, BANK(ReinitAnimatedObjectFrame_) ; $23 + rst Bankswitch + ld a, [wAnimatedObjectStructIDBuffer] + call ReinitAnimatedObjectFrame_ ; $5332 + pop af + rst Bankswitch + ret
\ No newline at end of file @@ -876,7 +876,7 @@ wc7fe:: ds 1 ; c7fe wc7ff:: ds 1 ; c7ff wLYOverridesEnd:: -wLYOverridesBuffer:: +wLYOverridesBackup:: wc800:: ds 1 ; c800 wc801:: ds 1 ; c801 wc802:: ds 1 ; c802 |