mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 08:50:23 +00:00
Code Issues Projects Releases Wiki Activity

Big cleanup (#775)

Browse source 
* Adult and child2 macros OK

* ICHAIN cleanup

* almost all overlay data

* format.sh

* func_8002FBAC NON_EQUIVALENT

* PR fixes (MZXrules)

* fix

* change //@ bug to //! @bug

* merge master and missed a //@bug

* fix ruto

* some more cleanup (#2)

* more `! @bug` formatting cleanup

* parenthesis cleanup

* hex naviEnemyId

* run formatter

* replace `IS_NOT_` macros with `!IS_`

* run formatter

* run formatter

* PR fixes (fig)

* Missed something

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
louist103 2021-08-21 19:12:57 -04:00 • committed by GitHub
parent 17c79a8f60
commit 556cdad7eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
177 changed files with 902 additions and 862 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
View file

@ -73,7 +73,7 @@ extern AnimationHeader D_06011348;
extern FlexSkeletonHeader D_060114E8;
extern FlexSkeletonHeader D_060119E8;
u8 D_80B2CEC0 = false;
static u8 D_80B2CEC0 = false;
const ActorInit En_Viewer_InitVars = {
ACTOR_EN_VIEWER,
@ -104,7 +104,7 @@ struct_80B2CEE8 D_80B2CEE8[] = {
{ OBJECT_GANON, OBJECT_GANON, 1, -6, 0, 10, 0, &D_060114E8, &D_06011348 },
};
EnViewerAnimFunc sAnimFuncs[] = {
static EnViewerAnimFunc sAnimFuncs[] = {
func_80B2A300,
func_80B2A4D8,
func_80B2A300,
@ -118,9 +118,9 @@ static void* sActorShadowDrawFunc[] = {
};
// timer
s16 D_80B2CFCC = 0;
static s16 D_80B2CFCC = 0;
Vec3f D_80B2CFD0 = { 0.0f, 0.0f, 0.0f };
static Vec3f D_80B2CFD0 = { 0.0f, 0.0f, 0.0f };
static EnViewerDrawFunc sDrawFuncs[] = {
func_80B2B4A8,
@ -131,9 +131,9 @@ static EnViewerDrawFunc sDrawFuncs[] = {
// angl
EnGanonMant* sGanonCape;
static EnGanonMant* sGanonCape;
Vec3f D_80B2D448;
static Vec3f D_80B2D448;
void EnViewer_SetupAction(EnViewer* this, EnViewerActionFunc actionFunc) {
this->actionFunc = actionFunc;