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

Rename game_011110.c to playerinit.c, game_0102b0.c to bondguninit.c

This commit is contained in:
Ryan Dwyer 2022-02-10 17:25:24 +10:00
parent a44a5356b5
commit 3a777bc25c
16 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ld/gamefiles.ntsc-beta.inc
View File

@ -29,8 +29,8 @@
build/ROMID/game/game_0108d0.o (section); \
build/ROMID/game/objectives/setup.o (section); \
build/ROMID/game/casing/reset.o (section); \
build/ROMID/game/game_010b20.o (section); \
build/ROMID/game/game_011110.o (section); \
build/ROMID/game/bondguninit.o (section); \
build/ROMID/game/playerinit.o (section); \
build/ROMID/game/inventory/init.o (section); \
build/ROMID/game/game_0125a0.o (section); \
build/ROMID/game/game_012aa0.o (section); \

4
ld/gamefiles.ntsc-final.inc
View File

@ -29,8 +29,8 @@
build/ROMID/game/game_0108d0.o (section); \
build/ROMID/game/objectives/setup.o (section); \
build/ROMID/game/casing/reset.o (section); \
build/ROMID/game/game_010b20.o (section); \
build/ROMID/game/game_011110.o (section); \
build/ROMID/game/bondguninit.o (section); \
build/ROMID/game/playerinit.o (section); \
build/ROMID/game/inventory/init.o (section); \
build/ROMID/game/game_0125a0.o (section); \
build/ROMID/game/game_012aa0.o (section); \

4
ld/gamefiles.pal-final.inc
View File

@ -29,8 +29,8 @@
build/ROMID/game/game_0108d0.o (section); \
build/ROMID/game/objectives/setup.o (section); \
build/ROMID/game/casing/reset.o (section); \
build/ROMID/game/game_010b20.o (section); \
build/ROMID/game/game_011110.o (section); \
build/ROMID/game/bondguninit.o (section); \
build/ROMID/game/playerinit.o (section); \
build/ROMID/game/inventory/init.o (section); \
build/ROMID/game/game_0125a0.o (section); \
build/ROMID/game/game_012aa0.o (section); \

6
src/game/bondgun.c
View File

@ -8499,7 +8499,7 @@ void bgun0f09ce8c(void)
bgun0f0a1528();
}
void bgun0f09ceac(void)
void bgunInitHandAnims(void)
{
struct hand *hand;
s32 i;
@ -8511,7 +8511,7 @@ void bgun0f09ceac(void)
hand = &g_Vars.currentplayer->hands[0];
}
hand->ganstarot = 0;
hand->gangstarot = 0;
hand->state = HANDSTATE_IDLE;
hand->animload = -1;
hand->animmode = HANDANIMMODE_IDLE;
@ -15379,7 +15379,7 @@ void bgun0f0a1528(void)
player->hands[i].gset.weaponnum = ctrl->weaponnum;
player->hands[i].gset.unk0639 = (ctrl->upgradewant >> (i * 4)) & 0xf;
player->hands[i].ganstarot = 0.0f;
player->hands[i].gangstarot = 0.0f;
bgun0f0abd30(i);

4
src/game/game_010b20.c → src/game/bondguninit.c
View File

@ -10,7 +10,7 @@
extern u32 var800700ac;
void func0f010bb0(void)
void bgunInit(void)
{
s32 i;
@ -262,5 +262,5 @@ void func0f010bb0(void)
g_Weapons[WEAPON_EYESPY]->flags |= (WEAPONFLAG_DETERMINER_S_AN | WEAPONFLAG_DETERMINER_F_AN);
}
bgun0f09ceac();
bgunInitHandAnims();
}

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

@ -8,7 +8,7 @@
#include "game/chr/chraicommands.h"
#include "game/debug.h"
#include "game/dlights.h"
#include "game/game_011110.h"
#include "game/playerinit.h"
#include "game/title.h"
#include "game/chr/chr.h"
#include "game/prop.h"

2
src/game/game_00b820.c
View File

@ -3,7 +3,7 @@
#include "game/cheats.h"
#include "game/chr/chrai.h"
#include "game/game_00b820.h"
#include "game/game_011110.h"
#include "game/playerinit.h"
#include "game/game_02cde0.h"
#include "game/game_091e10.h"
#include "bss.h"

2
src/game/game_00c490.c
View File

@ -5,7 +5,7 @@
#include "game/game_00b820.h"
#include "game/game_00c490.h"
#include "game/objectives.h"
#include "game/game_011110.h"
#include "game/playerinit.h"
#include "game/inventory/init.h"
#include "game/game_0125a0.h"
#include "game/game_012d50.h"

4
src/game/lv.c
View File

@ -18,7 +18,7 @@
#include "game/game_0108d0.h"
#include "game/objectives.h"
#include "game/casing.h"
#include "game/game_011110.h"
#include "game/playerinit.h"
#include "game/inventory/init.h"
#include "game/game_0125a0.h"
#include "game/explosions/init.h"
@ -434,7 +434,7 @@ void lvInit(s32 stagenum)
menuInit();
amInit();
invInitGunsHeld();
func0f010bb0();
bgunInit();
playerLoadDefaults();
playerInit();
playerSpawn();

2
src/game/game_011110.c → src/game/playerinit.c
View File

@ -4,7 +4,7 @@
#include "game/bondmove.h"
#include "game/cheats.h"
#include "game/inventory/items.h"
#include "game/game_011110.h"
#include "game/playerinit.h"
#include "game/chr/chr.h"
#include "game/game_02cde0.h"
#include "game/prop.h"

2
src/game/propobj.c
View File

@ -8,7 +8,7 @@
#include "game/debug.h"
#include "game/dlights.h"
#include "game/nbomb.h"
#include "game/game_011110.h"
#include "game/playerinit.h"
#include "game/chr/chr.h"
#include "game/prop.h"
#include "game/game_091e10.h"

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

@ -50,7 +50,7 @@ s32 bgunTickInc(struct handweaponinfo *info, s32 handnum, s32 lvupdate);
bool bgunSetState(s32 handnum, s32 state);
void bgunTick(s32 handnum);
void bgun0f09ce8c(void);
void bgun0f09ceac(void);
void bgunInitHandAnims(void);
f32 bgunGetNoiseRadius(s32 handnum);
void bgunDecreaseNoiseRadius(void);
void bgunCalculateBlend(s32 hand);

9
src/include/game/bondguninit.h Normal file
View File

@ -0,0 +1,9 @@
#ifndef _IN_GAME_BONDGUNINIT_H
#define _IN_GAME_BONDGUNINIT_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
void bgunInit(void);
#endif

9
src/include/game/game_010b20.h
View File

@ -1,9 +0,0 @@
#ifndef _IN_GAME_GAME_010B20_H
#define _IN_GAME_GAME_010B20_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
void func0f010bb0(void);
#endif

4
src/include/game/game_011110.h → src/include/game/playerinit.h
View File

@ -1,5 +1,5 @@
#ifndef IN_GAME_GAME_011110_H
#define IN_GAME_GAME_011110_H
#ifndef IN_GAME_PLAYERINIT_H
#define IN_GAME_PLAYERINIT_H
#include <ultra64.h>
#include "data.h"
#include "types.h"

2
src/include/types.h
View File

@ -2401,7 +2401,7 @@ struct hand {
/*0x0cec*/ ubool unk0cec;
/*0x0cf0*/ struct coord unk0cf0;
/*0x0cfc*/ struct coord unk0cfc;
/*0x0d08*/ f32 ganstarot;
/*0x0d08*/ f32 gangstarot;
/*0x0d0c*/ s16 primetimer;
/*0x0d0e*/ u8 unk0d0e_00 : 4;
/*0x0d0e*/ u8 unk0d0e_04 : 3;