From 6983efb1432ee4677f58674b667bd0bc2944a559 Mon Sep 17 00:00:00 2001 From: travis Date: Wed, 22 Jul 2020 13:12:23 +0000 Subject: [PATCH] Merge pull request #57 from Rangi42/master Use LOAD/ENDL for OAM DMA code in HRAM (requires rgbds 0.4.1) --- pokegold.sym | 8 ++++---- pokegold_debug.sym | 8 ++++---- pokesilver.sym | 8 ++++---- pokesilver_debug.sym | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pokegold.sym b/pokegold.sym index 6c114058..dabebee8 100644 --- a/pokegold.sym +++ b/pokegold.sym @@ -1222,10 +1222,9 @@ 01:4025 PlaceWaitingText.Waiting 01:4031 DummyPredef1 01:4032 WriteOAMDMACodeToHRAM -01:4039 WriteOAMDMACodeToHRAM.loop -01:4040 WriteOAMDMACodeToHRAM.PushOAM -01:4046 WriteOAMDMACodeToHRAM.pushoam_loop -01:404a WriteOAMDMACodeToHRAM.PushOAMEnd +01:4039 WriteOAMDMACodeToHRAM.copy +01:4040 OAMDMACode +01:404a OAMDMACodeEnd 01:404a Facings 01:408a Facings.End 01:408c FacingStepDown0 @@ -36009,6 +36008,7 @@ 01:dfff wStackTop 01:dfff wStack 00:ff80 hTransferVirtualOAM +00:ff86 hTransferVirtualOAM.wait 00:ff8f hRTCDayHi 00:ff90 hRTCDayLo 00:ff91 hRTCHours diff --git a/pokegold_debug.sym b/pokegold_debug.sym index 5683fe70..95325dff 100644 --- a/pokegold_debug.sym +++ b/pokegold_debug.sym @@ -1222,10 +1222,9 @@ 01:4025 PlaceWaitingText.Waiting 01:4031 DummyPredef1 01:4032 WriteOAMDMACodeToHRAM -01:4039 WriteOAMDMACodeToHRAM.loop -01:4040 WriteOAMDMACodeToHRAM.PushOAM -01:4046 WriteOAMDMACodeToHRAM.pushoam_loop -01:404a WriteOAMDMACodeToHRAM.PushOAMEnd +01:4039 WriteOAMDMACodeToHRAM.copy +01:4040 OAMDMACode +01:404a OAMDMACodeEnd 01:404a Facings 01:408a Facings.End 01:408c FacingStepDown0 @@ -36213,6 +36212,7 @@ 01:dfff wStackTop 01:dfff wStack 00:ff80 hTransferVirtualOAM +00:ff86 hTransferVirtualOAM.wait 00:ff8f hRTCDayHi 00:ff90 hRTCDayLo 00:ff91 hRTCHours diff --git a/pokesilver.sym b/pokesilver.sym index cff44c5f..0c367116 100644 --- a/pokesilver.sym +++ b/pokesilver.sym @@ -1222,10 +1222,9 @@ 01:4025 PlaceWaitingText.Waiting 01:4031 DummyPredef1 01:4032 WriteOAMDMACodeToHRAM -01:4039 WriteOAMDMACodeToHRAM.loop -01:4040 WriteOAMDMACodeToHRAM.PushOAM -01:4046 WriteOAMDMACodeToHRAM.pushoam_loop -01:404a WriteOAMDMACodeToHRAM.PushOAMEnd +01:4039 WriteOAMDMACodeToHRAM.copy +01:4040 OAMDMACode +01:404a OAMDMACodeEnd 01:404a Facings 01:408a Facings.End 01:408c FacingStepDown0 @@ -36008,6 +36007,7 @@ 01:dfff wStackTop 01:dfff wStack 00:ff80 hTransferVirtualOAM +00:ff86 hTransferVirtualOAM.wait 00:ff8f hRTCDayHi 00:ff90 hRTCDayLo 00:ff91 hRTCHours diff --git a/pokesilver_debug.sym b/pokesilver_debug.sym index c0a4694b..f42e079d 100644 --- a/pokesilver_debug.sym +++ b/pokesilver_debug.sym @@ -1222,10 +1222,9 @@ 01:4025 PlaceWaitingText.Waiting 01:4031 DummyPredef1 01:4032 WriteOAMDMACodeToHRAM -01:4039 WriteOAMDMACodeToHRAM.loop -01:4040 WriteOAMDMACodeToHRAM.PushOAM -01:4046 WriteOAMDMACodeToHRAM.pushoam_loop -01:404a WriteOAMDMACodeToHRAM.PushOAMEnd +01:4039 WriteOAMDMACodeToHRAM.copy +01:4040 OAMDMACode +01:404a OAMDMACodeEnd 01:404a Facings 01:408a Facings.End 01:408c FacingStepDown0 @@ -36212,6 +36211,7 @@ 01:dfff wStackTop 01:dfff wStack 00:ff80 hTransferVirtualOAM +00:ff86 hTransferVirtualOAM.wait 00:ff8f hRTCDayHi 00:ff90 hRTCDayLo 00:ff91 hRTCHours