Skip to content
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

Jump to bottom

March/April 2024 #174

Merged
merged 15 commits into from
Apr 24, 2024
Merged

March/April 2024 #174

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9abab93
move more data to src
SethBarberee Mar 17, 2024
f5bd176
continue moving data
SethBarberee Mar 17, 2024
94932b5
move WindowBG to src
SethBarberee Mar 19, 2024
6c0e119
move some data to src in math.c
SethBarberee Mar 26, 2024
5fe3e86
finish moving data to src - math
SethBarberee Mar 27, 2024
471597c
Decomp sub_80479B8 and sub_80482FC
SethBarberee Apr 1, 2024
6474da0
more documenting
SethBarberee Apr 1, 2024
da98eb4
update args
SethBarberee Apr 10, 2024
e442953
label more move funcs
SethBarberee Apr 15, 2024
9ee69e7
forgot to rename these to proper names
SethBarberee Apr 15, 2024
7efd9c4
more decomp work
SethBarberee Apr 19, 2024
4cf3126
more work
SethBarberee Apr 19, 2024
9b173ac
more decomp work
SethBarberee Apr 20, 2024
b3c617d
more decomp work
SethBarberee Apr 22, 2024
55925c9
Address review comments
SethBarberee Apr 24, 2024
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
1,047 changes: 0 additions & 1,047 deletions asm/code_8046CE4.s
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions asm/code_80521D0.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4497,7 +4497,7 @@ _08054B88:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_805B214
bl WrapMoveAction
bl _080554BA
_08054B98:
adds r0, r7, 0
Expand Down Expand Up @@ -4644,7 +4644,7 @@ _08054CD4:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_805815C
bl CounterMoveAction
b _080554BA
_08054CE2:
adds r0, r7, 0
Expand Down Expand Up @@ -4751,7 +4751,7 @@ _08054DAA:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_805A23C
bl MudWaterSportMoveAction
b _080554BA
_08054DB8:
adds r0, r7, 0
Expand Down Expand Up @@ -4989,7 +4989,7 @@ _08054F86:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_80585CC
bl BrickBreakMoveAction
b _080554BA
_08054F94:
adds r0, r7, 0
Expand Down Expand Up @@ -5446,7 +5446,7 @@ _08055318:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_805BB64
bl ReboundOrbAction
b _080554BA
_08055326:
adds r0, r7, 0
Expand Down Expand Up @@ -5551,7 +5551,7 @@ _080553EA:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_805B734
bl SnatchMoveAction
b _080554BA
_080553F8:
adds r0, r7, 0
Expand Down
6 changes: 3 additions & 3 deletions asm/code_807E5AC.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,8 @@ GetWeatherName:
_0807EA2C: .4byte gWeatherNames
thumb_func_end GetWeatherName

thumb_func_start sub_807EA30
sub_807EA30:
thumb_func_start MudWaterSportEffect
MudWaterSportEffect:
push {lr}
lsls r0, 24
cmp r0, 0
Expand Down Expand Up @@ -523,7 +523,7 @@ _0807EA90: .4byte gUnknown_80F4EAC
_0807EA94: .4byte gDungeon
_0807EA98: .4byte 0x0000e278
_0807EA9C: .4byte gUnknown_80FADB0
thumb_func_end sub_807EA30
thumb_func_end MudWaterSportEffect

thumb_func_start sub_807EAA0
sub_807EAA0:
Expand Down
Loading