Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-09-10 18:55:59 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Clean up for PR feedback

Browse Source
This commit is contained in:
Rachel
2025-02-05 21:10:40 -08:00
parent 5ec5abbca0
commit c191ef78a4
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/sprite_util.h
View File

@@ -35,7 +35,7 @@ void SpriteResourcesHeader_Init(CellActorResourceData *resourceHeader,
int animResourceID,
int mcellResourceID,
int manimResourceID,
int vramTransfer,
BOOL vramTransfer,
int priority,
SpriteResourceCollection *charResources,
SpriteResourceCollection *plttResources,

21
src/render_oam.c
View File

@@ -9,6 +9,11 @@
#include "heap.h"
#include "render_view.h"
#define NUM_HW_OAM_ATTR 128
#define NUM_HW_OAM_ATTR_RESERVED 4
#define NUM_HW_OAM_AFFINES 32
#define NUM_HW_OAM_AFFINE_RESERVED 1
typedef struct OamManager {
NNSG2dOamManagerInstance mainScreenOam;
NNSG2dOamManagerInstance subScreenOam;
@@ -31,11 +36,11 @@ void RenderOam_Init(int mainOamStart, int mainOamCount, int mainAffineOamStart,
int trueMainAffineOamCount;
// The first 4 OAM managers are reserved.
if (mainOamStart < 4) {
trueMainOamStart = 4;
if (mainOamStart < NUM_HW_OAM_ATTR_RESERVED) {
trueMainOamStart = NUM_HW_OAM_ATTR_RESERVED;
if (mainOamCount > 124) {
trueMainOamCount = mainOamCount - (4 - mainOamStart);
if (mainOamCount > NUM_HW_OAM_ATTR - NUM_HW_OAM_ATTR_RESERVED) {
trueMainOamCount = mainOamCount - (NUM_HW_OAM_ATTR_RESERVED - mainOamStart);
} else {
trueMainOamCount = mainOamCount;
}
@@ -45,11 +50,11 @@ void RenderOam_Init(int mainOamStart, int mainOamCount, int mainAffineOamStart,
}
// The first affine-enabled manager is reserved.
if (mainAffineOamStart < 1) {
trueMainAffineOamStart = 1;
if (mainAffineOamStart < NUM_HW_OAM_AFFINE_RESERVED) {
trueMainAffineOamStart = NUM_HW_OAM_AFFINE_RESERVED;
if (mainAffineOamCount > 30) {
trueMainAffineOamCount = mainAffineOamCount - (1 - mainAffineOamStart);
if (mainAffineOamCount > NUM_HW_OAM_AFFINES - NUM_HW_OAM_AFFINE_RESERVED - 1) {
trueMainAffineOamCount = mainAffineOamCount - (NUM_HW_OAM_AFFINE_RESERVED - mainAffineOamStart);
} else {
trueMainAffineOamCount = mainAffineOamCount;
}

2
src/render_view.c
View File

@@ -39,7 +39,7 @@ BOOL IsObjectInView(const NNSG2dCellData *cellData, const MtxFx32 *objectCoords,
fx32 minX, maxX;
fx32 tmp;
if (NNS_G2dCellHasBR(cellData) == 1) {
if (NNS_G2dCellHasBR(cellData) == TRUE) {
minY = boundingRect->minY << FX32_SHIFT;
maxY = boundingRect->maxY << FX32_SHIFT;
minX = boundingRect->minX << FX32_SHIFT;

2
src/sprite_util.c
View File

@@ -15,7 +15,7 @@
#define RESDAT_TABLE_TERMINATOR 0xFFFFFFFE
void SpriteResourcesHeader_Init(CellActorResourceData *resourceHeader, int charResourceID, int plttResourceID, int cellResourceID, int animResourceID, int mcellResourceID, int manimResourceID, int vramTransfer, int priority, SpriteResourceCollection *charResources, SpriteResourceCollection *plttResources, SpriteResourceCollection *cellResources, SpriteResourceCollection *animResources, SpriteResourceCollection *mcellResources, SpriteResourceCollection *manimResources)
void SpriteResourcesHeader_Init(CellActorResourceData *resourceHeader, int charResourceID, int plttResourceID, int cellResourceID, int animResourceID, int mcellResourceID, int manimResourceID, BOOL vramTransfer, int priority, SpriteResourceCollection *charResources, SpriteResourceCollection *plttResources, SpriteResourceCollection *cellResources, SpriteResourceCollection *animResources, SpriteResourceCollection *mcellResources, SpriteResourceCollection *manimResources)
{
SpriteResource *charResource;
SpriteResource *plttResource;