Skip to content

Commit 964ffa1

Browse files
committed
allocate enough space for waveforms in halt.asm
1 parent 6c94083 commit 964ffa1

File tree

2 files changed

+28
-26
lines changed

2 files changed

+28
-26
lines changed

src/halt.asm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ DS 1
2424
; $0144 - $0145: "New" Licensee Code, a two character name.
2525
DB "NF"
2626

27+
SECTION "Waveforms", WRAMX
28+
29+
waveforms: ds (16*256)
30+
2731
SECTION "Vars", WRAM0
2832

2933
instrument1: ds 6
@@ -36,8 +40,6 @@ subpattern2: ds (3*64)
3640
subpattern3: ds (3*64)
3741
subpattern4: ds (3*64)
3842

39-
waveforms: ds (16*16)
40-
4143
start_zero:
4244

4345
start_ch1: db

src/tracker.lfm

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
object frmTracker: TfrmTracker
2-
Left = 1769
2+
Left = 1827
33
Height = 712
4-
Top = 294
4+
Top = 290
55
Width = 1134
66
AllowDropFiles = True
77
Caption = 'hUGETracker'
@@ -78,7 +78,7 @@ object frmTracker: TfrmTracker
7878
Top = 8
7979
Width = 392
8080
Caption = 'Song information'
81-
ClientHeight = 173
81+
ClientHeight = 188
8282
ClientWidth = 388
8383
ParentFont = False
8484
TabOrder = 0
@@ -1350,7 +1350,7 @@ object frmTracker: TfrmTracker
13501350
Top = 8
13511351
Width = 568
13521352
Caption = 'Wave Editor'
1353-
ClientHeight = 120
1353+
ClientHeight = 135
13541354
ClientWidth = 564
13551355
ParentFont = False
13561356
TabOrder = 0
@@ -2139,7 +2139,7 @@ object frmTracker: TfrmTracker
21392139
ParentShowHint = False
21402140
end
21412141
object PanicToolButton: TToolButton
2142-
Left = 524
2142+
Left = 528
21432143
Hint = 'Stops all sound output'
21442144
Top = 0
21452145
AutoSize = True
@@ -2150,17 +2150,17 @@ object frmTracker: TfrmTracker
21502150
ShowHint = True
21512151
end
21522152
object ToolButton2: TToolButton
2153-
Left = 119
2153+
Left = 120
21542154
Top = 0
21552155
Action = PlayCursorAction
21562156
end
21572157
object ToolButton4: TToolButton
2158-
Left = 148
2158+
Left = 149
21592159
Top = 0
21602160
Action = StopAction
21612161
end
21622162
object ExportGBButton: TToolButton
2163-
Left = 243
2163+
Left = 246
21642164
Hint = 'Export the song as a standalone ROM'
21652165
Top = 0
21662166
AutoSize = True
@@ -2176,21 +2176,21 @@ object frmTracker: TfrmTracker
21762176
Style = tbsDivider
21772177
end
21782178
object ToolButton6: TToolButton
2179-
Left = 206
2179+
Left = 207
21802180
Height = 22
21812181
Top = 0
21822182
Caption = 'ToolButton6'
21832183
Style = tbsDivider
21842184
end
21852185
object ToolButton7: TToolButton
2186-
Left = 1066
2186+
Left = 1072
21872187
Height = 22
21882188
Top = 0
21892189
Caption = 'ToolButton7'
21902190
Style = tbsSeparator
21912191
end
21922192
object OctaveSpinEdit: TSpinEdit
2193-
Left = 632
2193+
Left = 638
21942194
Height = 27
21952195
Hint = 'The octave offset for entering new notes'
21962196
Top = 0
@@ -2201,14 +2201,14 @@ object frmTracker: TfrmTracker
22012201
TabOrder = 0
22022202
end
22032203
object ToolButton9: TToolButton
2204-
Left = 583
2204+
Left = 587
22052205
Height = 22
22062206
Top = 0
22072207
Caption = 'ToolButton9'
22082208
Style = tbsSeparator
22092209
end
22102210
object Label22: TLabel
2211-
Left = 589
2211+
Left = 595
22122212
Height = 22
22132213
Top = 0
22142214
Width = 43
@@ -2219,7 +2219,7 @@ object frmTracker: TfrmTracker
22192219
ParentFont = False
22202220
end
22212221
object Label23: TLabel
2222-
Left = 697
2222+
Left = 703
22232223
Height = 22
22242224
Top = 0
22252225
Width = 70
@@ -2230,7 +2230,7 @@ object frmTracker: TfrmTracker
22302230
ParentFont = False
22312231
end
22322232
object InstrumentComboBox: TComboBox
2233-
Left = 767
2233+
Left = 773
22342234
Height = 25
22352235
Hint = 'The selected instrument for new notes'
22362236
Top = 0
@@ -2248,7 +2248,7 @@ object frmTracker: TfrmTracker
22482248
OnChange = InstrumentComboBoxChange
22492249
end
22502250
object Label24: TLabel
2251-
Left = 981
2251+
Left = 987
22522252
Height = 22
22532253
Top = 0
22542254
Width = 35
@@ -2259,7 +2259,7 @@ object frmTracker: TfrmTracker
22592259
ParentFont = False
22602260
end
22612261
object StepSpinEdit: TSpinEdit
2262-
Left = 1016
2262+
Left = 1022
22632263
Height = 27
22642264
Hint = 'How many rows to step down after entering a new note'
22652265
Top = 0
@@ -2270,49 +2270,49 @@ object frmTracker: TfrmTracker
22702270
TabOrder = 2
22712271
end
22722272
object ToolButton3: TToolButton
2273-
Left = 90
2273+
Left = 91
22742274
Top = 0
22752275
Action = PlayStartAction
22762276
end
22772277
object ExportGBSButton: TToolButton
2278-
Left = 328
2278+
Left = 331
22792279
Hint = 'Export the song as a GBS soundtrack'
22802280
Top = 0
22812281
Caption = 'Export GBS'
22822282
ImageIndex = 80
22832283
OnClick = ExportGBSButtonClick
22842284
end
22852285
object ToolButton5: TToolButton
2286-
Left = 520
2286+
Left = 523
22872287
Height = 22
22882288
Top = 0
22892289
Caption = 'ToolButton5'
22902290
Style = tbsDivider
22912291
end
22922292
object ToolButton10: TToolButton
2293-
Left = 420
2293+
Left = 423
22942294
Hint = 'Export the song as WAV or MP3'
22952295
Top = 0
22962296
Caption = 'Render Song'
22972297
ImageIndex = 77
22982298
OnClick = ToolButton10Click
22992299
end
23002300
object ToolButton11: TToolButton
2301-
Left = 239
2301+
Left = 241
23022302
Height = 22
23032303
Top = 0
23042304
Caption = 'ToolButton11'
23052305
Style = tbsDivider
23062306
end
23072307
object LoopSongToolButton: TToolButton
2308-
Left = 210
2308+
Left = 212
23092309
Top = 0
23102310
ImageIndex = 87
23112311
OnClick = LoopSongToolButtonClick
23122312
Style = tbsCheck
23132313
end
23142314
object ToolButton12: TToolButton
2315-
Left = 177
2315+
Left = 178
23162316
Top = 0
23172317
Action = SingleStepAction
23182318
end

0 commit comments

Comments
 (0)