diff --git a/.gitignore b/.gitignore index 3f099cc9..d5266a91 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,6 @@ code/ !/sound/**/*custom*/**/*.aiff !/assets/**/*custom*.bin !/assets/**/*custom*/**/*.bin + +# Torch hash +torch.hash.yml diff --git a/Torch b/Torch index 8e3f1cf0..9cee54e5 160000 --- a/Torch +++ b/Torch @@ -1 +1 @@ -Subproject commit 8e3f1cf09337f0c373861b4b9dc6c7cb55c0e869 +Subproject commit 9cee54e5624a69a3ed0ca95fb07dac83ea4cad72 diff --git a/assets/ymls/jp/textures/intro_raw.yml b/assets/ymls/jp/textures/intro_raw.yml index 5716b321..2e4be067 100644 --- a/assets/ymls/jp/textures/intro_raw.yml +++ b/assets/ymls/jp/textures/intro_raw.yml @@ -133,6 +133,7 @@ sparkle_5: height: 32 offset: 0x262A08 format: RGBA16 + symbol: gd_texture_sparkle_5 white_star_0: type: TEXTURE size: 2048 diff --git a/assets/ymls/jp/textures/ipl3_raw.yml b/assets/ymls/jp/textures/ipl3_raw.yml index 05dc39f8..0d078b1d 100644 --- a/assets/ymls/jp/textures/ipl3_raw.yml +++ b/assets/ymls/jp/textures/ipl3_raw.yml @@ -5,6 +5,7 @@ ipl3_font_00: height: 14 offset: 0xB70 format: IA1 + symbol: ipl3_font_00 ipl3_font_01: type: TEXTURE size: 23 @@ -12,6 +13,7 @@ ipl3_font_01: height: 14 offset: 0xB87 format: IA1 + symbol: ipl3_font_01 ipl3_font_02: type: TEXTURE size: 23 @@ -19,6 +21,7 @@ ipl3_font_02: height: 14 offset: 0xB9E format: IA1 + symbol: ipl3_font_02 ipl3_font_03: type: TEXTURE size: 23 @@ -26,6 +29,7 @@ ipl3_font_03: height: 14 offset: 0xBB5 format: IA1 + symbol: ipl3_font_03 ipl3_font_04: type: TEXTURE size: 23 @@ -33,6 +37,7 @@ ipl3_font_04: height: 14 offset: 0xBCC format: IA1 + symbol: ipl3_font_04 ipl3_font_05: type: TEXTURE size: 23 @@ -40,6 +45,7 @@ ipl3_font_05: height: 14 offset: 0xBE3 format: IA1 + symbol: ipl3_font_05 ipl3_font_06: type: TEXTURE size: 23 @@ -47,6 +53,7 @@ ipl3_font_06: height: 14 offset: 0xBFA format: IA1 + symbol: ipl3_font_06 ipl3_font_07: type: TEXTURE size: 23 @@ -54,6 +61,7 @@ ipl3_font_07: height: 14 offset: 0xC11 format: IA1 + symbol: ipl3_font_07 ipl3_font_08: type: TEXTURE size: 23 @@ -61,6 +69,7 @@ ipl3_font_08: height: 14 offset: 0xC28 format: IA1 + symbol: ipl3_font_08 ipl3_font_09: type: TEXTURE size: 23 @@ -68,6 +77,7 @@ ipl3_font_09: height: 14 offset: 0xC3F format: IA1 + symbol: ipl3_font_09 ipl3_font_10: type: TEXTURE size: 23 @@ -75,6 +85,7 @@ ipl3_font_10: height: 14 offset: 0xC56 format: IA1 + symbol: ipl3_font_10 ipl3_font_11: type: TEXTURE size: 23 @@ -82,6 +93,7 @@ ipl3_font_11: height: 14 offset: 0xC6D format: IA1 + symbol: ipl3_font_11 ipl3_font_12: type: TEXTURE size: 23 @@ -89,6 +101,7 @@ ipl3_font_12: height: 14 offset: 0xC84 format: IA1 + symbol: ipl3_font_12 ipl3_font_13: type: TEXTURE size: 23 @@ -96,6 +109,7 @@ ipl3_font_13: height: 14 offset: 0xC9B format: IA1 + symbol: ipl3_font_13 ipl3_font_14: type: TEXTURE size: 23 @@ -103,6 +117,7 @@ ipl3_font_14: height: 14 offset: 0xCB2 format: IA1 + symbol: ipl3_font_14 ipl3_font_15: type: TEXTURE size: 23 @@ -110,6 +125,7 @@ ipl3_font_15: height: 14 offset: 0xCC9 format: IA1 + symbol: ipl3_font_15 ipl3_font_16: type: TEXTURE size: 23 @@ -117,6 +133,7 @@ ipl3_font_16: height: 14 offset: 0xCE0 format: IA1 + symbol: ipl3_font_16 ipl3_font_17: type: TEXTURE size: 23 @@ -124,6 +141,7 @@ ipl3_font_17: height: 14 offset: 0xCF7 format: IA1 + symbol: ipl3_font_17 ipl3_font_18: type: TEXTURE size: 23 @@ -131,6 +149,7 @@ ipl3_font_18: height: 14 offset: 0xD0E format: IA1 + symbol: ipl3_font_18 ipl3_font_19: type: TEXTURE size: 23 @@ -138,6 +157,7 @@ ipl3_font_19: height: 14 offset: 0xD25 format: IA1 + symbol: ipl3_font_19 ipl3_font_20: type: TEXTURE size: 23 @@ -145,6 +165,7 @@ ipl3_font_20: height: 14 offset: 0xD3C format: IA1 + symbol: ipl3_font_20 ipl3_font_21: type: TEXTURE size: 23 @@ -152,6 +173,7 @@ ipl3_font_21: height: 14 offset: 0xD53 format: IA1 + symbol: ipl3_font_21 ipl3_font_22: type: TEXTURE size: 23 @@ -159,6 +181,7 @@ ipl3_font_22: height: 14 offset: 0xD6A format: IA1 + symbol: ipl3_font_22 ipl3_font_23: type: TEXTURE size: 23 @@ -166,6 +189,7 @@ ipl3_font_23: height: 14 offset: 0xD81 format: IA1 + symbol: ipl3_font_23 ipl3_font_24: type: TEXTURE size: 23 @@ -173,6 +197,7 @@ ipl3_font_24: height: 14 offset: 0xD98 format: IA1 + symbol: ipl3_font_24 ipl3_font_25: type: TEXTURE size: 23 @@ -180,6 +205,7 @@ ipl3_font_25: height: 14 offset: 0xDAF format: IA1 + symbol: ipl3_font_25 ipl3_font_26: type: TEXTURE size: 23 @@ -187,6 +213,7 @@ ipl3_font_26: height: 14 offset: 0xDC6 format: IA1 + symbol: ipl3_font_26 ipl3_font_27: type: TEXTURE size: 23 @@ -194,6 +221,7 @@ ipl3_font_27: height: 14 offset: 0xDDD format: IA1 + symbol: ipl3_font_27 ipl3_font_28: type: TEXTURE size: 23 @@ -201,6 +229,7 @@ ipl3_font_28: height: 14 offset: 0xDF4 format: IA1 + symbol: ipl3_font_28 ipl3_font_29: type: TEXTURE size: 23 @@ -208,6 +237,7 @@ ipl3_font_29: height: 14 offset: 0xE0B format: IA1 + symbol: ipl3_font_29 ipl3_font_30: type: TEXTURE size: 23 @@ -215,6 +245,7 @@ ipl3_font_30: height: 14 offset: 0xE22 format: IA1 + symbol: ipl3_font_30 ipl3_font_31: type: TEXTURE size: 23 @@ -222,6 +253,7 @@ ipl3_font_31: height: 14 offset: 0xE39 format: IA1 + symbol: ipl3_font_31 ipl3_font_32: type: TEXTURE size: 23 @@ -229,6 +261,7 @@ ipl3_font_32: height: 14 offset: 0xE50 format: IA1 + symbol: ipl3_font_32 ipl3_font_33: type: TEXTURE size: 23 @@ -236,6 +269,7 @@ ipl3_font_33: height: 14 offset: 0xE67 format: IA1 + symbol: ipl3_font_33 ipl3_font_34: type: TEXTURE size: 23 @@ -243,6 +277,7 @@ ipl3_font_34: height: 14 offset: 0xE7E format: IA1 + symbol: ipl3_font_34 ipl3_font_35: type: TEXTURE size: 23 @@ -250,6 +285,7 @@ ipl3_font_35: height: 14 offset: 0xE95 format: IA1 + symbol: ipl3_font_35 ipl3_font_36: type: TEXTURE size: 23 @@ -257,6 +293,7 @@ ipl3_font_36: height: 14 offset: 0xEAC format: IA1 + symbol: ipl3_font_36 ipl3_font_37: type: TEXTURE size: 23 @@ -264,6 +301,7 @@ ipl3_font_37: height: 14 offset: 0xEC3 format: IA1 + symbol: ipl3_font_37 ipl3_font_38: type: TEXTURE size: 23 @@ -271,6 +309,7 @@ ipl3_font_38: height: 14 offset: 0xEDA format: IA1 + symbol: ipl3_font_38 ipl3_font_39: type: TEXTURE size: 23 @@ -278,6 +317,7 @@ ipl3_font_39: height: 14 offset: 0xEF1 format: IA1 + symbol: ipl3_font_39 ipl3_font_40: type: TEXTURE size: 23 @@ -285,6 +325,7 @@ ipl3_font_40: height: 14 offset: 0xF08 format: IA1 + symbol: ipl3_font_40 ipl3_font_41: type: TEXTURE size: 23 @@ -292,6 +333,7 @@ ipl3_font_41: height: 14 offset: 0xF1F format: IA1 + symbol: ipl3_font_41 ipl3_font_42: type: TEXTURE size: 23 @@ -299,6 +341,7 @@ ipl3_font_42: height: 14 offset: 0xF36 format: IA1 + symbol: ipl3_font_42 ipl3_font_43: type: TEXTURE size: 23 @@ -306,6 +349,7 @@ ipl3_font_43: height: 14 offset: 0xF4D format: IA1 + symbol: ipl3_font_43 ipl3_font_44: type: TEXTURE size: 23 @@ -313,6 +357,7 @@ ipl3_font_44: height: 14 offset: 0xF64 format: IA1 + symbol: ipl3_font_44 ipl3_font_45: type: TEXTURE size: 23 @@ -320,6 +365,7 @@ ipl3_font_45: height: 14 offset: 0xF7B format: IA1 + symbol: ipl3_font_45 ipl3_font_46: type: TEXTURE size: 23 @@ -327,6 +373,7 @@ ipl3_font_46: height: 14 offset: 0xF92 format: IA1 + symbol: ipl3_font_46 ipl3_font_47: type: TEXTURE size: 23 @@ -334,6 +381,7 @@ ipl3_font_47: height: 14 offset: 0xFA9 format: IA1 + symbol: ipl3_font_47 ipl3_font_48: type: TEXTURE size: 23 @@ -341,6 +389,7 @@ ipl3_font_48: height: 14 offset: 0xFC0 format: IA1 + symbol: ipl3_font_48 ipl3_font_49: type: TEXTURE size: 23 @@ -348,3 +397,4 @@ ipl3_font_49: height: 14 offset: 0xFD7 format: IA1 + symbol: ipl3_font_49 diff --git a/assets/ymls/us/textures/intro_raw.yml b/assets/ymls/us/textures/intro_raw.yml index ee5c5490..9163e507 100644 --- a/assets/ymls/us/textures/intro_raw.yml +++ b/assets/ymls/us/textures/intro_raw.yml @@ -133,6 +133,7 @@ sparkle_5: height: 32 offset: 0x264888 format: RGBA16 + symbol: gd_texture_sparkle_5 white_star_0: type: TEXTURE size: 2048 diff --git a/assets/ymls/us/textures/ipl3_raw.yml b/assets/ymls/us/textures/ipl3_raw.yml index 05dc39f8..0d078b1d 100644 --- a/assets/ymls/us/textures/ipl3_raw.yml +++ b/assets/ymls/us/textures/ipl3_raw.yml @@ -5,6 +5,7 @@ ipl3_font_00: height: 14 offset: 0xB70 format: IA1 + symbol: ipl3_font_00 ipl3_font_01: type: TEXTURE size: 23 @@ -12,6 +13,7 @@ ipl3_font_01: height: 14 offset: 0xB87 format: IA1 + symbol: ipl3_font_01 ipl3_font_02: type: TEXTURE size: 23 @@ -19,6 +21,7 @@ ipl3_font_02: height: 14 offset: 0xB9E format: IA1 + symbol: ipl3_font_02 ipl3_font_03: type: TEXTURE size: 23 @@ -26,6 +29,7 @@ ipl3_font_03: height: 14 offset: 0xBB5 format: IA1 + symbol: ipl3_font_03 ipl3_font_04: type: TEXTURE size: 23 @@ -33,6 +37,7 @@ ipl3_font_04: height: 14 offset: 0xBCC format: IA1 + symbol: ipl3_font_04 ipl3_font_05: type: TEXTURE size: 23 @@ -40,6 +45,7 @@ ipl3_font_05: height: 14 offset: 0xBE3 format: IA1 + symbol: ipl3_font_05 ipl3_font_06: type: TEXTURE size: 23 @@ -47,6 +53,7 @@ ipl3_font_06: height: 14 offset: 0xBFA format: IA1 + symbol: ipl3_font_06 ipl3_font_07: type: TEXTURE size: 23 @@ -54,6 +61,7 @@ ipl3_font_07: height: 14 offset: 0xC11 format: IA1 + symbol: ipl3_font_07 ipl3_font_08: type: TEXTURE size: 23 @@ -61,6 +69,7 @@ ipl3_font_08: height: 14 offset: 0xC28 format: IA1 + symbol: ipl3_font_08 ipl3_font_09: type: TEXTURE size: 23 @@ -68,6 +77,7 @@ ipl3_font_09: height: 14 offset: 0xC3F format: IA1 + symbol: ipl3_font_09 ipl3_font_10: type: TEXTURE size: 23 @@ -75,6 +85,7 @@ ipl3_font_10: height: 14 offset: 0xC56 format: IA1 + symbol: ipl3_font_10 ipl3_font_11: type: TEXTURE size: 23 @@ -82,6 +93,7 @@ ipl3_font_11: height: 14 offset: 0xC6D format: IA1 + symbol: ipl3_font_11 ipl3_font_12: type: TEXTURE size: 23 @@ -89,6 +101,7 @@ ipl3_font_12: height: 14 offset: 0xC84 format: IA1 + symbol: ipl3_font_12 ipl3_font_13: type: TEXTURE size: 23 @@ -96,6 +109,7 @@ ipl3_font_13: height: 14 offset: 0xC9B format: IA1 + symbol: ipl3_font_13 ipl3_font_14: type: TEXTURE size: 23 @@ -103,6 +117,7 @@ ipl3_font_14: height: 14 offset: 0xCB2 format: IA1 + symbol: ipl3_font_14 ipl3_font_15: type: TEXTURE size: 23 @@ -110,6 +125,7 @@ ipl3_font_15: height: 14 offset: 0xCC9 format: IA1 + symbol: ipl3_font_15 ipl3_font_16: type: TEXTURE size: 23 @@ -117,6 +133,7 @@ ipl3_font_16: height: 14 offset: 0xCE0 format: IA1 + symbol: ipl3_font_16 ipl3_font_17: type: TEXTURE size: 23 @@ -124,6 +141,7 @@ ipl3_font_17: height: 14 offset: 0xCF7 format: IA1 + symbol: ipl3_font_17 ipl3_font_18: type: TEXTURE size: 23 @@ -131,6 +149,7 @@ ipl3_font_18: height: 14 offset: 0xD0E format: IA1 + symbol: ipl3_font_18 ipl3_font_19: type: TEXTURE size: 23 @@ -138,6 +157,7 @@ ipl3_font_19: height: 14 offset: 0xD25 format: IA1 + symbol: ipl3_font_19 ipl3_font_20: type: TEXTURE size: 23 @@ -145,6 +165,7 @@ ipl3_font_20: height: 14 offset: 0xD3C format: IA1 + symbol: ipl3_font_20 ipl3_font_21: type: TEXTURE size: 23 @@ -152,6 +173,7 @@ ipl3_font_21: height: 14 offset: 0xD53 format: IA1 + symbol: ipl3_font_21 ipl3_font_22: type: TEXTURE size: 23 @@ -159,6 +181,7 @@ ipl3_font_22: height: 14 offset: 0xD6A format: IA1 + symbol: ipl3_font_22 ipl3_font_23: type: TEXTURE size: 23 @@ -166,6 +189,7 @@ ipl3_font_23: height: 14 offset: 0xD81 format: IA1 + symbol: ipl3_font_23 ipl3_font_24: type: TEXTURE size: 23 @@ -173,6 +197,7 @@ ipl3_font_24: height: 14 offset: 0xD98 format: IA1 + symbol: ipl3_font_24 ipl3_font_25: type: TEXTURE size: 23 @@ -180,6 +205,7 @@ ipl3_font_25: height: 14 offset: 0xDAF format: IA1 + symbol: ipl3_font_25 ipl3_font_26: type: TEXTURE size: 23 @@ -187,6 +213,7 @@ ipl3_font_26: height: 14 offset: 0xDC6 format: IA1 + symbol: ipl3_font_26 ipl3_font_27: type: TEXTURE size: 23 @@ -194,6 +221,7 @@ ipl3_font_27: height: 14 offset: 0xDDD format: IA1 + symbol: ipl3_font_27 ipl3_font_28: type: TEXTURE size: 23 @@ -201,6 +229,7 @@ ipl3_font_28: height: 14 offset: 0xDF4 format: IA1 + symbol: ipl3_font_28 ipl3_font_29: type: TEXTURE size: 23 @@ -208,6 +237,7 @@ ipl3_font_29: height: 14 offset: 0xE0B format: IA1 + symbol: ipl3_font_29 ipl3_font_30: type: TEXTURE size: 23 @@ -215,6 +245,7 @@ ipl3_font_30: height: 14 offset: 0xE22 format: IA1 + symbol: ipl3_font_30 ipl3_font_31: type: TEXTURE size: 23 @@ -222,6 +253,7 @@ ipl3_font_31: height: 14 offset: 0xE39 format: IA1 + symbol: ipl3_font_31 ipl3_font_32: type: TEXTURE size: 23 @@ -229,6 +261,7 @@ ipl3_font_32: height: 14 offset: 0xE50 format: IA1 + symbol: ipl3_font_32 ipl3_font_33: type: TEXTURE size: 23 @@ -236,6 +269,7 @@ ipl3_font_33: height: 14 offset: 0xE67 format: IA1 + symbol: ipl3_font_33 ipl3_font_34: type: TEXTURE size: 23 @@ -243,6 +277,7 @@ ipl3_font_34: height: 14 offset: 0xE7E format: IA1 + symbol: ipl3_font_34 ipl3_font_35: type: TEXTURE size: 23 @@ -250,6 +285,7 @@ ipl3_font_35: height: 14 offset: 0xE95 format: IA1 + symbol: ipl3_font_35 ipl3_font_36: type: TEXTURE size: 23 @@ -257,6 +293,7 @@ ipl3_font_36: height: 14 offset: 0xEAC format: IA1 + symbol: ipl3_font_36 ipl3_font_37: type: TEXTURE size: 23 @@ -264,6 +301,7 @@ ipl3_font_37: height: 14 offset: 0xEC3 format: IA1 + symbol: ipl3_font_37 ipl3_font_38: type: TEXTURE size: 23 @@ -271,6 +309,7 @@ ipl3_font_38: height: 14 offset: 0xEDA format: IA1 + symbol: ipl3_font_38 ipl3_font_39: type: TEXTURE size: 23 @@ -278,6 +317,7 @@ ipl3_font_39: height: 14 offset: 0xEF1 format: IA1 + symbol: ipl3_font_39 ipl3_font_40: type: TEXTURE size: 23 @@ -285,6 +325,7 @@ ipl3_font_40: height: 14 offset: 0xF08 format: IA1 + symbol: ipl3_font_40 ipl3_font_41: type: TEXTURE size: 23 @@ -292,6 +333,7 @@ ipl3_font_41: height: 14 offset: 0xF1F format: IA1 + symbol: ipl3_font_41 ipl3_font_42: type: TEXTURE size: 23 @@ -299,6 +341,7 @@ ipl3_font_42: height: 14 offset: 0xF36 format: IA1 + symbol: ipl3_font_42 ipl3_font_43: type: TEXTURE size: 23 @@ -306,6 +349,7 @@ ipl3_font_43: height: 14 offset: 0xF4D format: IA1 + symbol: ipl3_font_43 ipl3_font_44: type: TEXTURE size: 23 @@ -313,6 +357,7 @@ ipl3_font_44: height: 14 offset: 0xF64 format: IA1 + symbol: ipl3_font_44 ipl3_font_45: type: TEXTURE size: 23 @@ -320,6 +365,7 @@ ipl3_font_45: height: 14 offset: 0xF7B format: IA1 + symbol: ipl3_font_45 ipl3_font_46: type: TEXTURE size: 23 @@ -327,6 +373,7 @@ ipl3_font_46: height: 14 offset: 0xF92 format: IA1 + symbol: ipl3_font_46 ipl3_font_47: type: TEXTURE size: 23 @@ -334,6 +381,7 @@ ipl3_font_47: height: 14 offset: 0xFA9 format: IA1 + symbol: ipl3_font_47 ipl3_font_48: type: TEXTURE size: 23 @@ -341,6 +389,7 @@ ipl3_font_48: height: 14 offset: 0xFC0 format: IA1 + symbol: ipl3_font_48 ipl3_font_49: type: TEXTURE size: 23 @@ -348,3 +397,4 @@ ipl3_font_49: height: 14 offset: 0xFD7 format: IA1 + symbol: ipl3_font_49