@gaialabs/iog-baserom 0.1.7 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,8 +1,9 @@
1
1
  ?BANK 03
2
2
 
3
- ?INCLUDE 'chunk_008000'
3
+ ?INCLUDE 'cop_handlers_actors'
4
4
  ?INCLUDE 'chunk_03BAE1'
5
- ?INCLUDE 'chunk_028000'
5
+ ?INCLUDE 'scene_script'
6
+ ?INCLUDE 'spc_transfer'
6
7
 
7
8
  !meta_next_id $0642
8
9
  !meta_current_id $0644
@@ -93,7 +94,7 @@ count_check {
93
94
 
94
95
  ---------------------------------------
95
96
 
96
- cop_handler_0A_0087C9 {
97
+ WriteApuIo0! {
97
98
  SEP #$20
98
99
  LDA msu_flag
99
100
  BEQ cop0A_normal ;Normal process when no MSU
@@ -140,7 +141,7 @@ cop_handler_0A_0087C9 {
140
141
  --------------------------------------
141
142
  ;Hook for SPC init
142
143
 
143
- func_02908E {
144
+ SpcLoadBuiltinEngine! {
144
145
  REP #$20
145
146
 
146
147
  LDA $2002
@@ -163,18 +164,18 @@ func_02908E {
163
164
  STZ msu_flag
164
165
 
165
166
  init_complete:
166
- LDX #$&binary_029210
167
+ LDX #$&spc_sound_engine
167
168
  STX $46
168
- LDA #$^binary_029210
169
+ LDA #$^spc_sound_engine
169
170
  STA $48
170
- JSR $&sub_02919B
171
+ JSR $&SpcIplHandshake
171
172
  RTL
172
173
  }
173
174
 
174
175
  --------------------------------------
175
176
  ;Hook for checking track changes before screen transition
176
177
 
177
- func_03D9F6 {
178
+ func_03D9F6! {
178
179
  LDA $0654
179
180
  BMI loc_03DA03
180
181
  BEQ loc_03DA00
@@ -222,8 +223,8 @@ func_03D9F6 {
222
223
 
223
224
  -----------------------------------------------
224
225
 
225
- loc_03DADC {
226
- JSL $@func_00811E
226
+ loc_03DADC! {
227
+ JSL $@UpdateFrameDialogue
227
228
  LDA $0DB6
228
229
  BEQ loc_03DAF1
229
230
  DEX
@@ -238,7 +239,7 @@ loc_03DADC {
238
239
 
239
240
  ----------------------------------------------
240
241
 
241
- loc_03DAF2 {
242
+ loc_03DAF2! {
242
243
  LDA token
243
244
  BEQ immed_skip
244
245
  BMI immed_bgm
@@ -253,7 +254,7 @@ loc_03DAF2 {
253
254
  STZ token
254
255
 
255
256
  immed_skip:
256
- JSL $@func_00811E
257
+ JSL $@UpdateFrameDialogue
257
258
  STZ $INIDISP
258
259
  RTS
259
260
  }
@@ -261,8 +262,8 @@ loc_03DAF2 {
261
262
  -------------------------------------------
262
263
  ;Mosaic mode
263
264
 
264
- loc_03DB05 {
265
- JSL $@func_00811E
265
+ loc_03DB05! {
266
+ JSL $@UpdateFrameDialogue
266
267
  DEX
267
268
  BPL loc_03DB05
268
269
  STA $INIDISP
@@ -284,7 +285,7 @@ loc_03DB05 {
284
285
 
285
286
  --------------------------------------------
286
287
 
287
- loc_03DB6F {
288
+ loc_03DB6F! {
288
289
  LDA $006E
289
290
  STA $00
290
291
  PHA
@@ -317,7 +318,7 @@ loc_03DB6F {
317
318
 
318
319
  -------------------------------------------------
319
320
 
320
- loc_03DBBC {
321
+ loc_03DBBC! {
321
322
  INC $006E
322
323
  STA $00
323
324
  PHA
@@ -326,7 +327,7 @@ loc_03DBBC {
326
327
  STA $6C
327
328
  PLA
328
329
  JSR $&sub_03DBF6
329
- JSL $@func_00811E
330
+ JSL $@UpdateFrameDialogue
330
331
  LDA $01, S
331
332
  DEC
332
333
  STA $01, S
@@ -352,7 +353,7 @@ loc_03DBBC {
352
353
  ---------------------------------------------
353
354
  ;Hook for fading music via COP 05
354
355
 
355
- func_03E1AA {
356
+ func_03E1AA! {
356
357
  SEP #$20
357
358
  LDA msu_flag
358
359
  BEQ cop_fade_normal ;Assume normal process when no MSU
@@ -383,7 +384,7 @@ func_03E1AA {
383
384
  }
384
385
 
385
386
 
386
- loc_03E1C1 {
387
+ loc_03E1C1! {
387
388
  SEP #$20
388
389
  LDA #$01
389
390
  STA $APUIO0
@@ -399,7 +400,7 @@ loc_03E1C1 {
399
400
  ---------------------------------------------
400
401
  ;Hook for stopping music via COP 04/05
401
402
 
402
- func_03E1D6 {
403
+ func_03E1D6! {
403
404
  SEP #$20
404
405
  LDA msu_flag
405
406
  BEQ bgm_load_wait ;Always skip APU silent since we are always branching to the standard load process
@@ -424,7 +425,7 @@ func_03E1D6 {
424
425
  ;RTL
425
426
  }
426
427
 
427
- loc_03E1EB {
428
+ loc_03E1EB! {
428
429
  ;COP [C2]
429
430
  ;SEP #$20
430
431
  ;LDA #$FF
@@ -441,7 +442,7 @@ loc_03E1EB {
441
442
  RTL
442
443
  }
443
444
 
444
- loc_03E208 {
445
+ loc_03E208! {
445
446
  COP [DA] ( #01 )
446
447
  ;SEP #$20
447
448
  ;LDA #$01
@@ -455,7 +456,7 @@ loc_03E208 {
455
456
 
456
457
  ---------------------------------------------
457
458
 
458
- func_03E21E {
459
+ func_03E21E! {
459
460
  LDX $06FA
460
461
  BEQ loc_03E254
461
462
  BMI loc_03E254
@@ -493,7 +494,7 @@ func_03E21E {
493
494
  ;STA $47
494
495
  ;STA $0688
495
496
  ;JSL $@func_028191
496
- ;JSL $@func_02909B
497
+ ;JSL $@SpcBlockTransfer
497
498
  ;JSL $@func_0281A2
498
499
 
499
500
  ;LDA $06FA
@@ -509,20 +510,20 @@ func_03E21E {
509
510
  }
510
511
 
511
512
 
512
- loc_03E254 {
513
+ loc_03E254! {
513
514
  RTL
514
515
  }
515
516
 
516
517
  ---------------------------------------------
517
518
  ;Hook for music asset loading (from scene_meta)
518
519
 
519
- func_028B6D {
520
- JSR $&sub_028CE7
520
+ SpcMusicLoadCmd! {
521
+ JSR $&ReadScriptByte
521
522
  PHA
522
- JSR $&sub_028CE7
523
+ JSR $&ReadScriptByte
523
524
  STA $06F4
524
525
  LDX #$003E
525
- JSR $&sub_028D8F
526
+ JSR $&LoadScriptPointer
526
527
  LDA $06F6
527
528
  CMP $06F4
528
529
  BEQ loc_028B88
@@ -530,16 +531,16 @@ func_028B6D {
530
531
  RTS
531
532
  }
532
533
 
533
- loc_028B88 {
534
+ loc_028B88! {
534
535
  PLA
535
536
  STA $06F2
536
537
  LDX #$0687
537
- JSR $&sub_028DC1
538
+ JSR $&CheckSourceCacheHit
538
539
  BCS loc_028B91
539
540
  RTS
540
541
  }
541
542
 
542
- loc_028B91 {
543
+ loc_028B91! {
543
544
  LDA $06F2
544
545
  BEQ bgm_check ;Always branch to halt when reset is loading
545
546
 
@@ -556,15 +557,15 @@ loc_028B91 {
556
557
 
557
558
  bgm_halt:
558
559
  LDA #$01
559
- JSL $@func_0281C9
560
+ JSL $@WaitFrames
560
561
  LDA #$F0
561
562
  STA $APUIO0
562
563
  LDA #$03
563
- JSL $@func_0281C9 ;For some reason this is required
564
+ JSL $@WaitFrames ;For some reason this is required
564
565
  LDA #$FF
565
566
  STA $APUIO0
566
567
  LDA #$02
567
- JSL $@func_0281C9
568
+ JSL $@WaitFrames
568
569
 
569
570
  bgm_init:
570
571
  LDA $0D72
@@ -583,9 +584,9 @@ loc_028B91 {
583
584
  ;STX $0687
584
585
  ;LDX $47
585
586
  ;STX $0688
586
- JSL $@func_02909B
587
+ JSL $@SpcBlockTransfer
587
588
  LDA #$03
588
- JSL $@func_0281C9
589
+ JSL $@WaitFrames
589
590
  LDA $06F2
590
591
  BEQ $02
591
592
  LDA #$01
@@ -1,9 +1,8 @@
1
1
  
2
2
  h_epilogue_thinker [
3
- h_thinker < #00, #08 > ;00
4
- ]
3
+ thinker_def < #00, #08, {
5
4
 
6
- e_epilogue_thinker {
5
+ e_epilogue_thinker:
7
6
  PHX
8
7
  LDA $0D8C
9
8
  XBA
@@ -28,18 +27,18 @@ e_epilogue_thinker {
28
27
  PLX
29
28
  COP [3D]
30
29
  RTL
31
- }
30
+ } > ]
32
31
 
33
32
 
34
33
  ------------------------------------------
35
34
  ?INCLUDE 'scene_thinkers'
36
35
  ------------------------------------------
37
36
 
38
- thinker_0CEA9B [
39
- thinker < #74, @thinker_00B520 > ;00
40
- thinker < #00, @thinker_00BCDF > ;01
41
- thinker < #00, @thinker_00BCB3 > ;02
42
- thinker < #24, @parallax_thinker > ;03
43
- thinker < #00, @h_epilogue_thinker > ;04
37
+ thinker_spawn_0CEA9B! [
38
+ thinker-spawn < #74, @ambient_palette_cycler > ;00
39
+ thinker-spawn < #00, @ending_comet_dma_setup > ;01
40
+ thinker-spawn < #00, @ending_comet_sine_hdma > ;02
41
+ thinker-spawn < #24, @parallax_thinker > ;03
42
+ thinker-spawn < #00, @h_epilogue_thinker > ;04
44
43
  ]
45
44
 
@@ -97,7 +97,7 @@ diary_ngp_confirm {
97
97
 
98
98
  COP [26] ( #08, #$0050, #$00A0, #00, #$1200 )
99
99
  LDA #$2800
100
- TRB $player_flags
100
+ TRB $playerFlags
101
101
  COP [E0]
102
102
  }
103
103
 
@@ -107,7 +107,7 @@ diary_ngp_str `[DLG:6,A][SIZ:A,5]Start Journey[N]Erase Trip Diary[N]Copy Tri
107
107
  ?INCLUDE 'sFA_diary_menu'
108
108
  --------------------------------------------------
109
109
 
110
- code_0BE23A {
110
+ code_0BE23A! {
111
111
  LDA #$0000
112
112
  STA $7F0A00
113
113
  SEP #$20
@@ -147,9 +147,9 @@ code_0BE23A {
147
147
  STA $068E
148
148
  STA $06C2
149
149
  LDA #$3000
150
- TSB $joypad_mask_std
150
+ TSB $joypadMaskStd
151
151
  LDA #$2800
152
- TSB $player_flags
152
+ TSB $playerFlags
153
153
  JSR $&sub_0BED64
154
154
  COP [BD] ( @asciistring_01EADC )
155
155
  LDA $20
@@ -162,7 +162,7 @@ code_0BE23A {
162
162
 
163
163
  diary_menu_continue:
164
164
  LDA #$0F00
165
- STA $joypad_mask_inv
165
+ STA $joypadMaskInv
166
166
  STZ $18
167
167
  COP [C1]
168
168
  LDA $0654
@@ -172,7 +172,7 @@ code_0BE23A {
172
172
 
173
173
  -----------------------------------------------
174
174
 
175
- code_0BE2F6 {
175
+ code_0BE2F6! {
176
176
  COP [06] ( #10 )
177
177
  LDA $20
178
178
  BEQ diary_main_dec_normal
@@ -192,7 +192,7 @@ diary_main_dec_normal {
192
192
 
193
193
  ------------------------------------------------
194
194
 
195
- func_0BE2CC {
195
+ func_0BE2CC! {
196
196
  LDA $20
197
197
  BEQ diary_print_normal
198
198
  COP [6B] ( &diary_ngp_str )
@@ -204,7 +204,7 @@ func_0BE2CC {
204
204
 
205
205
  ------------------------------------------------
206
206
 
207
- code_0BE30F {
207
+ code_0BE30F! {
208
208
  COP [06] ( #10 )
209
209
  LDA $20
210
210
  BEQ diary_main_inc_normal
@@ -226,7 +226,7 @@ diary_main_inc_normal {
226
226
 
227
227
  -----------------------------------------------
228
228
 
229
- code_0BE32B {
229
+ code_0BE32B! {
230
230
  COP [06] ( #11 )
231
231
  LDA $0656
232
232
  ORA $0658
@@ -239,7 +239,7 @@ code_0BE32B {
239
239
  COP [D9] ( #$0000, &code_list_0BE34C )
240
240
  }
241
241
 
242
- code_list_0BE34C [
242
+ code_list_0BE34C! [
243
243
  &code_0BE354 ;00
244
244
  &code_0BEA55 ;01
245
245
  &func_0BE8A8 ;02
@@ -250,7 +250,7 @@ code_list_0BE34C [
250
250
  -----------------------------------------------
251
251
  ;Code for loading diary data into temp variables
252
252
 
253
- sub_0BED64 {
253
+ sub_0BED64! {
254
254
  PHX
255
255
  LDA #$0000
256
256
  STA $0D74
@@ -281,10 +281,10 @@ sub_0BED64 {
281
281
  LDA #$0000
282
282
  STA $306000
283
283
 
284
- loc_0BEDA3:
284
+ loc_0BEDA3!:
285
285
  STA $0D8C
286
286
 
287
- code_0BEDA6:
287
+ code_0BEDA6!:
288
288
  LDA $24
289
289
  XBA
290
290
  ASL
@@ -360,7 +360,7 @@ sub_0BED64 {
360
360
  SEC
361
361
  }
362
362
 
363
- loc_0BEE11 {
363
+ loc_0BEE11! {
364
364
  }
365
365
 
366
366
 
@@ -369,10 +369,10 @@ loc_0BEE11 {
369
369
  ------------------------------------------------
370
370
  ;Enable 5th menu option highlight
371
371
 
372
- loc_00BC45 {
372
+ loc_00BC45! {
373
373
  DEC
374
374
  BNE code_extra
375
- COP [02] ( @dma_data_00BC8D, #26 )
375
+ COP [02] ( @dma_channel_00BC8D, #26 )
376
376
  RTL
377
377
  }
378
378
 
@@ -382,8 +382,8 @@ code_extra {
382
382
  }
383
383
 
384
384
  dma_data_extra [
385
- dma_data < #10, #FF, #00 > ;00
386
- dma_data < #7F, #FF, #00 > ;00
387
- dma_data < #0F, #30, #D0 > ;01
388
- dma_data < #60, #FF, #00 > ;02
385
+ dma-channel < #10, #FF, #00 > ;00
386
+ dma-channel < #7F, #FF, #00 > ;00
387
+ dma-channel < #0F, #30, #D0 > ;01
388
+ dma-channel < #60, #FF, #00 > ;02
389
389
  ]
@@ -58,7 +58,7 @@ run_store_ew:
58
58
  --------------------------------------
59
59
 
60
60
  ;Fix Y button mapping for style 1
61
- loc_0BE695 {
61
+ loc_0BE695! {
62
62
  LDA #$0040
63
63
  STA $0DB0
64
64
  LDA $0B26
@@ -71,9 +71,9 @@ loc_0BE695 {
71
71
  STA $0DAE
72
72
  }
73
73
 
74
- loc_0BE6B3 {
74
+ loc_0BE6B3! {
75
75
  RTS
76
76
  }
77
77
 
78
- widestring_0BF538 `[DLG:6,8][SIZ:A,8][SKP:2]Change Snd/Buttons[N]End Changes[N]Sound[N][LU2:2]Type[N][SKP:5] :Attack/Talk[N][SKP:5] :Item/Cancel[N][SKP:5] :Item Menu[N][SKP:5] :Sprint`
79
- widestring_0BF5AD `[DLG:6,8][SIZ:A,8]Arrangement OK?[N]Start Journey[N]Sound[N][LU2:2]Type[N][SKP:5] :Attack/Talk[N][SKP:5] :Item/Cancel[N][SKP:5] :Item Menu[N][SKP:5] :Sprint`
78
+ widestring_0BF538! `[DLG:6,8][SIZ:A,8][SKP:2]Change Snd/Buttons[N]End Changes[N]Sound[N][LU2:2]Type[N][SKP:5] :Attack/Talk[N][SKP:5] :Item/Cancel[N][SKP:5] :Item Menu[N][SKP:5] :Sprint`
79
+ widestring_0BF5AD! `[DLG:6,8][SIZ:A,8]Arrangement OK?[N]Start Journey[N]Sound[N][LU2:2]Type[N][SKP:5] :Attack/Talk[N][SKP:5] :Item/Cancel[N][SKP:5] :Item Menu[N][SKP:5] :Sprint`
@@ -20,7 +20,7 @@ sfx_table:
20
20
  #@sfx38 #@sfx39 #@sfx3A #@sfx3B
21
21
 
22
22
 
23
- code_0290C9:
23
+ code_0290C9!:
24
24
  ;REP #$20
25
25
  LDX #&sfx_table
26
26
  STX SAMPLE_PTR
@@ -37,7 +37,7 @@ sfx_table:
37
37
  BEQ loc_0290E8
38
38
  JMP $&code_029153
39
39
 
40
- loc_0290F1:
40
+ loc_0290F1!:
41
41
  LDA SAMPLE_NUM
42
42
  ASL
43
43
  CLC
@@ -62,11 +62,11 @@ sfx_table:
62
62
  LDA SPC_CMD
63
63
  BRA loc_029160
64
64
 
65
- loc_02911D:
65
+ loc_02911D!:
66
66
  LDA [SAMPLE_PTR], Y
67
67
  INY
68
68
 
69
- loc_02912C:
69
+ loc_02912C!:
70
70
  XBA
71
71
  LDA [SAMPLE_PTR], Y
72
72
  INY
@@ -1,40 +1,13 @@
1
1
  ?BANK 02
2
2
 
3
- ?INCLUDE 'chunk_028000'
3
+ ?INCLUDE 'scene_script'
4
4
  ?INCLUDE 'scene_meta'
5
5
 
6
6
  !scene_current 0644
7
7
 
8
8
  ----------------------------------------
9
9
 
10
- ;meta_jump_table:
11
- ; &loc_028D44
12
- ; #$0000
13
- ; &loc_028D83
14
- ; &loc_028D7D
15
- ; &loc_028D7E
16
- ; &loc_028D7D
17
- ; &loc_028D80
18
- ; #$0000
19
- ; #$0000
20
- ; #$0000
21
- ; #$0000
22
- ; #$0000
23
- ; #$0000
24
- ; #$0000
25
- ; &loc_028D81
26
- ; #$0000
27
- ; &loc_028D7E ;10
28
- ; &loc_028D7F
29
- ; &loc_028D8D
30
- ; &loc_028D82
31
- ; &loc_028D86
32
- ; &loc_028D83
33
-
34
-
35
- --------------------------------
36
-
37
- sub_028CF2 {
10
+ FindCurrentScene! {
38
11
  REP #$20
39
12
  LDA $scene_current
40
13
  ASL
@@ -46,22 +19,22 @@ sub_028CF2 {
46
19
  SEP #$20
47
20
  RTS
48
21
 
49
- loc_028CF5:
50
- loc_028CFF:
51
- loc_028D34:
52
- loc_028D35:
53
- loc_028D36:
54
- loc_028D37:
55
- loc_028D38:
56
- loc_028D39:
57
- loc_028D3A:
22
+ loc_028CF5!:
23
+ loc_028CFF!:
24
+ loc_028D34!:
25
+ loc_028D35!:
26
+ loc_028D36!:
27
+ loc_028D37!:
28
+ loc_028D38!:
29
+ loc_028D39!:
30
+ loc_028D3A!:
58
31
  }
59
32
 
60
33
  -----------------------------------------
61
34
  ;Utilize the new label jump table
62
35
 
63
- func_028D3D {
64
- JSR $&sub_028CE7
36
+ SkipScriptCommands! {
37
+ JSR $&ReadScriptByte
65
38
  REP #$20
66
39
  ASL
67
40
  TAX
@@ -72,31 +45,8 @@ func_028D3D {
72
45
  SEP #$20
73
46
  RTS
74
47
 
75
- ;PHX
76
- ;PHA
77
- ;REP #$20
78
- ;LDA [$3A]
79
- ;SEC
80
- ;SBC $3A
81
- ;TAY
82
- ;SEP #$20
83
- ;LDA #$00
84
- ;XBA
85
-
86
- loc_028D44:
87
- ;INY
88
- ;INY
89
-
90
- loc_028D46:
91
- ;LDA [$3A], Y
92
- ;INY
93
- ;ASL
94
- ;TAX
95
- ;JMP (&meta_jump_table, X)
96
-
97
- loc_028D8D:
98
- ;PLA
99
- ;PLX
100
- ;RTS
48
+ loc_028D44!:
49
+ loc_028D46!:
50
+ loc_028D8D!:
101
51
  }
102
52
 
@@ -3,11 +3,9 @@
3
3
 
4
4
  --------------------------------------------
5
5
 
6
- h_actor < #0A, #00, #10 >
7
-
8
- --------------------------------------------
9
-
10
- skyd_main {
6
+ actor_def < #0A, #00, #10, {
7
+
8
+ skyd_main {
11
9
  COP [D0] ( #8D, #00, &skyd_destroy )
12
10
  COP [C0] ( &skyd_interact )
13
11
  COP [0B]
@@ -41,6 +39,7 @@ skyd_main {
41
39
  COP [26] ( #78, #$0160, #$0268, #07, #$4500 )
42
40
  RTL
43
41
  }
42
+ } >
44
43
 
45
44
  skyd_str_intro `[DEF]I'm the Sky Deliveryman. [N]My tame birds [LU1:EF][LU1:E7][N]you to [LU1:85]towns. [FIN]Do you [LU1:F1]to[N]go to Watermia?[N] Quit[N] Go`
46
45
  skyd_str_cancel `[CLR]OK. In [LU1:D7]case,[N]use [LU1:E6]later.[END]`
@@ -1,12 +1,12 @@
1
1
  ?BANK 02
2
2
 
3
- ?INCLUDE 'chunk_028000'
3
+ ?INCLUDE 'scene_script'
4
4
 
5
5
  !SPTR $3E
6
6
 
7
7
  -----------------------------------------------------
8
8
 
9
- func_028BE4 {
9
+ SceneCmd_LoadSpriteTiles! {
10
10
  PHP
11
11
  REP #$20
12
12
  ;LDA [$3A], Y
@@ -16,7 +16,7 @@ func_028BE4 {
16
16
  INY
17
17
  INY
18
18
  LDX #$003E
19
- JSR $&sub_028D8F
19
+ JSR $&LoadScriptPointer
20
20
  LDA [$3E]
21
21
  BPL store_size
22
22
 
@@ -28,7 +28,7 @@ func_028BE4 {
28
28
  STA $0666
29
29
 
30
30
  LDX #$0684
31
- JSR $&sub_028DC1
31
+ JSR $&CheckSourceCacheHit
32
32
  BCC loc_028C19
33
33
  REP #$20
34
34
  LDA [$3E]
@@ -41,5 +41,5 @@ func_028BE4 {
41
41
  SEP #$20
42
42
  LDX #$4000
43
43
  STX $7A
44
- JSL $@func_028270
44
+ JSL $@QuintetLzDecompress
45
45
  }