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

Attempt to decompile func0f0b72dc

This commit is contained in:
Ryan Dwyer 2020-12-23 22:42:25 +10:00
parent 8dd02f14a5
commit ddef8094fe
5 changed files with 235 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/game/game_011110.c
View File

@ -1332,22 +1332,22 @@ glabel var7f1a827c
// g_DefaultWeapons[HAND_RIGHT] = 0;
//
// if (cmd) {
// while (cmd[0] != INTROTYPE_END) {
// while (cmd[0] != INTROCMD_END) {
// switch (*cmd) {
// case INTROTYPE_SPAWN:
// case INTROCMD_SPAWN:
// if (cmd[2] == 0) {
// g_SpawnPoints[g_NumSpawnPoints++] = cmd[1];
// }
// cmd += 3;
// break;
// case INTROTYPE_CASE:
// case INTROTYPE_CASERESPAWN:
// case INTROCMD_CASE:
// case INTROCMD_CASERESPAWN:
// cmd += 3;
// break;
// case INTROTYPE_HILL:
// case INTROCMD_HILL:
// cmd += 2;
// break;
// case INTROTYPE_WEAPON:
// case INTROCMD_WEAPON:
// if (cmd[3] == 0 && g_Vars.currentplayer != g_Vars.anti) {
// func0f011560(cmd[1]);
//
@ -1374,26 +1374,26 @@ glabel var7f1a827c
// }
// cmd += 4;
// break;
// case INTROTYPE_AMMO:
// case INTROCMD_AMMO:
// if (cmd[3] == 0 && g_Vars.currentplayer != g_Vars.anti) {
// currentPlayerSetAmmoQuantity(cmd[1], cmd[2]);
// }
// cmd += 4;
// break;
// case INTROTYPE_3:
// case INTROCMD_3:
// cmd += 8;
// break;
// case INTROTYPE_4:
// case INTROCMD_4:
// cmd += 2;
// break;
// case INTROTYPE_OUTFIT:
// case INTROCMD_OUTFIT:
// g_Vars.currentplayer->bondtype = cmd[1];
// cmd += 2;
// break;
// case INTROTYPE_6:
// case INTROCMD_6:
// cmd += 10;
// break;
// case INTROTYPE_WATCHTIME:
// case INTROCMD_WATCHTIME:
// g_Vars.currentplayer->bondwatchtime60 = 0;
// if (cmd[2] > 0) {
// g_Vars.currentplayer->bondwatchtime60 += (cmd[2] % 60) * 3600;
@ -1403,7 +1403,7 @@ glabel var7f1a827c
// }
// cmd += 3;
// break;
// case INTROTYPE_CREDITOFFSET:
// case INTROCMD_CREDITOFFSET:
// thing = (struct gecreditsdata *)&g_GeCreditsData[cmd[1]];
// g_CurrentGeCreditsData = thing;
// while (thing->text1 || thing->text2) {

211
src/game/game_0b63b0.c
View File

@ -11,6 +11,7 @@
#include "game/data/data_01a3a0.h"
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/data/inventory.h"
#include "game/game_006bd0.h"
#include "game/title.h"
#include "game/chr/chr.h"
@ -1478,6 +1479,185 @@ glabel var7f1ad568
/* f0b77c8: 27bd0118 */ addiu $sp,$sp,0x118
);
// Mismatch: assigns to bondprevpos and player->prop->pos have extra loads
// from pos.
//void func0f0b72dc(void)
//{
// struct coord pos = {0, 0, 0}; // 10c
// s16 rooms[8]; // fc
// f32 angle; // f8
// s32 *cmd = g_StageSetup.intro;
// f32 groundy;
// s32 i;
// u32 stack[4];
// s32 aiStack188[34]; // 5c
//
// func0f11de20(g_Vars.currentplayernum);
//
// g_Vars.currentplayer->dostartnewlife = false;
//
// if (g_Vars.coopplayernum < 0) {
// struct prop *prop = g_Vars.currentplayer->prop->child;
//
// while (prop) {
// struct defaultobj *obj = prop->obj;
//
// if (obj) {
// obj->hidden |= OBJHFLAG_00000004;
// }
//
// prop = prop->next;
// }
// }
//
// chrInitSplats(g_Vars.currentplayer->prop->chr);
// func0f0b77cc();
// g_Vars.currentplayer->isdead = false;
// g_Vars.currentplayer->healthdamagetype = DAMAGETYPE_7;
// g_Vars.currentplayer->damagetype = DAMAGETYPE_7;
// g_Vars.currentplayer->unk16d8 = 0;
// g_Vars.currentplayer->gunsightoff = 2;
//
// currentPlayerUnsetFlag(0xffffffff);
//
// angle = M_BADTAU - scenarioCallback2c(30, &pos, rooms, g_Vars.currentplayer->prop); // var7f1ad534
//
// groundy = coordFindGroundY(&pos, 30, rooms,
// &g_Vars.currentplayer->floorcol,
// &g_Vars.currentplayer->floortype,
// &g_Vars.currentplayer->floorflags,
// &g_Vars.currentplayer->floorroom,
// NULL, NULL);
//
// pos.y = groundy + g_Vars.currentplayer->vv_eyeheight;
//
// g_Vars.currentplayer->vv_manground = groundy;
// g_Vars.currentplayer->vv_theta = (angle * 360.0f) / M_BADTAU; // var7f1ad538
// g_Vars.currentplayer->vv_ground = groundy;
//
// func0f0b85a0(&g_Vars.currentplayer->bond2, &pos);
//
// g_Vars.currentplayer->bond2.unk00.x = -sinf(angle);
// g_Vars.currentplayer->bond2.unk00.y = 0;
// g_Vars.currentplayer->bond2.unk00.z = cosf(angle);
//
// g_Vars.currentplayer->bondprevpos.x = pos.x;
// g_Vars.currentplayer->prop->pos.x = pos.x;
// g_Vars.currentplayer->bondprevpos.y = pos.y;
// g_Vars.currentplayer->prop->pos.y = pos.y;
// g_Vars.currentplayer->bondprevpos.z = pos.z;
// g_Vars.currentplayer->prop->pos.z = pos.z;
//
// func0f065c44(g_Vars.currentplayer->prop);
//
// g_Vars.currentplayer->prop->rooms[0] = rooms[0];
// g_Vars.currentplayer->prop->rooms[1] = -1;
//
// currentPlayerSetCamPropertiesWithRoom(&pos, &g_Vars.currentplayer->bond2.unk28,
// &g_Vars.currentplayer->bond2.unk1c, rooms[0]);
//
// if (g_Vars.coopplayernum >= 0) {
// for (i = 1; i != ARRAYCOUNT(aiStack188); i++) {
// aiStack188[i] = 0;
// }
//
// for (i = 1; i != ARRAYCOUNT(g_Weapons); i++) {
// if (func0f111ad4(i)) {
// s32 ammotype = weaponGetAmmoType(i, 0);
//
// if (ammotype >= 0 && ammotype <= AMMOTYPE_ECM_MINE) {
// aiStack188[ammotype + 1] = 1;
// }
// }
// }
//
// for (i = 0; i != ARRAYCOUNT(aiStack188); i++) {
// if (aiStack188[i] == 0) {
// g_Vars.currentplayer->ammoheldarr[i] = 0;
// }
// }
// } else {
// currentPlayerClearInventory();
//
// for (i = 0; i < ARRAYCOUNT(g_Vars.currentplayer->ammoheldarr); i++) {
// g_Vars.currentplayer->ammoheldarr[i] = 0;
// }
// }
//
// currentPlayerGiveWeapon(WEAPON_UNARMED);
//
// if (cmd) {
// if (g_Vars.antiplayernum < 0 || g_Vars.currentplayer != g_Vars.anti) {
// while (cmd[0] != INTROCMD_END) {
// switch (cmd[0]) {
// case INTROCMD_SPAWN:
// cmd += 3;
// break;
// case INTROCMD_CASE:
// case INTROCMD_CASERESPAWN:
// cmd += 3;
// break;
// case INTROCMD_HILL:
// cmd += 2;
// break;
// case INTROCMD_WEAPON:
// if (cmd[3] == 0) {
// if (cmd[2] >= 0) {
// currentPlayerGiveWeaponWithArgument(cmd[1], cmd[2]);
// } else {
// currentPlayerGiveWeapon(cmd[1]);
// }
// }
// cmd += 4;
// break;
// case INTROCMD_AMMO:
// if (cmd[3] == 0) {
// currentPlayerSetAmmoQuantity(cmd[1], cmd[2]);
// }
// cmd += 4;
// break;
// case INTROCMD_3:
// cmd += 8;
// break;
// case INTROCMD_4:
// cmd += 2;
// break;
// case INTROCMD_OUTFIT:
// cmd += 2;
// break;
// case INTROCMD_6:
// cmd += 10;
// break;
// default:
// cmd++;
// break;
// }
// }
// }
// }
//
// if (g_Vars.coopplayernum >= 0 && g_Vars.currentplayer->stealhealth > 0) {
// g_Vars.currentplayer->bondhealth = g_Vars.currentplayer->stealhealth;
// g_Vars.currentplayer->oldhealth = 0;
// g_Vars.currentplayer->oldarmour = 0;
// g_Vars.currentplayer->apparenthealth = 0;
// g_Vars.currentplayer->apparentarmour = 0;
// }
//
// func0f0cb8c4(g_Vars.currentplayer);
// currentPlayerSpawn();
//
// if (g_Vars.normmplayerisrunning) {
// currentPlayerStartChrFade(120, 1);
// } else {
// currentPlayerStartChrFade(0, 1);
// }
//
// if (g_Vars.currentplayer->prop->chr) {
// g_Vars.currentplayer->prop->chr->chrflags &= ~CHRCFLAG_HIDDEN;
// }
//}
GLOBAL_ASM(
glabel func0f0b77cc
.late_rodata
@ -2075,22 +2255,25 @@ void currentPlayerSpawn(void)
currentPlayerUpdatePerimInfo();
}
void func0f0b85a0(f32 *floats, struct coord *pos)
void func0f0b85a0(struct playerbond *pb, struct coord *pos)
{
floats[4] = pos->x;
floats[5] = pos->y;
floats[6] = pos->z;
floats[7] = 1;
floats[8] = 0;
floats[9] = 0;
floats[10] = 0;
floats[11] = 1;
floats[12] = 0;
pb->unk10.x = pos->x;
pb->unk10.y = pos->y;
pb->unk10.z = pos->z;
floats[0] = 0;
floats[1] = 0;
floats[2] = 1;
floats[3] = 30;
pb->unk1c.x = 1;
pb->unk1c.y = 0;
pb->unk1c.z = 0;
pb->unk28.x = 0;
pb->unk28.y = 1;
pb->unk28.z = 0;
pb->unk00.x = 0;
pb->unk00.y = 0;
pb->unk00.z = 1;
pb->width = 30;
}
void func0f0b85f8(void)

35
src/include/constants.h
View File

@ -522,6 +522,15 @@
#define CROUCH_HALF 1
#define CROUCH_STAND 2
#define DAMAGETYPE_0 0
#define DAMAGETYPE_1 1
#define DAMAGETYPE_2 2
#define DAMAGETYPE_3 3
#define DAMAGETYPE_4 4
#define DAMAGETYPE_5 5
#define DAMAGETYPE_6 6
#define DAMAGETYPE_7 7
#define DESCRIPTION_BRIEFING 0x00
#define DESCRIPTION_MPCONFIG 0x01
#define DESCRIPTION_MPCHALLENGE 0x02
@ -844,19 +853,19 @@
#define IDLEACTION_OPERATING 0x04
#define IDLEACTION_OPERATING_PAD 0x05
#define INTROTYPE_SPAWN 0
#define INTROTYPE_WEAPON 1
#define INTROTYPE_AMMO 2
#define INTROTYPE_3 3
#define INTROTYPE_4 4
#define INTROTYPE_OUTFIT 5
#define INTROTYPE_6 6
#define INTROTYPE_WATCHTIME 7
#define INTROTYPE_CREDITOFFSET 8
#define INTROTYPE_CASE 9
#define INTROTYPE_CASERESPAWN 10
#define INTROTYPE_HILL 11
#define INTROTYPE_END 12
#define INTROCMD_SPAWN 0
#define INTROCMD_WEAPON 1
#define INTROCMD_AMMO 2
#define INTROCMD_3 3
#define INTROCMD_4 4
#define INTROCMD_OUTFIT 5
#define INTROCMD_6 6
#define INTROCMD_WATCHTIME 7
#define INTROCMD_CREDITOFFSET 8
#define INTROCMD_CASE 9
#define INTROCMD_CASERESPAWN 10
#define INTROCMD_HILL 11
#define INTROCMD_END 12
#define INVENTORYFUNCTYPE_NONE 0x0000
#define INVENTORYFUNCTYPE_SHOOT_SINGLE 0x0001

3
src/include/game/data/inventory.h
View File

@ -1,8 +1,9 @@
#ifndef IN_GAME_DATA_INVENTORY_H
#define IN_GAME_DATA_INVENTORY_H
#include <ultra64.h>
extern struct inventory_menupos invmenupos_00010fd0;
extern struct inventory_typee inve_000110c0;
extern struct weapon *g_Weapons[];
extern struct weapon *g_Weapons[WEAPON_SUICIDEPILL + 1];
#endif

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

@ -16,7 +16,7 @@ void func0f0b72dc(void);
void func0f0b77cc(void);
bool currentPlayerAssumeChrForAnti(struct chrdata *chr, s32 param_2);
void currentPlayerSpawn(void);
void func0f0b85a0(f32 *floats, struct coord *pos);
void func0f0b85a0(struct playerbond *pb, struct coord *pos);
void func0f0b85f8(void);
void currentPlayerChooseBodyAndHead(s32 *bodynum, s32 *headnum, s32 *arg2);
void func0f0b8ba0(void);