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

Some small formatting fixes

Browse Source
This commit is contained in:
Arceveti
2021-10-12 20:08:25 -07:00
parent 9391eefd05
commit 7b26bf06eb
8 changed files with 55 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/special_presets.h
View File

@@ -6,12 +6,13 @@
#include "model_ids.h"
// Special Preset types
#define SPTYPE_NO_YROT_OR_PARAMS 0 // object is 8-bytes long, no y-rotation or any behavior params
#define SPTYPE_YROT_NO_PARAMS 1 // object is 10-bytes long, has y-rotation but no params
#define SPTYPE_PARAMS_AND_YROT 2 // object is 12-bytes long, has y-rotation and params
#define SPTYPE_UNKNOWN 3 // object is 14-bytes long, has 3 extra shorts that get converted to floats.
#define SPTYPE_DEF_PARAM_AND_YROT 4 // object is 10-bytes long, has y-rotation and uses the default param
enum SpecialPresetTypes {
SPTYPE_NO_YROT_OR_PARAMS, // object is 8-bytes long, no y-rotation or any behavior params
SPTYPE_YROT_NO_PARAMS, // object is 10-bytes long, has y-rotation but no params
SPTYPE_PARAMS_AND_YROT, // object is 12-bytes long, has y-rotation and params
SPTYPE_UNKNOWN, // object is 14-bytes long, has 3 extra shorts that get converted to floats.
SPTYPE_DEF_PARAM_AND_YROT // object is 10-bytes long, has y-rotation and uses the default param
};
struct SpecialPreset
{
/*00*/ u8 preset_id;

33
src/boot/memory.c
View File

@@ -127,7 +127,7 @@ void move_segment_table_to_dmem(void) {
void main_pool_init(void *start, void *end) {
sPoolStart = ((u8 *) ALIGN16((uintptr_t) start) + 16);
sPoolEnd = ((u8 *) ALIGN16((uintptr_t) end - 15) - 16);
sPoolFreeSpace = sPoolEnd - sPoolStart;
sPoolFreeSpace = (sPoolEnd - sPoolStart);
sPoolListHeadL = (struct MainPoolBlock *) (sPoolStart - 16);
sPoolListHeadR = (struct MainPoolBlock *) sPoolEnd;
@@ -187,14 +187,14 @@ u32 main_pool_free(void *addr) {
}
sPoolListHeadL = block;
sPoolListHeadL->next = NULL;
sPoolFreeSpace += (uintptr_t) oldListHead - (uintptr_t) sPoolListHeadL;
sPoolFreeSpace += ((uintptr_t) oldListHead - (uintptr_t) sPoolListHeadL);
} else {
while (oldListHead->prev != NULL) {
oldListHead = oldListHead->prev;
}
sPoolListHeadR = block->next;
sPoolListHeadR->prev = NULL;
sPoolFreeSpace += (uintptr_t) sPoolListHeadR - (uintptr_t) oldListHead;
sPoolFreeSpace += ((uintptr_t) sPoolListHeadR - (uintptr_t) oldListHead);
}
return sPoolFreeSpace;
}
@@ -275,7 +275,7 @@ void dma_read(u8 *dest, u8 *srcStart, u8 *srcEnd) {
size -= copySize;
}
#if PUPPYPRINT_DEBUG
dmaTime[perfIteration] += osGetTime() - first;
dmaTime[perfIteration] += (osGetTime() - first);
#endif
}
@@ -302,7 +302,7 @@ void *dynamic_dma_read(u8 *srcStart, u8 *srcEnd, u32 side, u32 alignment, u32 bs
return dest;
}
#define TLB_PAGE_SIZE 4096 //Blocksize of TLB transfers. Larger values can be faster to transfer, but more wasteful of RAM.
#define TLB_PAGE_SIZE 4096 // Blocksize of TLB transfers. Larger values can be faster to transfer, but more wasteful of RAM.
s32 gTlbEntries = 0;
u8 gTlbSegments[NUM_TLB_SEGMENTS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
@@ -310,7 +310,7 @@ void mapTLBPages(uintptr_t virtualAddress, uintptr_t physicalAddress, s32 length
while (length > 0) {
if (length > TLB_PAGE_SIZE) {
osMapTLB(gTlbEntries++, OS_PM_4K, (void *)virtualAddress, physicalAddress, physicalAddress + TLB_PAGE_SIZE, -1);
virtualAddress += TLB_PAGE_SIZE;
virtualAddress += TLB_PAGE_SIZE;
physicalAddress += TLB_PAGE_SIZE;
length -= TLB_PAGE_SIZE;
gTlbSegments[segment]++;
@@ -333,11 +333,11 @@ void *load_segment(s32 segment, u8 *srcStart, u8 *srcEnd, u32 side, u8 *bssStart
void *addr;
if (bssStart != NULL && side == MEMORY_POOL_LEFT) {
addr = dynamic_dma_read(srcStart, srcEnd, side, TLB_PAGE_SIZE, (uintptr_t)bssEnd - (uintptr_t)bssStart);
addr = dynamic_dma_read(srcStart, srcEnd, side, TLB_PAGE_SIZE, ((uintptr_t)bssEnd - (uintptr_t)bssStart));
if (addr != NULL) {
u8 *realAddr = (u8 *)ALIGN((uintptr_t)addr, TLB_PAGE_SIZE);
set_segment_base_addr(segment, realAddr);
mapTLBPages(segment << 24, VIRTUAL_TO_PHYSICAL(realAddr), (srcEnd - srcStart) + ((uintptr_t)bssEnd - (uintptr_t)bssStart), segment);
mapTLBPages((segment << 24), VIRTUAL_TO_PHYSICAL(realAddr), ((srcEnd - srcStart) + ((uintptr_t)bssEnd - (uintptr_t)bssStart)), segment);
}
} else {
addr = dynamic_dma_read(srcStart, srcEnd, side, 0, 0);
@@ -346,7 +346,7 @@ void *load_segment(s32 segment, u8 *srcStart, u8 *srcEnd, u32 side, u8 *bssStart
}
}
#if PUPPYPRINT_DEBUG
ramsizeSegment[segment + nameTable - 2] = (s32)srcEnd - (s32)srcStart;
ramsizeSegment[(segment + nameTable) - 2] = ((s32)srcEnd - (s32)srcStart);
#endif
return addr;
}
@@ -421,9 +421,9 @@ void *load_segment_decompress(s32 segment, u8 *srcStart, u8 *srcEnd) {
main_pool_free(compressed);
}
}
#if PUPPYPRINT_DEBUG
ramsizeSegment[segment+nameTable-2] = (s32)srcEnd - (s32)srcStart;
#endif
#if PUPPYPRINT_DEBUG
ramsizeSegment[(segment + nameTable) - 2] = (s32)srcEnd - (s32)srcStart;
#endif
return dest;
}
@@ -490,8 +490,8 @@ struct AllocOnlyPool *alloc_only_pool_init(u32 size, u32 side) {
subPool = (struct AllocOnlyPool *) addr;
subPool->totalSpace = size;
subPool->usedSpace = 0;
subPool->startPtr = (u8 *) addr + sizeof(struct AllocOnlyPool);
subPool->freePtr = (u8 *) addr + sizeof(struct AllocOnlyPool);
subPool->startPtr = ((u8 *) addr + sizeof(struct AllocOnlyPool));
subPool->freePtr = ((u8 *) addr + sizeof(struct AllocOnlyPool));
}
return subPool;
}
@@ -506,7 +506,7 @@ void *alloc_only_pool_alloc(struct AllocOnlyPool *pool, s32 size) {
size = ALIGN4(size);
if (size > 0 && pool->usedSpace + size <= pool->totalSpace) {
addr = pool->freePtr;
pool->freePtr += size;
pool->freePtr += size;
pool->usedSpace += size;
}
return addr;
@@ -636,8 +636,7 @@ void *alloc_display_list(u32 size) {
}
static struct DmaTable *load_dma_table_address(u8 *srcAddr) {
struct DmaTable *table = dynamic_dma_read(srcAddr, srcAddr + sizeof(u32),
MEMORY_POOL_LEFT, 0, 0);
struct DmaTable *table = dynamic_dma_read(srcAddr, srcAddr + sizeof(u32), MEMORY_POOL_LEFT, 0, 0);
u32 size = table->count * sizeof(struct OffsetSizePair) +
sizeof(struct DmaTable) - sizeof(struct OffsetSizePair);
main_pool_free(table);

39
src/game/level_update.c
View File

@@ -202,15 +202,11 @@ u32 level_control_timer(s32 timerOp) {
}
u32 pressed_pause(void) {
u32 dialogActive = get_dialog_id() >= 0;
u32 intangible = (gMarioState->action & ACT_FLAG_INTANGIBLE) != 0;
if (!intangible && !dialogActive && !gWarpTransition.isActive && sDelayedWarpOp == WARP_OP_NONE
&& (gPlayer1Controller->buttonPressed & START_BUTTON)) {
return TRUE;
}
return FALSE;
return (!(gMarioState->action & ACT_FLAG_INTANGIBLE)
&& (get_dialog_id() < 0)
&& !gWarpTransition.isActive
&& (sDelayedWarpOp == WARP_OP_NONE)
&& (gPlayer1Controller->buttonPressed & START_BUTTON));
}
void set_play_mode(s16 playMode) {
@@ -472,7 +468,7 @@ void warp_level(struct MarioState *m) {
}
void warp_credits(struct MarioState *m) {
s32 marioAction = 0;
s32 marioAction = ACT_UNINITIALIZED;
switch (sWarpDest.nodeId) {
case WARP_NODE_CREDITS_START:
@@ -521,15 +517,13 @@ void warp_credits(struct MarioState *m) {
}
void check_instant_warp(struct MarioState *m) {
s16 cameraAngle;
struct Surface *floor;
if (gCurrLevelNum == LEVEL_CASTLE && save_file_get_total_star_count(gCurrSaveFileNum - 1, COURSE_MIN - 1, COURSE_MAX - 1) >= 70) {
return;
}
if ((floor = m->floor) != NULL) {
s32 index = floor->type - SURFACE_INSTANT_WARP_1B;
struct Surface *floor = m->floor;
if (floor != NULL) {
s32 index = (floor->type - SURFACE_INSTANT_WARP_1B);
if (index >= INSTANT_WARP_INDEX_START && index < INSTANT_WARP_INDEX_STOP
&& gCurrentArea->instantWarps != NULL) {
struct InstantWarp *warp = &gCurrentArea->instantWarps[index];
@@ -539,7 +533,7 @@ void check_instant_warp(struct MarioState *m) {
vec3f_copy(&m->marioObj->oPosVec, m->pos);
// Fix instant warp offset not working when warping across different areas
vec3f_copy(m->marioObj->header.gfx.pos, m->pos);
cameraAngle = m->area->camera->yaw;
s16 cameraAngle = m->area->camera->yaw;
change_area(warp->area);
m->area = gCurrentArea;
@@ -563,7 +557,7 @@ s32 music_unchanged_through_warp(s16 arg) {
if (levelNum == LEVEL_BOB && levelNum == gCurrLevelNum && destArea == gCurrAreaIndex) {
currBgMusic = get_current_background_music();
if (currBgMusic == SEQUENCE_ARGS(4, SEQ_EVENT_POWERUP | SEQ_VARIATION)
|| currBgMusic == SEQUENCE_ARGS(4, SEQ_EVENT_POWERUP)) {
|| currBgMusic == SEQUENCE_ARGS(4, SEQ_EVENT_POWERUP)) {
unchanged = FALSE;
}
} else {
@@ -727,11 +721,11 @@ s32 level_trigger_warp(struct MarioState *m, s32 warpOp) {
break;
case WARP_OP_DEATH:
#ifndef DISABLE_LIVES
#ifndef DISABLE_LIVES
if (m->numLives == 0) {
sDelayedWarpOp = WARP_OP_GAME_OVER;
}
#endif
#endif
sDelayedWarpTimer = 48;
sSourceWarpNodeId = WARP_NODE_DEATH;
play_transition(WARP_TRANSITION_FADE_INTO_BOWSER, sDelayedWarpTimer, 0x00, 0x00, 0x00);
@@ -1070,6 +1064,7 @@ s32 play_mode_change_area(void) {
if (sTransitionUpdate != NULL) {
sTransitionUpdate(&sTransitionTimer);
}
if (--sTransitionTimer == -1) {
update_camera(gCurrentArea->camera);
sTransitionTimer = 0;
@@ -1185,7 +1180,7 @@ s32 init_level(void) {
#ifdef PEACH_SKIP
if (gCurrDemoInput != NULL) {
set_mario_action(gMarioState, ACT_IDLE, 0);
} else if (gDebugLevelSelect == 0) {
} else if (!gDebugLevelSelect) {
if (gMarioState->action != ACT_UNINITIALIZED) {
set_mario_action(gMarioState, ACT_IDLE, 0);
}
@@ -1194,7 +1189,7 @@ s32 init_level(void) {
#else
if (gCurrDemoInput != NULL) {
set_mario_action(gMarioState, ACT_IDLE, 0);
} else if (gDebugLevelSelect == 0) {
} else if (!gDebugLevelSelect) {
if (gMarioState->action != ACT_UNINITIALIZED) {
if (save_file_exists(gCurrSaveFileNum - 1)) {
set_mario_action(gMarioState, ACT_IDLE, 0);
@@ -1265,7 +1260,7 @@ void load_language_text(void) {
s32 lvl_init_from_save_file(UNUSED s16 initOrUpdate, s32 levelNum) {
#if MULTILANG
gInGameLanguage = eu_get_language()+1;
gInGameLanguage = (eu_get_language() + 1);
load_language_text();
#endif
sWarpDest.type = WARP_TYPE_NOT_WARPING;

21
src/game/macro_special_objects.c
View File

@@ -74,7 +74,7 @@ UNUSED static void spawn_macro_coin_unknown(const BehaviorScript *behavior, s16
a1[1], a1[2], a1[3], 0, convert_rotation(a1[0]), 0);
obj->oUnusedCoinParams = a1[4];
obj->oBehParams = (a1[4] & 0xFF) >> 16;
obj->oBehParams = ((a1[4] & 0xFF) >> 16);
}
struct LoadedPreset {
@@ -187,7 +187,7 @@ void spawn_macro_objects_hardcoded(s32 areaIndex, s16 *macroObjList) {
void spawn_special_objects(s32 areaIndex, TerrainData **specialObjList) {
s32 i;
s32 offset;
s16 x, y, z;
Vec3s pos;
s16 extraParams[4];
ModelID16 model;
u8 type;
@@ -204,11 +204,11 @@ void spawn_special_objects(s32 areaIndex, TerrainData **specialObjList) {
for (i = 0; i < numOfSpecialObjects; i++) {
presetID = (u8) **specialObjList;
(*specialObjList)++;
x = **specialObjList;
pos[0] = **specialObjList;
(*specialObjList)++;
y = **specialObjList;
pos[1] = **specialObjList;
(*specialObjList)++;
z = **specialObjList;
pos[2] = **specialObjList;
(*specialObjList)++;
offset = 0;
@@ -226,19 +226,19 @@ void spawn_special_objects(s32 areaIndex, TerrainData **specialObjList) {
switch (type) {
case SPTYPE_NO_YROT_OR_PARAMS:
spawn_macro_abs_yrot_2params(model, behavior, x, y, z, 0, 0);
spawn_macro_abs_yrot_2params(model, behavior, pos[0], pos[1], pos[2], 0, 0);
break;
case SPTYPE_YROT_NO_PARAMS:
extraParams[0] = **specialObjList; // Y-rotation
(*specialObjList)++;
spawn_macro_abs_yrot_2params(model, behavior, x, y, z, extraParams[0], 0);
spawn_macro_abs_yrot_2params(model, behavior, pos[0], pos[1], pos[2], extraParams[0], 0);
break;
case SPTYPE_PARAMS_AND_YROT:
extraParams[0] = **specialObjList; // Y-rotation
(*specialObjList)++;
extraParams[1] = **specialObjList; // Params
(*specialObjList)++;
spawn_macro_abs_yrot_2params(model, behavior, x, y, z, extraParams[0], extraParams[1]);
spawn_macro_abs_yrot_2params(model, behavior, pos[0], pos[1], pos[2], extraParams[0], extraParams[1]);
break;
case SPTYPE_UNKNOWN:
extraParams[0] = **specialObjList; // Unknown, gets put into obj->oMacroUnk108 as a float
@@ -247,13 +247,12 @@ void spawn_special_objects(s32 areaIndex, TerrainData **specialObjList) {
(*specialObjList)++;
extraParams[2] = **specialObjList; // Unknown, gets put into obj->oMacroUnk110 as a float
(*specialObjList)++;
spawn_macro_abs_special(model, behavior, x, y, z, extraParams[0], extraParams[1],
extraParams[2]);
spawn_macro_abs_special(model, behavior, pos[0], pos[1], pos[2], extraParams[0], extraParams[1], extraParams[2]);
break;
case SPTYPE_DEF_PARAM_AND_YROT:
extraParams[0] = **specialObjList; // Y-rotation
(*specialObjList)++;
spawn_macro_abs_yrot_param1(model, behavior, x, y, z, extraParams[0], defaultParam);
spawn_macro_abs_yrot_param1(model, behavior, pos[0], pos[1], pos[2], extraParams[0], defaultParam);
break;
default:
break;

4
src/game/mario.c
View File

@@ -1838,7 +1838,7 @@ void init_mario(struct MarioState *m) {
if (save_file_get_cap_pos(capPos)) {
capObject = spawn_object(m->marioObj, MODEL_MARIOS_CAP, bhvNormalCap);
vec3_copy(&capObject->oPosVec, capPos);
capObject->oForwardVel = 0;
capObject->oForwardVel = 0;
capObject->oMoveAngleYaw = 0;
}
}
@@ -1862,7 +1862,7 @@ void init_mario_from_save_file(struct MarioState *m) {
#else
m->numLives = DEFAULT_NUM_LIVES;
#endif
m->health = 0x880;
m->health = 0x880;
#ifdef BREATH_METER
m->breath = 0x880;
gHudDisplay.breath = 8;

2
src/game/print.c
View File

@@ -78,7 +78,7 @@ void format_integer(s32 n, s32 base, char *dest, s32 *totalLength, u8 width, s8
// Add leading pad to fit width.
if (width > numDigits) {
for (len = 0; len < width - numDigits; len++) dest[len] = pad;
for (len = 0; len < (width - numDigits); len++) dest[len] = pad;
// Needs 1 length to print negative prefix.
if (negative == TRUE) {

2
src/game/puppyprint.c
View File

@@ -394,7 +394,7 @@ void puppyprint_render_profiler(void) {
}
sprintf(textBytes, "RAM: %06X/%06X (%d_)", main_pool_available(), mempool, (s32)(((f32)main_pool_available() / (f32)mempool) * 100));
print_small_text((SCREEN_WIDTH/2), SCREEN_HEIGHT-16, textBytes, PRINT_TEXT_ALIGN_CENTRE, PRINT_ALL, FONT_OUTLINE);
print_small_text((SCREEN_WIDTH / 2), (SCREEN_HEIGHT - 16), textBytes, PRINT_TEXT_ALIGN_CENTRE, PRINT_ALL, FONT_OUTLINE);
if (!ramViewer && !benchViewer && !logViewer) {
print_fps(16, 40);

2
src/game/save_file.c
View File

@@ -736,7 +736,7 @@ void check_if_should_set_warp_checkpoint(struct WarpNode *warpNode) {
// Overwrite the warp checkpoint variables.
gWarpCheckpoint.actNum = gCurrActNum;
gWarpCheckpoint.courseNum = gCurrCourseNum;
gWarpCheckpoint.levelID = warpNode->destLevel & 0x7F;
gWarpCheckpoint.levelID = (warpNode->destLevel & 0x7F);
gWarpCheckpoint.areaNum = warpNode->destArea;
gWarpCheckpoint.warpNode = warpNode->destNode;
}