Skip to content

Commit bb5fc64

Browse files
queueRAMqueueRAM
committed
Rename SM64 config geo layout sections to match MIO0 blocks
1 parent 11bd489 commit bb5fc64

2 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎configs/sm64.j.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ ranges:
547547
- [0x12878, "tex.rgba", 16, 32, 32]
548548
- [0x13128, "tex.ia", 16, 32, 64]
549549
- [0x14FF70, 0x1505D0, "sm64.geo", "klepto_eyerock_pokey"]
550-
- [0x1505D0, 0x15E6E0, "mio0", "mole_monkey_fwoosh"]:
550+
- [0x1505D0, 0x15E6E0, "mio0", "mole_ukiki_fwoosh"]:
551551
- [0x00040, "tex.ia", 16, 32, 32]
552552
- [0x00970, "tex.rgba", 16, 32, 32]
553553
- [0x01170, "tex.rgba", 16, 32, 32]
@@ -560,7 +560,7 @@ ranges:
560560
- [0x09BC0, "tex.rgba", 16, 32, 32]
561561
- [0x0A3C0, "tex.rgba", 16, 32, 32]
562562
- [0x15808, "tex.ia", 16, 32, 32]
563-
- [0x15E6E0, 0x15EA70, "sm64.geo", "mole_monkey_fwoosh"]
563+
- [0x15E6E0, 0x15EA70, "sm64.geo", "mole_ukiki_fwoosh"]
564564
- [0x15EA70, 0x163AE0, "mio0", "spindrift_penguin_snowman"]:
565565
- [0x006D0, "tex.rgba", 16, 32, 32]
566566
- [0x00ED0, "tex.rgba", 16, 32, 32]
@@ -694,7 +694,7 @@ ranges:
694694
- [0x58AC0, "tex.rgba", 16, 32, 64]
695695
- [0x59AC0, "tex.ia", 16, 32, 32]
696696
- [0x1B7400, 0x1B8010, "sm64.geo", "bowser_flames_bomb"]
697-
- [0x1B8010, 0x1C2100, "mio0", "skeeter_fish_treasurechest"]:
697+
- [0x1B8010, 0x1C2100, "mio0", "skeeter_fish_manta_treasurechest"]:
698698
- [0x00090, "tex.rgba", 16, 32, 32]
699699
- [0x00890, "tex.rgba", 16, 16, 8]
700700
- [0x07E10, "tex.rgba", 16, 32, 32]
@@ -714,7 +714,7 @@ ranges:
714714
- [0x147A8, "tex.rgba", 16, 32, 32]
715715
- [0x14FA8, "tex.rgba", 16, 32, 32]
716716
- [0x157A8, "tex.rgba", 16, 64, 32]
717-
- [0x1C2100, 0x1C2580, "sm64.geo", "skeeter_fish_treasurechest"]
717+
- [0x1C2100, 0x1C2580, "sm64.geo", "skeeter_fish_manta_treasurechest"]
718718
- [0x1C2580, 0x1D5FE0, "mio0", "koopa_log_piranha_whomp_chomp"]:
719719
- [0x00048, "tex.rgba", 16, 32, 32]
720720
- [0x01050, "tex.rgba", 16, 32, 32]

‎configs/sm64.u.yaml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ ranges:
342342
- [0x162B8, "tex.ia" , 16, 32, 32]
343343
- [0x16AB8, "tex.rgba", 16, 32, 32]
344344
- [0x17698, "tex.ia" , 8, 8, 8] # up arrow
345-
- [0x114750, 0x1279B0, "mio0", "mario"]:
345+
- [0x114750, 0x1279B0, "mio0", "mario_water_sparkles"]:
346346
- [0x00090, "tex.rgba", 16, 64, 32]
347347
- [0x01090, "tex.rgba", 16, 32, 32]
348348
- [0x01890, "tex.rgba", 16, 32, 32]
@@ -391,8 +391,8 @@ ranges:
391391
- [0x33A88, "tex.ia" , 16, 32, 32]
392392
- [0x34288, "tex.ia" , 16, 32, 32]
393393
- [0x34A88, "tex.ia" , 16, 32, 32]
394-
- [0x1279B0, 0x12A7E0, "sm64.geo", "water_sparkles_mario"]
395-
- [0x12A7E0, 0x132850, "mio0", "yoshiegg_owl_thwomp"]:
394+
- [0x1279B0, 0x12A7E0, "sm64.geo", "mario_water_sparkles"]
395+
- [0x12A7E0, 0x132850, "mio0", "hoot_thwomp_bullet_heave"]:
396396
- [0x00040, "tex.rgba", 16, 32, 32]
397397
- [0x00A20, "tex.rgba", 16, 32, 32]
398398
- [0x01E50, "tex.rgba", 16, 32, 32]
@@ -415,14 +415,14 @@ ranges:
415415
- [0x109C8, "tex.rgba", 16, 32, 32]
416416
- [0x111C8, "tex.rgba", 16, 16, 16]
417417
- [0x113C8, "tex.rgba", 16, 32, 32]
418-
- [0x132850, 0x132C60, "sm64.geo", "owl_thwomp_bullet_heave"]
419-
- [0x132C60, 0x134A70, "mio0", "big_bully"]:
418+
- [0x132850, 0x132C60, "sm64.geo", "hoot_thwomp_bullet_heave"]
419+
- [0x132C60, 0x134A70, "mio0", "bully_blargg"]:
420420
- [0x000E0, "tex.rgba", 16, 16, 16]
421421
- [0x00468, "tex.rgba", 16, 32, 64]
422422
- [0x01468, "tex.rgba", 16, 32, 64]
423423
- [0x02468, "tex.rgba", 16, 32, 32]
424424
- [0x134A70, 0x134D20, "sm64.geo", "bully_blargg"]
425-
- [0x134D20, 0x13B5D0, "mio0", "bobombs"]:
425+
- [0x134D20, 0x13B5D0, "mio0", "bobombs_bubble"]:
426426
- [0x00078, "tex.rgba", 16, 32, 64]
427427
- [0x01078, "tex.rgba", 16, 32, 64]
428428
- [0x02078, "tex.rgba", 16, 32, 32]
@@ -435,8 +435,8 @@ ranges:
435435
- [0x08478, "tex.rgba", 16, 32, 64]
436436
- [0x09478, "tex.rgba", 16, 32, 64]
437437
- [0x0FE80, "tex.rgba", 16, 32, 32]
438-
- [0x13B5D0, 0x13B910, "sm64.geo", "kingbobomb_bubble"]
439-
- [0x13B910, 0x145C10, "mio0", "sea_creatures_texture"]:
438+
- [0x13B5D0, 0x13B910, "sm64.geo", "bobombs_bubble"]
439+
- [0x13B910, 0x145C10, "mio0", "sea_creatures"]:
440440
- [0x00030, "tex.rgba", 16, 32, 32]
441441
- [0x00830, "tex.rgba", 16, 32, 32]
442442
- [0x017A0, "tex.rgba", 16, 32, 32]
@@ -454,7 +454,7 @@ ranges:
454454
- [0x0C3A0, "tex.rgba", 16, 32, 32]
455455
- [0x12848, "tex.ia" , 16, 32, 64]
456456
- [0x145C10, 0x145E90, "sm64.geo", "sea_creatures"]
457-
- [0x145E90, 0x151B70, "mio0", "vulture_pokey"]:
457+
- [0x145E90, 0x151B70, "mio0", "klepto_eyerock_pokey"]:
458458
- [0x00008, "tex.rgba", 16, 32, 32]
459459
- [0x00808, "tex.rgba", 16, 32, 32]
460460
- [0x01008, "tex.rgba", 16, 32, 64]
@@ -470,7 +470,7 @@ ranges:
470470
- [0x12878, "tex.rgba", 16, 32, 32]
471471
- [0x13128, "tex.ia" , 16, 32, 64]
472472
- [0x151B70, 0x1521D0, "sm64.geo", "klepto_eyerock_pokey"]
473-
- [0x1521D0, 0x1602E0, "mio0", "monkey"]:
473+
- [0x1521D0, 0x1602E0, "mio0", "mole_ukiki_fwoosh"]:
474474
- [0x00040, "tex.ia" , 16, 32, 32]
475475
- [0x00970, "tex.rgba", 16, 32, 32]
476476
- [0x01170, "tex.rgba", 16, 32, 32]
@@ -483,7 +483,7 @@ ranges:
483483
- [0x09BC0, "tex.rgba", 16, 32, 32]
484484
- [0x0A3C0, "tex.rgba", 16, 32, 32]
485485
- [0x15808, "tex.ia" , 16, 32, 32]
486-
- [0x1602E0, 0x160670, "sm64.geo", "mole_monkey_fwoosh"]
486+
- [0x1602E0, 0x160670, "sm64.geo", "mole_ukiki_fwoosh"]
487487
- [0x160670, 0x1656E0, "mio0", "spindrift_penguin_snowman"]:
488488
- [0x006D0, "tex.rgba", 16, 32, 32]
489489
- [0x00ED0, "tex.rgba", 16, 32, 32]
@@ -500,14 +500,14 @@ ranges:
500500
- [0x0A470, "tex.rgba", 16, 32, 64]
501501
- [0x0B470, "tex.rgba", 16, 32, 32]
502502
- [0x0BC70, "tex.rgba", 16, 32, 32]
503-
- [0x1656E0, 0x165A50, "sm64.geo", "spindrift_penguin_blizzard"]
504-
- [0x165A50, 0x166BD0, "mio0", "checkerboard_question"]:
503+
- [0x1656E0, 0x165A50, "sm64.geo", "spindrift_penguin_snowman"]
504+
- [0x165A50, 0x166BD0, "mio0", "capswitch_springboard"]:
505505
- [0x00018, "tex.rgba", 16, 32, 32]
506506
- [0x00818, "tex.rgba", 16, 32, 32]
507507
- [0x01C48, "tex.ia" , 16, 32, 64]
508508
- [0x02C48, "tex.rgba", 16, 16, 4]
509-
- [0x166BD0, 0x166C60, "sm64.geo", "cap_switch"]
510-
- [0x166C60, 0x16D5C0, "mio0", "piano_books"]:
509+
- [0x166BD0, 0x166C60, "sm64.geo", "capswitch_springboard"]
510+
- [0x166C60, 0x16D5C0, "mio0", "boo_bookend_chair_piano"]:
511511
- [0x00060, "tex.rgba", 16, 16, 32]
512512
- [0x00460, "tex.rgba", 16, 16, 32]
513513
- [0x00860, "tex.rgba", 16, 16, 32]
@@ -530,8 +530,8 @@ ranges:
530530
- [0x0D288, "tex.rgba", 16, 32, 16]
531531
- [0x0D688, "tex.rgba", 16, 32, 16]
532532
- [0x0DA88, "tex.rgba", 16, 32, 32]
533-
- [0x16D5C0, 0x16D870, "sm64.geo", "bookend_chair_piano_boo"]
534-
- [0x16D870, 0x180540, "mio0", "peach_toadstool"]:
533+
- [0x16D5C0, 0x16D870, "sm64.geo", "boo_bookend_chair_piano"]
534+
- [0x16D870, 0x180540, "mio0", "peach_toadstool_yoshi_birds"]:
535535
- [0x00A28, "tex.rgba", 16, 32, 32]
536536
- [0x01228, "tex.rgba", 16, 32, 32]
537537
- [0x01A28, "tex.rgba", 16, 32, 32]
@@ -545,8 +545,8 @@ ranges:
545545
- [0x1C588, "tex.rgba", 16, 16, 16]
546546
- [0x1C788, "tex.rgba", 16, 16, 16]
547547
- [0x1C988, "tex.rgba", 16, 16, 16]
548-
- [0x180540, 0x180BB0, "sm64.geo", "birds_peach_yoshi"]
549-
- [0x180BB0, 0x187FA0, "mio0", "enemy"]:
548+
- [0x180540, 0x180BB0, "sm64.geo", "peach_toadstool_yoshi_birds"]
549+
- [0x180BB0, 0x187FA0, "mio0", "bubba_wiggler_lakitu"]:
550550
- [0x00008, "tex.rgba", 16, 16, 32]
551551
- [0x00408, "tex.rgba", 16, 64, 32]
552552
- [0x01408, "tex.rgba", 16, 32, 32]
@@ -565,7 +565,7 @@ ranges:
565565
- [0x114E0, "tex.rgba", 16, 32, 32]
566566
- [0x11CE0, "tex.rgba", 16, 32, 32]
567567
- [0x187FA0, 0x188440, "sm64.geo", "bubba_wiggler_lakitu"]
568-
- [0x188440, 0x1B9070, "mio0", "bowser"]:
568+
- [0x188440, 0x1B9070, "mio0", "bowser_flames_bomb"]:
569569
- [0x00000, "tex.rgba", 16, 64, 64]
570570
- [0x02000, "tex.rgba", 16, 64, 64]
571571
- [0x04000, "tex.rgba", 16, 64, 64]
@@ -617,7 +617,7 @@ ranges:
617617
- [0x58C10, "tex.rgba", 16, 32, 64]
618618
- [0x59C10, "tex.ia" , 16, 32, 32]
619619
- [0x1B9070, 0x1B9CC0, "sm64.geo", "bowser_flames_bomb"]
620-
- [0x1B9CC0, 0x1C3DB0, "mio0", "treasure_chest_fish"]:
620+
- [0x1B9CC0, 0x1C3DB0, "mio0", "skeeter_fish_manta_treasurechest"]:
621621
- [0x00090, "tex.rgba", 16, 32, 32]
622622
- [0x00890, "tex.rgba", 16, 16, 8]
623623
- [0x07E10, "tex.rgba", 16, 32, 32]
@@ -637,8 +637,8 @@ ranges:
637637
- [0x147A8, "tex.rgba", 16, 32, 32]
638638
- [0x14FA8, "tex.rgba", 16, 32, 32]
639639
- [0x157A8, "tex.rgba", 16, 64, 32]
640-
- [0x1C3DB0, 0x1C4230, "sm64.geo", "skeeter_fish_manta_chest"]
641-
- [0x1C4230, 0x1D7C90, "mio0", "koopa_whomp"]:
640+
- [0x1C3DB0, 0x1C4230, "sm64.geo", "skeeter_fish_manta_treasurechest"]
641+
- [0x1C4230, 0x1D7C90, "mio0", "koopa_log_piranha_whomp_chomp"]:
642642
- [0x00048, "tex.rgba", 16, 32, 32]
643643
- [0x01050, "tex.rgba", 16, 32, 32]
644644
- [0x01850, "tex.rgba", 16, 32, 32]
@@ -666,7 +666,7 @@ ranges:
666666
- [0x22BD0, "tex.rgba", 16, 32, 32]
667667
- [0x233D0, "tex.rgba", 16, 32, 32]
668668
- [0x1D7C90, 0x1D8310, "sm64.geo", "koopa_log_piranha_whomp_chomp"]
669-
- [0x1D8310, 0x1E4BF0, "mio0", "lakitu_toad"]:
669+
- [0x1D8310, 0x1E4BF0, "mio0", "lakitu_toad_mips_boo"]:
670670
- [0x00000, "tex.rgba", 16, 32, 32]
671671
- [0x00800, "tex.rgba", 16, 64, 32]
672672
- [0x01800, "tex.rgba", 16, 64, 32]
@@ -685,8 +685,8 @@ ranges:
685685
- [0x02060, "tex.rgba", 16, 32, 32]
686686
- [0x039B0, "tex.rgba", 16, 64, 32]
687687
- [0x049B0, "tex.rgba", 16, 32, 32]
688-
- [0x1E7D90, 0x1E7EE0, "sm64.geo", "moneybag"]
689-
- [0x1E7EE0, 0x1F1B30, "mio0", "mri_swoop"]:
688+
- [0x1E7D90, 0x1E7EE0, "sm64.geo", "chillychief_moneybag"]
689+
- [0x1E7EE0, 0x1F1B30, "mio0", "mri_swoop_snufit_dorrie_scuttlebug"]:
690690
- [0x00080, "tex.rgba", 16, 32, 64]
691691
- [0x01080, "tex.rgba", 16, 32, 64]
692692
- [0x02170, "tex.rgba", 16, 32, 32]
@@ -710,7 +710,7 @@ ranges:
710710
- [0x12908, "tex.rgba", 16, 32, 32]
711711
- [0x13108, "tex.rgba", 16, 32, 32]
712712
- [0x1F1B30, 0x1F2200, "sm64.geo", "mri_swoop_snufit_dorrie_scuttlebug"]
713-
- [0x1F2200, 0x2008D0, "mio0", "chuckya_shyguy_goomba"]:
713+
- [0x1F2200, 0x2008D0, "mio0", "amp_chuckya_shyguy_goomba_boxes"]:
714714
- [0x00018, "tex.rgba", 16, 32, 16]
715715
- [0x00418, "tex.rgba", 16, 32, 32]
716716
- [0x00F18, "tex.rgba", 16, 16, 32]
@@ -757,8 +757,8 @@ ranges:
757757
- [0x25A80, "tex.rgba", 16, 16, 32]
758758
- [0x274A0, "tex.rgba", 16, 32, 32]
759759
- [0x27CA0, "tex.rgba", 16, 32, 32]
760-
- [0x2008D0, 0x201410, "sm64.geo", "cannon_box_switch_enemies"]
761-
- [0x201410, 0x218DA0, "mio0", "doors_trees_coins"]:
760+
- [0x2008D0, 0x201410, "sm64.geo", "amp_chuckya_shyguy_goomba_boxes"]
761+
- [0x201410, 0x218DA0, "mio0", "coins_pipe_doors_maps_trees"]:
762762
- [0x00080, "tex.ia" , 16, 32, 32]
763763
- [0x00A08, "tex.rgba", 16, 32, 32]
764764
- [0x01208, "tex.rgba", 16, 32, 32]

0 commit comments

Comments
 (0)