diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2022-04-26 16:48:36 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-26 15:48:36 -0700 |
| commit | 2f8a1bfcb663adea7bea935ef1dcb8a2f82d46cb (patch) | |
| tree | f5cd483c48f0c2b4b97089c9648e4ae990d92bcc /data | |
| parent | 626513f90aca28597857768ff5fd45acd1dd9b59 (diff) | |
Actor decomp (#183)
* Actor decomp
Diffstat (limited to 'data')
| -rw-r--r-- | data/data_121DA0.s | 26 | ||||
| -rw-r--r-- | data/data_121DA0_2_1.s | 395 | ||||
| -rw-r--r-- | data/data_121DA0_2_2.s | 322 |
3 files changed, 375 insertions, 368 deletions
diff --git a/data/data_121DA0.s b/data/data_121DA0.s index 7f56e4f33..da28a4642 100644 --- a/data/data_121DA0.s +++ b/data/data_121DA0.s @@ -73,26 +73,26 @@ glabel D_802B8848 # struct .hword 0000 # fill -glabel D_802B8850 -.word 0, 0, 0 +#glabel D_802B8850 +#.word 0, 0, 0 -glabel D_802B885C -.hword 0, 0, 0 +#glabel D_802B885C +#.hword 0, 0, 0 -.hword 0000 # fill +#.hword 0000 # fill -glabel D_802B8864 -.hword 0, 0, 0 +#glabel D_802B8864 +#.hword 0, 0, 0 -.hword 0000 # fill +#.hword 0000 # fill -glabel D_802B886C -.hword 0, 0, 0 +#glabel D_802B886C +#.hword 0, 0, 0 -.hword 0000 # fill +#.hword 0000 # fill -glabel D_802B8874 -.float 0.0, 5.0, 10.0 +#glabel D_802B8874 +#.float 0.0, 5.0, 10.0 #glabel D_802B8880 # Vp viewport #.hword 640, 480, 511, 0 diff --git a/data/data_121DA0_2_1.s b/data/data_121DA0_2_1.s index c2a38f91b..71856c795 100644 --- a/data/data_121DA0_2_1.s +++ b/data/data_121DA0_2_1.s @@ -554,358 +554,43 @@ glabel D_802B9A28 glabel D_802B9A2C .float 16000000.0 -glabel D_802B9A30 -.float 640000.0 - -glabel D_802B9A34 -.float 16000000.0 - -glabel D_802B9A38 -.float 4000000.0 - -glabel D_802B9A3C -.float 4000000.0 - -glabel D_802B9A40 -.float 250000.0 - -glabel jpt_802B9A44 -.word L802A31E4, L802A31FC, L802A3214, L802A32EC -.word L802A3318, L802A3330, L802A3348, L802A34C0 -.word L802A3378, L802A34D4, L802A34D4, L802A34D4 -.word L802A34D4, L802A3390, L802A33A4, L802A33B8 -.word L802A33CC, L802A322C, L802A33E4, L802A34D4 -.word L802A34D4, L802A33FC, L802A34D4, L802A3428 -.word L802A3244, L802A34D4, L802A325C, L802A328C -.word L802A32A4, L802A32BC, L802A32D4, L802A3274 -.word L802A34D4, L802A3414, L802A34D4, L802A345C -.word L802A3440, L802A34AC, L802A3470, L802A3484 -.word L802A3360, L802A34D4, L802A3498, L802A3300 - -glabel jpt_802B9AF4 -.word L802A36D8, L802A36D8, L802A36D8, L802A3590 -.word L802A35E0, L802A35A0, L802A35B0, L802A36E8 -.word L802A3660, L802A36F0, L802A3630, L802A3650 -.word L802A3670, L802A3600, L802A3610, L802A3620 -.word L802A36F0, L802A36D8, L802A36F0, L802A3680 -.word L802A3694, L802A36A8, L802A36F0, L802A36D8 -.word L802A36D8, L802A36D8, L802A36D8, L802A36D8 -.word L802A36D8, L802A36D8, L802A36D8, L802A36D8 -.word L802A36F0, L802A36B8, L802A36F0, L802A36F0 -.word L802A35F0, L802A36C8, L802A36F0, L802A36F0 -.word L802A35C0, L802A3640, L802A36F0, L802A35D0 - -.word 0, 0, 0 - -glabel D_802B9BB0 -.float 30000.0 - -glabel D_802B9BB4 -.float 6800.0 - -glabel jtbl_802B9BB8 -.word L802A4E04, L802A4D98, L802A4D74, L802A4D74 -.word L802A4E04, L802A4E04, L802A4DBC, L802A4E04 -.word L802A4E04, L802A4E04, L802A4E04, L802A4E28 -.word L802A4E04, L802A4D74, L802A4DE0, L802A4D74 -.word L802A4D74, L802A4D98, L802A4E04 - -glabel D_802B9C04 -.float 2700.0 - -glabel D_802B9C08 -.float 1500.0 - -glabel D_802B9C0C -.float 5000.0 - -glabel D_802B9C10 -.float 4500.0 - -glabel D_802B9C14 -.float 7000.0 - -glabel D_802B9C18 -.float 6800.0 - -glabel D_802B9C1C -.float 1.3333333730697632 - -glabel D_802B9C20 -.float 0.6666666865348816 - -glabel D_802B9C24 -.float 2.6666667461395264 - -glabel D_802B9C28 -.float 1.3333333730697632 - -.word 0 - -glabel jpt_802B9C30 -.word L802A8FE0, L802A9014, L802A902C, L802A9044 -.word L802A9060, L802A907C, L802A9094, L802A9094 -.word L802A9094, L802A9094, L802A9094, L802A9094 -.word L802A9094, L802A9094, L802A9094, L802A9094 -.word L802A9094, L802A9094, L802A8FF8 - -glabel jpt_802B9C7C -.word L802A9250, L802A9268, L802A9280, L802A9298 -.word L802A92B4, L802A92D0 - -glabel jpt_802B9C94 -.word L802A9BB8, L802A9BDC, L802A9C00 -.word L802A9C24, L802A9C48, L802A9C6C, L802A9C90 -.word L802A9CB4, L802A9CD8, L802A9CFC, L802A9D20 -.word L802A9D44, L802A9D68, L802A9D8C, L802A9DB0 -.word L802A9DD4, L802A9DF8, L802A9E1C, L802A9E40 -.word L802A9E64, L802A9E88, L802A9EAC, L802A9EC8 -.word L802A9EE4, L802A9F38, L802A9F54, L802A9FC4 -.word L802AA00C, L802AA030, L802AA054, L802AA078 -.word L802AA09C, L802AA0C0, L802AA0E4, L802AA108 -.word L802AA12C, L802AA150, L802AA174, L802AA198 -.word L802AA1BC, L802AA1E0, L802AA684, L802AA714 -.word L802AA780, L802A9FE8, L802AA6F0, L802A9F00 -.word L802A9F70, L802AA6CC, L802A9B74, L802A9B74 -.word L802AA204, L802AA228, L802AA24C, L802AA270 -.word L802AA294, L802AA2B8, L802AA2DC, L802AA300 -.word L802AA324, L802AA348, L802AA36C, L802AA390 -.word L802AA3B4, L802AA3D8, L802AA3FC, L802AA420 -.word L802AA444, L802AA468, L802AA48C, L802AA4B0 -.word L802AA4D4, L802AA4F8, L802AA51C, L802AA540 -.word L802AA564, L802AA588, L802AA5AC, L802AA5D0 -.word L802AA5F4, L802AA618, L802AA63C, L802AA660 -.word L802A9F1C, L802A9F8C, L802A9FA8, L802AA738 -.word L802AA75C, L802AA6A8 - -.word 0, 0 - -glabel D_802B9E00 -.float 1859.0 - -glabel D_802B9E04 -.float 1549.0 - -glabel D_802B9E08 -.float -1102.0 - -glabel D_802B9E0C -.float -1402.0 - -glabel D_802B9E10 -.float 2405.0 - -glabel D_802B9E14 -.float 2233.0 - -glabel D_802B9E18 -.float 0.8 - -glabel D_802B9E1C -.float -475.0 - -glabel D_802B9E20 -.float -33.9 - -glabel D_802B9E24 -.float -838.0 - -glabel D_802B9E28 -.float -475.0 - -glabel D_802B9E2C -.float -475.0 - -glabel D_802B9E30 -.float -993.0 - -glabel D_802B9E34 -.float -33.9 - -glabel D_802B9E38 -.float -475.0 - -glabel D_802B9E3C -.float -33.9 - -glabel D_802B9E40 -.float -475.0 - -glabel D_802B9E44 -.float -33.9 - -glabel D_802B9E48 -.float -0.9 - -glabel D_802B9E4C -.float -3000.0 - -glabel D_802B9E50 -.float 3000.0 - -glabel D_802B9E54 -.float 3000.0 - -glabel D_802B9E58 -.float 3000.0 - -glabel D_802B9E5C -.float 3000.0 - -glabel D_802B9E60 -.float 3000.0 - -glabel D_802B9E64 -.float -0.9 - -glabel D_802B9E68 -.float 0.9 - -glabel D_802B9E6C -.float 0.1 - -glabel D_802B9E70 -.float -0.1 - -.word 0, 0, 0 - -glabel D_802B9E80 -.double 0.015 - -glabel D_802B9E88 -.double 0.015 - -glabel D_802B9E90 -.double 0.015 - -glabel jpt_802B9E98 -.word L802B0A88, L802B0AB0, L802B0AF8, L802B0B40 -.word L802B0B84, L802B0BCC, L802B0C70 - -glabel jpt_802B9EB4 -.word L802B0EF4, L802B0F60, L802B1050, L802B1154 -.word L802B11FC - -glabel jpt_802B9EC8 -.word L802B2094, L802B237C, L802B25A0, L802B2718 -.word L802B28E8, L802B285C - -glabel D_802B9EE0 -.float 0.2 - -glabel D_802B9EE4 -.float 0.15 - -glabel D_802B9EE8 -.float 0.2 - -glabel D_802B9EEC -.float 0.2 - -glabel D_802B9EF0 -.float 0.3 - -glabel jpt_802B9EF4 -.word L802B2B0C, L802B2B20, L802B2B4C, L802B2B78 -.word L802B2BA4 - -glabel jpt_802B9F08 -.word L802B301C, L802B302C, L802B2FEC, L802B30BC -.word L802B2FFC, L802B30CC, L802B300C, L802B309C -.word L802B30AC, L802B308C, L802B307C, L802B303C -.word L802B304C, L802B305C, L802B306C - -glabel jpt_802B9F44 -.word L802B33CC, L802B3614, L802B382C, L802B3B30 -.word L802B3974, L802B3AC4 - -glabel D_802B9F5C -.float 1.2 - -glabel D_802B9F60 -.float 1.2 - -glabel D_802B9F64 -.float 0.3 - -glabel D_802B9F68 -.float 25000000.0 - -glabel jpt_802B9F6C -.word L802B4324, L802B44B0, L802B4750, L802B4A9C -.word L802B4AD8, L802B4B18, L802B4B94, L802B4CE4 -.word L802B4D58, L802B4DE8 - -glabel D_802B9F94 -.float 1.2 - -glabel D_802B9F98 -.float 40000.0 - -glabel D_802B9F9C -.float 0.3 - -glabel D_802B9FA0 -.float 40000.0 - -.word 0, 0, 0 - -glabel D_802B9FB0 -.double 0.017453292222222222 - -glabel D_802B9FB8 -.double 3.141592653589793 - -glabel D_802B9FC0 -.double 360.0 - -glabel D_802B9FC8 -.double 3.141592653589793 - -glabel D_802B9FD0 -.double 360.0 - -glabel D_802B9FD8 -.float 1000000.0 - -glabel D_802B9FDC -.float -0.01600503 - -glabel D_802B9FE0 -.float 0.002834060 - -glabel D_802B9FE4 -.float -0.074954450 - -glabel D_802B9FE8 -.float 0.042587612 - -glabel D_802B9FEC -.float -0.142025709 - -glabel D_802B9FF0 -.float 0.106367543 - -glabel D_802B9FF4 -.float -0.333330661 - -glabel D_802B9FF8 -.double 1.3375206719956623e-08 - -glabel D_802BA000 -.double 1.5707963267948966 - -glabel D_802BA008 -.double 1.5707963267948966 - -glabel D_802BA010 -.double 50.123870849609375 - -glabel D_802BA018 -.double 3.141592653589793 - -glabel D_802BA020 -.double 3.141592653589793 - -glabel D_802BA028 -.double 65535.0 +#glabel D_802B9A30 +#.float 640000.0 + +#glabel D_802B9A34 +#.float 16000000.0 + +#glabel D_802B9A38 +#.float 4000000.0 + +#glabel D_802B9A3C +#.float 4000000.0 + +#glabel D_802B9A40 +#.float 250000.0 + +#glabel jpt_802B9A44 +#.word L802A31E4, L802A31FC, L802A3214, L802A32EC +#.word L802A3318, L802A3330, L802A3348, L802A34C0 +#.word L802A3378, L802A34D4, L802A34D4, L802A34D4 +#.word L802A34D4, L802A3390, L802A33A4, L802A33B8 +#.word L802A33CC, L802A322C, L802A33E4, L802A34D4 +#.word L802A34D4, L802A33FC, L802A34D4, L802A3428 +#.word L802A3244, L802A34D4, L802A325C, L802A328C +#.word L802A32A4, L802A32BC, L802A32D4, L802A3274 +#.word L802A34D4, L802A3414, L802A34D4, L802A345C +#.word L802A3440, L802A34AC, L802A3470, L802A3484 +#.word L802A3360, L802A34D4, L802A3498, L802A3300 + +#glabel jpt_802B9AF4 +#.word L802A36D8, L802A36D8, L802A36D8, L802A3590 +#.word L802A35E0, L802A35A0, L802A35B0, L802A36E8 +#.word L802A3660, L802A36F0, L802A3630, L802A3650 +#.word L802A3670, L802A3600, L802A3610, L802A3620 +#.word L802A36F0, L802A36D8, L802A36F0, L802A3680 +#.word L802A3694, L802A36A8, L802A36F0, L802A36D8 +#.word L802A36D8, L802A36D8, L802A36D8, L802A36D8 +#.word L802A36D8, L802A36D8, L802A36D8, L802A36D8 +#.word L802A36F0, L802A36B8, L802A36F0, L802A36F0 +#.word L802A35F0, L802A36C8, L802A36F0, L802A36F0 +#.word L802A35C0, L802A3640, L802A36F0, L802A35D0 diff --git a/data/data_121DA0_2_2.s b/data/data_121DA0_2_2.s new file mode 100644 index 000000000..3da71b9a3 --- /dev/null +++ b/data/data_121DA0_2_2.s @@ -0,0 +1,322 @@ +# Mario Kart 64 (U) disassembly and split file +# generated by n64split v0.4a - N64 ROM splitter + +.include "macros.inc" + +.section .data + + +#.word 0, 0, 0 + +glabel D_802B9BB0 +.float 30000.0 + +glabel D_802B9BB4 +.float 6800.0 + +glabel jtbl_802B9BB8 +.word L802A4E04, L802A4D98, L802A4D74, L802A4D74 +.word L802A4E04, L802A4E04, L802A4DBC, L802A4E04 +.word L802A4E04, L802A4E04, L802A4E04, L802A4E28 +.word L802A4E04, L802A4D74, L802A4DE0, L802A4D74 +.word L802A4D74, L802A4D98, L802A4E04 + +glabel D_802B9C04 +.float 2700.0 + +glabel D_802B9C08 +.float 1500.0 + +glabel D_802B9C0C +.float 5000.0 + +glabel D_802B9C10 +.float 4500.0 + +glabel D_802B9C14 +.float 7000.0 + +glabel D_802B9C18 +.float 6800.0 + +glabel D_802B9C1C +.float 1.3333333730697632 + +glabel D_802B9C20 +.float 0.6666666865348816 + +glabel D_802B9C24 +.float 2.6666667461395264 + +glabel D_802B9C28 +.float 1.3333333730697632 + +.word 0 + +glabel jpt_802B9C30 +.word L802A8FE0, L802A9014, L802A902C, L802A9044 +.word L802A9060, L802A907C, L802A9094, L802A9094 +.word L802A9094, L802A9094, L802A9094, L802A9094 +.word L802A9094, L802A9094, L802A9094, L802A9094 +.word L802A9094, L802A9094, L802A8FF8 + +glabel jpt_802B9C7C +.word L802A9250, L802A9268, L802A9280, L802A9298 +.word L802A92B4, L802A92D0 + +glabel jpt_802B9C94 +.word L802A9BB8, L802A9BDC, L802A9C00 +.word L802A9C24, L802A9C48, L802A9C6C, L802A9C90 +.word L802A9CB4, L802A9CD8, L802A9CFC, L802A9D20 +.word L802A9D44, L802A9D68, L802A9D8C, L802A9DB0 +.word L802A9DD4, L802A9DF8, L802A9E1C, L802A9E40 +.word L802A9E64, L802A9E88, L802A9EAC, L802A9EC8 +.word L802A9EE4, L802A9F38, L802A9F54, L802A9FC4 +.word L802AA00C, L802AA030, L802AA054, L802AA078 +.word L802AA09C, L802AA0C0, L802AA0E4, L802AA108 +.word L802AA12C, L802AA150, L802AA174, L802AA198 +.word L802AA1BC, L802AA1E0, L802AA684, L802AA714 +.word L802AA780, L802A9FE8, L802AA6F0, L802A9F00 +.word L802A9F70, L802AA6CC, L802A9B74, L802A9B74 +.word L802AA204, L802AA228, L802AA24C, L802AA270 +.word L802AA294, L802AA2B8, L802AA2DC, L802AA300 +.word L802AA324, L802AA348, L802AA36C, L802AA390 +.word L802AA3B4, L802AA3D8, L802AA3FC, L802AA420 +.word L802AA444, L802AA468, L802AA48C, L802AA4B0 +.word L802AA4D4, L802AA4F8, L802AA51C, L802AA540 +.word L802AA564, L802AA588, L802AA5AC, L802AA5D0 +.word L802AA5F4, L802AA618, L802AA63C, L802AA660 +.word L802A9F1C, L802A9F8C, L802A9FA8, L802AA738 +.word L802AA75C, L802AA6A8 + +.word 0, 0 + +glabel D_802B9E00 +.float 1859.0 + +glabel D_802B9E04 +.float 1549.0 + +glabel D_802B9E08 +.float -1102.0 + +glabel D_802B9E0C +.float -1402.0 + +glabel D_802B9E10 +.float 2405.0 + +glabel D_802B9E14 +.float 2233.0 + +glabel D_802B9E18 +.float 0.8 + +glabel D_802B9E1C +.float -475.0 + +glabel D_802B9E20 +.float -33.9 + +glabel D_802B9E24 +.float -838.0 + +glabel D_802B9E28 +.float -475.0 + +glabel D_802B9E2C +.float -475.0 + +glabel D_802B9E30 +.float -993.0 + +glabel D_802B9E34 +.float -33.9 + +glabel D_802B9E38 +.float -475.0 + +glabel D_802B9E3C +.float -33.9 + +glabel D_802B9E40 +.float -475.0 + +glabel D_802B9E44 +.float -33.9 + +glabel D_802B9E48 +.float -0.9 + +glabel D_802B9E4C +.float -3000.0 + +glabel D_802B9E50 +.float 3000.0 + +glabel D_802B9E54 +.float 3000.0 + +glabel D_802B9E58 +.float 3000.0 + +glabel D_802B9E5C +.float 3000.0 + +glabel D_802B9E60 +.float 3000.0 + +glabel D_802B9E64 +.float -0.9 + +glabel D_802B9E68 +.float 0.9 + +glabel D_802B9E6C +.float 0.1 + +glabel D_802B9E70 +.float -0.1 + +.word 0, 0, 0 + +glabel D_802B9E80 +.double 0.015 + +glabel D_802B9E88 +.double 0.015 + +glabel D_802B9E90 +.double 0.015 + +glabel jpt_802B9E98 +.word L802B0A88, L802B0AB0, L802B0AF8, L802B0B40 +.word L802B0B84, L802B0BCC, L802B0C70 + +glabel jpt_802B9EB4 +.word L802B0EF4, L802B0F60, L802B1050, L802B1154 +.word L802B11FC + +glabel jpt_802B9EC8 +.word L802B2094, L802B237C, L802B25A0, L802B2718 +.word L802B28E8, L802B285C + +glabel D_802B9EE0 +.float 0.2 + +glabel D_802B9EE4 +.float 0.15 + +glabel D_802B9EE8 +.float 0.2 + +glabel D_802B9EEC +.float 0.2 + +glabel D_802B9EF0 +.float 0.3 + +glabel jpt_802B9EF4 +.word L802B2B0C, L802B2B20, L802B2B4C, L802B2B78 +.word L802B2BA4 + +glabel jpt_802B9F08 +.word L802B301C, L802B302C, L802B2FEC, L802B30BC +.word L802B2FFC, L802B30CC, L802B300C, L802B309C +.word L802B30AC, L802B308C, L802B307C, L802B303C +.word L802B304C, L802B305C, L802B306C + +glabel jpt_802B9F44 +.word L802B33CC, L802B3614, L802B382C, L802B3B30 +.word L802B3974, L802B3AC4 + +glabel D_802B9F5C +.float 1.2 + +glabel D_802B9F60 +.float 1.2 + +glabel D_802B9F64 +.float 0.3 + +glabel D_802B9F68 +.float 25000000.0 + +glabel jpt_802B9F6C +.word L802B4324, L802B44B0, L802B4750, L802B4A9C +.word L802B4AD8, L802B4B18, L802B4B94, L802B4CE4 +.word L802B4D58, L802B4DE8 + +glabel D_802B9F94 +.float 1.2 + +glabel D_802B9F98 +.float 40000.0 + +glabel D_802B9F9C +.float 0.3 + +glabel D_802B9FA0 +.float 40000.0 + +.word 0, 0, 0 + +glabel D_802B9FB0 +.double 0.017453292222222222 + +glabel D_802B9FB8 +.double 3.141592653589793 + +glabel D_802B9FC0 +.double 360.0 + +glabel D_802B9FC8 +.double 3.141592653589793 + +glabel D_802B9FD0 +.double 360.0 + +glabel D_802B9FD8 +.float 1000000.0 + +glabel D_802B9FDC +.float -0.01600503 + +glabel D_802B9FE0 +.float 0.002834060 + +glabel D_802B9FE4 +.float -0.074954450 + +glabel D_802B9FE8 +.float 0.042587612 + +glabel D_802B9FEC +.float -0.142025709 + +glabel D_802B9FF0 +.float 0.106367543 + +glabel D_802B9FF4 +.float -0.333330661 + +glabel D_802B9FF8 +.double 1.3375206719956623e-08 + +glabel D_802BA000 +.double 1.5707963267948966 + +glabel D_802BA008 +.double 1.5707963267948966 + +glabel D_802BA010 +.double 50.123870849609375 + +glabel D_802BA018 +.double 3.141592653589793 + +glabel D_802BA020 +.double 3.141592653589793 + +glabel D_802BA028 +.double 65535.0 |