summaryrefslogtreecommitdiff
path: root/arm9/modules/84
diff options
context:
space:
mode:
authorRémi Calixte <remicalixte.rmc@gmail.com>2021-08-18 19:57:28 +0200
committerRémi Calixte <remicalixte.rmc@gmail.com>2021-08-18 19:57:28 +0200
commitbb8d0b174dfafd4d268a874ef55f2d09f510b82b (patch)
tree03de4ccb9a850663165c6f31741a1399a19810d9 /arm9/modules/84
parent99b7ee252db114934a7de5d71ca7a4cbf8244595 (diff)
partially document oam.c and brightness.c
Diffstat (limited to 'arm9/modules/84')
-rw-r--r--arm9/modules/84/asm/module_84_thumb1.s4
-rw-r--r--arm9/modules/84/asm/module_84_thumb2.s56
2 files changed, 30 insertions, 30 deletions
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