Decomped abs

asm/include/main_0207F894.inc

@@ -1,8 +1,25 @@
 #pragma once
+.public ArrayCopy32
+.public ArrayFill32
+.public ArrayFill32Fast
+.public CopyAndInterleave
+.public EnableIrqFlag
+.public FileInit
+.public GetIrqFlag
+.public MIi_UncompressBackward
+.public MemcpyFast
+.public MemsetFast
+.public OS_GetLockID
+.public OSi_ReferSymbol
+.public SVC_CpuSet
+.public SVC_WaitByLoop
+.public SetIrqFlag
+.public StartThread
+.public ThreadExit
+.public WaitForInterrupt
+.public WaitForever2
 .public _02000BC4
 .public _020AEC5C
-.public _020AECB0
-.public _020AEDB0
 .public _020B2BB4
 .public _020B2BB8
 .public _020B2BC0
@@ -12,22 +29,7 @@
 .public _020B2E9C
 .public _020B2ED0
 .public _020B2ED4
-.public _020B2F20
-.public _020B2F6C
 .public _020B2FBC
-.public _020B301C
-.public _020B31E4
-.public _020B31EC
-.public _020B31F4
-.public _020B31FC
-.public _020B3200
-.public _020B3204
-.public _020B320C
-.public _020B3214
-.public _020B3218
-.public _020B321C
-.public _020B3220
-.public _020B3224
 .public _020B3364
 .public _022B966C
 .public _022BB5EC
@@ -61,33 +63,9 @@
 .public _022BC228
 .public _022BC22C
 .public _022BC650
-.public _022BC674
-.public _022BC698
-.public _022BCA70
 .public _022BCA74
-.public _deq
-.public _dls
 .public _f2d
 .public _ll_udiv
-.public _u32_div_f
-.public _ull_mod
-.public ArrayCopy32
-.public ArrayFill32
-.public ArrayFill32Fast
-.public CopyAndInterleave
-.public EnableIrqFlag
-.public FileInit
-.public GetIrqFlag
-.public MemcpyFast
-.public MemsetFast
-.public MIi_UncompressBackward
-.public OS_GetLockID
-.public OSi_ReferSymbol
-.public SetIrqFlag
-.public StartThread
-.public strchr
-.public strlen
-.public strncpy
 .public sub_02078A98
 .public sub_02078C3C
 .public sub_02078C68
@@ -103,9 +81,6 @@
 .public sub_02079940
 .public sub_02079A64
 .public sub_0207A030
-.public sub_0207A048
-.public sub_0207A0CC
-.public sub_0207A164
 .public sub_0207A270
 .public sub_0207A2A4
 .public sub_0207A2C0
@@ -135,11 +110,4 @@
 .public sub_0207F654
 .public sub_0207F70C
 .public sub_0207F818
-.public sub_0208B374
-.public sub_0208C5B4
-.public sub_0208D638
-.public SVC_CpuSet
-.public SVC_WaitByLoop
-.public ThreadExit
-.public WaitForever2
-.public WaitForInterrupt
+.public sub_02086B7C

asm/include/main_02086568.inc

@@ -0,0 +1,40 @@
+#pragma once
+.public _020AECB0
+.public _020AEDB0
+.public _020B2ED4
+.public _020B2F20
+.public _020B2F6C
+.public _020B301C
+.public _020B31E4
+.public _020B31EC
+.public _020B31F4
+.public _020B31FC
+.public _020B3200
+.public _020B3204
+.public _020B320C
+.public _020B3214
+.public _020B3218
+.public _020B321C
+.public _020B3220
+.public _020B3224
+.public _022B966C
+.public _022BC650
+.public _022BC674
+.public _022BC698
+.public _022BCA70
+.public _deq
+.public _dls
+.public _ll_udiv
+.public _u32_div_f
+.public _ull_mod
+.public strchr
+.public strlen
+.public strncpy
+.public sub_0207A048
+.public sub_0207A0CC
+.public sub_0207A164
+.public sub_02086468
+.public sub_020864F4
+.public sub_0208B374
+.public sub_0208C5B4
+.public sub_0208D638

include/main_0208655C.h

@@ -0,0 +1,7 @@
+#ifndef PMDSKY_MAIN_0208655C_H
+#define PMDSKY_MAIN_0208655C_H
+
+// Takes the absolute value of an integer.
+s32 abs(s32 value);
+
+#endif //PMDSKY_MAIN_0208655C_H

main.lsf

@@ -50,6 +50,8 @@ Static main
 	Object asm/main_0207F40C.o
 	Object src/main_0207F818.o
 	Object asm/main_0207F894.o
+	Object src/main_0208655C.o
+	Object asm/main_02086568.o
 	Object src/main_02089678.o
 	Object asm/main_02089694.o
 	Object src/main_020897AC.o

src/dungeon_ai_items_1.c

@@ -6,6 +6,7 @@
 #include "dungeon_util_static.h"
 #include "dungeon_visibility.h"
 #include "item.h"
+#include "main_0208655C.h"
 #include "targeting.h"
 
 // dungeon_ai_items.c and dungeon_ai_items_1.c are split up to define AI_THROWN_ITEM_ACTION_CHOICE_COUNT differently.
@@ -16,7 +17,6 @@ extern struct dungeon *DUNGEON_PTR[];
 
 extern bool8 IsTargetInRange(struct entity *user, struct entity *target, s32 direction, s32 n_tiles);
 extern u32 GetAiUseItemProbability(struct entity *item_consumer, struct item *item, u32 flags);
-extern s32 abs(s32 value);
 
 void GetPossibleAiThrownItemDirections(struct entity *entity, s32 ally_or_enemy, struct item *item, bool8 always_add)
 {

src/dungeon_range.c

@@ -2,12 +2,11 @@
 #include "dg_camera.h"
 #include "dungeon.h"
 #include "dungeon_map_access.h"
+#include "main_0208655C.h"
 #include "map.h"
 
 extern struct dungeon *DUNGEON_PTR[];
 
-extern s32 abs(s32 value);
-
 bool8 IsPositionActuallyInSight(struct position *origin, struct position *target, bool8 user_has_dropeye)
 {
     u8 origin_room;

src/main_0208655C.c

@@ -0,0 +1,6 @@
+#include "main_0208655C.h"
+
+s32 abs(s32 value)
+{
+    return value < 0 ? -value : value;
+}