mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-01 09:23:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

General Cleanup 2 (#1538)

Browse Source 
* Cleanup

* Cleanup variables.h

* Cleanup fault headers

* Some includes/headers cleanup

* Libultra btn wrappers

* Mark differences to original libultra headers

* Remove duplicate include in fault

* format

* Update include/PR/os_voice.h

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* align

---------

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
This commit is contained in:
Derek Hensley
2024-01-28 16:27:50 -08:00
committed by GitHub
parent 6a15ce9521
commit db8f5f5ccc
54 changed files with 373 additions and 1785 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+23 -23
View File
@@ -2,35 +2,20 @@
* File: z_actor.c
* Description:
*/
#include "z64actor.h"
#include "prevent_bss_reordering.h"
#include "fault.h"
#include "sys_cfb.h"
#include "loadfragment.h"
#include "z64horse.h"
#include "z64malloc.h"
#include "z64quake.h"
#include "z64rumble.h"
#include "overlays/actors/ovl_En_Horse/z_en_horse.h"
#include "overlays/actors/ovl_En_Part/z_en_part.h"
#include "overlays/actors/ovl_En_Box/z_en_box.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#include "objects/object_bdoor/object_bdoor.h"
// bss
// Variables are put before most headers as a hacky way to bypass bss reordering
FaultClient sActorFaultClient; // 2 funcs
CollisionPoly* D_801ED8B0; // 1 func
s32 D_801ED8B4; // 2 funcs
struct CollisionPoly* D_801ED8B0; // 1 func
s32 D_801ED8B4; // 2 funcs
Actor* sTargetableNearestActor;
Actor* sTargetablePrioritizedActor;
Actor* D_801ED8C0;
Actor* D_801ED8C4;
struct Actor* sTargetableNearestActor;
struct Actor* sTargetablePrioritizedActor;
struct Actor* D_801ED8C0;
struct Actor* D_801ED8C4;
f32 sTargetableNearestActorDistSq;
f32 sBgmEnemyDistSq;
@@ -41,7 +26,22 @@ s16 sTargetPlayerRotY;
Mtx sActorHiliteMtx;
Actor* D_801ED920; // 2 funcs. 1 out of z_actor
struct Actor* D_801ED920; // 2 funcs. 1 out of z_actor
#include "z64actor.h"
#include "z64horse.h"
#include "z64malloc.h"
#include "z64quake.h"
#include "z64rumble.h"
#include "overlays/actors/ovl_En_Horse/z_en_horse.h"
#include "overlays/actors/ovl_En_Part/z_en_part.h"
#include "overlays/actors/ovl_En_Box/z_en_box.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#include "objects/object_bdoor/object_bdoor.h"
#define ACTOR_AUDIO_FLAG_SFX_ACTOR_POS (1 << 0)
#define ACTOR_AUDIO_FLAG_SFX_CENTERED_1 (1 << 1)