mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 14:34:32 +00:00
Code Issues Projects Releases Wiki Activity

Run formatter (#1139)

Browse source
This commit is contained in:
Dragorn421 2022-02-13 00:29:48 +01:00 • committed by GitHub
parent 8926b08582
commit ed0daabf98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
View file

@ -155,7 +155,8 @@ void EnHeishi2_Init(Actor* thisx, GlobalContext* globalCtx) {
// "Identification Completed!"
osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 識別完了！ ☆☆☆☆☆ %d\n" VT_RST, this->type);
// "Message completed!"
osSyncPrintf(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ メッセージ完了！ ☆☆☆☆☆ %x\n\n" VT_RST, (this->actor.params >> 8) & 0xF);
osSyncPrintf(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ メッセージ完了！ ☆☆☆☆☆ %x\n\n" VT_RST,
(this->actor.params >> 8) & 0xF);
}
}

8
src/overlays/actors/ovl_En_Sth/z_en_sth.c
View file

@ -61,12 +61,8 @@ static s16 sObjectIds[6] = {
};
static FlexSkeletonHeader* sSkeletons[6] = {
&object_ahg_Skel_0000F0,
&object_boj_Skel_0000F0,
&object_boj_Skel_0000F0,
&object_boj_Skel_0000F0,
&object_boj_Skel_0000F0,
&object_boj_Skel_0000F0,
&object_ahg_Skel_0000F0, &object_boj_Skel_0000F0, &object_boj_Skel_0000F0,
&object_boj_Skel_0000F0, &object_boj_Skel_0000F0, &object_boj_Skel_0000F0,
};
static AnimationHeader* sAnimations[6] = {

3
src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
View file

@ -186,7 +186,8 @@ void func_80B3A3D4(EnWonderTalk2* this, GlobalContext* globalCtx) {
if ((this->switchFlag >= 0) && (this->talkMode != 4)) {
Flags_SetSwitch(globalCtx, this->switchFlag);
// "(Forced) I saved it! All of it!"
osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ (強制)セーブしたよ！おもいっきり！ %x\n" VT_RST, this->switchFlag);
osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ (強制)セーブしたよ！おもいっきり！ %x\n" VT_RST,
this->switchFlag);
}
if (this->talkMode == 4) {

4
src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
View file

@ -344,8 +344,8 @@ s16 ObjOshihiki_GetHighestFloor(ObjOshihiki* this) {
for (i = 1; i < ARRAY_COUNT(this->floorHeights); i++) {
if (this->floorHeights[i] > this->floorHeights[highestFloor]) {
highestFloor = i;
} else if ((this->floorBgIds[i] == BGCHECK_SCENE) &&
((this->floorHeights[i] - this->floorHeights[highestFloor]) > -0.001f)) {
} else if ((this->floorBgIds[i] == BGCHECK_SCENE) &&
((this->floorHeights[i] - this->floorHeights[highestFloor]) > -0.001f)) {
highestFloor = i;
}
}