diff --git a/asm/main_02000C6C.s b/asm/main_02000C6C.s index f2518220..1b791d4e 100644 --- a/asm/main_02000C6C.s +++ b/asm/main_02000C6C.s @@ -3198,6 +3198,7 @@ _020032E4: bgt _020032D8 bx lr +; https://decomp.me/scratch/qcRwD arm_func_start Memcpy16 Memcpy16: ; 0x020032F0 b _02003300 @@ -3211,6 +3212,7 @@ _02003300: bgt _020032F4 bx lr +; https://decomp.me/scratch/edLa8 arm_func_start Memcpy32 Memcpy32: ; 0x0200330C b _0200331C diff --git a/asm/main_020082C4.s b/asm/main_020082C4.s index 3ee5c108..dc0d1ff4 100644 --- a/asm/main_020082C4.s +++ b/asm/main_020082C4.s @@ -2846,14 +2846,14 @@ _0200A6D0: strb r1, [ip], #1 bne _0200A6D0 mov r2, #0 - ldr r1, _0200A6FC ; =sub_0200AE38 + ldr r1, _0200A6FC ; =TransformPaletteDataWithFlushDivideFade str r2, [r0, #0x10] str r1, [r0, #0x14] mov r1, #1 strb r1, [r0, #8] bx lr .align 2, 0 -_0200A6FC: .word sub_0200AE38 +_0200A6FC: .word TransformPaletteDataWithFlushDivideFade arm_func_end sub_0200A6C4 arm_func_start sub_0200A700 @@ -3389,8 +3389,9 @@ _0200AE30: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} arm_func_end sub_0200ACB0 - arm_func_start sub_0200AE38 -sub_0200AE38: ; 0x0200AE38 +; https://decomp.me/scratch/VDRBP + arm_func_start TransformPaletteDataWithFlushDivideFade +TransformPaletteDataWithFlushDivideFade: ; 0x0200AE38 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x18 mov sl, r0 @@ -3559,7 +3560,7 @@ _0200B098: _0200B0A4: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} - arm_func_end sub_0200AE38 + arm_func_end TransformPaletteDataWithFlushDivideFade arm_func_start sub_0200B0AC sub_0200B0AC: ; 0x0200B0AC diff --git a/asm/main_0207F40C.s b/asm/main_0207F40C.s index 69f3a922..c3eea94a 100644 --- a/asm/main_0207F40C.s +++ b/asm/main_0207F40C.s @@ -94,6 +94,7 @@ _0207F538: _0207F54C: .word _022BB5EC arm_func_end sub_0207F40C +; https://decomp.me/scratch/ioqaD arm_func_start sub_0207F550 sub_0207F550: ; 0x0207F550 stmdb sp!, {r3, r4, r5, r6, r7, lr} diff --git a/asm/main_0207F894.s b/asm/main_0207F894.s index a496c5f3..0e2024c9 100644 --- a/asm/main_0207F894.s +++ b/asm/main_0207F894.s @@ -12335,6 +12335,7 @@ _02089A60: ldmia sp!, {r4, pc} arm_func_end strcspn +; https://decomp.me/scratch/QV4rQ arm_func_start strstr strstr: ; 0x02089A70 stmdb sp!, {r4, lr} diff --git a/asm/overlay_00.s b/asm/overlay_00.s index bcac932a..7b04b43f 100644 --- a/asm/overlay_00.s +++ b/asm/overlay_00.s @@ -3,6 +3,7 @@ .text +; https://decomp.me/scratch/rqTSp arm_func_start ov00_022BCA80 ov00_022BCA80: ; 0x022BCA80 stmdb sp!, {r4, r5, r6, lr} diff --git a/asm/overlay_10.s b/asm/overlay_10.s index 42413e40..9993265b 100644 --- a/asm/overlay_10.s +++ b/asm/overlay_10.s @@ -136,6 +136,7 @@ _022BCC58: .word INVENTORY_MENU_DEFAULT_WINDOW_PARAMS _022BCC5C: .word UpdateInventoryMenu arm_func_end CreateInventoryMenu +; https://decomp.me/scratch/V74kd arm_func_start ov10_022BCC60 ov10_022BCC60: ; 0x022BCC60 stmdb sp!, {r4, lr} @@ -982,6 +983,7 @@ ov10_022BD718: ; 0x022BD718 _022BD740: .word ov10_022DC220 arm_func_end ov10_022BD718 +; https://decomp.me/scratch/bBFFj arm_func_start ov10_022BD744 ov10_022BD744: ; 0x022BD744 ldr r0, _022BD758 ; =ov10_022DC1C0 diff --git a/asm/overlay_11.s b/asm/overlay_11.s index bc0952d0..2bb4d1ad 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -14061,6 +14061,7 @@ _022E824C: _022E8254: .word ov11_02324F9C arm_func_end GetRandomNpcJobStillAvailable +; https://decomp.me/scratch/bAiXn arm_func_start AcceptRandomNpcJob AcceptRandomNpcJob: ; 0x022E8258 stmdb sp!, {r3, lr} @@ -30927,6 +30928,7 @@ _022F5D48: ldmia sp!, {r4, r5, r6, r7, pc} arm_func_end ov11_022F5C94 +; https://decomp.me/scratch/OsJD0 arm_func_start GetIdleAnimationType GetIdleAnimationType: ; 0x022F5D50 ldr r2, _022F6CF4 ; =0x000002C6 diff --git a/asm/overlay_29_022DC314.s b/asm/overlay_29_022DC314.s index 1dd0954c..1c276086 100644 --- a/asm/overlay_29_022DC314.s +++ b/asm/overlay_29_022DC314.s @@ -396,6 +396,7 @@ _022DC7D0: _022DC7E0: .word ov29_02353518 arm_func_end ov29_022DC78C +; https://decomp.me/scratch/qiwjF arm_func_start ov29_022DC7E4 ov29_022DC7E4: ; 0x022DC7E4 stmdb sp!, {r3, lr} diff --git a/asm/overlay_29_022E0378.s b/asm/overlay_29_022E0378.s index 74fabe83..8edabbcb 100644 --- a/asm/overlay_29_022E0378.s +++ b/asm/overlay_29_022E0378.s @@ -3,6 +3,7 @@ .text +; https://decomp.me/scratch/SGR0O arm_func_start ov29_022E0378 ov29_022E0378: ; 0x022E0378 ldr r1, _022E03A8 ; =ov29_0237CFC0 diff --git a/asm/overlay_29_023118D8.s b/asm/overlay_29_023118D8.s index ee017c12..9dc53625 100644 --- a/asm/overlay_29_023118D8.s +++ b/asm/overlay_29_023118D8.s @@ -2623,6 +2623,7 @@ _02313B00: .word 0x00000D8F + BOOST_OFFENSIVE_STAT_OFFSET _02313B04: .word 0x00000DD8 + BOOST_OFFENSIVE_STAT_OFFSET arm_func_end BoostOffensiveStat +; https://decomp.me/scratch/90P8f arm_func_start BoostDefensiveStat BoostDefensiveStat: ; 0x02313B08 stmdb sp!, {r0, r1, r2, r3} diff --git a/asm/overlay_29_023350FC.s b/asm/overlay_29_023350FC.s index 0be7c280..7e7f3876 100644 --- a/asm/overlay_29_023350FC.s +++ b/asm/overlay_29_023350FC.s @@ -1706,6 +1706,7 @@ _023360F0: _023360F8: .word ov29_0237CA8C arm_func_end ov29_02335F40 +; https://decomp.me/scratch/OBj9L arm_func_start GetTile GetTile: ; 0x023360FC cmp r0, #0 diff --git a/asm/overlay_29_0233861C.s b/asm/overlay_29_0233861C.s index fd8bbd34..85a167b0 100644 --- a/asm/overlay_29_0233861C.s +++ b/asm/overlay_29_0233861C.s @@ -9957,6 +9957,7 @@ _02340C84: _02340CA8: .word DUNGEON_PTR arm_func_end ResetFloor +; https://decomp.me/scratch/8KLd6 arm_func_start PosIsOutOfBounds PosIsOutOfBounds: ; 0x02340CAC cmp r0, #0 diff --git a/asm/overlay_31_02382FBC.s b/asm/overlay_31_02382FBC.s index 5c59fc12..c26102fe 100644 --- a/asm/overlay_31_02382FBC.s +++ b/asm/overlay_31_02382FBC.s @@ -317,6 +317,7 @@ _023833C4: _023833D4: .word OVERLAY31_UNKNOWN_POINTER__NA_238A268 arm_func_end ov31_023833B4 +; https://decomp.me/scratch/Q183B arm_func_start ov31_023833D8 ov31_023833D8: ; 0x023833D8 stmdb sp!, {r3, lr} @@ -672,6 +673,7 @@ _02383820: _02383850: .word OVERLAY31_UNKNOWN_POINTER__NA_238A26C arm_func_end ov31_023837C8 +; https://decomp.me/scratch/VL6fa arm_func_start ov31_02383854 ov31_02383854: ; 0x02383854 stmdb sp!, {r4, lr}