From e20bdddf2f02d2e43017b2112978f9703fe86e20 Mon Sep 17 00:00:00 2001
From: octorock <79596758+octorock@users.noreply.github.com>
Date: Wed, 16 Feb 2022 07:59:57 +0100
Subject: [PATCH] Temporarily remove static from NONMATCH functions

So they are counted correctly in the progress script
---
 src/main.c    |  8 ++++----
 src/message.c | 22 +++++++++++-----------
 src/player.c  | 28 ++++++++++++++--------------
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/main.c b/src/main.c
index 235a8ef9..136ab17d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,7 +11,7 @@ extern u32 gRand;
 
 static void InitOverlays(void);
 static bool32 SoftResetKeysPressed(void);
-static u32 CheckHeaderValid(void);
+/*static*/ u32 CheckHeaderValid(void);
 
 void (*const sTaskHandlers[])(void) = {
     [TASK_TITLE] = TitleTask,
@@ -25,7 +25,7 @@ void (*const sTaskHandlers[])(void) = {
     [TASK_STAFFROLL] = StaffrollTask, [TASK_DEBUG] = DebugTask,
 };
 
-static void sub_080560B8(void);
+/*static*/ void sub_080560B8(void);
 
 void AgbMain(void) {
     InitOverlays();
@@ -170,7 +170,7 @@ const Defaults sDefaultSettings = {
 };
 
 // single misplaced ldr
-NONMATCH("asm/non_matching/sub_080560B8.inc", static void sub_080560B8(void)) {
+NONMATCH("asm/non_matching/sub_080560B8.inc", /*static*/ void sub_080560B8(void)) {
     u32 b;
 
     if (!CheckHeaderValid()) {
@@ -199,7 +199,7 @@ NONMATCH("asm/non_matching/sub_080560B8.inc", static void sub_080560B8(void)) {
 }
 END_NONMATCH
 
-static u32 CheckHeaderValid(void) {
+/*static*/ u32 CheckHeaderValid(void) {
     if ((gSaveHeader->signature != SIGNATURE) || (gSaveHeader->saveFileId >= NUM_SAVE_SLOTS) ||
         (gSaveHeader->msg_speed >= MAX_MSG_SPEED) || (gSaveHeader->brightness >= MAX_BRIGHTNESS)
 #ifdef EU
diff --git a/src/message.c b/src/message.c
index 4136fb06..b0219506 100644
--- a/src/message.c
+++ b/src/message.c
@@ -45,8 +45,8 @@ u32 GetFontStrWith(u8*, u32);
 
 static void StatusUpdate(u32 status);
 
-static u16 RunTextCommand(TextRender* this);
-static void PaletteChange(TextRender* this, u32 id);
+/*static*/ u16 RunTextCommand(TextRender* this);
+/*static*/ void PaletteChange(TextRender* this, u32 id);
 static void SwitchChoice(u32 to, u32 from);
 
 static void MsgChangeLine(u32 lineNo);
@@ -64,9 +64,9 @@ static void sub_08056FBC(TextRender*);
 
 typedef u32 (*MessageFunction)(void);
 static u32 MsgIdle(void);
-static u32 MsgInit(void);
+/*static*/ u32 MsgInit(void);
 static u32 MsgUpdate(void);
-static u32 MsgOpen(void);
+/*static*/ u32 MsgOpen(void);
 static u32 MsgClose(void);
 static u32 MsgDie(void);
 typedef enum {
@@ -84,7 +84,7 @@ static void TextDispUpdate(TextRender* this);
 static void TextDispDie(TextRender* this);
 static void TextDispWait(TextRender* this);
 static void TextDispRoll(TextRender* this);
-static void TextDispEnquiry(TextRender* this);
+/*static*/ void TextDispEnquiry(TextRender* this);
 typedef enum {
     RENDER_INIT,
     RENDER_UPDATE,
@@ -228,7 +228,7 @@ u8* const gUnk_08107BE0[] = {
 };
 
 // regalloc in loop
-NONMATCH("asm/non_matching/textbox/MsgInit.inc", static u32 MsgInit(void)) {
+NONMATCH("asm/non_matching/textbox/MsgInit.inc", /*static*/ u32 MsgInit(void)) {
     char* dest;
     u32 i;
 
@@ -266,7 +266,7 @@ NONMATCH("asm/non_matching/textbox/MsgInit.inc", static u32 MsgInit(void)) {
 }
 END_NONMATCH
 
-static u32 MsgOpen(void) {
+/*static*/ u32 MsgOpen(void) {
     if (gTextRender.renderStatus == RENDER_INIT) {
         gTextRender.renderStatus = RENDER_UPDATE;
         gTextRender._98.bytes.b1 = 1;
@@ -367,7 +367,7 @@ static void TextDispUpdate(TextRender* this) {
     }
 }
 
-NONMATCH("asm/non_matching/textbox/RunTextCommand.inc", static u16 RunTextCommand(TextRender* this)) {
+NONMATCH("asm/non_matching/textbox/RunTextCommand.inc", /*static*/ u16 RunTextCommand(TextRender* this)) {
     s32 palette;
     u32 chr = this->curToken.extended;
 
@@ -492,7 +492,7 @@ NONMATCH("asm/non_matching/textbox/RunTextCommand.inc", static u16 RunTextComman
 }
 END_NONMATCH
 
-static void PaletteChange(TextRender* this, u32 id) {
+/*static*/ void PaletteChange(TextRender* this, u32 id) {
     u32 temp = id % 8;
     this->_8f = temp;
     this->_50.unk2 = temp;
@@ -502,10 +502,10 @@ const u8 gUnk_08107C0F[] = { 0x8, 0x1e, 0x4, 0x12, 0x0 };
 const u8 gUnk_08107C14[] = { 0x8, 0x1e, 0x8, 0xFE, 0x0 };
 
 #ifdef EU
-ASM_FUNC("asm/non_matching/eu/TextDispEnquiry.inc", static void TextDispEnquiry(TextRender* ctb))
+ASM_FUNC("asm/non_matching/eu/TextDispEnquiry.inc", /*static*/ void TextDispEnquiry(TextRender* ctb))
 #else
 
-static void TextDispEnquiry(TextRender* this) {
+/*static*/ void TextDispEnquiry(TextRender* this) {
     s32 nextTextIdx, choiceIdx, lastChoice;
     u32 doSwitch;
     const u8* src;
diff --git a/src/player.c b/src/player.c
index 65076904..6c0463f5 100644
--- a/src/player.c
+++ b/src/player.c
@@ -113,8 +113,8 @@ static EntityAction PortalStandUpdate;
 static EntityAction PortalActivateInit;
 static EntityAction PortalActivateUpdate;
 static EntityAction PortalShrinkInit;
-static EntityAction PortalShrinkUpdate;
-static EntityAction PortalEnterUpdate;
+/*static*/ EntityAction PortalShrinkUpdate;
+/*static*/ EntityAction PortalEnterUpdate;
 static EntityAction PortalUnknownUpdate;
 
 // PLAYER_TALKEZLO
@@ -187,8 +187,8 @@ static EntityAction sub_08072C48;
 // PLAYER_08072C9C
 static EntityAction sub_08072CC0;
 static EntityAction sub_08072CFC;
-static EntityAction sub_08072D54;
-static EntityAction sub_08072F14;
+/*static*/ EntityAction sub_08072D54;
+/*static*/ EntityAction sub_08072F14;
 
 // PLAYER_CLIMB
 static EntityAction sub_08072F94;
@@ -204,8 +204,8 @@ static EntityAction sub_080733BC;
 static EntityAction sub_08073468;
 static EntityAction sub_080734D4;
 static EntityAction sub_08073504;
-static EntityAction sub_08073584;
-static EntityAction sub_0807379C;
+/*static*/ EntityAction sub_08073584;
+/*static*/ EntityAction sub_0807379C;
 static EntityAction sub_080737BC;
 static EntityAction sub_0807380C;
 static EntityAction sub_08073884;
@@ -226,7 +226,7 @@ static EntityAction sub_08073F4C;
 static EntityAction sub_08073FD0;
 static EntityAction sub_08074018;
 static EntityAction sub_08074060;
-static EntityAction sub_080740D8;
+/*static*/ EntityAction sub_080740D8;
 
 // PLAYER_08074C44
 static EntityAction sub_08074C68;
@@ -1178,9 +1178,9 @@ static const u8 gUnk_0811BABC[] = {
 };
 
 // horrible
-static ASM_FUNC("asm/non_matching/player/PortalShrinkUpdate.inc", void PortalShrinkUpdate(Entity* this));
+/*static*/ ASM_FUNC("asm/non_matching/player/PortalShrinkUpdate.inc", void PortalShrinkUpdate(Entity* this));
 
-static void PortalEnterUpdate(Entity* this) {
+/*static*/ void PortalEnterUpdate(Entity* this) {
     if (this->actionDelay == 0) {
         if (GravityUpdate(this, GRAVITY_RATE))
             return;
@@ -2311,7 +2311,7 @@ static const u16* const sTileTable[] = {
     sTiles + 9,
 };
 
-static NONMATCH("asm/non_matching/player/sub_08072D54.inc", void sub_08072D54(Entity* this)) {
+/*static*/ NONMATCH("asm/non_matching/player/sub_08072D54.inc", void sub_08072D54(Entity* this)) {
     u32 bVar1;
     u32 uVar2;
 
@@ -2398,7 +2398,7 @@ static NONMATCH("asm/non_matching/player/sub_08072D54.inc", void sub_08072D54(En
 }
 END_NONMATCH
 
-static void sub_08072F14(Entity* this) {
+/*static*/ void sub_08072F14(Entity* this) {
     if (--this->actionDelay != 0xff) {
         sub_0807921C();
     } else {
@@ -2729,7 +2729,7 @@ static const u16 gUnk_0811BC30[] = {
     0x0720,
 };
 
-static NONMATCH("asm/non_matching/player/sub_08073584.inc", void sub_08073584(Entity* this)) {
+/*static*/ NONMATCH("asm/non_matching/player/sub_08073584.inc", void sub_08073584(Entity* this)) {
     u32 state, dir, tmp, tmp2, idx;
 
     if ((gPlayerState.field_0x92 & 0x80) || this->iframes > 0 || gPlayerState.field_0x3c[0] ||
@@ -2821,7 +2821,7 @@ static NONMATCH("asm/non_matching/player/sub_08073584.inc", void sub_08073584(En
 }
 END_NONMATCH
 
-static void sub_0807379C(Entity* this) {
+/*static*/ void sub_0807379C(Entity* this) {
     if (this->z.HALF.HI > -32) {
         this->z.HALF.HI--;
     } else {
@@ -3244,7 +3244,7 @@ static void sub_08074060(Entity* this) {
     }
 }
 
-static NONMATCH("asm/non_matching/player/sub_080740D8.inc", void sub_080740D8(Entity* this)) {
+/*static*/ NONMATCH("asm/non_matching/player/sub_080740D8.inc", void sub_080740D8(Entity* this)) {
     int v1;          // r5
     int v2;          // r6
     unsigned int v4; // r0