rename some object-related routines

This commit is contained in:
PikalaxALT 2024-09-08 15:12:43 -04:00
parent 6d4c78ab9e
commit a65734aba6
No known key found for this signature in database
GPG Key ID: 7774E96AA69E5B61
43 changed files with 68 additions and 68 deletions

View File

@ -1535,7 +1535,7 @@ ov80_02239384: ; 0x02239384
bl sub_0200CF70
ldr r1, _022393E0 ; =0x00200010
mov r0, #1
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
ldr r0, [r4, #0x34]

View File

@ -57,7 +57,7 @@
.public Sprite_GetMatrixPtr
.public Sprite_SetAnimCtrlCurrentFrame
.public GF_AssertFail
.public sub_02025C44
.public GF_InitG2dRenderer
.public PlayerAvatar_GetMapObject
.public NNS_G2dGetUnpackedCharacterData
.public NNS_G2dGetUnpackedPaletteData

View File

@ -37,7 +37,7 @@
.public PokepicManager_SetPlttBaseAddrAndSize
.public PokepicManager_HandleLoadImgAndOrPltt
.public G2dRenderer_SetSubSurfaceCoords
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public NewMsgDataFromNarc
.public DestroyMsgData

View File

@ -34,7 +34,7 @@
.public Pokepic_SetAttr
.public PokepicManager_HandleLoadImgAndOrPltt
.public G2dRenderer_SetSubSurfaceCoords
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public NewMsgDataFromNarc
.public DestroyMsgData

View File

@ -144,7 +144,7 @@
.public TouchscreenHitbox_FindHitboxAtTouchNew
.public System_GetTouchNew
.public GF_AssertFail
.public sub_02025C88
.public GF_SetG2dRendererSurface
.public String_New
.public String_Delete
.public String_SetEmpty

View File

@ -43,7 +43,7 @@
.public CreateSpriteResourcesHeader
.public G2dRenderer_Init
.public G2dRenderer_SetSubSurfaceCoords
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public Create2DGfxResObjMan
.public Destroy2DGfxResObjMan

View File

@ -22,7 +22,7 @@
.public GfGfxLoader_GetCharDataFromOpenNarc
.public CreateSpriteResourcesHeader
.public G2dRenderer_Init
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public Create2DGfxResObjMan
.public Destroy2DGfxResObjMan

View File

@ -21,7 +21,7 @@
.public CreateSpriteResourcesHeader
.public G2dRenderer_Init
.public G2dRenderer_SetSubSurfaceCoords
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public Create2DGfxResObjMan
.public Destroy2DGfxResObjMan

View File

@ -32,7 +32,7 @@
.public CreateSpriteResourcesHeader
.public G2dRenderer_Init
.public G2dRenderer_SetSubSurfaceCoords
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public Create2DGfxResObjMan
.public Destroy2DGfxResObjMan

View File

@ -20,7 +20,7 @@
.public GfGfxLoader_GetPlttDataFromOpenNarc
.public G2dRenderer_SetMainSurfaceCoords
.public G2dRenderer_SetSubSurfaceCoords
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public SpriteRenderer_Create
.public SpriteRenderer_CreateGfxHandler

View File

@ -46,7 +46,7 @@
.public CreateSpriteResourcesHeader
.public G2dRenderer_Init
.public G2dRenderer_SetSubSurfaceCoords
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public Create2DGfxResObjMan
.public Destroy2DGfxResObjMan

View File

@ -26,7 +26,7 @@
.public GfGfxLoader_GXLoadPalFromOpenNarc
.public CreateSpriteResourcesHeader
.public G2dRenderer_Init
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public Create2DGfxResObjMan
.public Destroy2DGfxResObjMan

View File

@ -29,7 +29,7 @@
.public GfGfxLoader_GetScrnDataFromOpenNarc
.public CreateSpriteResourcesHeader
.public G2dRenderer_Init
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public Create2DGfxResObjMan
.public Destroy2DGfxResObjMan

View File

@ -18,7 +18,7 @@
.public GfGfxLoader_GetPlttDataFromOpenNarc
.public G2dRenderer_Init
.public G2dRenderer_SetSubSurfaceCoords
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public Create2DGfxResObjMan
.public Destroy2DGfxResObjMan

View File

@ -31,7 +31,7 @@
.public GfGfxLoader_LoadScrnDataFromOpenNarc
.public GfGfxLoader_LoadFromOpenNarc
.public G2dRenderer_SetSubSurfaceCoords
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public NewMsgDataFromNarc
.public DestroyMsgData

View File

@ -20,7 +20,7 @@
.public GfGfxLoader_GetPlttDataFromOpenNarc
.public CreateSpriteResourcesHeader
.public G2dRenderer_Init
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public Create2DGfxResObjMan
.public Destroy2DGfxResObjMan

View File

@ -17,7 +17,7 @@
.public CreateSpriteResourcesHeader
.public G2dRenderer_Init
.public G2dRenderer_SetSubSurfaceCoords
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public Create2DGfxResObjMan
.public Destroy2DGfxResObjMan

View File

@ -24,7 +24,7 @@
.public GfGfxLoader_LoadCharDataFromOpenNarc
.public GfGfxLoader_LoadScrnDataFromOpenNarc
.public G2dRenderer_SetSubSurfaceCoords
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public NewMsgDataFromNarc
.public DestroyMsgData

View File

@ -29,7 +29,7 @@
.public GfGfxLoader_LoadCharDataFromOpenNarc
.public GfGfxLoader_LoadScrnDataFromOpenNarc
.public G2dRenderer_SetSubSurfaceCoords
.public sub_02009FE8
.public G2dRenderer_SetObjCharTransferReservedRegion
.public sub_0200A080
.public NewMsgDataFromNarc
.public DestroyMsgData

View File

@ -1,8 +1,8 @@
#include <nitro/fs/overlay.h>
#pragma once
.public sub_02025C44
.public GF_InitG2dRenderer
.public sub_02025C54
.public sub_02025C88
.public GF_SetG2dRendererSurface
.public sub_02025C98
.public NNS_G2dInitRenderer
.public NNS_G2dAddRendererTargetSurface

View File

@ -411,7 +411,7 @@ ov01_021EB4B8: ; 0x021EB4B8
ldr r1, _021EB564 ; =0xFFFFF000
add r6, r0, #0
add r0, #0x14
bl sub_02025C44
bl GF_InitG2dRenderer
mov r0, #0
add r3, r6, #0
str r0, [sp, #0xc]

View File

@ -409,7 +409,7 @@ _02237FD8:
bl sub_0200CF70
ldr r1, _0223831C ; =0x00100010
mov r0, #1
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
add r0, r4, #0

View File

@ -99,12 +99,12 @@ ov40_0222B6E0: ; 0x0222B6E0
bl ov40_0223D544
ldr r1, _0222B92C ; =0x00200010
mov r0, #1
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
ldr r1, _0222B92C ; =0x00200010
mov r0, #2
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #2
bl sub_0200A080
bl sub_0203A880

View File

@ -4262,7 +4262,7 @@ ov43_0222C024: ; 0x0222C024
add r0, r4, #0
add r0, #8
add r1, r7, #0
bl sub_02025C88
bl GF_SetG2dRendererSurface
add r0, r5, #0
add r0, #0xb2
ldrh r0, [r0]
@ -4337,7 +4337,7 @@ _0222C0CA:
add r0, r4, #0
add r0, #8
add r1, r7, #0
bl sub_02025C88
bl GF_SetG2dRendererSurface
mov r0, #0xb0
ldrsh r3, [r5, r0]
mov r0, #0x1f

View File

@ -2270,7 +2270,7 @@ ov44_0222AFE8: ; 0x0222AFE8
bl sub_02022638
ldr r1, _0222B02C ; =0x00200010
mov r0, #1
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
add sp, #0x10
@ -19335,7 +19335,7 @@ ov44_0223376C: ; 0x0223376C
bl sub_02022638
ldr r1, _0223381C ; =0x00200010
mov r0, #1
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
add r1, r7, #0

View File

@ -488,7 +488,7 @@ ov47_02258BB4: ; 0x02258BB4
bl sub_02022638
mov r0, #1
mov r1, #0x10
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
add r1, r5, #0

View File

@ -1890,7 +1890,7 @@ ov48_02259688: ; 0x02259688
bl sub_02022638
mov r0, #1
mov r1, #0x10
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
add r1, r5, #0

View File

@ -4331,7 +4331,7 @@ _0225A636:
bl sub_02022638
mov r0, #1
mov r1, #0x10
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
bl sub_0203A880

View File

@ -5945,7 +5945,7 @@ _02240DBE:
beq _02240E26
mov r0, #1
mov r1, #0x10
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
bl sub_0203A880

View File

@ -1676,7 +1676,7 @@ _0223EA3C:
beq _0223EB12
mov r0, #1
mov r1, #0x10
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
bl sub_0203A880

View File

@ -2877,7 +2877,7 @@ _0223F5C8:
beq _0223F660
mov r0, #1
mov r1, #0x10
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
bl sub_0203A880
@ -12257,7 +12257,7 @@ _02244234:
beq _02244354
mov r0, #1
mov r1, #0x10
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
bl sub_0203A880

View File

@ -595,7 +595,7 @@ ov88_02258C98: ; 0x02258C98
bl sub_02022638
ldr r1, _02258D34 ; =0x00200010
mov r0, #1
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
add r1, r5, #0

View File

@ -181,7 +181,7 @@ ov89_02258800: ; 0x02258800
bl sub_0200CF70
ldr r1, _02258AEC ; =0x00200010
mov r0, #1
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
ldr r0, [r5, #0x1c]

View File

@ -1283,7 +1283,7 @@ ov90_022590CC: ; 0x022590CC
bl sub_02022638
mov r0, #1
mov r1, #0x10
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
ldr r0, [sp, #0x14]

View File

@ -7017,7 +7017,7 @@ ov91_0225FA9C: ; 0x0225FA9C
bl sub_02022638
ldr r1, _0225FB44 ; =0x00200010
mov r0, #1
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
add r1, r7, #0

View File

@ -135,7 +135,7 @@ ov92_0225C5C4: ; 0x0225C5C4
bl GF_CreateVramTransferManager
ldr r1, _0225C938 ; =0x00200010
mov r0, #1
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
bl sub_0203A880

View File

@ -419,7 +419,7 @@ ov93_0225C768: ; 0x0225C768
bl sub_0200CF70
ldr r1, _0225CA70 ; =0x00100010
mov r0, #1
bl sub_02009FE8
bl G2dRenderer_SetObjCharTransferReservedRegion
mov r0, #1
bl sub_0200A080
ldr r0, [r5, #0x24]

View File

@ -4,8 +4,8 @@
.text
thumb_func_start sub_02025C44
sub_02025C44: ; 0x02025C44
thumb_func_start GF_InitG2dRenderer
GF_InitG2dRenderer: ; 0x02025C44
push {r3, r4, r5, lr}
add r5, r0, #0
add r4, r1, #0
@ -13,7 +13,7 @@ sub_02025C44: ; 0x02025C44
add r5, #0x80
str r4, [r5]
pop {r3, r4, r5, pc}
thumb_func_end sub_02025C44
thumb_func_end GF_InitG2dRenderer
thumb_func_start sub_02025C54
sub_02025C54: ; 0x02025C54
@ -44,8 +44,8 @@ _02025C84:
.balign 4, 0
thumb_func_end sub_02025C54
thumb_func_start sub_02025C88
sub_02025C88: ; 0x02025C88
thumb_func_start GF_SetG2dRendererSurface
GF_SetG2dRendererSurface: ; 0x02025C88
add r3, r0, #0
add r2, r1, #0
ldmia r2!, {r0, r1}
@ -54,7 +54,7 @@ sub_02025C88: ; 0x02025C88
stmia r3!, {r0, r1}
bx lr
.balign 4, 0
thumb_func_end sub_02025C88
thumb_func_end GF_SetG2dRendererSurface
thumb_func_start sub_02025C98
sub_02025C98: ; 0x02025C98

View File

@ -47,10 +47,10 @@ typedef struct SpriteListParam {
void CreateSpriteResourcesHeader(SpriteResourcesHeader *hdr, int charId, int plttId, int cellId, int cellAnmId, int multiCellId, int multiCellAnmId, int transfer, int priority, GF_2DGfxResMan *charMan, GF_2DGfxResMan *plttMan, GF_2DGfxResMan *cellMan, GF_2DGfxResMan *cellAnmMan, GF_2DGfxResMan *multiCellMan, GF_2DGfxResMan *multiCellAnmMan);
SpriteResourceHeaderList *SpriteResourceHeaderList_Create(const struct ResdatNarcEntry *resdatNarcEntry, HeapID heapId, GF_2DGfxResMan *charMan, GF_2DGfxResMan *plttMan, GF_2DGfxResMan *cellMan, GF_2DGfxResMan *animMan, GF_2DGfxResMan *mcelMan, GF_2DGfxResMan *manmMan);
void SpriteResourceHeaderList_Destroy(SpriteResourceHeaderList *list);
SpriteList *G2dRenderer_Init(int a0, GF_G2dRenderer *renderer, HeapID heapId);
SpriteList *G2dRenderer_Init(int numSprites, GF_G2dRenderer *renderer, HeapID heapId);
void G2dRenderer_SetMainSurfaceCoords(GF_G2dRenderer *renderer, fx32 x, fx32 y);
void G2dRenderer_SetSubSurfaceCoords(GF_G2dRenderer *renderer, fx32 x, fx32 y);
void sub_02009FE8(NNS_G2D_VRAM_TYPE vram, GXOBJVRamModeChar mode);
void sub_0200A080(u32 a0);
void G2dRenderer_SetObjCharTransferReservedRegion(NNS_G2D_VRAM_TYPE vram, GXOBJVRamModeChar mode);
void sub_0200A080(NNS_G2D_VRAM_TYPE type);
#endif // POKEHEARTGOLD_UNK_02009D48_H

View File

@ -3,7 +3,7 @@
#include "heap.h"
void sub_0200B27C(NNSG2dRenderSurface *surface, NNSG2dViewRect *rect, int a2, NNSG2dRendererInstance *instance);
void sub_0200B27C(NNSG2dRenderSurface *surface, NNSG2dViewRect *rect, NNS_G2D_VRAM_TYPE type, NNSG2dRendererInstance *instance);
void OamManager_ApplyAndResetBuffers(void);
void OamManager_Free(void);
void OamManager_Create(int, int, int, int, int, int, int, int, HeapID);

View File

@ -1,7 +1,7 @@
#ifndef POKEHEARTGOLD_UNK_02025C44_H
#define POKEHEARTGOLD_UNK_02025C44_H
void sub_02025C44(NNSG2dRendererInstance *instance, fx32 a1);
void sub_02025C88(NNSG2dRenderSurface *surface, NNSG2dViewRect *rect);
void GF_InitG2dRenderer(NNSG2dRendererInstance *instance, fx32 a1);
void GF_SetG2dRendererSurface(NNSG2dRenderSurface *surface, NNSG2dViewRect *rect);
#endif // POKEHEARTGOLD_UNK_02025C44_H

View File

@ -608,8 +608,8 @@ static void BattleArcadeGameBoard_InitObjects(GAME_BOARD_WORK *work) {
work->button = BattleArcadeObject_Create(&work->unk3E8, 0, 0, 0, 2, 128, 96, 0, 0, 1);
if (sub_02037474()) {
sub_02009FE8(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_32K);
sub_0200A080(1);
G2dRenderer_SetObjCharTransferReservedRegion(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_32K);
sub_0200A080(NNS_G2D_VRAM_TYPE_2DMAIN);
sub_0203A880();
}

View File

@ -98,48 +98,48 @@ void SpriteResourceHeaderList_Destroy(SpriteResourceHeaderList *list) {
FreeToHeap(list);
}
SpriteList *G2dRenderer_Init(int a0, GF_G2dRenderer *renderer, HeapID heapId) {
SpriteList *G2dRenderer_Init(int numSprites, GF_G2dRenderer *renderer, HeapID heapId) {
struct SpriteListParam param;
NNSG2dViewRect rect;
sub_02025C44(&renderer->rendererInstance, -FX32_ONE);
GF_InitG2dRenderer(&renderer->rendererInstance, -FX32_ONE);
rect.posTopLeft.x = 0;
rect.posTopLeft.y = 0;
rect.sizeView.x = 255 * FX32_ONE;
rect.sizeView.y = 192 * FX32_ONE;
sub_0200B27C(&renderer->renderSurface[0], &rect, 1, &renderer->rendererInstance);
sub_0200B27C(&renderer->renderSurface[0], &rect, NNS_G2D_VRAM_TYPE_2DMAIN, &renderer->rendererInstance);
rect.posTopLeft.x = 0;
rect.posTopLeft.y = 192 * FX32_ONE;
rect.sizeView.x = 255 * FX32_ONE;
rect.sizeView.y = 192 * FX32_ONE;
sub_0200B27C(&renderer->renderSurface[1], &rect, 2, &renderer->rendererInstance);
param.num = a0;
sub_0200B27C(&renderer->renderSurface[1], &rect, NNS_G2D_VRAM_TYPE_2DSUB, &renderer->rendererInstance);
param.num = numSprites;
param.rendererInstance = &renderer->rendererInstance;
param.heapId = heapId;
return SpriteList_Create(&param);
}
void G2dRenderer_SetMainSurfaceCoords(struct GF_G2dRenderer *a0, fx32 x, fx32 y) {
void G2dRenderer_SetMainSurfaceCoords(GF_G2dRenderer *renderer, fx32 x, fx32 y) {
struct NNSG2dViewRect rect;
rect.posTopLeft.x = x;
rect.posTopLeft.y = y;
rect.sizeView.x = 255 * FX32_ONE;
rect.sizeView.y = 192 * FX32_ONE;
sub_02025C88(&a0->renderSurface[0], &rect);
GF_SetG2dRendererSurface(&renderer->renderSurface[0], &rect);
}
void G2dRenderer_SetSubSurfaceCoords(struct GF_G2dRenderer *a0, fx32 x, fx32 y) {
void G2dRenderer_SetSubSurfaceCoords(GF_G2dRenderer *renderer, fx32 x, fx32 y) {
struct NNSG2dViewRect rect;
rect.posTopLeft.x = x;
rect.posTopLeft.y = y;
rect.sizeView.x = 255 * FX32_ONE;
rect.sizeView.y = 192 * FX32_ONE;
sub_02025C88(&a0->renderSurface[1], &rect);
GF_SetG2dRendererSurface(&renderer->renderSurface[1], &rect);
}
void sub_02009FE8(NNS_G2D_VRAM_TYPE vram, GXOBJVRamModeChar mode) {
void G2dRenderer_SetObjCharTransferReservedRegion(NNS_G2D_VRAM_TYPE vram, GXOBJVRamModeChar mode) {
switch (mode) {
case GX_OBJVRAMMODE_CHAR_1D_32K:
if (GX_GetBankForOBJ() == GX_VRAM_OBJ_16_G || GX_GetBankForOBJ() == GX_VRAM_OBJ_16_F) {
@ -164,6 +164,6 @@ void sub_02009FE8(NNS_G2D_VRAM_TYPE vram, GXOBJVRamModeChar mode) {
}
}
void sub_0200A080(u32 a0) {
sub_020225E4(0xC000, a0);
void sub_0200A080(NNS_G2D_VRAM_TYPE type) {
sub_020225E4(0xC000, type);
}