diff options
Diffstat (limited to 'arm9/modules')
33 files changed, 210 insertions, 211 deletions
diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s index 52073cac..4b30f2d3 100644 --- a/arm9/modules/05/asm/mod05_021D74E0.s +++ b/arm9/modules/05/asm/mod05_021D74E0.s @@ -10,7 +10,7 @@ MOD05_021D74E0: ; 0x021D74E0 ldr r0, [r4, #8] bl DoScheduledBgGpuUpdates bl FUN_0201C30C - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r0, [r4, #0x34] bl FUN_020583A0 bl MOD05_021F2D48 @@ -744,10 +744,10 @@ MOD05_021D7B38: ; 0x021D7B38 thumb_func_start MOD05_021D7B5C MOD05_021D7B5C: ; 0x021D7B5C - ldr r3, _021D7B60 ; =FUN_02009FA0 + ldr r3, _021D7B60 ; =DeinitOamData bx r3 .balign 4, 0 -_021D7B60: .word FUN_02009FA0 +_021D7B60: .word DeinitOamData thumb_func_start MOD05_021D7B64 MOD05_021D7B64: ; 0x021D7B64 diff --git a/arm9/modules/05/asm/mod05_021E3340.s b/arm9/modules/05/asm/mod05_021E3340.s index 8fb0d143..5aeaf2cc 100644 --- a/arm9/modules/05/asm/mod05_021E3340.s +++ b/arm9/modules/05/asm/mod05_021E3340.s @@ -35,14 +35,14 @@ _021E3370: sub r1, #0x12 mov r2, #0 mov r3, #0x3f - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add r0, r0, #1 str r0, [r4] b _021E3414 _021E3388: mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021E3414 ldr r0, [r5, #8] @@ -67,7 +67,7 @@ _021E33A0: add r0, r6, #0 bl Sav2_Poketch_Give mov r0, #1 - bl FUN_0200A03C + bl GetOamManager str r0, [sp] ldr r1, [r5, #4] ldr r2, [r5, #0xc] @@ -87,14 +87,14 @@ _021E33E4: mov r0, #4 sub r2, #0x10 mov r3, #0x3f - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add r0, r0, #1 str r0, [r4] b _021E3414 _021E33FE: mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021E3414 add r0, r4, #0 diff --git a/arm9/modules/05/asm/mod05_021EFA9C.s b/arm9/modules/05/asm/mod05_021EFA9C.s index f749c0e8..b6c27091 100644 --- a/arm9/modules/05/asm/mod05_021EFA9C.s +++ b/arm9/modules/05/asm/mod05_021EFA9C.s @@ -37,7 +37,7 @@ MOD05_021EFAAC: ; 0x021EFAAC mov r1, #2 bl HandleLoadOverlay mov r0, #1 - bl FUN_0200A03C + bl GetOamManager str r0, [sp] ldr r1, [r5, #4] ldr r2, [r5, #0xc] diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index acd698d5..93dd97ef 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -37368,7 +37368,7 @@ _022244E4: mov r1, #0x10 mov r2, #0 mov r3, #0xd - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #0 mvn r0, r0 str r0, [r4, #0x10] @@ -37384,7 +37384,7 @@ _02224508: cmp r1, r0 bne _02224532 mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _02224532 mov r0, #1 @@ -37393,7 +37393,7 @@ _02224508: mov r1, #0 mov r2, #0x10 mov r3, #0xd - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #1 mvn r0, r0 str r0, [r4, #0x10] @@ -37408,7 +37408,7 @@ _02224532: b _022245A8 _02224544: mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _022245A8 ldr r0, [r4, #0xc] diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index c035be6d..88cebb83 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -8253,7 +8253,7 @@ _022318EA: MOD12_022318F8: ; 0x022318F8 push {r3, lr} mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #1 bne _02231908 mov r0, #1 @@ -8268,7 +8268,7 @@ MOD12_0223190C: ; 0x0223190C sub sp, #4 mov r0, #1 add r4, r1, #0 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _02231972 ldr r0, [r4, #8] @@ -8286,7 +8286,7 @@ MOD12_0223190C: ; 0x0223190C mov r1, #0 mov r2, #4 mov r3, #0x3f - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, _02231978 ; =0x000005F8 bl PlaySE mov r0, #0 @@ -28281,7 +28281,7 @@ _0223B04E: ldrsb r1, [r4, r1] ldrsb r2, [r4, r2] mov r3, #0x3d - bl FUN_0200A208 + bl StartBrightnessTransition ldrb r0, [r4, #0x10] add sp, #8 add r0, r0, #1 @@ -28289,7 +28289,7 @@ _0223B04E: pop {r3, r4, r5, pc} _0223B06C: mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #1 bne _0223B0C0 mov r1, #0 @@ -47725,7 +47725,7 @@ _0224467E: mov r1, #0x10 mov r2, #0 mov r3, #0x3f - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, _02244704 ; =0x0000049E mov r1, #0x5a bl FUN_02005350 @@ -47735,7 +47735,7 @@ _0224467E: pop {r3, r4, r5, pc} _0224469E: mov r0, #3 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #1 bne _02244700 bl FUN_02005404 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index e1acb188..67f55456 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -10857,7 +10857,7 @@ MOD14_021DCA38: ; 0x021DCA38 bl FreeToHeap add r0, r4, #0 bl FreeToHeap - bl FUN_02009FA0 + bl DeinitOamData pop {r4, pc} .align 2, 0 _021DCB08: .word 0x0000B3AC @@ -10994,7 +10994,7 @@ MOD14_021DCBFC: ; 0x021DCBFC bl MOD14_021E0EE4 ldr r0, [r4, #0x18] bl FUN_0201FDEC - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r3, _021DCC24 ; =0x027E0000 ldr r1, _021DCC28 ; =0x00003FF8 mov r0, #1 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 173d4fd6..ba4f57ae 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -2664,7 +2664,7 @@ _021D88A4: bl FUN_0200CAB4 ldr r0, [r6, #4] bl FUN_0200CAB4 - bl FUN_02009FA0 + bl DeinitOamData ldr r0, [r6, #0x24] bl FUN_0201FD58 ldr r0, [r6, #0x20] @@ -2691,7 +2691,7 @@ MOD15_021D88DC: ; 0x021D88DC push {r3, lr} ldr r0, [r1, #0x24] bl FUN_0201FDEC - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r3, _021D88F8 ; =0x027E0000 ldr r1, _021D88FC ; =0x00003FF8 mov r0, #1 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 16b3c00d..3365be5a 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -105,7 +105,7 @@ _021D75AC: mvn r0, r0 mov r1, #0x3f mov r2, #3 - bl FUN_0200A274 + bl SetBrightness ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -614,7 +614,7 @@ MOD16_021D79FC: ; 0x021D79FC thumb_func_start MOD16_021D7A10 MOD16_021D7A10: ; 0x021D7A10 push {r3, lr} - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C bl MOD16_021D8514 @@ -627,7 +627,7 @@ MOD16_021D7A24: ; 0x021D7A24 ldr r1, _021D7A34 ; =0x0000177C add r0, r0, r1 bl MOD16_021D86DC - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer pop {r3, pc} .align 2, 0 _021D7A34: .word 0x0000177C @@ -13301,7 +13301,7 @@ MOD16_021DD724: ; 0x021DD724 mov r0, #4 sub r2, #0x10 mov r3, #0x39 - bl FUN_0200A208 + bl StartBrightnessTransition pop {r3, r4, r5, pc} _021DD74C: mov r0, #1 @@ -13311,7 +13311,7 @@ _021DD74C: sub r1, #0x14 mov r2, #0 mov r3, #0x39 - bl FUN_0200A208 + bl StartBrightnessTransition _021DD75E: pop {r3, r4, r5, pc} thumb_func_end MOD16_021DD724 @@ -13328,7 +13328,7 @@ MOD16_021DD760: ; 0x021DD760 cmp r0, #1 beq _021DD77C mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive b _021DD77E _021DD77C: mov r0, #1 @@ -13346,7 +13346,7 @@ _021DD77E: mvn r0, r0 mov r1, #0x3f mov r2, #1 - bl FUN_0200A274 + bl SetBrightness ldr r0, [r5] mov r1, #0 add r0, r0, #4 @@ -14292,14 +14292,14 @@ _021DDE94: mov r0, #4 sub r2, #0x10 mov r3, #0x3f - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add r0, r0, #1 str r0, [r4] b _021DDEC8 _021DDEAE: mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021DDEC8 ldr r0, [r4] @@ -14415,14 +14415,14 @@ _021DDF86: sub r1, #0x14 mov r2, #0 mov r3, #0x3f - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add r0, r0, #1 str r0, [r4] b _021DDFD8 _021DDFA0: mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021DDFD8 ldr r0, [r4] @@ -16501,14 +16501,14 @@ _021DEEF6: str r0, [sp] sub r2, #0x10 mov r3, #0x3f - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add r0, r0, #1 str r0, [r4] b _021DEF2E _021DEF18: mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021DEF2E ldr r0, [r4] @@ -16592,7 +16592,7 @@ _021DEF96: sub r1, #0x16 mov r2, #0 mov r3, #0x3f - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -16603,7 +16603,7 @@ _021DEFB6: b _021DEFF2 _021DEFBC: mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021DEFF2 ldr r0, [r4] @@ -18398,7 +18398,7 @@ _021DFD50: mov r0, #1 sub r2, #0x10 mov r3, #0x3f - bl FUN_0200A208 + bl StartBrightnessTransition add r0, r6, #0 add r1, r5, #0 add r2, r7, #0 @@ -18409,7 +18409,7 @@ _021DFD50: b _021DFD96 _021DFD80: mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021DFD96 ldr r0, [r4] @@ -18617,14 +18617,14 @@ _021DFF02: sub r1, #0x16 mov r2, #0 mov r3, #0x3f - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add r0, r0, #1 str r0, [r4] b _021DFF6E _021DFF1C: mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021DFF6E ldr r0, [r4] @@ -25278,7 +25278,7 @@ MOD16_021E2E74: ; 0x021E2E74 mov r0, #4 sub r2, #0x10 mov r3, #0x3f - bl FUN_0200A208 + bl StartBrightnessTransition add sp, #4 pop {r3, r4, pc} _021E2EA4: @@ -25293,7 +25293,7 @@ _021E2EA4: sub r1, #0x14 mov r2, #0 mov r3, #0x3f - bl FUN_0200A208 + bl StartBrightnessTransition _021E2EC0: add sp, #4 pop {r3, r4, pc} @@ -28340,7 +28340,7 @@ MOD16_021E45BC: ; 0x021E45BC b _021E45E2 _021E45DC: mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive _021E45E2: cmp r0, #0 beq _021E45F4 @@ -37267,7 +37267,7 @@ MOD16_021E8878: ; 0x021E8878 b _021E889E _021E8898: mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive _021E889E: cmp r0, #0 beq _021E88B0 @@ -39308,7 +39308,7 @@ _021E979E: mov r0, #4 sub r2, #0x10 mov r3, #0x3f - bl FUN_0200A208 + bl StartBrightnessTransition add r0, r5, #0 add r1, r6, #0 add r2, r7, #0 @@ -39319,7 +39319,7 @@ _021E979E: b _021E97D8 _021E97C2: mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021E97D8 ldr r0, [r4] @@ -39392,14 +39392,14 @@ _021E9834: sub r1, #0x14 mov r2, #0 mov r3, #0x3f - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add r0, r0, #1 str r0, [r4] b _021E9890 _021E984E: mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021E9890 ldr r0, [r4] @@ -42999,7 +42999,7 @@ MOD16_021EB2E0: ; 0x021EB2E0 b _021EB306 _021EB300: mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive _021EB306: cmp r0, #0 beq _021EB318 @@ -46749,7 +46749,7 @@ MOD16_021ECF04: ; 0x021ECF04 b _021ECF2A _021ECF24: mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive _021ECF2A: cmp r0, #0 beq _021ECF3C @@ -50300,7 +50300,7 @@ MOD16_021EEA00: ; 0x021EEA00 b _021EEA26 _021EEA20: mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive _021EEA26: cmp r0, #0 beq _021EEA38 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 7e32e1c9..9111403a 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -863,7 +863,7 @@ MOD17_021D7AE4: ; 0x021D7AE4 bl DoScheduledBgGpuUpdates ldr r0, [r4, #0x20] bl FUN_020081C4 - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD17_021D7AE4 @@ -1137,7 +1137,7 @@ MOD17_021D7CF0: ; 0x021D7CF0 push {r3, lr} ldr r0, [r0, #0x38] bl DoScheduledBgGpuUpdates - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer pop {r3, pc} .align 2, 0 thumb_func_end MOD17_021D7CF0 @@ -1724,7 +1724,7 @@ _021D8178: blt _021D8178 bl FUN_0201D12C bl FUN_0201E08C - bl FUN_02009FA0 + bl DeinitOamData pop {r3, r4, r5, pc} thumb_func_end MOD17_021D816C @@ -3933,7 +3933,7 @@ _021D934E: sub r1, #0x18 mov r2, #0 mov r3, #0xa - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4, #0xc] add sp, #4 add r0, r0, #1 @@ -3941,7 +3941,7 @@ _021D934E: pop {r3, r4, pc} _021D936A: mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D9424 ldr r0, [r4, #0xc] @@ -4009,7 +4009,7 @@ _021D93EA: mov r0, #8 sub r2, #0x10 mov r3, #0xa - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4, #0xc] add sp, #4 add r0, r0, #1 @@ -4017,7 +4017,7 @@ _021D93EA: pop {r3, r4, pc} _021D9406: mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D9424 ldr r0, [r4, #0xc] @@ -4093,7 +4093,7 @@ _021D9482: sub r1, #0x18 mov r2, #0 mov r3, #0xa - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4, #0xc] add sp, #4 add r0, r0, #1 @@ -4101,7 +4101,7 @@ _021D9482: pop {r3, r4, pc} _021D949E: mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D95A4 ldr r0, [r4, #0xc] @@ -4175,7 +4175,7 @@ _021D952E: mov r0, #8 sub r2, #0x10 mov r3, #0xa - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4, #0xc] add sp, #4 add r0, r0, #1 @@ -4183,7 +4183,7 @@ _021D952E: pop {r3, r4, pc} _021D954A: mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D95A4 ldr r0, [r4, #0xc] diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index f30d7e23..ac5296d1 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -1969,7 +1969,7 @@ _0223A5F8: ldr r0, [r0] ldr r0, [r0, #0x20] bl FUN_0201FD58 - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C mov r0, #0 @@ -2628,7 +2628,7 @@ _0223AB94: add r2, r1, #0 mov r3, #7 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #0x1a add sp, #0xc str r0, [r4] @@ -6175,7 +6175,7 @@ MOD18_0223C6CC: ; 0x0223C6CC add r0, r4, #0 bl DoScheduledBgGpuUpdates bl FUN_0201C30C - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer pop {r4, pc} thumb_func_end MOD18_0223C6CC @@ -13940,7 +13940,7 @@ _0224013A: mov r1, #0xa mov r2, #0 add r3, r0, #0 - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add sp, #8 add r0, r0, #1 @@ -13957,7 +13957,7 @@ _0224015A: mov r1, #0 mov r2, #0xa add r3, r0, #0 - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add sp, #8 add r0, r0, #1 @@ -13989,7 +13989,7 @@ _02240190: sub r1, r0, #5 mov r2, #0 add r3, r0, #0 - bl FUN_0200A208 + bl StartBrightnessTransition bl MOD18_0223D638 bl MOD18_0224DD94 ldr r0, [r4, #0xc] @@ -14011,7 +14011,7 @@ _022401D2: mov r1, #1 mov r0, #0 add r2, r1, #0 - bl FUN_0200A274 + bl SetBrightness add r0, r4, #0 bl FreeToHeap add r0, r5, #0 @@ -14123,7 +14123,7 @@ MOD18_022402A0: ; 0x022402A0 mov r1, #1 mov r0, #0 add r2, r1, #0 - bl FUN_0200A274 + bl SetBrightness add r0, r4, #0 bl FreeToHeap ldr r0, _022402EC ; =0x022513A0 @@ -14372,7 +14372,7 @@ _02240480: strh r0, [r1] mov r1, #1 add r2, r1, #0 - bl FUN_0200A274 + bl SetBrightness ldr r0, _022404EC ; =0x022513A0 mov r1, #2 ldr r0, [r0, #4] @@ -14666,7 +14666,7 @@ _022406A4: mov r2, #0 add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition mov r1, #0 mov r0, #0x12 str r1, [sp] @@ -14706,7 +14706,7 @@ _022406F6: mov r2, #0xa add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, _02240884 ; =0x022513A0 ldr r1, [r0, #4] ldr r0, _02240888 ; =0x00000B3B @@ -14790,7 +14790,7 @@ _0224079E: mov r2, #0 add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #4 mov r1, #1 bl GX_EngineAToggleLayers @@ -15358,7 +15358,7 @@ MOD18_02240C14: ; 0x02240C14 mov r1, #1 mov r0, #0 add r2, r1, #0 - bl FUN_0200A274 + bl SetBrightness ldr r0, _02240C70 ; =0x04000050 mov r1, #0 strh r1, [r0] @@ -15593,7 +15593,7 @@ MOD18_02240DC8: ; 0x02240DC8 mov r1, #1 mov r0, #0 add r2, r1, #0 - bl FUN_0200A274 + bl SetBrightness ldr r0, _02240E28 ; =0x04000050 mov r1, #0 strh r1, [r0] @@ -15658,7 +15658,7 @@ _02240E54: mov r2, #0 add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition b _02240E7A _02240E68: cmp r0, #4 @@ -15668,7 +15668,7 @@ _02240E68: mov r2, #0xa add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition _02240E7A: ldr r0, [r4, #0x10] cmp r0, #0x1e @@ -15692,7 +15692,7 @@ _02240EA4: mov r1, #1 mov r0, #0 add r2, r1, #0 - bl FUN_0200A274 + bl SetBrightness ldr r0, _02240EE0 ; =0x04000050 mov r1, #0 strh r1, [r0] @@ -15826,7 +15826,7 @@ _02240FB4: mov r1, #1 mov r0, #0 add r2, r1, #0 - bl FUN_0200A274 + bl SetBrightness ldr r0, _02241004 ; =0x04000050 mov r1, #0 strh r1, [r0] @@ -15944,7 +15944,7 @@ _02241096: mov r1, #0xa mov r2, #0 add r3, r0, #0 - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add sp, #0x14 add r0, r0, #1 @@ -15961,7 +15961,7 @@ _022410B6: mov r1, #0 mov r2, #0xa add r3, r0, #0 - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add sp, #0x14 add r0, r0, #1 @@ -16441,7 +16441,7 @@ _02241472: mov r2, #0 add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, _022416A0 ; =0x022513A0 ldr r1, _022416A4 ; =0x00000B3B ldr r0, [r0, #4] @@ -16515,7 +16515,7 @@ _02241500: mov r2, #0xa add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, _022416A0 ; =0x022513A0 ldr r1, _022416A4 ; =0x00000B3B ldr r0, [r0, #4] @@ -16618,7 +16618,7 @@ _022415C0: mov r2, #0 add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition bl MOD18_0223D638 mov r2, #0 mov r1, #0x4c @@ -16742,13 +16742,13 @@ _022416D6: mov r1, #1 mov r0, #0 add r2, r1, #0 - bl FUN_0200A274 + bl SetBrightness mov r0, #1 mov r1, #0 sub r2, r1, #4 add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #0x45 lsl r0, r0, #2 ldrb r0, [r4, r0] @@ -17873,7 +17873,7 @@ _02241F60: mov r1, #0xa mov r2, #0 add r3, r0, #0 - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add sp, #0x10 add r0, r0, #1 @@ -17911,7 +17911,7 @@ _02241FD4: mov r2, #0xa add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition mov r3, #0 str r3, [sp] mov r0, #2 @@ -18683,7 +18683,7 @@ _02242604: strh r0, [r1] mov r1, #1 add r2, r1, #0 - bl FUN_0200A274 + bl SetBrightness ldr r0, _02242664 ; =0x0400006C mov r1, #0 bl GXx_SetMasterBrightness_ @@ -19893,7 +19893,7 @@ _02242F98: mov r2, #0 add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition mov r3, #0 str r3, [sp] mov r0, #1 @@ -19956,7 +19956,7 @@ _02243018: mov r2, #0xa add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition mov r3, #0 str r3, [sp] mov r0, #2 @@ -20251,7 +20251,7 @@ _02243268: mov r1, #1 mov r0, #0 add r2, r1, #0 - bl FUN_0200A274 + bl SetBrightness mov r0, #0x10 bl FUN_0204F774 ldr r0, _022432AC ; =0x022513A0 @@ -20644,7 +20644,7 @@ _0224358C: mov r2, #0 add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, _02243784 ; =0x022513A0 ldr r1, _02243788 ; =0x00000B3B ldr r0, [r0, #4] @@ -20710,7 +20710,7 @@ _0224360E: mov r2, #0xa add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, _02243784 ; =0x022513A0 ldr r1, _02243788 ; =0x00000B3B ldr r0, [r0, #4] @@ -20991,7 +20991,7 @@ _02243840: mov r1, #1 mov r0, #0 add r2, r1, #0 - bl FUN_0200A274 + bl SetBrightness ldr r0, _02243890 ; =0x04000050 mov r1, #0 strh r1, [r0] @@ -21069,7 +21069,7 @@ _022438DA: mov r1, #0xa mov r2, #0 add r3, r0, #0 - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add sp, #4 add r0, r0, #1 @@ -21086,7 +21086,7 @@ _022438FA: mov r1, #0 mov r2, #0xa add r3, r0, #0 - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add sp, #4 add r0, r0, #1 @@ -21257,7 +21257,7 @@ _02243A44: mov r1, #1 mov r0, #0 add r2, r1, #0 - bl FUN_0200A274 + bl SetBrightness ldr r0, _02243A8C ; =0x04000050 mov r1, #0 strh r1, [r0] @@ -36157,7 +36157,7 @@ MOD18_0224AFE8: ; 0x0224AFE8 mov r1, #1 mov r0, #0 add r2, r1, #0 - bl FUN_0200A274 + bl SetBrightness mov r1, #1 add r0, r4, #0 mvn r1, r1 @@ -37566,7 +37566,7 @@ _0224BB22: mov r2, #0 add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition bl MOD18_0223D658 mov r2, #0 mov r1, #0x30 @@ -37598,7 +37598,7 @@ _0224BB6E: mov r2, #0 add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition bl MOD18_0223D658 mov r2, #0 mov r1, #0x31 @@ -37630,7 +37630,7 @@ _0224BBBA: mov r2, #0 add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition bl MOD18_0223D658 mov r2, #0 mov r1, #0x32 @@ -37670,7 +37670,7 @@ _0224BC1E: sub r2, r1, #6 add r3, r0, #0 str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition bl MOD18_0223D658 bl MOD18_0224DD94 bl FUN_0202EDD8 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 0bff7b6e..388e4ef0 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -352,7 +352,7 @@ _021D77D8: blt _021D77D8 ldr r0, [r6, #0x34] bl FUN_0201FD58 - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C add r0, r6, #0 @@ -434,7 +434,7 @@ MOD53_021D78A8: ; 0x021D78A8 push {r4, lr} add r4, r0, #0 bl FUN_0201C30C - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer add r0, r4, #0 bl DoScheduledBgGpuUpdates ldr r3, _021D78C8 ; =0x027E0000 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 8795cd7f..83feae5d 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -301,7 +301,7 @@ _021D776C: blt _021D776C ldr r0, [r6, #0x50] bl FUN_0201FD58 - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C add r0, r6, #0 @@ -400,7 +400,7 @@ MOD54_021D784C: ; 0x021D784C push {r4, lr} add r4, r0, #0 bl FUN_0201C30C - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer add r0, r4, #0 bl DoScheduledBgGpuUpdates ldr r3, _021D786C ; =0x027E0000 diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index ce354a55..f23c5281 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -311,7 +311,7 @@ _021D7754: mov r1, #0 add r0, #0xec str r1, [r0] - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C mov r0, #0xeb @@ -370,7 +370,7 @@ _021D77E6: ldr r0, [r4, #4] bl DoScheduledBgGpuUpdates bl FUN_0201C30C - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r3, _021D7804 ; =0x027E0000 ldr r1, _021D7808 ; =0x00003FF8 mov r0, #1 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 61f44b88..5b49451e 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -509,7 +509,7 @@ _022121EC: lsl r0, r0, #2 ldr r0, [r6, r0] bl FUN_0201FD58 - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C add r0, r6, #0 @@ -577,7 +577,7 @@ MOD56_0221228C: ; 0x0221228C ldr r0, [r0] bl DoScheduledBgGpuUpdates bl FUN_0201C30C - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r3, _022122AC ; =0x027E0000 ldr r1, _022122B0 ; =0x00003FF8 mov r0, #1 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index bbf164b2..ec406679 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -1941,7 +1941,7 @@ _021D8470: MOD57_021D848C: ; 0x021D848C push {r3, lr} bl FUN_0201C30C - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r3, _021D84A4 ; =0x027E0000 ldr r1, _021D84A8 ; =0x00003FF8 mov r0, #1 @@ -3996,7 +3996,7 @@ _021D94F4: blo _021D94F4 ldr r0, [r5] bl FUN_0201FD58 - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C pop {r4, r5, r6, pc} diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 1cdd6b43..f9301441 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -247,7 +247,7 @@ _021D9C40: blt _021D9C40 ldr r0, [r6, #0x3c] bl FUN_0201FD58 - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C add r0, r6, #0 @@ -287,7 +287,7 @@ MOD58_021D9CB4: ; 0x021D9CB4 push {r4, lr} add r4, r0, #0 bl FUN_0201C30C - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer add r0, r4, #0 bl DoScheduledBgGpuUpdates ldr r3, _021D9CD4 ; =0x027E0000 diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index 27c05dd6..6e1c1392 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -3145,24 +3145,24 @@ _021D90E2: add r2, r5, #0 mov r3, #0xb str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #2 str r0, [sp] mov r0, #1 mov r1, #0x10 add r2, r5, #0 mov r3, #0xd - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #0x33 str r0, [r4, #0xc] b _021D985C _021D9106: mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #1 bne _021D91F6 mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #1 bne _021D91F6 mov r0, #1 @@ -3170,24 +3170,24 @@ _021D9106: mov r2, #0x10 mov r3, #0xb str r0, [sp] - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #2 str r0, [sp] mov r0, #1 add r1, r5, #0 mov r2, #0x10 mov r3, #0xd - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #0x34 str r0, [r4, #0xc] b _021D985C _021D913E: mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #1 bne _021D91F6 mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #1 bne _021D91F6 mov r0, #1 @@ -3196,24 +3196,24 @@ _021D913E: mov r1, #0x10 add r2, r5, #0 mov r3, #0xb - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #2 str r0, [sp] mov r0, #4 mov r1, #0x10 add r2, r5, #0 mov r3, #0xd - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #0x35 str r0, [r4, #0xc] b _021D985C _021D9178: mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #1 bne _021D91F6 mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #1 bne _021D91F6 mov r0, #0x36 @@ -3244,14 +3244,14 @@ _021D9192: add r1, r5, #0 add r2, r0, #0 mov r3, #0xb - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #2 str r0, [sp] mov r0, #0x10 add r1, r5, #0 add r2, r0, #0 mov r3, #0xd - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #0x37 str r0, [r4, #0xc] b _021D985C @@ -3260,14 +3260,14 @@ _021D91E4: add r1, #0x94 bl MOD59_021D86BC mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #1 beq _021D91F8 _021D91F6: b _021D985C _021D91F8: mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #1 bne _021D92FA mov r0, #0x38 diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s index 0dded682..77ecf51d 100644 --- a/arm9/modules/63/asm/mod63_021D74E0.s +++ b/arm9/modules/63/asm/mod63_021D74E0.s @@ -1136,11 +1136,11 @@ _021D7E18: b _021D824E _021D7E24: mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #1 bne _021D7E38 mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #1 beq _021D7E3A _021D7E38: @@ -1157,14 +1157,14 @@ _021D7E3A: mov r1, #0x10 add r2, r6, #0 mov r3, #6 - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #2 str r0, [sp] mov r0, #0xa mov r1, #0x10 add r2, r6, #0 mov r3, #7 - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, _021D80F0 ; =0x00000116 mov r1, #2 strh r1, [r4, r0] @@ -1188,11 +1188,11 @@ _021D7E7E: b _021D824E _021D7E8C: mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #1 bne _021D7F94 mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #1 bne _021D7F94 mov r0, #1 @@ -1201,14 +1201,14 @@ _021D7E8C: add r1, r6, #0 mov r2, #0x10 mov r3, #6 - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #2 str r0, [sp] mov r0, #0xa add r1, r6, #0 mov r2, #0x10 mov r3, #7 - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, _021D80F0 ; =0x00000116 mov r1, #3 strh r1, [r4, r0] @@ -1759,11 +1759,11 @@ _021D8272: add r0, r4, #0 mov r1, #6 mov r2, #1 - bl FUN_0200A274 + bl SetBrightness add r0, r4, #0 mov r1, #7 mov r2, #2 - bl FUN_0200A274 + bl SetBrightness add r0, r5, #0 mov r1, #2 add r0, #0xa4 diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s index 0fd84316..18a7c3b2 100644 --- a/arm9/modules/63/asm/mod63_021D8890.s +++ b/arm9/modules/63/asm/mod63_021D8890.s @@ -502,17 +502,17 @@ _021D8CA4: .word 0x04000580 thumb_func_start MOD63_021D8CA8 MOD63_021D8CA8: ; 0x021D8CA8 - ldr r3, _021D8CAC ; =FUN_02009F80 + ldr r3, _021D8CAC ; =ApplyAndResetOamManagerBuffer bx r3 .align 2, 0 -_021D8CAC: .word FUN_02009F80 +_021D8CAC: .word ApplyAndResetOamManagerBuffer thumb_func_end MOD63_021D8CA8 thumb_func_start MOD63_021D8CB0 MOD63_021D8CB0: ; 0x021D8CB0 push {r4, lr} add r4, r0, #0 - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r0, [r4, #0x4c] bl MOD63_021DB598 pop {r4, pc} @@ -565,7 +565,7 @@ _021D8D0C: .word 0x0000209F MOD63_021D8D10: ; 0x021D8D10 push {r4, lr} add r4, r0, #0 - bl FUN_0200A2AC + bl InitAllScreenBrightnessData ldr r1, _021D8D90 ; =0x00007FFF mov r0, #0 bl FUN_0200E3A0 @@ -1599,7 +1599,7 @@ _021D950C: mov r0, #0x10 mov r1, #1 mov r2, #2 - bl FUN_0200A274 + bl SetBrightness mov r0, #1 add r5, #0x36 strb r0, [r5] @@ -2178,7 +2178,7 @@ _021D9A42: mov r1, #0 mov r2, #0x10 mov r3, #1 - bl FUN_0200A208 + bl StartBrightnessTransition ldrb r0, [r4, #1] add r0, r0, #1 strb r0, [r4, #1] diff --git a/arm9/modules/63/asm/mod63_021DA640.s b/arm9/modules/63/asm/mod63_021DA640.s index 5bcdfbd2..698fc468 100644 --- a/arm9/modules/63/asm/mod63_021DA640.s +++ b/arm9/modules/63/asm/mod63_021DA640.s @@ -504,7 +504,7 @@ _021DAA32: blo _021DAA32 ldr r0, [r5] bl FUN_0201FD58 - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/63/asm/mod63_021DAE5C.s b/arm9/modules/63/asm/mod63_021DAE5C.s index efa1a033..fe1e0252 100644 --- a/arm9/modules/63/asm/mod63_021DAE5C.s +++ b/arm9/modules/63/asm/mod63_021DAE5C.s @@ -377,7 +377,7 @@ _021DB126: blo _021DB126 ldr r0, [r5] bl FUN_0201FD58 - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C pop {r4, r5, r6, pc} diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index ce6e5e5e..e3f91882 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -308,7 +308,7 @@ _021D7726: MOD64_021D77A4: ; 0x021D77A4 push {r4, lr} add r4, r0, #0 - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer add r0, r4, #0 add r0, #0x94 ldr r0, [r0] @@ -384,7 +384,7 @@ MOD64_021D7810: ; 0x021D7810 thumb_func_start MOD64_021D7828 MOD64_021D7828: ; 0x021D7828 push {r3, lr} - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C bl MOD64_021D7964 diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 1667a6f0..78dbeb0f 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -712,7 +712,7 @@ MOD69_0222DB2C: ; 0x0222DB2C str r1, [r0] ldr r0, [r4, #0x24] bl FUN_0201FDEC - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer _0222DB8E: add sp, #8 pop {r4, pc} @@ -1451,7 +1451,7 @@ _0222E1C2: bl FreeToHeap ldr r0, [r6, #0x24] bl FUN_0201FD58 - bl FUN_02009FA0 + bl DeinitOamData pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -4231,4 +4231,3 @@ MOD69_0222F940: ; 0x0222F940 .global MOD69_0222F960 MOD69_0222F960: ; 0x0222F960 .space 0x20 - diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index 8dc21247..66e1a85e 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -524,7 +524,7 @@ MOD70_021D78A0: ; 0x021D78A0 bl DestroyMsgData ldr r0, [r4, #0x34] bl FUN_0201FD58 - bl FUN_02009FA0 + bl DeinitOamData ldr r0, [r4, #0x10] bl FreeToHeap add r0, r4, #0 @@ -538,7 +538,7 @@ MOD70_021D790C: ; 0x021D790C push {r3, lr} ldr r0, [r0, #0x34] bl FUN_0201FDEC - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r3, _021D7928 ; =0x027E0000 ldr r1, _021D792C ; =0x00003FF8 mov r0, #1 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 5ece5081..acd8756a 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -1208,7 +1208,7 @@ _0222DFD6: mov r0, #8 sub r2, #0x10 mov r3, #0x1e - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #1 add r1, r0, #0 bl ToggleBgLayer @@ -1227,7 +1227,7 @@ _0222DFD6: b _0222E0E8 _0222E010: mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _0222E0E8 ldr r0, _0222E0F8 ; =0x00002218 @@ -1264,7 +1264,7 @@ _0222E054: mov r0, #8 sub r2, #0x10 mov r3, #0x17 - bl FUN_0200A208 + bl StartBrightnessTransition mov r0, #4 mov r1, #1 bl ToggleBgLayer @@ -1285,7 +1285,7 @@ _0222E054: b _0222E0E8 _0222E094: mov r0, #2 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _0222E0E8 ldr r0, _0222E110 ; =0x000005A8 @@ -1661,7 +1661,7 @@ _0222E3AC: lsl r0, r0, #2 ldr r0, [r6, r0] bl FUN_0201FD58 - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C pop {r3, r4, r5, r6, r7, pc} @@ -1827,7 +1827,7 @@ MOD71_0222E4DC: ; 0x0222E4DC str r1, [r5, r0] _0222E52E: bl FUN_0201C30C - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r3, _0222E550 ; =0x027E0000 ldr r1, _0222E554 ; =0x00003FF8 mov r0, #1 diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index 28b61540..c61aa026 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -2403,7 +2403,7 @@ _021D88AA: MOD73_021D88B0: ; 0x021D88B0 push {r4, lr} add r4, r0, #0 - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r0, [r4, #0x20] cmp r0, #0 beq _021D88C2 @@ -2635,7 +2635,7 @@ _021D8A70: .word 0x00200010 thumb_func_start MOD73_021D8A74 MOD73_021D8A74: ; 0x021D8A74 push {r3, lr} - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C pop {r3, pc} diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index fae0c264..3b68da11 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1712,7 +1712,7 @@ MOD80_0222E2E0: ; 0x0222E2E0 str r1, [r4, r0] _0222E2F4: bl FUN_0201C30C - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r3, _0222E310 ; =0x027E0000 ldr r1, _0222E314 ; =0x00003FF8 mov r0, #1 @@ -2389,7 +2389,7 @@ _0222E824: ldr r0, _0222E858 ; =0x00000B84 mov r1, #0 str r1, [r6, r0] - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index df849b5e..f3c96168 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -233,7 +233,7 @@ MOD81_02238004: ; 0x02238004 bl FreeToHeap ldr r0, [r4, #0x18] bl FUN_0201FD58 - bl FUN_02009FA0 + bl DeinitOamData add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x39 @@ -327,7 +327,7 @@ MOD81_022380F4: ; 0x022380F4 push {r3, lr} ldr r0, [r1, #0x18] bl FUN_0201FDEC - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r3, _02238110 ; =0x027E0000 ldr r1, _02238114 ; =0x00003FF8 mov r0, #1 diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 01d50253..c04d7d65 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -900,7 +900,7 @@ _0222DCC0: .word 0x00000B78 MOD82_0222DCC4: ; 0x0222DCC4 push {r3, lr} bl FUN_0201C30C - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r3, _0222DCDC ; =0x027E0000 ldr r1, _0222DCE0 ; =0x00003FF8 mov r0, #1 @@ -1349,7 +1349,7 @@ _0222E018: mov r1, #0 lsl r0, r0, #4 str r1, [r6, r0] - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 0cdcae12..c84d1e83 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -1893,7 +1893,7 @@ MOD83_0222E464: ; 0x0222E464 push {r4, lr} add r4, r0, #0 bl FUN_0201C30C - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer add r0, r4, #0 bl DoScheduledBgGpuUpdates ldr r3, _0222E484 ; =MOD83_027E0000 @@ -18085,7 +18085,7 @@ _022363E2: bl FUN_0201FD58 mov r0, #0 str r0, [r6, #0x28] - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C ldr r0, _02236448 ; =0x0000E88C @@ -18217,7 +18217,7 @@ MOD83_0223650C: ; 0x0223650C str r1, [r4, r0] _02236520: bl FUN_0201C30C - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r0, [r4, #0x20] bl DoScheduledBgGpuUpdates ldr r3, _02236540 ; =MOD83_027E0000 @@ -23784,7 +23784,7 @@ _02238EB0: ldr r0, _02238EF0 ; =MOD83_0223BC60 mov r1, #0 str r1, [r0] - bl FUN_02009FA0 + bl DeinitOamData bl FUN_0201D12C bl FUN_0201E08C mov r0, #0 @@ -23826,7 +23826,7 @@ MOD83_02238F00: ; 0x02238F00 str r1, [r4, r0] _02238F1E: bl FUN_0201C30C - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r3, _02238F3C ; =MOD83_027E0000 ldr r1, _02238F40 ; =0x00003FF8 mov r0, #1 diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s index c9bff482..8c7c35e8 100644 --- a/arm9/modules/84/asm/module_84_thumb1.s +++ b/arm9/modules/84/asm/module_84_thumb1.s @@ -260,7 +260,7 @@ _021D771A: add r5, #0xdc ldr r0, [r5] bl FUN_0201FD58 - bl FUN_02009FA0 + bl DeinitOamData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -552,7 +552,7 @@ MOD84_021D7958: ; 0x021D7958 add r1, #0xdc ldr r0, [r1] bl FUN_0201FDEC - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer pop {r3, pc} thumb_func_end MOD84_021D7958 diff --git a/arm9/modules/84/asm/module_84_thumb2.s b/arm9/modules/84/asm/module_84_thumb2.s index d97e5a59..cb5660e4 100644 --- a/arm9/modules/84/asm/module_84_thumb2.s +++ b/arm9/modules/84/asm/module_84_thumb2.s @@ -1067,14 +1067,14 @@ _021D8914: sub r1, #0x30 mov r2, #0 mov r3, #0x1d - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add r0, r0, #1 str r0, [r4] b _021D8950 _021D893A: mov r0, #3 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D8950 ldr r0, [r5, #8] @@ -1322,14 +1322,14 @@ _021D8AF4: mov r0, #0x20 sub r2, #0x10 mov r3, #0x1d - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add r0, r0, #1 str r0, [r4] b _021D8B66 _021D8B16: mov r0, #3 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D8B66 ldr r0, [r4] @@ -1350,14 +1350,14 @@ _021D8B28: sub r1, #0x30 mov r2, #0 mov r3, #0x1d - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add r0, r0, #1 str r0, [r4] b _021D8B66 _021D8B4E: mov r0, #3 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D8B66 mov r0, #1 @@ -1622,14 +1622,14 @@ _021D8D2C: mov r0, #0x20 sub r2, #0x10 mov r3, #0x1d - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r5] add r0, r0, #1 str r0, [r5] b _021D8DE6 _021D8D56: mov r0, #3 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D8DE6 ldr r0, _021D8DEC ; =0x00000DF4 @@ -1680,14 +1680,14 @@ _021D8D9E: sub r1, #0x30 mov r2, #0 mov r3, #0x1d - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r5] add r0, r0, #1 str r0, [r5] b _021D8DE6 _021D8DC8: mov r0, #3 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D8DE6 mov r0, #1 @@ -2481,14 +2481,14 @@ _021D93FC: mov r0, #0x20 sub r2, #0x10 mov r3, #0x1d - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add r0, r0, #1 str r0, [r4] b _021D946E _021D941E: mov r0, #3 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D946E ldr r0, [r4] @@ -2509,14 +2509,14 @@ _021D9430: sub r1, #0x30 mov r2, #0 mov r3, #0x1d - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add r0, r0, #1 str r0, [r4] b _021D946E _021D9456: mov r0, #3 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D946E mov r0, #1 @@ -2790,14 +2790,14 @@ _021D9654: mov r0, #0x10 sub r2, #0x10 mov r3, #0x1d - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r5] add r0, r0, #1 str r0, [r5] b _021D97F0 _021D966E: mov r0, #3 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D96D2 mov r1, #0 @@ -2960,14 +2960,14 @@ _021D97B0: sub r1, #0x30 mov r2, #0 mov r3, #0x1d - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r5] add r0, r0, #1 str r0, [r5] b _021D97F0 _021D97D8: mov r0, #3 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D97F0 ldr r0, [r4, #0x4c] @@ -3354,14 +3354,14 @@ _021D9ABC: mov r0, #0x20 sub r2, #0x10 mov r3, #0x1d - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add r0, r0, #1 str r0, [r4] b _021D9B2E _021D9ADE: mov r0, #3 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D9B2E ldr r0, [r4] @@ -3382,14 +3382,14 @@ _021D9AF0: sub r1, #0x30 mov r2, #0 mov r3, #0x1d - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r4] add r0, r0, #1 str r0, [r4] b _021D9B2E _021D9B16: mov r0, #3 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D9B2E mov r0, #1 @@ -3661,14 +3661,14 @@ _021D9D0E: mov r0, #0x20 sub r2, #0x10 mov r3, #0x1d - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r5] add r0, r0, #1 str r0, [r5] b _021DA068 _021D9D28: mov r0, #3 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021D9E16 mov r1, #0 @@ -3977,14 +3977,14 @@ _021D9F90: sub r1, #0x30 mov r2, #0 mov r3, #0x1d - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r5] add r0, r0, #1 str r0, [r5] b _021DA068 _021D9FBE: mov r0, #3 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021DA068 mov r0, #1 @@ -4049,14 +4049,14 @@ _021DA02A: mov r0, #0x10 sub r2, #0x10 mov r3, #0x1d - bl FUN_0200A208 + bl StartBrightnessTransition ldr r0, [r5] add r0, r0, #1 str r0, [r5] b _021DA068 _021DA058: mov r0, #1 - bl FUN_0200A344 + bl IsBrightnessTransitionActive cmp r0, #0 beq _021DA068 add sp, #0x10 diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index 042746c2..8d6b495f 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -979,7 +979,7 @@ MOD85_021D7D04: ; 0x021D7D04 lsl r0, r0, #4 ldr r0, [r4, r0] bl MOD85_021DE710 - bl FUN_02009FA0 + bl DeinitOamData pop {r4, pc} thumb_func_end MOD85_021D7D04 @@ -1459,7 +1459,7 @@ MOD85_021D80DC: ; 0x021D80DC push {r4, lr} add r4, r0, #0 bl FUN_0201C30C - bl FUN_02009F80 + bl ApplyAndResetOamManagerBuffer ldr r0, _021D80F4 ; =0x0000043C ldr r0, [r4, r0] bl DoScheduledBgGpuUpdates |