Skip to content

minor-sprite-doc #1246

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
z64a merged 4 commits into from
Nov 22, 2025
Merged

minor-sprite-doc #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b65460
dx names parity
z64a Aug 25, 2025
6f0c383
renames for consistency
z64a Aug 25, 2025
8a6bdd9
Merge branch 'main' into minor-sprite-doc
z64a Nov 22, 2025
4f6d7c5
fix
z64a Nov 22, 2025
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 src/101b90_len_8f0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define SPRITE_ROM_START 0x1A40000 + 0x10
#endif

extern s32 spr_allocateBtlComponentsOnWorldHeap;
extern bool SpriteUseGeneralHeap;
extern HeapNode heap_generalHead;
extern HeapNode heap_spriteHead;

Expand Down Expand Up @@ -365,7 +365,7 @@ SpriteComponent** spr_allocate_components(s32 count) {
listSize = (count + 1) * 4;
totalSize = (count * sizeof(SpriteComponent)) + listSize;

if (spr_allocateBtlComponentsOnWorldHeap) {
if (SpriteUseGeneralHeap) {
listStart = _heap_malloc(&heap_generalHead, totalSize);
listPos = listStart;
component = (SpriteComponent*) listPos;
Expand Down
Loading