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

Merge branch 'master' of github.com:zeldaret/tmc

This commit is contained in:
Behemoth 2020-08-05 17:34:36 +02:00
parent b4513a1b4f 1912771187
commit 08784153ef
147 changed files with 1783 additions and 2813 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -62,3 +62,4 @@ types_*.taghl
!sound/programmable_wave_samples/*.pcm
_Deparsed_XSubs.pm
*.py
*.sna

4
asm/armos.s
View File

@ -1014,7 +1014,7 @@ _0803088E:
strb r0, [r2]
ldr r0, [r5, #0x7c]
bl DoExitTransition
ldr r0, _08030938 @ =gUnk_030010A0
ldr r0, _08030938 @ =gScreenTransition
adds r1, r5, #0
adds r1, #0x80
ldrb r1, [r1]
@ -1027,7 +1027,7 @@ _08030928: .4byte gLinkState
_0803092C: .4byte gRoomControls
_08030930: .4byte 0x00004049
_08030934: .4byte gLinkEntity
_08030938: .4byte gUnk_030010A0
_08030938: .4byte gScreenTransition
_0803093C:
ldr r0, _0803094C @ =0x00004022
mov r3, r8

4
asm/bigBarrel.s
View File

@ -586,7 +586,7 @@ _08088E94:
.align 2, 0
_08088EB0: .4byte gRoomVars
_08088EB4:
ldr r0, _08088F18 @ =gUnk_030010A0
ldr r0, _08088F18 @ =gScreenTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@ -635,7 +635,7 @@ _08088EB4:
_08088F14:
pop {r4, pc}
.align 2, 0
_08088F18: .4byte gUnk_030010A0
_08088F18: .4byte gScreenTransition
_08088F1C: .4byte gUnk_08120C52
thumb_func_start sub_08088F20

4
asm/bigGoron.s
View File

@ -570,7 +570,7 @@ _0806D45E:
adds r0, r4, #0
bl sub_0807DDE4
_0806D46C:
ldr r0, _0806D4A8 @ =gUnk_030010A0
ldr r0, _0806D4A8 @ =gScreenTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@ -599,7 +599,7 @@ _0806D46C:
strb r0, [r2]
b _0806D4BE
.align 2, 0
_0806D4A8: .4byte gUnk_030010A0
_0806D4A8: .4byte gScreenTransition
_0806D4AC:
adds r1, r4, #0
adds r1, #0x63

4
asm/bossDoor.s
View File

@ -196,7 +196,7 @@ sub_0808C348: @ 0x0808C348
ands r0, r1
cmp r0, #0
bne _0808C37C
ldr r0, _0808C374 @ =gUnk_030010A0
ldr r0, _0808C374 @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@ -209,7 +209,7 @@ _0808C36A:
bl GetNextFrame
b _0808C382
.align 2, 0
_0808C374: .4byte gUnk_030010A0
_0808C374: .4byte gScreenTransition
_0808C378: .4byte 0x00000185
_0808C37C:
adds r0, r4, #0

4
asm/castorWildsStatue.s
View File

@ -45,7 +45,7 @@ _080673BC: .4byte gUnk_08110E4C
sub_080673C0: @ 0x080673C0
push {lr}
adds r2, r0, #0
ldr r0, _080673D4 @ =gUnk_030010A0
ldr r0, _080673D4 @ =gScreenTransition
adds r0, #0x2c
ldrb r0, [r0]
cmp r0, #0
@ -53,7 +53,7 @@ sub_080673C0: @ 0x080673C0
movs r0, #3
b _080673DA
.align 2, 0
_080673D4: .4byte gUnk_030010A0
_080673D4: .4byte gScreenTransition
_080673D8:
movs r0, #1
_080673DA:

14
asm/chuchuBoss.s
View File

@ -1366,7 +1366,7 @@ _080266B0:
strh r0, [r4, #0x24]
b _08026742
_080266D6:
ldr r0, _08026700 @ =gUnk_030010A0
ldr r0, _08026700 @ =gScreenTransition
ldr r0, [r0]
movs r1, #0x7f
ands r0, r1
@ -1387,7 +1387,7 @@ _080266EC:
lsls r0, r0, #1
b _0802670A
.align 2, 0
_08026700: .4byte gUnk_030010A0
_08026700: .4byte gScreenTransition
_08026704: .4byte gLinkEntity
_08026708:
movs r0, #0xc0
@ -1396,7 +1396,7 @@ _0802670A:
ldrb r0, [r4, #0xe]
cmp r0, #0
beq _0802672C
ldr r0, _0802674C @ =gUnk_030010A0
ldr r0, _0802674C @ =gScreenTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@ -1427,7 +1427,7 @@ _08026748:
add sp, #4
pop {r4, r5, pc}
.align 2, 0
_0802674C: .4byte gUnk_030010A0
_0802674C: .4byte gScreenTransition
thumb_func_start sub_08026750
sub_08026750: @ 0x08026750
@ -2643,7 +2643,7 @@ sub_08027064: @ 0x08027064
ldrb r0, [r0]
cmp r0, #0xa
beq _08027098
ldr r0, _080270C8 @ =gUnk_030010A0
ldr r0, _080270C8 @ =gScreenTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@ -2666,7 +2666,7 @@ _08027098:
ldrsh r2, [r0, r1]
cmp r4, r2
beq _080270E0
ldr r0, _080270C8 @ =gUnk_030010A0
ldr r0, _080270C8 @ =gScreenTransition
ldr r1, [r0]
movs r0, #0xf
ands r1, r0
@ -2677,7 +2677,7 @@ _08027098:
strb r1, [r3, #0xc]
b _080270D4
.align 2, 0
_080270C8: .4byte gUnk_030010A0
_080270C8: .4byte gScreenTransition
_080270CC: .4byte gLinkEntity
_080270D0:
movs r0, #0x10

100
asm/code_08000108.s
View File

@ -167,140 +167,240 @@ gUnk_08000278::
.4byte gUnk_02016654
.4byte gUnk_02030EB4
@ call 0x80B19CC
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_08000288
sub_08000288: @ 0x08000288
ldr r3, _080002F4 @ =gUnk_03005740
bx r3
@ call 0x80B19D8
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_0800028C
sub_0800028C: @ 0x0800028C
ldr r3, _080002F8 @ =gUnk_0300574C
bx r3
@ call 0x80B19EC
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_08000290
sub_08000290: @ 0x08000290
ldr r3, _080002FC @ =gUnk_03005760
bx r3
@ call 0x80B19FC
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_08000294
sub_08000294: @ 0x08000294
ldr r3, _08000300 @ =gUnk_03005770
bx r3
@ call 0x80B1A04
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_08000298
sub_08000298: @ 0x08000298
ldr r3, _08000304 @ =gUnk_03005778
bx r3
@ call 0x80B1A0C
@ r0: entity*
@ r1: s32
@ r2: s32
thumb_func_start sub_0800029C
sub_0800029C: @ 0x0800029C
ldr r3, _08000308 @ =gUnk_03005780
bx r3
@ call 0x080B1A28
@ r0: entity
@ return: u32 (tileType)
thumb_func_start GetTileTypeByEntity
GetTileTypeByEntity: @ 0x080002A0
ldr r3, _0800030C @ =gUnk_0300579C
bx r3
@ call 0x080B1A34
@ r0: s32 (xPos)
@ r1: s32 (yPos)
@ r2: u32 (layer)
@ return: u32 (tileType)
thumb_func_start GetTileTypeByPos
GetTileTypeByPos: @ 0x080002A4
ldr r3, _08000310 @ =gUnk_030057A8
bx r3
@ call 0x080B1A48
@ r0: s32 (xPos)
@ r1: s32 (yPos)
@ r2: u32 (layer)
thumb_func_start sub_080002A8
sub_080002A8: @ 0x080002A8
ldr r3, _08000314 @ =gUnk_030057BC
bx r3
@ call 0x080B1A58
@ r0: s32 (xPos)
@ r1: s32 (yPos)
@ r2: u32 (layer)
thumb_func_start sub_080002AC
sub_080002AC: @ 0x080002AC
ldr r3, _08000318 @ =gUnk_030057CC
bx r3
@ call 0x080B1A60
@ r0: u32 (tileIndex)
@ r1: u32 (layer)
@ return: u32 (tileType)
thumb_func_start GetTileType
GetTileType: @ 0x080002B0
ldr r3, _0800031C @ =gUnk_030057D4
bx r3
@ call 0x080B1A8C
@ r0: Entity*
@ r1: u32
@ r2: u32
thumb_func_start sub_080002B4
sub_080002B4: @ 0x080002B4
ldr r3, _08000320 @ =gUnk_03005800
bx r3
@ call 0x080B1AA8
@ r0:
@ r1:
@ r2:
@ return:
@ ========
@ Called every frame a pot is thrown, every frame the screen is sliding in a transition, and once when entering stairs.
thumb_func_start sub_080002B8
sub_080002B8: @ 0x080002B8
ldr r3, _08000324 @ =gUnk_0300581C
bx r3
@ call 0x080B1AB4
@ r0: s32 (xPos)
@ r1: s32 (yPos)
@ r2: u32 (layer)
thumb_func_start sub_080002BC
sub_080002BC: @ 0x080002BC
ldr r3, _08000328 @ =gUnk_03005828
bx r3
@ call 0x080B1AC8
@ r0: u32
@ r1: u32
@ r2: u32
@ return: ???
thumb_func_start sub_080002C0
sub_080002C0: @ 0x080002C0
ldr r3, _0800032C @ =gUnk_0300583C
bx r3
@ call 0x080B1AD8
@ r0: Entity*
@ r1: s32 (xOffset)
@ r2: s32 (yOffset)
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_080002C4
sub_080002C4: @ 0x080002C4
ldr r3, _08000330 @ =gUnk_0300584C
bx r3
@ call 0x080B1AE0
@ r0: u32 (tileIndex)
@ r1: u32 (layer)
thumb_func_start sub_080002C8
sub_080002C8: @ 0x080002C8
ldr r3, _08000334 @ =gUnk_03005854
bx r3
@ call 0x080B1AF0
@ r0: Entity*
@ r1: ???
@ r2: ???
thumb_func_start sub_080002CC
sub_080002CC: @ 0x080002CC
ldr r3, _08000338 @ =gUnk_03005864
bx r3
@ call 0x080B1B0C
@ r0: Entity*
thumb_func_start sub_080002D0
sub_080002D0: @ 0x080002D0
ldr r3, _0800033C @ =gUnk_03005880
bx r3
@ call 0x080B1B18
@ r0: s32 (xPos)
@ r1: s32 (yPos)
@ r2: u32 (layer)
thumb_func_start sub_080002D4
sub_080002D4: @ 0x080002D4
ldr r3, _08000340 @ =gUnk_0300588C
bx r3
@ call 0x080B1B2C
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_080002D8
sub_080002D8: @ 0x080002D8
ldr r3, _08000344 @ =gUnk_030058A0
bx r3
@ call 0x080B1B3C
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_080002DC
sub_080002DC: @ 0x080002DC
ldr r3, _08000348 @ =gUnk_030058B0
bx r3
@ call 0x080B1B44
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_080002E0
sub_080002E0: @ 0x080002E0
ldr r3, _0800034C @ =gUnk_030058B8
bx r3
@ call 0x080B1B54
@ r0: u32 (tileIndex)
thumb_func_start sub_080002E4
sub_080002E4: @ 0x080002E4
ldr r3, _08000350 @ =gUnk_030058C8
bx r3
@ call 0x080B1B68
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_080002E8
sub_080002E8: @ 0x080002E8
ldr r3, _08000354 @ =gUnk_030058DC
bx r3
@ call 0x080B1B84
@ r0: u32 (tileIndex)
@ r1: u32 (layer)
thumb_func_start sub_080002EC
sub_080002EC: @ 0x080002EC
ldr r3, _08000358 @ =gUnk_030058F8
bx r3
@ call 0x080B1BA4
@ r0: u32 (tileIndex)
@ r1: u32 (layer)
@ r2: ???
thumb_func_start sub_080002F0
sub_080002F0: @ 0x080002F0
ldr r3, _0800035C @ =gUnk_03005918
bx r3
_080002F4: .4byte gUnk_03005740
_080002F8: .4byte gUnk_0300574C
_080002FC: .4byte gUnk_03005760

2
asm/code_08016B30.s
View File

@ -53,7 +53,7 @@ sub_08016B6C: @ 0x08016B6C
ldrb r0, [r5]
cmp r0, #0
bne _08016BA6
bl sub_08016CF4
bl UpdateBackgroundRegisters
ldr r0, _08016BCC @ =gUnk_03000FBC
str r0, [r4]
ldr r0, _08016BD0 @ =gUnk_02022730

4
asm/code_08016DF8.s
View File

@ -391,7 +391,7 @@ _080170E8:
ldrb r0, [r0, #1]
cmp r0, #0
bne _08017112
ldr r0, _08017134 @ =gUnk_030010A0
ldr r0, _08017134 @ =gScreenTransition
ldr r0, [r0]
movs r1, #0x5a
bl __modsi3
@ -414,7 +414,7 @@ _08017124: .4byte gTextBox
_08017128: .4byte gRoomVars
_0801712C: .4byte gUnk_02002A40
_08017130: .4byte gUnk_0200AF00
_08017134: .4byte gUnk_030010A0
_08017134: .4byte gScreenTransition
_08017138: .4byte 0x0000011F
_0801713C:
adds r1, r0, #0

4
asm/code_08018500.s
View File

@ -167,7 +167,7 @@ sub_0801862C: @ 0x0801862C
movs r2, #0
movs r0, #0x16
strb r0, [r1, #0xc]
ldr r5, _08018650 @ =gUnk_030010A0
ldr r5, _08018650 @ =gScreenTransition
adds r0, r5, #0
adds r0, #0x35
strb r2, [r0]
@ -180,7 +180,7 @@ sub_0801862C: @ 0x0801862C
b _0801868C
.align 2, 0
_0801864C: .4byte gLinkState
_08018650: .4byte gUnk_030010A0
_08018650: .4byte gScreenTransition
_08018654: .4byte gUnk_02033AB8
_08018658:
ldrb r0, [r4, #2]

8
asm/code_08019444.s
View File

@ -3451,7 +3451,7 @@ sub_0801AE44: @ 0x0801AE44
_0801AE5A:
bl sub_080809D4
bl sub_080805F8
ldr r0, _0801AEE4 @ =gUnk_030010A0
ldr r0, _0801AEE4 @ =gScreenTransition
adds r0, #0x2d
ldrb r0, [r0]
cmp r0, #0
@ -3513,7 +3513,7 @@ _0801AED0:
b _0801AF10
.align 2, 0
_0801AEE0: .4byte gRoomControls
_0801AEE4: .4byte gUnk_030010A0
_0801AEE4: .4byte gScreenTransition
_0801AEE8: .4byte gArea
_0801AEEC: .4byte 0x0600F000
_0801AEF0: .4byte gUnk_03004030
@ -3567,7 +3567,7 @@ sub_0801AF48: @ 0x0801AF48
ldr r0, _0801AF7C @ =0x00003FFF
cmp r4, r0
bhi _0801AF7A
ldr r0, _0801AF80 @ =gUnk_030010A0
ldr r0, _0801AF80 @ =gScreenTransition
adds r0, #0x30
ldrb r0, [r0]
cmp r0, #0
@ -3589,7 +3589,7 @@ _0801AF7A:
pop {r4, r5, r6, pc}
.align 2, 0
_0801AF7C: .4byte 0x00003FFF
_0801AF80: .4byte gUnk_030010A0
_0801AF80: .4byte gScreenTransition
_0801AF84: .4byte gRoomVars
_0801AF88: .4byte gUnk_0200B240

4
asm/code_0801C85C.s
View File

@ -1039,7 +1039,7 @@ _0801CFFC: .4byte 0x0000FFFF
sub_0801D000: @ 0x0801D000
push {lr}
adds r2, r0, #0
ldr r0, _0801D024 @ =gUnk_030010A0
ldr r0, _0801D024 @ =gScreenTransition
movs r1, #0
cmp r2, #0
beq _0801D00E
@ -1054,7 +1054,7 @@ _0801D00E:
bl sub_0801CFD0
b _0801D03A
.align 2, 0
_0801D024: .4byte gUnk_030010A0
_0801D024: .4byte gScreenTransition
_0801D028:
ldr r3, _0801D03C @ =gUnk_02001A3C
ldrb r1, [r3]

12
asm/code_0801D79C.s
View File

@ -542,12 +542,12 @@ _0801DB90: .4byte 0x0000FFFF
thumb_func_start sub_0801DB94
sub_0801DB94: @ 0x0801DB94
ldr r0, _0801DB9C @ =gUnk_030010A0
ldr r0, _0801DB9C @ =gScreenTransition
ldrh r0, [r0, #0x1e]
lsrs r0, r0, #0xb
bx lr
.align 2, 0
_0801DB9C: .4byte gUnk_030010A0
_0801DB9C: .4byte gScreenTransition
thumb_func_start sub_0801DBA0
sub_0801DBA0: @ 0x0801DBA0
@ -563,7 +563,7 @@ sub_0801DBA0: @ 0x0801DBA0
bl _DmaZero
movs r0, #1
strb r0, [r5]
ldr r2, _0801DBE4 @ =gUnk_030010A0
ldr r2, _0801DBE4 @ =gScreenTransition
ldrh r0, [r2, #0x1c]
lsrs r0, r0, #4
movs r1, #0x7f
@ -585,7 +585,7 @@ sub_0801DBA0: @ 0x0801DBA0
ldr r6, [r4]
b _0801DD3A
.align 2, 0
_0801DBE4: .4byte gUnk_030010A0
_0801DBE4: .4byte gScreenTransition
_0801DBE8: .4byte gUnk_080C9C50
_0801DBEC: .4byte gArea
_0801DBF0:
@ -736,7 +736,7 @@ _0801DCF8:
strb r0, [r5, #2]
adds r5, #3
_0801DD16:
ldr r2, _0801DD54 @ =gUnk_030010A0
ldr r2, _0801DD54 @ =gScreenTransition
ldrh r0, [r6]
ldrh r1, [r2, #0x16]
cmp r0, r1
@ -769,7 +769,7 @@ _0801DD42:
.align 2, 0
_0801DD4C: .4byte gArea
_0801DD50: .4byte gUnk_0811E214
_0801DD54: .4byte gUnk_030010A0
_0801DD54: .4byte gScreenTransition
thumb_func_start sub_0801DD58
sub_0801DD58: @ 0x0801DD58

4
asm/code_08049CD4.s
View File

@ -1567,7 +1567,7 @@ _0804A81C:
ldrb r0, [r5, #9]
cmp r0, #0x37
bne _0804A84A
ldr r0, _0804A85C @ =gUnk_030010A0
ldr r0, _0804A85C @ =gScreenTransition
adds r0, #0x39
ldrb r0, [r0]
cmp r0, #0
@ -1580,7 +1580,7 @@ _0804A84A:
bl DeleteThisEntity
b _0804A982
.align 2, 0
_0804A85C: .4byte gUnk_030010A0
_0804A85C: .4byte gScreenTransition
_0804A860: .4byte 0x80100000
_0804A864:
adds r4, r5, #0

4
asm/code_0804AA84.s
View File

@ -248,7 +248,7 @@ sub_0804AD6C: @ 0x0804AD6C
push {r4, r5, r6, lr}
mov r6, r8
push {r6}
ldr r3, _0804ADD0 @ =gUnk_030010A0
ldr r3, _0804ADD0 @ =gScreenTransition
movs r1, #0
movs r6, #1
strb r6, [r3, #8]
@ -293,6 +293,6 @@ sub_0804AD6C: @ 0x0804AD6C
mov r8, r3
pop {r4, r5, r6, pc}
.align 2, 0
_0804ADD0: .4byte gUnk_030010A0
_0804ADD0: .4byte gScreenTransition
_0804ADD4: .4byte gArea
_0804ADD8: .4byte gUnk_080D4140

24
asm/code_08050038.s
View File

@ -3107,7 +3107,7 @@ _08051984: .4byte 0x000004B4
thumb_func_start sub_08051988
sub_08051988: @ 0x08051988
push {lr}
ldr r1, _080519A4 @ =gUnk_030010A0
ldr r1, _080519A4 @ =gScreenTransition
ldr r0, [r1]
adds r0, #1
str r0, [r1]
@ -3120,7 +3120,7 @@ sub_08051988: @ 0x08051988
bl _call_via_r0
pop {pc}
.align 2, 0
_080519A4: .4byte gUnk_030010A0
_080519A4: .4byte gScreenTransition
_080519A8: .4byte gUnk_080FC9D8
_080519AC: .4byte gUnk_03001000
@ -3137,7 +3137,7 @@ sub_080519B0: @ 0x080519B0
bl sub_0801DA7C
bl sub_080A7124
bl sub_0807059C
ldr r4, _08051A08 @ =gUnk_030010A0
ldr r4, _08051A08 @ =gScreenTransition
adds r0, r4, #0
movs r1, #0xb0
bl _DmaZero
@ -3160,7 +3160,7 @@ _08051A02:
pop {r4, r5, pc}
.align 2, 0
_08051A04: .4byte gUnk_03000FD0
_08051A08: .4byte gUnk_030010A0
_08051A08: .4byte gScreenTransition
_08051A0C: .4byte gUnk_02002AC8
_08051A10: .4byte gUnk_03001000
@ -3188,7 +3188,7 @@ sub_08051A14: @ 0x08051A14
bl sub_0801CFA8
bl sub_0806FD8C
ldr r2, _08051A80 @ =gRoomControls
ldr r1, _08051A84 @ =gUnk_030010A0
ldr r1, _08051A84 @ =gScreenTransition
ldrb r0, [r1, #0xc]
strb r0, [r2, #4]
ldrb r0, [r1, #0xd]
@ -3207,7 +3207,7 @@ _08051A74: .4byte gUnk_03000000
_08051A78: .4byte 0x00000B74
_08051A7C: .4byte gUnk_02032EC0
_08051A80: .4byte gRoomControls
_08051A84: .4byte gUnk_030010A0
_08051A84: .4byte gScreenTransition
_08051A88: .4byte gUnk_02024490
_08051A8C: .4byte gUnk_03001000
@ -3238,7 +3238,7 @@ InitializeNewRoom: @ 0x08051AAC
ldr r1, _08051AE8 @ =gUnk_03001000
movs r0, #1
strb r0, [r1, #4]
ldr r0, _08051AEC @ =gUnk_030010A0
ldr r0, _08051AEC @ =gScreenTransition
strb r2, [r0, #8]
strb r2, [r0, #4]
strb r2, [r0, #5]
@ -3252,7 +3252,7 @@ InitializeNewRoom: @ 0x08051AAC
.align 2, 0
_08051AE4: .4byte gScreen
_08051AE8: .4byte gUnk_03001000
_08051AEC: .4byte gUnk_030010A0
_08051AEC: .4byte gScreenTransition
thumb_func_start sub_08051AF0
sub_08051AF0: @ 0x08051AF0
@ -3470,14 +3470,14 @@ sub_08051CF0: @ 0x08051CF0
bl sub_0801DA90
strb r6, [r5, #3]
strb r4, [r5, #4]
ldr r0, _08051D28 @ =gUnk_030010A0
ldr r0, _08051D28 @ =gScreenTransition
strb r6, [r0, #8]
_08051D1E:
pop {r4, r5, r6, pc}
.align 2, 0
_08051D20: .4byte gUnk_03001000
_08051D24: .4byte gUnk_03000FD0
_08051D28: .4byte gUnk_030010A0
_08051D28: .4byte gScreenTransition
thumb_func_start sub_08051D2C
sub_08051D2C: @ 0x08051D2C
@ -3546,7 +3546,7 @@ _08051DC8: .4byte gRoomVars
sub_08051DCC: @ 0x08051DCC
push {r4, lr}
ldr r1, _08051DFC @ =gRoomControls
ldr r4, _08051E00 @ =gUnk_030010A0
ldr r4, _08051E00 @ =gScreenTransition
ldrb r0, [r4, #0xc]
strb r0, [r1, #4]
ldrb r0, [r4, #0xd]
@ -3563,7 +3563,7 @@ sub_08051DCC: @ 0x08051DCC
pop {r4, pc}
.align 2, 0
_08051DFC: .4byte gRoomControls
_08051E00: .4byte gUnk_030010A0
_08051E00: .4byte gScreenTransition
thumb_func_start sub_08051E04
sub_08051E04: @ 0x08051E04

68
asm/code_080526F8.s
View File

@ -236,14 +236,14 @@ _080528B0: .4byte 0x00000864
thumb_func_start sub_080528B4
sub_080528B4: @ 0x080528B4
push {lr}
ldr r0, _080528C4 @ =gUnk_030010A0
ldr r0, _080528C4 @ =gScreenTransition
ldrb r0, [r0, #5]
cmp r0, #0
bne _080528C8
movs r0, #0
b _080528E6
.align 2, 0
_080528C4: .4byte gUnk_030010A0
_080528C4: .4byte gScreenTransition
_080528C8:
bl sub_0804FFE4
ldr r1, _080528E8 @ =gUnk_03001000
@ -289,7 +289,7 @@ _08052918: .4byte 0x00000888
thumb_func_start sub_0805291C
sub_0805291C: @ 0x0805291C
push {r4, lr}
ldr r4, _08052948 @ =gUnk_030010A0
ldr r4, _08052948 @ =gScreenTransition
ldrb r0, [r4, #8]
cmp r0, #0
beq _080529F4
@ -310,7 +310,7 @@ sub_0805291C: @ 0x0805291C
strb r0, [r4, #8]
b _080529F6
.align 2, 0
_08052948: .4byte gUnk_030010A0
_08052948: .4byte gScreenTransition
_0805294C: .4byte gUnk_02002A40
_08052950: .4byte gLinkState
_08052954:
@ -394,7 +394,7 @@ _080529F6:
thumb_func_start sub_080529F8
sub_080529F8: @ 0x080529F8
push {r4, r5, r6, lr}
ldr r1, _08052A34 @ =gUnk_030010A0
ldr r1, _08052A34 @ =gScreenTransition
ldrh r4, [r1, #0xa]
ldr r2, _08052A38 @ =gUnk_080FCAD6
ldrh r0, [r2]
@ -426,7 +426,7 @@ _08052A30:
movs r0, #1
b _08052A4A
.align 2, 0
_08052A34: .4byte gUnk_030010A0
_08052A34: .4byte gScreenTransition
_08052A38: .4byte gUnk_080FCAD6
_08052A3C: .4byte gLinkState
_08052A40:
@ -442,7 +442,7 @@ _08052A4A:
thumb_func_start sub_08052A4C
sub_08052A4C: @ 0x08052A4C
push {r4, r5, lr}
ldr r2, _08052A88 @ =gUnk_030010A0
ldr r2, _08052A88 @ =gScreenTransition
movs r0, #1
strb r0, [r2, #8]
ldr r5, _08052A8C @ =gLinkEntity
@ -471,14 +471,14 @@ sub_08052A4C: @ 0x08052A4C
strb r0, [r2, #0xd]
pop {r4, r5, pc}
.align 2, 0
_08052A88: .4byte gUnk_030010A0
_08052A88: .4byte gScreenTransition
_08052A8C: .4byte gLinkEntity
_08052A90: .4byte gRoomControls
thumb_func_start sub_08052A94
sub_08052A94: @ 0x08052A94
push {lr}
ldr r0, _08052AAC @ =gUnk_030010A0
ldr r0, _08052AAC @ =gScreenTransition
ldrb r0, [r0, #9]
subs r0, #1
cmp r0, #8
@ -489,7 +489,7 @@ sub_08052A94: @ 0x08052A94
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08052AAC: .4byte gUnk_030010A0
_08052AAC: .4byte gScreenTransition
_08052AB0: .4byte _08052AB4
_08052AB4: @ jump table
.4byte _08052AD8 @ case 0
@ -618,7 +618,7 @@ _08052BB4:
thumb_func_start sub_08052BB8
sub_08052BB8: @ 0x08052BB8
push {lr}
ldr r0, _08052BE0 @ =gUnk_030010A0
ldr r0, _08052BE0 @ =gScreenTransition
adds r2, r0, #0
adds r2, #0x35
ldrb r1, [r2]
@ -638,7 +638,7 @@ sub_08052BB8: @ 0x08052BB8
movs r2, #1
b _08052BEE
.align 2, 0
_08052BE0: .4byte gUnk_030010A0
_08052BE0: .4byte gScreenTransition
_08052BE4: .4byte gLinkEntity
_08052BE8: .4byte gRoomControls
_08052BEC:
@ -652,7 +652,7 @@ _08052BEE:
thumb_func_start sub_08052BF8
sub_08052BF8: @ 0x08052BF8
push {lr}
ldr r2, _08052C34 @ =gUnk_030010A0
ldr r2, _08052C34 @ =gScreenTransition
adds r1, r2, #0
adds r1, #0x31
ldrb r0, [r1]
@ -680,7 +680,7 @@ sub_08052BF8: @ 0x08052BF8
_08052C30:
pop {pc}
.align 2, 0
_08052C34: .4byte gUnk_030010A0
_08052C34: .4byte gScreenTransition
_08052C38: .4byte gArea
thumb_func_start sub_08052C3C
@ -713,7 +713,7 @@ sub_08052C5C: @ 0x08052C5C
bl sub_08052620
cmp r0, #0
beq _08052C84
ldr r2, _08052C7C @ =gUnk_030010A0
ldr r2, _08052C7C @ =gScreenTransition
ldr r1, _08052C80 @ =gLinkEntity
ldrh r0, [r1, #0x2e]
strh r0, [r2, #0x20]
@ -721,13 +721,13 @@ sub_08052C5C: @ 0x08052C5C
strh r0, [r2, #0x22]
b _08052C98
.align 2, 0
_08052C7C: .4byte gUnk_030010A0
_08052C7C: .4byte gScreenTransition
_08052C80: .4byte gLinkEntity
_08052C84:
bl CheckIsDungeon
cmp r0, #0
beq _08052C98
ldr r2, _08052C9C @ =gUnk_030010A0
ldr r2, _08052C9C @ =gScreenTransition
ldr r1, _08052CA0 @ =gLinkEntity
ldrh r0, [r1, #0x2e]
strh r0, [r2, #0x1c]
@ -736,7 +736,7 @@ _08052C84:
_08052C98:
pop {pc}
.align 2, 0
_08052C9C: .4byte gUnk_030010A0
_08052C9C: .4byte gScreenTransition
_08052CA0: .4byte gLinkEntity
thumb_func_start sub_08052CA4
@ -750,7 +750,7 @@ sub_08052CA4: @ 0x08052CA4
lsls r4, r4, #1
ldr r1, [r0]
adds r1, r1, r4
ldr r4, _08052CCC @ =gUnk_030010A0
ldr r4, _08052CCC @ =gScreenTransition
ldrh r0, [r1]
adds r0, r0, r2
strh r0, [r4, #0x20]
@ -760,7 +760,7 @@ sub_08052CA4: @ 0x08052CA4
pop {r4, pc}
.align 2, 0
_08052CC8: .4byte gUnk_0811E214
_08052CCC: .4byte gUnk_030010A0
_08052CCC: .4byte gScreenTransition
thumb_func_start sub_08052CD0
sub_08052CD0: @ 0x08052CD0
@ -773,7 +773,7 @@ sub_08052CD0: @ 0x08052CD0
lsls r4, r4, #1
ldr r1, [r0]
adds r1, r1, r4
ldr r4, _08052CF8 @ =gUnk_030010A0
ldr r4, _08052CF8 @ =gScreenTransition
ldrh r0, [r1]
adds r0, r0, r2
strh r0, [r4, #0x1c]
@ -783,7 +783,7 @@ sub_08052CD0: @ 0x08052CD0
pop {r4, pc}
.align 2, 0
_08052CF4: .4byte gUnk_0811E214
_08052CF8: .4byte gUnk_030010A0
_08052CF8: .4byte gScreenTransition
thumb_func_start sub_08052CFC
sub_08052CFC: @ 0x08052CFC
@ -1343,7 +1343,7 @@ _08053154:
ldrb r2, [r0, #1]
cmp r2, #0
beq _0805316C
ldr r0, _08053174 @ =gUnk_030010A0
ldr r0, _08053174 @ =gScreenTransition
adds r0, #0x2e
ldrb r1, [r0]
eors r1, r2
@ -1356,7 +1356,7 @@ _0805316E:
pop {pc}
.align 2, 0
_08053170: .4byte gArea
_08053174: .4byte gUnk_030010A0
_08053174: .4byte gScreenTransition
thumb_func_start sub_08053178
sub_08053178: @ 0x08053178
@ -1364,7 +1364,7 @@ sub_08053178: @ 0x08053178
bl sub_08053144
cmp r0, #0
beq _080531E6
ldr r0, _080531E8 @ =gUnk_030010A0
ldr r0, _080531E8 @ =gScreenTransition
ldr r5, _080531EC @ =gArea
ldrb r1, [r5, #1]
adds r0, #0x2e
@ -1410,7 +1410,7 @@ _080531DC:
_080531E6:
pop {r4, r5, pc}
.align 2, 0
_080531E8: .4byte gUnk_030010A0
_080531E8: .4byte gScreenTransition
_080531EC: .4byte gArea
_080531F0: .4byte gRoomVars
_080531F4: .4byte gUnk_02002AA0
@ -1458,7 +1458,7 @@ _0805324C: .4byte gRoomControls
thumb_func_start sub_08053250
sub_08053250: @ 0x08053250
push {r4, lr}
ldr r0, _0805328C @ =gUnk_030010A0
ldr r0, _0805328C @ =gScreenTransition
movs r1, #0
strb r1, [r0, #0xf]
ldr r3, _08053290 @ =gLinkEntity
@ -1486,7 +1486,7 @@ sub_08053250: @ 0x08053250
bl sub_0801D66C
pop {r4, pc}
.align 2, 0
_0805328C: .4byte gUnk_030010A0
_0805328C: .4byte gScreenTransition
_08053290: .4byte gLinkEntity
_08053294: .4byte gRoomControls
_08053298: .4byte gUnk_02002AC8
@ -1541,7 +1541,7 @@ sub_080532E4: @ 0x080532E4
movs r3, #0xa5
lsls r3, r3, #1
adds r2, r0, r3
ldr r1, _0805331C @ =gUnk_030010A0
ldr r1, _0805331C @ =gScreenTransition
movs r0, #0x58
strb r0, [r1, #0x16]
movs r0, #0x21
@ -1561,7 +1561,7 @@ sub_080532E4: @ 0x080532E4
bx lr
.align 2, 0
_08053318: .4byte gUnk_0811E214
_0805331C: .4byte gUnk_030010A0
_0805331C: .4byte gScreenTransition
thumb_func_start sub_08053320
sub_08053320: @ 0x08053320
@ -2277,7 +2277,7 @@ sub_08053894: @ 0x08053894
_080538B4: .4byte gUnk_03000FD0
_080538B8: .4byte gMenu
_080538BC:
ldr r0, _080538FC @ =gUnk_030010A0
ldr r0, _080538FC @ =gScreenTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@ -2310,7 +2310,7 @@ _080538E4:
_080538F8:
pop {r4, pc}
.align 2, 0
_080538FC: .4byte gUnk_030010A0
_080538FC: .4byte gScreenTransition
_08053900: .4byte gScreen
thumb_func_start sub_08053904
@ -2335,7 +2335,7 @@ sub_08053904: @ 0x08053904
_08053924: .4byte gUnk_03000FD0
_08053928: .4byte gMenu
_0805392C:
ldr r0, _0805396C @ =gUnk_030010A0
ldr r0, _0805396C @ =gScreenTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@ -2368,7 +2368,7 @@ _08053954:
_08053968:
pop {r4, pc}
.align 2, 0
_0805396C: .4byte gUnk_030010A0
_0805396C: .4byte gScreenTransition
_08053970: .4byte gScreen
thumb_func_start sub_08053974

4
asm/code_0805436C.s
View File

@ -1269,7 +1269,7 @@ sub_0805524C: @ 0x0805524C
.align 2, 0
_08055270: .4byte gMenu
_08055274:
ldr r0, _080552A4 @ =gUnk_030010A0
ldr r0, _080552A4 @ =gScreenTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@ -1293,7 +1293,7 @@ _08055274:
strh r0, [r1]
b _080552D6
.align 2, 0
_080552A4: .4byte gUnk_030010A0
_080552A4: .4byte gScreenTransition
_080552A8: .4byte gUnk_080FF204
_080552AC: .4byte 0x0000FFFF
_080552B0: .4byte gScreen

4
asm/code_0805E744.s
View File

@ -891,7 +891,7 @@ _0805EE82:
thumb_func_start sub_0805EE88
sub_0805EE88: @ 0x0805EE88
push {lr}
ldr r1, _0805EEB0 @ =gUnk_030010A0
ldr r1, _0805EEB0 @ =gScreenTransition
adds r0, r1, #0
adds r0, #0x2f
ldrb r0, [r0]
@ -910,7 +910,7 @@ sub_0805EE88: @ 0x0805EE88
_0805EEAC:
pop {pc}
.align 2, 0
_0805EEB0: .4byte gUnk_030010A0
_0805EEB0: .4byte gScreenTransition
thumb_func_start sub_0805EEB4
sub_0805EEB4: @ 0x0805EEB4

4
asm/code_0806FA6C.s
View File

@ -106,7 +106,7 @@ _0806FBB2:
sub_0806FBB4: @ 0x0806FBB4
push {lr}
adds r1, r0, #0
ldr r0, _0806FBD0 @ =gUnk_030010A0
ldr r0, _0806FBD0 @ =gScreenTransition
ldrb r0, [r0, #5]
cmp r0, #0
bne _0806FBC8
@ -120,7 +120,7 @@ _0806FBC8:
_0806FBCC:
pop {pc}
.align 2, 0
_0806FBD0: .4byte gUnk_030010A0
_0806FBD0: .4byte gScreenTransition
_0806FBD4: .4byte gLinkState
thumb_func_start sub_0806FBD8

8
asm/code_08070698.s
View File

@ -650,7 +650,7 @@ _08070BC8:
ldrb r0, [r0]
cmp r0, #0
beq _08070BE4
ldr r0, _08070BE8 @ =gUnk_030010A0
ldr r0, _08070BE8 @ =gScreenTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@ -661,7 +661,7 @@ _08070BC8:
_08070BE4:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08070BE8: .4byte gUnk_030010A0
_08070BE8: .4byte gScreenTransition
thumb_func_start sub_08070BEC
sub_08070BEC: @ 0x08070BEC
@ -2955,13 +2955,13 @@ _08071D3A:
_08071D6C: .4byte gUnk_02002A40
_08071D70: .4byte gLinkState
_08071D74:
ldr r1, _08071D7C @ =gUnk_030010A0
ldr r1, _08071D7C @ =gScreenTransition
movs r0, #1
strb r0, [r1, #5]
_08071D7A:
pop {r4, r5, pc}
.align 2, 0
_08071D7C: .4byte gUnk_030010A0
_08071D7C: .4byte gScreenTransition
thumb_func_start sub_08071D80
sub_08071D80: @ 0x08071D80

24
asm/code_080732D0.s
View File

@ -706,7 +706,7 @@ _08073808: .4byte gLinkState
sub_0807380C: @ 0x0807380C
push {r4, lr}
adds r4, r0, #0
ldr r0, _08073854 @ =gUnk_030010A0
ldr r0, _08073854 @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@ -740,7 +740,7 @@ _0807382A:
bl sub_08003FC4
b _0807387A
.align 2, 0
_08073854: .4byte gUnk_030010A0
_08073854: .4byte gScreenTransition
_08073858: .4byte gLinkState
_0807385C: .4byte gUnk_0811BC38
_08073860:
@ -767,7 +767,7 @@ _0807387A:
sub_08073884: @ 0x08073884
push {r4, lr}
adds r4, r0, #0
ldr r0, _080738DC @ =gUnk_030010A0
ldr r0, _080738DC @ =gScreenTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@ -809,7 +809,7 @@ _080738A2:
bl DoExitTransition
b _080738F0
.align 2, 0
_080738DC: .4byte gUnk_030010A0
_080738DC: .4byte gScreenTransition
_080738E0: .4byte gLinkState
_080738E4: .4byte gUnk_0811BC40
_080738E8: .4byte gUnk_0813AD88
@ -1346,7 +1346,7 @@ sub_08073C80: @ 0x08073C80
ldr r0, _08073D0C @ =gRoomControls
str r4, [r0, #0x30]
bl sub_080809D4
ldr r1, _08073D10 @ =gUnk_030010A0
ldr r1, _08073D10 @ =gScreenTransition
ldrb r0, [r1, #0xf]
cmp r0, #9
bne _08073D14
@ -1362,7 +1362,7 @@ _08073D00: .4byte gLinkState
_08073D04: .4byte 0x00000C18
_08073D08: .4byte gUnk_0811BC80
_08073D0C: .4byte gRoomControls
_08073D10: .4byte gUnk_030010A0
_08073D10: .4byte gScreenTransition
_08073D14:
movs r0, #4
movs r1, #0
@ -2708,7 +2708,7 @@ _08074714:
.align 2, 0
_0807471C: .4byte 0x00000161
_08074720:
ldr r0, _08074760 @ =gUnk_030010A0
ldr r0, _08074760 @ =gScreenTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@ -2741,7 +2741,7 @@ _08074732:
strb r0, [r1]
b _08074792
.align 2, 0
_08074760: .4byte gUnk_030010A0
_08074760: .4byte gScreenTransition
_08074764: .4byte 0x00000161
_08074768: .4byte gLinkState
_0807476C:
@ -5168,7 +5168,7 @@ _08075962:
lsls r0, r0, #2
strh r0, [r4, #0x24]
bl sub_08079E08
ldr r0, _08075994 @ =gUnk_030010A0
ldr r0, _08075994 @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@ -5181,7 +5181,7 @@ _08075962:
b _080759B2
.align 2, 0
_08075990: .4byte gLinkEntity
_08075994: .4byte gUnk_030010A0
_08075994: .4byte gScreenTransition
_08075998:
ldrb r1, [r4, #0xe]
adds r0, r2, #0
@ -6613,7 +6613,7 @@ sub_08076488: @ 0x08076488
ands r0, r1
cmp r0, #0x10
bne _080764B8
ldr r0, _080764F8 @ =gUnk_030010A0
ldr r0, _080764F8 @ =gScreenTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@ -6651,7 +6651,7 @@ _080764B8:
strb r6, [r4, #0xf]
b _08076508
.align 2, 0
_080764F8: .4byte gUnk_030010A0
_080764F8: .4byte gScreenTransition
_080764FC: .4byte gLinkEntity
_08076500: .4byte gLinkState
_08076504:

20
asm/code_08078778.s
View File

@ -310,14 +310,14 @@ sub_08078AA8: @ 0x08078AA8
ldr r3, _08078AB8 @ =gLinkState
movs r2, #0x16
strb r2, [r3, #0xc]
ldr r2, _08078ABC @ =gUnk_030010A0
ldr r2, _08078ABC @ =gScreenTransition
strh r0, [r2, #0x36]
adds r2, #0x35
strb r1, [r2]
bx lr
.align 2, 0
_08078AB8: .4byte gLinkState
_08078ABC: .4byte gUnk_030010A0
_08078ABC: .4byte gScreenTransition
thumb_func_start sub_08078AC0
sub_08078AC0: @ 0x08078AC0
@ -736,7 +736,7 @@ _08078DE0:
ands r0, r1
cmp r0, #2
bne _08078E82
ldr r0, _08078E38 @ =gUnk_030010A0
ldr r0, _08078E38 @ =gScreenTransition
ldr r1, [r0]
movs r0, #3
ands r1, r0
@ -747,7 +747,7 @@ _08078DE0:
b _08078E82
.align 2, 0
_08078E34: .4byte gLinkState
_08078E38: .4byte gUnk_030010A0
_08078E38: .4byte gScreenTransition
_08078E3C:
ldrh r0, [r4, #0x2e]
adds r0, #1
@ -5097,7 +5097,7 @@ _0807AEA8:
ands r0, r1
cmp r0, #0
beq _0807AECC
ldr r0, _0807AEC8 @ =gUnk_030010A0
ldr r0, _0807AEC8 @ =gScreenTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@ -5108,9 +5108,9 @@ _0807AEA8:
bl sub_080A2A84
b _0807AEDE
.align 2, 0
_0807AEC8: .4byte gUnk_030010A0
_0807AEC8: .4byte gScreenTransition
_0807AECC:
ldr r0, _0807AEE0 @ =gUnk_030010A0
ldr r0, _0807AEE0 @ =gScreenTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@ -5121,7 +5121,7 @@ _0807AECC:
_0807AEDE:
pop {r4, pc}
.align 2, 0
_0807AEE0: .4byte gUnk_030010A0
_0807AEE0: .4byte gScreenTransition
thumb_func_start sub_0807AEE4
sub_0807AEE4: @ 0x0807AEE4
@ -5510,7 +5510,7 @@ sub_0807B1A8: @ 0x0807B1A8
ldr r1, [r0]
adds r0, r4, #0
bl _call_via_r1
ldr r0, _0807B1D8 @ =gUnk_030010A0
ldr r0, _0807B1D8 @ =gScreenTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@ -5522,7 +5522,7 @@ _0807B1D0:
pop {r4, pc}
.align 2, 0
_0807B1D4: .4byte gUnk_0811C298
_0807B1D8: .4byte gUnk_030010A0
_0807B1D8: .4byte gScreenTransition
thumb_func_start sub_0807B1DC
sub_0807B1DC: @ 0x0807B1DC

12
asm/code_0807B9B8.s
View File

@ -1003,7 +1003,7 @@ _0807C178:
movs r3, #1
mov sb, r3
_0807C184:
ldr r0, _0807C1B0 @ =gUnk_030010A0
ldr r0, _0807C1B0 @ =gScreenTransition
adds r0, #0x2d
ldrb r0, [r0]
cmp r0, #0
@ -1024,7 +1024,7 @@ _0807C184:
bl sub_0801D66C
b _0807C26C
.align 2, 0
_0807C1B0: .4byte gUnk_030010A0
_0807C1B0: .4byte gScreenTransition
_0807C1B4: .4byte gUnk_02025EB4
_0807C1B8: .4byte gUnk_0200B654
_0807C1BC:
@ -1859,7 +1859,7 @@ _0807C85C: .4byte gUnk_02000070
thumb_func_start sub_0807C860
sub_0807C860: @ 0x0807C860
push {r4, lr}
ldr r0, _0807C88C @ =gUnk_030010A0
ldr r0, _0807C88C @ =gScreenTransition
adds r0, #0x2d
movs r1, #1
strb r1, [r0]
@ -1879,14 +1879,14 @@ sub_0807C860: @ 0x0807C860
bl sub_0801D66C
pop {r4, pc}
.align 2, 0
_0807C88C: .4byte gUnk_030010A0
_0807C88C: .4byte gScreenTransition
_0807C890: .4byte gUnk_02025EB4
_0807C894: .4byte gUnk_0200B654
thumb_func_start sub_0807C898
sub_0807C898: @ 0x0807C898
push {r4, r5, lr}
ldr r4, _0807C8AC @ =gUnk_030010A0
ldr r4, _0807C8AC @ =gScreenTransition
adds r4, #0x2d
movs r5, #0
movs r0, #2
@ -1895,7 +1895,7 @@ sub_0807C898: @ 0x0807C898
strb r5, [r4]
pop {r4, r5, pc}
.align 2, 0
_0807C8AC: .4byte gUnk_030010A0
_0807C8AC: .4byte gScreenTransition
thumb_func_start sub_0807C8B0
sub_0807C8B0: @ 0x0807C8B0

296
asm/code_0807CC3C.s
View File

@ -5,237 +5,6 @@
.text
thumb_func_start sub_0807CD9C
sub_0807CD9C: @ 0x0807CD9C
push {lr}
bl sub_080530C8
pop {pc}
thumb_func_start sub_0807CDA4
sub_0807CDA4: @ 0x0807CDA4
push {lr}
ldr r2, _0807CDB8 @ =gUnk_0811E478
ldr r1, _0807CDBC @ =gMenu
ldrb r1, [r1, #7]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0807CDB8: .4byte gUnk_0811E478
_0807CDBC: .4byte gMenu
thumb_func_start sub_0807CDC0
sub_0807CDC0: @ 0x0807CDC0
push {lr}
ldr r0, _0807CDE0 @ =gUnk_02021EE0
ldrh r1, [r0, #0xa]
subs r1, #8
strh r1, [r0, #0xa]
movs r1, #8
ldrsh r0, [r0, r1]
cmp r0, #0
bgt _0807CDDC
ldr r0, _0807CDE4 @ =gMenu
movs r1, #8
strh r1, [r0, #0xa]
movs r1, #1
strb r1, [r0, #7]
_0807CDDC:
movs r0, #0
pop {pc}
.align 2, 0
_0807CDE0: .4byte gUnk_02021EE0
_0807CDE4: .4byte gMenu
thumb_func_start sub_0807CDE8
sub_0807CDE8: @ 0x0807CDE8
push {r4, r5, lr}
adds r4, r0, #0
ldr r1, _0807CE08 @ =gMenu
ldrh r0, [r1, #0xa]
cmp r0, #0
bne _0807CE4C
bl sub_0805616C
cmp r4, #1
beq _0807CE20
cmp r4, #1
blo _0807CE0C
cmp r4, #2
beq _0807CE2E
b _0807CE38
.align 2, 0
_0807CE08: .4byte gMenu
_0807CE0C:
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #4]
ldr r1, _0807CE1C @ =gUnk_02002A40
bl sub_0807CF08
b _0807CE36
.align 2, 0
_0807CE1C: .4byte gUnk_02002A40
_0807CE20:
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #4]
bl sub_0807CF48
movs r5, #1
b _0807CE38
_0807CE2E:
movs r0, #0x80
lsls r0, r0, #0x12
bl sub_0807CF10
_0807CE36:
adds r5, r0, #0
_0807CE38:
ldr r1, _0807CE48 @ =gMenu
strh r5, [r1, #0xa]
movs r0, #2
strb r0, [r1, #7]
bl sub_08056208
b _0807CE50
.align 2, 0
_0807CE48: .4byte gMenu
_0807CE4C:
subs r0, #1
strh r0, [r1, #0xa]
_0807CE50:
movs r0, #0
pop {r4, r5, pc}
thumb_func_start sub_0807CE54
sub_0807CE54: @ 0x0807CE54
push {r4, r5, lr}
movs r4, #0
ldr r2, _0807CE88 @ =gUnk_02021EE0
ldrh r0, [r2, #0xa]
adds r0, #8
strh r0, [r2, #0xa]
ldrh r3, [r2, #6]
movs r5, #6
ldrsh r1, [r2, r5]
lsls r0, r0, #0x10
asrs r0, r0, #0x10
cmp r1, r0
bgt _0807CE84
strh r3, [r2, #0xa]
bl sub_08050384
ldr r0, _0807CE8C @ =gMenu
movs r1, #0
strb r1, [r0, #7]
ldrh r0, [r0, #0xa]
subs r4, #1
cmp r0, #1
bne _0807CE84
movs r4, #1
_0807CE84:
adds r0, r4, #0
pop {r4, r5, pc}
.align 2, 0
_0807CE88: .4byte gUnk_02021EE0
_0807CE8C: .4byte gMenu
thumb_func_start sub_0807CE90
sub_0807CE90: @ 0x0807CE90
push {r4, r5, r6, lr}
movs r0, #0x40
bl sub_080B1520
movs r0, #4
bl sub_0807D1C4
adds r4, r0, #0
movs r5, #0
ldrh r0, [r4, #6]
ldr r6, _0807CF04 @ =gUnk_0811E484
ldrh r2, [r4]
adds r1, r6, #0
bl sub_0807D24C
cmp r0, #0
bne _0807CEB4
movs r5, #1
_0807CEB4:
ldrh r0, [r4, #8]
ldrh r2, [r4]
adds r1, r6, #0
bl sub_0807D24C
cmp r0, #0
bne _0807CEC4
adds r5, #2
_0807CEC4:
cmp r5, #0
beq _0807CEFE
cmp r5, #3
bne _0807CEEA
movs r0, #5
bl sub_0807CF68
movs r0, #3
bl sub_0807CF68
movs r0, #2
bl sub_0807CF68
movs r0, #1
bl sub_0807CF68
movs r0, #0
bl sub_0807CF68
_0807CEEA:
ldrh r0, [r4, #8]
ldrh r2, [r4]
adds r1, r6, #0
bl sub_0807D20C
ldrh r0, [r4, #6]
ldrh r2, [r4]
adds r1, r6, #0
bl sub_0807D20C
_0807CEFE:
movs r0, #1
pop {r4, r5, r6, pc}
.align 2, 0
_0807CF04: .4byte gUnk_0811E484
thumb_func_start sub_0807CF08
sub_0807CF08: @ 0x0807CF08
push {lr}
bl sub_0807CF88
pop {pc}
thumb_func_start sub_0807CF10
sub_0807CF10: @ 0x0807CF10
push {lr}
adds r1, r0, #0
movs r0, #3
bl sub_0807CF88
pop {pc}
thumb_func_start sub_0807CF1C
sub_0807CF1C: @ 0x0807CF1C
push {lr}
adds r1, r0, #0
movs r0, #5
bl sub_0807CF88
pop {pc}
thumb_func_start sub_0807CF28
sub_0807CF28: @ 0x0807CF28
push {lr}
bl sub_0807D008
pop {pc}
thumb_func_start sub_0807CF30
sub_0807CF30: @ 0x0807CF30
push {lr}
adds r1, r0, #0
movs r0, #3
bl sub_0807D008
pop {pc}
thumb_func_start sub_0807CF3C
sub_0807CF3C: @ 0x0807CF3C
push {lr}
adds r1, r0, #0
movs r0, #5
bl sub_0807D008
pop {pc}
thumb_func_start sub_0807CF48
sub_0807CF48: @ 0x0807CF48
push {r4, r5, lr}
@ -2303,7 +2072,7 @@ _0807DE1E:
bl sub_0800445C
b _0807DDEC
_0807DE26:
ldr r0, _0807DE40 @ =gUnk_030010A0
ldr r0, _0807DE40 @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@ -2317,9 +2086,9 @@ _0807DE26:
strb r0, [r4, #0xf]
b _0807DDEC
.align 2, 0
_0807DE40: .4byte gUnk_030010A0
_0807DE40: .4byte gScreenTransition
_0807DE44:
ldr r0, _0807DE68 @ =gUnk_030010A0
ldr r0, _0807DE68 @ =gScreenTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@ -2336,7 +2105,7 @@ _0807DE44:
strb r0, [r1]
b _0807DDEC
.align 2, 0
_0807DE68: .4byte gUnk_030010A0
_0807DE68: .4byte gScreenTransition
_0807DE6C: .4byte gUnk_0811E510
_0807DE70:
adds r0, r4, #0
@ -6989,7 +6758,7 @@ _0807FF18: .4byte gUnk_02000070
sub_0807FF1C: @ 0x0807FF1C
push {lr}
adds r2, r0, #0
ldr r0, _0807FF4C @ =gUnk_030010A0
ldr r0, _0807FF4C @ =gScreenTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@ -7011,7 +6780,7 @@ sub_0807FF1C: @ 0x0807FF1C
_0807FF48:
pop {pc}
.align 2, 0
_0807FF4C: .4byte gUnk_030010A0
_0807FF4C: .4byte gScreenTransition
_0807FF50: .4byte gUnk_02000070
thumb_func_start sub_0807FF54
@ -8165,7 +7934,7 @@ _0808083E:
DoExitTransition: @ 0x08080840
push {r4, lr}
adds r4, r0, #0
ldr r0, _0808085C @ =gUnk_030010A0
ldr r0, _0808085C @ =gScreenTransition
movs r1, #1
strb r1, [r0, #8]
adds r2, r0, #0
@ -8177,7 +7946,7 @@ DoExitTransition: @ 0x08080840
strh r1, [r2, #4]
b _08080872
.align 2, 0
_0808085C: .4byte gUnk_030010A0
_0808085C: .4byte gScreenTransition
_08080860: .4byte 0x000003FF
_08080864:
ldr r0, _08080880 @ =gRoomControls
@ -8233,51 +8002,4 @@ _080808B8:
.align 2, 0
_080808CC: .4byte gRoomControls
_080808D0: .4byte 0xFFFF8000
_080808D4: .4byte gUnk_0811E7C4
thumb_func_start sub_080808D8
sub_080808D8: @ 0x080808D8
ldr r1, _080808E0 @ =gUnk_030010A0
movs r0, #0
strb r0, [r1, #9]
bx lr
.align 2, 0
_080808E0: .4byte gUnk_030010A0
thumb_func_start sub_080808E4
sub_080808E4: @ 0x080808E4
push {r4, lr}
ldr r4, _080808F8 @ =gUnk_030010A0
ldrb r0, [r4, #0xc]
bl sub_08052638
cmp r0, #0
beq _080808FC
movs r0, #0
b _080808FE
.align 2, 0
_080808F8: .4byte gUnk_030010A0
_080808FC:
movs r0, #5
_080808FE:
strb r0, [r4, #9]
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08080904
sub_08080904: @ 0x08080904
ldr r1, _0808090C @ =gUnk_030010A0
movs r0, #1
strb r0, [r1, #9]
bx lr
.align 2, 0
_0808090C: .4byte gUnk_030010A0
thumb_func_start sub_08080910
sub_08080910: @ 0x08080910
ldr r1, _08080918 @ =gUnk_030010A0
movs r0, #1
strb r0, [r1, #9]
bx lr
.align 2, 0
_08080918: .4byte gUnk_030010A0
_080808D4: .4byte gUnk_0811E7C4

12
asm/code_080A3480.s
View File

@ -204,7 +204,7 @@ _080A35DC: .4byte gUnk_02021EE0
thumb_func_start sub_080A35E0
sub_080A35E0: @ 0x080A35E0
push {lr}
ldr r1, _080A35FC @ =gUnk_030010A0
ldr r1, _080A35FC @ =gScreenTransition
ldr r0, [r1]
adds r0, #1
str r0, [r1]
@ -217,7 +217,7 @@ sub_080A35E0: @ 0x080A35E0
bl _call_via_r0
pop {pc}
.align 2, 0
_080A35FC: .4byte gUnk_030010A0
_080A35FC: .4byte gScreenTransition
_080A3600: .4byte gUnk_08127D00
_080A3604: .4byte gUnk_03001000
@ -437,7 +437,7 @@ _080A37C4:
ldrb r0, [r0]
cmp r0, #0
bne _080A385E
ldr r0, _080A37FC @ =gUnk_030010A0
ldr r0, _080A37FC @ =gScreenTransition
ldr r0, [r0]
ands r0, r1
cmp r0, #0
@ -461,7 +461,7 @@ _080A37C4:
b _080A383C
.align 2, 0
_080A37F8: .4byte gUnk_03000FD0
_080A37FC: .4byte gUnk_030010A0
_080A37FC: .4byte gScreenTransition
_080A3800: .4byte gScreen
_080A3804:
ldrh r0, [r4, #8]
@ -472,7 +472,7 @@ _080A3804:
bne _080A385E
b _080A383C
_080A3812:
ldr r0, _080A3844 @ =gUnk_030010A0
ldr r0, _080A3844 @ =gScreenTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@ -499,7 +499,7 @@ _080A383C:
strb r0, [r4, #6]
b _080A385E
.align 2, 0
_080A3844: .4byte gUnk_030010A0
_080A3844: .4byte gScreenTransition
_080A3848: .4byte gScreen
_080A384C:
ldr r1, _080A3860 @ =gUnk_03000FD0

4
asm/code_080A3BD0.s
View File

@ -2418,7 +2418,7 @@ _080A4F38:
adds r1, #1
cmp r1, #0xd
ble _080A4F38
ldr r1, _080A4F94 @ =gUnk_030010A0
ldr r1, _080A4F94 @ =gScreenTransition
ldrh r0, [r1, #0x20]
ldrh r1, [r1, #0x22]
bl sub_080A6A80
@ -2452,7 +2452,7 @@ _080A4F66:
pop {r4, pc}
.align 2, 0
_080A4F90: .4byte gUnk_02034492
_080A4F94: .4byte gUnk_030010A0
_080A4F94: .4byte gScreenTransition
_080A4F98: .4byte gUnk_02034490
_080A4F9C: .4byte gUnk_08128A38

40
asm/code_080A5574.s
View File

@ -1818,7 +1818,7 @@ _080A6392:
ands r0, r1
cmp r0, #0
bne _080A63EA
ldr r4, _080A6428 @ =gUnk_030010A0
ldr r4, _080A6428 @ =gScreenTransition
ldrh r1, [r4, #0x20]
lsls r0, r1, #2
adds r0, r0, r1
@ -1874,7 +1874,7 @@ _080A63EA:
.align 2, 0
_080A6420: .4byte gMenu
_080A6424: .4byte gUnk_03001010
_080A6428: .4byte gUnk_030010A0
_080A6428: .4byte gScreenTransition
_080A642C: .4byte gLinkState
_080A6430: .4byte 0x000001FB
_080A6434: .4byte gUnk_08128DE8
@ -2468,7 +2468,7 @@ sub_080A68D4: @ 0x080A68D4
beq _080A68E6
movs r4, #0x65
_080A68E6:
ldr r1, _080A6910 @ =gUnk_030010A0
ldr r1, _080A6910 @ =gScreenTransition
ldrh r0, [r1, #0x20]
ldrh r1, [r1, #0x22]
ldr r2, _080A6914 @ =0x000001FB
@ -2486,7 +2486,7 @@ _080A68E6:
b _080A693A
.align 2, 0
_080A690C: .4byte gLinkState
_080A6910: .4byte gUnk_030010A0
_080A6910: .4byte gScreenTransition
_080A6914: .4byte 0x000001FB
_080A6918: .4byte gUnk_02002A40
_080A691C: .4byte gUnk_08128F58
@ -2800,7 +2800,7 @@ sub_080A6B04: @ 0x080A6B04
beq _080A6B84
movs r2, #0x65
_080A6B84:
ldr r1, _080A6C10 @ =gUnk_030010A0
ldr r1, _080A6C10 @ =gScreenTransition
ldrh r0, [r1, #0x20]
ldrh r1, [r1, #0x22]
ldr r4, _080A6C14 @ =0x000001FB
@ -2859,7 +2859,7 @@ _080A6C00: .4byte 0x0000475F
_080A6C04: .4byte 0x00005001
_080A6C08: .4byte gUnk_02001A40
_080A6C0C: .4byte gLinkState
_080A6C10: .4byte gUnk_030010A0
_080A6C10: .4byte gScreenTransition
_080A6C14: .4byte 0x000001FB
_080A6C18: .4byte gUnk_08128E94
@ -3718,7 +3718,7 @@ sub_080A7250: @ 0x080A7250
bl sub_0805E958
adds r1, r4, #0
subs r1, #0x54
ldr r0, _080A7314 @ =gUnk_030010A0
ldr r0, _080A7314 @ =gScreenTransition
adds r0, #0x2f
ldrb r0, [r0]
strb r0, [r1, #0xd]
@ -3751,7 +3751,7 @@ _080A7304: .4byte gUnk_02001A00
_080A7308: .4byte gRoomControls
_080A730C: .4byte gUnk_03000420
_080A7310: .4byte gUnk_02033280
_080A7314: .4byte gUnk_030010A0
_080A7314: .4byte gScreenTransition
_080A7318: .4byte gLinkState
_080A731C: .4byte gUnk_02017654
_080A7320: .4byte gUnk_02025EB0
@ -3793,7 +3793,7 @@ sub_080A7328: @ 0x080A7328
ldr r1, _080A73A0 @ =gUnk_02032EC0
movs r0, #2
strb r0, [r1]
ldr r0, _080A73A4 @ =gUnk_030010A0
ldr r0, _080A73A4 @ =gScreenTransition
adds r0, #0x30
strb r2, [r0]
_080A7384:
@ -3806,7 +3806,7 @@ _080A7394: .4byte gUnk_03000420
_080A7398: .4byte gUnk_02033280
_080A739C: .4byte gUnk_02024490
_080A73A0: .4byte gUnk_02032EC0
_080A73A4: .4byte gUnk_030010A0
_080A73A4: .4byte gScreenTransition
thumb_func_start sub_080A73A8
sub_080A73A8: @ 0x080A73A8
@ -3917,14 +3917,14 @@ _080A74AE:
movs r2, #0
movs r0, #4
strb r0, [r1]
ldr r0, _080A74C4 @ =gUnk_030010A0
ldr r0, _080A74C4 @ =gScreenTransition
adds r0, #0x30
strb r2, [r0]
_080A74BC:
pop {r4, r5, pc}
.align 2, 0
_080A74C0: .4byte gUnk_02032EC0
_080A74C4: .4byte gUnk_030010A0
_080A74C4: .4byte gScreenTransition
thumb_func_start sub_080A74C8
sub_080A74C8: @ 0x080A74C8
@ -4450,7 +4450,7 @@ sub_080A78B8: @ 0x080A78B8
ldrb r0, [r6, #0x1e]
subs r0, #0x6a
strb r0, [r4, #0x1e]
ldr r0, _080A78EC @ =gUnk_030010A0
ldr r0, _080A78EC @ =gScreenTransition
ldr r0, [r0]
movs r1, #4
ands r0, r1
@ -4462,7 +4462,7 @@ sub_080A78B8: @ 0x080A78B8
b _080A78F2
.align 2, 0
_080A78E8: .4byte gLinkState
_080A78EC: .4byte gUnk_030010A0
_080A78EC: .4byte gScreenTransition
_080A78F0:
ldrb r1, [r4, #0x1e]
_080A78F2:
@ -7418,7 +7418,7 @@ _080A8E8E:
adds r2, r0, #0
ldr r0, _080A8EC4 @ =0x000001FF
ands r2, r0
ldr r0, _080A8EC8 @ =gUnk_030010A0
ldr r0, _080A8EC8 @ =gScreenTransition
ldr r0, [r0]
ands r0, r6
cmp r0, #0
@ -7428,7 +7428,7 @@ _080A8E8E:
.align 2, 0
_080A8EC0: .4byte gLinkEntity
_080A8EC4: .4byte 0x000001FF
_080A8EC8: .4byte gUnk_030010A0
_080A8EC8: .4byte gScreenTransition
_080A8ECC:
subs r4, r4, r2
_080A8ECE:
@ -12353,7 +12353,7 @@ sub_080AB318: @ 0x080AB318
adds r1, r0, #0
ldr r0, _080AB3E4 @ =0x000001FF
ands r1, r0
ldr r0, _080AB3E8 @ =gUnk_030010A0
ldr r0, _080AB3E8 @ =gScreenTransition
ldr r0, [r0]
mov r2, r8
ands r0, r2
@ -12371,7 +12371,7 @@ _080AB3D8: .4byte 0xFFFF0000
_080AB3DC: .4byte gRoomControls
_080AB3E0: .4byte 0x000001B5
_080AB3E4: .4byte 0x000001FF
_080AB3E8: .4byte gUnk_030010A0
_080AB3E8: .4byte gScreenTransition
_080AB3EC:
subs r4, r4, r1
cmp r4, #0x1f
@ -15673,7 +15673,7 @@ sub_080ACC78: @ 0x080ACC78
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
ldrb r2, [r4, #0xa]
ldr r0, _080ACD20 @ =gUnk_030010A0
ldr r0, _080ACD20 @ =gScreenTransition
ldr r0, [r0]
adds r0, r2, r0
movs r1, #1
@ -15756,7 +15756,7 @@ _080ACD08:
movs r0, #2
b _080ACD32
.align 2, 0
_080ACD20: .4byte gUnk_030010A0
_080ACD20: .4byte gScreenTransition
_080ACD24: .4byte gUnk_0812AAAC
_080ACD28:
ldr r0, _080ACD74 @ =gUnk_0812AABC

4
asm/code_080AD90C.s
View File

@ -95,7 +95,7 @@ _080AD9AC: .4byte 0x00000427
sub_080AD9B0: @ 0x080AD9B0
push {lr}
ldr r2, _080AD9F4 @ =gUnk_03000000
ldr r0, _080AD9F8 @ =gUnk_030010A0
ldr r0, _080AD9F8 @ =gScreenTransition
adds r0, #0x2f
ldrb r0, [r0]
movs r1, #0
@ -129,7 +129,7 @@ _080AD9C2:
pop {pc}
.align 2, 0
_080AD9F4: .4byte gUnk_03000000
_080AD9F8: .4byte gUnk_030010A0
_080AD9F8: .4byte gScreenTransition
_080AD9FC: .4byte gRoomControls
_080ADA00: .4byte gUnk_03006164

8
asm/enemy5F.s
View File

@ -32,7 +32,7 @@ _080482E8: .4byte gUnk_080D1D48
sub_080482EC: @ 0x080482EC
push {r4, lr}
adds r4, r0, #0
ldr r0, _08048310 @ =gUnk_030010A0
ldr r0, _08048310 @ =gScreenTransition
adds r0, #0x38
ldrb r1, [r0]
movs r2, #1
@ -47,7 +47,7 @@ sub_080482EC: @ 0x080482EC
bl InitializeAnimation
b _08048326
.align 2, 0
_08048310: .4byte gUnk_030010A0
_08048310: .4byte gScreenTransition
_08048314:
strb r2, [r4, #0xc]
adds r0, r4, #0
@ -90,7 +90,7 @@ sub_0804835C: @ 0x0804835C
push {r4, lr}
adds r4, r0, #0
bl sub_080485D8
ldr r0, _08048384 @ =gUnk_030010A0
ldr r0, _08048384 @ =gScreenTransition
adds r0, #0x39
ldrb r1, [r0]
movs r2, #3
@ -108,7 +108,7 @@ sub_0804835C: @ 0x0804835C
_08048382:
pop {r4, pc}
.align 2, 0
_08048384: .4byte gUnk_030010A0
_08048384: .4byte gScreenTransition
thumb_func_start sub_08048388
sub_08048388: @ 0x08048388

4
asm/ezloCap.s
View File

@ -584,7 +584,7 @@ _0806DCB6:
thumb_func_start sub_0806DCC0
sub_0806DCC0: @ 0x0806DCC0
ldr r0, _0806DCD0 @ =gUnk_030010A0
ldr r0, _0806DCD0 @ =gScreenTransition
movs r1, #0xf9
lsls r1, r1, #3
strh r1, [r0, #0x20]
@ -592,7 +592,7 @@ sub_0806DCC0: @ 0x0806DCC0
strh r1, [r0, #0x22]
bx lr
.align 2, 0
_0806DCD0: .4byte gUnk_030010A0
_0806DCD0: .4byte gScreenTransition
thumb_func_start NPC4E_Fusion
NPC4E_Fusion: @ 0x0806DCD4

20
asm/gleerok.s
View File

@ -364,7 +364,7 @@ _0802D2D0:
movs r2, #0x40
bl sub_0802EA68
_0802D2E4:
ldr r5, _0802D338 @ =gUnk_030010A0
ldr r5, _0802D338 @ =gScreenTransition
ldr r0, [r5]
movs r1, #0x1f
ands r0, r1
@ -405,7 +405,7 @@ _0802D32E:
_0802D334:
pop {r4, r5, pc}
.align 2, 0
_0802D338: .4byte gUnk_030010A0
_0802D338: .4byte gScreenTransition
thumb_func_start sub_0802D33C
sub_0802D33C: @ 0x0802D33C
@ -957,7 +957,7 @@ _0802D77A:
sub_0802D77C: @ 0x0802D77C
push {r4, r5, lr}
adds r5, r0, #0
ldr r0, _0802D7B0 @ =gUnk_030010A0
ldr r0, _0802D7B0 @ =gScreenTransition
ldr r4, [r0]
movs r0, #1
ands r4, r0
@ -981,7 +981,7 @@ sub_0802D77C: @ 0x0802D77C
_0802D7AC:
pop {r4, r5, pc}
.align 2, 0
_0802D7B0: .4byte gUnk_030010A0
_0802D7B0: .4byte gScreenTransition
thumb_func_start sub_0802D7B4
sub_0802D7B4: @ 0x0802D7B4
@ -1230,7 +1230,7 @@ _0802D99C:
bl DeleteThisEntity
b _0802DB7E
_0802D9A2:
ldr r0, _0802D9F4 @ =gUnk_030010A0
ldr r0, _0802D9F4 @ =gScreenTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@ -1272,9 +1272,9 @@ _0802D9CE:
str r1, [r0]
b _0802D99C
.align 2, 0
_0802D9F4: .4byte gUnk_030010A0
_0802D9F4: .4byte gScreenTransition
_0802D9F8:
ldr r0, _0802DA50 @ =gUnk_030010A0
ldr r0, _0802DA50 @ =gScreenTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@ -1319,7 +1319,7 @@ _0802DA24:
str r1, [r0]
b _0802D99C
.align 2, 0
_0802DA50: .4byte gUnk_030010A0
_0802DA50: .4byte gScreenTransition
_0802DA54:
adds r0, r4, #0
adds r0, #0x74
@ -2607,7 +2607,7 @@ _0802E400:
.align 2, 0
_0802E408: .4byte gLinkEntity
_0802E40C:
ldr r0, _0802E42C @ =gUnk_030010A0
ldr r0, _0802E42C @ =gScreenTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@ -2623,7 +2623,7 @@ _0802E422:
_0802E428:
pop {r4, r5, r6, pc}
.align 2, 0
_0802E42C: .4byte gUnk_030010A0
_0802E42C: .4byte gScreenTransition
thumb_func_start sub_0802E430
sub_0802E430: @ 0x0802E430

38
asm/greatFairy/sub_080872AC.inc
View File

@ -1,38 +0,0 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
ldrb r1, [r4, #0x18]
movs r0, #4
rsbs r0, r0, #0
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r4, #0x18]
ldrb r1, [r4, #0x1b]
movs r2, #0x3f
adds r0, r2, #0
ands r0, r1
movs r1, #0x40
orrs r0, r1
strb r0, [r4, #0x1b]
ldrb r0, [r4, #0x19]
ands r2, r0
strb r2, [r4, #0x19]
ldrh r1, [r4, #0x2e]
adds r0, r4, #0
adds r0, #0x68
strh r1, [r0]
ldrh r0, [r4, #0x32]
adds r1, r4, #0
adds r1, #0x6a
strh r0, [r1]
bl Random
movs r1, #0x1f
ands r0, r1
strb r0, [r4, #0x15]
movs r0, #0x20
strh r0, [r4, #0x24]
adds r0, r4, #0
bl GreatFairy_InitializeAnimation
pop {r4, pc}
.syntax divided

8
asm/guardWithSpear.s
View File

@ -227,7 +227,7 @@ _080641E6:
lsls r0, r0, #1
cmp r1, r0
ble _08064222
ldr r0, _080642B4 @ =gUnk_030010A0
ldr r0, _080642B4 @ =gScreenTransition
ldr r0, [r0]
movs r1, #6
bl __modsi3
@ -304,7 +304,7 @@ _080642AC:
pop {r4, r5, r6, pc}
.align 2, 0
_080642B0: .4byte gLinkEntity
_080642B4: .4byte gUnk_030010A0
_080642B4: .4byte gScreenTransition
thumb_func_start sub_080642B8
sub_080642B8: @ 0x080642B8
@ -372,7 +372,7 @@ _08064306:
lsls r0, r0, #1
cmp r1, r0
ble _08064342
ldr r0, _080643D4 @ =gUnk_030010A0
ldr r0, _080643D4 @ =gScreenTransition
ldr r0, [r0]
movs r1, #6
bl __modsi3
@ -449,7 +449,7 @@ _080643CC:
pop {r4, r5, r6, pc}
.align 2, 0
_080643D0: .4byte gLinkEntity
_080643D4: .4byte gUnk_030010A0
_080643D4: .4byte gScreenTransition
thumb_func_start sub_080643D8
sub_080643D8: @ 0x080643D8

4
asm/gyorgChild.s
View File

@ -11,7 +11,7 @@
GyorgChild: @ 0x08048640
push {r4, r5, lr}
adds r5, r0, #0
ldr r0, _0804867C @ =gUnk_030010A0
ldr r0, _0804867C @ =gScreenTransition
adds r0, #0x39
ldrb r2, [r0]
cmp r2, #0
@ -38,7 +38,7 @@ _08048664:
bl _call_via_r1
pop {r4, r5, pc}
.align 2, 0
_0804867C: .4byte gUnk_030010A0
_0804867C: .4byte gScreenTransition
_08048680: .4byte gUnk_080D1E6C
thumb_func_start sub_08048684

418
asm/houseDoorExterior.s
View File

@ -1,418 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start HouseDoorExterior
HouseDoorExterior: @ 0x080866C0
push {lr}
ldr r2, _080866D4 @ =gUnk_081206B4
ldrb r1, [r0, #0xb]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_080866D4: .4byte gUnk_081206B4
thumb_func_start sub_080866D8
sub_080866D8: @ 0x080866D8
push {r4, r5, r6, r7, lr}
mov r7, sb
mov r6, r8
push {r6, r7}
adds r6, r0, #0
ldrb r1, [r6, #0xc]
cmp r1, #0
bne _080866FE
movs r0, #1
strb r0, [r6, #0xc]
str r1, [r6, #0x68]
ldrb r1, [r6, #0xe]
adds r0, r6, #0
adds r0, #0x6c
strb r1, [r0]
adds r0, r6, #0
movs r1, #6
bl sub_0805E3A0
_080866FE:
adds r0, r6, #0
adds r0, #0x6c
ldrb r0, [r0]
bl GetCurrentRoomProperty
adds r5, r0, #0
movs r0, #0
mov r8, r0
ldrh r0, [r5]
ldr r1, _080867C4 @ =0x0000FFFF
cmp r0, r1
beq _080867BA
mov sb, r1
_08086718:
movs r7, #1
mov r1, r8
lsls r7, r1
ldr r0, [r6, #0x68]
ands r0, r7
cmp r0, #0
bne _080867A8
ldrb r0, [r5, #5]
bl sub_080867CC
cmp r0, #0
beq _080867A8
ldrh r0, [r5]
ldrh r1, [r5, #2]
movs r2, #0x20
movs r3, #0x20
bl sub_080562CC
cmp r0, #0
beq _080867A8
ldrb r1, [r5, #7]
ldrb r2, [r5, #6]
movs r0, #0x19
bl CreateObject
adds r4, r0, #0
cmp r4, #0
beq _080867A8
adds r0, #0x6c
mov r2, r8
strb r2, [r0]
ldr r1, _080867C8 @ =gRoomControls
ldrh r0, [r5]
ldrh r2, [r1, #6]
adds r0, r0, r2
adds r0, #0x10
strh r0, [r4, #0x2e]
ldrh r0, [r5, #2]
ldrh r1, [r1, #8]
adds r0, r0, r1
adds r0, #0x20
strh r0, [r4, #0x32]
str r6, [r4, #0x50]
ldrh r1, [r5]
adds r0, r4, #0
adds r0, #0x68
strh r1, [r0]
ldrh r0, [r5, #2]
adds r1, r4, #0
adds r1, #0x6a
strh r0, [r1]
ldrb r1, [r5, #4]
adds r0, r4, #0
adds r0, #0x38
strb r1, [r0]
ldrb r0, [r5, #5]
strb r0, [r4, #0xd]
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
ldr r0, [r6, #0x68]
orrs r0, r7
str r0, [r6, #0x68]
ldr r1, [r5, #8]
cmp r1, #0
beq _080867A8
adds r0, r4, #0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
_080867A8:
adds r5, #0xc
movs r0, #1
add r8, r0
ldrh r0, [r5]
cmp r0, sb
beq _080867BA
mov r1, r8
cmp r1, #0x1f
bls _08086718
_080867BA:
pop {r3, r4}
mov r8, r3
mov sb, r4
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080867C4: .4byte 0x0000FFFF
_080867C8: .4byte gRoomControls
thumb_func_start sub_080867CC
sub_080867CC: @ 0x080867CC
push {lr}
cmp r0, #0
beq _080867DE
cmp r0, #2
bne _080867DE
movs r0, #0x18
bl CheckGlobalFlag
b _080867E0
_080867DE:
movs r0, #1
_080867E0:
pop {pc}
.align 2, 0
thumb_func_start sub_080867E4
sub_080867E4: @ 0x080867E4
push {r4, lr}
adds r4, r0, #0
adds r0, #0x68
ldrh r0, [r0]
adds r1, r4, #0
adds r1, #0x6a
ldrh r1, [r1]
movs r2, #0x20
movs r3, #0x20
bl sub_080562CC
cmp r0, #0
bne _08086814
ldr r2, [r4, #0x50]
adds r0, r4, #0
adds r0, #0x6c
movs r1, #1
ldrb r0, [r0]
lsls r1, r0
ldr r0, [r2, #0x68]
bics r0, r1
str r0, [r2, #0x68]
bl DeleteThisEntity
_08086814:
adds r0, r4, #0
bl sub_0808681C
pop {r4, pc}
thumb_func_start sub_0808681C
sub_0808681C: @ 0x0808681C
push {r4, r5, lr}
adds r5, r0, #0
ldrb r4, [r5, #0xc]
cmp r4, #0
beq _0808682C
cmp r4, #1
beq _08086868
b _0808688C
_0808682C:
movs r2, #1
movs r0, #1
strb r0, [r5, #0xc]
movs r0, #8
strb r0, [r5, #0xe]
ldrb r1, [r5, #0x18]
subs r0, #0xc
ands r0, r1
orrs r0, r2
strb r0, [r5, #0x18]
strb r4, [r5, #0x1e]
ldr r0, _08086864 @ =gUnk_081206AC
str r0, [r5, #0x48]
ldrb r1, [r5, #0xd]
cmp r1, #1
bne _08086852
movs r0, #2
strb r0, [r5, #0xc]
strb r1, [r5, #0x1e]
_08086852:
ldrb r1, [r5, #0x10]
movs r2, #2
adds r0, r2, #0
ands r0, r1
cmp r0, #0
beq _080868AA
strb r2, [r5, #0xc]
b _0808688C
.align 2, 0
_08086864: .4byte gUnk_081206AC
_08086868:
adds r0, r5, #0
bl sub_08086954
lsls r0, r0, #0x18
cmp r0, #0
bne _0808688C
ldrb r0, [r5, #0xc]
adds r0, #1
strb r0, [r5, #0xc]
strb r4, [r5, #0x1e]
movs r0, #0x10
movs r1, #0
movs r2, #1
bl sub_08078AC0
ldr r0, _080868AC @ =0x00000111
bl PlaySFX
_0808688C:
ldrb r1, [r5, #0x10]
movs r0, #2
ands r0, r1
cmp r0, #0
beq _080868AA
adds r4, r5, #0
adds r4, #0x84
ldr r1, [r4]
adds r0, r5, #0
bl ExecuteScriptCommandSet
ldr r1, [r4]
adds r0, r5, #0
bl sub_080868EC
_080868AA:
pop {r4, r5, pc}
.align 2, 0
_080868AC: .4byte 0x00000111
thumb_func_start sub_080868B0
sub_080868B0: @ 0x080868B0
push {r4, r5, lr}
adds r5, r0, #0
ldrb r0, [r5, #0xc]
cmp r0, #0
bne _080868D2
movs r2, #1
movs r0, #1
strb r0, [r5, #0xc]
ldrb r1, [r5, #0x18]
subs r0, #5
ands r0, r1
orrs r0, r2
strb r0, [r5, #0x18]
ldr r0, _080868E8 @ =gUnk_081206AC
str r0, [r5, #0x48]
movs r0, #8
strb r0, [r5, #0xe]
_080868D2:
adds r4, r5, #0
adds r4, #0x84
ldr r1, [r4]
adds r0, r5, #0
bl ExecuteScriptCommandSet
ldr r1, [r4]
adds r0, r5, #0
bl sub_080868EC
pop {r4, r5, pc}
.align 2, 0
_080868E8: .4byte gUnk_081206AC
thumb_func_start sub_080868EC
sub_080868EC: @ 0x080868EC
push {r4, r5, lr}
adds r3, r0, #0
ldr r2, [r1, #8]
movs r0, #0
str r0, [r1, #8]
cmp r2, #0
beq _0808691E
movs r5, #0x80
lsls r5, r5, #1
movs r4, #0
movs r1, #1
_08086902:
mvns r0, r2
adds r0, #1
ands r0, r2
eors r2, r0
cmp r0, #0x80
beq _08086914
cmp r0, r5
beq _08086918
b _0808691A
_08086914:
strb r4, [r3, #0x1e]
b _0808691A
_08086918:
strb r1, [r3, #0x1e]
_0808691A:
cmp r2, #0
bne _08086902
_0808691E:
ldrb r0, [r3, #0x1e]
cmp r0, #0
bne _0808692A
adds r0, r3, #0
bl sub_0800445C
_0808692A:
pop {r4, r5, pc}
thumb_func_start sub_0808692C
sub_0808692C: @ 0x0808692C
push {lr}
adds r2, r0, #0
ldrb r1, [r2, #0x10]
movs r0, #0xfd
ands r0, r1
strb r0, [r2, #0x10]
movs r0, #2
strb r0, [r2, #0xb]
ldrb r0, [r2, #0x1e]
movs r1, #2
cmp r0, #0
bne _08086946
movs r1, #1
_08086946:
strb r1, [r2, #0xc]
movs r0, #0
strb r0, [r2, #0xd]
movs r0, #8
strb r0, [r2, #0xe]
pop {pc}
.align 2, 0
thumb_func_start sub_08086954
sub_08086954: @ 0x08086954
push {r4, lr}
adds r4, r0, #0
bl sub_0800445C
cmp r0, #0
beq _0808699C
adds r0, r4, #0
movs r1, #6
movs r2, #0x14
bl sub_0806ED9C
cmp r0, #0
blt _080869A0
ldr r0, _08086994 @ =gLinkEntity
ldrb r0, [r0, #0x14]
cmp r0, #0
bne _080869A0
ldr r2, _08086998 @ =gLinkState
adds r0, r2, #0
adds r0, #0x90
ldrh r1, [r0]
movs r0, #0x80
lsls r0, r0, #3
cmp r1, r0
bne _080869A0
ldrb r0, [r2, #2]
cmp r0, #0
bne _080869A0
ldrb r0, [r4, #0xe]
subs r0, #1
b _0808699E
.align 2, 0
_08086994: .4byte gLinkEntity
_08086998: .4byte gLinkState
_0808699C:
movs r0, #8
_0808699E:
strb r0, [r4, #0xe]
_080869A0:
ldrb r0, [r4, #0xe]
pop {r4, pc}
thumb_func_start sub_080869A4
sub_080869A4: @ 0x080869A4
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
movs r0, #0
str r0, [r5, #0x14]
adds r0, r4, #0
bl sub_08086954
lsls r0, r0, #0x18
cmp r0, #0
bne _080869C2
movs r0, #8
strb r0, [r4, #0xe]
movs r0, #1
str r0, [r5, #0x14]
_080869C2:
pop {r4, r5, pc}

16
asm/initializeLink.s
View File

@ -26,7 +26,7 @@ InitializeLink: @ 0x080524A8
ldr r0, _0805251C @ =gRoomControls
str r4, [r0, #0x30]
ldr r1, _08052520 @ =gUnk_080FCAC8
ldr r5, _08052524 @ =gUnk_030010A0
ldr r5, _08052524 @ =gScreenTransition
ldrb r0, [r5, #0xf]
adds r0, r0, r1
ldrb r0, [r0]
@ -56,7 +56,7 @@ _08052514: .4byte gLinkState
_08052518: .4byte gLinkEntity
_0805251C: .4byte gRoomControls
_08052520: .4byte gUnk_080FCAC8
_08052524: .4byte gUnk_030010A0
_08052524: .4byte gScreenTransition
_08052528: .4byte _0805252C
_0805252C: @ jump table
.4byte _08052558 @ case 0
@ -81,7 +81,7 @@ _08052564:
adds r0, #0x38
movs r1, #0x10
strb r1, [r0]
ldr r1, _08052580 @ =gUnk_030010A0
ldr r1, _08052580 @ =gScreenTransition
ldrb r0, [r1, #0xe]
lsls r0, r0, #2
strb r0, [r4, #0x15]
@ -92,21 +92,21 @@ _08052576:
b _080525C2
.align 2, 0
_0805257C: .4byte gLinkState
_08052580: .4byte gUnk_030010A0
_08052580: .4byte gScreenTransition
_08052584:
ldr r1, _08052598 @ =gLinkState
adds r2, r1, #0
adds r2, #0x38
movs r0, #1
strb r0, [r2]
ldr r2, _0805259C @ =gUnk_030010A0
ldr r2, _0805259C @ =gScreenTransition
ldrb r0, [r2, #0xf]
adds r1, #0x39
strb r0, [r1]
b _080525C2
.align 2, 0
_08052598: .4byte gLinkState
_0805259C: .4byte gUnk_030010A0
_0805259C: .4byte gScreenTransition
_080525A0:
ldr r0, _080525A8 @ =gLinkState
adds r0, #0x38
@ -128,7 +128,7 @@ _080525B8:
_080525BE:
strb r1, [r0]
_080525C0:
ldr r2, _08052618 @ =gUnk_030010A0
ldr r2, _08052618 @ =gScreenTransition
_080525C2:
movs r0, #1
strb r0, [r4, #8]
@ -170,5 +170,5 @@ _080525C2:
pop {r4, r5, r6, pc}
.align 2, 0
_08052614: .4byte gLinkState
_08052618: .4byte gUnk_030010A0
_08052618: .4byte gScreenTransition
_0805261C: .4byte gUnk_02002A40

8
asm/itemOnGround.s
View File

@ -216,7 +216,7 @@ _08080AFA:
adds r0, r5, #0
adds r1, r6, #0
bl sub_080002A8
ldr r1, _08080B48 @ =gUnk_030010A0
ldr r1, _08080B48 @ =gScreenTransition
strh r0, [r1, #0xa]
cmp r4, #0x3f
beq _08080B50
@ -228,7 +228,7 @@ _08080AFA:
blo _08080B5C
b _08080B50
.align 2, 0
_08080B48: .4byte gUnk_030010A0
_08080B48: .4byte gScreenTransition
_08080B4C:
cmp r4, #0xf1
bne _08080B5C
@ -538,7 +538,7 @@ _08080DB4:
bl ResolveEntityOnTop
b _08080E00
_08080DEE:
ldr r0, _08080E04 @ =gUnk_030010A0
ldr r0, _08080E04 @ =gScreenTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@ -549,7 +549,7 @@ _08080DEE:
_08080E00:
pop {r4, r5, pc}
.align 2, 0
_08080E04: .4byte gUnk_030010A0
_08080E04: .4byte gScreenTransition
thumb_func_start ItemOnGround
ItemOnGround: @ 0x08080E08

8
asm/lilypadLarge.s
View File

@ -417,7 +417,7 @@ _080857F6:
_08085806:
str r1, [r7, #0x6c]
_08085808:
ldr r0, _080858B0 @ =gUnk_030010A0
ldr r0, _080858B0 @ =gScreenTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@ -495,7 +495,7 @@ _08085884:
.align 2, 0
_080858A8: .4byte gSineTable
_080858AC: .4byte 0xFFFF0000
_080858B0: .4byte gUnk_030010A0
_080858B0: .4byte gScreenTransition
_080858B4: .4byte 0x00000FFF
_080858B8:
movs r0, #0
@ -679,7 +679,7 @@ _080859E6:
bl sub_08085D60
b _08085A0A
_080859F4:
ldr r0, _08085A18 @ =gUnk_030010A0
ldr r0, _08085A18 @ =gScreenTransition
ldr r0, [r0]
movs r1, #0x1f
ands r0, r1
@ -696,7 +696,7 @@ _08085A0A:
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08085A18: .4byte gUnk_030010A0
_08085A18: .4byte gScreenTransition
thumb_func_start sub_08085A1C
sub_08085A1C: @ 0x08085A1C

8
asm/manager1.s
View File

@ -334,7 +334,7 @@ sub_080573AC: @ 0x080573AC
adds r0, r0, r2
strh r0, [r5, #0x30]
ldr r2, _08057444 @ =gSineTable
ldr r4, _08057448 @ =gUnk_030010A0
ldr r4, _08057448 @ =gScreenTransition
ldr r1, [r4]
ldrb r0, [r4]
adds r0, #0x40
@ -378,7 +378,7 @@ _08057438: .4byte 0xFFFFE000
_0805743C: .4byte 0xFFFFF000
_08057440: .4byte gScreen
_08057444: .4byte gSineTable
_08057448: .4byte gUnk_030010A0
_08057448: .4byte gScreenTransition
_0805744C: .4byte gUnk_08107C30
thumb_func_start sub_08057450
@ -417,7 +417,7 @@ _0805748A:
adds r0, r3, #0
adds r0, #0x22
ldrb r0, [r0]
ldr r5, _08057510 @ =gUnk_030010A0
ldr r5, _08057510 @ =gScreenTransition
cmp r0, #0
bne _080574BE
ldr r0, [r5]
@ -480,6 +480,6 @@ _08057502:
_08057504: .4byte gScreen
_08057508: .4byte gRoomControls
_0805750C: .4byte gUnk_02001A40
_08057510: .4byte gUnk_030010A0
_08057510: .4byte gScreenTransition
_08057514: .4byte gUnk_08107C30
_08057518: .4byte gUnk_085B4180

4
asm/manager10.s
View File

@ -192,7 +192,7 @@ _080596DC: .4byte gUnk_085A7320
sub_080596E0: @ 0x080596E0
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r0, _08059730 @ =gUnk_030010A0
ldr r0, _08059730 @ =gScreenTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@ -230,7 +230,7 @@ _080596FC:
str r1, [r0]
b _08059764
.align 2, 0
_08059730: .4byte gUnk_030010A0
_08059730: .4byte gScreenTransition
_08059734: .4byte gScreen
_08059738: .4byte gUnk_08108390
_0805973C: .4byte gUnk_0200B650

4
asm/manager1A.s
View File

@ -251,7 +251,7 @@ _0805B20C:
thumb_func_start sub_0805B210
sub_0805B210: @ 0x0805B210
push {r4, r5, lr}
ldr r2, _0805B248 @ =gUnk_030010A0
ldr r2, _0805B248 @ =gScreenTransition
movs r1, #1
strb r1, [r2, #8]
strb r1, [r2, #9]
@ -279,7 +279,7 @@ sub_0805B210: @ 0x0805B210
movs r0, #6
b _0805B256
.align 2, 0
_0805B248: .4byte gUnk_030010A0
_0805B248: .4byte gScreenTransition
_0805B24C: .4byte gUnk_08108764
_0805B250: .4byte gLinkState
_0805B254:

4
asm/manager22.s
View File

@ -130,7 +130,7 @@ _0805B9EC: .4byte 0x0000DFFF
_0805B9F0: .4byte gLinkState
_0805B9F4: .4byte gArea
_0805B9F8:
ldr r0, _0805BA24 @ =gUnk_030010A0
ldr r0, _0805BA24 @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@ -151,7 +151,7 @@ _0805B9F8:
bl sub_0801E154
b _0805BA42
.align 2, 0
_0805BA24: .4byte gUnk_030010A0
_0805BA24: .4byte gScreenTransition
_0805BA28: .4byte gSineTable
_0805BA2C:
movs r0, #0

4
asm/manager32.s
View File

@ -17,7 +17,7 @@ sub_0805D7A4: @ 0x0805D7A4
ldr r1, [r0]
adds r0, r4, #0
bl _call_via_r1
ldr r0, _0805D7D8 @ =gUnk_030010A0
ldr r0, _0805D7D8 @ =gScreenTransition
ldr r0, [r0]
lsls r0, r0, #4
str r0, [r4, #0x24]
@ -30,7 +30,7 @@ sub_0805D7A4: @ 0x0805D7A4
pop {r4, pc}
.align 2, 0
_0805D7D4: .4byte gUnk_08108D7C
_0805D7D8: .4byte gUnk_030010A0
_0805D7D8: .4byte gScreenTransition
thumb_func_start sub_0805D7DC
sub_0805D7DC: @ 0x0805D7DC

4
asm/manager34.s
View File

@ -27,7 +27,7 @@ _0805DBB0: .4byte gUnk_08108D8C
sub_0805DBB4: @ 0x0805DBB4
movs r1, #1
strb r1, [r0, #0xc]
ldr r1, _0805DBC8 @ =gUnk_030010A0
ldr r1, _0805DBC8 @ =gScreenTransition
adds r1, #0x3d
ldrb r2, [r1]
lsls r1, r2, #4
@ -36,7 +36,7 @@ sub_0805DBB4: @ 0x0805DBB4
strh r1, [r0, #0x20]
bx lr
.align 2, 0
_0805DBC8: .4byte gUnk_030010A0
_0805DBC8: .4byte gScreenTransition
thumb_func_start sub_0805DBCC
sub_0805DBCC: @ 0x0805DBCC

8
asm/manager37.s
View File

@ -45,7 +45,7 @@ _0805DE7A:
movs r1, #0
movs r0, #1
strb r0, [r4, #0xc]
ldr r2, _0805DEAC @ =gUnk_030010A0
ldr r2, _0805DEAC @ =gScreenTransition
adds r0, r2, #0
adds r0, #0x38
strb r1, [r0]
@ -67,7 +67,7 @@ _0805DE7A:
str r1, [r0]
pop {r4, pc}
.align 2, 0
_0805DEAC: .4byte gUnk_030010A0
_0805DEAC: .4byte gScreenTransition
_0805DEB0: .4byte gUnk_02002A40
_0805DEB4: .4byte 0x00001194
@ -266,7 +266,7 @@ sub_0805E000: @ 0x0805E000
strb r5, [r0]
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
ldr r0, _0805E068 @ =gUnk_030010A0
ldr r0, _0805E068 @ =gScreenTransition
adds r0, #0x38
ldrb r1, [r0]
adds r0, r5, #0
@ -293,7 +293,7 @@ _0805E062:
pop {r4, r5, r6, pc}
.align 2, 0
_0805E064: .4byte gRoomControls
_0805E068: .4byte gUnk_030010A0
_0805E068: .4byte gScreenTransition
_0805E06C: .4byte gArea
_0805E070: .4byte 0x00000864
_0805E074: .4byte 0x80010000

4
asm/manager4.s
View File

@ -249,7 +249,7 @@ sub_08057A18: @ 0x08057A18
ldr r3, _08057A98 @ =gRoomControls
ldrb r0, [r3, #4]
strb r0, [r6, #9]
ldr r1, _08057A9C @ =gUnk_030010A0
ldr r1, _08057A9C @ =gScreenTransition
ldrb r0, [r5, #4]
strb r0, [r1, #0xc]
ldrb r0, [r5, #5]
@ -303,7 +303,7 @@ _08057A86:
.align 2, 0
_08057A94: .4byte gUnk_03004030
_08057A98: .4byte gRoomControls
_08057A9C: .4byte gUnk_030010A0
_08057A9C: .4byte gScreenTransition
_08057AA0: .4byte gLinkEntity
_08057AA4: .4byte gUnk_02034480

8
asm/managerC.s
View File

@ -70,7 +70,7 @@ sub_080588CC: @ 0x080588CC
bl sub_08058CFC
adds r0, r4, #0
bl sub_08058A04
ldr r0, _080588E8 @ =gUnk_030010A0
ldr r0, _080588E8 @ =gScreenTransition
ldrb r0, [r0, #8]
cmp r0, #0
beq _080588EC
@ -78,7 +78,7 @@ sub_080588CC: @ 0x080588CC
strb r0, [r4, #0xc]
b _080588F2
.align 2, 0
_080588E8: .4byte gUnk_030010A0
_080588E8: .4byte gScreenTransition
_080588EC:
adds r0, r4, #0
bl sub_080588F8
@ -413,7 +413,7 @@ _08058B58: .4byte gRoomControls
thumb_func_start sub_08058B5C
sub_08058B5C: @ 0x08058B5C
push {r4, r5, lr}
ldr r3, _08058BB4 @ =gUnk_030010A0
ldr r3, _08058BB4 @ =gScreenTransition
movs r0, #0
movs r4, #1
strb r4, [r3, #8]
@ -455,7 +455,7 @@ sub_08058B5C: @ 0x08058B5C
bl PlaySFX
pop {r4, r5, pc}
.align 2, 0
_08058BB4: .4byte gUnk_030010A0
_08058BB4: .4byte gScreenTransition
_08058BB8: .4byte gRoomControls
_08058BBC: .4byte gUnk_081082E8
_08058BC0: .4byte gUnk_02002A40

8
asm/mazaalBracelet.s
View File

@ -233,7 +233,7 @@ _0803A2CC:
adds r1, r4, #0
bl PositionRelative
_0803A310:
ldr r0, _0803A350 @ =gUnk_030010A0
ldr r0, _0803A350 @ =gScreenTransition
adds r0, #0x38
ldrb r0, [r0]
cmp r0, #0
@ -263,7 +263,7 @@ _0803A310:
b _0803A360
.align 2, 0
_0803A34C: .4byte 0xFFF00000
_0803A350: .4byte gUnk_030010A0
_0803A350: .4byte gScreenTransition
_0803A354:
movs r0, #1
strb r0, [r4, #0xc]
@ -3166,7 +3166,7 @@ _0803B90C: .4byte gUnk_080CFD20
sub_0803B910: @ 0x0803B910
push {r4, lr}
adds r4, r0, #0
ldr r0, _0803B940 @ =gUnk_030010A0
ldr r0, _0803B940 @ =gScreenTransition
adds r0, #0x38
ldrb r0, [r0]
cmp r0, #0
@ -3188,7 +3188,7 @@ sub_0803B910: @ 0x0803B910
bl sub_0803BA8C
b _0803B950
.align 2, 0
_0803B940: .4byte gUnk_030010A0
_0803B940: .4byte gScreenTransition
_0803B944:
movs r0, #1
strb r0, [r4, #0xc]

16
asm/mazaalHead.s
View File

@ -74,7 +74,7 @@ sub_08033F3C: @ 0x08033F3C
ldrb r0, [r0]
cmp r0, #0x42
bhi _08033FFA
ldr r0, _08033F68 @ =gUnk_030010A0
ldr r0, _08033F68 @ =gScreenTransition
adds r0, #0x38
ldrb r0, [r0]
cmp r0, #0
@ -88,7 +88,7 @@ sub_08033F3C: @ 0x08033F3C
b _08033F70
.align 2, 0
_08033F64: .4byte gUnk_03003DBC
_08033F68: .4byte gUnk_030010A0
_08033F68: .4byte gScreenTransition
_08033F6C:
movs r0, #1
strb r0, [r4, #0xc]
@ -122,7 +122,7 @@ _08033F70:
movs r2, #0
bl CreateObject
str r4, [r0, #0x50]
ldr r0, _08033FD0 @ =gUnk_030010A0
ldr r0, _08033FD0 @ =gScreenTransition
adds r0, #0x39
ldrb r1, [r0]
cmp r1, #0
@ -138,7 +138,7 @@ _08033F70:
strb r0, [r4, #0x10]
b _08033FFA
.align 2, 0
_08033FD0: .4byte gUnk_030010A0
_08033FD0: .4byte gScreenTransition
_08033FD4:
movs r0, #0x44
movs r1, #0
@ -732,7 +732,7 @@ sub_0803443C: @ 0x0803443C
adds r1, #0x7d
movs r0, #0
strb r0, [r1]
ldr r0, _0803445C @ =gUnk_030010A0
ldr r0, _0803445C @ =gScreenTransition
adds r0, #0x39
ldrb r0, [r0]
cmp r0, #0x1e
@ -741,7 +741,7 @@ sub_0803443C: @ 0x0803443C
bl sub_080344BC
b _08034472
.align 2, 0
_0803445C: .4byte gUnk_030010A0
_0803445C: .4byte gScreenTransition
_08034460:
cmp r0, #0x3c
bhi _0803446C
@ -1831,7 +1831,7 @@ sub_08034C00: @ 0x08034C00
bl CheckPlayerInRegion
cmp r0, #0
beq _08034C5A
ldr r0, _08034C4C @ =gUnk_030010A0
ldr r0, _08034C4C @ =gScreenTransition
adds r0, #0x39
ldrb r0, [r0]
cmp r0, #0x3c
@ -1842,7 +1842,7 @@ sub_08034C00: @ 0x08034C00
.align 2, 0
_08034C44: .4byte gLinkState
_08034C48: .4byte gRoomControls
_08034C4C: .4byte gUnk_030010A0
_08034C4C: .4byte gScreenTransition
_08034C50: .4byte gUnk_080CED88
_08034C54:
ldr r0, _08034C5C @ =gUnk_080CED9C

28
asm/mazaalMacro.s
View File

@ -193,7 +193,7 @@ _08034DC4:
sub_08034DC8: @ 0x08034DC8
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, _08034E10 @ =gUnk_030010A0
ldr r0, _08034E10 @ =gScreenTransition
adds r0, #0x39
ldrb r0, [r0]
cmp r0, #0
@ -226,7 +226,7 @@ sub_08034DC8: @ 0x08034DC8
_08034E0E:
pop {r4, r5, pc}
.align 2, 0
_08034E10: .4byte gUnk_030010A0
_08034E10: .4byte gScreenTransition
_08034E14: .4byte gRoomControls
thumb_func_start sub_08034E18
@ -290,7 +290,7 @@ sub_08034E68: @ 0x08034E68
adds r0, r4, #0
bl sub_08035120
_08034E8A:
ldr r0, _08034EB0 @ =gUnk_030010A0
ldr r0, _08034EB0 @ =gScreenTransition
adds r0, #0x39
ldrb r0, [r0]
cmp r0, #0
@ -308,7 +308,7 @@ _08034E8A:
str r0, [r1]
b _08034EBC
.align 2, 0
_08034EB0: .4byte gUnk_030010A0
_08034EB0: .4byte gScreenTransition
_08034EB4: .4byte gUnk_08012E20
_08034EB8:
bl DeleteThisEntity
@ -411,7 +411,7 @@ _08034F6C: .4byte gUnk_0813ABA8
sub_08034F70: @ 0x08034F70
push {lr}
adds r2, r0, #0
ldr r0, _08034F8C @ =gUnk_030010A0
ldr r0, _08034F8C @ =gScreenTransition
adds r0, #0x39
ldrb r0, [r0]
adds r1, r2, #0
@ -424,7 +424,7 @@ sub_08034F70: @ 0x08034F70
movs r0, #0
b _08034F9A
.align 2, 0
_08034F8C: .4byte gUnk_030010A0
_08034F8C: .4byte gScreenTransition
_08034F90:
cmp r0, #0x1e
bls _08034F98
@ -496,12 +496,12 @@ _08035008:
adds r5, r0, #0
cmp r1, #0x3b
bhi _08035040
ldr r0, _0803501C @ =gUnk_030010A0
ldr r0, _0803501C @ =gScreenTransition
adds r0, #0x39
movs r1, #0x3c
b _08035032
.align 2, 0
_0803501C: .4byte gUnk_030010A0
_0803501C: .4byte gScreenTransition
_08035020:
adds r0, r4, #0
adds r0, #0x45
@ -509,7 +509,7 @@ _08035020:
adds r5, r0, #0
cmp r1, #0x1d
bhi _08035040
ldr r0, _0803503C @ =gUnk_030010A0
ldr r0, _0803503C @ =gScreenTransition
adds r0, #0x39
movs r1, #0x1e
_08035032:
@ -518,16 +518,16 @@ _08035032:
bl sub_08035050
b _08035048
.align 2, 0
_0803503C: .4byte gUnk_030010A0
_0803503C: .4byte gScreenTransition
_08035040:
ldr r0, _0803504C @ =gUnk_030010A0
ldr r0, _0803504C @ =gScreenTransition
ldrb r1, [r5]
adds r0, #0x39
strb r1, [r0]
_08035048:
pop {r4, r5, r6, pc}
.align 2, 0
_0803504C: .4byte gUnk_030010A0
_0803504C: .4byte gScreenTransition
thumb_func_start sub_08035050
sub_08035050: @ 0x08035050
@ -585,7 +585,7 @@ _080350A6:
lsrs r0, r0, #4
cmp r6, r0
beq _080350A6
ldr r2, _080350DC @ =gUnk_030010A0
ldr r2, _080350DC @ =gScreenTransition
adds r2, #0x38
ldrb r1, [r2]
movs r0, #0xf
@ -603,7 +603,7 @@ _080350D0:
b _080350F2
.align 2, 0
_080350D8: .4byte gUnk_030010D8
_080350DC: .4byte gUnk_030010A0
_080350DC: .4byte gScreenTransition
_080350E0: .4byte gUnk_080CEECC
_080350E4: .4byte gRoomControls
_080350E8:

81
asm/minishLight.s
View File

@ -1,81 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start MinishLight
MinishLight: @ 0x0809F828
push {lr}
ldr r2, _0809F83C @ =gUnk_081247F8
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0809F83C: .4byte gUnk_081247F8
thumb_func_start sub_0809F840
sub_0809F840: @ 0x0809F840
push {lr}
adds r2, r0, #0
movs r1, #0
movs r0, #1
strb r0, [r2, #0xc]
strb r1, [r2, #0x1e]
movs r0, #0x20
strb r0, [r2, #0xe]
strb r1, [r2, #0xf]
ldrb r0, [r2, #0xb]
cmp r0, #0
beq _0809F860
ldrb r0, [r2, #0x18]
movs r1, #0x40
orrs r0, r1
strb r0, [r2, #0x18]
_0809F860:
adds r0, r2, #0
bl UpdateSpriteForCollisionLayer
pop {pc}
thumb_func_start sub_0809F868
sub_0809F868: @ 0x0809F868
push {lr}
adds r1, r0, #0
ldrb r0, [r1, #0xe]
subs r0, #1
strb r0, [r1, #0xe]
movs r2, #0xff
lsls r0, r0, #0x18
cmp r0, #0
bne _0809F8A2
ldrb r0, [r1, #0xf]
cmp r0, #0
bne _0809F890
ldrb r0, [r1, #0x1e]
adds r0, #1
strb r0, [r1, #0x1e]
ands r0, r2
cmp r0, #3
bne _0809F89E
movs r0, #1
b _0809F89C
_0809F890:
ldrb r0, [r1, #0x1e]
subs r0, #1
strb r0, [r1, #0x1e]
ands r0, r2
cmp r0, #0
bne _0809F89E
_0809F89C:
strb r0, [r1, #0xf]
_0809F89E:
movs r0, #0x20
strb r0, [r1, #0xe]
_0809F8A2:
pop {pc}

4
asm/moldworm.s
View File

@ -549,7 +549,7 @@ _08023440:
subs r0, #1
strb r0, [r1]
_08023460:
ldr r0, _080234A0 @ =gUnk_030010A0
ldr r0, _080234A0 @ =gScreenTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@ -579,7 +579,7 @@ _08023460:
_0802349C:
pop {r4, r5, r6, pc}
.align 2, 0
_080234A0: .4byte gUnk_030010A0
_080234A0: .4byte gScreenTransition
thumb_func_start sub_080234A4
sub_080234A4: @ 0x080234A4

4
asm/non_matching/bigGoron/sub_0806CF30.inc
View File

@ -40,7 +40,7 @@ _0806CF6C:
bgt _0806D000
cmp r0, #0
blt _0806D000
ldr r0, _0806CFCC @ =gUnk_030010A0
ldr r0, _0806CFCC @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@ -83,7 +83,7 @@ _0806CFA8:
strh r0, [r5, #0x2e]
b _0806D000
.align 2, 0
_0806CFCC: .4byte gUnk_030010A0
_0806CFCC: .4byte gScreenTransition
_0806CFD0: .4byte gLinkEntity
_0806CFD4:
ldrb r0, [r5, #0xe]

4
asm/non_matching/minecart/sub_080919AC.inc
View File

@ -98,7 +98,7 @@ _08091A22:
beq _08091A68
b _08091C04
_08091A68:
ldr r0, _08091AD8 @ =gUnk_030010A0
ldr r0, _08091AD8 @ =gScreenTransition
ldr r0, [r0]
ands r0, r7
cmp r0, #0
@ -152,7 +152,7 @@ _08091A92:
strb r0, [r5, #0x14]
b _08091BD8
.align 2, 0
_08091AD8: .4byte gUnk_030010A0
_08091AD8: .4byte gScreenTransition
_08091ADC: .4byte gUnk_081223C8
_08091AE0: .4byte gUnk_081223D8
_08091AE4:

4
asm/non_matching/sub_0804C258.inc
View File

@ -10,7 +10,7 @@
movs r0, #0xf
ands r2, r0
strb r2, [r3, #0xd]
ldr r0, _0804C28C @ =gUnk_030010A0
ldr r0, _0804C28C @ =gScreenTransition
ldrb r0, [r0, #0xe]
cmp r0, #4
bne _0804C284
@ -24,5 +24,5 @@ _0804C284:
pop {pc}
.align 2, 0
_0804C288: .4byte gArea
_0804C28C: .4byte gUnk_030010A0
_0804C28C: .4byte gScreenTransition
.syntax divided

4
asm/non_matching/sub_0804DE00.inc
View File

@ -60,7 +60,7 @@ _0804DE5C:
strh r5, [r0, #4]
ldr r0, [r4]
strh r6, [r0, #6]
ldr r1, _0804DEC0 @ =gUnk_030010A0
ldr r1, _0804DEC0 @ =gScreenTransition
ldr r0, [r4]
ldrh r0, [r0]
lsrs r0, r0, #1
@ -80,7 +80,7 @@ _0804DE5C:
_0804DEB4: .4byte gArea
_0804DEB8: .4byte 0x0000085C
_0804DEBC: .4byte gRoomControls
_0804DEC0: .4byte gUnk_030010A0
_0804DEC0: .4byte gScreenTransition
_0804DEC4:
movs r0, #6
movs r1, #0x10

4
asm/non_matching/sub_08054524.inc
View File

@ -4,7 +4,7 @@
ldrb r1, [r0, #1]
cmp r1, #0
bne _08054534
ldr r0, _08054554 @ =gUnk_030010A0
ldr r0, _08054554 @ =gScreenTransition
adds r0, #0x2e
ldrb r1, [r0]
_08054534:
@ -24,7 +24,7 @@ _0805453A:
pop {pc}
.align 2, 0
_08054550: .4byte gArea
_08054554: .4byte gUnk_030010A0
_08054554: .4byte gScreenTransition
_08054558: .4byte gUnk_080FE1C6
_0805455C: .4byte gUnk_080015BC
_08054560: .4byte gUnk_02034398

4
asm/npc5.s
View File

@ -2315,7 +2315,7 @@ sub_08061B58: @ 0x08061B58
movs r1, #2
bl InitAnimationForceUpdate
_08061B6E:
ldr r0, _08061B88 @ =gUnk_030010A0
ldr r0, _08061B88 @ =gScreenTransition
adds r0, #0x2c
ldrb r0, [r0]
cmp r0, #2
@ -2327,4 +2327,4 @@ _08061B7E:
bl sub_0806FD3C
pop {r4, pc}
.align 2, 0
_08061B88: .4byte gUnk_030010A0
_08061B88: .4byte gScreenTransition

4
asm/object17.s
View File

@ -84,7 +84,7 @@ sub_08086234: @ 0x08086234
ldrb r0, [r4, #0xa]
cmp r0, #0
beq _08086258
ldr r0, _08086254 @ =gUnk_030010A0
ldr r0, _08086254 @ =gScreenTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@ -94,7 +94,7 @@ sub_08086234: @ 0x08086234
bl GetNextFrame
b _0808625E
.align 2, 0
_08086254: .4byte gUnk_030010A0
_08086254: .4byte gScreenTransition
_08086258:
adds r0, r4, #0
bl GetNextFrame

12
asm/object3E.s
View File

@ -171,7 +171,7 @@ _0808D1AE:
_0808D1F4: .4byte 0x00004069
_0808D1F8: .4byte gRoomControls
_0808D1FC:
ldr r0, _0808D274 @ =gUnk_030010A0
ldr r0, _0808D274 @ =gScreenTransition
ldr r3, [r0]
movs r0, #3
ands r3, r0
@ -233,7 +233,7 @@ _0808D24E:
_0808D272:
pop {r4, r5, r6, pc}
.align 2, 0
_0808D274: .4byte gUnk_030010A0
_0808D274: .4byte gScreenTransition
_0808D278: .4byte gScreen
_0808D27C: .4byte gUnk_08121704
@ -339,7 +339,7 @@ _0808D31C:
ldrsh r0, [r4, r1]
cmp r5, r0
beq _0808D350
ldr r0, _0808D358 @ =gUnk_030010A0
ldr r0, _0808D358 @ =gScreenTransition
ldr r0, [r0]
movs r1, #8
ands r0, r1
@ -351,7 +351,7 @@ _0808D350:
pop {r4, r5, pc}
.align 2, 0
_0808D354: .4byte gRoomControls
_0808D358: .4byte gUnk_030010A0
_0808D358: .4byte gScreenTransition
_0808D35C: .4byte 0x0000010F
thumb_func_start sub_0808D360
@ -585,7 +585,7 @@ _0808D514: .4byte 0x00004069
sub_0808D518: @ 0x0808D518
push {r4, r5, r6, lr}
adds r5, r0, #0
ldr r0, _0808D58C @ =gUnk_030010A0
ldr r0, _0808D58C @ =gScreenTransition
ldr r2, [r0]
movs r0, #3
ands r2, r0
@ -642,7 +642,7 @@ sub_0808D518: @ 0x0808D518
_0808D58A:
pop {r4, r5, r6, pc}
.align 2, 0
_0808D58C: .4byte gUnk_030010A0
_0808D58C: .4byte gScreenTransition
_0808D590: .4byte gScreen
_0808D594: .4byte 0x00004069
_0808D598: .4byte gRoomControls

8
asm/object43.s
View File

@ -240,7 +240,7 @@ _0808E084:
ldrh r0, [r5]
cmp r0, #0
beq _0808E0BC
ldr r0, _0808E0B8 @ =gUnk_030010A0
ldr r0, _0808E0B8 @ =gScreenTransition
ldr r1, [r0]
movs r0, #0x1f
ands r1, r0
@ -260,7 +260,7 @@ _0808E084:
strb r1, [r0]
b _0808E0E4
.align 2, 0
_0808E0B8: .4byte gUnk_030010A0
_0808E0B8: .4byte gScreenTransition
_0808E0BC:
ldr r0, _0808E140 @ =0x00000115
bl sub_08004488
@ -446,7 +446,7 @@ sub_0808E208: @ 0x0808E208
ldrb r0, [r0, #0x1b]
cmp r0, #0
beq _0808E248
ldr r0, _0808E244 @ =gUnk_030010A0
ldr r0, _0808E244 @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@ -464,7 +464,7 @@ sub_0808E208: @ 0x0808E208
b _0808E24C
.align 2, 0
_0808E240: .4byte gLinkState
_0808E244: .4byte gUnk_030010A0
_0808E244: .4byte gScreenTransition
_0808E248:
bl DeleteThisEntity
_0808E24C:

1244
asm/object48.s
View File

File diff suppressed because it is too large Load Diff

4
asm/object49.s
View File

@ -173,7 +173,7 @@ sub_0808F498: @ 0x0808F498
bl sub_0806F3E4
cmp r0, #0
beq _0808F4C2
ldr r0, _0808F4E4 @ =gUnk_030010A0
ldr r0, _0808F4E4 @ =gScreenTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@ -200,7 +200,7 @@ _0808F4D4:
bl DeleteThisEntity
b _0808F550
.align 2, 0
_0808F4E4: .4byte gUnk_030010A0
_0808F4E4: .4byte gScreenTransition
_0808F4E8: .4byte gLinkState
_0808F4EC:
movs r0, #1

8
asm/object6A.s
View File

@ -545,7 +545,7 @@ sub_08094E30: @ 0x08094E30
ldrb r0, [r4, #0xb]
cmp r0, #0
bne _08094E88
ldr r0, _08094E80 @ =gUnk_030010A0
ldr r0, _08094E80 @ =gScreenTransition
ldr r0, [r0]
movs r1, #0x1f
ands r0, r1
@ -577,7 +577,7 @@ _08094E5A:
strh r1, [r5, #0x32]
b _08094F94
.align 2, 0
_08094E80: .4byte gUnk_030010A0
_08094E80: .4byte gScreenTransition
_08094E84: .4byte gRoomControls
_08094E88:
cmp r0, #1
@ -1654,7 +1654,7 @@ _080956E2:
adds r0, r5, #0
bl GetNextFrame
ldrb r0, [r5, #0xb]
ldr r1, _08095724 @ =gUnk_030010A0
ldr r1, _08095724 @ =gScreenTransition
ldr r1, [r1]
adds r0, r0, r1
movs r1, #0xf
@ -1682,7 +1682,7 @@ _080956FE:
bl DeleteThisEntity
b _0809572C
.align 2, 0
_08095724: .4byte gUnk_030010A0
_08095724: .4byte gScreenTransition
_08095728:
bl DeleteThisEntity
_0809572C:

8
asm/object89.s
View File

@ -44,7 +44,7 @@ _0809AB22:
adds r1, r4, #0
bl CopyPosition
str r4, [r5, #0x54]
ldr r2, _0809AB68 @ =gUnk_030010A0
ldr r2, _0809AB68 @ =gScreenTransition
adds r0, r2, #0
adds r0, #0x38
ldrb r1, [r0]
@ -67,7 +67,7 @@ _0809AB52:
bl sub_080809D4
b _0809AB9C
.align 2, 0
_0809AB68: .4byte gUnk_030010A0
_0809AB68: .4byte gScreenTransition
_0809AB6C: .4byte gRoomControls
_0809AB70:
movs r0, #1
@ -253,7 +253,7 @@ sub_0809ACA0: @ 0x0809ACA0
ldr r1, [r2, #0x54]
movs r0, #6
strb r0, [r1, #0xd]
ldr r0, _0809ACC8 @ =gUnk_030010A0
ldr r0, _0809ACC8 @ =gScreenTransition
adds r0, #0x38
movs r1, #0xf1
strb r1, [r0]
@ -262,7 +262,7 @@ sub_0809ACA0: @ 0x0809ACA0
_0809ACC4:
pop {pc}
.align 2, 0
_0809ACC8: .4byte gUnk_030010A0
_0809ACC8: .4byte gScreenTransition
thumb_func_start sub_0809ACCC
sub_0809ACCC: @ 0x0809ACCC

20
asm/object8E.s
View File

@ -90,7 +90,7 @@ _0809B8D8:
ldrb r0, [r4, #0xf]
cmp r0, #0x1f
bhi _0809B914
ldr r5, _0809B90C @ =gUnk_030010A0
ldr r5, _0809B90C @ =gScreenTransition
ldr r0, [r5]
movs r1, #0x1f
ands r0, r1
@ -113,7 +113,7 @@ _0809B8F0:
bl sub_0809B97C
b _0809B972
.align 2, 0
_0809B90C: .4byte gUnk_030010A0
_0809B90C: .4byte gScreenTransition
_0809B910: .4byte 0x00000133
_0809B914:
movs r0, #2
@ -273,7 +273,7 @@ _0809BA40:
ldrb r0, [r4, #0xf]
cmp r0, #0
beq _0809BA7C
ldr r5, _0809BA74 @ =gUnk_030010A0
ldr r5, _0809BA74 @ =gScreenTransition
ldr r0, [r5]
movs r1, #0x1f
ands r0, r1
@ -296,7 +296,7 @@ _0809BA58:
bl sub_0809B97C
b _0809BAC2
.align 2, 0
_0809BA74: .4byte gUnk_030010A0
_0809BA74: .4byte gScreenTransition
_0809BA78: .4byte 0x00000133
_0809BA7C:
movs r0, #2
@ -436,7 +436,7 @@ _0809BB88:
ldrh r0, [r5]
cmp r0, #0xdf
bhi _0809BBC4
ldr r4, _0809BBBC @ =gUnk_030010A0
ldr r4, _0809BBBC @ =gScreenTransition
ldr r0, [r4]
movs r1, #0x1f
ands r0, r1
@ -456,7 +456,7 @@ _0809BBA6:
b _0809BC68
.align 2, 0
_0809BBB8: .4byte gScreen
_0809BBBC: .4byte gUnk_030010A0
_0809BBBC: .4byte gScreenTransition
_0809BBC0: .4byte 0x00000133
_0809BBC4:
movs r0, #2
@ -631,7 +631,7 @@ _0809BD20:
ldrb r0, [r4, #0xd]
cmp r0, #0
beq _0809BD64
ldr r6, _0809BD58 @ =gUnk_030010A0
ldr r6, _0809BD58 @ =gScreenTransition
ldr r0, [r6]
movs r1, #0x1f
ands r0, r1
@ -656,7 +656,7 @@ _0809BD38:
strh r0, [r1]
b _0809BDAE
.align 2, 0
_0809BD58: .4byte gUnk_030010A0
_0809BD58: .4byte gScreenTransition
_0809BD5C: .4byte 0x00000133
_0809BD60: .4byte gScreen
_0809BD64:
@ -753,7 +753,7 @@ _0809BE0C:
lsls r0, r0, #0x18
cmp r0, #0
beq _0809BE34
ldr r0, _0809BE2C @ =gUnk_030010A0
ldr r0, _0809BE2C @ =gScreenTransition
ldr r0, [r0]
movs r1, #0x1f
ands r0, r1
@ -763,7 +763,7 @@ _0809BE0C:
bl PlaySFX
b _0809BE70
.align 2, 0
_0809BE2C: .4byte gUnk_030010A0
_0809BE2C: .4byte gScreenTransition
_0809BE30: .4byte 0x00000133
_0809BE34:
movs r0, #2

16
asm/object91.s
View File

@ -463,7 +463,7 @@ _0809C74A:
ldrb r0, [r5, #0xf]
cmp r0, #0
beq _0809C7BC
ldr r0, _0809C7AC @ =gUnk_030010A0
ldr r0, _0809C7AC @ =gScreenTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@ -502,7 +502,7 @@ _0809C7A0:
b _0809C7BC
.align 2, 0
_0809C7A8: .4byte gUnk_08123DF8
_0809C7AC: .4byte gUnk_030010A0
_0809C7AC: .4byte gScreenTransition
_0809C7B0: .4byte 0xFFFFD000
_0809C7B4:
ldr r0, [r5, #0x50]
@ -776,7 +776,7 @@ sub_0809C988: @ 0x0809C988
strb r0, [r2, #0xb]
b _0809C9DC
_0809C9AC:
ldr r0, _0809C9C8 @ =gUnk_030010A0
ldr r0, _0809C9C8 @ =gScreenTransition
ldr r0, [r0]
movs r1, #8
ands r0, r1
@ -791,7 +791,7 @@ _0809C9AC:
subs r0, #4
b _0809C9DA
.align 2, 0
_0809C9C8: .4byte gUnk_030010A0
_0809C9C8: .4byte gScreenTransition
_0809C9CC:
adds r0, r2, #0
adds r0, #0x84
@ -810,7 +810,7 @@ _0809C9DC:
sub_0809C9E0: @ 0x0809C9E0
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
ldr r0, _0809CA04 @ =gUnk_030010A0
ldr r0, _0809CA04 @ =gScreenTransition
ldr r1, [r0]
movs r2, #2
ands r1, r2
@ -826,7 +826,7 @@ sub_0809C9E0: @ 0x0809C9E0
subs r0, #8
b _0809CA16
.align 2, 0
_0809CA04: .4byte gUnk_030010A0
_0809CA04: .4byte gScreenTransition
_0809CA08:
adds r2, r4, #0
adds r2, #0x84
@ -971,7 +971,7 @@ sub_0809CAC8: @ 0x0809CAC8
movs r0, #7
strb r0, [r5, #0xd]
_0809CB26:
ldr r0, _0809CB44 @ =gUnk_030010A0
ldr r0, _0809CB44 @ =gScreenTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@ -984,7 +984,7 @@ _0809CB38:
.align 2, 0
_0809CB3C: .4byte gRoomControls
_0809CB40: .4byte gLinkEntity
_0809CB44: .4byte gUnk_030010A0
_0809CB44: .4byte gScreenTransition
_0809CB48: .4byte 0x00000163
thumb_func_start sub_0809CB4C

4
asm/objectA8.s
View File

@ -283,7 +283,7 @@ _0809FCAC:
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _0809FCF8
ldr r0, _0809FCFC @ =gUnk_030010A0
ldr r0, _0809FCFC @ =gScreenTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@ -314,7 +314,7 @@ _0809FCE0:
_0809FCF8:
pop {r4, r5, pc}
.align 2, 0
_0809FCFC: .4byte gUnk_030010A0
_0809FCFC: .4byte gScreenTransition
thumb_func_start sub_0809FD00
sub_0809FD00: @ 0x0809FD00

8
asm/objectBA.s
View File

@ -133,7 +133,7 @@ _080A171E:
strh r1, [r0]
adds r0, #2
strh r1, [r0]
ldr r0, _080A1838 @ =gUnk_030010A0
ldr r0, _080A1838 @ =gScreenTransition
adds r0, #0x39
mov r2, sb
strb r2, [r0]
@ -173,7 +173,7 @@ _080A1828: .4byte gUnk_03003DBC
_080A182C: .4byte gRoomControls
_080A1830: .4byte gScreen
_080A1834: .4byte 0x00001E07
_080A1838: .4byte gUnk_030010A0
_080A1838: .4byte gScreenTransition
_080A183C: .4byte gLinkState
_080A1840: .4byte 0x80100000
_080A1844: .4byte gArea
@ -598,7 +598,7 @@ sub_080A1B4C: @ 0x080A1B4C
_080A1B80:
movs r6, #0
strh r7, [r5]
ldr r0, _080A1BF0 @ =gUnk_030010A0
ldr r0, _080A1BF0 @ =gScreenTransition
adds r0, #0x39
strb r6, [r0]
bl sub_08079F8C
@ -650,7 +650,7 @@ _080A1BD0:
strh r0, [r2, #0x18]
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A1BF0: .4byte gUnk_030010A0
_080A1BF0: .4byte gScreenTransition
_080A1BF4: .4byte gLinkEntity
_080A1BF8: .4byte gLinkState
_080A1BFC: .4byte 0xFFFDFFFF

40
asm/octorokBoss.s
View File

@ -333,7 +333,7 @@ _0803540E:
cmp r4, #0
bne _0803540E
_08035438:
ldr r1, _080354AC @ =gUnk_030010A0
ldr r1, _080354AC @ =gScreenTransition
ldr r0, [r1]
movs r1, #2
ands r0, r1
@ -387,7 +387,7 @@ _08035456:
bl InitAnimationForceUpdate
b _080354DC
.align 2, 0
_080354AC: .4byte gUnk_030010A0
_080354AC: .4byte gScreenTransition
_080354B0:
adds r1, r5, #0
adds r1, #0x3f
@ -635,7 +635,7 @@ _08035616:
ldrb r0, [r1]
cmp r0, #0
bne _080356EC
ldr r0, _080356E8 @ =gUnk_030010A0
ldr r0, _080356E8 @ =gScreenTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@ -677,7 +677,7 @@ _080356B2:
b _080356F0
.align 2, 0
_080356E4: .4byte gSineTable
_080356E8: .4byte gUnk_030010A0
_080356E8: .4byte gScreenTransition
_080356EC:
subs r0, #1
strb r0, [r1]
@ -1749,7 +1749,7 @@ _08035F16:
beq _08035F48
subs r0, #1
strb r0, [r1, #6]
ldr r0, _08035F74 @ =gUnk_030010A0
ldr r0, _08035F74 @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@ -1781,7 +1781,7 @@ _08035F6C:
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08035F74: .4byte gUnk_030010A0
_08035F74: .4byte gScreenTransition
_08035F78: .4byte gUnk_080CF0C4
thumb_func_start sub_08035F7C
@ -2273,7 +2273,7 @@ _08036300:
sub_08036304: @ 0x08036304
push {lr}
mov ip, r0
ldr r0, _08036328 @ =gUnk_030010A0
ldr r0, _08036328 @ =gScreenTransition
ldr r0, [r0]
movs r1, #2
ands r0, r1
@ -2289,7 +2289,7 @@ sub_08036304: @ 0x08036304
strh r0, [r1]
b _08036350
.align 2, 0
_08036328: .4byte gUnk_030010A0
_08036328: .4byte gScreenTransition
_0803632C:
mov r2, ip
adds r2, #0x84
@ -2483,7 +2483,7 @@ _080364A4:
ands r1, r0
str r1, [r2, #0x30]
_080364AA:
ldr r0, _080364C8 @ =gUnk_030010A0
ldr r0, _080364C8 @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@ -2497,7 +2497,7 @@ _080364AA:
b _0803657A
.align 2, 0
_080364C4: .4byte 0xFFFFF7FF
_080364C8: .4byte gUnk_030010A0
_080364C8: .4byte gScreenTransition
_080364CC:
adds r0, r4, #0
adds r0, #0x7c
@ -2726,7 +2726,7 @@ _08036678:
movs r0, #1
rsbs r0, r0, #0
bl sub_0805308C
ldr r0, _080366B0 @ =gUnk_030010A0
ldr r0, _080366B0 @ =gScreenTransition
ldr r1, [r0]
movs r0, #3
ands r0, r1
@ -2748,7 +2748,7 @@ _080366A0:
_080366AC:
pop {r4, r5, pc}
.align 2, 0
_080366B0: .4byte gUnk_030010A0
_080366B0: .4byte gScreenTransition
thumb_func_start sub_080366B4
sub_080366B4: @ 0x080366B4
@ -2770,7 +2770,7 @@ sub_080366B4: @ 0x080366B4
_080366D4:
subs r0, #1
strb r0, [r2]
ldr r0, _08036708 @ =gUnk_030010A0
ldr r0, _08036708 @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@ -2795,7 +2795,7 @@ _080366D4:
_08036706:
pop {r4, pc}
.align 2, 0
_08036708: .4byte gUnk_030010A0
_08036708: .4byte gScreenTransition
thumb_func_start sub_0803670C
sub_0803670C: @ 0x0803670C
@ -2816,7 +2816,7 @@ sub_0803670C: @ 0x0803670C
beq _08036746
subs r0, #1
strb r0, [r1, #6]
ldr r0, _08036760 @ =gUnk_030010A0
ldr r0, _08036760 @ =gScreenTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@ -2839,7 +2839,7 @@ _08036746:
pop {r4, pc}
.align 2, 0
_0803675C: .4byte gUnk_080CF100
_08036760: .4byte gUnk_030010A0
_08036760: .4byte gScreenTransition
thumb_func_start sub_08036764
sub_08036764: @ 0x08036764
@ -2963,7 +2963,7 @@ _0803683A:
movs r0, #0
strb r0, [r1]
_08036852:
ldr r0, _08036868 @ =gUnk_030010A0
ldr r0, _08036868 @ =gScreenTransition
ldr r0, [r0]
movs r1, #0x1f
ands r0, r1
@ -2974,7 +2974,7 @@ _08036852:
_08036864:
pop {r4, r5, pc}
.align 2, 0
_08036868: .4byte gUnk_030010A0
_08036868: .4byte gScreenTransition
_0803686C: .4byte 0x00000159
thumb_func_start sub_08036870
@ -3953,7 +3953,7 @@ _08036FA8:
sub_08036FAC: @ 0x08036FAC
push {lr}
adds r2, r0, #0
ldr r0, _08036FD0 @ =gUnk_030010A0
ldr r0, _08036FD0 @ =gScreenTransition
ldr r0, [r0]
ands r0, r1
cmp r0, #0
@ -3969,7 +3969,7 @@ sub_08036FAC: @ 0x08036FAC
bl PlaySFX
b _08036FDE
.align 2, 0
_08036FD0: .4byte gUnk_030010A0
_08036FD0: .4byte gScreenTransition
_08036FD4: .4byte 0x00000163
_08036FD8:
ldr r0, _08036FE0 @ =0x000001B1

4
asm/peahat.s
View File

@ -469,7 +469,7 @@ _080202B4:
adds r0, #4
strh r0, [r4, #0x24]
_080202C8:
ldr r0, _080202F0 @ =gUnk_030010A0
ldr r0, _080202F0 @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@ -487,7 +487,7 @@ _080202E6:
bl sub_080AEFE0
b _080202FE
.align 2, 0
_080202F0: .4byte gUnk_030010A0
_080202F0: .4byte gScreenTransition
_080202F4: .4byte gUnk_020000B0
_080202F8:
adds r0, r4, #0

16
asm/picolyteBottles.s
View File

@ -65,7 +65,7 @@ sub_0806DF00: @ 0x0806DF00
adds r0, #2
movs r1, #0xa
strh r1, [r0]
ldr r0, _0806DF58 @ =gUnk_030010A0
ldr r0, _0806DF58 @ =gScreenTransition
strh r1, [r0, #6]
adds r0, r4, #0
bl sub_0806E014
@ -73,7 +73,7 @@ sub_0806DF00: @ 0x0806DF00
bl sub_0807DD50
b _0806DF6E
.align 2, 0
_0806DF58: .4byte gUnk_030010A0
_0806DF58: .4byte gScreenTransition
_0806DF5C:
ldr r0, _0806DF70 @ =gUnk_080FD150
str r0, [r4, #0x48]
@ -389,7 +389,7 @@ _0806E1AC:
ldr r0, _0806E1D4 @ =0x0000421C
bl TextboxNoOverlapFollow
_0806E1C0:
ldr r1, _0806E1D8 @ =gUnk_030010A0
ldr r1, _0806E1D8 @ =gScreenTransition
ldrh r0, [r4]
strh r0, [r1, #6]
ldr r2, _0806E1DC @ =gUnk_02033280
@ -400,7 +400,7 @@ _0806E1C0:
pop {r4, r5, pc}
.align 2, 0
_0806E1D4: .4byte 0x0000421C
_0806E1D8: .4byte gUnk_030010A0
_0806E1D8: .4byte gScreenTransition
_0806E1DC: .4byte gUnk_02033280
thumb_func_start sub_0806E1E0
@ -428,7 +428,7 @@ _0806E208: .4byte gUnk_0813AD4C
thumb_func_start sub_0806E20C
sub_0806E20C: @ 0x0806E20C
push {r4, lr}
ldr r4, _0806E224 @ =gUnk_030010A0
ldr r4, _0806E224 @ =gScreenTransition
ldrh r0, [r4, #6]
cmp r0, #0
beq _0806E230
@ -439,7 +439,7 @@ sub_0806E20C: @ 0x0806E20C
str r0, [r1, #0x10]
b _0806E236
.align 2, 0
_0806E224: .4byte gUnk_030010A0
_0806E224: .4byte gScreenTransition
_0806E228: .4byte 0x0000421F
_0806E22C: .4byte gTextBox
_0806E230:
@ -453,7 +453,7 @@ _0806E238: .4byte 0x00004220
thumb_func_start sub_0806E23C
sub_0806E23C: @ 0x0806E23C
push {lr}
ldr r1, _0806E24C @ =gUnk_030010A0
ldr r1, _0806E24C @ =gScreenTransition
ldrh r0, [r1, #6]
cmp r0, #0
beq _0806E24A
@ -461,7 +461,7 @@ sub_0806E23C: @ 0x0806E23C
_0806E24A:
pop {pc}
.align 2, 0
_0806E24C: .4byte gUnk_030010A0
_0806E24C: .4byte gScreenTransition
thumb_func_start sub_0806E250
sub_0806E250: @ 0x0806E250

12
asm/rem.s
View File

@ -421,7 +421,7 @@ _0806A6E4:
strb r1, [r0]
b _0806A75A
_0806A724:
ldr r0, _0806A780 @ =gUnk_030010A0
ldr r0, _0806A780 @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@ -469,9 +469,9 @@ _0806A75A:
strb r1, [r0]
b _0806A82A
.align 2, 0
_0806A780: .4byte gUnk_030010A0
_0806A780: .4byte gScreenTransition
_0806A784:
ldr r0, _0806A7C4 @ =gUnk_030010A0
ldr r0, _0806A7C4 @ =gScreenTransition
ldr r0, [r0]
lsrs r0, r0, #4
movs r1, #3
@ -506,7 +506,7 @@ _0806A7BA:
strb r0, [r3]
b _0806A82A
.align 2, 0
_0806A7C4: .4byte gUnk_030010A0
_0806A7C4: .4byte gScreenTransition
_0806A7C8:
adds r2, r4, #0
adds r2, #0x29
@ -835,7 +835,7 @@ sub_0806AA18: @ 0x0806AA18
.align 2, 0
_0806AA28: .4byte 0x00004408
_0806AA2C:
ldr r0, _0806AA48 @ =gUnk_030010A0
ldr r0, _0806AA48 @ =gScreenTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@ -849,7 +849,7 @@ _0806AA3C:
bl TextboxNoOverlap
pop {pc}
.align 2, 0
_0806AA48: .4byte gUnk_030010A0
_0806AA48: .4byte gScreenTransition
_0806AA4C: .4byte 0x0000440D
thumb_func_start sub_0806AA50

4
asm/sturgeon.s
View File

@ -275,7 +275,7 @@ sub_08064C9C: @ 0x08064C9C
ldrb r0, [r2, #0xe]
cmp r0, #0
beq _08064CB8
ldr r0, _08064CBC @ =gUnk_030010A0
ldr r0, _08064CBC @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@ -286,7 +286,7 @@ sub_08064C9C: @ 0x08064C9C
_08064CB8:
pop {pc}
.align 2, 0
_08064CBC: .4byte gUnk_030010A0
_08064CBC: .4byte gScreenTransition
thumb_func_start sub_08064CC0
sub_08064CC0: @ 0x08064CC0

4
asm/updateBackgroundRegisters.s
View File

@ -5,8 +5,8 @@
.text
thumb_func_start sub_08016CF4
sub_08016CF4: @ 0x08016CF4
thumb_func_start UpdateBackgroundRegisters
UpdateBackgroundRegisters: @ 0x08016CF4
ldr r3, _08016DF0 @ =gScreen
ldrh r1, [r3]
ldrh r0, [r3, #6]

4
asm/vaati.s
View File

@ -78,7 +78,7 @@ sub_08066ACC: @ 0x08066ACC
asrs r0, r0, #0x18
cmp r0, #0
beq _08066AF6
ldr r0, _08066B1C @ =gUnk_030010A0
ldr r0, _08066B1C @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@ -105,7 +105,7 @@ _08066AF6:
b _08066B66
.align 2, 0
_08066B18: .4byte sub_08066B74
_08066B1C: .4byte gUnk_030010A0
_08066B1C: .4byte gScreenTransition
_08066B20:
cmp r2, #3
beq _08066B40

40
asm/vaatiArm.s
View File

@ -75,7 +75,7 @@ sub_080425B4: @ 0x080425B4
strb r1, [r0]
adds r0, #1
strb r1, [r0]
ldr r5, _08042614 @ =gUnk_030010A0
ldr r5, _08042614 @ =gScreenTransition
adds r0, r5, #0
adds r0, #0x38
ldrb r0, [r0]
@ -109,7 +109,7 @@ sub_080425B4: @ 0x080425B4
strb r0, [r4, #0xd]
b _0804264C
.align 2, 0
_08042614: .4byte gUnk_030010A0
_08042614: .4byte gScreenTransition
_08042618:
movs r0, #8
strb r0, [r4, #0xc]
@ -2479,7 +2479,7 @@ sub_08043770: @ 0x08043770
bne _080437D8
ldr r0, [r2, #0x64]
ldr r3, [r0, #0x14]
ldr r0, _080437AC @ =gUnk_030010A0
ldr r0, _080437AC @ =gScreenTransition
adds r5, r0, #0
adds r5, #0x39
ldrb r1, [r5]
@ -2499,7 +2499,7 @@ _0804379A:
movs r0, #0xfe
b _080437B8
.align 2, 0
_080437AC: .4byte gUnk_030010A0
_080437AC: .4byte gScreenTransition
_080437B0:
ldr r0, [r3, #0x64]
str r4, [r0, #0x18]
@ -3173,7 +3173,7 @@ sub_08043C98: @ 0x08043C98
_08043CB4:
adds r0, r3, #0
bl sub_08043D08
ldr r0, _08043CCC @ =gUnk_030010A0
ldr r0, _08043CCC @ =gScreenTransition
adds r0, #0x38
ldrb r2, [r0]
movs r1, #2
@ -3182,7 +3182,7 @@ _08043CB4:
movs r0, #1
b _08043CD2
.align 2, 0
_08043CCC: .4byte gUnk_030010A0
_08043CCC: .4byte gScreenTransition
_08043CD0:
movs r0, #0
_08043CD2:
@ -3332,7 +3332,7 @@ sub_08043DB0: @ 0x08043DB0
beq _08043EAC
ldr r0, _08043E50 @ =gUnk_080D13EC
bl DoExitTransition
ldr r4, _08043E54 @ =gUnk_030010A0
ldr r4, _08043E54 @ =gScreenTransition
adds r0, r4, #0
adds r0, #0x39
ldrb r1, [r0]
@ -3382,7 +3382,7 @@ _08043DFE:
_08043E48: .4byte gLinkState
_08043E4C: .4byte gRoomControls
_08043E50: .4byte gUnk_080D13EC
_08043E54: .4byte gUnk_030010A0
_08043E54: .4byte gScreenTransition
_08043E58:
movs r1, #0x88
lsls r1, r1, #1
@ -3401,7 +3401,7 @@ _08043E70:
ldr r3, [r0, #0x18]
cmp r3, #0
beq _08043E90
ldr r1, _08043E8C @ =gUnk_030010A0
ldr r1, _08043E8C @ =gScreenTransition
ldrh r2, [r3, #0x2e]
adds r0, r1, #0
adds r0, #0x48
@ -3411,9 +3411,9 @@ _08043E70:
strh r0, [r1]
b _08043EAC
.align 2, 0
_08043E8C: .4byte gUnk_030010A0
_08043E8C: .4byte gScreenTransition
_08043E90:
ldr r2, _08043EB0 @ =gUnk_030010A0
ldr r2, _08043EB0 @ =gScreenTransition
ldr r3, _08043EB4 @ =gRoomControls
movs r1, #0x88
lsls r1, r1, #1
@ -3430,7 +3430,7 @@ _08043E90:
_08043EAC:
pop {r4, r5, r6, pc}
.align 2, 0
_08043EB0: .4byte gUnk_030010A0
_08043EB0: .4byte gScreenTransition
_08043EB4: .4byte gRoomControls
thumb_func_start sub_08043EB8
@ -3521,14 +3521,14 @@ sub_08043EB8: @ 0x08043EB8
ldrb r0, [r7, #0xb]
cmp r0, #0
bne _08043F74
ldr r1, _08043F70 @ =gUnk_030010A0
ldr r1, _08043F70 @ =gScreenTransition
adds r0, r1, #0
adds r0, #0x44
b _08043F7A
.align 2, 0
_08043F70: .4byte gUnk_030010A0
_08043F70: .4byte gScreenTransition
_08043F74:
ldr r1, _08043F8C @ =gUnk_030010A0
ldr r1, _08043F8C @ =gScreenTransition
adds r0, r1, #0
adds r0, #0x48
_08043F7A:
@ -3541,7 +3541,7 @@ _08043F7A:
adds r0, #0x46
b _08043F94
.align 2, 0
_08043F8C: .4byte gUnk_030010A0
_08043F8C: .4byte gScreenTransition
_08043F90:
adds r0, r1, #0
adds r0, #0x4a
@ -3673,7 +3673,7 @@ sub_08044078: @ 0x08044078
ldrb r0, [r4, #0xa]
cmp r0, #3
bne _080440AC
ldr r3, _080440B8 @ =gUnk_030010A0
ldr r3, _080440B8 @ =gScreenTransition
adds r0, r3, #0
adds r0, #0x38
ldrb r1, [r0]
@ -3695,7 +3695,7 @@ _080440AC:
bl InitializeAnimation
b _080440C4
.align 2, 0
_080440B8: .4byte gUnk_030010A0
_080440B8: .4byte gScreenTransition
_080440BC:
adds r0, r4, #0
movs r1, #0x11
@ -3714,7 +3714,7 @@ sub_080440CC: @ 0x080440CC
bne _08044110
movs r0, #1
strb r0, [r4, #0xc]
ldr r2, _08044104 @ =gUnk_030010A0
ldr r2, _08044104 @ =gScreenTransition
adds r1, r2, #0
adds r1, #0x38
ldrb r1, [r1]
@ -3734,7 +3734,7 @@ sub_080440CC: @ 0x080440CC
bl InitializeAnimation
b _08044110
.align 2, 0
_08044104: .4byte gUnk_030010A0
_08044104: .4byte gScreenTransition
_08044108:
adds r0, r4, #0
movs r1, #0x11

12
asm/vaatiEyesMacro.s
View File

@ -60,7 +60,7 @@ sub_0802ECC0: @ 0x0802ECC0
adds r0, #0x45
ldrb r1, [r0]
adds r5, r0, #0
ldr r3, _0802ED00 @ =gUnk_030010A0
ldr r3, _0802ED00 @ =gScreenTransition
cmp r1, #0
bne _0802ECEE
adds r2, r3, #0
@ -84,7 +84,7 @@ _0802ECEE:
adds r0, #0x3a
b _0802ED0E
.align 2, 0
_0802ED00: .4byte gUnk_030010A0
_0802ED00: .4byte gScreenTransition
_0802ED04: .4byte gRoomControls
_0802ED08:
ldrb r1, [r5]
@ -187,15 +187,15 @@ sub_0802ED8C: @ 0x0802ED8C
ldrb r0, [r0, #5]
cmp r0, #0
bne _0802EDDC
ldr r0, _0802EDD8 @ =gUnk_030010A0
ldr r0, _0802EDD8 @ =gScreenTransition
adds r0, #0x3a
b _0802EDE0
.align 2, 0
_0802EDD0: .4byte gUnk_03003DBC
_0802EDD4: .4byte gRoomControls
_0802EDD8: .4byte gUnk_030010A0
_0802EDD8: .4byte gScreenTransition
_0802EDDC:
ldr r0, _0802EE0C @ =gUnk_030010A0
ldr r0, _0802EE0C @ =gScreenTransition
adds r0, #0x3b
_0802EDE0:
ldrb r0, [r0]
@ -218,7 +218,7 @@ _0802EDE0:
_0802EE0A:
pop {r4, pc}
.align 2, 0
_0802EE0C: .4byte gUnk_030010A0
_0802EE0C: .4byte gScreenTransition
thumb_func_start sub_0802EE10
sub_0802EE10: @ 0x0802EE10

4
asm/vaatiProjectile.s
View File

@ -557,7 +557,7 @@ _0803E49E:
sub_0803E4A0: @ 0x0803E4A0
push {lr}
adds r1, r0, #0
ldr r0, _0803E4B8 @ =gUnk_030010A0
ldr r0, _0803E4B8 @ =gScreenTransition
adds r0, #0x39
ldrb r0, [r0]
cmp r0, #0
@ -568,7 +568,7 @@ sub_0803E4A0: @ 0x0803E4A0
movs r0, #0
b _0803E4D6
.align 2, 0
_0803E4B8: .4byte gUnk_030010A0
_0803E4B8: .4byte gScreenTransition
_0803E4BC:
adds r0, r1, #0
adds r0, #0x45

28
asm/vaatiWrath.s
View File

@ -82,7 +82,7 @@ _080413BC: .4byte gUnk_080D0E2C
sub_080413C0: @ 0x080413C0
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
ldr r7, _080413F8 @ =gUnk_030010A0
ldr r7, _080413F8 @ =gScreenTransition
adds r0, r7, #0
adds r0, #0x38
ldrb r0, [r0]
@ -107,14 +107,14 @@ sub_080413C0: @ 0x080413C0
strb r6, [r4, #0xd]
b _08041404
.align 2, 0
_080413F8: .4byte gUnk_030010A0
_080413F8: .4byte gScreenTransition
_080413FC:
movs r0, #2
strb r0, [r4, #0xc]
movs r0, #0x3c
strb r0, [r4, #0xe]
_08041404:
ldr r0, _0804141C @ =gUnk_030010A0
ldr r0, _0804141C @ =gScreenTransition
adds r1, r0, #0
adds r1, #0x40
ldrh r1, [r1]
@ -126,7 +126,7 @@ _08041404:
bl sub_08042004
b _0804144A
.align 2, 0
_0804141C: .4byte gUnk_030010A0
_0804141C: .4byte gScreenTransition
_08041420:
adds r0, r4, #0
bl sub_08041ED4
@ -315,7 +315,7 @@ _08041592:
strb r0, [r4, #0xd]
movs r0, #0x1e
strb r0, [r4, #0xe]
ldr r1, _080415BC @ =gUnk_030010A0
ldr r1, _080415BC @ =gScreenTransition
adds r1, #0x38
ldrb r2, [r1]
movs r0, #1
@ -330,7 +330,7 @@ _08041592:
strb r1, [r0]
b _080415E6
.align 2, 0
_080415BC: .4byte gUnk_030010A0
_080415BC: .4byte gScreenTransition
_080415C0: .4byte gRoomControls
_080415C4: .4byte gLinkEntity
_080415C8: .4byte gLinkState
@ -540,7 +540,7 @@ _08041748:
adds r2, r1, #0
cmp r2, #2
bne _080417AA
ldr r0, _0804179C @ =gUnk_030010A0
ldr r0, _0804179C @ =gScreenTransition
adds r0, #0x39
ldrb r1, [r0]
movs r0, #3
@ -572,7 +572,7 @@ _08041748:
bl InitializeAnimation
b _080417AA
.align 2, 0
_0804179C: .4byte gUnk_030010A0
_0804179C: .4byte gScreenTransition
_080417A0: .4byte gRoomControls
_080417A4:
strb r2, [r5, #0xc]
@ -1580,7 +1580,7 @@ _08041F88: .4byte gUnk_03003DBC
_08041F8C:
ldr r7, [r5, #0x64]
movs r4, #0
ldr r0, _08041FC0 @ =gUnk_030010A0
ldr r0, _08041FC0 @ =gScreenTransition
adds r0, #0x39
ldrb r0, [r0]
asrs r0, r6
@ -1603,7 +1603,7 @@ _08041FB6:
str r4, [r7, #0x14]
b _08041FC6
.align 2, 0
_08041FC0: .4byte gUnk_030010A0
_08041FC0: .4byte gScreenTransition
_08041FC4:
str r4, [r7, #0x18]
_08041FC6:
@ -1895,7 +1895,7 @@ _080421C0:
ands r0, r5
cmp r0, #0
beq _080421F4
ldr r0, _080421F0 @ =gUnk_030010A0
ldr r0, _080421F0 @ =gScreenTransition
adds r0, #0x39
ldrb r1, [r0]
movs r0, #0xc
@ -1907,7 +1907,7 @@ _080421C0:
strb r5, [r6]
b _08042212
.align 2, 0
_080421F0: .4byte gUnk_030010A0
_080421F0: .4byte gScreenTransition
_080421F4:
adds r1, r4, #0
adds r1, #0x7e
@ -2133,7 +2133,7 @@ sub_0804235C: @ 0x0804235C
thumb_func_start sub_080423A4
sub_080423A4: @ 0x080423A4
push {r4, lr}
ldr r0, _080423CC @ =gUnk_030010A0
ldr r0, _080423CC @ =gScreenTransition
adds r4, r0, #0
adds r4, #0x38
ldrb r1, [r4]
@ -2152,7 +2152,7 @@ sub_080423A4: @ 0x080423A4
str r0, [r1]
b _0804241C
.align 2, 0
_080423CC: .4byte gUnk_030010A0
_080423CC: .4byte gScreenTransition
_080423D0: .4byte gUnk_02002A40
_080423D4:
ldr r2, _08042420 @ =gLinkState

4
asm/warpPoint.s
View File

@ -317,7 +317,7 @@ sub_0808B684: @ 0x0808B684
lsrs r2, r0, #0x18
cmp r2, #0
bne _0808B6E8
ldr r3, _0808B6E4 @ =gUnk_030010A0
ldr r3, _0808B6E4 @ =gScreenTransition
movs r0, #1
strb r0, [r3, #8]
strb r2, [r3, #9]
@ -355,7 +355,7 @@ sub_0808B684: @ 0x0808B684
strb r0, [r3, #9]
b _0808B736
.align 2, 0
_0808B6E4: .4byte gUnk_030010A0
_0808B6E4: .4byte gScreenTransition
_0808B6E8:
movs r0, #0x60
ands r0, r1

28
asm/windTribeTeleporter.s
View File

@ -162,12 +162,12 @@ _080A1038:
bl PlaySFX
b _080A10D4
_080A1056:
ldr r0, _080A1060 @ =gUnk_030010A0
ldr r0, _080A1060 @ =gScreenTransition
ldr r0, [r0]
movs r1, #7
b _080A10C2
.align 2, 0
_080A1060: .4byte gUnk_030010A0
_080A1060: .4byte gScreenTransition
_080A1064:
ldrb r0, [r4, #0xe]
subs r0, #1
@ -183,11 +183,11 @@ _080A1070:
strb r0, [r4, #0xe]
b _080A10D4
_080A107C:
ldr r0, _080A1084 @ =gUnk_030010A0
ldr r0, _080A1084 @ =gScreenTransition
ldr r0, [r0]
b _080A10C2
.align 2, 0
_080A1084: .4byte gUnk_030010A0
_080A1084: .4byte gScreenTransition
_080A1088:
ldrb r0, [r4, #0xe]
subs r0, #1
@ -214,7 +214,7 @@ _080A10A2:
_080A10B4: .4byte gRoomControls
_080A10B8: .4byte gUnk_0813ADEC
_080A10BC:
ldr r0, _080A10D8 @ =gUnk_030010A0
ldr r0, _080A10D8 @ =gScreenTransition
ldr r0, [r0]
movs r1, #1
_080A10C2:
@ -230,7 +230,7 @@ _080A10C2:
_080A10D4:
pop {r4, pc}
.align 2, 0
_080A10D8: .4byte gUnk_030010A0
_080A10D8: .4byte gScreenTransition
_080A10DC: .4byte gLinkEntity
thumb_func_start sub_080A10E0
@ -266,11 +266,11 @@ _080A110E:
lsls r0, r0, #0x18
cmp r0, #0
beq _080A1130
ldr r0, _080A1120 @ =gUnk_030010A0
ldr r0, _080A1120 @ =gScreenTransition
ldr r0, [r0]
b _080A1162
.align 2, 0
_080A1120: .4byte gUnk_030010A0
_080A1120: .4byte gScreenTransition
_080A1124:
ldrb r0, [r2, #0xe]
subs r0, #1
@ -286,12 +286,12 @@ _080A1130:
strb r0, [r2, #0xe]
b _080A11BA
_080A113C:
ldr r0, _080A1144 @ =gUnk_030010A0
ldr r0, _080A1144 @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
b _080A1162
.align 2, 0
_080A1144: .4byte gUnk_030010A0
_080A1144: .4byte gScreenTransition
_080A1148:
ldrb r0, [r2, #0xe]
subs r0, #1
@ -304,7 +304,7 @@ _080A1148:
strb r0, [r2, #0xd]
b _080A11BA
_080A115C:
ldr r0, _080A1178 @ =gUnk_030010A0
ldr r0, _080A1178 @ =gScreenTransition
ldr r0, [r0]
movs r1, #7
_080A1162:
@ -319,14 +319,14 @@ _080A1162:
strb r1, [r0, #0x14]
b _080A11BA
.align 2, 0
_080A1178: .4byte gUnk_030010A0
_080A1178: .4byte gScreenTransition
_080A117C: .4byte gLinkEntity
_080A1180:
ldr r4, _080A11A0 @ =gLinkEntity
ldrb r3, [r4, #0x14]
cmp r3, #4
beq _080A11A8
ldr r0, _080A11A4 @ =gUnk_030010A0
ldr r0, _080A11A4 @ =gScreenTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@ -339,7 +339,7 @@ _080A1180:
b _080A11BA
.align 2, 0
_080A11A0: .4byte gLinkEntity
_080A11A4: .4byte gUnk_030010A0
_080A11A4: .4byte gScreenTransition
_080A11A8:
movs r0, #0
movs r1, #1

16
asm/wizzrobeIce.s
View File

@ -394,7 +394,7 @@ _080300C0: .4byte gUnk_0300110C
thumb_func_start sub_080300C4
sub_080300C4: @ 0x080300C4
push {lr}
ldr r2, _080300E4 @ =gUnk_030010A0
ldr r2, _080300E4 @ =gScreenTransition
adds r0, r2, #0
adds r0, #0xae
ldrh r0, [r0]
@ -410,12 +410,12 @@ sub_080300C4: @ 0x080300C4
_080300E2:
pop {pc}
.align 2, 0
_080300E4: .4byte gUnk_030010A0
_080300E4: .4byte gScreenTransition
thumb_func_start sub_080300E8
sub_080300E8: @ 0x080300E8
push {lr}
ldr r1, _08030110 @ =gUnk_030010A0
ldr r1, _08030110 @ =gScreenTransition
adds r3, r1, #0
adds r3, #0xae
ldrh r0, [r3]
@ -435,14 +435,14 @@ sub_080300E8: @ 0x080300E8
_0803010C:
pop {pc}
.align 2, 0
_08030110: .4byte gUnk_030010A0
_08030110: .4byte gScreenTransition
_08030114: .4byte gLinkEntity
thumb_func_start sub_08030118
sub_08030118: @ 0x08030118
push {lr}
adds r2, r0, #0
ldr r0, _0803013C @ =gUnk_030010A0
ldr r0, _0803013C @ =gScreenTransition
adds r0, #0xac
ldrh r0, [r0]
asrs r0, r2
@ -457,7 +457,7 @@ sub_08030118: @ 0x08030118
bl SetLocalFlagByOffset
b _0803014C
.align 2, 0
_0803013C: .4byte gUnk_030010A0
_0803013C: .4byte gScreenTransition
_08030140:
movs r0, #0xc0
lsls r0, r0, #2
@ -472,7 +472,7 @@ _0803014C:
sub_08030150: @ 0x08030150
push {r4, r5, lr}
mov ip, r0
ldr r2, _08030194 @ =gUnk_030010A0
ldr r2, _08030194 @ =gScreenTransition
adds r5, r2, #0
adds r5, #0xac
mov r3, ip
@ -504,4 +504,4 @@ sub_08030150: @ 0x08030150
strh r1, [r0]
pop {r4, r5, pc}
.align 2, 0
_08030194: .4byte gUnk_030010A0
_08030194: .4byte gScreenTransition

13
include/entity.h
View File

@ -27,7 +27,7 @@ typedef struct {
typedef struct Entity {
/*0x00*/ u32* field_0x0;
/*0x04*/ u32* field_0x4;
/*0x04*/ struct Entity* field_0x4;
/*0x08*/ EntityType entityType;
/*0x0c*/ u8 action;
/*0x0d*/ u8 previousActionFlag;
@ -124,13 +124,11 @@ typedef struct Entity {
/*0x5c*/ Frame* animPtr;
/*0x60*/ u16 spriteVramOffset;
/*0x62*/ u8 spriteOffsetX;
/*0x64*/ u8 spriteOffsetY;
/*0x63*/ u8 spriteOffsetY;
/*0x64*/ u32* otherEntity;
/*0x68*/ u8 field_0x68;
/*0x69*/ u8 field_0x69;
/*0x68*/ union SplitHWord field_0x68;
/*0x6a*/ union SplitHWord field_0x6a;
/*0x6c*/ u8 field_0x6c;
/*0x6d*/ u8 field_0x6d;
/*0x6c*/ union SplitHWord field_0x6c;
/*0x6e*/ u8 filler4[2];
/*0x70*/ union SplitWord field_0x70;
/*0x74*/ u16 field_0x74;
@ -171,4 +169,7 @@ extern void SetSpriteSubEntryOffsetData2(Entity*, u32, u32);
extern u32 GetFacingDirection(Entity*, Entity*);
extern void DeleteThisEntity();
extern Entity gUnk_03003DA0;
#endif

16
include/functions.h
View File

@ -6,6 +6,7 @@
#include "entity.h"
#include "position.h"
#include "link.h"
#include "structures.h"
// Identified - to be sorted into header files
extern u32 Random(void);
@ -39,6 +40,7 @@ extern void UpdateAnimationVariableFrames(Entity*, u32);
extern void CopyPositionAndSpriteOffset(Entity*, Entity*);
extern u8* GetSpriteSubEntryOffsetDataPointer(u32, u32);
extern u32 LoadFixedGFX(Entity*, u32);
extern void ExecuteScriptCommandSet(Entity*, void *);
// Unidentified
extern void sub_0806ED78(Entity*);
@ -204,4 +206,18 @@ extern u32 sub_0800445C(Entity*);
extern void sub_0807A108(void);
extern void sub_0801766C(Entity*);
extern void sub_08004168(Entity*);
extern u32 sub_08052638(u32);
extern void sub_0805616C();
extern u32 sub_0807CF08(u32, u8*);
extern void sub_0807CF48(u32);
extern u32 sub_0807CF10(u8 *);
extern void sub_08056208();
extern void sub_08050384();
extern void sub_080B1520(u32);
extern struct_0807D1C4* sub_0807D1C4(u32);
extern u32 sub_0807D24C(u32, char*, u32);
extern void sub_0807CF68(u32);
extern void sub_0807D20C(u32, char*, u32);
extern u32 sub_0807CF88(u32, u8*);
extern u32 sub_0807D008(u32, void*);
#endif

20
include/global.h
View File

@ -47,23 +47,21 @@
#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) >= (b) ? (a) : (b))
struct Coords16
{
s16 x;
s16 y;
} PACKED;
struct UCoords16
{
u16 x;
u16 y;
};
typedef union {
s32 WORD;
struct {
s16 x, y;
} HALF;
} Coords;
union SplitWord {
s32 WORD;
struct {
s16 LO, HI;
} HALF;
struct {
u8 byte0, byte1, byte2, byte3;
} BYTES;
};
union SplitHWord {

1
include/main.h
View File

@ -45,7 +45,6 @@ extern UI gUnk_02032EC0;
extern s32 sub_08055F70();
extern s32 sub_080A3204(s32);
extern s32 sub_0805616C(s32);
extern s32 sub_0807CE90(s32);
extern s32 sub_080560B8(s32);
extern void sub_08056208(s32);

12
include/menu.h
View File

@ -27,9 +27,15 @@ typedef struct {
u8 overlayType;
u8 storyPanelIndex;
u16 transitionTimer;
u8 field_0xa[8];
u8 field_0x11;
u8 field_0x12[0x16];
u16 field_0xa;
u8 field_0xc[0x4];
u8 unk10[2];
u8 field_0x12;
u8 unk13;
u8 filler14[0x2];
u8 unk16;
u8 filler17[0x13];
u8 unk2a;
u32 field_0x2c;
} Menu;

14
include/npc.h
View File

@ -170,22 +170,8 @@ extern void Phonograph(Entity*);
extern void NPC58(Entity*);
extern void NPC58_Head(Entity*);
extern u32 UpdateFuseInteraction(Entity*);
extern void ShowNPCDialogue(Entity*, u32*);
typedef struct {
/*0x000*/ u8 filler[8];
/*0x008*/ u8 unk;
/*0x009*/ u8 filler2[0x47];
/*0x050*/ u32 unk2;
/*0x051*/ u8 filler3[0x54];
/*0x0a8*/ Stats stats;
/*0x0d0*/ u8 filler4[0x3c0];
/*0x490*/ u32 unk3;
} struct_02002A40;
extern struct_02002A40 gUnk_02002A40;
#endif

1
include/position.h
View File

@ -9,5 +9,6 @@ void PositionEntityOnTop(Entity*, Entity*);
void PositionRelative(Entity*, Entity*, s32, s32);
void sub_0806FA90(Entity*, Entity*, s32, s32);
void ResolveEntityOnTop(Entity*, Entity*);
void sub_0806FAD8(Entity*, Entity*);
#endif

16
include/readKeyInput.h
View File

@ -1,9 +1,9 @@
struct Input {
u16 unk0;
u16 unk1;
u16 unk2;
u8 unk3;
u8 unk4;
};
typedef struct {
u16 heldKeys;
u16 newKeys;
u16 unk4;
u8 unk6;
u8 unk7;
} Input;
// void ReadKeyInput(void);
extern Input gUnk_03000FF0;

86
include/structures.h
View File

@ -6,23 +6,56 @@
#include "link.h"
typedef struct {
u8 filler[8];
u8 field_0x8;
u8 field_0x9[0x34];
u32 windcrests;
u8 field_0x44[0x64];
Stats stats;
char header[4];
u8 saveFile;
u8 field_0x5;
u8 brightnessPref;
u8 gameLanguage;
} struct_02000000;
typedef struct {
u16 field_0x0;
u16 field_0x2;
u16 field_0x4;
u16 field_0x6;
u16 field_0x8;
u16 field_0xa;
} struct_0807D1C4;
#define gUnk_02000000 ((struct_02000000*)(0x2000000))
//extern struct_02000000 gUnk_02000000;
typedef struct {
/*0x000*/ u8 filler0[0x6];
/*0x006*/ u8 unk6;
/*0x007*/ u8 unk7;
/*0x008*/ u8 unk8;
/*0x009*/ u8 field_0x9[0x34];
/*0x040*/ u32 windcrests;
/*0x044*/ u8 filler44[0xC];
/*0x050*/ u32 unk50;
/*0x054*/ u8 filler54[0x54];
/*0x0A8*/ Stats stats;
/*0x0D0*/ u8 filler4[0x3c0];
/*0x490*/ u32 unk490;
} struct_02002A40;
extern struct_02002A40 gUnk_02002A40;
typedef struct {
u8 field_0x0[8];
u8 field_0x8;
u8 field_0x9;
u8 field_0xa[6];
union SplitWord field_0x10;
u8 field_0x14[0xc];
u16 frameCount; // regular frame count? does anything reset it?
u8 field_0x2[6];
bool8 transitioningOut;
u8 transitionType; // transition when changing areas
u8 field_0xa; // seems to be a tile type
u8 field_0xb;
u8 areaID;
u8 roomID;
u8 playerState;
u8 field_0xf;
Coords playerStartPos;
u16 playerLayer;
u8 field_0x14[0xa];
u16 field_0x20;
u16 field_0x22;
u8 field_0x24[0x14];
@ -35,9 +68,34 @@ typedef struct {
u16 field_0x46;
u16 field_0x48;
u16 field_0x4a;
} struct_030010A0;
u8 field_0x4c[0x60];
u16 field_0xac;
} ScreenTransition;
extern struct_030010A0 gUnk_030010A0;
extern ScreenTransition gScreenTransition;
typedef struct {
u16 transitionType;
u8 field_0x2[4];
s16 playerXPos;
s16 playerYPos;
u8 field_0xa;
u8 areaID;
u8 roomID;
u8 playerLayer;
u8 field_0xe;
u8 playerState;
u16 transitionSFX;
} ScreenTransitionData;
typedef struct {
/*0x00*/ u8 unk0;
/*0x01*/ u8 filler1[0x5];
/*0x06*/ u8 unk6;
/*0x07*/ u8 unk7;
/*0x08*/ s8 unk8[0x10]; // ?? unclear know how large this is
} struct_02019EE0;
extern struct_02019EE0 gUnk_02019EE0;
#endif

10
linker.ld
View File

@ -174,7 +174,7 @@ SECTIONS {
. = 0x00001000; gUnk_03001000 = .;
. = 0x00001010; gUnk_03001010 = .;
. = 0x00001020; gUnk_03001020 = .;
. = 0x000010A0; gUnk_030010A0 = .;
. = 0x000010A0; gScreenTransition = .;
. = 0x000010AC; gUnk_030010AC = .;
. = 0x000010D8; gUnk_030010D8 = .;
. = 0x000010EC; gUnk_030010EC = .;
@ -664,7 +664,9 @@ SECTIONS {
asm/getInventoryValue.o(.text);
asm/code_0807CAA0.o(.text);
src/flags.o(.text);
src/code_0807CC3C.o(.text);
asm/code_0807CC3C.o(.text);
src/code_080808D8.o(.text);
src/code_0808091C.o(.text);
/* objects */
asm/itemOnGround.o(.text);
@ -693,7 +695,7 @@ SECTIONS {
asm/floatingPlatform.o(.text);
asm/object17.o(.text);
asm/evilSpirit.o(.text);
asm/houseDoorExterior.o(.text);
src/object/houseDoorExterior.o(.text);
src/object/object1A.o(.text);
src/object/greatFairy.o(.text);
asm/greatFairy.o(.text);
@ -745,7 +747,7 @@ SECTIONS {
asm/object45.o(.text);
asm/giantBookLadder.o(.text);
src/object/heartContainer.o(.text);
asm/object48.o(.text);
src/object/object48.o(.text);
src/object/object49.o(.text);
asm/object49.o(.text);
asm/backgroundCloud.o(.text);
@ -840,7 +842,7 @@ SECTIONS {
src/object/palaceArchway.o(.text);
asm/objectA2.o(.text);
src/object/cloud.o(.text);
asm/minishLight.o(.text);
src/object/minishLight.o(.text);
asm/objectA5.o(.text);
asm/objectA6.o(.text);
asm/objectA7.o(.text);

6
src/code_0805436C.c
View File

@ -17,11 +17,11 @@ typedef struct {
typedef struct {
u8 filler[0x2e];
u8 unk;
} struct_030010A0;
} ScreenTransition;
extern struct_02002A40 gUnk_02002A40;
extern struct_080FD5B4 gUnk_080FD5B4[];
extern struct_030010A0 gUnk_030010A0;
extern ScreenTransition gScreenTransition;
extern u8 gUnk_0200AF13;
extern u8 gUnk_0200AF14;
@ -154,7 +154,7 @@ void sub_08054524(void) {
bVar1 = gArea.locationIndex;
if (gArea.locationIndex == 0) {
bVar1 = gUnk_030010A0.unk;
bVar1 = gScreenTransition.unk;
}
if (bVar1 > 0x16) {
bVar1 = 0;

6
src/code_08077B98.c
View File

@ -83,7 +83,7 @@ void* sub_08077C54(UnkItemStruct* unk)
item->entityType.type = 8;
item->flags = 0xa0;
item->parent = (Entity*)unk;
item->field_0x68 = unk->field_0x1;
item->field_0x68.HALF.LO = unk->field_0x1;
sub_0805EA2C(item, 2);
}
return item;
@ -111,7 +111,7 @@ Entity * CreatePlayerItem(u32 subtype, u32 form, u32 parameter, u32 unk)
(ent->entityType).subtype = subtype;
(ent->entityType).form = form;
(ent->entityType).parameter = parameter;
ent->field_0x68 = unk;
ent->field_0x68.HALF.LO = unk;
sub_0805EA2C(ent, 2);
}
return ent;
@ -128,7 +128,7 @@ Entity * sub_08077CF8(u32 subtype, u32 form, u32 parameter, u32 unk)
(ent->entityType).subtype = subtype;
(ent->entityType).form = form;
(ent->entityType).parameter = parameter;
ent->field_0x68 = unk;
ent->field_0x68.HALF.LO = unk;
sub_0805EA2C(ent, 2);
}
return ent;

125
src/code_0807CC3C.c Normal file
View File

@ -0,0 +1,125 @@
#include "global.h"
#include "entity.h"
#include "functions.h"
#include "menu.h"
#include "structures.h"
extern void (*const gUnk_0811E478[])(u32);
extern s16 gUnk_02021EE0[6];
void sub_0807CD9C() {
sub_080530C8();
}
void sub_0807CDA4(u32 arg0) {
gUnk_0811E478[gMenu.storyPanelIndex](arg0);
}
u32 sub_0807CDC0(void) {
gUnk_02021EE0[5] -= 8;
if (gUnk_02021EE0[4] <= 0) {
gMenu.field_0xa = 8;
gMenu.storyPanelIndex = 1;
}
return 0;
}
u32 sub_0807CDE8(u32 arg0) {
u32 temp;
if (gMenu.field_0xa == 0) {
sub_0805616C();
switch (arg0) {
case 0:
temp = sub_0807CF08(gUnk_02000000->saveFile, gUnk_02002A40.filler0);
break;
case 1:
sub_0807CF48(gUnk_02000000->saveFile);
temp = 1;
break;
case 2:
temp = sub_0807CF10((u8*)gUnk_02000000->header);
break;
}
gMenu.field_0xa = temp;
gMenu.storyPanelIndex = 2;
sub_08056208();
} else {
gMenu.field_0xa--;
}
return 0;
}
s32 sub_0807CE54(void) {
u32 uVar1;
uVar1 = 0;
gUnk_02021EE0[5] += 8;
if (gUnk_02021EE0[3] <= gUnk_02021EE0[5]) {
gUnk_02021EE0[5] = gUnk_02021EE0[3];
sub_08050384();
gMenu.storyPanelIndex = 0;
if (gMenu.field_0xa == 1) {
uVar1 = 1;
} else {
uVar1 = -1;
}
}
return uVar1;
}
extern char gUnk_0811E484[];
u32 sub_0807CE90(void)
{
struct_0807D1C4 *puVar1;
int iVar2;
int iVar3;
sub_080B1520(0x40);
puVar1 = sub_0807D1C4(4);
iVar3 = 0;
if (sub_0807D24C(puVar1->field_0x6, gUnk_0811E484, puVar1->field_0x0) == 0) {
iVar3 += 1;
}
if (sub_0807D24C(puVar1->field_0x8, gUnk_0811E484, puVar1->field_0x0) == 0) {
iVar3 += 2;
}
if (iVar3 != 0) {
if (iVar3 == 3) {
sub_0807CF68(5);
sub_0807CF68(3);
sub_0807CF68(2);
sub_0807CF68(1);
sub_0807CF68(0);
}
sub_0807D20C(puVar1->field_0x8, gUnk_0811E484, puVar1->field_0x0);
sub_0807D20C(puVar1->field_0x6, gUnk_0811E484, puVar1->field_0x0);
}
return 1;
}
u32 sub_0807CF08(u32 arg0, u8* arg1) {
return sub_0807CF88(arg0, arg1);
}
u32 sub_0807CF10(u8* arg0) {
return sub_0807CF88(3, arg0);
}
u32 sub_0807CF1C(u8* arg0) {
return sub_0807CF88(5, arg0);
}
u32 sub_0807CF28(u32 arg0, void* arg1) {
return sub_0807D008(arg0, arg1);
}
u32 sub_0807CF30(void* arg0) {
return sub_0807D008(3, arg0);
}
u32 sub_0807CF3C(void* arg0) {
return sub_0807D008(5, arg0);
}

25
src/code_080808D8.c Normal file
View File

@ -0,0 +1,25 @@
#include "global.h"
#include "entity.h"
#include "structures.h"
#include "functions.h"
void sub_080808D8(void) {
gScreenTransition.transitionType = 0;
}
void sub_080808E4(void) {
if (sub_08052638(gScreenTransition.areaID)) {
gScreenTransition.transitionType = 0;
} else {
gScreenTransition.transitionType = 5;
}
}
void sub_08080904(void) {
gScreenTransition.transitionType = 1;
}
void sub_08080910(void) {
gScreenTransition.transitionType = 1;
}

4
src/code_0808091C.c
View File

@ -6,7 +6,7 @@ extern void sub_0805E5A8();
extern RoomControls gRoomControls;
extern u32 gUnk_0200B650;
extern u32 gUnk_02025EB0;
extern u8 gUnk_030010A0[10];
extern u8 gScreenTransition[10];
extern void DoExitTransition(Entity*);
extern void sub_080809D4();
@ -15,7 +15,7 @@ void sub_0808091C(Entity* param_1, u32 param_2)
{
DoExitTransition(param_1);
gUnk_030010A0[9] = param_2;
gScreenTransition[9] = param_2;
return;
}

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