diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-08-18 19:53:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-18 19:53:17 +0100 |
| commit | bb16d9a030161b764029628f99eb22a8834b96d5 (patch) | |
| tree | 03de4ccb9a850663165c6f31741a1399a19810d9 /arm9/modules/05/asm | |
| parent | e947eab3f1d5315ba59ec989a02f6b84797e052b (diff) | |
| parent | bb8d0b174dfafd4d268a874ef55f2d09f510b82b (diff) | |
Merge pull request #451 from remicalixte/unk_02009EAC
Decompile and split unk_02009EAC.s
Diffstat (limited to 'arm9/modules/05/asm')
| -rw-r--r-- | arm9/modules/05/asm/mod05_021D74E0.s | 6 | ||||
| -rw-r--r-- | arm9/modules/05/asm/mod05_021E3340.s | 10 | ||||
| -rw-r--r-- | arm9/modules/05/asm/mod05_021EFA9C.s | 2 |
3 files changed, 9 insertions, 9 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] |