diff --git a/assets/ymls/us/actors/bowser.yml b/assets/ymls/us/actors/bowser.yml index d7d5e31b..e2f2b8bf 100644 --- a/assets/ymls/us/actors/bowser.yml +++ b/assets/ymls/us/actors/bowser.yml @@ -238,6 +238,7 @@ bowser_upper_face: format: RGBA16 symbol: bowser_seg6_texture_06028438 + bowser_seg6_lights_06038C38: type: LIGHTS size: 24 @@ -560,498 +561,498 @@ bowser_seg6_dl_0603B948: bowser_seg6_vertex_0603B948: type: VTX count: 16 - offset: 0x3B948 + offset: 0x3B9C8 symbol: bowser_seg6_vertex_0603B948 bowser_seg6_vertex_0603BA48: type: VTX count: 11 - offset: 0x3BA48 + offset: 0x3BAC8 symbol: bowser_seg6_vertex_0603BA48 bowser_seg6_vertex_0603BAF8: type: VTX count: 16 - offset: 0x3BAF8 + offset: 0x3BB78 symbol: bowser_seg6_vertex_0603BAF8 bowser_seg6_vertex_0603BBF8: type: VTX count: 10 - offset: 0x3BBF8 + offset: 0x3BC78 symbol: bowser_seg6_vertex_0603BBF8 bowser_seg6_vertex_0603BC98: type: VTX count: 15 - offset: 0x3BC98 + offset: 0x3BD18 symbol: bowser_seg6_vertex_0603BC98 bowser_seg6_vertex_0603BD88: type: VTX count: 7 - offset: 0x3BD88 + offset: 0x3BE08 symbol: bowser_seg6_vertex_0603BD88 bowser_seg6_dl_0603BDF8: type: GFX - offset: 0x3BDF8 + offset: 0x3BE78 symbol: bowser_seg6_dl_0603BDF8 bowser_seg6_dl_0603BEA0: type: GFX - offset: 0x3BEA0 + offset: 0x3BF20 symbol: bowser_seg6_dl_0603BEA0 bowser_seg6_dl_0603BF48: type: GFX - offset: 0x3BF48 + offset: 0x3BFC8 symbol: bowser_seg6_dl_0603BF48 bowser_seg6_dl_0603BFC8: type: GFX - offset: 0x3BFC8 + offset: 0x3C048 symbol: bowser_seg6_dl_0603BFC8 bowser_seg6_vertex_0603C050: type: VTX count: 16 - offset: 0x3C050 + offset: 0x3C0D0 symbol: bowser_seg6_vertex_0603C050 bowser_seg6_vertex_0603C150: type: VTX count: 11 - offset: 0x3C150 + offset: 0x3C1D0 symbol: bowser_seg6_vertex_0603C150 bowser_seg6_vertex_0603C200: type: VTX count: 16 - offset: 0x3C200 + offset: 0x3C280 symbol: bowser_seg6_vertex_0603C200 bowser_seg6_vertex_0603C300: type: VTX count: 10 - offset: 0x3C300 + offset: 0x3C380 symbol: bowser_seg6_vertex_0603C300 bowser_seg6_vertex_0603C3A0: type: VTX count: 15 - offset: 0x3C3A0 + offset: 0x3C420 symbol: bowser_seg6_vertex_0603C3A0 bowser_seg6_vertex_0603C490: type: VTX count: 7 - offset: 0x3C490 + offset: 0x3C510 symbol: bowser_seg6_vertex_0603C490 bowser_seg6_dl_0603C500: type: GFX - offset: 0x3C500 + offset: 0x3C580 symbol: bowser_seg6_dl_0603C500 bowser_seg6_dl_0603C5A8: type: GFX - offset: 0x3C5A8 + offset: 0x3C628 symbol: bowser_seg6_dl_0603C5A8 bowser_seg6_dl_0603C650: type: GFX - offset: 0x3C650 + offset: 0x3C6D0 symbol: bowser_seg6_dl_0603C650 bowser_seg6_dl_0603C6D0: type: GFX - offset: 0x3C6D0 + offset: 0x3C750 symbol: bowser_seg6_dl_0603C6D0 bowser_seg6_vertex_0603C758: type: VTX count: 15 - offset: 0x3C758 + offset: 0x3C7D8 symbol: bowser_seg6_vertex_0603C758 bowser_seg6_vertex_0603C848: type: VTX count: 16 - offset: 0x3C848 + offset: 0x3C8C8 symbol: bowser_seg6_vertex_0603C848 bowser_seg6_vertex_0603C948: type: VTX count: 16 - offset: 0x3C948 + offset: 0x3C9C8 symbol: bowser_seg6_vertex_0603C948 bowser_seg6_vertex_0603CA48: type: VTX count: 14 - offset: 0x3CA48 + offset: 0x3CAC8 symbol: bowser_seg6_vertex_0603CA48 bowser_seg6_vertex_0603CB28: type: VTX count: 15 - offset: 0x3CB28 + offset: 0x3CBA8 symbol: bowser_seg6_vertex_0603CB28 bowser_seg6_vertex_0603CC18: type: VTX count: 14 - offset: 0x3CC18 + offset: 0x3CC98 symbol: bowser_seg6_vertex_0603CC18 bowser_seg6_vertex_0603CCF8: type: VTX count: 16 - offset: 0x3CCF8 + offset: 0x3CD78 symbol: bowser_seg6_vertex_0603CCF8 bowser_seg6_vertex_0603CDF8: type: VTX count: 14 - offset: 0x3CDF8 + offset: 0x3CE78 symbol: bowser_seg6_vertex_0603CDF8 bowser_seg6_vertex_0603CED8: type: VTX count: 5 - offset: 0x3CED8 + offset: 0x3CF58 symbol: bowser_seg6_vertex_0603CED8 -# bowser_seg6_dl_0603CF28: -# type: GFX -# offset: 0x3CF28 -# symbol: bowser_seg6_dl_0603CF28 +bowser_seg6_dl_0603CF28: + type: GFX + offset: 0x3CFA8 + symbol: bowser_seg6_dl_0603CF28 bowser_seg6_dl_0603D098: type: GFX - offset: 0x3D098 + offset: 0x3D118 symbol: bowser_seg6_dl_0603D098 bowser_seg6_dl_0603D200: type: GFX - offset: 0x3D200 + offset: 0x3D280 symbol: bowser_seg6_dl_0603D200 bowser_seg6_vertex_0603D280: type: VTX count: 16 - offset: 0x3D280 + offset: 0x3D300 symbol: bowser_seg6_vertex_0603D280 bowser_seg6_vertex_0603D380: type: VTX count: 15 - offset: 0x3D380 + offset: 0x3D400 symbol: bowser_seg6_vertex_0603D380 bowser_seg6_vertex_0603D470: type: VTX count: 16 - offset: 0x3D470 + offset: 0x3D4F0 symbol: bowser_seg6_vertex_0603D470 bowser_seg6_vertex_0603D570: type: VTX count: 14 - offset: 0x3D570 + offset: 0x3D5F0 symbol: bowser_seg6_vertex_0603D570 bowser_seg6_vertex_0603D650: type: VTX count: 3 - offset: 0x3D650 + offset: 0x3D6D0 symbol: bowser_seg6_vertex_0603D650 bowser_seg6_vertex_0603D680: type: VTX count: 15 - offset: 0x3D680 + offset: 0x3D700 symbol: bowser_seg6_vertex_0603D680 bowser_seg6_vertex_0603D770: type: VTX count: 16 - offset: 0x3D770 + offset: 0x3D7F0 symbol: bowser_seg6_vertex_0603D770 bowser_seg6_vertex_0603D870: type: VTX count: 14 - offset: 0x3D870 + offset: 0x3D8F0 symbol: bowser_seg6_vertex_0603D870 bowser_seg6_vertex_0603D950: type: VTX count: 16 - offset: 0x3D950 + offset: 0x3D9D0 symbol: bowser_seg6_vertex_0603D950 bowser_seg6_vertex_0603DA50: type: VTX count: 16 - offset: 0x3DA50 + offset: 0x3DAD0 symbol: bowser_seg6_vertex_0603DA50 bowser_seg6_vertex_0603DB50: type: VTX count: 15 - offset: 0x3DB50 + offset: 0x3DBD0 symbol: bowser_seg6_vertex_0603DB50 bowser_seg6_vertex_0603DC40: type: VTX count: 3 - offset: 0x3DC40 + offset: 0x3DCC0 symbol: bowser_seg6_vertex_0603DC40 bowser_seg6_dl_0603DC70: type: GFX - offset: 0x3DC70 + offset: 0x3DCF0 symbol: bowser_seg6_dl_0603DC70 bowser_seg6_dl_0603DDD0: type: GFX - offset: 0x3DDD0 + offset: 0x3DE50 symbol: bowser_seg6_dl_0603DDD0 bowser_seg6_dl_0603DFB0: type: GFX - offset: 0x3DFB0 + offset: 0x3E030 symbol: bowser_seg6_dl_0603DFB0 bowser_seg6_vertex_0603E030: type: VTX count: 15 - offset: 0x3E030 + offset: 0x3E0B0 symbol: bowser_seg6_vertex_0603E030 bowser_seg6_vertex_0603E120: type: VTX count: 16 - offset: 0x3E120 + offset: 0x3E1A0 symbol: bowser_seg6_vertex_0603E120 bowser_seg6_vertex_0603E220: type: VTX count: 16 - offset: 0x3E220 + offset: 0x3E2A0 symbol: bowser_seg6_vertex_0603E220 bowser_seg6_vertex_0603E320: type: VTX count: 16 - offset: 0x3E320 + offset: 0x3E3A0 symbol: bowser_seg6_vertex_0603E320 bowser_seg6_vertex_0603E420: type: VTX count: 14 - offset: 0x3E420 + offset: 0x3E4A0 symbol: bowser_seg6_vertex_0603E420 bowser_seg6_dl_0603E500: type: GFX - offset: 0x3E500 + offset: 0x3E580 symbol: bowser_seg6_dl_0603E500 bowser_seg6_dl_0603E6B8: type: GFX - offset: 0x3E6B8 + offset: 0x3E738 symbol: bowser_seg6_dl_0603E6B8 bowser_seg6_vertex_0603E718: type: VTX count: 9 - offset: 0x3E718 + offset: 0x3E798 symbol: bowser_seg6_vertex_0603E718 bowser_seg6_vertex_0603E7A8: type: VTX count: 16 - offset: 0x3E7A8 + offset: 0x3E828 symbol: bowser_seg6_vertex_0603E7A8 bowser_seg6_vertex_0603E8A8: type: VTX count: 14 - offset: 0x3E8A8 + offset: 0x3E928 symbol: bowser_seg6_vertex_0603E8A8 bowser_seg6_vertex_0603E988: type: VTX count: 14 - offset: 0x3E988 + offset: 0x3EA08 symbol: bowser_seg6_vertex_0603E988 bowser_seg6_vertex_0603EA68: type: VTX count: 14 - offset: 0x3EA68 + offset: 0x3EAE8 symbol: bowser_seg6_vertex_0603EA68 bowser_seg6_vertex_0603EB48: type: VTX count: 13 - offset: 0x3EB48 + offset: 0x3EBC8 symbol: bowser_seg6_vertex_0603EB48 bowser_seg6_vertex_0603EC18: type: VTX count: 16 - offset: 0x3EC18 + offset: 0x3EC98 symbol: bowser_seg6_vertex_0603EC18 bowser_seg6_vertex_0603ED18: type: VTX count: 14 - offset: 0x3ED18 + offset: 0x3ED98 symbol: bowser_seg6_vertex_0603ED18 bowser_seg6_vertex_0603EDF8: type: VTX count: 6 - offset: 0x3EDF8 + offset: 0x3EE78 symbol: bowser_seg6_vertex_0603EDF8 bowser_seg6_vertex_0603EE58: type: VTX count: 16 - offset: 0x3EE58 + offset: 0x3EED8 symbol: bowser_seg6_vertex_0603EE58 bowser_seg6_vertex_0603EF58: type: VTX count: 14 - offset: 0x3EF58 + offset: 0x3EFD8 symbol: bowser_seg6_vertex_0603EF58 bowser_seg6_vertex_0603F038: type: VTX count: 15 - offset: 0x3F038 + offset: 0x3F0B8 symbol: bowser_seg6_vertex_0603F038 bowser_seg6_vertex_0603F128: type: VTX count: 13 - offset: 0x3F128 + offset: 0x3F1A8 symbol: bowser_seg6_vertex_0603F128 bowser_seg6_vertex_0603F1F8: type: VTX count: 15 - offset: 0x3F1F8 + offset: 0x3F278 symbol: bowser_seg6_vertex_0603F1F8 bowser_seg6_vertex_0603F2E8: type: VTX count: 15 - offset: 0x3F2E8 + offset: 0x3F368 symbol: bowser_seg6_vertex_0603F2E8 bowser_seg6_vertex_0603F3D8: type: VTX count: 15 - offset: 0x3F3D8 + offset: 0x3F458 symbol: bowser_seg6_vertex_0603F3D8 bowser_seg6_vertex_0603F4C8: type: VTX count: 15 - offset: 0x3F4C8 + offset: 0x3F548 symbol: bowser_seg6_vertex_0603F4C8 bowser_seg6_vertex_0603F5B8: type: VTX count: 15 - offset: 0x3F5B8 + offset: 0x3F638 symbol: bowser_seg6_vertex_0603F5B8 bowser_seg6_vertex_0603F6A8: type: VTX count: 16 - offset: 0x3F6A8 + offset: 0x3F728 symbol: bowser_seg6_vertex_0603F6A8 bowser_seg6_vertex_0603F7A8: type: VTX count: 15 - offset: 0x3F7A8 + offset: 0x3F828 symbol: bowser_seg6_vertex_0603F7A8 bowser_seg6_vertex_0603F898: type: VTX count: 15 - offset: 0x3F898 + offset: 0x3F918 symbol: bowser_seg6_vertex_0603F898 bowser_seg6_vertex_0603F988: type: VTX count: 15 - offset: 0x3F988 + offset: 0x3FA08 symbol: bowser_seg6_vertex_0603F988 bowser_seg6_vertex_0603FA78: type: VTX count: 15 - offset: 0x3FA78 + offset: 0x3FAF8 symbol: bowser_seg6_vertex_0603FA78 bowser_seg6_vertex_0603FB68: type: VTX count: 4 - offset: 0x3FB68 + offset: 0x3FBE8 symbol: bowser_seg6_vertex_0603FB68 bowser_seg6_dl_0603FBA8: type: GFX - offset: 0x3FBA8 + offset: 0x3FC28 symbol: bowser_seg6_dl_0603FBA8 bowser_seg6_dl_0603FC18: type: GFX - offset: 0x3FC18 + offset: 0x3FC98 symbol: bowser_seg6_dl_0603FC18 bowser_seg6_dl_0603FD38: type: GFX - offset: 0x3FD38 + offset: 0x3FDB8 symbol: bowser_seg6_dl_0603FD38 bowser_seg6_dl_0603FDD0: type: GFX - offset: 0x3FDD0 + offset: 0x3FE50 symbol: bowser_seg6_dl_0603FDD0 bowser_seg6_dl_0603FEA8: type: GFX - offset: 0x3FEA8 + offset: 0x3FF28 symbol: bowser_seg6_dl_0603FEA8 bowser_seg6_dl_0603FFA8: type: GFX - offset: 0x3FFA8 + offset: 0x40028 symbol: bowser_seg6_dl_0603FFA8 bowser_seg6_dl_06040180: type: GFX - offset: 0x40180 + offset: 0x40200 symbol: bowser_seg6_dl_06040180 bowser_seg6_dl_060401F0: type: GFX - offset: 0x401F0 + offset: 0x40270 symbol: bowser_seg6_dl_060401F0 bowser_seg6_dl_06040210: type: GFX - offset: 0x40210 + offset: 0x40290 symbol: bowser_seg6_dl_06040210 bowser_seg6_dl_06040358: @@ -1062,392 +1063,392 @@ bowser_seg6_dl_06040358: bowser_seg6_vertex_060402D8: type: VTX count: 16 - offset: 0x402D8 + offset: 0x40428 symbol: bowser_seg6_vertex_060402D8 bowser_seg6_vertex_060403D8: type: VTX count: 14 - offset: 0x403D8 + offset: 0x40528 symbol: bowser_seg6_vertex_060403D8 bowser_seg6_vertex_060404B8: type: VTX count: 16 - offset: 0x404B8 + offset: 0x40608 symbol: bowser_seg6_vertex_060404B8 bowser_seg6_vertex_060405B8: type: VTX count: 15 - offset: 0x405B8 + offset: 0x40708 symbol: bowser_seg6_vertex_060405B8 bowser_seg6_vertex_060406A8: type: VTX count: 16 - offset: 0x406A8 + offset: 0x407F8 symbol: bowser_seg6_vertex_060406A8 bowser_seg6_vertex_060407A8: type: VTX count: 3 - offset: 0x407A8 + offset: 0x408F8 symbol: bowser_seg6_vertex_060407A8 bowser_seg6_vertex_060407D8: type: VTX count: 14 - offset: 0x407D8 + offset: 0x40928 symbol: bowser_seg6_vertex_060407D8 bowser_seg6_vertex_060408B8: type: VTX count: 16 - offset: 0x408B8 + offset: 0x40A08 symbol: bowser_seg6_vertex_060408B8 bowser_seg6_vertex_060409B8: type: VTX count: 15 - offset: 0x409B8 + offset: 0x40B08 symbol: bowser_seg6_vertex_060409B8 bowser_seg6_vertex_06040AA8: type: VTX count: 16 - offset: 0x40AA8 + offset: 0x40BF8 symbol: bowser_seg6_vertex_06040AA8 bowser_seg6_vertex_06040BA8: type: VTX count: 16 - offset: 0x40BA8 + offset: 0x40CF8 symbol: bowser_seg6_vertex_06040BA8 bowser_seg6_vertex_06040CA8: type: VTX count: 16 - offset: 0x40CA8 + offset: 0x40DF8 symbol: bowser_seg6_vertex_06040CA8 bowser_seg6_vertex_06040DA8: type: VTX count: 16 - offset: 0x40DA8 + offset: 0x40EF8 symbol: bowser_seg6_vertex_06040DA8 bowser_seg6_vertex_06040EA8: type: VTX count: 16 - offset: 0x40EA8 + offset: 0x40FF8 symbol: bowser_seg6_vertex_06040EA8 bowser_seg6_vertex_06040FA8: type: VTX count: 3 - offset: 0x40FA8 + offset: 0x410F8 symbol: bowser_seg6_vertex_06040FA8 bowser_seg6_vertex_06040FD8: type: VTX count: 11 - offset: 0x40FD8 + offset: 0x41128 symbol: bowser_seg6_vertex_06040FD8 bowser_seg6_vertex_06041088: type: VTX count: 16 - offset: 0x41088 + offset: 0x411D8 symbol: bowser_seg6_vertex_06041088 bowser_seg6_vertex_06041188: type: VTX count: 9 - offset: 0x41188 + offset: 0x412D8 symbol: bowser_seg6_vertex_06041188 bowser_seg6_vertex_06041218: type: VTX count: 15 - offset: 0x41218 + offset: 0x41368 symbol: bowser_seg6_vertex_06041218 bowser_seg6_vertex_06041308: type: VTX count: 14 - offset: 0x41308 + offset: 0x41458 symbol: bowser_seg6_vertex_06041308 bowser_seg6_vertex_060413E8: type: VTX count: 15 - offset: 0x413E8 + offset: 0x41538 symbol: bowser_seg6_vertex_060413E8 bowser_seg6_vertex_060414D8: type: VTX count: 16 - offset: 0x414D8 + offset: 0x41628 symbol: bowser_seg6_vertex_060414D8 bowser_seg6_vertex_060415D8: type: VTX count: 12 - offset: 0x415D8 + offset: 0x41728 symbol: bowser_seg6_vertex_060415D8 bowser_seg6_vertex_06041698: type: VTX count: 12 - offset: 0x41698 + offset: 0x417E8 symbol: bowser_seg6_vertex_06041698 bowser_seg6_vertex_06041758: type: VTX count: 11 - offset: 0x41758 + offset: 0x418A8 symbol: bowser_seg6_vertex_06041758 bowser_seg6_vertex_06041808: type: VTX count: 16 - offset: 0x41808 + offset: 0x41958 symbol: bowser_seg6_vertex_06041808 bowser_seg6_vertex_06041908: type: VTX count: 6 - offset: 0x41908 + offset: 0x41A58 symbol: bowser_seg6_vertex_06041908 bowser_seg6_vertex_06041968: type: VTX count: 12 - offset: 0x41968 + offset: 0x41AB8 symbol: bowser_seg6_vertex_06041968 -# bowser_seg6_dl_06041A28: -# type: GFX -# offset: 0x41A28 -# symbol: bowser_seg6_dl_06041A28 +bowser_seg6_dl_06041A28: + type: GFX + offset: 0x41B78 + symbol: bowser_seg6_dl_06041A28 bowser_seg6_dl_06041BA0: type: GFX - offset: 0x41BA0 + offset: 0x41CF0 symbol: bowser_seg6_dl_06041BA0 bowser_seg6_dl_06041E48: type: GFX - offset: 0x41E48 + offset: 0x41F98 symbol: bowser_seg6_dl_06041E48 bowser_seg6_dl_06041EA8: type: GFX - offset: 0x41EA8 + offset: 0x41FF8 symbol: bowser_seg6_dl_06041EA8 bowser_seg6_dl_06041F50: type: GFX - offset: 0x41F50 + offset: 0x420A0 symbol: bowser_seg6_dl_06041F50 bowser_seg6_dl_06042098: type: GFX - offset: 0x42098 + offset: 0x421E8 symbol: bowser_seg6_dl_06042098 bowser_seg6_dl_060420F0: type: GFX - offset: 0x420F0 + offset: 0x42240 symbol: bowser_seg6_dl_060420F0 bowser_seg6_dl_06042140: type: GFX - offset: 0x42140 + offset: 0x42290 symbol: bowser_seg6_dl_06042140 bowser_seg6_dl_060421D8: type: GFX - offset: 0x421D8 + offset: 0x42328 symbol: bowser_seg6_dl_060421D8 bowser_seg6_dl_06042220: type: GFX - offset: 0x42220 + offset: 0x42370 symbol: bowser_seg6_dl_06042220 bowser_seg6_dl_06042278: type: GFX - offset: 0x42278 + offset: 0x423C8 symbol: bowser_seg6_dl_06042278 bowser_seg6_dl_06042328: type: GFX - offset: 0x42328 + offset: 0x42478 symbol: bowser_seg6_dl_06042328 bowser_seg6_dl_06042348: type: GFX - offset: 0x42348 + offset: 0x42498 symbol: bowser_seg6_dl_06042348 bowser_seg6_dl_060423A0: type: GFX - offset: 0x423A0 + offset: 0x424F0 symbol: bowser_seg6_dl_060423A0 bowser_seg6_dl_060423F8: type: GFX - offset: 0x423F8 + offset: 0x42548 symbol: bowser_seg6_dl_060423F8 bowser_seg6_dl_06042450: type: GFX - offset: 0x42450 + offset: 0x425A0 symbol: bowser_seg6_dl_06042450 bowser_seg6_dl_060424A8: type: GFX - offset: 0x424A8 + offset: 0x425F8 symbol: bowser_seg6_dl_060424A8 bowser_seg6_dl_06042500: type: GFX - offset: 0x42500 + offset: 0x42650 symbol: bowser_seg6_dl_06042500 bowser_seg6_dl_06042558: type: GFX - offset: 0x42558 + offset: 0x426A8 symbol: bowser_seg6_dl_06042558 bowser_seg6_dl_060425B0: type: GFX - offset: 0x425B0 + offset: 0x42700 symbol: bowser_seg6_dl_060425B0 bowser_seg6_dl_06042608: type: GFX - offset: 0x42608 + offset: 0x42758 symbol: bowser_seg6_dl_06042608 bowser_seg6_vertex_06042660: type: VTX count: 16 - offset: 0x42660 + offset: 0x427B0 symbol: bowser_seg6_vertex_06042660 bowser_seg6_vertex_06042760: type: VTX count: 16 - offset: 0x42760 + offset: 0x428B0 symbol: bowser_seg6_vertex_06042760 bowser_seg6_vertex_06042860: type: VTX count: 15 - offset: 0x42860 + offset: 0x429B0 symbol: bowser_seg6_vertex_06042860 bowser_seg6_vertex_06042950: type: VTX count: 15 - offset: 0x42950 + offset: 0x42AA0 symbol: bowser_seg6_vertex_06042950 bowser_seg6_vertex_06042A40: type: VTX count: 16 - offset: 0x42A40 + offset: 0x42B90 symbol: bowser_seg6_vertex_06042A40 bowser_seg6_vertex_06042B40: type: VTX count: 11 - offset: 0x42B40 + offset: 0x42C90 symbol: bowser_seg6_vertex_06042B40 bowser_seg6_vertex_06042BF0: type: VTX count: 15 - offset: 0x42BF0 + offset: 0x42D40 symbol: bowser_seg6_vertex_06042BF0 bowser_seg6_vertex_06042CE0: type: VTX count: 15 - offset: 0x42CE0 + offset: 0x42E30 symbol: bowser_seg6_vertex_06042CE0 bowser_seg6_vertex_06042DD0: type: VTX count: 6 - offset: 0x42DD0 + offset: 0x42F20 symbol: bowser_seg6_vertex_06042DD0 bowser_seg6_vertex_06042E30: type: VTX count: 11 - offset: 0x42E30 + offset: 0x42F80 symbol: bowser_seg6_vertex_06042E30 -# bowser_seg6_dl_06042EE0: -# type: GFX -# offset: 0x42EE0 -# symbol: bowser_seg6_dl_06042EE0 +bowser_seg6_dl_06042EE0: + type: GFX + offset: 0x43030 + symbol: bowser_seg6_dl_06042EE0 bowser_seg6_dl_060430E8: type: GFX - offset: 0x430E8 + offset: 0x43238 symbol: bowser_seg6_dl_060430E8 bowser_seg6_dl_06043180: type: GFX - offset: 0x43180 + offset: 0x432D0 symbol: bowser_seg6_dl_06043180 bowser_seg6_dl_060431F0: type: GFX - offset: 0x431F0 + offset: 0x43340 symbol: bowser_seg6_dl_060431F0 bowser_seg6_vertex_06043278: type: VTX count: 16 - offset: 0x43278 + offset: 0x433C8 symbol: bowser_seg6_vertex_06043278 bowser_seg6_vertex_06043378: type: VTX count: 15 - offset: 0x43378 + offset: 0x434C8 symbol: bowser_seg6_vertex_06043378 bowser_seg6_vertex_06043468: type: VTX count: 7 - offset: 0x43468 + offset: 0x435B8 symbol: bowser_seg6_vertex_06043468 bowser_seg6_vertex_060434D8: type: VTX count: 7 - offset: 0x434D8 + offset: 0x43628 symbol: bowser_seg6_vertex_060434D8 -# bowser_seg6_dl_06043548: -# type: GFX -# offset: 0x43548 -# symbol: bowser_seg6_dl_06043548 +bowser_seg6_dl_06043548: + type: GFX + offset: 0x43698 + symbol: bowser_seg6_dl_06043548 -# bowser_seg6_dl_06043648: -# type: GFX -# offset: 0x43648 -# symbol: bowser_seg6_dl_06043648 +bowser_seg6_dl_06043648: + type: GFX + offset: 0x43798 + symbol: bowser_seg6_dl_06043648 bowser_seg6_dl_06043698: type: GFX - offset: 0x43698 + offset: 0x437E8 symbol: bowser_seg6_dl_06043698 diff --git a/assets/ymls/us/actors/peach.yml b/assets/ymls/us/actors/peach.yml index fe74e2a2..2f0fd07d 100644 --- a/assets/ymls/us/actors/peach.yml +++ b/assets/ymls/us/actors/peach.yml @@ -426,371 +426,371 @@ peach_seg5_us_dl_05007288: peach_seg5_lights_05007288: type: LIGHTS size: 24 - offset: 0x7288 + offset: 0x72E8 symbol: peach_seg5_lights_05007288 peach_seg5_vertex_050072A0: type: VTX count: 14 - offset: 0x72A0 + offset: 0x7300 symbol: peach_seg5_vertex_050072A0 peach_seg5_vertex_05007380: type: VTX count: 16 - offset: 0x7380 + offset: 0x73E0 symbol: peach_seg5_vertex_05007380 peach_seg5_vertex_05007480: type: VTX count: 16 - offset: 0x7480 + offset: 0x74E0 symbol: peach_seg5_vertex_05007480 peach_seg5_vertex_05007580: type: VTX count: 16 - offset: 0x7580 + offset: 0x75E0 symbol: peach_seg5_vertex_05007580 peach_seg5_vertex_05007680: type: VTX count: 16 - offset: 0x7680 + offset: 0x76E0 symbol: peach_seg5_vertex_05007680 peach_seg5_vertex_05007780: type: VTX count: 9 - offset: 0x7780 + offset: 0x77E0 symbol: peach_seg5_vertex_05007780 peach_seg5_dl_05007810: type: GFX - offset: 0x7810 + offset: 0x7870 symbol: peach_seg5_dl_05007810 peach_seg5_dl_05007AB8: type: GFX - offset: 0x7AB8 + offset: 0x7B18 symbol: peach_seg5_dl_05007AB8 peach_seg5_lights_05007AE0: type: LIGHTS size: 24 - offset: 0x7AE0 + offset: 0x7B40 symbol: peach_seg5_lights_05007AE0 peach_seg5_vertex_05007AF8: type: VTX count: 15 - offset: 0x7AF8 + offset: 0x7B58 symbol: peach_seg5_vertex_05007AF8 peach_seg5_vertex_05007BE8: type: VTX count: 16 - offset: 0x7BE8 + offset: 0x7C48 symbol: peach_seg5_vertex_05007BE8 peach_seg5_dl_05007CE8: type: GFX - offset: 0x7CE8 + offset: 0x7D48 symbol: peach_seg5_dl_05007CE8 peach_seg5_dl_05007E58: type: GFX - offset: 0x7E58 + offset: 0x7EB8 symbol: peach_seg5_dl_05007E58 peach_seg5_lights_05007EB0: type: LIGHTS size: 24 - offset: 0x7EB0 + offset: 0x7F10 symbol: peach_seg5_lights_05007EB0 peach_seg5_vertex_05007EC8: type: VTX count: 15 - offset: 0x7EC8 + offset: 0x7F28 symbol: peach_seg5_vertex_05007EC8 peach_seg5_vertex_05007FB8: type: VTX count: 16 - offset: 0x7FB8 + offset: 0x8018 symbol: peach_seg5_vertex_05007FB8 peach_seg5_dl_050080B8: type: GFX - offset: 0x80B8 + offset: 0x8118 symbol: peach_seg5_dl_050080B8 peach_seg5_dl_05008228: type: GFX - offset: 0x8228 + offset: 0x8288 symbol: peach_seg5_dl_05008228 peach_seg5_lights_05008280: type: LIGHTS size: 24 - offset: 0x8280 + offset: 0x82E0 symbol: peach_seg5_lights_05008280 peach_seg5_vertex_05008298: type: VTX count: 12 - offset: 0x8298 + offset: 0x82F8 symbol: peach_seg5_vertex_05008298 peach_seg5_vertex_05008358: type: VTX count: 13 - offset: 0x8358 + offset: 0x83B8 symbol: peach_seg5_vertex_05008358 peach_seg5_dl_05008428: type: GFX - offset: 0x8428 + offset: 0x8488 symbol: peach_seg5_dl_05008428 peach_seg5_dl_050084C0: type: GFX - offset: 0x84C0 + offset: 0x8520 symbol: peach_seg5_dl_050084C0 peach_seg5_dl_05008560: type: GFX - offset: 0x8560 + offset: 0x85C0 symbol: peach_seg5_dl_05008560 peach_seg5_lights_050085D0: type: LIGHTS size: 24 - offset: 0x85D0 + offset: 0x8630 symbol: peach_seg5_lights_050085D0 peach_seg5_vertex_050085E8: type: VTX count: 14 - offset: 0x85E8 + offset: 0x8648 symbol: peach_seg5_vertex_050085E8 peach_seg5_dl_050086C8: type: GFX - offset: 0x86C8 + offset: 0x8728 symbol: peach_seg5_dl_050086C8 peach_seg5_dl_050087A8: type: GFX - offset: 0x87A8 + offset: 0x8808 symbol: peach_seg5_dl_050087A8 peach_seg5_lights_050087D0: type: LIGHTS size: 24 - offset: 0x87D0 + offset: 0x8830 symbol: peach_seg5_lights_050087D0 peach_seg5_vertex_050087E8: type: VTX count: 12 - offset: 0x87E8 + offset: 0x8848 symbol: peach_seg5_vertex_050087E8 peach_seg5_vertex_050088A8: type: VTX count: 13 - offset: 0x88A8 + offset: 0x8908 symbol: peach_seg5_vertex_050088A8 peach_seg5_dl_05008978: type: GFX - offset: 0x8978 + offset: 0x89D8 symbol: peach_seg5_dl_05008978 peach_seg5_dl_05008A10: type: GFX - offset: 0x8A10 + offset: 0x8A70 symbol: peach_seg5_dl_05008A10 peach_seg5_dl_05008AB0: type: GFX - offset: 0x8AB0 + offset: 0x8B10 symbol: peach_seg5_dl_05008AB0 peach_seg5_lights_05008B20: type: LIGHTS size: 24 - offset: 0x8B20 + offset: 0x8B80 symbol: peach_seg5_lights_05008B20 peach_seg5_vertex_05008B38: type: VTX count: 14 - offset: 0x8B38 + offset: 0x8B98 symbol: peach_seg5_vertex_05008B38 peach_seg5_dl_05008C18: type: GFX - offset: 0x8C18 + offset: 0x8C78 symbol: peach_seg5_dl_05008C18 peach_seg5_dl_05008CF8: type: GFX - offset: 0x8CF8 + offset: 0x8D58 symbol: peach_seg5_dl_05008CF8 peach_seg5_lights_05008D20: type: LIGHTS size: 24 - offset: 0x8D20 + offset: 0x8D80 symbol: peach_seg5_lights_05008D20 peach_seg5_vertex_05008D38: type: VTX count: 16 - offset: 0x8D38 + offset: 0x8D98 symbol: peach_seg5_vertex_05008D38 peach_seg5_dl_05008E38: type: GFX - offset: 0x8E38 + offset: 0x8E98 symbol: peach_seg5_dl_05008E38 peach_seg5_dl_05008F20: type: GFX - offset: 0x8F20 + offset: 0x8F80 symbol: peach_seg5_dl_05008F20 peach_seg5_lights_05008F48: type: LIGHTS size: 24 - offset: 0x8F48 + offset: 0x8FA8 symbol: peach_seg5_lights_05008F48 peach_seg5_vertex_05008F60: type: VTX count: 16 - offset: 0x8F60 + offset: 0x8FC0 symbol: peach_seg5_vertex_05008F60 peach_seg5_dl_05009060: type: GFX - offset: 0x9060 + offset: 0x90C0 symbol: peach_seg5_dl_05009060 peach_seg5_dl_05009148: type: GFX - offset: 0x9148 + offset: 0x91A8 symbol: peach_seg5_dl_05009148 peach_seg5_lights_05009170: type: LIGHTS size: 24 - offset: 0x9170 + offset: 0x91D0 symbol: peach_seg5_lights_05009170 peach_seg5_vertex_05009188: type: VTX count: 16 - offset: 0x9188 + offset: 0x91E8 symbol: peach_seg5_vertex_05009188 peach_seg5_vertex_05009288: type: VTX count: 16 - offset: 0x9288 + offset: 0x92E8 symbol: peach_seg5_vertex_05009288 peach_seg5_dl_05009388: type: GFX - offset: 0x9388 + offset: 0x93E8 symbol: peach_seg5_dl_05009388 peach_seg5_dl_05009500: type: GFX - offset: 0x9500 + offset: 0x9560 symbol: peach_seg5_dl_05009500 peach_seg5_lights_05009528: type: LIGHTS size: 24 - offset: 0x9528 + offset: 0x9588 symbol: peach_seg5_lights_05009528 peach_seg5_vertex_05009540: type: VTX count: 16 - offset: 0x9540 + offset: 0x95A0 symbol: peach_seg5_vertex_05009540 peach_seg5_vertex_05009640: type: VTX count: 16 - offset: 0x9640 + offset: 0x96A0 symbol: peach_seg5_vertex_05009640 peach_seg5_vertex_05009740: type: VTX count: 8 - offset: 0x9740 + offset: 0x97A0 symbol: peach_seg5_vertex_05009740 peach_seg5_dl_050097C0: type: GFX - offset: 0x97C0 + offset: 0x9820 symbol: peach_seg5_dl_050097C0 peach_seg5_dl_05009940: type: GFX - offset: 0x9940 + offset: 0x99A0 symbol: peach_seg5_dl_05009940 peach_seg5_lights_05009968: type: LIGHTS size: 24 - offset: 0x9968 + offset: 0x99C8 symbol: peach_seg5_lights_05009968 peach_seg5_vertex_05009980: type: VTX count: 15 - offset: 0x9980 + offset: 0x99E0 symbol: peach_seg5_vertex_05009980 peach_seg5_vertex_05009A70: type: VTX count: 15 - offset: 0x9A70 + offset: 0x9AD0 symbol: peach_seg5_vertex_05009A70 peach_seg5_vertex_05009B60: type: VTX count: 16 - offset: 0x9B60 + offset: 0x9BC0 symbol: peach_seg5_vertex_05009B60 peach_seg5_vertex_05009C60: type: VTX count: 15 - offset: 0x9C60 + offset: 0x9CC0 symbol: peach_seg5_vertex_05009C60 peach_seg5_vertex_05009D50: type: VTX count: 13 - offset: 0x9D50 + offset: 0x9DB0 symbol: peach_seg5_vertex_05009D50 -# peach_seg5_dl_05009E20: -# type: GFX -# offset: 0x9E20 -# symbol: peach_seg5_dl_05009E20 +peach_seg5_dl_05009E20: + type: GFX + offset: 0x9E80 + symbol: peach_seg5_dl_05009E20 peach_seg5_dl_0500A0A8: type: GFX - offset: 0xA0A8 + offset: 0xA108 symbol: peach_seg5_dl_0500A0A8 peach_seg5_us_dl_0500A188: diff --git a/assets/ymls/us/actors/toad.yml b/assets/ymls/us/actors/toad.yml index 0ad04206..20d1437e 100644 --- a/assets/ymls/us/actors/toad.yml +++ b/assets/ymls/us/actors/toad.yml @@ -28,6 +28,7 @@ toad_seg6_lights_06005908: offset: 0x5908 symbol: toad_seg6_lights_06005908 + toad_seg6_vertex_06006920: type: VTX count: 15 @@ -122,29 +123,29 @@ toad_seg6_us_dl_06007788: toad_seg6_lights_06007788: type: LIGHTS size: 24 - offset: 0x7788 + offset: 0x7808 symbol: toad_seg6_lights_06007788 toad_seg6_vertex_060077A0: type: VTX count: 16 - offset: 0x77A0 + offset: 0x7820 symbol: toad_seg6_vertex_060077A0 toad_seg6_vertex_060078A0: type: VTX count: 12 - offset: 0x78A0 + offset: 0x7920 symbol: toad_seg6_vertex_060078A0 toad_seg6_dl_06007960: type: GFX - offset: 0x7960 + offset: 0x79E0 symbol: toad_seg6_dl_06007960 toad_seg6_dl_06007A48: type: GFX - offset: 0x7A48 + offset: 0x7AC8 symbol: toad_seg6_dl_06007A48 toad_seg6_us_dl_06007B00: @@ -155,97 +156,97 @@ toad_seg6_us_dl_06007B00: toad_seg6_lights_06007A80: type: LIGHTS size: 24 - offset: 0x7A80 + offset: 0x7B28 symbol: toad_seg6_lights_06007A80 toad_seg6_lights_06007A98: type: LIGHTS size: 24 - offset: 0x7A98 + offset: 0x7B40 symbol: toad_seg6_lights_06007A98 toad_seg6_vertex_06007AB0: type: VTX count: 14 - offset: 0x7AB0 + offset: 0x7B58 symbol: toad_seg6_vertex_06007AB0 toad_seg6_vertex_06007B90: type: VTX count: 12 - offset: 0x7B90 + offset: 0x7C38 symbol: toad_seg6_vertex_06007B90 toad_seg6_vertex_06007C50: type: VTX count: 12 - offset: 0x7C50 + offset: 0x7CF8 symbol: toad_seg6_vertex_06007C50 toad_seg6_dl_06007D10: type: GFX - offset: 0x7D10 + offset: 0x7DB8 symbol: toad_seg6_dl_06007D10 toad_seg6_dl_06007EB0: type: GFX - offset: 0x7EB0 + offset: 0x7F58 symbol: toad_seg6_dl_06007EB0 toad_seg6_lights_06007ED8: type: LIGHTS size: 24 - offset: 0x7ED8 + offset: 0x7F80 symbol: toad_seg6_lights_06007ED8 toad_seg6_vertex_06007EF0: type: VTX count: 16 - offset: 0x7EF0 + offset: 0x7F98 symbol: toad_seg6_vertex_06007EF0 toad_seg6_vertex_06007FF0: type: VTX count: 13 - offset: 0x7FF0 + offset: 0x8098 symbol: toad_seg6_vertex_06007FF0 toad_seg6_dl_060080C0: type: GFX - offset: 0x80C0 + offset: 0x8168 symbol: toad_seg6_dl_060080C0 toad_seg6_dl_060081F8: type: GFX - offset: 0x81F8 + offset: 0x82A0 symbol: toad_seg6_dl_060081F8 toad_seg6_lights_06008220: type: LIGHTS size: 24 - offset: 0x8220 + offset: 0x82C8 symbol: toad_seg6_lights_06008220 toad_seg6_vertex_06008238: type: VTX count: 16 - offset: 0x8238 + offset: 0x82E0 symbol: toad_seg6_vertex_06008238 toad_seg6_vertex_06008338: type: VTX count: 11 - offset: 0x8338 + offset: 0x83E0 symbol: toad_seg6_vertex_06008338 toad_seg6_dl_060083E8: type: GFX - offset: 0x83E8 + offset: 0x8490 symbol: toad_seg6_dl_060083E8 toad_seg6_dl_06008520: type: GFX - offset: 0x8520 + offset: 0x85C8 symbol: toad_seg6_dl_06008520 toad_seg6_us_dl_06008608: @@ -256,56 +257,56 @@ toad_seg6_us_dl_06008608: toad_seg6_lights_06008560: type: LIGHTS size: 24 - offset: 0x8560 + offset: 0x8650 symbol: toad_seg6_lights_06008560 toad_seg6_vertex_06008578: type: VTX count: 16 - offset: 0x8578 + offset: 0x8668 symbol: toad_seg6_vertex_06008578 toad_seg6_vertex_06008678: type: VTX count: 13 - offset: 0x8678 + offset: 0x8768 symbol: toad_seg6_vertex_06008678 toad_seg6_dl_06008748: type: GFX - offset: 0x8748 + offset: 0x8838 symbol: toad_seg6_dl_06008748 toad_seg6_dl_06008890: type: GFX - offset: 0x8890 + offset: 0x8980 symbol: toad_seg6_dl_06008890 toad_seg6_lights_060088B8: type: LIGHTS size: 24 - offset: 0x88B8 + offset: 0x89A8 symbol: toad_seg6_lights_060088B8 toad_seg6_vertex_060088D0: type: VTX count: 16 - offset: 0x88D0 + offset: 0x89C0 symbol: toad_seg6_vertex_060088D0 toad_seg6_vertex_060089D0: type: VTX count: 12 - offset: 0x89D0 + offset: 0x8AC0 symbol: toad_seg6_vertex_060089D0 toad_seg6_dl_06008A90: type: GFX - offset: 0x8A90 + offset: 0x8B80 symbol: toad_seg6_dl_06008A90 toad_seg6_dl_06008BD8: type: GFX - offset: 0x8BD8 + offset: 0x8CC8 symbol: toad_seg6_dl_06008BD8