From bbac3d905b6c5e2aee0c66502d0026047bfff18d Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Tue, 9 Feb 2021 03:02:14 +0900 Subject: [PATCH] match nuContRmbMgr.c --- .vscode/settings.json | 10 +- asm/data/code_1060_len_310.rodata.s | 6 + asm/data/code_6EAC0.data.s | 195 ------------------ asm/data/code_6F110.data.s | 192 +++++++++++++++++ asm/data/code_73130.rodata.s | 10 - .../code_1b40_len_20b0/func_80027088.s | 7 + .../code_42e0_len_1f60/func_80029860.s | 44 ---- .../code_7e40_len_3f0/nuGfxTaskMgr.s | 0 .../code_7e40_len_3f0/nuGfxTaskMgrInit.s | 0 .../code_7e40_len_3f0/nuGfxTaskStart.s | 0 configure.py | 10 +- diff_settings.py | 2 +- include/functions.h | 3 +- src/code_1060_len_310.c | 6 +- src/code_1b40_len_20b0.c | 35 ++++ src/code_42e0_len_1f60.c | 67 +++++- src/os/code_7e40_len_3f0.c | 7 - src/os/nusys/code_7e40_len_3f0.c | 7 + src/os/nusys/nuContRmbMgr.c | 18 +- tools/splat.yaml | 7 +- 20 files changed, 351 insertions(+), 275 deletions(-) create mode 100644 asm/data/code_1060_len_310.rodata.s create mode 100644 asm/data/code_6F110.data.s delete mode 100644 asm/data/code_73130.rodata.s delete mode 100644 asm/nonmatchings/code_42e0_len_1f60/func_80029860.s rename asm/nonmatchings/os/{ => nusys}/code_7e40_len_3f0/nuGfxTaskMgr.s (100%) rename asm/nonmatchings/os/{ => nusys}/code_7e40_len_3f0/nuGfxTaskMgrInit.s (100%) rename asm/nonmatchings/os/{ => nusys}/code_7e40_len_3f0/nuGfxTaskStart.s (100%) delete mode 100644 src/os/code_7e40_len_3f0.c create mode 100644 src/os/nusys/code_7e40_len_3f0.c diff --git a/.vscode/settings.json b/.vscode/settings.json index 65e69d00f9..56b12a823d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -31,6 +31,14 @@ }, "files.associations": { "*.h": "c", - "random": "c" + "random": "c", + "array": "c", + "deque": "c", + "string": "c", + "unordered_map": "c", + "vector": "c", + "string_view": "c", + "initializer_list": "c", + "ranges": "c" }, } diff --git a/asm/data/code_1060_len_310.rodata.s b/asm/data/code_1060_len_310.rodata.s new file mode 100644 index 0000000000..b3e031650e --- /dev/null +++ b/asm/data/code_1060_len_310.rodata.s @@ -0,0 +1,6 @@ +.include "macro.inc" + +.section .rodata + +glabel D_80097D30 +.ascii "File:%s Line:%d %s \n\0\0\0" diff --git a/asm/data/code_6EAC0.data.s b/asm/data/code_6EAC0.data.s index 17783004c1..e78604e770 100644 --- a/asm/data/code_6EAC0.data.s +++ b/asm/data/code_6EAC0.data.s @@ -28,198 +28,3 @@ glabel nuContPakGameCode glabel nuContCallBack .word 0x00000000, 0x80093CA8, 0x02000000, 0x00000000 - -glabel nuContRmbSearchTime -.word 0x0000012C, contRmbRetrace, contRmbCheckMesg, contRmbStartMesg, contRmbStopMesg, contRmbForceStopMesg, contRmbForceStopEndMesg, 0x00000000 - -glabel nuContRmbCallBack -.word 0x00000000, 0x80093CE4, 0x03000000, 0x00000000 - -glabel nuGfxFunc -.word 0x00000000 - -glabel nuGfxPreNMIFunc -.word 0x00000000, 0x00000000, 0x00000000 - -glabel D_80093D20 -.word 0x00000000, contRetrace, contReadData, contReadNW, contQuery, 0x00000000 - -glabel D_80093D38 -.word 0x00000000, 0x80093D24, 0x01000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_80093D50 -.word 0x00000000 - -glabel D_80093D54 -.word 0x00000000 - -glabel D_80093D58 -.word 0x00000000 - -glabel D_80093D5C -.word 0x00000000 - -glabel D_80093D60 -.word 0x00000000 - -glabel D_80093D64 -.word 0x00000000 - -glabel D_80093D68 -.word 0x00000000 - -glabel D_80093D6C -.word 0x00000000 - -glabel D_80093D70 -.word 0x800B4518, 0x800B1B08, 0x00000000, 0x00000000 - -glabel D_80093D80 -.word 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -glabel D_80093D90 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_80093DA0 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -glabel D_80093DB0 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_80093DC0 -.float 0.017453292, 0.0, 0.0, 0.0 - -glabel D_80093DD0 -.float 0.017453292, 0.0, 0.0, 0.0 - -glabel D_80093DE0 -.short 0x0000, 0x0032, 0x0064, 0x0096, 0x00C9, 0x00FB, 0x012D, 0x0160, 0x0192, 0x01C4, 0x01F7, 0x0229, 0x025B, 0x028E, 0x02C0, 0x02F2, 0x0324, 0x0357, 0x0389, 0x03BB, 0x03EE, 0x0420, 0x0452, 0x0484, 0x04B7, 0x04E9, 0x051B, 0x054E, 0x0580, 0x05B2, 0x05E4, 0x0617, 0x0649, 0x067B, 0x06AD, 0x06E0, 0x0712, 0x0744, 0x0776, 0x07A9, 0x07DB, 0x080D, 0x083F, 0x0871, 0x08A4, 0x08D6, 0x0908, 0x093A, 0x096C, 0x099F, 0x09D1, 0x0A03, 0x0A35, 0x0A67, 0x0A99, 0x0ACB, 0x0AFE, 0x0B30, 0x0B62, 0x0B94, 0x0BC6, 0x0BF8, 0x0C2A, 0x0C5C, 0x0C8E, 0x0CC0, 0x0CF2, 0x0D25, 0x0D57, 0x0D89, 0x0DBB, 0x0DED, 0x0E1F, 0x0E51, 0x0E83, 0x0EB5, 0x0EE7, 0x0F19, 0x0F4B, 0x0F7C, 0x0FAE, 0x0FE0, 0x1012, 0x1044, 0x1076, 0x10A8, 0x10DA, 0x110C, 0x113E, 0x116F, 0x11A1, 0x11D3, 0x1205, 0x1237, 0x1269, 0x129A, 0x12CC, 0x12FE, 0x1330, 0x1361, 0x1393, 0x13C5, 0x13F6, 0x1428, 0x145A, 0x148C, 0x14BD, 0x14EF, 0x1520, 0x1552, 0x1584, 0x15B5, 0x15E7, 0x1618, 0x164A, 0x167B, 0x16AD, 0x16DF, 0x1710, 0x1741, 0x1773, 0x17A4, 0x17D6, 0x1807, 0x1839, 0x186A, 0x189B, 0x18CD, 0x18FE, 0x1930, 0x1961, 0x1992, 0x19C3, 0x19F5, 0x1A26, 0x1A57, 0x1A88, 0x1ABA, 0x1AEB, 0x1B1C, 0x1B4D, 0x1B7E, 0x1BAF, 0x1BE1, 0x1C12, 0x1C43, 0x1C74, 0x1CA5, 0x1CD6, 0x1D07, 0x1D38, 0x1D69, 0x1D9A, 0x1DCB, 0x1DFC, 0x1E2D, 0x1E5D, 0x1E8E, 0x1EBF, 0x1EF0, 0x1F21, 0x1F52, 0x1F82, 0x1FB3, 0x1FE4, 0x2015, 0x2045, 0x2076, 0x20A7, 0x20D7, 0x2108, 0x2139, 0x2169, 0x219A, 0x21CA, 0x21FB, 0x222B, 0x225C, 0x228C, 0x22BD, 0x22ED, 0x231D, 0x234E, 0x237E, 0x23AE, 0x23DF, 0x240F, 0x243F, 0x2470, 0x24A0, 0x24D0, 0x2500, 0x2530, 0x2560, 0x2591, 0x25C1, 0x25F1, 0x2621, 0x2651, 0x2681, 0x26B1, 0x26E1, 0x2711, 0x2740, 0x2770, 0x27A0, 0x27D0, 0x2800, 0x2830, 0x285F, 0x288F, 0x28BF, 0x28EE, 0x291E, 0x294E, 0x297D, 0x29AD, 0x29DD, 0x2A0C, 0x2A3C, 0x2A6B, 0x2A9B, 0x2ACA, 0x2AF9, 0x2B29, 0x2B58, 0x2B87, 0x2BB7, 0x2BE6, 0x2C15, 0x2C44, 0x2C74, 0x2CA3, 0x2CD2, 0x2D01, 0x2D30, 0x2D5F, 0x2D8E, 0x2DBD, 0x2DEC, 0x2E1B, 0x2E4A, 0x2E79, 0x2EA8, 0x2ED7, 0x2F06, 0x2F34, 0x2F63, 0x2F92, 0x2FC0, 0x2FEF, 0x301E, 0x304C, 0x307B, 0x30A9, 0x30D8, 0x3107, 0x3135, 0x3163, 0x3192, 0x31C0, 0x31EF, 0x321D, 0x324B, 0x3279, 0x32A8, 0x32D6, 0x3304, 0x3332, 0x3360, 0x338E, 0x33BC, 0x33EA, 0x3418, 0x3446, 0x3474, 0x34A2, 0x34D0, 0x34FE, 0x352B, 0x3559, 0x3587, 0x35B5, 0x35E2, 0x3610, 0x363D, 0x366B, 0x3698, 0x36C6, 0x36F3, 0x3721, 0x374E, 0x377C, 0x37A9, 0x37D6, 0x3803, 0x3831, 0x385E, 0x388B, 0x38B8, 0x38E5, 0x3912, 0x393F, 0x396C, 0x3999, 0x39C6, 0x39F3, 0x3A20, 0x3A4D, 0x3A79, 0x3AA6, 0x3AD3, 0x3B00, 0x3B2C, 0x3B59, 0x3B85, 0x3BB2, 0x3BDE, 0x3C0B, 0x3C37, 0x3C64, 0x3C90, 0x3CBC, 0x3CE9, 0x3D15, 0x3D41, 0x3D6D, 0x3D99, 0x3DC5, 0x3DF1, 0x3E1D, 0x3E49, 0x3E75, 0x3EA1, 0x3ECD, 0x3EF9, 0x3F25, 0x3F50, 0x3F7C, 0x3FA8, 0x3FD3, 0x3FFF, 0x402B, 0x4056, 0x4082, 0x40AD, 0x40D8, 0x4104, 0x412F, 0x415A, 0x4186, 0x41B1, 0x41DC, 0x4207, 0x4232, 0x425D, 0x4288, 0x42B3, 0x42DE, 0x4309, 0x4334, 0x435F, 0x4389, 0x43B4, 0x43DF, 0x4409, 0x4434, 0x445F, 0x4489, 0x44B4, 0x44DE, 0x4508, 0x4533, 0x455D, 0x4587, 0x45B1, 0x45DC, 0x4606, 0x4630, 0x465A, 0x4684, 0x46AE, 0x46D8, 0x4702, 0x472C, 0x4755, 0x477F, 0x47A9, 0x47D2, 0x47FC, 0x4826, 0x484F, 0x4879, 0x48A2, 0x48CC, 0x48F5, 0x491E, 0x4948, 0x4971, 0x499A, 0x49C3, 0x49EC, 0x4A15, 0x4A3E, 0x4A67, 0x4A90, 0x4AB9, 0x4AE2, 0x4B0B, 0x4B33, 0x4B5C, 0x4B85, 0x4BAD, 0x4BD6, 0x4BFE, 0x4C27, 0x4C4F, 0x4C78, 0x4CA0, 0x4CC8, 0x4CF0, 0x4D19, 0x4D41, 0x4D69, 0x4D91, 0x4DB9, 0x4DE1, 0x4E09, 0x4E31, 0x4E58, 0x4E80, 0x4EA8, 0x4ED0, 0x4EF7, 0x4F1F, 0x4F46, 0x4F6E, 0x4F95, 0x4FBD, 0x4FE4, 0x500B, 0x5032, 0x505A, 0x5081, 0x50A8, 0x50CF, 0x50F6, 0x511D, 0x5144, 0x516B, 0x5191, 0x51B8, 0x51DF, 0x5205, 0x522C, 0x5253, 0x5279, 0x52A0, 0x52C6, 0x52EC, 0x5313, 0x5339, 0x535F, 0x5385, 0x53AB, 0x53D1, 0x53F7, 0x541D, 0x5443, 0x5469, 0x548F, 0x54B5, 0x54DA, 0x5500, 0x5525, 0x554B, 0x5571, 0x5596, 0x55BB, 0x55E1, 0x5606, 0x562B, 0x5650, 0x5675, 0x569B, 0x56C0, 0x56E5, 0x5709, 0x572E, 0x5753, 0x5778, 0x579D, 0x57C1, 0x57E6, 0x580A, 0x582F, 0x5853, 0x5878, 0x589C, 0x58C0, 0x58E5, 0x5909, 0x592D, 0x5951, 0x5975, 0x5999, 0x59BD, 0x59E1, 0x5A04, 0x5A28, 0x5A4C, 0x5A6F, 0x5A93, 0x5AB7, 0x5ADA, 0x5AFD, 0x5B21, 0x5B44, 0x5B67, 0x5B8B, 0x5BAE, 0x5BD1, 0x5BF4, 0x5C17, 0x5C3A, 0x5C5D, 0x5C7F, 0x5CA2, 0x5CC5, 0x5CE7, 0x5D0A, 0x5D2D, 0x5D4F, 0x5D71, 0x5D94, 0x5DB6, 0x5DD8, 0x5DFA, 0x5E1D, 0x5E3F, 0x5E61, 0x5E83, 0x5EA5, 0x5EC6, 0x5EE8, 0x5F0A, 0x5F2C, 0x5F4D, 0x5F6F, 0x5F90, 0x5FB2, 0x5FD3, 0x5FF4, 0x6016, 0x6037, 0x6058, 0x6079, 0x609A, 0x60BB, 0x60DC, 0x60FD, 0x611E, 0x613E, 0x615F, 0x6180, 0x61A0, 0x61C1, 0x61E1, 0x6202, 0x6222, 0x6242, 0x6263, 0x6283, 0x62A3, 0x62C3, 0x62E3, 0x6303, 0x6323, 0x6342, 0x6362, 0x6382, 0x63A1, 0x63C1, 0x63E0, 0x6400, 0x641F, 0x643F, 0x645E, 0x647D, 0x649C, 0x64BB, 0x64DA, 0x64F9, 0x6518, 0x6537, 0x6556, 0x6574, 0x6593, 0x65B2, 0x65D0, 0x65EF, 0x660D, 0x662B, 0x664A, 0x6668, 0x6686, 0x66A4, 0x66C2, 0x66E0, 0x66FE, 0x671C, 0x673A, 0x6757, 0x6775, 0x6792, 0x67B0, 0x67CD, 0x67EB, 0x6808, 0x6825, 0x6843, 0x6860, 0x687D, 0x689A, 0x68B7, 0x68D4, 0x68F1, 0x690D, 0x692A, 0x6947, 0x6963, 0x6980, 0x699C, 0x69B9, 0x69D5, 0x69F1, 0x6A0E, 0x6A2A, 0x6A46, 0x6A62, 0x6A7E, 0x6A9A, 0x6AB5, 0x6AD1, 0x6AED, 0x6B08, 0x6B24, 0x6B40, 0x6B5B, 0x6B76, 0x6B92, 0x6BAD, 0x6BC8, 0x6BE3, 0x6BFE, 0x6C19, 0x6C34, 0x6C4F, 0x6C6A, 0x6C84, 0x6C9F, 0x6CBA, 0x6CD4, 0x6CEF, 0x6D09, 0x6D23, 0x6D3E, 0x6D58, 0x6D72, 0x6D8C, 0x6DA6, 0x6DC0, 0x6DDA, 0x6DF3, 0x6E0D, 0x6E27, 0x6E40, 0x6E5A, 0x6E73, 0x6E8D, 0x6EA6, 0x6EBF, 0x6ED9, 0x6EF2, 0x6F0B, 0x6F24, 0x6F3D, 0x6F55, 0x6F6E, 0x6F87, 0x6FA0, 0x6FB8, 0x6FD1, 0x6FE9, 0x7002, 0x701A, 0x7032, 0x704A, 0x7062, 0x707A, 0x7092, 0x70AA, 0x70C2, 0x70DA, 0x70F2, 0x7109, 0x7121, 0x7138, 0x7150, 0x7167, 0x717E, 0x7196, 0x71AD, 0x71C4, 0x71DB, 0x71F2, 0x7209, 0x7220, 0x7236, 0x724D, 0x7264, 0x727A, 0x7291, 0x72A7, 0x72BD, 0x72D4, 0x72EA, 0x7300, 0x7316, 0x732C, 0x7342, 0x7358, 0x736E, 0x7383, 0x7399, 0x73AE, 0x73C4, 0x73D9, 0x73EF, 0x7404, 0x7419, 0x742E, 0x7443, 0x7458, 0x746D, 0x7482, 0x7497, 0x74AC, 0x74C0, 0x74D5, 0x74EA, 0x74FE, 0x7512, 0x7527, 0x753B, 0x754F, 0x7563, 0x7577, 0x758B, 0x759F, 0x75B3, 0x75C7, 0x75DA, 0x75EE, 0x7601, 0x7615, 0x7628, 0x763B, 0x764F, 0x7662, 0x7675, 0x7688, 0x769B, 0x76AE, 0x76C1, 0x76D3, 0x76E6, 0x76F9, 0x770B, 0x771E, 0x7730, 0x7742, 0x7754, 0x7767, 0x7779, 0x778B, 0x779D, 0x77AF, 0x77C0, 0x77D2, 0x77E4, 0x77F5, 0x7807, 0x7818, 0x782A, 0x783B, 0x784C, 0x785D, 0x786E, 0x787F, 0x7890, 0x78A1, 0x78B2, 0x78C3, 0x78D3, 0x78E4, 0x78F4, 0x7905, 0x7915, 0x7925, 0x7936, 0x7946, 0x7956, 0x7966, 0x7976, 0x7985, 0x7995, 0x79A5, 0x79B5, 0x79C4, 0x79D4, 0x79E3, 0x79F2, 0x7A02, 0x7A11, 0x7A20, 0x7A2F, 0x7A3E, 0x7A4D, 0x7A5B, 0x7A6A, 0x7A79, 0x7A87, 0x7A96, 0x7AA4, 0x7AB3, 0x7AC1, 0x7ACF, 0x7ADD, 0x7AEB, 0x7AF9, 0x7B07, 0x7B15, 0x7B23, 0x7B31, 0x7B3E, 0x7B4C, 0x7B59, 0x7B67, 0x7B74, 0x7B81, 0x7B8E, 0x7B9B, 0x7BA8, 0x7BB5, 0x7BC2, 0x7BCF, 0x7BDC, 0x7BE8, 0x7BF5, 0x7C02, 0x7C0E, 0x7C1A, 0x7C27, 0x7C33, 0x7C3F, 0x7C4B, 0x7C57, 0x7C63, 0x7C6F, 0x7C7A, 0x7C86, 0x7C92, 0x7C9D, 0x7CA9, 0x7CB4, 0x7CBF, 0x7CCB, 0x7CD6, 0x7CE1, 0x7CEC, 0x7CF7, 0x7D02, 0x7D0C, 0x7D17, 0x7D22, 0x7D2C, 0x7D37, 0x7D41, 0x7D4B, 0x7D56, 0x7D60, 0x7D6A, 0x7D74, 0x7D7E, 0x7D88, 0x7D91, 0x7D9B, 0x7DA5, 0x7DAE, 0x7DB8, 0x7DC1, 0x7DCB, 0x7DD4, 0x7DDD, 0x7DE6, 0x7DEF, 0x7DF8, 0x7E01, 0x7E0A, 0x7E13, 0x7E1B, 0x7E24, 0x7E2C, 0x7E35, 0x7E3D, 0x7E45, 0x7E4D, 0x7E56, 0x7E5E, 0x7E66, 0x7E6D, 0x7E75, 0x7E7D, 0x7E85, 0x7E8C, 0x7E94, 0x7E9B, 0x7EA3, 0x7EAA, 0x7EB1, 0x7EB8, 0x7EBF, 0x7EC6, 0x7ECD, 0x7ED4, 0x7EDB, 0x7EE1, 0x7EE8, 0x7EEE, 0x7EF5, 0x7EFB, 0x7F01, 0x7F08, 0x7F0E, 0x7F14, 0x7F1A, 0x7F20, 0x7F25, 0x7F2B, 0x7F31, 0x7F36, 0x7F3C, 0x7F41, 0x7F47, 0x7F4C, 0x7F51, 0x7F56, 0x7F5B, 0x7F60, 0x7F65, 0x7F6A, 0x7F6F, 0x7F74, 0x7F78, 0x7F7D, 0x7F81, 0x7F85, 0x7F8A, 0x7F8E, 0x7F92, 0x7F96, 0x7F9A, 0x7F9E, 0x7FA2, 0x7FA6, 0x7FA9, 0x7FAD, 0x7FB0, 0x7FB4, 0x7FB7, 0x7FBA, 0x7FBE, 0x7FC1, 0x7FC4, 0x7FC7, 0x7FCA, 0x7FCC, 0x7FCF, 0x7FD2, 0x7FD4, 0x7FD7, 0x7FD9, 0x7FDC, 0x7FDE, 0x7FE0, 0x7FE2, 0x7FE4, 0x7FE6, 0x7FE8, 0x7FEA, 0x7FEC, 0x7FED, 0x7FEF, 0x7FF1, 0x7FF2, 0x7FF3, 0x7FF5, 0x7FF6, 0x7FF7, 0x7FF8, 0x7FF9, 0x7FFA, 0x7FFB, 0x7FFB, 0x7FFC, 0x7FFD, 0x7FFD, 0x7FFE, 0x7FFE, 0x7FFE, 0x7FFE, 0x7FFE, 0x7FFF - -glabel D_800945E0 -.ascii " \0\0\0\0" - -glabel D_80094604 -.word 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x00000000, 0x00000000, 0x00000000 - -glabel D_80094630 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_80094640 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_80094650 -.word 0x00000000, 0xFFFFFFFF - -glabel D_80094658 -.word D_80094650 - -glabel D_8009465C -.word D_80094650 - -glabel D_80094660 -.word 0x00000000 - -glabel D_80094664 -.word 0x00000000, 0x00000000, 0x00000000 - -glabel D_80094670 -.word 0x800D9210, 0x00000000, 0x00000000, 0x00000000 - -glabel D_80094680 -.word 0x00000000 - -glabel D_80094684 -.word 0x00000000 - -glabel D_80094688 -.word 0x00000000 - -glabel D_8009468C -.word 0x00000000 - -glabel D_80094690 -.word 0x00000000 - -glabel D_80094694 -.word 0x00000000 - -glabel D_80094698 -.word 0x00000000 - -glabel D_8009469C -.word 0x00000000 - -glabel osViModeTable -.word 0x00000000, 0x0000320E, 0x00000140, 0x03E52239, 0x0000020D, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x01000000, 0x0000324E, 0x00000140, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x002301FD, 0x000E0204, 0x00000002, 0x00000280, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x02000000, 0x0000311E, 0x00000140, 0x03E52239, 0x0000020D, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x03000000, 0x0000305E, 0x00000140, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x002301FD, 0x000E0204, 0x00000002, 0x00000280, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x04000000, 0x0000330F, 0x00000140, 0x03E52239, 0x0000020D, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x05000000, 0x0000324F, 0x00000140, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x002301FD, 0x000E0204, 0x00000002, 0x00000500, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x06000000, 0x0000301F, 0x00000140, 0x03E52239, 0x0000020D, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x07000000, 0x0000305F, 0x00000140, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x002301FD, 0x000E0204, 0x00000002, 0x00000500, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x08000000, 0x0000324E, 0x00000500, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x002301FD, 0x000E0204, 0x00000002, 0x00000A00, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x09000000, 0x0000324E, 0x00000280, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x002301FD, 0x000E0204, 0x00000002, 0x00000A00, 0x02000800, 0x002501FF, 0x000E0204, 0x00000002, 0x0A000000, 0x0000305E, 0x00000500, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x002301FD, 0x000E0204, 0x00000002, 0x00000A00, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x0B000000, 0x0000305E, 0x00000280, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x002301FD, 0x000E0204, 0x00000002, 0x00000A00, 0x02000800, 0x002501FF, 0x000E0204, 0x00000002, 0x0C000000, 0x0000334F, 0x00000500, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000400, 0x00000000, 0x00000A00, 0x00000400, 0x002301FD, 0x000E0204, 0x00000002, 0x00001400, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x0D000000, 0x0000324F, 0x00000280, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000400, 0x00000000, 0x00000A00, 0x02000800, 0x002301FD, 0x000E0204, 0x00000002, 0x00001400, 0x02000800, 0x002501FF, 0x000E0204, 0x00000002, 0x0E000000, 0x0000320E, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x00000280, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x0F000000, 0x0000324E, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x005D0237, 0x0009026B, 0x00000002, 0x00000280, 0x03000400, 0x005F0239, 0x000D0269, 0x00000002, 0x10000000, 0x0000311E, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x00000280, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x11000000, 0x0000305E, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x005D0237, 0x0009026B, 0x00000002, 0x00000280, 0x03000400, 0x005F0239, 0x000D0269, 0x00000002, 0x12000000, 0x0000330F, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x00000500, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x13000000, 0x0000324F, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x005D0237, 0x0009026B, 0x00000002, 0x00000500, 0x03000400, 0x005F0239, 0x000D0269, 0x00000002, 0x14000000, 0x0000301F, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x00000500, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x15000000, 0x0000305F, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x005D0237, 0x0009026B, 0x00000002, 0x00000500, 0x03000400, 0x005F0239, 0x000D0269, 0x00000002, 0x16000000, 0x0000324E, 0x00000500, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x005D0237, 0x0009026B, 0x00000002, 0x00000A00, 0x00000400, 0x005F0239, 0x000D0269, 0x00000002, 0x17000000, 0x0000324E, 0x00000280, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x005D0237, 0x0009026B, 0x00000002, 0x00000A00, 0x02000800, 0x005F0239, 0x000D0269, 0x00000002, 0x18000000, 0x0000305E, 0x00000500, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x005D0237, 0x0009026B, 0x00000002, 0x00000A00, 0x00000400, 0x005F0239, 0x000D0269, 0x00000002, 0x19000000, 0x0000305E, 0x00000280, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x005D0237, 0x0009026B, 0x00000002, 0x00000A00, 0x02000800, 0x005F0239, 0x000D0269, 0x00000002, 0x1A000000, 0x0000334F, 0x00000500, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000A00, 0x00000400, 0x005D0237, 0x0009026B, 0x00000002, 0x00001400, 0x00000400, 0x005F0239, 0x000D0269, 0x00000002, 0x1B000000, 0x0000324F, 0x00000280, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000A00, 0x02000800, 0x005D0237, 0x0009026B, 0x00000002, 0x00001400, 0x02000800, 0x005F0239, 0x000D0269, 0x00000002, 0x1C000000, 0x0000320E, 0x00000140, 0x04651E39, 0x0000020D, 0x00040C11, 0x0C190C1A, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x1D000000, 0x0000324E, 0x00000140, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x002301FD, 0x000B0202, 0x00000002, 0x00000280, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x1E000000, 0x0000311E, 0x00000140, 0x04651E39, 0x0000020D, 0x00040C11, 0x0C190C1A, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x1F000000, 0x0000305E, 0x00000140, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x002301FD, 0x000B0202, 0x00000002, 0x00000280, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x20000000, 0x0000330F, 0x00000140, 0x04651E39, 0x0000020D, 0x00040C11, 0x0C190C1A, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x21000000, 0x0000324F, 0x00000140, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x002301FD, 0x000B0202, 0x00000002, 0x00000500, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x22000000, 0x0000301F, 0x00000140, 0x04651E39, 0x0000020D, 0x00040C11, 0x0C190C1A, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x23000000, 0x0000305F, 0x00000140, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x002301FD, 0x000B0202, 0x00000002, 0x00000500, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x24000000, 0x0000324E, 0x00000500, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x002301FD, 0x000B0202, 0x00000002, 0x00000A00, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x25000000, 0x0000324E, 0x00000280, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x002301FD, 0x000B0202, 0x00000002, 0x00000A00, 0x02000800, 0x002501FF, 0x000E0204, 0x00000002, 0x26000000, 0x0000305E, 0x00000500, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x002301FD, 0x000B0202, 0x00000002, 0x00000A00, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x27000000, 0x0000305E, 0x00000280, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x002301FD, 0x000B0202, 0x00000002, 0x00000A00, 0x02000800, 0x002501FF, 0x000E0204, 0x00000002, 0x28000000, 0x0000334F, 0x00000500, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000400, 0x00000000, 0x00000A00, 0x00000400, 0x002301FD, 0x000B0202, 0x00000002, 0x00001400, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x29000000, 0x0000324F, 0x00000280, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000400, 0x00000000, 0x00000A00, 0x02000800, 0x002301FD, 0x000B0202, 0x00000002, 0x00001400, 0x02000800, 0x002501FF, 0x000E0204, 0x00000002, 0x2A000000, 0x0000320E, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x00000280, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x2B000000, 0x0000324E, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x002D0267, 0x0009026B, 0x00000002, 0x00000280, 0x03000400, 0x002F0269, 0x000D0269, 0x00000002, 0x2C000000, 0x0000311E, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x00000280, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x2D000000, 0x0000305E, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x002D0267, 0x0009026B, 0x00000002, 0x00000280, 0x03000400, 0x002F0269, 0x000D0269, 0x00000002, 0x2E000000, 0x0000330F, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x00000500, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x2F000000, 0x0000324F, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x002D0267, 0x0009026B, 0x00000002, 0x00000500, 0x03000400, 0x002F0269, 0x000D0269, 0x00000002, 0x30000000, 0x0000301F, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x00000500, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x31000000, 0x0000305F, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x002D0267, 0x0009026B, 0x00000002, 0x00000500, 0x03000400, 0x002F0269, 0x000D0269, 0x00000002, 0x32000000, 0x0000324E, 0x00000500, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x002D0267, 0x0009026B, 0x00000002, 0x00000A00, 0x00000400, 0x002F0269, 0x000D0269, 0x00000002, 0x33000000, 0x0000324E, 0x00000280, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x002D0267, 0x0009026B, 0x00000002, 0x00000A00, 0x02000800, 0x002F0269, 0x000D0269, 0x00000002, 0x34000000, 0x0000305E, 0x00000500, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x002D0267, 0x0009026B, 0x00000002, 0x00000A00, 0x00000400, 0x002F0269, 0x000D0269, 0x00000002, 0x35000000, 0x0000305E, 0x00000280, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x002D0267, 0x0009026B, 0x00000002, 0x00000A00, 0x02000800, 0x002F0269, 0x000D0269, 0x00000002, 0x36000000, 0x0000334F, 0x00000500, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000A00, 0x00000400, 0x002D0267, 0x0009026B, 0x00000002, 0x00001400, 0x00000400, 0x002F0269, 0x000D0269, 0x00000002, 0x37000000, 0x0000324F, 0x00000280, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000A00, 0x02000800, 0x002D0267, 0x0009026B, 0x00000002, 0x00001400, 0x02000800, 0x002F0269, 0x000D0269, 0x00000002 - -glabel D_80095820 -.word 0x02000000, 0x0000311E, 0x00000140, 0x03E52239, 0x0000020D, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002 - -glabel D_80095870 -.word 0x1E000000, 0x0000311E, 0x00000140, 0x04651E39, 0x0000020D, 0x00040C11, 0x0C190C1A, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002 - -glabel D_800958C0 -.float 0.017453292, 0.0, 0.0, 0.0 - -glabel D_800958D0 -.word 0xFFFFFFFF - -glabel D_800958D4 -.byte 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -glabel D_800958E0 -.word 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 - -glabel D_800958F0 -.word 0x00000000 - -glabel D_800958F4 -.word 0x03B9ACA0 - -glabel D_800958F8 -.word 0x02E6D354 - -glabel D_800958FC -.word 0x00000000 - -glabel D_80095900 -.word 0x003FFF01, 0x00000000, 0x00000000, 0x00000000 - -glabel D_80095910 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_80095938 -.word 0x00000000, 0x00000000 - -glabel D_80095940 -.ascii "0123456789abcdef\0\0\0\0" - -glabel D_80095954 -.word 0x30313233, 0x34353637, 0x38394142, 0x43444546, 0x00000000, 0x00000000, 0x00000000 - -glabel D_80095970 -.short 0x0000 - -glabel D_80095972 -.short 0x0000 - -glabel D_80095974 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -glabel D_800959A2 -.short 0x0000 - -glabel D_800959A4 -.word 0x00000000 - -glabel D_800959A8 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -glabel D_800959D0 -.word D_80095970 - -glabel D_800959D4 -.word 0x800959A0, 0x00000000, 0x00000000 - -glabel D_800959E0 -.word 0x10000000, 0x0000311E, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x00000280, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002 diff --git a/asm/data/code_6F110.data.s b/asm/data/code_6F110.data.s new file mode 100644 index 0000000000..341964f0b0 --- /dev/null +++ b/asm/data/code_6F110.data.s @@ -0,0 +1,192 @@ +.include "macro.inc" + +.section .data + +glabel nuGfxFunc +.word 0x00000000 + +glabel nuGfxPreNMIFunc +.word 0x00000000, 0x00000000, 0x00000000 + +glabel D_80093D20 +.word 0x00000000, contRetrace, contReadData, contReadNW, contQuery, 0x00000000 + +glabel D_80093D38 +.word 0x00000000, 0x80093D24, 0x01000000, 0x00000000, 0x00000000, 0x00000000 + +glabel D_80093D50 +.word 0x00000000 + +glabel D_80093D54 +.word 0x00000000 + +glabel D_80093D58 +.word 0x00000000 + +glabel D_80093D5C +.word 0x00000000 + +glabel D_80093D60 +.word 0x00000000 + +glabel D_80093D64 +.word 0x00000000 + +glabel D_80093D68 +.word 0x00000000 + +glabel D_80093D6C +.word 0x00000000 + +glabel D_80093D70 +.word 0x800B4518, 0x800B1B08, 0x00000000, 0x00000000 + +glabel D_80093D80 +.word 0x00000001, 0x00000000, 0x00000000, 0x00000000 + +glabel D_80093D90 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 + +glabel D_80093DA0 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +glabel D_80093DB0 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 + +glabel D_80093DC0 +.float 0.017453292, 0.0, 0.0, 0.0 + +glabel D_80093DD0 +.float 0.017453292, 0.0, 0.0, 0.0 + +glabel D_80093DE0 +.short 0x0000, 0x0032, 0x0064, 0x0096, 0x00C9, 0x00FB, 0x012D, 0x0160, 0x0192, 0x01C4, 0x01F7, 0x0229, 0x025B, 0x028E, 0x02C0, 0x02F2, 0x0324, 0x0357, 0x0389, 0x03BB, 0x03EE, 0x0420, 0x0452, 0x0484, 0x04B7, 0x04E9, 0x051B, 0x054E, 0x0580, 0x05B2, 0x05E4, 0x0617, 0x0649, 0x067B, 0x06AD, 0x06E0, 0x0712, 0x0744, 0x0776, 0x07A9, 0x07DB, 0x080D, 0x083F, 0x0871, 0x08A4, 0x08D6, 0x0908, 0x093A, 0x096C, 0x099F, 0x09D1, 0x0A03, 0x0A35, 0x0A67, 0x0A99, 0x0ACB, 0x0AFE, 0x0B30, 0x0B62, 0x0B94, 0x0BC6, 0x0BF8, 0x0C2A, 0x0C5C, 0x0C8E, 0x0CC0, 0x0CF2, 0x0D25, 0x0D57, 0x0D89, 0x0DBB, 0x0DED, 0x0E1F, 0x0E51, 0x0E83, 0x0EB5, 0x0EE7, 0x0F19, 0x0F4B, 0x0F7C, 0x0FAE, 0x0FE0, 0x1012, 0x1044, 0x1076, 0x10A8, 0x10DA, 0x110C, 0x113E, 0x116F, 0x11A1, 0x11D3, 0x1205, 0x1237, 0x1269, 0x129A, 0x12CC, 0x12FE, 0x1330, 0x1361, 0x1393, 0x13C5, 0x13F6, 0x1428, 0x145A, 0x148C, 0x14BD, 0x14EF, 0x1520, 0x1552, 0x1584, 0x15B5, 0x15E7, 0x1618, 0x164A, 0x167B, 0x16AD, 0x16DF, 0x1710, 0x1741, 0x1773, 0x17A4, 0x17D6, 0x1807, 0x1839, 0x186A, 0x189B, 0x18CD, 0x18FE, 0x1930, 0x1961, 0x1992, 0x19C3, 0x19F5, 0x1A26, 0x1A57, 0x1A88, 0x1ABA, 0x1AEB, 0x1B1C, 0x1B4D, 0x1B7E, 0x1BAF, 0x1BE1, 0x1C12, 0x1C43, 0x1C74, 0x1CA5, 0x1CD6, 0x1D07, 0x1D38, 0x1D69, 0x1D9A, 0x1DCB, 0x1DFC, 0x1E2D, 0x1E5D, 0x1E8E, 0x1EBF, 0x1EF0, 0x1F21, 0x1F52, 0x1F82, 0x1FB3, 0x1FE4, 0x2015, 0x2045, 0x2076, 0x20A7, 0x20D7, 0x2108, 0x2139, 0x2169, 0x219A, 0x21CA, 0x21FB, 0x222B, 0x225C, 0x228C, 0x22BD, 0x22ED, 0x231D, 0x234E, 0x237E, 0x23AE, 0x23DF, 0x240F, 0x243F, 0x2470, 0x24A0, 0x24D0, 0x2500, 0x2530, 0x2560, 0x2591, 0x25C1, 0x25F1, 0x2621, 0x2651, 0x2681, 0x26B1, 0x26E1, 0x2711, 0x2740, 0x2770, 0x27A0, 0x27D0, 0x2800, 0x2830, 0x285F, 0x288F, 0x28BF, 0x28EE, 0x291E, 0x294E, 0x297D, 0x29AD, 0x29DD, 0x2A0C, 0x2A3C, 0x2A6B, 0x2A9B, 0x2ACA, 0x2AF9, 0x2B29, 0x2B58, 0x2B87, 0x2BB7, 0x2BE6, 0x2C15, 0x2C44, 0x2C74, 0x2CA3, 0x2CD2, 0x2D01, 0x2D30, 0x2D5F, 0x2D8E, 0x2DBD, 0x2DEC, 0x2E1B, 0x2E4A, 0x2E79, 0x2EA8, 0x2ED7, 0x2F06, 0x2F34, 0x2F63, 0x2F92, 0x2FC0, 0x2FEF, 0x301E, 0x304C, 0x307B, 0x30A9, 0x30D8, 0x3107, 0x3135, 0x3163, 0x3192, 0x31C0, 0x31EF, 0x321D, 0x324B, 0x3279, 0x32A8, 0x32D6, 0x3304, 0x3332, 0x3360, 0x338E, 0x33BC, 0x33EA, 0x3418, 0x3446, 0x3474, 0x34A2, 0x34D0, 0x34FE, 0x352B, 0x3559, 0x3587, 0x35B5, 0x35E2, 0x3610, 0x363D, 0x366B, 0x3698, 0x36C6, 0x36F3, 0x3721, 0x374E, 0x377C, 0x37A9, 0x37D6, 0x3803, 0x3831, 0x385E, 0x388B, 0x38B8, 0x38E5, 0x3912, 0x393F, 0x396C, 0x3999, 0x39C6, 0x39F3, 0x3A20, 0x3A4D, 0x3A79, 0x3AA6, 0x3AD3, 0x3B00, 0x3B2C, 0x3B59, 0x3B85, 0x3BB2, 0x3BDE, 0x3C0B, 0x3C37, 0x3C64, 0x3C90, 0x3CBC, 0x3CE9, 0x3D15, 0x3D41, 0x3D6D, 0x3D99, 0x3DC5, 0x3DF1, 0x3E1D, 0x3E49, 0x3E75, 0x3EA1, 0x3ECD, 0x3EF9, 0x3F25, 0x3F50, 0x3F7C, 0x3FA8, 0x3FD3, 0x3FFF, 0x402B, 0x4056, 0x4082, 0x40AD, 0x40D8, 0x4104, 0x412F, 0x415A, 0x4186, 0x41B1, 0x41DC, 0x4207, 0x4232, 0x425D, 0x4288, 0x42B3, 0x42DE, 0x4309, 0x4334, 0x435F, 0x4389, 0x43B4, 0x43DF, 0x4409, 0x4434, 0x445F, 0x4489, 0x44B4, 0x44DE, 0x4508, 0x4533, 0x455D, 0x4587, 0x45B1, 0x45DC, 0x4606, 0x4630, 0x465A, 0x4684, 0x46AE, 0x46D8, 0x4702, 0x472C, 0x4755, 0x477F, 0x47A9, 0x47D2, 0x47FC, 0x4826, 0x484F, 0x4879, 0x48A2, 0x48CC, 0x48F5, 0x491E, 0x4948, 0x4971, 0x499A, 0x49C3, 0x49EC, 0x4A15, 0x4A3E, 0x4A67, 0x4A90, 0x4AB9, 0x4AE2, 0x4B0B, 0x4B33, 0x4B5C, 0x4B85, 0x4BAD, 0x4BD6, 0x4BFE, 0x4C27, 0x4C4F, 0x4C78, 0x4CA0, 0x4CC8, 0x4CF0, 0x4D19, 0x4D41, 0x4D69, 0x4D91, 0x4DB9, 0x4DE1, 0x4E09, 0x4E31, 0x4E58, 0x4E80, 0x4EA8, 0x4ED0, 0x4EF7, 0x4F1F, 0x4F46, 0x4F6E, 0x4F95, 0x4FBD, 0x4FE4, 0x500B, 0x5032, 0x505A, 0x5081, 0x50A8, 0x50CF, 0x50F6, 0x511D, 0x5144, 0x516B, 0x5191, 0x51B8, 0x51DF, 0x5205, 0x522C, 0x5253, 0x5279, 0x52A0, 0x52C6, 0x52EC, 0x5313, 0x5339, 0x535F, 0x5385, 0x53AB, 0x53D1, 0x53F7, 0x541D, 0x5443, 0x5469, 0x548F, 0x54B5, 0x54DA, 0x5500, 0x5525, 0x554B, 0x5571, 0x5596, 0x55BB, 0x55E1, 0x5606, 0x562B, 0x5650, 0x5675, 0x569B, 0x56C0, 0x56E5, 0x5709, 0x572E, 0x5753, 0x5778, 0x579D, 0x57C1, 0x57E6, 0x580A, 0x582F, 0x5853, 0x5878, 0x589C, 0x58C0, 0x58E5, 0x5909, 0x592D, 0x5951, 0x5975, 0x5999, 0x59BD, 0x59E1, 0x5A04, 0x5A28, 0x5A4C, 0x5A6F, 0x5A93, 0x5AB7, 0x5ADA, 0x5AFD, 0x5B21, 0x5B44, 0x5B67, 0x5B8B, 0x5BAE, 0x5BD1, 0x5BF4, 0x5C17, 0x5C3A, 0x5C5D, 0x5C7F, 0x5CA2, 0x5CC5, 0x5CE7, 0x5D0A, 0x5D2D, 0x5D4F, 0x5D71, 0x5D94, 0x5DB6, 0x5DD8, 0x5DFA, 0x5E1D, 0x5E3F, 0x5E61, 0x5E83, 0x5EA5, 0x5EC6, 0x5EE8, 0x5F0A, 0x5F2C, 0x5F4D, 0x5F6F, 0x5F90, 0x5FB2, 0x5FD3, 0x5FF4, 0x6016, 0x6037, 0x6058, 0x6079, 0x609A, 0x60BB, 0x60DC, 0x60FD, 0x611E, 0x613E, 0x615F, 0x6180, 0x61A0, 0x61C1, 0x61E1, 0x6202, 0x6222, 0x6242, 0x6263, 0x6283, 0x62A3, 0x62C3, 0x62E3, 0x6303, 0x6323, 0x6342, 0x6362, 0x6382, 0x63A1, 0x63C1, 0x63E0, 0x6400, 0x641F, 0x643F, 0x645E, 0x647D, 0x649C, 0x64BB, 0x64DA, 0x64F9, 0x6518, 0x6537, 0x6556, 0x6574, 0x6593, 0x65B2, 0x65D0, 0x65EF, 0x660D, 0x662B, 0x664A, 0x6668, 0x6686, 0x66A4, 0x66C2, 0x66E0, 0x66FE, 0x671C, 0x673A, 0x6757, 0x6775, 0x6792, 0x67B0, 0x67CD, 0x67EB, 0x6808, 0x6825, 0x6843, 0x6860, 0x687D, 0x689A, 0x68B7, 0x68D4, 0x68F1, 0x690D, 0x692A, 0x6947, 0x6963, 0x6980, 0x699C, 0x69B9, 0x69D5, 0x69F1, 0x6A0E, 0x6A2A, 0x6A46, 0x6A62, 0x6A7E, 0x6A9A, 0x6AB5, 0x6AD1, 0x6AED, 0x6B08, 0x6B24, 0x6B40, 0x6B5B, 0x6B76, 0x6B92, 0x6BAD, 0x6BC8, 0x6BE3, 0x6BFE, 0x6C19, 0x6C34, 0x6C4F, 0x6C6A, 0x6C84, 0x6C9F, 0x6CBA, 0x6CD4, 0x6CEF, 0x6D09, 0x6D23, 0x6D3E, 0x6D58, 0x6D72, 0x6D8C, 0x6DA6, 0x6DC0, 0x6DDA, 0x6DF3, 0x6E0D, 0x6E27, 0x6E40, 0x6E5A, 0x6E73, 0x6E8D, 0x6EA6, 0x6EBF, 0x6ED9, 0x6EF2, 0x6F0B, 0x6F24, 0x6F3D, 0x6F55, 0x6F6E, 0x6F87, 0x6FA0, 0x6FB8, 0x6FD1, 0x6FE9, 0x7002, 0x701A, 0x7032, 0x704A, 0x7062, 0x707A, 0x7092, 0x70AA, 0x70C2, 0x70DA, 0x70F2, 0x7109, 0x7121, 0x7138, 0x7150, 0x7167, 0x717E, 0x7196, 0x71AD, 0x71C4, 0x71DB, 0x71F2, 0x7209, 0x7220, 0x7236, 0x724D, 0x7264, 0x727A, 0x7291, 0x72A7, 0x72BD, 0x72D4, 0x72EA, 0x7300, 0x7316, 0x732C, 0x7342, 0x7358, 0x736E, 0x7383, 0x7399, 0x73AE, 0x73C4, 0x73D9, 0x73EF, 0x7404, 0x7419, 0x742E, 0x7443, 0x7458, 0x746D, 0x7482, 0x7497, 0x74AC, 0x74C0, 0x74D5, 0x74EA, 0x74FE, 0x7512, 0x7527, 0x753B, 0x754F, 0x7563, 0x7577, 0x758B, 0x759F, 0x75B3, 0x75C7, 0x75DA, 0x75EE, 0x7601, 0x7615, 0x7628, 0x763B, 0x764F, 0x7662, 0x7675, 0x7688, 0x769B, 0x76AE, 0x76C1, 0x76D3, 0x76E6, 0x76F9, 0x770B, 0x771E, 0x7730, 0x7742, 0x7754, 0x7767, 0x7779, 0x778B, 0x779D, 0x77AF, 0x77C0, 0x77D2, 0x77E4, 0x77F5, 0x7807, 0x7818, 0x782A, 0x783B, 0x784C, 0x785D, 0x786E, 0x787F, 0x7890, 0x78A1, 0x78B2, 0x78C3, 0x78D3, 0x78E4, 0x78F4, 0x7905, 0x7915, 0x7925, 0x7936, 0x7946, 0x7956, 0x7966, 0x7976, 0x7985, 0x7995, 0x79A5, 0x79B5, 0x79C4, 0x79D4, 0x79E3, 0x79F2, 0x7A02, 0x7A11, 0x7A20, 0x7A2F, 0x7A3E, 0x7A4D, 0x7A5B, 0x7A6A, 0x7A79, 0x7A87, 0x7A96, 0x7AA4, 0x7AB3, 0x7AC1, 0x7ACF, 0x7ADD, 0x7AEB, 0x7AF9, 0x7B07, 0x7B15, 0x7B23, 0x7B31, 0x7B3E, 0x7B4C, 0x7B59, 0x7B67, 0x7B74, 0x7B81, 0x7B8E, 0x7B9B, 0x7BA8, 0x7BB5, 0x7BC2, 0x7BCF, 0x7BDC, 0x7BE8, 0x7BF5, 0x7C02, 0x7C0E, 0x7C1A, 0x7C27, 0x7C33, 0x7C3F, 0x7C4B, 0x7C57, 0x7C63, 0x7C6F, 0x7C7A, 0x7C86, 0x7C92, 0x7C9D, 0x7CA9, 0x7CB4, 0x7CBF, 0x7CCB, 0x7CD6, 0x7CE1, 0x7CEC, 0x7CF7, 0x7D02, 0x7D0C, 0x7D17, 0x7D22, 0x7D2C, 0x7D37, 0x7D41, 0x7D4B, 0x7D56, 0x7D60, 0x7D6A, 0x7D74, 0x7D7E, 0x7D88, 0x7D91, 0x7D9B, 0x7DA5, 0x7DAE, 0x7DB8, 0x7DC1, 0x7DCB, 0x7DD4, 0x7DDD, 0x7DE6, 0x7DEF, 0x7DF8, 0x7E01, 0x7E0A, 0x7E13, 0x7E1B, 0x7E24, 0x7E2C, 0x7E35, 0x7E3D, 0x7E45, 0x7E4D, 0x7E56, 0x7E5E, 0x7E66, 0x7E6D, 0x7E75, 0x7E7D, 0x7E85, 0x7E8C, 0x7E94, 0x7E9B, 0x7EA3, 0x7EAA, 0x7EB1, 0x7EB8, 0x7EBF, 0x7EC6, 0x7ECD, 0x7ED4, 0x7EDB, 0x7EE1, 0x7EE8, 0x7EEE, 0x7EF5, 0x7EFB, 0x7F01, 0x7F08, 0x7F0E, 0x7F14, 0x7F1A, 0x7F20, 0x7F25, 0x7F2B, 0x7F31, 0x7F36, 0x7F3C, 0x7F41, 0x7F47, 0x7F4C, 0x7F51, 0x7F56, 0x7F5B, 0x7F60, 0x7F65, 0x7F6A, 0x7F6F, 0x7F74, 0x7F78, 0x7F7D, 0x7F81, 0x7F85, 0x7F8A, 0x7F8E, 0x7F92, 0x7F96, 0x7F9A, 0x7F9E, 0x7FA2, 0x7FA6, 0x7FA9, 0x7FAD, 0x7FB0, 0x7FB4, 0x7FB7, 0x7FBA, 0x7FBE, 0x7FC1, 0x7FC4, 0x7FC7, 0x7FCA, 0x7FCC, 0x7FCF, 0x7FD2, 0x7FD4, 0x7FD7, 0x7FD9, 0x7FDC, 0x7FDE, 0x7FE0, 0x7FE2, 0x7FE4, 0x7FE6, 0x7FE8, 0x7FEA, 0x7FEC, 0x7FED, 0x7FEF, 0x7FF1, 0x7FF2, 0x7FF3, 0x7FF5, 0x7FF6, 0x7FF7, 0x7FF8, 0x7FF9, 0x7FFA, 0x7FFB, 0x7FFB, 0x7FFC, 0x7FFD, 0x7FFD, 0x7FFE, 0x7FFE, 0x7FFE, 0x7FFE, 0x7FFE, 0x7FFF + +glabel D_800945E0 +.ascii " \0\0\0\0" + +glabel D_80094604 +.word 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x00000000, 0x00000000, 0x00000000 + +glabel D_80094630 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 + +glabel D_80094640 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 + +glabel D_80094650 +.word 0x00000000, 0xFFFFFFFF + +glabel D_80094658 +.word D_80094650 + +glabel D_8009465C +.word D_80094650 + +glabel D_80094660 +.word 0x00000000 + +glabel D_80094664 +.word 0x00000000, 0x00000000, 0x00000000 + +glabel D_80094670 +.word 0x800D9210, 0x00000000, 0x00000000, 0x00000000 + +glabel D_80094680 +.word 0x00000000 + +glabel D_80094684 +.word 0x00000000 + +glabel D_80094688 +.word 0x00000000 + +glabel D_8009468C +.word 0x00000000 + +glabel D_80094690 +.word 0x00000000 + +glabel D_80094694 +.word 0x00000000 + +glabel D_80094698 +.word 0x00000000 + +glabel D_8009469C +.word 0x00000000 + +glabel osViModeTable +.word 0x00000000, 0x0000320E, 0x00000140, 0x03E52239, 0x0000020D, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x01000000, 0x0000324E, 0x00000140, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x002301FD, 0x000E0204, 0x00000002, 0x00000280, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x02000000, 0x0000311E, 0x00000140, 0x03E52239, 0x0000020D, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x03000000, 0x0000305E, 0x00000140, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x002301FD, 0x000E0204, 0x00000002, 0x00000280, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x04000000, 0x0000330F, 0x00000140, 0x03E52239, 0x0000020D, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x05000000, 0x0000324F, 0x00000140, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x002301FD, 0x000E0204, 0x00000002, 0x00000500, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x06000000, 0x0000301F, 0x00000140, 0x03E52239, 0x0000020D, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x07000000, 0x0000305F, 0x00000140, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x002301FD, 0x000E0204, 0x00000002, 0x00000500, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x08000000, 0x0000324E, 0x00000500, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x002301FD, 0x000E0204, 0x00000002, 0x00000A00, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x09000000, 0x0000324E, 0x00000280, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x002301FD, 0x000E0204, 0x00000002, 0x00000A00, 0x02000800, 0x002501FF, 0x000E0204, 0x00000002, 0x0A000000, 0x0000305E, 0x00000500, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x002301FD, 0x000E0204, 0x00000002, 0x00000A00, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x0B000000, 0x0000305E, 0x00000280, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x002301FD, 0x000E0204, 0x00000002, 0x00000A00, 0x02000800, 0x002501FF, 0x000E0204, 0x00000002, 0x0C000000, 0x0000334F, 0x00000500, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000400, 0x00000000, 0x00000A00, 0x00000400, 0x002301FD, 0x000E0204, 0x00000002, 0x00001400, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x0D000000, 0x0000324F, 0x00000280, 0x03E52239, 0x0000020C, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000400, 0x00000000, 0x00000A00, 0x02000800, 0x002301FD, 0x000E0204, 0x00000002, 0x00001400, 0x02000800, 0x002501FF, 0x000E0204, 0x00000002, 0x0E000000, 0x0000320E, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x00000280, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x0F000000, 0x0000324E, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x005D0237, 0x0009026B, 0x00000002, 0x00000280, 0x03000400, 0x005F0239, 0x000D0269, 0x00000002, 0x10000000, 0x0000311E, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x00000280, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x11000000, 0x0000305E, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x005D0237, 0x0009026B, 0x00000002, 0x00000280, 0x03000400, 0x005F0239, 0x000D0269, 0x00000002, 0x12000000, 0x0000330F, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x00000500, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x13000000, 0x0000324F, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x005D0237, 0x0009026B, 0x00000002, 0x00000500, 0x03000400, 0x005F0239, 0x000D0269, 0x00000002, 0x14000000, 0x0000301F, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x00000500, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x15000000, 0x0000305F, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x005D0237, 0x0009026B, 0x00000002, 0x00000500, 0x03000400, 0x005F0239, 0x000D0269, 0x00000002, 0x16000000, 0x0000324E, 0x00000500, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x005D0237, 0x0009026B, 0x00000002, 0x00000A00, 0x00000400, 0x005F0239, 0x000D0269, 0x00000002, 0x17000000, 0x0000324E, 0x00000280, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x005D0237, 0x0009026B, 0x00000002, 0x00000A00, 0x02000800, 0x005F0239, 0x000D0269, 0x00000002, 0x18000000, 0x0000305E, 0x00000500, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x005D0237, 0x0009026B, 0x00000002, 0x00000A00, 0x00000400, 0x005F0239, 0x000D0269, 0x00000002, 0x19000000, 0x0000305E, 0x00000280, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x005D0237, 0x0009026B, 0x00000002, 0x00000A00, 0x02000800, 0x005F0239, 0x000D0269, 0x00000002, 0x1A000000, 0x0000334F, 0x00000500, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000A00, 0x00000400, 0x005D0237, 0x0009026B, 0x00000002, 0x00001400, 0x00000400, 0x005F0239, 0x000D0269, 0x00000002, 0x1B000000, 0x0000324F, 0x00000280, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000A00, 0x02000800, 0x005D0237, 0x0009026B, 0x00000002, 0x00001400, 0x02000800, 0x005F0239, 0x000D0269, 0x00000002, 0x1C000000, 0x0000320E, 0x00000140, 0x04651E39, 0x0000020D, 0x00040C11, 0x0C190C1A, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x1D000000, 0x0000324E, 0x00000140, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x002301FD, 0x000B0202, 0x00000002, 0x00000280, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x1E000000, 0x0000311E, 0x00000140, 0x04651E39, 0x0000020D, 0x00040C11, 0x0C190C1A, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x1F000000, 0x0000305E, 0x00000140, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x002301FD, 0x000B0202, 0x00000002, 0x00000280, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x20000000, 0x0000330F, 0x00000140, 0x04651E39, 0x0000020D, 0x00040C11, 0x0C190C1A, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x21000000, 0x0000324F, 0x00000140, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x002301FD, 0x000B0202, 0x00000002, 0x00000500, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x22000000, 0x0000301F, 0x00000140, 0x04651E39, 0x0000020D, 0x00040C11, 0x0C190C1A, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000500, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x23000000, 0x0000305F, 0x00000140, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x002301FD, 0x000B0202, 0x00000002, 0x00000500, 0x03000400, 0x002501FF, 0x000E0204, 0x00000002, 0x24000000, 0x0000324E, 0x00000500, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x002301FD, 0x000B0202, 0x00000002, 0x00000A00, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x25000000, 0x0000324E, 0x00000280, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x002301FD, 0x000B0202, 0x00000002, 0x00000A00, 0x02000800, 0x002501FF, 0x000E0204, 0x00000002, 0x26000000, 0x0000305E, 0x00000500, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x002301FD, 0x000B0202, 0x00000002, 0x00000A00, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x27000000, 0x0000305E, 0x00000280, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x002301FD, 0x000B0202, 0x00000002, 0x00000A00, 0x02000800, 0x002501FF, 0x000E0204, 0x00000002, 0x28000000, 0x0000334F, 0x00000500, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000400, 0x00000000, 0x00000A00, 0x00000400, 0x002301FD, 0x000B0202, 0x00000002, 0x00001400, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x29000000, 0x0000324F, 0x00000280, 0x04651E39, 0x0000020C, 0x00000C10, 0x0C1C0C1C, 0x006C02EC, 0x00000400, 0x00000000, 0x00000A00, 0x02000800, 0x002301FD, 0x000B0202, 0x00000002, 0x00001400, 0x02000800, 0x002501FF, 0x000E0204, 0x00000002, 0x2A000000, 0x0000320E, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x00000280, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x2B000000, 0x0000324E, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x002D0267, 0x0009026B, 0x00000002, 0x00000280, 0x03000400, 0x002F0269, 0x000D0269, 0x00000002, 0x2C000000, 0x0000311E, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x00000280, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x2D000000, 0x0000305E, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x01000400, 0x002D0267, 0x0009026B, 0x00000002, 0x00000280, 0x03000400, 0x002F0269, 0x000D0269, 0x00000002, 0x2E000000, 0x0000330F, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x00000500, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x2F000000, 0x0000324F, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x002D0267, 0x0009026B, 0x00000002, 0x00000500, 0x03000400, 0x002F0269, 0x000D0269, 0x00000002, 0x30000000, 0x0000301F, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x00000500, 0x00000400, 0x002F0269, 0x0009026B, 0x00000002, 0x31000000, 0x0000305F, 0x00000140, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000500, 0x01000400, 0x002D0267, 0x0009026B, 0x00000002, 0x00000500, 0x03000400, 0x002F0269, 0x000D0269, 0x00000002, 0x32000000, 0x0000324E, 0x00000500, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x002D0267, 0x0009026B, 0x00000002, 0x00000A00, 0x00000400, 0x002F0269, 0x000D0269, 0x00000002, 0x33000000, 0x0000324E, 0x00000280, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x002D0267, 0x0009026B, 0x00000002, 0x00000A00, 0x02000800, 0x002F0269, 0x000D0269, 0x00000002, 0x34000000, 0x0000305E, 0x00000500, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x00000400, 0x002D0267, 0x0009026B, 0x00000002, 0x00000A00, 0x00000400, 0x002F0269, 0x000D0269, 0x00000002, 0x35000000, 0x0000305E, 0x00000280, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000500, 0x02000800, 0x002D0267, 0x0009026B, 0x00000002, 0x00000A00, 0x02000800, 0x002F0269, 0x000D0269, 0x00000002, 0x36000000, 0x0000334F, 0x00000500, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000A00, 0x00000400, 0x002D0267, 0x0009026B, 0x00000002, 0x00001400, 0x00000400, 0x002F0269, 0x000D0269, 0x00000002, 0x37000000, 0x0000324F, 0x00000280, 0x04541E3A, 0x00000270, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000400, 0x00000000, 0x00000A00, 0x02000800, 0x002D0267, 0x0009026B, 0x00000002, 0x00001400, 0x02000800, 0x002F0269, 0x000D0269, 0x00000002 + +glabel D_80095820 +.word 0x02000000, 0x0000311E, 0x00000140, 0x03E52239, 0x0000020D, 0x00000C15, 0x0C150C15, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002 + +glabel D_80095870 +.word 0x1E000000, 0x0000311E, 0x00000140, 0x04651E39, 0x0000020D, 0x00040C11, 0x0C190C1A, 0x006C02EC, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, 0x00000400, 0x002501FF, 0x000E0204, 0x00000002 + +glabel D_800958C0 +.float 0.017453292, 0.0, 0.0, 0.0 + +glabel D_800958D0 +.word 0xFFFFFFFF + +glabel D_800958D4 +.byte 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +glabel D_800958E0 +.word 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 + +glabel D_800958F0 +.word 0x00000000 + +glabel D_800958F4 +.word 0x03B9ACA0 + +glabel D_800958F8 +.word 0x02E6D354 + +glabel D_800958FC +.word 0x00000000 + +glabel D_80095900 +.word 0x003FFF01, 0x00000000, 0x00000000, 0x00000000 + +glabel D_80095910 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + +glabel D_80095938 +.word 0x00000000, 0x00000000 + +glabel D_80095940 +.ascii "0123456789abcdef\0\0\0\0" + +glabel D_80095954 +.word 0x30313233, 0x34353637, 0x38394142, 0x43444546, 0x00000000, 0x00000000, 0x00000000 + +glabel D_80095970 +.short 0x0000 + +glabel D_80095972 +.short 0x0000 + +glabel D_80095974 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +glabel D_800959A2 +.short 0x0000 + +glabel D_800959A4 +.word 0x00000000 + +glabel D_800959A8 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + +glabel D_800959D0 +.word D_80095970 + +glabel D_800959D4 +.word 0x800959A0, 0x00000000, 0x00000000 + +glabel D_800959E0 +.word 0x10000000, 0x0000311E, 0x00000140, 0x04541E3A, 0x00000271, 0x00170C69, 0x0C6F0C6D, 0x00800300, 0x00000200, 0x00000000, 0x00000280, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002, 0x00000280, 0x00000400, 0x005F0239, 0x0009026B, 0x00000002 diff --git a/asm/data/code_73130.rodata.s b/asm/data/code_73130.rodata.s deleted file mode 100644 index 92cd12587b..0000000000 --- a/asm/data/code_73130.rodata.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macro.inc" - -.section .rodata - -glabel D_80097D30 -.ascii "File:%s Line:%d %s -\0\0\0" - -glabel jtbl_80097D48 -.word L800270B4_24B4, L800270E4_24E4, L8002710C_250C, L80027134_2534, L80027168_2568, 0 diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s b/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s index ade00e9525..d3066091e1 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_80097D48 +.word L800270B4_24B4, L800270E4_24E4, L8002710C_250C, L80027134_2534, L80027168_2568, 0 + +.section .text + glabel func_80027088 /* 2488 80027088 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 248C 8002708C 0080282D */ daddu $a1, $a0, $zero diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_80029860.s b/asm/nonmatchings/code_42e0_len_1f60/func_80029860.s deleted file mode 100644 index e3bbeaaab3..0000000000 --- a/asm/nonmatchings/code_42e0_len_1f60/func_80029860.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80029860 -/* 4C60 80029860 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 4C64 80029864 AFB20050 */ sw $s2, 0x50($sp) -/* 4C68 80029868 0080902D */ daddu $s2, $a0, $zero -/* 4C6C 8002986C AFB40058 */ sw $s4, 0x58($sp) -/* 4C70 80029870 00A0A02D */ daddu $s4, $a1, $zero -/* 4C74 80029874 AFB30054 */ sw $s3, 0x54($sp) -/* 4C78 80029878 00C0982D */ daddu $s3, $a2, $zero -/* 4C7C 8002987C 0260282D */ daddu $a1, $s3, $zero -/* 4C80 80029880 AFBF005C */ sw $ra, 0x5c($sp) -/* 4C84 80029884 AFB1004C */ sw $s1, 0x4c($sp) -/* 4C88 80029888 0C018614 */ jal osWritebackDCache -/* 4C8C 8002988C AFB00048 */ sw $s0, 0x48($sp) -/* 4C90 80029890 27B00028 */ addiu $s0, $sp, 0x28 -/* 4C94 80029894 0200202D */ daddu $a0, $s0, $zero -/* 4C98 80029898 27B10040 */ addiu $s1, $sp, 0x40 -/* 4C9C 8002989C 0220282D */ daddu $a1, $s1, $zero -/* 4CA0 800298A0 0C019560 */ jal osCreateMesgQueue -/* 4CA4 800298A4 24060001 */ addiu $a2, $zero, 1 -/* 4CA8 800298A8 27A50010 */ addiu $a1, $sp, 0x10 -/* 4CAC 800298AC 3C04800A */ lui $a0, %hi(carthandle) -/* 4CB0 800298B0 8C84A638 */ lw $a0, %lo(carthandle)($a0) -/* 4CB4 800298B4 24060001 */ addiu $a2, $zero, 1 -/* 4CB8 800298B8 A3A00012 */ sb $zero, 0x12($sp) -/* 4CBC 800298BC AFB00014 */ sw $s0, 0x14($sp) -/* 4CC0 800298C0 AFB20018 */ sw $s2, 0x18($sp) -/* 4CC4 800298C4 AFB4001C */ sw $s4, 0x1c($sp) -/* 4CC8 800298C8 0C018388 */ jal osEPiStartDma -/* 4CCC 800298CC AFB30020 */ sw $s3, 0x20($sp) -/* 4CD0 800298D0 0200202D */ daddu $a0, $s0, $zero -/* 4CD4 800298D4 0220282D */ daddu $a1, $s1, $zero -/* 4CD8 800298D8 0C0195BC */ jal osRecvMesg -/* 4CDC 800298DC 24060001 */ addiu $a2, $zero, 1 -/* 4CE0 800298E0 8FBF005C */ lw $ra, 0x5c($sp) -/* 4CE4 800298E4 8FB40058 */ lw $s4, 0x58($sp) -/* 4CE8 800298E8 8FB30054 */ lw $s3, 0x54($sp) -/* 4CEC 800298EC 8FB20050 */ lw $s2, 0x50($sp) -/* 4CF0 800298F0 8FB1004C */ lw $s1, 0x4c($sp) -/* 4CF4 800298F4 8FB00048 */ lw $s0, 0x48($sp) -/* 4CF8 800298F8 03E00008 */ jr $ra -/* 4CFC 800298FC 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgr.s b/asm/nonmatchings/os/nusys/code_7e40_len_3f0/nuGfxTaskMgr.s similarity index 100% rename from asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgr.s rename to asm/nonmatchings/os/nusys/code_7e40_len_3f0/nuGfxTaskMgr.s diff --git a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgrInit.s b/asm/nonmatchings/os/nusys/code_7e40_len_3f0/nuGfxTaskMgrInit.s similarity index 100% rename from asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgrInit.s rename to asm/nonmatchings/os/nusys/code_7e40_len_3f0/nuGfxTaskMgrInit.s diff --git a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskStart.s b/asm/nonmatchings/os/nusys/code_7e40_len_3f0/nuGfxTaskStart.s similarity index 100% rename from asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskStart.s rename to asm/nonmatchings/os/nusys/code_7e40_len_3f0/nuGfxTaskStart.s diff --git a/configure.py b/configure.py index c1ac3393d5..4da0c2fbb4 100755 --- a/configure.py +++ b/configure.py @@ -379,18 +379,20 @@ async def main(): msg_files.extend(glob(d + "/**/*.msg", recursive=True)) for msg_file in msg_files: n.build( - f"$builddir/{msg_file}.bin", + f"$builddir/{msg_file.split('/', 1)[1]}.bin", "msg", msg_file, implicit="tools/msg/parse_compile.py", ) + msg_headers = [add_generated_header(f"$builddir/include/{msg_file.split('/', 1)[1]}.h") for msg_file in msg_files] + msg_bins = list(set([f"$builddir/{msg_file.split('/', 1)[1]}.bin" for msg_file in msg_files])) n.build( "$builddir/msg.bin", "msg_combine", - [f"$builddir/{msg_file}.bin" for msg_file in msg_files], + msg_bins, implicit="tools/msg/combine.py", - implicit_outputs=[add_generated_header(f"$builddir/include/{msg_file.split('/', 1)[1]}.h") for msg_file in msg_files], - variables={ "msg_combine_headers": [f"{msg_file}.h" for msg_file in msg_files] } + implicit_outputs=msg_headers, + variables={ "msg_combine_headers": msg_headers } ) n.build("$builddir/msg.o", "bin", "$builddir/msg.bin") diff --git a/diff_settings.py b/diff_settings.py index 965287954e..cbf85efa4c 100644 --- a/diff_settings.py +++ b/diff_settings.py @@ -4,5 +4,5 @@ def apply(config, args): config['baseimg'] = 'baserom.z64' config['myimg'] = 'papermario.z64' config['mapfile'] = 'build/papermario.map' - config['source_directories'] = ['.'] + config['source_directories'] = ['src', 'asm', 'include', 'assets'] config['make_command'] = ['ninja'] diff --git a/include/functions.h b/include/functions.h index 3a193e0e4b..d09bec02ce 100644 --- a/include/functions.h +++ b/include/functions.h @@ -38,6 +38,7 @@ void func_80070550(s32, f32, f32, f32, f32, f32, s32, s32); void func_802E263C(Entity* entity); void step_game_loop(void); +s32 resume_all_group(s32 groupFlags); void create_shadow_callback(Shadow* entity); void func_802E10F4(Entity* entity); @@ -176,7 +177,7 @@ void func_80137DA4(s32, f32); void func_80137DC0(s32, f32*, f32*); s32 func_80137E10(s32, u8, u8, u8); void func_80137E4C(s32, s32, s32, s32); -s32 rand_int(s32); +//s32 rand_int(s32); void sort_items(void); s32 is_ability_active(s32 arg0); f32 update_lerp(Easing easing, f32 start, f32 end, s32 elapsed, s32 duration); diff --git a/src/code_1060_len_310.c b/src/code_1060_len_310.c index 39fb07a548..f57ac3f759 100644 --- a/src/code_1060_len_310.c +++ b/src/code_1060_len_310.c @@ -1,8 +1,6 @@ #include "common.h" #include "stdlib/stdarg.h" -extern const char D_80097D30[]; - u32 func_80025D74(void* arg0, const unsigned char* str, s32 count); void func_80025C60(void) { @@ -81,7 +79,9 @@ u32 func_80025D74(void* arg0, const unsigned char* str, s32 count) { return 1; } +extern const char D_80097D30[]; // "File:%s Line:%d %s \n\0\0\0" + void func_80025F44(char* arg0, char* file, s32 line, char* arg3) { - func_80025CFC(&D_80097D30, file, line, arg0); + func_80025CFC(D_80097D30, file, line, arg0); PANIC(); } diff --git a/src/code_1b40_len_20b0.c b/src/code_1b40_len_20b0.c index 0f6a994fa8..d55fc69313 100644 --- a/src/code_1b40_len_20b0.c +++ b/src/code_1b40_len_20b0.c @@ -110,7 +110,42 @@ void load_engine_data(void) { INCLUDE_ASM(s32, "code_1b40_len_20b0", load_engine_data); #endif +//weird ordering issue +#ifdef NON_MATCHING +void func_80027088(s32 arg0) { + switch (arg0) { + case 0: + D_8009A5D8 = arg0; + *D_8009A650 &= ~0xF00; + resume_all_group(3); + break; + case 1: + D_8009A5D8 = arg0; + *D_8009A650 &= ~0xE00; + *D_8009A650 |= 0x100; + suspend_all_group(1); + break; + case 2: + D_8009A5D8 = arg0; + *D_8009A650 &= ~0xC00; + *D_8009A650 |= 0x300; + suspend_all_group(2); + break; + case 3: + D_8009A5D8 = arg0; + *D_8009A650 &= ~0x800; + *D_8009A650 |= 0x700; + suspend_all_group(2); + break; + case 4: + D_8009A5D8 = arg0; + *D_8009A650 |= 0xF00; + break; + } +} +#else INCLUDE_ASM(void, "code_1b40_len_20b0", func_80027088, s32 arg0); +#endif s32 func_80027190(void) { return D_8009A5D8; diff --git a/src/code_42e0_len_1f60.c b/src/code_42e0_len_1f60.c index e4ea96a62b..4b357fd778 100644 --- a/src/code_42e0_len_1f60.c +++ b/src/code_42e0_len_1f60.c @@ -191,7 +191,23 @@ s32 func_800297D4(s32 romStart, s32 romEnd, void* vramDest) { return length; } -INCLUDE_ASM(void, "code_42e0_len_1f60", func_80029860, s32 romStart, s32 vramDest, s32 length); +void func_80029860(s32 dramAddr, s32 devAddr, s32 size) { + OSIoMesg osIoMesg; + OSMesg osMesg; + OSMesgQueue osMesgQueue; + + osWritebackDCache(dramAddr, size); + osCreateMesgQueue(&osMesgQueue, &osMesg, 1); + + osIoMesg.hdr.pri = 0; + osIoMesg.hdr.retQueue = &osMesgQueue; + osIoMesg.dramAddr = dramAddr; + osIoMesg.devAddr = devAddr; + osIoMesg.size = size; + + osEPiStartDma(carthandle, &osIoMesg, 1); + osRecvMesg(&osMesgQueue, &osMesg, 1); +} s32 _advance_rng(void) { s32* rngVal = &gRandSeed; @@ -229,7 +245,31 @@ s32 func_80029994(s32 arg0) { return result; } +// Issue with the negation at the beginning +#ifdef NON_MATCHING +s32 rand_int(s32 arg0) { + s32 ret; + + if (arg0 < 0) { + arg0 = -arg0; + } + + ret = 0; + if (arg0 != 0) { + if (arg0 == 1) { + return (func_80029994(1000) < 501) ^ 1; + } + if (arg0 != 100) { + return func_80029994(arg0); + } + ret = func_80029994(1009) / 10; + } + + return ret; +} +#else INCLUDE_ASM(s32, "code_42e0_len_1f60", rand_int, s32 arg0); +#endif f32 signF(f32 val) { f32 sign; @@ -348,8 +388,31 @@ f32 cos_deg(f32 angle) { INCLUDE_ASM(f32, "code_42e0_len_1f60", update_lerp, Easing easing, f32 start, f32 end, s32 elapsed, s32 duration); -INCLUDE_ASM(s32, "code_42e0_len_1f60", func_8002A904); +//void func_8002A904(u8 arg0, u8 arg1, u8 arg2, u8 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7); +INCLUDE_ASM(void, "code_42e0_len_1f60", func_8002A904, u8 arg0, u8 arg1, u8 arg2, u8 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7); INCLUDE_ASM(s32, "code_42e0_len_1f60", func_8002AAC4); +// void func_8002AAC4(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7) { +// s16 phi_t0; +// s16 phi_t1; +// s16 phi_t2; +// s16 phi_t3; + +// phi_t0 = arg0; +// phi_t2 = arg2; +// if (arg2 < arg0) { +// phi_t0 = arg2; +// phi_t2 = arg0; +// } + +// phi_t1 = arg1; +// phi_t3 = arg3; +// if (arg3 < arg1) { +// phi_t1 = arg3; +// phi_t3 = arg1; +// } + +// func_8002A904(arg4, arg5, arg6, arg7, phi_t0, phi_t1, phi_t2, phi_t3); +// } INCLUDE_ASM(s32, "code_42e0_len_1f60", func_8002AB5C); diff --git a/src/os/code_7e40_len_3f0.c b/src/os/code_7e40_len_3f0.c deleted file mode 100644 index 077ad44f8b..0000000000 --- a/src/os/code_7e40_len_3f0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_7e40_len_3f0", nuGfxTaskMgr); - -INCLUDE_ASM(s32, "os/code_7e40_len_3f0", nuGfxTaskMgrInit); - -INCLUDE_ASM(s32, "os/code_7e40_len_3f0", nuGfxTaskStart); diff --git a/src/os/nusys/code_7e40_len_3f0.c b/src/os/nusys/code_7e40_len_3f0.c new file mode 100644 index 0000000000..aa8ed825cf --- /dev/null +++ b/src/os/nusys/code_7e40_len_3f0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/nusys/code_7e40_len_3f0", nuGfxTaskMgr); + +INCLUDE_ASM(s32, "os/nusys/code_7e40_len_3f0", nuGfxTaskMgrInit); + +INCLUDE_ASM(s32, "os/nusys/code_7e40_len_3f0", nuGfxTaskStart); diff --git a/src/os/nusys/nuContRmbMgr.c b/src/os/nusys/nuContRmbMgr.c index 6d459e797c..776af78ec8 100644 --- a/src/os/nusys/nuContRmbMgr.c +++ b/src/os/nusys/nuContRmbMgr.c @@ -1,6 +1,19 @@ #include "common.h" #include "nu/nusys.h" +s32 contRmbRetrace(NUSiCommonMesg* mesg); +s32 contRmbCheckMesg(NUSiCommonMesg* mesg); +s32 contRmbStartMesg(NUSiCommonMesg* mesg); +s32 contRmbStopMesg(NUSiCommonMesg* mesg); +s32 contRmbForceStopMesg(NUSiCommonMesg* mesg); +s32 contRmbForceStopEndMesg(NUSiCommonMesg* mesg); + +u32 nuContRmbSearchTime = 300; + +s32 D_80093CE4[] = { contRmbRetrace, contRmbCheckMesg, contRmbStartMesg, contRmbStopMesg, contRmbForceStopMesg, contRmbForceStopEndMesg, NULL}; + +NUCallBackList nuContRmbCallBack = {.next = NULL, .func = D_80093CE4, .majorNo = 0x300, .funcNum = 0}; + s32 contRmbControl(NUContRmbCtl* rmbCtl, u32 contNo) { s32 ret = 0; u32 cnt; @@ -93,8 +106,6 @@ s32 contRmbRetrace(NUSiCommonMesg* mesg) { return 0; } -#ifdef NON_MATCHING -// Will match when data is decompiled. void nuContRmbMgrInit(void) { u32 i; @@ -106,9 +117,6 @@ void nuContRmbMgrInit(void) { nuSiCallBackAdd(&nuContRmbCallBack); } -#else -INCLUDE_ASM(void, "os/nusys/nuContRmbMgr", nuContRmbMgrInit); -#endif void nuContRmbMgrRemove(void) { nuSiCallBackRemove(&nuContRmbCallBack); diff --git a/tools/splat.yaml b/tools/splat.yaml index 90b21e2dc8..16543062b4 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -41,7 +41,7 @@ segments: - [0x6240, c, code_6240_len_c00] - [0x6e40, c, code_6e40_len_500] - [0x7340, c, code_7340_len_b00] - - [0x7e40, c, os/code_7e40_len_3f0] + - [0x7e40, c, os/nusys/code_7e40_len_3f0] - [0x8230, c, os/nusys/nuSiMgr] - [0x8560, c] - [0x8800, c] @@ -242,9 +242,12 @@ segments: - [0x542E0, data, code_31650] - [0x6B450, .data, world/world] - [0x6EAC0, data] # has scripts + - [0x6F0E0, .data, os/nusys/nuContRmbMgr] + - [0x6F110, data] # has scripts? - [0x70E30, .data, battle/battle] - [0x71430, data] - - [0x73130, rodata] + - [0x73130, rodata, code_1060_len_310] + - [0x73148, .rodata, code_1b40_len_20b0] - [0x73160, .rodata, code_42e0_len_1f60] - [0x73200, rodata] - [0x73DA0, .rodata, world/world]