Skip to content

Work on rings_manager.c #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JaceCear merged 17 commits into from
Apr 6, 2026
Merged

Work on rings_manager.c #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6bca351
Start Rings Manager
JaceCear Mar 27, 2026
4364b87
Match sub_802AB8C
JaceCear Mar 28, 2026
f72a9fb
Make Task_RingsMgrExtraZone compilable
JaceCear Mar 28, 2026
cd09f89
Progress on Task_RingsMgrExtraZone
JaceCear Mar 29, 2026
fc8d1ac
More progress on Task_RingsMgrExtraZone
JaceCear Mar 29, 2026
ff2e680
Make rings_manager compile again
JaceCear Mar 29, 2026
a2e7e42
More progress in Task_RingsMgrExtraZone
JaceCear Mar 30, 2026
d9bf259
Match Task_RingsMgrExtraZone
JaceCear Apr 2, 2026
efaabf4
More progress
JaceCear Apr 3, 2026
40def0f
More Task_RingsMgrStage progress
JaceCear Apr 4, 2026
15269cb
Move Task_RingsMgrStage into non-matching
JaceCear Apr 5, 2026
f73d316
Finish rings_manager.c
JaceCear Apr 5, 2026
a29a0f4
Document 1st Zone on gSpritePosData_rings table
JaceCear Apr 5, 2026
c6849c3
Document gSpritePosData_rings pointers
JaceCear Apr 6, 2026
a8577fd
Move gSpritePosData_rings into non-matching
JaceCear Apr 6, 2026
6f3de8a
Remove temp comment
JaceCear Apr 6, 2026
dbd8363
Fix build
JaceCear Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions asm/code_0_2.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11034,7 +11034,7 @@ _080269E0:
lsrs r0, r0, #0x16
cmp r1, r0
bhs _08026A06
bl sub_8029BB0
bl PlayRingCollectSE
_08026A06:
ldrh r0, [r7, #0xe]
lsls r0, r0, #0x16
Expand Down Expand Up @@ -11080,7 +11080,7 @@ _08026A32:
cmp r0, #0
bne _08026AA0
adds r6, r1, #0
bl sub_8029BB0
bl PlayRingCollectSE
ldrh r0, [r7, #0xe]
lsls r0, r0, #0x16
lsrs r0, r0, #0x16
Expand Down
2 changes: 1 addition & 1 deletion asm/code_0_3.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ _0802B2AA:
lsls r1, r7, #0x10
asrs r0, r0, #0x10
asrs r1, r1, #0x10
bl sub_8029C54
bl CreateCollectRingEffect
cmp r5, #0
beq _0802B2CA
mov r2, r8
Expand Down
Loading