diff --git a/asm/incbin/arm9_data.bin b/asm/incbin/arm9_data.bin deleted file mode 100644 index a96570b200..0000000000 Binary files a/asm/incbin/arm9_data.bin and /dev/null differ diff --git a/asm/incbin/arm9_rodata.bin b/asm/incbin/arm9_rodata.bin deleted file mode 100644 index fa638c8339..0000000000 Binary files a/asm/incbin/arm9_rodata.bin and /dev/null differ diff --git a/asm/incbin/arm9_exception.bin b/asm/incbin/main_etable.bin similarity index 100% rename from asm/incbin/arm9_exception.bin rename to asm/incbin/main_etable.bin diff --git a/asm/incbin/overlay14_rodata.bin b/asm/incbin/ov14_022248A4.bin similarity index 100% rename from asm/incbin/overlay14_rodata.bin rename to asm/incbin/ov14_022248A4.bin diff --git a/asm/incbin/overlay100_data.bin b/asm/incbin/overlay100_data.bin deleted file mode 100644 index b073ebfe1d..0000000000 Binary files a/asm/incbin/overlay100_data.bin and /dev/null differ diff --git a/asm/incbin/overlay100_rodata.bin b/asm/incbin/overlay100_rodata.bin deleted file mode 100644 index 84ea161323..0000000000 Binary files a/asm/incbin/overlay100_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay101_data.bin b/asm/incbin/overlay101_data.bin deleted file mode 100644 index 3afb75bcfa..0000000000 Binary files a/asm/incbin/overlay101_data.bin and /dev/null differ diff --git a/asm/incbin/overlay101_rodata.bin b/asm/incbin/overlay101_rodata.bin deleted file mode 100644 index 68ec4fe213..0000000000 Binary files a/asm/incbin/overlay101_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay102_rodata.bin b/asm/incbin/overlay102_rodata.bin deleted file mode 100644 index f927b7bbfc..0000000000 Binary files a/asm/incbin/overlay102_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay104_data.bin b/asm/incbin/overlay104_data.bin deleted file mode 100644 index 25da8866f0..0000000000 Binary files a/asm/incbin/overlay104_data.bin and /dev/null differ diff --git a/asm/incbin/overlay104_rodata.bin b/asm/incbin/overlay104_rodata.bin deleted file mode 100644 index 7968deda80..0000000000 Binary files a/asm/incbin/overlay104_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay105_rodata.bin b/asm/incbin/overlay105_rodata.bin deleted file mode 100644 index 28709b4c33..0000000000 Binary files a/asm/incbin/overlay105_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay106_rodata.bin b/asm/incbin/overlay106_rodata.bin deleted file mode 100644 index f7a124d967..0000000000 Binary files a/asm/incbin/overlay106_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay107_rodata.bin b/asm/incbin/overlay107_rodata.bin deleted file mode 100644 index 75cb932278..0000000000 Binary files a/asm/incbin/overlay107_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay108_rodata.bin b/asm/incbin/overlay108_rodata.bin deleted file mode 100644 index c6fb2c2625..0000000000 Binary files a/asm/incbin/overlay108_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay109_data.bin b/asm/incbin/overlay109_data.bin deleted file mode 100644 index 4c65a66483..0000000000 Binary files a/asm/incbin/overlay109_data.bin and /dev/null differ diff --git a/asm/incbin/overlay109_rodata.bin b/asm/incbin/overlay109_rodata.bin deleted file mode 100644 index a31726476e..0000000000 Binary files a/asm/incbin/overlay109_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay10_rodata.bin b/asm/incbin/overlay10_rodata.bin deleted file mode 100644 index 8e25bc8f2f..0000000000 Binary files a/asm/incbin/overlay10_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay110_rodata.bin b/asm/incbin/overlay110_rodata.bin deleted file mode 100644 index 3480f2796a..0000000000 Binary files a/asm/incbin/overlay110_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay111_data.bin b/asm/incbin/overlay111_data.bin deleted file mode 100644 index 0aa63404f0..0000000000 Binary files a/asm/incbin/overlay111_data.bin and /dev/null differ diff --git a/asm/incbin/overlay111_rodata.bin b/asm/incbin/overlay111_rodata.bin deleted file mode 100644 index bae5d30a8e..0000000000 Binary files a/asm/incbin/overlay111_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay112_data.bin b/asm/incbin/overlay112_data.bin deleted file mode 100644 index ea4d71e823..0000000000 Binary files a/asm/incbin/overlay112_data.bin and /dev/null differ diff --git a/asm/incbin/overlay112_rodata.bin b/asm/incbin/overlay112_rodata.bin deleted file mode 100644 index 03e4d8c6f2..0000000000 Binary files a/asm/incbin/overlay112_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay113_rodata.bin b/asm/incbin/overlay113_rodata.bin deleted file mode 100644 index f723516221..0000000000 Binary files a/asm/incbin/overlay113_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay114_rodata.bin b/asm/incbin/overlay114_rodata.bin deleted file mode 100644 index 8064af8224..0000000000 Binary files a/asm/incbin/overlay114_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay115_rodata.bin b/asm/incbin/overlay115_rodata.bin deleted file mode 100644 index 752f3ed51d..0000000000 Binary files a/asm/incbin/overlay115_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay116_data.bin b/asm/incbin/overlay116_data.bin deleted file mode 100644 index e8c3348ec3..0000000000 Binary files a/asm/incbin/overlay116_data.bin and /dev/null differ diff --git a/asm/incbin/overlay116_rodata.bin b/asm/incbin/overlay116_rodata.bin deleted file mode 100644 index 3d321a75ce..0000000000 Binary files a/asm/incbin/overlay116_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay117_rodata.bin b/asm/incbin/overlay117_rodata.bin deleted file mode 100644 index 38703f4117..0000000000 Binary files a/asm/incbin/overlay117_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay118_rodata.bin b/asm/incbin/overlay118_rodata.bin deleted file mode 100644 index ccff38b076..0000000000 Binary files a/asm/incbin/overlay118_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay119_rodata.bin b/asm/incbin/overlay119_rodata.bin deleted file mode 100644 index 68e94874bc..0000000000 Binary files a/asm/incbin/overlay119_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay11_rodata.bin b/asm/incbin/overlay11_rodata.bin deleted file mode 100644 index 285c0ce274..0000000000 Binary files a/asm/incbin/overlay11_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay120_rodata.bin b/asm/incbin/overlay120_rodata.bin deleted file mode 100644 index 54a67ababe..0000000000 Binary files a/asm/incbin/overlay120_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay121_rodata.bin b/asm/incbin/overlay121_rodata.bin deleted file mode 100644 index 00ad58484f..0000000000 Binary files a/asm/incbin/overlay121_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay12_data.bin b/asm/incbin/overlay12_data.bin deleted file mode 100644 index cd1d153953..0000000000 Binary files a/asm/incbin/overlay12_data.bin and /dev/null differ diff --git a/asm/incbin/overlay12_rodata.bin b/asm/incbin/overlay12_rodata.bin deleted file mode 100644 index 194f99f7ca..0000000000 Binary files a/asm/incbin/overlay12_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay13_rodata.bin b/asm/incbin/overlay13_rodata.bin deleted file mode 100644 index 7e72df19fb..0000000000 Binary files a/asm/incbin/overlay13_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay16_data.bin b/asm/incbin/overlay16_data.bin deleted file mode 100644 index 9e851d5635..0000000000 Binary files a/asm/incbin/overlay16_data.bin and /dev/null differ diff --git a/asm/incbin/overlay16_rodata.bin b/asm/incbin/overlay16_rodata.bin deleted file mode 100644 index 6ba2454443..0000000000 Binary files a/asm/incbin/overlay16_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay17_rodata.bin b/asm/incbin/overlay17_rodata.bin deleted file mode 100644 index 6f72a5bae9..0000000000 Binary files a/asm/incbin/overlay17_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay18_data.bin b/asm/incbin/overlay18_data.bin deleted file mode 100644 index 08012f7546..0000000000 Binary files a/asm/incbin/overlay18_data.bin and /dev/null differ diff --git a/asm/incbin/overlay19_data.bin b/asm/incbin/overlay19_data.bin deleted file mode 100644 index 4e4e493570..0000000000 Binary files a/asm/incbin/overlay19_data.bin and /dev/null differ diff --git a/asm/incbin/overlay19_rodata.bin b/asm/incbin/overlay19_rodata.bin deleted file mode 100644 index 6e77adc99e..0000000000 Binary files a/asm/incbin/overlay19_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay20_rodata.bin b/asm/incbin/overlay20_rodata.bin deleted file mode 100644 index c6e29e7533..0000000000 Binary files a/asm/incbin/overlay20_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay21_rodata.bin b/asm/incbin/overlay21_rodata.bin deleted file mode 100644 index 290846a332..0000000000 Binary files a/asm/incbin/overlay21_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay22_rodata.bin b/asm/incbin/overlay22_rodata.bin deleted file mode 100644 index cb52bae428..0000000000 Binary files a/asm/incbin/overlay22_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay23_data.bin b/asm/incbin/overlay23_data.bin deleted file mode 100644 index 141f103b4a..0000000000 Binary files a/asm/incbin/overlay23_data.bin and /dev/null differ diff --git a/asm/incbin/overlay23_rodata.bin b/asm/incbin/overlay23_rodata.bin deleted file mode 100644 index 5ae9fd50ce..0000000000 Binary files a/asm/incbin/overlay23_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay25_rodata.bin b/asm/incbin/overlay25_rodata.bin deleted file mode 100644 index d67ebaf26f..0000000000 Binary files a/asm/incbin/overlay25_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay26_rodata.bin b/asm/incbin/overlay26_rodata.bin deleted file mode 100644 index 5a39eefce2..0000000000 Binary files a/asm/incbin/overlay26_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay27_rodata.bin b/asm/incbin/overlay27_rodata.bin deleted file mode 100644 index 8fdfc5f41b..0000000000 Binary files a/asm/incbin/overlay27_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay28_rodata.bin b/asm/incbin/overlay28_rodata.bin deleted file mode 100644 index 192cf8668b..0000000000 Binary files a/asm/incbin/overlay28_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay29_rodata.bin b/asm/incbin/overlay29_rodata.bin deleted file mode 100644 index e601831b24..0000000000 Binary files a/asm/incbin/overlay29_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay30_rodata.bin b/asm/incbin/overlay30_rodata.bin deleted file mode 100644 index 70ba936331..0000000000 Binary files a/asm/incbin/overlay30_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay31_rodata.bin b/asm/incbin/overlay31_rodata.bin deleted file mode 100644 index 7c443920af..0000000000 Binary files a/asm/incbin/overlay31_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay32_rodata.bin b/asm/incbin/overlay32_rodata.bin deleted file mode 100644 index dca9d01d40..0000000000 Binary files a/asm/incbin/overlay32_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay33_data.bin b/asm/incbin/overlay33_data.bin deleted file mode 100644 index d04162ff85..0000000000 Binary files a/asm/incbin/overlay33_data.bin and /dev/null differ diff --git a/asm/incbin/overlay33_rodata.bin b/asm/incbin/overlay33_rodata.bin deleted file mode 100644 index 190a9b2ea7..0000000000 Binary files a/asm/incbin/overlay33_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay34_rodata.bin b/asm/incbin/overlay34_rodata.bin deleted file mode 100644 index fa0e9615c9..0000000000 Binary files a/asm/incbin/overlay34_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay35_rodata.bin b/asm/incbin/overlay35_rodata.bin deleted file mode 100644 index d9cdd4ad02..0000000000 Binary files a/asm/incbin/overlay35_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay36_rodata.bin b/asm/incbin/overlay36_rodata.bin deleted file mode 100644 index 9fd13541c7..0000000000 Binary files a/asm/incbin/overlay36_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay37_rodata.bin b/asm/incbin/overlay37_rodata.bin deleted file mode 100644 index b935b4d566..0000000000 Binary files a/asm/incbin/overlay37_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay38_rodata.bin b/asm/incbin/overlay38_rodata.bin deleted file mode 100644 index f474996dd0..0000000000 Binary files a/asm/incbin/overlay38_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay39_rodata.bin b/asm/incbin/overlay39_rodata.bin deleted file mode 100644 index e76c1fe542..0000000000 Binary files a/asm/incbin/overlay39_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay40_rodata.bin b/asm/incbin/overlay40_rodata.bin deleted file mode 100644 index bc13364aaf..0000000000 Binary files a/asm/incbin/overlay40_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay41_rodata.bin b/asm/incbin/overlay41_rodata.bin deleted file mode 100644 index 1d75bcfa3c..0000000000 Binary files a/asm/incbin/overlay41_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay42_rodata.bin b/asm/incbin/overlay42_rodata.bin deleted file mode 100644 index 1cd83d6b59..0000000000 Binary files a/asm/incbin/overlay42_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay43_rodata.bin b/asm/incbin/overlay43_rodata.bin deleted file mode 100644 index 74520ce5ce..0000000000 Binary files a/asm/incbin/overlay43_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay44_rodata.bin b/asm/incbin/overlay44_rodata.bin deleted file mode 100644 index 4f5ad4c620..0000000000 Binary files a/asm/incbin/overlay44_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay45_rodata.bin b/asm/incbin/overlay45_rodata.bin deleted file mode 100644 index 76b6be3615..0000000000 Binary files a/asm/incbin/overlay45_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay46_rodata.bin b/asm/incbin/overlay46_rodata.bin deleted file mode 100644 index 4c130b9947..0000000000 Binary files a/asm/incbin/overlay46_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay47_rodata.bin b/asm/incbin/overlay47_rodata.bin deleted file mode 100644 index 5f28fb6e51..0000000000 Binary files a/asm/incbin/overlay47_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay48_rodata.bin b/asm/incbin/overlay48_rodata.bin deleted file mode 100644 index 2ad8716c32..0000000000 Binary files a/asm/incbin/overlay48_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay49_rodata.bin b/asm/incbin/overlay49_rodata.bin deleted file mode 100644 index b28839e385..0000000000 Binary files a/asm/incbin/overlay49_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay4_rodata.bin b/asm/incbin/overlay4_rodata.bin deleted file mode 100644 index 0d123bc579..0000000000 Binary files a/asm/incbin/overlay4_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay50_rodata.bin b/asm/incbin/overlay50_rodata.bin deleted file mode 100644 index 5dbabc05ca..0000000000 Binary files a/asm/incbin/overlay50_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay51_rodata.bin b/asm/incbin/overlay51_rodata.bin deleted file mode 100644 index f474996dd0..0000000000 Binary files a/asm/incbin/overlay51_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay52_rodata.bin b/asm/incbin/overlay52_rodata.bin deleted file mode 100644 index c323bd538a..0000000000 Binary files a/asm/incbin/overlay52_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay53_rodata.bin b/asm/incbin/overlay53_rodata.bin deleted file mode 100644 index 4f3423f921..0000000000 Binary files a/asm/incbin/overlay53_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay54_rodata.bin b/asm/incbin/overlay54_rodata.bin deleted file mode 100644 index 393427f10f..0000000000 Binary files a/asm/incbin/overlay54_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay55_rodata.bin b/asm/incbin/overlay55_rodata.bin deleted file mode 100644 index 42be975b7a..0000000000 Binary files a/asm/incbin/overlay55_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay57_rodata.bin b/asm/incbin/overlay57_rodata.bin deleted file mode 100644 index 9d944c215d..0000000000 Binary files a/asm/incbin/overlay57_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay58_data.bin b/asm/incbin/overlay58_data.bin deleted file mode 100644 index cd65afd503..0000000000 Binary files a/asm/incbin/overlay58_data.bin and /dev/null differ diff --git a/asm/incbin/overlay58_rodata.bin b/asm/incbin/overlay58_rodata.bin deleted file mode 100644 index 25bfbae8f0..0000000000 Binary files a/asm/incbin/overlay58_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay59_data.bin b/asm/incbin/overlay59_data.bin deleted file mode 100644 index 7005e932ef..0000000000 Binary files a/asm/incbin/overlay59_data.bin and /dev/null differ diff --git a/asm/incbin/overlay59_rodata.bin b/asm/incbin/overlay59_rodata.bin deleted file mode 100644 index f98f328c8c..0000000000 Binary files a/asm/incbin/overlay59_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay5_data.bin b/asm/incbin/overlay5_data.bin deleted file mode 100644 index af01da248b..0000000000 Binary files a/asm/incbin/overlay5_data.bin and /dev/null differ diff --git a/asm/incbin/overlay5_rodata.bin b/asm/incbin/overlay5_rodata.bin deleted file mode 100644 index 3d04a6ff07..0000000000 Binary files a/asm/incbin/overlay5_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay60_rodata.bin b/asm/incbin/overlay60_rodata.bin deleted file mode 100644 index f42797c582..0000000000 Binary files a/asm/incbin/overlay60_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay61_data.bin b/asm/incbin/overlay61_data.bin deleted file mode 100644 index 67a7dfb8d9..0000000000 Binary files a/asm/incbin/overlay61_data.bin and /dev/null differ diff --git a/asm/incbin/overlay61_rodata.bin b/asm/incbin/overlay61_rodata.bin deleted file mode 100644 index f5b27e9545..0000000000 Binary files a/asm/incbin/overlay61_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay62_data.bin b/asm/incbin/overlay62_data.bin deleted file mode 100644 index 655ffddc55..0000000000 Binary files a/asm/incbin/overlay62_data.bin and /dev/null differ diff --git a/asm/incbin/overlay62_rodata.bin b/asm/incbin/overlay62_rodata.bin deleted file mode 100644 index 5cd0b7f347..0000000000 Binary files a/asm/incbin/overlay62_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay63_rodata.bin b/asm/incbin/overlay63_rodata.bin deleted file mode 100644 index fa7265b623..0000000000 Binary files a/asm/incbin/overlay63_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay64_data.bin b/asm/incbin/overlay64_data.bin deleted file mode 100644 index 80d6a79d32..0000000000 Binary files a/asm/incbin/overlay64_data.bin and /dev/null differ diff --git a/asm/incbin/overlay64_rodata.bin b/asm/incbin/overlay64_rodata.bin deleted file mode 100644 index 6484aa98bb..0000000000 Binary files a/asm/incbin/overlay64_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay65_data.bin b/asm/incbin/overlay65_data.bin deleted file mode 100644 index f30e750779..0000000000 Binary files a/asm/incbin/overlay65_data.bin and /dev/null differ diff --git a/asm/incbin/overlay65_rodata.bin b/asm/incbin/overlay65_rodata.bin deleted file mode 100644 index a07c6c44e8..0000000000 Binary files a/asm/incbin/overlay65_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay66_rodata.bin b/asm/incbin/overlay66_rodata.bin deleted file mode 100644 index c79f3bf7e8..0000000000 Binary files a/asm/incbin/overlay66_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay67_rodata.bin b/asm/incbin/overlay67_rodata.bin deleted file mode 100644 index 203c12474d..0000000000 Binary files a/asm/incbin/overlay67_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay68_data.bin b/asm/incbin/overlay68_data.bin deleted file mode 100644 index 63cbf22e67..0000000000 Binary files a/asm/incbin/overlay68_data.bin and /dev/null differ diff --git a/asm/incbin/overlay68_rodata.bin b/asm/incbin/overlay68_rodata.bin deleted file mode 100644 index 7cb0e75b23..0000000000 Binary files a/asm/incbin/overlay68_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay69_rodata.bin b/asm/incbin/overlay69_rodata.bin deleted file mode 100644 index c80492c37b..0000000000 Binary files a/asm/incbin/overlay69_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay6_data.bin b/asm/incbin/overlay6_data.bin deleted file mode 100644 index 8626b00e78..0000000000 Binary files a/asm/incbin/overlay6_data.bin and /dev/null differ diff --git a/asm/incbin/overlay6_rodata.bin b/asm/incbin/overlay6_rodata.bin deleted file mode 100644 index 31f3a2b194..0000000000 Binary files a/asm/incbin/overlay6_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay70_rodata.bin b/asm/incbin/overlay70_rodata.bin deleted file mode 100644 index fc34226df4..0000000000 Binary files a/asm/incbin/overlay70_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay71_rodata.bin b/asm/incbin/overlay71_rodata.bin deleted file mode 100644 index df7a911d49..0000000000 Binary files a/asm/incbin/overlay71_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay72_data.bin b/asm/incbin/overlay72_data.bin deleted file mode 100644 index 8fef2d87c5..0000000000 Binary files a/asm/incbin/overlay72_data.bin and /dev/null differ diff --git a/asm/incbin/overlay72_rodata.bin b/asm/incbin/overlay72_rodata.bin deleted file mode 100644 index 5c330bf148..0000000000 Binary files a/asm/incbin/overlay72_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay73_rodata.bin b/asm/incbin/overlay73_rodata.bin deleted file mode 100644 index 267faaf60a..0000000000 Binary files a/asm/incbin/overlay73_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay74_rodata.bin b/asm/incbin/overlay74_rodata.bin deleted file mode 100644 index b099546d67..0000000000 Binary files a/asm/incbin/overlay74_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay75_rodata.bin b/asm/incbin/overlay75_rodata.bin deleted file mode 100644 index b847398f12..0000000000 Binary files a/asm/incbin/overlay75_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay76_rodata.bin b/asm/incbin/overlay76_rodata.bin deleted file mode 100644 index c49b911816..0000000000 Binary files a/asm/incbin/overlay76_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay77_data.bin b/asm/incbin/overlay77_data.bin deleted file mode 100644 index 88439913e4..0000000000 Binary files a/asm/incbin/overlay77_data.bin and /dev/null differ diff --git a/asm/incbin/overlay77_rodata.bin b/asm/incbin/overlay77_rodata.bin deleted file mode 100644 index 9e1c7ba1f0..0000000000 Binary files a/asm/incbin/overlay77_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay78_rodata.bin b/asm/incbin/overlay78_rodata.bin deleted file mode 100644 index 556e66a0b0..0000000000 Binary files a/asm/incbin/overlay78_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay79_data.bin b/asm/incbin/overlay79_data.bin deleted file mode 100644 index d7137c2e79..0000000000 Binary files a/asm/incbin/overlay79_data.bin and /dev/null differ diff --git a/asm/incbin/overlay79_rodata.bin b/asm/incbin/overlay79_rodata.bin deleted file mode 100644 index da7aeccabb..0000000000 Binary files a/asm/incbin/overlay79_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay7_data.bin b/asm/incbin/overlay7_data.bin deleted file mode 100644 index 5f82665d86..0000000000 Binary files a/asm/incbin/overlay7_data.bin and /dev/null differ diff --git a/asm/incbin/overlay7_rodata.bin b/asm/incbin/overlay7_rodata.bin deleted file mode 100644 index a8ae60ca8e..0000000000 Binary files a/asm/incbin/overlay7_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay80_data.bin b/asm/incbin/overlay80_data.bin deleted file mode 100644 index bb24ae3090..0000000000 Binary files a/asm/incbin/overlay80_data.bin and /dev/null differ diff --git a/asm/incbin/overlay80_rodata.bin b/asm/incbin/overlay80_rodata.bin deleted file mode 100644 index a856d86e4b..0000000000 Binary files a/asm/incbin/overlay80_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay81_rodata.bin b/asm/incbin/overlay81_rodata.bin deleted file mode 100644 index 77328eeeb8..0000000000 Binary files a/asm/incbin/overlay81_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay82_rodata.bin b/asm/incbin/overlay82_rodata.bin deleted file mode 100644 index ca39a4e18f..0000000000 Binary files a/asm/incbin/overlay82_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay83_data.bin b/asm/incbin/overlay83_data.bin deleted file mode 100644 index bb952d8012..0000000000 Binary files a/asm/incbin/overlay83_data.bin and /dev/null differ diff --git a/asm/incbin/overlay83_rodata.bin b/asm/incbin/overlay83_rodata.bin deleted file mode 100644 index 4de7b61918..0000000000 Binary files a/asm/incbin/overlay83_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay84_rodata.bin b/asm/incbin/overlay84_rodata.bin deleted file mode 100644 index ca3f59b8d0..0000000000 Binary files a/asm/incbin/overlay84_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay85_rodata.bin b/asm/incbin/overlay85_rodata.bin deleted file mode 100644 index af1659ea97..0000000000 Binary files a/asm/incbin/overlay85_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay86_data.bin b/asm/incbin/overlay86_data.bin deleted file mode 100644 index 9870828e39..0000000000 Binary files a/asm/incbin/overlay86_data.bin and /dev/null differ diff --git a/asm/incbin/overlay86_rodata.bin b/asm/incbin/overlay86_rodata.bin deleted file mode 100644 index 9db7414989..0000000000 Binary files a/asm/incbin/overlay86_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay87_data.bin b/asm/incbin/overlay87_data.bin deleted file mode 100644 index 2990e7ef4b..0000000000 Binary files a/asm/incbin/overlay87_data.bin and /dev/null differ diff --git a/asm/incbin/overlay87_rodata.bin b/asm/incbin/overlay87_rodata.bin deleted file mode 100644 index ac684dd7a5..0000000000 Binary files a/asm/incbin/overlay87_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay88_rodata.bin b/asm/incbin/overlay88_rodata.bin deleted file mode 100644 index 8685cd38d0..0000000000 Binary files a/asm/incbin/overlay88_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay8_data.bin b/asm/incbin/overlay8_data.bin deleted file mode 100644 index 54768f4be4..0000000000 Binary files a/asm/incbin/overlay8_data.bin and /dev/null differ diff --git a/asm/incbin/overlay8_rodata.bin b/asm/incbin/overlay8_rodata.bin deleted file mode 100644 index 073d11812f..0000000000 Binary files a/asm/incbin/overlay8_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay90_data.bin b/asm/incbin/overlay90_data.bin deleted file mode 100644 index ee91dff00d..0000000000 Binary files a/asm/incbin/overlay90_data.bin and /dev/null differ diff --git a/asm/incbin/overlay90_rodata.bin b/asm/incbin/overlay90_rodata.bin deleted file mode 100644 index b9c99a286c..0000000000 Binary files a/asm/incbin/overlay90_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay91_rodata.bin b/asm/incbin/overlay91_rodata.bin deleted file mode 100644 index a4585f5131..0000000000 Binary files a/asm/incbin/overlay91_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay92_rodata.bin b/asm/incbin/overlay92_rodata.bin deleted file mode 100644 index 8f7240d319..0000000000 Binary files a/asm/incbin/overlay92_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay93_data.bin b/asm/incbin/overlay93_data.bin deleted file mode 100644 index 41afef9183..0000000000 Binary files a/asm/incbin/overlay93_data.bin and /dev/null differ diff --git a/asm/incbin/overlay93_rodata.bin b/asm/incbin/overlay93_rodata.bin deleted file mode 100644 index 2a3b57e2a2..0000000000 Binary files a/asm/incbin/overlay93_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay94_data.bin b/asm/incbin/overlay94_data.bin deleted file mode 100644 index d0bb27a1a3..0000000000 Binary files a/asm/incbin/overlay94_data.bin and /dev/null differ diff --git a/asm/incbin/overlay94_rodata.bin b/asm/incbin/overlay94_rodata.bin deleted file mode 100644 index 15080e4e30..0000000000 Binary files a/asm/incbin/overlay94_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay95_data.bin b/asm/incbin/overlay95_data.bin deleted file mode 100644 index 9870828e39..0000000000 Binary files a/asm/incbin/overlay95_data.bin and /dev/null differ diff --git a/asm/incbin/overlay95_rodata.bin b/asm/incbin/overlay95_rodata.bin deleted file mode 100644 index f63f6fbca6..0000000000 Binary files a/asm/incbin/overlay95_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay96_data.bin b/asm/incbin/overlay96_data.bin deleted file mode 100644 index 7c6f0d9361..0000000000 Binary files a/asm/incbin/overlay96_data.bin and /dev/null differ diff --git a/asm/incbin/overlay96_rodata.bin b/asm/incbin/overlay96_rodata.bin deleted file mode 100644 index a76e916779..0000000000 Binary files a/asm/incbin/overlay96_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay97_data.bin b/asm/incbin/overlay97_data.bin deleted file mode 100644 index 2ab6eb26fb..0000000000 Binary files a/asm/incbin/overlay97_data.bin and /dev/null differ diff --git a/asm/incbin/overlay97_rodata.bin b/asm/incbin/overlay97_rodata.bin deleted file mode 100644 index 884300ff8c..0000000000 Binary files a/asm/incbin/overlay97_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay98_data.bin b/asm/incbin/overlay98_data.bin deleted file mode 100644 index 80afb08891..0000000000 Binary files a/asm/incbin/overlay98_data.bin and /dev/null differ diff --git a/asm/incbin/overlay98_rodata.bin b/asm/incbin/overlay98_rodata.bin deleted file mode 100644 index 90241f250e..0000000000 Binary files a/asm/incbin/overlay98_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay99_rodata.bin b/asm/incbin/overlay99_rodata.bin deleted file mode 100644 index d2218bb2f4..0000000000 Binary files a/asm/incbin/overlay99_rodata.bin and /dev/null differ diff --git a/asm/incbin/overlay9_data.bin b/asm/incbin/overlay9_data.bin deleted file mode 100644 index 66c469eb1f..0000000000 Binary files a/asm/incbin/overlay9_data.bin and /dev/null differ diff --git a/asm/incbin/overlay9_rodata.bin b/asm/incbin/overlay9_rodata.bin deleted file mode 100644 index a1e8a0c769..0000000000 Binary files a/asm/incbin/overlay9_rodata.bin and /dev/null differ diff --git a/asm/main_etable.s b/asm/main_etable.s index c18c04420b..c0c5577e76 100644 --- a/asm/main_etable.s +++ b/asm/main_etable.s @@ -25,44 +25,44 @@ .global Exception_Table_Index Exception_Table_Index: ; 0x020E4670 - .incbin "incbin/arm9_exception.bin", 0x118, 0x164 + .incbin "incbin/main_etable.bin", 0x118, 0x164 .word Unk_020E4558 - .incbin "incbin/arm9_exception.bin",0x280,0x68 + .incbin "incbin/main_etable.bin",0x280,0x68 .word Unk_020E4560 - .incbin "incbin/arm9_exception.bin",0x2EC,0x2C + .incbin "incbin/main_etable.bin",0x2EC,0x2C .word Unk_020E4568 - .incbin "incbin/arm9_exception.bin",0x31C,0x8C + .incbin "incbin/main_etable.bin",0x31C,0x8C .word Unk_020E4570 - .incbin "incbin/arm9_exception.bin",0x3AC,0x8 + .incbin "incbin/main_etable.bin",0x3AC,0x8 .word Unk_020E4578 - .incbin "incbin/arm9_exception.bin",0x3B8,0x2C + .incbin "incbin/main_etable.bin",0x3B8,0x2C .word Unk_020E4580 - .incbin "incbin/arm9_exception.bin",0x3E8,0x80 + .incbin "incbin/main_etable.bin",0x3E8,0x80 .word Unk_020E4588 - .incbin "incbin/arm9_exception.bin",0x46C,0x2C + .incbin "incbin/main_etable.bin",0x46C,0x2C .word Unk_020E4590 - .incbin "incbin/arm9_exception.bin",0x49C,0x2C + .incbin "incbin/main_etable.bin",0x49C,0x2C .word Unk_020E45A0 - .incbin "incbin/arm9_exception.bin",0x4CC,0x68 + .incbin "incbin/main_etable.bin",0x4CC,0x68 .word Unk_020E45B4 - .incbin "incbin/arm9_exception.bin",0x538,0x2C + .incbin "incbin/main_etable.bin",0x538,0x2C .word Unk_020E45CC - .incbin "incbin/arm9_exception.bin",0x568,0x8 + .incbin "incbin/main_etable.bin",0x568,0x8 .word Unk_020E45D4 - .incbin "incbin/arm9_exception.bin",0x574,0x8 + .incbin "incbin/main_etable.bin",0x574,0x8 .word Unk_020E45E4 - .incbin "incbin/arm9_exception.bin",0x580,0x14 + .incbin "incbin/main_etable.bin",0x580,0x14 .word Unk_020E45EC - .incbin "incbin/arm9_exception.bin",0x598,0x8 + .incbin "incbin/main_etable.bin",0x598,0x8 .word Unk_020E4600 - .incbin "incbin/arm9_exception.bin",0x5A4,0x8 + .incbin "incbin/main_etable.bin",0x5A4,0x8 .word Unk_020E4608 - .incbin "incbin/arm9_exception.bin",0x5B0,0x38 + .incbin "incbin/main_etable.bin",0x5B0,0x38 .word Unk_020E4610 - .incbin "incbin/arm9_exception.bin",0x5EC,0x8 + .incbin "incbin/main_etable.bin",0x5EC,0x8 .word Unk_020E4628 - .incbin "incbin/arm9_exception.bin",0x5F8,0x14 + .incbin "incbin/main_etable.bin",0x5F8,0x14 .word Unk_020E4644 - .incbin "incbin/arm9_exception.bin",0x610,0x8 + .incbin "incbin/main_etable.bin",0x610,0x8 .word Unk_020E465C - .incbin "incbin/arm9_exception.bin",0x61C,0xCC \ No newline at end of file + .incbin "incbin/main_etable.bin",0x61C,0xCC \ No newline at end of file diff --git a/asm/overlay014/ov14_022248A4.s b/asm/overlay014/ov14_022248A4.s index a6a1deae95..1e9f658225 100644 --- a/asm/overlay014/ov14_022248A4.s +++ b/asm/overlay014/ov14_022248A4.s @@ -3,4 +3,4 @@ .global Unk_ov14_022248A4 Unk_ov14_022248A4: ; 0x022248A4 - .incbin "incbin/overlay14_rodata.bin", 0x0, 0xA5BC + .incbin "incbin/ov14_022248A4.bin", 0x0, 0xA5BC diff --git a/asm/overlay061/ov61_0222D498.s b/asm/overlay061/ov61_0222D498.s index a586f27934..1a7dd5cae8 100644 --- a/asm/overlay061/ov61_0222D498.s +++ b/asm/overlay061/ov61_0222D498.s @@ -666,7 +666,7 @@ _0222DCD8: .word 0x0222E76A .global Unk_ov61_0222E638 Unk_ov61_0222E638: ; 0x0222E638 - .incbin "incbin/overlay61_data.bin", 0x38, 0x1 + .space 0x1 .bss diff --git a/asm/overlay061/ov61_0222DCDC.s b/asm/overlay061/ov61_0222DCDC.s index bf565f87d9..c7a150aa00 100644 --- a/asm/overlay061/ov61_0222DCDC.s +++ b/asm/overlay061/ov61_0222DCDC.s @@ -354,9 +354,11 @@ _0222E0B4: .word 0x000059DB .global Unk_ov61_0222E63C Unk_ov61_0222E63C: ; 0x0222E63C - .incbin "incbin/overlay61_data.bin", 0x3C, 0x58 - 0x3C + .ascii "pkgdsprod.nintendo.co.jp" + .space 0x4 .global Unk_ov61_0222E658 Unk_ov61_0222E658: ; 0x0222E658 - .incbin "incbin/overlay61_data.bin", 0x58, 0x3 + .ascii "--" + .space 0x2 diff --git a/asm/overlay061/ov61_0222E0B8.s b/asm/overlay061/ov61_0222E0B8.s index c694377b63..9338507a9c 100644 --- a/asm/overlay061/ov61_0222E0B8.s +++ b/asm/overlay061/ov61_0222E0B8.s @@ -314,15 +314,25 @@ _0222E474: .word 0x00001C24 .global Unk_ov61_0222E550 Unk_ov61_0222E550: ; 0x0222E550 - .incbin "incbin/overlay61_rodata.bin", 0xD4, 0x104 - 0xD4 + .word 0x5, 0x3, 0x2 + .word 0x4, 0x1, 0x6, 0x9 + .word 0x2, 0x7, 0x8, 0x6 + .word 0x3 .global Unk_ov61_0222E580 Unk_ov61_0222E580: ; 0x0222E580 - .incbin "incbin/overlay61_rodata.bin", 0x104, 0x134 - 0x104 + .word 0x0, 0x4E20, 0x4E21 + .word 0x5208, 0x5209, 0x55F0, 0x55F1 + .word 0x59D8, 0x59D9, 0x59DA, 0x59DB + .word 0xFFFFFFFF + .global Unk_ov61_0222E5B0 Unk_ov61_0222E5B0: ; 0x0222E5B0 - .incbin "incbin/overlay61_rodata.bin", 0x134, 0x30 + .word 0x5, 0x3, 0x2 + .word 0x4, 0x1, 0x6, 0x9 + .word 0x2, 0x7, 0x8, 0x6 + .word 0x3 .data @@ -330,5 +340,21 @@ Unk_ov61_0222E5B0: ; 0x0222E5B0 .global Unk_ov61_0222E65C Unk_ov61_0222E65C: ; 0x0222E65C - .incbin "incbin/overlay61_data.bin", 0x5C, 0x100 + .byte 0x93, 0x18, 0x33, 0x28 + .byte 0x0B, 0x07, 0x03, 0x82, 0x02, 0x43, 0x8A, 0x86, 0xDB, 0x38, 0x34, 0x19, 0xD6, 0xF9, 0x59, 0xB2 + .byte 0xAD, 0x6A, 0x7D, 0xBC, 0xEE, 0xE0, 0x3A, 0x3F, 0xCA, 0x4C, 0x25, 0x68, 0xF4, 0xA9, 0x5B, 0xF7 + .byte 0x22, 0x60, 0x5A, 0x6F, 0xFA, 0x1B, 0x79, 0xE9, 0x17, 0xB1, 0x00, 0x9C, 0xAA, 0x5E, 0x9D, 0xFF + .byte 0xEA, 0xA0, 0x0D, 0x4B, 0x75, 0xF6, 0x61, 0x85, 0x5D, 0xBB, 0xDC, 0xFB, 0x64, 0x2E, 0x7A, 0xAB + .byte 0xF1, 0xE8, 0x44, 0x0C, 0xB8, 0x8F, 0xA8, 0x0A, 0x8E, 0xBD, 0xE1, 0x3B, 0xFC, 0x3C, 0x9F, 0x1A + .byte 0x56, 0xC5, 0xE2, 0xF5, 0x47, 0xD9, 0xD7, 0x8C, 0xCD, 0x97, 0xF0, 0x7B, 0x8B, 0xC3, 0x4F, 0x45 + .byte 0x04, 0x90, 0x81, 0x1E, 0x6B, 0xC9, 0xD3, 0x73, 0xC6, 0xE7, 0x24, 0xBA, 0x32, 0xF3, 0xC0, 0xEC + .byte 0x57, 0xCC, 0xC4, 0xB6, 0xC1, 0xAE, 0xAF, 0x88, 0xF2, 0x84, 0xCE, 0x4A, 0x0F, 0x94, 0x41, 0xB4 + .byte 0x74, 0x2A, 0xD1, 0x70, 0x1C, 0xD4, 0xB0, 0xC2, 0x09, 0x08, 0x16, 0x9B, 0xB5, 0x8D, 0x2B, 0xD2 + .byte 0x89, 0xB7, 0x99, 0xA1, 0x30, 0x65, 0x54, 0x40, 0x96, 0x71, 0xFE, 0xBF, 0x31, 0x06, 0xE5, 0x14 + .byte 0xE6, 0xDA, 0x48, 0x26, 0xAC, 0x87, 0x9A, 0xD8, 0xA6, 0xEB, 0x92, 0xCF, 0xFD, 0x77, 0x1D, 0x21 + .byte 0x9E, 0x36, 0x35, 0x53, 0x3E, 0xD0, 0xD5, 0x62, 0x58, 0x5F, 0x63, 0x7C, 0x7E, 0x52, 0x29, 0x12 + .byte 0x2C, 0x78, 0x05, 0x91, 0x55, 0xE3, 0xA2, 0xB9, 0xF8, 0x50, 0x95, 0x13, 0x80, 0x7F, 0x11, 0x27 + .byte 0xCB, 0x37, 0x4E, 0x51, 0x15, 0xEF, 0xA7, 0x72, 0x4D, 0x83, 0x49, 0xA4, 0x69, 0xDE, 0x20, 0xA3 + .byte 0x67, 0xDF, 0x10, 0x42, 0x39, 0x6C, 0x2D, 0xC7, 0x23, 0xE4, 0xDD, 0xED, 0xBE, 0x66, 0xB3, 0x2F + .byte 0x01, 0x6E, 0x6D, 0xC8, 0x1F, 0x98, 0xA5, 0x46, 0x76, 0x5C, 0x3D, 0x0E diff --git a/asm/overlay097/ov97_02239420.s b/asm/overlay097/ov97_02239420.s index 09ec317de1..a735a7e789 100644 --- a/asm/overlay097/ov97_02239420.s +++ b/asm/overlay097/ov97_02239420.s @@ -4793,7 +4793,15 @@ _0223D670: .word 0x02240AF4 .global Unk_ov97_0223DEC4 Unk_ov97_0223DEC4: ; 0x0223DEC4 - .incbin "incbin/overlay97_rodata.bin", 0x850, 0x74 + .byte 0x0, 0x8, 0x1, 0x1, 0x1, 0x10, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8, 0x1, 0x1 + .byte 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8, 0x1, 0x1, 0x1, 0x4, 0x1, 0x0 + .byte 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x2, 0x2, 0x3, 0x3, 0x3, 0x3, 0x4, 0x4, 0x4, 0x4 + .byte 0x4, 0x4, 0x4, 0x4 + .short 0x6, 0x1, 0x2, 0x1, 0x3, 0x1 + .short 0x2, 0x1, 0x4, 0x1, 0x2, 0x1, 0x3, 0x1 + .short 0x2, 0x1, 0x5, 0x1, 0x2, 0x1, 0x3, 0x1 + .short 0x2, 0x1, 0x4, 0x1, 0x2, 0x1, 0x3, 0x1 + .short 0x2, 0x1 .data @@ -4801,5 +4809,11 @@ Unk_ov97_0223DEC4: ; 0x0223DEC4 .global Unk_ov97_0223F158 Unk_ov97_0223F158: ; 0x0223F158 - .incbin "incbin/overlay97_data.bin", 0x1218, 0x1C + .word 0x0223DF37 + .word 0x0223DF36 + .word 0x0223DF34 + .word 0x0223DF30 + .word 0x0223DF28 + .word 0x0223DF18 + .word 0x0223DEF8 diff --git a/asm/unk_0209DD54.s b/asm/unk_0209DD54.s index ee3d5e5fc9..2dea9b428f 100644 --- a/asm/unk_0209DD54.s +++ b/asm/unk_0209DD54.s @@ -2715,9 +2715,11 @@ _020A05B8: .word 0x04000504 .global Unk_02100DA0 Unk_02100DA0: ; 0x02100DA0 - .incbin "incbin/arm9_data.bin", 0x20C0, 0x20C8 - 0x20C0 + .word sub_020A0500 + .word sub_020A0444 .global Unk_02100DA8 Unk_02100DA8: ; 0x02100DA8 - .incbin "incbin/arm9_data.bin", 0x20C8, 0x8 + .word sub_020A0358 + .word sub_020A0398 diff --git a/asm/unk_020A05BC.s b/asm/unk_020A05BC.s index 16df89adfa..f050dc9dc0 100644 --- a/asm/unk_020A05BC.s +++ b/asm/unk_020A05BC.s @@ -1360,5 +1360,6 @@ _020A19EC: .word Unk_02100DB0 .global Unk_02100DB0 Unk_02100DB0: ; 0x02100DB0 - .incbin "incbin/arm9_data.bin", 0x20D0, 0x6 + .word 0x10000000 + .space 0x2 diff --git a/lib/NitroDWC/asm/ac/incbin/search_dwcac.bin b/lib/NitroDWC/asm/ac/incbin/search_dwcac.bin new file mode 100644 index 0000000000..915e0af5e4 Binary files /dev/null and b/lib/NitroDWC/asm/ac/incbin/search_dwcac.bin differ diff --git a/lib/NitroDWC/asm/ac/incbin/shop_usb.bin b/lib/NitroDWC/asm/ac/incbin/shop_usb.bin new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/NitroDWC/asm/ac/incbin/test.bin b/lib/NitroDWC/asm/ac/incbin/test.bin new file mode 100644 index 0000000000..d132ba55fc Binary files /dev/null and b/lib/NitroDWC/asm/ac/incbin/test.bin differ diff --git a/lib/NitroDWC/asm/ac/makelist.s b/lib/NitroDWC/asm/ac/makelist.s index 87f178b6a0..0bf575a931 100644 --- a/lib/NitroDWC/asm/ac/makelist.s +++ b/lib/NitroDWC/asm/ac/makelist.s @@ -323,15 +323,15 @@ _021E77FC: .global Unk_ov4_02215898 Unk_ov4_02215898: ; 0x02215898 - .incbin "incbin/overlay4_rodata.bin", 0x30, 0x38 - 0x30 + .ascii "Wayport2" .global Unk_ov4_022158A0 Unk_ov4_022158A0: ; 0x022158A0 - .incbin "incbin/overlay4_rodata.bin", 0x38, 0x40 - 0x38 + .ascii "FREESPOT" .global Unk_ov4_022158A8 Unk_ov4_022158A8: ; 0x022158A8 - .incbin "incbin/overlay4_rodata.bin", 0x40, 0xC + .asciz "NINTENDOWFC" @@ -340,5 +340,5 @@ Unk_ov4_022158A8: ; 0x022158A8 .global Unk_ov4_0221760C Unk_ov4_0221760C: ; 0x0221760C - .incbin "incbin/overlay4_data.bin", 0x178C, 0x9 + .asciz "NWCUSBAP" diff --git a/lib/NitroDWC/asm/ac/search_dwcac.s b/lib/NitroDWC/asm/ac/search_dwcac.s index 009da57371..d853640083 100644 --- a/lib/NitroDWC/asm/ac/search_dwcac.s +++ b/lib/NitroDWC/asm/ac/search_dwcac.s @@ -604,5 +604,5 @@ _021E80AC: .word Unk_ov4_022158B4 .global Unk_ov4_022158B4 Unk_ov4_022158B4: ; 0x022158B4 - .incbin "incbin/overlay4_rodata.bin", 0x4C, 0x34 + .incbin "incbin/search_dwcac.bin", 0x0, 0x34 diff --git a/lib/NitroDWC/asm/ac/shop_usb.s b/lib/NitroDWC/asm/ac/shop_usb.s index 7a930ceac0..5152fe32f9 100644 --- a/lib/NitroDWC/asm/ac/shop_usb.s +++ b/lib/NitroDWC/asm/ac/shop_usb.s @@ -448,19 +448,23 @@ _021E8B9C: .global Unk_ov4_02215940 Unk_ov4_02215940: ; 0x02215940 - .incbin "incbin/overlay4_rodata.bin", 0xD8, 0xDB - 0xD8 + .ascii "aaa" .global Unk_ov4_02215943 Unk_ov4_02215943: ; 0x02215943 - .incbin "incbin/overlay4_rodata.bin", 0xDB, 0xF4 - 0xDB + .byte 0x17, 0x14, 0x11, 0xD, 0xB + .byte 0x6, 0xF, 0xE, 0x9, 0x15, 0xC, 0x4, 0x2, 0x1, 0x12, 0x10, 0x5, 0x3, 0x13, 0xA, 0x7 + .short 0x8, 0x16 .global Unk_ov4_0221595C Unk_ov4_0221595C: ; 0x0221595C - .incbin "incbin/overlay4_rodata.bin", 0xF4, 0x104 - 0xF4 + .byte 0x5, 0x1, 0xC, 0x4, 0x2, 0x3, 0xA, 0x0, 0xB, 0x7, 0x9, 0x8 + .word 0x6 .global Unk_ov4_0221596C Unk_ov4_0221596C: ; 0x0221596C - .incbin "incbin/overlay4_rodata.bin", 0x104, 0x10 + .byte 0xA, 0xD, 0xE, 0x8, 0x9, 0x3, 0x6, 0x0, 0xC, 0x5, 0x2, 0x7 + .byte 0xB, 0x1, 0xF, 0x4 @@ -469,41 +473,47 @@ Unk_ov4_0221596C: ; 0x0221596C .global Unk_ov4_02217624 Unk_ov4_02217624: ; 0x02217624 - .incbin "incbin/overlay4_data.bin", 0x17A4, 0x17A8 - 0x17A4 + .word Unk_ov4_02217670 .global Unk_ov4_02217628 Unk_ov4_02217628: ; 0x02217628 - .incbin "incbin/overlay4_data.bin", 0x17A8, 0x17AC - 0x17A8 + .word Unk_ov4_02217634 .global Unk_ov4_0221762C Unk_ov4_0221762C: ; 0x0221762C - .incbin "incbin/overlay4_data.bin", 0x17AC, 0x17B0 - 0x17AC + .word Unk_ov4_02217654 .global Unk_ov4_02217630 Unk_ov4_02217630: ; 0x02217630 - .incbin "incbin/overlay4_data.bin", 0x17B0, 0x17B4 - 0x17B0 + .word Unk_ov4_02217644 .global Unk_ov4_02217634 Unk_ov4_02217634: ; 0x02217634 - .incbin "incbin/overlay4_data.bin", 0x17B4, 0x17C4 - 0x17B4 + .asciz "gwi'6&fs=0Nf~" + .space 0x2 .global Unk_ov4_02217644 Unk_ov4_02217644: ; 0x02217644 - .incbin "incbin/overlay4_data.bin", 0x17C4, 0x17D4 - 0x17C4 + .asciz "%(egEr)ag(s&m" + .space 0x2 .global Unk_ov4_02217654 Unk_ov4_02217654: ; 0x02217654 - .incbin "incbin/overlay4_data.bin", 0x17D4, 0x17F0 - 0x17D4 + .ascii "952uybjnpmu903bia@bk5m[-" + .space 0x4 .global Unk_ov4_02217670 Unk_ov4_02217670: ; 0x02217670 - .incbin "incbin/overlay4_data.bin", 0x17F0, 0x180C - 0x17F0 + .ascii "38g6zxjk20gvmv]6^=j&%vY1" + .space 0x4 .global Unk_ov4_0221768C Unk_ov4_0221768C: ; 0x0221768C - .incbin "incbin/overlay4_data.bin", 0x180C, 0x1818 - 0x180C + .ascii "NDWCSHAP" + .space 0x4 .global Unk_ov4_02217698 Unk_ov4_02217698: ; 0x02217698 - .incbin "incbin/overlay4_data.bin", 0x1818, 0x9 + .ascii "NWCUSBAP" + .space 0x4 diff --git a/lib/NitroDWC/asm/ac/test.s b/lib/NitroDWC/asm/ac/test.s index 0761af09e0..0037773810 100644 --- a/lib/NitroDWC/asm/ac/test.s +++ b/lib/NitroDWC/asm/ac/test.s @@ -379,9 +379,9 @@ ov4_021E856C: ; 0x021E856C .global Unk_ov4_022158E8 Unk_ov4_022158E8: ; 0x022158E8 - .incbin "incbin/overlay4_rodata.bin", 0x80, 0x48 + .incbin "incbin/test.bin", 0x0, 0x48 .word Unk_ov4_02217618 - .incbin "incbin/overlay4_rodata.bin", 0xCC, 0xC + .word 0x4, 0x0, 0x0 @@ -390,5 +390,5 @@ Unk_ov4_022158E8: ; 0x022158E8 .global Unk_ov4_02217618 Unk_ov4_02217618: ; 0x02217618 - .incbin "incbin/overlay4_data.bin", 0x1798, 0xC + .asciz "NINTENDO-DS" diff --git a/lib/NitroDWC/asm/ac/wds.s b/lib/NitroDWC/asm/ac/wds.s index 5c5b70fe06..9bece23b8c 100644 --- a/lib/NitroDWC/asm/ac/wds.s +++ b/lib/NitroDWC/asm/ac/wds.s @@ -453,7 +453,7 @@ _021E91B0: .word Unk_ov4_0221AE40 .global Unk_ov4_0221597C Unk_ov4_0221597C: ; 0x0221597C - .incbin "incbin/overlay4_rodata.bin", 0x114, 0x4 + .ascii "!SDW" diff --git a/lib/NitroDWC/asm/auth/dwc_auth.s b/lib/NitroDWC/asm/auth/dwc_auth.s index 5648e1ba8f..79cc7ea131 100644 --- a/lib/NitroDWC/asm/auth/dwc_auth.s +++ b/lib/NitroDWC/asm/auth/dwc_auth.s @@ -1032,91 +1032,113 @@ _021D3E58: .word Unk_ov4_0221A414 .global Unk_ov4_02215EA0 Unk_ov4_02215EA0: ; 0x02215EA0 - .incbin "incbin/overlay4_data.bin", 0x20, 0x3C - 0x20 + .word Unk_ov4_02215EBC + .word 0x0 + .word 0x1000 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x4E20 .global Unk_ov4_02215EBC Unk_ov4_02215EBC: ; 0x02215EBC - .incbin "incbin/overlay4_data.bin", 0x3C, 0x64 - 0x3C + .ascii "https://nas.test.nintendowifi.net/ac" + .word 0x0 .global Unk_ov4_02215EE4 Unk_ov4_02215EE4: ; 0x02215EE4 - .incbin "incbin/overlay4_data.bin", 0x64, 0x74 - 0x64 + .asciz "ALLOC DWCauth" + .short 0x0 .global Unk_ov4_02215EF4 Unk_ov4_02215EF4: ; 0x02215EF4 - .incbin "incbin/overlay4_data.bin", 0x74, 0x84 - 0x74 + .ascii "FREE DWCauth" + .word 0x0 .global Unk_ov4_02215F04 Unk_ov4_02215F04: ; 0x02215F04 - .incbin "incbin/overlay4_data.bin", 0x84, 0xA4 - 0x84 + .asciz "https://nas.nintendowifi.net/ac" .global Unk_ov4_02215F24 Unk_ov4_02215F24: ; 0x02215F24 - .incbin "incbin/overlay4_data.bin", 0xA4, 0xB4 - 0xA4 + .ascii "ALLOC bmwork" + .word 0x0 .global Unk_ov4_02215F34 Unk_ov4_02215F34: ; 0x02215F34 - .incbin "incbin/overlay4_data.bin", 0xB4, 0xC0 - 0xB4 + .asciz "FREE bmwork" .global Unk_ov4_02215F40 Unk_ov4_02215F40: ; 0x02215F40 - .incbin "incbin/overlay4_data.bin", 0xC0, 0xC8 - 0xC0 + .ascii "Date" + .word 0x0 .global Unk_ov4_02215F48 Unk_ov4_02215F48: ; 0x02215F48 - .incbin "incbin/overlay4_data.bin", 0xC8, 0xD4 - 0xC8 + .ascii "httpresult" + .short 0x0 .global Unk_ov4_02215F54 Unk_ov4_02215F54: ; 0x02215F54 - .incbin "incbin/overlay4_data.bin", 0xD4, 0xE0 - 0xD4 + .ascii "returncd" + .word 0x0 .global Unk_ov4_02215F60 Unk_ov4_02215F60: ; 0x02215F60 - .incbin "incbin/overlay4_data.bin", 0xE0, 0xE8 - 0xE0 + .asciz "token" + .short 0x0 .global Unk_ov4_02215F68 Unk_ov4_02215F68: ; 0x02215F68 - .incbin "incbin/overlay4_data.bin", 0xE8, 0xF0 - 0xE8 + .asciz "locator" .global Unk_ov4_02215F70 Unk_ov4_02215F70: ; 0x02215F70 - .incbin "incbin/overlay4_data.bin", 0xF0, 0xFC - 0xF0 + .asciz "challenge" + .short 0x0 .global Unk_ov4_02215F7C Unk_ov4_02215F7C: ; 0x02215F7C - .incbin "incbin/overlay4_data.bin", 0xFC, 0x108 - 0xFC + .ascii "datetime" + .word 0x0 .global Unk_ov4_02215F88 Unk_ov4_02215F88: ; 0x02215F88 - .incbin "incbin/overlay4_data.bin", 0x108, 0x114 - 0x108 + .ascii "Set-Cookie" + .short 0x0 .global Unk_ov4_02215F94 Unk_ov4_02215F94: ; 0x02215F94 - .incbin "incbin/overlay4_data.bin", 0x114, 0x120 - 0x114 + .ascii "acctcreate" + .short 0x0 .global Unk_ov4_02215FA0 Unk_ov4_02215FA0: ; 0x02215FA0 - .incbin "incbin/overlay4_data.bin", 0x120, 0x128 - 0x120 + .ascii "action" + .short 0x0 .global Unk_ov4_02215FA8 Unk_ov4_02215FA8: ; 0x02215FA8 - .incbin "incbin/overlay4_data.bin", 0x128, 0x130 - 0x128 + .asciz "login" + .short 0x0 .global Unk_ov4_02215FB0 Unk_ov4_02215FB0: ; 0x02215FB0 - .incbin "incbin/overlay4_data.bin", 0x130, 0x138 - 0x130 + .ascii "gsbrcd" + .short 0x0 .global Unk_ov4_02215FB8 Unk_ov4_02215FB8: ; 0x02215FB8 - .incbin "incbin/overlay4_data.bin", 0x138, 0x13C - 0x138 + .word 0x59 .global Unk_ov4_02215FBC Unk_ov4_02215FBC: ; 0x02215FBC - .incbin "incbin/overlay4_data.bin", 0x13C, 0x144 - 0x13C + .asciz "iswfc" + .short 0x0 .global Unk_ov4_02215FC4 Unk_ov4_02215FC4: ; 0x02215FC4 - .incbin "incbin/overlay4_data.bin", 0x144, 0x9 + .asciz "ingamesn" diff --git a/lib/NitroDWC/asm/auth/dwc_ca_cybertrust.s b/lib/NitroDWC/asm/auth/dwc_ca_cybertrust.s index 0253c60e9c..2baf01444b 100644 --- a/lib/NitroDWC/asm/auth/dwc_ca_cybertrust.s +++ b/lib/NitroDWC/asm/auth/dwc_ca_cybertrust.s @@ -7,7 +7,8 @@ .global Unk_ov4_02216670 Unk_ov4_02216670: ; 0x02216670 - .incbin "incbin/overlay4_data.bin", 0x7F0, 0x7F4 - 0x7F0 + .short 0x1 + .short 0x1 .global Unk_ov4_02216674 Unk_ov4_02216674: ; 0x02216674 @@ -19,57 +20,75 @@ Unk_ov4_02216674: ; 0x02216674 .global Unk_ov4_02216688 Unk_ov4_02216688: ; 0x02216688 - .incbin "incbin/overlay4_data.bin", 0x808, 0x83C - 0x808 + .asciz "BE, GlobalSign nv-sa, Root CA, GlobalSign Root CA" + .short 0x0 .global Unk_ov4_022166BC Unk_ov4_022166BC: ; 0x022166BC - .incbin "incbin/overlay4_data.bin", 0x83C, 0x93C - 0x83C + .incbin "incbin/dwc_ca_cybertrust.bin", 0x0, 0x100 .global Unk_ov4_022167BC Unk_ov4_022167BC: ; 0x022167BC - .incbin "incbin/overlay4_data.bin", 0x93C, 0x940 - 0x93C + .short 0x1 + .short 0x1 .global Unk_ov4_022167C0 Unk_ov4_022167C0: ; 0x022167C0 - .incbin "incbin/overlay4_data.bin", 0x940, 0x954 - 0x940 + .word Unk_ov4_022167D4 + .word 0x100 + .word Unk_ov4_0221680C + .word 0x3 + .word Unk_ov4_022167BC .global Unk_ov4_022167D4 Unk_ov4_022167D4: ; 0x022167D4 - .incbin "incbin/overlay4_data.bin", 0x954, 0x98C - 0x954 + .ascii "IE, Baltimore, CyberTrust, Baltimore CyberTrust Root" + .word 0x0 .global Unk_ov4_0221680C Unk_ov4_0221680C: ; 0x0221680C - .incbin "incbin/overlay4_data.bin", 0x98C, 0xA8C - 0x98C + .incbin "incbin/dwc_ca_cybertrust.bin", 0x100, 0x200 - 0x100 .global Unk_ov4_0221690C Unk_ov4_0221690C: ; 0x0221690C - .incbin "incbin/overlay4_data.bin", 0xA8C, 0xA90 - 0xA8C + .short 0x1 + .short 0x1 .global Unk_ov4_02216910 Unk_ov4_02216910: ; 0x02216910 - .incbin "incbin/overlay4_data.bin", 0xA90, 0xAA4 - 0xA90 + .word Unk_ov4_02216924 + .word 0x80 + .word Unk_ov4_02216974 + .word 0x3 + .word Unk_ov4_0221690C .global Unk_ov4_02216924 Unk_ov4_02216924: ; 0x02216924 - .incbin "incbin/overlay4_data.bin", 0xAA4, 0xAF4 - 0xAA4 + .asciz "US, GTE Corporation, GTE CyberTrust Solutions, Inc., GTE CyberTrust Global Root" .global Unk_ov4_02216974 Unk_ov4_02216974: ; 0x02216974 - .incbin "incbin/overlay4_data.bin", 0xAF4, 0xB74 - 0xAF4 + .incbin "incbin/dwc_ca_cybertrust.bin", 0x200, 0x280 - 0x200 .global Unk_ov4_022169F4 Unk_ov4_022169F4: ; 0x022169F4 - .incbin "incbin/overlay4_data.bin", 0xB74, 0xB78 - 0xB74 + .short 0x1 + .short 0x1 .global Unk_ov4_022169F8 Unk_ov4_022169F8: ; 0x022169F8 - .incbin "incbin/overlay4_data.bin", 0xB78, 0xB8C - 0xB78 + .word Unk_ov4_02216A0C + .word 0x80 + .word Unk_ov4_02216A38 + .word 0x3 + .word Unk_ov4_022169F4 .global Unk_ov4_02216A0C Unk_ov4_02216A0C: ; 0x02216A0C - .incbin "incbin/overlay4_data.bin", 0xB8C, 0xBB8 - 0xB8C + .ascii "US, GTE Corporation, GTE CyberTrust Root" + .word 0x0 .global Unk_ov4_02216A38 Unk_ov4_02216A38: ; 0x02216A38 - .incbin "incbin/overlay4_data.bin", 0xBB8, 0x80 + .incbin "incbin/dwc_ca_cybertrust.bin", 0x280, 0x80 diff --git a/lib/NitroDWC/asm/auth/dwc_ca_globalsign.s b/lib/NitroDWC/asm/auth/dwc_ca_globalsign.s index d920cb24e3..5a1bf49273 100644 --- a/lib/NitroDWC/asm/auth/dwc_ca_globalsign.s +++ b/lib/NitroDWC/asm/auth/dwc_ca_globalsign.s @@ -7,17 +7,22 @@ .global Unk_ov4_02217270 Unk_ov4_02217270: ; 0x02217270 - .incbin "incbin/overlay4_data.bin", 0x13F0, 0x13F4 - 0x13F0 + .short 0x1 + .short 0x1 .global Unk_ov4_02217274 Unk_ov4_02217274: ; 0x02217274 - .incbin "incbin/overlay4_data.bin", 0x13F4, 0x1408 - 0x13F4 + .word Unk_ov4_02217288 + .word 0x100 + .word Unk_ov4_022172B8 + .word 0x3 + .word Unk_ov4_02217270 .global Unk_ov4_02217288 Unk_ov4_02217288: ; 0x02217288 - .incbin "incbin/overlay4_data.bin", 0x1408, 0x1438 - 0x1408 + .asciz "GlobalSign Root CA - R2, GlobalSign, GlobalSign" .global Unk_ov4_022172B8 Unk_ov4_022172B8: ; 0x022172B8 - .incbin "incbin/overlay4_data.bin", 0x1438, 0x100 + .incbin "incbin/dwc_ca_globalsign.bin", 0x0, 0x100 diff --git a/lib/NitroDWC/asm/auth/dwc_ca_nas_self.s b/lib/NitroDWC/asm/auth/dwc_ca_nas_self.s index da05520657..6d0701cc0a 100644 --- a/lib/NitroDWC/asm/auth/dwc_ca_nas_self.s +++ b/lib/NitroDWC/asm/auth/dwc_ca_nas_self.s @@ -7,17 +7,23 @@ .global Unk_ov4_02216AB8 Unk_ov4_02216AB8: ; 0x02216AB8 - .incbin "incbin/overlay4_data.bin", 0xC38, 0xC3C - 0xC38 + .short 0x1 + .short 0x1 .global Unk_ov4_02216ABC Unk_ov4_02216ABC: ; 0x02216ABC - .incbin "incbin/overlay4_data.bin", 0xC3C, 0xC50 - 0xC3C + .word Unk_ov4_02216AD0 + .word 0x80 + .word Unk_ov4_02216B20 + .word 0x3 + .word Unk_ov4_02216AB8 .global Unk_ov4_02216AD0 Unk_ov4_02216AD0: ; 0x02216AD0 - .incbin "incbin/overlay4_data.bin", 0xC50, 0xCA0 - 0xC50 + .asciz "US, Washington, Nintendo of America Inc, NOA, Nintendo CA, ca@noa.nintendo.com" + .byte 0x0 .global Unk_ov4_02216B20 Unk_ov4_02216B20: ; 0x02216B20 - .incbin "incbin/overlay4_data.bin", 0xCA0, 0x80 + .incbin "incbin/dwc_ca_nas_self.bin", 0x0, 0x80 diff --git a/lib/NitroDWC/asm/auth/dwc_ca_thawte_premiumserver.s b/lib/NitroDWC/asm/auth/dwc_ca_thawte_premiumserver.s index efae5fd3d0..2c2cd68dce 100644 --- a/lib/NitroDWC/asm/auth/dwc_ca_thawte_premiumserver.s +++ b/lib/NitroDWC/asm/auth/dwc_ca_thawte_premiumserver.s @@ -7,17 +7,22 @@ .global Unk_ov4_02216BA0 Unk_ov4_02216BA0: ; 0x02216BA0 - .incbin "incbin/overlay4_data.bin", 0xD20, 0xD24 - 0xD20 + .short 0x1 + .short 0x1 .global Unk_ov4_02216BA4 Unk_ov4_02216BA4: ; 0x02216BA4 - .incbin "incbin/overlay4_data.bin", 0xD24, 0xD38 - 0xD24 + .word Unk_ov4_02216C38 + .word 0x80 + .word Unk_ov4_02216BB8 + .word 0x3 + .word Unk_ov4_02216BA0 .global Unk_ov4_02216BB8 Unk_ov4_02216BB8: ; 0x02216BB8 - .incbin "incbin/overlay4_data.bin", 0xD38, 0xDB8 - 0xD38 + .incbin "incbin/dwc_ca_thawte_premiumserver.bin", 0x0, 0x80 .global Unk_ov4_02216C38 Unk_ov4_02216C38: ; 0x02216C38 - .incbin "incbin/overlay4_data.bin", 0xDB8, 0x88 + .asciz "ZA, Western Cape, Cape Town, Thawte Consulting cc, Certification Services Division, Thawte Premium Server CA, premium-server@thawte.com" diff --git a/lib/NitroDWC/asm/auth/dwc_ca_thawte_server.s b/lib/NitroDWC/asm/auth/dwc_ca_thawte_server.s index 15aa572efd..49323ef2fb 100644 --- a/lib/NitroDWC/asm/auth/dwc_ca_thawte_server.s +++ b/lib/NitroDWC/asm/auth/dwc_ca_thawte_server.s @@ -7,17 +7,23 @@ .global Unk_ov4_02216CC0 Unk_ov4_02216CC0: ; 0x02216CC0 - .incbin "incbin/overlay4_data.bin", 0xE40, 0xE44 - 0xE40 + .short 0x1 + .short 0x1 .global Unk_ov4_02216CC4 Unk_ov4_02216CC4: ; 0x02216CC4 - .incbin "incbin/overlay4_data.bin", 0xE44, 0xE58 - 0xE44 + .word Unk_ov4_02216CD8 + .word 0x80 + .word Unk_ov4_02216D58 + .word 0x3 + .word Unk_ov4_02216CC0 .global Unk_ov4_02216CD8 Unk_ov4_02216CD8: ; 0x02216CD8 - .incbin "incbin/overlay4_data.bin", 0xE58, 0xED8 - 0xE58 + .asciz "ZA, Western Cape, Cape Town, Thawte Consulting cc, Certification Services Division, Thawte Server CA, server-certs@thawte.com" + .short 0x0 .global Unk_ov4_02216D58 Unk_ov4_02216D58: ; 0x02216D58 - .incbin "incbin/overlay4_data.bin", 0xED8, 0x80 + .incbin "incbin/dwc_ca_thawte_server.bin", 0x0, 0x80 diff --git a/lib/NitroDWC/asm/auth/dwc_ca_verisign.s b/lib/NitroDWC/asm/auth/dwc_ca_verisign.s index 4e857cddbc..7ebd1e70ad 100644 --- a/lib/NitroDWC/asm/auth/dwc_ca_verisign.s +++ b/lib/NitroDWC/asm/auth/dwc_ca_verisign.s @@ -7,65 +7,89 @@ .global Unk_ov4_02216DD8 Unk_ov4_02216DD8: ; 0x02216DD8 - .incbin "incbin/overlay4_data.bin", 0xF58, 0xF5C - 0xF58 + .short 0x1 + .short 0x1 .global Unk_ov4_02216DDC Unk_ov4_02216DDC: ; 0x02216DDC - .incbin "incbin/overlay4_data.bin", 0xF5C, 0xF70 - 0xF5C + .word Unk_ov4_02216E70 + .word 0x80 + .word Unk_ov4_02216DF0 + .word 0x3 + .word Unk_ov4_02216DD8 .global Unk_ov4_02216DF0 Unk_ov4_02216DF0: ; 0x02216DF0 - .incbin "incbin/overlay4_data.bin", 0xF70, 0xFF0 - 0xF70 + .incbin "incbin/dwc_ca_verisign.bin", 0x0, 0x80 .global Unk_ov4_02216E70 Unk_ov4_02216E70: ; 0x02216E70 - .incbin "incbin/overlay4_data.bin", 0xFF0, 0x1084 - 0xFF0 + .asciz "US, VeriSign, Inc., Class 3 Public Primary Certification Authority - G2, (c) 1998 VeriSign, Inc. - For authorized use only, VeriSign Trust Network" + .byte 0x0 .global Unk_ov4_02216F04 Unk_ov4_02216F04: ; 0x02216F04 - .incbin "incbin/overlay4_data.bin", 0x1084, 0x1088 - 0x1084 + .short 0x1 + .short 0x1 .global Unk_ov4_02216F08 Unk_ov4_02216F08: ; 0x02216F08 - .incbin "incbin/overlay4_data.bin", 0x1088, 0x109C - 0x1088 + .word Unk_ov4_02216F1C + .word 0x100 + .word Unk_ov4_02216FB8 + .word 0x3 + .word Unk_ov4_02216F04 + .global Unk_ov4_02216F1C Unk_ov4_02216F1C: ; 0x02216F1C - .incbin "incbin/overlay4_data.bin", 0x109C, 0x1138 - 0x109C + .asciz "US, VeriSign, Inc., VeriSign Trust Network, (c) 1999 VeriSign, Inc. - For authorized use only, VeriSign Class 3 Public Primary Certification Authority - G3" .global Unk_ov4_02216FB8 Unk_ov4_02216FB8: ; 0x02216FB8 - .incbin "incbin/overlay4_data.bin", 0x1138, 0x1238 - 0x1138 + .incbin "incbin/dwc_ca_verisign.bin", 0x80, 0x100 .global Unk_ov4_022170B8 Unk_ov4_022170B8: ; 0x022170B8 - .incbin "incbin/overlay4_data.bin", 0x1238, 0x123C - 0x1238 + .short 0x1 + .short 0x1 .global Unk_ov4_022170BC Unk_ov4_022170BC: ; 0x022170BC - .incbin "incbin/overlay4_data.bin", 0x123C, 0x1250 - 0x123C + .word Unk_ov4_022170D0 + .word 0x80 + .word Unk_ov4_02217114 + .word 0x3 + .word Unk_ov4_022170B8 .global Unk_ov4_022170D0 Unk_ov4_022170D0: ; 0x022170D0 - .incbin "incbin/overlay4_data.bin", 0x1250, 0x1294 - 0x1250 + .asciz "US, VeriSign, Inc., Class 3 Public Primary Certification Authority" + .byte 0x0 .global Unk_ov4_02217114 Unk_ov4_02217114: ; 0x02217114 - .incbin "incbin/overlay4_data.bin", 0x1294, 0x1314 - 0x1294 + .incbin "incbin/dwc_ca_verisign.bin", 0x180, 0x80 .global Unk_ov4_02217194 Unk_ov4_02217194: ; 0x02217194 - .incbin "incbin/overlay4_data.bin", 0x1314, 0x1318 - 0x1314 + .short 0x1 + .short 0x1 .global Unk_ov4_02217198 Unk_ov4_02217198: ; 0x02217198 - .incbin "incbin/overlay4_data.bin", 0x1318, 0x132C - 0x1318 + .word Unk_ov4_022171AC + .word 0x7D + .word Unk_ov4_022171F0 + .word 0x3 + .word Unk_ov4_02217194 .global Unk_ov4_022171AC Unk_ov4_022171AC: ; 0x022171AC - .incbin "incbin/overlay4_data.bin", 0x132C, 0x1370 - 0x132C + .asciz "US, RSA Data Security, Inc., Secure Server Certification Authority" + .byte 0x0 .global Unk_ov4_022171F0 Unk_ov4_022171F0: ; 0x022171F0 - .incbin "incbin/overlay4_data.bin", 0x1370, 0x7D + .incbin "incbin/dwc_ca_verisign.bin", 0x200, 0x7D diff --git a/lib/NitroDWC/asm/auth/dwc_cal.s b/lib/NitroDWC/asm/auth/dwc_cal.s index c9c001eb8e..e5849bdb63 100644 --- a/lib/NitroDWC/asm/auth/dwc_cal.s +++ b/lib/NitroDWC/asm/auth/dwc_cal.s @@ -427,97 +427,115 @@ _021D4474: .word Unk_ov4_022160C0 .global Unk_ov4_02215FD0 Unk_ov4_02215FD0: ; 0x02215FD0 - .incbin "incbin/overlay4_data.bin", 0x150, 0x158 - 0x150 + .asciz "%013llu" .global Unk_ov4_02215FD8 Unk_ov4_02215FD8: ; 0x02215FD8 - .incbin "incbin/overlay4_data.bin", 0x158, 0x160 - 0x158 + .ascii "%03u" + .word 0x0 .global Unk_ov4_02215FE0 Unk_ov4_02215FE0: ; 0x02215FE0 - .incbin "incbin/overlay4_data.bin", 0x160, 0x168 - 0x160 + .ascii "%02x" + .word 0x0 .global Unk_ov4_02215FE8 Unk_ov4_02215FE8: ; 0x02215FE8 - .incbin "incbin/overlay4_data.bin", 0x168, 0x174 - 0x168 + .ascii "%02x%02x" + .word 0x0 .global Unk_ov4_02215FF4 Unk_ov4_02215FF4: ; 0x02215FF4 - .incbin "incbin/overlay4_data.bin", 0x174, 0x190 - 0x174 + .ascii "%02d%02d%02d%02d%02d%02d" + .word 0x0 .global Unk_ov4_02216010 Unk_ov4_02216010: ; 0x02216010 - .incbin "incbin/overlay4_data.bin", 0x190, 0x1A0 - 0x190 + .asciz "%02d:0000000-00" .global Unk_ov4_02216020 Unk_ov4_02216020: ; 0x02216020 - .incbin "incbin/overlay4_data.bin", 0x1A0, 0x1AC - 0x1A0 + .ascii "%03d%03d" + .word 0x0 .global Unk_ov4_0221602C Unk_ov4_0221602C: ; 0x0221602C - .incbin "incbin/overlay4_data.bin", 0x1AC, 0x1B4 - 0x1AC + .asciz "sdkver" + .byte 0x0 .global Unk_ov4_02216034 Unk_ov4_02216034: ; 0x02216034 - .incbin "incbin/overlay4_data.bin", 0x1B4, 0x1BC - 0x1B4 + .asciz "userid" + .byte 0x0 .global Unk_ov4_0221603C Unk_ov4_0221603C: ; 0x0221603C - .incbin "incbin/overlay4_data.bin", 0x1BC, 0x1C4 - 0x1BC + .asciz "passwd" + .byte 0x0 .global Unk_ov4_02216044 Unk_ov4_02216044: ; 0x02216044 - .incbin "incbin/overlay4_data.bin", 0x1C4, 0x1CC - 0x1C4 + .asciz "bssid" + .short 0x0 .global Unk_ov4_0221604C Unk_ov4_0221604C: ; 0x0221604C - .incbin "incbin/overlay4_data.bin", 0x1CC, 0x1D4 - 0x1CC + .asciz "apinfo" + .byte 0x0 .global Unk_ov4_02216054 Unk_ov4_02216054: ; 0x02216054 - .incbin "incbin/overlay4_data.bin", 0x1D4, 0x1DC - 0x1D4 + .asciz "gamecd" + .byte 0x0 .global Unk_ov4_0221605C Unk_ov4_0221605C: ; 0x0221605C - .incbin "incbin/overlay4_data.bin", 0x1DC, 0x1E4 - 0x1DC + .asciz "makercd" .global Unk_ov4_02216064 Unk_ov4_02216064: ; 0x02216064 - .incbin "incbin/overlay4_data.bin", 0x1E4, 0x1EC - 0x1E4 + .asciz "unitcd" + .byte 0x0 .global Unk_ov4_0221606C Unk_ov4_0221606C: ; 0x0221606C - .incbin "incbin/overlay4_data.bin", 0x1EC, 0x1F4 - 0x1EC + .asciz "macadr" + .byte 0x0 .global Unk_ov4_02216074 Unk_ov4_02216074: ; 0x02216074 - .incbin "incbin/overlay4_data.bin", 0x1F4, 0x1FC - 0x1F4 + .ascii "lang" + .word 0x0 .global Unk_ov4_0221607C Unk_ov4_0221607C: ; 0x0221607C - .incbin "incbin/overlay4_data.bin", 0x1FC, 0x204 - 0x1FC + .asciz "birth" + .short 0x0 .global Unk_ov4_02216084 Unk_ov4_02216084: ; 0x02216084 - .incbin "incbin/overlay4_data.bin", 0x204, 0x20C - 0x204 + .asciz "devtime" .global Unk_ov4_0221608C Unk_ov4_0221608C: ; 0x0221608C - .incbin "incbin/overlay4_data.bin", 0x20C, 0x214 - 0x20C + .asciz "devname" .global Unk_ov4_02216094 Unk_ov4_02216094: ; 0x02216094 - .incbin "incbin/overlay4_data.bin", 0x214, 0x21C - 0x214 + .ascii "ssid" + .word 0x0 .global Unk_ov4_0221609C Unk_ov4_0221609C: ; 0x0221609C - .incbin "incbin/overlay4_data.bin", 0x21C, 0x234 - 0x21C + .ascii "Nitro WiFi SDK/%d.%d" + .word 0x0 .global Unk_ov4_022160B4 Unk_ov4_022160B4: ; 0x022160B4 - .incbin "incbin/overlay4_data.bin", 0x234, 0x240 - 0x234 + .asciz "User-Agent" + .byte 0x0 .global Unk_ov4_022160C0 Unk_ov4_022160C0: ; 0x022160C0 - .incbin "incbin/overlay4_data.bin", 0x240, 0xE + .asciz "HTTP_X_GAMECD" diff --git a/lib/NitroDWC/asm/auth/dwc_http.s b/lib/NitroDWC/asm/auth/dwc_http.s index d812888729..93300dbf50 100644 --- a/lib/NitroDWC/asm/auth/dwc_http.s +++ b/lib/NitroDWC/asm/auth/dwc_http.s @@ -1460,147 +1460,190 @@ Unk_ov4_022160D0: ; 0x022160D0 .global Unk_ov4_02216100 Unk_ov4_02216100: ; 0x02216100 - .incbin "incbin/overlay4_data.bin", 0x280, 0x298 - 0x280 + .asciz "ALLOC http->lowrecvbuf" + .byte 0x0 .global Unk_ov4_02216118 Unk_ov4_02216118: ; 0x02216118 - .incbin "incbin/overlay4_data.bin", 0x298, 0x2B0 - 0x298 + .asciz "ALLOC http->lowsendbuf" + .byte 0x0 .global Unk_ov4_02216130 Unk_ov4_02216130: ; 0x02216130 - .incbin "incbin/overlay4_data.bin", 0x2B0, 0x2BC - 0x2B0 + .asciz "Connection" + .byte 0x0 .global Unk_ov4_0221613C Unk_ov4_0221613C: ; 0x0221613C - .incbin "incbin/overlay4_data.bin", 0x2BC, 0x2C4 - 0x2BC + .asciz "close" + .short 0x0 .global Unk_ov4_02216144 Unk_ov4_02216144: ; 0x02216144 - .incbin "incbin/overlay4_data.bin", 0x2C4, 0x2CC - 0x2C4 + .byte 0xD, 0xA + .byte 0xD, 0xA + .word 0x0 .global Unk_ov4_0221614C Unk_ov4_0221614C: ; 0x0221614C - .incbin "incbin/overlay4_data.bin", 0x2CC, 0x2D0 - 0x2CC + .ascii "%d" + .short 0x0 .global Unk_ov4_02216150 Unk_ov4_02216150: ; 0x02216150 - .incbin "incbin/overlay4_data.bin", 0x2D0, 0x2E0 - 0x2D0 + .ascii "Content-Length" + .short 0x0 .global Unk_ov4_02216160 Unk_ov4_02216160: ; 0x02216160 - .incbin "incbin/overlay4_data.bin", 0x2E0, 0x2F4 - 0x2E0 + .ascii "Content-Length: " + .word 0x0 .global Unk_ov4_02216174 Unk_ov4_02216174: ; 0x02216174 - .incbin "incbin/overlay4_data.bin", 0x2F4, 0x2F8 - 0x2F4 + .byte 0xD, 0xA + .short 0x0 .global Unk_ov4_02216178 Unk_ov4_02216178: ; 0x02216178 - .incbin "incbin/overlay4_data.bin", 0x2F8, 0x310 - 0x2F8 + .asciz "FREE http->lowrecvbuf" + .short 0x0 .global Unk_ov4_02216190 Unk_ov4_02216190: ; 0x02216190 - .incbin "incbin/overlay4_data.bin", 0x310, 0x328 - 0x310 + .asciz "FREE http->lowsendbuf" + .short 0x0 .global Unk_ov4_022161A8 Unk_ov4_022161A8: ; 0x022161A8 - .incbin "incbin/overlay4_data.bin", 0x328, 0x37C - 0x328 + .ascii "POST /%s HTTP/1.0" + .byte 0xD, 0xA + .ascii "Content-type: application/x-www-form-urlencoded" + .byte 0xD, 0xA + .ascii "Host: %s" + .byte 0xD, 0xA + .byte 0xD, 0xA + .word 0x0 .global Unk_ov4_022161FC Unk_ov4_022161FC: ; 0x022161FC - .incbin "incbin/overlay4_data.bin", 0x37C, 0x39C - 0x37C + .ascii "GET /%s HTTP/1.0" + .byte 0xD, 0xA + .ascii "Host: %s" + .byte 0xD, 0xA + .byte 0xD, 0xA + .short 0x0 .global Unk_ov4_0221621C Unk_ov4_0221621C: ; 0x0221621C - .incbin "incbin/overlay4_data.bin", 0x39C, 0x3A8 - 0x39C + .ascii "%s: %s" + .byte 0xD, 0xA + .word 0x0 .global Unk_ov4_02216228 Unk_ov4_02216228: ; 0x02216228 - .incbin "incbin/overlay4_data.bin", 0x3A8, 0x3AC - 0x3A8 + .asciz "%s=" .global Unk_ov4_0221622C Unk_ov4_0221622C: ; 0x0221622C - .incbin "incbin/overlay4_data.bin", 0x3AC, 0x3B4 - 0x3AC + .ascii "&%s=" + .word 0x0 .global Unk_ov4_02216234 Unk_ov4_02216234: ; 0x02216234 - .incbin "incbin/overlay4_data.bin", 0x3B4, 0x3B8 - 0x3B4 + .ascii "%s" + .short 0x0 .global Unk_ov4_02216238 Unk_ov4_02216238: ; 0x02216238 - .incbin "incbin/overlay4_data.bin", 0x3B8, 0x3CC - 0x3B8 + .asciz "ALLOC buf->buffer" + .short 0x0 .global Unk_ov4_0221624C Unk_ov4_0221624C: ; 0x0221624C - .incbin "incbin/overlay4_data.bin", 0x3CC, 0x3E0 - 0x3CC + .ascii "FREE buf->buffer" + .word 0x0 .global Unk_ov4_02216260 Unk_ov4_02216260: ; 0x02216260 - .incbin "incbin/overlay4_data.bin", 0x3E0, 0x3F0 - 0x3E0 + .ascii "ALLOC newptr" + .word 0x0 .global Unk_ov4_02216270 Unk_ov4_02216270: ; 0x02216270 - .incbin "incbin/overlay4_data.bin", 0x3F0, 0x3F8 - 0x3F0 + .asciz "http://" .global Unk_ov4_02216278 Unk_ov4_02216278: ; 0x02216278 - .incbin "incbin/overlay4_data.bin", 0x3F8, 0x404 - 0x3F8 + .ascii "https://" + .word 0x0 .global Unk_ov4_02216284 Unk_ov4_02216284: ; 0x02216284 - .incbin "incbin/overlay4_data.bin", 0x404, 0x408 - 0x404 + .asciz ":" + .short 0x0 .global Unk_ov4_02216288 Unk_ov4_02216288: ; 0x02216288 - .incbin "incbin/overlay4_data.bin", 0x408, 0x40C - 0x408 + .asciz "/" + .short 0x0 .global Unk_ov4_0221628C Unk_ov4_0221628C: ; 0x0221628C - .incbin "incbin/overlay4_data.bin", 0x40C, 0x42C - 0x40C + .ascii "ALLOC result->entry[i].label" + .word 0x0 .global Unk_ov4_022162AC Unk_ov4_022162AC: ; 0x022162AC - .incbin "incbin/overlay4_data.bin", 0x42C, 0x44C - 0x42C + .ascii "ALLOC result->entry[i].value" + .word 0x0 .global Unk_ov4_022162CC Unk_ov4_022162CC: ; 0x022162CC - .incbin "incbin/overlay4_data.bin", 0x44C, 0x468 - 0x44C + .asciz "FREE result->entry[i].label" .global Unk_ov4_022162E8 Unk_ov4_022162E8: ; 0x022162E8 - .incbin "incbin/overlay4_data.bin", 0x468, 0x484 - 0x468 + .asciz "FREE result->entry[i].value" .global Unk_ov4_02216304 Unk_ov4_02216304: ; 0x02216304 - .incbin "incbin/overlay4_data.bin", 0x484, 0x488 - 0x484 + .asciz " " + .short 0x0 .global Unk_ov4_02216308 Unk_ov4_02216308: ; 0x02216308 - .incbin "incbin/overlay4_data.bin", 0x488, 0x494 - 0x488 + .ascii "httpresult" + .short 0x0 .global Unk_ov4_02216314 Unk_ov4_02216314: ; 0x02216314 - .incbin "incbin/overlay4_data.bin", 0x494, 0x498 - 0x494 + .asciz "200" .global Unk_ov4_02216318 Unk_ov4_02216318: ; 0x02216318 - .incbin "incbin/overlay4_data.bin", 0x498, 0x49C - 0x498 + .ascii ": " + .short 0x0 .global Unk_ov4_0221631C Unk_ov4_0221631C: ; 0x0221631C - .incbin "incbin/overlay4_data.bin", 0x49C, 0x4A0 - 0x49C + .asciz "=" + .short 0x0 .global Unk_ov4_02216320 Unk_ov4_02216320: ; 0x02216320 - .incbin "incbin/overlay4_data.bin", 0x4A0, 0x4A4 - 0x4A0 + .asciz "&" + .short 0x0 .global Unk_ov4_02216324 Unk_ov4_02216324: ; 0x02216324 - .incbin "incbin/overlay4_data.bin", 0x4A4, 0x4C0 - 0x4A4 + .asciz "FREE array_entry[i].label" + .short 0x0 .global Unk_ov4_02216340 Unk_ov4_02216340: ; 0x02216340 - .incbin "incbin/overlay4_data.bin", 0x4C0, 0x1C + .asciz "FREE array_entry[i].value" + .short 0x0 diff --git a/lib/NitroDWC/asm/auth/dwc_nastime.s b/lib/NitroDWC/asm/auth/dwc_nastime.s index 10cb8f4f4e..14474be019 100644 --- a/lib/NitroDWC/asm/auth/dwc_nastime.s +++ b/lib/NitroDWC/asm/auth/dwc_nastime.s @@ -154,59 +154,59 @@ _021D6CA0: .word DWCnastimediffvalid .global Unk_ov4_02216510 Unk_ov4_02216510: ; 0x02216510 - .incbin "incbin/overlay4_data.bin", 0x690, 0x694 - 0x690 + .asciz "Jun" .global Unk_ov4_02216514 Unk_ov4_02216514: ; 0x02216514 - .incbin "incbin/overlay4_data.bin", 0x694, 0x698 - 0x694 + .asciz "Jul" .global Unk_ov4_02216518 Unk_ov4_02216518: ; 0x02216518 - .incbin "incbin/overlay4_data.bin", 0x698, 0x69C - 0x698 + .asciz "Dec" .global Unk_ov4_0221651C Unk_ov4_0221651C: ; 0x0221651C - .incbin "incbin/overlay4_data.bin", 0x69C, 0x6A0 - 0x69C + .asciz "Sep" .global Unk_ov4_02216520 Unk_ov4_02216520: ; 0x02216520 - .incbin "incbin/overlay4_data.bin", 0x6A0, 0x6A4 - 0x6A0 + .asciz "Aug" .global Unk_ov4_02216524 Unk_ov4_02216524: ; 0x02216524 - .incbin "incbin/overlay4_data.bin", 0x6A4, 0x6A8 - 0x6A4 + .asciz "Nov" .global Unk_ov4_02216528 Unk_ov4_02216528: ; 0x02216528 - .incbin "incbin/overlay4_data.bin", 0x6A8, 0x6AC - 0x6A8 + .asciz "Oct" .global Unk_ov4_0221652C Unk_ov4_0221652C: ; 0x0221652C - .incbin "incbin/overlay4_data.bin", 0x6AC, 0x6B0 - 0x6AC + .asciz "May" .global Unk_ov4_02216530 Unk_ov4_02216530: ; 0x02216530 - .incbin "incbin/overlay4_data.bin", 0x6B0, 0x6B4 - 0x6B0 + .asciz "Apr" .global Unk_ov4_02216534 Unk_ov4_02216534: ; 0x02216534 - .incbin "incbin/overlay4_data.bin", 0x6B4, 0x6B8 - 0x6B4 + .asciz "Mar" .global Unk_ov4_02216538 Unk_ov4_02216538: ; 0x02216538 - .incbin "incbin/overlay4_data.bin", 0x6B8, 0x6BC - 0x6B8 + .asciz "Feb" .global Unk_ov4_0221653C Unk_ov4_0221653C: ; 0x0221653C - .incbin "incbin/overlay4_data.bin", 0x6BC, 0x6C0 - 0x6BC + .asciz "Jan" .global Unk_ov4_02216540 Unk_ov4_02216540: ; 0x02216540 - .incbin "incbin/overlay4_data.bin", 0x6C0, 0x6F0 - 0x6C0 + .incbin "incbin/dwc_nastime.bin", 0x0, 0x30 .global Unk_ov4_02216570 Unk_ov4_02216570: ; 0x02216570 - .incbin "incbin/overlay4_data.bin", 0x6F0, 0x1E + .asciz "Fri, 03 Mar 2006 01:28:13 GMT" diff --git a/lib/NitroDWC/asm/auth/dwc_netcheck.s b/lib/NitroDWC/asm/auth/dwc_netcheck.s index 13e5fdf380..9605b5ad6a 100644 --- a/lib/NitroDWC/asm/auth/dwc_netcheck.s +++ b/lib/NitroDWC/asm/auth/dwc_netcheck.s @@ -1316,111 +1316,130 @@ _021D6A84: .word Unk_ov4_0221A438 .global Unk_ov4_0221635C Unk_ov4_0221635C: ; 0x0221635C - .incbin "incbin/overlay4_data.bin", 0x4DC, 0x4E0 - 0x4DC + .word Unk_ov4_02216360 .global Unk_ov4_02216360 Unk_ov4_02216360: ; 0x02216360 - .incbin "incbin/overlay4_data.bin", 0x4E0, 0x504 - 0x4E0 + .asciz "http://conntest.nintendowifi.net/" + .short 0x0 .global Unk_ov4_02216384 Unk_ov4_02216384: ; 0x02216384 - .incbin "incbin/overlay4_data.bin", 0x504, 0x518 - 0x504 + .asciz "ALLOC DWCnetcheck" + .short 0x0 .global Unk_ov4_02216398 Unk_ov4_02216398: ; 0x02216398 - .incbin "incbin/overlay4_data.bin", 0x518, 0x528 - 0x518 + .asciz "ALLOC DWChttp" + .short 0x0 .global Unk_ov4_022163A8 Unk_ov4_022163A8: ; 0x022163A8 - .incbin "incbin/overlay4_data.bin", 0x528, 0x538 - 0x528 + .ascii "FREE DWChttp" + .word 0x0 .global Unk_ov4_022163B8 Unk_ov4_022163B8: ; 0x022163B8 - .incbin "incbin/overlay4_data.bin", 0x538, 0x554 - 0x538 + .asciz "FREE DWCnetcheck->body_302" + .byte 0x0 .global Unk_ov4_022163D4 Unk_ov4_022163D4: ; 0x022163D4 - .incbin "incbin/overlay4_data.bin", 0x554, 0x574 - 0x554 + .asciz "FREE DWCnetcheck->body_wayport" + .byte 0x0 .global Unk_ov4_022163F4 Unk_ov4_022163F4: ; 0x022163F4 - .incbin "incbin/overlay4_data.bin", 0x574, 0x588 - 0x574 + .ascii "FREE DWCnetcheck" + .word 0x0 .global Unk_ov4_02216408 Unk_ov4_02216408: ; 0x02216408 - .incbin "incbin/overlay4_data.bin", 0x588, 0x5A4 - 0x588 + .asciz "ALLOC DWCnetcheck->body_302" .global Unk_ov4_02216424 Unk_ov4_02216424: ; 0x02216424 - .incbin "incbin/overlay4_data.bin", 0x5A4, 0x5B0 - 0x5A4 + .asciz "ALLOC url" + .short 0x0 .global Unk_ov4_02216430 Unk_ov4_02216430: ; 0x02216430 - .incbin "incbin/overlay4_data.bin", 0x5B0, 0x5C0 - 0x5B0 + .asciz "ALLOC data_len" + .byte 0x0 .global Unk_ov4_02216440 Unk_ov4_02216440: ; 0x02216440 - .incbin "incbin/overlay4_data.bin", 0x5C0, 0x5D0 - 0x5C0 + .asciz "ALLOC wait_len" + .byte 0x0 .global Unk_ov4_02216450 Unk_ov4_02216450: ; 0x02216450 - .incbin "incbin/overlay4_data.bin", 0x5D0, 0x5F0 - 0x5D0 + .asciz "ALLOC DWCnetcheck->body_wayport" .global Unk_ov4_02216470 Unk_ov4_02216470: ; 0x02216470 - .incbin "incbin/overlay4_data.bin", 0x5F0, 0x5FC - 0x5F0 + .asciz "httpresult" + .byte 0x0 .global Unk_ov4_0221647C Unk_ov4_0221647C: ; 0x0221647C - .incbin "incbin/overlay4_data.bin", 0x5FC, 0x61C - 0x5FC + .asciz "https://nas.nintendowifi.net/ac" .global Unk_ov4_0221649C Unk_ov4_0221649C: ; 0x0221649C - .incbin "incbin/overlay4_data.bin", 0x61C, 0x624 - 0x61C + .asciz "action" + .byte 0x0 .global Unk_ov4_022164A4 Unk_ov4_022164A4: ; 0x022164A4 - .incbin "incbin/overlay4_data.bin", 0x624, 0x62C - 0x624 + .asciz "message" .global Unk_ov4_022164AC Unk_ov4_022164AC: ; 0x022164AC - .incbin "incbin/overlay4_data.bin", 0x62C, 0x63C - 0x62C + .asciz "HotSpotResponse" .global Unk_ov4_022164BC Unk_ov4_022164BC: ; 0x022164BC - .incbin "incbin/overlay4_data.bin", 0x63C, 0x644 - 0x63C + .asciz "parse" + .short 0x0 .global Unk_ov4_022164C4 Unk_ov4_022164C4: ; 0x022164C4 - .incbin "incbin/overlay4_data.bin", 0x644, 0x64C - 0x644 + .ascii "HTML" + .word 0x0 .global Unk_ov4_022164CC Unk_ov4_022164CC: ; 0x022164CC - .incbin "incbin/overlay4_data.bin", 0x64C, 0x658 - 0x64C + .ascii "returncd" + .word 0x0 .global Unk_ov4_022164D8 Unk_ov4_022164D8: ; 0x022164D8 - .incbin "incbin/overlay4_data.bin", 0x658, 0x65C - 0x658 + .asciz "url" .global Unk_ov4_022164DC Unk_ov4_022164DC: ; 0x022164DC - .incbin "incbin/overlay4_data.bin", 0x65C, 0x664 - 0x65C + .ascii "data" + .word 0x0 .global Unk_ov4_022164E4 Unk_ov4_022164E4: ; 0x022164E4 - .incbin "incbin/overlay4_data.bin", 0x664, 0x66C - 0x664 + .ascii "wait" + .word 0x0 .global Unk_ov4_022164EC Unk_ov4_022164EC: ; 0x022164EC - .incbin "incbin/overlay4_data.bin", 0x66C, 0x678 - 0x66C + .ascii "FREE url" + .word 0x0 .global Unk_ov4_022164F8 Unk_ov4_022164F8: ; 0x022164F8 - .incbin "incbin/overlay4_data.bin", 0x678, 0x684 - 0x678 + .asciz "FREE data" + .short 0x0 .global Unk_ov4_02216504 Unk_ov4_02216504: ; 0x02216504 - .incbin "incbin/overlay4_data.bin", 0x684, 0xA + .asciz "FREE wait" diff --git a/lib/NitroDWC/asm/auth/dwc_svl.s b/lib/NitroDWC/asm/auth/dwc_svl.s index 012be01f68..9c0f390551 100644 --- a/lib/NitroDWC/asm/auth/dwc_svl.s +++ b/lib/NitroDWC/asm/auth/dwc_svl.s @@ -458,51 +458,59 @@ _021D72DC: .word Unk_ov4_0221661C .global Unk_ov4_02216590 Unk_ov4_02216590: ; 0x02216590 - .incbin "incbin/overlay4_data.bin", 0x710, 0x720 - 0x710 + .asciz "ALLOC intwork" + .short 0x0 .global Unk_ov4_022165A0 Unk_ov4_022165A0: ; 0x022165A0 - .incbin "incbin/overlay4_data.bin", 0x720, 0x730 - 0x720 + .ascii "FREE intwork" + .word 0x0 .global Unk_ov4_022165B0 Unk_ov4_022165B0: ; 0x022165B0 - .incbin "incbin/overlay4_data.bin", 0x730, 0x750 - 0x730 + .asciz "https://nas.nintendowifi.net/ac" .global Unk_ov4_022165D0 Unk_ov4_022165D0: ; 0x022165D0 - .incbin "incbin/overlay4_data.bin", 0x750, 0x758 - 0x750 + .asciz "action" + .byte 0x0 .global Unk_ov4_022165D8 Unk_ov4_022165D8: ; 0x022165D8 - .incbin "incbin/overlay4_data.bin", 0x758, 0x760 - 0x758 + .asciz "SVCLOC" + .byte 0x0 .global Unk_ov4_022165E0 Unk_ov4_022165E0: ; 0x022165E0 - .incbin "incbin/overlay4_data.bin", 0x760, 0x764 - 0x760 + .asciz "svc" .global Unk_ov4_022165E4 Unk_ov4_022165E4: ; 0x022165E4 - .incbin "incbin/overlay4_data.bin", 0x764, 0x76C - 0x764 + .ascii "Date" + .word 0x0 .global Unk_ov4_022165EC Unk_ov4_022165EC: ; 0x022165EC - .incbin "incbin/overlay4_data.bin", 0x76C, 0x778 - 0x76C + .asciz "httpresult" + .byte 0x0 .global Unk_ov4_022165F8 Unk_ov4_022165F8: ; 0x022165F8 - .incbin "incbin/overlay4_data.bin", 0x778, 0x784 - 0x778 + .ascii "returncd" + .word 0x0 .global Unk_ov4_02216604 Unk_ov4_02216604: ; 0x02216604 - .incbin "incbin/overlay4_data.bin", 0x784, 0x78C - 0x784 + .asciz "svchost" .global Unk_ov4_0221660C Unk_ov4_0221660C: ; 0x0221660C - .incbin "incbin/overlay4_data.bin", 0x78C, 0x79C - 0x78C + .ascii "servicetoken" + .word 0x0 .global Unk_ov4_0221661C Unk_ov4_0221661C: ; 0x0221661C - .incbin "incbin/overlay4_data.bin", 0x79C, 0xB + .asciz "statusdata" diff --git a/lib/NitroDWC/asm/auth/incbin/dwc_ca_cybertrust.bin b/lib/NitroDWC/asm/auth/incbin/dwc_ca_cybertrust.bin new file mode 100644 index 0000000000..222a013300 Binary files /dev/null and b/lib/NitroDWC/asm/auth/incbin/dwc_ca_cybertrust.bin differ diff --git a/lib/NitroDWC/asm/auth/incbin/dwc_ca_globalsign.bin b/lib/NitroDWC/asm/auth/incbin/dwc_ca_globalsign.bin new file mode 100644 index 0000000000..a4ac2323ba Binary files /dev/null and b/lib/NitroDWC/asm/auth/incbin/dwc_ca_globalsign.bin differ diff --git a/lib/NitroDWC/asm/auth/incbin/dwc_ca_nas_self.bin b/lib/NitroDWC/asm/auth/incbin/dwc_ca_nas_self.bin new file mode 100644 index 0000000000..89139e961b Binary files /dev/null and b/lib/NitroDWC/asm/auth/incbin/dwc_ca_nas_self.bin differ diff --git a/lib/NitroDWC/asm/auth/incbin/dwc_ca_thawte_premiumserver.bin b/lib/NitroDWC/asm/auth/incbin/dwc_ca_thawte_premiumserver.bin new file mode 100644 index 0000000000..af426641ea Binary files /dev/null and b/lib/NitroDWC/asm/auth/incbin/dwc_ca_thawte_premiumserver.bin differ diff --git a/lib/NitroDWC/asm/auth/incbin/dwc_ca_thawte_server.bin b/lib/NitroDWC/asm/auth/incbin/dwc_ca_thawte_server.bin new file mode 100644 index 0000000000..f8e73b016a Binary files /dev/null and b/lib/NitroDWC/asm/auth/incbin/dwc_ca_thawte_server.bin differ diff --git a/lib/NitroDWC/asm/auth/incbin/dwc_ca_verisign.bin b/lib/NitroDWC/asm/auth/incbin/dwc_ca_verisign.bin new file mode 100644 index 0000000000..d997fe8668 Binary files /dev/null and b/lib/NitroDWC/asm/auth/incbin/dwc_ca_verisign.bin differ diff --git a/lib/NitroDWC/asm/auth/incbin/dwc_nastime.bin b/lib/NitroDWC/asm/auth/incbin/dwc_nastime.bin new file mode 100644 index 0000000000..5a2bb77c77 Binary files /dev/null and b/lib/NitroDWC/asm/auth/incbin/dwc_nastime.bin differ diff --git a/lib/NitroDWC/asm/auth/util_base64.s b/lib/NitroDWC/asm/auth/util_base64.s index 907a894963..0a52ad26f7 100644 --- a/lib/NitroDWC/asm/auth/util_base64.s +++ b/lib/NitroDWC/asm/auth/util_base64.s @@ -223,9 +223,9 @@ _021D75CC: .global Unk_ov4_02216628 Unk_ov4_02216628: ; 0x02216628 - .incbin "incbin/overlay4_data.bin", 0x7A8, 0x7AC - 0x7A8 + .word Unk_ov4_0221662C .global Unk_ov4_0221662C Unk_ov4_0221662C: ; 0x0221662C - .incbin "incbin/overlay4_data.bin", 0x7AC, 0x41 + .asciz "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.-" diff --git a/lib/NitroDWC/asm/base/dwc_common.s b/lib/NitroDWC/asm/base/dwc_common.s index 4b417409e7..c934b1fd8e 100644 --- a/lib/NitroDWC/asm/base/dwc_common.s +++ b/lib/NitroDWC/asm/base/dwc_common.s @@ -216,7 +216,7 @@ _021D8C00: .global Unk_ov4_02217460 Unk_ov4_02217460: ; 0x02217460 - .incbin "incbin/overlay4_data.bin", 0x15E0, 0x9 + .asciz "%c%s%c%s" diff --git a/lib/NitroDWC/asm/bm/dwc_backup.s b/lib/NitroDWC/asm/bm/dwc_backup.s index a78518cb78..09e5b386e0 100644 --- a/lib/NitroDWC/asm/bm/dwc_backup.s +++ b/lib/NitroDWC/asm/bm/dwc_backup.s @@ -919,7 +919,7 @@ _020A3400: .word Unk_021C3A54 .global Unk_020F9534 Unk_020F9534: ; 0x020F9534 - .incbin "incbin/arm9_rodata.bin", 0x148F4, 0x4 + .word 0x0 diff --git a/lib/NitroDWC/asm/bm/util_wifiidtool.s b/lib/NitroDWC/asm/bm/util_wifiidtool.s index 73ddf5cd35..bf0ba46e2b 100644 --- a/lib/NitroDWC/asm/bm/util_wifiidtool.s +++ b/lib/NitroDWC/asm/bm/util_wifiidtool.s @@ -457,9 +457,9 @@ _020A3EE4: .global Unk_020F9538 Unk_020F9538: ; 0x020F9538 - .incbin "incbin/arm9_rodata.bin", 0x148F8, 0x14900 - 0x148F8 + .byte 0x1, 0x2, 0x0, 0x4, 0x3, 0x5, 0x6, 0x7 .global Unk_020F9540 Unk_020F9540: ; 0x020F9540 - .incbin "incbin/arm9_rodata.bin", 0x14900, 0x10 + .byte 0x5, 0x9, 0x1, 0xE, 0xC, 0x2, 0xA, 0x0, 0xB, 0xD, 0x3, 0x4, 0x8, 0x6, 0xF, 0x7 diff --git a/lib/NitroDWC/asm/enc/dwc_encsession.s b/lib/NitroDWC/asm/enc/dwc_encsession.s index 052cc927f6..ae78c7a475 100644 --- a/lib/NitroDWC/asm/enc/dwc_encsession.s +++ b/lib/NitroDWC/asm/enc/dwc_encsession.s @@ -950,7 +950,9 @@ ov66_022588F4: ; 0x022588F4 .global Unk_ov66_02258CE4 Unk_ov66_02258CE4: ; 0x02258CE4 - .incbin "incbin/overlay66_rodata.bin", 0x3CC, 0x24 + .asciz "0123456789abcdef" + .asciz "0123456789abcdef" + .space 0x2 .data @@ -958,7 +960,30 @@ Unk_ov66_02258CE4: ; 0x02258CE4 .global Unk_ov66_0225B528 Unk_ov66_0225B528: ; 0x0225B528 - .incbin "incbin/overlay66_data.bin", 0x2808, 0x188 + .word 0x0 + .word 0x2 + .space 0x9C + .ascii "&hash=" + .space 0x2 + .ascii "error:" + .space 0x2 + .ascii "http://gamestats2.gs.nintendowifi.net/" + .space 0x2 + .ascii "http://sdkdev.gamespy.com/games/" + .space 0x4 + .ascii "http://ishikawa.servebeer.com/games/" + .space 0x4 + .ascii "&data=" + .space 0x2 + .ascii "%d" + .space 0x2 + .asciz "?pid=" + .space 0x2 + .asciz "%s%s%s?pid=%d&hash=%s&data=" + .ascii "0000000000000000000000000000000000000000" + .space 0x8 + + .bss diff --git a/lib/NitroDWC/asm/ilobby/dwci_lobbydata.s b/lib/NitroDWC/asm/ilobby/dwci_lobbydata.s index 89861d62bc..6e837201bc 100644 --- a/lib/NitroDWC/asm/ilobby/dwci_lobbydata.s +++ b/lib/NitroDWC/asm/ilobby/dwci_lobbydata.s @@ -2282,11 +2282,23 @@ _022483A8: .global Unk_ov66_02258CAC Unk_ov66_02258CAC: ; 0x02258CAC - .incbin "incbin/overlay66_rodata.bin", 0x394, 0x39C - 0x394 + .ascii "#GSP" + .word 0x0 .global Unk_ov66_02258CB4 Unk_ov66_02258CB4: ; 0x02258CB4 - .incbin "incbin/overlay66_rodata.bin", 0x39C, 0x30 + .word Unk_ov66_02259268 + .word Unk_ov66_02259270 + .word Unk_ov66_02259284 + .word Unk_ov66_02259288 + .word Unk_ov66_0225928C + .word Unk_ov66_02259290 + .word Unk_ov66_02259294 + .word Unk_ov66_0225927C + .word Unk_ov66_02259274 + .word Unk_ov66_02259278 + .word Unk_ov66_02259280 + .word Unk_ov66_0225926C .data @@ -2294,105 +2306,116 @@ Unk_ov66_02258CB4: ; 0x02258CB4 .global Unk_ov66_02259258 Unk_ov66_02259258: ; 0x02259258 - .incbin "incbin/overlay66_data.bin", 0x538, 0x539 - 0x538 + .byte 0x1 .global Unk_ov66_02259259 Unk_ov66_02259259: ; 0x02259259 - .incbin "incbin/overlay66_data.bin", 0x539, 0x53A - 0x539 + .byte 0x0 .global Unk_ov66_0225925A Unk_ov66_0225925A: ; 0x0225925A - .incbin "incbin/overlay66_data.bin", 0x53A, 0x53B - 0x53A + .byte 0x0 .global Unk_ov66_0225925B Unk_ov66_0225925B: ; 0x0225925B - .incbin "incbin/overlay66_data.bin", 0x53B, 0x53C - 0x53B + .byte 0x1 .global Unk_ov66_0225925C Unk_ov66_0225925C: ; 0x0225925C - .incbin "incbin/overlay66_data.bin", 0x53C, 0x53D - 0x53C + .byte 0x1 .global Unk_ov66_0225925D Unk_ov66_0225925D: ; 0x0225925D - .incbin "incbin/overlay66_data.bin", 0x53D, 0x53E - 0x53D + .byte 0x0 .global Unk_ov66_0225925E Unk_ov66_0225925E: ; 0x0225925E - .incbin "incbin/overlay66_data.bin", 0x53E, 0x53F - 0x53E + .byte 0x0 .global Unk_ov66_0225925F Unk_ov66_0225925F: ; 0x0225925F - .incbin "incbin/overlay66_data.bin", 0x53F, 0x540 - 0x53F + .byte 0x0 .global Unk_ov66_02259260 Unk_ov66_02259260: ; 0x02259260 - .incbin "incbin/overlay66_data.bin", 0x540, 0x548 - 0x540 + .word ov66_02246F78 + .word 0x0 .global Unk_ov66_02259268 Unk_ov66_02259268: ; 0x02259268 - .incbin "incbin/overlay66_data.bin", 0x548, 0x54C - 0x548 + .word 0x52 .global Unk_ov66_0225926C Unk_ov66_0225926C: ; 0x0225926C - .incbin "incbin/overlay66_data.bin", 0x54C, 0x550 - 0x54C + .word 0x54 .global Unk_ov66_02259270 Unk_ov66_02259270: ; 0x02259270 - .incbin "incbin/overlay66_data.bin", 0x550, 0x554 - 0x550 + .word 0x44 .global Unk_ov66_02259274 Unk_ov66_02259274: ; 0x02259274 - .incbin "incbin/overlay66_data.bin", 0x554, 0x558 - 0x554 + .ascii "D7" + .space 0x2 .global Unk_ov66_02259278 Unk_ov66_02259278: ; 0x02259278 - .incbin "incbin/overlay66_data.bin", 0x558, 0x55C - 0x558 + .ascii "D8" + .space 0x2 .global Unk_ov66_0225927C Unk_ov66_0225927C: ; 0x0225927C - .incbin "incbin/overlay66_data.bin", 0x55C, 0x560 - 0x55C + .ascii "D6" + .space 0x2 .global Unk_ov66_02259280 Unk_ov66_02259280: ; 0x02259280 - .incbin "incbin/overlay66_data.bin", 0x560, 0x564 - 0x560 + .ascii "D9" + .space 0x2 .global Unk_ov66_02259284 Unk_ov66_02259284: ; 0x02259284 - .incbin "incbin/overlay66_data.bin", 0x564, 0x568 - 0x564 + .ascii "D1" + .space 0x2 .global Unk_ov66_02259288 Unk_ov66_02259288: ; 0x02259288 - .incbin "incbin/overlay66_data.bin", 0x568, 0x56C - 0x568 + .ascii "D2" + .space 0x2 .global Unk_ov66_0225928C Unk_ov66_0225928C: ; 0x0225928C - .incbin "incbin/overlay66_data.bin", 0x56C, 0x570 - 0x56C + .ascii "D3" + .space 0x2 .global Unk_ov66_02259290 Unk_ov66_02259290: ; 0x02259290 - .incbin "incbin/overlay66_data.bin", 0x570, 0x574 - 0x570 + .ascii "D4" + .space 0x2 .global Unk_ov66_02259294 Unk_ov66_02259294: ; 0x02259294 - .incbin "incbin/overlay66_data.bin", 0x574, 0x578 - 0x574 + .ascii "D5" + .space 0x2 .global Unk_ov66_02259298 Unk_ov66_02259298: ; 0x02259298 - .incbin "incbin/overlay66_data.bin", 0x578, 0x57C - 0x578 + .word 0x21 .global Unk_ov66_0225929C Unk_ov66_0225929C: ; 0x0225929C - .incbin "incbin/overlay66_data.bin", 0x57C, 0x584 - 0x57C + .asciz "N_%d_%u" .global Unk_ov66_022592A4 Unk_ov66_022592A4: ; 0x022592A4 - .incbin "incbin/overlay66_data.bin", 0x584, 0x588 - 0x584 + .word 0x5F .global Unk_ov66_022592A8 Unk_ov66_022592A8: ; 0x022592A8 - .incbin "incbin/overlay66_data.bin", 0x588, 0x58C - 0x588 + .space 0x4 .global Unk_ov66_022592AC Unk_ov66_022592AC: ; 0x022592AC - .incbin "incbin/overlay66_data.bin", 0x58C, 0x1A + .asciz "tree::insert length error" + .space 0x2 diff --git a/lib/NitroDWC/asm/nd/dwci_nd_base64.s b/lib/NitroDWC/asm/nd/dwci_nd_base64.s index ca9fbb87a6..3226f112ff 100644 --- a/lib/NitroDWC/asm/nd/dwci_nd_base64.s +++ b/lib/NitroDWC/asm/nd/dwci_nd_base64.s @@ -237,5 +237,6 @@ _022241DC: .global Unk_ov60_02228C78 Unk_ov60_02228C78: ; 0x02228C78 - .incbin "incbin/overlay60_rodata.bin", 0x2C, 0x41 + .ascii "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.-" + .space 0x4 diff --git a/lib/NitroDWC/asm/nd/dwci_nd_ca_nasself.s b/lib/NitroDWC/asm/nd/dwci_nd_ca_nasself.s index 590a61f4b8..6f9f5c2254 100644 --- a/lib/NitroDWC/asm/nd/dwci_nd_ca_nasself.s +++ b/lib/NitroDWC/asm/nd/dwci_nd_ca_nasself.s @@ -6,7 +6,8 @@ .global Unk_ov60_02229B20 Unk_ov60_02229B20: ; 0x02229B20 - .incbin "incbin/overlay60_data.bin", 0xCE0, 0xCE4 - 0xCE0 + .short 0x1 + .short 0x1 .global Unk_ov60_02229B24 Unk_ov60_02229B24: ; 0x02229B24 @@ -18,9 +19,10 @@ Unk_ov60_02229B24: ; 0x02229B24 .global Unk_ov60_02229B38 Unk_ov60_02229B38: ; 0x02229B38 - .incbin "incbin/overlay60_data.bin", 0xCF8, 0xD48 - 0xCF8 + .ascii "US, Washington, Nintendo of America Inc, NOA, Nintendo CA, ca@noa.nintendo.com" + .space 0x2 .global Unk_ov60_02229B88 Unk_ov60_02229B88: ; 0x02229B88 - .incbin "incbin/overlay60_data.bin", 0xD48, 0x80 + .incbin "incbin/dwci_nd_ca_nasself.bin", 0x0, 0x80 diff --git a/lib/NitroDWC/asm/nd/dwci_nd_dwc_nitro.s b/lib/NitroDWC/asm/nd/dwci_nd_dwc_nitro.s index 606745f015..f9925bd141 100644 --- a/lib/NitroDWC/asm/nd/dwci_nd_dwc_nitro.s +++ b/lib/NitroDWC/asm/nd/dwci_nd_dwc_nitro.s @@ -139,7 +139,7 @@ _0222462C: .word Unk_ov60_02229C08 .global Unk_ov60_02228CBC Unk_ov60_02228CBC: ; 0x02228CBC - .incbin "incbin/overlay60_rodata.bin", 0x70, 0xD + .ascii "00:0000000-00" @@ -148,7 +148,8 @@ Unk_ov60_02228CBC: ; 0x02228CBC .global Unk_ov60_02229C08 Unk_ov60_02229C08: ; 0x02229C08 - .incbin "incbin/overlay60_data.bin", 0xDC8, 0x18 + .ascii "Nitro WiFi SDK/%d.%d" + .space 0x4 diff --git a/lib/NitroDWC/asm/nd/dwci_nd_fileapi.s b/lib/NitroDWC/asm/nd/dwci_nd_fileapi.s index 6da22c3f41..578d65df70 100644 --- a/lib/NitroDWC/asm/nd/dwci_nd_fileapi.s +++ b/lib/NitroDWC/asm/nd/dwci_nd_fileapi.s @@ -876,15 +876,17 @@ _02225210: .word ov60_02227184 .global Unk_ov60_02228CCC Unk_ov60_02228CCC: ; 0x02228CCC - .incbin "incbin/overlay60_rodata.bin", 0x80, 0x8C - 0x80 + .ascii "bGlzdA**" + .space 0x4 .global Unk_ov60_02228CD8 Unk_ov60_02228CD8: ; 0x02228CD8 - .incbin "incbin/overlay60_rodata.bin", 0x8C, 0x98 - 0x8C + .ascii "Y291bnQ*" + .space 0x4 .global Unk_ov60_02228CE4 Unk_ov60_02228CE4: ; 0x02228CE4 - .incbin "incbin/overlay60_rodata.bin", 0x98, 0xD + .asciz "Y29udGVudHM*" @@ -897,71 +899,87 @@ Unk_ov60_02229C20: ; 0x02229C20 .global Unk_ov60_02229C24 Unk_ov60_02229C24: ; 0x02229C24 - .incbin "incbin/overlay60_data.bin", 0xDE4, 0xDF4 - 0xDE4 + .ascii "HTTPSTATUSCODE" + .space 0x2 .global Unk_ov60_02229C34 Unk_ov60_02229C34: ; 0x02229C34 - .incbin "incbin/overlay60_data.bin", 0xDF4, 0xE00 - 0xDF4 + .ascii "returncd" + .space 0x4 .global Unk_ov60_02229C40 Unk_ov60_02229C40: ; 0x02229C40 - .incbin "incbin/overlay60_data.bin", 0xE00, 0xE0C - 0xE00 + .ascii "User-Agent" + .space 0x2 .global Unk_ov60_02229C4C Unk_ov60_02229C4C: ; 0x02229C4C - .incbin "incbin/overlay60_data.bin", 0xE0C, 0xE14 - 0xE0C + .ascii "gamecd" + .space 0x2 .global Unk_ov60_02229C54 Unk_ov60_02229C54: ; 0x02229C54 - .incbin "incbin/overlay60_data.bin", 0xE14, 0xE20 - 0xE14 + .ascii "rhgamecd" + .space 0x4 .global Unk_ov60_02229C60 Unk_ov60_02229C60: ; 0x02229C60 - .incbin "incbin/overlay60_data.bin", 0xE20, 0xE28 - 0xE20 + .ascii "passwd" + .space 0x2 .global Unk_ov60_02229C68 Unk_ov60_02229C68: ; 0x02229C68 - .incbin "incbin/overlay60_data.bin", 0xE28, 0xE30 - 0xE28 + .asciz "token" + .space 0x2 .global Unk_ov60_02229C70 Unk_ov60_02229C70: ; 0x02229C70 - .incbin "incbin/overlay60_data.bin", 0xE30, 0xE38 - 0xE30 + .ascii "userid" + .space 0x2 .global Unk_ov60_02229C78 Unk_ov60_02229C78: ; 0x02229C78 - .incbin "incbin/overlay60_data.bin", 0xE38, 0xE40 - 0xE38 + .ascii "macadr" + .space 0x2 .global Unk_ov60_02229C80 Unk_ov60_02229C80: ; 0x02229C80 - .incbin "incbin/overlay60_data.bin", 0xE40, 0xE48 - 0xE40 + .ascii "action" + .space 0x2 .global Unk_ov60_02229C88 Unk_ov60_02229C88: ; 0x02229C88 - .incbin "incbin/overlay60_data.bin", 0xE48, 0xE50 - 0xE48 + .asciz "attr1" + .space 0x2 .global Unk_ov60_02229C90 Unk_ov60_02229C90: ; 0x02229C90 - .incbin "incbin/overlay60_data.bin", 0xE50, 0xE58 - 0xE50 + .asciz "attr2" + .space 0x2 .global Unk_ov60_02229C98 Unk_ov60_02229C98: ; 0x02229C98 - .incbin "incbin/overlay60_data.bin", 0xE58, 0xE60 - 0xE58 + .asciz "attr3" + .space 0x2 .global Unk_ov60_02229CA0 Unk_ov60_02229CA0: ; 0x02229CA0 - .incbin "incbin/overlay60_data.bin", 0xE60, 0xE68 - 0xE60 + .ascii "apinfo" + .space 0x2 .global Unk_ov60_02229CA8 Unk_ov60_02229CA8: ; 0x02229CA8 - .incbin "incbin/overlay60_data.bin", 0xE68, 0xE70 - 0xE68 + .ascii "offset" + .space 0x2 .global Unk_ov60_02229CB0 Unk_ov60_02229CB0: ; 0x02229CB0 - .incbin "incbin/overlay60_data.bin", 0xE70, 0xE74 - 0xE70 + .asciz "num" .global Unk_ov60_02229CB4 Unk_ov60_02229CB4: ; 0x02229CB4 - .incbin "incbin/overlay60_data.bin", 0xE74, 0xC + .ascii "contents" + .space 0x4 diff --git a/lib/NitroDWC/asm/nd/dwci_nd_filelist.s b/lib/NitroDWC/asm/nd/dwci_nd_filelist.s index 34ec12557f..c5dc227615 100644 --- a/lib/NitroDWC/asm/nd/dwci_nd_filelist.s +++ b/lib/NitroDWC/asm/nd/dwci_nd_filelist.s @@ -194,5 +194,6 @@ _02225514: .word Unk_ov60_02229CC0 .global Unk_ov60_02229CC0 Unk_ov60_02229CC0: ; 0x02229CC0 - .incbin "incbin/overlay60_data.bin", 0xE80, 0x10 + .ascii "Content-Length" + .space 0x2 diff --git a/lib/NitroDWC/asm/nd/dwci_nd_string.s b/lib/NitroDWC/asm/nd/dwci_nd_string.s index a49069f38c..4fa559565a 100644 --- a/lib/NitroDWC/asm/nd/dwci_nd_string.s +++ b/lib/NitroDWC/asm/nd/dwci_nd_string.s @@ -118,5 +118,5 @@ _022257F4: .global Unk_ov60_02228CF4 Unk_ov60_02228CF4: ; 0x02228CF4 - .incbin "incbin/overlay60_rodata.bin", 0xA8, 0x80 + .incbin "incbin/dwci_nd_string.bin", 0x0, 0x80 diff --git a/lib/NitroDWC/asm/nd/incbin/dwci_nd_ca_nasself.bin b/lib/NitroDWC/asm/nd/incbin/dwci_nd_ca_nasself.bin new file mode 100644 index 0000000000..89139e961b Binary files /dev/null and b/lib/NitroDWC/asm/nd/incbin/dwci_nd_ca_nasself.bin differ diff --git a/lib/NitroDWC/asm/nd/incbin/dwci_nd_string.bin b/lib/NitroDWC/asm/nd/incbin/dwci_nd_string.bin new file mode 100644 index 0000000000..8a068dc259 Binary files /dev/null and b/lib/NitroDWC/asm/nd/incbin/dwci_nd_string.bin differ diff --git a/lib/NitroDWC/asm/nhttp/incbin/nhttp_token.bin b/lib/NitroDWC/asm/nhttp/incbin/nhttp_token.bin new file mode 100644 index 0000000000..53419ebe79 Binary files /dev/null and b/lib/NitroDWC/asm/nhttp/incbin/nhttp_token.bin differ diff --git a/lib/NitroDWC/asm/nhttp/nhttp_request.s b/lib/NitroDWC/asm/nhttp/nhttp_request.s index 1915bc65e6..6d78843eaf 100644 --- a/lib/NitroDWC/asm/nhttp/nhttp_request.s +++ b/lib/NitroDWC/asm/nhttp/nhttp_request.s @@ -590,7 +590,7 @@ _02226B68: .word 0x0222A020 .global Unk_ov60_02228D74 Unk_ov60_02228D74: ; 0x02228D74 - .incbin "incbin/overlay60_rodata.bin", 0x128, 0x15 + .asciz "--t9Sf4yfjf1RtvDu3AA" @@ -599,9 +599,10 @@ Unk_ov60_02228D74: ; 0x02228D74 .global Unk_ov60_02229CD0 Unk_ov60_02229CD0: ; 0x02229CD0 - .incbin "incbin/overlay60_data.bin", 0xE90, 0xE98 - 0xE90 + .asciz "http://" .global Unk_ov60_02229CD8 Unk_ov60_02229CD8: ; 0x02229CD8 - .incbin "incbin/overlay60_data.bin", 0xE98, 0xC + .ascii "https://" + .space 0x4 diff --git a/lib/NitroDWC/asm/nhttp/nhttp_response.s b/lib/NitroDWC/asm/nhttp/nhttp_response.s index 27087fb7b3..a32e8179fc 100644 --- a/lib/NitroDWC/asm/nhttp/nhttp_response.s +++ b/lib/NitroDWC/asm/nhttp/nhttp_response.s @@ -212,5 +212,6 @@ ov60_02226E8C: ; 0x02226E8C .global Unk_ov60_02229CE4 Unk_ov60_02229CE4: ; 0x02229CE4 - .incbin "incbin/overlay60_data.bin", 0xEA4, 0x10 + .ascii "HTTPSTATUSCODE" + .space 0x2 diff --git a/lib/NitroDWC/asm/nhttp/nhttp_thread.s b/lib/NitroDWC/asm/nhttp/nhttp_thread.s index 41a475a743..e6be5c59f0 100644 --- a/lib/NitroDWC/asm/nhttp/nhttp_thread.s +++ b/lib/NitroDWC/asm/nhttp/nhttp_thread.s @@ -1559,11 +1559,16 @@ _0222879C: .word Unk_ov60_0222A014 .global Unk_ov60_02228D8C Unk_ov60_02228D8C: ; 0x02228D8C - .incbin "incbin/overlay60_rodata.bin", 0x140, 0x168 - 0x140 + .ascii "Content-Disposition: form-data; name=" + .byte 0x22 + .space 0x2 .global Unk_ov60_02228DB4 Unk_ov60_02228DB4: ; 0x02228DB4 - .incbin "incbin/overlay60_rodata.bin", 0x168, 0x4C + .ascii "Content-Type: application/octet-stream" + .byte 0xD, 0xA + .ascii "Content-Transfer-Encoding: binary" + .byte 0xD, 0xA @@ -1572,87 +1577,106 @@ Unk_ov60_02228DB4: ; 0x02228DB4 .global Unk_ov60_02229CF4 Unk_ov60_02229CF4: ; 0x02229CF4 - .incbin "incbin/overlay60_data.bin", 0xEB4, 0xEBC - 0xEB4 + .ascii "GET " + .space 0x4 .global Unk_ov60_02229CFC Unk_ov60_02229CFC: ; 0x02229CFC - .incbin "incbin/overlay60_data.bin", 0xEBC, 0xEC4 - 0xEBC + .ascii "POST " + .space 0x3 .global Unk_ov60_02229D04 Unk_ov60_02229D04: ; 0x02229D04 - .incbin "incbin/overlay60_data.bin", 0xEC4, 0xECC - 0xEC4 + .ascii "HEAD " + .space 0x3 .global Unk_ov60_02229D0C Unk_ov60_02229D0C: ; 0x02229D0C - .incbin "incbin/overlay60_data.bin", 0xECC, 0xED0 - 0xECC + .word 0x2F .global Unk_ov60_02229D10 Unk_ov60_02229D10: ; 0x02229D10 - .incbin "incbin/overlay60_data.bin", 0xED0, 0xEDC - 0xED0 + .ascii " HTTP/1.1" + .byte 0xD, 0xA + .space 0x1 .global Unk_ov60_02229D1C Unk_ov60_02229D1C: ; 0x02229D1C - .incbin "incbin/overlay60_data.bin", 0xEDC, 0xEE4 - 0xEDC + .ascii "Host: " + .space 0x2 .global Unk_ov60_02229D24 Unk_ov60_02229D24: ; 0x02229D24 - .incbin "incbin/overlay60_data.bin", 0xEE4, 0xEE8 - 0xEE4 + .byte 0xD, 0xA + .space 0x2 .global Unk_ov60_02229D28 Unk_ov60_02229D28: ; 0x02229D28 - .incbin "incbin/overlay60_data.bin", 0xEE8, 0xEEC - 0xEE8 + .ascii ": " + .space 0x2 .global Unk_ov60_02229D2C Unk_ov60_02229D2C: ; 0x02229D2C - .incbin "incbin/overlay60_data.bin", 0xEEC, 0xF1C - 0xEEC + .ascii "Content-Type: multipart/form-data; boundary=" + .space 0x4 .global Unk_ov60_02229D5C Unk_ov60_02229D5C: ; 0x02229D5C - .incbin "incbin/overlay60_data.bin", 0xF1C, 0xF50 - 0xF1C + .ascii "Content-Type: application/x-www-form-urlencoded" + .byte 0xD, 0xA + .space 0x3 .global Unk_ov60_02229D90 Unk_ov60_02229D90: ; 0x02229D90 - .incbin "incbin/overlay60_data.bin", 0xF50, 0xF64 - 0xF50 + .ascii "Content-Length: " + .space 0x4 .global Unk_ov60_02229DA4 Unk_ov60_02229DA4: ; 0x02229DA4 - .incbin "incbin/overlay60_data.bin", 0xF64, 0xF68 - 0xF64 + .byte 0x22, 0xD, 0xA, 0x0 .global Unk_ov60_02229DA8 Unk_ov60_02229DA8: ; 0x02229DA8 - .incbin "incbin/overlay60_data.bin", 0xF68, 0xF70 - 0xF68 + .ascii "--" + .byte 0xD, 0xA + .space 0x4 .global Unk_ov60_02229DB0 Unk_ov60_02229DB0: ; 0x02229DB0 - .incbin "incbin/overlay60_data.bin", 0xF70, 0xF74 - 0xF70 + .word 0x3D .global Unk_ov60_02229DB4 Unk_ov60_02229DB4: ; 0x02229DB4 - .incbin "incbin/overlay60_data.bin", 0xF74, 0xF78 - 0xF74 + .word 0x26 .global Unk_ov60_02229DB8 Unk_ov60_02229DB8: ; 0x02229DB8 - .incbin "incbin/overlay60_data.bin", 0xF78, 0xF80 - 0xF78 + .ascii "HTTP/" + .space 0x3 .global Unk_ov60_02229DC0 Unk_ov60_02229DC0: ; 0x02229DC0 - .incbin "incbin/overlay60_data.bin", 0xF80, 0xF90 - 0xF80 + .ascii "Content-Length" + .space 0x2 .global Unk_ov60_02229DD0 Unk_ov60_02229DD0: ; 0x02229DD0 - .incbin "incbin/overlay60_data.bin", 0xF90, 0xF9C - 0xF90 + .ascii "Connection" + .space 0x2 .global Unk_ov60_02229DDC Unk_ov60_02229DDC: ; 0x02229DDC - .incbin "incbin/overlay60_data.bin", 0xF9C, 0xFA8 - 0xF9C + .ascii "Keep-Alive" + .space 0x2 .global Unk_ov60_02229DE8 Unk_ov60_02229DE8: ; 0x02229DE8 - .incbin "incbin/overlay60_data.bin", 0xFA8, 0xFBC - 0xFA8 + .ascii "Transfer-Encoding" + .space 0x3 .global Unk_ov60_02229DFC Unk_ov60_02229DFC: ; 0x02229DFC - .incbin "incbin/overlay60_data.bin", 0xFBC, 0x8 + .asciz "chunked" diff --git a/lib/NitroDWC/asm/nhttp/nhttp_token.s b/lib/NitroDWC/asm/nhttp/nhttp_token.s index 779693f816..50dc369f94 100644 --- a/lib/NitroDWC/asm/nhttp/nhttp_token.s +++ b/lib/NitroDWC/asm/nhttp/nhttp_token.s @@ -385,5 +385,5 @@ _02228C44: .global Unk_ov60_02228E00 Unk_ov60_02228E00: ; 0x02228E00 - .incbin "incbin/overlay60_rodata.bin", 0x1B4, 0x24 + .incbin "incbin/nhttp_token.bin", 0x0, 0x24 diff --git a/lib/NitroDWC/asm/ppwlobby/dwci_lobby.s b/lib/NitroDWC/asm/ppwlobby/dwci_lobby.s index 49adc61bea..a26959f758 100644 --- a/lib/NitroDWC/asm/ppwlobby/dwci_lobby.s +++ b/lib/NitroDWC/asm/ppwlobby/dwci_lobby.s @@ -3971,107 +3971,144 @@ _02246284: .global Unk_ov66_02259128 Unk_ov66_02259128: ; 0x02259128 - .incbin "incbin/overlay66_data.bin", 0x408, 0x409 - 0x408 + .byte 0x0 .global Unk_ov66_02259129 Unk_ov66_02259129: ; 0x02259129 - .incbin "incbin/overlay66_data.bin", 0x409, 0x40A - 0x409 + .byte 0x1 .global Unk_ov66_0225912A Unk_ov66_0225912A: ; 0x0225912A - .incbin "incbin/overlay66_data.bin", 0x40A, 0x40B - 0x40A + .byte 0x0 .global Unk_ov66_0225912B Unk_ov66_0225912B: ; 0x0225912B - .incbin "incbin/overlay66_data.bin", 0x40B, 0x40C - 0x40B + .byte 0x1 .global Unk_ov66_0225912C Unk_ov66_0225912C: ; 0x0225912C - .incbin "incbin/overlay66_data.bin", 0x40C, 0x40D - 0x40C + .byte 0x0 .global Unk_ov66_0225912D Unk_ov66_0225912D: ; 0x0225912D - .incbin "incbin/overlay66_data.bin", 0x40D, 0x410 - 0x40D + .byte 0x0 .global Unk_ov66_02259130 Unk_ov66_02259130: ; 0x02259130 - .incbin "incbin/overlay66_data.bin", 0x410, 0x428 - 0x410 + .word 0x0 + .word 0x0 + .word ov66_02243C90 + .word ov66_02245E7C + .word ov66_022451C0 + .word ov66_02243C74 .global Unk_ov66_02259148 Unk_ov66_02259148: ; 0x02259148 - .incbin "incbin/overlay66_data.bin", 0x428, 0x440 - 0x428 + .word 0x0 + .word 0x0 + .word ov66_02245EA0 + .word ov66_02245EA4 + .word ov66_022451C0 + .word ov66_02243C74 .global Unk_ov66_02259160 Unk_ov66_02259160: ; 0x02259160 - .incbin "incbin/overlay66_data.bin", 0x440, 0x458 - 0x440 + .word 0x0 + .word 0x0 + .word ov66_02245EC8 + .word ov66_02245ECC + .word ov66_022451C0 + .word ov66_02243C74 .global Unk_ov66_02259178 Unk_ov66_02259178: ; 0x02259178 - .incbin "incbin/overlay66_data.bin", 0x458, 0x470 - 0x458 + .word 0x0 + .word 0x0 + .word ov66_02245EF0 + .word ov66_02245EF4 + .word ov66_022451C0 + .word ov66_02243C74 .global Unk_ov66_02259190 Unk_ov66_02259190: ; 0x02259190 - .incbin "incbin/overlay66_data.bin", 0x470, 0x488 - 0x470 + .word 0x0 + .word 0x0 + .word ov66_02245F18 + .word ov66_02245F1C + .word ov66_022451C0 + .word ov66_02243C74 .global Unk_ov66_022591A8 Unk_ov66_022591A8: ; 0x022591A8 - .incbin "incbin/overlay66_data.bin", 0x488, 0x4A0 - 0x488 + .word 0x0 + .word 0x0 + .word ov66_02245F40 + .word ov66_02245F44 + .word ov66_022451C0 + .word ov66_02243C74 .global Unk_ov66_022591C0 Unk_ov66_022591C0: ; 0x022591C0 - .incbin "incbin/overlay66_data.bin", 0x4A0, 0x4A8 - 0x4A0 + .ascii "SERVER" + .space 0x2 .global Unk_ov66_022591C8 Unk_ov66_022591C8: ; 0x022591C8 - .incbin "incbin/overlay66_data.bin", 0x4A8, 0x4B8 - 0x4A8 + .ascii "Excess Flood" + .space 0x4 .global Unk_ov66_022591D8 Unk_ov66_022591D8: ; 0x022591D8 - .incbin "incbin/overlay66_data.bin", 0x4B8, 0x4BC - 0x4B8 + .ascii " :" + .space 0x2 .global Unk_ov66_022591DC Unk_ov66_022591DC: ; 0x022591DC - .incbin "incbin/overlay66_data.bin", 0x4BC, 0x4C4 - 0x4BC + .ascii "normal" + .space 0x2 .global Unk_ov66_022591E4 Unk_ov66_022591E4: ; 0x022591E4 - .incbin "incbin/overlay66_data.bin", 0x4C4, 0x4CC - 0x4C4 + .asciz "voice" + .space 0x2 .global Unk_ov66_022591EC Unk_ov66_022591EC: ; 0x022591EC - .incbin "incbin/overlay66_data.bin", 0x4CC, 0x4D0 - 0x4CC + .asciz "ops" .global Unk_ov66_022591F0 Unk_ov66_022591F0: ; 0x022591F0 - .incbin "incbin/overlay66_data.bin", 0x4D0, 0x4DC - 0x4D0 + .ascii "voice+ops" + .space 0x3 .global Unk_ov66_022591FC Unk_ov66_022591FC: ; 0x022591FC - .incbin "incbin/overlay66_data.bin", 0x4DC, 0x4E4 - 0x4DC + .asciz "invalid" .global Unk_ov66_02259204 Unk_ov66_02259204: ; 0x02259204 - .incbin "incbin/overlay66_data.bin", 0x4E4, 0x4E8 - 0x4E4 + .space 0x4 .global Unk_ov66_02259208 Unk_ov66_02259208: ; 0x02259208 - .incbin "incbin/overlay66_data.bin", 0x4E8, 0x4F0 - 0x4E8 + .asciz "DWCUser" .global Unk_ov66_02259210 Unk_ov66_02259210: ; 0x02259210 - .incbin "incbin/overlay66_data.bin", 0x4F0, 0x4F8 - 0x4F0 + .asciz "DWCName" .global Unk_ov66_02259218 Unk_ov66_02259218: ; 0x02259218 - .incbin "incbin/overlay66_data.bin", 0x4F8, 0x4FC - 0x4F8 + .word 0x2E .global Unk_ov66_0225921C Unk_ov66_0225921C: ; 0x0225921C - .incbin "incbin/overlay66_data.bin", 0x4FC, 0x51C - 0x4FC + .ascii "peerchat.gs.nintendowifi.net" + .space 0x4 .global Unk_ov66_0225923C Unk_ov66_0225923C: ; 0x0225923C - .incbin "incbin/overlay66_data.bin", 0x51C, 0x1A + .asciz "tree::insert length error" .bss diff --git a/lib/NitroDWC/asm/ppwlobby/ppw_innerinfo.s b/lib/NitroDWC/asm/ppwlobby/ppw_innerinfo.s index 312324c06a..bb0cd82076 100644 --- a/lib/NitroDWC/asm/ppwlobby/ppw_innerinfo.s +++ b/lib/NitroDWC/asm/ppwlobby/ppw_innerinfo.s @@ -5085,7 +5085,14 @@ _0224117C: .global Unk_ov66_02258C8C Unk_ov66_02258C8C: ; 0x02258C8C - .incbin "incbin/overlay66_rodata.bin", 0x374, 0x20 + .word 0x0 + .word 0x0 + .word 0x1 + .word 0x0 + .word 0x1 + .word 0x1 + .word 0x1 + .word 0x14 .data @@ -5093,35 +5100,36 @@ Unk_ov66_02258C8C: ; 0x02258C8C .global Unk_ov66_02259098 Unk_ov66_02259098: ; 0x02259098 - .incbin "incbin/overlay66_data.bin", 0x378, 0x379 - 0x378 + .space 0x1 .global Unk_ov66_02259099 Unk_ov66_02259099: ; 0x02259099 - .incbin "incbin/overlay66_data.bin", 0x379, 0x37C - 0x379 + .space 0x3 .global Unk_ov66_0225909C Unk_ov66_0225909C: ; 0x0225909C - .incbin "incbin/overlay66_data.bin", 0x37C, 0x380 - 0x37C + .space 0x4 .global Unk_ov66_022590A0 Unk_ov66_022590A0: ; 0x022590A0 - .incbin "incbin/overlay66_data.bin", 0x380, 0x384 - 0x380 + .space 0x4 .global Unk_ov66_022590A4 Unk_ov66_022590A4: ; 0x022590A4 - .incbin "incbin/overlay66_data.bin", 0x384, 0x388 - 0x384 + .space 0x4 .global Unk_ov66_022590A8 Unk_ov66_022590A8: ; 0x022590A8 - .incbin "incbin/overlay66_data.bin", 0x388, 0x38C - 0x388 + .space 0x4 .global Unk_ov66_022590AC Unk_ov66_022590AC: ; 0x022590AC - .incbin "incbin/overlay66_data.bin", 0x38C, 0x3A4 - 0x38C + .ascii "deque:: length error" + .space 0x4 .global Unk_ov66_022590C4 Unk_ov66_022590C4: ; 0x022590C4 - .incbin "incbin/overlay66_data.bin", 0x3A4, 0x14 + .asciz "cdeque length error" .bss diff --git a/lib/NitroDWC/asm/ppwlobby/ppw_lobby.s b/lib/NitroDWC/asm/ppwlobby/ppw_lobby.s index 2a982776f7..2adbe56a32 100644 --- a/lib/NitroDWC/asm/ppwlobby/ppw_lobby.s +++ b/lib/NitroDWC/asm/ppwlobby/ppw_lobby.s @@ -8887,23 +8887,56 @@ _0223CA04: .global Unk_ov66_02258BF4 Unk_ov66_02258BF4: ; 0x02258BF4 - .incbin "incbin/overlay66_rodata.bin", 0x2DC, 0x2F4 - 0x2DC + .word Unk_ov66_02258E78 + .word Unk_ov66_02258E84 + .word Unk_ov66_02258E80 + .word Unk_ov66_02258E7C + .word Unk_ov66_02258E74 + .word Unk_ov66_02258E90 .global Unk_ov66_02258C0C Unk_ov66_02258C0C: ; 0x02258C0C - .incbin "incbin/overlay66_rodata.bin", 0x2F4, 0x314 - 0x2F4 + .word 0x0 + .word 0x0 + .word 0x1 + .word 0x0 + .word 0x1 + .word 0x1 + .word 0x1 + .word 0x4 .global Unk_ov66_02258C2C Unk_ov66_02258C2C: ; 0x02258C2C - .incbin "incbin/overlay66_rodata.bin", 0x314, 0x334 - 0x314 + .word 0x0 + .word 0x0 + .word 0x1 + .word 0x0 + .word 0x1 + .word 0x1 + .word 0x1 + .word 0x4 .global Unk_ov66_02258C4C Unk_ov66_02258C4C: ; 0x02258C4C - .incbin "incbin/overlay66_rodata.bin", 0x334, 0x354 - 0x334 + .word 0x0 + .word 0x0 + .word 0x1 + .word 0x0 + .word 0x1 + .word 0x1 + .word 0x1 + .word 0x8 .global Unk_ov66_02258C6C Unk_ov66_02258C6C: ; 0x02258C6C - .incbin "incbin/overlay66_rodata.bin", 0x354, 0x20 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x1 + .word 0x1 + .word 0x1 + .word 0x14 .data @@ -8911,159 +8944,180 @@ Unk_ov66_02258C6C: ; 0x02258C6C .global Unk_ov66_02258E58 Unk_ov66_02258E58: ; 0x02258E58 - .incbin "incbin/overlay66_data.bin", 0x138, 0x139 - 0x138 + .space 0x1 .global Unk_ov66_02258E59 Unk_ov66_02258E59: ; 0x02258E59 - .incbin "incbin/overlay66_data.bin", 0x139, 0x13A - 0x139 + .space 0x1 .global Unk_ov66_02258E5A Unk_ov66_02258E5A: ; 0x02258E5A - .incbin "incbin/overlay66_data.bin", 0x13A, 0x13B - 0x13A + .byte 0x1 .global Unk_ov66_02258E5B Unk_ov66_02258E5B: ; 0x02258E5B - .incbin "incbin/overlay66_data.bin", 0x13B, 0x13C - 0x13B + .space 0x1 .global Unk_ov66_02258E5C Unk_ov66_02258E5C: ; 0x02258E5C - .incbin "incbin/overlay66_data.bin", 0x13C, 0x140 - 0x13C + .word Unk_ov66_02258F48 .global Unk_ov66_02258E60 Unk_ov66_02258E60: ; 0x02258E60 - .incbin "incbin/overlay66_data.bin", 0x140, 0x144 - 0x140 + .word Unk_ov66_02258F24 .global Unk_ov66_02258E64 Unk_ov66_02258E64: ; 0x02258E64 - .incbin "incbin/overlay66_data.bin", 0x144, 0x148 - 0x144 + .word Unk_ov66_02258F70 .global Unk_ov66_02258E68 Unk_ov66_02258E68: ; 0x02258E68 - .incbin "incbin/overlay66_data.bin", 0x148, 0x14C - 0x148 + .word Unk_ov66_02258EE4 .global Unk_ov66_02258E6C Unk_ov66_02258E6C: ; 0x02258E6C - .incbin "incbin/overlay66_data.bin", 0x14C, 0x150 - 0x14C + .word Unk_ov66_02258EC8 .global Unk_ov66_02258E70 Unk_ov66_02258E70: ; 0x02258E70 - .incbin "incbin/overlay66_data.bin", 0x150, 0x154 - 0x150 + .word Unk_ov66_02258F04 .global Unk_ov66_02258E74 Unk_ov66_02258E74: ; 0x02258E74 - .incbin "incbin/overlay66_data.bin", 0x154, 0x158 - 0x154 + .word 0x4E .global Unk_ov66_02258E78 Unk_ov66_02258E78: ; 0x02258E78 - .incbin "incbin/overlay66_data.bin", 0x158, 0x15C - 0x158 + .word 0x4D .global Unk_ov66_02258E7C Unk_ov66_02258E7C: ; 0x02258E7C - .incbin "incbin/overlay66_data.bin", 0x15C, 0x160 - 0x15C + .word 0x43 .global Unk_ov66_02258E80 Unk_ov66_02258E80: ; 0x02258E80 - .incbin "incbin/overlay66_data.bin", 0x160, 0x164 - 0x160 + .ascii "F2" + .space 0x2 .global Unk_ov66_02258E84 Unk_ov66_02258E84: ; 0x02258E84 - .incbin "incbin/overlay66_data.bin", 0x164, 0x168 - 0x164 + .ascii "F1" + .space 0x2 .global Unk_ov66_02258E88 Unk_ov66_02258E88: ; 0x02258E88 - .incbin "incbin/overlay66_data.bin", 0x168, 0x170 - 0x168 + .ascii "M%d_%u" + .space 0x2 .global Unk_ov66_02258E90 Unk_ov66_02258E90: ; 0x02258E90 - .incbin "incbin/overlay66_data.bin", 0x170, 0x178 - 0x170 + .asciz "Invalid" .global Unk_ov66_02258E98 Unk_ov66_02258E98: ; 0x02258E98 - .incbin "incbin/overlay66_data.bin", 0x178, 0x188 - 0x178 + .space 0x8 + .word ov66_02235374 + .word ov66_0223A984 .global Unk_ov66_02258EA8 Unk_ov66_02258EA8: ; 0x02258EA8 - .incbin "incbin/overlay66_data.bin", 0x188, 0x198 - 0x188 + .space 0x8 + .word ov66_0223535C + .word ov66_0223A9CC .global Unk_ov66_02258EB8 Unk_ov66_02258EB8: ; 0x02258EB8 - .incbin "incbin/overlay66_data.bin", 0x198, 0x1A8 - 0x198 + .space 0x8 + .word ov66_0223A95C + .word ov66_02235B4C .global Unk_ov66_02258EC8 Unk_ov66_02258EC8: ; 0x02258EC8 - .incbin "incbin/overlay66_data.bin", 0x1A8, 0x1C4 - 0x1A8 + .ascii "/web/enc/lobby/getVIP.asp" + .space 0x3 .global Unk_ov66_02258EE4 Unk_ov66_02258EE4: ; 0x02258EE4 - .incbin "incbin/overlay66_data.bin", 0x1C4, 0x1E4 - 0x1C4 + .ascii "/web/enc/lobby/getSchedule.asp" + .space 0x2 .global Unk_ov66_02258F04 Unk_ov66_02258F04: ; 0x02258F04 - .incbin "incbin/overlay66_data.bin", 0x1E4, 0x204 - 0x1E4 + .asciz "/web/enc/lobby/checkProfile.asp" .global Unk_ov66_02258F24 Unk_ov66_02258F24: ; 0x02258F24 - .incbin "incbin/overlay66_data.bin", 0x204, 0x228 - 0x204 + .asciz "/web/enc/lobby/getQuestionnaire.asp" .global Unk_ov66_02258F48 Unk_ov66_02258F48: ; 0x02258F48 - .incbin "incbin/overlay66_data.bin", 0x228, 0x250 - 0x228 + .ascii "/web/enc/lobby/submitQuestionnaire.asp" + .space 0x2 .global Unk_ov66_02258F70 Unk_ov66_02258F70: ; 0x02258F70 - .incbin "incbin/overlay66_data.bin", 0x250, 0x290 - 0x250 + .asciz "uLMOGEiiJogofchScpXb000244fd00006015100000005b440e7epokemondpds" .global Unk_ov66_02258FB0 Unk_ov66_02258FB0: ; 0x02258FB0 - .incbin "incbin/overlay66_data.bin", 0x290, 0x294 - 0x290 + .word 0x2A .global Unk_ov66_02258FB4 Unk_ov66_02258FB4: ; 0x02258FB4 - .incbin "incbin/overlay66_data.bin", 0x294, 0x298 - 0x294 + .space 0x4 .global Unk_ov66_02258FB8 Unk_ov66_02258FB8: ; 0x02258FB8 - .incbin "incbin/overlay66_data.bin", 0x298, 0x29C - 0x298 + .word 0x21 .global Unk_ov66_02258FBC Unk_ov66_02258FBC: ; 0x02258FBC - .incbin "incbin/overlay66_data.bin", 0x29C, 0x2A4 - 0x29C + .ascii "C%d_%u" + .space 0x2 .global Unk_ov66_02258FC4 Unk_ov66_02258FC4: ; 0x02258FC4 - .incbin "incbin/overlay66_data.bin", 0x2A4, 0x2B4 - 0x2A4 + .ascii "b_lib_u_user" + .space 0x4 .global Unk_ov66_02258FD4 Unk_ov66_02258FD4: ; 0x02258FD4 - .incbin "incbin/overlay66_data.bin", 0x2B4, 0x2C4 - 0x2B4 + .ascii "b_lib_u_system" + .space 0x2 .global Unk_ov66_02258FE4 Unk_ov66_02258FE4: ; 0x02258FE4 - .incbin "incbin/overlay66_data.bin", 0x2C4, 0x2D4 - 0x2C4 + .ascii "b_lib_c_time" + .space 0x4 .global Unk_ov66_02258FF4 Unk_ov66_02258FF4: ; 0x02258FF4 - .incbin "incbin/overlay66_data.bin", 0x2D4, 0x2E4 - 0x2D4 + .ascii "b_lib_c_lobby" + .space 0x3 .global Unk_ov66_02259004 Unk_ov66_02259004: ; 0x02259004 - .incbin "incbin/overlay66_data.bin", 0x2E4, 0x300 - 0x2E4 + .ascii "tree::insert length error" + .space 0x3 .global Unk_ov66_02259020 Unk_ov66_02259020: ; 0x02259020 - .incbin "incbin/overlay66_data.bin", 0x300, 0x324 - 0x300 + .ascii "basic_string::reserve length_error" + .space 0x2 .global Unk_ov66_02259044 Unk_ov66_02259044: ; 0x02259044 - .incbin "incbin/overlay66_data.bin", 0x324, 0x340 - 0x324 + .ascii "basic_string: out_of_range" + .space 0x2 .global Unk_ov66_02259060 Unk_ov66_02259060: ; 0x02259060 - .incbin "incbin/overlay66_data.bin", 0x340, 0x35C - 0x340 + .ascii "string compare: pos > len" + .space 0x3 .global Unk_ov66_0225907C Unk_ov66_0225907C: ; 0x0225907C - .incbin "incbin/overlay66_data.bin", 0x35C, 0x1B + .asciz "basic_string: length_error" .bss diff --git a/lib/NitroDWC/asm/ppwlobby/ppw_parser.s b/lib/NitroDWC/asm/ppwlobby/ppw_parser.s index f114eac6b1..a39a78b32e 100644 --- a/lib/NitroDWC/asm/ppwlobby/ppw_parser.s +++ b/lib/NitroDWC/asm/ppwlobby/ppw_parser.s @@ -754,49 +754,52 @@ ov66_02241A94: ; 0x02241A94 .global Unk_ov66_022590D8 Unk_ov66_022590D8: ; 0x022590D8 - .incbin "incbin/overlay66_data.bin", 0x3B8, 0x3B9 - 0x3B8 + .space 0x1 .global Unk_ov66_022590D9 Unk_ov66_022590D9: ; 0x022590D9 - .incbin "incbin/overlay66_data.bin", 0x3B9, 0x3BA - 0x3B9 + .space 0x1 .global Unk_ov66_022590DA Unk_ov66_022590DA: ; 0x022590DA - .incbin "incbin/overlay66_data.bin", 0x3BA, 0x3BC - 0x3BA + .space 0x2 .global Unk_ov66_022590DC Unk_ov66_022590DC: ; 0x022590DC - .incbin "incbin/overlay66_data.bin", 0x3BC, 0x3C0 - 0x3BC + .ascii " " + .space 0x2 .global Unk_ov66_022590E0 Unk_ov66_022590E0: ; 0x022590E0 - .incbin "incbin/overlay66_data.bin", 0x3C0, 0x3C4 - 0x3C0 + .word 0x20 .global Unk_ov66_022590E4 Unk_ov66_022590E4: ; 0x022590E4 - .incbin "incbin/overlay66_data.bin", 0x3C4, 0x3C8 - 0x3C4 + .word 0x42 .global Unk_ov66_022590E8 Unk_ov66_022590E8: ; 0x022590E8 - .incbin "incbin/overlay66_data.bin", 0x3C8, 0x3CC - 0x3C8 + .word 0x53 .global Unk_ov66_022590EC Unk_ov66_022590EC: ; 0x022590EC - .incbin "incbin/overlay66_data.bin", 0x3CC, 0x3D0 - 0x3CC + .word 0x0 .global Unk_ov66_022590F0 Unk_ov66_022590F0: ; 0x022590F0 - .incbin "incbin/overlay66_data.bin", 0x3D0, 0x3D4 - 0x3D0 + .ascii "%x" + .space 0x2 .global Unk_ov66_022590F4 Unk_ov66_022590F4: ; 0x022590F4 - .incbin "incbin/overlay66_data.bin", 0x3D4, 0x3D8 - 0x3D4 + .word 0x41 .global Unk_ov66_022590F8 Unk_ov66_022590F8: ; 0x022590F8 - .incbin "incbin/overlay66_data.bin", 0x3D8, 0x3DC - 0x3D8 + .word 0x5F .global Unk_ov66_022590FC Unk_ov66_022590FC: ; 0x022590FC - .incbin "incbin/overlay66_data.bin", 0x3DC, 0x3 + .ascii "%s" + .space 0x2 diff --git a/lib/NitroDWC/asm/ppwlobby/ppw_profile.s b/lib/NitroDWC/asm/ppwlobby/ppw_profile.s index 6b6fa36563..e1d5916f09 100644 --- a/lib/NitroDWC/asm/ppwlobby/ppw_profile.s +++ b/lib/NitroDWC/asm/ppwlobby/ppw_profile.s @@ -1204,17 +1204,18 @@ _02242BFC: .global Unk_ov66_02259100 Unk_ov66_02259100: ; 0x02259100 - .incbin "incbin/overlay66_data.bin", 0x3E0, 0x3E1 - 0x3E0 + .byte 0x1 .global Unk_ov66_02259101 Unk_ov66_02259101: ; 0x02259101 - .incbin "incbin/overlay66_data.bin", 0x3E1, 0x3E4 - 0x3E1 + .space 0x3 .global Unk_ov66_02259104 Unk_ov66_02259104: ; 0x02259104 - .incbin "incbin/overlay66_data.bin", 0x3E4, 0x3EC - 0x3E4 + .word ov66_0224239C + .space 0x4 .global Unk_ov66_0225910C Unk_ov66_0225910C: ; 0x0225910C - .incbin "incbin/overlay66_data.bin", 0x3EC, 0x1A + .asciz "tree::insert length error" diff --git a/lib/NitroDWC/asm/util/anime.s b/lib/NitroDWC/asm/util/anime.s index 3f85494dfa..44e98e5151 100644 --- a/lib/NitroDWC/asm/util/anime.s +++ b/lib/NitroDWC/asm/util/anime.s @@ -144,7 +144,7 @@ _0222AF08: .word 0xFE00FF00 .global Unk_ov18_02248C8C Unk_ov18_02248C8C: ; 0x02248C8C - .incbin "incbin/overlay18_rodata.bin", 0x2858, 0x3 + .byte 0xE, 0x4, 0x5, 0x0 diff --git a/lib/NitroDWC/asm/util/aoss.s b/lib/NitroDWC/asm/util/aoss.s index c0d21a4c5c..81d91e5390 100644 --- a/lib/NitroDWC/asm/util/aoss.s +++ b/lib/NitroDWC/asm/util/aoss.s @@ -4504,7 +4504,7 @@ ov18_02226908: ; 0x02226908 .global Unk_ov18_02246458 Unk_ov18_02246458: ; 0x02246458 - .incbin "incbin/overlay18_rodata.bin", 0x24, 0x4 + .byte 0xFF, 0xFF, 0xFF, 0xFF @@ -4513,27 +4513,34 @@ Unk_ov18_02246458: ; 0x02246458 .global Unk_ov18_02249790 Unk_ov18_02249790: ; 0x02249790 - .incbin "incbin/overlay18_data.bin", 0x30, 0x34 - 0x30 + .word 0x809 .global Unk_ov18_02249794 Unk_ov18_02249794: ; 0x02249794 - .incbin "incbin/overlay18_data.bin", 0x34, 0x38 - 0x34 + .word 0xFFFFFFFF .global Unk_ov18_02249798 Unk_ov18_02249798: ; 0x02249798 - .incbin "incbin/overlay18_data.bin", 0x38, 0x3C - 0x38 + .word 0xFFFFFFFF .global Unk_ov18_0224979C Unk_ov18_0224979C: ; 0x0224979C - .incbin "incbin/overlay18_data.bin", 0x3C, 0x94 - 0x3C + .word 0x01000000 + .word ov18_02226680 + .word ov18_02226698 + .space 0x18 + .word 0x1000 + .word 0x1000 + .space 0x2C .global Unk_ov18_022497F4 Unk_ov18_022497F4: ; 0x022497F4 - .incbin "incbin/overlay18_data.bin", 0x94, 0xA0 - 0x94 + .ascii "ESSID-AOSS" + .space 0x2 .global Unk_ov18_02249800 Unk_ov18_02249800: ; 0x02249800 - .incbin "incbin/overlay18_data.bin", 0xA0, 0x6 + .asciz "MELCO" diff --git a/lib/NitroDWC/asm/util/aosslink.s b/lib/NitroDWC/asm/util/aosslink.s index b62f455ca9..d396be670e 100644 --- a/lib/NitroDWC/asm/util/aosslink.s +++ b/lib/NitroDWC/asm/util/aosslink.s @@ -816,8 +816,30 @@ _02226EEC: .word Unk_ov18_02251B60 .global Unk_ov18_02249808 Unk_ov18_02249808: ; 0x02249808 - .incbin "incbin/overlay18_data.bin", 0xA8, 0x30 - + .short 0x1 + .short 0x2 + .short 0x2 + .short 0x4 + .short 0x4 + .short 0xB + .short 0x8 + .short 0xC + .short 0x10 + .short 0x12 + .short 0x20 + .short 0x16 + .short 0x40 + .short 0x18 + .short 0x80 + .short 0x24 + .short 0x100 + .short 0x30 + .short 0x200 + .short 0x48 + .short 0x400 + .short 0x60 + .short 0x800 + .short 0x6C .bss diff --git a/lib/NitroDWC/asm/util/archive.s b/lib/NitroDWC/asm/util/archive.s index 48a43a7f0e..f112937b1b 100644 --- a/lib/NitroDWC/asm/util/archive.s +++ b/lib/NitroDWC/asm/util/archive.s @@ -348,7 +348,7 @@ ov18_02243860: ; 0x02243860 .global Unk_ov18_02249718 Unk_ov18_02249718: ; 0x02249718 - .incbin "incbin/overlay18_rodata.bin", 0x32E4, 0x4 + .asciz "dwc" @@ -357,19 +357,23 @@ Unk_ov18_02249718: ; 0x02249718 .global Unk_ov18_0224B1E4 Unk_ov18_0224B1E4: ; 0x0224B1E4 - .incbin "incbin/overlay18_data.bin", 0x1A84, 0x1A9C - 0x1A84 + .ascii "rom:/dwc/utility.bin" + .space 0x4 .global Unk_ov18_0224B1FC Unk_ov18_0224B1FC: ; 0x0224B1FC - .incbin "incbin/overlay18_data.bin", 0x1A9C, 0x1AA4 - 0x1A9C + .ascii "%s:/" + .space 0x4 .global Unk_ov18_0224B204 Unk_ov18_0224B204: ; 0x0224B204 - .incbin "incbin/overlay18_data.bin", 0x1AA4, 0x1AAC - 0x1AA4 + .ascii "rom:/" + .space 0x3 .global Unk_ov18_0224B20C Unk_ov18_0224B20C: ; 0x0224B20C - .incbin "incbin/overlay18_data.bin", 0x1AAC, 0x3 + .ascii ".l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/atermset.s b/lib/NitroDWC/asm/util/atermset.s index 82d465f507..c11b541763 100644 --- a/lib/NitroDWC/asm/util/atermset.s +++ b/lib/NitroDWC/asm/util/atermset.s @@ -7362,51 +7362,51 @@ _0222AD30: .word Unk_ov18_02251D10 .global Unk_ov18_0224645C Unk_ov18_0224645C: ; 0x0224645C - .incbin "incbin/overlay18_rodata.bin", 0x28, 0x30 - 0x28 + .incbin "incbin/atermset.bin", 0x0, 0x8 .global Unk_ov18_02246464 Unk_ov18_02246464: ; 0x02246464 - .incbin "incbin/overlay18_rodata.bin", 0x30, 0x58 - 0x30 + .incbin "incbin/atermset.bin", 0x8, 0x30 - 0x8 .global Unk_ov18_0224648C Unk_ov18_0224648C: ; 0x0224648C - .incbin "incbin/overlay18_rodata.bin", 0x58, 0x458 - 0x58 + .incbin "incbin/atermset.bin", 0x30, 0x430 - 0x30 .global Unk_ov18_0224688C Unk_ov18_0224688C: ; 0x0224688C - .incbin "incbin/overlay18_rodata.bin", 0x458, 0x858 - 0x458 + .incbin "incbin/atermset.bin", 0x430, 0x830 - 0x430 .global Unk_ov18_02246C8C Unk_ov18_02246C8C: ; 0x02246C8C - .incbin "incbin/overlay18_rodata.bin", 0x858, 0xC58 - 0x858 + .incbin "incbin/atermset.bin", 0x830, 0xC30 - 0x830 .global Unk_ov18_0224708C Unk_ov18_0224708C: ; 0x0224708C - .incbin "incbin/overlay18_rodata.bin", 0xC58, 0x1058 - 0xC58 + .incbin "incbin/atermset.bin", 0xC30, 0x1030 - 0xC30 .global Unk_ov18_0224748C Unk_ov18_0224748C: ; 0x0224748C - .incbin "incbin/overlay18_rodata.bin", 0x1058, 0x1458 - 0x1058 + .incbin "incbin/atermset.bin", 0x1030, 0x1430 - 0x1030 .global Unk_ov18_0224788C Unk_ov18_0224788C: ; 0x0224788C - .incbin "incbin/overlay18_rodata.bin", 0x1458, 0x1858 - 0x1458 + .incbin "incbin/atermset.bin", 0x1430, 0x1830 - 0x1430 .global Unk_ov18_02247C8C Unk_ov18_02247C8C: ; 0x02247C8C - .incbin "incbin/overlay18_rodata.bin", 0x1858, 0x1C58 - 0x1858 + .incbin "incbin/atermset.bin", 0x1830, 0x1C30 - 0x1830 .global Unk_ov18_0224808C Unk_ov18_0224808C: ; 0x0224808C - .incbin "incbin/overlay18_rodata.bin", 0x1C58, 0x2058 - 0x1C58 + .incbin "incbin/atermset.bin", 0x1C30, 0x2030 - 0x1C30 .global Unk_ov18_0224848C Unk_ov18_0224848C: ; 0x0224848C - .incbin "incbin/overlay18_rodata.bin", 0x2058, 0x2458 - 0x2058 + .incbin "incbin/atermset.bin", 0x2030, 0x2430 - 0x2030 .global Unk_ov18_0224888C Unk_ov18_0224888C: ; 0x0224888C - .incbin "incbin/overlay18_rodata.bin", 0x2458, 0x400 + .incbin "incbin/atermset.bin", 0x2430, 0x400 @@ -7415,43 +7415,62 @@ Unk_ov18_0224888C: ; 0x0224888C .global Unk_ov18_02249838 Unk_ov18_02249838: ; 0x02249838 - .incbin "incbin/overlay18_data.bin", 0xD8, 0xDC - 0xD8 + .word Unk_ov18_02252244 + 0x8 .global Unk_ov18_0224983C Unk_ov18_0224983C: ; 0x0224983C - .incbin "incbin/overlay18_data.bin", 0xDC, 0xE0 - 0xDC + .word 0x1 .global Unk_ov18_02249840 Unk_ov18_02249840: ; 0x02249840 - .incbin "incbin/overlay18_data.bin", 0xE0, 0xE4 - 0xE0 + .word 0x800 .global Unk_ov18_02249844 Unk_ov18_02249844: ; 0x02249844 - .incbin "incbin/overlay18_data.bin", 0xE4, 0xE8 - 0xE4 + .word 0xFFFFFFFF .global Unk_ov18_02249848 Unk_ov18_02249848: ; 0x02249848 - .incbin "incbin/overlay18_data.bin", 0xE8, 0xEC - 0xE8 + .word 0x40 .global Unk_ov18_0224984C Unk_ov18_0224984C: ; 0x0224984C - .incbin "incbin/overlay18_data.bin", 0xEC, 0x144 - 0xEC + .word 0x01000000 + .word ov18_02227BC8 + .word ov18_02227BF8 + .space 0x4 + .short 0xA8C0 + .short 0xB000 + .word 0xFFFFFF + .short 0xA8C0 + .short 0xC800 + .short 0xA8C0 + .short 0x2000 + .space 0x4 + .word 0x1000 + .word 0x1000 + .space 0x1C + .word Unk_ov18_022498AC + .word 0x4 + .space 0x8 .global Unk_ov18_022498A4 Unk_ov18_022498A4: ; 0x022498A4 - .incbin "incbin/overlay18_data.bin", 0x144, 0x14C - 0x144 + .ascii "******" + .space 0x2 .global Unk_ov18_022498AC Unk_ov18_022498AC: ; 0x022498AC - .incbin "incbin/overlay18_data.bin", 0x14C, 0x158 - 0x14C + .asciz "NINTENDO-DS" .global Unk_ov18_022498B8 Unk_ov18_022498B8: ; 0x022498B8 - .incbin "incbin/overlay18_data.bin", 0x158, 0x198 - 0x158 + .word 0x80 + .space 0x3C .global Unk_ov18_022498F8 Unk_ov18_022498F8: ; 0x022498F8 - .incbin "incbin/overlay18_data.bin", 0x198, 0x5 + .asciz "WARP" diff --git a/lib/NitroDWC/asm/util/button.s b/lib/NitroDWC/asm/util/button.s index 9a17fed60f..f0b745bc06 100644 --- a/lib/NitroDWC/asm/util/button.s +++ b/lib/NitroDWC/asm/util/button.s @@ -510,27 +510,27 @@ _0222B57C: .word Unk_ov18_02248CA0 .global Unk_ov18_02248C90 Unk_ov18_02248C90: ; 0x02248C90 - .incbin "incbin/overlay18_rodata.bin", 0x285C, 0x2860 - 0x285C + .incbin "incbin/button.bin", 0x0, 0x4 .global Unk_ov18_02248C94 Unk_ov18_02248C94: ; 0x02248C94 - .incbin "incbin/overlay18_rodata.bin", 0x2860, 0x2864 - 0x2860 + .incbin "incbin/button.bin", 0x4, 0x8 - 0x4 .global Unk_ov18_02248C98 Unk_ov18_02248C98: ; 0x02248C98 - .incbin "incbin/overlay18_rodata.bin", 0x2864, 0x286C - 0x2864 + .incbin "incbin/button.bin", 0x8, 0x10 - 0x8 .global Unk_ov18_02248CA0 Unk_ov18_02248CA0: ; 0x02248CA0 - .incbin "incbin/overlay18_rodata.bin", 0x286C, 0x287A - 0x286C + .incbin "incbin/button.bin", 0x10, 0x1E - 0x10 .global Unk_ov18_02248CAE Unk_ov18_02248CAE: ; 0x02248CAE - .incbin "incbin/overlay18_rodata.bin", 0x287A, 0x2888 - 0x287A + .incbin "incbin/button.bin", 0x1E, 0x2C - 0x1E .global Unk_ov18_02248CBC Unk_ov18_02248CBC: ; 0x02248CBC - .incbin "incbin/overlay18_rodata.bin", 0x2888, 0x7 + .incbin "incbin/button.bin", 0x2C, 0x8 diff --git a/lib/NitroDWC/asm/util/comment.s b/lib/NitroDWC/asm/util/comment.s index 5517ca26d7..ad261c5c4b 100644 --- a/lib/NitroDWC/asm/util/comment.s +++ b/lib/NitroDWC/asm/util/comment.s @@ -98,7 +98,7 @@ _0222B69C: .word Unk_ov18_0225324C .global Unk_ov18_02249900 Unk_ov18_02249900: ; 0x02249900 - .incbin "incbin/overlay18_data.bin", 0x1A0, 0x12 + .asciz "char/jtNull.nsc.l" diff --git a/lib/NitroDWC/asm/util/common.s b/lib/NitroDWC/asm/util/common.s index a54678aa3a..a9659751a4 100644 --- a/lib/NitroDWC/asm/util/common.s +++ b/lib/NitroDWC/asm/util/common.s @@ -201,23 +201,23 @@ _0222B90C: .word Unk_ov18_02248CD4 .global Unk_ov18_02248CC4 Unk_ov18_02248CC4: ; 0x02248CC4 - .incbin "incbin/overlay18_rodata.bin", 0x2890, 0x2898 - 0x2890 + .incbin "incbin/common.bin", 0x0, 0x8 .global Unk_ov18_02248CCC Unk_ov18_02248CCC: ; 0x02248CCC - .incbin "incbin/overlay18_rodata.bin", 0x2898, 0x28A0 - 0x2898 + .incbin "incbin/common.bin", 0x8, 0x10 - 0x8 .global Unk_ov18_02248CD4 Unk_ov18_02248CD4: ; 0x02248CD4 - .incbin "incbin/overlay18_rodata.bin", 0x28A0, 0x28BC - 0x28A0 + .incbin "incbin/common.bin", 0x10, 0x2C - 0x10 .global Unk_ov18_02248CF0 Unk_ov18_02248CF0: ; 0x02248CF0 - .incbin "incbin/overlay18_rodata.bin", 0x28BC, 0x28D8 - 0x28BC + .incbin "incbin/common.bin", 0x2C, 0x48 - 0x2C .global Unk_ov18_02248D0C Unk_ov18_02248D0C: ; 0x02248D0C - .incbin "incbin/overlay18_rodata.bin", 0x28D8, 0x8 + .incbin "incbin/common.bin", 0x48, 0x8 diff --git a/lib/NitroDWC/asm/util/dwc_mov_mbp.s b/lib/NitroDWC/asm/util/dwc_mov_mbp.s index 43ae7694f0..7e10538e82 100644 --- a/lib/NitroDWC/asm/util/dwc_mov_mbp.s +++ b/lib/NitroDWC/asm/util/dwc_mov_mbp.s @@ -944,107 +944,142 @@ _02241444: .word Unk_ov18_0225339C .global Unk_ov18_0224A648 Unk_ov18_0224A648: ; 0x0224A648 - .incbin "incbin/overlay18_data.bin", 0xEE8, 0xEFC - 0xEE8 + .ascii "MB_COMM_PSTATE_END" + .space 0x2 .global Unk_ov18_0224A65C Unk_ov18_0224A65C: ; 0x0224A65C - .incbin "incbin/overlay18_data.bin", 0xEFC, 0xF10 - 0xEFC + .asciz "MB_COMM_PSTATE_NONE" .global Unk_ov18_0224A670 Unk_ov18_0224A670: ; 0x0224A670 - .incbin "incbin/overlay18_data.bin", 0xF10, 0xF28 - 0xF10 + .ascii "MB_COMM_PSTATE_ERROR" + .space 0x4 .global Unk_ov18_0224A688 Unk_ov18_0224A688: ; 0x0224A688 - .incbin "incbin/overlay18_data.bin", 0xF28, 0xF40 - 0xF28 + .ascii "MB_COMM_PSTATE_KICKED" + .space 0x3 .global Unk_ov18_0224A6A0 Unk_ov18_0224A6A0: ; 0x0224A6A0 - .incbin "incbin/overlay18_data.bin", 0xF40, 0xF58 - 0xF40 + .asciz "DWCi_MOV_MBP_STATE_STOP" .global Unk_ov18_0224A6B8 Unk_ov18_0224A6B8: ; 0x0224A6B8 - .incbin "incbin/overlay18_data.bin", 0xF58, 0xF70 - 0xF58 + .space 0x18 .global Unk_ov18_0224A6D0 Unk_ov18_0224A6D0: ; 0x0224A6D0 - .incbin "incbin/overlay18_data.bin", 0xF70, 0xF90 - 0xF70 + .word Unk_ov18_0224A6A0 + .word Unk_ov18_0224A72C + .word Unk_ov18_0224A760 + .word Unk_ov18_0224A914 + .word Unk_ov18_0224A894 + .word Unk_ov18_0224A824 + .word Unk_ov18_0224A7B4 + .word Unk_ov18_0224A798 .global Unk_ov18_0224A6F0 Unk_ov18_0224A6F0: ; 0x0224A6F0 - .incbin "incbin/overlay18_data.bin", 0xF90, 0xFCC - 0xF90 + .word Unk_ov18_0224A65C + .word Unk_ov18_0224A8B4 + .word Unk_ov18_0224A744 + .word Unk_ov18_0224A808 + .word Unk_ov18_0224A688 + .word Unk_ov18_0224A840 + .word Unk_ov18_0224A85C + .word Unk_ov18_0224A8D4 + .word Unk_ov18_0224A878 + .word Unk_ov18_0224A8F4 + .word Unk_ov18_0224A77C + .word Unk_ov18_0224A7D0 + .word Unk_ov18_0224A648 + .word Unk_ov18_0224A670 + .word Unk_ov18_0224A7EC .global Unk_ov18_0224A72C Unk_ov18_0224A72C: ; 0x0224A72C - .incbin "incbin/overlay18_data.bin", 0xFCC, 0xFE4 - 0xFCC + .asciz "DWCi_MOV_MBP_STATE_IDLE" .global Unk_ov18_0224A744 Unk_ov18_0224A744: ; 0x0224A744 - .incbin "incbin/overlay18_data.bin", 0xFE4, 0x1000 - 0xFE4 + .ascii "MB_COMM_PSTATE_CONNECTED" + .space 0x4 .global Unk_ov18_0224A760 Unk_ov18_0224A760: ; 0x0224A760 - .incbin "incbin/overlay18_data.bin", 0x1000, 0x101C - 0x1000 + .ascii "DWCi_MOV_MBP_STATE_ENTRY" + .space 0x4 .global Unk_ov18_0224A77C Unk_ov18_0224A77C: ; 0x0224A77C - .incbin "incbin/overlay18_data.bin", 0x101C, 0x1038 - 0x101C + .ascii "MB_COMM_PSTATE_REQUESTED" + .space 0x4 .global Unk_ov18_0224A798 Unk_ov18_0224A798: ; 0x0224A798 - .incbin "incbin/overlay18_data.bin", 0x1038, 0x1054 - 0x1038 + .ascii "DWCi_MOV_MBP_STATE_ERROR" + .space 0x4 .global Unk_ov18_0224A7B4 Unk_ov18_0224A7B4: ; 0x0224A7B4 - .incbin "incbin/overlay18_data.bin", 0x1054, 0x1070 - 0x1054 + .asciz "DWCi_MOV_MBP_STATE_CANCEL" + .space 0x2 .global Unk_ov18_0224A7D0 Unk_ov18_0224A7D0: ; 0x0224A7D0 - .incbin "incbin/overlay18_data.bin", 0x1070, 0x108C - 0x1070 + .ascii "MB_COMM_PSTATE_MEMBER_FULL" + .space 0x2 .global Unk_ov18_0224A7EC Unk_ov18_0224A7EC: ; 0x0224A7EC - .incbin "incbin/overlay18_data.bin", 0x108C, 0x10A8 - 0x108C + .asciz "MB_COMM_PSTATE_WAIT_TO_SEND" .global Unk_ov18_0224A808 Unk_ov18_0224A808: ; 0x0224A808 - .incbin "incbin/overlay18_data.bin", 0x10A8, 0x10C4 - 0x10A8 + .asciz "MB_COMM_PSTATE_DISCONNECTED" .global Unk_ov18_0224A824 Unk_ov18_0224A824: ; 0x0224A824 - .incbin "incbin/overlay18_data.bin", 0x10C4, 0x10E0 - 0x10C4 + .asciz "DWCi_MOV_MBP_STATE_COMPLETE" .global Unk_ov18_0224A840 Unk_ov18_0224A840: ; 0x0224A840 - .incbin "incbin/overlay18_data.bin", 0x10E0, 0x10FC - 0x10E0 + .asciz "MB_COMM_PSTATE_REQ_ACCEPTED" .global Unk_ov18_0224A85C Unk_ov18_0224A85C: ; 0x0224A85C - .incbin "incbin/overlay18_data.bin", 0x10FC, 0x1118 - 0x10FC + .asciz "MB_COMM_PSTATE_SEND_PROCEED" .global Unk_ov18_0224A878 Unk_ov18_0224A878: ; 0x0224A878 - .incbin "incbin/overlay18_data.bin", 0x1118, 0x1134 - 0x1118 + .asciz "MB_COMM_PSTATE_BOOT_REQUEST" .global Unk_ov18_0224A894 Unk_ov18_0224A894: ; 0x0224A894 - .incbin "incbin/overlay18_data.bin", 0x1134, 0x1154 - 0x1134 + .ascii "DWCi_MOV_MBP_STATE_REBOOTING" + .space 0x4 .global Unk_ov18_0224A8B4 Unk_ov18_0224A8B4: ; 0x0224A8B4 - .incbin "incbin/overlay18_data.bin", 0x1154, 0x1174 - 0x1154 + .ascii "MB_COMM_PSTATE_INIT_COMPLETE" + .space 0x4 .global Unk_ov18_0224A8D4 Unk_ov18_0224A8D4: ; 0x0224A8D4 - .incbin "incbin/overlay18_data.bin", 0x1174, 0x1194 - 0x1174 + .ascii "MB_COMM_PSTATE_SEND_COMPLETE" + .space 0x4 .global Unk_ov18_0224A8F4 Unk_ov18_0224A8F4: ; 0x0224A8F4 - .incbin "incbin/overlay18_data.bin", 0x1194, 0x11B4 - 0x1194 + .ascii "MB_COMM_PSTATE_BOOT_STARTABLE" + .space 0x3 .global Unk_ov18_0224A914 Unk_ov18_0224A914: ; 0x0224A914 - .incbin "incbin/overlay18_data.bin", 0x11B4, 0x1F + .ascii "DWCi_MOV_MBP_STATE_DATASENDING" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/dwc_mov_wh.s b/lib/NitroDWC/asm/util/dwc_mov_wh.s index 10bd4f59f0..8754368550 100644 --- a/lib/NitroDWC/asm/util/dwc_mov_wh.s +++ b/lib/NitroDWC/asm/util/dwc_mov_wh.s @@ -1422,303 +1422,433 @@ _022425E4: .word ov18_02241CB4 .global Unk_ov18_0224A934 Unk_ov18_0224A934: ; 0x0224A934 - .incbin "incbin/overlay18_data.bin", 0x11D4, 0x11D8 - 0x11D4 + .asciz "N/A" .global Unk_ov18_0224A938 Unk_ov18_0224A938: ; 0x0224A938 - .incbin "incbin/overlay18_data.bin", 0x11D8, 0x11EC - 0x11D8 + .asciz "WM_ERRCODE_FAILED" + .space 0x2 .global Unk_ov18_0224A94C Unk_ov18_0224A94C: ; 0x0224A94C - .incbin "incbin/overlay18_data.bin", 0x11EC, 0x1200 - 0x11EC + .ascii "WM_ERRCODE_NO_DATA" + .space 0x2 .global Unk_ov18_0224A960 Unk_ov18_0224A960: ; 0x0224A960 - .incbin "incbin/overlay18_data.bin", 0x1200, 0x1214 - 0x1200 + .ascii "WM_ERRCODE_TIMEOUT" + .space 0x2 .global Unk_ov18_0224A974 Unk_ov18_0224A974: ; 0x0224A974 - .incbin "incbin/overlay18_data.bin", 0x1214, 0x1228 - 0x1214 + .ascii "WM_ERRCODE_SUCCESS" + .space 0x2 .global Unk_ov18_0224A988 Unk_ov18_0224A988: ; 0x0224A988 - .incbin "incbin/overlay18_data.bin", 0x1228, 0x123C - 0x1228 + .asciz "WM_STATECODE_MP_IND" .global Unk_ov18_0224A99C Unk_ov18_0224A99C: ; 0x0224A99C - .incbin "incbin/overlay18_data.bin", 0x123C, 0x1250 - 0x123C + .asciz "WM_ERRCODE_DCF_TEST" .global Unk_ov18_0224A9B0 Unk_ov18_0224A9B0: ; 0x0224A9B0 - .incbin "incbin/overlay18_data.bin", 0x1250, 0x1264 - 0x1250 + .asciz "WM_ERRCODE_NO_ENTRY" .global Unk_ov18_0224A9C4 Unk_ov18_0224A9C4: ; 0x0224A9C4 - .incbin "incbin/overlay18_data.bin", 0x1264, 0x1278 - 0x1264 + .asciz "WM_ERRCODE_NO_CHILD" .global Unk_ov18_0224A9D8 Unk_ov18_0224A9D8: ; 0x0224A9D8 - .incbin "incbin/overlay18_data.bin", 0x1278, 0x1290 - 0x1278 + .ascii "WM_ERRCODE_OPERATING" + .space 0x4 .global Unk_ov18_0224A9F0 Unk_ov18_0224A9F0: ; 0x0224A9F0 - .incbin "incbin/overlay18_data.bin", 0x1290, 0x12A8 - 0x1290 + .ascii "WM_STATECODE_DCF_IND" + .space 0x4 .global Unk_ov18_0224AA08 Unk_ov18_0224AA08: ; 0x0224AA08 - .incbin "incbin/overlay18_data.bin", 0x12A8, 0x12C0 - 0x12A8 + .asciz "WM_STATECODE_MP_START" + .space 0x2 .global Unk_ov18_0224AA20 Unk_ov18_0224AA20: ; 0x0224AA20 - .incbin "incbin/overlay18_data.bin", 0x12C0, 0x12D8 - 0x12C0 + .asciz "WM_ERRCODE_FIFO_ERROR" + .space 0x2 .global Unk_ov18_0224AA38 Unk_ov18_0224AA38: ; 0x0224AA38 - .incbin "incbin/overlay18_data.bin", 0x12D8, 0x12F0 - 0x12D8 + .asciz "WM_ERRCODE_NO_DATASET" + .space 0x2 .global Unk_ov18_0224AA50 Unk_ov18_0224AA50: ; 0x0224AA50 - .incbin "incbin/overlay18_data.bin", 0x12F0, 0x1308 - 0x12F0 + .asciz "WM_ERRCODE_WM_DISABLE" + .space 0x2 .global Unk_ov18_0224AA68 Unk_ov18_0224AA68: ; 0x0224AA68 - .incbin "incbin/overlay18_data.bin", 0x1308, 0x1320 - 0x1308 + .ascii "WM_STATECODE_PORT_RECV" + .space 0x2 .global Unk_ov18_0224AA80 Unk_ov18_0224AA80: ; 0x0224AA80 - .incbin "incbin/overlay18_data.bin", 0x1320, 0x1338 - 0x1320 + .ascii "WM_STATECODE_CONNECTED" + .space 0x2 .global Unk_ov18_0224AA98 Unk_ov18_0224AA98: ; 0x0224AA98 - .incbin "incbin/overlay18_data.bin", 0x1338, 0x1350 - 0x1338 + .ascii "WM_STATECODE_MPACK_IND" + .space 0x2 .global Unk_ov18_0224AAB0 Unk_ov18_0224AAB0: ; 0x0224AAB0 - .incbin "incbin/overlay18_data.bin", 0x1350, 0x1368 - 0x1350 + .ascii "WM_ERRCODE_SEND_FAILED" + .space 0x2 .global Unk_ov18_0224AAC8 Unk_ov18_0224AAC8: ; 0x0224AAC8 - .incbin "incbin/overlay18_data.bin", 0x1368, 0x1380 - 0x1368 + .ascii "WM_STATECODE_DCF_START" + .space 0x2 .global Unk_ov18_0224AAE0 Unk_ov18_0224AAE0: ; 0x0224AAE0 - .incbin "incbin/overlay18_data.bin", 0x1380, 0x1398 - 0x1380 + .ascii "WM_ERRCODE_FLASH_ERROR" + .space 0x2 .global Unk_ov18_0224AAF8 Unk_ov18_0224AAF8: ; 0x0224AAF8 - .incbin "incbin/overlay18_data.bin", 0x1398, 0x13B0 - 0x1398 + .ascii "WM_STATECODE_MPEND_IND" + .space 0x2 .global Unk_ov18_0224AB10 Unk_ov18_0224AB10: ; 0x0224AB10 - .incbin "incbin/overlay18_data.bin", 0x13B0, 0x13C8 - 0x13B0 + .ascii "WM_STATECODE_PORT_SEND" + .space 0x2 .global Unk_ov18_0224AB28 Unk_ov18_0224AB28: ; 0x0224AB28 - .incbin "incbin/overlay18_data.bin", 0x13C8, 0x13E0 - 0x13C8 + .asciz "WM_STATECODE_SCAN_START" .global Unk_ov18_0224AB40 Unk_ov18_0224AB40: ; 0x0224AB40 - .incbin "incbin/overlay18_data.bin", 0x13E0, 0x13F8 - 0x13E0 + .asciz "WM_STATECODE_FIFO_ERROR" .global Unk_ov18_0224AB58 Unk_ov18_0224AB58: ; 0x0224AB58 - .incbin "incbin/overlay18_data.bin", 0x13F8, 0x1414 - 0x13F8 + .ascii "WM_ERRCODE_ILLEGAL_STATE" + .space 0x4 .global Unk_ov18_0224AB74 Unk_ov18_0224AB74: ; 0x0224AB74 - .incbin "incbin/overlay18_data.bin", 0x1414, 0x1430 - 0x1414 + .ascii "WM_STATECODE_BEACON_LOST" + .space 0x4 .global Unk_ov18_0224AB90 Unk_ov18_0224AB90: ; 0x0224AB90 - .incbin "incbin/overlay18_data.bin", 0x1430, 0x144C - 0x1430 + .ascii "WM_ERRCODE_INVALID_PARAM" + .space 0x4 .global Unk_ov18_0224ABAC Unk_ov18_0224ABAC: ; 0x0224ABAC - .incbin "incbin/overlay18_data.bin", 0x144C, 0x1468 - 0x144C + .ascii "WM_ERRCODE_WL_LENGTH_ERR" + .space 0x4 .global Unk_ov18_0224ABC8 Unk_ov18_0224ABC8: ; 0x0224ABC8 - .incbin "incbin/overlay18_data.bin", 0x1468, 0x1484 - 0x1468 + .ascii "WM_STATECODE_BEACON_RECV" + .space 0x4 .global Unk_ov18_0224ABE4 Unk_ov18_0224ABE4: ; 0x0224ABE4 - .incbin "incbin/overlay18_data.bin", 0x1484, 0x14A0 - 0x1484 + .ascii "WM_STATECODE_REASSOCIATE" + .space 0x4 .global Unk_ov18_0224AC00 Unk_ov18_0224AC00: ; 0x0224AC00 - .incbin "incbin/overlay18_data.bin", 0x14A0, 0x14BC - 0x14A0 + .ascii "WM_STATECODE_BEACON_SENT" + .space 0x4 .global Unk_ov18_0224AC1C Unk_ov18_0224AC1C: ; 0x0224AC1C - .incbin "incbin/overlay18_data.bin", 0x14BC, 0x14D8 - 0x14BC + .asciz "WM_STATECODE_PARENT_FOUND" + .space 0x2 .global Unk_ov18_0224AC38 Unk_ov18_0224AC38: ; 0x0224AC38 - .incbin "incbin/overlay18_data.bin", 0x14D8, 0x14F4 - 0x14D8 + .asciz "WM_STATECODE_DISCONNECTED" + .space 0x2 .global Unk_ov18_0224AC54 Unk_ov18_0224AC54: ; 0x0224AC54 - .incbin "incbin/overlay18_data.bin", 0x14F4, 0x1510 - 0x14F4 + .asciz "DWCi_MOV_WH_SYSSTATE_STOP" + .space 0x2 .global Unk_ov18_0224AC70 Unk_ov18_0224AC70: ; 0x0224AC70 - .incbin "incbin/overlay18_data.bin", 0x1510, 0x152C - 0x1510 + .asciz "WM_ERRCODE_OVER_MAX_ENTRY" + .space 0x2 .global Unk_ov18_0224AC8C Unk_ov18_0224AC8C: ; 0x0224AC8C - .incbin "incbin/overlay18_data.bin", 0x152C, 0x1548 - 0x152C + .asciz "DWCi_MOV_WH_SYSSTATE_IDLE" + .space 0x2 .global Unk_ov18_0224ACA8 Unk_ov18_0224ACA8: ; 0x0224ACA8 - .incbin "incbin/overlay18_data.bin", 0x1548, 0x1564 - 0x1548 + .asciz "WM_STATECODE_DISASSOCIATE" + .space 0x2 .global Unk_ov18_0224ACC4 Unk_ov18_0224ACC4: ; 0x0224ACC4 - .incbin "incbin/overlay18_data.bin", 0x1564, 0x1580 - 0x1564 + .asciz "WM_STATECODE_PARENT_START" + .space 0x2 .global Unk_ov18_0224ACE0 Unk_ov18_0224ACE0: ; 0x0224ACE0 - .incbin "incbin/overlay18_data.bin", 0x1580, 0x159C - 0x1580 + .asciz "DWCi_MOV_WH_SYSSTATE_BUSY" + .space 0x2 .global Unk_ov18_0224ACFC Unk_ov18_0224ACFC: ; 0x0224ACFC - .incbin "incbin/overlay18_data.bin", 0x159C, 0x15B8 - 0x159C + .asciz "WM_STATECODE_AUTHENTICATE" + .space 0x2 .global Unk_ov18_0224AD18 Unk_ov18_0224AD18: ; 0x0224AD18 - .incbin "incbin/overlay18_data.bin", 0x15B8, 0x15D4 - 0x15B8 + .ascii "WM_STATECODE_CONNECT_START" + .space 0x2 .global Unk_ov18_0224AD34 Unk_ov18_0224AD34: ; 0x0224AD34 - .incbin "incbin/overlay18_data.bin", 0x15D4, 0x15F0 - 0x15D4 + .ascii "DWCi_MOV_WH_SYSSTATE_ERROR" + .space 0x2 .global Unk_ov18_0224AD50 Unk_ov18_0224AD50: ; 0x0224AD50 - .incbin "incbin/overlay18_data.bin", 0x15F0, 0x160C - 0x15F0 + .ascii "WM_ERRCODE_SEND_QUEUE_FULL" + .space 0x2 .global Unk_ov18_0224AD6C Unk_ov18_0224AD6C: ; 0x0224AD6C - .incbin "incbin/overlay18_data.bin", 0x160C, 0x1628 - 0x160C + .asciz "WM_ERRCODE_WL_INVALID_PARAM" .global Unk_ov18_0224AD88 Unk_ov18_0224AD88: ; 0x0224AD88 - .incbin "incbin/overlay18_data.bin", 0x1628, 0x1648 - 0x1628 + .ascii "DWCi_MOV_WH_ERRCODE_NO_RADIO" + .space 0x4 .global Unk_ov18_0224ADA8 Unk_ov18_0224ADA8: ; 0x0224ADA8 - .incbin "incbin/overlay18_data.bin", 0x1648, 0x1668 - 0x1648 + .asciz "WM_ERRCODE_INVALID_POLLBITMAP" + .space 0x2 .global Unk_ov18_0224ADC8 Unk_ov18_0224ADC8: ; 0x0224ADC8 - .incbin "incbin/overlay18_data.bin", 0x1668, 0x1688 - 0x1668 + .asciz "DWCi_MOV_WH_SYSSTATE_SCANNING" + .space 0x2 .global Unk_ov18_0224ADE8 Unk_ov18_0224ADE8: ; 0x0224ADE8 - .incbin "incbin/overlay18_data.bin", 0x1688, 0x16A8 - 0x1688 + .asciz "WM_STATECODE_PARENT_NOT_FOUND" + .space 0x2 .global Unk_ov18_0224AE08 Unk_ov18_0224AE08: ; 0x0224AE08 - .incbin "incbin/overlay18_data.bin", 0x16A8, 0x16C8 - 0x16A8 + .ascii "DWCi_MOV_WH_SYSSTATE_CONNECTED" + .space 0x2 .global Unk_ov18_0224AE28 Unk_ov18_0224AE28: ; 0x0224AE28 - .incbin "incbin/overlay18_data.bin", 0x16C8, 0x16E8 - 0x16C8 + .asciz "DWCi_MOV_WH_SYSSTATE_KEYSHARING" .global Unk_ov18_0224AE48 Unk_ov18_0224AE48: ; 0x0224AE48 - .incbin "incbin/overlay18_data.bin", 0x16E8, 0x170C - 0x16E8 + .ascii "DWCi_MOV_WH_SYSSTATE_DATASHARING" + .space 0x4 .global Unk_ov18_0224AE6C Unk_ov18_0224AE6C: ; 0x0224AE6C - .incbin "incbin/overlay18_data.bin", 0x170C, 0x1730 - 0x170C + .ascii "DWCi_MOV_WH_ERRCODE_DISCONNECTED" + .space 0x4 .global Unk_ov18_0224AE90 Unk_ov18_0224AE90: ; 0x0224AE90 - .incbin "incbin/overlay18_data.bin", 0x1730, 0x1754 - 0x1730 + .asciz "DWCi_MOV_WH_SYSSTATE_CONNECT_FAIL" + .space 0x2 .global Unk_ov18_0224AEB4 Unk_ov18_0224AEB4: ; 0x0224AEB4 - .incbin "incbin/overlay18_data.bin", 0x1754, 0x1778 - 0x1754 + .asciz "DWCi_MOV_WH_SYSSTATE_MEASURECHANNEL" .global Unk_ov18_0224AED8 Unk_ov18_0224AED8: ; 0x0224AED8 - .incbin "incbin/overlay18_data.bin", 0x1778, 0x17A0 - 0x1778 + .ascii "DWCi_MOV_WH_ERRCODE_PARENT_NOT_FOUND" + .space 0x4 .global Unk_ov18_0224AF00 Unk_ov18_0224AF00: ; 0x0224AF00 - .incbin "incbin/overlay18_data.bin", 0x17A0, 0x17C8 - 0x17A0 + .word Unk_ov18_0224AC54 + .word Unk_ov18_0224AC8C + .word Unk_ov18_0224ADC8 + .word Unk_ov18_0224ACE0 + .word Unk_ov18_0224AE08 + .word Unk_ov18_0224AE48 + .word Unk_ov18_0224AE28 + .word Unk_ov18_0224AEB4 + .word Unk_ov18_0224AE90 + .word Unk_ov18_0224AD34 .global Unk_ov18_0224AF28 Unk_ov18_0224AF28: ; 0x0224AF28 - .incbin "incbin/overlay18_data.bin", 0x17C8, 0x1824 - 0x17C8 + .word Unk_ov18_0224ACC4 + .word Unk_ov18_0224A934 + .word Unk_ov18_0224AC00 + .word Unk_ov18_0224AB28 + .word Unk_ov18_0224ADE8 + .word Unk_ov18_0224AC1C + .word Unk_ov18_0224AD18 + .word Unk_ov18_0224AA80 + .word Unk_ov18_0224AB74 + .word Unk_ov18_0224AC38 + .word Unk_ov18_0224AA08 + .word Unk_ov18_0224AAF8 + .word Unk_ov18_0224A988 + .word Unk_ov18_0224AA98 + .word Unk_ov18_0224AAC8 + .word Unk_ov18_0224A9F0 + .word Unk_ov18_0224ABC8 + .word Unk_ov18_0224ACA8 + .word Unk_ov18_0224ABE4 + .word Unk_ov18_0224ACFC + .word Unk_ov18_0224AB10 + .word Unk_ov18_0224AA68 + .word Unk_ov18_0224AB40 .global Unk_ov18_0224AF84 Unk_ov18_0224AF84: ; 0x0224AF84 - .incbin "incbin/overlay18_data.bin", 0x1824, 0x1880 - 0x1824 + .word Unk_ov18_0224A974 + .word Unk_ov18_0224A938 + .word Unk_ov18_0224A9D8 + .word Unk_ov18_0224AB58 + .word Unk_ov18_0224AA50 + .word Unk_ov18_0224AA38 + .word Unk_ov18_0224AB90 + .word Unk_ov18_0224A9C4 + .word Unk_ov18_0224AA20 + .word Unk_ov18_0224A960 + .word Unk_ov18_0224AD50 + .word Unk_ov18_0224A9B0 + .word Unk_ov18_0224AC70 + .word Unk_ov18_0224ADA8 + .word Unk_ov18_0224A94C + .word Unk_ov18_0224AAB0 + .word Unk_ov18_0224A99C + .word Unk_ov18_0224AD6C + .word Unk_ov18_0224ABAC + .word Unk_ov18_0224AAE0 + .word Unk_ov18_0224AE6C + .word Unk_ov18_0224AED8 + .word Unk_ov18_0224AD88 .global Unk_ov18_0224AFE0 Unk_ov18_0224AFE0: ; 0x0224AFE0 - .incbin "incbin/overlay18_data.bin", 0x1880, 0x1888 - 0x1880 + .ascii "%s -> " + .space 0x2 .global Unk_ov18_0224AFE8 Unk_ov18_0224AFE8: ; 0x0224AFE8 - .incbin "incbin/overlay18_data.bin", 0x1888, 0x188C - 0x1888 + .ascii "%s" + .byte 0xA + .space 0x1 .global Unk_ov18_0224AFEC Unk_ov18_0224AFEC: ; 0x0224AFEC - .incbin "incbin/overlay18_data.bin", 0x188C, 0x18B8 - 0x188C + .ascii "StartParent - new child (aid %x) connected" + .byte 0xA + .space 0x1 .global Unk_ov18_0224B018 Unk_ov18_0224B018: ; 0x0224B018 - .incbin "incbin/overlay18_data.bin", 0x18B8, 0x18E4 - 0x18B8 + .ascii "StartParent - child (aid %x) disconnected" + .byte 0xA + .space 0x2 .global Unk_ov18_0224B044 Unk_ov18_0224B044: ; 0x0224B044 - .incbin "incbin/overlay18_data.bin", 0x18E4, 0x1904 - 0x18E4 + .ascii "unknown indicate, state = %d" + .byte 0xA + .space 0x3 .global Unk_ov18_0224B064 Unk_ov18_0224B064: ; 0x0224B064 - .incbin "incbin/overlay18_data.bin", 0x1904, 0x1934 - 0x1904 + .ascii "DWCi_MOV_WH_StateInStartParentKeyShare failed" + .byte 0xA + .space 0x2 .global Unk_ov18_0224B094 Unk_ov18_0224B094: ; 0x0224B094 - .incbin "incbin/overlay18_data.bin", 0x1934, 0x195C - 0x1934 + .ascii "DWCi_MOV_WH_StateInEndParent failed" + .byte 0xA + .space 0x4 .global Unk_ov18_0224B0BC Unk_ov18_0224B0BC: ; 0x0224B0BC - .incbin "incbin/overlay18_data.bin", 0x195C, 0x1974 - 0x195C + .ascii "recv buffer size = %d" + .byte 0xA + .space 0x2 .global Unk_ov18_0224B0D4 Unk_ov18_0224B0D4: ; 0x0224B0D4 - .incbin "incbin/overlay18_data.bin", 0x1974, 0x198C - 0x1974 + .ascii "send buffer size = %d" + .byte 0xA + .space 0x2 .global Unk_ov18_0224B0EC Unk_ov18_0224B0EC: ; 0x0224B0EC - .incbin "incbin/overlay18_data.bin", 0x198C, 0x19A4 - 0x198C + .ascii "channel %d bratio = %x" + .byte 0xA + .space 0x1 .global Unk_ov18_0224B104 Unk_ov18_0224B104: ; 0x0224B104 - .incbin "incbin/overlay18_data.bin", 0x19A4, 0x19BC - 0x19A4 + .ascii "decided channel = %d" + .byte 0xA + .space 0x3 .global Unk_ov18_0224B11C Unk_ov18_0224B11C: ; 0x0224B11C - .incbin "incbin/overlay18_data.bin", 0x19BC, 0x19D8 - 0x19BC + .ascii "unknown connect mode %d" + .byte 0xA + .space 0x4 .global Unk_ov18_0224B138 Unk_ov18_0224B138: ; 0x0224B138 - .incbin "incbin/overlay18_data.bin", 0x19D8, 0x1A08 - 0x19D8 + .ascii "DWCi_MOV_WH_StepDataSharing - Warning No Child" + .byte 0xA + .space 0x1 .global Unk_ov18_0224B168 Unk_ov18_0224B168: ; 0x0224B168 - .incbin "incbin/overlay18_data.bin", 0x1A08, 0x1A3C - 0x1A08 + .ascii "DWCi_MOV_WH_StepDataSharing - Warning No DataSet" + .byte 0xA + .space 0x3 .global Unk_ov18_0224B19C Unk_ov18_0224B19C: ; 0x0224B19C - .incbin "incbin/overlay18_data.bin", 0x1A3C, 0x1A60 - 0x1A3C + .ascii "already DWCi_MOV_WH_SYSSTATE_IDLE" + .byte 0xA + .space 0x2 .global Unk_ov18_0224B1C0 Unk_ov18_0224B1C0: ; 0x0224B1C0 - .incbin "incbin/overlay18_data.bin", 0x1A60, 0x22 + .ascii "DWCi_MOV_WH_Finalize, state = %d" + .byte 0xA + .space 0x1 diff --git a/lib/NitroDWC/asm/util/effect.s b/lib/NitroDWC/asm/util/effect.s index cf49cad38e..71853c03e3 100644 --- a/lib/NitroDWC/asm/util/effect.s +++ b/lib/NitroDWC/asm/util/effect.s @@ -247,15 +247,15 @@ ov18_022443EC: ; 0x022443EC .global Unk_ov18_0224971C Unk_ov18_0224971C: ; 0x0224971C - .incbin "incbin/overlay18_rodata.bin", 0x32E8, 0x32EC - 0x32E8 + .byte 0x0, 0xF0, 0x0, 0x10 .global Unk_ov18_02249720 Unk_ov18_02249720: ; 0x02249720 - .incbin "incbin/overlay18_rodata.bin", 0x32EC, 0x32F0 - 0x32EC + .byte 0x11, 0x10, 0x01, 0x0 .global Unk_ov18_02249724 Unk_ov18_02249724: ; 0x02249724 - .incbin "incbin/overlay18_rodata.bin", 0x32F0, 0x4 + .byte 0xF0, 0x0, 0x10, 0x0 diff --git a/lib/NitroDWC/asm/util/focus.s b/lib/NitroDWC/asm/util/focus.s index b89c2c9cff..d6b7e3914d 100644 --- a/lib/NitroDWC/asm/util/focus.s +++ b/lib/NitroDWC/asm/util/focus.s @@ -177,7 +177,7 @@ _0222BB30: .word Unk_ov18_02253290 .global Unk_ov18_02248D14 Unk_ov18_02248D14: ; 0x02248D14 - .incbin "incbin/overlay18_rodata.bin", 0x28E0, 0x8 + .byte 0xA, 0xB, 0x4, 0x5, 0x2, 0x3, 0xC, 0xD diff --git a/lib/NitroDWC/asm/util/font.s b/lib/NitroDWC/asm/util/font.s index df4e92be2e..d3251b665a 100644 --- a/lib/NitroDWC/asm/util/font.s +++ b/lib/NitroDWC/asm/util/font.s @@ -621,12 +621,11 @@ _02244C28: .word Unk_ov18_022533C0 .global Unk_ov18_02249728 Unk_ov18_02249728: ; 0x02249728 - .incbin "incbin/overlay18_rodata.bin", 0x32F4, 0x32F8 - 0x32F4 + .byte 0x0, 0x0, 0x80, 0x1 .global Unk_ov18_0224972C Unk_ov18_0224972C: ; 0x0224972C - .incbin "incbin/overlay18_rodata.bin", 0x32F8, 0x8 - + .short 0x20, 0x18, 0x20, 0xC .data @@ -634,23 +633,25 @@ Unk_ov18_0224972C: ; 0x0224972C .global Unk_ov18_0224B210 Unk_ov18_0224B210: ; 0x0224B210 - .incbin "incbin/overlay18_data.bin", 0x1AB0, 0x1AB8 - 0x1AB0 + .word Unk_ov18_0224B230 + .word Unk_ov18_0224B220 .global Unk_ov18_0224B218 Unk_ov18_0224B218: ; 0x0224B218 - .incbin "incbin/overlay18_data.bin", 0x1AB8, 0x1AC0 - 0x1AB8 + .word Unk_ov18_0224B240 + .word Unk_ov18_0224B220 .global Unk_ov18_0224B220 Unk_ov18_0224B220: ; 0x0224B220 - .incbin "incbin/overlay18_data.bin", 0x1AC0, 0x1AD0 - 0x1AC0 + .asciz "msg/lc_s.NFTR.l" .global Unk_ov18_0224B230 Unk_ov18_0224B230: ; 0x0224B230 - .incbin "incbin/overlay18_data.bin", 0x1AD0, 0x1AE0 - 0x1AD0 + .asciz "msg/kc_m.NFTR.l" .global Unk_ov18_0224B240 Unk_ov18_0224B240: ; 0x0224B240 - .incbin "incbin/overlay18_data.bin", 0x1AE0, 0x10 + .asciz "msg/lc_m.NFTR.l" diff --git a/lib/NitroDWC/asm/util/foundation.s b/lib/NitroDWC/asm/util/foundation.s index f6fc837e04..7969d342ae 100644 --- a/lib/NitroDWC/asm/util/foundation.s +++ b/lib/NitroDWC/asm/util/foundation.s @@ -44,5 +44,6 @@ ov18_02244C50: ; 0x02244C50 .global Unk_ov18_02249734 Unk_ov18_02249734: ; 0x02249734 - .incbin "incbin/overlay18_rodata.bin", 0x3300, 0x8 + .word 0x0 + .word 0xC00100 diff --git a/lib/NitroDWC/asm/util/headline.s b/lib/NitroDWC/asm/util/headline.s index 4d1832e819..a516ca1e73 100644 --- a/lib/NitroDWC/asm/util/headline.s +++ b/lib/NitroDWC/asm/util/headline.s @@ -127,91 +127,128 @@ _0222BC88: .word Unk_ov18_02253294 .global Unk_ov18_02249914 Unk_ov18_02249914: ; 0x02249914 - .incbin "incbin/overlay18_data.bin", 0x1B4, 0x1C8 - 0x1B4 + .ascii "char/jb2HlAp.nsc.l" + .space 0x2 .global Unk_ov18_02249928 Unk_ov18_02249928: ; 0x02249928 - .incbin "incbin/overlay18_data.bin", 0x1C8, 0x1DC - 0x1C8 + .ascii "char/jb4HlIp.nsc.l" + .space 0x2 .global Unk_ov18_0224993C Unk_ov18_0224993C: ; 0x0224993C - .incbin "incbin/overlay18_data.bin", 0x1DC, 0x1F0 - 0x1DC + .asciz "char/jb4HlWep.nsc.l" .global Unk_ov18_02249950 Unk_ov18_02249950: ; 0x02249950 - .incbin "incbin/overlay18_data.bin", 0x1F0, 0x204 - 0x1F0 + .asciz "char/jb4HlUsb.nsc.l" .global Unk_ov18_02249964 Unk_ov18_02249964: ; 0x02249964 - .incbin "incbin/overlay18_data.bin", 0x204, 0x21C - 0x204 + .ascii "char/jb4HlDns1.nsc.l" + .space 0x4 .global Unk_ov18_0224997C Unk_ov18_0224997C: ; 0x0224997C - .incbin "incbin/overlay18_data.bin", 0x21C, 0x234 - 0x21C + .ascii "char/jb4HlSsid.nsc.l" + .space 0x4 .global Unk_ov18_02249994 Unk_ov18_02249994: ; 0x02249994 - .incbin "incbin/overlay18_data.bin", 0x234, 0x24C - 0x234 + .ascii "char/jb5HlMove.nsc.l" + .space 0x4 .global Unk_ov18_022499AC Unk_ov18_022499AC: ; 0x022499AC - .incbin "incbin/overlay18_data.bin", 0x24C, 0x264 - 0x24C + .ascii "char/jb2HlWiFi.nsc.l" + .space 0x4 .global Unk_ov18_022499C4 Unk_ov18_022499C4: ; 0x022499C4 - .incbin "incbin/overlay18_data.bin", 0x264, 0x27C - 0x264 + .ascii "char/jb5HlInfo.nsc.l" + .space 0x4 .global Unk_ov18_022499DC Unk_ov18_022499DC: ; 0x022499DC - .incbin "incbin/overlay18_data.bin", 0x27C, 0x294 - 0x27C + .ascii "char/jb4HlMask.nsc.l" + .space 0x4 .global Unk_ov18_022499F4 Unk_ov18_022499F4: ; 0x022499F4 - .incbin "incbin/overlay18_data.bin", 0x294, 0x2AC - 0x294 + .ascii "char/jb4HlSet2.nsc.l" + .space 0x4 .global Unk_ov18_02249A0C Unk_ov18_02249A0C: ; 0x02249A0C - .incbin "incbin/overlay18_data.bin", 0x2AC, 0x2C4 - 0x2AC + .ascii "char/jb4HlDns0.nsc.l" + .space 0x4 .global Unk_ov18_02249A24 Unk_ov18_02249A24: ; 0x02249A24 - .incbin "incbin/overlay18_data.bin", 0x2C4, 0x2DC - 0x2C4 + .ascii "char/jb4HlSet3.nsc.l" + .space 0x4 .global Unk_ov18_02249A3C Unk_ov18_02249A3C: ; 0x02249A3C - .incbin "incbin/overlay18_data.bin", 0x2DC, 0x2F4 - 0x2DC + .ascii "char/jb4HlSet1.nsc.l" + .space 0x4 .global Unk_ov18_02249A54 Unk_ov18_02249A54: ; 0x02249A54 - .incbin "incbin/overlay18_data.bin", 0x2F4, 0x30C - 0x2F4 + .asciz "char/jb3HlList1.nsc.l" + .space 0x2 .global Unk_ov18_02249A6C Unk_ov18_02249A6C: ; 0x02249A6C - .incbin "incbin/overlay18_data.bin", 0x30C, 0x324 - 0x30C + .asciz "char/jb3HlList2.nsc.l" + .space 0x2 .global Unk_ov18_02249A84 Unk_ov18_02249A84: ; 0x02249A84 - .incbin "incbin/overlay18_data.bin", 0x324, 0x33C - 0x324 + .asciz "char/jb3HlList3.nsc.l" + .space 0x2 .global Unk_ov18_02249A9C Unk_ov18_02249A9C: ; 0x02249A9C - .incbin "incbin/overlay18_data.bin", 0x33C, 0x354 - 0x33C + .asciz "char/jb5HlErase.nsc.l" + .space 0x2 .global Unk_ov18_02249AB4 Unk_ov18_02249AB4: ; 0x02249AB4 - .incbin "incbin/overlay18_data.bin", 0x354, 0x36C - 0x354 + .ascii "char/jb5HlOption.nsc.l" + .space 0x2 .global Unk_ov18_02249ACC Unk_ov18_02249ACC: ; 0x02249ACC - .incbin "incbin/overlay18_data.bin", 0x36C, 0x384 - 0x36C + .asciz "char/jb4HlGateway.nsc.l" .global Unk_ov18_02249AE4 Unk_ov18_02249AE4: ; 0x02249AE4 - .incbin "incbin/overlay18_data.bin", 0x384, 0x3D4 - 0x384 + .word Unk_ov18_022499AC + .word Unk_ov18_02249914 + .word Unk_ov18_02249A54 + .word Unk_ov18_02249A6C + .word Unk_ov18_02249A84 + .word Unk_ov18_02249A3C + .word Unk_ov18_022499F4 + .word Unk_ov18_02249A24 + .word Unk_ov18_02249950 + .word Unk_ov18_0224997C + .word Unk_ov18_0224993C + .word Unk_ov18_02249928 + .word Unk_ov18_022499DC + .word Unk_ov18_02249ACC + .word Unk_ov18_02249A0C + .word Unk_ov18_02249964 + .word Unk_ov18_02249AB4 + .word Unk_ov18_022499C4 + .word Unk_ov18_02249A9C + .word Unk_ov18_02249994 .global Unk_ov18_02249B34 Unk_ov18_02249B34: ; 0x02249B34 - .incbin "incbin/overlay18_data.bin", 0x3D4, 0x12 + .asciz "char/jbBgHl.ncg.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/icon.s b/lib/NitroDWC/asm/util/icon.s index 1d193da59c..a782a4fb86 100644 --- a/lib/NitroDWC/asm/util/icon.s +++ b/lib/NitroDWC/asm/util/icon.s @@ -132,13 +132,13 @@ _0222BE2C: .word 0xFE00FF00 .global Unk_ov18_02248D1C Unk_ov18_02248D1C: ; 0x02248D1C - .incbin "incbin/overlay18_rodata.bin", 0x28E8, 0x28EC - 0x28E8 + .short 0xE5 + .short 0x26 .global Unk_ov18_02248D20 Unk_ov18_02248D20: ; 0x02248D20 - .incbin "incbin/overlay18_rodata.bin", 0x28EC, 0x8 - - + .byte 0x18, 0x17, 0x16, 0x15 + .byte 0x5F, 0x5E, 0x5D, 0x5C .bss diff --git a/asm/incbin/overlay18_rodata.bin b/lib/NitroDWC/asm/util/incbin/atermset.bin similarity index 75% rename from asm/incbin/overlay18_rodata.bin rename to lib/NitroDWC/asm/util/incbin/atermset.bin index 105607a09b..c1b91dbcb6 100644 Binary files a/asm/incbin/overlay18_rodata.bin and b/lib/NitroDWC/asm/util/incbin/atermset.bin differ diff --git a/lib/NitroDWC/asm/util/incbin/button.bin b/lib/NitroDWC/asm/util/incbin/button.bin new file mode 100644 index 0000000000..0656a7de72 Binary files /dev/null and b/lib/NitroDWC/asm/util/incbin/button.bin differ diff --git a/lib/NitroDWC/asm/util/incbin/common.bin b/lib/NitroDWC/asm/util/incbin/common.bin new file mode 100644 index 0000000000..c092eb7615 Binary files /dev/null and b/lib/NitroDWC/asm/util/incbin/common.bin differ diff --git a/lib/NitroDWC/asm/util/incbin/keyboard.bin b/lib/NitroDWC/asm/util/incbin/keyboard.bin new file mode 100644 index 0000000000..e08aba3d91 Binary files /dev/null and b/lib/NitroDWC/asm/util/incbin/keyboard.bin differ diff --git a/lib/NitroDWC/asm/util/incbin/keyboard10.bin b/lib/NitroDWC/asm/util/incbin/keyboard10.bin new file mode 100644 index 0000000000..169fb3cd3d Binary files /dev/null and b/lib/NitroDWC/asm/util/incbin/keyboard10.bin differ diff --git a/lib/NitroDWC/asm/util/include/scenesetedit32.inc b/lib/NitroDWC/asm/util/include/scenesetedit32.inc index ea5dd8f97e..34ed651eec 100644 --- a/lib/NitroDWC/asm/util/include/scenesetedit32.inc +++ b/lib/NitroDWC/asm/util/include/scenesetedit32.inc @@ -36,6 +36,8 @@ .public ov18_022358B0 .public ov18_02236BE0 .public ov18_0223C21C +.public ov18_0223DE08 +.public ov18_0223DE38 .public ov18_0223E068 .public ov18_0223E994 .public ov18_0223FC48 diff --git a/lib/NitroDWC/asm/util/include/sceneseteditaddress.inc b/lib/NitroDWC/asm/util/include/sceneseteditaddress.inc index 813fbe70d7..99bcd427d3 100644 --- a/lib/NitroDWC/asm/util/include/sceneseteditaddress.inc +++ b/lib/NitroDWC/asm/util/include/sceneseteditaddress.inc @@ -42,6 +42,16 @@ .public ov18_0223654C .public ov18_02236578 .public ov18_02236BE0 +.public ov18_0223DFD0 +.public ov18_0223DFEC +.public ov18_0223E008 +.public ov18_0223E028 +.public ov18_0223E048 +.public ov18_0223E08C +.public ov18_0223E0CC +.public ov18_0223E10C +.public ov18_0223E150 +.public ov18_0223E194 .public ov18_0223E834 .public ov18_0223E994 .public ov18_0223FC48 diff --git a/lib/NitroDWC/asm/util/keyboard.s b/lib/NitroDWC/asm/util/keyboard.s index e70cff8435..b4ac546719 100644 --- a/lib/NitroDWC/asm/util/keyboard.s +++ b/lib/NitroDWC/asm/util/keyboard.s @@ -2127,75 +2127,75 @@ _0222DAD8: .word Unk_ov18_0225329C .global Unk_ov18_02248D28 Unk_ov18_02248D28: ; 0x02248D28 - .incbin "incbin/overlay18_rodata.bin", 0x28F4, 0x28F8 - 0x28F4 + .incbin "incbin/keyboard.bin", 0x0, 0x4 .global Unk_ov18_02248D2C Unk_ov18_02248D2C: ; 0x02248D2C - .incbin "incbin/overlay18_rodata.bin", 0x28F8, 0x28FC - 0x28F8 + .incbin "incbin/keyboard.bin", 0x4, 0x8 - 0x4 .global Unk_ov18_02248D30 Unk_ov18_02248D30: ; 0x02248D30 - .incbin "incbin/overlay18_rodata.bin", 0x28FC, 0x2900 - 0x28FC + .incbin "incbin/keyboard.bin", 0x8, 0xC - 0x8 .global Unk_ov18_02248D34 Unk_ov18_02248D34: ; 0x02248D34 - .incbin "incbin/overlay18_rodata.bin", 0x2900, 0x2904 - 0x2900 + .incbin "incbin/keyboard.bin", 0xC, 0x10 - 0xC .global Unk_ov18_02248D38 Unk_ov18_02248D38: ; 0x02248D38 - .incbin "incbin/overlay18_rodata.bin", 0x2904, 0x2908 - 0x2904 + .incbin "incbin/keyboard.bin", 0x10, 0x14 - 0x10 .global Unk_ov18_02248D3C Unk_ov18_02248D3C: ; 0x02248D3C - .incbin "incbin/overlay18_rodata.bin", 0x2908, 0x290C - 0x2908 + .incbin "incbin/keyboard.bin", 0x14, 0x18 - 0x14 .global Unk_ov18_02248D40 Unk_ov18_02248D40: ; 0x02248D40 - .incbin "incbin/overlay18_rodata.bin", 0x290C, 0x2910 - 0x290C + .incbin "incbin/keyboard.bin", 0x18, 0x1C - 0x18 .global Unk_ov18_02248D44 Unk_ov18_02248D44: ; 0x02248D44 - .incbin "incbin/overlay18_rodata.bin", 0x2910, 0x2914 - 0x2910 + .incbin "incbin/keyboard.bin", 0x1C, 0x20 - 0x1C .global Unk_ov18_02248D48 Unk_ov18_02248D48: ; 0x02248D48 - .incbin "incbin/overlay18_rodata.bin", 0x2914, 0x2919 - 0x2914 + .incbin "incbin/keyboard.bin", 0x20, 0x21 - 0x20 .global Unk_ov18_02248D4D Unk_ov18_02248D4D: ; 0x02248D4D - .incbin "incbin/overlay18_rodata.bin", 0x2919, 0x291E - 0x2919 + .incbin "incbin/keyboard.bin", 0x21, 0x2A - 0x21 .global Unk_ov18_02248D52 Unk_ov18_02248D52: ; 0x02248D52 - .incbin "incbin/overlay18_rodata.bin", 0x291E, 0x2924 - 0x291E + .incbin "incbin/keyboard.bin", 0x2A, 0x30 - 0x2A .global Unk_ov18_02248D58 Unk_ov18_02248D58: ; 0x02248D58 - .incbin "incbin/overlay18_rodata.bin", 0x2924, 0x292C - 0x2924 + .incbin "incbin/keyboard.bin", 0x30, 0x38 - 0x30 .global Unk_ov18_02248D60 Unk_ov18_02248D60: ; 0x02248D60 - .incbin "incbin/overlay18_rodata.bin", 0x292C, 0x293C - 0x292C + .incbin "incbin/keyboard.bin", 0x38, 0x48 - 0x38 .global Unk_ov18_02248D70 Unk_ov18_02248D70: ; 0x02248D70 - .incbin "incbin/overlay18_rodata.bin", 0x293C, 0x294C - 0x293C + .incbin "incbin/keyboard.bin", 0x48, 0x58 - 0x48 .global Unk_ov18_02248D80 Unk_ov18_02248D80: ; 0x02248D80 - .incbin "incbin/overlay18_rodata.bin", 0x294C, 0x2A08 - 0x294C + .incbin "incbin/keyboard.bin", 0x58, 0x114 - 0x58 .global Unk_ov18_02248E3C Unk_ov18_02248E3C: ; 0x02248E3C - .incbin "incbin/overlay18_rodata.bin", 0x2A08, 0x2ADC - 0x2A08 + .incbin "incbin/keyboard.bin", 0x114, 0x1E8 - 0x114 .global Unk_ov18_02248F10 Unk_ov18_02248F10: ; 0x02248F10 - .incbin "incbin/overlay18_rodata.bin", 0x2ADC, 0x2BB0 - 0x2ADC + .incbin "incbin/keyboard.bin", 0x1E8, 0x2BC - 0x1E8 .global Unk_ov18_02248FE4 Unk_ov18_02248FE4: ; 0x02248FE4 - .incbin "incbin/overlay18_rodata.bin", 0x2BB0, 0x5 + .incbin "incbin/keyboard.bin", 0x2BC, 0x8 @@ -2204,40 +2204,335 @@ Unk_ov18_02248FE4: ; 0x02248FE4 .global Unk_ov18_02249B48 Unk_ov18_02249B48: ; 0x02249B48 - .incbin "incbin/overlay18_data.bin", 0x3E8, 0x3F4 - 0x3E8 + .word Unk_ov18_02249CF8 + .word Unk_ov18_02249C98 + .word Unk_ov18_02249CC8 .global Unk_ov18_02249B54 Unk_ov18_02249B54: ; 0x02249B54 - .incbin "incbin/overlay18_data.bin", 0x3F4, 0x400 - 0x3F4 + .word Unk_ov18_02249B70 + .word Unk_ov18_02249BD2 + .word Unk_ov18_02249C34 .global Unk_ov18_02249B60 Unk_ov18_02249B60: ; 0x02249B60 - .incbin "incbin/overlay18_data.bin", 0x400, 0x410 - 0x400 + .space 0xC + .word 0x2 .global Unk_ov18_02249B70 Unk_ov18_02249B70: ; 0x02249B70 - .incbin "incbin/overlay18_data.bin", 0x410, 0x472 - 0x410 + .ascii "1" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "3" + .space 0x1 + .ascii "4" + .space 0x1 + .ascii "5" + .space 0x1 + .ascii "6" + .space 0x1 + .ascii "7" + .space 0x1 + .ascii "8" + .space 0x1 + .ascii "9" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "=" + .space 0x1 + .ascii "q" + .space 0x1 + .ascii "w" + .space 0x1 + .ascii "e" + .space 0x1 + .ascii "r" + .space 0x1 + .ascii "t" + .space 0x1 + .ascii "y" + .space 0x1 + .ascii "u" + .space 0x1 + .ascii "i" + .space 0x1 + .ascii "o" + .space 0x1 + .ascii "p" + .space 0x1 + .ascii "[" + .space 0x1 + .ascii "]" + .space 0x1 + .ascii "a" + .space 0x1 + .ascii "s" + .space 0x1 + .ascii "d" + .space 0x1 + .ascii "f" + .space 0x1 + .ascii "g" + .space 0x1 + .ascii "h" + .space 0x1 + .ascii "j" + .space 0x1 + .ascii "k" + .space 0x1 + .ascii "l" + .space 0x1 + .ascii ";" + .space 0x1 + .ascii "'" + .space 0x1 + .ascii "`" + .space 0x1 + .ascii "z" + .space 0x1 + .ascii "x" + .space 0x1 + .ascii "c" + .space 0x1 + .ascii "v" + .space 0x1 + .ascii "b" + .space 0x1 + .ascii "n" + .space 0x1 + .ascii "m" + .space 0x1 + .ascii "," + .space 0x1 + .ascii "." + .space 0x1 + .ascii "/" + .space 0x1 + .byte 0x5C + .space 0x1 + .ascii " " + .space 0x3 .global Unk_ov18_02249BD2 Unk_ov18_02249BD2: ; 0x02249BD2 - .incbin "incbin/overlay18_data.bin", 0x472, 0x4D4 - 0x472 + .ascii "!" + .space 0x1 + .ascii "@" + .space 0x1 + .ascii "#" + .space 0x1 + .ascii "$" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "^" + .space 0x1 + .ascii "&" + .space 0x1 + .ascii "*" + .space 0x1 + .ascii "(" + .space 0x1 + .ascii ")" + .space 0x1 + .ascii "_" + .space 0x1 + .ascii "+" + .space 0x1 + .ascii "Q" + .space 0x1 + .ascii "W" + .space 0x1 + .ascii "E" + .space 0x1 + .ascii "R" + .space 0x1 + .ascii "T" + .space 0x1 + .ascii "Y" + .space 0x1 + .ascii "U" + .space 0x1 + .ascii "I" + .space 0x1 + .ascii "O" + .space 0x1 + .ascii "P" + .space 0x1 + .ascii "{" + .space 0x1 + .ascii "}" + .space 0x1 + .ascii "A" + .space 0x1 + .ascii "S" + .space 0x1 + .ascii "D" + .space 0x1 + .ascii "F" + .space 0x1 + .ascii "G" + .space 0x1 + .ascii "H" + .space 0x1 + .ascii "J" + .space 0x1 + .ascii "K" + .space 0x1 + .ascii "L" + .space 0x1 + .ascii ":" + .space 0x1 + .byte 0x22 + .space 0x1 + .ascii "~" + .space 0x1 + .ascii "Z" + .space 0x1 + .ascii "X" + .space 0x1 + .ascii "C" + .space 0x1 + .ascii "V" + .space 0x1 + .ascii "B" + .space 0x1 + .ascii "N" + .space 0x1 + .ascii "M" + .space 0x1 + .ascii "<" + .space 0x1 + .ascii ">" + .space 0x1 + .ascii "?" + .space 0x1 + .ascii "|" + .space 0x1 + .ascii " " + .space 0x3 .global Unk_ov18_02249C34 Unk_ov18_02249C34: ; 0x02249C34 - .incbin "incbin/overlay18_data.bin", 0x4D4, 0x538 - 0x4D4 + .ascii "1" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "3" + .space 0x1 + .ascii "4" + .space 0x1 + .ascii "5" + .space 0x1 + .ascii "6" + .space 0x1 + .ascii "7" + .space 0x1 + .ascii "8" + .space 0x1 + .ascii "9" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "=" + .space 0x1 + .ascii "Q" + .space 0x1 + .ascii "W" + .space 0x1 + .ascii "E" + .space 0x1 + .ascii "R" + .space 0x1 + .ascii "T" + .space 0x1 + .ascii "Y" + .space 0x1 + .ascii "U" + .space 0x1 + .ascii "I" + .space 0x1 + .ascii "O" + .space 0x1 + .ascii "P" + .space 0x1 + .ascii "[" + .space 0x1 + .ascii "]" + .space 0x1 + .ascii "A" + .space 0x1 + .ascii "S" + .space 0x1 + .ascii "D" + .space 0x1 + .ascii "F" + .space 0x1 + .ascii "G" + .space 0x1 + .ascii "H" + .space 0x1 + .ascii "J" + .space 0x1 + .ascii "K" + .space 0x1 + .ascii "L" + .space 0x1 + .ascii ";" + .space 0x1 + .ascii "'" + .space 0x1 + .ascii "`" + .space 0x1 + .ascii "Z" + .space 0x1 + .ascii "X" + .space 0x1 + .ascii "C" + .space 0x1 + .ascii "V" + .space 0x1 + .ascii "B" + .space 0x1 + .ascii "N" + .space 0x1 + .ascii "M" + .space 0x1 + .ascii "," + .space 0x1 + .ascii "." + .space 0x1 + .ascii "/" + .space 0x1 + .byte 0x5C + .space 0x1 + .ascii " " + .space 0x5 .global Unk_ov18_02249C98 Unk_ov18_02249C98: ; 0x02249C98 - .incbin "incbin/overlay18_data.bin", 0x538, 0x568 - 0x538 + .ascii "!@#$%^&*()_+QWERTYUIOP{}ASDFGHJKL:" + .byte 0x22 + .asciz "~ZXCVBNM<>?|" .global Unk_ov18_02249CC8 Unk_ov18_02249CC8: ; 0x02249CC8 - .incbin "incbin/overlay18_data.bin", 0x568, 0x598 - 0x568 + .ascii "1234567890-=QWERTYUIOP[]ASDFGHJKL;'`ZXCVBNM,./" + .byte 0x5C + .space 0x1 .global Unk_ov18_02249CF8 Unk_ov18_02249CF8: ; 0x02249CF8 - .incbin "incbin/overlay18_data.bin", 0x598, 0x30 - + .ascii "1234567890-=qwertyuiop[]asdfghjkl;'`zxcvbnm,./" + .byte 0x5C + .space 0x1 .bss diff --git a/lib/NitroDWC/asm/util/keyboard10.s b/lib/NitroDWC/asm/util/keyboard10.s index 9c9f6ad5d9..e653502676 100644 --- a/lib/NitroDWC/asm/util/keyboard10.s +++ b/lib/NitroDWC/asm/util/keyboard10.s @@ -1578,87 +1578,87 @@ _0222F02C: .word Unk_ov18_022532A0 .global Unk_ov18_02248FEC Unk_ov18_02248FEC: ; 0x02248FEC - .incbin "incbin/overlay18_rodata.bin", 0x2BB8, 0x2BBC - 0x2BB8 + .incbin "incbin/keyboard10.bin", 0x0, 0x4 .global Unk_ov18_02248FF0 Unk_ov18_02248FF0: ; 0x02248FF0 - .incbin "incbin/overlay18_rodata.bin", 0x2BBC, 0x2BC0 - 0x2BBC + .incbin "incbin/keyboard10.bin", 0x4, 0x8 - 0x4 .global Unk_ov18_02248FF4 Unk_ov18_02248FF4: ; 0x02248FF4 - .incbin "incbin/overlay18_rodata.bin", 0x2BC0, 0x2BC4 - 0x2BC0 + .incbin "incbin/keyboard10.bin", 0x8, 0xC - 0x8 .global Unk_ov18_02248FF8 Unk_ov18_02248FF8: ; 0x02248FF8 - .incbin "incbin/overlay18_rodata.bin", 0x2BC4, 0x2BC8 - 0x2BC4 + .incbin "incbin/keyboard10.bin", 0xC, 0x10 - 0xC .global Unk_ov18_02248FFC Unk_ov18_02248FFC: ; 0x02248FFC - .incbin "incbin/overlay18_rodata.bin", 0x2BC8, 0x2BCC - 0x2BC8 + .incbin "incbin/keyboard10.bin", 0x10, 0x14 - 0x10 .global Unk_ov18_02249000 Unk_ov18_02249000: ; 0x02249000 - .incbin "incbin/overlay18_rodata.bin", 0x2BCC, 0x2BD0 - 0x2BCC + .incbin "incbin/keyboard10.bin", 0x14, 0x18 - 0x14 .global Unk_ov18_02249004 Unk_ov18_02249004: ; 0x02249004 - .incbin "incbin/overlay18_rodata.bin", 0x2BD0, 0x2BD4 - 0x2BD0 + .incbin "incbin/keyboard10.bin", 0x18, 0x1C - 0x18 .global Unk_ov18_02249008 Unk_ov18_02249008: ; 0x02249008 - .incbin "incbin/overlay18_rodata.bin", 0x2BD4, 0x2BD8 - 0x2BD4 + .incbin "incbin/keyboard10.bin", 0x1C, 0x20 - 0x1C .global Unk_ov18_0224900C Unk_ov18_0224900C: ; 0x0224900C - .incbin "incbin/overlay18_rodata.bin", 0x2BD8, 0x2BDC - 0x2BD8 + .incbin "incbin/keyboard10.bin", 0x20, 0x24 - 0x20 .global Unk_ov18_02249010 Unk_ov18_02249010: ; 0x02249010 - .incbin "incbin/overlay18_rodata.bin", 0x2BDC, 0x2BE0 - 0x2BDC + .incbin "incbin/keyboard10.bin", 0x24, 0x28 - 0x24 .global Unk_ov18_02249014 Unk_ov18_02249014: ; 0x02249014 - .incbin "incbin/overlay18_rodata.bin", 0x2BE0, 0x2BE5 - 0x2BE0 + .incbin "incbin/keyboard10.bin", 0x28, 0x2D - 0x28 .global Unk_ov18_02249019 Unk_ov18_02249019: ; 0x02249019 - .incbin "incbin/overlay18_rodata.bin", 0x2BE5, 0x2BEA - 0x2BE5 + .incbin "incbin/keyboard10.bin", 0x2D, 0x32 - 0x2D .global Unk_ov18_0224901E Unk_ov18_0224901E: ; 0x0224901E - .incbin "incbin/overlay18_rodata.bin", 0x2BEA, 0x2BF0 - 0x2BEA + .incbin "incbin/keyboard10.bin", 0x32, 0x38 - 0x32 .global Unk_ov18_02249024 Unk_ov18_02249024: ; 0x02249024 - .incbin "incbin/overlay18_rodata.bin", 0x2BF0, 0x2BF8 - 0x2BF0 + .incbin "incbin/keyboard10.bin", 0x38, 0x40 - 0x38 .global Unk_ov18_0224902C Unk_ov18_0224902C: ; 0x0224902C - .incbin "incbin/overlay18_rodata.bin", 0x2BF8, 0x2C00 - 0x2BF8 + .incbin "incbin/keyboard10.bin", 0x40, 0x48 - 0x40 .global Unk_ov18_02249034 Unk_ov18_02249034: ; 0x02249034 - .incbin "incbin/overlay18_rodata.bin", 0x2C00, 0x2C08 - 0x2C00 + .incbin "incbin/keyboard10.bin", 0x48, 0x50 - 0x48 .global Unk_ov18_0224903C Unk_ov18_0224903C: ; 0x0224903C - .incbin "incbin/overlay18_rodata.bin", 0x2C08, 0x2C22 - 0x2C08 + .incbin "incbin/keyboard10.bin", 0x50, 0x6A - 0x50 .global Unk_ov18_02249056 Unk_ov18_02249056: ; 0x02249056 - .incbin "incbin/overlay18_rodata.bin", 0x2C22, 0x2C4A - 0x2C22 + .incbin "incbin/keyboard10.bin", 0x6A, 0x92 - 0x6A .global Unk_ov18_0224907E Unk_ov18_0224907E: ; 0x0224907E - .incbin "incbin/overlay18_rodata.bin", 0x2C4A, 0x2C82 - 0x2C4A + .incbin "incbin/keyboard10.bin", 0x92, 0xCA - 0x92 .global Unk_ov18_022490B6 Unk_ov18_022490B6: ; 0x022490B6 - .incbin "incbin/overlay18_rodata.bin", 0x2C82, 0x2CBC - 0x2C82 + .incbin "incbin/keyboard10.bin", 0xCA, 0x104 - 0xCA .global Unk_ov18_022490F0 Unk_ov18_022490F0: ; 0x022490F0 - .incbin "incbin/overlay18_rodata.bin", 0x2CBC, 0xB + .incbin "incbin/keyboard10.bin", 0x104, 0xC diff --git a/lib/NitroDWC/asm/util/libaoss.s b/lib/NitroDWC/asm/util/libaoss.s index 909b65089b..5d222bf456 100644 --- a/lib/NitroDWC/asm/util/libaoss.s +++ b/lib/NitroDWC/asm/util/libaoss.s @@ -160,7 +160,7 @@ _0222F208: .word ov18_022450D0 .global Unk_ov18_022490FC Unk_ov18_022490FC: ; 0x022490FC - .incbin "incbin/overlay18_rodata.bin", 0x2CC8, 0xC + .asciz "NINTENDO-DS" diff --git a/lib/NitroDWC/asm/util/move.s b/lib/NitroDWC/asm/util/move.s index 2c8ac384f2..2e41ae3a90 100644 --- a/lib/NitroDWC/asm/util/move.s +++ b/lib/NitroDWC/asm/util/move.s @@ -336,19 +336,26 @@ _0222FD38: .word Unk_ov18_022532D0 .global Unk_ov18_02249D28 Unk_ov18_02249D28: ; 0x02249D28 - .incbin "incbin/overlay18_data.bin", 0x5C8, 0x5DC - 0x5C8 + .asciz "dwc:/move/child.srl" .global Unk_ov18_02249D3C Unk_ov18_02249D3C: ; 0x02249D3C - .incbin "incbin/overlay18_data.bin", 0x5DC, 0x5F4 - 0x5DC + .ascii "dwc:/move/banner.plt" + .space 0x4 .global Unk_ov18_02249D54 Unk_ov18_02249D54: ; 0x02249D54 - .incbin "incbin/overlay18_data.bin", 0x5F4, 0x60C - 0x5F4 + .asciz "dwc:/move/banner.char" + .space 0x2 .global Unk_ov18_02249D6C Unk_ov18_02249D6C: ; 0x02249D6C - .incbin "incbin/overlay18_data.bin", 0x60C, 0x1C + .word Unk_ov18_02249D28 + .space 0x8 + .word Unk_ov18_02249D54 + .word Unk_ov18_02249D3C + .word 0x159 + .space 0x4 diff --git a/lib/NitroDWC/asm/util/sceneinit.s b/lib/NitroDWC/asm/util/sceneinit.s index 4397bcc942..3888754aa3 100644 --- a/lib/NitroDWC/asm/util/sceneinit.s +++ b/lib/NitroDWC/asm/util/sceneinit.s @@ -197,87 +197,111 @@ _02230224: .word ov18_0223A6B4 .global Unk_ov18_02249D88 Unk_ov18_02249D88: ; 0x02249D88 - .incbin "incbin/overlay18_data.bin", 0x628, 0x638 - 0x628 + .asciz "msg/kor.bmg.l" + .space 0x2 .global Unk_ov18_02249D98 Unk_ov18_02249D98: ; 0x02249D98 - .incbin "incbin/overlay18_data.bin", 0x638, 0x648 - 0x638 + .asciz "msg/eng.bmg.l" + .space 0x2 .global Unk_ov18_02249DA8 Unk_ov18_02249DA8: ; 0x02249DA8 - .incbin "incbin/overlay18_data.bin", 0x648, 0x658 - 0x648 + .asciz "msg/ita.bmg.l" + .space 0x2 .global Unk_ov18_02249DB8 Unk_ov18_02249DB8: ; 0x02249DB8 - .incbin "incbin/overlay18_data.bin", 0x658, 0x668 - 0x658 + .asciz "msg/ger.bmg.l" + .space 0x2 .global Unk_ov18_02249DC8 Unk_ov18_02249DC8: ; 0x02249DC8 - .incbin "incbin/overlay18_data.bin", 0x668, 0x678 - 0x668 + .asciz "msg/fre.bmg.l" + .space 0x2 .global Unk_ov18_02249DD8 Unk_ov18_02249DD8: ; 0x02249DD8 - .incbin "incbin/overlay18_data.bin", 0x678, 0x688 - 0x678 + .asciz "msg/spa.bmg.l" + .space 0x2 .global Unk_ov18_02249DE8 Unk_ov18_02249DE8: ; 0x02249DE8 - .incbin "incbin/overlay18_data.bin", 0x688, 0x698 - 0x688 + .asciz "msg/jap.bmg.l" + .space 0x2 .global Unk_ov18_02249DF8 Unk_ov18_02249DF8: ; 0x02249DF8 - .incbin "incbin/overlay18_data.bin", 0x698, 0x6B4 - 0x698 + .word Unk_ov18_02249DE8 + .word Unk_ov18_02249D98 + .word Unk_ov18_02249DC8 + .word Unk_ov18_02249DB8 + .word Unk_ov18_02249DA8 + .word Unk_ov18_02249DD8 + .word Unk_ov18_02249D88 .global Unk_ov18_02249E14 Unk_ov18_02249E14: ; 0x02249E14 - .incbin "incbin/overlay18_data.bin", 0x6B4, 0x6C4 - 0x6B4 + .asciz "msg/usa.bmg.l" + .space 0x2 .global Unk_ov18_02249E24 Unk_ov18_02249E24: ; 0x02249E24 - .incbin "incbin/overlay18_data.bin", 0x6C4, 0x6D8 - 0x6C4 + .asciz "char/jtMain.nce.l" + .space 0x2 .global Unk_ov18_02249E38 Unk_ov18_02249E38: ; 0x02249E38 - .incbin "incbin/overlay18_data.bin", 0x6D8, 0x6EC - 0x6D8 + .asciz "char/jbMain.nce.l" + .space 0x2 .global Unk_ov18_02249E4C Unk_ov18_02249E4C: ; 0x02249E4C - .incbin "incbin/overlay18_data.bin", 0x6EC, 0x700 - 0x6EC + .asciz "char/jtBgMain.ncg.l" .global Unk_ov18_02249E60 Unk_ov18_02249E60: ; 0x02249E60 - .incbin "incbin/overlay18_data.bin", 0x700, 0x714 - 0x700 + .asciz "char/jtBgMain.ncl.l" .global Unk_ov18_02249E74 Unk_ov18_02249E74: ; 0x02249E74 - .incbin "incbin/overlay18_data.bin", 0x714, 0x72C - 0x714 + .ascii "char/jtObjMain.ncg.l" + .space 0x4 .global Unk_ov18_02249E8C Unk_ov18_02249E8C: ; 0x02249E8C - .incbin "incbin/overlay18_data.bin", 0x72C, 0x744 - 0x72C + .ascii "char/xtObjMain.ncl.l" + .space 0x4 .global Unk_ov18_02249EA4 Unk_ov18_02249EA4: ; 0x02249EA4 - .incbin "incbin/overlay18_data.bin", 0x744, 0x75C - 0x744 + .ascii "char/jbBgStep1.ncg.l" + .space 0x4 .global Unk_ov18_02249EBC Unk_ov18_02249EBC: ; 0x02249EBC - .incbin "incbin/overlay18_data.bin", 0x75C, 0x774 - 0x75C + .ascii "char/jbBgStep1.ncl.l" + .space 0x4 .global Unk_ov18_02249ED4 Unk_ov18_02249ED4: ; 0x02249ED4 - .incbin "incbin/overlay18_data.bin", 0x774, 0x78C - 0x774 + .ascii "char/jbObjMain.ncg.l" + .space 0x4 .global Unk_ov18_02249EEC Unk_ov18_02249EEC: ; 0x02249EEC - .incbin "incbin/overlay18_data.bin", 0x78C, 0x7A4 - 0x78C + .ascii "char/ybObjMain.ncl.l" + .space 0x4 .global Unk_ov18_02249F04 Unk_ov18_02249F04: ; 0x02249F04 - .incbin "incbin/overlay18_data.bin", 0x7A4, 0x7B8 - 0x7A4 + .ascii "char/jtTop.nsc.l" + .space 0x4 .global Unk_ov18_02249F18 Unk_ov18_02249F18: ; 0x02249F18 - .incbin "incbin/overlay18_data.bin", 0x7B8, 0x13 + .ascii "char/jtStep1.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/scenemenu.s b/lib/NitroDWC/asm/util/scenemenu.s index 460cb93445..bf1eed20a0 100644 --- a/lib/NitroDWC/asm/util/scenemenu.s +++ b/lib/NitroDWC/asm/util/scenemenu.s @@ -441,19 +441,19 @@ _0223079C: .word Unk_ov18_022532DC .global Unk_ov18_02249108 Unk_ov18_02249108: ; 0x02249108 - .incbin "incbin/overlay18_rodata.bin", 0x2CD4, 0x2CD6 - 0x2CD4 + .byte 0x1, 0x2 .global Unk_ov18_0224910A Unk_ov18_0224910A: ; 0x0224910A - .incbin "incbin/overlay18_rodata.bin", 0x2CD6, 0x2CE6 - 0x2CD6 + .short 0x8, 0x20, 0xAC, 0xA0, 0xB4, 0x20, 0xF8, 0xA0 .global Unk_ov18_0224911A Unk_ov18_0224911A: ; 0x0224911A - .incbin "incbin/overlay18_rodata.bin", 0x2CE6, 0x2CF6 - 0x2CE6 + .short 0x6, 0x1E, 0x9E, 0x92, 0xB2, 0x1E, 0xEA, 0x92 .global Unk_ov18_0224912A Unk_ov18_0224912A: ; 0x0224912A - .incbin "incbin/overlay18_rodata.bin", 0x2CF6, 0x16 + .asciz "char/ybBgStep11.ncl.l" @@ -462,15 +462,18 @@ Unk_ov18_0224912A: ; 0x0224912A .global Unk_ov18_02249F2C Unk_ov18_02249F2C: ; 0x02249F2C - .incbin "incbin/overlay18_data.bin", 0x7CC, 0x7E4 - 0x7CC + .ascii "char/jbBgStep1.ncg.l" + .space 0x4 .global Unk_ov18_02249F44 Unk_ov18_02249F44: ; 0x02249F44 - .incbin "incbin/overlay18_data.bin", 0x7E4, 0x7FC - 0x7E4 + .ascii "char/jbBgStep1.ncl.l" + .space 0x4 .global Unk_ov18_02249F5C Unk_ov18_02249F5C: ; 0x02249F5C - .incbin "incbin/overlay18_data.bin", 0x7FC, 0x13 + .ascii "char/jb2Menu.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/sceneopterase.s b/lib/NitroDWC/asm/util/sceneopterase.s index d7272fbfd5..73c4844861 100644 --- a/lib/NitroDWC/asm/util/sceneopterase.s +++ b/lib/NitroDWC/asm/util/sceneopterase.s @@ -336,7 +336,7 @@ _02230B80: .word ov18_022309D8 .global Unk_ov18_02249F70 Unk_ov18_02249F70: ; 0x02249F70 - .incbin "incbin/overlay18_data.bin", 0x810, 0x14 + .asciz "char/yb5Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/sceneopterase1.s b/lib/NitroDWC/asm/util/sceneopterase1.s index 714f6049ab..fe56800cd6 100644 --- a/lib/NitroDWC/asm/util/sceneopterase1.s +++ b/lib/NitroDWC/asm/util/sceneopterase1.s @@ -206,5 +206,5 @@ ov18_02230D7C: ; 0x02230D7C .global Unk_ov18_02249F84 Unk_ov18_02249F84: ; 0x02249F84 - .incbin "incbin/overlay18_data.bin", 0x824, 0x14 + .asciz "char/yb5Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/sceneoptinfo.s b/lib/NitroDWC/asm/util/sceneoptinfo.s index cb59ffeec2..6eee552215 100644 --- a/lib/NitroDWC/asm/util/sceneoptinfo.s +++ b/lib/NitroDWC/asm/util/sceneoptinfo.s @@ -364,17 +364,149 @@ _0223122C: .word ov18_02231230 .global Unk_ov18_02249F98 Unk_ov18_02249F98: ; 0x02249F98 - .incbin "incbin/overlay18_data.bin", 0x838, 0x84C - 0x838 + .ascii "char/jb5Info.nsc.l" + .space 0x2 .global Unk_ov18_02249FAC Unk_ov18_02249FAC: ; 0x02249FAC - .incbin "incbin/overlay18_data.bin", 0x84C, 0x888 - 0x84C + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "X" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "X" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "X" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "X" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "X" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "2" + .space 0x1 + .ascii "X" + .space 0x3 .global Unk_ov18_02249FE8 Unk_ov18_02249FE8: ; 0x02249FE8 - .incbin "incbin/overlay18_data.bin", 0x888, 0x8B0 - 0x888 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "4" + .space 0x1 + .ascii "d" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "4" + .space 0x1 + .ascii "d" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "4" + .space 0x1 + .ascii "d" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "%" + .space 0x1 + .ascii "0" + .space 0x1 + .ascii "4" + .space 0x1 + .ascii "d" + .space 0x3 .global Unk_ov18_0224A010 Unk_ov18_0224A010: ; 0x0224A010 - .incbin "incbin/overlay18_data.bin", 0x8B0, 0x28 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x1 + .ascii "-" + .space 0x3 diff --git a/lib/NitroDWC/asm/util/sceneoptmenu.s b/lib/NitroDWC/asm/util/sceneoptmenu.s index 000e632e8b..d5a71466be 100644 --- a/lib/NitroDWC/asm/util/sceneoptmenu.s +++ b/lib/NitroDWC/asm/util/sceneoptmenu.s @@ -553,27 +553,32 @@ _02231944: .word ov18_0223D154 .global Unk_ov18_02249140 Unk_ov18_02249140: ; 0x02249140 - .incbin "incbin/overlay18_rodata.bin", 0x2D0C, 0x2D10 - 0x2D0C + .byte 0x1, 0x2, 0x3, 0x0 .global Unk_ov18_02249144 Unk_ov18_02249144: ; 0x02249144 - .incbin "incbin/overlay18_rodata.bin", 0x2D10, 0x2D14 - 0x2D10 + .short 0xE0 + .short 0x84 .global Unk_ov18_02249148 Unk_ov18_02249148: ; 0x02249148 - .incbin "incbin/overlay18_rodata.bin", 0x2D14, 0x2D2A - 0x2D14 + .asciz "char/ybBgOption.ncl.l" .global Unk_ov18_0224915E Unk_ov18_0224915E: ; 0x0224915E - .incbin "incbin/overlay18_rodata.bin", 0x2D2A, 0x2D42 - 0x2D2A + .ascii "char/ybBgOption1.ncl.l" + .space 0x2 .global Unk_ov18_02249176 Unk_ov18_02249176: ; 0x02249176 - .incbin "incbin/overlay18_rodata.bin", 0x2D42, 0x2D5A - 0x2D42 + .short 0x8, 0x24, 0xF8, 0x44, 0x8, 0x50, 0xF8 + .short 0x70, 0x8, 0x7C, 0xF8, 0x9C .global Unk_ov18_0224918E Unk_ov18_0224918E: ; 0x0224918E - .incbin "incbin/overlay18_rodata.bin", 0x2D5A, 0x18 + .short 0x6, 0x22, 0xEA + .short 0x36, 0x6, 0x4E, 0xEA, 0x62, 0x6, 0x7A, 0xEA + .short 0x8E @@ -582,11 +587,13 @@ Unk_ov18_0224918E: ; 0x0224918E .global Unk_ov18_0224A038 Unk_ov18_0224A038: ; 0x0224A038 - .incbin "incbin/overlay18_data.bin", 0x8D8, 0x8F0 - 0x8D8 + .asciz "char/jbBgOption.ncg.l" + .space 0x2 .global Unk_ov18_0224A050 Unk_ov18_0224A050: ; 0x0224A050 - .incbin "incbin/overlay18_data.bin", 0x8F0, 0x16 + .asciz "char/jb5OptMenu.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/sceneoptmovcomm.s b/lib/NitroDWC/asm/util/sceneoptmovcomm.s index 7265414284..20aabc3301 100644 --- a/lib/NitroDWC/asm/util/sceneoptmovcomm.s +++ b/lib/NitroDWC/asm/util/sceneoptmovcomm.s @@ -221,7 +221,7 @@ _02231BBC: .word ov18_02231A7C .global Unk_ov18_0224A068 Unk_ov18_0224A068: ; 0x0224A068 - .incbin "incbin/overlay18_data.bin", 0x908, 0x14 + .asciz "char/yb5Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/sceneoptmovconfirm.s b/lib/NitroDWC/asm/util/sceneoptmovconfirm.s index 8fe8ab1273..3955ed2832 100644 --- a/lib/NitroDWC/asm/util/sceneoptmovconfirm.s +++ b/lib/NitroDWC/asm/util/sceneoptmovconfirm.s @@ -483,7 +483,7 @@ _02232344: .word ov18_02231DD0 .global Unk_ov18_0224A07C Unk_ov18_0224A07C: ; 0x0224A07C - .incbin "incbin/overlay18_data.bin", 0x91C, 0x14 + .asciz "char/yb5Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/sceneoptmovdisconnect.s b/lib/NitroDWC/asm/util/sceneoptmovdisconnect.s index 8c8c3a4a2b..b27eed88a4 100644 --- a/lib/NitroDWC/asm/util/sceneoptmovdisconnect.s +++ b/lib/NitroDWC/asm/util/sceneoptmovdisconnect.s @@ -176,7 +176,7 @@ _0223252C: .word ov18_0223245C .global Unk_ov18_0224A090 Unk_ov18_0224A090: ; 0x0224A090 - .incbin "incbin/overlay18_data.bin", 0x930, 0x14 + .asciz "char/yb5Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/sceneoptmovfailure.s b/lib/NitroDWC/asm/util/sceneoptmovfailure.s index fc66b6c31a..f251612ac6 100644 --- a/lib/NitroDWC/asm/util/sceneoptmovfailure.s +++ b/lib/NitroDWC/asm/util/sceneoptmovfailure.s @@ -293,7 +293,7 @@ _02232894: .word ov18_02232C90 .global Unk_ov18_0224A0A4 Unk_ov18_0224A0A4: ; 0x0224A0A4 - .incbin "incbin/overlay18_data.bin", 0x944, 0x14 + .asciz "char/yb5Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/sceneoptmovuser.s b/lib/NitroDWC/asm/util/sceneoptmovuser.s index 7ea9cb8592..5ee96deb8b 100644 --- a/lib/NitroDWC/asm/util/sceneoptmovuser.s +++ b/lib/NitroDWC/asm/util/sceneoptmovuser.s @@ -326,7 +326,8 @@ _02232C6C: .word Unk_ov18_02253304 .global Unk_ov18_0224A0B8 Unk_ov18_0224A0B8: ; 0x0224A0B8 - .incbin "incbin/overlay18_data.bin", 0x958, 0x13 + .ascii "char/jb5Move.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/sceneoptmovwait.s b/lib/NitroDWC/asm/util/sceneoptmovwait.s index 7d0305d0a4..e5ae75aea4 100644 --- a/lib/NitroDWC/asm/util/sceneoptmovwait.s +++ b/lib/NitroDWC/asm/util/sceneoptmovwait.s @@ -343,7 +343,7 @@ _02233064: .word ov18_02232E5C .global Unk_ov18_0224A0CC Unk_ov18_0224A0CC: ; 0x0224A0CC - .incbin "incbin/overlay18_data.bin", 0x96C, 0x14 + .asciz "char/yb5Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetaossbutton.s b/lib/NitroDWC/asm/util/scenesetaossbutton.s index a67d54f689..c88cf9af98 100644 --- a/lib/NitroDWC/asm/util/scenesetaossbutton.s +++ b/lib/NitroDWC/asm/util/scenesetaossbutton.s @@ -473,15 +473,17 @@ _02233620: .word ov18_022333C4 .global Unk_ov18_0224A0E0 Unk_ov18_0224A0E0: ; 0x0224A0E0 - .incbin "incbin/overlay18_data.bin", 0x980, 0x998 - 0x980 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A0F8 Unk_ov18_0224A0F8: ; 0x0224A0F8 - .incbin "incbin/overlay18_data.bin", 0x998, 0x9B0 - 0x998 + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A110 Unk_ov18_0224A110: ; 0x0224A110 - .incbin "incbin/overlay18_data.bin", 0x9B0, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetaosscomplete.s b/lib/NitroDWC/asm/util/scenesetaosscomplete.s index b0466d844f..f11819087b 100644 --- a/lib/NitroDWC/asm/util/scenesetaosscomplete.s +++ b/lib/NitroDWC/asm/util/scenesetaosscomplete.s @@ -179,7 +179,7 @@ _02233814: .word ov18_02233738 .global Unk_ov18_0224A124 Unk_ov18_0224A124: ; 0x0224A124 - .incbin "incbin/overlay18_data.bin", 0x9C4, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetaplist.s b/lib/NitroDWC/asm/util/scenesetaplist.s index bb46464b29..a1cfd65f6b 100644 --- a/lib/NitroDWC/asm/util/scenesetaplist.s +++ b/lib/NitroDWC/asm/util/scenesetaplist.s @@ -1611,31 +1611,36 @@ _02234DB0: .word ov18_02233D18 .global Unk_ov18_022491A8 Unk_ov18_022491A8: ; 0x022491A8 - .incbin "incbin/overlay18_rodata.bin", 0x2D74, 0x2D75 - 0x2D74 + .byte 0x2 .global Unk_ov18_022491A9 Unk_ov18_022491A9: ; 0x022491A9 - .incbin "incbin/overlay18_rodata.bin", 0x2D75, 0x2D8B - 0x2D75 + .asciz "char/ybBgStep31.ncl.l" .global Unk_ov18_022491BF Unk_ov18_022491BF: ; 0x022491BF - .incbin "incbin/overlay18_rodata.bin", 0x2D8B, 0x2DA4 - 0x2D8B + .asciz "char/xb4ApListBack.nsc.l" .global Unk_ov18_022491D8 Unk_ov18_022491D8: ; 0x022491D8 - .incbin "incbin/overlay18_rodata.bin", 0x2DA4, 0x2DCC - 0x2DA4 + .short 0x7, 0x32, 0xD0, 0x4C, 0x7, 0x4E + .short 0xD0, 0x68, 0x7, 0x6A, 0xD0, 0x84, 0x7, 0x86 + .short 0xD0, 0xA0, 0x85, 0x1B, 0xFD, 0x2C .global Unk_ov18_02249200 Unk_ov18_02249200: ; 0x02249200 - .incbin "incbin/overlay18_rodata.bin", 0x2DCC, 0x2DF4 - 0x2DCC + .short 0x4, 0x2E + .short 0xDB, 0x3F, 0x4, 0x4A, 0xDB, 0x5B, 0x4, 0x66 + .short 0xDB, 0x77, 0x4, 0x82, 0xDB, 0x93, 0x82, 0x18 + .short 0xF0, 0x2C .global Unk_ov18_02249228 Unk_ov18_02249228: ; 0x02249228 - .incbin "incbin/overlay18_rodata.bin", 0x2DF4, 0x2DF8 - 0x2DF4 + .asciz ".-3" .global Unk_ov18_0224922C Unk_ov18_0224922C: ; 0x0224922C - .incbin "incbin/overlay18_rodata.bin", 0x2DF8, 0x4 + .byte 0x18, 0x17, 0x16, 0x15 @@ -1644,7 +1649,7 @@ Unk_ov18_0224922C: ; 0x0224922C .global Unk_ov18_0224A138 Unk_ov18_0224A138: ; 0x0224A138 - .incbin "incbin/overlay18_data.bin", 0x9D8, 0x15 + .asciz "char/jb4ApList.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetedit32.s b/lib/NitroDWC/asm/util/scenesetedit32.s index efa91d157a..43957016b6 100644 --- a/lib/NitroDWC/asm/util/scenesetedit32.s +++ b/lib/NitroDWC/asm/util/scenesetedit32.s @@ -865,27 +865,31 @@ _022358F0: .word ov18_02234FF8 .global Unk_ov18_02249230 Unk_ov18_02249230: ; 0x02249230 - .incbin "incbin/overlay18_rodata.bin", 0x2DFC, 0x2DFE - 0x2DFC + .byte 0x3E, 0x3D .global Unk_ov18_02249232 Unk_ov18_02249232: ; 0x02249232 - .incbin "incbin/overlay18_rodata.bin", 0x2DFE, 0x2E04 - 0x2DFE + .short 0xE + .word 0x10 .global Unk_ov18_02249238 Unk_ov18_02249238: ; 0x02249238 - .incbin "incbin/overlay18_rodata.bin", 0x2E04, 0x2E0C - 0x2E04 + .word 0x47 + .word 0x48 .global Unk_ov18_02249240 Unk_ov18_02249240: ; 0x02249240 - .incbin "incbin/overlay18_rodata.bin", 0x2E0C, 0x2E14 - 0x2E0C + .word ov18_0223DE08 + .word ov18_0223DE38 .global Unk_ov18_02249248 Unk_ov18_02249248: ; 0x02249248 - .incbin "incbin/overlay18_rodata.bin", 0x2E14, 0x2E18 - 0x2E14 + .byte 0x20, 0x31, 0x0, 0x0 .global Unk_ov18_0224924C Unk_ov18_0224924C: ; 0x0224924C - .incbin "incbin/overlay18_rodata.bin", 0x2E18, 0x10 + .byte 0x8, 0x17, 0x26, 0x35, 0x44, 0x53, 0x62, 0x71 + .byte 0x80, 0x8F, 0x9E, 0xAD, 0xBC, 0xCB, 0xDA, 0xE9 @@ -894,23 +898,28 @@ Unk_ov18_0224924C: ; 0x0224924C .global Unk_ov18_0224A150 Unk_ov18_0224A150: ; 0x0224A150 - .incbin "incbin/overlay18_data.bin", 0x9F0, 0xA04 - 0x9F0 + .ascii "char/ybObjKb.ncl.l" + .space 0x2 .global Unk_ov18_0224A164 Unk_ov18_0224A164: ; 0x0224A164 - .incbin "incbin/overlay18_data.bin", 0xA04, 0xA1C - 0xA04 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A17C Unk_ov18_0224A17C: ; 0x0224A17C - .incbin "incbin/overlay18_data.bin", 0xA1C, 0xA34 - 0xA1C + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A194 Unk_ov18_0224A194: ; 0x0224A194 - .incbin "incbin/overlay18_data.bin", 0xA34, 0xA48 - 0xA34 + .ascii "char/xb4Edit.nsc.l" + .space 0x2 .global Unk_ov18_0224A1A8 Unk_ov18_0224A1A8: ; 0x0224A1A8 - .incbin "incbin/overlay18_data.bin", 0xA48, 0x15 + .ascii "char/ybObjMain.ncl.l" + .space 0x4 diff --git a/lib/NitroDWC/asm/util/sceneseteditaddress.s b/lib/NitroDWC/asm/util/sceneseteditaddress.s index e963889a53..9648fcba4b 100644 --- a/lib/NitroDWC/asm/util/sceneseteditaddress.s +++ b/lib/NitroDWC/asm/util/sceneseteditaddress.s @@ -972,31 +972,42 @@ _022365B8: .word ov18_02235B78 .global Unk_ov18_0224925C Unk_ov18_0224925C: ; 0x0224925C - .incbin "incbin/overlay18_rodata.bin", 0x2E28, 0x2E2C - 0x2E28 + .asciz "255" .global Unk_ov18_02249260 Unk_ov18_02249260: ; 0x02249260 - .incbin "incbin/overlay18_rodata.bin", 0x2E2C, 0x2E30 - 0x2E2C + .short 0xB + .short 0x10 .global Unk_ov18_02249264 Unk_ov18_02249264: ; 0x02249264 - .incbin "incbin/overlay18_rodata.bin", 0x2E30, 0x2E36 - 0x2E30 + .asciz "?@ABC" + .space 0x2 .global Unk_ov18_0224926A Unk_ov18_0224926A: ; 0x0224926A - .incbin "incbin/overlay18_rodata.bin", 0x2E36, 0x2E40 - 0x2E36 + .word 0x29 + .space 0x4 .global Unk_ov18_02249274 Unk_ov18_02249274: ; 0x02249274 - .incbin "incbin/overlay18_rodata.bin", 0x2E40, 0x2E54 - 0x2E40 + .word ov18_0223E08C + .word ov18_0223E0CC + .word ov18_0223E10C + .word ov18_0223E150 + .word ov18_0223E194 .global Unk_ov18_02249288 Unk_ov18_02249288: ; 0x02249288 - .incbin "incbin/overlay18_rodata.bin", 0x2E54, 0x2E68 - 0x2E54 + .word ov18_0223DFD0 + .word ov18_0223DFEC + .word ov18_0223E008 + .word ov18_0223E028 + .word ov18_0223E048 .global Unk_ov18_0224929C Unk_ov18_0224929C: ; 0x0224929C - .incbin "incbin/overlay18_rodata.bin", 0x2E68, 0xC + .byte 0x31, 0x3D, 0x49, 0x5A, 0x66, 0x72, 0x83, 0x8F, 0x9B, 0xAC, 0xB8, 0xC4 @@ -1005,27 +1016,32 @@ Unk_ov18_0224929C: ; 0x0224929C .global Unk_ov18_0224A1C0 Unk_ov18_0224A1C0: ; 0x0224A1C0 - .incbin "incbin/overlay18_data.bin", 0xA60, 0xA64 - 0xA60 + .asciz " 0" .global Unk_ov18_0224A1C4 Unk_ov18_0224A1C4: ; 0x0224A1C4 - .incbin "incbin/overlay18_data.bin", 0xA64, 0xA78 - 0xA64 + .ascii "char/ybObjKb.ncl.l" + .space 0x2 .global Unk_ov18_0224A1D8 Unk_ov18_0224A1D8: ; 0x0224A1D8 - .incbin "incbin/overlay18_data.bin", 0xA78, 0xA90 - 0xA78 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A1F0 Unk_ov18_0224A1F0: ; 0x0224A1F0 - .incbin "incbin/overlay18_data.bin", 0xA90, 0xAA8 - 0xA90 + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A208 Unk_ov18_0224A208: ; 0x0224A208 - .incbin "incbin/overlay18_data.bin", 0xAA8, 0xAC0 - 0xAA8 + .ascii "char/xb4EditAddr.nsc.l" + .space 0x2 .global Unk_ov18_0224A220 Unk_ov18_0224A220: ; 0x0224A220 - .incbin "incbin/overlay18_data.bin", 0xAC0, 0x15 + .ascii "char/ybObjMain.ncl.l" + .space 0x4 diff --git a/lib/NitroDWC/asm/util/sceneseterror.s b/lib/NitroDWC/asm/util/sceneseterror.s index c939ed4814..f5a6dcd66e 100644 --- a/lib/NitroDWC/asm/util/sceneseterror.s +++ b/lib/NitroDWC/asm/util/sceneseterror.s @@ -475,16 +475,16 @@ _02236BDC: .word Unk_ov18_02253328 .global Unk_ov18_022492A8 Unk_ov18_022492A8: ; 0x022492A8 - .incbin "incbin/overlay18_rodata.bin", 0x2E74, 0x2E7C - 0x2E74 + .byte 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0 .global Unk_ov18_022492B0 Unk_ov18_022492B0: ; 0x022492B0 - .incbin "incbin/overlay18_rodata.bin", 0x2E7C, 0x2E84 - 0x2E7C + .short 0xD, 0x3C, 0xE6, 0x5E .global Unk_ov18_022492B8 Unk_ov18_022492B8: ; 0x022492B8 - .incbin "incbin/overlay18_rodata.bin", 0x2E84, 0x1C - + .short 0x62, 0x22, 0x62, 0x22, 0x3D, 0x22 + .short 0x65, 0x22, 0x6C, 0x22, 0x34, 0x22, 0x4E, 0x22 .data @@ -492,11 +492,12 @@ Unk_ov18_022492B8: ; 0x022492B8 .global Unk_ov18_0224A238 Unk_ov18_0224A238: ; 0x0224A238 - .incbin "incbin/overlay18_data.bin", 0xAD8, 0xAEC - 0xAD8 + .asciz "char/jb4Error.nsc.l" .global Unk_ov18_0224A24C Unk_ov18_0224A24C: ; 0x0224A24C - .incbin "incbin/overlay18_data.bin", 0xAEC, 0x6 + .short 0x25, 0x64 + .space 0x4 diff --git a/lib/NitroDWC/asm/util/scenesetlist.s b/lib/NitroDWC/asm/util/scenesetlist.s index 114d46c78b..14f2a70655 100644 --- a/lib/NitroDWC/asm/util/scenesetlist.s +++ b/lib/NitroDWC/asm/util/scenesetlist.s @@ -2715,71 +2715,81 @@ _022390A8: .word Unk_ov18_0225332C .global Unk_ov18_022492D4 Unk_ov18_022492D4: ; 0x022492D4 - .incbin "incbin/overlay18_rodata.bin", 0x2EA0, 0x2EA4 - 0x2EA0 + .byte 0x6, 0x8, 0x7 + .space 0x1 .global Unk_ov18_022492D8 Unk_ov18_022492D8: ; 0x022492D8 - .incbin "incbin/overlay18_rodata.bin", 0x2EA4, 0x2EA8 - 0x2EA4 + .byte 0x2, 0x3, 0x7, 0x8 .global Unk_ov18_022492DC Unk_ov18_022492DC: ; 0x022492DC - .incbin "incbin/overlay18_rodata.bin", 0x2EA8, 0x2EB0 - 0x2EA8 + .short 0xCC, 0x34, 0x1C, 0x18 .global Unk_ov18_022492E4 Unk_ov18_022492E4: ; 0x022492E4 - .incbin "incbin/overlay18_rodata.bin", 0x2EB0, 0x2EB8 - 0x2EB0 + .short 0x8F, 0x34, 0x2C, 0x18 .global Unk_ov18_022492EC Unk_ov18_022492EC: ; 0x022492EC - .incbin "incbin/overlay18_rodata.bin", 0x2EB8, 0x2EC0 - 0x2EB8 + .short 0xC0, 0x34, 0x2C, 0x18 .global Unk_ov18_022492F4 Unk_ov18_022492F4: ; 0x022492F4 - .incbin "incbin/overlay18_rodata.bin", 0x2EC0, 0x2ECE - 0x2EC0 + .byte 0x0, 0x0, 0x1, 0x2, 0x0, 0x0, 0x0, 0x1, 0x2, 0x0, 0x0, 0x3, 0x4, 0x5 .global Unk_ov18_02249302 Unk_ov18_02249302: ; 0x02249302 - .incbin "incbin/overlay18_rodata.bin", 0x2ECE, 0x2EDE - 0x2ECE + .byte 0x0, 0x29, 0x2C, 0x52, 0x53, 0x30, 0x0, 0x2A, 0x30, 0x54, 0x55, 0x0, 0x0, 0x2B + .space 0x2 .global Unk_ov18_02249312 Unk_ov18_02249312: ; 0x02249312 - .incbin "incbin/overlay18_rodata.bin", 0x2EDE, 0x2EF0 - 0x2EDE + .short 0x0, 0x60, 0xE0, 0x140, 0x1C0, 0x240, 0x2A0, 0x320, 0x3A0 .global Unk_ov18_02249324 Unk_ov18_02249324: ; 0x02249324 - .incbin "incbin/overlay18_rodata.bin", 0x2EF0, 0x2F05 - 0x2EF0 + .asciz "char/ybBgStep2.ncl.l" .global Unk_ov18_02249339 Unk_ov18_02249339: ; 0x02249339 - .incbin "incbin/overlay18_rodata.bin", 0x2F05, 0x2F1B - 0x2F05 + .asciz "char/ybBgStep21.ncl.l" .global Unk_ov18_0224934F Unk_ov18_0224934F: ; 0x0224934F - .incbin "incbin/overlay18_rodata.bin", 0x2F1B, 0x2F32 - 0x2F1B + .asciz "char/jb3ListBack.nsc.l" .global Unk_ov18_02249366 Unk_ov18_02249366: ; 0x02249366 - .incbin "incbin/overlay18_rodata.bin", 0x2F32, 0x2F4A - 0x2F32 + .short 0x84, 0x1B, 0xFC, 0x2C, 0x84, 0xAC, 0xFC + .short 0xBD, 0x4, 0xAC, 0x7C, 0xBD .global Unk_ov18_0224937E Unk_ov18_0224937E: ; 0x0224937E - .incbin "incbin/overlay18_rodata.bin", 0x2F4A, 0x2F7C - 0x2F4A + .short 0xC8, 0x31, 0xE0 + .short 0x4D, 0xBC, 0x31, 0xE0, 0x4D, 0x8B, 0x31, 0xAF + .short 0x4D, 0x82, 0x18, 0xEE, 0x2C, 0x82, 0xA9, 0xEE + .short 0xBD, 0x2, 0xA9, 0x6E, 0xBD, 0x0 .global Unk_ov18_022493B0 Unk_ov18_022493B0: ; 0x022493B0 - .incbin "incbin/overlay18_rodata.bin", 0x2F7C, 0x2F84 - 0x2F7C + .byte 0xFF, 0x23, 0x27, 0xFF + .byte 0x23, 0x2F, 0xFF, 0x0 .global Unk_ov18_022493B8 Unk_ov18_022493B8: ; 0x022493B8 - .incbin "incbin/overlay18_rodata.bin", 0x2F84, 0x2F90 - 0x2F84 + .byte 0x0, 0x1, 0xE, 0x4, 0x5, 0x6, 0xE, 0x9, 0xA, 0x0 + .space 0x2 .global Unk_ov18_022493C4 Unk_ov18_022493C4: ; 0x022493C4 - .incbin "incbin/overlay18_rodata.bin", 0x2F90, 0x2F9C - 0x2F90 + .byte 0x0, 0x5, 0x2, 0x7, 0x4, 0x1, 0x6, 0x3 + .space 0x4 .global Unk_ov18_022493D0 Unk_ov18_022493D0: ; 0x022493D0 - .incbin "incbin/overlay18_rodata.bin", 0x2F9C, 0xB + .byte 0x0, 0x1, 0x2, 0x2, 0x3, 0x4, 0x5, 0x6, 0x6, 0x7, 0x8 + .space 0x1 @@ -2788,27 +2798,34 @@ Unk_ov18_022493D0: ; 0x022493D0 .global Unk_ov18_0224A254 Unk_ov18_0224A254: ; 0x0224A254 - .incbin "incbin/overlay18_data.bin", 0xAF4, 0xB08 - 0xAF4 + .ascii "char/ybObjKb.ncl.l" + .space 0x2 .global Unk_ov18_0224A268 Unk_ov18_0224A268: ; 0x0224A268 - .incbin "incbin/overlay18_data.bin", 0xB08, 0xB20 - 0xB08 + .ascii "char/jbBgStep2.ncg.l" + .space 0x4 .global Unk_ov18_0224A280 Unk_ov18_0224A280: ; 0x0224A280 - .incbin "incbin/overlay18_data.bin", 0xB20, 0xB38 - 0xB20 + .asciz "char/jbBgStep21.ncg.l" + .space 0x2 .global Unk_ov18_0224A298 Unk_ov18_0224A298: ; 0x0224A298 - .incbin "incbin/overlay18_data.bin", 0xB38, 0xB4C - 0xB38 + .ascii "char/jb3List.nsc.l" + .space 0x2 .global Unk_ov18_0224A2AC Unk_ov18_0224A2AC: ; 0x0224A2AC - .incbin "incbin/overlay18_data.bin", 0xB4C, 0xB64 - 0xB4C + .ascii "char/ybObjMain.ncl.l" + .space 0x4 .global Unk_ov18_0224A2C4 Unk_ov18_0224A2C4: ; 0x0224A2C4 - .incbin "incbin/overlay18_data.bin", 0xB64, 0x20 + .short 0x25, 0x33, 0x64, 0x2E, 0x25, 0x33 + .short 0x64, 0x2E, 0x25, 0x33, 0x64, 0x2E, 0x25, 0x33 + .short 0x64, 0x0 diff --git a/lib/NitroDWC/asm/util/scenesetlistsave.s b/lib/NitroDWC/asm/util/scenesetlistsave.s index b14dce274b..99b26dbbea 100644 --- a/lib/NitroDWC/asm/util/scenesetlistsave.s +++ b/lib/NitroDWC/asm/util/scenesetlistsave.s @@ -190,13 +190,16 @@ _022392C8: .word ov18_0223A6B4 .global Unk_ov18_0224A2E4 Unk_ov18_0224A2E4: ; 0x0224A2E4 - .incbin "incbin/overlay18_data.bin", 0xB84, 0xB9C - 0xB84 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A2FC Unk_ov18_0224A2FC: ; 0x0224A2FC - .incbin "incbin/overlay18_data.bin", 0xB9C, 0xBB4 - 0xB9C + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A314 Unk_ov18_0224A314: ; 0x0224A314 - .incbin "incbin/overlay18_data.bin", 0xBB4, 0x13 + .ascii "char/xb4None.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/scenesetrakubutton.s b/lib/NitroDWC/asm/util/scenesetrakubutton.s index b6a64a5e45..950ddf8082 100644 --- a/lib/NitroDWC/asm/util/scenesetrakubutton.s +++ b/lib/NitroDWC/asm/util/scenesetrakubutton.s @@ -719,11 +719,11 @@ _02239B30: .word ov18_022398D0 .global Unk_ov18_0224A328 Unk_ov18_0224A328: ; 0x0224A328 - .incbin "incbin/overlay18_data.bin", 0xBC8, 0xBDC - 0xBC8 + .asciz "char/xb4Multi.nsc.l" .global Unk_ov18_0224A33C Unk_ov18_0224A33C: ; 0x0224A33C - .incbin "incbin/overlay18_data.bin", 0xBDC, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetrakucomplete.s b/lib/NitroDWC/asm/util/scenesetrakucomplete.s index ec363d1686..4954c4c34e 100644 --- a/lib/NitroDWC/asm/util/scenesetrakucomplete.s +++ b/lib/NitroDWC/asm/util/scenesetrakucomplete.s @@ -184,7 +184,7 @@ _02239D38: .word ov18_02239C5C .global Unk_ov18_0224A350 Unk_ov18_0224A350: ; 0x0224A350 - .incbin "incbin/overlay18_data.bin", 0xBF0, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetrakuready.s b/lib/NitroDWC/asm/util/scenesetrakuready.s index 4079eb01b5..44a65ba750 100644 --- a/lib/NitroDWC/asm/util/scenesetrakuready.s +++ b/lib/NitroDWC/asm/util/scenesetrakuready.s @@ -389,15 +389,17 @@ _0223A1CC: .word ov18_02239FA4 .global Unk_ov18_0224A364 Unk_ov18_0224A364: ; 0x0224A364 - .incbin "incbin/overlay18_data.bin", 0xC04, 0xC1C - 0xC04 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A37C Unk_ov18_0224A37C: ; 0x0224A37C - .incbin "incbin/overlay18_data.bin", 0xC1C, 0xC34 - 0xC1C + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A394 Unk_ov18_0224A394: ; 0x0224A394 - .incbin "incbin/overlay18_data.bin", 0xC34, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetsearch.s b/lib/NitroDWC/asm/util/scenesetsearch.s index cdd96c2b32..17c7dd3ba6 100644 --- a/lib/NitroDWC/asm/util/scenesetsearch.s +++ b/lib/NitroDWC/asm/util/scenesetsearch.s @@ -402,15 +402,17 @@ _0223A6B0: .word ov18_0223A52C .global Unk_ov18_0224A3A8 Unk_ov18_0224A3A8: ; 0x0224A3A8 - .incbin "incbin/overlay18_data.bin", 0xC48, 0xC60 - 0xC48 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A3C0 Unk_ov18_0224A3C0: ; 0x0224A3C0 - .incbin "incbin/overlay18_data.bin", 0xC60, 0xC78 - 0xC60 + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A3D8 Unk_ov18_0224A3D8: ; 0x0224A3D8 - .incbin "incbin/overlay18_data.bin", 0xC78, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetselectap.s b/lib/NitroDWC/asm/util/scenesetselectap.s index cbea3bacb0..badd34e331 100644 --- a/lib/NitroDWC/asm/util/scenesetselectap.s +++ b/lib/NitroDWC/asm/util/scenesetselectap.s @@ -995,35 +995,44 @@ _0223B3F0: .word Unk_ov18_0225334C .global Unk_ov18_022493DC Unk_ov18_022493DC: ; 0x022493DC - .incbin "incbin/overlay18_rodata.bin", 0x2FA8, 0x2FAC - 0x2FA8 + .byte 0x13, 0x14, 0x12, 0x56 .global Unk_ov18_022493E0 Unk_ov18_022493E0: ; 0x022493E0 - .incbin "incbin/overlay18_rodata.bin", 0x2FAC, 0x2FB0 - 0x2FAC + .byte 0x3, 0x4, 0x5, 0x7 .global Unk_ov18_022493E4 Unk_ov18_022493E4: ; 0x022493E4 - .incbin "incbin/overlay18_rodata.bin", 0x2FB0, 0x2FB4 - 0x2FB0 + .byte 0xA, 0x9, 0xB, 0x6 .global Unk_ov18_022493E8 Unk_ov18_022493E8: ; 0x022493E8 - .incbin "incbin/overlay18_rodata.bin", 0x2FB4, 0x2FCA - 0x2FB4 + .asciz "char/ybBgStep11.ncl.l" .global Unk_ov18_022493FE Unk_ov18_022493FE: ; 0x022493FE - .incbin "incbin/overlay18_rodata.bin", 0x2FCA, 0x2FE2 - 0x2FCA + .short 0x8, 0x30, 0x5A + .short 0x30, 0xAC, 0x30, 0xC, 0x58, 0x5E, 0x58, 0xB0 + .short 0x58 .global Unk_ov18_02249416 Unk_ov18_02249416: ; 0x02249416 - .incbin "incbin/overlay18_rodata.bin", 0x2FE2, 0x301A - 0x2FE2 + .short 0x8, 0x20, 0x54, 0x56, 0x5A, 0x20, 0xA6 + .short 0x56, 0xAC, 0x20, 0xF8, 0x56, 0x8, 0x78, 0xF8 + .short 0xA0, 0x8, 0x54, 0x54, 0x70, 0x5A, 0x54, 0xA6 + .short 0x70, 0xAC, 0x54, 0xF8, 0x70 .global Unk_ov18_0224944E Unk_ov18_0224944E: ; 0x0224944E - .incbin "incbin/overlay18_rodata.bin", 0x301A, 0x3054 - 0x301A + .short 0x6, 0x1E, 0x46 + .short 0x48, 0x58, 0x1E, 0x98, 0x48, 0xAA, 0x1E, 0xEA + .short 0x48, 0x6, 0x76, 0xEA, 0x92, 0x9, 0x54, 0x43 + .short 0x70, 0x5B, 0x54, 0x95, 0x70, 0xAD, 0x54, 0xE7 + .word 0x70 .global Unk_ov18_02249488 Unk_ov18_02249488: ; 0x02249488 - .incbin "incbin/overlay18_rodata.bin", 0x3054, 0x7 + .byte 0x3, 0x2D, 0x27, 0x1D, 0x32, 0x30, 0x6, 0x0 @@ -1032,23 +1041,27 @@ Unk_ov18_02249488: ; 0x02249488 .global Unk_ov18_0224A3EC Unk_ov18_0224A3EC: ; 0x0224A3EC - .incbin "incbin/overlay18_data.bin", 0xC8C, 0xCA0 - 0xC8C + .asciz "char/ybObjWay.ncl.l" .global Unk_ov18_0224A400 Unk_ov18_0224A400: ; 0x0224A400 - .incbin "incbin/overlay18_data.bin", 0xCA0, 0xCB8 - 0xCA0 + .ascii "char/jbBgStep1.ncg.l" + .space 0x4 .global Unk_ov18_0224A418 Unk_ov18_0224A418: ; 0x0224A418 - .incbin "incbin/overlay18_data.bin", 0xCB8, 0xCD0 - 0xCB8 + .ascii "char/jbBgStep1.ncl.l" + .space 0x4 .global Unk_ov18_0224A430 Unk_ov18_0224A430: ; 0x0224A430 - .incbin "incbin/overlay18_data.bin", 0xCD0, 0xCE4 - 0xCD0 + .ascii "char/jb2Ap.nsc.l" + .space 0x4 .global Unk_ov18_0224A444 Unk_ov18_0224A444: ; 0x0224A444 - .incbin "incbin/overlay18_data.bin", 0xCE4, 0x15 + .ascii "char/ybObjMain.ncl.l" + .space 0x4 diff --git a/lib/NitroDWC/asm/util/scenesetselectway.s b/lib/NitroDWC/asm/util/scenesetselectway.s index 13183705d8..1786592e74 100644 --- a/lib/NitroDWC/asm/util/scenesetselectway.s +++ b/lib/NitroDWC/asm/util/scenesetselectway.s @@ -593,27 +593,41 @@ _0223BBA8: .word Unk_ov18_02253354 .global Unk_ov18_02249490 Unk_ov18_02249490: ; 0x02249490 - .incbin "incbin/overlay18_rodata.bin", 0x305C, 0x3060 - 0x305C + .byte 0x1, 0x2, 0x3, 0x4 .global Unk_ov18_02249494 Unk_ov18_02249494: ; 0x02249494 - .incbin "incbin/overlay18_rodata.bin", 0x3060, 0x3076 - 0x3060 + .asciz "char/ybBgStep21.ncl.l" .global Unk_ov18_022494AA Unk_ov18_022494AA: ; 0x022494AA - .incbin "incbin/overlay18_rodata.bin", 0x3076, 0x3096 - 0x3076 + .short 0xFEFF, 0xFEFF + .short 0x3, 0x3 + .short 0xFFFF, 0xFFFF + .short 0x1, 0x1 + .short 0xFEFF, 0xFEFF + .short 0x3, 0x2, 0x1 + .short 0x3, 0x2, 0x1 .global Unk_ov18_022494CA Unk_ov18_022494CA: ; 0x022494CA - .incbin "incbin/overlay18_rodata.bin", 0x3096, 0x30D6 - 0x3096 + .short 0x8, 0x20, 0xF8, 0x5C, 0x8 + .short 0x64, 0x7E, 0xA0, 0x0, 0x0, 0x0, 0x0, 0x83 + .short 0x64, 0xF8, 0xA0, 0x8, 0x20, 0xF8, 0x5C, 0x8 + .short 0x64, 0x64, 0xA0, 0x68, 0x64, 0xC4, 0xA0, 0xC8 + .short 0x64, 0xF8, 0xA0 .global Unk_ov18_0224950A Unk_ov18_0224950A: ; 0x0224950A - .incbin "incbin/overlay18_rodata.bin", 0x30D6, 0x3118 - 0x30D6 + .short 0x6, 0x1E, 0xEA, 0x4E, 0x6 + .short 0x62, 0x70, 0x92, 0x0, 0x0, 0x0, 0x0, 0x80 + .short 0x62, 0xEA, 0x92, 0x6, 0x1E, 0xEA, 0x4E, 0x6 + .short 0x62, 0x56, 0x92, 0x66, 0x62, 0xB6, 0x92, 0xC6 + .short 0x62, 0xEA, 0x92, 0x0 .global Unk_ov18_0224954C Unk_ov18_0224954C: ; 0x0224954C - .incbin "incbin/overlay18_rodata.bin", 0x3118, 0x7 + .byte 0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x6, 0x0 @@ -622,15 +636,18 @@ Unk_ov18_0224954C: ; 0x0224954C .global Unk_ov18_0224A45C Unk_ov18_0224A45C: ; 0x0224A45C - .incbin "incbin/overlay18_data.bin", 0xCFC, 0xD14 - 0xCFC + .ascii "char/jbBgStep2.ncg.l" + .space 0x4 .global Unk_ov18_0224A474 Unk_ov18_0224A474: ; 0x0224A474 - .incbin "incbin/overlay18_data.bin", 0xD14, 0xD2C - 0xD14 + .ascii "char/ybBgStep2.ncl.l" + .space 0x4 .global Unk_ov18_0224A48C Unk_ov18_0224A48C: ; 0x0224A48C - .incbin "incbin/overlay18_data.bin", 0xD2C, 0x12 + .asciz "char/jb3Way.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/scenesettest.s b/lib/NitroDWC/asm/util/scenesettest.s index 42d8908492..678e082743 100644 --- a/lib/NitroDWC/asm/util/scenesettest.s +++ b/lib/NitroDWC/asm/util/scenesettest.s @@ -345,7 +345,10 @@ _0223BFA4: .word ov18_022450D0 .global Unk_ov18_02249554 Unk_ov18_02249554: ; 0x02249554 - .incbin "incbin/overlay18_rodata.bin", 0x3120, 0xC + .word ov18_0223BF84 + .word ov18_0223BF98 + .byte 0x3, 0x1 + .space 0x2 @@ -354,15 +357,17 @@ Unk_ov18_02249554: ; 0x02249554 .global Unk_ov18_0224A4A0 Unk_ov18_0224A4A0: ; 0x0224A4A0 - .incbin "incbin/overlay18_data.bin", 0xD40, 0xD58 - 0xD40 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A4B8 Unk_ov18_0224A4B8: ; 0x0224A4B8 - .incbin "incbin/overlay18_data.bin", 0xD58, 0xD70 - 0xD58 + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A4D0 Unk_ov18_0224A4D0: ; 0x0224A4D0 - .incbin "incbin/overlay18_data.bin", 0xD70, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesettestcomplete.s b/lib/NitroDWC/asm/util/scenesettestcomplete.s index 67d8031b1f..a478cba16f 100644 --- a/lib/NitroDWC/asm/util/scenesettestcomplete.s +++ b/lib/NitroDWC/asm/util/scenesettestcomplete.s @@ -214,7 +214,7 @@ _0223C218: .word ov18_0223C0B0 .global Unk_ov18_0224A4E4 Unk_ov18_0224A4E4: ; 0x0224A4E4 - .incbin "incbin/overlay18_data.bin", 0xD84, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesettestconfirm.s b/lib/NitroDWC/asm/util/scenesettestconfirm.s index 56d67c970d..8cbbcbdc2d 100644 --- a/lib/NitroDWC/asm/util/scenesettestconfirm.s +++ b/lib/NitroDWC/asm/util/scenesettestconfirm.s @@ -205,7 +205,9 @@ _0223C46C: .word ov18_0223BBAC .global Unk_ov18_02249560 Unk_ov18_02249560: ; 0x02249560 - .incbin "incbin/overlay18_rodata.bin", 0x312C, 0xC + .word 0x2B + .word 0x2B + .word 0x49 @@ -214,5 +216,6 @@ Unk_ov18_02249560: ; 0x02249560 .global Unk_ov18_0224A4F8 Unk_ov18_0224A4F8: ; 0x0224A4F8 - .incbin "incbin/overlay18_data.bin", 0xD98, 0x13 + .ascii "char/xb4None.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/scenesetusbcomplete.s b/lib/NitroDWC/asm/util/scenesetusbcomplete.s index 9435a85a82..94d5121b69 100644 --- a/lib/NitroDWC/asm/util/scenesetusbcomplete.s +++ b/lib/NitroDWC/asm/util/scenesetusbcomplete.s @@ -185,7 +185,7 @@ _0223C678: .word ov18_0223C59C .global Unk_ov18_0224A50C Unk_ov18_0224A50C: ; 0x0224A50C - .incbin "incbin/overlay18_data.bin", 0xDAC, 0x14 + .asciz "char/xb4Multi.nsc.l" diff --git a/lib/NitroDWC/asm/util/scenesetusbready.s b/lib/NitroDWC/asm/util/scenesetusbready.s index 0dec91f719..b7c04a5c00 100644 --- a/lib/NitroDWC/asm/util/scenesetusbready.s +++ b/lib/NitroDWC/asm/util/scenesetusbready.s @@ -787,27 +787,32 @@ _0223D000: .word ov18_0223CBEC .global Unk_ov18_0224A520 Unk_ov18_0224A520: ; 0x0224A520 - .incbin "incbin/overlay18_data.bin", 0xDC0, 0xDD8 - 0xDC0 + .ascii "char/jbBgStep2.ncg.l" + .space 0x4 .global Unk_ov18_0224A538 Unk_ov18_0224A538: ; 0x0224A538 - .incbin "incbin/overlay18_data.bin", 0xDD8, 0xDF0 - 0xDD8 + .ascii "char/ybBgStep2.ncl.l" + .space 0x4 .global Unk_ov18_0224A550 Unk_ov18_0224A550: ; 0x0224A550 - .incbin "incbin/overlay18_data.bin", 0xDF0, 0xE04 - 0xDF0 + .asciz "char/xb3Multi.nsc.l" .global Unk_ov18_0224A564 Unk_ov18_0224A564: ; 0x0224A564 - .incbin "incbin/overlay18_data.bin", 0xE04, 0xE1C - 0xE04 + .ascii "char/jbBgStep3.ncg.l" + .space 0x4 .global Unk_ov18_0224A57C Unk_ov18_0224A57C: ; 0x0224A57C - .incbin "incbin/overlay18_data.bin", 0xE1C, 0xE34 - 0xE1C + .ascii "char/ybBgStep3.ncl.l" + .space 0x4 .global Unk_ov18_0224A594 Unk_ov18_0224A594: ; 0x0224A594 - .incbin "incbin/overlay18_data.bin", 0xE34, 0x12 + .asciz "char/jb4Usb.nsc.l" + .space 0x2 diff --git a/lib/NitroDWC/asm/util/scrollbar.s b/lib/NitroDWC/asm/util/scrollbar.s index 6bfa12d463..7f28478170 100644 --- a/lib/NitroDWC/asm/util/scrollbar.s +++ b/lib/NitroDWC/asm/util/scrollbar.s @@ -547,11 +547,11 @@ _0223D8D8: .word Unk_ov18_0225337C .global Unk_ov18_0224956C Unk_ov18_0224956C: ; 0x0224956C - .incbin "incbin/overlay18_rodata.bin", 0x3138, 0x313C - 0x3138 + .byte 0x10, 0xF, 0xE, 0x0 .global Unk_ov18_02249570 Unk_ov18_02249570: ; 0x02249570 - .incbin "incbin/overlay18_rodata.bin", 0x313C, 0x3 + .byte 0x55, 0x36, 0x1E, 0x0 diff --git a/lib/NitroDWC/asm/util/search_dwcutil.s b/lib/NitroDWC/asm/util/search_dwcutil.s index 3a0b4b4228..6e5c51a411 100644 --- a/lib/NitroDWC/asm/util/search_dwcutil.s +++ b/lib/NitroDWC/asm/util/search_dwcutil.s @@ -362,16 +362,21 @@ _0223DD70: .word Unk_ov18_02249574 .global Unk_ov18_02249574 Unk_ov18_02249574: ; 0x02249574 - .incbin "incbin/overlay18_rodata.bin", 0x3140, 0x3144 - 0x3140 + .byte 0x0, 0x50, 0xF2, 0x1 .global Unk_ov18_02249578 Unk_ov18_02249578: ; 0x02249578 - .incbin "incbin/overlay18_rodata.bin", 0x3144, 0x314C - 0x3144 + .space 0x8 .global Unk_ov18_02249580 Unk_ov18_02249580: ; 0x02249580 - .incbin "incbin/overlay18_rodata.bin", 0x314C, 0x44 - + .space 0x4 + .byte 0x0, 0x4, 0xFF, 0x3F + .space 0x2 + .short 0xFFFF + .short 0xFFFF + .short 0xFFFF + .space 0x34 .bss diff --git a/lib/NitroDWC/asm/util/setting.s b/lib/NitroDWC/asm/util/setting.s index 61d4c8ed20..688b94c247 100644 --- a/lib/NitroDWC/asm/util/setting.s +++ b/lib/NitroDWC/asm/util/setting.s @@ -920,7 +920,7 @@ ov18_0223E8BC: ; 0x0223E8BC .global Unk_ov18_022495C4 Unk_ov18_022495C4: ; 0x022495C4 - .incbin "incbin/overlay18_rodata.bin", 0x3190, 0x4 + .space 0x4 @@ -929,7 +929,8 @@ Unk_ov18_022495C4: ; 0x022495C4 .global Unk_ov18_0224A5A8 Unk_ov18_0224A5A8: ; 0x0224A5A8 - .incbin "incbin/overlay18_data.bin", 0xE48, 0xD + .ascii "%3d%3d%3d%3d" + .space 0x4 diff --git a/lib/NitroDWC/asm/util/sound.s b/lib/NitroDWC/asm/util/sound.s index 0bb41efaae..2084f03c78 100644 --- a/lib/NitroDWC/asm/util/sound.s +++ b/lib/NitroDWC/asm/util/sound.s @@ -130,7 +130,7 @@ _0223EA24: .word NNS_SndMain .global Unk_ov18_0224A5B8 Unk_ov18_0224A5B8: ; 0x0224A5B8 - .incbin "incbin/overlay18_data.bin", 0xE58, 0x18 + .asciz "sound/sound_data.sdat.l" diff --git a/lib/NitroDWC/asm/util/step.s b/lib/NitroDWC/asm/util/step.s index 6e5f29618b..72c0ac3a44 100644 --- a/lib/NitroDWC/asm/util/step.s +++ b/lib/NitroDWC/asm/util/step.s @@ -852,15 +852,18 @@ _0223F560: .word Unk_ov18_0225338C .global Unk_ov18_022495C8 Unk_ov18_022495C8: ; 0x022495C8 - .incbin "incbin/overlay18_rodata.bin", 0x3194, 0x31A3 - 0x3194 + .short 0x1, 0x5, 0x406, 0x200, 0x600, 0x4 + .short 0x5 + .byte 0x3 .global Unk_ov18_022495D7 Unk_ov18_022495D7: ; 0x022495D7 - .incbin "incbin/overlay18_rodata.bin", 0x31A3, 0x31B2 - 0x31A3 + .byte 0x2, 0x1, 0x3, 0x1, 0x3, 0x5, 0x1, 0x4, 0x1, 0x5, 0x7, 0x1, 0x7, 0x1, 0x6 .global Unk_ov18_022495E6 Unk_ov18_022495E6: ; 0x022495E6 - .incbin "incbin/overlay18_rodata.bin", 0x31B2, 0x14 + .short 0x20, 0x21, 0x50, 0x30, 0x68, 0x21, 0x98 + .short 0x30, 0xB0, 0x21 @@ -869,28 +872,35 @@ Unk_ov18_022495E6: ; 0x022495E6 .global Unk_ov18_0224A5D0 Unk_ov18_0224A5D0: ; 0x0224A5D0 - .incbin "incbin/overlay18_data.bin", 0xE70, 0xE84 - 0xE70 + .ascii "char/jtTop.nsc.l" + .space 0x4 .global Unk_ov18_0224A5E4 Unk_ov18_0224A5E4: ; 0x0224A5E4 - .incbin "incbin/overlay18_data.bin", 0xE84, 0xE98 - 0xE84 + .ascii "char/jtStep1.nsc.l" + .space 0x2 .global Unk_ov18_0224A5F8 Unk_ov18_0224A5F8: ; 0x0224A5F8 - .incbin "incbin/overlay18_data.bin", 0xE98, 0xEAC - 0xE98 + .ascii "char/jtStep2.nsc.l" + .space 0x2 .global Unk_ov18_0224A60C Unk_ov18_0224A60C: ; 0x0224A60C - .incbin "incbin/overlay18_data.bin", 0xEAC, 0xEC0 - 0xEAC + .ascii "char/jtStep3.nsc.l" + .space 0x2 .global Unk_ov18_0224A620 Unk_ov18_0224A620: ; 0x0224A620 - .incbin "incbin/overlay18_data.bin", 0xEC0, 0xED4 - 0xEC0 + .asciz "char/jtOption.nsc.l" .global Unk_ov18_0224A634 Unk_ov18_0224A634: ; 0x0224A634 - .incbin "incbin/overlay18_data.bin", 0xED4, 0x14 - + .word Unk_ov18_0224A5E4 + .word Unk_ov18_0224A5F8 + .word Unk_ov18_0224A60C + .word Unk_ov18_0224A620 + .word Unk_ov18_0224A5D0 .bss diff --git a/lib/NitroDWC/asm/util/task.s b/lib/NitroDWC/asm/util/task.s index 3558e640f1..a60bdae9c4 100644 --- a/lib/NitroDWC/asm/util/task.s +++ b/lib/NitroDWC/asm/util/task.s @@ -275,7 +275,7 @@ _02246430: .word Unk_ov18_02253424 .global Unk_ov18_0224973C Unk_ov18_0224973C: ; 0x0224973C - .incbin "incbin/overlay18_rodata.bin", 0x3308, 0x2 + .byte 0x80, 0x20, 0x0, 0x0 diff --git a/lib/NitroDWC/asm/util/usbap.s b/lib/NitroDWC/asm/util/usbap.s index 50cb61ed83..9377348126 100644 --- a/lib/NitroDWC/asm/util/usbap.s +++ b/lib/NitroDWC/asm/util/usbap.s @@ -520,15 +520,23 @@ _0223FC44: .word Unk_ov18_022495FC .global Unk_ov18_022495FC Unk_ov18_022495FC: ; 0x022495FC - .incbin "incbin/overlay18_rodata.bin", 0x31C8, 0x31D0 - 0x31C8 + .space 0x8 .global Unk_ov18_02249604 Unk_ov18_02249604: ; 0x02249604 - .incbin "incbin/overlay18_rodata.bin", 0x31D0, 0x31DC - 0x31D0 + .ascii "NWCUSBAP" + .space 0x4 .global Unk_ov18_02249610 Unk_ov18_02249610: ; 0x02249610 - .incbin "incbin/overlay18_rodata.bin", 0x31DC, 0x44 + .space 0x4 + .byte 0x0, 0x4, 0xFF, 0x3F + .space 0x2 + .short 0xFFFF, 0xFFFF, 0xFFFF + .short 0x2, 0x20 + .space 0x20 + .word 0x8 + .space 0xC diff --git a/lib/NitroDWC/asm/util/window.s b/lib/NitroDWC/asm/util/window.s index 3e6fb85ad0..bea88c6272 100644 --- a/lib/NitroDWC/asm/util/window.s +++ b/lib/NitroDWC/asm/util/window.s @@ -839,55 +839,75 @@ _022407AC: .word Unk_ov18_02253398 .global Unk_ov18_02249654 Unk_ov18_02249654: ; 0x02249654 - .incbin "incbin/overlay18_rodata.bin", 0x3220, 0x3224 - 0x3220 + .short 0x8 + .short 0x8 .global Unk_ov18_02249658 Unk_ov18_02249658: ; 0x02249658 - .incbin "incbin/overlay18_rodata.bin", 0x3224, 0x322A - 0x3224 + .byte 0x1, 0x1 + .space 0x2 + .byte 0x1, 0x1 .global Unk_ov18_0224965E Unk_ov18_0224965E: ; 0x0224965E - .incbin "incbin/overlay18_rodata.bin", 0x322A, 0x3232 - 0x322A + .short 0x4, 0x1D, 0xFC, 0x44 .global Unk_ov18_02249666 Unk_ov18_02249666: ; 0x02249666 - .incbin "incbin/overlay18_rodata.bin", 0x3232, 0x323C - 0x3232 + .space 0x1 + .byte 0x1, 0x1 + .space 0x2 + .byte 0x1, 0x1 + .space 0x2 + .byte 0x1 .global Unk_ov18_02249670 Unk_ov18_02249670: ; 0x02249670 - .incbin "incbin/overlay18_rodata.bin", 0x323C, 0x3246 - 0x323C + .short 0x1, 0xFF00 + .short 0x1, 0xFF00, 0x1 .global Unk_ov18_0224967A Unk_ov18_0224967A: ; 0x0224967A - .incbin "incbin/overlay18_rodata.bin", 0x3246, 0x3250 - 0x3246 + .byte 0x1B, 0x19, 0x57, 0x0, 0x23, 0x1D, 0x59, 0x0, 0x23, 0x1D .global Unk_ov18_02249684 Unk_ov18_02249684: ; 0x02249684 - .incbin "incbin/overlay18_rodata.bin", 0x3250, 0x3264 - 0x3250 + .short 0x6C, 0x10, 0x6C, 0x10, 0x78, 0x10, 0x78, 0x10, 0x78, 0x10 .global Unk_ov18_02249698 Unk_ov18_02249698: ; 0x02249698 - .incbin "incbin/overlay18_rodata.bin", 0x3264, 0x327C - 0x3264 + .short 0xD8, 0x50, 0xD8, 0x50, 0xE6, 0x4F + .short 0xE6, 0x4F, 0xE6, 0x48, 0xDA, 0x5C .global Unk_ov18_022496B0 Unk_ov18_022496B0: ; 0x022496B0 - .incbin "incbin/overlay18_rodata.bin", 0x327C, 0x3294 - 0x327C + .short 0xB, 0x27 + .short 0xB, 0x27, 0x4, 0x4C, 0x4, 0x4C, 0x4, 0x54 + .short 0xB, 0x27 .global Unk_ov18_022496C8 Unk_ov18_022496C8: ; 0x022496C8 - .incbin "incbin/overlay18_rodata.bin", 0x3294, 0x32AC - 0x3294 + .short 0xEA, 0x72, 0xEA, 0x72, 0xF8, 0x70 + .short 0xF8, 0x70, 0x64, 0x70, 0xEA, 0x72 .global Unk_ov18_022496E0 Unk_ov18_022496E0: ; 0x022496E0 - .incbin "incbin/overlay18_rodata.bin", 0x32AC, 0x32D4 - 0x32AC + .short 0x10, 0x84 + .short 0x84, 0x84, 0x10, 0x84, 0x84, 0x84, 0x9, 0xA7 + .short 0x83, 0xA7, 0x9, 0xA7, 0x83, 0xA7, 0x9, 0xA7 + .short 0x83, 0xA7 .global Unk_ov18_02249708 Unk_ov18_02249708: ; 0x02249708 - .incbin "incbin/overlay18_rodata.bin", 0x32D4, 0x32DC - 0x32D4 + .space 0x2 + .ascii "FFO/" + .space 0x2 .global Unk_ov18_02249710 Unk_ov18_02249710: ; 0x02249710 - .incbin "incbin/overlay18_rodata.bin", 0x32DC, 0x6 + .byte 0x2, 0x1 + .byte 0x2, 0x1 + .byte 0x2, 0x0 diff --git a/lib/NitroSDK/asm/dgt/hash1.s b/lib/NitroSDK/asm/dgt/hash1.s index 0977558191..fee950d1b5 100644 --- a/lib/NitroSDK/asm/dgt/hash1.s +++ b/lib/NitroSDK/asm/dgt/hash1.s @@ -388,7 +388,7 @@ _020C9178: .word Unk_02101174 .global Unk_02101170 Unk_02101170: ; 0x02101170 - .incbin "incbin/arm9_data.bin", 0x2490, 0x2494 - 0x2490 + .word 0x80 .global Unk_02101174 Unk_02101174: ; 0x02101174 @@ -443,5 +443,5 @@ Unk_02101174: ; 0x02101174 .global Unk_02101234 Unk_02101234: ; 0x02101234 - .incbin "incbin/arm9_data.bin", 0x2554, 0x100 + .incbin "incbin/hash1.bin", 0x0, 0x100 diff --git a/lib/NitroSDK/asm/dgt/hash2.s b/lib/NitroSDK/asm/dgt/hash2.s index de0476be69..5801c4f4fd 100644 --- a/lib/NitroSDK/asm/dgt/hash2.s +++ b/lib/NitroSDK/asm/dgt/hash2.s @@ -1,7 +1,7 @@ .include "macros/function.inc" .include "include/hash2.inc" - + .text @@ -312,15 +312,33 @@ _020C95AC: .word DGT_Hash2GetDigest .global Unk_020FE4E8 Unk_020FE4E8: ; 0x020FE4E8 - .incbin "incbin/arm9_rodata.bin", 0x198A8, 0x198C4 - 0x198A8 + .word 0x14 + .word 0x40 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x0 .global Unk_020FE504 Unk_020FE504: ; 0x020FE504 - .incbin "incbin/arm9_rodata.bin", 0x198C4, 0x198E0 - 0x198C4 + .word 0x14 + .word 0x40 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x0 .global Unk_020FE520 Unk_020FE520: ; 0x020FE520 - .incbin "incbin/arm9_rodata.bin", 0x198E0, 0x1C + .word 0x14 + .word 0x40 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x0 + .word 0x0 @@ -329,19 +347,25 @@ Unk_020FE520: ; 0x020FE520 .global Unk_02101334 Unk_02101334: ; 0x02101334 - .incbin "incbin/arm9_data.bin", 0x2654, 0x2658 - 0x2654 + .word 0x61 .global Unk_02101338 Unk_02101338: ; 0x02101338 - .incbin "incbin/arm9_data.bin", 0x2658, 0x265C - 0x2658 + .word DGTi_hash2_arm4_small .global Unk_0210133C Unk_0210133C: ; 0x0210133C - .incbin "incbin/arm9_data.bin", 0x265C, 0x266C - 0x265C + .word Unk_021013A0 + .word Unk_021013B8 + .word Unk_02101370 + .word Unk_02101388 .global Unk_0210134C Unk_0210134C: ; 0x0210134C - .incbin "incbin/arm9_data.bin", 0x266C, 0x267C - 0x266C + .word Unk_0210136C + .word Unk_021013D0 + .word Unk_02101334 + .word Unk_0210140C .global Unk_0210135C Unk_0210135C: ; 0x0210135C @@ -352,29 +376,29 @@ Unk_0210135C: ; 0x0210135C .global Unk_0210136C Unk_0210136C: ; 0x0210136C - .incbin "incbin/arm9_data.bin", 0x268C, 0x2690 - 0x268C + .incbin "incbin/hash2.bin", 0x0, 0x4 .global Unk_02101370 Unk_02101370: ; 0x02101370 - .incbin "incbin/arm9_data.bin", 0x2690, 0x26A8 - 0x2690 + .incbin "incbin/hash2.bin", 0x4, 0x1C - 0x4 .global Unk_02101388 Unk_02101388: ; 0x02101388 - .incbin "incbin/arm9_data.bin", 0x26A8, 0x26C0 - 0x26A8 + .incbin "incbin/hash2.bin", 0x1C, 0x34 - 0x1C .global Unk_021013A0 Unk_021013A0: ; 0x021013A0 - .incbin "incbin/arm9_data.bin", 0x26C0, 0x26D8 - 0x26C0 + .incbin "incbin/hash2.bin", 0x34, 0x4C - 0x34 .global Unk_021013B8 Unk_021013B8: ; 0x021013B8 - .incbin "incbin/arm9_data.bin", 0x26D8, 0x26F0 - 0x26D8 + .incbin "incbin/hash2.bin", 0x4C, 0x64 - 0x4C .global Unk_021013D0 Unk_021013D0: ; 0x021013D0 - .incbin "incbin/arm9_data.bin", 0x26F0, 0x272C - 0x26F0 + .incbin "incbin/hash2.bin", 0x64, 0xA0 - 0x64 .global Unk_0210140C Unk_0210140C: ; 0x0210140C - .incbin "incbin/arm9_data.bin", 0x272C, 0x41 + .incbin "incbin/hash2.bin", 0xA0, 0x41 diff --git a/lib/NitroSDK/asm/dgt/incbin/hash1.bin b/lib/NitroSDK/asm/dgt/incbin/hash1.bin new file mode 100644 index 0000000000..6c11c85124 Binary files /dev/null and b/lib/NitroSDK/asm/dgt/incbin/hash1.bin differ diff --git a/lib/NitroSDK/asm/dgt/incbin/hash2.bin b/lib/NitroSDK/asm/dgt/incbin/hash2.bin new file mode 100644 index 0000000000..f6f27ffc91 Binary files /dev/null and b/lib/NitroSDK/asm/dgt/incbin/hash2.bin differ diff --git a/lib/NitroSDK/asm/dgt/include/hash2.inc b/lib/NitroSDK/asm/dgt/include/hash2.inc index 5cf66721d6..cfc49466f4 100644 --- a/lib/NitroSDK/asm/dgt/include/hash2.inc +++ b/lib/NitroSDK/asm/dgt/include/hash2.inc @@ -3,4 +3,5 @@ .public DGT_Hash2Reset .public DGT_Hash2SetSource .public DGT_Hash2GetDigest +.public DGTi_hash2_arm4_small .public HmacCalc diff --git a/lib/NitroSDK/asm/os/os_emulator.s b/lib/NitroSDK/asm/os/os_emulator.s index 1a2dc09716..ebc2bc4f90 100644 --- a/lib/NitroSDK/asm/os/os_emulator.s +++ b/lib/NitroSDK/asm/os/os_emulator.s @@ -27,5 +27,5 @@ _020C2744: .word Unk_0210115C .global Unk_0210115C Unk_0210115C: ; 0x0210115C - .incbin "incbin/arm9_data.bin", 0x247C, 0x4 + .word 0xFFFFFFFF diff --git a/lib/NitroSystem/asm/g3d/incbin/nsbca.bin b/lib/NitroSystem/asm/g3d/incbin/nsbca.bin new file mode 100644 index 0000000000..e6ba1e4931 Binary files /dev/null and b/lib/NitroSystem/asm/g3d/incbin/nsbca.bin differ diff --git a/lib/NitroSystem/asm/g3d/nsbca.s b/lib/NitroSystem/asm/g3d/nsbca.s index 97fba10536..313d7e615c 100644 --- a/lib/NitroSystem/asm/g3d/nsbca.s +++ b/lib/NitroSystem/asm/g3d/nsbca.s @@ -1604,5 +1604,5 @@ _020B53D4: .word 0x020F981B .global Unk_020F9818 Unk_020F9818: ; 0x020F9818 - .incbin "incbin/arm9_rodata.bin", 0x14BD8, 0x24 + .incbin "incbin/nsbca.bin", 0x0, 0x24 diff --git a/lib/NitroWiFi/asm/cps/incbin/network.bin b/lib/NitroWiFi/asm/cps/incbin/network.bin new file mode 100644 index 0000000000..4e4f8c0e5d Binary files /dev/null and b/lib/NitroWiFi/asm/cps/incbin/network.bin differ diff --git a/lib/NitroWiFi/asm/cps/network.s b/lib/NitroWiFi/asm/cps/network.s index 5e9672242a..03e2ef45f7 100644 --- a/lib/NitroWiFi/asm/cps/network.s +++ b/lib/NitroWiFi/asm/cps/network.s @@ -5743,19 +5743,19 @@ Unk_02000C58: ; 0x02000C58 .global Unk_ov4_0221A190 Unk_ov4_0221A190: ; 0x0221A190 - .incbin "incbin/overlay4_data.bin", 0x4310, 0x4314 - 0x4310 + .incbin "incbin/network.bin", 0x0, 0x4 .global Unk_ov4_0221A194 Unk_ov4_0221A194: ; 0x0221A194 - .incbin "incbin/overlay4_data.bin", 0x4314, 0x431C - 0x4314 + .incbin "incbin/network.bin", 0x4, 0xC - 0x4 .global Unk_ov4_0221A19C Unk_ov4_0221A19C: ; 0x0221A19C - .incbin "incbin/overlay4_data.bin", 0x431C, 0x4328 - 0x431C + .incbin "incbin/network.bin", 0xC, 0x18 - 0xC .global Unk_ov4_0221A1A8 Unk_ov4_0221A1A8: ; 0x0221A1A8 - .incbin "incbin/overlay4_data.bin", 0x4328, 0xB + .incbin "incbin/network.bin", 0x18, 0xB diff --git a/lib/NitroWiFi/asm/ssl/incbin/md5.bin b/lib/NitroWiFi/asm/ssl/incbin/md5.bin new file mode 100644 index 0000000000..2c18ebda78 Binary files /dev/null and b/lib/NitroWiFi/asm/ssl/incbin/md5.bin differ diff --git a/lib/NitroWiFi/asm/ssl/incbin/sha1.bin b/lib/NitroWiFi/asm/ssl/incbin/sha1.bin new file mode 100644 index 0000000000..4b54fd4659 Binary files /dev/null and b/lib/NitroWiFi/asm/ssl/incbin/sha1.bin differ diff --git a/lib/NitroWiFi/asm/ssl/incbin/ssl.bin b/lib/NitroWiFi/asm/ssl/incbin/ssl.bin new file mode 100644 index 0000000000..fd56ac5b98 Binary files /dev/null and b/lib/NitroWiFi/asm/ssl/incbin/ssl.bin differ diff --git a/lib/NitroWiFi/asm/ssl/md5.s b/lib/NitroWiFi/asm/ssl/md5.s index 298199ce19..8baa5fdc6c 100644 --- a/lib/NitroWiFi/asm/ssl/md5.s +++ b/lib/NitroWiFi/asm/ssl/md5.s @@ -412,13 +412,13 @@ _0221149C: .word Unk_ov4_0221A264 .global Unk_ov4_0221A224 Unk_ov4_0221A224: ; 0x0221A224 - .incbin "incbin/overlay4_data.bin", 0x43A4, 0x43E4 - 0x43A4 + .incbin "incbin/md5.bin", 0x0, 0x40 .global Unk_ov4_0221A264 Unk_ov4_0221A264: ; 0x0221A264 - .incbin "incbin/overlay4_data.bin", 0x43E4, 0x4424 - 0x43E4 + .incbin "incbin/md5.bin", 0x40, 0x80 - 0x40 .global Unk_ov4_0221A2A4 Unk_ov4_0221A2A4: ; 0x0221A2A4 - .incbin "incbin/overlay4_data.bin", 0x4424, 0x100 + .incbin "incbin/md5.bin", 0x80, 0x100 diff --git a/lib/NitroWiFi/asm/ssl/sha1.s b/lib/NitroWiFi/asm/ssl/sha1.s index e8b56a684b..fa90d198d9 100644 --- a/lib/NitroWiFi/asm/ssl/sha1.s +++ b/lib/NitroWiFi/asm/ssl/sha1.s @@ -631,5 +631,5 @@ _02211D98: .word 0x0221A3A5 .global Unk_ov4_0221A3A4 Unk_ov4_0221A3A4: ; 0x0221A3A4 - .incbin "incbin/overlay4_data.bin", 0x4524, 0x5C + .incbin "incbin/sha1.bin", 0x0, 0x5C diff --git a/lib/NitroWiFi/asm/ssl/ssl.s b/lib/NitroWiFi/asm/ssl/ssl.s index 6b20a36166..eaf317a8a9 100644 --- a/lib/NitroWiFi/asm/ssl/ssl.s +++ b/lib/NitroWiFi/asm/ssl/ssl.s @@ -3886,7 +3886,7 @@ Unk_02000C70: ; 0x02000C70 .global Unk_ov4_02215E40 Unk_ov4_02215E40: ; 0x02215E40 - .incbin "incbin/overlay4_rodata.bin", 0x5D8, 0x7 + .byte 0x15, 0x3, 0x0, 0x0, 0x2, 0x1, 0x29, 0x0 @@ -3895,59 +3895,59 @@ Unk_ov4_02215E40: ; 0x02215E40 .global Unk_ov4_0221A1B4 Unk_ov4_0221A1B4: ; 0x0221A1B4 - .incbin "incbin/overlay4_data.bin", 0x4334, 0x4338 - 0x4334 + .incbin "incbin/ssl.bin", 0x0, 0x4 .global Unk_ov4_0221A1B8 Unk_ov4_0221A1B8: ; 0x0221A1B8 - .incbin "incbin/overlay4_data.bin", 0x4338, 0x433C - 0x4338 + .incbin "incbin/ssl.bin", 0x4, 0x8 - 0x4 .global Unk_ov4_0221A1BC Unk_ov4_0221A1BC: ; 0x0221A1BC - .incbin "incbin/overlay4_data.bin", 0x433C, 0x4340 - 0x433C + .incbin "incbin/ssl.bin", 0x8, 0xC - 0x8 .global Unk_ov4_0221A1C0 Unk_ov4_0221A1C0: ; 0x0221A1C0 - .incbin "incbin/overlay4_data.bin", 0x4340, 0x4344 - 0x4340 + .incbin "incbin/ssl.bin", 0xC, 0x10 - 0xC .global Unk_ov4_0221A1C4 Unk_ov4_0221A1C4: ; 0x0221A1C4 - .incbin "incbin/overlay4_data.bin", 0x4344, 0x435C - 0x4344 + .incbin "incbin/ssl.bin", 0x10, 0x28 - 0x10 .global Unk_ov4_0221A1DC Unk_ov4_0221A1DC: ; 0x0221A1DC - .incbin "incbin/overlay4_data.bin", 0x435C, 0x4364 - 0x435C + .incbin "incbin/ssl.bin", 0x28, 0x30 - 0x28 .global Unk_ov4_0221A1E4 Unk_ov4_0221A1E4: ; 0x0221A1E4 - .incbin "incbin/overlay4_data.bin", 0x4364, 0x4370 - 0x4364 + .incbin "incbin/ssl.bin", 0x30, 0x3C - 0x30 .global Unk_ov4_0221A1F0 Unk_ov4_0221A1F0: ; 0x0221A1F0 - .incbin "incbin/overlay4_data.bin", 0x4370, 0x437C - 0x4370 + .incbin "incbin/ssl.bin", 0x3C, 0x48 - 0x3C .global Unk_ov4_0221A1FC Unk_ov4_0221A1FC: ; 0x0221A1FC - .incbin "incbin/overlay4_data.bin", 0x437C, 0x4388 - 0x437C + .incbin "incbin/ssl.bin", 0x48, 0x54 - 0x48 .global Unk_ov4_0221A208 Unk_ov4_0221A208: ; 0x0221A208 - .incbin "incbin/overlay4_data.bin", 0x4388, 0x438C - 0x4388 + .incbin "incbin/ssl.bin", 0x54, 0x58 - 0x54 .global Unk_ov4_0221A20C Unk_ov4_0221A20C: ; 0x0221A20C - .incbin "incbin/overlay4_data.bin", 0x438C, 0x4390 - 0x438C + .incbin "incbin/ssl.bin", 0x58, 0x5C - 0x58 .global Unk_ov4_0221A210 Unk_ov4_0221A210: ; 0x0221A210 - .incbin "incbin/overlay4_data.bin", 0x4390, 0x4394 - 0x4390 + .incbin "incbin/ssl.bin", 0x5C, 0x60 - 0x5C .global Unk_ov4_0221A214 Unk_ov4_0221A214: ; 0x0221A214 - .incbin "incbin/overlay4_data.bin", 0x4394, 0x439C - 0x4394 + .incbin "incbin/ssl.bin", 0x60, 0x68 - 0x60 .global Unk_ov4_0221A21C Unk_ov4_0221A21C: ; 0x0221A21C - .incbin "incbin/overlay4_data.bin", 0x439C, 0x5 + .incbin "incbin/ssl.bin", 0x68, 0x5 diff --git a/lib/gamespy/asm/available.s b/lib/gamespy/asm/available.s index 0852c53aa3..34e3f78dca 100644 --- a/lib/gamespy/asm/available.s +++ b/lib/gamespy/asm/available.s @@ -276,11 +276,12 @@ _021E99E8: .word Unk_ov4_0221AE50 .global Unk_ov4_022176A4 Unk_ov4_022176A4: ; 0x022176A4 - .incbin "incbin/overlay4_data.bin", 0x1824, 0x1848 - 0x1824 + .ascii "%s.available.gs.nintendowifi.net" + .space 0x4 .global Unk_ov4_022176C8 Unk_ov4_022176C8: ; 0x022176C8 - .incbin "incbin/overlay4_data.bin", 0x1848, 0x4 + .byte 0xFE, 0xFD, 0x9, 0x0 diff --git a/lib/gamespy/asm/chat/chatcallbacks.s b/lib/gamespy/asm/chat/chatcallbacks.s index c823f182d2..10e00beb07 100644 --- a/lib/gamespy/asm/chat/chatcallbacks.s +++ b/lib/gamespy/asm/chat/chatcallbacks.s @@ -3447,121 +3447,144 @@ ov66_0224B3F8: ; 0x0224B3F8 .global Unk_ov66_022592C8 Unk_ov66_022592C8: ; 0x022592C8 - .incbin "incbin/overlay66_data.bin", 0x5A8, 0x5B8 - 0x5A8 + .ascii "ciAddCallback_" + .space 0x2 .global Unk_ov66_022592D8 Unk_ov66_022592D8: ; 0x022592D8 - .incbin "incbin/overlay66_data.bin", 0x5B8, 0x5C8 - 0x5B8 + .ascii "ciCallCallback" + .space 0x2 .global Unk_ov66_022592E8 Unk_ov66_022592E8: ; 0x022592E8 - .incbin "incbin/overlay66_data.bin", 0x5C8, 0x5D8 - 0x5C8 + .asciz "ciCallCallbacks" .global Unk_ov66_022592F8 Unk_ov66_022592F8: ; 0x022592F8 - .incbin "incbin/overlay66_data.bin", 0x5D8, 0x5EC - 0x5D8 + .ascii "ciFreeCallbackData" + .space 0x2 .global Unk_ov66_0225930C Unk_ov66_0225930C: ; 0x0225930C - .incbin "incbin/overlay66_data.bin", 0x5EC, 0x600 - 0x5EC + .ascii "ciCleanupCallbacks" + .space 0x2 .global Unk_ov66_02259320 Unk_ov66_02259320: ; 0x02259320 - .incbin "incbin/overlay66_data.bin", 0x600, 0x618 - 0x600 + .ascii "ciGetCallbackIndexByID" + .space 0x2 .global Unk_ov66_02259338 Unk_ov66_02259338: ; 0x02259338 - .incbin "incbin/overlay66_data.bin", 0x618, 0x638 - 0x618 + .asciz "ciCallbacksArrayElementFreeFn" + .space 0x2 .global Unk_ov66_02259358 Unk_ov66_02259358: ; 0x02259358 - .incbin "incbin/overlay66_data.bin", 0x638, 0x648 - 0x638 + .ascii "data != NULL" + .space 0x4 .global Unk_ov66_02259368 Unk_ov66_02259368: ; 0x02259368 - .incbin "incbin/overlay66_data.bin", 0x648, 0x658 - 0x648 + .asciz "chatCallbacks.c" .global Unk_ov66_02259378 Unk_ov66_02259378: ; 0x02259378 - .incbin "incbin/overlay66_data.bin", 0x658, 0x668 - 0x658 + .asciz "data->type >= 0" .global Unk_ov66_02259388 Unk_ov66_02259388: ; 0x02259388 - .incbin "incbin/overlay66_data.bin", 0x668, 0x684 - 0x668 + .asciz "data->type < CALLBACK_NUM" + .space 0x2 .global Unk_ov66_022593A4 Unk_ov66_022593A4: ; 0x022593A4 - .incbin "incbin/overlay66_data.bin", 0x684, 0x69C - 0x684 + .ascii "data->callback != NULL" + .space 0x2 .global Unk_ov66_022593BC Unk_ov66_022593BC: ; 0x022593BC - .incbin "incbin/overlay66_data.bin", 0x69C, 0x6BC - 0x69C + .ascii "data->callbackParams != NULL" + .space 0x4 .global Unk_ov66_022593DC Unk_ov66_022593DC: ; 0x022593DC - .incbin "incbin/overlay66_data.bin", 0x6BC, 0x6CC - 0x6BC + .asciz "data->ID >= 0" + .space 0x2 .global Unk_ov66_022593EC Unk_ov66_022593EC: ; 0x022593EC - .incbin "incbin/overlay66_data.bin", 0x6CC, 0x6D0 - 0x6CC + .word 0x30 .global Unk_ov66_022593F0 Unk_ov66_022593F0: ; 0x022593F0 - .incbin "incbin/overlay66_data.bin", 0x6D0, 0x6E0 - 0x6D0 + .ascii "chat != NULL" + .space 0x4 .global Unk_ov66_02259400 Unk_ov66_02259400: ; 0x02259400 - .incbin "incbin/overlay66_data.bin", 0x6E0, 0x6EC - 0x6E0 + .asciz "type >= 0" + .space 0x2 .global Unk_ov66_0225940C Unk_ov66_0225940C: ; 0x0225940C - .incbin "incbin/overlay66_data.bin", 0x6EC, 0x700 - 0x6EC + .asciz "type < CALLBACK_NUM" .global Unk_ov66_02259420 Unk_ov66_02259420: ; 0x02259420 - .incbin "incbin/overlay66_data.bin", 0x700, 0x724 - 0x700 + .ascii "connection->callbackList != NULL" + .space 0x4 .global Unk_ov66_02259444 Unk_ov66_02259444: ; 0x02259444 - .incbin "incbin/overlay66_data.bin", 0x724, 0x738 - 0x724 + .ascii "callback != NULL" + .space 0x4 .global Unk_ov66_02259458 Unk_ov66_02259458: ; 0x02259458 - .incbin "incbin/overlay66_data.bin", 0x738, 0x750 - 0x738 + .ascii "callbackParams != NULL" + .space 0x2 .global Unk_ov66_02259470 Unk_ov66_02259470: ; 0x02259470 - .incbin "incbin/overlay66_data.bin", 0x750, 0x768 - 0x750 + .ascii "callbackParamsSize > 0" + .space 0x2 .global Unk_ov66_02259488 Unk_ov66_02259488: ; 0x02259488 - .incbin "incbin/overlay66_data.bin", 0x768, 0x770 - 0x768 + .asciz "ID >= 0" .global Unk_ov66_02259490 Unk_ov66_02259490: ; 0x02259490 - .incbin "incbin/overlay66_data.bin", 0x770, 0x790 - 0x770 + .ascii "srcParams-> numChannels >= 0" + .space 0x4 .global Unk_ov66_022594B0 Unk_ov66_022594B0: ; 0x022594B0 - .incbin "incbin/overlay66_data.bin", 0x790, 0x7AC - 0x790 + .asciz "srcParams->numUsers != NULL" .global Unk_ov66_022594CC Unk_ov66_022594CC: ; 0x022594CC - .incbin "incbin/overlay66_data.bin", 0x7AC, 0x7C8 - 0x7AC + .asciz "srcParams-> numUsers >= 0" + .space 0x2 .global Unk_ov66_022594E8 Unk_ov66_022594E8: ; 0x022594E8 - .incbin "incbin/overlay66_data.bin", 0x7C8, 0x7E4 - 0x7C8 + .ascii "srcParams->modes != NULL" + .space 0x4 .global Unk_ov66_02259504 Unk_ov66_02259504: ; 0x02259504 - .incbin "incbin/overlay66_data.bin", 0x7E4, 0x800 - 0x7E4 + .ascii "srcParams-> numBans >= 0" + .space 0x4 .global Unk_ov66_02259520 Unk_ov66_02259520: ; 0x02259520 - .incbin "incbin/overlay66_data.bin", 0x800, 0x824 - 0x800 + .ascii "srcParams-> numSuggestedNicks >= 0" + .space 0x2 .global Unk_ov66_02259544 Unk_ov66_02259544: ; 0x02259544 - .incbin "incbin/overlay66_data.bin", 0x824, 0x15 + .ascii "srcParams-> num >= 0" + .space 0x4 diff --git a/asm/incbin/overlay66_data.bin b/lib/gamespy/asm/chat/incbin/overlay66_data.bin similarity index 100% rename from asm/incbin/overlay66_data.bin rename to lib/gamespy/asm/chat/incbin/overlay66_data.bin diff --git a/lib/gamespy/asm/darray.s b/lib/gamespy/asm/darray.s index 3ccf5d48ac..a6480349ec 100644 --- a/lib/gamespy/asm/darray.s +++ b/lib/gamespy/asm/darray.s @@ -663,85 +663,103 @@ _021EA1F4: .global Unk_ov4_022176CC Unk_ov4_022176CC: ; 0x022176CC - .incbin "incbin/overlay4_data.bin", 0x184C, 0x1858 - 0x184C + .ascii "ArrayMap" + .space 0x4 .global Unk_ov4_022176D8 Unk_ov4_022176D8: ; 0x022176D8 - .incbin "incbin/overlay4_data.bin", 0x1858, 0x1864 - 0x1858 + .ascii "ArrayNth" + .space 0x4 .global Unk_ov4_022176E4 Unk_ov4_022176E4: ; 0x022176E4 - .incbin "incbin/overlay4_data.bin", 0x1864, 0x1870 - 0x1864 + .ascii "ArrayNew" + .space 0x4 .global Unk_ov4_022176F0 Unk_ov4_022176F0: ; 0x022176F0 - .incbin "incbin/overlay4_data.bin", 0x1870, 0x187C - 0x1870 + .asciz "ArrayFree" + .space 0x2 .global Unk_ov4_022176FC Unk_ov4_022176FC: ; 0x022176FC - .incbin "incbin/overlay4_data.bin", 0x187C, 0x1888 - 0x187C + .asciz "ArrayGrow" + .space 0x2 .global Unk_ov4_02217708 Unk_ov4_02217708: ; 0x02217708 - .incbin "incbin/overlay4_data.bin", 0x1888, 0x1894 - 0x1888 + .asciz "ArrayAppend" .global Unk_ov4_02217714 Unk_ov4_02217714: ; 0x02217714 - .incbin "incbin/overlay4_data.bin", 0x1894, 0x18A4 - 0x1894 + .asciz "ArrayRemoveAt" + .space 0x2 .global Unk_ov4_02217724 Unk_ov4_02217724: ; 0x02217724 - .incbin "incbin/overlay4_data.bin", 0x18A4, 0x18B4 - 0x18A4 + .asciz "ArrayDeleteAt" + .space 0x2 .global Unk_ov4_02217734 Unk_ov4_02217734: ; 0x02217734 - .incbin "incbin/overlay4_data.bin", 0x18B4, 0x18C4 - 0x18B4 + .asciz "ArrayInsertAt" + .space 0x2 .global Unk_ov4_02217744 Unk_ov4_02217744: ; 0x02217744 - .incbin "incbin/overlay4_data.bin", 0x18C4, 0x18D4 - 0x18C4 + .ascii "ArrayReplaceAt" + .space 0x2 .global Unk_ov4_02217754 Unk_ov4_02217754: ; 0x02217754 - .incbin "incbin/overlay4_data.bin", 0x18D4, 0x18E8 - 0x18D4 + .asciz "ArrayMapBackwards" + .space 0x2 .global Unk_ov4_02217768 Unk_ov4_02217768: ; 0x02217768 - .incbin "incbin/overlay4_data.bin", 0x18E8, 0x18FC - 0x18E8 + .asciz "ArrayInsertSorted" + .space 0x2 .global Unk_ov4_0221777C Unk_ov4_0221777C: ; 0x0221777C - .incbin "incbin/overlay4_data.bin", 0x18FC, 0x1910 - 0x18FC + .ascii "ArrayMapBackwards2" + .space 0x2 .global Unk_ov4_02217790 Unk_ov4_02217790: ; 0x02217790 - .incbin "incbin/overlay4_data.bin", 0x1910, 0x191C - 0x1910 + .asciz "array->list" .global Unk_ov4_0221779C Unk_ov4_0221779C: ; 0x0221779C - .incbin "incbin/overlay4_data.bin", 0x191C, 0x1928 - 0x191C + .ascii "darray.c" + .space 0x4 .global Unk_ov4_022177A8 Unk_ov4_022177A8: ; 0x022177A8 - .incbin "incbin/overlay4_data.bin", 0x1928, 0x1930 - 0x1928 + .asciz "array" + .space 0x2 .global Unk_ov4_022177B0 Unk_ov4_022177B0: ; 0x022177B0 - .incbin "incbin/overlay4_data.bin", 0x1930, 0x193C - 0x1930 + .ascii "elemSize" + .space 0x4 .global Unk_ov4_022177BC Unk_ov4_022177BC: ; 0x022177BC - .incbin "incbin/overlay4_data.bin", 0x193C, 0x195C - 0x193C + .ascii "(n >= 0) && (n < array->count)" + .space 0x2 .global Unk_ov4_022177DC Unk_ov4_022177DC: ; 0x022177DC - .incbin "incbin/overlay4_data.bin", 0x195C, 0x197C - 0x195C + .asciz "(n >= 0) && (n <= array->count)" .global Unk_ov4_022177FC Unk_ov4_022177FC: ; 0x022177FC - .incbin "incbin/overlay4_data.bin", 0x197C, 0x1988 - 0x197C + .ascii "comparator" + .space 0x2 .global Unk_ov4_02217808 Unk_ov4_02217808: ; 0x02217808 - .incbin "incbin/overlay4_data.bin", 0x1988, 0x3 + .ascii "fn" + .space 0x2 diff --git a/lib/gamespy/asm/ghttp/ghttppost.s b/lib/gamespy/asm/ghttp/ghttppost.s index 6d21f03a36..a7f822dbfd 100644 --- a/lib/gamespy/asm/ghttp/ghttppost.s +++ b/lib/gamespy/asm/ghttp/ghttppost.s @@ -1110,7 +1110,7 @@ _022227F4: .word Unk_ov60_022298A8 .global Unk_ov60_02228C60 Unk_ov60_02228C60: ; 0x02228C60 - .incbin "incbin/overlay60_rodata.bin", 0x14, 0x4 + .asciz "%00" diff --git a/lib/gamespy/asm/ghttp/ghttpprocess.s b/lib/gamespy/asm/ghttp/ghttpprocess.s index cf25d84164..3885752d61 100644 --- a/lib/gamespy/asm/ghttp/ghttpprocess.s +++ b/lib/gamespy/asm/ghttp/ghttpprocess.s @@ -1571,15 +1571,16 @@ _02223D70: .global Unk_ov60_02228C64 Unk_ov60_02228C64: ; 0x02228C64 - .incbin "incbin/overlay60_rodata.bin", 0x18, 0x1C - 0x18 + .word 0x2000 .global Unk_ov60_02228C68 Unk_ov60_02228C68: ; 0x02228C68 - .incbin "incbin/overlay60_rodata.bin", 0x1C, 0x20 - 0x1C + .word 0x1000 .global Unk_ov60_02228C6C Unk_ov60_02228C6C: ; 0x02228C6C - .incbin "incbin/overlay60_rodata.bin", 0x20, 0xB + .ascii "2147483647" + .space 0x2 diff --git a/asm/incbin/overlay60_data.bin b/lib/gamespy/asm/ghttp/incbin/overlay60_data.bin similarity index 100% rename from asm/incbin/overlay60_data.bin rename to lib/gamespy/asm/ghttp/incbin/overlay60_data.bin diff --git a/asm/incbin/overlay4_data.bin b/lib/gamespy/asm/gp/incbin/overlay4_data.bin similarity index 100% rename from asm/incbin/overlay4_data.bin rename to lib/gamespy/asm/gp/incbin/overlay4_data.bin diff --git a/lib/gamespy/asm/gstats/gbucket.s b/lib/gamespy/asm/gstats/gbucket.s index b2546386f1..2ffc3486a2 100644 --- a/lib/gamespy/asm/gstats/gbucket.s +++ b/lib/gamespy/asm/gstats/gbucket.s @@ -458,27 +458,32 @@ _021F6334: .word 0x00000153 .global Unk_ov4_02219308 Unk_ov4_02219308: ; 0x02219308 - .incbin "incbin/overlay4_data.bin", 0x3488, 0x3490 - 0x3488 + .ascii "DoFind" + .space 0x2 .global Unk_ov4_02219310 Unk_ov4_02219310: ; 0x02219310 - .incbin "incbin/overlay4_data.bin", 0x3490, 0x349C - 0x3490 + .asciz "BucketNew" + .space 0x2 .global Unk_ov4_0221931C Unk_ov4_0221931C: ; 0x0221931C - .incbin "incbin/overlay4_data.bin", 0x349C, 0x34AC - 0x349C + .ascii "BucketConcat" + .space 0x4 .global Unk_ov4_0221932C Unk_ov4_0221932C: ; 0x0221932C - .incbin "incbin/overlay4_data.bin", 0x34AC, 0x34B0 - 0x34AC + .asciz "set" .global Unk_ov4_02219330 Unk_ov4_02219330: ; 0x02219330 - .incbin "incbin/overlay4_data.bin", 0x34B0, 0x34BC - 0x34B0 + .asciz "gbucket.c" + .space 0x2 .global Unk_ov4_0221933C Unk_ov4_0221933C: ; 0x0221933C - .incbin "incbin/overlay4_data.bin", 0x34BC, 0x1C + .ascii "pbucket->type == bt_string" + .space 0x2 diff --git a/lib/gamespy/asm/gstats/gstats.s b/lib/gamespy/asm/gstats/gstats.s index ba5f8e5e76..404cd11237 100644 --- a/lib/gamespy/asm/gstats/gstats.s +++ b/lib/gamespy/asm/gstats/gstats.s @@ -1075,55 +1075,55 @@ _021F7124: .word Unk_ov4_02219448 .global Unk_ov4_0221598C Unk_ov4_0221598C: ; 0x0221598C - .incbin "incbin/overlay4_rodata.bin", 0x124, 0x12C - 0x124 + .incbin "incbin/gstats.bin", 0x0, 0x8 .global Unk_ov4_02215994 Unk_ov4_02215994: ; 0x02215994 - .incbin "incbin/overlay4_rodata.bin", 0x12C, 0x13C - 0x12C + .incbin "incbin/gstats.bin", 0x8, 0x18 - 0x8 .global Unk_ov4_022159A4 Unk_ov4_022159A4: ; 0x022159A4 - .incbin "incbin/overlay4_rodata.bin", 0x13C, 0x14C - 0x13C + .incbin "incbin/gstats.bin", 0x18, 0x28 - 0x18 .global Unk_ov4_022159B4 Unk_ov4_022159B4: ; 0x022159B4 - .incbin "incbin/overlay4_rodata.bin", 0x14C, 0x16A - 0x14C + .incbin "incbin/gstats.bin", 0x28, 0x46 - 0x28 .global Unk_ov4_022159D2 Unk_ov4_022159D2: ; 0x022159D2 - .incbin "incbin/overlay4_rodata.bin", 0x16A, 0x189 - 0x16A + .incbin "incbin/gstats.bin", 0x46, 0x65 - 0x46 .global Unk_ov4_022159F1 Unk_ov4_022159F1: ; 0x022159F1 - .incbin "incbin/overlay4_rodata.bin", 0x189, 0x1AC - 0x189 + .incbin "incbin/gstats.bin", 0x65, 0x88 - 0x65 .global Unk_ov4_02215A14 Unk_ov4_02215A14: ; 0x02215A14 - .incbin "incbin/overlay4_rodata.bin", 0x1AC, 0x1D0 - 0x1AC + .incbin "incbin/gstats.bin", 0x88, 0xAC - 0x88 .global Unk_ov4_02215A38 Unk_ov4_02215A38: ; 0x02215A38 - .incbin "incbin/overlay4_rodata.bin", 0x1D0, 0x1F9 - 0x1D0 + .incbin "incbin/gstats.bin", 0xAC, 0xD5 - 0xAC .global Unk_ov4_02215A61 Unk_ov4_02215A61: ; 0x02215A61 - .incbin "incbin/overlay4_rodata.bin", 0x1F9, 0x223 - 0x1F9 + .incbin "incbin/gstats.bin", 0xD5, 0xFF - 0xD5 .global Unk_ov4_02215A8B Unk_ov4_02215A8B: ; 0x02215A8B - .incbin "incbin/overlay4_rodata.bin", 0x223, 0x24F - 0x223 + .incbin "incbin/gstats.bin", 0xFF, 0x12B - 0xFF .global Unk_ov4_02215AB7 Unk_ov4_02215AB7: ; 0x02215AB7 - .incbin "incbin/overlay4_rodata.bin", 0x24F, 0x280 - 0x24F + .incbin "incbin/gstats.bin", 0x12B, 0x15C - 0x12B .global Unk_ov4_02215AE8 Unk_ov4_02215AE8: ; 0x02215AE8 - .incbin "incbin/overlay4_rodata.bin", 0x280, 0x2BF - 0x280 + .incbin "incbin/gstats.bin", 0x15C, 0x19B - 0x15C .global Unk_ov4_02215B27 Unk_ov4_02215B27: ; 0x02215B27 - .incbin "incbin/overlay4_rodata.bin", 0x2BF, 0x101 + .incbin "incbin/gstats.bin", 0x19B, 0x101 @@ -1132,103 +1132,134 @@ Unk_ov4_02215B27: ; 0x02215B27 .global Unk_ov4_02219358 Unk_ov4_02219358: ; 0x02219358 - .incbin "incbin/overlay4_data.bin", 0x34D8, 0x34DC - 0x34D8 + .word 0xFFFFFFFF .global Unk_ov4_0221935C Unk_ov4_0221935C: ; 0x0221935C - .incbin "incbin/overlay4_data.bin", 0x34DC, 0x34E0 - 0x34DC + .ascii " N" + .space 0x2 .global Unk_ov4_02219360 Unk_ov4_02219360: ; 0x02219360 - .incbin "incbin/overlay4_data.bin", 0x34E0, 0x34E4 - 0x34E0 + .word Unk_ov4_022193A4 .global Unk_ov4_02219364 Unk_ov4_02219364: ; 0x02219364 - .incbin "incbin/overlay4_data.bin", 0x34E4, 0x3500 - 0x34E4 + .word ov4_021F5E18 + .word ov4_021F5E44 + .word ov4_021F5ED8 + .word ov4_021F5F5C + .word ov4_021F5FDC + .word ov4_021F6060 + .word ov4_021F6104 .global Unk_ov4_02219380 Unk_ov4_02219380: ; 0x02219380 - .incbin "incbin/overlay4_data.bin", 0x3500, 0x3524 - 0x3500 + .word ov4_021F6DC4 + .word ov4_021F6E2C + .word ov4_021F6E9C + .word ov4_021F6EF8 + .word ov4_021F6F54 + .word ov4_021F6FB4 + .word ov4_021F7010 + .word ov4_021F706C + .word ov4_021F70CC .global Unk_ov4_022193A4 Unk_ov4_022193A4: ; 0x022193A4 - .incbin "incbin/overlay4_data.bin", 0x3524, 0x3534 - 0x3524 + .space 0x1 + .asciz "ameSpy3D" + .space 0x6 .global Unk_ov4_022193B4 Unk_ov4_022193B4: ; 0x022193B4 - .incbin "incbin/overlay4_data.bin", 0x3534, 0x3544 - 0x3534 + .space 0x1 + .ascii "rojectAphex" + .space 0x4 .global Unk_ov4_022193C4 Unk_ov4_022193C4: ; 0x022193C4 - .incbin "incbin/overlay4_data.bin", 0x3544, 0x3548 - 0x3544 + .space 0x4 .global Unk_ov4_022193C8 Unk_ov4_022193C8: ; 0x022193C8 - .incbin "incbin/overlay4_data.bin", 0x3548, 0x354C - 0x3548 + .word 0x5C .global Unk_ov4_022193CC Unk_ov4_022193CC: ; 0x022193CC - .incbin "incbin/overlay4_data.bin", 0x354C, 0x3554 - 0x354C + .ascii "pauthr" + .space 0x2 .global Unk_ov4_022193D4 Unk_ov4_022193D4: ; 0x022193D4 - .incbin "incbin/overlay4_data.bin", 0x3554, 0x3558 - 0x3554 + .asciz "lid" .global Unk_ov4_022193D8 Unk_ov4_022193D8: ; 0x022193D8 - .incbin "incbin/overlay4_data.bin", 0x3558, 0x3560 - 0x3558 + .ascii "errmsg" + .space 0x2 .global Unk_ov4_022193E0 Unk_ov4_022193E0: ; 0x022193E0 - .incbin "incbin/overlay4_data.bin", 0x3560, 0x3568 - 0x3560 + .asciz "getpidr" .global Unk_ov4_022193E8 Unk_ov4_022193E8: ; 0x022193E8 - .incbin "incbin/overlay4_data.bin", 0x3568, 0x3570 - 0x3568 + .ascii "getpdr" + .space 0x2 .global Unk_ov4_022193F0 Unk_ov4_022193F0: ; 0x022193F0 - .incbin "incbin/overlay4_data.bin", 0x3570, 0x3574 - 0x3570 + .asciz "pid" .global Unk_ov4_022193F4 Unk_ov4_022193F4: ; 0x022193F4 - .incbin "incbin/overlay4_data.bin", 0x3574, 0x3578 - 0x3574 + .asciz "mod" .global Unk_ov4_022193F8 Unk_ov4_022193F8: ; 0x022193F8 - .incbin "incbin/overlay4_data.bin", 0x3578, 0x3580 - 0x3578 + .ascii "length" + .space 0x2 .global Unk_ov4_02219400 Unk_ov4_02219400: ; 0x02219400 - .incbin "incbin/overlay4_data.bin", 0x3580, 0x3588 - 0x3580 + .ascii "\\data\\" + .space 0x2 .global Unk_ov4_02219408 Unk_ov4_02219408: ; 0x02219408 - .incbin "incbin/overlay4_data.bin", 0x3588, 0x3590 - 0x3588 + .ascii "setpdr" + .space 0x2 .global Unk_ov4_02219410 Unk_ov4_02219410: ; 0x02219410 - .incbin "incbin/overlay4_data.bin", 0x3590, 0x359C - 0x3590 + .ascii "\\pauthr\\" + .space 0x4 .global Unk_ov4_0221941C Unk_ov4_0221941C: ; 0x0221941C - .incbin "incbin/overlay4_data.bin", 0x359C, 0x35A8 - 0x359C + .asciz "\\getpidr\\" + .space 0x2 .global Unk_ov4_02219428 Unk_ov4_02219428: ; 0x02219428 - .incbin "incbin/overlay4_data.bin", 0x35A8, 0x35B4 - 0x35A8 + .ascii "\\getpdr\\" + .space 0x4 .global Unk_ov4_02219434 Unk_ov4_02219434: ; 0x02219434 - .incbin "incbin/overlay4_data.bin", 0x35B4, 0x35C0 - 0x35B4 + .ascii "\\setpdr\\" + .space 0x4 .global Unk_ov4_02219440 Unk_ov4_02219440: ; 0x02219440 - .incbin "incbin/overlay4_data.bin", 0x35C0, 0x35C8 - 0x35C0 + .ascii "%s_t%d" + .space 0x2 .global Unk_ov4_02219448 Unk_ov4_02219448: ; 0x02219448 - .incbin "incbin/overlay4_data.bin", 0x35C8, 0x6 + .asciz "%s_%d" + .space 0x2 diff --git a/lib/gamespy/asm/gstats/incbin/gstats.bin b/lib/gamespy/asm/gstats/incbin/gstats.bin new file mode 100644 index 0000000000..cfc8a99cec Binary files /dev/null and b/lib/gamespy/asm/gstats/incbin/gstats.bin differ diff --git a/lib/gamespy/asm/gstats/include/gstats.inc b/lib/gamespy/asm/gstats/include/gstats.inc index dad4a0b7df..0ea0f5f22e 100644 --- a/lib/gamespy/asm/gstats/include/gstats.inc +++ b/lib/gamespy/asm/gstats/include/gstats.inc @@ -16,6 +16,13 @@ .public ov4_021EAD04 .public ov4_021EAE04 .public ov4_021F5D7C +.public ov4_021F5E18 +.public ov4_021F5E44 +.public ov4_021F5ED8 +.public ov4_021F5F5C +.public ov4_021F5FDC +.public ov4_021F6060 +.public ov4_021F6104 .public CloseStatsConnection .public ov4_021F6518 .public ov4_021F6560 @@ -36,3 +43,4 @@ .public ov4_021F6DC4 .public ov4_021F6E2C .public ov4_021F6E9C + diff --git a/lib/gamespy/asm/gt2/gt2auth.s b/lib/gamespy/asm/gt2/gt2auth.s index 80d81f2acf..35e6b89c02 100644 --- a/lib/gamespy/asm/gt2/gt2auth.s +++ b/lib/gamespy/asm/gt2/gt2auth.s @@ -231,17 +231,21 @@ _021F73EC: .global Unk_ov4_02219450 Unk_ov4_02219450: ; 0x02219450 - .incbin "incbin/overlay4_data.bin", 0x35D0, 0x35E4 - 0x35D0 + .ascii "gti2GetChallenge" + .space 0x4 .global Unk_ov4_02219464 Unk_ov4_02219464: ; 0x02219464 - .incbin "incbin/overlay4_data.bin", 0x35E4, 0x3608 - 0x35E4 + .ascii "3b8dd8995f7c40a9a5c5b7dd5b481341" + .space 0x4 .global Unk_ov4_02219488 Unk_ov4_02219488: ; 0x02219488 - .incbin "incbin/overlay4_data.bin", 0x3608, 0x3610 - 0x3608 + .ascii "buffer" + .space 0x2 .global Unk_ov4_02219490 Unk_ov4_02219490: ; 0x02219490 - .incbin "incbin/overlay4_data.bin", 0x3610, 0xA + .asciz "gt2Auth.c" + .space 0x2 diff --git a/lib/gamespy/asm/gt2/gt2buffer.s b/lib/gamespy/asm/gt2/gt2buffer.s index 95aeb08d40..5768e1bafb 100644 --- a/lib/gamespy/asm/gt2/gt2buffer.s +++ b/lib/gamespy/asm/gt2/gt2buffer.s @@ -181,41 +181,47 @@ _021F7638: .word Unk_ov4_02219578 .global Unk_ov4_0221949C Unk_ov4_0221949C: ; 0x0221949C - .incbin "incbin/overlay4_data.bin", 0x361C, 0x3630 - 0x361C + .asciz "gti2BufferShorten" + .space 0x2 .global Unk_ov4_022194B0 Unk_ov4_022194B0: ; 0x022194B0 - .incbin "incbin/overlay4_data.bin", 0x3630, 0x3644 - 0x3630 + .asciz "gti2BufferWriteData" .global Unk_ov4_022194C4 Unk_ov4_022194C4: ; 0x022194C4 - .incbin "incbin/overlay4_data.bin", 0x3644, 0x3658 - 0x3644 + .asciz "gti2BufferWriteByte" .global Unk_ov4_022194D8 Unk_ov4_022194D8: ; 0x022194D8 - .incbin "incbin/overlay4_data.bin", 0x3658, 0x3670 - 0x3658 + .asciz "gti2BufferWriteUShort" + .space 0x2 .global Unk_ov4_022194F0 Unk_ov4_022194F0: ; 0x022194F0 - .incbin "incbin/overlay4_data.bin", 0x3670, 0x368C - 0x3670 + .ascii "buffer->len < buffer->size" + .space 0x2 .global Unk_ov4_0221950C Unk_ov4_0221950C: ; 0x0221950C - .incbin "incbin/overlay4_data.bin", 0x368C, 0x3698 - 0x368C + .asciz "gt2Buffer.c" .global Unk_ov4_02219518 Unk_ov4_02219518: ; 0x02219518 - .incbin "incbin/overlay4_data.bin", 0x3698, 0x36BC - 0x3698 + .asciz "(buffer->len + 2) <= buffer->size" + .space 0x2 .global Unk_ov4_0221953C Unk_ov4_0221953C: ; 0x0221953C - .incbin "incbin/overlay4_data.bin", 0x36BC, 0x36E0 - 0x36BC + .asciz "(buffer->len + len) <= buffer->size" .global Unk_ov4_02219560 Unk_ov4_02219560: ; 0x02219560 - .incbin "incbin/overlay4_data.bin", 0x36E0, 0x36F8 - 0x36E0 + .ascii "start <= buffer->len" + .space 0x4 .global Unk_ov4_02219578 Unk_ov4_02219578: ; 0x02219578 - .incbin "incbin/overlay4_data.bin", 0x36F8, 0x23 + .ascii "shortenBy <= (buffer->len - start)" + .space 0x2 diff --git a/lib/gamespy/asm/gt2/gt2callback.s b/lib/gamespy/asm/gt2/gt2callback.s index 037558c748..1033289365 100644 --- a/lib/gamespy/asm/gt2/gt2callback.s +++ b/lib/gamespy/asm/gt2/gt2callback.s @@ -663,57 +663,69 @@ _021F7F50: .word 0x00000197 .global Unk_ov4_0221959C Unk_ov4_0221959C: ; 0x0221959C - .incbin "incbin/overlay4_data.bin", 0x371C, 0x3730 - 0x371C + .ascii "gti2DumpCallback" + .space 0x4 .global Unk_ov4_022195B0 Unk_ov4_022195B0: ; 0x022195B0 - .incbin "incbin/overlay4_data.bin", 0x3730, 0x3744 - 0x3730 + .ascii "gti2PingCallback" + .space 0x4 .global Unk_ov4_022195C4 Unk_ov4_022195C4: ; 0x022195C4 - .incbin "incbin/overlay4_data.bin", 0x3744, 0x3758 - 0x3744 + .ascii "gti2ClosedCallback" + .space 0x2 .global Unk_ov4_022195D8 Unk_ov4_022195D8: ; 0x022195D8 - .incbin "incbin/overlay4_data.bin", 0x3758, 0x3770 - 0x3758 + .ascii "gti2ReceivedCallback" + .space 0x4 .global Unk_ov4_022195F0 Unk_ov4_022195F0: ; 0x022195F0 - .incbin "incbin/overlay4_data.bin", 0x3770, 0x3788 - 0x3770 + .asciz "gti2ConnectedCallback" + .space 0x2 .global Unk_ov4_02219608 Unk_ov4_02219608: ; 0x02219608 - .incbin "incbin/overlay4_data.bin", 0x3788, 0x37A0 - 0x3788 + .ascii "gti2SendFilterCallback" + .space 0x2 .global Unk_ov4_02219620 Unk_ov4_02219620: ; 0x02219620 - .incbin "incbin/overlay4_data.bin", 0x37A0, 0x37B8 - 0x37A0 + .asciz "gti2SocketErrorCallback" .global Unk_ov4_02219638 Unk_ov4_02219638: ; 0x02219638 - .incbin "incbin/overlay4_data.bin", 0x37B8, 0x37D4 - 0x37B8 + .asciz "gti2ReceiveFilterCallback" + .space 0x2 .global Unk_ov4_02219654 Unk_ov4_02219654: ; 0x02219654 - .incbin "incbin/overlay4_data.bin", 0x37D4, 0x37F0 - 0x37D4 + .ascii "gti2ConnectAttemptCallback" + .space 0x2 .global Unk_ov4_02219670 Unk_ov4_02219670: ; 0x02219670 - .incbin "incbin/overlay4_data.bin", 0x37F0, 0x3810 - 0x37F0 + .asciz "gti2UnrecognizedMessageCallback" .global Unk_ov4_02219690 Unk_ov4_02219690: ; 0x02219690 - .incbin "incbin/overlay4_data.bin", 0x3810, 0x3818 - 0x3810 + .ascii "socket" + .space 0x2 .global Unk_ov4_02219698 Unk_ov4_02219698: ; 0x02219698 - .incbin "incbin/overlay4_data.bin", 0x3818, 0x3828 - 0x3818 + .asciz "gt2Callback.c" + .space 0x2 .global Unk_ov4_022196A8 Unk_ov4_022196A8: ; 0x022196A8 - .incbin "incbin/overlay4_data.bin", 0x3828, 0x3840 - 0x3828 + .ascii "socket && connection" + .space 0x4 .global Unk_ov4_022196C0 Unk_ov4_022196C0: ; 0x022196C0 - .incbin "incbin/overlay4_data.bin", 0x3840, 0xB + .ascii "connection" + .space 0x2 diff --git a/lib/gamespy/asm/gt2/gt2main.s b/lib/gamespy/asm/gt2/gt2main.s index 0c104858de..c44423ceef 100644 --- a/lib/gamespy/asm/gt2/gt2main.s +++ b/lib/gamespy/asm/gt2/gt2main.s @@ -318,19 +318,23 @@ _021F87EC: .word 0x000001AA .global Unk_ov4_022196CC Unk_ov4_022196CC: ; 0x022196CC - .incbin "incbin/overlay4_data.bin", 0x384C, 0x3864 - 0x384C + .ascii "gt2SetConnectionData" + .space 0x4 .global Unk_ov4_022196E4 Unk_ov4_022196E4: ; 0x022196E4 - .incbin "incbin/overlay4_data.bin", 0x3864, 0x387C - 0x3864 + .ascii "gt2GetConnectionData" + .space 0x4 .global Unk_ov4_022196FC Unk_ov4_022196FC: ; 0x022196FC - .incbin "incbin/overlay4_data.bin", 0x387C, 0x3888 - 0x387C + .asciz "gt2Main.c" + .space 0x2 .global Unk_ov4_02219708 Unk_ov4_02219708: ; 0x02219708 - .incbin "incbin/overlay4_data.bin", 0x3888, 0xB + .ascii "connection" + .space 0x2 diff --git a/lib/gamespy/asm/gt2/gt2message.s b/lib/gamespy/asm/gt2/gt2message.s index 3833294d77..695e53e371 100644 --- a/lib/gamespy/asm/gt2/gt2message.s +++ b/lib/gamespy/asm/gt2/gt2message.s @@ -2075,21 +2075,24 @@ _021FA358: .global Unk_ov4_02219714 Unk_ov4_02219714: ; 0x02219714 - .incbin "incbin/overlay4_data.bin", 0x3894, 0x38AC - 0x3894 + .ascii "gti2EndReliableMessage" + .space 0x2 .global Unk_ov4_0221972C Unk_ov4_0221972C: ; 0x0221972C - .incbin "incbin/overlay4_data.bin", 0x38AC, 0x38B4 - 0x38AC + .ascii "time" + .space 0x4 .global Unk_ov4_02219734 Unk_ov4_02219734: ; 0x02219734 - .incbin "incbin/overlay4_data.bin", 0x38B4, 0x38B8 - 0x38B4 + .byte 0xFE, 0xFE, 0x0, 0x0 .global Unk_ov4_02219738 Unk_ov4_02219738: ; 0x02219738 - .incbin "incbin/overlay4_data.bin", 0x38B8, 0x38C0 - 0x38B8 + .asciz "len > 0" .global Unk_ov4_02219740 Unk_ov4_02219740: ; 0x02219740 - .incbin "incbin/overlay4_data.bin", 0x38C0, 0xD + .ascii "gt2Message.c" + .space 0x4 diff --git a/lib/gamespy/asm/gt2/gt2utility.s b/lib/gamespy/asm/gt2/gt2utility.s index 08e30f839c..233595ce49 100644 --- a/lib/gamespy/asm/gt2/gt2utility.s +++ b/lib/gamespy/asm/gt2/gt2utility.s @@ -203,31 +203,36 @@ _021FAE7C: .word Unk_ov4_022197A4 .global Unk_ov4_02219750 Unk_ov4_02219750: ; 0x02219750 - .incbin "incbin/overlay4_data.bin", 0x38D0, 0x38E4 - 0x38D0 + .ascii "gt2StringToAddress" + .space 0x2 .global Unk_ov4_02219764 Unk_ov4_02219764: ; 0x02219764 - .incbin "incbin/overlay4_data.bin", 0x38E4, 0x38EC - 0x38E4 + .asciz "%s:%d" + .space 0x2 .global Unk_ov4_0221976C Unk_ov4_0221976C: ; 0x0221976C - .incbin "incbin/overlay4_data.bin", 0x38EC, 0x38F0 - 0x38EC + .ascii "%s" + .space 0x2 .global Unk_ov4_02219770 Unk_ov4_02219770: ; 0x02219770 - .incbin "incbin/overlay4_data.bin", 0x38F0, 0x38F4 - 0x38F0 + .asciz ":%d" .global Unk_ov4_02219774 Unk_ov4_02219774: ; 0x02219774 - .incbin "incbin/overlay4_data.bin", 0x38F4, 0x3914 - 0x38F4 + .ascii "len < GTI2_STACK_HOSTLEN_MAX" + .space 0x4 .global Unk_ov4_02219794 Unk_ov4_02219794: ; 0x02219794 - .incbin "incbin/overlay4_data.bin", 0x3914, 0x3924 - 0x3914 + .ascii "gt2Utility.c" + .space 0x4 .global Unk_ov4_022197A4 Unk_ov4_022197A4: ; 0x022197A4 - .incbin "incbin/overlay4_data.bin", 0x3924, 0x1 + .space 0x1 diff --git a/lib/gamespy/asm/hashtable.s b/lib/gamespy/asm/hashtable.s index 46bbb9242c..c724ae0936 100644 --- a/lib/gamespy/asm/hashtable.s +++ b/lib/gamespy/asm/hashtable.s @@ -452,69 +452,83 @@ _021EA7B0: .word Unk_ov4_02217870 .global Unk_ov4_0221780C Unk_ov4_0221780C: ; 0x0221780C - .incbin "incbin/overlay4_data.bin", 0x198C, 0x1998 - 0x198C + .ascii "TableMap" + .space 0x4 .global Unk_ov4_02217818 Unk_ov4_02217818: ; 0x02217818 - .incbin "incbin/overlay4_data.bin", 0x1998, 0x19A4 - 0x1998 + .asciz "TableNew2" + .space 0x2 .global Unk_ov4_02217824 Unk_ov4_02217824: ; 0x02217824 - .incbin "incbin/overlay4_data.bin", 0x19A4, 0x19B0 - 0x19A4 + .asciz "TableFree" + .space 0x2 .global Unk_ov4_02217830 Unk_ov4_02217830: ; 0x02217830 - .incbin "incbin/overlay4_data.bin", 0x19B0, 0x19BC - 0x19B0 + .ascii "TableEnter" + .space 0x2 .global Unk_ov4_0221783C Unk_ov4_0221783C: ; 0x0221783C - .incbin "incbin/overlay4_data.bin", 0x19BC, 0x19C8 - 0x19BC + .ascii "TableCount" + .space 0x2 .global Unk_ov4_02217848 Unk_ov4_02217848: ; 0x02217848 - .incbin "incbin/overlay4_data.bin", 0x19C8, 0x19D4 - 0x19C8 + .asciz "TableRemove" .global Unk_ov4_02217854 Unk_ov4_02217854: ; 0x02217854 - .incbin "incbin/overlay4_data.bin", 0x19D4, 0x19E0 - 0x19D4 + .asciz "TableLookup" .global Unk_ov4_02217860 Unk_ov4_02217860: ; 0x02217860 - .incbin "incbin/overlay4_data.bin", 0x19E0, 0x19F0 - 0x19E0 + .ascii "TableMapSafe" + .space 0x4 .global Unk_ov4_02217870 Unk_ov4_02217870: ; 0x02217870 - .incbin "incbin/overlay4_data.bin", 0x19F0, 0x1A00 - 0x19F0 + .asciz "TableMapSafe2" + .space 0x2 .global Unk_ov4_02217880 Unk_ov4_02217880: ; 0x02217880 - .incbin "incbin/overlay4_data.bin", 0x1A00, 0x1A08 - 0x1A00 + .ascii "hashFn" + .space 0x2 .global Unk_ov4_02217888 Unk_ov4_02217888: ; 0x02217888 - .incbin "incbin/overlay4_data.bin", 0x1A08, 0x1A14 - 0x1A08 + .asciz "hashtable.c" .global Unk_ov4_02217894 Unk_ov4_02217894: ; 0x02217894 - .incbin "incbin/overlay4_data.bin", 0x1A14, 0x1A1C - 0x1A14 + .ascii "compFn" + .space 0x2 .global Unk_ov4_0221789C Unk_ov4_0221789C: ; 0x0221789C - .incbin "incbin/overlay4_data.bin", 0x1A1C, 0x1A28 - 0x1A1C + .ascii "elemSize" + .space 0x4 .global Unk_ov4_022178A8 Unk_ov4_022178A8: ; 0x022178A8 - .incbin "incbin/overlay4_data.bin", 0x1A28, 0x1A34 - 0x1A28 + .ascii "nBuckets" + .space 0x4 .global Unk_ov4_022178B4 Unk_ov4_022178B4: ; 0x022178B4 - .incbin "incbin/overlay4_data.bin", 0x1A34, 0x1A3C - 0x1A34 + .asciz "table" + .space 0x2 .global Unk_ov4_022178BC Unk_ov4_022178BC: ; 0x022178BC - .incbin "incbin/overlay4_data.bin", 0x1A3C, 0x1A4C - 0x1A3C + .ascii "table->buckets" + .space 0x2 .global Unk_ov4_022178CC Unk_ov4_022178CC: ; 0x022178CC - .incbin "incbin/overlay4_data.bin", 0x1A4C, 0x3 + .ascii "fn" + .space 0x2 diff --git a/lib/gamespy/asm/md5c.s b/lib/gamespy/asm/md5c.s index c6a02e7482..06cd813423 100644 --- a/lib/gamespy/asm/md5c.s +++ b/lib/gamespy/asm/md5c.s @@ -56,5 +56,6 @@ ov4_021EA7F4: ; 0x021EA7F4 .global Unk_ov4_022178D0 Unk_ov4_022178D0: ; 0x022178D0 - .incbin "incbin/overlay4_data.bin", 0x1A50, 0x8 + .ascii "%02x" + .space 0x4 diff --git a/lib/gamespy/asm/natneg/natneg.s b/lib/gamespy/asm/natneg/natneg.s index 5b94ecb9b0..16eacc6da6 100644 --- a/lib/gamespy/asm/natneg/natneg.s +++ b/lib/gamespy/asm/natneg/natneg.s @@ -1121,19 +1121,21 @@ _021FBD18: .global NNMagicData NNMagicData: ; 0x022197A8 - .incbin "incbin/overlay4_data.bin", 0x3928, 0x3930 - 0x3928 + .byte 0xFD, 0xFC, 0x1E, 0x66, 0x6A, 0xB2 + .space 0x2 .global Unk_ov4_022197B0 Unk_ov4_022197B0: ; 0x022197B0 - .incbin "incbin/overlay4_data.bin", 0x3930, 0x3938 - 0x3930 + .asciz "%s.%s" + .space 0x2 .global Unk_ov4_022197B8 Unk_ov4_022197B8: ; 0x022197B8 - .incbin "incbin/overlay4_data.bin", 0x3938, 0x3954 - 0x3938 + .asciz "natneg1.gs.nintendowifi.net" .global Unk_ov4_022197D4 Unk_ov4_022197D4: ; 0x022197D4 - .incbin "incbin/overlay4_data.bin", 0x3954, 0x1C + .asciz "natneg2.gs.nintendowifi.net" diff --git a/lib/gamespy/asm/nonport.s b/lib/gamespy/asm/nonport.s index f3dca17881..a437cf2726 100644 --- a/lib/gamespy/asm/nonport.s +++ b/lib/gamespy/asm/nonport.s @@ -849,15 +849,15 @@ _021EB224: .word 0x55555556 .global Unk_ov4_02215980 Unk_ov4_02215980: ; 0x02215980 - .incbin "incbin/overlay4_rodata.bin", 0x118, 0x11C - 0x118 + .asciz "[]_" .global Unk_ov4_02215984 Unk_ov4_02215984: ; 0x02215984 - .incbin "incbin/overlay4_rodata.bin", 0x11C, 0x120 - 0x11C + .asciz "-_=" .global Unk_ov4_02215988 Unk_ov4_02215988: ; 0x02215988 - .incbin "incbin/overlay4_rodata.bin", 0x120, 0x4 + .asciz "+/=" @@ -866,28 +866,32 @@ Unk_ov4_02215988: ; 0x02215988 .global Unk_ov4_022178D8 Unk_ov4_022178D8: ; 0x022178D8 - .incbin "incbin/overlay4_data.bin", 0x1A58, 0x1A5C - 0x1A58 + .word 0x1 .global Unk_ov4_022178DC Unk_ov4_022178DC: ; 0x022178DC - .incbin "incbin/overlay4_data.bin", 0x1A5C, 0x1A64 - 0x1A5C + .ascii "time" + .space 0x4 .global Unk_ov4_022178E4 Unk_ov4_022178E4: ; 0x022178E4 - .incbin "incbin/overlay4_data.bin", 0x1A64, 0x1A74 - 0x1A64 + .ascii "current_time" + .space 0x4 .global Unk_ov4_022178F4 Unk_ov4_022178F4: ; 0x022178F4 - .incbin "incbin/overlay4_data.bin", 0x1A74, 0x1A94 - 0x1A74 + .ascii "OS_IsTickAvailable() == TRUE" + .space 0x4 .global Unk_ov4_02217914 Unk_ov4_02217914: ; 0x02217914 - .incbin "incbin/overlay4_data.bin", 0x1A94, 0x1AA0 - 0x1A94 + .asciz "nonport.c" + .space 0x2 .global Unk_ov4_02217920 Unk_ov4_02217920: ; 0x02217920 - .incbin "incbin/overlay4_data.bin", 0x1AA0, 0xA - + .asciz "localhost" + .space 0x2 .bss diff --git a/lib/gamespy/asm/qr2/qr2.s b/lib/gamespy/asm/qr2/qr2.s index cc30cd1525..1f7f336337 100644 --- a/lib/gamespy/asm/qr2/qr2.s +++ b/lib/gamespy/asm/qr2/qr2.s @@ -1721,7 +1721,8 @@ _021FD4DC: .word Unk_ov4_022199F4 .global Unk_ov4_02215C28 Unk_ov4_02215C28: ; 0x02215C28 - .incbin "incbin/overlay4_rodata.bin", 0x3C0, 0x8 + .byte 0xFD, 0xFC, 0x1E, 0x66, 0x6A, 0xB2 + .space 0x2 @@ -1730,84 +1731,96 @@ Unk_ov4_02215C28: ; 0x02215C28 .global Unk_ov4_022197F0 Unk_ov4_022197F0: ; 0x022197F0 - .incbin "incbin/overlay4_data.bin", 0x3970, 0x3974 - 0x3970 + .word Unk_ov4_022197F4 .global Unk_ov4_022197F4 Unk_ov4_022197F4: ; 0x022197F4 - .incbin "incbin/overlay4_data.bin", 0x3974, 0x3A84 - 0x3974 + .word 0xFFFFFFFF + .space 0x10C .global Unk_ov4_02219904 Unk_ov4_02219904: ; 0x02219904 - .incbin "incbin/overlay4_data.bin", 0x3A84, 0x3AA4 - 0x3A84 + .asciz "%s.master.gs.nintendowifi.net" + .space 0x2 .global Unk_ov4_02219924 Unk_ov4_02219924: ; 0x02219924 - .incbin "incbin/overlay4_data.bin", 0x3AA4, 0x3ADC - 0x3AA4 + .asciz "No challenge value was received from the master server." .global Unk_ov4_0221995C Unk_ov4_0221995C: ; 0x0221995C - .incbin "incbin/overlay4_data.bin", 0x3ADC, 0x3AE0 - 0x3ADC + .ascii "%d" + .space 0x2 .global Unk_ov4_02219960 Unk_ov4_02219960: ; 0x02219960 - .incbin "incbin/overlay4_data.bin", 0x3AE0, 0x3AF0 - 0x3AE0 + .asciz "255.255.255.255" .global Unk_ov4_02219970 Unk_ov4_02219970: ; 0x02219970 - .incbin "incbin/overlay4_data.bin", 0x3AF0, 0x3AFC - 0x3AF0 + .ascii "%08X%04X" + .space 0x4 .global Unk_ov4_0221997C Unk_ov4_0221997C: ; 0x0221997C - .incbin "incbin/overlay4_data.bin", 0x3AFC, 0x3B04 - 0x3AFC + .asciz "unknown" .global Unk_ov4_02219984 Unk_ov4_02219984: ; 0x02219984 - .incbin "incbin/overlay4_data.bin", 0x3B04, 0x3B08 - 0x3B04 + .space 0x4 .global Unk_ov4_02219988 Unk_ov4_02219988: ; 0x02219988 - .incbin "incbin/overlay4_data.bin", 0x3B08, 0x3B10 - 0x3B08 + .ascii "%s%d" + .space 0x4 .global Unk_ov4_02219990 Unk_ov4_02219990: ; 0x02219990 - .incbin "incbin/overlay4_data.bin", 0x3B10, 0x3B24 - 0x3B10 + .ascii "final\\\\queryid\\1.1" + .space 0x2 .global Unk_ov4_022199A4 Unk_ov4_022199A4: ; 0x022199A4 - .incbin "incbin/overlay4_data.bin", 0x3B24, 0x3B30 - 0x3B24 + .asciz "localip%d" + .space 0x2 .global Unk_ov4_022199B0 Unk_ov4_022199B0: ; 0x022199B0 - .incbin "incbin/overlay4_data.bin", 0x3B30, 0x3B3C - 0x3B30 + .asciz "localport" + .space 0x2 .global Unk_ov4_022199BC Unk_ov4_022199BC: ; 0x022199BC - .incbin "incbin/overlay4_data.bin", 0x3B3C, 0x3B44 - 0x3B3C + .ascii "natneg" + .space 0x2 .global Unk_ov4_022199C4 Unk_ov4_022199C4: ; 0x022199C4 - .incbin "incbin/overlay4_data.bin", 0x3B44, 0x3B48 - 0x3B44 + .word 0x31 .global Unk_ov4_022199C8 Unk_ov4_022199C8: ; 0x022199C8 - .incbin "incbin/overlay4_data.bin", 0x3B48, 0x3B4C - 0x3B48 + .word 0x30 .global Unk_ov4_022199CC Unk_ov4_022199CC: ; 0x022199CC - .incbin "incbin/overlay4_data.bin", 0x3B4C, 0x3B5C - 0x3B4C + .ascii "statechanged" + .space 0x4 .global Unk_ov4_022199DC Unk_ov4_022199DC: ; 0x022199DC - .incbin "incbin/overlay4_data.bin", 0x3B5C, 0x3B68 - 0x3B5C + .ascii "gamename" + .space 0x4 .global Unk_ov4_022199E8 Unk_ov4_022199E8: ; 0x022199E8 - .incbin "incbin/overlay4_data.bin", 0x3B68, 0x3B74 - 0x3B68 + .ascii "publicip" + .space 0x4 .global Unk_ov4_022199F4 Unk_ov4_022199F4: ; 0x022199F4 - .incbin "incbin/overlay4_data.bin", 0x3B74, 0xB - + .ascii "publicport" + .space 0x2 .bss diff --git a/lib/gamespy/asm/qr2/qr2regkeys.s b/lib/gamespy/asm/qr2/qr2regkeys.s index bbacf7b7ab..67a15ed01c 100644 --- a/lib/gamespy/asm/qr2/qr2regkeys.s +++ b/lib/gamespy/asm/qr2/qr2regkeys.s @@ -21,126 +21,176 @@ _021FD4FC: .word Unk_ov4_02219B38 .global Unk_ov4_02219A00 Unk_ov4_02219A00: ; 0x02219A00 - .incbin "incbin/overlay4_data.bin", 0x3B80, 0x3B84 - 0x3B80 + .space 0x4 .global Unk_ov4_02219A04 Unk_ov4_02219A04: ; 0x02219A04 - .incbin "incbin/overlay4_data.bin", 0x3B84, 0x3B8C - 0x3B84 + .ascii "pid_" + .space 0x4 .global Unk_ov4_02219A0C Unk_ov4_02219A0C: ; 0x02219A0C - .incbin "incbin/overlay4_data.bin", 0x3B8C, 0x3B94 - 0x3B8C + .asciz "ping_" + .space 0x2 .global Unk_ov4_02219A14 Unk_ov4_02219A14: ; 0x02219A14 - .incbin "incbin/overlay4_data.bin", 0x3B94, 0x3B9C - 0x3B94 + .asciz "team_" + .space 0x2 .global Unk_ov4_02219A1C Unk_ov4_02219A1C: ; 0x02219A1C - .incbin "incbin/overlay4_data.bin", 0x3B9C, 0x3BA4 - 0x3B9C + .ascii "score_" + .space 0x2 .global Unk_ov4_02219A24 Unk_ov4_02219A24: ; 0x02219A24 - .incbin "incbin/overlay4_data.bin", 0x3BA4, 0x3BAC - 0x3BA4 + .ascii "team_t" + .space 0x2 .global Unk_ov4_02219A2C Unk_ov4_02219A2C: ; 0x02219A2C - .incbin "incbin/overlay4_data.bin", 0x3BAC, 0x3BB4 - 0x3BAC + .ascii "skill_" + .space 0x2 .global Unk_ov4_02219A34 Unk_ov4_02219A34: ; 0x02219A34 - .incbin "incbin/overlay4_data.bin", 0x3BB4, 0x3BBC - 0x3BB4 + .asciz "groupid" .global Unk_ov4_02219A3C Unk_ov4_02219A3C: ; 0x02219A3C - .incbin "incbin/overlay4_data.bin", 0x3BBC, 0x3BC4 - 0x3BBC + .asciz "deaths_" .global Unk_ov4_02219A44 Unk_ov4_02219A44: ; 0x02219A44 - .incbin "incbin/overlay4_data.bin", 0x3BC4, 0x3BCC - 0x3BC4 + .asciz "gamever" .global Unk_ov4_02219A4C Unk_ov4_02219A4C: ; 0x02219A4C - .incbin "incbin/overlay4_data.bin", 0x3BCC, 0x3BD4 - 0x3BCC + .asciz "player_" .global Unk_ov4_02219A54 Unk_ov4_02219A54: ; 0x02219A54 - .incbin "incbin/overlay4_data.bin", 0x3BD4, 0x3BDC - 0x3BD4 + .asciz "score_t" .global Unk_ov4_02219A5C Unk_ov4_02219A5C: ; 0x02219A5C - .incbin "incbin/overlay4_data.bin", 0x3BDC, 0x3BE4 - 0x3BDC + .asciz "mapname" .global Unk_ov4_02219A64 Unk_ov4_02219A64: ; 0x02219A64 - .incbin "incbin/overlay4_data.bin", 0x3BE4, 0x3BF0 - 0x3BE4 + .ascii "gamename" + .space 0x4 .global Unk_ov4_02219A70 Unk_ov4_02219A70: ; 0x02219A70 - .incbin "incbin/overlay4_data.bin", 0x3BF0, 0x3BFC - 0x3BF0 + .ascii "hostport" + .space 0x4 .global Unk_ov4_02219A7C Unk_ov4_02219A7C: ; 0x02219A7C - .incbin "incbin/overlay4_data.bin", 0x3BFC, 0x3C08 - 0x3BFC + .ascii "password" + .space 0x4 .global Unk_ov4_02219A88 Unk_ov4_02219A88: ; 0x02219A88 - .incbin "incbin/overlay4_data.bin", 0x3C08, 0x3C14 - 0x3C08 + .ascii "gametype" + .space 0x4 .global Unk_ov4_02219A94 Unk_ov4_02219A94: ; 0x02219A94 - .incbin "incbin/overlay4_data.bin", 0x3C14, 0x3C20 - 0x3C14 + .ascii "numteams" + .space 0x4 .global Unk_ov4_02219AA0 Unk_ov4_02219AA0: ; 0x02219AA0 - .incbin "incbin/overlay4_data.bin", 0x3C20, 0x3C2C - 0x3C20 + .ascii "gamemode" + .space 0x4 .global Unk_ov4_02219AAC Unk_ov4_02219AAC: ; 0x02219AAC - .incbin "incbin/overlay4_data.bin", 0x3C2C, 0x3C38 - 0x3C2C + .ascii "teamplay" + .space 0x4 .global Unk_ov4_02219AB8 Unk_ov4_02219AB8: ; 0x02219AB8 - .incbin "incbin/overlay4_data.bin", 0x3C38, 0x3C44 - 0x3C38 + .ascii "hostname" + .space 0x4 .global Unk_ov4_02219AC4 Unk_ov4_02219AC4: ; 0x02219AC4 - .incbin "incbin/overlay4_data.bin", 0x3C44, 0x3C50 - 0x3C44 + .asciz "fraglimit" + .space 0x2 .global Unk_ov4_02219AD0 Unk_ov4_02219AD0: ; 0x02219AD0 - .incbin "incbin/overlay4_data.bin", 0x3C50, 0x3C5C - 0x3C50 + .asciz "timelimit" + .space 0x2 .global Unk_ov4_02219ADC Unk_ov4_02219ADC: ; 0x02219ADC - .incbin "incbin/overlay4_data.bin", 0x3C5C, 0x3C68 - 0x3C5C + .asciz "roundtime" + .space 0x2 .global Unk_ov4_02219AE8 Unk_ov4_02219AE8: ; 0x02219AE8 - .incbin "incbin/overlay4_data.bin", 0x3C68, 0x3C74 - 0x3C68 + .ascii "numplayers" + .space 0x2 .global Unk_ov4_02219AF4 Unk_ov4_02219AF4: ; 0x02219AF4 - .incbin "incbin/overlay4_data.bin", 0x3C74, 0x3C80 - 0x3C74 + .ascii "maxplayers" + .space 0x2 .global Unk_ov4_02219B00 Unk_ov4_02219B00: ; 0x02219B00 - .incbin "incbin/overlay4_data.bin", 0x3C80, 0x3C8C - 0x3C80 + .asciz "gamevariant" .global Unk_ov4_02219B0C Unk_ov4_02219B0C: ; 0x02219B0C - .incbin "incbin/overlay4_data.bin", 0x3C8C, 0x3C98 - 0x3C8C + .asciz "timeelapsed" .global Unk_ov4_02219B18 Unk_ov4_02219B18: ; 0x02219B18 - .incbin "incbin/overlay4_data.bin", 0x3C98, 0x3CA8 - 0x3C98 + .ascii "roundelapsed" + .space 0x4 .global Unk_ov4_02219B28 Unk_ov4_02219B28: ; 0x02219B28 - .incbin "incbin/overlay4_data.bin", 0x3CA8, 0x3CB8 - 0x3CA8 + .asciz "teamfraglimit" + .space 0x2 .global Unk_ov4_02219B38 Unk_ov4_02219B38: ; 0x02219B38 - .incbin "incbin/overlay4_data.bin", 0x3CB8, 0x1FC - .incbin "incbin/overlay4_data.bin", 0x3CB8 + 0x1FC, 0x1FC + .word Unk_ov4_02219A00 + .word Unk_ov4_02219AB8 + .word Unk_ov4_02219A64 + .word Unk_ov4_02219A44 + .word Unk_ov4_02219A70 + .word Unk_ov4_02219A5C + .word Unk_ov4_02219A88 + .word Unk_ov4_02219B00 + .word Unk_ov4_02219AE8 + .word Unk_ov4_02219A94 + .word Unk_ov4_02219AF4 + .word Unk_ov4_02219AA0 + .word Unk_ov4_02219AAC + .word Unk_ov4_02219AC4 + .word Unk_ov4_02219B28 + .word Unk_ov4_02219B0C + .word Unk_ov4_02219AD0 + .word Unk_ov4_02219ADC + .word Unk_ov4_02219B18 + .word Unk_ov4_02219A7C + .word Unk_ov4_02219A34 + .word Unk_ov4_02219A4C + .word Unk_ov4_02219A1C + .word Unk_ov4_02219A2C + .word Unk_ov4_02219A0C + .word Unk_ov4_02219A14 + .word Unk_ov4_02219A3C + .word Unk_ov4_02219A04 + .word Unk_ov4_02219A24 + .word Unk_ov4_02219A54 + .space 0x380 diff --git a/lib/gamespy/asm/serverbrowsing/sb_queryengine.s b/lib/gamespy/asm/serverbrowsing/sb_queryengine.s index a68eb7ee60..48e09fd870 100644 --- a/lib/gamespy/asm/serverbrowsing/sb_queryengine.s +++ b/lib/gamespy/asm/serverbrowsing/sb_queryengine.s @@ -703,13 +703,15 @@ ov4_021FE080: ; 0x021FE080 .global Unk_ov4_02219F30 Unk_ov4_02219F30: ; 0x02219F30 - .incbin "incbin/overlay4_data.bin", 0x40B0, 0x40C0 - 0x40B0 + .asciz "\\basic\\\\info\\" + .space 0x2 .global Unk_ov4_02219F40 Unk_ov4_02219F40: ; 0x02219F40 - .incbin "incbin/overlay4_data.bin", 0x40C0, 0x40CC - 0x40C0 + .ascii "\\status\\" + .space 0x4 .global Unk_ov4_02219F4C Unk_ov4_02219F4C: ; 0x02219F4C - .incbin "incbin/overlay4_data.bin", 0x40CC, 0x8 + .asciz "\\final\\" diff --git a/lib/gamespy/asm/serverbrowsing/sb_server.s b/lib/gamespy/asm/serverbrowsing/sb_server.s index 18825e7c96..93d65bf03c 100644 --- a/lib/gamespy/asm/serverbrowsing/sb_server.s +++ b/lib/gamespy/asm/serverbrowsing/sb_server.s @@ -700,7 +700,8 @@ _021FE88C: .word Unk_ov4_0221B750 .global Unk_ov4_02215C30 Unk_ov4_02215C30: ; 0x02215C30 - .incbin "incbin/overlay4_rodata.bin", 0x3C8, 0x8 + .word Unk_ov4_02219F5C + .word Unk_ov4_02219F54 @@ -709,39 +710,44 @@ Unk_ov4_02215C30: ; 0x02215C30 .global Unk_ov4_02219F54 Unk_ov4_02219F54: ; 0x02219F54 - .incbin "incbin/overlay4_data.bin", 0x40D4, 0x40DC - 0x40D4 + .asciz "final" + .space 0x2 .global Unk_ov4_02219F5C Unk_ov4_02219F5C: ; 0x02219F5C - .incbin "incbin/overlay4_data.bin", 0x40DC, 0x40E4 - 0x40DC + .asciz "queryid" .global Unk_ov4_02219F64 Unk_ov4_02219F64: ; 0x02219F64 - .incbin "incbin/overlay4_data.bin", 0x40E4, 0x40FC - 0x40E4 + .asciz "SBServerGetStringValueA" .global Unk_ov4_02219F7C Unk_ov4_02219F7C: ; 0x02219F7C - .incbin "incbin/overlay4_data.bin", 0x40FC, 0x4100 - 0x40FC + .ascii "%d" + .space 0x2 .global Unk_ov4_02219F80 Unk_ov4_02219F80: ; 0x02219F80 - .incbin "incbin/overlay4_data.bin", 0x4100, 0x4108 - 0x4100 + .ascii "server" + .space 0x2 .global Unk_ov4_02219F88 Unk_ov4_02219F88: ; 0x02219F88 - .incbin "incbin/overlay4_data.bin", 0x4108, 0x4114 - 0x4108 + .asciz "sb_server.c" .global Unk_ov4_02219F94 Unk_ov4_02219F94: ; 0x02219F94 - .incbin "incbin/overlay4_data.bin", 0x4114, 0x411C - 0x4114 + .ascii "ping" + .space 0x4 .global Unk_ov4_02219F9C Unk_ov4_02219F9C: ; 0x02219F9C - .incbin "incbin/overlay4_data.bin", 0x411C, 0x4120 - 0x411C + .space 0x4 .global Unk_ov4_02219FA0 Unk_ov4_02219FA0: ; 0x02219FA0 - .incbin "incbin/overlay4_data.bin", 0x4120, 0x5 + .ascii "%s%d" + .space 0x4 diff --git a/lib/gamespy/asm/serverbrowsing/sb_serverbrowsing.s b/lib/gamespy/asm/serverbrowsing/sb_serverbrowsing.s index cdb850d25b..2e374d043c 100644 --- a/lib/gamespy/asm/serverbrowsing/sb_serverbrowsing.s +++ b/lib/gamespy/asm/serverbrowsing/sb_serverbrowsing.s @@ -508,5 +508,5 @@ ServerBrowserGetMyPublicIPAddr: ; 0x021FEEC0 .global Unk_ov4_02219FA8 Unk_ov4_02219FA8: ; 0x02219FA8 - .incbin "incbin/overlay4_data.bin", 0x4128, 0x4 + .asciz "\\%s" diff --git a/lib/gamespy/asm/serverbrowsing/sb_serverlist.s b/lib/gamespy/asm/serverbrowsing/sb_serverlist.s index 603b62b4ae..12d8b02d78 100644 --- a/lib/gamespy/asm/serverbrowsing/sb_serverlist.s +++ b/lib/gamespy/asm/serverbrowsing/sb_serverlist.s @@ -2833,79 +2833,88 @@ _022014FC: .global Unk_ov4_02219FAC Unk_ov4_02219FAC: ; 0x02219FAC - .incbin "incbin/overlay4_data.bin", 0x412C, 0x4130 - 0x412C + .word Unk_ov4_02219FC0 .global Unk_ov4_02219FB0 Unk_ov4_02219FB0: ; 0x02219FB0 - .incbin "incbin/overlay4_data.bin", 0x4130, 0x4140 - 0x4130 + .ascii "SBReleaseStr" + .space 0x4 .global Unk_ov4_02219FC0 Unk_ov4_02219FC0: ; 0x02219FC0 - .incbin "incbin/overlay4_data.bin", 0x4140, 0x4150 - 0x4140 + .asciz "Query Error: " + .space 0x2 .global Unk_ov4_02219FD0 Unk_ov4_02219FD0: ; 0x02219FD0 - .incbin "incbin/overlay4_data.bin", 0x4150, 0x4160 - 0x4150 + .ascii "AllKeysPresent" + .space 0x2 .global Unk_ov4_02219FE0 Unk_ov4_02219FE0: ; 0x02219FE0 - .incbin "incbin/overlay4_data.bin", 0x4160, 0x4174 - 0x4160 + .ascii "SBServerListInit" + .space 0x4 .global Unk_ov4_02219FF4 Unk_ov4_02219FF4: ; 0x02219FF4 - .incbin "incbin/overlay4_data.bin", 0x4174, 0x4188 - 0x4174 + .ascii "ProcessAdHocData" + .space 0x4 .global Unk_ov4_0221A008 Unk_ov4_0221A008: ; 0x0221A008 - .incbin "incbin/overlay4_data.bin", 0x4188, 0x419C - 0x4188 + .asciz "ProcessMainListData" .global Unk_ov4_0221A01C Unk_ov4_0221A01C: ; 0x0221A01C - .incbin "incbin/overlay4_data.bin", 0x419C, 0x41B8 - 0x419C + .asciz "SBServerListConnectAndQuery" .global Unk_ov4_0221A038 Unk_ov4_0221A038: ; 0x0221A038 - .incbin "incbin/overlay4_data.bin", 0x41B8, 0x41BC - 0x41B8 + .space 0x4 .global Unk_ov4_0221A03C Unk_ov4_0221A03C: ; 0x0221A03C - .incbin "incbin/overlay4_data.bin", 0x41BC, 0x41C8 - 0x41BC + .asciz "val != NULL" .global Unk_ov4_0221A048 Unk_ov4_0221A048: ; 0x0221A048 - .incbin "incbin/overlay4_data.bin", 0x41C8, 0x41D8 - 0x41C8 + .asciz "sb_serverlist.c" .global Unk_ov4_0221A058 Unk_ov4_0221A058: ; 0x0221A058 - .incbin "incbin/overlay4_data.bin", 0x41D8, 0x41E8 - 0x41D8 + .asciz "slist != NULL" + .space 0x2 .global Unk_ov4_0221A068 Unk_ov4_0221A068: ; 0x0221A068 - .incbin "incbin/overlay4_data.bin", 0x41E8, 0x41FC - 0x41E8 + .ascii "callback != NULL" + .space 0x4 .global Unk_ov4_0221A07C Unk_ov4_0221A07C: ; 0x0221A07C - .incbin "incbin/overlay4_data.bin", 0x41FC, 0x4218 - 0x41FC + .asciz "%s.ms%d.gs.nintendowifi.net" .global Unk_ov4_0221A098 Unk_ov4_0221A098: ; 0x0221A098 - .incbin "incbin/overlay4_data.bin", 0x4218, 0x4238 - 0x4218 + .asciz "slist->state == sl_disconnected" .global Unk_ov4_0221A0B8 Unk_ov4_0221A0B8: ; 0x0221A0B8 - .incbin "incbin/overlay4_data.bin", 0x4238, 0x423C - 0x4238 + .word 0x30 .global Unk_ov4_0221A0BC Unk_ov4_0221A0BC: ; 0x0221A0BC - .incbin "incbin/overlay4_data.bin", 0x423C, 0x4244 - 0x423C + .word 0xFFFFFFFF + .word 0x0 .global Unk_ov4_0221A0C4 Unk_ov4_0221A0C4: ; 0x0221A0C4 - .incbin "incbin/overlay4_data.bin", 0x4244, 0x4250 - 0x4244 + .ascii "inlen >= 0" + .space 0x2 .global Unk_ov4_0221A0D0 Unk_ov4_0221A0D0: ; 0x0221A0D0 - .incbin "incbin/overlay4_data.bin", 0x4250, 0x18 + .asciz "slist->inbufferlen >= 0" diff --git a/lib/libVCT/asm/adpcm.s b/lib/libVCT/asm/adpcm.s index 529a1cc9fa..aca246dfa6 100644 --- a/lib/libVCT/asm/adpcm.s +++ b/lib/libVCT/asm/adpcm.s @@ -1242,17 +1242,34 @@ _0220268C: .global Unk_ov4_02215C38 Unk_ov4_02215C38: ; 0x02215C38 - .incbin "incbin/overlay4_rodata.bin", 0x3D0, 0x3D4 - 0x3D0 + .short 0x1FF + .short 0x1FF .global Unk_ov4_02215C3C Unk_ov4_02215C3C: ; 0x02215C3C - .incbin "incbin/overlay4_rodata.bin", 0x3D4, 0x3DC - 0x3D4 + .word 0x201FFFF + .word 0x201FFFF .global Unk_ov4_02215C44 Unk_ov4_02215C44: ; 0x02215C44 - .incbin "incbin/overlay4_rodata.bin", 0x3DC, 0x3EC - 0x3DC + .word 0xFFFFFFFF + .byte 0x2, 0x4, 0x6, 0x8 + .word 0xFFFFFFFF + .byte 0x2, 0x4, 0x6, 0x8 .global Unk_ov4_02215C54 Unk_ov4_02215C54: ; 0x02215C54 - .incbin "incbin/overlay4_rodata.bin", 0x3EC, 0xB4 + .short 0x7, 0x8 + .short 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0x10, 0x11 + .short 0x13, 0x15, 0x17, 0x19, 0x1C, 0x1F, 0x22, 0x25 + .short 0x29, 0x2D, 0x32, 0x37, 0x3C, 0x42, 0x49, 0x50 + .short 0x58, 0x61, 0x6B, 0x76, 0x82, 0x8F, 0x9D, 0xAD + .short 0xBE, 0xD1, 0xE6, 0xFD, 0x117, 0x133, 0x151, 0x173 + .short 0x198, 0x1C1, 0x1EE, 0x220, 0x256, 0x292, 0x2D4, 0x31C + .short 0x36C, 0x3C3, 0x424, 0x48E, 0x502, 0x583, 0x610, 0x6AB + .short 0x756, 0x812, 0x8E0, 0x9C3, 0xABD, 0xBD0, 0xCFF, 0xE4C + .short 0xFBA, 0x114C, 0x1307, 0x14EE, 0x1706, 0x1954, 0x1BDC, 0x1EA5 + .short 0x21B6, 0x2515, 0x28CA, 0x2CDF, 0x315B, 0x364B, 0x3BB9, 0x41B2 + .short 0x4844, 0x4F7E, 0x5771, 0x602F, 0x69CE, 0x7462, 0x7FFF + .space 0x2 diff --git a/lib/libVCT/asm/audio.s b/lib/libVCT/asm/audio.s index c189828de1..53d27a7164 100644 --- a/lib/libVCT/asm/audio.s +++ b/lib/libVCT/asm/audio.s @@ -1071,12 +1071,14 @@ _02203500: .word Unk_ov4_02215D12 .global Unk_ov4_02215D08 Unk_ov4_02215D08: ; 0x02215D08 - .incbin "incbin/overlay4_rodata.bin", 0x4A0, 0x4AA - 0x4A0 + .short 0x8, 0x8 + .byte 0x2, 0x4, 0x3, 0x4, 0x4, 0x4 .global Unk_ov4_02215D12 Unk_ov4_02215D12: ; 0x02215D12 - .incbin "incbin/overlay4_rodata.bin", 0x4AA, 0x15 - + .byte 0x1, 0x0, 0x0, 0x1, 0x1, 0x0 + .byte 0x1, 0x1, 0x1, 0x1, 0x1, 0x2, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2 + .short 0x3 .data @@ -1084,7 +1086,7 @@ Unk_ov4_02215D12: ; 0x02215D12 .global Unk_ov4_0221A0E8 Unk_ov4_0221A0E8: ; 0x0221A0E8 - .incbin "incbin/overlay4_data.bin", 0x4268, 0x4 + .word 0x1 diff --git a/lib/libVCT/asm/fir.s b/lib/libVCT/asm/fir.s index 3f4a448be7..de42aaced4 100644 --- a/lib/libVCT/asm/fir.s +++ b/lib/libVCT/asm/fir.s @@ -287,7 +287,8 @@ _0220589C: .word Unk_ov4_0221C78C .global Unk_ov4_0221A124 Unk_ov4_0221A124: ; 0x0221A124 - .incbin "incbin/overlay4_data.bin", 0x42A4, 0x10 + .byte 0xFB, 0xE9, 0x3D, 0x40, 0xBC, 0xC7, 0xD1, 0x2C, 0x2A, 0xD0, 0x7C, 0x3 + .byte 0xF0, 0x8, 0x93, 0xF5 diff --git a/lib/libVCT/asm/g711.s b/lib/libVCT/asm/g711.s index 8c8d48ae96..67b63400a0 100644 --- a/lib/libVCT/asm/g711.s +++ b/lib/libVCT/asm/g711.s @@ -121,5 +121,7 @@ _022038D4: .global Unk_ov4_0221A0EC Unk_ov4_0221A0EC: ; 0x0221A0EC - .incbin "incbin/overlay4_data.bin", 0x426C, 0x20 + .word 0x3F + .word 0x7F, 0xFF, 0x1FF, 0x3FF + .word 0x7FF, 0xFFF, 0x1FFF diff --git a/lib/libVCT/asm/incbin/ssp.bin b/lib/libVCT/asm/incbin/ssp.bin new file mode 100644 index 0000000000..ee4fe6ae29 Binary files /dev/null and b/lib/libVCT/asm/incbin/ssp.bin differ diff --git a/lib/libVCT/asm/ssp.s b/lib/libVCT/asm/ssp.s index a3f0aa8380..40f90223b4 100644 --- a/lib/libVCT/asm/ssp.s +++ b/lib/libVCT/asm/ssp.s @@ -1233,27 +1233,29 @@ _02205124: .word 0x0221C70C .global Unk_ov4_02215D28 Unk_ov4_02215D28: ; 0x02215D28 - .incbin "incbin/overlay4_rodata.bin", 0x4C0, 0x4C8 - 0x4C0 + .byte 0x1, 0x8, 0x4, 0xA + .space 0x4 .global Unk_ov4_02215D30 Unk_ov4_02215D30: ; 0x02215D30 - .incbin "incbin/overlay4_rodata.bin", 0x4C8, 0x4D0 - 0x4C8 + .byte 0x7, 0xC, 0x2, 0x3, 0x9, 0x2 + .space 0x2 .global Unk_ov4_02215D38 Unk_ov4_02215D38: ; 0x02215D38 - .incbin "incbin/overlay4_rodata.bin", 0x4D0, 0x512 - 0x4D0 + .incbin "incbin/ssp.bin", 0x0, 0x42 .global Unk_ov4_02215D7A Unk_ov4_02215D7A: ; 0x02215D7A - .incbin "incbin/overlay4_rodata.bin", 0x512, 0x554 - 0x512 + .incbin "incbin/ssp.bin", 0x42, 0x84 - 0x42 .global Unk_ov4_02215DBC Unk_ov4_02215DBC: ; 0x02215DBC - .incbin "incbin/overlay4_rodata.bin", 0x554, 0x596 - 0x554 + .incbin "incbin/ssp.bin", 0x84, 0xC6 - 0x84 .global Unk_ov4_02215DFE Unk_ov4_02215DFE: ; 0x02215DFE - .incbin "incbin/overlay4_rodata.bin", 0x596, 0x42 + .incbin "incbin/ssp.bin", 0xC6, 0x42 @@ -1262,7 +1264,8 @@ Unk_ov4_02215DFE: ; 0x02215DFE .global Unk_ov4_0221A10C Unk_ov4_0221A10C: ; 0x0221A10C - .incbin "incbin/overlay4_data.bin", 0x428C, 0x8 + .byte 0xF7, 0xB5, 0xEF, 0x0 + .space 0x4 diff --git a/lib/libVCT/asm/vad.s b/lib/libVCT/asm/vad.s index f58e1d4906..8475c4d00f 100644 --- a/lib/libVCT/asm/vad.s +++ b/lib/libVCT/asm/vad.s @@ -201,7 +201,9 @@ _022054E0: .word ov4_02205270 .global Unk_ov4_0221A114 Unk_ov4_0221A114: ; 0x0221A114 - .incbin "incbin/overlay4_data.bin", 0x4294, 0x10 + .space 0x8 + .word 0xF + .word 0x3FC diff --git a/lib/msl/asm/MSL_C++/float.s b/lib/msl/asm/MSL_C++/float.s index cc74cc50be..92548a9c11 100644 --- a/lib/msl/asm/MSL_C++/float.s +++ b/lib/msl/asm/MSL_C++/float.s @@ -7,13 +7,15 @@ .global Unk_021015AC Unk_021015AC: ; 0x021015AC - .incbin "incbin/arm9_data.bin", 0x28CC, 0x28D0 - 0x28CC + .space 0x2 + .byte 0x80, 0x7F .global Unk_021015B0 Unk_021015B0: ; 0x021015B0 - .incbin "incbin/arm9_data.bin", 0x28D0, 0x28D4 - 0x28D0 + .byte 0xFF, 0xFF, 0xFF, 0x7F .global Unk_021015B4 Unk_021015B4: ; 0x021015B4 - .incbin "incbin/arm9_data.bin", 0x28D4, 0x8 + .space 0x6 + .byte 0xF0, 0x7F diff --git a/lib/msl/asm/MSL_C++/include/locale_cpp.inc b/lib/msl/asm/MSL_C++/include/locale_cpp.inc index 5e1cd9fdd6..e45d06abe7 100644 --- a/lib/msl/asm/MSL_C++/include/locale_cpp.inc +++ b/lib/msl/asm/MSL_C++/include/locale_cpp.inc @@ -1,2 +1,3 @@ .public sub_020DFA90 .public sub_020E3F94 +.public Unk_021019C8 \ No newline at end of file diff --git a/lib/msl/asm/MSL_C++/include/msl_thread.inc b/lib/msl/asm/MSL_C++/include/msl_thread.inc index 2590fe85df..03fe4038e6 100644 --- a/lib/msl/asm/MSL_C++/include/msl_thread.inc +++ b/lib/msl/asm/MSL_C++/include/msl_thread.inc @@ -1,5 +1,6 @@ .public strlen .public strcpy +.public sub_020DF9BC .public sub_020DF9C0 .public sub_020DFB48 .public sub_020DFBB0 diff --git a/lib/msl/asm/MSL_C++/ios.s b/lib/msl/asm/MSL_C++/ios.s index 3bf6e91cd9..328d719358 100644 --- a/lib/msl/asm/MSL_C++/ios.s +++ b/lib/msl/asm/MSL_C++/ios.s @@ -139,11 +139,15 @@ sub_020DFB04: ; 0x020DFB04 .global Unk_020E4590 Unk_020E4590: ; 0x020E4590 - .incbin "incbin/arm9_exception.bin", 0x38, 0x10 + .byte 0x20, 0x3, 0x50, 0x58, 0x0, 0xE, 0x0, 0x82 + .byte 0x0, 0xD0, 0xFA, 0xD + .word 0x2 .global Unk_020E45A0 Unk_020E45A0: ; 0x020E45A0 - .incbin "incbin/arm9_exception.bin", 0x48, 0x14 + .byte 0x40, 0x81, 0x50, 0x0, 0x40, 0x0, 0x16, 0x28 + .short 0x1E00, 0x8F00, 0x5800, 0x8D00 + .space 0x4 .data @@ -151,41 +155,58 @@ Unk_020E45A0: ; 0x020E45A0 .global Unk_021019C8 Unk_021019C8: ; 0x021019C8 - .incbin "incbin/arm9_data.bin", 0x2CE8, 0x2CF0 - 0x2CE8 + .word 0x02101CB8 + .word Unk_021019EC .global Unk_021019D0 Unk_021019D0: ; 0x021019D0 - .incbin "incbin/arm9_data.bin", 0x2CF0, 0x2CF8 - 0x2CF0 + .word 0x02101CB8 + .word Unk_02101A50 .global Unk_021019D8 Unk_021019D8: ; 0x021019D8 - .incbin "incbin/arm9_data.bin", 0x2CF8, 0x2D00 - 0x2CF8 + .word 0x02101CB8 + .word Unk_02101A2C .global Unk_021019E0 Unk_021019E0: ; 0x021019E0 - .incbin "incbin/arm9_data.bin", 0x2D00, 0x2D0C - 0x2D00 + .word 0x02101CA8 + .word Unk_02101A7C + .word Unk_021019D0 .global Unk_021019EC Unk_021019EC: ; 0x021019EC - .incbin "incbin/arm9_data.bin", 0x2D0C, 0x2D1C - 0x2D0C + .ascii "St9exception" + .space 0x4 .global Unk_021019FC Unk_021019FC: ; 0x021019FC - .incbin "incbin/arm9_data.bin", 0x2D1C, 0x2D34 - 0x2D1C + .space 0x4 + .word Unk_021019D0 + .word sub_020DFA54 + .word sub_020DFA40 + .space 0x8 .global Unk_02101A14 Unk_02101A14: ; 0x02101A14 - .incbin "incbin/arm9_data.bin", 0x2D34, 0x2D4C - 0x2D34 + .space 0x4 + .word Unk_021019E0 + .word sub_020DFB04 + .word sub_020DFAF0 + .word sub_020DFA58 + .word sub_020DFA80 .global Unk_02101A2C Unk_02101A2C: ; 0x02101A2C - .incbin "incbin/arm9_data.bin", 0x2D4C, 0x2D70 - 0x2D4C + .asciz "NSt6detail14default_deleteIA0_cEE" + .space 0x2 .global Unk_02101A50 Unk_02101A50: ; 0x02101A50 - .incbin "incbin/arm9_data.bin", 0x2D70, 0x2D9C - 0x2D70 + .ascii "NSt3tr16detail25shared_ptr_deleter_commonE" + .space 0x2 .global Unk_02101A7C Unk_02101A7C: ; 0x02101A7C - .incbin "incbin/arm9_data.bin", 0x2D9C, 0x48 + .asciz "NSt3tr16detail18shared_ptr_deleterIcNSt6detail14default_deleteIA0_cEEEE" diff --git a/lib/msl/asm/MSL_C++/locale_cpp.s b/lib/msl/asm/MSL_C++/locale_cpp.s index b1dcc21e31..b2d27ed4e5 100644 --- a/lib/msl/asm/MSL_C++/locale_cpp.s +++ b/lib/msl/asm/MSL_C++/locale_cpp.s @@ -61,7 +61,9 @@ sub_020DFB60: ; 0x020DFB60 .global Unk_02101AC4 Unk_02101AC4: ; 0x02101AC4 - .incbin "incbin/arm9_data.bin", 0x2DE4, 0x2DF0 - 0x2DE4 + .word 0x02101CA8 + .word Unk_02101ADC + .word Unk_021019C8 .global Unk_02101AD0 Unk_02101AD0: ; 0x02101AD0 @@ -71,11 +73,12 @@ Unk_02101AD0: ; 0x02101AD0 .global Unk_02101ADC Unk_02101ADC: ; 0x02101ADC - .incbin "incbin/arm9_data.bin", 0x2DFC, 0x2E0C - 0x2DFC + .asciz "St11logic_error" .global Unk_02101AEC Unk_02101AEC: ; 0x02101AEC - .incbin "incbin/arm9_data.bin", 0x2E0C, 0x2E20 - 0x2E0C + .ascii "St12length_error" + .space 0x4 .global Unk_02101B00 Unk_02101B00: ; 0x02101B00 diff --git a/lib/msl/asm/MSL_C++/msl_thread.s b/lib/msl/asm/MSL_C++/msl_thread.s index 292c8d06b4..050d04a5a9 100644 --- a/lib/msl/asm/MSL_C++/msl_thread.s +++ b/lib/msl/asm/MSL_C++/msl_thread.s @@ -84,7 +84,9 @@ _020DFC68: .word sub_020DFB48 .global Unk_020E45B4 Unk_020E45B4: ; 0x020E45B4 - .incbin "incbin/arm9_exception.bin", 0x5C, 0x18 + .short 0x700, 0x4840 + .short 0x2258, 0x18, 0x14, 0xA27, 0x9000, 0xDFA, 0xA602, 0xC + .word sub_020DF9BC .data @@ -92,9 +94,10 @@ Unk_020E45B4: ; 0x020E45B4 .global Unk_02101B28 Unk_02101B28: ; 0x02101B28 - .incbin "incbin/arm9_data.bin", 0x2E48, 0x2E5C - 0x2E48 + .asciz "vector length error" .global Unk_02101B3C Unk_02101B3C: ; 0x02101B3C - .incbin "incbin/arm9_data.bin", 0x2E5C, 0x37 + .ascii "!std::exception!!std::logic_error!!std::length_error!!" + .space 0x2 diff --git a/lib/msl/asm/MSL_C/ansi_fp.s b/lib/msl/asm/MSL_C/ansi_fp.s index c2b46a6632..67d331ec89 100644 --- a/lib/msl/asm/MSL_C/ansi_fp.s +++ b/lib/msl/asm/MSL_C/ansi_fp.s @@ -1481,7 +1481,8 @@ _020DF7D0: .word 0x7FEFFFFF .global Unk_020E4588 Unk_020E4588: ; 0x020E4588 - .incbin "incbin/arm9_exception.bin", 0x30, 0x8 + .short 0xFF00, 0x2005 + .space 0x4 .data @@ -1489,93 +1490,110 @@ Unk_020E4588: ; 0x020E4588 .global Unk_0210188C Unk_0210188C: ; 0x0210188C - .incbin "incbin/arm9_data.bin", 0x2BAC, 0x2BEC - 0x2BAC + .incbin "incbin/ansi_fp.bin", 0x0, 0x40 .global Unk_021018CC Unk_021018CC: ; 0x021018CC - .incbin "incbin/arm9_data.bin", 0x2BEC, 0x2C1C - 0x2BEC + .asciz "542101086242752217003726400434970855712890625" + .space 0x2 .global Unk_021018FC Unk_021018FC: ; 0x021018FC - .incbin "incbin/arm9_data.bin", 0x2C1C, 0x2C44 - 0x2C1C + .ascii "11102230246251565404236316680908203125" + .space 0x2 .global Unk_02101924 Unk_02101924: ; 0x02101924 - .incbin "incbin/arm9_data.bin", 0x2C44, 0x2C5C - 0x2C44 + .asciz "23283064365386962890625" .global Unk_0210193C Unk_0210193C: ; 0x0210193C - .incbin "incbin/arm9_data.bin", 0x2C5C, 0x2C6C - 0x2C5C + .ascii "152587890625" + .space 0x4 .global Unk_0210194C Unk_0210194C: ; 0x0210194C - .incbin "incbin/arm9_data.bin", 0x2C6C, 0x2C74 - 0x2C6C + .ascii "390625" + .space 0x2 .global Unk_02101954 Unk_02101954: ; 0x02101954 - .incbin "incbin/arm9_data.bin", 0x2C74, 0x2C7C - 0x2C74 + .asciz "78125" + .space 0x2 .global Unk_0210195C Unk_0210195C: ; 0x0210195C - .incbin "incbin/arm9_data.bin", 0x2C7C, 0x2C84 - 0x2C7C + .asciz "15625" + .space 0x2 .global Unk_02101964 Unk_02101964: ; 0x02101964 - .incbin "incbin/arm9_data.bin", 0x2C84, 0x2C8C - 0x2C84 + .ascii "3125" + .space 0x4 .global Unk_0210196C Unk_0210196C: ; 0x0210196C - .incbin "incbin/arm9_data.bin", 0x2C8C, 0x2C90 - 0x2C8C + .asciz "625" .global Unk_02101970 Unk_02101970: ; 0x02101970 - .incbin "incbin/arm9_data.bin", 0x2C90, 0x2C94 - 0x2C90 + .asciz "125" .global Unk_02101974 Unk_02101974: ; 0x02101974 - .incbin "incbin/arm9_data.bin", 0x2C94, 0x2C98 - 0x2C94 + .ascii "25" + .space 0x2 .global Unk_02101978 Unk_02101978: ; 0x02101978 - .incbin "incbin/arm9_data.bin", 0x2C98, 0x2C9C - 0x2C98 + .asciz "5" + .space 0x2 .global Unk_0210197C Unk_0210197C: ; 0x0210197C - .incbin "incbin/arm9_data.bin", 0x2C9C, 0x2CA0 - 0x2C9C + .asciz "1" + .space 0x2 .global Unk_02101980 Unk_02101980: ; 0x02101980 - .incbin "incbin/arm9_data.bin", 0x2CA0, 0x2CA4 - 0x2CA0 + .asciz "2" + .space 0x2 .global Unk_02101984 Unk_02101984: ; 0x02101984 - .incbin "incbin/arm9_data.bin", 0x2CA4, 0x2CA8 - 0x2CA4 + .asciz "4" + .space 0x2 .global Unk_02101988 Unk_02101988: ; 0x02101988 - .incbin "incbin/arm9_data.bin", 0x2CA8, 0x2CAC - 0x2CA8 + .asciz "8" + .space 0x2 .global Unk_0210198C Unk_0210198C: ; 0x0210198C - .incbin "incbin/arm9_data.bin", 0x2CAC, 0x2CB0 - 0x2CAC + .ascii "16" + .space 0x2 .global Unk_02101990 Unk_02101990: ; 0x02101990 - .incbin "incbin/arm9_data.bin", 0x2CB0, 0x2CB4 - 0x2CB0 + .ascii "32" + .space 0x2 .global Unk_02101994 Unk_02101994: ; 0x02101994 - .incbin "incbin/arm9_data.bin", 0x2CB4, 0x2CB8 - 0x2CB4 + .ascii "64" + .space 0x2 .global Unk_02101998 Unk_02101998: ; 0x02101998 - .incbin "incbin/arm9_data.bin", 0x2CB8, 0x2CBC - 0x2CB8 + .asciz "128" .global Unk_0210199C Unk_0210199C: ; 0x0210199C - .incbin "incbin/arm9_data.bin", 0x2CBC, 0x2CC0 - 0x2CBC + .asciz "256" .global Unk_021019A0 Unk_021019A0: ; 0x021019A0 - .incbin "incbin/arm9_data.bin", 0x2CC0, 0x25 + .ascii "179769313486231580793728714053034151" + .space 0x4 diff --git a/lib/msl/asm/MSL_C/ctype.s b/lib/msl/asm/MSL_C/ctype.s index a4dc4bb692..61f243a14d 100644 --- a/lib/msl/asm/MSL_C/ctype.s +++ b/lib/msl/asm/MSL_C/ctype.s @@ -7,13 +7,30 @@ .global Unk_020FE764 Unk_020FE764: ; 0x020FE764 - .incbin "incbin/arm9_rodata.bin", 0x19B24, 0x19BA4 - 0x19B24 + .byte 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xA, 0xB + .byte 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16 + .byte 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F + .ascii " !" + .byte 0x22 + .ascii "#$%&'()*+,-./0123456789:;<=>?@abcdefghijklmnopqrstuvwxyz[" + .byte 0x5C + .ascii "]^_`abcdefghijklmnopqrstuvwxyz{|}~" + .byte 0x7F + .global Unk_020FE7E4 Unk_020FE7E4: ; 0x020FE7E4 - .incbin "incbin/arm9_rodata.bin", 0x19BA4, 0x19C24 - 0x19BA4 + .byte 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xA, 0xB + .byte 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16 + .byte 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F + .ascii " !" + .byte 0x22 + .ascii "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[" + .byte 0x5C + .ascii "]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~" + .byte 0x7F .global Unk_020FE864 Unk_020FE864: ; 0x020FE864 - .incbin "incbin/arm9_rodata.bin", 0x19C24, 0x100 + .incbin "incbin/ctype.bin", 0x0, 0x100 diff --git a/lib/msl/asm/MSL_C/e_pow.s b/lib/msl/asm/MSL_C/e_pow.s index 741f97ba7a..14af321f1b 100644 --- a/lib/msl/asm/MSL_C/e_pow.s +++ b/lib/msl/asm/MSL_C/e_pow.s @@ -1169,7 +1169,8 @@ _020DE038: .global Unk_020E4580 Unk_020E4580: ; 0x020E4580 - .incbin "incbin/arm9_exception.bin", 0x28, 0x8 + .byte 0x20, 0xFF, 0x1, 0xB8 + .space 0x4 .rodata @@ -1177,13 +1178,18 @@ Unk_020E4580: ; 0x020E4580 .global Unk_020FEC9C Unk_020FEC9C: ; 0x020FEC9C - .incbin "incbin/arm9_rodata.bin", 0x1A05C, 0x1A06C - 0x1A05C + .space 0xB + .byte 0x40, 0x3, 0xB8, 0xE2, 0x3F .global Unk_020FECAC Unk_020FECAC: ; 0x020FECAC - .incbin "incbin/arm9_rodata.bin", 0x1A06C, 0x1A07C - 0x1A06C + .space 0x6 + .byte 0xF0, 0x3F + .space 0x6 + .byte 0xF8, 0x3F .global Unk_020FECBC Unk_020FECBC: ; 0x020FECBC - .incbin "incbin/arm9_rodata.bin", 0x1A07C, 0x10 + .space 0x8 + .byte 0x6, 0xD0, 0xCF, 0x43, 0xEB, 0xFD, 0x4C, 0x3E diff --git a/lib/msl/asm/MSL_C/incbin/ansi_fp.bin b/lib/msl/asm/MSL_C/incbin/ansi_fp.bin new file mode 100644 index 0000000000..a1f3221e79 Binary files /dev/null and b/lib/msl/asm/MSL_C/incbin/ansi_fp.bin differ diff --git a/lib/msl/asm/MSL_C/incbin/ctype.bin b/lib/msl/asm/MSL_C/incbin/ctype.bin new file mode 100644 index 0000000000..fdb56233ad Binary files /dev/null and b/lib/msl/asm/MSL_C/incbin/ctype.bin differ diff --git a/lib/msl/asm/MSL_C/incbin/locale_c.bin b/lib/msl/asm/MSL_C/incbin/locale_c.bin new file mode 100644 index 0000000000..2d3d00e141 Binary files /dev/null and b/lib/msl/asm/MSL_C/incbin/locale_c.bin differ diff --git a/lib/msl/asm/MSL_C/incbin/wctype.bin b/lib/msl/asm/MSL_C/incbin/wctype.bin new file mode 100644 index 0000000000..49324691aa Binary files /dev/null and b/lib/msl/asm/MSL_C/incbin/wctype.bin differ diff --git a/lib/msl/asm/MSL_C/include/locale_c.inc b/lib/msl/asm/MSL_C/include/locale_c.inc new file mode 100644 index 0000000000..92396d71b8 --- /dev/null +++ b/lib/msl/asm/MSL_C/include/locale_c.inc @@ -0,0 +1,2 @@ +.public __mbtowc_noconv +.public __wctomb_noconv \ No newline at end of file diff --git a/lib/msl/asm/MSL_C/locale_c.s b/lib/msl/asm/MSL_C/locale_c.s index a82d81a260..a405ee5ccd 100644 --- a/lib/msl/asm/MSL_C/locale_c.s +++ b/lib/msl/asm/MSL_C/locale_c.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - + .include "include/locale_c.inc" .data @@ -7,23 +7,28 @@ .global Unk_021015BC Unk_021015BC: ; 0x021015BC - .incbin "incbin/arm9_data.bin", 0x28DC, 0x28E0 - 0x28DC + .space 0x4 .global Unk_021015C0 Unk_021015C0: ; 0x021015C0 - .incbin "incbin/arm9_data.bin", 0x28E0, 0x28E4 - 0x28E0 + .byte 0x25, 0x54 + .space 0x2 .global Unk_021015C4 Unk_021015C4: ; 0x021015C4 - .incbin "incbin/arm9_data.bin", 0x28E4, 0x28EC - 0x28E4 + .asciz "AM|PM" + .space 0x2 .global Unk_021015CC Unk_021015CC: ; 0x021015CC - .incbin "incbin/arm9_data.bin", 0x28EC, 0x28F4 - 0x28EC + .word __mbtowc_noconv + .word __wctomb_noconv .global Unk_021015D4 Unk_021015D4: ; 0x021015D4 - .incbin "incbin/arm9_data.bin", 0x28F4, 0x2900 - 0x28F4 + .word 0x20 + .word 0x6E + .space 0x4 .word Unk_02101604 .global Unk_021015E4 @@ -39,11 +44,12 @@ Unk_021015E4: ; 0x021015E4 .global Unk_02101604 Unk_02101604: ; 0x02101604 - .incbin "incbin/arm9_data.bin", 0x2924, 0x29E4 - 0x2924 + .incbin "incbin/locale_c.bin", 0x0, 0xC0 .global Unk_021016C4 Unk_021016C4: ; 0x021016C4 - .incbin "incbin/arm9_data.bin", 0x29E4, 0x29F0 - 0x29E4 + .ascii "%m/%d/%y" + .space 0x4 .global Unk_021016D0 Unk_021016D0: ; 0x021016D0 @@ -53,17 +59,20 @@ Unk_021016D0: ; 0x021016D0 .global Unk_021016DC Unk_021016DC: ; 0x021016DC - .incbin "incbin/arm9_data.bin", 0x29FC, 0x2A08 - 0x29FC + .asciz "%I:%M:%S %p" .global Unk_021016E8 Unk_021016E8: ; 0x021016E8 - .incbin "incbin/arm9_data.bin", 0x2A08, 0x2A18 - 0x2A08 + .ascii "%a %b %e %T %Y" + .space 0x2 .global Unk_021016F8 Unk_021016F8: ; 0x021016F8 - .incbin "incbin/arm9_data.bin", 0x2A18, 0x2A70 - 0x2A18 + .ascii "Sun|Sunday|Mon|Monday|Tue|Tuesday|Wed|Wednesday|Thu|Thursday|Fri|Friday|Sat|Saturday" + .space 0x4 .global Unk_02101750 Unk_02101750: ; 0x02101750 - .incbin "incbin/arm9_data.bin", 0x2A70, 0x86 + .asciz "Jan|January|Feb|February|Mar|March|Apr|April|May|May|Jun|June|Jul|July|Aug|August|Sep|September|Oct|October|Nov|November|Dec|December" + .space 0x2 diff --git a/lib/msl/asm/MSL_C/printf.s b/lib/msl/asm/MSL_C/printf.s index aebff456b9..95a4c7606c 100644 --- a/lib/msl/asm/MSL_C/printf.s +++ b/lib/msl/asm/MSL_C/printf.s @@ -2533,52 +2533,58 @@ sprintf: ; 0x020D7510 .global Unk_020E4558 Unk_020E4558: ; 0x020E4558 - .incbin "incbin/arm9_exception.bin", 0x0, 0x8 + .byte 0x20, 0xFF, 0x9, 0x60 + .space 0x4 .data .global Unk_021017D8 Unk_021017D8: ; 0x021017D8 - .incbin "incbin/arm9_data.bin", 0x2AF8, 0x2B00 - 0x2AF8 + .asciz "0x0p0" + .space 0x2 .global Unk_021017E0 Unk_021017E0: ; 0x021017E0 - .incbin "incbin/arm9_data.bin", 0x2B00, 0x2B08 - 0x2B00 + .ascii "-INF" + .space 0x4 .global Unk_021017E8 Unk_021017E8: ; 0x021017E8 - .incbin "incbin/arm9_data.bin", 0x2B08, 0x2B10 - 0x2B08 + .ascii "-inf" + .space 0x4 .global Unk_021017F0 Unk_021017F0: ; 0x021017F0 - .incbin "incbin/arm9_data.bin", 0x2B10, 0x2B14 - 0x2B10 + .asciz "INF" .global Unk_021017F4 Unk_021017F4: ; 0x021017F4 - .incbin "incbin/arm9_data.bin", 0x2B14, 0x2B18 - 0x2B14 + .asciz "inf" .global Unk_021017F8 Unk_021017F8: ; 0x021017F8 - .incbin "incbin/arm9_data.bin", 0x2B18, 0x2B20 - 0x2B18 + .ascii "-NAN" + .space 0x4 .global Unk_02101800 Unk_02101800: ; 0x02101800 - .incbin "incbin/arm9_data.bin", 0x2B20, 0x2B28 - 0x2B20 + .ascii "-nan" + .space 0x4 .global Unk_02101808 Unk_02101808: ; 0x02101808 - .incbin "incbin/arm9_data.bin", 0x2B28, 0x2B2C - 0x2B28 + .asciz "NAN" .global Unk_0210180C Unk_0210180C: ; 0x0210180C - .incbin "incbin/arm9_data.bin", 0x2B2C, 0x2B30 - 0x2B2C + .asciz "nan" .global Unk_02101810 Unk_02101810: ; 0x02101810 - .incbin "incbin/arm9_data.bin", 0x2B30, 0x2B34 - 0x2B30 + .space 0x4 .global Unk_02101814 Unk_02101814: ; 0x02101814 - .incbin "incbin/arm9_data.bin", 0x2B34, 0x1 + .space 0x1 diff --git a/lib/msl/asm/MSL_C/rand.s b/lib/msl/asm/MSL_C/rand.s index d7e87d573c..3bc1dfef62 100644 --- a/lib/msl/asm/MSL_C/rand.s +++ b/lib/msl/asm/MSL_C/rand.s @@ -37,5 +37,5 @@ _020D76E0: .word Unk_02101818 .global Unk_02101818 Unk_02101818: ; 0x02101818 - .incbin "incbin/arm9_data.bin", 0x2B38, 0x4 + .word 0x1 diff --git a/lib/msl/asm/MSL_C/scanf.s b/lib/msl/asm/MSL_C/scanf.s index 89d49b9e33..825388f3ac 100644 --- a/lib/msl/asm/MSL_C/scanf.s +++ b/lib/msl/asm/MSL_C/scanf.s @@ -1447,12 +1447,15 @@ sscanf: ; 0x020D8A08 .global Unk_020E4560 Unk_020E4560: ; 0x020E4560 - .incbin "incbin/arm9_exception.bin", 0x8, 0x8 + .byte 0x0, 0xFF, 0x1, 0xB0 + .space 0x4 .rodata .global Unk_020FE964 Unk_020FE964: ; 0x020FE964 - .incbin "incbin/arm9_rodata.bin", 0x19D24, 0x28 + .space 0x4 + .byte 0xFF, 0xFF, 0xFF, 0x7F + .space 0x20 diff --git a/lib/msl/asm/MSL_C/string.s b/lib/msl/asm/MSL_C/string.s index fcf7ba8f65..a8285d68a1 100644 --- a/lib/msl/asm/MSL_C/string.s +++ b/lib/msl/asm/MSL_C/string.s @@ -470,13 +470,13 @@ _020D9114: .global Unk_0210181C Unk_0210181C: ; 0x0210181C - .incbin "incbin/arm9_data.bin", 0x2B3C, 0x2B40 - 0x2B3C + .space 0x4 .global Unk_02101820 Unk_02101820: ; 0x02101820 - .incbin "incbin/arm9_data.bin", 0x2B40, 0x2B44 - 0x2B40 + .word Unk_0210181C .global Unk_02101824 Unk_02101824: ; 0x02101824 - .incbin "incbin/arm9_data.bin", 0x2B44, 0x4 + .word Unk_0210181C diff --git a/lib/msl/asm/MSL_C/strtold.s b/lib/msl/asm/MSL_C/strtold.s index b3c8bdf5fd..ecb48d062f 100644 --- a/lib/msl/asm/MSL_C/strtold.s +++ b/lib/msl/asm/MSL_C/strtold.s @@ -1421,7 +1421,8 @@ _020DA454: .word strtod .global Unk_020E4568 Unk_020E4568: ; 0x020E4568 - .incbin "incbin/arm9_exception.bin", 0x10, 0x8 + .byte 0x0, 0xFF, 0x1, 0xD0 + .space 0x4 .rodata @@ -1429,9 +1430,9 @@ Unk_020E4568: ; 0x020E4568 .global Unk_020FE98C Unk_020FE98C: ; 0x020FE98C - .incbin "incbin/arm9_rodata.bin", 0x19D4C, 0x19D51 - 0x19D4C + .asciz "NAN(" .global Unk_020FE991 Unk_020FE991: ; 0x020FE991 - .incbin "incbin/arm9_rodata.bin", 0x19D51, 0x9 + .asciz "INFINITY" diff --git a/lib/msl/asm/MSL_C/wctype.s b/lib/msl/asm/MSL_C/wctype.s index 0c5195680c..f00e81d00b 100644 --- a/lib/msl/asm/MSL_C/wctype.s +++ b/lib/msl/asm/MSL_C/wctype.s @@ -7,13 +7,13 @@ .global Unk_020FE99C Unk_020FE99C: ; 0x020FE99C - .incbin "incbin/arm9_rodata.bin", 0x19D5C, 0x19E5C - 0x19D5C + .incbin "incbin/wctype.bin", 0x0, 0x100 .global Unk_020FEA9C Unk_020FEA9C: ; 0x020FEA9C - .incbin "incbin/arm9_rodata.bin", 0x19E5C, 0x19F5C - 0x19E5C + .incbin "incbin/wctype.bin", 0x100, 0x200 - 0x100 .global Unk_020FEB9C Unk_020FEB9C: ; 0x020FEB9C - .incbin "incbin/arm9_rodata.bin", 0x19F5C, 0x100 + .incbin "incbin/wctype.bin", 0x200, 0x100 diff --git a/lib/msl/asm/MSL_C/wprintf.s b/lib/msl/asm/MSL_C/wprintf.s index 0b66a5da16..b7c3236d21 100644 --- a/lib/msl/asm/MSL_C/wprintf.s +++ b/lib/msl/asm/MSL_C/wprintf.s @@ -2305,11 +2305,13 @@ _020DCE60: .word __wStringWrite .global Unk_020E4570 Unk_020E4570: ; 0x020E4570 - .incbin "incbin/arm9_exception.bin", 0x18, 0x8 + .byte 0x20, 0xFF, 0x9, 0x60 + .space 0x4 .global Unk_020E4578 Unk_020E4578: ; 0x020E4578 - .incbin "incbin/arm9_exception.bin", 0x20, 0x8 + .byte 0x20, 0xFF, 0x11, 0x68 + .space 0x4 .data @@ -2317,45 +2319,54 @@ Unk_020E4578: ; 0x020E4578 .global Unk_02101828 Unk_02101828: ; 0x02101828 - .incbin "incbin/arm9_data.bin", 0x2B48, 0x2B54 - 0x2B48 + .short 0x30, 0x78, 0x30, 0x70 + .word 0x30 .global Unk_02101834 Unk_02101834: ; 0x02101834 - .incbin "incbin/arm9_data.bin", 0x2B54, 0x2B60 - 0x2B54 + .short 0x2D, 0x49, 0x4E, 0x46 + .space 0x4 .global Unk_02101840 Unk_02101840: ; 0x02101840 - .incbin "incbin/arm9_data.bin", 0x2B60, 0x2B6C - 0x2B60 + .short 0x2D, 0x69, 0x6E, 0x66 + .space 0x4 .global Unk_0210184C Unk_0210184C: ; 0x0210184C - .incbin "incbin/arm9_data.bin", 0x2B6C, 0x2B74 - 0x2B6C + .short 0x49, 0x4E + .word 0x46 .global Unk_02101854 Unk_02101854: ; 0x02101854 - .incbin "incbin/arm9_data.bin", 0x2B74, 0x2B7C - 0x2B74 + .short 0x69, 0x6E + .word 0x66 .global Unk_0210185C Unk_0210185C: ; 0x0210185C - .incbin "incbin/arm9_data.bin", 0x2B7C, 0x2B88 - 0x2B7C + .short 0x2D, 0x4E, 0x41, 0x4E + .space 0x4 .global Unk_02101868 Unk_02101868: ; 0x02101868 - .incbin "incbin/arm9_data.bin", 0x2B88, 0x2B94 - 0x2B88 + .short 0x2D, 0x6E, 0x61, 0x6E + .space 0x4 .global Unk_02101874 Unk_02101874: ; 0x02101874 - .incbin "incbin/arm9_data.bin", 0x2B94, 0x2B9C - 0x2B94 + .short 0x4E, 0x41, 0x4E + .space 0x2 .global Unk_0210187C Unk_0210187C: ; 0x0210187C - .incbin "incbin/arm9_data.bin", 0x2B9C, 0x2BA4 - 0x2B9C + .short 0x6E, 0x61 + .word 0x6E .global Unk_02101884 Unk_02101884: ; 0x02101884 - .incbin "incbin/arm9_data.bin", 0x2BA4, 0x2BA8 - 0x2BA4 + .space 0x4 .global Unk_02101888 Unk_02101888: ; 0x02101888 - .incbin "incbin/arm9_data.bin", 0x2BA8, 0x1 + .space 0x1 diff --git a/lib/msl/asm/runtime/cxxabi_rtti.s b/lib/msl/asm/runtime/cxxabi_rtti.s index 266331439d..96f6ca222e 100644 --- a/lib/msl/asm/runtime/cxxabi_rtti.s +++ b/lib/msl/asm/runtime/cxxabi_rtti.s @@ -100,7 +100,8 @@ Unk_02101C84: ; 0x02101C84 .global Unk_02101C90 Unk_02101C90: ; 0x02101C90 - .incbin "incbin/arm9_data.bin", 0x2FB0, 0x2FC0 - 0x2FB0 + .ascii "St9type_info" + .space 0x4 .global Unk_02101CA0 Unk_02101CA0: ; 0x02101CA0 @@ -118,9 +119,10 @@ Unk_02101CB0: ; 0x02101CB0 .global Unk_02101CC0 Unk_02101CC0: ; 0x02101CC0 - .incbin "incbin/arm9_data.bin", 0x2FE0, 0x3004 - 0x2FE0 + .asciz "N10__cxxabiv117__class_type_infoE" + .space 0x2 .global Unk_02101CE4 Unk_02101CE4: ; 0x02101CE4 - .incbin "incbin/arm9_data.bin", 0x3004, 0x25 + .asciz "N10__cxxabiv120__si_class_type_infoE" diff --git a/lib/msl/asm/runtime/exceptionhandler.s b/lib/msl/asm/runtime/exceptionhandler.s index 891126fd44..d6b5012abf 100644 --- a/lib/msl/asm/runtime/exceptionhandler.s +++ b/lib/msl/asm/runtime/exceptionhandler.s @@ -1439,27 +1439,34 @@ _020E3EA4: .word Unk_02101B80 .global Unk_020E45CC Unk_020E45CC: ; 0x020E45CC - .incbin "incbin/arm9_exception.bin", 0x74, 0x8 + .byte 0x0, 0x3, 0x1, 0xB0 + .space 0x4 .global Unk_020E45D4 Unk_020E45D4: ; 0x020E45D4 - .incbin "incbin/arm9_exception.bin", 0x7C, 0x10 + .byte 0x0, 0xFF, 0x1, 0xC8 + .byte 0x58, 0x1D, 0xB8, 0x1A, 0x1, 0x8C, 0x50, 0x1A, 0x0, 0x8E + .space 0x2 .global Unk_020E45E4 Unk_020E45E4: ; 0x020E45E4 - .incbin "incbin/arm9_exception.bin", 0x8C, 0x8 + .byte 0x0, 0x3, 0x1, 0x98 + .space 0x4 .global Unk_020E45EC Unk_020E45EC: ; 0x020E45EC - .incbin "incbin/arm9_exception.bin", 0x94, 0x14 + .byte 0x40, 0x81, 0x70, 0x0, 0x30, 0x0, 0x16, 0x20, 0xB0, 0x24, 0x0, 0x8C + .space 0x4 + .byte 0x38, 0x8, 0x8D, 0x8 .global Unk_020E4600 Unk_020E4600: ; 0x020E4600 - .incbin "incbin/arm9_exception.bin", 0xA8, 0x8 + .byte 0x0, 0xF, 0x30, 0x38, 0x80, 0xE, 0x0, 0x8E .global Unk_020E4608 Unk_020E4608: ; 0x020E4608 - .incbin "incbin/arm9_exception.bin", 0xB0, 0x8 + .byte 0x0, 0xFF, 0x1, 0xC8 + .space 0x4 .data @@ -1467,25 +1474,35 @@ Unk_020E4608: ; 0x020E4608 .global Unk_02101B74 Unk_02101B74: ; 0x02101B74 - .incbin "incbin/arm9_data.bin", 0x2E94, 0x2EA0 - 0x2E94 + .word 0x02101CA8 + .word Unk_02101B90 + .word Unk_021019C8 .global Unk_02101B80 Unk_02101B80: ; 0x02101B80 - .incbin "incbin/arm9_data.bin", 0x2EA0, 0x2EB0 - 0x2EA0 + .asciz "bad_exception" + .space 0x2 .global Unk_02101B90 Unk_02101B90: ; 0x02101B90 - .incbin "incbin/arm9_data.bin", 0x2EB0, 0x2EC4 - 0x2EB0 + .asciz "St13bad_exception" + .space 0x2 .global Unk_02101BA4 Unk_02101BA4: ; 0x02101BA4 - .incbin "incbin/arm9_data.bin", 0x2EC4, 0x2ED8 - 0x2EC4 + .space 0x4 + .word Unk_02101B74 + .word sub_020E3AD8 + .word sub_020E3E88 + .word sub_020E3E9C .global Unk_02101BB8 Unk_02101BB8: ; 0x02101BB8 - .incbin "incbin/arm9_data.bin", 0x2ED8, 0x2EF0 - 0x2ED8 + .asciz "!std::bad_exception!!" + .space 0x2 .global Unk_02101BD0 Unk_02101BD0: ; 0x02101BD0 - .incbin "incbin/arm9_data.bin", 0x2EF0, 0x26 + .asciz "!std::exception!!std::bad_exception!!" + .space 0x2 diff --git a/lib/msl/asm/runtime/include/exceptionhandler.inc b/lib/msl/asm/runtime/include/exceptionhandler.inc index 15b60f2f18..608ce5f9ed 100644 --- a/lib/msl/asm/runtime/include/exceptionhandler.inc +++ b/lib/msl/asm/runtime/include/exceptionhandler.inc @@ -31,3 +31,4 @@ .public sub_020E4458 .public sub_020E4488 .public __throw +.public Unk_021019C8 diff --git a/lib/msl/asm/runtime/include/new.inc b/lib/msl/asm/runtime/include/new.inc index 637f5383b2..482ebd7496 100644 --- a/lib/msl/asm/runtime/include/new.inc +++ b/lib/msl/asm/runtime/include/new.inc @@ -6,3 +6,4 @@ .public sub_020E3F50 .public sub_020E3F94 .public __throw +.public Unk_021019C8 diff --git a/lib/msl/asm/runtime/mwexception.s b/lib/msl/asm/runtime/mwexception.s index f416e519fd..fe9ab937d2 100644 --- a/lib/msl/asm/runtime/mwexception.s +++ b/lib/msl/asm/runtime/mwexception.s @@ -339,9 +339,9 @@ __rethrow: ; 0x020E4500 .global Unk_02101D0C Unk_02101D0C: ; 0x02101D0C - .incbin "incbin/arm9_data.bin", 0x302C, 0x3030 - 0x302C + .word sub_020E4144 .global Unk_02101D10 Unk_02101D10: ; 0x02101D10 - .incbin "incbin/arm9_data.bin", 0x3030, 0x4 + .word sub_020E4150 diff --git a/lib/msl/asm/runtime/new.s b/lib/msl/asm/runtime/new.s index cbfcc2d6ba..5248697c1d 100644 --- a/lib/msl/asm/runtime/new.s +++ b/lib/msl/asm/runtime/new.s @@ -145,19 +145,27 @@ _020E4028: .word Unk_02101BFC .global Unk_020E4610 Unk_020E4610: ; 0x020E4610 - .incbin "incbin/arm9_exception.bin", 0xB8, 0x18 + .byte 0x40, 0x87, 0x60, 0x0, 0x40, 0x40, 0x16, 0x28 + .byte 0x0, 0x26, 0x0, 0x8F, 0x2, 0x98, 0x0, 0x24, 0x1C, 0x10, 0x2, 0x8D + .space 0x4 .global Unk_020E4628 Unk_020E4628: ; 0x020E4628 - .incbin "incbin/arm9_exception.bin", 0xD0, 0x1C + .byte 0x40, 0x80, 0x70, 0x0, 0x28, 0x0, 0x1C, 0x20, 0x0, 0x2A, 0x28, 0x0, 0x32, 0x0, 0xC, 0x0 + .byte 0x0, 0x0, 0x0, 0x38, 0x30, 0x8F, 0x0, 0x60, 0x0, 0x8D + .space 0x2 .global Unk_020E4644 Unk_020E4644: ; 0x020E4644 - .incbin "incbin/arm9_exception.bin", 0xEC, 0x18 + .byte 0x40, 0x80, 0x40, 0x0 + .byte 0x20, 0x0, 0x16, 0x20, 0x0, 0x26, 0x0, 0x8F, 0x2, 0x30, 0x0, 0x24, 0x1C, 0x10, 0x2, 0x8D + .space 0x4 .global Unk_020E465C Unk_020E465C: ; 0x020E465C - .incbin "incbin/arm9_exception.bin", 0x104, 0x14 + .byte 0x40, 0x80, 0x40, 0x0, 0x20, 0x0, 0x16, 0x20, 0x0, 0x1E, 0x0, 0x8F + .byte 0x0, 0x30, 0x0, 0x8D + .space 0x4 .data @@ -165,31 +173,41 @@ Unk_020E465C: ; 0x020E465C .global Unk_02101BF8 Unk_02101BF8: ; 0x02101BF8 - .incbin "incbin/arm9_data.bin", 0x2F18, 0x2F1C - 0x2F18 + .word 0x1 .global Unk_02101BFC Unk_02101BFC: ; 0x02101BFC - .incbin "incbin/arm9_data.bin", 0x2F1C, 0x2F28 - 0x2F1C + .asciz "bad_alloc" + .space 0x2 .global Unk_02101C08 Unk_02101C08: ; 0x02101C08 - .incbin "incbin/arm9_data.bin", 0x2F28, 0x2F34 - 0x2F28 + .word 0x2101CA8 + .word Unk_02101C14 + .word Unk_021019C8 .global Unk_02101C14 Unk_02101C14: ; 0x02101C14 - .incbin "incbin/arm9_data.bin", 0x2F34, 0x2F44 - 0x2F34 + .ascii "St9bad_alloc" + .space 0x4 .global Unk_02101C24 Unk_02101C24: ; 0x02101C24 - .incbin "incbin/arm9_data.bin", 0x2F44, 0x2F58 - 0x2F44 + .ascii "!std::bad_alloc!" + .space 0x4 .global Unk_02101C38 Unk_02101C38: ; 0x02101C38 - .incbin "incbin/arm9_data.bin", 0x2F58, 0x2F6C - 0x2F58 + .space 0x4 + .word Unk_02101C08 + .word sub_020E3EE8 + .word sub_020E400C + .word sub_020E4020 .global Unk_02101C4C Unk_02101C4C: ; 0x02101C4C - .incbin "incbin/arm9_data.bin", 0x2F6C, 0x22 + .asciz "!std::exception!!std::bad_alloc!!" + .space 0x2