diff --git a/asm/include/ov02.inc b/asm/include/ov02.inc index f9618e23..5f312014 100644 --- a/asm/include/ov02.inc +++ b/asm/include/ov02.inc @@ -804,7 +804,7 @@ .extern func_01ff8214 .extern func_01ff8690 .extern data_02050f54 -.extern func_ov09_0211c144 +.extern LoadTreasureItemFanfare .extern data_027e105c .extern func_ov09_0211cebc .extern _ZN9SysObjectnwEmPjj diff --git a/asm/include/ov31.inc b/asm/include/ov31.inc index 5b585a94..9d0c4cb1 100644 --- a/asm/include/ov31.inc +++ b/asm/include/ov31.inc @@ -215,7 +215,7 @@ .extern func_ov00_020a9588 .extern data_027e1058 .extern data_027e0ce0 -.extern func_ov09_0211c144 +.extern LoadTreasureItemFanfare .extern _ZN9SysObjectnwEmPjj .extern func_ov00_020a9588 .extern data_027e105c diff --git a/asm/ov00/ItemManager/ItemManager.s b/asm/ov00/ItemManager/ItemManager.s index 278005cf..0eb69dbd 100644 --- a/asm/ov00/ItemManager/ItemManager.s +++ b/asm/ov00/ItemManager/ItemManager.s @@ -40,7 +40,7 @@ _020adb5c: ldr r0, [r0] mov r2, #1 mov r3, #0 - bl func_ov09_0211c144 + bl LoadTreasureItemFanfare add r1, r0, #0 b _020adc7c _020adb76: diff --git a/asm/ov00/ItemManager/include/ItemManager.inc b/asm/ov00/ItemManager/include/ItemManager.inc index 200935c1..eff72e42 100644 --- a/asm/ov00/ItemManager/include/ItemManager.inc +++ b/asm/ov00/ItemManager/include/ItemManager.inc @@ -25,7 +25,7 @@ .extern Divide .extern _ZNK11ItemManager16GetEquippedFairyEv .extern _ZNK11ItemManager16GetEquippedFairyEv -.extern func_ov09_0211c144 +.extern LoadTreasureItemFanfare .extern func_0204713c .extern func_0204713c .extern func_0204713c diff --git a/asm/ov02.s b/asm/ov02.s index 281dee6d..797d88e1 100644 --- a/asm/ov02.s +++ b/asm/ov02.s @@ -9036,7 +9036,7 @@ func_ov02_020f644c: ; 0x020f644c ldr r0, [r0] mov r2, r4 mov r3, #0 - blx func_ov09_0211c144 + blx LoadTreasureItemFanfare ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov02_020f644c diff --git a/asm/ov09.s b/asm/ov09.s index a1b0dfb6..6a7b7140 100644 --- a/asm/ov09.s +++ b/asm/ov09.s @@ -16249,9 +16249,9 @@ _0211c138: .word data_ov09_0211f30c _0211c13c: .word data_ov09_0211f36c _0211c140: .word data_ov09_0211f384 - .global func_ov09_0211c144 - thumb_func_start func_ov09_0211c144 -func_ov09_0211c144: ; 0x0211c144 + .global LoadTreasureItemFanfare + thumb_func_start LoadTreasureItemFanfare +LoadTreasureItemFanfare: ; 0x0211c144 push {r3, r4, r5, r6, lr} sub sp, #0x5c add r6, r0, #0 @@ -16301,7 +16301,7 @@ _0211c190: add sp, #0x5c pop {r3, r4, r5, r6, pc} .align 2, 0 - thumb_func_end func_ov09_0211c144 + thumb_func_end LoadTreasureItemFanfare _0211c1a4: .word gItemManager .global func_ov09_0211c1a8 @@ -17599,7 +17599,7 @@ _0211cb18: add r1, r5, #0 ldr r0, [r0] mov r3, #0 - bl func_ov09_0211c144 + bl LoadTreasureItemFanfare pop {r3, r4, r5, pc} nop thumb_func_end func_ov09_0211cac0 diff --git a/asm/ov31.s b/asm/ov31.s index 32ef24fe..f170afc0 100644 --- a/asm/ov31.s +++ b/asm/ov31.s @@ -3737,7 +3737,7 @@ func_ov31_0217eb34: ; 0x0217eb34 ldr r3, [r5, #0x178] mov r0, r4 mov r2, #0 - blx func_ov09_0211c144 + blx LoadTreasureItemFanfare ldr r1, _0217eb90 ; =data_027e0ce0 mov r4, r0 ldr r1, [r1, #4]