diff options
| -rwxr-xr-x | home.asm | 17 | ||||
| -rwxr-xr-x | home/text.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 16 |
3 files changed, 18 insertions, 17 deletions
@@ -1428,21 +1428,22 @@ ClearOAMBuffer: ; 0x916 ld [wOAMBufferSize], a ret -Func_926: ; 0x926 +CleanOAMBuffer: ; 0x926 +; Cleans up any trailing unused oam slots in the oam buffer. ld a, [wOAMBufferSize] cp wOAMBufferEnd % $100 - jr nc, .asm_93a + jr nc, .done ld l, a ld h, wOAMBufferEnd / $100 cpl add (wOAMBufferEnd + 1) % $100 ld b, a ld a, $f0 -.asm_936 +.loop ld [hli], a dec b - jr nz, .asm_936 -.asm_93a + jr nz, .loop +.done xor a ld [wOAMBufferSize], a ret @@ -3910,8 +3911,8 @@ Func_1ffc: ; 0x1ffc ld [wCurrentScreen], a .master_loop call Func_2034 - call Func_2043 - call Func_926 + call DoScreenLogic + call CleanOAMBuffer call Func_b2e rst AdvanceFrame jr .master_loop @@ -3928,7 +3929,7 @@ Func_2034: ; 0x2034 ld [wd803], a ret -Func_2043: ; 0x2043 +DoScreenLogic: ; 0x2043 ld a, [wCurrentScreen] call CallInFollowingTable CallTable_2049: ; 0x2049 diff --git a/home/text.asm b/home/text.asm index 97de605..c7ee25d 100755 --- a/home/text.asm +++ b/home/text.asm @@ -677,7 +677,7 @@ Func_3475: ; 0x3475 callba nz, HandleFlippers callba Func_84b7 call Func_33e3 - call Func_926 + call CleanOAMBuffer rst AdvanceFrame ld a, [wd5ca] and a @@ -2545,7 +2545,7 @@ Func_c10e: ; 0xc10e ld a, $2 ld [wd911], a .asm_c18f - call Func_926 + call CleanOAMBuffer rst AdvanceFrame call Func_c1b1 ld a, [wd910] @@ -3131,7 +3131,7 @@ Func_c55a: ; 0xc55a sla a call Func_c621 call Func_c554 - call Func_926 + call CleanOAMBuffer rst AdvanceFrame pop hl pop bc @@ -3173,7 +3173,7 @@ Func_c55a: ; 0xc55a inc a call Func_c621 call Func_c554 - call Func_926 + call CleanOAMBuffer rst AdvanceFrame pop hl pop de @@ -4472,7 +4472,7 @@ SendHighScores: ; 0xced1 ld bc, $473b ld a, $8f call LoadOAMData - call Func_926 + call CleanOAMBuffer rst AdvanceFrame ld a, $1 ld [wd8e9], a @@ -4507,7 +4507,7 @@ SendHighScores: ; 0xced1 ld bc, $473b ld a, $8f call LoadOAMData - call Func_926 + call CleanOAMBuffer call Func_1ca1 ld a, [wSendHighScoresAnimationFrameIndex] cp $6 @@ -7873,7 +7873,7 @@ FieldVerticalTransition: ; 0xe674 ld [wd548], a ld [wd803], a callba Func_84b7 - call Func_926 + call CleanOAMBuffer pop af ld [wd548], a pop af @@ -8372,7 +8372,7 @@ Func_ed8e: ; 0xed8e call nz, BankSwitch callba Func_84b7 call Func_33e3 - call Func_926 + call CleanOAMBuffer rst AdvanceFrame ld a, [wd7af] and a @@ -30728,7 +30728,7 @@ MainPokedexScreen: ; 0x280fe jp z, .asm_28174 call Func_288c6 call Func_2885c - call Func_926 + call CleanOAMBuffer call Func_2887c call Func_2885c ld hl, wScreenState |