Skip to content

Commit

Permalink
Clang-format changes exist. Committing.
Browse files Browse the repository at this point in the history
  • Loading branch information
PhlexPlexico authored and github-actions[bot] committed Jul 13, 2024
1 parent 69c9aba commit 89e0b0d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
1 change: 0 additions & 1 deletion code/include/rnd/item_override.h
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,6 @@ namespace rnd {
u32 ItemOverride_GetOshExtData();
u8 ItemOverride_OverrideSkullToken(game::GlobalContext*, game::act::Actor*);
u8 ItemOverride_CheckBossStatus();

}
extern "C" u32 rActiveItemGraphicId;
extern "C" ItemOverride rItemOverrides[640];
Expand Down
22 changes: 11 additions & 11 deletions code/source/rnd/item_override.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1057,17 +1057,17 @@ namespace rnd {

u8 ItemOverride_CheckBossStatus() {
game::SceneId scene = GetContext().gctx->scene;
switch(scene) {
case game::SceneId::OdolwaLair:
return gExtSaveData.givenItemChecks.odolwaDefeated == 0 ? 1 : 0;
case game::SceneId::GohtLair:
return gExtSaveData.givenItemChecks.gohtDefeated == 0 ? 1 : 0;
case game::SceneId::GyorgLair:
return gExtSaveData.givenItemChecks.gyorgDefeated == 0 ? 1 : 0;
case game::SceneId::TwinmoldLair:
return gExtSaveData.givenItemChecks.twinmoldDefeated == 0 ? 1 : 0;
default:
return 0;
switch (scene) {
case game::SceneId::OdolwaLair:
return gExtSaveData.givenItemChecks.odolwaDefeated == 0 ? 1 : 0;
case game::SceneId::GohtLair:
return gExtSaveData.givenItemChecks.gohtDefeated == 0 ? 1 : 0;
case game::SceneId::GyorgLair:
return gExtSaveData.givenItemChecks.gyorgDefeated == 0 ? 1 : 0;
case game::SceneId::TwinmoldLair:
return gExtSaveData.givenItemChecks.twinmoldDefeated == 0 ? 1 : 0;
default:
return 0;
}
}
}
Expand Down

0 comments on commit 89e0b0d

Please sign in to comment.