Skip to content

Commit

Permalink
Merge pull request #633 from Eebit/sio_mu
Browse files Browse the repository at this point in the history
Split and decompile Link Arena Move Unit effects
  • Loading branch information
RevoSucks authored Jun 18, 2024
2 parents 9e95abf + 0cb46a7 commit 304f096
Show file tree
Hide file tree
Showing 19 changed files with 1,522 additions and 2,310 deletions.
18 changes: 9 additions & 9 deletions asm/code_sio.s
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ _08045E46:
movs r0, #0xc0
movs r1, #0x10
adds r2, r6, #0
bl sub_804C2EC
bl StartLinkArenaButtonSpriteDraw
movs r0, #0x50
movs r1, #0x20
adds r2, r6, #0
Expand Down Expand Up @@ -788,7 +788,7 @@ sub_8045F48: @ 0x08045F48
_08045F7A:
movs r0, #1
bl SioPlaySoundEffect
bl sub_804C31C
bl EndLinkArenaButtonSpriteDraw
b _08045FEE
.align 2, 0
_08045F88: .4byte gUnk_Sio_0203DD28
Expand All @@ -804,7 +804,7 @@ _08045F94:
beq _08045FBC
movs r0, #1
bl SioPlaySoundEffect
bl sub_804C31C
bl EndLinkArenaButtonSpriteDraw
bl sub_8045CBC
bl sub_8045CE0
adds r0, r4, #0
Expand Down Expand Up @@ -873,7 +873,7 @@ _0804601E:
movs r0, #0xc0
movs r1, #0x10
adds r2, r4, #0
bl sub_804C2EC
bl StartLinkArenaButtonSpriteDraw
b _0804618A
_08046046:
movs r0, #6
Expand Down Expand Up @@ -901,7 +901,7 @@ _0804606C:
ands r0, r1
cmp r0, #0
beq _080460EE
bl sub_804C31C
bl EndLinkArenaButtonSpriteDraw
ldr r0, [r7]
movs r2, #0
movs r1, #6
Expand Down Expand Up @@ -971,7 +971,7 @@ _080460EE:
lsls r0, r0, #0x10
cmp r0, #0
beq _08046164
bl sub_804C31C
bl EndLinkArenaButtonSpriteDraw
ldr r0, [r5]
movs r2, #0
movs r1, #6
Expand Down Expand Up @@ -1069,7 +1069,7 @@ _080461C4:
movs r0, #0xc0
movs r1, #0x10
adds r2, r4, #0
bl sub_804C2EC
bl StartLinkArenaButtonSpriteDraw
adds r0, r4, #0
movs r1, #3
bl Proc_Goto
Expand Down Expand Up @@ -2057,7 +2057,7 @@ sub_80469C4: @ 0x080469C4
movs r0, #0xc0
movs r1, #0x10
adds r2, r7, #0
bl sub_804C2EC
bl StartLinkArenaButtonSpriteDraw
ldr r4, _08046AC4 @ gSioTexts
adds r0, r4, #0
movs r1, #0x18
Expand Down Expand Up @@ -2601,7 +2601,7 @@ sub_8046E0C: @ 0x08046E0C
bl nullsub_13
bl sub_804C4F8
bl sub_804C590
bl sub_804C31C
bl EndLinkArenaButtonSpriteDraw
bl BMapVSync_End
bl StartPrepAtMenu
adds r0, r4, #0
Expand Down
Loading

0 comments on commit 304f096

Please sign in to comment.