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

Split & decompile overlay 16 (berry growth) #209

Merged
merged 12 commits into from
Aug 22, 2023
Merged

Split & decompile overlay 16 (berry growth) #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b256dde
Split overlay 16
tgsm Aug 12, 2023
1c65521
unk_0203E348: Fill out BerryPotsArgs struct
tgsm Aug 13, 2023
c5fe072
heap: Add heap ID for overlay 16
tgsm Aug 13, 2023
cbfb0fc
Decompile overlay_16_02201948
tgsm Aug 13, 2023
dab5786
Decompile most of overlay_16_022014A0
tgsm Aug 13, 2023
221feba
overlay 16: Match ov16_02201760
tgsm Aug 15, 2023
746d8c5
overlay 16: Match ov16_022014A0 and ov16_022016F4
tgsm Aug 15, 2023
189a90d
overlay 16: Cleanup, some documentation
tgsm Aug 16, 2023
7980b66
heap: `HEAP_ID_OV16` -> `HEAP_ID_BERRY_POTS`
tgsm Aug 16, 2023
ddfca82
`CreateBerryPotsArgs` -> `BerryPotsArgs_New`
tgsm Aug 17, 2023
7d68071
`BERRY_POT` -> `BerryPot`
tgsm Aug 17, 2023
d045d2b
overlay 16: Use constants where known to be applicable
tgsm Aug 17, 2023
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
61 changes: 0 additions & 61 deletions asm/include/overlay_16.inc
View file
Open in desktop

This file was deleted.

24 changes: 12 additions & 12 deletions asm/include/overlay_17.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,28 +143,28 @@
.public _s32_div_f
.public gSystem
.public ov16_022014A0
.public ov16_022015B0
.public ov16_022015BC
.public BerryPots_GetPotGrowthStage
.public BerryPots_GetPotBerryId
.public ov16_022015C4
.public ov16_022015E0
.public BerryPots_GetPotMoisture
.public ov16_022015EC
.public ov16_022015F8
.public ov16_02201604
.public ov16_02201610
.public ov16_02201644
.public ov16_02201650
.public ov16_0220165C
.public BerryPots_ResetPotMoisture
.public BerryPots_GetPotMulch
.public BerryPots_SetPotMulch
.public ov16_02201668
.public ov16_02201674
.public ov16_02201760
.public ov16_022017FC
.public ov16_02201820
.public ov16_022018B4
.public ov16_022018C4
.public ov16_022018D4
.public ov16_022018E4
.public ov16_022018F0
.public ov16_0220191C
.public BerryIdToItemId
.public ItemIdToBerryId
.public MulchIdToItemId
.public ItemIdToMulchId
.public GetTotalBerryQuantity
.public GetTotalMulchQuantity
.public ov17_02201BC0
.public ov17_02201C10
.public ov17_02201C78
Expand Down
2 changes: 1 addition & 1 deletion asm/include/unk_0203E348.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
.public sub_0203EBA4
.public Fsys_CreateApplication_AlphPuzzle
.public CreateUnownReportWork
.public CreateBerryPotsWork
.public BerryPotsArgs_New
.public CreateApricornBoxWork
.public sub_0203ED80
.public sub_0203EDDC
Expand Down
Loading