falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile more intro code and palette loading code

This commit is contained in:
Marcus Huderle 2020-08-11 20:27:29 -05:00
parent 546c69ed58
commit 37d1781f51
43 changed files with 15344 additions and 15945 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/code_08019444.s
View File

@ -499,7 +499,7 @@ _0801981A:
b _0801982E b _0801982E
_08019824: _08019824:
ldrh r0, [r4] ldrh r0, [r4]
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
bl sub_080533CC bl sub_080533CC
_0801982E: _0801982E:
adds r4, #0xc adds r4, #0xc
@ -3793,7 +3793,7 @@ sub_0801B0EC: @ 0x0801B0EC
adds r4, r0, #0 adds r4, r0, #0
_0801B0F0: _0801B0F0:
ldr r1, [r4, #4] ldr r1, [r4, #4]
ldr r0, _0801B110 @ =gUnk_085A2E80 ldr r0, _0801B110 @ =gGlobalPalettes
adds r5, r1, r0 adds r5, r1, r0
ldrb r2, [r4, #2] ldrb r2, [r4, #2]
ldrh r3, [r4] ldrh r3, [r4]
@ -3805,10 +3805,10 @@ _0801B0F0:
beq _0801B114 beq _0801B114
lsrs r1, r3, #5 lsrs r1, r3, #5
adds r0, r5, #0 adds r0, r5, #0
bl sub_0801D754 bl LoadPalettes
b _0801B122 b _0801B122
.align 2, 0 .align 2, 0
_0801B110: .4byte gUnk_085A2E80 _0801B110: .4byte gGlobalPalettes
_0801B114: _0801B114:
movs r0, #0xc0 movs r0, #0xc0
lsls r0, r0, #0x13 lsls r0, r0, #0x13

2
asm/code_0801C370.s
View File

@ -41,7 +41,7 @@ _0801C398:
lsrs r0, r0, #1 lsrs r0, r0, #1
strb r0, [r5, #4] strb r0, [r5, #4]
movs r0, #0xc movs r0, #0xc
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
movs r0, #0x10 movs r0, #0x10
bl sub_0801D7EC bl sub_0801D7EC
ldr r4, _0801C478 @ =gUnk_02034CB0 ldr r4, _0801C478 @ =gUnk_02034CB0

28
asm/code_0801CEC0.s
View File

@ -448,7 +448,7 @@ sub_0801D2B4: @ 0x0801D2B4
sub_0801D2C8: @ 0x0801D2C8 sub_0801D2C8: @ 0x0801D2C8
push {r4, lr} push {r4, lr}
adds r3, r0, #0 adds r3, r0, #0
ldr r2, _0801D2F8 @ =gUnk_0200B644 ldr r2, _0801D2F8 @ =gUsedPalettes
adds r4, r1, #0 adds r4, r1, #0
adds r4, #0x10 adds r4, #0x10
movs r1, #1 movs r1, #1
@ -460,7 +460,7 @@ sub_0801D2C8: @ 0x0801D2C8
bls _0801D33C bls _0801D33C
cmp r3, #0x15 cmp r3, #0x15
bne _0801D300 bne _0801D300
ldr r2, _0801D2FC @ =gUnk_020176A0 ldr r2, _0801D2FC @ =gPaletteBuffer
adds r0, r2, #0 adds r0, r2, #0
adds r0, #0x78 adds r0, #0x78
ldrh r0, [r0] ldrh r0, [r0]
@ -470,21 +470,21 @@ sub_0801D2C8: @ 0x0801D2C8
bl _DmaFill16 bl _DmaFill16
b _0801D33C b _0801D33C
.align 2, 0 .align 2, 0
_0801D2F8: .4byte gUnk_0200B644 _0801D2F8: .4byte gUsedPalettes
_0801D2FC: .4byte gUnk_020176A0 _0801D2FC: .4byte gPaletteBuffer
_0801D300: _0801D300:
cmp r3, #0x14 cmp r3, #0x14
bhi _0801D31C bhi _0801D31C
subs r0, r3, #6 subs r0, r3, #6
lsls r0, r0, #5 lsls r0, r0, #5
ldr r1, _0801D318 @ =gUnk_020176A0 ldr r1, _0801D318 @ =gPaletteBuffer
adds r0, r0, r1 adds r0, r0, r1
adds r1, r4, #0 adds r1, r4, #0
movs r2, #1 movs r2, #1
bl sub_0801D754 bl LoadPalettes
b _0801D33C b _0801D33C
.align 2, 0 .align 2, 0
_0801D318: .4byte gUnk_020176A0 _0801D318: .4byte gPaletteBuffer
_0801D31C: _0801D31C:
ldr r1, _0801D340 @ =gUnk_08133368 ldr r1, _0801D340 @ =gUnk_08133368
adds r0, r3, #0 adds r0, r3, #0
@ -497,16 +497,16 @@ _0801D31C:
ands r2, r1 ands r2, r1
ldr r1, _0801D344 @ =0x00FFFFFF ldr r1, _0801D344 @ =0x00FFFFFF
ands r0, r1 ands r0, r1
ldr r1, _0801D348 @ =gUnk_085A2E80 ldr r1, _0801D348 @ =gGlobalPalettes
adds r0, r0, r1 adds r0, r0, r1
adds r1, r4, #0 adds r1, r4, #0
bl sub_0801D754 bl LoadPalettes
_0801D33C: _0801D33C:
pop {r4, pc} pop {r4, pc}
.align 2, 0 .align 2, 0
_0801D340: .4byte gUnk_08133368 _0801D340: .4byte gUnk_08133368
_0801D344: .4byte 0x00FFFFFF _0801D344: .4byte 0x00FFFFFF
_0801D348: .4byte gUnk_085A2E80 _0801D348: .4byte gGlobalPalettes
thumb_func_start sub_0801D34C thumb_func_start sub_0801D34C
sub_0801D34C: @ 0x0801D34C sub_0801D34C: @ 0x0801D34C
@ -704,7 +704,7 @@ sub_0801D48C: @ 0x0801D48C
rsbs r0, r0, #0 rsbs r0, r0, #0
cmp r5, r0 cmp r5, r0
beq _0801D4F8 beq _0801D4F8
ldr r2, _0801D510 @ =gUnk_020176A0 ldr r2, _0801D510 @ =gPaletteBuffer
lsls r0, r3, #5 lsls r0, r3, #5
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #2 lsls r1, r1, #2
@ -741,7 +741,7 @@ _0801D4C8:
cmp r5, r0 cmp r5, r0
bne _0801D4C8 bne _0801D4C8
_0801D4F8: _0801D4F8:
ldr r0, _0801D514 @ =gUnk_0200B644 ldr r0, _0801D514 @ =gUsedPalettes
ldr r1, [r0] ldr r1, [r0]
ldr r2, _0801D518 @ =0xFFFF0000 ldr r2, _0801D518 @ =0xFFFF0000
orrs r1, r2 orrs r1, r2
@ -752,8 +752,8 @@ _0801D4F8:
pop {r4, r5, r6, r7, pc} pop {r4, r5, r6, r7, pc}
.align 2, 0 .align 2, 0
_0801D50C: .4byte gUnk_02001A00 _0801D50C: .4byte gUnk_02001A00
_0801D510: .4byte gUnk_020176A0 _0801D510: .4byte gPaletteBuffer
_0801D514: .4byte gUnk_0200B644 _0801D514: .4byte gUsedPalettes
_0801D518: .4byte 0xFFFF0000 _0801D518: .4byte 0xFFFF0000
thumb_func_start sub_0801D51C thumb_func_start sub_0801D51C

81
asm/code_0801D714.s
View File

@ -1,81 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start LoadPalettesByPaletteGroupIndex
LoadPalettesByPaletteGroupIndex: @ 0x0801D714
push {r4, lr}
ldr r1, _0801D748 @ =gUnk_080FF850
lsls r0, r0, #2
adds r0, r0, r1
ldr r4, [r0]
_0801D71E:
ldrb r3, [r4, #2]
ldrb r0, [r4, #3]
movs r2, #0xf
ands r2, r0
cmp r2, #0
bne _0801D72C
movs r2, #0x10
_0801D72C:
ldrh r0, [r4]
lsls r0, r0, #5
ldr r1, _0801D74C @ =gUnk_085A2E80
adds r0, r0, r1
adds r1, r3, #0
bl sub_0801D754
ldrb r1, [r4, #3]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _0801D750
adds r4, #4
b _0801D71E
.align 2, 0
_0801D748: .4byte gUnk_080FF850
_0801D74C: .4byte gUnk_085A2E80
_0801D750:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0801D754
sub_0801D754: @ 0x0801D754
push {r4, r5, r6, r7, lr}
adds r6, r0, #0
lsls r5, r2, #5
movs r3, #1
lsls r3, r1
subs r2, #1
ldr r4, _0801D790 @ =gUnk_0200B644
ldr r7, _0801D794 @ =gUnk_020176A0
cmp r2, #0
ble _0801D772
_0801D768:
lsls r0, r3, #1
orrs r3, r0
subs r2, #1
cmp r2, #0
bgt _0801D768
_0801D772:
ldr r0, [r4]
orrs r0, r3
str r0, [r4]
lsls r0, r1, #5
adds r0, r0, r7
ldr r2, _0801D798 @ =0x040000D4
str r6, [r2]
str r0, [r2, #4]
lsrs r0, r5, #2
movs r1, #0x84
lsls r1, r1, #0x18
orrs r0, r1
str r0, [r2, #8]
ldr r0, [r2, #8]
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0801D790: .4byte gUnk_0200B644
_0801D794: .4byte gUnk_020176A0
_0801D798: .4byte 0x040000D4

12
asm/code_0801D79C.s
View File

@ -7,11 +7,11 @@
thumb_func_start sub_0801D79C thumb_func_start sub_0801D79C
sub_0801D79C: @ 0x0801D79C sub_0801D79C: @ 0x0801D79C
ldr r3, _0801D7B4 @ =gUnk_020176A0 ldr r3, _0801D7B4 @ =gPaletteBuffer
lsls r2, r0, #1 lsls r2, r0, #1
adds r2, r2, r3 adds r2, r2, r3
strh r1, [r2] strh r1, [r2]
ldr r2, _0801D7B8 @ =gUnk_0200B644 ldr r2, _0801D7B8 @ =gUsedPalettes
lsrs r0, r0, #4 lsrs r0, r0, #4
movs r1, #1 movs r1, #1
lsls r1, r0 lsls r1, r0
@ -20,8 +20,8 @@ sub_0801D79C: @ 0x0801D79C
str r0, [r2] str r0, [r2]
bx lr bx lr
.align 2, 0 .align 2, 0
_0801D7B4: .4byte gUnk_020176A0 _0801D7B4: .4byte gPaletteBuffer
_0801D7B8: .4byte gUnk_0200B644 _0801D7B8: .4byte gUsedPalettes
thumb_func_start sub_0801D7BC thumb_func_start sub_0801D7BC
sub_0801D7BC: @ 0x0801D7BC sub_0801D7BC: @ 0x0801D7BC
@ -101,7 +101,7 @@ _0801D842:
ldr r0, [r4] ldr r0, [r4]
ldr r1, _0801D868 @ =0x00FFFFFF ldr r1, _0801D868 @ =0x00FFFFFF
ands r0, r1 ands r0, r1
ldr r1, _0801D86C @ =gUnk_085A2E80 ldr r1, _0801D86C @ =gGlobalPalettes
adds r2, r0, r1 adds r2, r0, r1
ldr r1, [r4, #4] ldr r1, [r4, #4]
ldr r0, [r4, #8] ldr r0, [r4, #8]
@ -117,7 +117,7 @@ _0801D842:
b _0801D888 b _0801D888
.align 2, 0 .align 2, 0
_0801D868: .4byte 0x00FFFFFF _0801D868: .4byte 0x00FFFFFF
_0801D86C: .4byte gUnk_085A2E80 _0801D86C: .4byte gGlobalPalettes
_0801D870: .4byte 0x05FFFFFF _0801D870: .4byte 0x05FFFFFF
_0801D874: _0801D874:
adds r0, r2, #0 adds r0, r2, #0

6
asm/code_0804AA84.s
View File

@ -37,7 +37,7 @@ _0804ABA4:
ldr r0, _0804AC0C @ =gUnk_080D4138 ldr r0, _0804AC0C @ =gUnk_080D4138
adds r4, r4, r0 adds r4, r4, r0
ldrb r0, [r4] ldrb r0, [r4]
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
ldrb r0, [r4, #1] ldrb r0, [r4, #1]
bl sub_0801D7EC bl sub_0801D7EC
ldr r0, _0804AC10 @ =gUnk_02017700 ldr r0, _0804AC10 @ =gUnk_02017700
@ -46,7 +46,7 @@ _0804ABA4:
adds r1, r0, r2 adds r1, r0, r2
movs r2, #0x20 movs r2, #0x20
bl sub_0801D66C bl sub_0801D66C
ldr r2, _0804AC14 @ =gUnk_0200B644 ldr r2, _0804AC14 @ =gUsedPalettes
ldr r0, [r2] ldr r0, [r2]
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #0xe lsls r1, r1, #0xe
@ -75,7 +75,7 @@ _0804AC04: .4byte gArea
_0804AC08: .4byte gUnk_02032EC0 _0804AC08: .4byte gUnk_02032EC0
_0804AC0C: .4byte gUnk_080D4138 _0804AC0C: .4byte gUnk_080D4138
_0804AC10: .4byte gUnk_02017700 _0804AC10: .4byte gUnk_02017700
_0804AC14: .4byte gUnk_0200B644 _0804AC14: .4byte gUsedPalettes
_0804AC18: .4byte gUnk_080D4110 _0804AC18: .4byte gUnk_080D4110
thumb_func_start sub_0804AC1C thumb_func_start sub_0804AC1C

4
asm/code_0804B058.s
View File

@ -70,13 +70,13 @@ _0804B190:
bl SetTileType bl SetTileType
_0804B198: _0804B198:
adds r4, #8 adds r4, #8
ldr r0, _0804B1A8 @ =gUnk_020176A0 ldr r0, _0804B1A8 @ =gPaletteBuffer
cmp r4, r0 cmp r4, r0
blo _0804B170 blo _0804B170
pop {r4, pc} pop {r4, pc}
.align 2, 0 .align 2, 0
_0804B1A4: .4byte gUnk_02017660 _0804B1A4: .4byte gUnk_02017660
_0804B1A8: .4byte gUnk_020176A0 _0804B1A8: .4byte gPaletteBuffer
thumb_func_start LoadRoomTileEntities thumb_func_start LoadRoomTileEntities
LoadRoomTileEntities: @ 0x0804B1AC LoadRoomTileEntities: @ 0x0804B1AC

8
asm/code_0804B9F8.s
View File

@ -9,7 +9,7 @@
sub_0804FF98: @ 0x0804FF98 sub_0804FF98: @ 0x0804FF98
push {r4, r5, r6, r7, lr} push {r4, r5, r6, r7, lr}
ldr r6, _0804FFD4 @ =gUnk_020354C0 ldr r6, _0804FFD4 @ =gUnk_020354C0
ldr r1, _0804FFD8 @ =gUnk_0200B644 ldr r1, _0804FFD8 @ =gUsedPalettes
ldr r4, [r1] ldr r4, [r1]
movs r0, #0 movs r0, #0
str r0, [r1] str r0, [r1]
@ -22,7 +22,7 @@ _0804FFAC:
ands r0, r4 ands r0, r4
cmp r0, #0 cmp r0, #0
beq _0804FFC6 beq _0804FFC6
ldr r0, _0804FFE0 @ =gUnk_020176A0 ldr r0, _0804FFE0 @ =gPaletteBuffer
adds r0, r5, r0 adds r0, r5, r0
movs r2, #0xa0 movs r2, #0xa0
lsls r2, r2, #0x13 lsls r2, r2, #0x13
@ -40,9 +40,9 @@ _0804FFD0:
pop {r4, r5, r6, r7, pc} pop {r4, r5, r6, r7, pc}
.align 2, 0 .align 2, 0
_0804FFD4: .4byte gUnk_020354C0 _0804FFD4: .4byte gUnk_020354C0
_0804FFD8: .4byte gUnk_0200B644 _0804FFD8: .4byte gUsedPalettes
_0804FFDC: .4byte gUnk_03005E98 _0804FFDC: .4byte gUnk_03005E98
_0804FFE0: .4byte gUnk_020176A0 _0804FFE0: .4byte gPaletteBuffer
thumb_func_start sub_0804FFE4 thumb_func_start sub_0804FFE4
sub_0804FFE4: @ 0x0804FFE4 sub_0804FFE4: @ 0x0804FFE4

28
asm/code_08050038.s
View File

@ -90,7 +90,7 @@ _080501DE:
ldr r2, [r0, #4] ldr r2, [r0, #4]
ldr r1, _080501FC @ =gUnk_020354C0 ldr r1, _080501FC @ =gUnk_020354C0
movs r4, #0 movs r4, #0
ldr r7, _08050200 @ =gUnk_0200B644 ldr r7, _08050200 @ =gUsedPalettes
movs r6, #1 movs r6, #1
_080501EA: _080501EA:
adds r0, r2, #0 adds r0, r2, #0
@ -103,7 +103,7 @@ _080501EA:
.align 2, 0 .align 2, 0
_080501F8: .4byte gUnk_03000FD0 _080501F8: .4byte gUnk_03000FD0
_080501FC: .4byte gUnk_020354C0 _080501FC: .4byte gUnk_020354C0
_08050200: .4byte gUnk_0200B644 _08050200: .4byte gUsedPalettes
_08050204: _08050204:
strb r0, [r1] strb r0, [r1]
strh r0, [r1, #2] strh r0, [r1, #2]
@ -370,7 +370,7 @@ _080503FE:
lsls r0, r0, #0x12 lsls r0, r0, #0x12
strb r2, [r0, #5] strb r2, [r0, #5]
strb r1, [r0, #6] strb r1, [r0, #6]
ldr r1, _08050418 @ =gUnk_0200B644 ldr r1, _08050418 @ =gUsedPalettes
movs r0, #1 movs r0, #1
rsbs r0, r0, #0 rsbs r0, r0, #0
str r0, [r1] str r0, [r1]
@ -378,7 +378,7 @@ _080503FE:
.align 2, 0 .align 2, 0
_08050410: .4byte 0x000004B4 _08050410: .4byte 0x000004B4
_08050414: .4byte gUnk_02019EEC _08050414: .4byte gUnk_02019EEC
_08050418: .4byte gUnk_0200B644 _08050418: .4byte gUsedPalettes
thumb_func_start sub_0805041C thumb_func_start sub_0805041C
sub_0805041C: @ 0x0805041C sub_0805041C: @ 0x0805041C
@ -527,7 +527,7 @@ _08050546:
movs r0, #5 movs r0, #5
bl sub_080503A8 bl sub_080503A8
movs r0, #9 movs r0, #9
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
movs r4, #0 movs r4, #0
_08050586: _08050586:
movs r0, #0x48 movs r0, #0x48
@ -676,35 +676,35 @@ _080506AA:
lsls r0, r0, #1 lsls r0, r0, #1
adds r0, r0, r1 adds r0, r0, r1
ldrh r4, [r0] ldrh r4, [r0]
ldr r0, _080506F8 @ =gUnk_085A2E80 ldr r0, _080506F8 @ =gGlobalPalettes
adds r4, r4, r0 adds r4, r4, r0
ldr r1, _080506FC @ =0x00011AA0 ldr r1, _080506FC @ =0x00011AA0
adds r0, r4, r1 adds r0, r4, r1
movs r1, #0xb movs r1, #0xb
movs r2, #1 movs r2, #1
bl sub_0801D754 bl LoadPalettes
ldr r1, _08050700 @ =0x00011BA0 ldr r1, _08050700 @ =0x00011BA0
adds r0, r4, r1 adds r0, r4, r1
movs r1, #0xc movs r1, #0xc
movs r2, #1 movs r2, #1
bl sub_0801D754 bl LoadPalettes
ldr r1, _08050704 @ =0x00011CA0 ldr r1, _08050704 @ =0x00011CA0
adds r0, r4, r1 adds r0, r4, r1
movs r1, #0xd movs r1, #0xd
movs r2, #1 movs r2, #1
bl sub_0801D754 bl LoadPalettes
ldr r0, _08050708 @ =0x00011DA0 ldr r0, _08050708 @ =0x00011DA0
adds r4, r4, r0 adds r4, r4, r0
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0xe movs r1, #0xe
movs r2, #1 movs r2, #1
bl sub_0801D754 bl LoadPalettes
_080506EE: _080506EE:
pop {r4, pc} pop {r4, pc}
.align 2, 0 .align 2, 0
_080506F0: .4byte gUnk_02019EE0 _080506F0: .4byte gUnk_02019EE0
_080506F4: .4byte gUnk_080FC8DE _080506F4: .4byte gUnk_080FC8DE
_080506F8: .4byte gUnk_085A2E80 _080506F8: .4byte gGlobalPalettes
_080506FC: .4byte 0x00011AA0 _080506FC: .4byte 0x00011AA0
_08050700: .4byte 0x00011BA0 _08050700: .4byte 0x00011BA0
_08050704: .4byte 0x00011CA0 _08050704: .4byte 0x00011CA0
@ -3787,7 +3787,7 @@ sub_08051F9C: @ 0x08051F9C
ldr r1, _08051FE8 @ =gUnk_02000070 ldr r1, _08051FE8 @ =gUnk_02000070
movs r0, #1 movs r0, #1
strb r0, [r1] strb r0, [r1]
ldr r0, _08051FEC @ =gUnk_0200B644 ldr r0, _08051FEC @ =gUsedPalettes
str r6, [r0] str r6, [r0]
ldrh r0, [r5] ldrh r0, [r5]
orrs r4, r0 orrs r4, r0
@ -3799,7 +3799,7 @@ sub_08051F9C: @ 0x08051F9C
_08051FE0: .4byte gScreen _08051FE0: .4byte gScreen
_08051FE4: .4byte gRoomControls _08051FE4: .4byte gRoomControls
_08051FE8: .4byte gUnk_02000070 _08051FE8: .4byte gUnk_02000070
_08051FEC: .4byte gUnk_0200B644 _08051FEC: .4byte gUsedPalettes
thumb_func_start sub_08051FF0 thumb_func_start sub_08051FF0
sub_08051FF0: @ 0x08051FF0 sub_08051FF0: @ 0x08051FF0
@ -3839,7 +3839,7 @@ sub_08052010: @ 0x08052010
bl _DmaZero bl _DmaZero
bl sub_080A4D34 bl sub_080A4D34
movs r0, #0xa movs r0, #0xa
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
movs r0, #0 movs r0, #0
movs r1, #0 movs r1, #0
bl sub_0801D79C bl sub_0801D79C

18
asm/code_080526F8.s
View File

@ -158,19 +158,19 @@ sub_080527FC: @ 0x080527FC
adds r0, r4, #0 adds r0, r4, #0
bl sub_0801AE44 bl sub_0801AE44
ldr r0, _08052830 @ =gUnk_02024090 ldr r0, _08052830 @ =gUnk_02024090
ldr r1, _08052834 @ =gUnk_020176A0 ldr r1, _08052834 @ =gPaletteBuffer
movs r2, #0x80 movs r2, #0x80
lsls r2, r2, #3 lsls r2, r2, #3
bl sub_0801D66C bl sub_0801D66C
ldr r1, _08052838 @ =gUnk_0200B644 ldr r1, _08052838 @ =gUsedPalettes
movs r0, #1 movs r0, #1
rsbs r0, r0, #0 rsbs r0, r0, #0
str r0, [r1] str r0, [r1]
pop {r4, pc} pop {r4, pc}
.align 2, 0 .align 2, 0
_08052830: .4byte gUnk_02024090 _08052830: .4byte gUnk_02024090
_08052834: .4byte gUnk_020176A0 _08052834: .4byte gPaletteBuffer
_08052838: .4byte gUnk_0200B644 _08052838: .4byte gUsedPalettes
thumb_func_start sub_0805283C thumb_func_start sub_0805283C
sub_0805283C: @ 0x0805283C sub_0805283C: @ 0x0805283C
@ -1594,9 +1594,9 @@ sub_08053320: @ 0x08053320
_08053362: _08053362:
bl sub_08053390 bl sub_08053390
movs r0, #0xb movs r0, #0xb
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
movs r0, #0xc movs r0, #0xc
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
movs r0, #0 movs r0, #0
movs r1, #0 movs r1, #0
bl sub_0801D79C bl sub_0801D79C
@ -1659,7 +1659,7 @@ sub_080533CC: @ 0x080533CC
strh r2, [r1] strh r2, [r1]
ldrh r0, [r0, #2] ldrh r0, [r0, #2]
strh r0, [r1, #2] strh r0, [r1, #2]
ldr r2, _08053408 @ =gUnk_0200B644 ldr r2, _08053408 @ =gUsedPalettes
ldr r0, [r2] ldr r0, [r2]
movs r1, #8 movs r1, #8
orrs r0, r1 orrs r0, r1
@ -1668,7 +1668,7 @@ sub_080533CC: @ 0x080533CC
.align 2, 0 .align 2, 0
_08053400: .4byte gUnk_020178E0 _08053400: .4byte gUnk_020178E0
_08053404: .4byte 0xFFFFFE00 _08053404: .4byte 0xFFFFFE00
_08053408: .4byte gUnk_0200B644 _08053408: .4byte gUsedPalettes
thumb_func_start sub_0805340C thumb_func_start sub_0805340C
sub_0805340C: @ 0x0805340C sub_0805340C: @ 0x0805340C
@ -2215,7 +2215,7 @@ sub_08053800: @ 0x08053800
strb r2, [r1, #7] strb r2, [r1, #7]
adds r0, r5, #0 adds r0, r5, #0
adds r0, #0x8a adds r0, #0x8a
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
adds r0, r5, #0 adds r0, r5, #0
adds r0, #0x3a adds r0, #0x3a
bl sub_0801D7EC bl sub_0801D7EC

2
asm/code_0805EC04.s
View File

@ -376,7 +376,7 @@ sub_0805EE88: @ 0x0805EE88
ands r1, r0 ands r1, r0
lsrs r0, r1, #2 lsrs r0, r1, #2
adds r0, #0x2f adds r0, #0x2f
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
_0805EEAC: _0805EEAC:
pop {pc} pop {pc}
.align 2, 0 .align 2, 0

8
asm/code_0807B9B8.s
View File

@ -846,7 +846,7 @@ _0807C01C:
ldr r0, [r4] ldr r0, [r4]
ldr r0, [r0, #0x10] ldr r0, [r0, #0x10]
bl sub_080197D4 bl sub_080197D4
ldr r1, _0807C0D0 @ =gUnk_020176A0 ldr r1, _0807C0D0 @ =gPaletteBuffer
adds r0, r1, #0 adds r0, r1, #0
adds r0, #0x60 adds r0, #0x60
movs r2, #0xa8 movs r2, #0xa8
@ -854,7 +854,7 @@ _0807C01C:
adds r1, r1, r2 adds r1, r1, r2
movs r2, #0x20 movs r2, #0x20
bl sub_0801D66C bl sub_0801D66C
ldr r2, _0807C0D4 @ =gUnk_0200B644 ldr r2, _0807C0D4 @ =gUsedPalettes
ldr r0, [r2] ldr r0, [r2]
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #0xe lsls r1, r1, #0xe
@ -927,8 +927,8 @@ _0807C0C0: .4byte gUnk_02010654
_0807C0C4: .4byte gRoomControls _0807C0C4: .4byte gRoomControls
_0807C0C8: .4byte gArea _0807C0C8: .4byte gArea
_0807C0CC: .4byte 0x0000085C _0807C0CC: .4byte 0x0000085C
_0807C0D0: .4byte gUnk_020176A0 _0807C0D0: .4byte gPaletteBuffer
_0807C0D4: .4byte gUnk_0200B644 _0807C0D4: .4byte gUsedPalettes
_0807C0D8: .4byte 0x000007FF _0807C0D8: .4byte 0x000007FF
thumb_func_start sub_0807C0DC thumb_func_start sub_0807C0DC

8
asm/code_080A3480.s
View File

@ -268,9 +268,9 @@ _080A365E:
movs r0, #0 movs r0, #0
bl sub_0801DA90 bl sub_0801DA90
movs r0, #0xb movs r0, #0xb
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
movs r0, #0xc movs r0, #0xc
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
movs r0, #0 movs r0, #0
movs r1, #0 movs r1, #0
bl sub_0801D79C bl sub_0801D79C
@ -348,7 +348,7 @@ sub_080A36F8: @ 0x080A36F8
ldr r0, _080A375C @ =gUnk_08127CEC ldr r0, _080A375C @ =gUnk_08127CEC
adds r4, r4, r0 adds r4, r4, r0
ldrb r0, [r4] ldrb r0, [r4]
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
ldrb r0, [r4, #1] ldrb r0, [r4, #1]
bl sub_0801D7EC bl sub_0801D7EC
ldr r0, _080A3760 @ =gUnk_02021F30 ldr r0, _080A3760 @ =gUnk_02021F30
@ -703,7 +703,7 @@ _080A39C8:
bl sub_080A3210 bl sub_080A3210
bl sub_080A4D34 bl sub_080A4D34
movs r0, #0xa movs r0, #0xa
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
movs r0, #0 movs r0, #0
movs r1, #0 movs r1, #0
bl sub_0801D79C bl sub_0801D79C

14
asm/code_080A3BD0.s
View File

@ -1021,7 +1021,7 @@ sub_080A4418: @ 0x080A4418
ands r2, r1 ands r2, r1
mvns r0, r2 mvns r0, r2
ands r0, r1 ands r0, r1
ldr r1, _080A444C @ =gUnk_085A2E80 ldr r1, _080A444C @ =gGlobalPalettes
adds r1, r0, r1 adds r1, r0, r1
cmp r2, #0 cmp r2, #0
beq _080A4450 beq _080A4450
@ -1032,7 +1032,7 @@ sub_080A4418: @ 0x080A4418
.align 2, 0 .align 2, 0
_080A4444: .4byte 0x06010000 _080A4444: .4byte 0x06010000
_080A4448: .4byte gUnk_080CA06C _080A4448: .4byte gUnk_080CA06C
_080A444C: .4byte gUnk_085A2E80 _080A444C: .4byte gGlobalPalettes
_080A4450: _080A4450:
ldr r0, _080A4460 @ =0x040000D4 ldr r0, _080A4460 @ =0x040000D4
str r1, [r0] str r1, [r0]
@ -1252,7 +1252,7 @@ sub_080A4608: @ 0x080A4608
bl sub_080A3248 bl sub_080A3248
movs r0, #3 movs r0, #3
bl sub_080A4DA8 bl sub_080A4DA8
ldr r4, _080A46A0 @ =gUnk_020176A0 ldr r4, _080A46A0 @ =gPaletteBuffer
movs r1, #0xfb movs r1, #0xfb
lsls r1, r1, #1 lsls r1, r1, #1
adds r0, r4, r1 adds r0, r4, r1
@ -1320,7 +1320,7 @@ _080A4694:
bl DoFade bl DoFade
pop {r4, pc} pop {r4, pc}
.align 2, 0 .align 2, 0
_080A46A0: .4byte gUnk_020176A0 _080A46A0: .4byte gPaletteBuffer
_080A46A4: .4byte gUnk_02034CB0 _080A46A4: .4byte gUnk_02034CB0
_080A46A8: .4byte gUnk_02001A40 _080A46A8: .4byte gUnk_02001A40
_080A46AC: .4byte gScreen _080A46AC: .4byte gScreen
@ -1898,7 +1898,7 @@ _080A4ABE:
ldr r0, [r4] ldr r0, [r4]
movs r1, #0x16 movs r1, #0x16
movs r2, #9 movs r2, #9
bl sub_0801D754 bl LoadPalettes
ldr r0, [r4, #4] ldr r0, [r4, #4]
ldr r2, [r4, #8] ldr r2, [r4, #8]
cmp r2, #0 cmp r2, #0
@ -2174,7 +2174,7 @@ sub_080A4D34: @ 0x080A4D34
push {lr} push {lr}
bl sub_08053320 bl sub_08053320
movs r0, #0xb5 movs r0, #0xb5
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
ldr r1, _080A4D50 @ =gUnk_02002A40 ldr r1, _080A4D50 @ =gUnk_02002A40
adds r2, r1, #0 adds r2, r1, #0
adds r2, #0xaa adds r2, #0xaa
@ -2303,7 +2303,7 @@ sub_080A4DB8: @ 0x080A4DB8
ldrb r0, [r4] ldrb r0, [r4]
cmp r0, #0 cmp r0, #0
beq _080A4E4A beq _080A4E4A
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
_080A4E4A: _080A4E4A:
ldrb r0, [r4, #1] ldrb r0, [r4, #1]
cmp r0, #0 cmp r0, #0

14
asm/code_080A5574.s
View File

@ -869,7 +869,7 @@ sub_080A5BF0: @ 0x080A5BF0
movs r2, #0xe movs r2, #0xe
bl sub_0801D66C bl sub_0801D66C
strh r5, [r4, #0xe] strh r5, [r4, #0xe]
ldr r2, _080A5C40 @ =gUnk_0200B644 ldr r2, _080A5C40 @ =gUsedPalettes
ldr r0, [r2] ldr r0, [r2]
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #5 lsls r1, r1, #5
@ -882,7 +882,7 @@ _080A5C30: .4byte gUnk_08128D30
_080A5C34: .4byte gMenu _080A5C34: .4byte gMenu
_080A5C38: .4byte gUnk_03001000 _080A5C38: .4byte gUnk_03001000
_080A5C3C: .4byte gUnk_02017830 _080A5C3C: .4byte gUnk_02017830
_080A5C40: .4byte gUnk_0200B644 _080A5C40: .4byte gUsedPalettes
thumb_func_start sub_080A5C44 thumb_func_start sub_080A5C44
sub_080A5C44: @ 0x080A5C44 sub_080A5C44: @ 0x080A5C44
@ -2016,7 +2016,7 @@ sub_080A6534: @ 0x080A6534
ands r0, r1 ands r0, r1
movs r4, #0 movs r4, #0
strh r0, [r2] strh r0, [r2]
ldr r0, _080A6598 @ =gUnk_020176A0 ldr r0, _080A6598 @ =gPaletteBuffer
adds r0, #0xa2 adds r0, #0xa2
ldrh r1, [r0] ldrh r1, [r0]
movs r0, #0 movs r0, #0
@ -2048,7 +2048,7 @@ sub_080A6534: @ 0x080A6534
.align 2, 0 .align 2, 0
_080A6590: .4byte gScreen _080A6590: .4byte gScreen
_080A6594: .4byte 0x0000F7FF _080A6594: .4byte 0x0000F7FF
_080A6598: .4byte gUnk_020176A0 _080A6598: .4byte gPaletteBuffer
_080A659C: .4byte gUnk_08128F4C _080A659C: .4byte gUnk_08128F4C
_080A65A0: .4byte gUnk_02032EC0 _080A65A0: .4byte gUnk_02032EC0
_080A65A4: .4byte gUnk_02002A40 _080A65A4: .4byte gUnk_02002A40
@ -2328,7 +2328,7 @@ sub_080A67C4: @ 0x080A67C4
push {r4, r5, r6, r7, lr} push {r4, r5, r6, r7, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0xba adds r0, #0xba
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
adds r5, r4, #0 adds r5, r4, #0
adds r5, #0x5f adds r5, #0x5f
cmp r4, #0xb cmp r4, #0xb
@ -3680,7 +3680,7 @@ sub_080A7250: @ 0x080A7250
ldr r1, _080A72F0 @ =gUnk_03001020 ldr r1, _080A72F0 @ =gUnk_03001020
movs r2, #0x7c movs r2, #0x7c
bl sub_0801D66C bl sub_0801D66C
ldr r0, _080A72F4 @ =gUnk_020176A0 ldr r0, _080A72F4 @ =gPaletteBuffer
ldr r1, _080A72F8 @ =gUnk_02024090 ldr r1, _080A72F8 @ =gUnk_02024090
movs r2, #0x80 movs r2, #0x80
lsls r2, r2, #3 lsls r2, r2, #3
@ -3743,7 +3743,7 @@ _080A72E4:
_080A72E8: .4byte gUnk_03000FD0 _080A72E8: .4byte gUnk_03000FD0
_080A72EC: .4byte gScreen _080A72EC: .4byte gScreen
_080A72F0: .4byte gUnk_03001020 _080A72F0: .4byte gUnk_03001020
_080A72F4: .4byte gUnk_020176A0 _080A72F4: .4byte gPaletteBuffer
_080A72F8: .4byte gUnk_02024090 _080A72F8: .4byte gUnk_02024090
_080A72FC: .4byte gUnk_02024490 _080A72FC: .4byte gUnk_02024490
_080A7300: .4byte gUnk_02032F14 _080A7300: .4byte gUnk_02032F14

4
asm/code_080AD90C.s
View File

@ -660,7 +660,7 @@ sub_080ADDD8: @ 0x080ADDD8
adds r3, r1, r0 adds r3, r1, r0
ldr r0, _080ADE00 @ =0x00FFFFFC ldr r0, _080ADE00 @ =0x00FFFFFC
ands r0, r2 ands r0, r2
ldr r1, _080ADE04 @ =gUnk_085A2E80 ldr r1, _080ADE04 @ =gGlobalPalettes
adds r0, r0, r1 adds r0, r0, r1
str r0, [r3, #8] str r0, [r3, #8]
movs r0, #1 movs r0, #1
@ -672,7 +672,7 @@ sub_080ADDD8: @ 0x080ADDD8
.align 2, 0 .align 2, 0
_080ADDFC: .4byte gUnk_02024494 _080ADDFC: .4byte gUnk_02024494
_080ADE00: .4byte 0x00FFFFFC _080ADE00: .4byte 0x00FFFFFC
_080ADE04: .4byte gUnk_085A2E80 _080ADE04: .4byte gGlobalPalettes
_080ADE08: .4byte 0x0000FFFF _080ADE08: .4byte 0x0000FFFF
_080ADE0C: _080ADE0C:
movs r0, #0xfe movs r0, #0xfe

6
asm/manager10.s
View File

@ -441,7 +441,7 @@ _080598AA:
adds r1, r0, r2 adds r1, r0, r2
movs r2, #0x20 movs r2, #0x20
bl sub_0801D66C bl sub_0801D66C
ldr r2, _080598F0 @ =gUnk_0200B644 ldr r2, _080598F0 @ =gUsedPalettes
ldr r0, [r2] ldr r0, [r2]
ldr r1, _080598F4 @ =0x00207FFC ldr r1, _080598F4 @ =0x00207FFC
orrs r0, r1 orrs r0, r1
@ -453,7 +453,7 @@ _080598AA:
.align 2, 0 .align 2, 0
_080598E8: .4byte gUnk_020176E0 _080598E8: .4byte gUnk_020176E0
_080598EC: .4byte gUnk_02017700 _080598EC: .4byte gUnk_02017700
_080598F0: .4byte gUnk_0200B644 _080598F0: .4byte gUsedPalettes
_080598F4: .4byte 0x00207FFC _080598F4: .4byte 0x00207FFC
thumb_func_start sub_080598F8 thumb_func_start sub_080598F8
@ -547,7 +547,7 @@ sub_08059994: @ 0x08059994
cmp r0, #0 cmp r0, #0
beq _080599AE beq _080599AE
movs r0, #0x5b movs r0, #0x5b
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
ldr r0, _080599B0 @ =gArea ldr r0, _080599B0 @ =gArea
ldr r1, _080599B4 @ =0x00000864 ldr r1, _080599B4 @ =0x00000864
adds r0, r0, r1 adds r0, r0, r1

4
asm/manager12.s
View File

@ -378,7 +378,7 @@ _08059CE8:
_08059CEC: _08059CEC:
adds r6, r1, r0 adds r6, r1, r0
ldr r0, [r6] ldr r0, [r6]
ldr r4, _08059D14 @ =gUnk_085A2E80 ldr r4, _08059D14 @ =gGlobalPalettes
adds r0, r0, r4 adds r0, r0, r4
ldr r1, [r6, #4] ldr r1, [r6, #4]
movs r5, #0x80 movs r5, #0x80
@ -393,7 +393,7 @@ _08059CEC:
pop {r4, r5, r6, pc} pop {r4, r5, r6, pc}
.align 2, 0 .align 2, 0
_08059D10: .4byte gUnk_08108468 _08059D10: .4byte gUnk_08108468
_08059D14: .4byte gUnk_085A2E80 _08059D14: .4byte gGlobalPalettes
thumb_func_start sub_08059D18 thumb_func_start sub_08059D18
sub_08059D18: @ 0x08059D18 sub_08059D18: @ 0x08059D18

2
asm/manager15.s
View File

@ -1089,7 +1089,7 @@ sub_0805AA58: @ 0x0805AA58
adds r0, r0, r1 adds r0, r0, r1
movs r1, #5 movs r1, #5
movs r2, #1 movs r2, #1
bl sub_0801D754 bl LoadPalettes
_0805AA8C: _0805AA8C:
ldrb r0, [r4, #0xf] ldrb r0, [r4, #0xf]
subs r0, #1 subs r0, #1

4
asm/manager1A.s
View File

@ -418,7 +418,7 @@ sub_0805B328: @ 0x0805B328
adds r0, r0, r1 adds r0, r0, r1
ldr r0, [r0, #0xc] ldr r0, [r0, #0xc]
ldr r0, [r0] ldr r0, [r0]
ldr r1, _0805B378 @ =gUnk_085A2E80 ldr r1, _0805B378 @ =gGlobalPalettes
adds r0, r0, r1 adds r0, r0, r1
ldr r1, _0805B37C @ =0x0600F000 ldr r1, _0805B37C @ =0x0600F000
movs r4, #0x80 movs r4, #0x80
@ -445,7 +445,7 @@ _0805B372:
pop {r4, pc} pop {r4, pc}
.align 2, 0 .align 2, 0
_0805B374: .4byte gUnk_08108764 _0805B374: .4byte gUnk_08108764
_0805B378: .4byte gUnk_085A2E80 _0805B378: .4byte gGlobalPalettes
_0805B37C: .4byte 0x0600F000 _0805B37C: .4byte 0x0600F000
_0805B380: .4byte gScreen _0805B380: .4byte gScreen
_0805B384: .4byte 0x00001E07 _0805B384: .4byte 0x00001E07

16
asm/manager7.s
View File

@ -76,7 +76,7 @@ _08057DD6:
movs r0, #1 movs r0, #1
strb r0, [r1] strb r0, [r1]
ldr r0, [r2] ldr r0, [r2]
ldr r1, _08057DFC @ =gUnk_085A2E80 ldr r1, _08057DFC @ =gGlobalPalettes
adds r0, r0, r1 adds r0, r0, r1
ldr r1, [r2, #4] ldr r1, [r2, #4]
movs r2, #0x80 movs r2, #0x80
@ -85,17 +85,17 @@ _08057DD6:
ldr r0, _08057E00 @ =gUnk_081081E4 ldr r0, _08057E00 @ =gUnk_081081E4
adds r0, r5, r0 adds r0, r5, r0
ldrb r0, [r0] ldrb r0, [r0]
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
b _08057E24 b _08057E24
.align 2, 0 .align 2, 0
_08057DF8: .4byte gUnk_02034490 _08057DF8: .4byte gUnk_02034490
_08057DFC: .4byte gUnk_085A2E80 _08057DFC: .4byte gGlobalPalettes
_08057E00: .4byte gUnk_081081E4 _08057E00: .4byte gUnk_081081E4
_08057E04: _08057E04:
lsls r1, r1, #3 lsls r1, r1, #3
adds r1, r1, r2 adds r1, r1, r2
ldr r0, [r1] ldr r0, [r1]
ldr r2, _08057E1C @ =gUnk_085A2E80 ldr r2, _08057E1C @ =gGlobalPalettes
adds r0, r0, r2 adds r0, r0, r2
ldr r1, [r1, #4] ldr r1, [r1, #4]
movs r2, #0x80 movs r2, #0x80
@ -103,7 +103,7 @@ _08057E04:
bl LoadAssetAsync bl LoadAssetAsync
b _08057E24 b _08057E24
.align 2, 0 .align 2, 0
_08057E1C: .4byte gUnk_085A2E80 _08057E1C: .4byte gGlobalPalettes
_08057E20: _08057E20:
ldr r0, _08057E2C @ =gUnk_02034490 ldr r0, _08057E2C @ =gUnk_02034490
strb r3, [r0] strb r3, [r0]
@ -169,13 +169,13 @@ sub_08057E7C: @ 0x08057E7C
ldr r0, _08057EB8 @ =gUnk_081081E4 ldr r0, _08057EB8 @ =gUnk_081081E4
adds r0, r4, r0 adds r0, r4, r0
ldrb r0, [r0] ldrb r0, [r0]
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
lsls r1, r4, #6 lsls r1, r4, #6
ldr r0, _08057EBC @ =gUnk_081080A4 ldr r0, _08057EBC @ =gUnk_081080A4
adds r1, r1, r0 adds r1, r1, r0
movs r3, #0 movs r3, #0
ldr r2, _08057EC0 @ =0x040000D4 ldr r2, _08057EC0 @ =0x040000D4
ldr r6, _08057EC4 @ =gUnk_085A2E80 ldr r6, _08057EC4 @ =gGlobalPalettes
ldr r5, _08057EC8 @ =0x84000400 ldr r5, _08057EC8 @ =0x84000400
_08057E9C: _08057E9C:
ldr r0, [r1] ldr r0, [r1]
@ -197,6 +197,6 @@ _08057EB6:
_08057EB8: .4byte gUnk_081081E4 _08057EB8: .4byte gUnk_081081E4
_08057EBC: .4byte gUnk_081080A4 _08057EBC: .4byte gUnk_081080A4
_08057EC0: .4byte 0x040000D4 _08057EC0: .4byte 0x040000D4
_08057EC4: .4byte gUnk_085A2E80 _08057EC4: .4byte gGlobalPalettes
_08057EC8: .4byte 0x84000400 _08057EC8: .4byte 0x84000400
_08057ECC: .4byte gRoomVars _08057ECC: .4byte gRoomVars

2
asm/manager9.s
View File

@ -185,7 +185,7 @@ sub_08058324: @ 0x08058324
str r0, [r1] str r0, [r1]
adds r0, r4, #0 adds r0, r4, #0
adds r0, #0x86 adds r0, #0x86
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
adds r0, r4, #0 adds r0, r4, #0
adds r0, #0x36 adds r0, #0x36
bl sub_0801D7EC bl sub_0801D7EC

6
asm/managerC.s
View File

@ -647,14 +647,14 @@ _08058D30: .4byte gRoomControls
sub_08058D34: @ 0x08058D34 sub_08058D34: @ 0x08058D34
push {r4, lr} push {r4, lr}
movs r0, #0x28 movs r0, #0x28
bl LoadPalettesByPaletteGroupIndex bl LoadPaletteGroup
ldr r0, _08058DAC @ =gUnk_02017700 ldr r0, _08058DAC @ =gUnk_02017700
movs r2, #0x90 movs r2, #0x90
lsls r2, r2, #2 lsls r2, r2, #2
adds r1, r0, r2 adds r1, r0, r2
movs r2, #0x20 movs r2, #0x20
bl sub_0801D66C bl sub_0801D66C
ldr r2, _08058DB0 @ =gUnk_0200B644 ldr r2, _08058DB0 @ =gUsedPalettes
ldr r0, [r2] ldr r0, [r2]
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #0xe lsls r1, r1, #0xe
@ -702,7 +702,7 @@ _08058DA8:
pop {r4, pc} pop {r4, pc}
.align 2, 0 .align 2, 0
_08058DAC: .4byte gUnk_02017700 _08058DAC: .4byte gUnk_02017700
_08058DB0: .4byte gUnk_0200B644 _08058DB0: .4byte gUsedPalettes
_08058DB4: .4byte gScreen _08058DB4: .4byte gScreen
_08058DB8: .4byte 0x0000BC82 _08058DB8: .4byte 0x0000BC82
_08058DBC: .4byte 0x00005E86 _08058DBC: .4byte 0x00005E86

108
asm/sub_080AD76C.s
View File

@ -1,108 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080AD76C
sub_080AD76C: @ 0x080AD76C
push {lr}
ldr r1, _080AD780 @ =gMenu
ldrb r0, [r1, #6]
cmp r0, #1
beq _080AD7B4
cmp r0, #1
bgt _080AD784
cmp r0, #0
beq _080AD78A
b _080AD80E
.align 2, 0
_080AD780: .4byte gMenu
_080AD784:
cmp r0, #2
beq _080AD7DC
b _080AD80E
_080AD78A:
ldr r0, _080AD7AC @ =gUnk_03000FD0
ldrb r0, [r0]
cmp r0, #0
bne _080AD82A
movs r0, #1
strb r0, [r1, #6]
ldr r2, _080AD7B0 @ =gScreen
ldrh r1, [r2]
movs r3, #0x80
lsls r3, r3, #3
adds r0, r3, #0
orrs r0, r1
strh r0, [r2]
movs r0, #0xf6
bl PlaySFX
b _080AD82A
.align 2, 0
_080AD7AC: .4byte gUnk_03000FD0
_080AD7B0: .4byte gScreen
_080AD7B4:
ldr r0, [r1, #0x2c]
adds r0, #0x10
str r0, [r1, #0x2c]
movs r2, #0x80
lsls r2, r2, #1
cmp r0, r2
ble _080AD7D6
str r2, [r1, #0x2c]
movs r0, #0x28
strh r0, [r1, #8]
ldrb r0, [r1, #6]
adds r0, #1
strb r0, [r1, #6]
movs r0, #6
movs r1, #0x10
bl DoFade
_080AD7D6:
bl sub_080AD670
b _080AD82A
_080AD7DC:
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
lsls r0, r0, #0x10
cmp r0, #0
bne _080AD82A
movs r0, #0x96
lsls r0, r0, #1
strh r0, [r1, #8]
ldrb r0, [r1, #6]
adds r0, #1
strb r0, [r1, #6]
movs r0, #0xbd
movs r1, #0
movs r2, #0
bl CreateObject
movs r0, #6
movs r1, #0x10
bl DoFade
movs r0, #0xf8
bl PlaySFX
b _080AD82A
_080AD80E:
ldr r0, _080AD82C @ =gUnk_03000FD0
ldrb r0, [r0]
cmp r0, #0
bne _080AD82A
bl sub_080AD84C
cmp r0, #0
beq _080AD82A
ldr r0, _080AD830 @ =gMenu
ldrb r1, [r0, #5]
adds r1, #1
strb r1, [r0, #5]
movs r1, #0x3c
strh r1, [r0, #8]
_080AD82A:
pop {pc}
.align 2, 0
_080AD82C: .4byte gUnk_03000FD0
_080AD830: .4byte gMenu

51
asm/sub_080AD84C.s
View File

@ -1,51 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080AD84C
sub_080AD84C: @ 0x080AD84C
push {lr}
ldr r0, _080AD864 @ =gUnk_03000FD0
ldrb r0, [r0]
cmp r0, #0
bne _080AD894
ldr r0, _080AD868 @ =gUnk_02000010
ldrb r0, [r0, #5]
cmp r0, #0
bne _080AD86C
movs r2, #0
b _080AD874
.align 2, 0
_080AD864: .4byte gUnk_03000FD0
_080AD868: .4byte gUnk_02000010
_080AD86C:
ldr r0, _080AD888 @ =gUnk_03000FF0
ldrh r0, [r0, #2]
movs r2, #9
ands r2, r0
_080AD874:
ldr r1, _080AD88C @ =gMenu
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
lsls r0, r0, #0x10
cmp r0, #0
bne _080AD890
movs r0, #1
b _080AD89A
.align 2, 0
_080AD888: .4byte gUnk_03000FF0
_080AD88C: .4byte gMenu
_080AD890:
cmp r2, #0
bne _080AD898
_080AD894:
movs r0, #0
b _080AD89A
_080AD898:
movs r0, #2
_080AD89A:
pop {pc}

49
asm/sub_080AD89C.s
View File

@ -1,49 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080AD89C
sub_080AD89C: @ 0x080AD89C
push {r4, lr}
ldr r4, _080AD8E4 @ =gMenu
ldrb r1, [r4, #0x12]
movs r0, #7
ands r0, r1
cmp r0, #0
bne _080AD8BC
ldrb r0, [r4, #0x10]
adds r0, #1
movs r1, #3
ands r0, r1
strb r0, [r4, #0x10]
ldrb r0, [r4, #0x10]
adds r0, #5
bl LoadPalettesByPaletteGroupIndex
_080AD8BC:
ldrb r1, [r4, #0x12]
movs r0, #0x1f
ands r0, r1
cmp r0, #0
bne _080AD8E0
ldrb r0, [r4, #0x11]
adds r0, #1
movs r1, #7
ands r0, r1
strb r0, [r4, #0x11]
ldr r1, _080AD8E8 @ =gScreen
ldr r2, _080AD8EC @ =gUnk_081320FC
ldrb r0, [r4, #0x11]
lsls r0, r0, #1
adds r0, r0, r2
ldrh r0, [r0]
adds r1, #0x68
strh r0, [r1]
_080AD8E0:
pop {r4, pc}
.align 2, 0
_080AD8E4: .4byte gMenu
_080AD8E8: .4byte gScreen
_080AD8EC: .4byte gUnk_081320FC

857
data/data_080D5360.s
View File

@ -12275,652 +12275,217 @@ gUnk_080FF420:: @ 080FF420
.incbin "baserom.gba", 0x0FF420, 0x0000008 .incbin "baserom.gba", 0x0FF420, 0x0000008
gUnk_080FF428:: @ 080FF428 gUnk_080FF428:: @ 080FF428
.incbin "baserom.gba", 0x0FF428, 0x0000008 .incbin "baserom.gba", 0x0FF428, 0x0000428
gUnk_080FF430:: @ 080FF430 gPaletteGroups:: @ 080FF850
.incbin "baserom.gba", 0x0FF430, 0x0000008 .word 0x00000000
.word 0x080FF428
gUnk_080FF438:: @ 080FF438 .word 0x080FF430
.incbin "baserom.gba", 0x0FF438, 0x000000C .word 0x080FF438
.word 0x080FF444
gUnk_080FF444:: @ 080FF444 .word 0x080FF450
.incbin "baserom.gba", 0x0FF444, 0x000000C .word 0x080FF454
.word 0x080FF458
gUnk_080FF450:: @ 080FF450 .word 0x080FF45C
.incbin "baserom.gba", 0x0FF450, 0x0000004 .word 0x080FF460
.word 0x080FF474
gUnk_080FF454:: @ 080FF454 .word 0x080FF488
.incbin "baserom.gba", 0x0FF454, 0x0000004 .word 0x080FF484
.word 0x080FF5C8
gUnk_080FF458:: @ 080FF458 .word 0x080FF4A0
.incbin "baserom.gba", 0x0FF458, 0x0000004 .word 0x080FF4DC
.word 0x080FF560
gUnk_080FF45C:: @ 080FF45C .word 0x080FF4E4
.incbin "baserom.gba", 0x0FF45C, 0x0000004 .word 0x080FF4C4
.word 0x080FF570
gUnk_080FF460:: @ 080FF460 .word 0x080FF49C
.incbin "baserom.gba", 0x0FF460, 0x0000014 .word 0x080FF498
.word 0x080FF4A4
gUnk_080FF474:: @ 080FF474 .word 0x080FF4A8
.incbin "baserom.gba", 0x0FF474, 0x0000010 .word 0x080FF4AC
.word 0x080FF4B0
gUnk_080FF484:: @ 080FF484 .word 0x080FF4E8
.incbin "baserom.gba", 0x0FF484, 0x0000004 .word 0x080FF4B8
.word 0x080FF490
gUnk_080FF488:: @ 080FF488 .word 0x080FF574
.incbin "baserom.gba", 0x0FF488, 0x0000008 .word 0x080FF578
.word 0x080FF590
gUnk_080FF490:: @ 080FF490 .word 0x080FF594
.incbin "baserom.gba", 0x0FF490, 0x0000004 .word 0x080FF57C
.word 0x080FF5E4
gUnk_080FF494:: @ 080FF494 .word 0x080FF5F8
.incbin "baserom.gba", 0x0FF494, 0x0000004 .word 0x080FF4F0
.word 0x080FF4F4
gUnk_080FF498:: @ 080FF498 .word 0x080FF598
.incbin "baserom.gba", 0x0FF498, 0x0000004 .word 0x080FF494
.word 0x080FF6C4
gUnk_080FF49C:: @ 080FF49C .word 0x080FF59C
.incbin "baserom.gba", 0x0FF49C, 0x0000004 .word 0x080FF6C8
.word 0x080FF6CC
gUnk_080FF4A0:: @ 080FF4A0 .word 0x080FF58C
.incbin "baserom.gba", 0x0FF4A0, 0x0000004 .word 0x080FF5CC
.word 0x080FF564
gUnk_080FF4A4:: @ 080FF4A4 .word 0x080FF6D0
.incbin "baserom.gba", 0x0FF4A4, 0x0000004 .word 0x080FF6D4
.word 0x080FF6D8
gUnk_080FF4A8:: @ 080FF4A8 .word 0x080FF6DC
.incbin "baserom.gba", 0x0FF4A8, 0x0000004 .word 0x080FF5B0
.word 0x080FF5B4
gUnk_080FF4AC:: @ 080FF4AC .word 0x080FF5C4
.incbin "baserom.gba", 0x0FF4AC, 0x0000004 .word 0x080FF4C0
.word 0x080FF500
gUnk_080FF4B0:: @ 080FF4B0 .word 0x080FF510
.incbin "baserom.gba", 0x0FF4B0, 0x0000004 .word 0x080FF518
.word 0x080FF51C
gUnk_080FF4B4:: @ 080FF4B4 .word 0x080FF524
.incbin "baserom.gba", 0x0FF4B4, 0x0000004 .word 0x080FF50C
.word 0x080FF4B4
gUnk_080FF4B8:: @ 080FF4B8 .word 0x080FF5A0
.incbin "baserom.gba", 0x0FF4B8, 0x0000004 .word 0x080FF4C8
.word 0x080FF4CC
gUnk_080FF4BC:: @ 080FF4BC .word 0x080FF4D0
.incbin "baserom.gba", 0x0FF4BC, 0x0000004 .word 0x080FF4D4
.word 0x080FF568
gUnk_080FF4C0:: @ 080FF4C0 .word 0x080FF650
.incbin "baserom.gba", 0x0FF4C0, 0x0000004 .word 0x080FF654
.word 0x080FF658
gUnk_080FF4C4:: @ 080FF4C4 .word 0x080FF65C
.incbin "baserom.gba", 0x0FF4C4, 0x0000004 .word 0x080FF660
.word 0x080FF664
gUnk_080FF4C8:: @ 080FF4C8 .word 0x080FF668
.incbin "baserom.gba", 0x0FF4C8, 0x0000004 .word 0x080FF66C
.word 0x080FF670
gUnk_080FF4CC:: @ 080FF4CC .word 0x080FF680
.incbin "baserom.gba", 0x0FF4CC, 0x0000004 .word 0x080FF684
.word 0x080FF688
gUnk_080FF4D0:: @ 080FF4D0 .word 0x080FF68C
.incbin "baserom.gba", 0x0FF4D0, 0x0000004 .word 0x080FF690
.word 0x080FF694
gUnk_080FF4D4:: @ 080FF4D4 .word 0x080FF698
.incbin "baserom.gba", 0x0FF4D4, 0x0000004 .word 0x080FF69C
.word 0x080FF56C
gUnk_080FF4D8:: @ 080FF4D8 .word 0x080FF674
.incbin "baserom.gba", 0x0FF4D8, 0x0000004 .word 0x080FF678
.word 0x080FF67C
gUnk_080FF4DC:: @ 080FF4DC .word 0x080FF5B8
.incbin "baserom.gba", 0x0FF4DC, 0x0000004 .word 0x080FF4EC
.word 0x080FF6E0
gUnk_080FF4E0:: @ 080FF4E0 .word 0x080FF5A4
.incbin "baserom.gba", 0x0FF4E0, 0x0000004 .word 0x080FF4D8
.word 0x080FF4FC
gUnk_080FF4E4:: @ 080FF4E4 .word 0x080FF640
.incbin "baserom.gba", 0x0FF4E4, 0x0000004 .word 0x080FF644
.word 0x080FF648
gUnk_080FF4E8:: @ 080FF4E8 .word 0x080FF64C
.incbin "baserom.gba", 0x0FF4E8, 0x0000004 .word 0x080FF580
.word 0x080FF584
gUnk_080FF4EC:: @ 080FF4EC .word 0x080FF5FC
.incbin "baserom.gba", 0x0FF4EC, 0x0000004 .word 0x080FF5A8
.word 0x080FF5AC
gUnk_080FF4F0:: @ 080FF4F0 .word 0x080FF504
.incbin "baserom.gba", 0x0FF4F0, 0x0000004 .word 0x080FF53C
.word 0x080FF540
gUnk_080FF4F4:: @ 080FF4F4 .word 0x080FF544
.incbin "baserom.gba", 0x0FF4F4, 0x0000004 .word 0x080FF548
.word 0x080FF4E0
gUnk_080FF4F8:: @ 080FF4F8 .word 0x080FF600
.incbin "baserom.gba", 0x0FF4F8, 0x0000004 .word 0x080FF630
.word 0x080FF634
gUnk_080FF4FC:: @ 080FF4FC .word 0x080FF638
.incbin "baserom.gba", 0x0FF4FC, 0x0000004 .word 0x080FF63C
.word 0x080FF6A0
gUnk_080FF500:: @ 080FF500 .word 0x080FF6A4
.incbin "baserom.gba", 0x0FF500, 0x0000004 .word 0x080FF6A8
.word 0x080FF6AC
gUnk_080FF504:: @ 080FF504 .word 0x080FF6B0
.incbin "baserom.gba", 0x0FF504, 0x0000004 .word 0x080FF54C
.word 0x080FF604
gUnk_080FF508:: @ 080FF508 .word 0x080FF6C0
.incbin "baserom.gba", 0x0FF508, 0x0000004 .word 0x080FF6BC
.word 0x080FF6B8
gUnk_080FF50C:: @ 080FF50C .word 0x080FF608
.incbin "baserom.gba", 0x0FF50C, 0x0000004 .word 0x080FF60C
.word 0x080FF610
gUnk_080FF510:: @ 080FF510 .word 0x080FF4F8
.incbin "baserom.gba", 0x0FF510, 0x0000004 .word 0x080FF6B4
.word 0x080FF508
gUnk_080FF514:: @ 080FF514 .word 0x080FF614
.incbin "baserom.gba", 0x0FF514, 0x0000004 .word 0x080FF618
.word 0x080FF61C
gUnk_080FF518:: @ 080FF518 .word 0x080FF6E4
.incbin "baserom.gba", 0x0FF518, 0x0000004 .word 0x080FF6E8
.word 0x080FF6EC
gUnk_080FF51C:: @ 080FF51C .word 0x080FF6F0
.incbin "baserom.gba", 0x0FF51C, 0x0000004 .word 0x080FF6F4
.word 0x080FF6F8
gUnk_080FF520:: @ 080FF520 .word 0x080FF6FC
.incbin "baserom.gba", 0x0FF520, 0x0000004 .word 0x080FF700
.word 0x080FF704
gUnk_080FF524:: @ 080FF524 .word 0x080FF708
.incbin "baserom.gba", 0x0FF524, 0x0000004 .word 0x080FF528
.word 0x080FF520
gUnk_080FF528:: @ 080FF528 .word 0x080FF5D0
.incbin "baserom.gba", 0x0FF528, 0x0000004 .word 0x080FF5D4
.word 0x080FF5D8
gUnk_080FF52C:: @ 080FF52C .word 0x080FF5DC
.incbin "baserom.gba", 0x0FF52C, 0x0000004 .word 0x080FF5E0
.word 0x080FF5E8
gUnk_080FF530:: @ 080FF530 .word 0x080FF5EC
.incbin "baserom.gba", 0x0FF530, 0x0000004 .word 0x080FF5F0
.word 0x080FF5F4
gUnk_080FF534:: @ 080FF534 .word 0x080FF530
.incbin "baserom.gba", 0x0FF534, 0x0000004 .word 0x080FF534
.word 0x080FF5BC
gUnk_080FF538:: @ 080FF538 .word 0x080FF620
.incbin "baserom.gba", 0x0FF538, 0x0000004 .word 0x080FF624
.word 0x080FF628
gUnk_080FF53C:: @ 080FF53C .word 0x080FF62C
.incbin "baserom.gba", 0x0FF53C, 0x0000004 .word 0x080FF514
.word 0x080FF550
gUnk_080FF540:: @ 080FF540 .word 0x080FF554
.incbin "baserom.gba", 0x0FF540, 0x0000004 .word 0x080FF558
.word 0x080FF55C
gUnk_080FF544:: @ 080FF544 .word 0x080FF588
.incbin "baserom.gba", 0x0FF544, 0x0000004 .word 0x080FF5C0
.word 0x080FF538
gUnk_080FF548:: @ 080FF548 .word 0x080FF4BC
.incbin "baserom.gba", 0x0FF548, 0x0000004 .word 0x080FF70C
.word 0x080FF710
gUnk_080FF54C:: @ 080FF54C .word 0x080FF714
.incbin "baserom.gba", 0x0FF54C, 0x0000004 .word 0x080FF718
.word 0x080FF71C
gUnk_080FF550:: @ 080FF550 .word 0x080FF720
.incbin "baserom.gba", 0x0FF550, 0x0000004 .word 0x080FF724
.word 0x080FF728
gUnk_080FF554:: @ 080FF554 .word 0x080FF72C
.incbin "baserom.gba", 0x0FF554, 0x0000004 .word 0x080FF52C
.word 0x080FF730
gUnk_080FF558:: @ 080FF558 .word 0x080FF73C
.incbin "baserom.gba", 0x0FF558, 0x0000004 .word 0x080FF744
.word 0x080FF750
gUnk_080FF55C:: @ 080FF55C .word 0x080FF75C
.incbin "baserom.gba", 0x0FF55C, 0x0000004 .word 0x080FF770
.word 0x080FF778
gUnk_080FF560:: @ 080FF560 .word 0x080FF780
.incbin "baserom.gba", 0x0FF560, 0x0000004 .word 0x080FF788
.word 0x080FF790
gUnk_080FF564:: @ 080FF564 .word 0x080FF798
.incbin "baserom.gba", 0x0FF564, 0x0000004 .word 0x080FF7A0
.word 0x080FF7A8
gUnk_080FF568:: @ 080FF568 .word 0x080FF7B0
.incbin "baserom.gba", 0x0FF568, 0x0000004 .word 0x080FF7B8
.word 0x080FF7C0
gUnk_080FF56C:: @ 080FF56C .word 0x080FF7C8
.incbin "baserom.gba", 0x0FF56C, 0x0000004 .word 0x080FF7D0
.word 0x080FF7D8
gUnk_080FF570:: @ 080FF570 .word 0x080FF7E0
.incbin "baserom.gba", 0x0FF570, 0x0000004 .word 0x080FF7E8
.word 0x080FF7F0
gUnk_080FF574:: @ 080FF574 .word 0x080FF7F8
.incbin "baserom.gba", 0x0FF574, 0x0000004 .word 0x080FF808
.word 0x080FF814
gUnk_080FF578:: @ 080FF578 .word 0x080FF83C
.incbin "baserom.gba", 0x0FF578, 0x0000004 .word 0x080FF844
gUnk_080FF57C:: @ 080FF57C
.incbin "baserom.gba", 0x0FF57C, 0x0000004
gUnk_080FF580:: @ 080FF580
.incbin "baserom.gba", 0x0FF580, 0x0000004
gUnk_080FF584:: @ 080FF584
.incbin "baserom.gba", 0x0FF584, 0x0000004
gUnk_080FF588:: @ 080FF588
.incbin "baserom.gba", 0x0FF588, 0x0000004
gUnk_080FF58C:: @ 080FF58C
.incbin "baserom.gba", 0x0FF58C, 0x0000004
gUnk_080FF590:: @ 080FF590
.incbin "baserom.gba", 0x0FF590, 0x0000004
gUnk_080FF594:: @ 080FF594
.incbin "baserom.gba", 0x0FF594, 0x0000004
gUnk_080FF598:: @ 080FF598
.incbin "baserom.gba", 0x0FF598, 0x0000004
gUnk_080FF59C:: @ 080FF59C
.incbin "baserom.gba", 0x0FF59C, 0x0000004
gUnk_080FF5A0:: @ 080FF5A0
.incbin "baserom.gba", 0x0FF5A0, 0x0000004
gUnk_080FF5A4:: @ 080FF5A4
.incbin "baserom.gba", 0x0FF5A4, 0x0000004
gUnk_080FF5A8:: @ 080FF5A8
.incbin "baserom.gba", 0x0FF5A8, 0x0000004
gUnk_080FF5AC:: @ 080FF5AC
.incbin "baserom.gba", 0x0FF5AC, 0x0000004
gUnk_080FF5B0:: @ 080FF5B0
.incbin "baserom.gba", 0x0FF5B0, 0x0000004
gUnk_080FF5B4:: @ 080FF5B4
.incbin "baserom.gba", 0x0FF5B4, 0x0000004
gUnk_080FF5B8:: @ 080FF5B8
.incbin "baserom.gba", 0x0FF5B8, 0x0000004
gUnk_080FF5BC:: @ 080FF5BC
.incbin "baserom.gba", 0x0FF5BC, 0x0000004
gUnk_080FF5C0:: @ 080FF5C0
.incbin "baserom.gba", 0x0FF5C0, 0x0000004
gUnk_080FF5C4:: @ 080FF5C4
.incbin "baserom.gba", 0x0FF5C4, 0x0000004
gUnk_080FF5C8:: @ 080FF5C8
.incbin "baserom.gba", 0x0FF5C8, 0x0000001
gUnk_080FF5C9:: @ 080FF5C9
.incbin "baserom.gba", 0x0FF5C9, 0x0000003
gUnk_080FF5CC:: @ 080FF5CC
.incbin "baserom.gba", 0x0FF5CC, 0x0000004
gUnk_080FF5D0:: @ 080FF5D0
.incbin "baserom.gba", 0x0FF5D0, 0x0000004
gUnk_080FF5D4:: @ 080FF5D4
.incbin "baserom.gba", 0x0FF5D4, 0x0000004
gUnk_080FF5D8:: @ 080FF5D8
.incbin "baserom.gba", 0x0FF5D8, 0x0000004
gUnk_080FF5DC:: @ 080FF5DC
.incbin "baserom.gba", 0x0FF5DC, 0x0000004
gUnk_080FF5E0:: @ 080FF5E0
.incbin "baserom.gba", 0x0FF5E0, 0x0000004
gUnk_080FF5E4:: @ 080FF5E4
.incbin "baserom.gba", 0x0FF5E4, 0x0000004
gUnk_080FF5E8:: @ 080FF5E8
.incbin "baserom.gba", 0x0FF5E8, 0x0000004
gUnk_080FF5EC:: @ 080FF5EC
.incbin "baserom.gba", 0x0FF5EC, 0x0000004
gUnk_080FF5F0:: @ 080FF5F0
.incbin "baserom.gba", 0x0FF5F0, 0x0000004
gUnk_080FF5F4:: @ 080FF5F4
.incbin "baserom.gba", 0x0FF5F4, 0x0000004
gUnk_080FF5F8:: @ 080FF5F8
.incbin "baserom.gba", 0x0FF5F8, 0x0000004
gUnk_080FF5FC:: @ 080FF5FC
.incbin "baserom.gba", 0x0FF5FC, 0x0000004
gUnk_080FF600:: @ 080FF600
.incbin "baserom.gba", 0x0FF600, 0x0000004
gUnk_080FF604:: @ 080FF604
.incbin "baserom.gba", 0x0FF604, 0x0000004
gUnk_080FF608:: @ 080FF608
.incbin "baserom.gba", 0x0FF608, 0x0000004
gUnk_080FF60C:: @ 080FF60C
.incbin "baserom.gba", 0x0FF60C, 0x0000004
gUnk_080FF610:: @ 080FF610
.incbin "baserom.gba", 0x0FF610, 0x0000004
gUnk_080FF614:: @ 080FF614
.incbin "baserom.gba", 0x0FF614, 0x0000004
gUnk_080FF618:: @ 080FF618
.incbin "baserom.gba", 0x0FF618, 0x0000004
gUnk_080FF61C:: @ 080FF61C
.incbin "baserom.gba", 0x0FF61C, 0x0000004
gUnk_080FF620:: @ 080FF620
.incbin "baserom.gba", 0x0FF620, 0x0000004
gUnk_080FF624:: @ 080FF624
.incbin "baserom.gba", 0x0FF624, 0x0000004
gUnk_080FF628:: @ 080FF628
.incbin "baserom.gba", 0x0FF628, 0x0000004
gUnk_080FF62C:: @ 080FF62C
.incbin "baserom.gba", 0x0FF62C, 0x0000004
gUnk_080FF630:: @ 080FF630
.incbin "baserom.gba", 0x0FF630, 0x0000004
gUnk_080FF634:: @ 080FF634
.incbin "baserom.gba", 0x0FF634, 0x0000004
gUnk_080FF638:: @ 080FF638
.incbin "baserom.gba", 0x0FF638, 0x0000004
gUnk_080FF63C:: @ 080FF63C
.incbin "baserom.gba", 0x0FF63C, 0x0000004
gUnk_080FF640:: @ 080FF640
.incbin "baserom.gba", 0x0FF640, 0x0000004
gUnk_080FF644:: @ 080FF644
.incbin "baserom.gba", 0x0FF644, 0x0000004
gUnk_080FF648:: @ 080FF648
.incbin "baserom.gba", 0x0FF648, 0x0000004
gUnk_080FF64C:: @ 080FF64C
.incbin "baserom.gba", 0x0FF64C, 0x0000004
gUnk_080FF650:: @ 080FF650
.incbin "baserom.gba", 0x0FF650, 0x0000004
gUnk_080FF654:: @ 080FF654
.incbin "baserom.gba", 0x0FF654, 0x0000004
gUnk_080FF658:: @ 080FF658
.incbin "baserom.gba", 0x0FF658, 0x0000004
gUnk_080FF65C:: @ 080FF65C
.incbin "baserom.gba", 0x0FF65C, 0x0000004
gUnk_080FF660:: @ 080FF660
.incbin "baserom.gba", 0x0FF660, 0x0000004
gUnk_080FF664:: @ 080FF664
.incbin "baserom.gba", 0x0FF664, 0x0000004
gUnk_080FF668:: @ 080FF668
.incbin "baserom.gba", 0x0FF668, 0x0000004
gUnk_080FF66C:: @ 080FF66C
.incbin "baserom.gba", 0x0FF66C, 0x0000004
gUnk_080FF670:: @ 080FF670
.incbin "baserom.gba", 0x0FF670, 0x0000004
gUnk_080FF674:: @ 080FF674
.incbin "baserom.gba", 0x0FF674, 0x0000004
gUnk_080FF678:: @ 080FF678
.incbin "baserom.gba", 0x0FF678, 0x0000004
gUnk_080FF67C:: @ 080FF67C
.incbin "baserom.gba", 0x0FF67C, 0x0000004
gUnk_080FF680:: @ 080FF680
.incbin "baserom.gba", 0x0FF680, 0x0000004
gUnk_080FF684:: @ 080FF684
.incbin "baserom.gba", 0x0FF684, 0x0000004
gUnk_080FF688:: @ 080FF688
.incbin "baserom.gba", 0x0FF688, 0x0000004
gUnk_080FF68C:: @ 080FF68C
.incbin "baserom.gba", 0x0FF68C, 0x0000004
gUnk_080FF690:: @ 080FF690
.incbin "baserom.gba", 0x0FF690, 0x0000004
gUnk_080FF694:: @ 080FF694
.incbin "baserom.gba", 0x0FF694, 0x0000004
gUnk_080FF698:: @ 080FF698
.incbin "baserom.gba", 0x0FF698, 0x0000004
gUnk_080FF69C:: @ 080FF69C
.incbin "baserom.gba", 0x0FF69C, 0x0000004
gUnk_080FF6A0:: @ 080FF6A0
.incbin "baserom.gba", 0x0FF6A0, 0x0000004
gUnk_080FF6A4:: @ 080FF6A4
.incbin "baserom.gba", 0x0FF6A4, 0x0000004
gUnk_080FF6A8:: @ 080FF6A8
.incbin "baserom.gba", 0x0FF6A8, 0x0000004
gUnk_080FF6AC:: @ 080FF6AC
.incbin "baserom.gba", 0x0FF6AC, 0x0000004
gUnk_080FF6B0:: @ 080FF6B0
.incbin "baserom.gba", 0x0FF6B0, 0x0000004
gUnk_080FF6B4:: @ 080FF6B4
.incbin "baserom.gba", 0x0FF6B4, 0x0000004
gUnk_080FF6B8:: @ 080FF6B8
.incbin "baserom.gba", 0x0FF6B8, 0x0000004
gUnk_080FF6BC:: @ 080FF6BC
.incbin "baserom.gba", 0x0FF6BC, 0x0000004
gUnk_080FF6C0:: @ 080FF6C0
.incbin "baserom.gba", 0x0FF6C0, 0x0000004
gUnk_080FF6C4:: @ 080FF6C4
.incbin "baserom.gba", 0x0FF6C4, 0x0000004
gUnk_080FF6C8:: @ 080FF6C8
.incbin "baserom.gba", 0x0FF6C8, 0x0000004
gUnk_080FF6CC:: @ 080FF6CC
.incbin "baserom.gba", 0x0FF6CC, 0x0000004
gUnk_080FF6D0:: @ 080FF6D0
.incbin "baserom.gba", 0x0FF6D0, 0x0000004
gUnk_080FF6D4:: @ 080FF6D4
.incbin "baserom.gba", 0x0FF6D4, 0x0000004
gUnk_080FF6D8:: @ 080FF6D8
.incbin "baserom.gba", 0x0FF6D8, 0x0000002
gUnk_080FF6DA:: @ 080FF6DA
.incbin "baserom.gba", 0x0FF6DA, 0x0000002
gUnk_080FF6DC:: @ 080FF6DC
.incbin "baserom.gba", 0x0FF6DC, 0x0000004
gUnk_080FF6E0:: @ 080FF6E0
.incbin "baserom.gba", 0x0FF6E0, 0x0000004
gUnk_080FF6E4:: @ 080FF6E4
.incbin "baserom.gba", 0x0FF6E4, 0x0000004
gUnk_080FF6E8:: @ 080FF6E8
.incbin "baserom.gba", 0x0FF6E8, 0x0000004
gUnk_080FF6EC:: @ 080FF6EC
.incbin "baserom.gba", 0x0FF6EC, 0x0000004
gUnk_080FF6F0:: @ 080FF6F0
.incbin "baserom.gba", 0x0FF6F0, 0x0000004
gUnk_080FF6F4:: @ 080FF6F4
.incbin "baserom.gba", 0x0FF6F4, 0x0000004
gUnk_080FF6F8:: @ 080FF6F8
.incbin "baserom.gba", 0x0FF6F8, 0x0000001
gUnk_080FF6F9:: @ 080FF6F9
.incbin "baserom.gba", 0x0FF6F9, 0x0000003
gUnk_080FF6FC:: @ 080FF6FC
.incbin "baserom.gba", 0x0FF6FC, 0x0000004
gUnk_080FF700:: @ 080FF700
.incbin "baserom.gba", 0x0FF700, 0x0000004
gUnk_080FF704:: @ 080FF704
.incbin "baserom.gba", 0x0FF704, 0x0000004
gUnk_080FF708:: @ 080FF708
.incbin "baserom.gba", 0x0FF708, 0x0000004
gUnk_080FF70C:: @ 080FF70C
.incbin "baserom.gba", 0x0FF70C, 0x0000004
gUnk_080FF710:: @ 080FF710
.incbin "baserom.gba", 0x0FF710, 0x0000004
gUnk_080FF714:: @ 080FF714
.incbin "baserom.gba", 0x0FF714, 0x0000004
gUnk_080FF718:: @ 080FF718
.incbin "baserom.gba", 0x0FF718, 0x0000004
gUnk_080FF71C:: @ 080FF71C
.incbin "baserom.gba", 0x0FF71C, 0x0000004
gUnk_080FF720:: @ 080FF720
.incbin "baserom.gba", 0x0FF720, 0x0000004
gUnk_080FF724:: @ 080FF724
.incbin "baserom.gba", 0x0FF724, 0x0000004
gUnk_080FF728:: @ 080FF728
.incbin "baserom.gba", 0x0FF728, 0x0000004
gUnk_080FF72C:: @ 080FF72C
.incbin "baserom.gba", 0x0FF72C, 0x0000004
gUnk_080FF730:: @ 080FF730
.incbin "baserom.gba", 0x0FF730, 0x000000C
gUnk_080FF73C:: @ 080FF73C
.incbin "baserom.gba", 0x0FF73C, 0x0000008
gUnk_080FF744:: @ 080FF744
.incbin "baserom.gba", 0x0FF744, 0x000000C
gUnk_080FF750:: @ 080FF750
.incbin "baserom.gba", 0x0FF750, 0x000000C
gUnk_080FF75C:: @ 080FF75C
.incbin "baserom.gba", 0x0FF75C, 0x0000014
gUnk_080FF770:: @ 080FF770
.incbin "baserom.gba", 0x0FF770, 0x0000008
gUnk_080FF778:: @ 080FF778
.incbin "baserom.gba", 0x0FF778, 0x0000008
gUnk_080FF780:: @ 080FF780
.incbin "baserom.gba", 0x0FF780, 0x0000008
gUnk_080FF788:: @ 080FF788
.incbin "baserom.gba", 0x0FF788, 0x0000008
gUnk_080FF790:: @ 080FF790
.incbin "baserom.gba", 0x0FF790, 0x0000008
gUnk_080FF798:: @ 080FF798
.incbin "baserom.gba", 0x0FF798, 0x0000008
gUnk_080FF7A0:: @ 080FF7A0
.incbin "baserom.gba", 0x0FF7A0, 0x0000008
gUnk_080FF7A8:: @ 080FF7A8
.incbin "baserom.gba", 0x0FF7A8, 0x0000008
gUnk_080FF7B0:: @ 080FF7B0
.incbin "baserom.gba", 0x0FF7B0, 0x0000008
gUnk_080FF7B8:: @ 080FF7B8
.incbin "baserom.gba", 0x0FF7B8, 0x0000008
gUnk_080FF7C0:: @ 080FF7C0
.incbin "baserom.gba", 0x0FF7C0, 0x0000008
gUnk_080FF7C8:: @ 080FF7C8
.incbin "baserom.gba", 0x0FF7C8, 0x0000008
gUnk_080FF7D0:: @ 080FF7D0
.incbin "baserom.gba", 0x0FF7D0, 0x0000008
gUnk_080FF7D8:: @ 080FF7D8
.incbin "baserom.gba", 0x0FF7D8, 0x0000008
gUnk_080FF7E0:: @ 080FF7E0
.incbin "baserom.gba", 0x0FF7E0, 0x0000008
gUnk_080FF7E8:: @ 080FF7E8
.incbin "baserom.gba", 0x0FF7E8, 0x0000008
gUnk_080FF7F0:: @ 080FF7F0
.incbin "baserom.gba", 0x0FF7F0, 0x0000008
gUnk_080FF7F8:: @ 080FF7F8
.incbin "baserom.gba", 0x0FF7F8, 0x0000010
gUnk_080FF808:: @ 080FF808
.incbin "baserom.gba", 0x0FF808, 0x000000C
gUnk_080FF814:: @ 080FF814
.incbin "baserom.gba", 0x0FF814, 0x0000028
gUnk_080FF83C:: @ 080FF83C
.incbin "baserom.gba", 0x0FF83C, 0x0000008
gUnk_080FF844:: @ 080FF844
.incbin "baserom.gba", 0x0FF844, 0x000000C
gUnk_080FF850:: @ 080FF850
.incbin "baserom.gba", 0x0FF850, 0x00000BE
gUnk_080FF90E:: @ 080FF90E
.incbin "baserom.gba", 0x0FF90E, 0x00000CE
gUnk_080FF9DC:: @ 080FF9DC
.incbin "baserom.gba", 0x0FF9DC, 0x000000A
gUnk_080FF9E6:: @ 080FF9E6
.incbin "baserom.gba", 0x0FF9E6, 0x000002C
gUnk_080FFA12:: @ 080FFA12
.incbin "baserom.gba", 0x0FFA12, 0x00000DD
gUnk_080FFAEF:: @ 080FFAEF
.incbin "baserom.gba", 0x0FFAEF, 0x00000A1
gUnk_080FFB90:: @ 080FFB90 gUnk_080FFB90:: @ 080FFB90
.incbin "baserom.gba", 0x0FFB90, 0x0000018 .incbin "baserom.gba", 0x0FFB90, 0x0000018

14853
data/data_08121C58.s
View File

File diff suppressed because it is too large Load Diff

14855
data/data_081320FC.s Executable file
View File

File diff suppressed because it is too large Load Diff

5
include/functions.h
View File

@ -137,7 +137,7 @@ extern void sub_0801AFE4(void);
extern u32 sub_08060354(void); extern u32 sub_08060354(void);
extern void sub_08057E64(void); extern void sub_08057E64(void);
extern void LoadAssetAsync(void*, u32, u32); extern void LoadAssetAsync(void*, u32, u32);
extern void LoadPalettesByPaletteGroupIndex(u32); extern void LoadPaletteGroup(u32);
extern void sub_0809F814(u32); extern void sub_0809F814(u32);
extern void sub_080300E8(void); extern void sub_080300E8(void);
extern void sub_0801DA90(u32); extern void sub_0801DA90(u32);
@ -170,10 +170,9 @@ extern void sub_08059994(void);
extern u32 sub_080AD84C(); extern u32 sub_080AD84C();
extern void sub_0801D7EC(u32); extern void sub_0801D7EC(u32);
extern s32 sub_0801CFA8(u32); extern s32 sub_0801CFA8(u32);
extern void sub_080AD670();
extern void sub_080A3210(); extern void sub_080A3210();
extern void sub_080AD6AC(); extern void sub_080AD6AC();
extern void sub_080AD76C(); extern void sub_080AD76C(void);
extern void sub_080AD644(); extern void sub_080AD644();
extern void sub_080ADA14(u32, u32); extern void sub_080ADA14(u32, u32);
extern void sub_080AD89C(); extern void sub_080AD89C();

2
include/menu.h
View File

@ -36,7 +36,7 @@ typedef struct {
u8 unk16; u8 unk16;
u8 filler17[0x13]; u8 filler17[0x13];
u8 unk2a; u8 unk2a;
u32 field_0x2c; int field_0x2c;
} Menu; } Menu;
extern Menu gMenu; extern Menu gMenu;

10
include/screen.h
View File

@ -63,11 +63,11 @@ typedef struct {
} BgControls; } BgControls;
typedef struct { typedef struct {
LcdControls lcd; /*0x00*/ LcdControls lcd;
BgSettings bg1; /*0x0C*/ BgSettings bg1;
BgSettings bg2; /*0x18*/ BgSettings bg2;
BgAffSettings affine; /*0x24*/ BgAffSettings affine;
BgControls controls; /*0x3C*/ BgControls controls;
} Screen; } Screen;
extern BgControls gBgControls; extern BgControls gBgControls;

12
linker.ld
View File

@ -49,7 +49,7 @@ SECTIONS {
. = 0x0000AF34; gUnk_0200AF34 = .; . = 0x0000AF34; gUnk_0200AF34 = .;
. = 0x0000B240; gUnk_0200B240 = .; . = 0x0000B240; gUnk_0200B240 = .;
. = 0x0000B640; gUnk_0200B640 = .; . = 0x0000B640; gUnk_0200B640 = .;
. = 0x0000B644; gUnk_0200B644 = .; . = 0x0000B644; gUsedPalettes = .;
. = 0x0000B650; gUnk_0200B650 = .; . = 0x0000B650; gUnk_0200B650 = .;
. = 0x0000B654; gUnk_0200B654 = .; . = 0x0000B654; gUnk_0200B654 = .;
. = 0x0000D654; gUnk_0200D654 = .; . = 0x0000D654; gUnk_0200D654 = .;
@ -60,7 +60,7 @@ SECTIONS {
. = 0x00016654; gUnk_02016654 = .; . = 0x00016654; gUnk_02016654 = .;
. = 0x00017654; gUnk_02017654 = .; . = 0x00017654; gUnk_02017654 = .;
. = 0x00017660; gUnk_02017660 = .; . = 0x00017660; gUnk_02017660 = .;
. = 0x000176A0; gUnk_020176A0 = .; . = 0x000176A0; gPaletteBuffer = .;
. = 0x000176E0; gUnk_020176E0 = .; . = 0x000176E0; gUnk_020176E0 = .;
. = 0x00017700; gUnk_02017700 = .; . = 0x00017700; gUnk_02017700 = .;
. = 0x00017830; gUnk_02017830 = .; . = 0x00017830; gUnk_02017830 = .;
@ -320,7 +320,7 @@ SECTIONS {
src/dma.o(.text); src/dma.o(.text);
asm/sub_0801D66C.o(.text); asm/sub_0801D66C.o(.text);
src/input.o(.text); src/input.o(.text);
asm/code_0801D714.o(.text); src/code_0801D714.o(.text);
asm/code_0801D79C.o(.text); asm/code_0801D79C.o(.text);
/* enemies */ /* enemies */
src/enemy/octorok.o(.text); src/enemy/octorok.o(.text);
@ -888,10 +888,6 @@ SECTIONS {
src/sub_080A554C.o(.text); src/sub_080A554C.o(.text);
asm/code_080A5574.o(.text); asm/code_080A5574.o(.text);
src/introSetTransition.o(.text); src/introSetTransition.o(.text);
asm/sub_080AD76C.o(.text);
src/sub_080AD834.o(.text);
asm/sub_080AD84C.o(.text);
asm/sub_080AD89C.o(.text);
asm/sub_080AD8F0.o(.text); asm/sub_080AD8F0.o(.text);
asm/code_080AD90C.o(.text); asm/code_080AD90C.o(.text);
/* library functions */ /* library functions */
@ -925,6 +921,8 @@ SECTIONS {
data/data_081208A0.o(.rodata); data/data_081208A0.o(.rodata);
src/object/heartContainer.o(.rodata); src/object/heartContainer.o(.rodata);
data/data_08121C58.o(.rodata); data/data_08121C58.o(.rodata);
src/introSetTransition.o(.rodata);
data/data_081320FC.o(.rodata);
data/strings.o(.rodata); data/strings.o(.rodata);
data/data_089FC6C4.o(.rodata); data/data_089FC6C4.o(.rodata);
} >rom } >rom

43
src/code_0801D714.c Executable file
View File

@ -0,0 +1,43 @@
#include "global.h"
extern void LoadPalettes(const u8*, int, int);
extern u32 gUsedPalettes;
extern u16 gPaletteBuffer[][16];
typedef struct {
u16 paletteId;
u8 destPaletteNum;
u8 numPalettes;
} PaletteGroup;
extern const PaletteGroup* gPaletteGroups[];
extern const u8 gGlobalPalettes[][32];
void LoadPaletteGroup(u32 arg0) {
const PaletteGroup* paletteGroup = gPaletteGroups[arg0];
while (1) {
u32 destPaletteNum = paletteGroup->destPaletteNum;
u32 numPalettes = paletteGroup->numPalettes & 0xF;
if (numPalettes == 0) {
numPalettes = 16;
}
LoadPalettes(gGlobalPalettes[paletteGroup->paletteId], destPaletteNum, numPalettes);
if ((paletteGroup->numPalettes & 0x80) == 0) {
break;
}
paletteGroup++;
}
}
void LoadPalettes(const u8* src, int destPaletteNum, int numPalettes) {
u16* dest;
u32 size = numPalettes * 32;
u32 usedPalettesMask = 1 << destPaletteNum;
while (--numPalettes > 0) {
usedPalettesMask |= (usedPalettesMask << 1);
}
gUsedPalettes |= usedPalettesMask;
dest = gPaletteBuffer[destPaletteNum];
DmaCopy32(3, src, dest, size);
}

111
src/introSetTransition.c
View File

@ -3,10 +3,20 @@
#include "main.h" #include "main.h"
#include "entity.h" #include "entity.h"
#include "functions.h" #include "functions.h"
#include "readKeyInput.h"
#include "screen.h" #include "screen.h"
#include "structures.h" #include "structures.h"
extern void (*const gUnk_081320F0[])(); static void sub_080AD3F4(void);
static void sub_080AD474(void);
static void sub_080AD670(void);
static void sub_080AD834(void);
static void (*const gUnk_081320F0[])(void) = {
sub_080AD3F4,
sub_080AD474,
sub_080AD834,
};
typedef struct { typedef struct {
u8 field_0x0; u8 field_0x0;
@ -18,11 +28,13 @@ typedef struct {
extern struct_03000FD0 gUnk_03000FD0; extern struct_03000FD0 gUnk_03000FD0;
extern const u16 gUnk_081320FC[];
u32 IntroSetTransition(u32 transition) u32 IntroSetTransition(u32 transition)
{ {
gUnk_02032EC0.transitionType = transition; gUnk_02032EC0.transitionType = transition;
gUnk_03001000.funcIndex = 2; gUnk_03001000.funcIndex = 2;
_DmaZero((u32 *)&gMenu, 48); _DmaZero(&gMenu, sizeof(gMenu));
DoFade(7, 8); DoFade(7, 8);
} }
@ -49,7 +61,7 @@ void HandleIntroScreen(void)
sub_080AD918(); sub_080AD918();
} }
void sub_080AD3F4(void) static void sub_080AD3F4(void)
{ {
u32 iVar1; u32 iVar1;
u32 uVar2; u32 uVar2;
@ -58,7 +70,7 @@ void sub_080AD3F4(void)
if (gMenu.menuType == 0) { if (gMenu.menuType == 0) {
sub_0801DA90(1); sub_0801DA90(1);
gMenu.menuType = 1; gMenu.menuType = 1;
gMenu.transitionTimer = 0x78; gMenu.transitionTimer = 120;
sub_0801D7EC(0x10); sub_0801D7EC(0x10);
sub_0801D7EC(1); sub_0801D7EC(1);
if (((struct_02000000 *)0x2000000)->gameLanguage == 0) { if (((struct_02000000 *)0x2000000)->gameLanguage == 0) {
@ -67,7 +79,7 @@ void sub_080AD3F4(void)
else { else {
uVar2 = 2; uVar2 = 2;
} }
LoadPalettesByPaletteGroupIndex(uVar2); LoadPaletteGroup(uVar2);
gScreen.lcd.lcdControl2 |= 0x400; gScreen.lcd.lcdControl2 |= 0x400;
gScreen.bg2.bg0xOffset = 1; gScreen.bg2.bg0xOffset = 1;
DoFade(6, 8); DoFade(6, 8);
@ -92,7 +104,7 @@ extern u16 gUnk_03001010[5];
extern u8 gUnk_02024490; extern u8 gUnk_02024490;
void sub_080AD474(void) static void sub_080AD474(void)
{ {
int iVar2; int iVar2;
u32 uVar3; u32 uVar3;
@ -115,7 +127,7 @@ void sub_080AD474(void)
else { else {
uVar3 = 4; uVar3 = 4;
} }
LoadPalettesByPaletteGroupIndex(uVar3); LoadPaletteGroup(uVar3);
if (((struct_02000000*)0x2000000)->gameLanguage == 0) { if (((struct_02000000*)0x2000000)->gameLanguage == 0) {
gScreen.controls.windowOutsideControl = 0x844; gScreen.controls.windowOutsideControl = 0x844;
gScreen.controls.mosaicSize = 0x909; gScreen.controls.mosaicSize = 0x909;
@ -198,7 +210,7 @@ void sub_080AD644(void) {
return; return;
} }
void sub_080AD670(void) static void sub_080AD670(void)
{ {
struct BgAffineSrcData aff; struct BgAffineSrcData aff;
aff.texY = 0x8000; aff.texY = 0x8000;
@ -232,7 +244,7 @@ void sub_080AD6AC(void)
} }
break; break;
case 1: case 1:
if (gUnk_03000FD0.field_0x0 == '\0') { if (gUnk_03000FD0.field_0x0 == 0) {
gUnk_03000FD0.field_0x4 = -1; gUnk_03000FD0.field_0x4 = -1;
gMenu.overlayType++; gMenu.overlayType++;
gMenu.transitionTimer = 0x5a; gMenu.transitionTimer = 0x5a;
@ -249,4 +261,83 @@ void sub_080AD6AC(void)
gMenu.transitionTimer = 0x3c; gMenu.transitionTimer = 0x3c;
} }
} }
} }
void sub_080AD76C(void) {
switch (gMenu.overlayType) {
case 0:
if (gUnk_03000FD0.field_0x0 == 0) {
gMenu.overlayType = 1;
gScreen.lcd.lcdControl2 |= 0x400;
PlaySFX(0xF6);
}
break;
case 1:
gMenu.field_0x2c += 16;
if (gMenu.field_0x2c > 256) {
gMenu.field_0x2c = 256;
gMenu.transitionTimer = 40;
gMenu.overlayType++;
DoFade(6, 16);
}
sub_080AD670();
break;
case 2:
if (--gMenu.transitionTimer == 0) {
gMenu.transitionTimer = 300;
gMenu.overlayType++;
CreateObject(0xBD, 0, 0);
DoFade(6, 16);
PlaySFX(0xF8);
}
break;
default:
if (gUnk_03000FD0.field_0x0 == 0 && sub_080AD84C()) {
gMenu.menuType++;
gMenu.transitionTimer = 60;
}
break;
}
}
static void sub_080AD834(void) {
if (gUnk_03000FD0.field_0x0 == 0) {
InitScreen(SCREEN_CHOOSE_FILE);
}
}
u32 sub_080AD84C(void) {
u32 newKeys;
if (gUnk_03000FD0.field_0x0 != 0) {
return 0;
}
if (gUnk_02000010.field_0x5 == 0) {
newKeys = 0;
} else {
newKeys = gUnk_03000FF0.newKeys & (A_BUTTON | START_BUTTON);
}
if (--gMenu.transitionTimer == 0) {
return 1;
}
if (newKeys) {
return 2;
}
return 0;
}
void sub_080AD89C(void) {
if ((gMenu.field_0x12 & 0x7) == 0) {
gMenu.unk10[0] = (gMenu.unk10[0] + 1) & 0x3;
LoadPaletteGroup(gMenu.unk10[0] + 5);
}
if ((gMenu.field_0x12 & 0x1F) == 0) {
gMenu.unk10[1] = (gMenu.unk10[1] + 1) & 0x7;
gScreen.controls.mosaicSize = gUnk_081320FC[gMenu.unk10[1]];
}
}

4
src/mainLoop.c
View File

@ -5,7 +5,7 @@
#include "readKeyInput.h" #include "readKeyInput.h"
extern void sub_0804FF84(u32); extern void sub_0804FF84(u32);
extern u32 gUnk_020176A0; extern u32 gPaletteBuffer;
extern void VBlankInterruptWait(void); extern void VBlankInterruptWait(void);
extern void DisableInterruptsAndDMA(void); extern void DisableInterruptsAndDMA(void);
extern void sub_0801D66C(void*, u8*, int); extern void sub_0801D66C(void*, u8*, int);
@ -34,7 +34,7 @@ void MainLoop(void) {
sub_08056208(); sub_08056208();
gUnk_02000010.field_0x4 = 193; gUnk_02000010.field_0x4 = 193;
sub_0804FFE4(); sub_0804FFE4();
DmaSet(3, 0x5000000U, &gUnk_020176A0, 0x84000080U); DmaSet(3, 0x5000000U, &gPaletteBuffer, 0x84000080U);
sub_0804FF84(1); sub_0804FF84(1);
sub_08056418(); sub_08056418();
sub_080ADD30(); sub_080ADD30();

4
src/manager/manager27.c
View File

@ -4,7 +4,7 @@
#include "functions.h" #include "functions.h"
extern u32 sub_0805C920(Entity*); extern u32 sub_0805C920(Entity*);
extern void LoadPalettesByPaletteGroupIndex(u32); extern void LoadPaletteGroup(u32);
extern void (*const gUnk_08108D10[])(Entity*); extern void (*const gUnk_08108D10[])(Entity*);
extern u8 gUnk_08108D20[]; extern u8 gUnk_08108D20[];
@ -58,7 +58,7 @@ void sub_0805C8B4(Entity *this)
if (5 < ++this->field_0xf) { if (5 < ++this->field_0xf) {
this->field_0xf = 0; this->field_0xf = 0;
} }
LoadPalettesByPaletteGroupIndex(gUnk_08108D20[this->field_0xf]); LoadPaletteGroup(gUnk_08108D20[this->field_0xf]);
if (this->field_0xf == 0) { if (this->field_0xf == 0) {
PlaySFX(0x11a); PlaySFX(0x11a);
} }

6
src/object/object48.c
View File

@ -10,7 +10,7 @@
#include "structures.h" #include "structures.h"
extern int sub_0807A094(int); extern int sub_0807A094(int);
extern u32 sub_0801D754(const u8*, u8, u8); extern void LoadPalettes(const u8*, int, int);
extern u32 sub_080041EC(int, int); extern u32 sub_080041EC(int, int);
extern u32 sub_080045DA(int, int); extern u32 sub_080045DA(int, int);
@ -39,7 +39,7 @@ typedef struct {
extern void (*const gUnk_08121C64[])(Entity*); extern void (*const gUnk_08121C64[])(Entity*);
extern void (*const gUnk_08121CCC[])(Entity*); extern void (*const gUnk_08121CCC[])(Entity*);
extern const int gUnk_08133368[]; extern const int gUnk_08133368[];
extern const u8 gUnk_085A2E80[]; extern const u8 gGlobalPalettes[];
extern const struct_08121CD4 gUnk_08121CD4[][4]; extern const struct_08121CD4 gUnk_08121CD4[][4];
extern const u8 gUnk_08121D10[]; extern const u8 gUnk_08121D10[];
extern const u8 gUnk_08121D38[][8]; extern const u8 gUnk_08121D38[][8];
@ -88,7 +88,7 @@ void sub_0808E818(Entity* this) {
this->field_0x70.BYTES.byte0 = 4; this->field_0x70.BYTES.byte0 = 4;
this->animationState = 2; this->animationState = 2;
var1 = gUnk_08133368[sub_0807A094(1) - 22] & 0xFFFFFF; var1 = gUnk_08133368[sub_0807A094(1) - 22] & 0xFFFFFF;
sub_0801D754(&gUnk_085A2E80[var1], 31, 1); LoadPalettes(&gGlobalPalettes[var1], 31, 1);
} }
if (gUnk_02032EC0.transitionType == 0) { if (gUnk_02032EC0.transitionType == 0) {

8
src/room.c
View File

@ -1740,7 +1740,7 @@ extern struct_086D4460 gUnk_086D4460;
void sub_0804C918(void) { void sub_0804C918(void) {
LoadAssetAsync(&gUnk_086D4460.LO, 0x6000000, 0x4000); LoadAssetAsync(&gUnk_086D4460.LO, 0x6000000, 0x4000);
LoadAssetAsync(&gUnk_086D4460.HI, 0x6008000, 0x4000); LoadAssetAsync(&gUnk_086D4460.HI, 0x6008000, 0x4000);
LoadPalettesByPaletteGroupIndex(0x19); LoadPaletteGroup(0x19);
} }
u32 sub_0804C948() { u32 sub_0804C948() {
@ -2224,7 +2224,7 @@ extern EntityData gUnk_080DF94C;
extern u8 gUnk_02000070; extern u8 gUnk_02000070;
extern u8 gUnk_03000FD0; extern u8 gUnk_03000FD0;
extern u32 gUnk_0200B644; extern u32 gUsedPalettes;
void sub_0804CD48(void) { void sub_0804CD48(void) {
@ -2233,7 +2233,7 @@ void sub_0804CD48(void) {
MenuFadeIn(5, 0); MenuFadeIn(5, 0);
gUnk_02000070 = 0; gUnk_02000070 = 0;
gUnk_03000FD0 = 0; gUnk_03000FD0 = 0;
gUnk_0200B644 = 0; gUsedPalettes = 0;
*(u16*)0x5000000 = 0x7fff; *(u16*)0x5000000 = 0x7fff;
sub_0801DA90(1); sub_0801DA90(1);
} }
@ -6552,5 +6552,5 @@ void nullsub_106() {}
void sub_0804FF84(u32 arg0) void sub_0804FF84(u32 arg0)
{ {
((struct_02000000 * )0x02000000)->brightnessPref = arg0; ((struct_02000000 * )0x02000000)->brightnessPref = arg0;
gUnk_0200B644 = (u32)-1; gUsedPalettes = (u32)-1;
} }

10
src/sub_0801D754.c
View File

@ -1,17 +1,17 @@
#include "global.h" #include "global.h"
extern u8 gUnk_020176E0; extern const u8 gUnk_020176E0[];
extern void sub_0807C960(); extern void sub_0807C960();
extern u32 sub_0801D754(const u8*, u8, u8); extern void LoadPalettes(const u8*, int, int);
u32 sub_0807C9D8(u32* a1) { void sub_0807C9D8(u32* a1) {
u32* v1; // r5@1 u32* v1; // r5@1
v1 = a1; v1 = a1;
sub_0807C960(0x6004000, *a1); sub_0807C960(0x6004000, *a1);
sub_0807C960(0x6000000, v1[1]); sub_0807C960(0x6000000, v1[1]);
sub_0807C960(0x6008000, v1[2]); sub_0807C960(0x6008000, v1[2]);
sub_0807C960(&gUnk_020176E0, v1[3]); sub_0807C960(gUnk_020176E0, v1[3]);
return sub_0801D754(&gUnk_020176E0, 2, 13); LoadPalettes(gUnk_020176E0, 2, 13);
} }

4
src/sub_08050024.c
View File

@ -29,7 +29,7 @@ typedef struct {
extern struct_03000000 gUnk_03000000; extern struct_03000000 gUnk_03000000;
extern u32 gUnk_0200B644; extern u32 gUsedPalettes;
extern void sub_0801E104(); extern void sub_0801E104();
extern void DoFade(u32, u32); extern void DoFade(u32, u32);
@ -75,7 +75,7 @@ void DoFade(u32 fadeType, u32 fadeSpeed)
if ((fadeType & 1) == 0) { if ((fadeType & 1) == 0) {
gUnk_03000FD0.fadeType &= 0xfffb; gUnk_03000FD0.fadeType &= 0xfffb;
sub_08050008(); sub_08050008();
gUnk_0200B644 = 0xffffffff; gUsedPalettes = 0xffffffff;
} }
} }
} }

2
src/sub_080A3B84.c
View File

@ -31,7 +31,7 @@ void sub_080A3BD0(void)
gMenu.field_0x1 = 1; gMenu.field_0x1 = 1;
gMenu.unk2a = 0; gMenu.unk2a = 0;
sub_080A4D34(); sub_080A4D34();
LoadPalettesByPaletteGroupIndex(0xcb); LoadPaletteGroup(0xcb);
sub_0801D7EC(0x75); sub_0801D7EC(0x75);
iVar1 = sub_080A4494(); iVar1 = sub_080A4494();

10
src/sub_080AD834.c
View File

@ -1,10 +0,0 @@
#include "global.h"
#include "main.h"
extern u8 gUnk_03000FD0;
void sub_080AD834(void) {
if (gUnk_03000FD0 == 0) {
InitScreen(SCREEN_CHOOSE_FILE);
}
}