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

enable -W pedantic #143

Merged
merged 1 commit into from
May 29, 2023
Merged

enable -W pedantic #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ XMAP := $(NEF).xMAP

EXCCFLAGS := -Cpp_exceptions off

MWCFLAGS = $(DEFINES) $(OPTFLAGS) -enum int -lang c99 $(EXCCFLAGS) -gccext,on -proc $(PROC) -msgstyle gcc -gccinc -i ./include -i ./include/library -i $(WORK_DIR)/files -I$(WORK_DIR)/lib/include -ipa file -interworking -inline on,noauto -char signed -W all -W nopedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error
MWCFLAGS = $(DEFINES) $(OPTFLAGS) -enum int -lang c99 $(EXCCFLAGS) -gccext,on -proc $(PROC) -msgstyle gcc -gccinc -i ./include -i ./include/library -i $(WORK_DIR)/files -I$(WORK_DIR)/lib/include -ipa file -interworking -inline on,noauto -char signed -W all -W pedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error

MWASFLAGS = $(DEFINES) -proc $(PROC_S) -gccinc -i . -i ./include -i $(WORK_DIR)/asm/include -i $(WORK_DIR)/files -i $(WORK_DIR)/lib/asm/include -i $(WORK_DIR)/lib/NitroDWC/asm/include -i $(WORK_DIR)/lib/NitroSDK/asm/include -i $(WORK_DIR)/lib/syscall/asm/include -I$(WORK_DIR)/lib/include -DSDK_ASM
MWLDFLAGS := -w off -proc $(PROC) -nopic -nopid -interworking -map closure,unused -symtab sort -m _start -msgstyle gcc
MWLDFLAGS := -proc $(PROC) -nopic -nopid -interworking -map closure,unused -symtab sort -m _start -msgstyle gcc
ARFLAGS := rcS

$(C_OBJS): MWCFLAGS += -include global.h
Expand Down
2 changes: 1 addition & 1 deletion include/field_use_item.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ struct ItemMenuUseData {

typedef void (*ItemMenuUseFunc)(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2);
typedef BOOL (*ItemFieldUseFunc)(struct ItemFieldUseData *data);
typedef u32 (*ItemCheckUseFunc)(const struct ItemCheckUseData *data);
typedef enum ItemUseError (*ItemCheckUseFunc)(const struct ItemCheckUseData *data);

struct UseItemInPartyTaskEnv {
PARTY *party;
Expand Down
4 changes: 2 additions & 2 deletions include/font.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ u32 FontID_FlatArray_GetWidthFirstLine(FontID fontId, const u16 *string, u32 let
u32 FontID_String_GetWidth(FontID fontId, STRING *string, u32 letterSpacing);
BOOL FontID_String_AllCharsValid(FontID fontId, STRING *str0, STRING *str1);
u8 GetFontAttribute(FontID fontId, int attr);
void LoadFontPal0(int layer, u32 baseAddr, HeapID heapId);
void LoadFontPal1(int layer, u32 baseAddr, HeapID heapId);
void LoadFontPal0(enum GFBgLayer layer, u32 baseAddr, HeapID heapId);
void LoadFontPal1(enum GFBgLayer layer, u32 baseAddr, HeapID heapId);
u32 FontID_String_GetWidthMultiline(FontID fontId, STRING *string, u32 letterSpacing);
u32 FontID_String_GetCenterAlignmentX(FontID fontId, STRING *string, u32 letterSpacing, u32 windowWidth);
u32 FontID_GetGlyphWidth(FontID fontId, u16 glyph);
Expand Down
10 changes: 5 additions & 5 deletions include/gf_gfx_loader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// These functions load (perhap-compressed) graphics resources to VRAM.
// A temporary file handle is used to read the data from the card.
u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, BGCONFIG *bgConfig, enum GFBgLayer layer, u32 tileStart, u32 szByte, BOOL isCompressed, HeapID heapId);
void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, BGCONFIG *bgConfig, int layer, u32 tileStart, u32 szByte, BOOL isCompressed, HeapID heapId);
void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, int layer, u32 baseAddr, u32 szByte, HeapID heapId);
void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, int layer, u32 srcOffset, u32 baseAddr, u32 szByte, HeapID heapId);
void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, BGCONFIG *bgConfig, enum GFBgLayer layer, u32 tileStart, u32 szByte, BOOL isCompressed, HeapID heapId);
void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, enum GFBgLayer layer, u32 baseAddr, u32 szByte, HeapID heapId);
void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, enum GFBgLayer layer, u32 srcOffset, u32 baseAddr, u32 szByte, HeapID heapId);
void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberNo, NNS_G2D_VRAM_TYPE type, u32 baseAddr, HeapID heapId, NNSG2dImagePaletteProxy *pPltProxy);
u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberNo, BOOL isCompressed, enum GFBgLayer layer, u32 szByte,NNS_G2D_VRAM_TYPE type, u32 baseAddr, HeapID heapId, NNSG2dImageProxy *pImgProxy);

Expand All @@ -31,8 +31,8 @@ void *GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 fileId, BOOL isComp
// These functions are the same as above, but they use an existing file handle.
u32 GfGfxLoader_LoadCharDataFromOpenNarc(NARC *narc, s32 memberNo, BGCONFIG *bgConfig, enum GFBgLayer layer, u32 tileStart, u32 szByte, BOOL isCompressed, HeapID heapId);
void GfGfxLoader_LoadScrnDataFromOpenNarc(NARC *narc, s32 memberNo, BGCONFIG *bgConfig, enum GFBgLayer layer, u32 tileStart, u32 szByte, BOOL isCompressed, HeapID heapId);
void GfGfxLoader_GXLoadPalFromOpenNarc(NARC *narc, s32 memberNo, int layer, u32 baseAddr, u32 szByte, HeapID heapId);
void GfGfxLoader_GXLoadPalWithSrcOffsetFromOpenNarc(NARC *narc, s32 memberNo, int layer, u32 srcOffset, u32 baseAddr, u32 szByte, HeapID heapId);
void GfGfxLoader_GXLoadPalFromOpenNarc(NARC *narc, s32 memberNo, enum GFBgLayer layer, u32 baseAddr, u32 szByte, HeapID heapId);
void GfGfxLoader_GXLoadPalWithSrcOffsetFromOpenNarc(NARC *narc, s32 memberNo, enum GFBgLayer layer, u32 srcOffset, u32 baseAddr, u32 szByte, HeapID heapId);
void GfGfxLoader_PartiallyLoadPaletteFromOpenNarc(NARC *narc, s32 memberNo, NNS_G2D_VRAM_TYPE type, u32 baseAddr, HeapID heapId, struct NNSG2dImagePaletteProxy *pPltProxy);
u32 GfGfxLoader_LoadImageMappingFromOpenNarc(NARC *narc, s32 memberNo, BOOL isCompressed, enum GFBgLayer layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, HeapID heapId, NNSG2dImageProxy *pImgProxy);
void *GfGfxLoader_GetCharDataFromOpenNarc(NARC *narc, s32 memberNo, BOOL isCompressed, NNSG2dCharacterData ** ppCharData, HeapID heapId);
Expand Down
2 changes: 1 addition & 1 deletion include/unk_0200A090.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ void Destroy2DGfxResObjMan(struct _2DGfxResMan *mgr);
struct _2DGfxResObj *Add2DGfxResObjFromHeader(struct _2DGfxResMan *mgr, const struct _2DGfxResHeader *header, int idx, HeapID heapId);
struct _2DGfxResObj *AddCharResObjFromNarc(struct _2DGfxResMan *mgr, NarcId narcId, int fileId, BOOL compressed, int id, int vram, HeapID heapId);
struct _2DGfxResObj *AddPlttResObjFromNarc(struct _2DGfxResMan *mgr, NarcId narcId, int fileId, BOOL compressed, int id, int vram, int pltt_num, HeapID heapId);
struct _2DGfxResObj *AddCellOrAnimResObjFromNarc(struct _2DGfxResMan *mgr, NarcId narcId, int fileId, BOOL compressed, int id, int type, HeapID heapId);
struct _2DGfxResObj *AddCellOrAnimResObjFromNarc(struct _2DGfxResMan *mgr, NarcId narcId, int fileId, BOOL compressed, int id, GfGfxResType type, HeapID heapId);
void ReplaceCharResObjFromNarc(struct _2DGfxResMan *mgr, struct _2DGfxResObj *obj, NarcId narcId, int fileId, BOOL compressed, HeapID heapId);
void ReplacePlttResObjFromNarc(struct _2DGfxResMan *mgr, struct _2DGfxResObj *obj, NarcId narcId, int fileId, BOOL compressed, HeapID heapId);
struct _2DGfxResObj *AddCharResObjFromOpenNarc(struct _2DGfxResMan *mgr, NARC *narc, int fileId, BOOL compressed, int id, int vram, HeapID heapId);
Expand Down
3 changes: 1 addition & 2 deletions include/unk_0203DFA4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#ifndef POKEHEARTGOLD_UNK_0203DFA4_H
#define POKEHEARTGOLD_UNK_0203DFA4_H

#include "field_system.h"
#include "overlay_manager.h"

typedef struct FieldSystem FieldSystem;

void sub_0203DEF0(FieldSystem *fsys);
BOOL sub_0203DF7C(FieldSystem *fsys);
BOOL sub_0203DF8C(FieldSystem *fsys);
Expand Down
4 changes: 2 additions & 2 deletions include/voltorb_flip/voltorb_flip_game.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ typedef enum CardType {
} CardType;

// A x2 or x3 card (since the card types are stored as unsigned ints)
#define IS_MULTIPLIER_CARD(type) (type - 2 <= 1)
#define IS_MULTIPLIER_CARD(type) ((u32)(type - 2) <= 1)
#define IS_NOT_ONE_CARD(type) (type > 1)

// Card ID's
Expand Down Expand Up @@ -54,7 +54,7 @@ typedef enum RoundOutcome {
typedef u8 Level;

typedef struct Card {
u32 type;
CardType type;
int memo;
BOOL flipped;
} Card;
Expand Down
86 changes: 43 additions & 43 deletions src/battle_arcade_game_board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ static void ov84_0223E958(BGCONFIG *config);
static void BattleArcade_VBlank(void *work);
static void BattleArcade_SetVramBanks(void);
static void ov84_0223E9E4(BGCONFIG *config) ;
static void ov84_0223EAAC(GAME_BOARD_WORK *work, u32 a1);
static void ov84_0223EB08(GAME_BOARD_WORK *work, u32 a1);
static void ov84_0223EAAC(GAME_BOARD_WORK *work, enum GFBgLayer layer);
static void ov84_0223EB08(GAME_BOARD_WORK *work, enum GFBgLayer layer);
static void ov84_0223EB44(void);
static void ov84_0223EB78(GAME_BOARD_WORK *work, u32 a1);
static void ov84_0223EB78(GAME_BOARD_WORK *work, enum GFBgLayer layer);
static void BattleArcadeGameBoard_SetState(GAME_BOARD_WORK *work, int *state, int a2);
static void ov84_0223EBE8(GAME_BOARD_WORK *work, int key);
static void BattleArcadeGameBoard_SetCursorPos(GAME_BOARD_WORK *work, u8 cursorPos);
Expand Down Expand Up @@ -94,7 +94,7 @@ BOOL BattleArcadeGameBoard_InitOverlay(OVY_MANAGER *man, int *state) {
GAME_BOARD_WORK *work;
GAME_BOARD_ARGS *args;

HandleLoadOverlay(FS_OVERLAY_ID(OVY_80), 2);
HandleLoadOverlay(FS_OVERLAY_ID(OVY_80), OVY_LOAD_ASYNC);
BattleArcadeGameBoard_InitSub();
CreateHeap(3, HEAP_ID_GAME_BOARD, 0x20000);
work = OverlayManager_CreateAndGetData(man, sizeof(GAME_BOARD_WORK), HEAP_ID_GAME_BOARD);
Expand Down Expand Up @@ -327,7 +327,7 @@ static BOOL BattleArcadeGameBoard_MoveCursor(GAME_BOARD_WORK *work) {
BattleArcadeObj_SetVisible(work->panel[i], 1);
}
}
ov84_0223EB08(work, 3);
ov84_0223EB08(work, GF_BG_LYR_MAIN_3);
PlaySE(SEQ_SE_DP_WIN_OPEN2);
work->wait = 24;
work->substate = 3;
Expand Down Expand Up @@ -553,7 +553,7 @@ static void BattleArcadeGameBoard_InitObjects(GAME_BOARD_WORK *work) {
u16 yOffset, yOffset2;
int i;

work->narc = NARC_ctor(183, HEAP_ID_GAME_BOARD);
work->narc = NARC_ctor(NARC_a_1_8_3, HEAP_ID_GAME_BOARD);
ov84_0223E8DC(work);
ov84_0223E934(work);

Expand All @@ -566,8 +566,8 @@ static void BattleArcadeGameBoard_InitObjects(GAME_BOARD_WORK *work) {
work->unk78[i] = String_ctor(32, HEAP_ID_GAME_BOARD);
}

LoadFontPal0(0, 416, HEAP_ID_GAME_BOARD);
LoadFontPal1(0, 384, HEAP_ID_GAME_BOARD);
LoadFontPal0(GF_BG_LYR_MAIN_0, 416, HEAP_ID_GAME_BOARD);
LoadFontPal1(GF_BG_LYR_MAIN_0, 384, HEAP_ID_GAME_BOARD);
ov84_0223F8B4(work->bgConfig, work->window);
work->cursor = BattleArcadeObject_Create(&work->unk3E8, 1, 1, 1, 35, 68, 36, 0, 2, 0);
BattleArcadeObj_SetVisible(work->cursor, 0);
Expand Down Expand Up @@ -603,7 +603,7 @@ 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(1, 16);
sub_02009FE8(1, GX_OBJVRAMMODE_CHAR_1D_32K);
sub_0200A080(1);
sub_0203A880();
}
Expand All @@ -620,18 +620,18 @@ static void ov84_0223E8DC(GAME_BOARD_WORK *work) {
PaletteData_AllocBuffers(work->unk3D4, 2, 0x200, HEAP_ID_GAME_BOARD);
PaletteData_AllocBuffers(work->unk3D4, 0, 0x200, HEAP_ID_GAME_BOARD);

ov84_0223EAAC(work, 3);
ov84_0223EAAC(work, GF_BG_LYR_MAIN_3);
ov84_0223EB44();
ov84_0223EB78(work, 4);
ov84_0223EB78(work, GF_BG_LYR_SUB_0);
}

static void ov84_0223E934(GAME_BOARD_WORK *work) {
ov84_0223F2B4(&work->unk3E8, work->playerParty, work->opponentParty, BattleArcade_MultiplayerCheck(work->type));
}

static void ov84_0223E958(BGCONFIG *config) {
GX_EngineAToggleLayers(31, 0);
GX_EngineBToggleLayers(31, 0);
GX_EngineAToggleLayers(31, GX_LAYER_TOGGLE_OFF);
GX_EngineBToggleLayers(31, GX_LAYER_TOGGLE_OFF);
FreeBgTilemapBuffer(config, 3);
FreeBgTilemapBuffer(config, 1);
FreeBgTilemapBuffer(config, 4);
Expand Down Expand Up @@ -682,24 +682,24 @@ static void ov84_0223E9E4(BGCONFIG *config) {

G2_SetBG0Priority(0);

GX_EngineAToggleLayers(1, 0);
GX_EngineAToggleLayers(1, GX_LAYER_TOGGLE_OFF);
}

static void ov84_0223EAAC(GAME_BOARD_WORK *work, u32 a1) {
static void ov84_0223EAAC(GAME_BOARD_WORK *work, enum GFBgLayer layer) {
u32 var;

GfGfxLoader_LoadCharDataFromOpenNarc(work->narc, 124, work->bgConfig, a1, 0, 0, 1, HEAP_ID_GAME_BOARD);
GfGfxLoader_LoadCharDataFromOpenNarc(work->narc, 124, work->bgConfig, layer, 0, 0, 1, HEAP_ID_GAME_BOARD);

if (BattleArcade_MultiplayerCheck(work->type) == FALSE) {
var = 120;
} else {
var = 122;
}

GfGfxLoader_LoadScrnDataFromOpenNarc(work->narc, var, work->bgConfig, a1, 0, 0, 1, HEAP_ID_GAME_BOARD);
GfGfxLoader_LoadScrnDataFromOpenNarc(work->narc, var, work->bgConfig, layer, 0, 0, 1, HEAP_ID_GAME_BOARD);
}

static void ov84_0223EB08(GAME_BOARD_WORK *work, u32 a1) {
static void ov84_0223EB08(GAME_BOARD_WORK *work, enum GFBgLayer layer) {
u32 var;

if (BattleArcade_MultiplayerCheck(work->type) == FALSE) {
Expand All @@ -708,25 +708,25 @@ static void ov84_0223EB08(GAME_BOARD_WORK *work, u32 a1) {
var = 123;
}

GfGfxLoader_LoadScrnDataFromOpenNarc(work->narc, var, work->bgConfig, a1, 0, 0, 1, HEAP_ID_GAME_BOARD);
GfGfxLoader_LoadScrnDataFromOpenNarc(work->narc, var, work->bgConfig, layer, 0, 0, 1, HEAP_ID_GAME_BOARD);
}

static void ov84_0223EB44(void) {
void *buffer;
NNSG2dPaletteData *dat;

buffer = GfGfxLoader_GetPlttData(183, 186, &dat, HEAP_ID_GAME_BOARD);
buffer = GfGfxLoader_GetPlttData(NARC_a_1_8_3, 186, &dat, HEAP_ID_GAME_BOARD);

DC_FlushRange(dat->pRawData, 224);
GX_LoadBGPltt(dat->pRawData, 0, 224);

FreeToHeap(buffer);
}

static void ov84_0223EB78(GAME_BOARD_WORK *work, u32 a1) {
GfGfxLoader_LoadCharDataFromOpenNarc(work->narc, 126, work->bgConfig, a1, 0, 0, TRUE, HEAP_ID_GAME_BOARD);
GfGfxLoader_GXLoadPalFromOpenNarc(work->narc, 187, 4, 0, 64, HEAP_ID_GAME_BOARD);
GfGfxLoader_LoadScrnDataFromOpenNarc(work->narc, 125, work->bgConfig, a1, 0, 0, TRUE, HEAP_ID_GAME_BOARD);
static void ov84_0223EB78(GAME_BOARD_WORK *work, enum GFBgLayer layer) {
GfGfxLoader_LoadCharDataFromOpenNarc(work->narc, 126, work->bgConfig, layer, 0, 0, TRUE, HEAP_ID_GAME_BOARD);
GfGfxLoader_GXLoadPalFromOpenNarc(work->narc, 187, GF_BG_LYR_SUB_0, 0, 64, HEAP_ID_GAME_BOARD);
GfGfxLoader_LoadScrnDataFromOpenNarc(work->narc, 125, work->bgConfig, layer, 0, 0, TRUE, HEAP_ID_GAME_BOARD);
}

static void BattleArcadeGameBoard_SetState(GAME_BOARD_WORK *work, int *state, int a2) {
Expand Down Expand Up @@ -1217,7 +1217,7 @@ static void ov84_0223F2B4(GAME_BOARD_SUB_3E8 *work, PARTY *playerParty, PARTY *o
work->spriteList = G2dRenderer_Init(34, &work->render, HEAP_ID_GAME_BOARD);

for (i = 0; i < 4; i++) {
work->resourceMan[i] = Create2DGfxResObjMan(ov84_0223F9E4[i], i, HEAP_ID_GAME_BOARD);
work->resourceMan[i] = Create2DGfxResObjMan(ov84_0223F9E4[i], (GfGfxResType)i, HEAP_ID_GAME_BOARD);
}

ov84_0223F714(work);
Expand All @@ -1233,8 +1233,8 @@ static void ov84_0223F2B4(GAME_BOARD_SUB_3E8 *work, PARTY *playerParty, PARTY *o
sub_0200AF94(work->resourceObj[i][1]);
}

GX_EngineBToggleLayers(16, 1);
GX_EngineAToggleLayers(16, 1);
GX_EngineBToggleLayers(16, GX_LAYER_TOGGLE_ON);
GX_EngineAToggleLayers(16, GX_LAYER_TOGGLE_ON);
}

static Sprite *ov84_0223F374(GAME_BOARD_SUB_3E8 *work, u32 chara, u32 pal, u32 cell, u32 anim, u32 prio, int bgPrio, u8 display) {
Expand Down Expand Up @@ -1305,19 +1305,19 @@ static void ov84_0223F480(void) {
}

static void ov84_0223F4B4(GAME_BOARD_SUB_3E8 *work) {
work->resourceObj[1][0] = AddCharResObjFromNarc(work->resourceMan[0], 184, 18, TRUE, 1, 1, HEAP_ID_GAME_BOARD);
work->resourceObj[1][1] = AddPlttResObjFromNarc(work->resourceMan[1], 184, 56, FALSE, 1, 1, 8, HEAP_ID_GAME_BOARD);
work->resourceObj[1][2] = AddCellOrAnimResObjFromNarc(work->resourceMan[2], 184, 20, TRUE, 1, 2, HEAP_ID_GAME_BOARD);
work->resourceObj[1][3] = AddCellOrAnimResObjFromNarc(work->resourceMan[3], 184, 19, TRUE, 1, 3, HEAP_ID_GAME_BOARD);
work->resourceObj[1][0] = AddCharResObjFromNarc(work->resourceMan[0], NARC_a_1_8_4, 18, TRUE, 1, 1, HEAP_ID_GAME_BOARD);
work->resourceObj[1][1] = AddPlttResObjFromNarc(work->resourceMan[1], NARC_a_1_8_4, 56, FALSE, 1, 1, 8, HEAP_ID_GAME_BOARD);
work->resourceObj[1][2] = AddCellOrAnimResObjFromNarc(work->resourceMan[2], NARC_a_1_8_4, 20, TRUE, 1, GF_GFX_RES_TYPE_CELL, HEAP_ID_GAME_BOARD);
work->resourceObj[1][3] = AddCellOrAnimResObjFromNarc(work->resourceMan[3], NARC_a_1_8_4, 19, TRUE, 1, GF_GFX_RES_TYPE_ANIM, HEAP_ID_GAME_BOARD);
}

static void ov84_0223F538(GAME_BOARD_SUB_3E8 *work) {
NARC *narc = NARC_ctor(21, HEAP_ID_GAME_BOARD);
NARC *narc = NARC_ctor(NARC_a_0_2_1, HEAP_ID_GAME_BOARD);

work->resourceObj[2][0] = AddCharResObjFromOpenNarc(work->resourceMan[0], narc, sub_0207CA9C(), FALSE, 2, 1, HEAP_ID_GAME_BOARD);
work->resourceObj[2][1] = AddPlttResObjFromNarc(work->resourceMan[1], 21, sub_0207CAA0(), FALSE, 2, 1, 3, HEAP_ID_GAME_BOARD);
work->resourceObj[2][2] = AddCellOrAnimResObjFromOpenNarc(work->resourceMan[2], narc, sub_0207CAA4(), FALSE, 2, 2, HEAP_ID_GAME_BOARD);
work->resourceObj[2][3] = AddCellOrAnimResObjFromOpenNarc(work->resourceMan[3], narc, sub_0207CAA8(), FALSE, 2, 3, HEAP_ID_GAME_BOARD);
work->resourceObj[2][1] = AddPlttResObjFromNarc(work->resourceMan[1], NARC_a_0_2_1, sub_0207CAA0(), FALSE, 2, 1, 3, HEAP_ID_GAME_BOARD);
work->resourceObj[2][2] = AddCellOrAnimResObjFromOpenNarc(work->resourceMan[2], narc, sub_0207CAA4(), FALSE, 2, GF_GFX_RES_TYPE_CELL, HEAP_ID_GAME_BOARD);
work->resourceObj[2][3] = AddCellOrAnimResObjFromOpenNarc(work->resourceMan[3], narc, sub_0207CAA8(), FALSE, 2, GF_GFX_RES_TYPE_ANIM, HEAP_ID_GAME_BOARD);

NARC_dtor(narc);
}
Expand All @@ -1326,11 +1326,11 @@ static void ov84_0223F5E4(GAME_BOARD_SUB_3E8 *work, PARTY *playerParty, PARTY *o
u32 i;
Pokemon *playerMon;
Pokemon *opponentMon;
NARC *narc = NARC_ctor(20, HEAP_ID_GAME_BOARD);
NARC *narc = NARC_ctor(NARC_a_0_2_0, HEAP_ID_GAME_BOARD);

work->resourceObj[3][1] = AddPlttResObjFromNarc(work->resourceMan[1], 20, sub_02074490(), FALSE, 3, 1, 3, HEAP_ID_GAME_BOARD);
work->resourceObj[3][2] = AddCellOrAnimResObjFromOpenNarc(work->resourceMan[2], narc, sub_02074498(), FALSE, 3, 2, HEAP_ID_GAME_BOARD);
work->resourceObj[3][3] = AddCellOrAnimResObjFromOpenNarc(work->resourceMan[3], narc, sub_020744A4(), FALSE, 3, 3, HEAP_ID_GAME_BOARD);
work->resourceObj[3][1] = AddPlttResObjFromNarc(work->resourceMan[1], NARC_a_0_2_0, sub_02074490(), FALSE, 3, 1, 3, HEAP_ID_GAME_BOARD);
work->resourceObj[3][2] = AddCellOrAnimResObjFromOpenNarc(work->resourceMan[2], narc, sub_02074498(), FALSE, 3, GF_GFX_RES_TYPE_CELL, HEAP_ID_GAME_BOARD);
work->resourceObj[3][3] = AddCellOrAnimResObjFromOpenNarc(work->resourceMan[3], narc, sub_020744A4(), FALSE, 3, GF_GFX_RES_TYPE_ANIM, HEAP_ID_GAME_BOARD);

for (i = 0; i < 4; i++) {
if (i == 3) {
Expand All @@ -1354,10 +1354,10 @@ static void ov84_0223F5E4(GAME_BOARD_SUB_3E8 *work, PARTY *playerParty, PARTY *o
}

static void ov84_0223F714(GAME_BOARD_SUB_3E8 *work) {
work->resourceObj[0][0] = AddCharResObjFromNarc(work->resourceMan[0], 184, 21, TRUE, 0, 2, HEAP_ID_GAME_BOARD);
work->resourceObj[0][1] = AddPlttResObjFromNarc(work->resourceMan[1], 184, 57, FALSE, 0, 2, 2, HEAP_ID_GAME_BOARD);
work->resourceObj[0][2] = AddCellOrAnimResObjFromNarc(work->resourceMan[2], 184, 23, TRUE, 0, 2, HEAP_ID_GAME_BOARD);
work->resourceObj[0][3] = AddCellOrAnimResObjFromNarc(work->resourceMan[3], 184, 22, TRUE, 0, 3, HEAP_ID_GAME_BOARD);
work->resourceObj[0][0] = AddCharResObjFromNarc(work->resourceMan[0], NARC_a_1_8_4, 21, TRUE, 0, 2, HEAP_ID_GAME_BOARD);
work->resourceObj[0][1] = AddPlttResObjFromNarc(work->resourceMan[1], NARC_a_1_8_4, 57, FALSE, 0, 2, 2, HEAP_ID_GAME_BOARD);
work->resourceObj[0][2] = AddCellOrAnimResObjFromNarc(work->resourceMan[2], NARC_a_1_8_4, 23, TRUE, 0, GF_GFX_RES_TYPE_CELL, HEAP_ID_GAME_BOARD);
work->resourceObj[0][3] = AddCellOrAnimResObjFromNarc(work->resourceMan[3], NARC_a_1_8_4, 22, TRUE, 0, GF_GFX_RES_TYPE_ANIM, HEAP_ID_GAME_BOARD);
}

static BATTLE_ARCADE_OBJECT *BattleArcadeObject_Create(GAME_BOARD_SUB_3E8 *work, u32 chara, u32 pal, u32 cell, u32 anim, u16 x, u16 y, u32 priority, int bgPrio, u8 display) {
Expand Down
Loading