summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLywx <kiritodev01@gmail.com>2024-03-06 17:33:08 -0600
committerGitHub <noreply@github.com>2024-03-06 20:33:08 -0300
commitddf28ecd3ec1b5f653de9bdbba41a3dc0e4ceee5 (patch)
tree7ba4407c5eaf9400c51ca9f14445de576955ed96 /src
parent7e99fe712de9603eb98c31778315fecf91c38be4 (diff)
"export configuration for ast_allies" by Sonic fixed (#150)
* begin * progress * progress * Matchpoint * clean up unnecessary externs * dec --------- Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/fox_360.c2
-rw-r--r--src/main/fox_demo.c2
-rw-r--r--src/main/fox_display.c2
-rw-r--r--src/main/fox_enmy2.c1
-rw-r--r--src/main/fox_hud.c1
-rw-r--r--src/main/fox_radio.c4
-rw-r--r--src/overlays/ovl_ending/fox_end1.c1
-rw-r--r--src/overlays/ovl_ending/fox_end2.c1
8 files changed, 13 insertions, 1 deletions
diff --git a/src/main/fox_360.c b/src/main/fox_360.c
index ab1af016..e78d28a4 100644
--- a/src/main/fox_360.c
+++ b/src/main/fox_360.c
@@ -45,6 +45,8 @@ s32 D_8015F93C;
s32 D_8015F940;
f32 D_8015F944;
+#include "assets/ast_allies.h"
+
void func_8002E3E0(Actor* actor) {
s32 hits = 0;
diff --git a/src/main/fox_demo.c b/src/main/fox_demo.c
index 2fed5c65..719e2ece 100644
--- a/src/main/fox_demo.c
+++ b/src/main/fox_demo.c
@@ -39,6 +39,8 @@ extern Animation D_601F3B8;
extern Limb* D_6020C6C[];
extern Limb* D_602D140[];
+#include "assets/ast_allies.h"
+
Vec3f D_800C9F60[] = {
{ 2000.0f, 2000.0f, 2000.0f },
{ -2000.0f, 2000.0f, 2000.0f },
diff --git a/src/main/fox_display.c b/src/main/fox_display.c
index ecb57b7d..ed391ebd 100644
--- a/src/main/fox_display.c
+++ b/src/main/fox_display.c
@@ -12,6 +12,8 @@ Vec3f D_80161578[4];
f32 D_801615A8[4];
f32 D_801615B8[4];
+#include "assets/ast_allies.h"
+
s32 D_800CA220 = 0;
u8 D_800CA224[] = { 0, 0, 0, 0 };
s32 D_800CA228 = 0;
diff --git a/src/main/fox_enmy2.c b/src/main/fox_enmy2.c
index d706b385..3cc7b3ee 100644
--- a/src/main/fox_enmy2.c
+++ b/src/main/fox_enmy2.c
@@ -6,6 +6,7 @@ s32 D_80161690;
#include "fox_enmy2_assets.h"
#include "assets/ast_warp_zone.h"
+#include "assets/ast_allies.h"
void func_8006A7B0(u16* msg, s32 character) {
PRINTF("Enm->obj.pos.y + tmp_xyz.y=<%10.3f>\n");
diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c
index ae33c427..cadc4bca 100644
--- a/src/main/fox_hud.c
+++ b/src/main/fox_hud.c
@@ -148,6 +148,7 @@ extern u8 D_C000A80[];
#include "assets/ast_bg_space.h"
#include "assets/ast_bg_planet.h"
+#include "assets/ast_allies.h"
// DATA SECTION START
diff --git a/src/main/fox_radio.c b/src/main/fox_radio.c
index ee8b3fc1..61a0756a 100644
--- a/src/main/fox_radio.c
+++ b/src/main/fox_radio.c
@@ -12,6 +12,8 @@ f32 D_80178740;
s32 D_80178744;
s32 D_80178748;
+#include "assets/ast_allies.h"
+
s32 gCurrentMsgPri = 0;
void func_800BA760(void) {
@@ -455,7 +457,7 @@ void func_800BB388(void) {
} else {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 60, 60, 255, 170);
}
- TextureRect_8bCI(&gMasterDisp, sp38, sp34, 0x20, 0x20, D_80178730, D_80178734 + 16.0f + sp30, D_80178738,
+ TextureRect_8bCI(&gMasterDisp, sp38, sp34, 32, 32, D_80178730, D_80178734 + 16.0f + sp30, D_80178738,
D_80177D50);
}
if (D_80177D50 == 1.3f) {
diff --git a/src/overlays/ovl_ending/fox_end1.c b/src/overlays/ovl_ending/fox_end1.c
index e16e2b2a..7d9c2682 100644
--- a/src/overlays/ovl_ending/fox_end1.c
+++ b/src/overlays/ovl_ending/fox_end1.c
@@ -1,6 +1,7 @@
#include "global.h"
#include "assets/ast_ending_award_front.h"
#include "assets/ast_ending_award_back.h"
+#include "assets/ast_allies.h"
void func_ending_8018CE20(s32);
void func_ending_801926D4(void);
diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c
index b50fc552..8fcf14cf 100644
--- a/src/overlays/ovl_ending/fox_end2.c
+++ b/src/overlays/ovl_ending/fox_end2.c
@@ -1,6 +1,7 @@
#include "global.h"
#include "fox_end2_data.c"
#include "assets/ast_ending_expert.h"
+#include "assets/ast_allies.h"
void func_ending_8018CE20(u32 arg0) {
u8 alpha;