Game-Decompilation/dk64
1
0
Fork 0
mirror of https://gitlab.com/dk64_decomp/dk64.git synced 2024-11-22 22:51:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More labels

Browse Source
This commit is contained in:
Donkey Kong 2024-04-17 02:14:30 +09:30
parent 9306335d5a
commit 3abdc44639
53 changed files with 267 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -64,4 +64,5 @@ diff_settings.py
ctx.c
!tools/build
test.csv
refcount.csv
*.csv#

36
generate_function_reference_counts.py Executable file
View File

@ -0,0 +1,36 @@
#!/usr/bin/env python3
import os
import csv
def count_references(function_names):
function_references = {name: 0 for name in function_names}
for root, dirs, files in os.walk('./src'):
for file in files:
if file.endswith('.c'):
file_path = os.path.join(root, file)
with open(file_path, 'r') as f:
content = f.read()
for name in function_names:
function_references[name] += content.count(name)
for root, dirs, files in os.walk('./asm/nonmatchings'):
for file in files:
if file.endswith('.s'):
file_path = os.path.join(root, file)
with open(file_path, 'r') as f:
content = f.read()
for name in function_names:
function_references[name] += content.count(name)
return function_references
if __name__ == "__main__":
with open("./progress/progress.total.csv", 'r') as f:
reader = csv.reader(f)
header = next(reader)
function_names = [row[2] for row in reader]
function_references = count_references(function_names)
for reference in function_references:
print(f'{reference},{function_references.get(reference)}')

6
include/functions.h
View File

@ -37,7 +37,7 @@ f32 func_global_asm_80611BB4(f32, f32);
void func_global_asm_806DF5A0(s16 *arg0, s16 arg1, s16 arg2, s16 arg3);
Actor *func_global_asm_807270C0(s16 spawn_trigger, u16 arg1);
Actor *getSpawnerTiedActor(s16 spawn_trigger, u16 arg1);
Actor *func_global_asm_807271F4(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6);
Gfx *func_global_asm_8068C5A8(Gfx *, u16, s32, s32, s32, s32, s32, s32, f32, f32, s32, f32);
@ -348,7 +348,7 @@ void func_global_asm_80714A68(s16 arg0, s16 arg1, s16 arg2, s16 arg3);
Struct80717D84 *func_global_asm_80714B84(void *arg0, f32 arg1, s32 arg2, s32 arg3, u8 arg4);
Struct80717D84 *func_global_asm_80714C08(void *arg0, f32 arg1, Actor *arg2, s32 arg3, u8 arg4);
Struct80717D84 *func_global_asm_80714CC0(void* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4);
Struct80717D84 *drawSpriteAtPosition(void* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4);
void func_global_asm_80715E38(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5);
void func_global_asm_807180F4(s32 arg0, s32 arg1);
@ -2203,7 +2203,7 @@ typedef struct {
void func_global_asm_8060ED6C(Struct131B0_2 *arg0, Struct131B0_1 *arg1, s32 arg2, s32 arg3, s32 arg4);
void func_global_asm_8060F928(Struct131B0_2*, Struct131B0_1*);
void func_dk64_boot_800031E0(char *str, char *format, ...);
int sprintf(char *str, const char *format, ...);
Gfx *func_global_asm_806FC530(Gfx*, s16, s16, s16, void *, s32);
int func_global_asm_8071ABDC(); // TODO: Datatype

2
progress/progress.dk64_boot.csv
View File

@ -56,7 +56,6 @@ us,boot,osPfsIsPlug,416,yes
us,boot,__osCleanupThread,16,yes
us,boot,func_dk64_boot_800057DC,60,no
us,boot,func_dk64_boot_80000CD4,184,yes
us,boot,func_dk64_boot_800031E0,44,no
us,boot,func_dk64_boot_80000D8C,188,yes
us,boot,func_dk64_boot_800074E0,200,yes
us,boot,func_dk64_boot_800057B0,44,no
@ -209,6 +208,7 @@ us,boot,viMgrMain,400,no
us,boot,func_dk64_boot_80000980,80,yes
us,boot,osCreateViManager,384,no
us,boot,guRotateF,404,no
us,boot,sprintf,44,no
us,boot,func_dk64_boot_80000A30,112,no
us,boot,guMtxCatF,360,yes
us,boot,osYieldThread,76,yes

1 version section function length matching
56 us boot __osCleanupThread 16 yes
57 us boot func_dk64_boot_800057DC 60 no
58 us boot func_dk64_boot_80000CD4 184 yes
us boot func_dk64_boot_800031E0 44 no
59 us boot func_dk64_boot_80000D8C 188 yes
60 us boot func_dk64_boot_800074E0 200 yes
61 us boot func_dk64_boot_800057B0 44 no
208 us boot func_dk64_boot_80000980 80 yes
209 us boot osCreateViManager 384 no
210 us boot guRotateF 404 no
211 us boot sprintf 44 no
212 us boot func_dk64_boot_80000A30 112 no
213 us boot guMtxCatF 360 yes
214 us boot osYieldThread 76 yes

4
progress/progress.global_asm.csv
View File

@ -970,6 +970,7 @@ us,asm,func_global_asm_806505F0,148,yes
us,asm,func_global_asm_806582F8,532,no
us,asm,func_global_asm_80713EB0,432,no
us,asm,func_global_asm_80690094,252,yes
us,asm,drawSpriteAtPosition,72,yes
us,asm,func_global_asm_8066FE08,1856,no
us,asm,func_global_asm_806F1B58,56,yes
us,asm,func_global_asm_806EE74C,108,yes
@ -1225,6 +1226,7 @@ us,asm,func_global_asm_8073CF00,176,no
us,asm,func_global_asm_8071321C,84,yes
us,asm,func_global_asm_806348B4,84,yes
us,asm,func_global_asm_80714708,112,yes
us,asm,getSpawnerTiedActor,212,yes
us,asm,func_global_asm_8070CA2C,68,yes
us,asm,func_global_asm_806871DC,548,yes
us,asm,func_global_asm_806D37CC,224,yes
@ -1912,7 +1914,6 @@ us,asm,func_global_asm_8066A64C,272,no
us,asm,func_global_asm_80636AE8,104,no
us,asm,func_global_asm_80662AB4,208,yes
us,asm,func_global_asm_806D3530,216,yes
us,asm,func_global_asm_80714CC0,72,yes
us,asm,func_global_asm_806886E0,608,no
us,asm,func_global_asm_806D59E4,352,yes
us,asm,func_global_asm_806CFECC,40,yes
@ -2493,7 +2494,6 @@ us,asm,func_global_asm_8064EC04,92,yes
us,asm,func_global_asm_80673B78,188,no
us,asm,func_global_asm_80733D8C,6296,no
us,asm,func_global_asm_807149C8,52,yes
us,asm,func_global_asm_807270C0,212,yes
us,asm,func_global_asm_806EA200,108,yes
us,asm,func_global_asm_806D45A4,436,yes
us,asm,func_global_asm_8073B560,112,yes

1 version section function length matching
970 us asm func_global_asm_806582F8 532 no
971 us asm func_global_asm_80713EB0 432 no
972 us asm func_global_asm_80690094 252 yes
973 us asm drawSpriteAtPosition 72 yes
974 us asm func_global_asm_8066FE08 1856 no
975 us asm func_global_asm_806F1B58 56 yes
976 us asm func_global_asm_806EE74C 108 yes
1226 us asm func_global_asm_8071321C 84 yes
1227 us asm func_global_asm_806348B4 84 yes
1228 us asm func_global_asm_80714708 112 yes
1229 us asm getSpawnerTiedActor 212 yes
1230 us asm func_global_asm_8070CA2C 68 yes
1231 us asm func_global_asm_806871DC 548 yes
1232 us asm func_global_asm_806D37CC 224 yes
1914 us asm func_global_asm_80636AE8 104 no
1915 us asm func_global_asm_80662AB4 208 yes
1916 us asm func_global_asm_806D3530 216 yes
us asm func_global_asm_80714CC0 72 yes
1917 us asm func_global_asm_806886E0 608 no
1918 us asm func_global_asm_806D59E4 352 yes
1919 us asm func_global_asm_806CFECC 40 yes
2494 us asm func_global_asm_80673B78 188 no
2495 us asm func_global_asm_80733D8C 6296 no
2496 us asm func_global_asm_807149C8 52 yes
us asm func_global_asm_807270C0 212 yes
2497 us asm func_global_asm_806EA200 108 yes
2498 us asm func_global_asm_806D45A4 436 yes
2499 us asm func_global_asm_8073B560 112 yes

6
progress/progress.total.csv
View File

@ -970,6 +970,7 @@ us,asm,func_global_asm_806505F0,148,yes
us,asm,func_global_asm_806582F8,532,no
us,asm,func_global_asm_80713EB0,432,no
us,asm,func_global_asm_80690094,252,yes
us,asm,drawSpriteAtPosition,72,yes
us,asm,func_global_asm_8066FE08,1856,no
us,asm,func_global_asm_806F1B58,56,yes
us,asm,func_global_asm_806EE74C,108,yes
@ -1225,6 +1226,7 @@ us,asm,func_global_asm_8073CF00,176,no
us,asm,func_global_asm_8071321C,84,yes
us,asm,func_global_asm_806348B4,84,yes
us,asm,func_global_asm_80714708,112,yes
us,asm,getSpawnerTiedActor,212,yes
us,asm,func_global_asm_8070CA2C,68,yes
us,asm,func_global_asm_806871DC,548,yes
us,asm,func_global_asm_806D37CC,224,yes
@ -1912,7 +1914,6 @@ us,asm,func_global_asm_8066A64C,272,no
us,asm,func_global_asm_80636AE8,104,no
us,asm,func_global_asm_80662AB4,208,yes
us,asm,func_global_asm_806D3530,216,yes
us,asm,func_global_asm_80714CC0,72,yes
us,asm,func_global_asm_806886E0,608,no
us,asm,func_global_asm_806D59E4,352,yes
us,asm,func_global_asm_806CFECC,40,yes
@ -2493,7 +2494,6 @@ us,asm,func_global_asm_8064EC04,92,yes
us,asm,func_global_asm_80673B78,188,no
us,asm,func_global_asm_80733D8C,6296,no
us,asm,func_global_asm_807149C8,52,yes
us,asm,func_global_asm_807270C0,212,yes
us,asm,func_global_asm_806EA200,108,yes
us,asm,func_global_asm_806D45A4,436,yes
us,asm,func_global_asm_8073B560,112,yes
@ -4017,7 +4017,6 @@ us,boot,osPfsIsPlug,416,yes
us,boot,__osCleanupThread,16,yes
us,boot,func_dk64_boot_800057DC,60,no
us,boot,func_dk64_boot_80000CD4,184,yes
us,boot,func_dk64_boot_800031E0,44,no
us,boot,func_dk64_boot_80000D8C,188,yes
us,boot,func_dk64_boot_800074E0,200,yes
us,boot,func_dk64_boot_800057B0,44,no
@ -4170,6 +4169,7 @@ us,boot,viMgrMain,400,no
us,boot,func_dk64_boot_80000980,80,yes
us,boot,osCreateViManager,384,no
us,boot,guRotateF,404,no
us,boot,sprintf,44,no
us,boot,func_dk64_boot_80000A30,112,no
us,boot,guMtxCatF,360,yes
us,boot,osYieldThread,76,yes

1 version section function length matching
970 us asm func_global_asm_806582F8 532 no
971 us asm func_global_asm_80713EB0 432 no
972 us asm func_global_asm_80690094 252 yes
973 us asm drawSpriteAtPosition 72 yes
974 us asm func_global_asm_8066FE08 1856 no
975 us asm func_global_asm_806F1B58 56 yes
976 us asm func_global_asm_806EE74C 108 yes
1226 us asm func_global_asm_8071321C 84 yes
1227 us asm func_global_asm_806348B4 84 yes
1228 us asm func_global_asm_80714708 112 yes
1229 us asm getSpawnerTiedActor 212 yes
1230 us asm func_global_asm_8070CA2C 68 yes
1231 us asm func_global_asm_806871DC 548 yes
1232 us asm func_global_asm_806D37CC 224 yes
1914 us asm func_global_asm_80636AE8 104 no
1915 us asm func_global_asm_80662AB4 208 yes
1916 us asm func_global_asm_806D3530 216 yes
us asm func_global_asm_80714CC0 72 yes
1917 us asm func_global_asm_806886E0 608 no
1918 us asm func_global_asm_806D59E4 352 yes
1919 us asm func_global_asm_806CFECC 40 yes
2494 us asm func_global_asm_80673B78 188 no
2495 us asm func_global_asm_80733D8C 6296 no
2496 us asm func_global_asm_807149C8 52 yes
us asm func_global_asm_807270C0 212 yes
2497 us asm func_global_asm_806EA200 108 yes
2498 us asm func_global_asm_806D45A4 436 yes
2499 us asm func_global_asm_8073B560 112 yes
4017 us boot __osCleanupThread 16 yes
4018 us boot func_dk64_boot_800057DC 60 no
4019 us boot func_dk64_boot_80000CD4 184 yes
us boot func_dk64_boot_800031E0 44 no
4020 us boot func_dk64_boot_80000D8C 188 yes
4021 us boot func_dk64_boot_800074E0 200 yes
4022 us boot func_dk64_boot_800057B0 44 no
4169 us boot func_dk64_boot_80000980 80 yes
4170 us boot osCreateViManager 384 no
4171 us boot guRotateF 404 no
4172 us boot sprintf 44 no
4173 us boot func_dk64_boot_80000A30 112 no
4174 us boot guMtxCatF 360 yes
4175 us boot osYieldThread 76 yes

66
src/arcade/code_0.c
View File

@ -3430,44 +3430,44 @@ void func_arcade_8003159C(Gfx **arg0) {
if (D_arcade_8004C724 == 3) {
func_arcade_800244E4(0x00, 0xff, 0xff, 0xff);
func_arcade_80024508(0x78, 0x3b);
func_dk64_boot_800031E0(sp50, "NAME %.3s", &D_arcade_8004A774);
sprintf(sp50, "NAME %.3s", &D_arcade_8004A774);
func_arcade_8002451C(&spA0, sp50);
func_arcade_80024508(0xA0, 0x41);
func_dk64_boot_800031E0(sp50, "---");
sprintf(sp50, "---");
func_arcade_8002451C(&spA0, sp50);
if (D_arcade_8004C6DC < 1800) {
func_arcade_80024508(0x60, 0x7b);
func_dk64_boot_800031E0(sp50, "REGI TIME <%02d>", 30 - D_arcade_8004C6DC/60);
sprintf(sp50, "REGI TIME <%02d>", 30 - D_arcade_8004C6DC/60);
} else {//L800316A0
func_arcade_80024508(0x40, 0x7b);
func_dk64_boot_800031E0(sp50, "YOUR NAME WAS");
sprintf(sp50, "YOUR NAME WAS");
func_arcade_8002451C(&spA0, sp50);
func_arcade_80024508(0xb0, 0x7b);
func_dk64_boot_800031E0(sp50, "REGISTERED.");
sprintf(sp50, "REGISTERED.");
}//L800316E8
func_arcade_8002451C(&spA0, sp50);
func_arcade_800244E4(0xff, 0x00, 0x00, 0xff);
func_arcade_80024508(0x58, 0x2b);
func_dk64_boot_800031E0(sp50, "NAME REGISTRATION");
sprintf(sp50, "NAME REGISTRATION");
func_arcade_8002451C(&spA0, sp50);
func_arcade_800244E4(0x00, 0xff, 0x00, 0xff);
func_arcade_80024508(0x58, 0x4b);
func_dk64_boot_800031E0(sp50, "A B C D E F G H I J");
sprintf(sp50, "A B C D E F G H I J");
func_arcade_8002451C(&spA0, sp50);
func_arcade_80024508(0x58, 0x5b);
func_dk64_boot_800031E0(sp50, "K L M N O P Q R S T");
sprintf(sp50, "K L M N O P Q R S T");
func_arcade_8002451C(&spA0, sp50);
func_arcade_80024508(0x58, 0x6b);
func_dk64_boot_800031E0(sp50, "U V W X Y Z . -");
sprintf(sp50, "U V W X Y Z . -");
func_arcade_8002451C(&spA0, sp50);
func_arcade_80024508(0xd4, 0x6b);
func_dk64_boot_800031E0(sp50, "ba");
sprintf(sp50, "ba");
func_arcade_8002451C(&spA0, sp50);
}//L800317E0
@ -3480,16 +3480,16 @@ void func_arcade_8003159C(Gfx **arg0) {
&& D_arcade_8004C6DC & 0x20
&& D_arcade_8004C724 == 3
) {
func_dk64_boot_800031E0(sp50, "%.3s", &D_arcade_8004A82C[i]);
sprintf(sp50, "%.3s", &D_arcade_8004A82C[i]);
} else {//L80031888
func_dk64_boot_800031E0(sp50, "%.3s %06d %.3s", D_arcade_8004A82C[i], arcade_saved_high_scores[i], arcade_saved_high_score_initials[i]);
sprintf(sp50, "%.3s %06d %.3s", D_arcade_8004A82C[i], arcade_saved_high_scores[i], arcade_saved_high_score_initials[i]);
}//L800318B8
func_arcade_8002451C(&spA0, sp50);
}
func_arcade_800244E4(0x00, 0xff, 0x00, 0xff);
func_arcade_80024508(0xb8, 0xdb);
func_dk64_boot_800031E0(sp50, "CREDIT 00");
sprintf(sp50, "CREDIT 00");
func_arcade_8002451C(&spA0, sp50);
*arg0 = spA0;
@ -3534,22 +3534,22 @@ void func_arcade_800319D4(Gfx **arg0) {
func_arcade_800244E4(0xff, 0, 00, 0xff);
if ((D_arcade_8004C6D8 & 0x10) || !D_arcade_8004C724) {
func_arcade_80024508(0x48, 0x13);
func_dk64_boot_800031E0(sp40, "1UP");
sprintf(sp40, "1UP");
func_arcade_8002451C(&sp90, sp40);
}//L80031B78
func_arcade_80024508(0x78, 0x13);
func_dk64_boot_800031E0(sp40, "HIGH SCORE");
sprintf(sp40, "HIGH SCORE");
func_arcade_8002451C(&sp90, sp40);
func_arcade_800244E4(0, 0, 0xff, 0xff);
func_arcade_80024508(0xd8, 0x1b);
func_dk64_boot_800031E0(sp40, "L=%02d", D_arcade_8004A76C);
sprintf(sp40, "L=%02d", D_arcade_8004A76C);
func_arcade_8002451C(&sp90, sp40);
func_arcade_800244E4(0xff, 0xff, 0xff, 0xff);
func_arcade_80024508(0x38, 0x1b);
func_dk64_boot_800031E0(sp40, "%06d %06d", arcade_current_score, D_arcade_8004A760);
sprintf(sp40, "%06d %06d", arcade_current_score, D_arcade_8004A760);
func_arcade_8002451C(&sp90, sp40);
if (D_arcade_8004C724 == 5 || D_arcade_8004C724 == 4) {//L80031C50
@ -3562,7 +3562,7 @@ void func_arcade_800319D4(Gfx **arg0) {
func_arcade_800244E4(0, 0xff, 0xff, 0xff);
} //L80031CC4
func_arcade_80024508(0x78, 0xa3);
func_dk64_boot_800031E0(sp40, "GAME OVER");
sprintf(sp40, "GAME OVER");
func_arcade_8002451C(&sp90, sp40);
}//L80031CF4
if (D_arcade_8004C724 == 4) {
@ -3575,17 +3575,17 @@ void func_arcade_800319D4(Gfx **arg0) {
}//L80031D64
func_arcade_80031948(0);
func_arcade_80024508(0x88, 0x8b);
func_dk64_boot_800031E0(sp40, "RETURN");
sprintf(sp40, "RETURN");
func_arcade_8002451C(&sp90, sp40);
func_arcade_80031948(1);
func_arcade_80024508(0x68, 0x9b);
func_dk64_boot_800031E0(sp40, "DELETE HISCORE");
sprintf(sp40, "DELETE HISCORE");
func_arcade_8002451C(&sp90, sp40);
func_arcade_80031948(2);
func_arcade_80024508(0x68, 0xab);
func_dk64_boot_800031E0(sp40, "EXIT DK ARCADE");
sprintf(sp40, "EXIT DK ARCADE");
func_arcade_8002451C(&sp90, sp40);
}//L80031DF8
if (arcade_background_visual == 2) {
@ -3609,7 +3609,7 @@ void func_arcade_800319D4(Gfx **arg0) {
}//L80031EE4
func_arcade_80024508(0xe0, 0x30);
score = MAX(D_arcade_8004C71E, 0);
func_dk64_boot_800031E0(sp40, "%02d00", score, score);
sprintf(sp40, "%02d00", score, score);
func_arcade_8002451C(&sp90, sp40);
}//L80031F30
@ -3617,25 +3617,25 @@ void func_arcade_800319D4(Gfx **arg0) {
sp3B = (D_arcade_8004C723 & 3) + 1;
func_arcade_800244E4(0xff, 0xff, 0xff, 0xff);
func_arcade_80024508(0x48, 0xd7);
func_dk64_boot_800031E0(sp40, "HOW HIGH CAN YOU GET ?");
sprintf(sp40, "HOW HIGH CAN YOU GET ?");
func_arcade_8002451C(&sp90, sp40);
func_arcade_80024508(0x58, 0xc9);
func_dk64_boot_800031E0(sp40, "@%%m");
sprintf(sp40, "@%%m");
func_arcade_8002451C(&sp90, sp40);
//sp34 = sp3B;
if (sp3B >= 2) {
func_arcade_80024508(0x58, 0xad);
func_dk64_boot_800031E0(sp40, "%%)m");
sprintf(sp40, "%%)m");
func_arcade_8002451C(&sp90, sp40);
}
if (sp3B >= 3) {
func_arcade_80024508(0x58, 0x91);
func_dk64_boot_800031E0(sp40, "&%%m");
sprintf(sp40, "&%%m");
func_arcade_8002451C(&sp90, sp40);
}
if (sp3B >= 4) {
func_arcade_80024508(0x50, 0x75);
func_dk64_boot_800031E0(sp40, "!))m");
sprintf(sp40, "!))m");
func_arcade_8002451C(&sp90, sp40);
}
}//L80032054
@ -3646,25 +3646,25 @@ void func_arcade_800319D4(Gfx **arg0) {
if (!(D_arcade_8004C6DC & 0x200)) {
func_arcade_800244E4(0, 0xff, 0xff, 0xff);
func_arcade_80024508(0x70, 0x33);
func_dk64_boot_800031E0(sp40, "INSERT COIN");
sprintf(sp40, "INSERT COIN");
func_arcade_8002451C(&sp90, sp40);
func_arcade_80024508(0x68, 0x43);
func_dk64_boot_800031E0(sp40, "PLAYER COIN");
sprintf(sp40, "PLAYER COIN");
func_arcade_8002451C(&sp90, sp40);
func_arcade_80024508(0x78, 0x53);
func_dk64_boot_800031E0(sp40, "1 1");
sprintf(sp40, "1 1");
func_arcade_8002451C(&sp90, sp40);
func_arcade_80024508(0x38, 0x7b);
func_dk64_boot_800031E0(sp40, "RANK SCORE NAME");
sprintf(sp40, "RANK SCORE NAME");
func_arcade_8002451C(&sp90, sp40);
func_arcade_8003159C(&sp90);
func_arcade_800244E4(0xff, 0, 0, 0xff);
func_arcade_80024508(0x78, 0x63);
func_dk64_boot_800031E0(sp40, "2 2");
sprintf(sp40, "2 2");
func_arcade_8002451C(&sp90, sp40);
} else {//L80032190
if (D_arcade_8004C6DC & 0x182) {
@ -3673,7 +3673,7 @@ void func_arcade_800319D4(Gfx **arg0) {
func_arcade_800244E4(0xff, 0xff, 0xff, 0xff);
}
func_arcade_80024508(0x68, 0xd7);
func_dk64_boot_800031E0(sp40, "c NINTENDO 1981");
sprintf(sp40, "c NINTENDO 1981");
func_arcade_8002451C(&sp90, sp40);
}
}//L800321EC

2
src/bonus/code_12A0.c
View File

@ -89,7 +89,7 @@ void func_bonus_800254B0(s16 arg0, s16 arg1, s16 arg2, s16 arg3) {
func_global_asm_807149B8(1);
func_global_asm_8071498C(&func_global_asm_80717404);
func_global_asm_80714950(1);
func_global_asm_80714CC0(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3], 0.3f, arg0, arg1, arg2);
drawSpriteAtPosition(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3], 0.3f, arg0, arg1, arg2);
}
}

2
src/bonus/code_2690.c
View File

@ -121,7 +121,7 @@ void func_bonus_8002733C(Struct8002733C *arg0) {
func_global_asm_80714944(i * 3);
func_global_asm_8071498C(&func_global_asm_8071A038);
func_global_asm_80714950(&arg0->unk18[i]);
arg0->unk4[i] = func_global_asm_80714CC0(&D_global_asm_8071FFD4, 1.0f, var_s2, 210.0f, -10.0f);
arg0->unk4[i] = drawSpriteAtPosition(&D_global_asm_8071FFD4, 1.0f, var_s2, 210.0f, -10.0f);
var_s2 -= 0x1E;
}
playSound(0x3E4, 0x7FFF, 63.0f, 1.0f, 5, 0);

4
src/bonus/code_9010.c
View File

@ -76,9 +76,9 @@ Gfx *func_bonus_8002D010(Gfx *dl, Actor *arg1) {
y = 480 - (u16)(D_bonus_8002D92C * 48);
for (i = -1; i < D_bonus_8002D92C; i++) {
if (i >= 0) {
func_dk64_boot_800031E0(sp70, "HIT %d", D_bonus_8002DEF0[i]);
sprintf(sp70, "HIT %d", D_bonus_8002DEF0[i]);
} else if (D_bonus_8002D92C >= 2) {
func_dk64_boot_800031E0(sp70, "COMBO x2");
sprintf(sp70, "COMBO x2");
} else {
sp70[0] = '\0';
}

2
src/boss/code_0.c
View File

@ -117,7 +117,7 @@ void func_boss_80024000(void) {
func_global_asm_807149B8(1);
func_global_asm_807149C8(0x8C, 0x8C, 0x8C, 0xFF);
func_global_asm_80714998(3);
func_global_asm_80714CC0(&D_global_asm_8071FFA0, 2.5f, current_actor_pointer->x_position, current_actor_pointer->y_position + 40.0f, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FFA0, 2.5f, current_actor_pointer->x_position, current_actor_pointer->y_position + 40.0f, current_actor_pointer->z_position);
}
}
*/

4
src/boss/code_3840.c
View File

@ -99,7 +99,7 @@ void func_boss_80028478(u16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, u8 arg
func_global_asm_807149FC(-1);
func_global_asm_807149B8(1);
func_global_asm_80714950(D_global_asm_807FDC94);
func_global_asm_80714CC0(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3], 1.8f, D_global_asm_807FDC94->x_position, D_global_asm_807FDC94->y_position + D_global_asm_807FDC94->unk15E, D_global_asm_807FDC94->z_position);
drawSpriteAtPosition(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3], 1.8f, D_global_asm_807FDC94->x_position, D_global_asm_807FDC94->y_position + D_global_asm_807FDC94->unk15E, D_global_asm_807FDC94->z_position);
}
func_global_asm_806A5DF0(0x48, arg1, arg2, arg3, arg4, arg5, arg0, 0);
}
@ -127,7 +127,7 @@ Gfx *func_boss_800286B8(Gfx *dl, s32 arg1) {
guMtxCatF(&sp90, &sp50, &sp90);
guMtxF2L(&sp90, sp4C);
gSPMatrix(dl++, sp4C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_dk64_boot_800031E0(&sp3C, "ROUND %d", D_global_asm_80750AD4);
sprintf(&sp3C, "ROUND %d", D_global_asm_80750AD4);
gSPDisplayList(dl++, &D_1000118);
gDPPipeSync(dl++);
gDPSetCombineMode(dl++ , G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);

2
src/boss/code_6240.c
View File

@ -161,7 +161,7 @@ void func_boss_8002A5CC(void) {
func_global_asm_8071498C(&func_global_asm_8071EDEC);
func_global_asm_80714950(current_actor_pointer);
func_global_asm_807149C8(0xFF, 0xD7, 0x58, 0xFF);
func_global_asm_80714CC0(&D_global_asm_80720120, 1.5f, sp6C, sp68, sp64);
drawSpriteAtPosition(&D_global_asm_80720120, 1.5f, sp6C, sp68, sp64);
for (i = 0; i < 4; i++) {
func_global_asm_80714998(2);
func_global_asm_8071498C(&func_global_asm_8071720C);

2
src/boss/code_F0D0.c
View File

@ -59,7 +59,7 @@ void func_boss_800336C0(void) {
func_global_asm_8071498C(&func_global_asm_8071720C);
func_global_asm_807149B8(1);
func_global_asm_80714950(1);
func_global_asm_80714CC0(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3],
drawSpriteAtPosition(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3],
(f64)sp24,
current_actor_pointer->x_position,
current_actor_pointer->y_position,

2
src/critter/code_0.c
View File

@ -451,7 +451,7 @@ void func_critter_80024F28(Critter *arg0) {
func_global_asm_80714950(1);
func_global_asm_807149FC(-1);
func_global_asm_8071498C(&func_global_asm_80718BF4);
func_global_asm_80714CC0(&D_global_asm_8071FC40, 0.0f, arg0->x_pos, arg0->y_pos, arg0->z_pos);
drawSpriteAtPosition(&D_global_asm_8071FC40, 0.0f, arg0->x_pos, arg0->y_pos, arg0->z_pos);
}
temp = ABS(sp3E);
if (!(temp < 0x5B)) {

4
src/critter/code_3340.c
View File

@ -234,7 +234,7 @@ void func_critter_80027448(void) {
if (aaD->unk0 >= 0x3D) {
func_global_asm_807149B8(0);
func_global_asm_807149FC(1);
func_global_asm_80714CC0(
drawSpriteAtPosition(
&D_global_asm_80720A7C,
0.5f,
((func_global_asm_806119FC() * 35.0) + current_actor_pointer->x_position) - 15.0,
@ -262,7 +262,7 @@ void func_critter_80027448(void) {
current_actor_pointer->control_state_progress = 4;
func_global_asm_807149B8(0);
func_global_asm_807149FC(1);
func_global_asm_80714CC0(
drawSpriteAtPosition(
&D_global_asm_8071FE08,
0.5f,
current_actor_pointer->x_position,

5
src/dk64_boot/dk64_boot_3D20.c
View File

@ -4,11 +4,10 @@
#pragma GLOBAL_ASM("asm/nonmatchings/dk64_boot/dk64_boot_3D20/func_dk64_boot_80003120.s")
// sprintf
#pragma GLOBAL_ASM("asm/nonmatchings/dk64_boot/dk64_boot_3D20/func_dk64_boot_800031E0.s")
#pragma GLOBAL_ASM("asm/nonmatchings/dk64_boot/dk64_boot_3D20/sprintf.s")
/*
void func_dk64_boot_800031E0(char *str, char *format, ...) {
int sprintf(char *str, const char *format, ...) {
func_dk64_boot_8000320C(str, format);
}
*/

4
src/global_asm/code_114270.c
View File

@ -702,8 +702,8 @@ void func_global_asm_80713438(Gfx *dl, u8 arg1) {
temp_f16 = 418.0f;
sp34 = malloc(size);
func_global_asm_8061134C(sp34);
func_dk64_boot_800031E0(sp34, &D_global_asm_8075E5D4, 0x63, sp30);
// func_dk64_boot_800031E0(sp34, "%c%s", 0x63, sp30);
sprintf(sp34, &D_global_asm_8075E5D4, 0x63, sp30);
// sprintf(sp34, "%c%s", 0x63, sp30);
sp28 -= 0.5 * getCenterOfString(1, sp34);
gDPSetRenderMode(dl++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
gDPSetPrimColor(dl++, 0, 0, 0x00, 0x00, 0x00, arg1);

31
src/global_asm/code_119370.c
View File

@ -259,20 +259,20 @@ Struct80717D84 *func_global_asm_80714B84(void *arg0, f32 arg1, s32 arg2, s32 arg
return func_global_asm_80714D08(arg0, arg1, sp3C, sp38, sp34, 0, arg2, arg3, arg4);
}
Struct80717D84 *func_global_asm_80714C08(void *arg0, f32 arg1, Actor *arg2, s32 arg3, u8 arg4) {
f32 sp3C;
f32 sp38;
f32 sp34;
Struct80717D84 *func_global_asm_80714C08(void *sprite, f32 scale, Actor *arg2, s32 arg3, u8 arg4) {
f32 x;
f32 y;
f32 z;
func_global_asm_80671C0C(arg2, arg3, &sp3C, &sp38, &sp34);
func_global_asm_80671C0C(arg2, arg3, &x, &y, &z);
if (!(arg2->object_properties_bitfield & 0x200) && (arg2->animation_state != NULL) && (D_global_asm_807FDB36 & 0x80)) {
func_global_asm_80714A38(0x40);
}
return func_global_asm_80714D08(arg0, arg1, sp3C, sp38, sp34, arg2, 0, arg3, arg4);
return func_global_asm_80714D08(sprite, scale, x, y, z, arg2, 0, arg3, arg4);
}
Struct80717D84 *func_global_asm_80714CC0(void* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
return func_global_asm_80714D08(arg0, arg1, arg2, arg3, arg4, 0, 0, 0, 0);
Struct80717D84 *drawSpriteAtPosition(void* sprite, f32 scale, f32 x, f32 y, f32 z) {
return func_global_asm_80714D08(sprite, scale, x, y, z, 0, 0, 0, 0);
}
extern u8 D_global_asm_80750AB4;
@ -281,7 +281,6 @@ extern u8 D_global_asm_807FDB0C;
extern u8 D_global_asm_807FDB0D;
extern u8 D_global_asm_807FDB0E;
extern u8 D_global_asm_807FDB0F;
extern u8 D_global_asm_807FDB18;
extern u8 D_global_asm_807FDB1D;
extern f32 D_global_asm_807FDB20;
extern f32 D_global_asm_807FDB24;
@ -639,7 +638,7 @@ void func_global_asm_80717760(Struct80717D84 *arg0, s8 *arg1) {
func_global_asm_807149B8(1);
func_global_asm_8071498C(&func_global_asm_80717404);
func_global_asm_80714950(0xA);
func_global_asm_80714CC0(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3], 0.8f, arg0->unk340, arg0->unk344, arg0->unk348);
drawSpriteAtPosition(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3], 0.8f, arg0->unk340, arg0->unk344, arg0->unk348);
return;
}
*arg1 = 1;
@ -821,7 +820,7 @@ void func_global_asm_80718124(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
func_global_asm_807149B8(1);
func_global_asm_80714998(3);
func_global_asm_8071498C(&func_global_asm_80718380);
func_global_asm_80714CC0(&D_global_asm_8071FEF4, arg0, arg1, arg2, arg3);
drawSpriteAtPosition(&D_global_asm_8071FEF4, arg0, arg1, arg2, arg3);
}
void func_global_asm_80718188(Struct80717D84 *arg0, s8 *arg1) {
@ -1545,7 +1544,7 @@ void func_global_asm_8071B8EC(Struct80717D84 *arg0, s8 *arg1) {
func_global_asm_80714950(-0xA);
func_global_asm_807149B8(1);
func_global_asm_807149C8(0x9B, 0x9B, 0x9B, 0x96);
func_global_asm_80714CC0(&D_global_asm_8071FFA0, 0.8f, (((rand() >> 0xF) % 65535) & 7) + arg0->unk340, arg0->unk344 + 10.0f, (((rand() >> 0xF) % 65535) & 7) + arg0->unk348);
drawSpriteAtPosition(&D_global_asm_8071FFA0, 0.8f, (((rand() >> 0xF) % 65535) & 7) + arg0->unk340, arg0->unk344 + 10.0f, (((rand() >> 0xF) % 65535) & 7) + arg0->unk348);
}
}
@ -1680,7 +1679,7 @@ void func_global_asm_8071C004(Struct80717D84 *arg0, s8 *arg1) {
func_global_asm_807149FC(-1);
func_global_asm_807149B8(1);
func_global_asm_8071498C(&func_global_asm_8071C24C);
func_global_asm_80714CC0(&D_global_asm_807201D4, 0.8f, arg0->unk340, arg0->unk344, arg0->unk348);
drawSpriteAtPosition(&D_global_asm_807201D4, 0.8f, arg0->unk340, arg0->unk344, arg0->unk348);
} else {
temp_f0 = arg0->unk330->unk16 * 2;
temp = 200.0f * (f32)(1.0 - ((temp_f0 - ((arg0->unk34E * 2) + arg0->unk351)) / temp_f0));
@ -1733,7 +1732,7 @@ void func_global_asm_8071C24C(Struct80717D84 *arg0, u8 *arg1) {
func_global_asm_80714950(1);
func_global_asm_8071498C(&func_global_asm_8071C004);
func_global_asm_80714944(7);
func_global_asm_80714CC0(&D_global_asm_8071FB54, 0.667f, arg0->unk340, sp50 + 10.0f, arg0->unk348);
drawSpriteAtPosition(&D_global_asm_8071FB54, 0.667f, arg0->unk340, sp50 + 10.0f, arg0->unk348);
}
func_global_asm_8065A708(arg0->unk340, arg0->unk344, arg0->unk348, 0.0f, 0.0f, 0.0f, 200.0f, 0, sp48[0], sp48[1], sp48[2]);
}
@ -1922,7 +1921,7 @@ void func_global_asm_8071D28C(Struct80717D84 *arg0, s8 *arg1) {
func_global_asm_80714950(0x2A);
func_global_asm_8071498C(&func_global_asm_8071D260);
func_global_asm_80714A28(0x20);
func_global_asm_80714CC0(arg0->unk330->unk0, arg0->unk360, arg0->unk340, arg0->unk344, arg0->unk348);
drawSpriteAtPosition(arg0->unk330->unk0, arg0->unk360, arg0->unk340, arg0->unk344, arg0->unk348);
}
}
@ -2632,7 +2631,7 @@ void func_global_asm_8071F8E4(Struct80717D84 *arg0, u8 *arg1) {
if (!(object_timer & 3)) {
func_global_asm_807149B8(1);
func_global_asm_8071498C(&func_global_asm_8071C818);
func_global_asm_80714CC0(&D_global_asm_8071FB08, 1.6f, arg0->unk340, arg0->unk344, arg0->unk348);
drawSpriteAtPosition(&D_global_asm_8071FB08, 1.6f, arg0->unk340, arg0->unk344, arg0->unk348);
}
temp_v0->unk4 += temp_v0->unk0;
guScaleF(&sp78[0], arg0->unk360, arg0->unk364, 0.0f);

7
src/global_asm/code_1295B0.c
View File

@ -302,15 +302,14 @@ void func_global_asm_80726EE0(u8 arg0) {
}
void func_global_asm_8072707C(s16 arg0, u8 arg1, u16 arg2) {
Actor *actor = func_global_asm_807270C0(arg0, arg2);
Actor *actor = getSpawnerTiedActor(arg0, arg2);
if (actor) {
actor->control_state = arg1;
actor->control_state_progress = 0;
}
}
// getSpawnerTiedActor()
Actor *func_global_asm_807270C0(s16 spawn_trigger, u16 arg1) {
Actor *getSpawnerTiedActor(s16 spawn_trigger, u16 arg1) {
s16 i;
EnemySpawner *var_v1;
@ -533,7 +532,7 @@ void func_global_asm_807289B0(u8 arg0, u8 arg1) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_1295B0/func_global_asm_807289E8.s")
void func_global_asm_80729AA4(u8 arg0) {
Actor *actor = func_global_asm_807270C0(arg0, 0); // getSpawnerTiedActor()
Actor *actor = getSpawnerTiedActor(arg0, 0);
if (!actor) {
actor = player_pointer;
}

8
src/global_asm/code_12E800.c
View File

@ -134,7 +134,7 @@ extern s32 D_global_asm_80720120; // TODO: Datatype
void func_global_asm_8072A714(void) {
if ((current_actor_pointer->interactable & 2) && (func_global_asm_80666A94() || func_global_asm_80666AA0())) {
if (func_global_asm_80666AA0()) {
func_global_asm_80714CC0(
drawSpriteAtPosition(
&D_global_asm_80720120,
current_actor_pointer->animation_state->scale_y * D_global_asm_8075FD28,
current_actor_pointer->x_position,
@ -636,11 +636,11 @@ void func_global_asm_8072D99C(void) {
}
void func_global_asm_8072D9D4(void) {
func_global_asm_80714CC0(&D_global_asm_8071FB34, 0.55f, current_actor_pointer->x_position, current_actor_pointer->y_position + (current_actor_pointer->unk15E * 0.5), current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FB34, 0.55f, current_actor_pointer->x_position, current_actor_pointer->y_position + (current_actor_pointer->unk15E * 0.5), current_actor_pointer->z_position);
}
void func_global_asm_8072DA60(void) {
func_global_asm_80714CC0(&D_global_asm_8071FB34,
drawSpriteAtPosition(&D_global_asm_8071FB34,
0.55f,
D_global_asm_807FBD6C->x_position,
D_global_asm_807FBD6C->y_position,
@ -652,7 +652,7 @@ void func_global_asm_8072DAA4(void) {
func_global_asm_807149B8(1);
func_global_asm_8071498C(&func_global_asm_80717D4C);
func_global_asm_80714950(-0x28 - ((rand() >> 0xF) % 15));
func_global_asm_80714CC0(&D_global_asm_8071FF18,
drawSpriteAtPosition(&D_global_asm_8071FF18,
(((rand() >> 0xF) % 1000) / D_global_asm_8075FF20) + 0.5,
current_actor_pointer->x_position,
current_actor_pointer->y_position,

2
src/global_asm/code_2C910.c
View File

@ -110,7 +110,7 @@ Actor *func_global_asm_80627EA8(s16 arg0) {
Actor *actor;
if (arg0) {
actor = func_global_asm_807270C0(arg0, 0); // getSpawnerTiedActor()
actor = getSpawnerTiedActor(arg0, 0);
}
if (!arg0 || !actor) {
actor = player_pointer;

6
src/global_asm/code_42630.c
View File

@ -557,7 +557,7 @@ void func_global_asm_80641DA0(GlobalASMStruct44 *arg0, s16 arg1, s16 arg2, s16 a
playCutscene(NULL, arg1, (phi_v1 | 1 | D_global_asm_807F693C) & 0xFF);
return;
case 2:
playCutscene(func_global_asm_807270C0(arg3, 0x400), arg1, (phi_v1 | 1 | D_global_asm_807F693C) & 0xFF);
playCutscene(getSpawnerTiedActor(arg3, 0x400), arg1, (phi_v1 | 1 | D_global_asm_807F693C) & 0xFF);
break;
}
}
@ -647,7 +647,7 @@ s32 func_global_asm_806423A8(s16 arg0, s16 arg1, s16 arg2) {
var_s0 = arg1;
while (arg2 >= var_s0) {
if (func_global_asm_80726D7C(var_s0) != 0) {
temp_v0 = func_global_asm_807270C0(var_s0, 0);
temp_v0 = getSpawnerTiedActor(var_s0, 0);
if (temp_v0 != NULL) {
if (func_global_asm_8064216C(arg0, temp_v0->x_position, temp_v0->y_position, temp_v0->z_position) != 0) {
return TRUE;
@ -851,7 +851,7 @@ void func_global_asm_80642940(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
func_global_asm_807149FC(2);
func_global_asm_80714950(0x64);
func_global_asm_8071498C(func_global_asm_80717D4C);
func_global_asm_80714CC0(
drawSpriteAtPosition(
&D_global_asm_8071FC58,
0.5f,
D_global_asm_807F621C + var_f6,

77
src/global_asm/code_478F0.c
View File

@ -92,7 +92,7 @@ void func_global_asm_80642C78(s32 arg0, s16 arg1, s32 arg2, s32 arg3) {
func_global_asm_80714950(-0x14 - ((func_global_asm_806119A0() / 10000U) % 50));
func_global_asm_807149C8(0xE1, 0x87, 0x38, 0xFF);
func_global_asm_8071498C(&func_global_asm_80717D4C);
func_global_asm_80714CC0(&D_global_asm_8071FF18, 0.5f, sp6C, sp68 + 2.0f, sp64);
drawSpriteAtPosition(&D_global_asm_8071FF18, 0.5f, sp6C, sp68 + 2.0f, sp64);
}
break;
}
@ -193,7 +193,7 @@ void func_global_asm_80643354(s32 arg0, u32 arg1, u32 arg2) {
func_global_asm_807149B8(1);
func_global_asm_80714998(3);
temp_v0 = &D_global_asm_807F5FD4->unk0[0][sp24];
func_global_asm_80714CC0(&D_global_asm_8071FFA0, 1.5f, temp_v0->unk0, temp_v0->unk4, temp_v0->unk8);
drawSpriteAtPosition(&D_global_asm_8071FFA0, 1.5f, temp_v0->unk0, temp_v0->unk4, temp_v0->unk8);
}
}
@ -273,7 +273,7 @@ void func_global_asm_806436E0(Struct806436E0_arg0 *arg0, s32 arg1, s32 arg2, s32
func_global_asm_807149B8(1);
func_global_asm_80714950(0);
func_global_asm_8071498C(&func_global_asm_8071C004);
func_global_asm_80714CC0(&D_global_asm_8071FB54, 0.667f, sp34, sp30 + 0xA, sp2C);
drawSpriteAtPosition(&D_global_asm_8071FB54, 0.667f, sp34, sp30 + 0xA, sp2C);
var_v1->unk0 = 0x19;
}
var_v1->unk0--;
@ -314,7 +314,7 @@ void func_global_asm_806438B8(s32 arg0, s16 arg1, s16 arg2, s16 arg3) {
func_global_asm_807149FC(1);
func_global_asm_80714950(0x100C8);
func_global_asm_8071498C(&func_global_asm_8071A8B0);
func_global_asm_80714CC0(&D_global_asm_8071FE08, 1.5f, sp60, sp5C, sp58);
drawSpriteAtPosition(&D_global_asm_8071FE08, 1.5f, sp60, sp5C, sp58);
for (i = 0; i < 7; i++) {
temp_s0 = (s32)(func_global_asm_806119A0() / 10000U) % 3;
func_global_asm_807149B8(1);
@ -324,13 +324,13 @@ void func_global_asm_806438B8(s32 arg0, s16 arg1, s16 arg2, s16 arg3) {
func_global_asm_80714950(7);
switch (temp_s0) {
case 0:
func_global_asm_80714CC0(&D_global_asm_8071FE64, 0.5f, sp60, sp5C, sp58);
drawSpriteAtPosition(&D_global_asm_8071FE64, 0.5f, sp60, sp5C, sp58);
break;
case 1:
func_global_asm_80714CC0(&D_global_asm_8071FE88, 0.5f, sp60, sp5C, sp58);
drawSpriteAtPosition(&D_global_asm_8071FE88, 0.5f, sp60, sp5C, sp58);
break;
case 2:
func_global_asm_80714CC0(&D_global_asm_8071FEAC, 0.5f, sp60, sp5C, sp58);
drawSpriteAtPosition(&D_global_asm_8071FEAC, 0.5f, sp60, sp5C, sp58);
break;
}
}
@ -390,7 +390,7 @@ void func_global_asm_80643C0C(Struct80643C0C *arg0, s32 arg1, s16 arg2, s32 arg3
func_global_asm_80714950(-0x190);
func_global_asm_807149C8(0xFF, 0xFF, 0xFF, 1);
func_global_asm_8071498C(&func_global_asm_80717CE8);
func_global_asm_80714CC0(&D_global_asm_807201D4, 1.2f, D_global_asm_807F621C, D_global_asm_807F6220 + 30.0, D_global_asm_807F6224);
drawSpriteAtPosition(&D_global_asm_807201D4, 1.2f, D_global_asm_807F621C, D_global_asm_807F6220 + 30.0, D_global_asm_807F6224);
}
}
if (temp_f20 < 0.1) {
@ -407,7 +407,7 @@ void func_global_asm_80643F38(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
func_global_asm_807149FC(1);
func_global_asm_8071498C(&func_global_asm_8071EA24);
func_global_asm_8071496C(i / 7);
func_global_asm_80714CC0(D_global_asm_8074E880[i % 3], 1.4f, D_global_asm_807F621C, D_global_asm_807F6220, D_global_asm_807F6224);
drawSpriteAtPosition(D_global_asm_8074E880[i % 3], 1.4f, D_global_asm_807F621C, D_global_asm_807F6220, D_global_asm_807F6224);
}
}
@ -478,7 +478,7 @@ void func_global_asm_80644E2C(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
func_global_asm_807149FC(-1);
func_global_asm_8071498C(&func_global_asm_80717760);
func_global_asm_80714950(0x50);
func_global_asm_80714CC0(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3], 0.5f, D_global_asm_807F621C, D_global_asm_807F6220, D_global_asm_807F6224);
drawSpriteAtPosition(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3], 0.5f, D_global_asm_807F621C, D_global_asm_807F6220, D_global_asm_807F6224);
}
int func_global_asm_8071E3EC(); // TODO: Signature
@ -498,7 +498,7 @@ void func_global_asm_80644EC8(s32 arg0, s32 arg1, s16 arg2, s16 arg3) {
func_global_asm_80714950(0x10064);
func_global_asm_8071498C(&func_global_asm_8071AADC);
func_global_asm_807149C8(0xFF, 0xFF, 0xFF, 0xFF);
func_global_asm_80714CC0(&D_global_asm_80720A7C, 1.2f, D_global_asm_807F5FD4->unk0[0][sp2C].unk0, D_global_asm_807F5FD4->unk0[0][sp2C].unk4, D_global_asm_807F5FD4->unk0[0][sp2C].unk8);
drawSpriteAtPosition(&D_global_asm_80720A7C, 1.2f, D_global_asm_807F5FD4->unk0[0][sp2C].unk0, D_global_asm_807F5FD4->unk0[0][sp2C].unk4, D_global_asm_807F5FD4->unk0[0][sp2C].unk8);
}
if (((func_global_asm_806119A0() / 10000U) % arg2) == 0) {
sp2C = (func_global_asm_806119A0() / 10000U) % arg3;
@ -506,7 +506,7 @@ void func_global_asm_80644EC8(s32 arg0, s32 arg1, s16 arg2, s16 arg3) {
func_global_asm_80714950(0x10064);
func_global_asm_8071498C(&func_global_asm_8071AADC);
func_global_asm_807149C8(0xFF, 0xFF, 0xFF, 0xFF);
func_global_asm_80714CC0(&D_global_asm_80720A7C, 1.2f, D_global_asm_807F5FD4->unk0[1][sp2C].unk0, D_global_asm_807F5FD4->unk0[1][sp2C].unk4, D_global_asm_807F5FD4->unk0[1][sp2C].unk8);
drawSpriteAtPosition(&D_global_asm_80720A7C, 1.2f, D_global_asm_807F5FD4->unk0[1][sp2C].unk0, D_global_asm_807F5FD4->unk0[1][sp2C].unk4, D_global_asm_807F5FD4->unk0[1][sp2C].unk8);
}
}
@ -528,7 +528,7 @@ void func_global_asm_806450C0(s32 arg0, s32 arg1, s16 arg2, s16 arg3) {
func_global_asm_807149FC(-1);
func_global_asm_807149B8(1);
func_global_asm_807149C8(0xFF, 0xFF, 0xFF, D_global_asm_807480EF);
func_global_asm_80714CC0(&D_global_asm_80720CD8, D_global_asm_807480E8, D_global_asm_807F5FD4->unk0[arg2][temp_hi].unk0, D_global_asm_807F5FD4->unk0[arg2][temp_hi].unk4, D_global_asm_807F5FD4->unk0[arg2][temp_hi].unk8);
drawSpriteAtPosition(&D_global_asm_80720CD8, D_global_asm_807480E8, D_global_asm_807F5FD4->unk0[arg2][temp_hi].unk0, D_global_asm_807F5FD4->unk0[arg2][temp_hi].unk4, D_global_asm_807F5FD4->unk0[arg2][temp_hi].unk8);
}
}
}
@ -580,7 +580,7 @@ void func_global_asm_80645238(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
var_s1 = &D_global_asm_80720E8C;
break;
}
func_global_asm_80714CC0(var_s1, 0.5f, D_global_asm_807F621C, D_global_asm_807F6220, D_global_asm_807F6224);
drawSpriteAtPosition(var_s1, 0.5f, D_global_asm_807F621C, D_global_asm_807F6220, D_global_asm_807F6224);
}
for (i = 0; i < 6; i++) {
var_f8 = (func_global_asm_806119A0() / 1000) % 150;
@ -596,7 +596,7 @@ void func_global_asm_80645238(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
func_global_asm_807149B8(1);
func_global_asm_80714998(3);
func_global_asm_807149C8(0xFF, 0xFF, 0xFF, 0x64);
func_global_asm_80714CC0(&D_global_asm_8071FFA0, (f32)((var_f4 - 25.0) / 50.0) + 3.5, D_global_asm_807F621C + (f32)(var_f8 - 75.0), D_global_asm_807F6220 + 30.0, D_global_asm_807F6224 + (f32)(var_f6 - 75.0));
drawSpriteAtPosition(&D_global_asm_8071FFA0, (f32)((var_f4 - 25.0) / 50.0) + 3.5, D_global_asm_807F621C + (f32)(var_f8 - 75.0), D_global_asm_807F6220 + 30.0, D_global_asm_807F6224 + (f32)(var_f6 - 75.0));
}
}
*/
@ -635,7 +635,7 @@ void func_global_asm_80645700(Struct80645700_sp20 **arg0, s32 arg1, s16 arg2, s1
func_global_asm_80714950(3);
func_global_asm_8071498C(&func_global_asm_8071E3EC);
func_global_asm_807149A8(0x7D0);
func_global_asm_80714CC0(&D_global_asm_80720BC4, 2.5f, D_global_asm_807F5FD4->unk0[0][sp24].unk0, D_global_asm_807F5FD4->unk0[0][sp24].unk4, D_global_asm_807F5FD4->unk0[0][sp24].unk8);
drawSpriteAtPosition(&D_global_asm_80720BC4, 2.5f, D_global_asm_807F5FD4->unk0[0][sp24].unk0, D_global_asm_807F5FD4->unk0[0][sp24].unk4, D_global_asm_807F5FD4->unk0[0][sp24].unk8);
if (arg3) {
if (player_pointer->control_state == 0x42) {
var_v1->unk0 = player_pointer->y_position;
@ -664,7 +664,7 @@ void func_global_asm_806458C8(s32 arg0, s32 arg1, s16 arg2, s32 arg3) {
func_global_asm_8071498C(func_global_asm_80717D4C);
func_global_asm_807149B8(1);
func_global_asm_80714998(2);
func_global_asm_80714CC0(&D_global_asm_8071FFA0, 1.0f, (func_global_asm_80612794(sp2E) * sp2C) + D_global_asm_807F621C, D_global_asm_807F6220 + 50.0f, (func_global_asm_80612790(sp2E) * sp2C) + D_global_asm_807F6224);
drawSpriteAtPosition(&D_global_asm_8071FFA0, 1.0f, (func_global_asm_80612794(sp2E) * sp2C) + D_global_asm_807F621C, D_global_asm_807F6220 + 50.0f, (func_global_asm_80612790(sp2E) * sp2C) + D_global_asm_807F6224);
}
}
@ -837,7 +837,7 @@ void func_global_asm_80646770(s32 **arg0, s32 arg1, s32 arg2, s32 arg3) {
func_global_asm_8071498C(&func_global_asm_8071E3EC);
func_global_asm_807149A8(0x320);
temp_v1_2 = &D_global_asm_807F5FD4->unk0[0][*var_v1];
func_global_asm_80714CC0(&D_global_asm_80720BC4, 2.5f, temp_v1_2->unk0, temp_v1_2->unk4, temp_v1_2->unk8);
drawSpriteAtPosition(&D_global_asm_80720BC4, 2.5f, temp_v1_2->unk0, temp_v1_2->unk4, temp_v1_2->unk8);
} else {
(*var_v1)++;
if (count == *var_v1) {
@ -873,7 +873,7 @@ void func_global_asm_80646DC4(s32 arg0, s16 arg1, s16 arg2, s16 arg3) {
func_global_asm_807149B8(1);
func_global_asm_8071498C(&func_global_asm_8071BB14);
func_global_asm_807149C8(0xFF, 0xFF, 0xFF, 0x96);
func_global_asm_80714CC0(&D_global_asm_80720BE8, 1.5f, spB8, spB4, spB0);
drawSpriteAtPosition(&D_global_asm_80720BE8, 1.5f, spB8, spB4, spB0);
}
return;
}
@ -942,7 +942,7 @@ void func_global_asm_80647218(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
func_global_asm_807149B8(1);
func_global_asm_80714998(3);
func_global_asm_8071496C(i << 1);
func_global_asm_80714CC0(&D_global_asm_8071FFA0, (rand4) + 1.5, D_global_asm_807F621C + (rand1), D_global_asm_807F6220 + (rand2), D_global_asm_807F6224 + (rand3));
drawSpriteAtPosition(&D_global_asm_8071FFA0, (rand4) + 1.5, D_global_asm_807F621C + (rand1), D_global_asm_807F6220 + (rand2), D_global_asm_807F6224 + (rand3));
}
}
@ -958,7 +958,7 @@ void func_global_asm_80647508(s32 arg0, s16 arg1, s32 arg2, s32 arg3) {
func_global_asm_807149C8(0xFF, 0xFF, 0xFF, 0x64);
func_global_asm_80714944(5);
func_global_asm_806335B0(arg1, 1, sp34, &sp30, &sp2C, &sp28);
func_global_asm_80714CC0(&D_global_asm_8071FFA0, 1.5f, sp30, sp2C - 70, sp28);
drawSpriteAtPosition(&D_global_asm_8071FFA0, 1.5f, sp30, sp2C - 70, sp28);
}
// Close
@ -996,7 +996,7 @@ void func_global_asm_80647610(s32 **arg0, s32 arg1, s16 arg2, s16 arg3) {
func_global_asm_80714998(2);
func_global_asm_807149B8(1);
func_global_asm_807149C8(0xFF, 0xFF, 0xFF, 0xC8);
func_global_asm_80714CC0(&D_global_asm_80720DE0, 1.0f, sp2C, sp28 + 0xA, sp24);
drawSpriteAtPosition(&D_global_asm_80720DE0, 1.0f, sp2C, sp28 + 0xA, sp24);
}
*/
@ -1038,7 +1038,7 @@ void func_global_asm_80647834(s32 arg0, s16 arg1, s32 arg2, s32 arg3) {
func_global_asm_80714998(2);
func_global_asm_80714950(4);
temp = ((func_global_asm_806119A0() / 1000U) % 80);
func_global_asm_80714CC0(&D_global_asm_80720EA4, 1.0f, D_global_asm_807F621C, D_global_asm_807F6220 + temp, D_global_asm_807F6224);
drawSpriteAtPosition(&D_global_asm_80720EA4, 1.0f, D_global_asm_807F621C, D_global_asm_807F6220 + temp, D_global_asm_807F6224);
}
for (i = 1; i != 6; i++) {
func_global_asm_80714950(-0x78);
@ -1067,9 +1067,9 @@ void func_global_asm_80647A14(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
func_global_asm_8071498C(&func_global_asm_8071F1D0);
func_global_asm_80714998(1);
func_global_asm_80714950(var_f20);
func_global_asm_80714CC0(&D_global_asm_8071FC8C, 0.5f, D_global_asm_807F621C, D_global_asm_807F6220, D_global_asm_807F6224);
drawSpriteAtPosition(&D_global_asm_8071FC8C, 0.5f, D_global_asm_807F621C, D_global_asm_807F6220, D_global_asm_807F6224);
func_global_asm_80714950(var_f20 + 2048.0f);
func_global_asm_80714CC0(&D_global_asm_8071FC8C, 0.5f, D_global_asm_807F621C, D_global_asm_807F6220, D_global_asm_807F6224);
drawSpriteAtPosition(&D_global_asm_8071FC8C, 0.5f, D_global_asm_807F621C, D_global_asm_807F6220, D_global_asm_807F6224);
var_f20 += temp_f26;
}
}
@ -1127,7 +1127,7 @@ void func_global_asm_80647B74(Struct80647B74_arg0 *arg0, s16 arg1, s32 arg2, s32
void func_global_asm_80647CF4(s32 arg0, s16 arg1, s16 arg2, s32 arg3) {
func_global_asm_80714998(2);
if (arg2 != 0) {
func_global_asm_80714CC0(&D_global_asm_8071FBC8, 3.0, D_global_asm_807F621C, D_global_asm_807F6220, D_global_asm_807F6224);
drawSpriteAtPosition(&D_global_asm_8071FBC8, 3.0, D_global_asm_807F621C, D_global_asm_807F6220, D_global_asm_807F6224);
return;
}
func_global_asm_80714B84(&D_global_asm_8071FBC8, 3.0, arg1, 1, 0);
@ -1156,7 +1156,7 @@ void func_global_asm_80647D7C(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
func_global_asm_80714950(1);
func_global_asm_807149FC(-1);
func_global_asm_8071498C(func_global_asm_80718BF4);
func_global_asm_80714CC0(
drawSpriteAtPosition(
&D_global_asm_8071FC40,
0.0f,
D_global_asm_807F621C + randomX,
@ -1203,7 +1203,7 @@ void func_global_asm_80648000(OM2_unk7C *arg0, s16 arg1, s32 arg2, s32 arg3) {
func_global_asm_80714950(2);
func_global_asm_807149FC(-1);
func_global_asm_8071498C(&func_global_asm_80718BF4);
func_global_asm_80714CC0(&D_global_asm_8071FC40, 0.0f, sp40, temp_s0[4][0], sp38);
drawSpriteAtPosition(&D_global_asm_8071FC40, 0.0f, sp40, temp_s0[4][0], sp38);
}
}
}
@ -1276,7 +1276,7 @@ void func_global_asm_8064826C(Struct8064826C_arg0 *arg0, s32 arg1, s16 arg2, s32
func_global_asm_80714A08(sp38 + 1.0, (f32)(temp_f0 * 0.1) + 1.0);
func_global_asm_807149A8(1400);
func_global_asm_80714A28(4);
func_global_asm_80714CC0(sp3C, 0.0f, D_global_asm_807F621C + sp2C, (func_global_asm_80612794(temp_v0->unk8) * 10.0) + (D_global_asm_807F6220 + 80.0), D_global_asm_807F6224 + sp28);
drawSpriteAtPosition(sp3C, 0.0f, D_global_asm_807F621C + sp2C, (func_global_asm_80612794(temp_v0->unk8) * 10.0) + (D_global_asm_807F6220 + 80.0), D_global_asm_807F6224 + sp28);
temp_v0->unk8 += 0x64;
if ((D_global_asm_8076A068 % 12) == 0) {
func_global_asm_807149B8(1);
@ -1284,7 +1284,7 @@ void func_global_asm_8064826C(Struct8064826C_arg0 *arg0, s32 arg1, s16 arg2, s32
func_global_asm_8071498C(&func_global_asm_80716F10);
func_global_asm_807149A8(1400);
func_global_asm_80714A28(4);
func_global_asm_80714CC0(&D_global_asm_8072126C, 2.0f, D_global_asm_807F621C + sp2C, D_global_asm_807F6220 + 30.0, D_global_asm_807F6224 + sp28);
drawSpriteAtPosition(&D_global_asm_8072126C, 2.0f, D_global_asm_807F621C + sp2C, D_global_asm_807F6220 + 30.0, D_global_asm_807F6224 + sp28);
}
}
@ -1333,7 +1333,7 @@ loop_8:
goto loop_8;
}
temp_f2 = temp_f30 / temp_f0;
func_global_asm_80714CC0(&D_global_asm_8071FF18, sp6C, D_global_asm_807F621C + (temp_f22 * temp_f2), D_global_asm_807F6220 + ((temp_f20 * temp_f2) + temp_f30), D_global_asm_807F6224 + (temp_f26 * temp_f2));
drawSpriteAtPosition(&D_global_asm_8071FF18, sp6C, D_global_asm_807F621C + (temp_f22 * temp_f2), D_global_asm_807F6220 + ((temp_f20 * temp_f2) + temp_f30), D_global_asm_807F6224 + (temp_f26 * temp_f2));
}
}
*/
@ -1431,7 +1431,7 @@ void func_global_asm_806493C4(s32 arg0, s32 arg1, s16 arg2, s16 arg3) {
func_global_asm_807149A8(0x7D0);
func_global_asm_8071498C(func_global_asm_8071F660);
func_global_asm_807149FC(8);
func_global_asm_80714CC0(&D_global_asm_80721298, 1.0f, D_global_asm_807F5FD4->unk0[0][temp_s1].unk0, D_global_asm_807F5FD4->unk0[0][temp_s1].unk4, D_global_asm_807F5FD4->unk0[0][temp_s1].unk8);
drawSpriteAtPosition(&D_global_asm_80721298, 1.0f, D_global_asm_807F5FD4->unk0[0][temp_s1].unk0, D_global_asm_807F5FD4->unk0[0][temp_s1].unk4, D_global_asm_807F5FD4->unk0[0][temp_s1].unk8);
}
}
@ -1779,7 +1779,6 @@ void func_global_asm_8064B868(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
void func_global_asm_8064B900(s32 arg0, s32 arg1, s16 arg2, s32 arg3) {
Actor *temp_v0;
Actor *temp_v0_2;
if (arg2 != 0) {
if (arg2 != 1) {
@ -1788,7 +1787,7 @@ void func_global_asm_8064B900(s32 arg0, s32 arg1, s16 arg2, s32 arg3) {
last_spawned_actor->object_properties_bitfield &= -5;
}
} else {
temp_v0 = func_global_asm_807270C0(8, 0);
temp_v0 = getSpawnerTiedActor(8, 0);
if (temp_v0) {
temp_v0->object_properties_bitfield |= 4;
playActorAnimation(temp_v0, 0x35C);
@ -1796,9 +1795,9 @@ void func_global_asm_8064B900(s32 arg0, s32 arg1, s16 arg2, s32 arg3) {
}
}
} else {
temp_v0_2 = func_global_asm_807270C0(8, 0);
if (temp_v0_2) {
temp_v0_2->control_state = 0x3C;
temp_v0 = getSpawnerTiedActor(8, 0);
if (temp_v0) {
temp_v0->control_state = 0x3C;
}
}
}
@ -1996,7 +1995,7 @@ void func_global_asm_8064C250(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
func_global_asm_806A5DF0(0x2F, D_global_asm_807F621C, D_global_asm_807F6220 + 15.0f, D_global_asm_807F6224, 0x800, 1, -1, 0);
func_global_asm_806A5DF0(0x2F, D_global_asm_807F621C, D_global_asm_807F6220 + 15.0f, D_global_asm_807F6224, 0xC00, 1, -1, 0);
func_global_asm_807149B8(1);
func_global_asm_80714CC0(&D_global_asm_8071FFA0, 2.5f, D_global_asm_807F621C, D_global_asm_807F6220 + 30.0f, D_global_asm_807F6224);
drawSpriteAtPosition(&D_global_asm_8071FFA0, 2.5f, D_global_asm_807F621C, D_global_asm_807F6220 + 30.0f, D_global_asm_807F6224);
}
void func_global_asm_8061EF4C(s32, s32, s32, f32, f32, f32, f32, f32);
@ -2657,7 +2656,7 @@ void func_global_asm_8064F028(s32 arg0, s32 arg1, s16 arg2, s32 arg3) {
func_global_asm_807149FC(-1);
func_global_asm_807149B8(1);
func_global_asm_80714998(2);
func_global_asm_80714CC0(&D_global_asm_80721530, 0, D_global_asm_807F621C, D_global_asm_807F6220 + 17.5, D_global_asm_807F6224);
drawSpriteAtPosition(&D_global_asm_80721530, 0, D_global_asm_807F621C, D_global_asm_807F6220 + 17.5, D_global_asm_807F6224);
spawnActor(ACTOR_WRINKLY, 0x53);
last_spawned_actor->x_position = D_global_asm_807F621C;
last_spawned_actor->y_position = D_global_asm_807F6220;

24
src/global_asm/code_80150.c
View File

@ -78,7 +78,7 @@ void func_global_asm_8067BA7C(s16 arg0) {
func_global_asm_80608528(current_actor_pointer, 0x31, 0xFF, 0x7F, 1);
func_global_asm_807149B8(0);
func_global_asm_807149FC(1);
func_global_asm_80714CC0(&D_global_asm_8071FE08, 0.5f, current_actor_pointer->x_position, current_actor_pointer->y_position + 7.0f, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FE08, 0.5f, current_actor_pointer->x_position, current_actor_pointer->y_position + 7.0f, current_actor_pointer->z_position);
func_global_asm_80689114(arg0, current_actor_pointer->x_position, current_actor_pointer->y_position + 8.3, current_actor_pointer->z_position, 0, 1.0f, current_actor_pointer);
current_actor_pointer->control_state++;
break;
@ -284,7 +284,7 @@ u8 func_global_asm_8067BF84(s16 arg0, u8 *arg1, u8 *arg2, u8 *arg3) {
func_global_asm_80608528(current_actor_pointer, 0x31, 0xFF, 0x7F, 1);
func_global_asm_807149B8(0);
func_global_asm_807149FC(1);
func_global_asm_80714CC0(&D_global_asm_8071FE08, 0.5f, current_actor_pointer->x_position, current_actor_pointer->y_position + 7.0f, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FE08, 0.5f, current_actor_pointer->x_position, current_actor_pointer->y_position + 7.0f, current_actor_pointer->z_position);
}
}
if (*arg2 != 0) {
@ -423,7 +423,7 @@ void func_global_asm_8067DCC0(void) {
func_global_asm_8060E7EC(0, 0xB4, 0xA);
func_global_asm_807149B8(0);
func_global_asm_807149FC(1);
func_global_asm_80714CC0(&D_global_asm_8071FE08, temp_f20 * 0.75, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FE08, temp_f20 * 0.75, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
func_global_asm_80608528(current_actor_pointer, 0x23, 0xFF, 0x7F, 1);
for (i = 0; i < 7; i++) {
temp_s0 = (s32)(func_global_asm_806119A0() / 10000U) % 3;
@ -434,13 +434,13 @@ void func_global_asm_8067DCC0(void) {
func_global_asm_80714950(2);
switch (temp_s0) {
case 0:
func_global_asm_80714CC0(&D_global_asm_8071FE64, temp_f20 * 0.25, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FE64, temp_f20 * 0.25, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
break;
case 1:
func_global_asm_80714CC0(&D_global_asm_8071FE88, temp_f20 * 0.25, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FE88, temp_f20 * 0.25, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
break;
case 2:
func_global_asm_80714CC0(&D_global_asm_8071FEAC, temp_f20 * 0.25, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FEAC, temp_f20 * 0.25, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
break;
}
}
@ -463,7 +463,7 @@ void func_global_asm_8067DF44(f32 arg0, f32 arg1, f32 arg2, f32 arg3, u8 arg4, u
}
func_global_asm_807149B8(1);
func_global_asm_8071498C(&func_global_asm_8071B89C);
func_global_asm_80714CC0(&D_global_asm_80720120, 0.0f, arg0, arg1 + 5.0f, arg2);
drawSpriteAtPosition(&D_global_asm_80720120, 0.0f, arg0, arg1 + 5.0f, arg2);
sp80 = arg3;
sp7C = arg3 * 1.5;
for (i = 0; i < 5; i++) {
@ -474,13 +474,13 @@ void func_global_asm_8067DF44(f32 arg0, f32 arg1, f32 arg2, f32 arg3, u8 arg4, u
func_global_asm_807149B8(1);
func_global_asm_807149FC(1);
func_global_asm_8071498C(&func_global_asm_8071BB14);
func_global_asm_80714CC0(&D_global_asm_80720340, sp7C, arg0 + temp_f22, arg1 + temp_f24, arg2 + temp_f20);
drawSpriteAtPosition(&D_global_asm_80720340, sp7C, arg0 + temp_f22, arg1 + temp_f24, arg2 + temp_f20);
}
func_global_asm_8071496C(4);
func_global_asm_807149B8(1);
func_global_asm_807149FC(1);
func_global_asm_8071498C(&func_global_asm_8071BB14);
func_global_asm_80714CC0(&D_global_asm_80720340, sp7C, arg0, arg1, arg2);
drawSpriteAtPosition(&D_global_asm_80720340, sp7C, arg0, arg1, arg2);
if (arg4 != 0) {
for (i = 0; i < 0xC; i++) {
func_global_asm_807149B8(1);
@ -488,7 +488,7 @@ void func_global_asm_8067DF44(f32 arg0, f32 arg1, f32 arg2, f32 arg3, u8 arg4, u
func_global_asm_80714950(i + 0x0B020000);
func_global_asm_8071498C(&func_global_asm_8071ABDC);
func_global_asm_80714998(1);
func_global_asm_80714CC0(&D_global_asm_8072038C, sp80 * 0.5, arg0, arg1, arg2);
drawSpriteAtPosition(&D_global_asm_8072038C, sp80 * 0.5, arg0, arg1, arg2);
}
}
}
@ -565,7 +565,7 @@ void func_global_asm_8067E510(void) {
if (D_global_asm_807FBB70.unk258[i] == 1) {
func_global_asm_807149B8(0);
func_global_asm_807149FC(1);
func_global_asm_80714CC0(&D_global_asm_8071FE08, 0.5f, current_actor_pointer->x_position, current_actor_pointer->y_position + 7.0f, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FE08, 0.5f, current_actor_pointer->x_position, current_actor_pointer->y_position + 7.0f, current_actor_pointer->z_position);
deleteActor(current_actor_pointer);
}
}
@ -1228,7 +1228,7 @@ void func_global_asm_8068412C(void) {
func_global_asm_807149B8(1);
func_global_asm_807149A8(1000);
func_global_asm_80714A28(4);
func_global_asm_80714CC0(&D_global_asm_8071FC8C,
drawSpriteAtPosition(&D_global_asm_8071FC8C,
1.3f,
current_actor_pointer->x_position,
current_actor_pointer->y_position + 13.0,

50
src/global_asm/code_89250.c
View File

@ -126,7 +126,7 @@ void func_global_asm_80684850(u8 arg0) {
func_global_asm_80714C08(&D_global_asm_8071FF58, 0.05f, current_actor_pointer, arg0, 0);
return;
}
func_global_asm_80714CC0(&D_global_asm_8071FF58, 0.05f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FF58, 0.05f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
}
}
@ -151,7 +151,7 @@ void func_global_asm_80684A00(s16 arg0, s8 arg1) {
func_global_asm_80714950((((rand() >> 0xF) % 100) + 400) * arg1);
func_global_asm_8071498C(&func_global_asm_80717D4C);
func_global_asm_807149B8(1);
func_global_asm_80714CC0(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3],
drawSpriteAtPosition(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3],
sp30 * 0.8,
((rand() >> 0xF) % 20) + (sp3C - 10.0f),
sp38,
@ -171,7 +171,7 @@ void func_global_asm_80684BB0(s16 arg0, s16 arg1, s16 arg2) {
func_global_asm_8071498C(&func_global_asm_8071F2F8);
func_global_asm_807149B8(1);
func_global_asm_807149FC(MAX(2.0, arg2 * 0.02));
func_global_asm_80714CC0(
drawSpriteAtPosition(
D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3],
sp48 * 0.8,
((rand() >> 0xF) % 60) + (sp54 - 30.0f),
@ -197,7 +197,7 @@ void func_global_asm_80684D98(u8 arg0) {
func_global_asm_807149FC(-1);
func_global_asm_8071498C(&func_global_asm_80718BF4);
func_global_asm_80714A28(4);
func_global_asm_80714CC0(
drawSpriteAtPosition(
&D_global_asm_8071FC40,
0.0f,
current_actor_pointer->x_position + randomX,
@ -219,7 +219,7 @@ void func_global_asm_80685020(u8 arg0, u8 arg1) {
func_global_asm_80714C08(&D_global_asm_8071FC40, 0, current_actor_pointer, arg1, 0);
return;
}
func_global_asm_80714CC0(&D_global_asm_8071FC40, 0, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FC40, 0, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
}
}
@ -232,7 +232,7 @@ void func_global_asm_806850D0(void) {
temp_f20 = current_actor_pointer->animation_state->scale_y / 0.15;
func_global_asm_807149B8(0);
func_global_asm_807149FC(1);
func_global_asm_80714CC0(&D_global_asm_8071FE08,
drawSpriteAtPosition(&D_global_asm_8071FE08,
temp_f20 * 0.75,
current_actor_pointer->x_position,
current_actor_pointer->y_position,
@ -244,7 +244,7 @@ void func_global_asm_806850D0(void) {
func_global_asm_8071498C(&func_global_asm_8071910C);
func_global_asm_80714998(2);
func_global_asm_80714950(0);
func_global_asm_80714CC0(&D_global_asm_8072073C,
drawSpriteAtPosition(&D_global_asm_8072073C,
temp_f20 * 0.15,
current_actor_pointer->x_position,
current_actor_pointer->y_position,
@ -272,7 +272,7 @@ void func_global_asm_806852C4(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
func_global_asm_80714950(i);
func_global_asm_807149B8(1);
func_global_asm_807149C8(0xFF, 0xFF, 0xFF, 0xC8);
func_global_asm_80714CC0(&D_global_asm_8071FFA0, arg0, arg1, arg2, arg3);
drawSpriteAtPosition(&D_global_asm_8071FFA0, arg0, arg1, arg2, arg3);
}
}
@ -339,7 +339,7 @@ void func_global_asm_80685520(f32 arg0, u8 arg1, f32 arg2, f32 arg3, f32 arg4) {
func_global_asm_807149B8(1);
func_global_asm_807149FC(-1);
func_global_asm_807149C8(0xFF, 0xFF, 0xFF, 0xFF);
func_global_asm_80714CC0(&D_global_asm_8071FF40, arg0 * 0.5, arg2, arg3, arg4);
drawSpriteAtPosition(&D_global_asm_8071FF40, arg0 * 0.5, arg2, arg3, arg4);
}
}
if (arg1 >= 3) {
@ -349,7 +349,7 @@ void func_global_asm_80685520(f32 arg0, u8 arg1, f32 arg2, f32 arg3, f32 arg4) {
func_global_asm_807149B8(1);
func_global_asm_807149FC(-1);
func_global_asm_807149C8(0xFF, 0xFF, 0xFF, 0xFF);
func_global_asm_80714CC0(D_global_asm_8074E880[i % 3], arg0, arg2, arg3, arg4);
drawSpriteAtPosition(D_global_asm_8074E880[i % 3], arg0, arg2, arg3, arg4);
}
}
}
@ -390,7 +390,7 @@ void func_global_asm_806858E8(Actor *arg0, s16 arg1, f32 arg2, f32 arg3, f32 arg
}
func_global_asm_8071498C(&func_global_asm_80718080);
func_global_asm_80714950(arg6);
func_global_asm_80714CC0(&D_global_asm_8071FFA0, arg2, arg3, arg4 + 5.0f, arg5)->unk338 = arg0;
drawSpriteAtPosition(&D_global_asm_8071FFA0, arg2, arg3, arg4 + 5.0f, arg5)->unk338 = arg0;
}
void func_global_asm_80685984(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
@ -402,7 +402,7 @@ void func_global_asm_80685984(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
func_global_asm_807149B8(1);
func_global_asm_807149C8(0x9B, 0x9B, 0x9B, 0xC8);
func_global_asm_8071498C(&func_global_asm_80719EF4);
func_global_asm_80714CC0(&D_global_asm_8071FFA0, arg0, (((rand() >> 0xF) % 100000) % 10) + (arg1 - 5.0f), arg2, (((rand() >> 0xF) % 100000) % 10) + (arg3 - 5.0f));
drawSpriteAtPosition(&D_global_asm_8071FFA0, arg0, (((rand() >> 0xF) % 100000) % 10) + (arg1 - 5.0f), arg2, (((rand() >> 0xF) % 100000) % 10) + (arg3 - 5.0f));
}
}
@ -421,7 +421,7 @@ void func_global_asm_80685B44(void *arg0, u8 arg1, f32 arg2, u8 arg3, u8 arg4, s
if (arg1) {
func_global_asm_8071496C(arg1);
}
func_global_asm_80714CC0(arg0, arg2, arg6 + temp_s4, arg7, arg8 + temp_s0);
drawSpriteAtPosition(arg0, arg2, arg6 + temp_s4, arg7, arg8 + temp_s0);
}
}
@ -462,7 +462,7 @@ void func_global_asm_80685E78(Actor *arg0) {
func_global_asm_8071498C(&func_global_asm_807184F4);
func_global_asm_80714A28(4);
func_global_asm_807149C8(0xC8, 0xFF, 0xFF, 0xC8);
func_global_asm_80714CC0(&D_global_asm_8071FED0, sp28 * 0.6, arg0->x_position, arg0->unkAC, arg0->z_position)->unk338 = arg0;
drawSpriteAtPosition(&D_global_asm_8071FED0, sp28 * 0.6, arg0->x_position, arg0->unkAC, arg0->z_position)->unk338 = arg0;
}
*/
@ -532,7 +532,7 @@ void func_global_asm_8068613C(Actor *arg0) {
func_global_asm_807149B8(1);
func_global_asm_807149FC(1);
func_global_asm_807149C8(0xFF, 0xFF, 0xFF, 0xFF);
func_global_asm_80714CC0(&D_global_asm_8071FC0C, var_f20 * 0.65, arg0->x_position, arg0->unkAC + 15.0f, arg0->z_position);
drawSpriteAtPosition(&D_global_asm_8071FC0C, var_f20 * 0.65, arg0->x_position, arg0->unkAC + 15.0f, arg0->z_position);
if (D_global_asm_80750AD0 == 0) {
temp_v1 = (func_global_asm_806119A0() & 3) + 4;
for (i = 0; i < temp_v1; i++) {
@ -540,7 +540,7 @@ void func_global_asm_8068613C(Actor *arg0) {
func_global_asm_807149FC(-1);
func_global_asm_8071498C(&func_global_asm_8071DB74);
func_global_asm_80714A28(4);
func_global_asm_80714CC0(&D_global_asm_80720B58, var_f20 * 0.1, arg0->x_position, arg0->unkAC, arg0->z_position);
drawSpriteAtPosition(&D_global_asm_80720B58, var_f20 * 0.1, arg0->x_position, arg0->unkAC, arg0->z_position);
}
}
}
@ -563,7 +563,7 @@ void func_global_asm_8068696C(Actor *arg0) {
func_global_asm_807149FC(-1);
func_global_asm_80714950(arg0);
func_global_asm_8071498C(&func_global_asm_8071DC90);
func_global_asm_80714CC0(D_global_asm_8074E880[i % 3], 0.7f, arg0->x_position, arg0->y_position, arg0->z_position);
drawSpriteAtPosition(D_global_asm_8074E880[i % 3], 0.7f, arg0->x_position, arg0->y_position, arg0->z_position);
}
}
@ -574,14 +574,14 @@ void func_global_asm_80686A5C(Actor *arg0, f32 arg1, f32 arg2, s32 arg3) {
func_global_asm_807149FC(-1);
func_global_asm_80714950(arg0);
func_global_asm_8071498C(func_global_asm_8071E1C8);
func_global_asm_8071E110(func_global_asm_80714CC0(D_global_asm_8074E880[i], 0.7f, arg0->x_position, arg0->y_position, arg0->z_position), 1, (i * 1365.3334f), arg1, arg2, arg3);
func_global_asm_8071E110(drawSpriteAtPosition(D_global_asm_8074E880[i], 0.7f, arg0->x_position, arg0->y_position, arg0->z_position), 1, (i * 1365.3334f), arg1, arg2, arg3);
}
for (i = 0; i < 3; i++) {
func_global_asm_807149B8(1);
func_global_asm_807149FC(-1);
func_global_asm_80714950(arg0);
func_global_asm_8071498C(func_global_asm_8071E1C8);
func_global_asm_8071E110(func_global_asm_80714CC0(D_global_asm_8074E880[i], 0.7f, arg0->x_position, arg0->y_position, arg0->z_position), 0, (i * 1365.3334f), arg1, arg2, arg3);
func_global_asm_8071E110(drawSpriteAtPosition(D_global_asm_8074E880[i], 0.7f, arg0->x_position, arg0->y_position, arg0->z_position), 0, (i * 1365.3334f), arg1, arg2, arg3);
}
}
@ -595,7 +595,7 @@ void func_global_asm_80686CF8(Actor *arg0) {
func_global_asm_807149FC(1);
func_global_asm_8071498C(func_global_asm_8071EA24);
func_global_asm_8071496C(i / 7);
func_global_asm_80714CC0(D_global_asm_8074E880[i % 3], 1.4f, arg0->x_position, arg0->y_position + 10.0f, arg0->z_position);
drawSpriteAtPosition(D_global_asm_8074E880[i % 3], 1.4f, arg0->x_position, arg0->y_position + 10.0f, arg0->z_position);
}
}
@ -620,7 +620,7 @@ void func_global_asm_80686E40(f32 arg0, f32 arg1, f32 arg2, s32 arg3) {
func_global_asm_8071498C(&func_global_asm_80717930);
func_global_asm_8071496C(i >> var_s4);
func_global_asm_80714950(arg3);
func_global_asm_80714CC0(D_global_asm_8074E880[i % 3], 0.5f, arg0, arg1, arg2);
drawSpriteAtPosition(D_global_asm_8074E880[i % 3], 0.5f, arg0, arg1, arg2);
}
}
@ -705,7 +705,7 @@ void func_global_asm_80687400(void) {
func_global_asm_807149FC(0xC8);
func_global_asm_8071495C();
func_global_asm_8071498C(&func_global_asm_8071EFDC);
func_global_asm_80714CC0(&D_global_asm_80721158, 1.0f, 160.0f, 120.0f, -10.0f);
drawSpriteAtPosition(&D_global_asm_80721158, 1.0f, 160.0f, 120.0f, -10.0f);
}
void func_global_asm_80687474(Actor *arg0, f32 arg1) {
@ -755,7 +755,7 @@ void func_global_asm_8068780C(u8 arg0, u8 arg1, u8 arg2, u8 arg3) {
func_global_asm_807149FC(1);
func_global_asm_80714950(sp5C);
func_global_asm_8071498C(&func_global_asm_8071E028);
func_global_asm_80714CC0(&D_global_asm_80720B24, sp48 * 0.008, (sp74 + sp68) * 0.5, (sp70 + sp64) * 0.5, (sp6C + sp60) * 0.5);
drawSpriteAtPosition(&D_global_asm_80720B24, sp48 * 0.008, (sp74 + sp68) * 0.5, (sp70 + sp64) * 0.5, (sp6C + sp60) * 0.5);
if (((rand() >> 0xF) % 1000) & 1) {
func_global_asm_806595F0(1);
func_global_asm_8065A708(current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position, 0.0f, 0.0f, 0.0f, 150.0f, 0, 0x96, 0x64, 0xFF);
@ -774,7 +774,7 @@ void func_global_asm_80687C48(void) {
func_global_asm_807149FC(0xC8);
func_global_asm_8071495C();
func_global_asm_8071498C(&func_global_asm_8071EFDC);
func_global_asm_80714CC0(&D_global_asm_80720558, 1.0f, 160.0f, 120.0f, -10.0f);
drawSpriteAtPosition(&D_global_asm_80720558, 1.0f, 160.0f, 120.0f, -10.0f);
}
void func_global_asm_80687CC8(void) {
@ -783,5 +783,5 @@ void func_global_asm_80687CC8(void) {
func_global_asm_807149FC(0xC8);
func_global_asm_8071495C();
func_global_asm_8071498C(&func_global_asm_8071EFDC);
func_global_asm_80714CC0(&D_global_asm_807210EC, 1.0f, 160.0f, 120.0f, -10.0f);
drawSpriteAtPosition(&D_global_asm_807210EC, 1.0f, 160.0f, 120.0f, -10.0f);
}

14
src/global_asm/code_8F4B0.c
View File

@ -481,10 +481,10 @@ Gfx *func_global_asm_8068D9DC(Gfx *dl, Struct8068D9DC_arg1 *arg1) {
gDPSetCombineMode(dl++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
gDPSetPrimColor(dl++, 0, 0, 0xFF, 0xFF, 0xFF, 0x96);
func_dk64_boot_800031E0(&sp3C, &D_global_asm_80759F30, arg1->unk14);
sprintf(&sp3C, &D_global_asm_80759F30, arg1->unk14);
dl = func_global_asm_806FC530(dl, 3, 0x424, 0x50, &sp3C, 1);
dl = func_global_asm_806FC530(dl, 1, 0x50, 0x50, &D_global_asm_80759F34, 1);
func_dk64_boot_800031E0(&sp38, &D_global_asm_80759F38, arg1->unk1C);
sprintf(&sp38, &D_global_asm_80759F38, arg1->unk1C);
return func_global_asm_806FC530(dl, 3, 0x50, 0xB0, &sp38, 1);
}
*/
@ -496,7 +496,7 @@ Gfx *func_global_asm_8068DAF4(Gfx *dl, u8 *arg1) {
gDPSetCombineMode(dl++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
gDPSetPrimColor(dl++, 0, 0, 0xFF, 0xFF, 0xFF, 0x96);
func_dk64_boot_800031E0(&sp38, &D_global_asm_80759F3C, *arg1);
sprintf(&sp38, &D_global_asm_80759F3C, *arg1);
return func_global_asm_806FC530(dl, 3, 0x104, 0x50, &sp38, 1);
}
@ -522,7 +522,7 @@ Gfx *func_global_asm_8068DBA4(Gfx *dl, Struct8068DBA4_arg1 *arg1) {
gDPSetCombineMode(dl++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
gDPSetPrimColor(dl++, 0, 0, 0xFF, 0xFF, 0xFF, 0x96);
func_dk64_boot_800031E0(&sp34, &D_global_asm_80759F40, arg1->unk14);
sprintf(&sp34, &D_global_asm_80759F40, arg1->unk14);
return func_global_asm_806FC530(dl, 3, 0x370, 0x50, &sp34, 1);
}
*/
@ -544,15 +544,15 @@ Gfx *func_global_asm_8068E7B4(Gfx *dl, f32 arg1, f32 arg2, s32 seconds) {
s32 sp2C;
sp50 = arg2 - (func_global_asm_806FD894(0x86) * 0.5f);
func_dk64_boot_800031E0(&sp3C, &D_global_asm_80759F4C);
sprintf(&sp3C, &D_global_asm_80759F4C);
sp4C = getCenterOfString(6, &sp3C) * 0.5f;
sp54 = arg1 - sp4C;
sp2C = sp50 * 4.0f;
minutes = seconds / 60;
dl = func_global_asm_806FC530(dl, 6, sp54 * 4.0f, sp2C, &sp3C, 1);
func_dk64_boot_800031E0(&sp3C, &D_global_asm_80759F50, minutes);
sprintf(&sp3C, &D_global_asm_80759F50, minutes);
sp54 -= getCenterOfString(0x86, &sp3C);
dl = func_global_asm_806FC530(dl, 0x86, sp54 * 4.0f, sp2C, &sp3C, 1);
func_dk64_boot_800031E0(&sp3C, &D_global_asm_80759F54, seconds - (minutes * 60));
sprintf(&sp3C, &D_global_asm_80759F54, seconds - (minutes * 60));
return func_global_asm_806FC530(dl, 0x86, (arg1 + sp4C) * 4.0f, sp2C, &sp3C, 1);
}

8
src/global_asm/code_936B0.c
View File

@ -442,7 +442,7 @@ void func_global_asm_806915B0(void) {
func_global_asm_80714950(i * -0x14);
func_global_asm_80714998(3);
func_global_asm_8071498C(func_global_asm_80717D4C);
func_global_asm_80714CC0(
drawSpriteAtPosition(
&D_global_asm_8071FFA0,
2.0f,
current_actor_pointer->x_position + randomX,
@ -621,7 +621,7 @@ void func_global_asm_80692640(void) {
func_global_asm_807149FC(1);
func_global_asm_8071498C(&func_global_asm_8071D260);
func_global_asm_80714950(0xC);
func_global_asm_80714CC0(&D_global_asm_807202D0, 0.75f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_807202D0, 0.75f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
}
playSoundAtPosition(current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position, 0x61, 0xFF, 0x7F, 0x1E, 0, 0.0f, 0);
deleteActor(current_actor_pointer);
@ -641,7 +641,7 @@ void func_global_asm_8069329C(void) {
func_global_asm_807149B8(1);
func_global_asm_80714950(0x1006E);
func_global_asm_8071498C(&func_global_asm_8071A8B0);
func_global_asm_80714CC0(&D_global_asm_80720120, 2.0f, current_actor_pointer->x_position, current_actor_pointer->y_position + 22.0f, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_80720120, 2.0f, current_actor_pointer->x_position, current_actor_pointer->y_position + 22.0f, current_actor_pointer->z_position);
for (i = 0; i < cc_number_of_players; i++) {
func_global_asm_8061EF4C(character_change_array[i].player_pointer->PaaD->unk104, 7, 0x16, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position, 200.0f, 400.0f);
}
@ -651,7 +651,7 @@ void func_global_asm_8069329C(void) {
func_global_asm_807149B8(1);
func_global_asm_80714950(i + 0x0B010000);
func_global_asm_8071498C(&func_global_asm_8071ABDC);
func_global_asm_80714CC0(&D_global_asm_807200EC, 0.35f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_807200EC, 0.35f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
}
}
func_global_asm_80608528(current_actor_pointer, 0xF6, 0xFF, 0x7F, 0x1E);

2
src/global_asm/code_9BF30.c
View File

@ -164,7 +164,7 @@ void func_global_asm_80697CEC(void) {
func_global_asm_807149B8(1);
func_global_asm_80714950(i + 0x0B000000);
func_global_asm_8071498C(&func_global_asm_8071ABDC);
func_global_asm_80714CC0(&D_global_asm_8071FBA0, (((rand() >> 0xF) % 10) * 0.05) + 0.2, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FBA0, (((rand() >> 0xF) % 10) * 0.05) + 0.2, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
}
}
deleteActor(current_actor_pointer);

2
src/global_asm/code_A2F10.c
View File

@ -605,7 +605,7 @@ void func_global_asm_806A0330(void) {
func_global_asm_807149B8(1);
func_global_asm_8071498C(&func_global_asm_8071BB14);
func_global_asm_807149C8(0xFF, 0xFF, 0xFF, 0x96);
func_global_asm_80714CC0(&D_global_asm_80720BE8, 1.5f, sp68, sp64, sp60);
drawSpriteAtPosition(&D_global_asm_80720BE8, 1.5f, sp68, sp64, sp60);
}
deleteActor(current_actor_pointer);
}

6
src/global_asm/code_A6280.c
View File

@ -23,7 +23,7 @@ void func_global_asm_806A1580(void) {
Actor *sp30;
sp36 = func_global_asm_80688E68(current_actor_pointer);
sp30 = func_global_asm_807270C0(2, 0);
sp30 = getSpawnerTiedActor(2, 0);
if (!(current_actor_pointer->object_properties_bitfield & 0x10)) {
current_actor_pointer->unk130 = 0x46;
current_actor_pointer->unk131 = 0x32;
@ -158,7 +158,7 @@ void func_global_asm_806A1AC4(void) {
func_global_asm_807149B8(1);
func_global_asm_807149C8(0x8C, 0x8C, 0x8C, 0xFF);
func_global_asm_80714998(5);
func_global_asm_80714CC0(&D_global_asm_8071FFA0, temp_f20, current_actor_pointer->x_position, current_actor_pointer->y_position + 50.0f, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FFA0, temp_f20, current_actor_pointer->x_position, current_actor_pointer->y_position + 50.0f, current_actor_pointer->z_position);
}
}
break;
@ -256,7 +256,7 @@ void func_global_asm_806A1FD8(void) {
func_global_asm_80714950(-0x64);
func_global_asm_807149C8(0x64, 0x46, 0x1E, 0xFF);
func_global_asm_80671C0C(current_actor_pointer, i, &sp54, &sp50, &sp4C);
func_global_asm_80714CC0(&D_global_asm_8071FF18, 2.0f, sp54, sp50 + 10.0, sp4C);
drawSpriteAtPosition(&D_global_asm_8071FF18, 2.0f, sp54, sp50 + 10.0, sp4C);
}
aaD->unk0 = 0xF;
func_global_asm_80608528(current_actor_pointer, 0x1C1, 0xFF, 0x7F, 1);

2
src/global_asm/code_A8400.c
View File

@ -198,7 +198,7 @@ void func_global_asm_806A495C(void *arg0, void *arg1, void *arg2) {
func_global_asm_80714998(2);
func_global_asm_80714A68(arg2->unk44, arg2->unk48, arg2->unk4C, arg2->unk50);
temp_v1 = &arg0->unk10;
temp_v0 = func_global_asm_80714CC0(D_global_asm_80755390[temp_v1->unk0], 1.0f, arg2->unk44, arg2->unk48, 1.0f);
temp_v0 = drawSpriteAtPosition(D_global_asm_80755390[temp_v1->unk0], 1.0f, arg2->unk44, arg2->unk48, 1.0f);
temp_v1->unk4 = temp_v0;
if (temp_v1->unk2 != 0) {
temp_v0->unk360 = temp_v0->unk360 * -1.0f;

6
src/global_asm/code_ACDC0.c
View File

@ -527,14 +527,14 @@ void func_global_asm_806AB808(void *arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4
}
switch (arg7) {
case 1:
func_dk64_boot_800031E0(&sp2C, &D_global_asm_8075AB04, arg5);
sprintf(&sp2C, &D_global_asm_8075AB04, arg5);
break;
case 2:
func_dk64_boot_800031E0(&sp2C, &D_global_asm_8075AB0C, arg5);
sprintf(&sp2C, &D_global_asm_8075AB0C, arg5);
arg3 -= getCenterOfString(1, &sp2C) >> 1;
break;
default:
func_dk64_boot_800031E0(&sp2C, &D_global_asm_8075AB10, arg5);
sprintf(&sp2C, &D_global_asm_8075AB10, arg5);
break;
}
if (sp37 != 0) {

2
src/global_asm/code_B2CE0.c
View File

@ -51,7 +51,7 @@ void func_global_asm_806ADFE0(void) {
return;
}
if (((current_actor_pointer->unk6A & 1) != 0) && (current_actor_pointer->unk6C & 1)) {
func_global_asm_80714CC0(&D_global_asm_8071FBC8, 1.0f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FBC8, 1.0f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
deleteActor(current_actor_pointer);
}
}

2
src/global_asm/code_B7490.c
View File

@ -174,7 +174,7 @@ void func_global_asm_806B3680(void) {
func_global_asm_80714950(i + 0x0B020000);
func_global_asm_8071498C(sp44);
func_global_asm_80714998(1);
func_global_asm_80714CC0(&D_global_asm_8072073C, 2.0 * current_actor_pointer->animation_state->scale_y, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8072073C, 2.0 * current_actor_pointer->animation_state->scale_y, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
}
func_global_asm_80608528(current_actor_pointer, 0x3D, 0xFF, 0x7F, 0);
playSoundAtPosition(current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position, 0x35C, 0xFF, 0x7F, 0, 0x32, D_global_asm_8075B5D8, 0);

2
src/global_asm/code_BC3B0.c
View File

@ -225,7 +225,7 @@ void func_global_asm_806B83E4(void) {
func_global_asm_807149B8(1);
func_global_asm_80714950(-0x1C2);
func_global_asm_8071498C(&func_global_asm_80717D4C);
func_global_asm_80714CC0(&D_global_asm_807201D4, 1.2f, current_actor_pointer->x_position, current_actor_pointer->y_position + 7.0, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_807201D4, 1.2f, current_actor_pointer->x_position, current_actor_pointer->y_position + 7.0, current_actor_pointer->z_position);
}
if (D_global_asm_807FDC90->unk2C != 0) {
func_global_asm_8065A708(current_actor_pointer->x_position, current_actor_pointer->y_position + 7.0, current_actor_pointer->z_position, 0.0f, 0.0f, 0.0f, 200.0f, 0, 0xFF, 0xC8, 0);

4
src/global_asm/code_BDEE0.c
View File

@ -31,7 +31,7 @@ void func_global_asm_806B9CE0(u8 arg0, s8 arg1) {
break;
}
func_global_asm_807149B8(1);
func_global_asm_80714CC0(
drawSpriteAtPosition(
D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3],
(((rand() >> 0xF) % 256) * 0.001953125) + 0.5,
((rand() >> 0xF) % 6) + (current_actor_pointer->x_position - 3.0f),
@ -146,7 +146,7 @@ s32 func_global_asm_806BA240(u8 arg0, s16 arg1) {
current_actor_pointer->object_properties_bitfield |= 0x20000000;
if (current_actor_pointer->unkF0 == 0) {
current_actor_pointer->unkF0 = 0x28;
func_global_asm_80714CC0(&D_global_asm_8071FB34, 2.0f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FB34, 2.0f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
playSound(0x1CA, 0x7FFF, 63.0f, 1.0f, 0, 0);
playActorAnimation(temp_s0, 0x220);
temp_s0->control_state_progress = 2;

8
src/global_asm/code_C2A90.c
View File

@ -224,9 +224,9 @@ Gfx *func_global_asm_806BE6F0(Gfx *dl, Actor *arg1) {
temp_t7 = (arg1->unk168 / 30);
if (temp_t7) {
func_dk64_boot_800031E0(&sp4C, "%d", MIN(3, temp_t7));
sprintf(&sp4C, "%d", MIN(3, temp_t7));
} else {
func_dk64_boot_800031E0(&sp4C, func_global_asm_8070E750(0x26, 9, 1));
sprintf(&sp4C, func_global_asm_8070E750(0x26, 9, 1));
}
if ((arg1->unk168 % 30) == 0) {
if (temp_t7) {
@ -811,7 +811,7 @@ void func_global_asm_806C226C(void) {
func_global_asm_8071498C(&func_global_asm_80718BF4);
func_global_asm_807149B8(1);
func_global_asm_807149FC(-1);
func_global_asm_80714CC0(&D_global_asm_8071FC40, 0.0f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FC40, 0.0f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
}
} else {
if ((current_actor_pointer->unk6A ^ current_actor_pointer->unk6C) & 1) {
@ -927,7 +927,7 @@ void func_global_asm_806C2A64(u8 arg0, u8 arg1, u8 arg2, f32 arg3, f32 arg4, f32
func_global_asm_807149C8(arg0, arg1, arg2, 0xFF);
func_global_asm_8071498C(&func_global_asm_80717D84);
func_global_asm_80714950(2);
func_global_asm_80714CC0(arg6, arg7 * 0.2, arg3, arg4, arg5);
drawSpriteAtPosition(arg6, arg7 * 0.2, arg3, arg4, arg5);
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_C2A90/func_global_asm_806C2B2C.s")

6
src/global_asm/code_CEAE0.c
View File

@ -268,7 +268,7 @@ s32 func_global_asm_806CA1B4(s32 arg0) {
if (extra_player_info_pointer->unk247 >= 0) {
phi_v1 = character_change_array[extra_player_info_pointer->unk247].player_pointer;
} else if (extra_player_info_pointer->unk246 > 0) {
phi_v1 = func_global_asm_807270C0(extra_player_info_pointer->unk246, 0);
phi_v1 = getSpawnerTiedActor(extra_player_info_pointer->unk246, 0);
}
if (phi_v1) {
@ -459,7 +459,7 @@ void func_global_asm_806CB53C(void) {
func_global_asm_8071498C(&func_global_asm_80716FB4);
func_global_asm_807149B8(1);
func_global_asm_807149FC(3);
func_global_asm_80714CC0(&D_global_asm_8071FB08, 1.0f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FB08, 1.0f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
}
if (extra_player_info_pointer->unk1FE == 0) {
func_global_asm_80602B60(0x6C, 0);
@ -1494,7 +1494,7 @@ void func_global_asm_806CF878(void) {
func_global_asm_80714998(2);
func_global_asm_807149B8(1);
func_global_asm_8071498C(&func_global_asm_80716FB4);
func_global_asm_80714CC0(&D_global_asm_8071FB08, 0.8f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FB08, 0.8f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
}
}
}

4
src/global_asm/code_D78D0.c
View File

@ -995,7 +995,7 @@ void func_global_asm_806D5300(void) {
func_global_asm_80714950(D_global_asm_80750FC4);
func_global_asm_8071498C(&func_global_asm_80717D4C);
func_global_asm_807149B8(1);
func_global_asm_80714CC0(D_global_asm_8074E880[((rand() % 10000) % 3)],
drawSpriteAtPosition(D_global_asm_8074E880[((rand() % 10000) % 3)],
D_global_asm_80750FC0 * temp_f20,
(temp_f24 * temp_f20) + sp90,
(temp_f26 * temp_f20) + sp8C,
@ -2119,7 +2119,7 @@ void func_global_asm_806D9AD4(void) {
func_global_asm_807149B8(1);
func_global_asm_80714950((extra_player_info_pointer->unk23C << 0x10) + (s32)(15.0 * (current_actor_pointer->shadow_opacity / 255.0)));
func_global_asm_8071498C(&func_global_asm_80717100);
func_global_asm_80714CC0(&D_global_asm_8071FC8C, 0.5f, current_actor_pointer->x_position, sp28, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FC8C, 0.5f, current_actor_pointer->x_position, sp28, current_actor_pointer->z_position);
}
switch (current_actor_pointer->control_state_progress) {
case 0:

4
src/global_asm/code_F9450.c
View File

@ -672,7 +672,7 @@ void func_global_asm_806F70FC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4,
func_global_asm_80714950(0x1006E);
func_global_asm_8071498C(&func_global_asm_8071C48C);
func_global_asm_807149B8(1);
func_global_asm_80714CC0(&D_global_asm_8071FC58, arg3, arg0, arg1, arg2);
drawSpriteAtPosition(&D_global_asm_8071FC58, arg3, arg0, arg1, arg2);
temp_f20 = 1000.0 / (arg4 + arg4);
for (i = 0; i < arg5; i++) {
phi_f4 = (func_global_asm_806119A0() / 10000U) % 1000;
@ -681,7 +681,7 @@ void func_global_asm_806F70FC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4,
func_global_asm_8071498C(&func_global_asm_8071C620);
func_global_asm_8071496C(i);
func_global_asm_807149B8(1);
func_global_asm_80714CC0(
drawSpriteAtPosition(
&D_global_asm_8071FC58,
arg3,
arg0 + ((phi_f4 / arg4) - temp_f20),

4
src/global_asm/done/code_68EA0.c
View File

@ -143,7 +143,7 @@ void func_global_asm_80664834(s16 arg0) {
func_global_asm_807149C8(0xFF, 0xC8, 0xC8, 0xC8);
func_global_asm_80714A08(0.2f, 0.1f);
func_global_asm_80714A28(4);
func_global_asm_80714CC0(
drawSpriteAtPosition(
&D_global_asm_807213D0,
0.0f,
(D_global_asm_807F9430[arg0].unk2 + (((rand() % 10000) % 100) / 20.0)) - 2.5,
@ -161,7 +161,7 @@ void func_global_asm_80664A38(s16 arg0) {
func_global_asm_807149B8(1);
func_global_asm_80714998(2);
func_global_asm_80714A28(4);
func_global_asm_80714CC0(
drawSpriteAtPosition(
&D_global_asm_80720A7C,
0.4f,
D_global_asm_807F9430[arg0].unk2 + (((((rand() % 10000) % 300) / 20.0) - 7.5) * sp34),

4
src/global_asm/done/code_BD820.c
View File

@ -15,7 +15,7 @@ void func_global_asm_806B8B20(s16 arg0, s16 arg1, s16 arg2, s16 arg3) {
func_global_asm_807149FC(-1);
func_global_asm_807149B8(1);
func_global_asm_8071496C(arg3);
func_global_asm_80714CC0(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3], 1.8f, arg0, arg1, arg2);
drawSpriteAtPosition(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3], 1.8f, arg0, arg1, arg2);
}
void func_global_asm_806B8BDC(s16 arg0, s16 arg1, s16 arg2) {
@ -24,7 +24,7 @@ void func_global_asm_806B8BDC(s16 arg0, s16 arg1, s16 arg2) {
func_global_asm_80714950(-0x28);
func_global_asm_807149B8(1);
func_global_asm_807149C8(0xFF, 0xFF, 0xFF, 0xC8);
func_global_asm_80714CC0(&D_global_asm_8071FFA0, 2.0f, arg0, arg1, arg2);
drawSpriteAtPosition(&D_global_asm_8071FFA0, 2.0f, arg0, arg1, arg2);
}
void func_global_asm_806B8C78(void) {

4
src/global_asm/hud.c
View File

@ -776,7 +776,7 @@ void func_global_asm_806F9744(Struct806F9744_arg0 *arg0, s32 arg1, f32 arg2, f32
if (arg1 == 3) {
func_global_asm_807149C8(0xFF, 0, 0, 0xFF);
}
temp_s0->unk8 = func_global_asm_80714CC0(func_global_asm_806FACE8(arg1), 1.0f, arg2, arg3, -10.0f);
temp_s0->unk8 = drawSpriteAtPosition(func_global_asm_806FACE8(arg1), 1.0f, arg2, arg3, -10.0f);
temp_s0->unk2 = 0;
if (arg1 == 7) {
temp_s0->unk4 = 1;
@ -828,7 +828,7 @@ void func_global_asm_806F9B64(s32 arg0) {
func_global_asm_8071498C(&func_global_asm_806F9AF0);
func_global_asm_80714950(i);
D_global_asm_807FD7A0[i] = -100.0f;
func_global_asm_80714CC0(var_s2[i], 1.0f, -200.0f, 0.0f, -10.0f);
drawSpriteAtPosition(var_s2[i], 1.0f, -200.0f, 0.0f, -10.0f);
}
}
*/

14
src/jetpac/code_0.c
View File

@ -133,7 +133,7 @@ void func_jetpac_80024408(Gfx **arg0) {
for (playerIndex = 0; playerIndex < 2; playerIndex++) {
player = &D_jetpac_8002EC30.player[playerIndex];
if (D_jetpac_8002EC30.player[playerIndex].lives > 0) {
func_dk64_boot_800031E0(&sp60, "%d!", D_jetpac_8002EC30.player[playerIndex].lives);
sprintf(&sp60, "%d!", D_jetpac_8002EC30.player[playerIndex].lives);
func_jetpac_8002AEFC(arg0, &sp60, (playerIndex * 0x70) + 0x60, 0x18, 0);
}
}
@ -141,11 +141,11 @@ void func_jetpac_80024408(Gfx **arg0) {
func_jetpac_8002AE94(0, 0xFF, 0xFF, 0xFF);
func_jetpac_8002AEFC(arg0, "HI", 0x98, 0x18, 0);
func_jetpac_8002AE94(0xFF, 0xFF, 0, 0xFF);
func_dk64_boot_800031E0(&sp60, "%06d", D_jetpac_8002EC50);
sprintf(&sp60, "%06d", D_jetpac_8002EC50);
func_jetpac_8002AEFC(arg0, &sp60, 0x28, 0x20, 0);
func_dk64_boot_800031E0(&sp60, "%06d", D_jetpac_8002EC48);
sprintf(&sp60, "%06d", D_jetpac_8002EC48);
func_jetpac_8002AEFC(arg0, &sp60, 0x88, 0x20, 0);
func_dk64_boot_800031E0(&sp60, "%06d", D_jetpac_8002EDE4);
sprintf(&sp60, "%06d", D_jetpac_8002EDE4);
func_jetpac_8002AEFC(arg0, &sp60, 0xE8, 0x20, 0);
}
*/
@ -169,7 +169,7 @@ void func_jetpac_8002466C(Gfx **arg0) {
func_jetpac_8002AEFC(arg0, "3@@@KEYBOARD", 0x50, 0x70, D_jetpac_8002BA6C != 0 && D_jetpac_8002EC30.unk34C == 0);
func_jetpac_8002AEFC(arg0, "4@@@KEMPSTON@JOYSTICK", 0x50, 0x80, D_jetpac_8002BA6C != 0 && D_jetpac_8002EC30.unk34C != 0);
func_jetpac_8002AEFC(arg0, "5 START GAME", 0x50, 0xB8, 0);
func_dk64_boot_800031E0(&sp28, "%c1983 A.C.G. ALL RIGHTS RESERVED", 0x7F);
sprintf(&sp28, "%c1983 A.C.G. ALL RIGHTS RESERVED", 0x7F);
func_jetpac_8002AEFC(arg0, &sp28, 0x20, 0xD8, 0);
if (D_jetpac_8002EC30.unk798 != 0) {
if (!(D_jetpac_8002EC30.unk8 & 0x1000) && (D_jetpac_8002EC30.unk799 < 0x78)) {
@ -323,10 +323,10 @@ void func_jetpac_80024D48(Gfx **arg0) {
sp4C = 7;
func_jetpac_80024408(arg0);
if ((D_jetpac_8002EC30.unk798 != 0) && (isFlagSet(0x62, FLAG_TYPE_TEMPORARY) != 0)) {
func_dk64_boot_800031E0(&sp2C, "RAREWARE COIN COLLECTED");
sprintf(&sp2C, "RAREWARE COIN COLLECTED");
sp4C = 5;
} else {
func_dk64_boot_800031E0(&sp2C, "GAME OVER PLAYER %d", D_jetpac_8002EC30.player_index + 1);
sprintf(&sp2C, "GAME OVER PLAYER %d", D_jetpac_8002EC30.player_index + 1);
}
func_jetpac_8002AE94(0xFF, 0xFF, 0xFF, 0xFF);
func_jetpac_8002AEFC(arg0, &sp2C, (sp4C * 8) + 0x20, 0x88, 0);

9
src/menu/code_0.c
View File

@ -72,7 +72,7 @@ void func_menu_800240BC(MenuStruct0 *arg0) {
func_global_asm_807149B8(1);
func_global_asm_807149FC(-1);
func_global_asm_80714998(0);
arg0->unk8 = func_global_asm_80714CC0(&D_global_asm_80720268, 0.3f, 181.0f, 3.0f, 82.0f);
arg0->unk8 = drawSpriteAtPosition(&D_global_asm_80720268, 0.3f, 181.0f, 3.0f, 82.0f);
}
void func_menu_80024154(MenuStruct0 *arg0) {
@ -195,7 +195,6 @@ void func_menu_80024418(MenuStruct0 *arg0, s32 arg1) {
}
}
void func_dk64_boot_800031E0(char *, char *, ...);
Gfx *func_global_asm_806FC530(Gfx*, s16, s16, s16, void *, s32);
s32 func_global_asm_8070E750(s32, s32, s32);
@ -227,12 +226,12 @@ Gfx *func_menu_800244EC(Gfx *dl, Actor *arg1) {
}
} else {
gDPSetPrimColor(dl++, 0, 0, 0xFF, 0xFF, 0xFF, arg1->unk15F);
func_dk64_boot_800031E0(&sp70, "q %s", func_global_asm_8070E750(0x2A, 0, 1));
sprintf(&sp70, "q %s", func_global_asm_8070E750(0x2A, 0, 1));
dl = func_global_asm_806FC530(dl, 1, 0x15E, 0x190, &sp70, 1);
func_dk64_boot_800031E0(&sp70, "b %s", func_global_asm_8070E750(0x2A, 1, 1));
sprintf(&sp70, "b %s", func_global_asm_8070E750(0x2A, 1, 1));
dl = func_global_asm_806FC530(dl, 1, 0x15E, 0x1F4, &sp70, 1);
if (snide_aad->minigame_menu_unlocked) {
func_dk64_boot_800031E0(&sp70, "n %s", func_global_asm_8070E750(0x2A, 2, 1));
sprintf(&sp70, "n %s", func_global_asm_8070E750(0x2A, 2, 1));
dl = func_global_asm_806FC530(dl, 1, 0x15E, 0x258, &sp70, 1);
}
}

4
src/menu/code_1AF0.c
View File

@ -102,9 +102,9 @@ Gfx *func_menu_80025B64(Gfx *dl, Actor *arg1) {
}
arg1->unk15F += var_a3;
gDPSetPrimColor(dl++, 0, 0, 0xFF, 0xFF, 0xFF, arg1->unk15F);
func_dk64_boot_800031E0(&sp4C, "q %s", func_global_asm_8070E750(0x24, 0x10, 1, var_a3));
sprintf(&sp4C, "q %s", func_global_asm_8070E750(0x24, 0x10, 1, var_a3));
dl = func_global_asm_806FC530(dl, 1, 0x1F4, 0x190, &sp4C, 1);
func_dk64_boot_800031E0(&sp4C, "b %s", func_global_asm_8070E750(0x24, 0x11, 1));
sprintf(&sp4C, "b %s", func_global_asm_8070E750(0x24, 0x11, 1));
dl = func_global_asm_806FC530(dl, 1, 0x1F4, 0x1F4, &sp4C, 1);
break;
}

16
src/menu/code_3E10.c
View File

@ -530,15 +530,15 @@ Gfx *func_menu_80028D3C(Actor *arg0, Gfx *dl) {
gDPSetPrimColor(dl++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF);
sp100 = func_menu_800317E8(aaD, 160.0f, 15.0f, &spFC, &spF8, 4, 1, 0.3f);
if (sp100 == 2) {
func_dk64_boot_800031E0(&sp2C, "%s", label_string_pointer_array[5]);
sprintf(&sp2C, "%s", label_string_pointer_array[5]);
} else {
if (sp100 == 3) {
sp100 = 2;
}
if (func_menu_800322D0(sp100) != 0) {
func_dk64_boot_800031E0(&sp2C, "%s", label_string_pointer_array[6]);
sprintf(&sp2C, "%s", label_string_pointer_array[6]);
} else {
func_dk64_boot_800031E0(&sp2C, "%s %d", label_string_pointer_array[7], sp100 + 1);
sprintf(&sp2C, "%s %d", label_string_pointer_array[7], sp100 + 1);
}
}
return printText(dl, spFC * 4.0f, spF8 * 4.0f, 0.6f, &sp2C);
@ -668,9 +668,9 @@ Gfx *func_menu_80029BB4(Actor *arg0, Gfx *dl) {
spFE = sp110 * 4.0f;
sp100 = sp10C * 4.0f;
if (func_menu_800322D0(sp120)) {
func_dk64_boot_800031E0(&sp34, "%s", label_string_pointer_array[6]);
sprintf(&sp34, "%s", label_string_pointer_array[6]);
} else {
func_dk64_boot_800031E0(&sp34, "%s %d", label_string_pointer_array[7], sp120 + 1);
sprintf(&sp34, "%s %d", label_string_pointer_array[7], sp120 + 1);
}
dl = printText(dl, spFE, sp100, 0.6f, &sp34);
sp100 -= 0x3C;
@ -712,9 +712,9 @@ void func_menu_80029EF8(Actor *arg0, s32 arg1) {
if (arg1 & 1) {
if ((arg1 & 8) && (D_menu_80033FAC != 0)) {
func_global_asm_8071495C();
func_global_asm_80714CC0(&D_global_asm_8071FBC8, 10.3f, 240.0f, 120.0f, -10.0f);
drawSpriteAtPosition(&D_global_asm_8071FBC8, 10.3f, 240.0f, 120.0f, -10.0f);
func_global_asm_8071495C();
func_global_asm_80714CC0(&D_global_asm_8071FE08, 10.3f, 240.0f, 120.0f, -10.0f);
drawSpriteAtPosition(&D_global_asm_8071FE08, 10.3f, 240.0f, 120.0f, -10.0f);
playSound(0xF6, 0x7FFF, 63.0f, 1.0f, 0, 0);
func_global_asm_8060C830(D_menu_80033F48, 1);
MaaD->unk16 = 0;
@ -1551,7 +1551,7 @@ void func_menu_80030894(MenuAdditionalActorData *arg0, void *arg1, s32 arg2, s32
func_global_asm_80714950(arg0);
func_global_asm_8071498C(&func_menu_80030C14);
func_global_asm_80714A28(1);
sp3C = func_global_asm_80714CC0(arg1, arg4, arg2, arg3, -10.0f);
sp3C = drawSpriteAtPosition(arg1, arg4, arg2, arg3, -10.0f);
temp_v0 = malloc(sizeof(Struct80717D84_80030894));
sp3C->unk384 = temp_v0;
temp_v0->unk0 = arg6;

2
src/minecart/code_25F0.c
View File

@ -107,7 +107,7 @@ void func_minecart_80026C54(void) {
func_global_asm_8071498C(&func_global_asm_80717D4C);
func_global_asm_807149B8(1);
func_global_asm_80714A28(4);
func_global_asm_80714CC0(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3],
drawSpriteAtPosition(D_global_asm_8074E880[((rand() >> 0xF) % 1000) % 3],
0.5f,
((rand() >> 0xF) % 20) + (current_actor_pointer->x_position - 10.0f),
current_actor_pointer->y_position,

2
src/multiplayer/code_0.c
View File

@ -443,7 +443,7 @@ void func_multiplayer_80025B48(Struct80025B48 *arg0) {
if (var_a2 == 3) {
var_a2 += (((rand() >> 0xF) % 32767) % 5);
}
arg0->unk18 = func_global_asm_807270C0(var_a2, 0);
arg0->unk18 = getSpawnerTiedActor(var_a2, 0);
if (arg0->unk18 == NULL) {
arg0->unk18 = func_global_asm_807271F4(var_a2, 0, 0, 0, 0, 0, 0);
}

4
src/race/code_0.c
View File

@ -488,7 +488,7 @@ void func_race_800274C0(void) {
}
if (D_global_asm_807FBB70.unk200 == 9 || D_global_asm_807FBB70.unk15 != 0 || D_global_asm_807FBB70.unk200 == 5) {
func_global_asm_807149B8(1);
func_global_asm_80714CC0(&D_global_asm_80720340, 3.0f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_80720340, 3.0f, current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position);
playSoundAtPosition(current_actor_pointer->x_position, current_actor_pointer->y_position, current_actor_pointer->z_position, 0xF6, 0xFF, 0x7F, 0x14, 0x32, 0.3f, 0);
var_v1 = TRUE;
}
@ -496,7 +496,7 @@ void func_race_800274C0(void) {
current_actor_pointer->y_position += 5.0f;
if (temp_s1->unk0_u16[0] != 0) {
func_global_asm_807149B8(1);
func_global_asm_80714CC0(&D_global_asm_8071FFA0, 1.0f, current_actor_pointer->x_position, current_actor_pointer->y_position + 10.0f, current_actor_pointer->z_position);
drawSpriteAtPosition(&D_global_asm_8071FFA0, 1.0f, current_actor_pointer->x_position, current_actor_pointer->y_position + 10.0f, current_actor_pointer->z_position);
temp_s1->unk0_u16[0]--;
if (!(temp_s1->unk0_u16[0])) {
var_v1 = TRUE;

2
src/race/code_36B0.c
View File

@ -313,7 +313,7 @@ void func_race_80029054(void) {
current_actor_pointer->noclip_byte = 0x3C;
a178->unk4 = 0.5f;
func_global_asm_8066EA90(current_actor_pointer, 1);
a17C->unk30 = func_global_asm_807270C0(1, 0);
a17C->unk30 = getSpawnerTiedActor(1, 0);
current_actor_pointer->object_properties_bitfield &= ~1;
}
temp = a17C->unk30;

3
symbol_addrs.us.txt
View File

@ -8,6 +8,7 @@ D_2000080 = 0x2000080;
D_20000C0 = 0x20000C0;
D_2000180 = 0x2000180;
sprintf = 0x800031E0; // segment:dk64_boot
strchr = 0x80002ECC; // segment:dk64_boot
strcpy = 0x80002A30; // segment:dk64_boot
strlen = 0x80002F18; // segment:dk64_boot
@ -209,6 +210,8 @@ __osViIntrCount = 0x80014FEC; // segment:dk64_boot
__osTimerCounter = 0x80014FF0; // segment:dk64_boot
__osEepPifRam = 0x800162E0; // segment:dk64_boot
drawSpriteAtPosition = 0x80714CC0; // segment:global_asm
getSpawnerTiedActor = 0x807270C0; // segment:global_asm
getCenterOfString = 0x806FBD5C; // segment:global_asm
handleInputsForControlState = 0x806DF6D4; // segment:global_asm
setYAccelerationFrom80753578 = 0x806CFE7C; // segment:global_asm