diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-09-15 11:02:27 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-15 11:02:27 -0300 |
| commit | 4b30f1a6549c99eff5344a815b12f54e69d689e9 (patch) | |
| tree | bae6d7b5b89e0c9ac761bbdd9a904a1113ea0834 /src/code | |
| parent | 626f09266d264dc994e51d8ce9e57b8da80704d4 (diff) | |
Move libultra variables to their respective headers (#1369)
* internal_rsp; move size_t and NULL to ultratypes.h
* guint.h
* Move system variables to os_system.h
* controller, pi and vi
* osint.h
* piint.h
* siint, ucode, viint, voiceinternal
* Remove remaining variables from variables.h
* format
* final renames
* bss
* review
* review
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/padmgr.c | 2 | ||||
| -rw-r--r-- | src/code/z_actor.c | 3 | ||||
| -rw-r--r-- | src/code/z_camera.c | 1 | ||||
| -rw-r--r-- | src/code/z_collision_check.c | 1 | ||||
| -rw-r--r-- | src/code/z_nmi_buff.c | 2 | ||||
| -rw-r--r-- | src/code/z_parameter.c | 1 | ||||
| -rw-r--r-- | src/code/z_room.c | 1 |
7 files changed, 7 insertions, 4 deletions
diff --git a/src/code/padmgr.c b/src/code/padmgr.c index ae40fc1a4..1b75721cb 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -36,6 +36,8 @@ #include "PR/os_motor.h" #include "fault.h" +extern FaultMgr gFaultMgr; + #define PADMGR_RETRACE_MSG (1 << 0) #define PADMGR_PRE_NMI_MSG (1 << 1) #define PADMGR_NMI_MSG (1 << 2) diff --git a/src/code/z_actor.c b/src/code/z_actor.c index f88f511b5..cef3c89da 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3,8 +3,7 @@ * Description: */ -#include "prevent_bss_reordering.h" -#include "global.h" +#include "z64actor.h" #include "fault.h" #include "sys_cfb.h" #include "loadfragment.h" diff --git a/src/code/z_camera.c b/src/code/z_camera.c index c2e00e206..a9477231c 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -43,6 +43,7 @@ * */ +#include "prevent_bss_reordering.h" #include "global.h" #include "libc/string.h" #include "z64quake.h" diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index af1f4ad6c..39b57cbd0 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "global.h" #include "z64collision_check.h" diff --git a/src/code/z_nmi_buff.c b/src/code/z_nmi_buff.c index eacfc5f46..840345932 100644 --- a/src/code/z_nmi_buff.c +++ b/src/code/z_nmi_buff.c @@ -13,7 +13,7 @@ typedef struct { NmiBuff* gNMIBuffer; void Nmi_Init(void) { - gNMIBuffer = (NmiBuff*)osAppNmiBuffer; + gNMIBuffer = (NmiBuff*)osAppNMIBuffer; gNMIBuffer->resetting = false; if (osResetType == COLD_RESET) { diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 3ba6a9e99..a3dc07aaf 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1,4 +1,5 @@ #include "global.h" +#include "PR/gs2dex.h" #include "sys_cfb.h" #include "z64snap.h" #include "z64view.h" diff --git a/src/code/z_room.c b/src/code/z_room.c index 28a297499..b8de6caec 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -1,4 +1,5 @@ #include "global.h" +#include "PR/gs2dex.h" #include "debug.h" void Room_Noop(PlayState* play, Room* room, Input* input, s32 arg3) { |