Skip to content

Commit 8c8c30d

Browse files
kandowontukandowontu
committed
Merge branch 'main' of https://github.com/tfdsoft/famidash 
2 parents bf36071 + 11e3ab0 commit 8c8c30d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+77474
-77645
lines changed

‎LEVELS/LEVEL DATA/lvlset_HUGE/trolled.tmx‎

Lines changed: 75 additions & 0 deletions
Large diffs are not rendered by default.

‎LEVELS/include/lvlset_HUGE/EXPORTS/trolled.lz.bin‎

1.28 KB
Binary file not shown.

‎LEVELS/include/lvlset_HUGE/all_level_data.s‎

Lines changed: 52 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@
657657
.incbin "EXPORTS/pgclubstep.lz.bin" ; Size: 7507
658658

659659

660-
.segment "DAT_BANK_1D" ; Total bank size: 8108 bytes
660+
.segment "DAT_BANK_1D" ; Total bank size: 8138 bytes
661661
.export level_data_kratos
662662
level_data_kratos:
663663
; Header
@@ -682,30 +682,6 @@
682682
; Level data
683683
.incbin "EXPORTS/kratos.lz.bin" ; Size: 7399
684684

685-
.export level_data_luckydraw
686-
level_data_luckydraw:
687-
; Header
688-
.byte <sprite_data_luckydraw ;____________ Sprite data ptr, low byte
689-
.byte >sprite_data_luckydraw ;____________ Sprite data ptr, high byte
690-
.byte <(.bank(sprite_data_luckydraw)) ;___ Sprite data bank
691-
.byte song_meltdown ;_____________________ Song ID
692-
.byte (0 << 4) | 0 ;______________________ Starting game mode and speed
693-
.byte ($B0) ;_____________________________ Spawn Y Position (high byte)
694-
.byte ($00) ;_____________________________ Spawn Y Position (low byte)
695-
.byte ($02) ;_____________________________ Y Scroll Position (high byte)
696-
.byte ($EF) ;_____________________________ Y Scroll Position (low byte)
697-
.byte ($06) ;_____________________________ Max Fall Speed (high byte)
698-
.byte (0 << 0) | (1 << 1) ;_______________ Force platformer, Disable parallax
699-
.byte _DECOCLOUD ;________________________ Deco type
700-
.byte _SPIKESB ;__________________________ Spike set
701-
.byte _BLOCKSB ;__________________________ Block set
702-
.byte _LETTERBANK ;_______________________ Sawblade set
703-
.byte $0F ;_______________________________ Starting background color
704-
.byte $0F ;_______________________________ Starting ground color
705-
.byte 27 ;________________________________ Level height
706-
; Level data
707-
.incbin "EXPORTS/luckydraw.lz.bin" ; Size: 673
708-
709685

710686
.segment "DAT_BANK_1E" ; Total bank size: 8190 bytes
711687
.export level_data_cataclysm
@@ -2735,7 +2711,33 @@
27352711
.incbin "EXPORTS/lookatthislevel.lz.bin" ; Size: 1663
27362712

27372713

2738-
.segment "DAT_BANK_6C" ; Total bank size: 4462 bytes
2714+
.segment "DAT_BANK_6A" ; Total bank size: 8168 bytes
2715+
.export level_data_trolled
2716+
level_data_trolled:
2717+
; Header
2718+
.byte <sprite_data_trolled ;____________ Sprite data ptr, low byte
2719+
.byte >sprite_data_trolled ;____________ Sprite data ptr, high byte
2720+
.byte <(.bank(sprite_data_trolled)) ;___ Sprite data bank
2721+
.byte song_youve_been_trolled ;_________ Song ID
2722+
.byte (0 << 4) | 0 ;____________________ Starting game mode and speed
2723+
.byte ($B0) ;___________________________ Spawn Y Position (high byte)
2724+
.byte ($00) ;___________________________ Spawn Y Position (low byte)
2725+
.byte ($02) ;___________________________ Y Scroll Position (high byte)
2726+
.byte ($EF) ;___________________________ Y Scroll Position (low byte)
2727+
.byte ($06) ;___________________________ Max Fall Speed (high byte)
2728+
.byte (0 << 0) | (0 << 1) ;_____________ Force platformer, Disable parallax
2729+
.byte _DECO1 ;__________________________ Deco type
2730+
.byte _SPIKESC ;________________________ Spike set
2731+
.byte _BLOCKSC ;________________________ Block set
2732+
.byte _SAWBLADESA ;_____________________ Sawblade set
2733+
.byte $0F ;_____________________________ Starting background color
2734+
.byte $0F ;_____________________________ Starting ground color
2735+
.byte 27 ;______________________________ Level height
2736+
; Level data
2737+
.incbin "EXPORTS/trolled.lz.bin" ; Size: 1315
2738+
2739+
2740+
.segment "DAT_BANK_6C" ; Total bank size: 6184 bytes
27392741
.export level_data_thechallenge
27402742
level_data_thechallenge:
27412743
; Header
@@ -2764,3 +2766,27 @@
27642766
level_data_eon_13:
27652767
; Level data
27662768
.incbin "EXPORTS/eon.lz.1.bin" ; Size: 807
2769+
2770+
.export level_data_luckydraw
2771+
level_data_luckydraw:
2772+
; Header
2773+
.byte <sprite_data_luckydraw ;____________ Sprite data ptr, low byte
2774+
.byte >sprite_data_luckydraw ;____________ Sprite data ptr, high byte
2775+
.byte <(.bank(sprite_data_luckydraw)) ;___ Sprite data bank
2776+
.byte song_meltdown ;_____________________ Song ID
2777+
.byte (0 << 4) | 0 ;______________________ Starting game mode and speed
2778+
.byte ($B0) ;_____________________________ Spawn Y Position (high byte)
2779+
.byte ($00) ;_____________________________ Spawn Y Position (low byte)
2780+
.byte ($02) ;_____________________________ Y Scroll Position (high byte)
2781+
.byte ($EF) ;_____________________________ Y Scroll Position (low byte)
2782+
.byte ($06) ;_____________________________ Max Fall Speed (high byte)
2783+
.byte (0 << 0) | (1 << 1) ;_______________ Force platformer, Disable parallax
2784+
.byte _DECOCLOUD ;________________________ Deco type
2785+
.byte _SPIKESB ;__________________________ Spike set
2786+
.byte _BLOCKSB ;__________________________ Block set
2787+
.byte _LETTERBANK ;_______________________ Sawblade set
2788+
.byte $0F ;_______________________________ Starting background color
2789+
.byte $0F ;_______________________________ Starting ground color
2790+
.byte 27 ;________________________________ Level height
2791+
; Level data
2792+
.incbin "EXPORTS/luckydraw.lz.bin" ; Size: 673

‎LEVELS/include/lvlset_HUGE/all_level_table.s‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ _level_list_lo:
6363
.byte .lobyte(level_data_subtleoddities)
6464
.byte .lobyte(level_data_powertrip)
6565
.byte .lobyte(level_data_danceofviolins)
66+
.byte .lobyte(level_data_trolled)
6667
.byte .lobyte(level_data_aprettyeasylevel)
6768
.byte .lobyte(level_data_highlife)
6869
.byte .lobyte(level_data_extraordinaryexcitement)
@@ -168,6 +169,7 @@ _level_list_hi:
168169
.byte .hibyte(level_data_subtleoddities)
169170
.byte .hibyte(level_data_powertrip)
170171
.byte .hibyte(level_data_danceofviolins)
172+
.byte .hibyte(level_data_trolled)
171173
.byte .hibyte(level_data_aprettyeasylevel)
172174
.byte .hibyte(level_data_highlife)
173175
.byte .hibyte(level_data_extraordinaryexcitement)
@@ -273,6 +275,7 @@ _level_list_bank:
273275
.byte .lobyte(.bank(level_data_subtleoddities))
274276
.byte .lobyte(.bank(level_data_powertrip))
275277
.byte .lobyte(.bank(level_data_danceofviolins))
278+
.byte .lobyte(.bank(level_data_trolled))
276279
.byte .lobyte(.bank(level_data_aprettyeasylevel))
277280
.byte .lobyte(.bank(level_data_highlife))
278281
.byte .lobyte(.bank(level_data_extraordinaryexcitement))
@@ -447,6 +450,7 @@ _level_lengths_lo:
447450
.byte .lobyte($0000C0) ; subtleoddities
448451
.byte .lobyte($0000C0) ; powertrip
449452
.byte .lobyte($000096) ; danceofviolins
453+
.byte .lobyte($00003D) ; trolled
450454
.byte .lobyte($000070) ; aprettyeasylevel
451455
.byte .lobyte($000154) ; highlife
452456
.byte .lobyte($0000F0) ; extraordinaryexcitement
@@ -554,6 +558,7 @@ _level_lengths_md:
554558
.byte .hibyte($0000C0) ; subtleoddities
555559
.byte .hibyte($0000C0) ; powertrip
556560
.byte .hibyte($000096) ; danceofviolins
561+
.byte .hibyte($00003D) ; trolled
557562
.byte .hibyte($000070) ; aprettyeasylevel
558563
.byte .hibyte($000154) ; highlife
559564
.byte .hibyte($0000F0) ; extraordinaryexcitement
@@ -661,6 +666,7 @@ _level_lengths_hi:
661666
.byte .bankbyte($0000C0) ; subtleoddities
662667
.byte .bankbyte($0000C0) ; powertrip
663668
.byte .bankbyte($000096) ; danceofviolins
669+
.byte .bankbyte($00003D) ; trolled
664670
.byte .bankbyte($000070) ; aprettyeasylevel
665671
.byte .bankbyte($000154) ; highlife
666672
.byte .bankbyte($0000F0) ; extraordinaryexcitement

‎LEVELS/include/lvlset_HUGE/all_sprite_data.s‎

Lines changed: 152 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ sprite_data_dryout:
861861
.byte $90,$34,$30,$03,$0f
862862
.byte $ff
863863

864-
.segment "DAT_BANK_6A"
864+
.segment "DAT_BANK_6B"
865865
sprite_data_baseafterbase:
866866
.byte $70,$02,$70,$03,$2b
867867
.byte $a0,$02,$40,$03,$2d
@@ -8276,7 +8276,7 @@ sprite_data_retray:
82768276
.byte $90,$27,$80,$03,$0f
82778277
.byte $ff
82788278

8279-
.segment "DAT_BANK_6B"
8279+
.segment "DAT_BANK_6A"
82808280
sprite_data_sonar:
82818281
.byte $00,$00,$60,$03,$81
82828282
.byte $00,$00,$80,$03,$c1
@@ -26813,7 +26813,155 @@ sprite_data_danceofviolins:
2681326813
.byte $60,$3a,$d0,$02,$c4
2681426814
.byte $ff
2681526815

26816-
.segment "DAT_BANK_6A"
26816+
.segment "DAT_BANK_1D"
26817+
sprite_data_trolled:
26818+
.byte $00,$00,$60,$03,$bd
26819+
.byte $00,$00,$70,$03,$8f
26820+
.byte $00,$00,$80,$03,$cf
26821+
.byte $30,$00,$50,$03,$36
26822+
.byte $50,$00,$70,$03,$2c
26823+
.byte $90,$00,$30,$03,$36
26824+
.byte $a0,$00,$70,$03,$2c
26825+
.byte $f0,$00,$40,$03,$36
26826+
.byte $40,$01,$60,$03,$2c
26827+
.byte $50,$01,$30,$03,$36
26828+
.byte $b0,$01,$60,$03,$2c
26829+
.byte $e0,$01,$50,$03,$36
26830+
.byte $10,$02,$40,$03,$b0
26831+
.byte $10,$02,$50,$03,$81
26832+
.byte $30,$02,$50,$03,$91
26833+
.byte $30,$02,$60,$03,$c1
26834+
.byte $50,$02,$30,$03,$36
26835+
.byte $90,$02,$60,$03,$2c
26836+
.byte $a0,$02,$40,$03,$36
26837+
.byte $d0,$02,$40,$03,$92
26838+
.byte $d0,$02,$50,$03,$c2
26839+
.byte $d0,$02,$60,$03,$0b
26840+
.byte $f0,$02,$40,$03,$93
26841+
.byte $f0,$02,$50,$03,$c3
26842+
.byte $10,$03,$20,$03,$36
26843+
.byte $10,$03,$60,$03,$0b
26844+
.byte $50,$03,$30,$03,$27
26845+
.byte $70,$03,$00,$03,$36
26846+
.byte $80,$03,$30,$03,$94
26847+
.byte $80,$03,$40,$03,$c4
26848+
.byte $80,$03,$50,$03,$36
26849+
.byte $a0,$03,$30,$03,$95
26850+
.byte $a0,$03,$40,$03,$c5
26851+
.byte $b0,$03,$f0,$02,$05
26852+
.byte $e0,$03,$30,$03,$36
26853+
.byte $30,$04,$10,$03,$36
26854+
.byte $40,$04,$20,$03,$94
26855+
.byte $40,$04,$30,$03,$c4
26856+
.byte $60,$04,$20,$03,$93
26857+
.byte $60,$04,$30,$03,$c3
26858+
.byte $60,$04,$80,$03,$30
26859+
.byte $80,$04,$f0,$02,$36
26860+
.byte $a0,$04,$80,$03,$2b
26861+
.byte $c0,$04,$10,$03,$2d
26862+
.byte $c0,$04,$88,$03,$52
26863+
.byte $d0,$04,$70,$03,$0b
26864+
.byte $e0,$04,$10,$03,$2d
26865+
.byte $20,$05,$30,$03,$36
26866+
.byte $30,$05,$50,$03,$2c
26867+
.byte $50,$05,$00,$03,$2d
26868+
.byte $70,$05,$00,$03,$2d
26869+
.byte $70,$05,$50,$03,$92
26870+
.byte $70,$05,$60,$03,$c2
26871+
.byte $90,$05,$50,$03,$91
26872+
.byte $90,$05,$60,$03,$c1
26873+
.byte $b0,$05,$20,$03,$01
26874+
.byte $e0,$05,$50,$03,$36
26875+
.byte $60,$06,$70,$03,$d1
26876+
.byte $e0,$07,$30,$03,$02
26877+
.byte $80,$0a,$78,$03,$52
26878+
.byte $00,$0b,$60,$03,$01
26879+
.byte $50,$0b,$60,$03,$33
26880+
.byte $80,$0b,$70,$03,$81
26881+
.byte $80,$0b,$80,$03,$c1
26882+
.byte $90,$0b,$50,$03,$33
26883+
.byte $a0,$0b,$60,$03,$cf
26884+
.byte $a0,$0b,$70,$03,$8f
26885+
.byte $a0,$0b,$80,$03,$b6
26886+
.byte $00,$0c,$60,$03,$09
26887+
.byte $50,$0c,$60,$03,$33
26888+
.byte $b0,$0c,$60,$03,$08
26889+
.byte $c0,$0c,$60,$03,$00
26890+
.byte $e0,$0c,$88,$03,$52
26891+
.byte $00,$0d,$60,$03,$01
26892+
.byte $50,$0d,$60,$03,$b0
26893+
.byte $50,$0d,$70,$03,$81
26894+
.byte $50,$0d,$80,$03,$c1
26895+
.byte $70,$0d,$70,$03,$91
26896+
.byte $70,$0d,$80,$03,$d1
26897+
.byte $d0,$0e,$10,$03,$37
26898+
.byte $d0,$0e,$70,$03,$33
26899+
.byte $f0,$10,$30,$03,$24
26900+
.byte $e0,$13,$d0,$02,$00
26901+
.byte $e0,$13,$f0,$02,$05
26902+
.byte $e0,$13,$00,$03,$00
26903+
.byte $e0,$13,$30,$03,$00
26904+
.byte $e0,$13,$60,$03,$00
26905+
.byte $e0,$14,$00,$02,$df
26906+
.byte $e0,$14,$10,$02,$01
26907+
.byte $f0,$14,$00,$02,$df
26908+
.byte $00,$15,$00,$02,$df
26909+
.byte $10,$15,$00,$02,$df
26910+
.byte $20,$15,$00,$02,$df
26911+
.byte $30,$15,$00,$02,$df
26912+
.byte $40,$15,$00,$02,$df
26913+
.byte $50,$15,$00,$02,$df
26914+
.byte $60,$15,$00,$02,$df
26915+
.byte $70,$15,$00,$02,$df
26916+
.byte $80,$15,$00,$02,$df
26917+
.byte $90,$15,$00,$02,$df
26918+
.byte $a0,$15,$00,$02,$df
26919+
.byte $b0,$15,$00,$02,$df
26920+
.byte $c0,$15,$00,$02,$df
26921+
.byte $d0,$15,$00,$02,$df
26922+
.byte $e0,$15,$00,$02,$df
26923+
.byte $f0,$15,$00,$02,$df
26924+
.byte $00,$16,$00,$02,$df
26925+
.byte $10,$16,$00,$02,$df
26926+
.byte $20,$16,$00,$02,$df
26927+
.byte $20,$16,$20,$02,$07
26928+
.byte $30,$16,$00,$02,$df
26929+
.byte $40,$16,$00,$02,$df
26930+
.byte $40,$16,$20,$02,$1a
26931+
.byte $50,$16,$00,$02,$df
26932+
.byte $60,$16,$00,$02,$df
26933+
.byte $60,$16,$20,$02,$1b
26934+
.byte $70,$16,$00,$02,$df
26935+
.byte $80,$16,$00,$02,$df
26936+
.byte $90,$16,$00,$02,$df
26937+
.byte $a0,$16,$00,$02,$df
26938+
.byte $b0,$16,$00,$02,$df
26939+
.byte $c0,$16,$00,$02,$df
26940+
.byte $d0,$16,$00,$02,$df
26941+
.byte $e0,$16,$00,$02,$df
26942+
.byte $f0,$16,$00,$02,$df
26943+
.byte $00,$17,$00,$02,$df
26944+
.byte $10,$17,$00,$02,$df
26945+
.byte $10,$17,$60,$03,$df
26946+
.byte $20,$17,$00,$02,$df
26947+
.byte $20,$17,$60,$03,$df
26948+
.byte $30,$17,$00,$02,$df
26949+
.byte $30,$17,$60,$03,$df
26950+
.byte $40,$17,$00,$02,$df
26951+
.byte $40,$17,$60,$03,$df
26952+
.byte $50,$17,$00,$02,$df
26953+
.byte $50,$17,$60,$03,$df
26954+
.byte $60,$17,$00,$02,$df
26955+
.byte $60,$17,$60,$03,$df
26956+
.byte $70,$17,$00,$02,$df
26957+
.byte $70,$17,$60,$03,$df
26958+
.byte $80,$17,$00,$02,$df
26959+
.byte $80,$17,$60,$03,$df
26960+
.byte $90,$17,$00,$02,$0f
26961+
.byte $90,$17,$60,$03,$0f
26962+
.byte $ff
26963+
26964+
.segment "DAT_BANK_6B"
2681726965
sprite_data_aprettyeasylevel:
2681826966
.byte $00,$00,$70,$03,$96
2681926967
.byte $00,$00,$80,$03,$c6
@@ -45001,7 +45149,7 @@ sprite_data_futurefunk:
4500145149
.byte $10,$ba,$f0,$01,$0f
4500245150
.byte $ff
4500345151

45004-
.segment "DAT_BANK_6B"
45152+
.segment "DAT_BANK_6C"
4500545153
sprite_data_stalemate:
4500645154
.byte $00,$00,$30,$03,$b7
4500745155
.byte $00,$00,$40,$03,$80

‎LEVELS/include/lvlset_HUGE/level_data_cache.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)