Merge pull request #288 from octorock/nonmatch

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

asm/non_matching/textbox/RunTextCommand.inc

@@ -1,6 +1,3 @@
-
-    .section .text
-
     .syntax unified
 
 	push {r4, r5, r6, r7, lr}

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

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;
 

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;

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;

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;

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;
 

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();

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;