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

Format the misformatted files in master (#354) 

* Format the misformatted files in master

* Correct arms_hook double-semicolon, since it was almost certainly just an accident
This commit is contained in:
Tom Overton 2021-10-23 06:14:25 -07:00 committed by GitHub
parent 151e098e48
commit 961913f18f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/code/flg_set.c
View File

@ -231,7 +231,7 @@ void FlagSet_Update(GameState* gameState) {
} }
/* Other controls */ /* Other controls */
// A toggles the selected flag // A toggles the selected flag
if (CHECK_BTN_ALL(input->press.button, BTN_A)) { if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
*sFlagEntries[sEntryIndex].value ^= (1 << sCurrentBit); *sFlagEntries[sEntryIndex].value ^= (1 << sCurrentBit);

2
src/code/z_debug.c
View File

@ -12,7 +12,7 @@ void GameInfo_Init(void) {
gGameInfo->unk_02 = 0; gGameInfo->unk_02 = 0;
gGameInfo->unk_04 = 0; gGameInfo->unk_04 = 0;
gGameInfo->unk_03 = 0; gGameInfo->unk_03 = 0;
for (i = 0; i < ARRAY_COUNT(gGameInfo->data); i++) { for (i = 0; i < ARRAY_COUNT(gGameInfo->data); i++) {
gGameInfo->data[i] = 0; gGameInfo->data[i] = 0;
} }

2
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View File

@ -288,7 +288,7 @@ static Vec3f D_808C1C4C = { 0.0f, -500.0f, 0.0f };
void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) { void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) {
ArmsHook* this = THIS; ArmsHook* this = THIS;
f32 f0; f32 f0;
Player* player = GET_PLAYER(globalCtx);; Player* player = GET_PLAYER(globalCtx);
if (player->actor.draw != NULL && player->rightHandType == 0xB) { if (player->actor.draw != NULL && player->rightHandType == 0xB) {
Vec3f sp68; Vec3f sp68;

2
src/overlays/actors/ovl_En_Owl/z_en_owl.c
View File

@ -557,7 +557,7 @@ void func_8095B76C(EnOwl* this, GlobalContext* globalCtx) {
do { do {
this->actor.world.pos.x = points->x; this->actor.world.pos.x = points->x;
this->actor.world.pos.z = points->z; this->actor.world.pos.z = points->z;
} while(0); } while (0);
this->unk_3F8++; this->unk_3F8++;
if (this->path->count <= this->unk_3F8) { if (this->path->count <= this->unk_3F8) {

3
src/overlays/actors/ovl_En_Poh/z_en_poh.c
View File

@ -1013,7 +1013,8 @@ void func_80B2F37C(Actor* thisx, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 170, 255, this->unk_197); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 170, 255, this->unk_197);
gDPSetEnvColor(POLY_XLU_DISP++, this->unk_194, this->unk_195, this->unk_196, 255); gDPSetEnvColor(POLY_XLU_DISP++, this->unk_194, this->unk_195, this->unk_196, 255);
SysMatrix_InsertYRotation_f((func_800DFCDC(GET_ACTIVE_CAM(globalCtx)) + 0x8000) * (M_PI / 32768), MTXMODE_APPLY); SysMatrix_InsertYRotation_f((func_800DFCDC(GET_ACTIVE_CAM(globalCtx)) + 0x8000) * (M_PI / 32768),
MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06003850); gSPDisplayList(POLY_XLU_DISP++, D_06003850);