Skip to content

Commit

Permalink
Dear Nostalgists Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@kandowontu
kandowontu committed Feb 24, 2025
1 parent 6079f13 commit 6a174b2
Show file tree
Hide file tree
Showing 14 changed files with 271 additions and 140 deletions.
Binary file modified LEVELS/EXPORTS/dearnostalgists.lz.0.bin
View file
Binary file not shown.
Binary file modified LEVELS/EXPORTS/dearnostalgists.lz.1.bin
View file
Binary file not shown.
Binary file modified LEVELS/EXPORTS/dearnostalgists.lz.bin
View file
Binary file not shown.
Binary file modified LEVELS/EXPORTS/test4.lz.bin
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions LEVELS/LEVEL DATA/dearnostalgists_.csv
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions LEVELS/LEVEL DATA/dearnostalgists_SP.csv
View file

Large diffs are not rendered by default.

112 changes: 89 additions & 23 deletions LEVELS/LEVEL DATA/test4.tmx
View file

Large diffs are not rendered by default.

68 changes: 49 additions & 19 deletions LEVELS/LEVEL DATA/test4_.csv
View file

Large diffs are not rendered by default.

32 changes: 31 additions & 1 deletion LEVELS/LEVEL DATA/test4_SP.csv
View file

Large diffs are not rendered by default.

144 changes: 73 additions & 71 deletions LEVELS/all_level_data.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,7 @@
; Generated by export_levels.py


.segment "LVL_BANK_01" ; Total bank size: 8170 bytes
.export level_data_dash
level_data_dash:
; Header
.byte dash_song_number
.byte dash_game_mode
.byte dash_speed
.byte dash_no_parallax
.byte dash_bg_color
.byte dash_grnd_color
.byte 36 ; height of dash
; Level data
.incbin "EXPORTS/dash.lz.0.bin" ; Size: 8170


.segment "LVL_BANK_02" ; Total bank size: 8179 bytes
.segment "LVL_BANK_01" ; Total bank size: 8190 bytes
.export level_data_dearnostalgists
level_data_dearnostalgists:
; Header
Expand All @@ -29,12 +14,22 @@
.byte dearnostalgists_grnd_color
.byte 57 ; height of dearnostalgists
; Level data
.incbin "EXPORTS/dearnostalgists.lz.0.bin" ; Size: 8093
.incbin "EXPORTS/dearnostalgists.lz.0.bin" ; Size: 8190

.export level_data_dash_0
level_data_dash_0:

.segment "LVL_BANK_02" ; Total bank size: 8170 bytes
.export level_data_dash
level_data_dash:
; Header
.byte dash_song_number
.byte dash_game_mode
.byte dash_speed
.byte dash_no_parallax
.byte dash_bg_color
.byte dash_grnd_color
.byte 36 ; height of dash
; Level data
.incbin "EXPORTS/dash.lz.1.bin" ; Size: 86
.incbin "EXPORTS/dash.lz.0.bin" ; Size: 8170


.segment "LVL_BANK_03" ; Total bank size: 8072 bytes
Expand Down Expand Up @@ -198,7 +193,7 @@
.incbin "EXPORTS/decode.lz.bin" ; Size: 5892


.segment "LVL_BANK_0C" ; Total bank size: 8134 bytes
.segment "LVL_BANK_0C" ; Total bank size: 8180 bytes
.export level_data_toe2
level_data_toe2:
; Header
Expand Down Expand Up @@ -258,27 +253,7 @@
.incbin "EXPORTS/stalemate.lz.bin" ; Size: 5217


.segment "LVL_BANK_10" ; Total bank size: 8172 bytes
.export level_data_dearnostalgists_2
level_data_dearnostalgists_2:
; Level data
.incbin "EXPORTS/dearnostalgists.lz.1.bin" ; Size: 5148

.export level_data_cycles
level_data_cycles:
; Header
.byte cycles_song_number
.byte cycles_game_mode
.byte cycles_speed
.byte cycles_no_parallax
.byte cycles_bg_color
.byte cycles_grnd_color
.byte 27 ; height of cycles
; Level data
.incbin "EXPORTS/cycles.lz.bin" ; Size: 3024


.segment "LVL_BANK_11" ; Total bank size: 8134 bytes
.segment "LVL_BANK_10" ; Total bank size: 8134 bytes
.export level_data_electrodynamix
level_data_electrodynamix:
; Header
Expand Down Expand Up @@ -306,6 +281,26 @@
.incbin "EXPORTS/timemachine.lz.bin" ; Size: 3074


.segment "LVL_BANK_11" ; Total bank size: 8082 bytes
.export level_data_dearnostalgists_2
level_data_dearnostalgists_2:
; Level data
.incbin "EXPORTS/dearnostalgists.lz.1.bin" ; Size: 5058

.export level_data_cycles
level_data_cycles:
; Header
.byte cycles_song_number
.byte cycles_game_mode
.byte cycles_speed
.byte cycles_no_parallax
.byte cycles_bg_color
.byte cycles_grnd_color
.byte 27 ; height of cycles
; Level data
.incbin "EXPORTS/cycles.lz.bin" ; Size: 3024


.segment "LVL_BANK_12" ; Total bank size: 7803 bytes
.export level_data_kappaclysm
level_data_kappaclysm:
Expand Down Expand Up @@ -336,7 +331,7 @@
.incbin "EXPORTS/problematic.lz.bin" ; Size: 4874


.segment "LVL_BANK_14" ; Total bank size: 8089 bytes
.segment "LVL_BANK_14" ; Total bank size: 8175 bytes
.export level_data_blastprocessing
level_data_blastprocessing:
; Header
Expand All @@ -355,6 +350,11 @@
; Level data
.incbin "EXPORTS/deathmoon.lz.1.bin" ; Size: 3302

.export level_data_dash_0
level_data_dash_0:
; Level data
.incbin "EXPORTS/dash.lz.1.bin" ; Size: 86


.segment "LVL_BANK_15" ; Total bank size: 7891 bytes
.export level_data_demonpark
Expand Down Expand Up @@ -483,7 +483,7 @@
.incbin "EXPORTS/clutterfunk.lz.bin" ; Size: 4027


.segment "LVL_BANK_1A" ; Total bank size: 8191 bytes
.segment "LVL_BANK_1A" ; Total bank size: 8183 bytes
.export level_data_theoryofeverything
level_data_theoryofeverything:
; Header
Expand All @@ -497,32 +497,6 @@
; Level data
.incbin "EXPORTS/theoryofeverything.lz.bin" ; Size: 3571

.export level_data_thechallenge
level_data_thechallenge:
; Header
.byte thechallenge_song_number
.byte thechallenge_game_mode
.byte thechallenge_speed
.byte thechallenge_no_parallax
.byte thechallenge_bg_color
.byte thechallenge_grnd_color
.byte 57 ; height of thechallenge
; Level data
.incbin "EXPORTS/thechallenge.lz.bin" ; Size: 937

.export level_data_test4
level_data_test4:
; Header
.byte test4_song_number
.byte test4_game_mode
.byte test4_speed
.byte test4_no_parallax
.byte test4_bg_color
.byte test4_grnd_color
.byte 27 ; height of test4
; Level data
.incbin "EXPORTS/test4.lz.bin" ; Size: 97


.segment "LVL_BANK_1B" ; Total bank size: 8174 bytes
.export level_data_sonar
Expand Down Expand Up @@ -580,7 +554,7 @@
.incbin "EXPORTS/retray.lz.bin" ; Size: 2719


.segment "LVL_BANK_1F" ; Total bank size: 8188 bytes
.segment "LVL_BANK_1F" ; Total bank size: 8182 bytes
.export level_data_jumper
level_data_jumper:
; Header
Expand Down Expand Up @@ -662,3 +636,31 @@
.byte 27 ; height of backontrack
; Level data
.incbin "EXPORTS/backontrack.lz.bin" ; Size: 1351


.segment "LVL_BANK_22" ; Total bank size: 7777 bytes
.export level_data_thechallenge
level_data_thechallenge:
; Header
.byte thechallenge_song_number
.byte thechallenge_game_mode
.byte thechallenge_speed
.byte thechallenge_no_parallax
.byte thechallenge_bg_color
.byte thechallenge_grnd_color
.byte 57 ; height of thechallenge
; Level data
.incbin "EXPORTS/thechallenge.lz.bin" ; Size: 937

.export level_data_test4
level_data_test4:
; Header
.byte test4_song_number
.byte test4_game_mode
.byte test4_speed
.byte test4_no_parallax
.byte test4_bg_color
.byte test4_grnd_color
.byte 57 ; height of test4
; Level data
.incbin "EXPORTS/test4.lz.bin" ; Size: 759
23 changes: 13 additions & 10 deletions LEVELS/all_sprite_data.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ sprite_data_polargeist:
.byte $50,$3a,$30,$03,$0f
.byte $ff

.segment "LVL_BANK_22"
.segment "LVL_BANK_1A"
sprite_data_dryout:
.byte $40,$02,$60,$03,$2b
.byte $60,$02,$80,$03,$2e
Expand Down Expand Up @@ -13736,15 +13736,10 @@ sprite_data_dearnostalgists:
.byte $40,$27,$f0,$02,$80
.byte $40,$27,$20,$03,$fe
.byte $40,$27,$38,$03,$fd
.byte $50,$27,$10,$03,$fa
.byte $50,$27,$20,$03,$fe
.byte $50,$27,$38,$03,$fd
.byte $50,$27,$40,$03,$fa
.byte $60,$27,$10,$03,$fa
.byte $60,$27,$20,$03,$fe
.byte $60,$27,$30,$03,$fb
.byte $60,$27,$40,$03,$fa
.byte $70,$27,$10,$03,$fa
.byte $70,$27,$20,$03,$fe
.byte $70,$27,$30,$03,$fc
.byte $80,$27,$20,$03,$fe
Expand Down Expand Up @@ -13825,7 +13820,7 @@ sprite_data_dearnostalgists:
.byte $40,$38,$38,$03,$0a
.byte $a0,$38,$50,$03,$13
.byte $e0,$38,$30,$03,$27
.byte $40,$39,$40,$03,$0b
.byte $30,$39,$40,$03,$0b
.byte $60,$39,$00,$03,$03
.byte $00,$3a,$10,$03,$97
.byte $40,$3a,$10,$03,$87
Expand Down Expand Up @@ -14841,7 +14836,7 @@ sprite_data_firetemple:
.byte $f0,$36,$70,$03,$0f
.byte $ff

.segment "LVL_BANK_22"
.segment "LVL_BANK_23"
sprite_data_foresttemple:
.byte $00,$00,$60,$03,$80
.byte $00,$00,$70,$03,$ba
Expand Down Expand Up @@ -15952,7 +15947,15 @@ sprite_data_luckydraw:
.byte $b0,$33,$60,$03,$0f
.byte $ff

.segment "LVL_BANK_1F"
.segment "LVL_BANK_0C"
sprite_data_test4:
.byte $50,$00,$60,$03,$24
.byte $c0,$03,$80,$01,$01
.byte $c0,$03,$90,$01,$6d
.byte $d0,$03,$80,$01,$fc
.byte $d0,$03,$90,$01,$fc
.byte $d0,$03,$a0,$01,$fc
.byte $60,$04,$a0,$01,$84
.byte $90,$04,$a0,$01,$94
.byte $10,$0a,$90,$01,$00
.byte $10,$0a,$a0,$01,$14
.byte $ff
2 changes: 1 addition & 1 deletion LEVELS/level_data_cache.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion SAUCE/defines/physics_defines.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#define ROBOT_JUMP_VEL (-0x2B0)
#define MINI_ROBOT_JUMP_VEL (-0x2B0)

#define CUBE_SPEED_SLOW 0x170
#define CUBE_SPEED_SLOW 0x16E
#define CUBE_SPEED_X05 0x23B
#define CUBE_SPEED_X1 0x2C4
#define CUBE_SPEED_X2 0x371
Expand Down
14 changes: 7 additions & 7 deletions fan level collection/Dear Nostalgists.tmx
View file

Large diffs are not rendered by default.

0 comments on commit 6a174b2

Please sign in to comment.