summaryrefslogtreecommitdiff
path: root/home/battle.asm
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2020-02-21 23:48:51 +0100
committermid-kid <esteve.varela@gmail.com>2020-02-22 00:23:47 +0100
commit43eff93861b5b00473e567e6449c64f039f8f4ba (patch)
tree7eb66fc5272b26fbc0e99a5ea4327013516a89fc /home/battle.asm
parent9a927c1b3efa2eca886f346a4fcca0eb57278faf (diff)
Small home/ reorganization
Time to move everything out of home.asm: - InexplicablyEmptyFunction was moved to home/map.asm - The wDebugFlags functions and xor_a brothers were moved to home/flag.asm because they're all flag-related. - ret_2f3e was moved into home/region.asm - The register alias sisters were moved to a new file called home/call_regs.asm - IsInArray and SkipNames were joined by AddNTimes from home/math.asm into home/array.asm, as they're all used to index arrays. - CallPointerAt was moved into home/print_text.asm because given the contents of that file it doesn't feel very out of place (that file isn't very aptly named...) - CountSetBits was moved into home/pokedex_flags.asm because it's unique use is counting the amount of seen/caught mon in the podedex. GetWeekday was pulled into this by proximity. Other changes were also made: - PushLYOverrides was moved from home/sprite_anims.asm to home/battle.asm, because it's almost exclusively used for battle animations, with the lone exception being the Magnet Train. - home/copy.asm was renamed to home/gfx.asm, as it's all gfx-related - home/copy2.asm was renamed to home/copy.asm, now it's the only file called copy. - SetHPPal and GetHPPal were moved from home/hp_pals.asm to home/tilemap.asm, as they're attrmap related, like many functions in that file are. - home/rtc.asm was renamed to home/time_palettes.asm, as it had very little to do with the RTC at all, all RTC functions being in home/time.asm - home/handshake.asm was renamed to home/printer.asm. - home/mon_data_2.asm was renamed to home/mon_party.asm.
Diffstat (limited to 'home/battle.asm')
-rw-r--r--home/battle.asm19
1 files changed, 19 insertions, 0 deletions
diff --git a/home/battle.asm b/home/battle.asm
index 7f2e8bfdd..fff6b7d42 100644
--- a/home/battle.asm
+++ b/home/battle.asm
@@ -224,3 +224,22 @@ GetBattleAnimByte::
ld a, [wBattleAnimByte]
ret
+
+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) / 16
+ ld [wRequested2bpp], a
+ ret