hackern64/HackerSM64
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerSM64.git synced 2026-01-21 10:35:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Further Puppycamera fixes

Browse Source
This commit is contained in:
Fazana
2021-12-12 19:38:19 +00:00
committed by thecozies
parent 9f538f8e7d
commit a5a826052e
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
asm/rom_header.s
View File

@@ -25,6 +25,12 @@
#else
.ascii "E" /* NTSC-U (North America) */
#endif
#if defined(PUPPYCAM) && defined(EEP4K)
#undef EEP4K
#define EEP16K
#endif
#if defined(SRAM)
.byte 0x32 /* Version */
#elif defined(EEP16K)

12
src/game/puppycam2.c
View File

@@ -997,22 +997,24 @@ void puppycam_wall_angle(void) {
void puppycam_projection_behaviours(void) {
f32 turnRate = 1;
f32 turnMag = ABS(gPlayer1Controller->rawStickX / 80.0f);
// This will only be executed if Mario's the target. If it's not, it'll reset the
if (gPuppyCam.targetObj == gMarioState->marioObj) {
if ((gPuppyCam.options.turnAggression > 0 && gPuppyCam.flags & PUPPYCAM_BEHAVIOUR_TURN_HELPER && !(gPuppyCam.flags & PUPPYCAM_BEHAVIOUR_INPUT_8DIR) &&
gMarioState->vel[1] == 0.0f && !(gPuppyCam.flags & PUPPYCAM_BEHAVIOUR_INPUT_4DIR) && gPuppyCam.options.inputType != 2) || (gMarioState->action == ACT_SHOT_FROM_CANNON || gMarioState->action == ACT_FLYING)) { // Holy hell this is getting spicy.
gMarioState->vel[1] == 0.0f && !(gPuppyCam.flags & PUPPYCAM_BEHAVIOUR_INPUT_4DIR) && gPuppyCam.options.inputType != 2) || gMarioState->action == ACT_SHOT_FROM_CANNON || gMarioState->action == ACT_FLYING) { // Holy hell this is getting spicy.
// With turn aggression enabled, or if Mario's sliding, adjust the camera view behind mario.
if (gPuppyCam.options.turnAggression > 0 || gMarioState->action & ACT_FLAG_BUTT_OR_STOMACH_SLIDE || gMarioState->action == ACT_SHOT_FROM_CANNON || gMarioState->action == ACT_FLYING) {
if (gMarioState->action & ACT_FLAG_BUTT_OR_STOMACH_SLIDE) {
turnRate = 4; // If he's sliding, do it 4x as fast.
}
if (gMarioState->action == ACT_SHOT_FROM_CANNON || gMarioState->action == ACT_FLYING)
turnMag = 1;
// The deal here, is if Mario's moving, or he's sliding and the camera's within 90 degrees behind him, it'll auto focus behind him, with an intensity based on the camera's centre speed.
// It also scales with forward velocity, so it's a gradual effect as he speeds up.
if ((ABS(gPlayer1Controller->rawStickX) > 20 && !(gMarioState->action & ACT_FLAG_BUTT_OR_STOMACH_SLIDE)) ||
(gMarioState->action & ACT_FLAG_BUTT_OR_STOMACH_SLIDE &&
(s16)ABS(((gPuppyCam.yaw + 0x8000) % 0xFFFF - 0x8000) - ((gMarioState->faceAngle[1]) % 0xFFFF - 0x8000)) < 0x3000 ))
gPuppyCam.yawTarget = approach_angle(gPuppyCam.yawTarget, (gMarioState->faceAngle[1] + 0x8000), ((gPuppyCam.options.turnAggression * 10) * ABS(gMarioState->forwardVel / 32) * ABS(gPlayer1Controller->rawStickX / 80.0f) * turnRate));
if ((ABS(gPlayer1Controller->rawStickX) > 20 && !(gMarioState->action & ACT_FLAG_BUTT_OR_STOMACH_SLIDE)) || (gMarioState->action == ACT_SHOT_FROM_CANNON) ||
(gMarioState->action & ACT_FLAG_BUTT_OR_STOMACH_SLIDE && (s16)ABS(((gPuppyCam.yaw + 0x8000) % 0xFFFF - 0x8000) - ((gMarioState->faceAngle[1]) % 0xFFFF - 0x8000)) < 0x3000 ))
gPuppyCam.yawTarget = approach_angle(gPuppyCam.yawTarget, (gMarioState->faceAngle[1] + 0x8000), ((gPuppyCam.options.turnAggression * 10) * ABS(gMarioState->forwardVel / 32) * turnMag * turnRate));
}
} else { //If none of the above is true, it'll attempt to do this instead.
// If the camera's in these modes, snap the yaw to prevent desync.

10
src/game/save_file.h
View File

@@ -9,6 +9,11 @@
#include "course_table.h"
#if defined(PUPPYCAM) && defined(EEP4K)
#undef EEP4K
#define EEP16K
#endif
#if defined(SRAM)
#define EEPROM_SIZE 0x8000
#elif defined(EEP16K)
@@ -77,9 +82,6 @@ struct MainMenuSaveData {
u8 firstBoot;
#ifdef PUPPYCAM
// Pad to match the EEPROM size of 0x200 (10 bytes on JP/US, 8 bytes on EU)
//u8 filler[EEPROM_SIZE / 2 - SUBTRAHEND - NUM_SAVE_FILES * (4 + sizeof(struct SaveFile))];
struct gPuppyOptions saveOptions;
#endif
struct SaveBlockSignature signature;
@@ -89,7 +91,7 @@ struct SaveBuffer {
// Each of the four save files has two copies. If one is bad, the other is used as a backup.
struct SaveFile files[NUM_SAVE_FILES][2];
// The main menu data has two copies. If one is bad, the other is used as a backup.
struct MainMenuSaveData menuData[1];
struct MainMenuSaveData menuData[2];
};
#ifdef PUPPYCAM