From 8d3d4cd2d06b3efb4716b39d9f2f1391037ed737 Mon Sep 17 00:00:00 2001
From: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
Date: Thu, 15 Aug 2024 02:05:53 -0300
Subject: [PATCH] WingInfo -> ArwingInfo

---
 include/functions.h                | 2 +-
 include/sf64player.h               | 6 +++---
 src/engine/fox_display.c           | 4 ++--
 src/engine/fox_edisplay.c          | 2 +-
 src/overlays/ovl_ending/fox_end2.c | 2 +-
 src/overlays/ovl_menu/fox_map.c    | 2 +-
 src/overlays/ovl_menu/fox_title.c  | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/functions.h b/include/functions.h
index 62f1efcc..f97773a5 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -86,7 +86,7 @@ void ActorCutscene_Draw(Actor*);
 void Cutscene_DrawGreatFox(void);
 
 // fox_display
-void Display_ArwingWings(WingInfo*);
+void Display_ArwingWings(ArwingInfo*);
 void Display_DrawEngineGlow(s32);
 void Display_SetupPlayerSfxPos(Player*);
 void Display_Update(void);
diff --git a/include/sf64player.h b/include/sf64player.h
index 85ad278f..622eb792 100644
--- a/include/sf64player.h
+++ b/include/sf64player.h
@@ -127,7 +127,7 @@ typedef struct PlayerShot {
     /* 0x6C */ u8 bonus;
 } PlayerShot; // size = 0x70
 
-typedef struct WingInfo { // ArwingInfo
+typedef struct ArwingInfo { // ArArwingInfo
     /* 0x00 */ u8 rightState; // rightWingState
     /* 0x01 */ u8 leftState; // leftWingState
     /* 0x04 */ f32 unk_04; // upperRightFlapYrot
@@ -144,7 +144,7 @@ typedef struct WingInfo { // ArwingInfo
     /* 0x30 */ f32 unk_30; // teamFaceXrot
     /* 0x34 */ f32 unk_34; // teamFaceYrot
     /* 0x38 */ f32 unk_38; // windshieldXrot
-} WingInfo; // size = 0x3C
+} ArwingInfo; // size = 0x3C
 
 typedef struct PlayerSfx {
     /* 0x00 */ u8 levelType;
@@ -316,7 +316,7 @@ typedef struct Player {
     /* 0x46C */ f32 sfxVel[3];
     /* 0x478 */ PlayerSfx sfx;
     /* 0x498 */ s32 mercyTimer;
-    /* 0x49C */ WingInfo wings;
+    /* 0x49C */ ArwingInfo wings;
     /* 0x4D8 */ f32 aerobaticPitch;
     /* 0x4DC */ bool somersault;
 } Player; // size = 0x4E0
diff --git a/src/engine/fox_display.c b/src/engine/fox_display.c
index b95501e3..0f54600c 100644
--- a/src/engine/fox_display.c
+++ b/src/engine/fox_display.c
@@ -450,7 +450,7 @@ void Display_SetCullingMode(void) {
 }
 
 bool Display_ArwingWingsOverrideLimbDraw(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* wingData) {
-    WingInfo* wings = (WingInfo*) wingData;
+    ArwingInfo* wings = (ArwingInfo*) wingData;
 
     if (D_display_800CA22C && (gPlayer[0].dmgEffect == 0)) {
         RCP_SetupDL(&gMasterDisp, SETUPDL_29);
@@ -558,7 +558,7 @@ bool Display_ArwingWingsOverrideLimbDraw(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos
     return false;
 }
 
-void Display_ArwingWings(WingInfo* wings) {
+void Display_ArwingWings(ArwingInfo* wings) {
     Vec3f sp68[30];
     s32 modelId;
 
diff --git a/src/engine/fox_edisplay.c b/src/engine/fox_edisplay.c
index bfc66fcb..be786487 100644
--- a/src/engine/fox_edisplay.c
+++ b/src/engine/fox_edisplay.c
@@ -26,7 +26,7 @@ Vec3f D_edisplay_801615D0;
 Vec3f sViewPos;
 bool sDrewActor;
 Matrix D_edisplay_801615F0;
-WingInfo D_edisplay_80161630;
+ArwingInfo D_edisplay_80161630;
 
 char D_edisplay_800CF970[] = "$Id: fox_edisplay.c,v 1.196 1997/05/08 08:31:50 morita Exp $";
 
diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c
index 760eca44..c1402d74 100644
--- a/src/overlays/ovl_ending/fox_end2.c
+++ b/src/overlays/ovl_ending/fox_end2.c
@@ -3,7 +3,7 @@
 #include "assets/ast_ending_expert.h"
 #include "assets/ast_allies.h"
 
-WingInfo D_ending_80198590;
+ArwingInfo D_ending_80198590;
 Vec3f D_ending_801985D0;
 Vec3f D_ending_801985E0;
 Vec3f D_ending_801985F0;
diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c
index 77849035..ca0f8e2f 100644
--- a/src/overlays/ovl_menu/fox_map.c
+++ b/src/overlays/ovl_menu/fox_map.c
@@ -2215,7 +2215,7 @@ void Map_801A0D14(void) {
 
 void Map_801A116C(void) {
     static f32 D_menu_801B6970 = 35.0f;
-    WingInfo wings;
+    ArwingInfo wings;
     Vec3f dest;
     Vec3f src;
     s32 colR = 30, colG = 9, colB = 5;
diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c
index 2498addb..8baef4d0 100644
--- a/src/overlays/ovl_menu/fox_title.c
+++ b/src/overlays/ovl_menu/fox_title.c
@@ -2232,7 +2232,7 @@ void Title_8018CD9C(CameraPoint* pos, CameraPoint* arg1, f32 weight, s32 arg3) {
 }
 
 void Title_8018D2B8(s32 arg0) {
-    WingInfo wings;
+    ArwingInfo wings;
 
     Lights_SetOneLight(&gMasterDisp, D_menu_801B82E0, D_menu_801B82E4, D_menu_801B82E8, gLight1R, gLight1G, gLight1B,
                        gAmbientR, gAmbientG, gAmbientB);