Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2025-02-17 03:48:00 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

choose_starter.c

Browse Source
This commit is contained in:
PikalaxALT 2022-03-27 18:00:16 -04:00
parent 5bdf4cd8cc
commit f6b2210d5a
118 changed files with 594 additions and 707 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/field_take_photo.s
View File

@ -482,7 +482,7 @@ _0206AAF6:
str r0, [r4, #4]
b _0206AB26
_0206AB14:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0206AB26
mov r0, #0
@ -524,7 +524,7 @@ _0206AB3E:
str r0, [r4, #4]
b _0206AB70
_0206AB5E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0206AB70
mov r0, #0
@ -1893,7 +1893,7 @@ _0206B626:
strb r0, [r4]
b _0206B824
_0206B652:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0206B6EA
add r0, r5, #0
@ -1959,7 +1959,7 @@ _0206B6BC:
strb r0, [r4]
b _0206B824
_0206B6E2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _0206B6EC
_0206B6EA:

20
asm/overlay_01_021E90C0.s
View File

@ -600,7 +600,7 @@ _021E9572:
bl ov01_021E8F10
cmp r0, #0
beq _021E95B0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E95B0
ldr r0, [r4, #0x24]
@ -616,7 +616,7 @@ _021E9572:
mov r0, #1
pop {r3, r4, r5, r6, r7, pc}
_021E95A2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E95B0
add sp, #0x58
@ -1034,7 +1034,7 @@ _021E98B4:
bl ov01_021E8F10
cmp r0, #0
beq _021E98E0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E98E0
ldr r0, [r6, #0x54]
@ -1252,7 +1252,7 @@ _021E9A80:
bl ov01_021E8F10
cmp r0, #0
beq _021E9AAC
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E9AAC
ldr r0, [r6, #0x54]
@ -1677,7 +1677,7 @@ _021E9DCC:
str r0, [r6]
b _021E9ECC
_021E9DEA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E9ECC
ldr r0, [r4, #0x24]
@ -1759,7 +1759,7 @@ _021E9E9C:
bl ov01_021E8F10
cmp r0, #0
beq _021E9ECC
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E9ECC
ldr r0, [r4, #0x24]
@ -1835,7 +1835,7 @@ _021E9F0C:
strb r0, [r5]
b _021E9F5C
_021E9F48:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E9F5C
add r0, r5, #0
@ -1900,7 +1900,7 @@ _021E9F98:
strb r0, [r4]
b _021E9FDE
_021E9FCA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E9FDE
add r0, r4, #0
@ -2047,7 +2047,7 @@ _021EA0D2:
strb r0, [r4]
b _021EA110
_021EA0F0:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EA110
ldr r0, [r5, #0x24]
@ -2160,7 +2160,7 @@ _021EA1BC:
strb r0, [r4]
b _021EA1EE
_021EA1DA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EA1EE
add r0, r4, #0

4
asm/overlay_01_021EB1E8.s
View File

@ -5142,7 +5142,7 @@ _021ED836:
strh r1, [r4, r0]
pop {r3, r4, r5, r6, pc}
_021ED85A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021ED8FA
mov r0, #6
@ -5162,7 +5162,7 @@ _021ED85A:
strh r1, [r4, r0]
pop {r3, r4, r5, r6, pc}
_021ED884:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021ED8FA
ldr r0, _021ED90C ; =0x00000632

4
asm/overlay_01_021EDAFC.s
View File

@ -508,7 +508,7 @@ ov01_021EDE8C: ; 0x021EDE8C
strb r0, [r4]
pop {r4, pc}
_021EDEA8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EDEF8
add r0, r4, #0
@ -1316,7 +1316,7 @@ ov01_021EE49C: ; 0x021EE49C
strb r0, [r5]
pop {r4, r5, r6, pc}
_021EE4B8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EE55A
mov r0, #0x6f

4
asm/overlay_01_021F3378.s
View File

@ -134,7 +134,7 @@ _021F33F8:
pop {r4, r5, r6, r7, pc}
_021F345E:
ble _021F347A
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F347A
ldr r0, [r5, #4]
@ -270,7 +270,7 @@ _021F3582:
str r0, [r5, #8]
pop {r3, r4, r5, r6, r7, pc}
_021F3590:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F35B4
ldr r0, [r5]

4
asm/overlay_01_021F6830.s
View File

@ -290,7 +290,7 @@ _021F69F6:
strb r0, [r4, #1]
pop {r3, r4, pc}
_021F6A14:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F6A8E
mov r0, #4
@ -345,7 +345,7 @@ _021F6A60:
strb r0, [r4, #1]
pop {r3, r4, pc}
_021F6A82:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F6A8E
mov r0, #1

30
asm/overlay_02.s
View File

@ -156,7 +156,7 @@ _02245C68:
b _02245D06
_02245C98:
bl ov02_02245DE0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02245D06
mov r0, #0
@ -196,7 +196,7 @@ _02245CB0:
strh r0, [r4, #8]
b _02245D06
_02245CF2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02245D06
add r0, r4, #0
@ -8658,7 +8658,7 @@ _02249CC8:
ov02_02249CD8: ; 0x02249CD8
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02249CEA
ldr r0, [r4]
@ -13495,7 +13495,7 @@ ov02_0224C14C: ; 0x0224C14C
bl EventObjectMovementMan_Create
str r0, [r4, #0x14]
_0224C184:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _0224C190
mov r0, #0
@ -13659,7 +13659,7 @@ ov02_0224C2A8: ; 0x0224C2A8
bl EventObjectMovementMan_Create
str r0, [r4, #0x10]
_0224C2C6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _0224C2D2
mov r0, #0
@ -14349,7 +14349,7 @@ ov02_0224C7D4: ; 0x0224C7D4
bl EventObjectMovementMan_Create
str r0, [r4, #0x14]
_0224C80C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _0224C818
mov r0, #0
@ -14584,7 +14584,7 @@ ov02_0224C9B8: ; 0x0224C9B8
bl EventObjectMovementMan_Create
str r0, [r4, #0x14]
_0224C9F2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _0224C9FE
mov r0, #0
@ -26619,7 +26619,7 @@ _02252596:
str r0, [r5]
b _02252698
_022525B4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02252698
add r0, r4, #0
@ -26642,7 +26642,7 @@ _022525B4:
str r0, [r5]
b _02252698
_022525EA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02252698
ldr r0, [r4, #8]
@ -26706,7 +26706,7 @@ _02252638:
str r0, [r5]
b _02252698
_0225266E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02252698
add r0, r4, #0
@ -27250,7 +27250,7 @@ _02252A60:
str r0, [r5]
b _02252B3A
_02252A80:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02252B3A
add r0, r4, #0
@ -27270,7 +27270,7 @@ _02252A80:
str r0, [r5]
b _02252B3A
_02252AAC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02252B3A
mov r2, #0x89
@ -27328,7 +27328,7 @@ _02252AF2:
str r0, [r5]
b _02252B3A
_02252B20:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02252B3A
add r0, r4, #0
@ -27881,7 +27881,7 @@ _02252F4A:
str r0, [r4]
b _02252FD4
_02252F6A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02252FD4
add r0, r5, #0
@ -27901,7 +27901,7 @@ _02252F6A:
str r0, [r4]
b _02252FD4
_02252F96:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02252FD4
add r0, r5, #0

4
asm/overlay_03.s
View File

@ -9224,7 +9224,7 @@ ov03_02258764: ; 0x02258764
push {r3, r4, r5, r6, lr}
sub sp, #4
add r6, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _022587C2
add r0, r6, #0
@ -9272,7 +9272,7 @@ _022587D0: .word 0x00000272
thumb_func_start ov03_022587D4
ov03_022587D4: ; 0x022587D4
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _022587E2
mov r0, #0x1a

6
asm/overlay_05.s
View File

@ -757,7 +757,7 @@ _0221C014: .word 0x00000BB4
ov05_0221C018: ; 0x0221C018
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _0221C028
mov r0, #0
@ -1271,7 +1271,7 @@ _0221C458:
ldrb r0, [r4, r0]
cmp r0, #8
blo _0221C474
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0221C474
ldr r0, _0221C550 ; =0x00000B7F
@ -2290,7 +2290,7 @@ ov05_0221CC74: ; 0x0221CC74
push {r3, r4, r5, lr}
add r5, r0, #0
add r4, r1, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _0221CC86
mov r0, #0

32
asm/overlay_101.s
View File

@ -910,7 +910,7 @@ _021E7DAA:
str r0, [r5, #4]
b _021E7E22
_021E7E04:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E7E22
mov r0, #0
@ -959,7 +959,7 @@ _021E7E3A:
str r0, [r5, #4]
b _021E7E90
_021E7E5A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E7E90
mov r4, #0
@ -1300,7 +1300,7 @@ _021E80D6:
bl BeginNormalPaletteFade
b _021E817C
_021E80FC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
add r5, r0, #0
add r0, r4, #0
mov r1, #1
@ -1337,7 +1337,7 @@ _021E8120:
bl ov101_021E9FDC
b _021E817C
_021E814C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _021E815A
add sp, #0xc
@ -1420,7 +1420,7 @@ _021E81CC:
bl BeginNormalPaletteFade
b _021E8254
_021E81E6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _021E81F4
add sp, #0xc
@ -1452,7 +1452,7 @@ _021E8202:
bl BeginNormalPaletteFade
b _021E8254
_021E822E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
add r5, r0, #0
add r0, r4, #0
mov r1, #0
@ -13028,7 +13028,7 @@ _021EDC30:
str r0, [r5, #4]
b _021EDC6A
_021EDC58:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EDC6A
mov r0, #0
@ -13070,7 +13070,7 @@ _021EDC82:
str r0, [r5, #4]
b _021EDCD8
_021EDCA2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EDCD8
mov r4, #0
@ -14892,7 +14892,7 @@ _021EEB20:
str r0, [r5, #4]
b _021EEB9C
_021EEB8A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EEB9C
mov r0, #0
@ -14935,7 +14935,7 @@ _021EEBB6:
str r0, [r5, #4]
b _021EEBFC
_021EEBD6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EEBFC
mov r4, #0
@ -15308,7 +15308,7 @@ _021EEEA0:
bl BeginNormalPaletteFade
b _021EEF00
_021EEEB8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _021EEEC6
add sp, #0xc
@ -15332,7 +15332,7 @@ _021EEECE:
bl BeginNormalPaletteFade
b _021EEF00
_021EEEE8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _021EEEF6
add sp, #0xc
@ -17007,7 +17007,7 @@ _021EFB82:
str r0, [r5, #4]
b _021EFBC8
_021EFBA2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EFBC8
mov r4, #0
@ -17519,7 +17519,7 @@ _021EFF7C:
str r0, [r5, #8]
b _021EFFB6
_021EFFA4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EFFB6
mov r0, #0
@ -27086,7 +27086,7 @@ _021F4790:
str r0, [r5, #4]
b _021F481C
_021F4804:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F481C
add r0, r5, #0
@ -27131,7 +27131,7 @@ _021F4836:
str r0, [r5, #4]
b _021F4882
_021F4856:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F4882
add r0, r5, #0

4
asm/overlay_102.s
View File

@ -4307,7 +4307,7 @@ _021E96AA:
str r0, [r6, #0x14]
pop {r4, r5, r6, r7, pc}
_021E96CC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E9784
mov r0, #0x1e
@ -4493,7 +4493,7 @@ _021E984E:
str r0, [r4, #0x14]
pop {r3, r4, pc}
_021E986E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E9886
ldr r0, [r4, #0x14]

2
asm/overlay_103.s
View File

@ -1402,7 +1402,7 @@ _021ED45C: .word 0x04001050
ov103_021ED460: ; 0x021ED460
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021ED476
mov r0, #0xbb

2
asm/overlay_104.s
View File

@ -144,7 +144,7 @@ _021E5A0C:
str r0, [r6]
b _021E5A64
_021E5A2A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5A64
mov r0, #0x5a

2
asm/overlay_105.s
View File

@ -144,7 +144,7 @@ _021E5A04:
str r0, [r6]
b _021E5A6C
_021E5A28:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5A6C
add r0, r5, #0

12
asm/overlay_106.s
View File

@ -1086,7 +1086,7 @@ ov106_021E6104: ; 0x021E6104
ov106_021E6118: ; 0x021E6118
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E612C
mov r0, #0x41
@ -1105,7 +1105,7 @@ ov106_021E6130: ; 0x021E6130
bl ov106_021E5D08
cmp r0, #0
bne _021E614E
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E614E
ldr r0, _021E61A8 ; =0x00000414
@ -1202,7 +1202,7 @@ ov106_021E61F8: ; 0x021E61F8
bl ov106_021E5D08
cmp r0, #0
bne _021E6216
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E6216
ldr r0, _021E6248 ; =0x00000414
@ -1314,7 +1314,7 @@ ov106_021E62C8: ; 0x021E62C8
ov106_021E62DC: ; 0x021E62DC
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E62F0
mov r0, #0x41
@ -1333,7 +1333,7 @@ ov106_021E62F4: ; 0x021E62F4
bl ov106_021E5D08
cmp r0, #0
bne _021E631E
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E631E
ldr r0, _021E6398 ; =0x00000414
@ -2044,7 +2044,7 @@ _021E68D8: .word 0x00000418
ov106_021E68DC: ; 0x021E68DC
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E68F0
mov r0, #0x41

8
asm/overlay_108.s
View File

@ -388,7 +388,7 @@ _021E5BAA:
str r0, [r4, #4]
b _021E5BF0
_021E5BD8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5BF0
mov r0, #0
@ -434,7 +434,7 @@ _021E5C0E:
str r0, [r4, #4]
b _021E5C46
_021E5C2E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5C46
mov r0, #0
@ -6428,7 +6428,7 @@ _021E8BD2:
str r0, [r4, #4]
b _021E8C12
_021E8C00:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E8C12
mov r0, #0
@ -6470,7 +6470,7 @@ _021E8C2A:
str r0, [r4, #4]
b _021E8C5C
_021E8C4A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E8C5C
mov r0, #0

4
asm/overlay_109.s
View File

@ -370,7 +370,7 @@ _021E5BBE:
str r0, [r4, #4]
b _021E5BEE
_021E5BDC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5BEE
mov r0, #0
@ -412,7 +412,7 @@ _021E5C06:
str r0, [r4, #4]
b _021E5C38
_021E5C26:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5C38
mov r0, #0

4
asm/overlay_110.s
View File

@ -307,7 +307,7 @@ _021E5B32:
str r0, [r4, #8]
b _021E5B62
_021E5B50:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5B62
mov r0, #0
@ -349,7 +349,7 @@ _021E5B7A:
str r0, [r4, #8]
b _021E5BAC
_021E5B9A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5BAC
mov r0, #0

4
asm/overlay_111.s
View File

@ -39,7 +39,7 @@ _021E5922:
str r0, [r4]
b _021E595A
_021E5944:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E595A
mov r0, #0
@ -85,7 +85,7 @@ _021E5978:
str r0, [r4]
b _021E59B0
_021E5998:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E59B0
add r0, r5, #0

48
asm/overlay_112.s
View File

@ -4073,7 +4073,7 @@ _021E784E: ; jump table
.short _021E7898 - _021E784E - 2 ; case 3
.short _021E78D6 - _021E784E - 2 ; case 4
_021E7858:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E78E4
mov r0, #1
@ -4137,7 +4137,7 @@ _021E78CC:
bl ov112_021E9C94
b _021E78E4
_021E78D6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E78E4
add sp, #0xc
@ -10447,7 +10447,7 @@ _021EAF44: .word 0x0001EBF8
thumb_func_start ov112_021EAF48
ov112_021EAF48: ; 0x021EAF48
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021EAF56
mov r0, #4
@ -13523,7 +13523,7 @@ ov112_021EC69C: ; 0x021EC69C
ov112_021EC6C0: ; 0x021EC6C0
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021EC6D4
mov r0, #7
@ -13557,7 +13557,7 @@ ov112_021EC6D8: ; 0x021EC6D8
thumb_func_start ov112_021EC6F8
ov112_021EC6F8: ; 0x021EC6F8
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021EC706
mov r0, #7
@ -17329,7 +17329,7 @@ ov112_021EE52C: ; 0x021EE52C
ov112_021EE550: ; 0x021EE550
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021EE56A
add r0, r4, #0
@ -18765,7 +18765,7 @@ _021EF06A:
str r0, [r4]
b _021EF0EA
_021EF086:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EF0EA
mov r0, #3
@ -18805,7 +18805,7 @@ _021EF0B6:
str r0, [r4]
b _021EF0EA
_021EF0D4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EF0EA
add r0, r4, #0
@ -19435,7 +19435,7 @@ _021EF5C2: ; jump table
.short _021EF602 - _021EF5C2 - 2 ; case 2
.short _021EF618 - _021EF5C2 - 2 ; case 3
_021EF5CA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021EF61C
add r0, r4, #0
@ -19818,7 +19818,7 @@ _021EF8BC: .word 0x00009D44
thumb_func_start ov112_021EF8C0
ov112_021EF8C0: ; 0x021EF8C0
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021EF8CE
mov r0, #3
@ -20077,7 +20077,7 @@ ov112_021EFA9C: ; 0x021EFA9C
thumb_func_start ov112_021EFAC0
ov112_021EFAC0: ; 0x021EFAC0
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021EFACE
mov r0, #0xc
@ -20307,7 +20307,7 @@ _021EFC98: .word 0x0001E448
thumb_func_start ov112_021EFC9C
ov112_021EFC9C: ; 0x021EFC9C
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021EFCAA
mov r0, #0xe
@ -20363,7 +20363,7 @@ ov112_021EFCD8: ; 0x021EFCD8
ov112_021EFCFC: ; 0x021EFCFC
push {r3, r4, r5, lr}
add r5, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021EFD1E
mov r4, #0
@ -20601,7 +20601,7 @@ _021EFED4: .word 0x00000D4C
thumb_func_start ov112_021EFED8
ov112_021EFED8: ; 0x021EFED8
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021EFEE6
mov r0, #0x13
@ -20656,7 +20656,7 @@ ov112_021EFF14: ; 0x021EFF14
thumb_func_start ov112_021EFF38
ov112_021EFF38: ; 0x021EFF38
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021EFF46
mov r0, #0x24
@ -20691,7 +20691,7 @@ ov112_021EFF4C: ; 0x021EFF4C
thumb_func_start ov112_021EFF70
ov112_021EFF70: ; 0x021EFF70
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021EFF7E
mov r0, #0x18
@ -20851,7 +20851,7 @@ _021F00C8: .word 0x0001E4BC
thumb_func_start ov112_021F00CC
ov112_021F00CC: ; 0x021F00CC
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021F00DA
mov r0, #0x1a
@ -20950,7 +20950,7 @@ ov112_021F015C: ; 0x021F015C
thumb_func_start ov112_021F0180
ov112_021F0180: ; 0x021F0180
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021F018E
mov r0, #0xc
@ -20985,7 +20985,7 @@ ov112_021F0194: ; 0x021F0194
thumb_func_start ov112_021F01B8
ov112_021F01B8: ; 0x021F01B8
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021F01C6
mov r0, #0x20
@ -21145,7 +21145,7 @@ _021F0310: .word 0x0001E4BC
thumb_func_start ov112_021F0314
ov112_021F0314: ; 0x021F0314
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021F0322
mov r0, #0x22
@ -26582,7 +26582,7 @@ _021F2CFC:
str r0, [r4, r1]
b _021F2DCE
_021F2D2E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F2DCE
ldr r0, _021F2DDC ; =0x0000013D
@ -26641,7 +26641,7 @@ _021F2D5E:
str r0, [r4, r1]
b _021F2DCE
_021F2DA8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F2DCE
mov r1, #0x51
@ -26864,7 +26864,7 @@ _021F2F70:
str r0, [r4]
b _021F2FA0
_021F2F8E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F2FA0
add sp, #0xc
@ -26921,7 +26921,7 @@ _021F2FDA:
str r0, [r4]
b _021F3012
_021F2FFA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F3012
add r0, r5, #0

8
asm/overlay_113.s
View File

@ -391,7 +391,7 @@ _021E5BD6:
strh r0, [r4, #0x10]
b _021E5C06
_021E5BF4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5C06
mov r0, #0
@ -436,7 +436,7 @@ _021E5C1E:
strh r0, [r4, #0x10]
b _021E5C58
_021E5C46:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5C58
mov r0, #0
@ -495,7 +495,7 @@ _021E5C88:
strh r0, [r4, #0x10]
b _021E5CF2
_021E5CA8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5CF2
ldrb r1, [r4, #0x1a]
@ -522,7 +522,7 @@ _021E5CC0:
strh r0, [r4, #0x10]
b _021E5CF2
_021E5CE0:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5CF2
mov r0, #0

4
asm/overlay_114.s
View File

@ -239,7 +239,7 @@ _0225F1D8:
bl sub_020247F4
cmp r6, #1
bne _0225F260
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0225F260
ldr r0, [r4]
@ -544,7 +544,7 @@ _0225F45C:
str r0, [r6]
b _0225F4E2
_0225F486:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0225F4E2
ldr r0, [r6]

4
asm/overlay_115.s
View File

@ -738,7 +738,7 @@ _0225F5F6:
str r0, [r5]
b _0225F6BC
_0225F616:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225F6BC
ldr r0, [r5]
@ -2170,7 +2170,7 @@ _02260102:
ldr r0, [r4, r0]
add r1, sp, #0x38
bl sub_020247D4
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0226021C
ldr r0, [r6]

4
asm/overlay_116.s
View File

@ -170,7 +170,7 @@ _0225F140:
str r0, [r4]
pop {r3, r4, r5, r6, pc}
_0225F162:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225F1A6
mov r0, #0
@ -380,7 +380,7 @@ _0225F2F0:
str r0, [r4]
pop {r4, r5, r6, r7, pc}
_0225F312:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225F356
mov r0, #0

4
asm/overlay_117.s
View File

@ -321,7 +321,7 @@ _0225F274:
str r1, [r0]
b _0225F330
_0225F2A4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225F330
ldr r0, [sp, #0x18]
@ -1225,7 +1225,7 @@ _0225F9CC:
str r0, [r5]
b _0225FA98
_0225FA16:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225FA98
ldr r0, [r5]

4
asm/overlay_119.s
View File

@ -1147,7 +1147,7 @@ _0225F95A:
ldr r0, [sp, #0x18]
cmp r0, #1
bne _0225F9F0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0225F9F0
ldr r0, [r7]
@ -2152,7 +2152,7 @@ _022601CC:
sub r1, r1, #4
ldr r1, [r4, r1]
bl sub_020235D4
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02260238
ldr r0, [r5]

2
asm/overlay_12.s
View File

@ -44684,7 +44684,7 @@ _0224D4EC: .word 0x0000311F
ov12_0224D4F0: ; 0x0224D4F0
push {r4, lr}
add r4, r1, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0224D500
mov r0, #0x2c

4
asm/overlay_120.s
View File

@ -1243,7 +1243,7 @@ _0225F922:
str r0, [r4]
b _0225F968
_0225F946:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225F968
mov r0, #2
@ -1297,7 +1297,7 @@ _0225F986:
str r0, [r4]
b _0225F9CC
_0225F9AA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225F9CC
mov r0, #2

4
asm/overlay_121.s
View File

@ -52,7 +52,7 @@ _021E5936:
strb r1, [r4, r0]
b _021E59B0
_021E5956:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E59B0
mov r0, #0x23
@ -87,7 +87,7 @@ _021E597A:
strb r1, [r4, r0]
b _021E59B0
_021E599C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E59B0
add r0, r4, #0

8
asm/overlay_122.s
View File

@ -267,7 +267,7 @@ _021E5AFC:
bl ov122_021E84C8
b _021E5B56
_021E5B1A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5B56
add r0, r4, #0
@ -286,7 +286,7 @@ _021E5B1A:
bl ov122_021E84C8
b _021E5B56
_021E5B44:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5B56
add sp, #0xc
@ -5353,7 +5353,7 @@ _021E82CA:
str r0, [r4]
b _021E8300
_021E82EE:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E8300
add sp, #0xc
@ -5398,7 +5398,7 @@ _021E8320:
str r0, [r4]
b _021E8358
_021E8340:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E8358
add r0, r5, #0

2
asm/overlay_14.s
View File

@ -11563,7 +11563,7 @@ _021EB16C: .word 0x04001050
ov14_021EB170: ; 0x021EB170
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021EB186
mov r0, #0x11

4
asm/overlay_15.s
View File

@ -333,7 +333,7 @@ _021F9624: ; jump table
.short _021F97F6 - _021F9624 - 2 ; case 36
.short _021F9804 - _021F9624 - 2 ; case 37
_021F9670:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021F96B8
mov r0, #0x8d
@ -544,7 +544,7 @@ _021F97F6:
str r0, [r4]
b _021F9810
_021F9804:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021F9810
mov r0, #1

4
asm/overlay_17.s
View File

@ -360,7 +360,7 @@ _02201E64:
strh r0, [r4]
b _02201EA2
_02201E88:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02201EA2
add r0, r4, #0
@ -409,7 +409,7 @@ _02201EBC:
strh r0, [r4]
b _02201EF6
_02201EE2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02201EF6
mov r0, #0

4
asm/overlay_18.s
View File

@ -6544,7 +6544,7 @@ _021E8DAC: .word 0x0000085C
ov18_021E8DB0: ; 0x021E8DB0
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E8DC4
mov r0, #0x86
@ -9463,7 +9463,7 @@ _021EA5F0:
b _021EA620
_021EA600:
bls _021EA620
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021EA620
ldr r0, _021EA680 ; =0x00000868

8
asm/overlay_27.s
View File

@ -434,7 +434,7 @@ ov27_0225A320: ; 0x0225A320
beq _0225A366
cmp r6, #0
beq _0225A35E
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225A35E
ldr r2, [r5, #0x10]
@ -1088,7 +1088,7 @@ _0225A846:
ldr r0, [r1, #0x6c]
cmp r0, #0
beq _0225A86A
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225A86A
add r0, r4, #0
@ -1131,7 +1131,7 @@ ov27_0225A86C: ; 0x0225A86C
ov27_0225A89C: ; 0x0225A89C
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225A8E0
ldr r0, [r4, #0x6c]
@ -2691,7 +2691,7 @@ _0225B53A:
mov r0, #1
pop {r4, r5, r6, pc}
_0225B53E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _0225B54A
mov r0, #1

2
asm/overlay_31.s
View File

@ -318,7 +318,7 @@ ov31_0225D7A0: ; 0x0225D7A0
beq _0225D7BE
pop {r3, r4, r5, pc}
_0225D7B0:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0225D836
mov r0, #1

4
asm/overlay_37.s
View File

@ -204,7 +204,7 @@ _021E5ACC: ; jump table
.short _021E5B48 - _021E5ACC - 2 ; case 2
.short _021E5B68 - _021E5ACC - 2 ; case 3
_021E5AD4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5B74
bl sub_0203769C
@ -276,7 +276,7 @@ _021E5B48:
str r0, [r5]
b _021E5B74
_021E5B68:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5B74
mov r0, #1

4
asm/overlay_39_thumb.s
View File

@ -2566,7 +2566,7 @@ ov39_02228308: ; 0x02228308
beq _0222835C
b _02228368
_02228322:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02228368
mov r0, #1
@ -2597,7 +2597,7 @@ _02228352:
str r0, [r5]
b _02228368
_0222835C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02228368
mov r0, #1

22
asm/overlay_40.s
View File

@ -11211,7 +11211,7 @@ _02230F12:
str r0, [r4, #8]
b _022310E2
_02230FA2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _02230FAC
b _022310E2
@ -11482,7 +11482,7 @@ _022311E8:
bl ov40_0222C4DC
cmp r0, #1
bne _02231202
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
beq _022311FA
b _022312FC
@ -12272,7 +12272,7 @@ _0223181A:
str r0, [r4, #8]
b _02231850
_0223183A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02231850
add r0, r4, #0
@ -14550,7 +14550,7 @@ _02232A5E:
str r0, [r4, #8]
b _02232AE8
_02232A82:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02232AE8
ldr r0, [r4, #8]
@ -14637,7 +14637,7 @@ _02232B14:
str r0, [r5, #8]
b _02232BCE
_02232B34:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02232BCE
ldr r0, [r5, #8]
@ -15042,7 +15042,7 @@ _02232E7E:
str r0, [r4, #8]
b _02232EC2
_02232E9C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02232EC2
ldr r0, [r4, #8]
@ -33017,7 +33017,7 @@ _0223C3C0:
str r0, [r5, #8]
b _0223C48E
_0223C3E0:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223C48E
ldr r0, [r5, #8]
@ -33353,7 +33353,7 @@ _0223C69E:
str r0, [r4, #8]
b _0223C6E2
_0223C6BC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223C6E2
ldr r0, [r4, #8]
@ -40637,7 +40637,7 @@ _022401B6:
str r0, [r4, #8]
b _022401FA
_022401D4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _022401FA
ldr r0, [r4, #8]
@ -43189,7 +43189,7 @@ _02241726:
str r0, [r4, #8]
b _0224176A
_02241744:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0224176A
ldr r0, [r4, #8]
@ -45843,7 +45843,7 @@ _02242D18:
str r0, [r5, #8]
b _02242DDC
_02242D38:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02242DDC
ldr r0, [r5, #8]

8
asm/overlay_41.s
View File

@ -2227,7 +2227,7 @@ _02246F4A:
str r0, [r5]
b _0224712A
_02246F66:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02246FD6
ldr r0, [r5]
@ -2435,7 +2435,7 @@ _022470EE:
str r0, [r5]
b _0224712A
_0224710C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0224712A
add r0, r6, #0
@ -12501,7 +12501,7 @@ _0224BB1A:
str r0, [r4]
b _0224BB96
_0224BB38:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0224BB96
ldr r0, [r4]
@ -12541,7 +12541,7 @@ _0224BB68:
str r0, [r4]
b _0224BB96
_0224BB88:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0224BB96
add sp, #0xc

10
asm/overlay_43.s
View File

@ -2010,7 +2010,7 @@ _0222AE9A:
strb r0, [r4, #8]
b _0222B08A
_0222AEBA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0222AEF0
mov r0, #3
@ -2092,7 +2092,7 @@ _0222AF3C:
strb r0, [r4, #8]
b _0222B08A
_0222AF5A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0222B01C
add sp, #0x14
@ -2114,7 +2114,7 @@ _0222AF68:
strb r0, [r4, #8]
b _0222B08A
_0222AF88:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0222B08A
add r0, r7, #0
@ -3134,7 +3134,7 @@ _0222B744:
strb r0, [r4, #8]
b _0222B932
_0222B780:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0222B818
add r0, r6, #0
@ -3178,7 +3178,7 @@ _0222B7B8:
strb r0, [r4, #8]
b _0222B932
_0222B7E2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0222B818
mov r0, #2

16
asm/overlay_44.s
View File

@ -1008,7 +1008,7 @@ ov44_0222A60C: ; 0x0222A60C
beq _0222A64E
b _0222A65A
_0222A626:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0222A65A
mov r0, #1
@ -1029,7 +1029,7 @@ _0222A634:
str r0, [r5]
b _0222A65A
_0222A64E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0222A65A
mov r0, #1
@ -4660,7 +4660,7 @@ ov44_0222C35C: ; 0x0222C35C
sub sp, #0xc
add r5, r0, #0
add r7, r1, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _0222C372
add sp, #0xc
@ -5053,7 +5053,7 @@ ov44_0222C684: ; 0x0222C684
add r4, r0, #0
add r5, r1, #0
mov r7, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _0222C698
add r0, r5, #0
@ -18360,7 +18360,7 @@ _02232F98:
str r0, [r5]
b _0223308A
_02232FB6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223308A
ldr r0, [r5]
@ -18455,7 +18455,7 @@ _0223305C:
str r0, [r5]
b _0223308A
_0223307C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223308A
add sp, #0xc
@ -23013,7 +23013,7 @@ ov44_02235268: ; 0x02235268
add r5, r0, #0
add r6, r1, #0
add r4, r2, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02235324
ldr r0, [r6, #8]
@ -23102,7 +23102,7 @@ _02235324:
ov44_0223532C: ; 0x0223532C
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223533C
mov r0, #0

8
asm/overlay_46.s
View File

@ -194,7 +194,7 @@ _02258976:
str r0, [r4]
b _02258C28
_02258994:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _022589F0
ldr r0, [r4]
@ -490,7 +490,7 @@ _02258BF6:
str r0, [r4]
b _02258C28
_02258C16:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02258C28
add sp, #0x10
@ -721,7 +721,7 @@ _02258DE8:
str r0, [r4]
b _02258EF2
_02258E06:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02258EF2
mov r0, #2
@ -826,7 +826,7 @@ _02258EBC:
str r0, [r4]
b _02258EF2
_02258EDC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02258EF2
add r5, #0x40

10
asm/overlay_47.s
View File

@ -118,7 +118,7 @@ _022588CA:
str r0, [r4]
b _02258996
_022588F0:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02258996
ldr r0, [r4]
@ -126,7 +126,7 @@ _022588F0:
str r0, [r4]
b _02258996
_02258900:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02258930
ldr r0, [r5, #4]
@ -188,7 +188,7 @@ _0225895E:
str r0, [r4]
b _02258996
_0225897E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02258996
mov r0, #0x9a
@ -1988,7 +1988,7 @@ _0225976A:
strh r0, [r4]
b _02259948
_0225978A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0225982A
ldr r2, [sp, #0x14]
@ -2016,7 +2016,7 @@ _022597A6:
strh r0, [r4]
b _02259948
_022597C4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0225982A
mov r0, #0xd

4
asm/overlay_48.s
View File

@ -173,7 +173,7 @@ _02258956:
str r0, [r4]
b _022589EE
_0225897C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _022589EE
ldr r0, [r4]
@ -221,7 +221,7 @@ _022589C0:
str r0, [r4]
b _022589EE
_022589E0:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _022589EE
add sp, #0xc

12
asm/overlay_49.s
View File

@ -2844,7 +2844,7 @@ _02259CC8:
str r0, [r5]
b _02259EE2
_02259CEA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02259D58
mov r0, #0
@ -3079,7 +3079,7 @@ _02259EA8:
str r0, [r5]
b _02259EE2
_02259ED0:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02259EE2
mov r0, #0
@ -6250,7 +6250,7 @@ _0225B568:
strb r0, [r4]
pop {r3, r4, r5, r6, r7, pc}
_0225B586:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0225B5FA
add r0, r6, #0
@ -6298,7 +6298,7 @@ _0225B5D4:
strb r0, [r4]
pop {r3, r4, r5, r6, r7, pc}
_0225B5F2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
beq _0225B5FC
_0225B5FA:
@ -6430,7 +6430,7 @@ _0225B6E2:
strb r0, [r4]
pop {r3, r4, r5, r6, r7, pc}
_0225B700:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
beq _0225B70A
_0225B708:
@ -6622,7 +6622,7 @@ _0225B876:
strb r0, [r4]
pop {r3, r4, r5, r6, r7, pc}
_0225B880:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0225B88C
mov r0, #5

34
asm/overlay_53.s
View File

@ -199,7 +199,7 @@ _021E5A80:
str r0, [r5]
b _021E5B22
_021E5AA4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E5B22
mov r0, #0x5e
@ -218,7 +218,7 @@ _021E5AA4:
mov r6, #1
b _021E5B22
_021E5AD4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E5B22
mov r0, #0x5e
@ -3040,7 +3040,7 @@ _021E70E4:
str r0, [r4, #0xc]
bl _021E7CF8
_021E7138:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E71F6
add r0, r4, #0
@ -3119,7 +3119,7 @@ _021E71CE:
str r0, [r4, #0xc]
bl _021E7CF8
_021E71EE:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
beq _021E71FA
_021E71F6:
@ -3179,7 +3179,7 @@ _021E7226:
str r0, [r4, #0xc]
bl _021E7CF8
_021E7274:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E7348
mov r0, #0xb
@ -3381,7 +3381,7 @@ _021E7414:
str r0, [r4, #0xc]
bl _021E7CF8
_021E7440:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E7462
add r0, r4, #0
@ -3440,7 +3440,7 @@ _021E7484:
str r0, [r4, #0xc]
bl _021E7CF8
_021E74CE:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E7572
mov r0, #0x24
@ -3516,7 +3516,7 @@ _021E754C:
str r0, [r4, #0xc]
b _021E7CF8
_021E756A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
beq _021E7574
_021E7572:
@ -3570,7 +3570,7 @@ _021E7590:
bl BeginNormalPaletteFade
b _021E7CF8
_021E75E8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E76A0
add r0, r4, #0
@ -3852,7 +3852,7 @@ _021E7818:
bl BeginNormalPaletteFade
b _021E7CF8
_021E7842:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E78B2
mov r0, #0x3f
@ -3887,7 +3887,7 @@ _021E7850:
str r0, [r4, #0xc]
b _021E7CF8
_021E7892:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E78B2
mov r0, #0x5f
@ -4046,7 +4046,7 @@ _021E79C0:
bl BeginNormalPaletteFade
b _021E7CF8
_021E79DE:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E7A6E
mov r0, #5
@ -4085,7 +4085,7 @@ _021E79DE:
str r0, [r4, #0xc]
b _021E7CF8
_021E7A3C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E7A6E
add r0, r4, #0
@ -4270,7 +4270,7 @@ _021E7BA0:
str r0, [r4, #0xc]
b _021E7CF8
_021E7BBE:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
beq _021E7BC8
b _021E7CF8
@ -4312,7 +4312,7 @@ _021E7BC8:
str r0, [r4, #0xc]
b _021E7CF8
_021E7C20:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E7CF8
mov r0, #0x67
@ -4343,7 +4343,7 @@ _021E7C40:
str r0, [r4, #0xc]
b _021E7CF8
_021E7C5E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E7CF8
mov r0, #0x78
@ -4384,7 +4384,7 @@ _021E7C90:
bl ToggleBgLayer
b _021E7CF8
_021E7CB4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E7CC0
mov r0, #0x7b

4
asm/overlay_54.s
View File

@ -318,7 +318,7 @@ _021E5B9E:
lsl r0, r0, #2
ldr r0, [r4, r0]
bl sub_0200D020
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _021E5C58
add sp, #0xc
@ -385,7 +385,7 @@ _021E5C2C:
lsl r0, r0, #2
ldr r0, [r4, r0]
bl sub_0200D020
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _021E5C58
add sp, #0xc

12
asm/overlay_57.s
View File

@ -5267,7 +5267,7 @@ _0223A226:
str r1, [r4, r0]
b _0223A300
_0223A236:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223A300
mov r0, #0xff
@ -5343,7 +5343,7 @@ _0223A2C0:
str r1, [r4, r0]
b _0223A300
_0223A2D0:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223A300
add r0, r4, #0
@ -5857,7 +5857,7 @@ _0223A708:
bl ov57_0223B940
cmp r0, #1
beq _0223A7C0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223A7C0
mov r0, #0x10
@ -5918,7 +5918,7 @@ _0223A708:
str r1, [r4, r0]
b _0223A7C0
_0223A7A6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223A7C0
add r0, r4, #0
@ -5979,7 +5979,7 @@ _0223A80C:
str r1, [r4, r0]
b _0223A8EC
_0223A820:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223A8EC
mov r0, #0x10
@ -6042,7 +6042,7 @@ _0223A8B4:
bl ov57_0223B940
cmp r0, #1
beq _0223A8EC
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223A8EC
mov r0, #0x32

14
asm/overlay_59.s
View File

@ -349,7 +349,7 @@ _02237FB6:
strh r0, [r4, #0x3c]
b _02238016
_02237FD4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02238016
mov r0, #0
@ -418,7 +418,7 @@ _0223802E:
strh r0, [r4, #0x3c]
b _02238060
_0223804E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02238060
mov r0, #0
@ -5998,7 +5998,7 @@ _0223AB50:
strh r0, [r4]
b _0223AB88
_0223AB74:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223AB88
mov r0, #0
@ -6046,7 +6046,7 @@ _0223ABA4:
strh r0, [r4]
b _0223ABDE
_0223ABCA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223ABDE
mov r0, #0
@ -6701,7 +6701,7 @@ _0223B0C4:
strh r0, [r4]
b _0223B10E
_0223B0CC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223B10E
mov r0, #6
@ -6723,7 +6723,7 @@ _0223B0CC:
strh r0, [r4]
b _0223B10E
_0223B0FA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223B10E
mov r0, #0
@ -8925,7 +8925,7 @@ _0223C22A:
strb r0, [r4, #5]
pop {r3, r4, r5, r6, pc}
_0223C25C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223C288
ldr r0, [r5, #0x78]

16
asm/overlay_60.s
View File

@ -310,7 +310,7 @@ _021E5B62:
ldr r2, [r4]
add r0, #0xcc
bl ov60_021E641C
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5BA0
mov r0, #0xc
@ -419,7 +419,7 @@ _021E5C68:
add r0, r4, #0
add r0, #0xcc
bl ov60_021E6B08
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E5C8E
add r0, r4, #0
@ -4481,7 +4481,7 @@ _021E7C1A:
bl ov60_021E7958
b _021E7C4C
_021E7C3E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E7C4C
add sp, #0x10
@ -5392,7 +5392,7 @@ _021E8340:
bl ov60_021E8B58
cmp r0, #0
beq _021E837C
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _021E837E
_021E837C:
@ -8672,7 +8672,7 @@ _021E9EE4:
bl ov60_021E7958
b _021EA1FA
_021E9F04:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E9FD6
add r0, r6, #0
@ -8966,7 +8966,7 @@ _021EA158:
bl ov60_021E7958
b _021EA1FA
_021EA182:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EA1FA
mov r0, #1
@ -10151,7 +10151,7 @@ _021EAB40:
bl ov60_021E7958
b _021EAC08
_021EAB5E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EAC08
add r0, r4, #0
@ -10235,7 +10235,7 @@ _021EABD6:
bl ov60_021E7958
b _021EAC08
_021EABFA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EAC08
add sp, #0xc

6
asm/overlay_61.s
View File

@ -188,7 +188,7 @@ _021E5A74:
str r0, [r5]
b _021E5E86
_021E5AA6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5B94
mov r0, #2
@ -621,7 +621,7 @@ _021E5E4C:
bl PlaySE
b _021E5E86
_021E5E52:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5E86
mov r0, #0x10
@ -639,7 +639,7 @@ _021E5E52:
str r0, [r5]
b _021E5E86
_021E5E78:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5E86
add sp, #0x40

4
asm/overlay_62.s
View File

@ -243,7 +243,7 @@ _021E5AB8:
str r0, [r4]
pop {r4, r5, pc}
_021E5ADA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5AFA
mov r0, #2
@ -396,7 +396,7 @@ _021E5BD4:
str r0, [r4]
pop {r4, r5, pc}
_021E5BF8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5C18
mov r0, #2

8
asm/overlay_63.s
View File

@ -499,7 +499,7 @@ _0221C1F4: .word 0x00013050
ov63_0221C1F8: ; 0x0221C1F8
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0221C20A
ldr r0, _0221C210 ; =0x00013050
@ -5064,7 +5064,7 @@ _0221E77C:
strh r0, [r4, #0xc]
b _0221E874
_0221E782:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0221E874
ldr r0, _0221E898 ; =gSystem
@ -5097,7 +5097,7 @@ _0221E7B6:
ldrh r0, [r4, #0xc]
cmp r0, #0x1e
bne _0221E7E8
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0221E7EC
ldr r0, _0221E888 ; =0x00013064
@ -5173,7 +5173,7 @@ _0221E834:
ldrh r0, [r4, #0xc]
cmp r0, #0x3c
bne _0221E870
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0221E874
mov r0, #0

4
asm/overlay_64.s
View File

@ -143,7 +143,7 @@ _021E5A3C:
str r0, [r4]
b _021E5A74
_021E5A48:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E5A74
ldr r0, [r4]
@ -159,7 +159,7 @@ _021E5A58:
str r0, [r4]
b _021E5A74
_021E5A68:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E5A74
mov r0, #1

8
asm/overlay_65.s
View File

@ -470,7 +470,7 @@ ov65_0221C250: ; 0x0221C250
_0221C26E:
b _0221C3B4
_0221C270:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0221C28A
mov r0, #1
@ -539,7 +539,7 @@ _0221C2D6:
str r0, [r4, #0x54]
b _0221C3B4
_0221C2F4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0221C3B4
add r0, r4, #0
@ -613,14 +613,14 @@ _0221C380:
str r0, [r4, #0x54]
b _0221C3B4
_0221C39C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0221C3B4
mov r0, #1
str r0, [r4, #0x54]
b _0221C3B4
_0221C3AA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0221C3B4
mov r6, #1

4
asm/overlay_67.s
View File

@ -112,7 +112,7 @@ _021E59C2:
str r0, [r4]
b _021E5A52
_021E59DE:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5A52
ldrh r0, [r5, #8]
@ -157,7 +157,7 @@ _021E5A18:
str r0, [r4]
b _021E5A52
_021E5A36:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5A52
mov r0, #8

2
asm/overlay_68.s
View File

@ -764,7 +764,7 @@ ov68_021E5F18: ; 0x021E5F18
ov68_021E5F50: ; 0x021E5F50
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E5F64
mov r0, #0x1b

4
asm/overlay_69.s
View File

@ -228,7 +228,7 @@ _021E5A9A:
str r0, [r5]
b _021E6028
_021E5B0A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E5BEC
mov r0, #2
@ -833,7 +833,7 @@ _021E5FDC:
str r0, [r5]
b _021E6028
_021E5FFE:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E6028
ldr r0, _021E6078 ; =0x0000C2F8

20
asm/overlay_70.s
View File

@ -1763,7 +1763,7 @@ _0223860C:
bl ov70_02238E98
b _022386BA
_02238634:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _022386BA
mov r0, #3
@ -1781,7 +1781,7 @@ _02238642:
str r0, [r5]
b _022386BA
_02238656:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _022386BA
mov r0, #0x45
@ -3841,7 +3841,7 @@ ov70_022396A8: ; 0x022396A8
ov70_022396CC: ; 0x022396CC
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _022396DC
mov r0, #5
@ -3855,7 +3855,7 @@ _022396DC:
ov70_022396E0: ; 0x022396E0
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _022396F0
mov r0, #5
@ -7267,7 +7267,7 @@ ov70_0223B2D0: ; 0x0223B2D0
ldr r1, [r4, r0]
add r1, r1, #1
str r1, [r4, r0]
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223B2F6
ldr r0, _0223B2FC ; =0x00000F14
@ -7293,7 +7293,7 @@ ov70_0223B300: ; 0x0223B300
ldr r1, [r4, r0]
sub r1, r1, #1
str r1, [r4, r0]
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223B332
ldr r2, _0223B33C ; =0x04000304
@ -10100,7 +10100,7 @@ ov70_0223C9AC: ; 0x0223C9AC
ldr r1, [r4, r0]
add r1, r1, #1
str r1, [r4, r0]
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223CA06
ldr r2, _0223CA10 ; =0x04000304
@ -10153,7 +10153,7 @@ ov70_0223CA18: ; 0x0223CA18
ldr r1, [r4, r0]
sub r1, r1, #1
str r1, [r4, r0]
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223CA36
ldr r0, _0223CA3C ; =0x00000F14
@ -11359,7 +11359,7 @@ ov70_0223D44C: ; 0x0223D44C
push {r3, r4, r5, lr}
sub sp, #8
add r5, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223D486
ldr r0, [r5, #0x24]
@ -14504,7 +14504,7 @@ ov70_0223ED58: ; 0x0223ED58
push {r3, r4, lr}
sub sp, #4
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223ED80
ldr r0, _0223ED88 ; =0x00000F0F

28
asm/overlay_71.s
View File

@ -8,7 +8,7 @@ ov71_02246960: ; 0x02246960
push {r4, r5, lr}
sub sp, #0x14
add r5, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _02246970
b _02246B0C
@ -2481,7 +2481,7 @@ ov71_02247C34: ; 0x02247C34
ldr r0, [r1]
cmp r0, #0
bne _02247C5A
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02247C5A
ldr r0, [r4, #0x3c]
@ -2781,7 +2781,7 @@ _02247E8E:
str r0, [r4]
b _02247EC6
_02247EAE:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02247EC6
add r0, r5, #0
@ -3514,7 +3514,7 @@ ov71_0224843C: ; 0x0224843C
beq _02248462
b _0224847A
_0224844C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0224847A
ldr r0, _02248480 ; =ov71_0224C0C4
@ -3729,7 +3729,7 @@ _022485B8:
str r0, [r5]
b _022485F4
_022485E6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _022485F4
add sp, #0xc
@ -5795,7 +5795,7 @@ _02249624:
str r0, [r4]
b _0224965C
_0224964E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0224965C
add sp, #0xc
@ -6730,7 +6730,7 @@ ov71_02249D80: ; 0x02249D80
beq _02249DF6
b _02249E04
_02249D98:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02249E04
ldr r0, _02249E0C ; =0xFFE80000
@ -6775,7 +6775,7 @@ _02249DCA:
str r0, [r4]
b _02249E04
_02249DF6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02249E04
add sp, #0xc
@ -7251,7 +7251,7 @@ _0224A1DE: ; jump table
.short _0224A230 - _0224A1DE - 2 ; case 2
.short _0224A25C - _0224A1DE - 2 ; case 3
_0224A1E6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0224A26A
ldr r0, [r5, #0x20]
@ -7304,7 +7304,7 @@ _0224A230:
str r0, [r4]
b _0224A26A
_0224A25C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0224A26A
add sp, #0xc
@ -8321,7 +8321,7 @@ _0224AA40: ; jump table
.short _0224AAD4 - _0224AA40 - 2 ; case 5
.short _0224AAE8 - _0224AA40 - 2 ; case 6
_0224AA4E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0224AAF2
mov r0, #0
@ -8465,7 +8465,7 @@ _0224AB38:
str r0, [r4]
b _0224AB76
_0224AB62:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0224AB76
ldr r0, [r5, #0x1c]
@ -9537,7 +9537,7 @@ ov71_0224B450: ; 0x0224B450
ldr r0, [r1]
cmp r0, #0
bne _0224B476
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0224B476
ldr r0, [r4, #0x40]
@ -9846,7 +9846,7 @@ _0224B6AE:
str r0, [r5]
b _0224B6E6
_0224B6D8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0224B6E6
add sp, #0x10

14
asm/overlay_72.s
View File

@ -937,7 +937,7 @@ _02237FEC:
str r0, [r4]
b _02238044
_02238000:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02238044
mov r0, #3
@ -955,7 +955,7 @@ _0223800E:
str r0, [r4]
b _02238044
_02238022:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02238044
ldr r3, [r5, #0x10]
@ -997,7 +997,7 @@ ov72_02238070: ; 0x02238070
add r5, r0, #0
bl OverlayManager_GetData
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _02238086
mov r0, #0
@ -5760,7 +5760,7 @@ ov72_0223A5E0: ; 0x0223A5E0
push {r3, r4, lr}
sub sp, #0xc
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223A65E
add r0, r4, #0
@ -5896,7 +5896,7 @@ _0223A718: .word 0x00000E0C
ov72_0223A71C: ; 0x0223A71C
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223A72E
ldr r0, _0223A734 ; =0x00001312
@ -6584,7 +6584,7 @@ ov72_0223AC2C: ; 0x0223AC2C
push {r3, r4, lr}
sub sp, #0xc
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223AC62
add r0, r4, #0
@ -6634,7 +6634,7 @@ _0223AC84: .word 0x00001313
ov72_0223AC88: ; 0x0223AC88
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223AC9A
ldr r0, _0223ACA0 ; =0x00001312

8
asm/overlay_73.s
View File

@ -217,7 +217,7 @@ _021E5AF0: ; jump table
.short _021E5B6E - _021E5AF0 - 2 ; case 2
.short _021E5B86 - _021E5AF0 - 2 ; case 3
_021E5AF8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5B92
mov r0, #1
@ -285,7 +285,7 @@ _021E5B6E:
str r0, [r5]
b _021E5B92
_021E5B86:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5B92
mov r0, #1
@ -4970,7 +4970,7 @@ _021E8008:
str r0, [r4]
b _021E8060
_021E801C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E8060
mov r0, #3
@ -4988,7 +4988,7 @@ _021E802A:
str r0, [r4]
b _021E8060
_021E803E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E8060
ldr r3, [r5, #0x10]

8
asm/overlay_74_thumb.s
View File

@ -14848,7 +14848,7 @@ _0222E76E:
bl ov74_0222D7F0
b _0222E79C
_0222E77A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0222E79C
mov r0, #0xb1
@ -17268,7 +17268,7 @@ _0222FB00:
bl ov74_0222EFF0
b _0222FB2C
_0222FB0C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0222FB2C
ldr r0, _0222FB84 ; =0x00002BF8
@ -25279,7 +25279,7 @@ _0223386A:
bl PlaySE
b _02233896
_0223387E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02233896
ldr r0, [r4, #0x24]
@ -29042,7 +29042,7 @@ ov74_022353FC: ; 0x022353FC
push {r3, r4, r5, lr}
add r4, r0, #0
ldr r5, _02235410 ; =ov74_0223D454
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223540E
ldr r0, [r5, #0xc]

4
asm/overlay_75.s
View File

@ -1010,7 +1010,7 @@ ov75_02247118: ; 0x02247118
beq _0224716C
b _02247178
_02247132:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02247178
mov r0, #1
@ -1041,7 +1041,7 @@ _02247162:
str r0, [r5]
b _02247178
_0224716C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02247178
mov r0, #1

8
asm/overlay_76.s
View File

@ -312,7 +312,7 @@ _021E5B8C: ; jump table
.short _021E5D34 - _021E5B8C - 2 ; case 5
.short _021E5D66 - _021E5B8C - 2 ; case 6
_021E5B9A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5C3C
ldr r0, [r4]
@ -385,7 +385,7 @@ _021E5BEE:
str r0, [r4]
b _021E5D74
_021E5C34:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _021E5C3E
_021E5C3C:
@ -457,7 +457,7 @@ _021E5C4A:
str r0, [r4]
b _021E5D74
_021E5CD4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5D74
mov r0, #0
@ -532,7 +532,7 @@ _021E5D46:
str r0, [r4]
b _021E5D74
_021E5D66:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5D74
add sp, #0x10

4
asm/overlay_78.s
View File

@ -166,7 +166,7 @@ _021E5A1A:
str r0, [r5]
b _021E5B14
_021E5A76:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E5B14
add r0, r6, #0
@ -243,7 +243,7 @@ _021E5AEC:
str r0, [r5]
b _021E5B14
_021E5B0A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E5B14
mov r6, #1

22
asm/overlay_80.s
View File

@ -4926,7 +4926,7 @@ _0222C1FC: .word ov80_0222C200
thumb_func_start ov80_0222C200
ov80_0222C200: ; 0x0222C200
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0222C20E
mov r0, #1
@ -7330,7 +7330,7 @@ _0222D3BE:
str r0, [r4, #4]
b _0222D3FE
_0222D3F0:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0222D3FE
add sp, #0xc
@ -7440,7 +7440,7 @@ _0222D4B2:
str r0, [r4, #4]
b _0222D51A
_0222D4CC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0222D51A
ldr r0, [r4, #0x2c]
@ -7574,7 +7574,7 @@ _0222D5CE:
str r0, [r4, #4]
b _0222D636
_0222D5E8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0222D636
ldr r0, [r4, #0x2c]
@ -9935,7 +9935,7 @@ ov80_0222E7C8: ; 0x0222E7C8
strb r0, [r5]
pop {r3, r4, r5, pc}
_0222E7E4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0222E87E
add r0, r5, #0
@ -10570,7 +10570,7 @@ ov80_0222EC90: ; 0x0222EC90
strb r0, [r5]
pop {r4, r5, r6, pc}
_0222ECAC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0222ED8C
mov r0, #0x6d
@ -34160,7 +34160,7 @@ _0223A410:
str r0, [r4]
b _0223A620
_0223A42E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223A4FC
ldr r0, [r4]
@ -34181,7 +34181,7 @@ _0223A43E:
str r0, [r4]
b _0223A620
_0223A458:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223A4FC
ldr r0, [r4]
@ -34262,7 +34262,7 @@ _0223A4D0:
str r0, [r4]
b _0223A620
_0223A4F4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _0223A4FE
_0223A4FC:
@ -34332,7 +34332,7 @@ _0223A57A:
str r0, [r4]
b _0223A620
_0223A594:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223A620
mov r0, #0x1a
@ -34367,7 +34367,7 @@ _0223A5B8:
str r0, [r4]
b _0223A620
_0223A5D8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0223A620
ldr r0, [r4]

14
asm/overlay_81.s
View File

@ -789,7 +789,7 @@ _0223E3AA:
strb r0, [r4, #8]
b _0223E508
_0223E3E6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _0223E3F0
_0223E3EE:
@ -1004,7 +1004,7 @@ _0223E58E:
strb r0, [r4, #8]
b _0223E5AC
_0223E59E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223E5AC
add sp, #0xc
@ -2058,7 +2058,7 @@ _0223EE5E:
bl ov81_022425EC
b _0223EF42
_0223EE64:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223EF42
mov r0, #0x1a
@ -2102,7 +2102,7 @@ _0223EEB6:
mov r0, #1
pop {r4, r5, pc}
_0223EEC2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223EF42
mov r0, #1
@ -2928,7 +2928,7 @@ _0223F592:
bl ov81_022425EC
b _0223F666
_0223F598:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223F666
mov r0, #0x1a
@ -2972,7 +2972,7 @@ _0223F5EA:
mov r0, #1
pop {r4, r5, pc}
_0223F5F6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223F666
mov r0, #1
@ -4291,7 +4291,7 @@ _0224009A:
strb r0, [r4, #8]
b _022400C8
_022400BA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _022400C8
add sp, #0xc

6
asm/overlay_82.s
View File

@ -370,7 +370,7 @@ _0223E030:
strb r0, [r4, #8]
b _0223E068
_0223E05A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223E068
add sp, #0xc
@ -1007,7 +1007,7 @@ _0223E532:
strb r0, [r4, #8]
b _0223E5B6
_0223E58A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223E5B6
add r0, r4, #0
@ -1371,7 +1371,7 @@ _0223E842:
strb r0, [r4, #8]
b _0223E880
_0223E872:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223E880
add sp, #0xc

8
asm/overlay_83.s
View File

@ -431,7 +431,7 @@ _0223E0EE:
strb r0, [r4, #8]
b _0223E104
_0223E0F6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223E104
add sp, #0xc
@ -2196,7 +2196,7 @@ _0223F022:
strb r0, [r4, #8]
b _0223F050
_0223F042:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223F050
add sp, #0xc
@ -10409,7 +10409,7 @@ _0224339A:
strb r0, [r4, #8]
b _022433B0
_022433A2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _022433B0
add sp, #0xc
@ -11652,7 +11652,7 @@ _02243DFA:
strb r0, [r4, #8]
b _02243E28
_02243E1A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02243E28
add sp, #0xc

4
asm/overlay_84.s
View File

@ -525,7 +525,7 @@ _0223E18C:
strb r0, [r4, #8]
b _0223E1A2
_0223E194:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223E1A2
add sp, #0xc
@ -936,7 +936,7 @@ _0223E482:
strb r0, [r4, #8]
b _0223E4B0
_0223E4A2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0223E4B0
add sp, #0xc

8
asm/overlay_85.s
View File

@ -241,7 +241,7 @@ ov85_021E5AF8: ; 0x021E5AF8
ov85_021E5B0C: ; 0x021E5B0C
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5B2C
bl sub_0203769C
@ -1975,7 +1975,7 @@ _021E673E:
ov85_021E6748: ; 0x021E6748
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E675C
mov r0, #0x35
@ -6634,7 +6634,7 @@ _021E8A4C: ; jump table
.short _021E8ACC - _021E8A4C - 2 ; case 2
.short _021E8AE4 - _021E8A4C - 2 ; case 3
_021E8A54:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E8AF0
mov r0, #1
@ -6703,7 +6703,7 @@ _021E8ACC:
str r0, [r4]
b _021E8AF0
_021E8AE4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E8AF0
mov r0, #1

4
asm/overlay_86.s
View File

@ -295,7 +295,7 @@ _021E5B6C:
strb r0, [r4, #4]
b _021E5B9A
_021E5B8C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E5B9A
add sp, #0xc
@ -460,7 +460,7 @@ _021E5CA6:
strb r0, [r4, #4]
b _021E5CD4
_021E5CC6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E5CD4
add sp, #0xc

4
asm/overlay_87.s
View File

@ -269,7 +269,7 @@ _021E5B0E:
strb r0, [r4, #8]
b _021E5B40
_021E5B2E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E5B40
mov r0, #0
@ -1650,7 +1650,7 @@ _021E661E:
strb r0, [r4, #8]
b _021E6662
_021E6654:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E6662
add sp, #0xc

4
asm/overlay_88.s
View File

@ -140,7 +140,7 @@ _022588F8:
str r0, [r5]
b _022589EA
_0225891E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _022589EA
ldr r0, [r5]
@ -231,7 +231,7 @@ _022589BC:
str r0, [r5]
b _022589EA
_022589DC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _022589EA
add sp, #0xc

6
asm/overlay_89.s
View File

@ -364,7 +364,7 @@ _02258B52:
str r0, [r5]
b _02258E4A
_02258B70:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
beq _02258B7A
b _02258E4A
@ -676,7 +676,7 @@ _02258DE6:
str r0, [r5]
b _02258E4A
_02258E04:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _02258E10
bl sub_0200FB70
@ -697,7 +697,7 @@ _02258E10:
str r0, [r5]
b _02258E4A
_02258E30:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02258E4A
ldr r0, [r5]

16
asm/overlay_90.s
View File

@ -2187,7 +2187,7 @@ _022597FE:
add r0, r4, r0
add r1, #0x30
bl ov90_0225A428
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _022598AA
ldrb r0, [r4]
@ -2529,7 +2529,7 @@ _02259AAE:
_02259AB6:
add r0, r4, #0
bl ov90_02259B68
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02259AF2
mov r0, #0xb9
@ -4521,7 +4521,7 @@ _0225AA1A:
strb r0, [r4, #4]
b _0225AE1C
_0225AA38:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225AA8A
ldrb r0, [r4, #4]
@ -4966,7 +4966,7 @@ _0225AD60:
strb r0, [r4, #4]
b _0225AE1C
_0225AD80:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225AE1C
mov r0, #0x15
@ -5146,7 +5146,7 @@ _0225AEC0:
strb r0, [r4, #4]
b _0225B204
_0225AEDE:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225AF36
ldrb r0, [r4, #4]
@ -5507,7 +5507,7 @@ _0225B188:
strb r0, [r4, #4]
b _0225B204
_0225B1A8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225B204
mov r0, #0x14
@ -5822,7 +5822,7 @@ _0225B3EC:
strb r0, [r4]
b _0225B530
_0225B3F4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225B42C
ldrb r0, [r4]
@ -5963,7 +5963,7 @@ _0225B4EC:
strb r0, [r4]
b _0225B530
_0225B50C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225B530
bl sub_0203A914

6
asm/overlay_91.s
View File

@ -64,7 +64,7 @@ ov91_0225C58C: ; 0x0225C58C
beq _0225C5EC
b _0225C5FA
_0225C5BE:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0225C5CA
bl sub_0200FB70
@ -307,7 +307,7 @@ _0225C7A8:
ldr r0, [r4, #0x34]
mov r1, #0
bl ov91_0225CEB4
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225C7CE
add r4, #0x44
@ -489,7 +489,7 @@ _0225C922:
ldr r0, [r4, #0x34]
mov r1, #1
bl ov91_0225D078
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225C9E6
mov r0, #3

32
asm/overlay_92.s
View File

@ -1181,7 +1181,7 @@ _0225CEBE:
bl ov92_0225D88C
b _0225D1CA
_0225CEDC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
add r1, r0, #0
add r0, r4, #0
mov r2, #5
@ -1399,7 +1399,7 @@ _0225D096:
bl ov92_0225D88C
b _0225D1CA
_0225D0AA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
add r5, r0, #0
beq _0225D0B8
add r0, r4, #0
@ -2358,7 +2358,7 @@ ov92_0225D8E4: ; 0x0225D8E4
ldrb r0, [r0]
cmp r0, #0
bne _0225D916
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0225D908
bl sub_0200FB70
@ -5155,7 +5155,7 @@ ov92_0225EF4C: ; 0x0225EF4C
ldr r0, [r4, #0x28]
lsl r0, r0, #4
asr r5, r0, #0x10
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225EF6C
ldr r0, [r4, #0x78]
@ -5538,7 +5538,7 @@ ov92_0225F254: ; 0x0225F254
add r5, r0, #0
ldr r0, [r4, #0xc]
bl sub_0200DCD4
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225F274
ldr r0, [r4, #0x2c]
@ -5651,7 +5651,7 @@ ov92_0225F338: ; 0x0225F338
sub sp, #8
add r5, r0, #0
add r4, r1, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225F352
ldr r0, [r4, #0x3c]
@ -5892,7 +5892,7 @@ ov92_0225F530: ; 0x0225F530
add r7, r0, #0
ldr r6, [r4, #0x34]
ldr r5, [r4, #0x38]
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0225F550
ldr r2, [r4, #0x3c]
@ -8311,7 +8311,7 @@ ov92_022608B8: ; 0x022608B8
stmia r2!, {r0, r1}
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _022608FA
ldr r0, [sp, #4]
@ -8572,7 +8572,7 @@ ov92_02260AE0: ; 0x02260AE0
ldr r0, [r1]
str r1, [sp]
ldr r5, [r0, #0x14]
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02260AFC
add r5, #0x34
@ -9789,7 +9789,7 @@ ov92_02261448: ; 0x02261448
add r4, r1, #0
lsl r0, r0, #2
ldr r5, [r4, r0]
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02261464
add r5, #0x34
@ -10551,7 +10551,7 @@ ov92_02261A18: ; 0x02261A18
lsl r0, r0, #2
ldr r0, [r6, r0]
ldr r4, [r0]
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02261A3C
mov r1, #0x5f
@ -10742,7 +10742,7 @@ ov92_02261BA0: ; 0x02261BA0
sub sp, #8
add r5, r0, #0
add r4, r1, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02261BBE
mov r1, #0x5f
@ -11504,7 +11504,7 @@ ov92_022621A4: ; 0x022621A4
stmia r2!, {r0, r1}
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _022621CE
mov r0, #0x5f
@ -11943,7 +11943,7 @@ ov92_02262548: ; 0x02262548
stmia r2!, {r0, r1}
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02262572
mov r0, #0x5f
@ -12384,7 +12384,7 @@ ov92_022628F0: ; 0x022628F0
stmia r2!, {r0, r1}
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0226291A
mov r0, #0x5f
@ -12865,7 +12865,7 @@ ov92_02262CEC: ; 0x02262CEC
stmia r2!, {r0, r1}
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02262D16
mov r0, #0x5f

6
asm/overlay_93_thumb_1.s
View File

@ -634,7 +634,7 @@ ov93_0225CA8C: ; 0x0225CA8C
cmp r0, #1
b _0225CAE0
_0225CAB2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0225CABE
bl sub_0200FB70
@ -686,7 +686,7 @@ _0225CB08: ; jump table
.short _0225CB6E - _0225CB08 - 2 ; case 5
.short _0225CCBA - _0225CB08 - 2 ; case 6
_0225CB16:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0225CB60
ldr r0, [r5]
@ -895,7 +895,7 @@ _0225CC9C:
str r2, [r4, r0]
b _0225CCC8
_0225CCBA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _0225CCC8
add sp, #0xc

2
asm/overlay_93_thumb_2.s
View File

@ -5464,7 +5464,7 @@ ov93_022625BC: ; 0x022625BC
cmp r1, #2
b _0226261E
_022625E4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _022625F0
bl sub_0200FB70

12
asm/overlay_95.s
View File

@ -1392,7 +1392,7 @@ _021E63D2:
add r0, r0, #1
str r0, [r4, #0x60]
_021E63DC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E6412
bl sub_02005FA0
@ -1574,7 +1574,7 @@ _021E6548:
add r0, r0, #1
str r0, [r4, #0x60]
_021E6552:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E6586
ldr r0, [r4, #0x60]
@ -1707,7 +1707,7 @@ _021E6666:
add r0, r0, #1
str r0, [r4, #0x60]
_021E6670:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E6770
ldr r1, _021E67E8 ; =0x000003F3
@ -1855,7 +1855,7 @@ _021E679A:
add r0, r0, #1
str r0, [r4, #0x60]
_021E67A4:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E67D8
ldr r0, [r4, #0x60]
@ -2713,7 +2713,7 @@ ov95_021E6E88: ; 0x021E6E88
beq _021E6EDC
b _021E6EF8
_021E6E9E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E6EAC
ldr r0, [r4]
@ -2757,7 +2757,7 @@ _021E6EEC:
bl ov95_021E5B58
b _021E6F04
_021E6EF8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _021E6F04
mov r0, #1

72
asm/overlay_96.s
View File

@ -12749,7 +12749,7 @@ _021EB6F2:
strb r0, [r4]
b _021EB728
_021EB712:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EB728
add r0, r5, #0
@ -12883,7 +12883,7 @@ _021EB7F6:
strb r1, [r0]
b _021EB990
_021EB816:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _021EB820
b _021EB990
@ -13224,7 +13224,7 @@ _021EBAAA:
strb r0, [r4]
b _021EBAEC
_021EBADA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EBAEC
add sp, #0xc
@ -13279,7 +13279,7 @@ _021EBB26:
strb r0, [r4]
b _021EBB5C
_021EBB46:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EBB5C
add r0, r5, #0
@ -14107,7 +14107,7 @@ _021EC1D0:
strb r0, [r4]
b _021EC20E
_021EC1FC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EC20E
add sp, #0xc
@ -19913,7 +19913,7 @@ _021EEE44:
bl ov96_021E5DEC
b _021EEEB2
_021EEE78:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EEEB2
ldr r0, [r4, #8]
@ -20205,7 +20205,7 @@ _021EF0AC:
strb r0, [r5]
b _021EF0F4
_021EF0DC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EF0F4
ldr r0, [r4, #8]
@ -21511,10 +21511,10 @@ _021EFB4C: .word 0x00007FFF
thumb_func_start ov96_021EFB50
ov96_021EFB50: ; 0x021EFB50
ldr r3, _021EFB54 ; =IsPaletteFadeActive
ldr r3, _021EFB54 ; =IsPaletteFadeFinished
bx r3
.balign 4, 0
_021EFB54: .word IsPaletteFadeActive
_021EFB54: .word IsPaletteFadeFinished
thumb_func_end ov96_021EFB50
thumb_func_start ov96_021EFB58
@ -21881,7 +21881,7 @@ _021EFE62:
strb r0, [r4]
b _021EFEAC
_021EFE70:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EFEAC
ldr r0, [r5, #0x24]
@ -21932,7 +21932,7 @@ ov96_021EFEB8: ; 0x021EFEB8
beq _021EFF18
b _021EFF2A
_021EFED2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EFF2E
ldr r0, _021EFF34 ; =ov96_0221BA20
@ -22015,7 +22015,7 @@ _021EFF5E:
add r0, r0, #1
strb r0, [r4]
_021EFF7A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021EFFD2
ldr r0, _021EFFDC ; =ov96_0221BA2C
@ -22095,7 +22095,7 @@ _021F0006:
add r0, r0, #1
strb r0, [r4]
_021F0022:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F007A
ldr r0, _021F0084 ; =ov96_0221BA38
@ -22189,7 +22189,7 @@ _021F00C2:
strb r0, [r5]
b _021F00F8
_021F00EA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F00F8
add sp, #0xc
@ -23305,7 +23305,7 @@ _021F0AA8:
strb r0, [r4]
b _021F0AD8
_021F0AC8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F0AD8
add r0, r5, #0
@ -23390,7 +23390,7 @@ ov96_021F0B58: ; 0x021F0B58
ldrb r0, [r4]
cmp r0, #0
bne _021F0B7E
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F0B78
mov r0, #1
@ -32988,7 +32988,7 @@ _021F5692:
strb r0, [r4]
b _021F5728
_021F56B8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F56C6
ldrb r0, [r4]
@ -33057,7 +33057,7 @@ ov96_021F5730: ; 0x021F5730
ldrb r0, [r6]
cmp r0, #0
bne _021F5756
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F5750
mov r0, #1
@ -37691,7 +37691,7 @@ _021F7BFC:
bl ov96_021E5DEC
b _021F7C32
_021F7C20:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F7C32
add sp, #0x28
@ -38202,7 +38202,7 @@ _021F801E:
strb r0, [r7]
b _021F805C
_021F8048:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F805C
ldr r0, [sp, #0x14]
@ -40699,7 +40699,7 @@ ov96_021F9380: ; 0x021F9380
ldrb r0, [r4]
cmp r0, #0
bne _021F93A6
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F93A0
mov r0, #1
@ -41734,7 +41734,7 @@ _021F9C56:
bl ov96_021E5DEC
b _021F9C8A
_021F9C7C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021F9C8A
add sp, #0x180
@ -48624,7 +48624,7 @@ _021FD3A0:
strb r1, [r0]
b _021FD3D6
_021FD3C6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021FD3D6
ldr r0, [sp, #0xc]
@ -48715,7 +48715,7 @@ ov96_021FD46C: ; 0x021FD46C
ldrb r0, [r4]
cmp r0, #0
bne _021FD48E
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021FD48A
mov r0, #1
@ -57625,7 +57625,7 @@ _02201A8A:
bl ov96_021E5DEC
b _02201AFE
_02201AE2:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02201AFE
mov r0, #0x5c
@ -58447,7 +58447,7 @@ ov96_022021D4: ; 0x022021D4
ldrb r0, [r4]
cmp r0, #0
bne _022021FC
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _022021F8
mov r0, #1
@ -64598,7 +64598,7 @@ _02205430:
strb r1, [r0]
b _02205466
_02205456:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02205466
ldr r0, [sp, #0xc]
@ -64700,7 +64700,7 @@ ov96_02205520: ; 0x02205520
ldrb r0, [r4]
cmp r0, #0
bne _02205548
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02205544
mov r0, #1
@ -72777,7 +72777,7 @@ ov96_022093D0: ; 0x022093D0
add r6, r0, #0
bl ov96_021E5DC4
add r5, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02209442
add r0, r6, #0
@ -73147,7 +73147,7 @@ _02209702:
bl ov96_021E5DEC
b _02209722
_02209710:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02209722
add sp, #0xec
@ -82878,7 +82878,7 @@ _0220E256:
add r0, r0, #1
strb r0, [r5]
_0220E272:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0220E29A
ldrb r0, [r5]
@ -83024,7 +83024,7 @@ ov96_0220E394: ; 0x0220E394
ldrb r0, [r4]
cmp r0, #0
bne _0220E3E6
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0220E3EA
add r0, r6, #0
@ -89399,7 +89399,7 @@ _022115BE:
bl ov96_021E5DEC
b _02211626
_02211616:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02211626
add sp, #0x1fc
@ -89675,7 +89675,7 @@ ov96_02211870: ; 0x02211870
ldrb r0, [r4]
cmp r0, #0
bne _02211892
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0221188E
mov r0, #1
@ -98281,7 +98281,7 @@ _022159A0:
add r0, r0, #1
strb r0, [r4]
_022159BC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _022159E4
ldrb r0, [r4]
@ -98379,7 +98379,7 @@ ov96_02215A70: ; 0x02215A70
ldrb r0, [r4]
cmp r0, #0
bne _02215ABC
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02215AC0
add r0, r6, #0

4
asm/overlay_97.s
View File

@ -59,7 +59,7 @@ _0221E604:
str r0, [r4, #4]
b _0221E68A
_0221E620:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0221E68A
mov r0, #3
@ -99,7 +99,7 @@ _0221E650:
str r0, [r4, #4]
b _0221E68A
_0221E66E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0221E68A
add r0, r5, #0

16
asm/overlay_99.s
View File

@ -201,7 +201,7 @@ _021E5AA2:
str r0, [r5]
b _021E5B40
_021E5ABE:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5B40
mov r0, #2
@ -234,7 +234,7 @@ _021E5ACC:
str r0, [r5]
b _021E5B40
_021E5B04:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5B40
mov r0, #4
@ -1970,7 +1970,7 @@ _021E68B0:
str r0, [r4]
b _021E6924
_021E68CC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E6924
mov r0, #2
@ -1997,7 +1997,7 @@ _021E68DA:
str r0, [r4]
b _021E6924
_021E6906:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E6924
mov r0, #4
@ -4147,7 +4147,7 @@ _021E7974:
str r0, [r5]
b _021E7A32
_021E7990:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E7A32
mov r0, #2
@ -4211,7 +4211,7 @@ _021E79F0:
str r0, [r5]
b _021E7A32
_021E7A14:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E7A32
mov r0, #4
@ -5490,7 +5490,7 @@ _021E841C:
str r0, [r5]
b _021E84D6
_021E8438:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E84D6
mov r0, #2
@ -5551,7 +5551,7 @@ _021E8494:
str r0, [r5]
b _021E84D6
_021E84B8:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E84D6
mov r0, #4

4
asm/overlay_trainer_card_main.s
View File

@ -343,7 +343,7 @@ _021E5DAE: ; jump table
.short _021E5E56 - _021E5DAE - 2 ; case 4
.short _021E5E70 - _021E5DAE - 2 ; case 5
_021E5DBA:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5E96
mov r0, #1
@ -406,7 +406,7 @@ _021E5E26:
bl ov51_021E6DA8
b _021E5E96
_021E5E3A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E5E96
add sp, #0xc

4
asm/overlay_trainer_card_signature.s
View File

@ -177,7 +177,7 @@ SignBackOfTrainerCardApp_OvyExec: ; 0x021E8248
beq _021E828E
b _021E829A
_021E8262:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E829A
mov r0, #1
@ -200,7 +200,7 @@ _021E8284:
bl ov52_021E921C
b _021E829A
_021E828E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _021E829A
mov r0, #1

2
asm/scrcmd.s
View File

@ -5632,7 +5632,7 @@ _02043454: .word sub_02043458
thumb_func_start sub_02043458
sub_02043458: ; 0x02043458
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _02043466
mov r0, #1

2
asm/scrcmd_pokemon_misc.s
View File

@ -774,7 +774,7 @@ ov01_022010CC: ; 0x022010CC
strb r1, [r5, r0]
pop {r4, r5, r6, pc}
_022010E0:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0220115A
mov r0, #0x8f

6
asm/unk_0200FA24.s
View File

@ -218,8 +218,8 @@ _0200FB54: .word _021D1034
_0200FB58: .word _021D0EF4
thumb_func_end HandleFadeUpdateFrame
thumb_func_start IsPaletteFadeActive
IsPaletteFadeActive: ; 0x0200FB5C
thumb_func_start IsPaletteFadeFinished
IsPaletteFadeFinished: ; 0x0200FB5C
ldr r0, _0200FB6C ; =_021D1034
ldrh r0, [r0, #0xc]
cmp r0, #0
@ -231,7 +231,7 @@ _0200FB68:
bx lr
.balign 4, 0
_0200FB6C: .word _021D1034
thumb_func_end IsPaletteFadeActive
thumb_func_end IsPaletteFadeFinished
thumb_func_start sub_0200FB70
sub_0200FB70: ; 0x0200FB70

8
asm/unk_0203BC10.s
View File

@ -598,7 +598,7 @@ _0203C054:
strh r0, [r5, #0x26]
b _0203C136
_0203C06A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0203C136
add r0, r5, #0
@ -623,7 +623,7 @@ _0203C08A:
strh r0, [r5, #0x26]
b _0203C136
_0203C0A6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0203C136
mov r2, #0xd5
@ -675,7 +675,7 @@ _0203C0E0:
mov r0, #1
pop {r4, r5, r6, pc}
_0203C11A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0203C136
mov r0, #3
@ -1626,7 +1626,7 @@ _0203C84E:
sub_0203C870: ; 0x0203C870
push {r4, r5, r6, lr}
add r5, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0203C8AE
add r0, r5, #0

6
asm/unk_0205298C.s
View File

@ -99,7 +99,7 @@ _02052A10:
str r0, [r4]
b _02052A42
_02052A34:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02052A42
add sp, #0xc
@ -243,7 +243,7 @@ _02052B20:
str r0, [r4]
b _02052CA8
_02052B5A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02052B8C
ldr r0, [r6, #0xc]
@ -370,7 +370,7 @@ _02052C58:
str r0, [r4]
b _02052CA8
_02052C5E:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02052CA8
add r0, r6, #0

2
asm/unk_02055244.s
View File

@ -82,7 +82,7 @@ _020552D0: .word sub_0205528C
thumb_func_start sub_020552D4
sub_020552D4: ; 0x020552D4
push {r3, lr}
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _020552E2
mov r0, #1

8
asm/unk_02055BF0.s
View File

@ -105,7 +105,7 @@ _02055C50:
str r0, [r4]
b _02055C94
_02055C78:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02055C94
ldr r0, [r5, #4]
@ -794,7 +794,7 @@ _020561F8:
strh r0, [r4, #2]
b _02056218
_0205620C:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02056218
mov r0, #1
@ -1041,7 +1041,7 @@ _020563E8:
strh r0, [r5, #2]
b _02056418
_020563FC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02056418
ldr r0, [r4, #0x40]
@ -1164,7 +1164,7 @@ _020564F4:
strh r0, [r4, #2]
b _02056524
_02056508:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02056524
ldr r0, [r5, #0x40]

6
asm/unk_02056680.s
View File

@ -144,7 +144,7 @@ _02056792:
strh r0, [r4, #2]
b _020567AE
_0205679A:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _020567AE
ldrh r0, [r4, #2]
@ -307,7 +307,7 @@ _020568DE:
bl MapObject_AreBitsSetForMovementScriptInit
cmp r0, #0
beq _02056932
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02056932
add r0, r5, #0
@ -439,7 +439,7 @@ _020569FA:
bl MapObject_AreBitsSetForMovementScriptInit
cmp r0, #0
beq _02056A4E
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02056A4E
add r0, r5, #0

4
asm/unk_02058AEC.s
View File

@ -1062,7 +1062,7 @@ _02059334:
str r0, [r4, #0x34]
b _02059472
_02059340:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
bne _0205934A
_02059348:
@ -2289,7 +2289,7 @@ _02059C6C:
str r0, [r4, #0x28]
b _02059D36
_02059CBC:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02059D36
ldr r0, [r4, #0x28]

2
asm/unk_0206A360.s
View File

@ -199,7 +199,7 @@ _0206A440:
str r0, [r4]
b _0206A5BC
_0206A4D0:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _0206A5BC
ldr r0, [r4]

4
asm/unk_02078E30.s
View File

@ -456,7 +456,7 @@ _020791C8:
str r0, [r4]
b _020791EE
_020791D6:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _020791EE
ldr r0, _02079218 ; =0x00000C65
@ -544,7 +544,7 @@ _0207927C: .word 0x00000C78
sub_02079280: ; 0x02079280
push {r4, lr}
add r4, r0, #0
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #1
bne _020792FA
ldr r0, _02079300 ; =0x00000654

4
asm/unk_02082908.s
View File

@ -273,7 +273,7 @@ _02082B40: ; jump table
.short _02082B90 - _02082B40 - 2 ; case 2
.short _02082CBE - _02082B40 - 2 ; case 3
_02082B48:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02082B84
mov r0, #1
@ -456,7 +456,7 @@ _02082C6A:
bl sub_02084500
b _02082CCC
_02082CBE:
bl IsPaletteFadeActive
bl IsPaletteFadeFinished
cmp r0, #0
beq _02082CCC
add sp, #0x10

Some files were not shown because too many files have changed in this diff Show More