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.

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

Split & decompile overlay 16 (berry growth) #209

Merged
merged 12 commits into from
Aug 22, 2023

Conversation

tgsm
Copy link
Collaborator

@tgsm tgsm commented Aug 13, 2023

No description provided.

include/unk_0203E348.h Outdated Show resolved Hide resolved
include/heap.h Outdated Show resolved Hide resolved
src/overlay_16_022014A0.c Outdated Show resolved Hide resolved
src/overlay_16_022014A0.c Outdated Show resolved Hide resolved
@tgsm tgsm force-pushed the overlay_16 branch 3 times, most recently from 996215e to 99498aa Compare August 16, 2023 02:39
@tgsm tgsm marked this pull request as ready for review August 16, 2023 02:40
include/unk_0203E348.h Outdated Show resolved Hide resolved
src/overlay_16_022014A0.c Outdated Show resolved Hide resolved
src/overlay_16_022014A0.c Outdated Show resolved Hide resolved
src/overlay_16_022014A0.c Outdated Show resolved Hide resolved
src/overlay_16_022014A0.c Outdated Show resolved Hide resolved
@@ -360,7 +372,7 @@ u16 GetTotalBerryQuantity(Bag *bag, HeapID heapId) {
u16 GetTotalMulchQuantity(Bag *bag, HeapID heapId) {
s32 i;
u16 total;
for (total = 0, i = 0; i < 4; i++) {
for (total = 0, i = 0; i < NUM_MULCHES; i++) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NUM_ to refer to the number of elements in a set is weird, because you could also have numMulches which stores the current amount of mulches. TODO investigate what naming we want.

asm/overlay_16_data.s Show resolved Hide resolved
@adrienntindall adrienntindall merged commit a98f738 into pret:master Aug 22, 2023
1 check passed
@tgsm tgsm deleted the overlay_16 branch August 22, 2023 05:00
github-actions bot pushed a commit that referenced this pull request Aug 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants