This commit is contained in:
Donkey Kong 2024-09-23 20:21:28 +09:30
parent 76e72d04df
commit ae0d9fb6eb
8 changed files with 316 additions and 142 deletions

View File

@ -697,7 +697,7 @@ s32 playCutscene(Actor *arg0, s16 arg1, s32 arg2);
// TODO: func_global_asm_8061D1FC has no documented signature
void func_global_asm_8061D4E4(Actor *arg0);
// TODO: func_global_asm_8061D6A8 has no documented signature
// TODO: func_global_asm_8061D898 has no documented signature
void func_global_asm_8061D898(void);
// TODO: func_global_asm_8061D934 has no documented signature
// TODO: func_global_asm_8061D968 has no documented signature
// TODO: func_global_asm_8061D9EC has no documented signature

View File

@ -1594,7 +1594,10 @@ typedef struct {
f32 unk2C4; // Used
s16 unk2C8; // Used
s16 unk2CA;
u8 pad_unknown4[0x2E0 - 0x2CC];
s16 unk2CC;
s16 unk2CE;
f32 unk2D0;
u8 pad_unknown4[0x2E0 - 0x2D4];
u16 unk2E0;
u16 unk2E2;
u8 unk2E4;

View File

@ -226,7 +226,7 @@ us,asm,func_global_asm_806F6204,848,no
us,asm,func_global_asm_806533C4,284,yes
us,asm,func_global_asm_80724B5C,208,yes
us,asm,areAllKeysTurnedIn,92,yes
us,asm,func_global_asm_8061B610,64,no
us,asm,func_global_asm_8061B610,64,yes
us,asm,func_global_asm_8064AAC4,88,yes
us,asm,func_global_asm_80724A20,124,yes
us,asm,func_global_asm_80723484,1104,no
@ -340,7 +340,7 @@ us,asm,func_global_asm_806BE6F0,460,yes
us,asm,func_global_asm_8062AD28,1132,no
us,asm,func_global_asm_8070FC40,140,yes
us,asm,func_global_asm_806F0624,128,yes
us,asm,func_global_asm_80627878,16,no
us,asm,func_global_asm_80627878,16,yes
us,asm,func_global_asm_806F95C8,64,yes
us,asm,displayImage,3260,no
us,asm,func_global_asm_806D9320,1156,no
@ -375,7 +375,7 @@ us,asm,func_global_asm_8066F4AC,928,no
us,asm,func_global_asm_8070CC8C,56,yes
us,asm,func_global_asm_8073195C,48,yes
us,asm,func_global_asm_8064409C,640,no
us,asm,func_global_asm_8061DA84,40,no
us,asm,func_global_asm_8061DA84,40,yes
us,asm,func_global_asm_8069D424,1292,no
us,asm,func_global_asm_806016D0,88,yes
us,asm,func_global_asm_8072A920,352,yes
@ -432,7 +432,7 @@ us,asm,func_global_asm_80678E14,88,yes
us,asm,func_global_asm_806167EC,100,yes
us,asm,func_global_asm_80717814,284,yes
us,asm,func_global_asm_80735A50,76,yes
us,asm,func_global_asm_80619520,32,no
us,asm,func_global_asm_80619520,32,yes
us,asm,func_global_asm_8065D170,60,yes
us,asm,func_global_asm_80712490,40,yes
us,asm,func_global_asm_806DF050,336,yes
@ -445,7 +445,7 @@ us,asm,func_global_asm_80724154,436,yes
us,asm,func_global_asm_8061C2D8,24,yes
us,asm,func_global_asm_80724308,720,no
us,asm,func_global_asm_8060AA04,84,yes
us,asm,func_global_asm_8061B5C4,76,no
us,asm,func_global_asm_8061B5C4,76,yes
us,asm,func_global_asm_806BC080,100,yes
us,asm,func_global_asm_80684BB0,488,yes
us,asm,func_global_asm_8061159C,12,yes
@ -879,7 +879,7 @@ us,asm,func_global_asm_8073B5D0,112,yes
us,asm,func_global_asm_8070DB9C,164,no
us,asm,func_global_asm_806F9D8C,1048,no
us,asm,func_global_asm_80685210,180,yes
us,asm,func_global_asm_8061F164,40,no
us,asm,func_global_asm_8061F164,40,yes
us,asm,func_global_asm_806A62B4,32,yes
us,asm,func_global_asm_8069DC10,112,no
us,asm,func_global_asm_806EAE60,268,yes
@ -952,7 +952,7 @@ us,asm,func_global_asm_806A7600,1284,yes
us,asm,func_global_asm_80732064,56,no
us,asm,func_global_asm_80737E90,20,yes
us,asm,func_global_asm_806E8A8C,100,yes
us,asm,func_global_asm_8061B840,12,no
us,asm,func_global_asm_8061B840,12,yes
us,asm,func_global_asm_806C9E40,48,yes
us,asm,func_global_asm_8064F804,72,yes
us,asm,func_global_asm_8070DA74,264,no
@ -998,7 +998,7 @@ us,asm,func_global_asm_8062217C,440,no
us,asm,func_global_asm_80724874,56,yes
us,asm,func_global_asm_80714A58,16,yes
us,asm,func_global_asm_806B3F90,516,yes
us,asm,func_global_asm_80619580,52,no
us,asm,func_global_asm_80619580,52,yes
us,asm,func_global_asm_8060BBE0,192,no
us,asm,func_global_asm_806B91E0,2768,no
us,asm,func_global_asm_807375E0,40,yes
@ -1200,7 +1200,7 @@ us,asm,func_global_asm_8072FA14,688,yes
us,asm,func_global_asm_80658C10,188,yes
us,asm,func_global_asm_80688584,180,yes
us,asm,func_global_asm_807040E0,40,yes
us,asm,func_global_asm_8061CF90,60,no
us,asm,func_global_asm_8061CF90,60,yes
us,asm,func_global_asm_8062B8A4,64,yes
us,asm,func_global_asm_80617238,456,no
us,asm,func_global_asm_806163E8,136,yes
@ -1364,7 +1364,7 @@ us,asm,gameIsInDKTheatreMode,52,yes
us,asm,func_global_asm_8064B7D4,20,yes
us,asm,func_global_asm_806B6DB0,2116,no
us,asm,func_global_asm_806A7518,232,yes
us,asm,func_global_asm_80619540,64,no
us,asm,func_global_asm_80619540,64,yes
us,asm,func_global_asm_80664A38,628,yes
us,asm,func_global_asm_8062EE48,344,no
us,asm,func_global_asm_806CEED8,228,yes
@ -1467,7 +1467,7 @@ us,asm,func_global_asm_8062DAF4,124,yes
us,asm,func_global_asm_806E884C,52,yes
us,asm,func_global_asm_8066E9EC,120,no
us,asm,func_global_asm_8069F904,316,yes
us,asm,func_global_asm_806225C0,20,no
us,asm,func_global_asm_806225C0,20,yes
us,asm,func_global_asm_806EA844,92,yes
us,asm,func_global_asm_80661AB4,208,yes
us,asm,func_global_asm_8061612C,164,yes
@ -1643,7 +1643,7 @@ us,asm,func_global_asm_8063C4C4,532,yes
us,asm,func_global_asm_80678458,216,yes
us,asm,func_global_asm_8070D970,60,yes
us,asm,func_global_asm_80627A00,344,no
us,asm,func_global_asm_8061D9EC,40,no
us,asm,func_global_asm_8061D9EC,40,yes
us,asm,func_global_asm_8066E62C,56,yes
us,asm,func_global_asm_80725DC0,276,yes
us,asm,func_global_asm_8072E22C,132,yes
@ -1730,7 +1730,7 @@ us,asm,func_global_asm_8070C990,88,yes
us,asm,func_global_asm_806C93E4,80,yes
us,asm,func_global_asm_8071D784,456,yes
us,asm,func_global_asm_80648000,620,no
us,asm,func_global_asm_806195B4,28,no
us,asm,func_global_asm_806195B4,24,yes
us,asm,func_global_asm_806EEA5C,156,yes
us,asm,func_global_asm_806F18F4,156,no
us,asm,func_global_asm_8070DCA4,116,yes
@ -2031,7 +2031,7 @@ us,asm,func_global_asm_806998F0,36,yes
us,asm,func_global_asm_80645C04,272,yes
us,asm,func_global_asm_8062754C,352,no
us,asm,func_global_asm_80735958,72,no
us,asm,func_global_asm_8061C2C4,20,no
us,asm,func_global_asm_8061C2C4,20,yes
us,asm,func_global_asm_8073BA60,176,no
us,asm,func_global_asm_8071BC80,388,yes
us,asm,func_global_asm_80664CB0,112,yes
@ -2083,7 +2083,7 @@ us,asm,func_global_asm_806FFB2C,216,yes
us,asm,func_global_asm_806DF670,100,yes
us,asm,func_global_asm_8072E7DC,140,no
us,asm,func_global_asm_80650AD8,120,yes
us,asm,func_global_asm_8061B650,16,no
us,asm,func_global_asm_8061B650,16,yes
us,asm,func_global_asm_80630890,736,no
us,asm,func_global_asm_806C7238,8,yes
us,asm,func_global_asm_80616A1C,128,yes
@ -2146,7 +2146,7 @@ us,asm,func_global_asm_806CF0D0,104,yes
us,asm,func_global_asm_80658CCC,224,yes
us,asm,func_global_asm_80650E20,172,no
us,asm,func_global_asm_8070AF24,312,yes
us,asm,func_global_asm_8061D934,52,no
us,asm,func_global_asm_8061D934,52,yes
us,asm,func_global_asm_806F3760,92,yes
us,asm,func_global_asm_80667110,76,yes
us,asm,func_global_asm_8064FA7C,232,no
@ -2540,7 +2540,7 @@ us,asm,func_global_asm_807407A8,744,no
us,asm,func_global_asm_807180F4,48,yes
us,asm,func_global_asm_806A081C,72,yes
us,asm,func_global_asm_807065F8,940,no
us,asm,func_global_asm_8061CF80,16,no
us,asm,func_global_asm_8061CF80,16,yes
us,asm,func_global_asm_806EACEC,280,yes
us,asm,func_global_asm_80614644,1040,no
us,asm,func_global_asm_806C8220,748,no
@ -3310,7 +3310,7 @@ us,asm,func_global_asm_8071F3C0,132,no
us,asm,func_global_asm_806F0344,128,yes
us,asm,func_global_asm_806D3AE8,32,yes
us,asm,func_global_asm_8060FFF0,84,yes
us,asm,func_global_asm_806261CC,32,no
us,asm,func_global_asm_806261CC,32,yes
us,asm,func_global_asm_806C3A8C,1152,yes
us,asm,func_global_asm_806DED44,780,yes
us,asm,func_global_asm_806B7BB8,188,yes
@ -3446,7 +3446,7 @@ us,asm,func_global_asm_8070FA58,488,yes
us,asm,func_global_asm_806B8B20,188,yes
us,asm,func_global_asm_8069902C,32,yes
us,asm,func_global_asm_8065F964,416,no
us,asm,func_global_asm_8061B4B0,52,no
us,asm,func_global_asm_8061B4B0,52,yes
us,asm,func_global_asm_8062A24C,40,yes
us,asm,func_global_asm_806891D8,120,yes
us,asm,func_global_asm_80677CAC,172,yes
@ -3506,7 +3506,7 @@ us,asm,func_global_asm_8065214C,172,yes
us,asm,func_global_asm_8060128C,72,yes
us,asm,func_global_asm_80721814,2668,no
us,asm,func_global_asm_806B486C,76,yes
us,asm,func_global_asm_806252CC,84,no
us,asm,func_global_asm_806252CC,84,yes
us,asm,func_global_asm_8073A518,376,no
us,asm,func_global_asm_806C71E8,8,yes
us,asm,func_global_asm_8060C724,52,yes

1 version section function length matching
226 us asm func_global_asm_806533C4 284 yes
227 us asm func_global_asm_80724B5C 208 yes
228 us asm areAllKeysTurnedIn 92 yes
229 us asm func_global_asm_8061B610 64 no yes
230 us asm func_global_asm_8064AAC4 88 yes
231 us asm func_global_asm_80724A20 124 yes
232 us asm func_global_asm_80723484 1104 no
340 us asm func_global_asm_8062AD28 1132 no
341 us asm func_global_asm_8070FC40 140 yes
342 us asm func_global_asm_806F0624 128 yes
343 us asm func_global_asm_80627878 16 no yes
344 us asm func_global_asm_806F95C8 64 yes
345 us asm displayImage 3260 no
346 us asm func_global_asm_806D9320 1156 no
375 us asm func_global_asm_8070CC8C 56 yes
376 us asm func_global_asm_8073195C 48 yes
377 us asm func_global_asm_8064409C 640 no
378 us asm func_global_asm_8061DA84 40 no yes
379 us asm func_global_asm_8069D424 1292 no
380 us asm func_global_asm_806016D0 88 yes
381 us asm func_global_asm_8072A920 352 yes
432 us asm func_global_asm_806167EC 100 yes
433 us asm func_global_asm_80717814 284 yes
434 us asm func_global_asm_80735A50 76 yes
435 us asm func_global_asm_80619520 32 no yes
436 us asm func_global_asm_8065D170 60 yes
437 us asm func_global_asm_80712490 40 yes
438 us asm func_global_asm_806DF050 336 yes
445 us asm func_global_asm_8061C2D8 24 yes
446 us asm func_global_asm_80724308 720 no
447 us asm func_global_asm_8060AA04 84 yes
448 us asm func_global_asm_8061B5C4 76 no yes
449 us asm func_global_asm_806BC080 100 yes
450 us asm func_global_asm_80684BB0 488 yes
451 us asm func_global_asm_8061159C 12 yes
879 us asm func_global_asm_8070DB9C 164 no
880 us asm func_global_asm_806F9D8C 1048 no
881 us asm func_global_asm_80685210 180 yes
882 us asm func_global_asm_8061F164 40 no yes
883 us asm func_global_asm_806A62B4 32 yes
884 us asm func_global_asm_8069DC10 112 no
885 us asm func_global_asm_806EAE60 268 yes
952 us asm func_global_asm_80732064 56 no
953 us asm func_global_asm_80737E90 20 yes
954 us asm func_global_asm_806E8A8C 100 yes
955 us asm func_global_asm_8061B840 12 no yes
956 us asm func_global_asm_806C9E40 48 yes
957 us asm func_global_asm_8064F804 72 yes
958 us asm func_global_asm_8070DA74 264 no
998 us asm func_global_asm_80724874 56 yes
999 us asm func_global_asm_80714A58 16 yes
1000 us asm func_global_asm_806B3F90 516 yes
1001 us asm func_global_asm_80619580 52 no yes
1002 us asm func_global_asm_8060BBE0 192 no
1003 us asm func_global_asm_806B91E0 2768 no
1004 us asm func_global_asm_807375E0 40 yes
1200 us asm func_global_asm_80658C10 188 yes
1201 us asm func_global_asm_80688584 180 yes
1202 us asm func_global_asm_807040E0 40 yes
1203 us asm func_global_asm_8061CF90 60 no yes
1204 us asm func_global_asm_8062B8A4 64 yes
1205 us asm func_global_asm_80617238 456 no
1206 us asm func_global_asm_806163E8 136 yes
1364 us asm func_global_asm_8064B7D4 20 yes
1365 us asm func_global_asm_806B6DB0 2116 no
1366 us asm func_global_asm_806A7518 232 yes
1367 us asm func_global_asm_80619540 64 no yes
1368 us asm func_global_asm_80664A38 628 yes
1369 us asm func_global_asm_8062EE48 344 no
1370 us asm func_global_asm_806CEED8 228 yes
1467 us asm func_global_asm_806E884C 52 yes
1468 us asm func_global_asm_8066E9EC 120 no
1469 us asm func_global_asm_8069F904 316 yes
1470 us asm func_global_asm_806225C0 20 no yes
1471 us asm func_global_asm_806EA844 92 yes
1472 us asm func_global_asm_80661AB4 208 yes
1473 us asm func_global_asm_8061612C 164 yes
1643 us asm func_global_asm_80678458 216 yes
1644 us asm func_global_asm_8070D970 60 yes
1645 us asm func_global_asm_80627A00 344 no
1646 us asm func_global_asm_8061D9EC 40 no yes
1647 us asm func_global_asm_8066E62C 56 yes
1648 us asm func_global_asm_80725DC0 276 yes
1649 us asm func_global_asm_8072E22C 132 yes
1730 us asm func_global_asm_806C93E4 80 yes
1731 us asm func_global_asm_8071D784 456 yes
1732 us asm func_global_asm_80648000 620 no
1733 us asm func_global_asm_806195B4 28 24 no yes
1734 us asm func_global_asm_806EEA5C 156 yes
1735 us asm func_global_asm_806F18F4 156 no
1736 us asm func_global_asm_8070DCA4 116 yes
2031 us asm func_global_asm_80645C04 272 yes
2032 us asm func_global_asm_8062754C 352 no
2033 us asm func_global_asm_80735958 72 no
2034 us asm func_global_asm_8061C2C4 20 no yes
2035 us asm func_global_asm_8073BA60 176 no
2036 us asm func_global_asm_8071BC80 388 yes
2037 us asm func_global_asm_80664CB0 112 yes
2083 us asm func_global_asm_806DF670 100 yes
2084 us asm func_global_asm_8072E7DC 140 no
2085 us asm func_global_asm_80650AD8 120 yes
2086 us asm func_global_asm_8061B650 16 no yes
2087 us asm func_global_asm_80630890 736 no
2088 us asm func_global_asm_806C7238 8 yes
2089 us asm func_global_asm_80616A1C 128 yes
2146 us asm func_global_asm_80658CCC 224 yes
2147 us asm func_global_asm_80650E20 172 no
2148 us asm func_global_asm_8070AF24 312 yes
2149 us asm func_global_asm_8061D934 52 no yes
2150 us asm func_global_asm_806F3760 92 yes
2151 us asm func_global_asm_80667110 76 yes
2152 us asm func_global_asm_8064FA7C 232 no
2540 us asm func_global_asm_807180F4 48 yes
2541 us asm func_global_asm_806A081C 72 yes
2542 us asm func_global_asm_807065F8 940 no
2543 us asm func_global_asm_8061CF80 16 no yes
2544 us asm func_global_asm_806EACEC 280 yes
2545 us asm func_global_asm_80614644 1040 no
2546 us asm func_global_asm_806C8220 748 no
3310 us asm func_global_asm_806F0344 128 yes
3311 us asm func_global_asm_806D3AE8 32 yes
3312 us asm func_global_asm_8060FFF0 84 yes
3313 us asm func_global_asm_806261CC 32 no yes
3314 us asm func_global_asm_806C3A8C 1152 yes
3315 us asm func_global_asm_806DED44 780 yes
3316 us asm func_global_asm_806B7BB8 188 yes
3446 us asm func_global_asm_806B8B20 188 yes
3447 us asm func_global_asm_8069902C 32 yes
3448 us asm func_global_asm_8065F964 416 no
3449 us asm func_global_asm_8061B4B0 52 no yes
3450 us asm func_global_asm_8062A24C 40 yes
3451 us asm func_global_asm_806891D8 120 yes
3452 us asm func_global_asm_80677CAC 172 yes
3506 us asm func_global_asm_8060128C 72 yes
3507 us asm func_global_asm_80721814 2668 no
3508 us asm func_global_asm_806B486C 76 yes
3509 us asm func_global_asm_806252CC 84 no yes
3510 us asm func_global_asm_8073A518 376 no
3511 us asm func_global_asm_806C71E8 8 yes
3512 us asm func_global_asm_8060C724 52 yes

View File

@ -226,7 +226,7 @@ us,asm,func_global_asm_806F6204,848,no
us,asm,func_global_asm_806533C4,284,yes
us,asm,func_global_asm_80724B5C,208,yes
us,asm,areAllKeysTurnedIn,92,yes
us,asm,func_global_asm_8061B610,64,no
us,asm,func_global_asm_8061B610,64,yes
us,asm,func_global_asm_8064AAC4,88,yes
us,asm,func_global_asm_80724A20,124,yes
us,asm,func_global_asm_80723484,1104,no
@ -340,7 +340,7 @@ us,asm,func_global_asm_806BE6F0,460,yes
us,asm,func_global_asm_8062AD28,1132,no
us,asm,func_global_asm_8070FC40,140,yes
us,asm,func_global_asm_806F0624,128,yes
us,asm,func_global_asm_80627878,16,no
us,asm,func_global_asm_80627878,16,yes
us,asm,func_global_asm_806F95C8,64,yes
us,asm,displayImage,3260,no
us,asm,func_global_asm_806D9320,1156,no
@ -375,7 +375,7 @@ us,asm,func_global_asm_8066F4AC,928,no
us,asm,func_global_asm_8070CC8C,56,yes
us,asm,func_global_asm_8073195C,48,yes
us,asm,func_global_asm_8064409C,640,no
us,asm,func_global_asm_8061DA84,40,no
us,asm,func_global_asm_8061DA84,40,yes
us,asm,func_global_asm_8069D424,1292,no
us,asm,func_global_asm_806016D0,88,yes
us,asm,func_global_asm_8072A920,352,yes
@ -432,7 +432,7 @@ us,asm,func_global_asm_80678E14,88,yes
us,asm,func_global_asm_806167EC,100,yes
us,asm,func_global_asm_80717814,284,yes
us,asm,func_global_asm_80735A50,76,yes
us,asm,func_global_asm_80619520,32,no
us,asm,func_global_asm_80619520,32,yes
us,asm,func_global_asm_8065D170,60,yes
us,asm,func_global_asm_80712490,40,yes
us,asm,func_global_asm_806DF050,336,yes
@ -445,7 +445,7 @@ us,asm,func_global_asm_80724154,436,yes
us,asm,func_global_asm_8061C2D8,24,yes
us,asm,func_global_asm_80724308,720,no
us,asm,func_global_asm_8060AA04,84,yes
us,asm,func_global_asm_8061B5C4,76,no
us,asm,func_global_asm_8061B5C4,76,yes
us,asm,func_global_asm_806BC080,100,yes
us,asm,func_global_asm_80684BB0,488,yes
us,asm,func_global_asm_8061159C,12,yes
@ -879,7 +879,7 @@ us,asm,func_global_asm_8073B5D0,112,yes
us,asm,func_global_asm_8070DB9C,164,no
us,asm,func_global_asm_806F9D8C,1048,no
us,asm,func_global_asm_80685210,180,yes
us,asm,func_global_asm_8061F164,40,no
us,asm,func_global_asm_8061F164,40,yes
us,asm,func_global_asm_806A62B4,32,yes
us,asm,func_global_asm_8069DC10,112,no
us,asm,func_global_asm_806EAE60,268,yes
@ -952,7 +952,7 @@ us,asm,func_global_asm_806A7600,1284,yes
us,asm,func_global_asm_80732064,56,no
us,asm,func_global_asm_80737E90,20,yes
us,asm,func_global_asm_806E8A8C,100,yes
us,asm,func_global_asm_8061B840,12,no
us,asm,func_global_asm_8061B840,12,yes
us,asm,func_global_asm_806C9E40,48,yes
us,asm,func_global_asm_8064F804,72,yes
us,asm,func_global_asm_8070DA74,264,no
@ -998,7 +998,7 @@ us,asm,func_global_asm_8062217C,440,no
us,asm,func_global_asm_80724874,56,yes
us,asm,func_global_asm_80714A58,16,yes
us,asm,func_global_asm_806B3F90,516,yes
us,asm,func_global_asm_80619580,52,no
us,asm,func_global_asm_80619580,52,yes
us,asm,func_global_asm_8060BBE0,192,no
us,asm,func_global_asm_806B91E0,2768,no
us,asm,func_global_asm_807375E0,40,yes
@ -1200,7 +1200,7 @@ us,asm,func_global_asm_8072FA14,688,yes
us,asm,func_global_asm_80658C10,188,yes
us,asm,func_global_asm_80688584,180,yes
us,asm,func_global_asm_807040E0,40,yes
us,asm,func_global_asm_8061CF90,60,no
us,asm,func_global_asm_8061CF90,60,yes
us,asm,func_global_asm_8062B8A4,64,yes
us,asm,func_global_asm_80617238,456,no
us,asm,func_global_asm_806163E8,136,yes
@ -1364,7 +1364,7 @@ us,asm,gameIsInDKTheatreMode,52,yes
us,asm,func_global_asm_8064B7D4,20,yes
us,asm,func_global_asm_806B6DB0,2116,no
us,asm,func_global_asm_806A7518,232,yes
us,asm,func_global_asm_80619540,64,no
us,asm,func_global_asm_80619540,64,yes
us,asm,func_global_asm_80664A38,628,yes
us,asm,func_global_asm_8062EE48,344,no
us,asm,func_global_asm_806CEED8,228,yes
@ -1467,7 +1467,7 @@ us,asm,func_global_asm_8062DAF4,124,yes
us,asm,func_global_asm_806E884C,52,yes
us,asm,func_global_asm_8066E9EC,120,no
us,asm,func_global_asm_8069F904,316,yes
us,asm,func_global_asm_806225C0,20,no
us,asm,func_global_asm_806225C0,20,yes
us,asm,func_global_asm_806EA844,92,yes
us,asm,func_global_asm_80661AB4,208,yes
us,asm,func_global_asm_8061612C,164,yes
@ -1643,7 +1643,7 @@ us,asm,func_global_asm_8063C4C4,532,yes
us,asm,func_global_asm_80678458,216,yes
us,asm,func_global_asm_8070D970,60,yes
us,asm,func_global_asm_80627A00,344,no
us,asm,func_global_asm_8061D9EC,40,no
us,asm,func_global_asm_8061D9EC,40,yes
us,asm,func_global_asm_8066E62C,56,yes
us,asm,func_global_asm_80725DC0,276,yes
us,asm,func_global_asm_8072E22C,132,yes
@ -1730,7 +1730,7 @@ us,asm,func_global_asm_8070C990,88,yes
us,asm,func_global_asm_806C93E4,80,yes
us,asm,func_global_asm_8071D784,456,yes
us,asm,func_global_asm_80648000,620,no
us,asm,func_global_asm_806195B4,28,no
us,asm,func_global_asm_806195B4,24,yes
us,asm,func_global_asm_806EEA5C,156,yes
us,asm,func_global_asm_806F18F4,156,no
us,asm,func_global_asm_8070DCA4,116,yes
@ -2031,7 +2031,7 @@ us,asm,func_global_asm_806998F0,36,yes
us,asm,func_global_asm_80645C04,272,yes
us,asm,func_global_asm_8062754C,352,no
us,asm,func_global_asm_80735958,72,no
us,asm,func_global_asm_8061C2C4,20,no
us,asm,func_global_asm_8061C2C4,20,yes
us,asm,func_global_asm_8073BA60,176,no
us,asm,func_global_asm_8071BC80,388,yes
us,asm,func_global_asm_80664CB0,112,yes
@ -2083,7 +2083,7 @@ us,asm,func_global_asm_806FFB2C,216,yes
us,asm,func_global_asm_806DF670,100,yes
us,asm,func_global_asm_8072E7DC,140,no
us,asm,func_global_asm_80650AD8,120,yes
us,asm,func_global_asm_8061B650,16,no
us,asm,func_global_asm_8061B650,16,yes
us,asm,func_global_asm_80630890,736,no
us,asm,func_global_asm_806C7238,8,yes
us,asm,func_global_asm_80616A1C,128,yes
@ -2146,7 +2146,7 @@ us,asm,func_global_asm_806CF0D0,104,yes
us,asm,func_global_asm_80658CCC,224,yes
us,asm,func_global_asm_80650E20,172,no
us,asm,func_global_asm_8070AF24,312,yes
us,asm,func_global_asm_8061D934,52,no
us,asm,func_global_asm_8061D934,52,yes
us,asm,func_global_asm_806F3760,92,yes
us,asm,func_global_asm_80667110,76,yes
us,asm,func_global_asm_8064FA7C,232,no
@ -2540,7 +2540,7 @@ us,asm,func_global_asm_807407A8,744,no
us,asm,func_global_asm_807180F4,48,yes
us,asm,func_global_asm_806A081C,72,yes
us,asm,func_global_asm_807065F8,940,no
us,asm,func_global_asm_8061CF80,16,no
us,asm,func_global_asm_8061CF80,16,yes
us,asm,func_global_asm_806EACEC,280,yes
us,asm,func_global_asm_80614644,1040,no
us,asm,func_global_asm_806C8220,748,no
@ -3310,7 +3310,7 @@ us,asm,func_global_asm_8071F3C0,132,no
us,asm,func_global_asm_806F0344,128,yes
us,asm,func_global_asm_806D3AE8,32,yes
us,asm,func_global_asm_8060FFF0,84,yes
us,asm,func_global_asm_806261CC,32,no
us,asm,func_global_asm_806261CC,32,yes
us,asm,func_global_asm_806C3A8C,1152,yes
us,asm,func_global_asm_806DED44,780,yes
us,asm,func_global_asm_806B7BB8,188,yes
@ -3446,7 +3446,7 @@ us,asm,func_global_asm_8070FA58,488,yes
us,asm,func_global_asm_806B8B20,188,yes
us,asm,func_global_asm_8069902C,32,yes
us,asm,func_global_asm_8065F964,416,no
us,asm,func_global_asm_8061B4B0,52,no
us,asm,func_global_asm_8061B4B0,52,yes
us,asm,func_global_asm_8062A24C,40,yes
us,asm,func_global_asm_806891D8,120,yes
us,asm,func_global_asm_80677CAC,172,yes
@ -3506,7 +3506,7 @@ us,asm,func_global_asm_8065214C,172,yes
us,asm,func_global_asm_8060128C,72,yes
us,asm,func_global_asm_80721814,2668,no
us,asm,func_global_asm_806B486C,76,yes
us,asm,func_global_asm_806252CC,84,no
us,asm,func_global_asm_806252CC,84,yes
us,asm,func_global_asm_8073A518,376,no
us,asm,func_global_asm_806C71E8,8,yes
us,asm,func_global_asm_8060C724,52,yes

1 version section function length matching
226 us asm func_global_asm_806533C4 284 yes
227 us asm func_global_asm_80724B5C 208 yes
228 us asm areAllKeysTurnedIn 92 yes
229 us asm func_global_asm_8061B610 64 no yes
230 us asm func_global_asm_8064AAC4 88 yes
231 us asm func_global_asm_80724A20 124 yes
232 us asm func_global_asm_80723484 1104 no
340 us asm func_global_asm_8062AD28 1132 no
341 us asm func_global_asm_8070FC40 140 yes
342 us asm func_global_asm_806F0624 128 yes
343 us asm func_global_asm_80627878 16 no yes
344 us asm func_global_asm_806F95C8 64 yes
345 us asm displayImage 3260 no
346 us asm func_global_asm_806D9320 1156 no
375 us asm func_global_asm_8070CC8C 56 yes
376 us asm func_global_asm_8073195C 48 yes
377 us asm func_global_asm_8064409C 640 no
378 us asm func_global_asm_8061DA84 40 no yes
379 us asm func_global_asm_8069D424 1292 no
380 us asm func_global_asm_806016D0 88 yes
381 us asm func_global_asm_8072A920 352 yes
432 us asm func_global_asm_806167EC 100 yes
433 us asm func_global_asm_80717814 284 yes
434 us asm func_global_asm_80735A50 76 yes
435 us asm func_global_asm_80619520 32 no yes
436 us asm func_global_asm_8065D170 60 yes
437 us asm func_global_asm_80712490 40 yes
438 us asm func_global_asm_806DF050 336 yes
445 us asm func_global_asm_8061C2D8 24 yes
446 us asm func_global_asm_80724308 720 no
447 us asm func_global_asm_8060AA04 84 yes
448 us asm func_global_asm_8061B5C4 76 no yes
449 us asm func_global_asm_806BC080 100 yes
450 us asm func_global_asm_80684BB0 488 yes
451 us asm func_global_asm_8061159C 12 yes
879 us asm func_global_asm_8070DB9C 164 no
880 us asm func_global_asm_806F9D8C 1048 no
881 us asm func_global_asm_80685210 180 yes
882 us asm func_global_asm_8061F164 40 no yes
883 us asm func_global_asm_806A62B4 32 yes
884 us asm func_global_asm_8069DC10 112 no
885 us asm func_global_asm_806EAE60 268 yes
952 us asm func_global_asm_80732064 56 no
953 us asm func_global_asm_80737E90 20 yes
954 us asm func_global_asm_806E8A8C 100 yes
955 us asm func_global_asm_8061B840 12 no yes
956 us asm func_global_asm_806C9E40 48 yes
957 us asm func_global_asm_8064F804 72 yes
958 us asm func_global_asm_8070DA74 264 no
998 us asm func_global_asm_80724874 56 yes
999 us asm func_global_asm_80714A58 16 yes
1000 us asm func_global_asm_806B3F90 516 yes
1001 us asm func_global_asm_80619580 52 no yes
1002 us asm func_global_asm_8060BBE0 192 no
1003 us asm func_global_asm_806B91E0 2768 no
1004 us asm func_global_asm_807375E0 40 yes
1200 us asm func_global_asm_80658C10 188 yes
1201 us asm func_global_asm_80688584 180 yes
1202 us asm func_global_asm_807040E0 40 yes
1203 us asm func_global_asm_8061CF90 60 no yes
1204 us asm func_global_asm_8062B8A4 64 yes
1205 us asm func_global_asm_80617238 456 no
1206 us asm func_global_asm_806163E8 136 yes
1364 us asm func_global_asm_8064B7D4 20 yes
1365 us asm func_global_asm_806B6DB0 2116 no
1366 us asm func_global_asm_806A7518 232 yes
1367 us asm func_global_asm_80619540 64 no yes
1368 us asm func_global_asm_80664A38 628 yes
1369 us asm func_global_asm_8062EE48 344 no
1370 us asm func_global_asm_806CEED8 228 yes
1467 us asm func_global_asm_806E884C 52 yes
1468 us asm func_global_asm_8066E9EC 120 no
1469 us asm func_global_asm_8069F904 316 yes
1470 us asm func_global_asm_806225C0 20 no yes
1471 us asm func_global_asm_806EA844 92 yes
1472 us asm func_global_asm_80661AB4 208 yes
1473 us asm func_global_asm_8061612C 164 yes
1643 us asm func_global_asm_80678458 216 yes
1644 us asm func_global_asm_8070D970 60 yes
1645 us asm func_global_asm_80627A00 344 no
1646 us asm func_global_asm_8061D9EC 40 no yes
1647 us asm func_global_asm_8066E62C 56 yes
1648 us asm func_global_asm_80725DC0 276 yes
1649 us asm func_global_asm_8072E22C 132 yes
1730 us asm func_global_asm_806C93E4 80 yes
1731 us asm func_global_asm_8071D784 456 yes
1732 us asm func_global_asm_80648000 620 no
1733 us asm func_global_asm_806195B4 28 24 no yes
1734 us asm func_global_asm_806EEA5C 156 yes
1735 us asm func_global_asm_806F18F4 156 no
1736 us asm func_global_asm_8070DCA4 116 yes
2031 us asm func_global_asm_80645C04 272 yes
2032 us asm func_global_asm_8062754C 352 no
2033 us asm func_global_asm_80735958 72 no
2034 us asm func_global_asm_8061C2C4 20 no yes
2035 us asm func_global_asm_8073BA60 176 no
2036 us asm func_global_asm_8071BC80 388 yes
2037 us asm func_global_asm_80664CB0 112 yes
2083 us asm func_global_asm_806DF670 100 yes
2084 us asm func_global_asm_8072E7DC 140 no
2085 us asm func_global_asm_80650AD8 120 yes
2086 us asm func_global_asm_8061B650 16 no yes
2087 us asm func_global_asm_80630890 736 no
2088 us asm func_global_asm_806C7238 8 yes
2089 us asm func_global_asm_80616A1C 128 yes
2146 us asm func_global_asm_80658CCC 224 yes
2147 us asm func_global_asm_80650E20 172 no
2148 us asm func_global_asm_8070AF24 312 yes
2149 us asm func_global_asm_8061D934 52 no yes
2150 us asm func_global_asm_806F3760 92 yes
2151 us asm func_global_asm_80667110 76 yes
2152 us asm func_global_asm_8064FA7C 232 no
2540 us asm func_global_asm_807180F4 48 yes
2541 us asm func_global_asm_806A081C 72 yes
2542 us asm func_global_asm_807065F8 940 no
2543 us asm func_global_asm_8061CF80 16 no yes
2544 us asm func_global_asm_806EACEC 280 yes
2545 us asm func_global_asm_80614644 1040 no
2546 us asm func_global_asm_806C8220 748 no
3310 us asm func_global_asm_806F0344 128 yes
3311 us asm func_global_asm_806D3AE8 32 yes
3312 us asm func_global_asm_8060FFF0 84 yes
3313 us asm func_global_asm_806261CC 32 no yes
3314 us asm func_global_asm_806C3A8C 1152 yes
3315 us asm func_global_asm_806DED44 780 yes
3316 us asm func_global_asm_806B7BB8 188 yes
3446 us asm func_global_asm_806B8B20 188 yes
3447 us asm func_global_asm_8069902C 32 yes
3448 us asm func_global_asm_8065F964 416 no
3449 us asm func_global_asm_8061B4B0 52 no yes
3450 us asm func_global_asm_8062A24C 40 yes
3451 us asm func_global_asm_806891D8 120 yes
3452 us asm func_global_asm_80677CAC 172 yes
3506 us asm func_global_asm_8060128C 72 yes
3507 us asm func_global_asm_80721814 2668 no
3508 us asm func_global_asm_806B486C 76 yes
3509 us asm func_global_asm_806252CC 84 no yes
3510 us asm func_global_asm_8073A518 376 no
3511 us asm func_global_asm_806C71E8 8 yes
3512 us asm func_global_asm_8060C724 52 yes

View File

@ -17,7 +17,7 @@
<text x="38.5" y="14">global_asm</text>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="111.5" y="15" fill="#010101" fill-opacity=".3">37.0421%</text>
<text x="110.5" y="14">37.0421%</text>
<text x="111.5" y="15" fill="#010101" fill-opacity=".3">37.1084%</text>
<text x="110.5" y="14">37.1084%</text>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -17,7 +17,7 @@
<text x="66.0" y="14">Donkey Kong 64 (US)</text>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="166.5" y="15" fill="#010101" fill-opacity=".3">39.2005%</text>
<text x="165.5" y="14">39.2005%</text>
<text x="166.5" y="15" fill="#010101" fill-opacity=".3">39.2500%</text>
<text x="165.5" y="14">39.2500%</text>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -1749,10 +1749,42 @@ void func_global_asm_80619500(Actor *arg0) {
deleteActor(arg0);
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_80619520.s")
typedef struct {
u8 unk0[0x35 - 0x0];
u8 unk35;
} A178_80619580;
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_80619540.s")
A178_80619580 *func_global_asm_80619520(Actor *arg0) {
A178_80619580 *a178;
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_80619580.s")
a178 = NULL;
// TODO: Proper enum value
if (arg0->unk58 == 0x134) {
a178 = arg0->unk178;
}
return a178;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_806195B4.s")
void func_global_asm_80619540(Actor *arg0) {
u8 sp1F;
A178_80619580 *a178;
a178 = func_global_asm_80619520(arg0);
func_global_asm_80614F28(&sp1F);
if (a178 != NULL) {
a178->unk35 = sp1F;
}
}
void func_global_asm_80619580(Actor *arg0) {
A178_80619580 *a178;
a178 = func_global_asm_80619520(arg0);
if (a178 != NULL) {
a178->unk35++;
}
}
void func_global_asm_806195B4(Actor *arg0) {
arg0->animation_state->unk88 = (arg0->unkDE >= 0x3DA);
}

View File

@ -1,22 +1,57 @@
#include <ultra64.h>
#include "functions.h"
extern OSTime D_807F5CE0;
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061B4B0.s")
u8 func_global_asm_8061B4B0(void) {
return D_807F5CE0 != 0;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061B4E4.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061B5C4.s")
void func_global_asm_8061B5C4(s16 playerIndex) {
character_change_array[playerIndex].unk2D0 = character_change_array[playerIndex].unk2C4;
character_change_array[playerIndex].unk2E9 = 0x18;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061B610.s")
typedef struct {
Actor *unk0;
u8 unk4[0xF3 - 0x4];
u8 unkF3;
} AAD_8061B610;
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061B650.s")
void func_global_asm_8061B610(Actor *arg0) {
AAD_8061B610 *aaD;
aaD = arg0->additional_actor_data;
arg0->x_position = aaD->unk0->x_position;
arg0->y_position = aaD->unk0->y_position + 170.0f;
arg0->z_position = aaD->unk0->z_position;
aaD->unkF3 = 7;
}
typedef struct {
u8 unk0[0xF3 - 0x0];
u8 unkF3;
} AAD_8061B650;
void func_global_asm_8061B650(Actor *arg0) {
AAD_8061B650 *aaD = arg0->additional_actor_data;
aaD->unkF3 = 9;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061B660.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061B7E0.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061B840.s")
typedef struct {
u8 unk0[0xF7 - 0x0];
u8 unkF7;
} Struct8061B840;
void func_global_asm_8061B840(Struct8061B840 *arg0, s8 arg1) {
arg0->unkF7 = arg1;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061B84C.s")
@ -24,48 +59,54 @@
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061C0FC.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061C2C4.s")
void func_global_asm_8061C2C4(Actor *arg0, s32 arg1) {
s32 temp;
temp = arg0->CaaD->unkAC | arg1;
arg0->CaaD->unkAC = temp;
}
void func_global_asm_8061C2D8(Actor *camera, s32 arg1) {
CameraPaad *temp_v0;
CameraPaad *aaD;
temp_v0 = camera->CaaD;
temp_v0->unkAC &= ~arg1;
aaD = camera->CaaD;
aaD->unkAC &= ~arg1;
}
void func_global_asm_8061C2F0(Actor *camera, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, u8 arg7) {
CameraPaad *temp_v0;
CameraPaad *aaD;
temp_v0 = camera->CaaD;
aaD = camera->CaaD;
if ((is_cutscene_active == 1) && (arg7 != 0)) {
func_global_asm_8061D4E4(camera);
}
if ((is_cutscene_active != 1) || (arg7 != 0)) {
temp_v0->unkAC |= 0x80000000;
aaD->unkAC |= 0x80000000;
}
temp_v0->unk20 = arg1;
temp_v0->unk24 = arg2;
temp_v0->unk28 = arg3;
temp_v0->unk2C = arg4;
temp_v0->unk30 = arg5;
temp_v0->unk34 = arg6;
aaD->unk20 = arg1;
aaD->unk24 = arg2;
aaD->unk28 = arg3;
aaD->unk2C = arg4;
aaD->unk30 = arg5;
aaD->unk34 = arg6;
}
void func_global_asm_8061C39C(Actor *camera) {
CameraPaad *temp_v0;
CameraPaad *aaD;
temp_v0 = camera->CaaD;
character_change_array[temp_v0->unkFB].look_at_eye_x = temp_v0->unk20;
character_change_array[temp_v0->unkFB].look_at_eye_y = temp_v0->unk24;
character_change_array[temp_v0->unkFB].look_at_eye_z = temp_v0->unk28;
character_change_array[temp_v0->unkFB].look_at_at_x = temp_v0->unk2C;
character_change_array[temp_v0->unkFB].look_at_at_y = temp_v0->unk30;
character_change_array[temp_v0->unkFB].look_at_at_z = temp_v0->unk34;
aaD = camera->CaaD;
character_change_array[aaD->unkFB].look_at_eye_x = aaD->unk20;
character_change_array[aaD->unkFB].look_at_eye_y = aaD->unk24;
character_change_array[aaD->unkFB].look_at_eye_z = aaD->unk28;
character_change_array[aaD->unkFB].look_at_at_x = aaD->unk2C;
character_change_array[aaD->unkFB].look_at_at_y = aaD->unk30;
character_change_array[aaD->unkFB].look_at_at_z = aaD->unk34;
}
void func_global_asm_8061C458(Actor *camera, s32 arg1) {
if (camera->CaaD);
camera->CaaD->unk48 = arg1;
CameraPaad *aaD;
aaD = camera->CaaD;
aaD->unk48 = arg1;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061C464.s")
@ -104,7 +145,7 @@ void func_global_asm_8061C600(Actor *arg0, Actor *arg1, u8 arg2, s16 arg3, s16 a
typedef struct CutsceneBank_unk0 {
u8 pad0[4];
void* unk4;
void *unk4;
} CutsceneBank_unk0;
typedef struct CutsceneBank_FuncBank {
@ -119,25 +160,24 @@ typedef struct CutsceneBank_FuncBank {
typedef struct CutsceneBank_CamBank {
s16 point_count;
s16 unk2;
s16 * point_array;
s16 * length_array;
s16 *point_array;
s16 *length_array;
} CutsceneBank_CamBank;
typedef struct CutsceneBank {
CutsceneBank_unk0 unk0[24];
s16 lock_count;
u8 padC2[2];
void * lock_regions;
u8 * lock_chunks;
void *lock_regions;
u8 *lock_chunks;
s16 cutscene_count;
u8 padCE[2];
CutsceneBank_CamBank * camera_bank;
CutsceneBank_CamBank *camera_bank;
u8 unkD4[4];
CutsceneBank_FuncBank * function_bank;
CutsceneBank_FuncBank *function_bank;
f32 unkDC;
} CutsceneBank;
void func_global_asm_8061D898(void);
void func_global_asm_80622B24(Actor *, f32 *, f32 *, f32 *, f32 *, f32 *, f32 *, void *); /* extern */
extern Actor *D_807F5CE8;
extern s16 D_807F5CEC;
@ -237,8 +277,6 @@ void func_global_asm_8061CAD8(void) {
D_807F5CF4 &= 0xFFFD;
}
extern u16 D_807F5CF4;
void func_global_asm_8061CB08(void) {
if (D_807F5CF4 & 0x40) {
D_807F5CF4 &= 0xFFBF;
@ -247,56 +285,12 @@ void func_global_asm_8061CB08(void) {
D_807F5CF4 |= 2;
}
extern u16 D_807F5CF4;
u8 func_global_asm_8061CB38(void) {
return (D_807F5CF4 & 0x40) != 0;
}
u8 func_global_asm_8061CB50(void) {
return (is_cutscene_active == 1) || (D_global_asm_8076A0B1 & 0x10);
}
extern u16 D_807F5CF4;
u8 func_global_asm_8061CB80(void) {
return (D_807F5CF4 & 4) != 0;
}
extern s16 D_global_asm_807476F8;
u8 func_global_asm_8061CB98(u8 arg0) {
return (is_cutscene_active == 1) && (arg0 == D_global_asm_807476F8);
}
void func_global_asm_8061D898(void);
extern s16 D_807F5CF0;
extern s16 D_global_asm_807476F4;
extern s16 D_global_asm_807476F8;
void func_global_asm_8061CBCC(void) {
D_global_asm_807476F4 = D_global_asm_807476F8;
D_807F5CF0 = 0;
func_global_asm_8061D898();
}
extern Actor * D_global_asm_807F5D10;
u8 func_global_asm_8061CC00(void) {
if (D_global_asm_807F5D10->CaaD);
return (D_global_asm_807F5D10->CaaD->unkF3 == 3) || (D_global_asm_807F5D10->CaaD->unkF3 == 0xB);
}
extern u8 D_global_asm_807476EC;
void func_global_asm_8061CC30(void) {
D_global_asm_807476EC = 1;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/playCutscene.s")
extern CutsceneBank D_807F5B10[2];
extern OSTime D_807F5CE0;
extern Actor *D_807F5CE8;
extern s16 D_807F5CEC;
extern s16 D_807F5CEE;
@ -317,6 +311,39 @@ extern u8 D_global_asm_8076A0B1;
extern s8 D_global_asm_8076A0B3;
extern u8 D_global_asm_80770DC9;
u8 func_global_asm_8061CB38(void) {
return (D_807F5CF4 & 0x40) != 0;
}
u8 func_global_asm_8061CB50(void) {
return (is_cutscene_active == 1) || (D_global_asm_8076A0B1 & 0x10);
}
u8 func_global_asm_8061CB80(void) {
return (D_807F5CF4 & 4) != 0;
}
u8 func_global_asm_8061CB98(u8 arg0) {
return (is_cutscene_active == 1) && (arg0 == D_global_asm_807476F8);
}
void func_global_asm_8061CBCC(void) {
D_global_asm_807476F4 = D_global_asm_807476F8;
D_807F5CF0 = 0;
func_global_asm_8061D898();
}
u8 func_global_asm_8061CC00(void) {
if (D_global_asm_807F5D10->CaaD);
return (D_global_asm_807F5D10->CaaD->unkF3 == 3) || (D_global_asm_807F5D10->CaaD->unkF3 == 0xB);
}
void func_global_asm_8061CC30(void) {
D_global_asm_807476EC = 1;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/playCutscene.s")
/*
s32 playCutscene(Actor *arg0, s16 arg1, s32 arg2) {
u16 sp26;
@ -392,9 +419,27 @@ s32 playCutscene(Actor *arg0, s16 arg1, s32 arg2) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061CF24.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061CF80.s")
extern s16 D_807F5CEE;
extern Actor *D_807F5CE8;
extern s8 D_807F5CFA;
extern s16 D_807F5CF0;
extern s16 D_global_asm_807476F4;
extern f32 D_global_asm_807576DC;
extern f32 loading_zone_transition_speed;
extern s8 loading_zone_transition_type;
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061CF90.s")
void func_global_asm_8061CF80(s16 arg0) {
D_807F5CEE = arg0;
}
void func_global_asm_8061CF90(Actor *arg0, s16 arg1) {
if (arg0 != NULL) {
D_807F5CE8 = arg0;
} else {
D_807F5CE8 = character_change_array->player_pointer;
}
D_807F5CFA = arg1;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061CFCC.s")
@ -408,15 +453,24 @@ s32 playCutscene(Actor *arg0, s16 arg1, s32 arg2) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061D898.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061D934.s")
void func_global_asm_8061D934(u8 arg0) {
D_global_asm_807476F4 = arg0;
D_807F5CF0 = 0;
func_global_asm_8061D898();
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061D968.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061D9EC.s")
void func_global_asm_8061D9EC(s32 arg0, s32 arg1, s32 arg2) {
loading_zone_transition_type = 0;
loading_zone_transition_speed = D_global_asm_807576DC;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061DA14.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061DA84.s")
void func_global_asm_8061DA84(s32 arg0, s32 arg1, s32 arg2) {
func_global_asm_8061CB08();
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061DAAC.s")
@ -434,7 +488,18 @@ s32 playCutscene(Actor *arg0, s16 arg1, s32 arg2) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061F0B0.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061F164.s")
typedef struct {
u8 unk0[0xE8 - 0x0];
s16 unkE8;
s16 unkEA;
} AAD_8061F164;
void func_global_asm_8061F164(AAD_8061F164 *aaD, s16 arg1) {
if (arg1 >= 0xB) {
aaD->unkE8 = arg1;
aaD->unkEA = aaD->unkE8;
}
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061F18C.s")
@ -442,8 +507,30 @@ s32 playCutscene(Actor *arg0, s16 arg1, s32 arg2) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061F4B0.s")
// regalloc, close, doable
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061F510.s")
/*
typedef struct {
s32 unk0;
s32 unk4;
s32 unk8;
s32 unkC;
s32 unk10;
s32 unk14;
s8 unk18;
s8 unk19;
s8 unk1A;
s8 unk1B;
} Struct807F5BD4;
extern Struct807F5BD4 *D_807F5BD4;
void func_global_asm_8061F510(u8 arg0, s8 arg1) {
D_807F5BD4[arg0].unk18 = arg1;
}
*/
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8061F53C.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_80620628.s")
@ -466,7 +553,20 @@ s32 playCutscene(Actor *arg0, s16 arg1, s32 arg2) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_806224CC.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_806225C0.s")
typedef struct {
u8 unk0[0x44 - 0x0];
s32 unk44;
u8 unk48[0xF3 - 0x48];
u8 unkF3;
} AAD_806225C0;
void func_global_asm_806225C0(Actor *arg0) {
AAD_806225C0 *aaD;
aaD = arg0->additional_actor_data;
aaD->unk44 = 0;
aaD->unkF3 = 1;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_806225D4.s")
@ -482,7 +582,20 @@ s32 playCutscene(Actor *arg0, s16 arg1, s32 arg2) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_80624CA4.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_806252CC.s")
f32 func_global_asm_806252CC(f32 arg0, f32 arg1, f32 arg2) {
if (arg0 < arg1) {
arg0 = arg0 + arg2;
if (arg1 < arg0) {
arg0 = arg1;
}
} else {
arg0 = arg0 - arg2;
if (arg0 < arg1) {
arg0 = arg1;
}
}
return arg0;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_80625320.s")
@ -500,14 +613,29 @@ s32 playCutscene(Actor *arg0, s16 arg1, s32 arg2) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_80626110.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_806261CC.s")
typedef struct {
s32 unk0;
s32 unk4;
u8 unk8[0xAC - 0x8];
s32 unkAC;
} AAD_806261CC;
void func_global_asm_806261CC(Actor *arg0) {
AAD_806261CC *aaD;
aaD = arg0->additional_actor_data;
aaD->unk4 = 0;
aaD->unkAC &= 0xFFFEFFFB;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_806261EC.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_80626264.s")
// doable, weird negative offsets
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_80626478.s")
// memcpy concat, doable
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8062649C.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_806264DC.s")
@ -528,7 +656,18 @@ s32 playCutscene(Actor *arg0, s16 arg1, s32 arg2) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_8062773C.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_80627878.s")
typedef struct {
u8 unk0[0xB2 - 0x0];
s16 unkB2;
s16 unkB4;
} AAD_80627878;
void func_global_asm_80627878(Actor *arg0) {
AAD_80627878 *aaD;
aaD = arg0->additional_actor_data;
aaD->unkB4 = aaD->unkB2;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_201B0/func_global_asm_80627888.s")