Skip to content
This repository was archived by the owner on Sep 21, 2025. It is now read-only.

Commit 8bde503

Browse files
DevEd2DevEd2
committed
free up some space in rom0
1 parent de22bc8 commit 8bde503

3 files changed

Lines changed: 48 additions & 92 deletions

File tree

‎Engine/GameModes/Level.asm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ GM_Level:
3434
call GetLevel
3535
push hl
3636
; initialize variables
37+
call ClearScreen
3738
xor a
3839
ld [Engine_CurrentScreen],a
3940
ld [Engine_LastRow],a

‎Engine/GameModes/SoundTest.asm‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,9 @@ SoundTest_CursorOscillationTable:
456456
; a = song ID
457457
; b = offset
458458
SoundTest_DrawSongNameChar:
459-
ld de,SoundTest_SongNames
459+
push bc
460+
ldfar de,SoundTest_SongNames
461+
pop bc
460462
ld l,a
461463
ld h,0
462464
add hl,hl ; x2
@@ -489,7 +491,7 @@ SoundTest_DrawSongNameChar:
489491
; a = song ID
490492
SoundTest_DrawSongName:
491493
ld de,$9a00
492-
ld hl,SoundTest_SongNames
494+
ldfar hl,SoundTest_SongNames
493495
add a ; x2
494496
add a ; x4
495497
add a ; x8
@@ -592,6 +594,22 @@ SoundTest_RunMarquee:
592594
ld a,[SoundTest_SongID]
593595
jp SoundTest_DrawSongNameChar
594596

597+
; ================
598+
599+
section "Sound test - Marquee scroll table",romx,align[8]
600+
601+
SoundTest_MarqueeScrollTable::
602+
db $00,$00,$00,$00,$00,$00,$01,$01,$02,$03,$03,$04,$05,$06,$07,$08
603+
db $09,$0A,$0C,$0D,$0F,$10,$12,$13,$15,$17,$19,$1B,$1D,$1F,$21,$23
604+
db $25,$27,$2A,$2C,$2E,$31,$33,$36,$38,$3B,$3E,$40,$43,$46,$49,$4C
605+
db $4F,$51,$54,$57,$5A,$5D,$60,$63,$67,$6A,$6D,$70,$73,$76,$79,$7C
606+
db $80,$83,$86,$89,$8C,$8F,$92,$95,$98,$9C,$9F,$A2,$A5,$A8,$AB,$AE
607+
db $B0,$B3,$B6,$B9,$BC,$BF,$C1,$C4,$C7,$C9,$CC,$CE,$D1,$D3,$D5,$D8
608+
db $DA,$DC,$DE,$E0,$E2,$E4,$E6,$E8,$EA,$EC,$ED,$EF,$F0,$F2,$F3,$F5
609+
db $F6,$F7,$F8,$F9,$FA,$FB,$FC,$FC,$FD,$FE,$FE,$FF,$FF,$FF,$FF,$FF
610+
611+
section "Sound test - Song names",romx
612+
595613
SoundTest_SongNames:
596614
; -##################-------------
597615
db " Main Theme "
@@ -612,20 +630,6 @@ SoundTest_SongNames:
612630

613631
; ================
614632

615-
section "Sound test - Marquee scroll table",romx,align[8]
616-
617-
SoundTest_MarqueeScrollTable::
618-
db $00,$00,$00,$00,$00,$00,$01,$01,$02,$03,$03,$04,$05,$06,$07,$08
619-
db $09,$0A,$0C,$0D,$0F,$10,$12,$13,$15,$17,$19,$1B,$1D,$1F,$21,$23
620-
db $25,$27,$2A,$2C,$2E,$31,$33,$36,$38,$3B,$3E,$40,$43,$46,$49,$4C
621-
db $4F,$51,$54,$57,$5A,$5D,$60,$63,$67,$6A,$6D,$70,$73,$76,$79,$7C
622-
db $80,$83,$86,$89,$8C,$8F,$92,$95,$98,$9C,$9F,$A2,$A5,$A8,$AB,$AE
623-
db $B0,$B3,$B6,$B9,$BC,$BF,$C1,$C4,$C7,$C9,$CC,$CE,$D1,$D3,$D5,$D8
624-
db $DA,$DC,$DE,$E0,$E2,$E4,$E6,$E8,$EA,$EC,$ED,$EF,$F0,$F2,$F3,$F5
625-
db $F6,$F7,$F8,$F9,$FA,$FB,$FC,$FC,$FD,$FE,$FE,$FF,$FF,$FF,$FF,$FF
626-
627-
; ================
628-
629633
section "Sound test GFX",romx
630634

631635
SoundTestTiles:

‎Engine/Player.asm‎

Lines changed: 27 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -429,156 +429,107 @@ ProcessPlayer:
429429
; process "STAGE CLEAR" card
430430
call BeginSprites
431431

432-
433432
ld a,[sys_CurrentFrame]
434433
call .getYSine
435434
ldfar hl,StageClear_Scroll1
436-
ld b,$20 ; S
437435
ld c,%00001000
438436
ld a,[StageClear_Offset1]
439-
add l
440-
ld l,a
441-
ld a,[hl]
442-
ld e,a
443-
call AddSprite
444-
437+
call .getOffset1
445438
446439
ld a,[sys_CurrentFrame]
447440
add 8
448441
call .getYSine
449442
ld hl,StageClear_Scroll2
450443
ld b,$22 ; T
451-
ld c,%00001000
452444
ld a,[StageClear_Offset2]
453-
add l
454-
ld l,a
455-
ld a,[hl]
456-
ld e,a
457-
call AddSprite
445+
call .getOffset1
458446
459447
ld a,[sys_CurrentFrame]
460448
add 16
461449
call .getYSine
462450
ld hl,StageClear_Scroll3
463451
ld b,$24 ; A
464-
ld c,%00001000
465452
ld a,[StageClear_Offset3]
466-
add l
467-
ld l,a
468-
ld a,[hl]
469-
ld e,a
470-
call AddSprite
453+
call .getOffset1
471454
472455
ld a,[sys_CurrentFrame]
473456
add 24
474457
call .getYSine
475458
ld hl,StageClear_Scroll4
476459
ld b,$26 ; G
477-
ld c,%00001000
478460
ld a,[StageClear_Offset4]
479-
add l
480-
ld l,a
481-
jr nc,:+
482-
inc h
483-
: ld a,[hl]
484-
ld e,a
485-
call AddSprite
461+
call .getOffset1
486462
487463
ld a,[sys_CurrentFrame]
488464
add 32
489465
call .getYSine
490466
ld hl,StageClear_Scroll5
491467
ld b,$28 ; E
492-
ld c,%00001000
493468
ld a,[StageClear_Offset5]
494-
add l
495-
ld l,a
496-
ld a,[hl]
497-
ld e,a
498-
call AddSprite
469+
call .getOffset1
499470
500471
ld a,[sys_CurrentFrame]
501472
add 32
502473
call .getYSine2
503474
ldfar hl,StageClear_Scroll1
504475
ld b,$2e ; R
505-
ld c,%00001000
506476
ld a,[StageClear_Offset1]
507-
add l
508-
ld l,a
509-
ld a,[hl]
510-
ld e,a
511-
ld a,SCRN_X+6
512-
sub e
513-
ld e,a
514-
call AddSprite
477+
call .getOffset2
515478
516-
517479
ld a,[sys_CurrentFrame]
518480
add 24
519481
call .getYSine2
520482
ld hl,StageClear_Scroll2
521483
ld b,$24 ; A
522-
ld c,%00001000
523484
ld a,[StageClear_Offset2]
524-
add l
525-
ld l,a
526-
ld a,[hl]
527-
ld e,a
528-
ld a,SCRN_X+6
529-
sub e
530-
ld e,a
531-
call AddSprite
485+
call .getOffset2
532486
533487
ld a,[sys_CurrentFrame]
534488
add 16
535489
call .getYSine2
536490
ld hl,StageClear_Scroll3
537491
ld b,$28 ; E
538-
ld c,%00001000
539492
ld a,[StageClear_Offset3]
540-
add l
541-
ld l,a
542-
ld a,[hl]
543-
ld e,a
544-
ld a,SCRN_X+6
545-
sub e
546-
ld e,a
547-
call AddSprite
548-
493+
call .getOffset2
494+
549495
ld a,[sys_CurrentFrame]
550496
add 8
551497
call .getYSine2
552498
ld hl,StageClear_Scroll4
553499
ld b,$2c ; L
554-
ld c,%00001000
555500
ld a,[StageClear_Offset4]
501+
call .getOffset2
502+
503+
ld a,[sys_CurrentFrame]
504+
call .getYSine2
505+
ld hl,StageClear_Scroll5
506+
ld b,$2a ; C
507+
ld a,[StageClear_Offset5]
508+
call .getOffset2
509+
jr :+
510+
511+
.getOffset1
512+
ld c,%00001000
556513
add l
557514
ld l,a
558515
jr nc,:+
559516
inc h
560517
: ld a,[hl]
561518
ld e,a
562-
ld a,SCRN_X+6
563-
sub e
564-
ld e,a
565-
call AddSprite
519+
jp AddSprite
566520
567-
ld a,[sys_CurrentFrame]
568-
call .getYSine2
569-
ld hl,StageClear_Scroll5
570-
ld b,$2a ; C
521+
.getOffset2
571522
ld c,%00001000
572-
ld a,[StageClear_Offset5]
573523
add l
574524
ld l,a
575-
ld a,[hl]
525+
jr nc,:+
526+
inc h
527+
: ld a,[hl]
576528
ld e,a
577529
ld a,SCRN_X+6
578530
sub e
579531
ld e,a
580-
call AddSprite
581-
jr :+
532+
jp AddSprite
582533
583534
.getYSine:
584535
add a

0 commit comments

Comments
 (0)