falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Identify sparksTick, activeMenuTick, menuTick and doBoostAndSlayerSfx

This commit is contained in:
Ryan Dwyer 2020-03-15 22:45:06 +10:00
parent 72531a3400
commit ada4be8401
8 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/chr/chr.c
View File

@ -15,7 +15,7 @@ const u32 var7f1a8688[] = {0x00000000};
const u32 var7f1a868c[] = {0x00000000};
GLOBAL_ASM(
glabel func0f01e050
glabel sparksTick
/* f01e050: 27bdffe0 */ addiu $sp,$sp,-32
/* f01e054: 3c0b8008 */ lui $t3,%hi(var8007f0b8)
/* f01e058: 256bf0b8 */ addiu $t3,$t3,%lo(var8007f0b8)

2
src/game/game_01b0a0.c
View File

@ -98,7 +98,7 @@ glabel func0f01b154
);
GLOBAL_ASM(
glabel func0f01b160
glabel activemenuTick
/* f01b160: 27bdff20 */ addiu $sp,$sp,-224
/* f01b164: 3c06800a */ lui $a2,%hi(g_Vars)
/* f01b168: 24c69fc0 */ addiu $a2,$a2,%lo(g_Vars)

28
src/game/game_01bea0.c
View File

@ -74,36 +74,36 @@ void menuCountDialogs(void)
}
GLOBAL_ASM(
glabel func0f01bf28
glabel menuTick
.late_rodata
glabel var7f1a8608
.word 0x3ca3d70a
glabel var7f1a860c
.word func0f01bf28+0x168c # f01d5b4
.word menuTick+0x168c # f01d5b4
glabel var7f1a8610
.word func0f01bf28+0x168c # f01d5b4
.word menuTick+0x168c # f01d5b4
glabel var7f1a8614
.word func0f01bf28+0x168c # f01d5b4
.word menuTick+0x168c # f01d5b4
glabel var7f1a8618
.word func0f01bf28+0x16c0 # f01d5e8
.word menuTick+0x16c0 # f01d5e8
glabel var7f1a861c
.word func0f01bf28+0x168c # f01d5b4
.word menuTick+0x168c # f01d5b4
glabel var7f1a8620
.word func0f01bf28+0x168c # f01d5b4
.word menuTick+0x168c # f01d5b4
glabel var7f1a8624
.word func0f01bf28+0x168c # f01d5b4
.word menuTick+0x168c # f01d5b4
glabel var7f1a8628
.word func0f01bf28+0x16c0 # f01d5e8
.word menuTick+0x16c0 # f01d5e8
glabel var7f1a862c
.word func0f01bf28+0x16c0 # f01d5e8
.word menuTick+0x16c0 # f01d5e8
glabel var7f1a8630
.word func0f01bf28+0x168c # f01d5b4
.word menuTick+0x168c # f01d5b4
glabel var7f1a8634
.word func0f01bf28+0x168c # f01d5b4
.word menuTick+0x168c # f01d5b4
glabel var7f1a8638
.word func0f01bf28+0x16c0 # f01d5e8
.word menuTick+0x16c0 # f01d5e8
glabel var7f1a863c
.word func0f01bf28+0x168c # f01d5b4
.word menuTick+0x168c # f01d5b4
.text
/* f01bf28: 27bdfe98 */ addiu $sp,$sp,-360
/* f01bf2c: 3c0e8007 */ lui $t6,%hi(var800706c8)

26
src/game/game_167ae0.c
View File

@ -240,7 +240,7 @@ glabel func0f167b84
/* f167c84: 00000000 */ sll $zero,$zero,0x0
);
void func0f167c88(void)
void doBoostAndSlayerSfx(void)
{
s32 i;
@ -5336,7 +5336,7 @@ glabel func0f16b96c
/* f16c8d4: 2401005d */ addiu $at,$zero,0x5d
/* f16c8d8: 0fc4a24b */ jal setCurrentPlayerNum
/* f16c8dc: 00002025 */ or $a0,$zero,$zero
/* f16c8e0: 0fc06fca */ jal func0f01bf28
/* f16c8e0: 0fc06fca */ jal menuTick
/* f16c8e4: 00000000 */ sll $zero,$zero,0x0
/* f16c8e8: 0c004761 */ jal func00011d84
/* f16c8ec: 00000000 */ sll $zero,$zero,0x0
@ -5350,7 +5350,7 @@ glabel func0f16b96c
.L0f16c90c:
/* f16c90c: 5441000c */ bnel $v0,$at,.L0f16c940
/* f16c910: 2401005c */ addiu $at,$zero,0x5c
/* f16c914: 0fc06fca */ jal func0f01bf28
/* f16c914: 0fc06fca */ jal menuTick
/* f16c918: 00000000 */ sll $zero,$zero,0x0
/* f16c91c: 0c004761 */ jal func00011d84
/* f16c920: 00000000 */ sll $zero,$zero,0x0
@ -5385,7 +5385,7 @@ glabel func0f16b96c
/* f16c98c: 00000000 */ sll $zero,$zero,0x0
/* f16c990: 0fc0778c */ jal func0f01de30
/* f16c994: 00000000 */ sll $zero,$zero,0x0
/* f16c998: 0fc07814 */ jal func0f01e050
/* f16c998: 0fc07814 */ jal sparksTick
/* f16c99c: 00000000 */ sll $zero,$zero,0x0
/* f16c9a0: 0fc4fad1 */ jal func0f13eb44
/* f16c9a4: 00000000 */ sll $zero,$zero,0x0
@ -5405,7 +5405,7 @@ glabel func0f16b96c
/* f16c9d8: 0fc027ab */ jal func0f009eac
/* f16c9dc: 00000000 */ sll $zero,$zero,0x0
.L0f16c9e0:
/* f16c9e0: 0fc59f22 */ jal func0f167c88
/* f16c9e0: 0fc59f22 */ jal doBoostAndSlayerSfx
/* f16c9e4: 00000000 */ sll $zero,$zero,0x0
/* f16c9e8: 0c003fa2 */ jal func0000fe88
/* f16c9ec: 00000000 */ sll $zero,$zero,0x0
@ -5417,9 +5417,9 @@ glabel func0f16b96c
/* f16ca04: 00000000 */ sll $zero,$zero,0x0
/* f16ca08: 0fc2bbee */ jal func0f0aefb8
/* f16ca0c: 00000000 */ sll $zero,$zero,0x0
/* f16ca10: 0fc06c58 */ jal func0f01b160
/* f16ca10: 0fc06c58 */ jal activemenuTick
/* f16ca14: 00000000 */ sll $zero,$zero,0x0
/* f16ca18: 0fc06fca */ jal func0f01bf28
/* f16ca18: 0fc06fca */ jal menuTick
/* f16ca1c: 00000000 */ sll $zero,$zero,0x0
/* f16ca20: 0fc615ab */ jal scenarioCallback10
/* f16ca24: 00000000 */ sll $zero,$zero,0x0
@ -5781,12 +5781,12 @@ glabel func0f16b96c
// func00011d84();
// } else if (g_Vars.stagenum == STAGE_BOOTPAKMENU) {
// setCurrentPlayerNum(0);
// func0f01bf28();
// menuTick();
// func00011d84();
// func0f01d860();
// func0f11c7a0();
// } else if (g_Vars.stagenum == STAGE_4MBMENU) {
// func0f01bf28();
// menuTick();
// func00011d84();
// func0f01d860();
// func0f11c7a0();
@ -5801,7 +5801,7 @@ glabel func0f16b96c
// func0f01d990();
// func0f01dd6c();
// func0f01de30();
// func0f01e050();
// sparksTick();
// func0f13eb44();
// func0f149864();
//
@ -5813,14 +5813,14 @@ glabel func0f16b96c
// func0f009eac();
// }
//
// func0f167c88();
// doBoostAndSlayerSfx();
// func0000fe88();
// func0f11c7a0();
// func0f0033b0();
// func0f0b2904();
// func0f0aefb8();
// func0f01b160();
// func0f01bf28();
// activemenuTick();
// menuTick();
// scenarioCallback10();
//
// if (var8005d9d0 == 0) {

2
src/include/game/chr/chr.h
View File

@ -3,7 +3,7 @@
#include <ultra64.h>
#include "types.h"
void func0f01e050(void);
void sparksTick(void);
u32 func0f04e418(void);

2
src/include/game/game_01b0a0.h
View File

@ -9,6 +9,6 @@ u32 func0f01b0e0(void);
u32 func0f01b114(void);
u32 func0f01b148(void);
void func0f01b154(s32 arg0);
void func0f01b160(void);
void activemenuTick(void);
#endif

2
src/include/game/game_01bea0.h
View File

@ -5,6 +5,6 @@
void func0f01bea0(void);
void menuCountDialogs(void);
void func0f01bf28(void);
void menuTick(void);
#endif

2
src/include/game/game_167ae0.h
View File

@ -8,7 +8,7 @@ void func0f167af8(void);
void func0f167b10(void);
u32 func0f167b48(void);
void func0f167b84(u32 arg0, u32 arg1);
void func0f167c88(void);
void doBoostAndSlayerSfx(void);
void func0f167e7c(s32 stagenum);
u32 func0f1685d8(void);
void fadeCancel(void);