From b0b39514c2b43a40fbf18596b89153781d6b16cb Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Tue, 11 Jan 2022 19:12:19 +0100 Subject: [PATCH] Unify asm for non-matching functions So that tools can easier work with them. --- asm/non_matching/{dispCtrlSet.inc => DispCtrlSet.inc} | 0 asm/{getEmptyEntity.s => non_matching/GetEmptyEntity.inc} | 0 asm/{loadRoomEntity.s => non_matching/LoadRoomEntity.inc} | 0 .../businessScrub/{sub_0802925C.inc => sub_0802922C.inc} | 0 .../player/{sub_08070DC4.inc => PlayerBounceUpdate.inc} | 0 .../{sub_080705AC.inc => CheckPlayerInactive.inc} | 0 asm/non_matching/sub_080560B8.inc | 7 ------- .../textbox/{TextBoxFunction1.inc => MsgInit.inc} | 0 .../textbox/{sub_08056750.inc => RunTextCommand.inc} | 3 --- asm/non_matching/townsperson/Townsperson_Head.inc | 7 ------- asm/non_matching/vram/{sub_080AD918.inc => CopyOAM.inc} | 0 src/affine.c | 2 +- src/enemy/businessScrub.c | 2 +- src/entity.c | 2 +- src/interrupts.c | 2 +- src/message.c | 4 ++-- src/player.c | 4 ++-- src/room.c | 2 +- 18 files changed, 9 insertions(+), 26 deletions(-) rename asm/non_matching/{dispCtrlSet.inc => DispCtrlSet.inc} (100%) rename asm/{getEmptyEntity.s => non_matching/GetEmptyEntity.inc} (100%) rename asm/{loadRoomEntity.s => non_matching/LoadRoomEntity.inc} (100%) rename asm/non_matching/businessScrub/{sub_0802925C.inc => sub_0802922C.inc} (100%) rename asm/non_matching/player/{sub_08070DC4.inc => PlayerBounceUpdate.inc} (100%) rename asm/non_matching/playerItemPacciCane/{sub_080705AC.inc => CheckPlayerInactive.inc} (100%) rename asm/non_matching/textbox/{TextBoxFunction1.inc => MsgInit.inc} (100%) rename asm/non_matching/textbox/{sub_08056750.inc => RunTextCommand.inc} (99%) rename asm/non_matching/vram/{sub_080AD918.inc => CopyOAM.inc} (100%) diff --git a/asm/non_matching/dispCtrlSet.inc b/asm/non_matching/DispCtrlSet.inc similarity index 100% rename from asm/non_matching/dispCtrlSet.inc rename to asm/non_matching/DispCtrlSet.inc diff --git a/asm/getEmptyEntity.s b/asm/non_matching/GetEmptyEntity.inc similarity index 100% rename from asm/getEmptyEntity.s rename to asm/non_matching/GetEmptyEntity.inc diff --git a/asm/loadRoomEntity.s b/asm/non_matching/LoadRoomEntity.inc similarity index 100% rename from asm/loadRoomEntity.s rename to asm/non_matching/LoadRoomEntity.inc diff --git a/asm/non_matching/businessScrub/sub_0802925C.inc b/asm/non_matching/businessScrub/sub_0802922C.inc similarity index 100% rename from asm/non_matching/businessScrub/sub_0802925C.inc rename to asm/non_matching/businessScrub/sub_0802922C.inc diff --git a/asm/non_matching/player/sub_08070DC4.inc b/asm/non_matching/player/PlayerBounceUpdate.inc similarity index 100% rename from asm/non_matching/player/sub_08070DC4.inc rename to asm/non_matching/player/PlayerBounceUpdate.inc diff --git a/asm/non_matching/playerItemPacciCane/sub_080705AC.inc b/asm/non_matching/playerItemPacciCane/CheckPlayerInactive.inc similarity index 100% rename from asm/non_matching/playerItemPacciCane/sub_080705AC.inc rename to asm/non_matching/playerItemPacciCane/CheckPlayerInactive.inc diff --git a/asm/non_matching/sub_080560B8.inc b/asm/non_matching/sub_080560B8.inc index 56e0eb89..e5229cdf 100644 --- a/asm/non_matching/sub_080560B8.inc +++ b/asm/non_matching/sub_080560B8.inc @@ -1,11 +1,4 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - .syntax unified - - .text - push {r4, lr} bl CheckHeaderValid cmp r0, #0 diff --git a/asm/non_matching/textbox/TextBoxFunction1.inc b/asm/non_matching/textbox/MsgInit.inc similarity index 100% rename from asm/non_matching/textbox/TextBoxFunction1.inc rename to asm/non_matching/textbox/MsgInit.inc diff --git a/asm/non_matching/textbox/sub_08056750.inc b/asm/non_matching/textbox/RunTextCommand.inc similarity index 99% rename from asm/non_matching/textbox/sub_08056750.inc rename to asm/non_matching/textbox/RunTextCommand.inc index 9939daf0..efa310df 100644 --- a/asm/non_matching/textbox/sub_08056750.inc +++ b/asm/non_matching/textbox/RunTextCommand.inc @@ -1,6 +1,3 @@ - - .section .text - .syntax unified push {r4, r5, r6, r7, lr} diff --git a/asm/non_matching/townsperson/Townsperson_Head.inc b/asm/non_matching/townsperson/Townsperson_Head.inc index f41edb44..6815051f 100644 --- a/asm/non_matching/townsperson/Townsperson_Head.inc +++ b/asm/non_matching/townsperson/Townsperson_Head.inc @@ -1,11 +1,4 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - .syntax unified - - .text - push {r4, r5, lr} adds r4, r0, #0 adds r0, #0x58 diff --git a/asm/non_matching/vram/sub_080AD918.inc b/asm/non_matching/vram/CopyOAM.inc similarity index 100% rename from asm/non_matching/vram/sub_080AD918.inc rename to asm/non_matching/vram/CopyOAM.inc diff --git a/src/affine.c b/src/affine.c index 87bf319e..dcec33a8 100644 --- a/src/affine.c +++ b/src/affine.c @@ -24,7 +24,7 @@ void FlushSprites(void) { gOAMControls.updated = 0; } -NONMATCH("asm/non_matching/vram/sub_080AD918.inc", void CopyOAM(void)) { +NONMATCH("asm/non_matching/vram/CopyOAM.inc", void CopyOAM(void)) { s32 rem; u16* d; diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c index 5f2d6535..9c52774f 100644 --- a/src/enemy/businessScrub.c +++ b/src/enemy/businessScrub.c @@ -531,7 +531,7 @@ bool32 sub_080291DC(Entity* this) { return FALSE; } -NONMATCH("asm/non_matching/businessScrub/sub_0802925C.inc", void sub_0802922C(Entity* this)) { +NONMATCH("asm/non_matching/businessScrub/sub_0802922C.inc", void sub_0802922C(Entity* this)) { const struct SalesOffering* offer = (const struct SalesOffering*)this->field_0x7c.WORD; this->action = 6; diff --git a/src/entity.c b/src/entity.c index cdd1118c..7d6b0344 100644 --- a/src/entity.c +++ b/src/entity.c @@ -235,7 +235,7 @@ void EraseAllEntities(void) { extern Entity gUnk_030015A0[0x48]; extern Entity gUnk_03003BE0; -NONMATCH("./asm/getEmptyEntity.s", Entity* GetEmptyEntity()) { +NONMATCH("asm/non_matching/GetEmptyEntity.inc", Entity* GetEmptyEntity()) { u8 flags_ip; Entity* ptr; Entity* end; diff --git a/src/interrupts.c b/src/interrupts.c index 23633a5c..1668d859 100644 --- a/src/interrupts.c +++ b/src/interrupts.c @@ -117,7 +117,7 @@ void sub_08016CA8(BgSettings* bg) { } } -NONMATCH("asm/non_matching/dispCtrlSet.inc", void DispCtrlSet(void)) { +NONMATCH("asm/non_matching/DispCtrlSet.inc", void DispCtrlSet(void)) { BgControls* controls; u16 tmp = gScreen.lcd.displayControl & gScreen.lcd.displayControlMask; REG_DISPCNT = tmp; diff --git a/src/message.c b/src/message.c index d2d05083..0a3a2725 100644 --- a/src/message.c +++ b/src/message.c @@ -228,7 +228,7 @@ u8* const gUnk_08107BE0[] = { }; // regalloc in loop -NONMATCH("asm/non_matching/textbox/TextBoxFunction1.inc", static u32 MsgInit(void)) { +NONMATCH("asm/non_matching/textbox/MsgInit.inc", static u32 MsgInit(void)) { char* dest; u32 i; @@ -367,7 +367,7 @@ static void TextDispUpdate(TextRender* this) { } } -NONMATCH("asm/non_matching/textbox/sub_08056750.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; diff --git a/src/player.c b/src/player.c index a76b4013..74cf3bec 100644 --- a/src/player.c +++ b/src/player.c @@ -324,7 +324,7 @@ extern u16 script_BedAtSimons; extern Entity* gPlayerClones[]; extern ScriptExecutionContext gPlayerScriptExecutionContext; -NONMATCH("asm/non_matching/playerItemPacciCane/sub_080705AC.inc", u32 CheckPlayerInactive(void)) { +NONMATCH("asm/non_matching/playerItemPacciCane/CheckPlayerInactive.inc", u32 CheckPlayerInactive(void)) { if (!((gInput.newKeys & START_BUTTON) == 0 || gFadeControl.active || gUnk_02034490[0] || (gMessage.doTextBox & 0x7F) || gSave.stats.health == 0 || !gSave.fillerD0[34] || gPlayerState.controlMode != 0 || gPriorityHandler.priority_timer != 0)) { @@ -703,7 +703,7 @@ static void PlayerBounceInit(Entity* this) { } // minor regalloc -static NONMATCH("asm/non_matching/player/sub_08070DC4.inc", void PlayerBounceUpdate(Entity* this)) { +static NONMATCH("asm/non_matching/player/PlayerBounceUpdate.inc", void PlayerBounceUpdate(Entity* this)) { UpdateAnimationSingleFrame(this); sub_080085B0(this); UpdatePlayerMovement(); diff --git a/src/room.c b/src/room.c index 8e8928d0..7e5ffa99 100644 --- a/src/room.c +++ b/src/room.c @@ -52,7 +52,7 @@ void LoadRoomEntityList(EntityData* listPtr) { } } -NONMATCH("asm/loadRoomEntity.s", Entity* LoadRoomEntity(EntityData* dat)) { +NONMATCH("asm/non_matching/LoadRoomEntity.inc", Entity* LoadRoomEntity(EntityData* dat)) { int kind; Entity* v4; Entity* v5;