From ba11c5634b6f41afde924a16aa07b9b3a747bf95 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 7 Dec 2022 21:00:03 +1000 Subject: [PATCH] Introduce uintptr_t --- src/game/activemenu.c | 4 +- src/game/bg.c | 108 +- src/game/bondgun.c | 38 +- src/game/bondview.c | 8 +- src/game/camdraw.c | 21 +- src/game/cheats.c | 102 +- src/game/chr.c | 52 +- src/game/chrai.c | 2 +- src/game/dlights.c | 4 +- src/game/endscreen.c | 104 +- src/game/file.c | 4042 +++++++++--------- src/game/filemgr.c | 132 +- src/game/fmb.c | 22 +- src/game/game_13c510.c | 2 +- src/game/game_1531a0.c | 6 +- src/game/game_176080.c | 6 +- src/game/getitle.c | 4 +- src/game/gfxmemory.c | 2 +- src/game/lang.c | 12 +- src/game/lv.c | 6 +- src/game/mainmenu.c | 172 +- src/game/menu.c | 28 +- src/game/menuitem.c | 2 +- src/game/modeldef.c | 22 +- src/game/mplayer/ingame.c | 56 +- src/game/mplayer/scenarios.c | 12 +- src/game/mplayer/scenarios/kingofthehill.inc | 2 +- src/game/mplayer/setup.c | 352 +- src/game/objectives.c | 2 +- src/game/player.c | 8 +- src/game/playerreset.c | 24 +- src/game/portalconv.c | 2 +- src/game/propobj.c | 44 +- src/game/setup.c | 14 +- src/game/setuppads.c | 12 +- src/game/splat.c | 2 +- src/game/stagetable.c | 4 +- src/game/tex.c | 2 +- src/game/texdecompress.c | 16 +- src/game/texinit.c | 2 +- src/game/texreset.c | 46 +- src/game/tilesreset.c | 4 +- src/game/title.c | 12 +- src/game/training.c | 2 +- src/game/trainingmenus.c | 142 +- src/game/wallhitreset.c | 2 +- src/include/game/activemenu.h | 4 +- src/include/game/cheats.h | 8 +- src/include/game/endscreen.h | 16 +- src/include/game/file.h | 2 +- src/include/game/filemgr.h | 62 +- src/include/game/fmb.h | 10 +- src/include/game/mainmenu.h | 108 +- src/include/game/menu.h | 12 +- src/include/game/mplayer/ingame.h | 18 +- src/include/game/mplayer/scenarios.h | 2 +- src/include/game/mplayer/setup.h | 174 +- src/include/game/trainingmenus.h | 46 +- src/include/lib/model.h | 2 +- src/include/types.h | 11 +- src/lib/anim.c | 4 +- src/lib/audiomgr.c | 2 +- src/lib/boot.c | 10 +- src/lib/collision.c | 194 +- src/lib/crash.c | 20 +- src/lib/debughud.c | 2 +- src/lib/dma.c | 4 +- src/lib/lib_17ce0.c | 4 +- src/lib/main.c | 6 +- src/lib/mema.c | 8 +- src/lib/memp.c | 2 +- src/lib/model.c | 8 +- src/lib/mp3.c | 4 +- src/lib/mtxc.c | 2 +- src/lib/naudio/n_csq.c | 3 +- src/lib/naudio/n_load.c | 8 +- src/lib/naudio/n_resample2.c | 1 + src/lib/naudio/n_reverb.c | 2 +- src/lib/naudio/n_sndplayer.c | 2 +- src/lib/naudio/n_synthInternals.h | 3 +- src/lib/naudio/n_synthesizer.c | 2 +- src/lib/rdp.c | 6 +- src/lib/snd.c | 82 +- src/lib/str.c | 4 +- src/lib/ultra/audio/bnkf.c | 7 +- src/lib/ultra/io/aisetnextbuf.c | 3 +- src/lib/ultra/io/contpfs.c | 3 +- src/lib/ultra/io/devmgr.c | 3 +- src/lib/ultra/io/pirawdma.c | 3 +- src/lib/ultra/io/pirawread.c | 3 +- src/lib/ultra/io/sptask.c | 3 +- src/lib/ultra/io/visetxscale.c | 3 +- src/lib/ultra/os/createthread.c | 5 +- src/lib/vi.c | 2 +- src/lib/vm.c | 26 +- 95 files changed, 3297 insertions(+), 3285 deletions(-) diff --git a/src/game/activemenu.c b/src/game/activemenu.c index 28ac50848..9cde816c2 100644 --- a/src/game/activemenu.c +++ b/src/game/activemenu.c @@ -74,7 +74,7 @@ void amOpenPickTarget(void) } } -s32 amPickTargetMenuList(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult amPickTargetMenuList(s32 operation, struct menuitem *item, union handlerdata *data) { static u32 teamcolours[] = { 0xff666600, @@ -200,7 +200,7 @@ s32 amPickTargetMenuList(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 amPickTargetMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult amPickTargetMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: diff --git a/src/game/bg.c b/src/game/bg.c index c5ca95ec2..3a319a480 100644 --- a/src/game/bg.c +++ b/src/game/bg.c @@ -1140,7 +1140,7 @@ Gfx *bg0f1598b4(Gfx *gdl, Gfx *gdl2, struct gfxvtx *vertices, s16 arg3[3]) s32 index = gdl2->bytes[1] & 0xf; s32 numvertices = (((u32)gdl2->bytes[1] >> 4)) + 1; s32 offset = (gdl2->words.w1 & 0xffffff); - struct gfxvtx *vtx = (struct gfxvtx *)((u32)vertices + offset); + struct gfxvtx *vtx = (struct gfxvtx *)((uintptr_t)vertices + offset); u32 stack[4]; for (i = 0; i < numvertices; i++) { @@ -1692,7 +1692,7 @@ s32 stageGetIndex2(s32 stagenum) f32 portal0f15b274(s32 portalnum) { - struct portalvertices *pvertices = (struct portalvertices *)((u32)g_BgPortals + g_BgPortals[portalnum].verticesoffset); + struct portalvertices *pvertices = (struct portalvertices *)((uintptr_t)g_BgPortals + g_BgPortals[portalnum].verticesoffset); s32 count = pvertices->count; s32 i; s32 j; @@ -1720,7 +1720,7 @@ f32 portal0f15b274(s32 portalnum) void func0f15b3e4(s32 portalnum, struct coord *a, struct coord *b, struct coord *c, struct coord *d) { struct portalvertices *pvertices; - pvertices = (struct portalvertices *)((u32)g_BgPortals + g_BgPortals[portalnum].verticesoffset); + pvertices = (struct portalvertices *)((uintptr_t)g_BgPortals + g_BgPortals[portalnum].verticesoffset); a->x = pvertices->vertices[0].x; a->y = pvertices->vertices[0].y; @@ -1911,7 +1911,7 @@ void bgReset(s32 stagenum) } // Copy section 1 header to stack and parse into variables - header = (u8 *)ALIGN16((u32)headerbuffer); + header = (u8 *)ALIGN16((uintptr_t)headerbuffer); bgLoadFile(header, 0, 0x40); inflatedsize = *(u32 *)&header[0]; section1compsize = *(u32 *)&header[4]; @@ -1925,7 +1925,7 @@ void bgReset(s32 stagenum) g_BgPrimaryData = mempAlloc(ALIGN16(inflatedsize + 0x8010), MEMPOOL_STAGE); // Set up pointer to scratch space - scratch = (u32) g_BgPrimaryData + inflatedsize - primcompsize; + scratch = (uintptr_t) g_BgPrimaryData + inflatedsize - primcompsize; scratch = ALIGN16(scratch + 0x8000); g_LoadType = LOADTYPE_BG; @@ -1955,13 +1955,13 @@ void bgReset(s32 stagenum) // in the docs folder of this project. #ifdef AVOID_UB section2 = mempAlloc(inflatedsize + section2compsize, MEMPOOL_STAGE); - scratch = (u32) section2 + inflatedsize; + scratch = (uintptr_t) section2 + inflatedsize; #elif VERSION >= VERSION_NTSC_FINAL section2 = mempAlloc(inflatedsize + 0x8000, MEMPOOL_STAGE); - scratch = (u32) section2 + 0x8000; + scratch = (uintptr_t) section2 + 0x8000; #else section2 = mempAlloc(inflatedsize + 0x800, MEMPOOL_STAGE); - scratch = (u32) section2 + 0x800; + scratch = (uintptr_t) section2 + 0x800; #endif // Load compressed data from ROM to scratch @@ -2129,7 +2129,7 @@ void bgBuildTables(s32 stagenum) } } - pvertices = (struct portalvertices *)((u32)g_BgPortals + offset); + pvertices = (struct portalvertices *)((uintptr_t)g_BgPortals + offset); if (pvertices->count <= 0) { break; @@ -2230,7 +2230,7 @@ void bgBuildTables(s32 stagenum) tmp2.coord.y = 0.0f; tmp2.coord.z = 0.0f; - pvertices = (struct portalvertices *)((u32)g_BgPortals + g_BgPortals[i].verticesoffset); + pvertices = (struct portalvertices *)((uintptr_t)g_BgPortals + g_BgPortals[i].verticesoffset); for (j = 0; j < pvertices->count; j++) { struct coord *next = &pvertices->vertices[(j + 1) % pvertices->count]; @@ -2276,7 +2276,7 @@ void bgBuildTables(s32 stagenum) if (g_BgCommands != NULL) { for (i = 0; g_BgCommands[i].type != BGCMD_END; i++) { if (g_BgCommands[i].type == BGCMD_PORTALARG) { - g_BgCommands[i].param = portalFindNumByVertices((void *)(g_BgCommands[i].param + (u32)g_BgPrimaryData + 0xf1000000)); + g_BgCommands[i].param = portalFindNumByVertices((void *)(g_BgCommands[i].param + (uintptr_t)g_BgPrimaryData + 0xf1000000)); } } } @@ -2309,7 +2309,7 @@ void bgBuildTables(s32 stagenum) // the section 3 allocation is resized to 0, effectively freeing it. // Load and read the header - header = (u8 *)ALIGN16((u32)headerbuffer); + header = (u8 *)ALIGN16((uintptr_t)headerbuffer); bgLoadFile(header, g_BgSection3, 0x40); inflatedsize = (*(u16 *)&header[0] & 0x7fff) - 1; section3compsize = *(u16 *)&header[2]; @@ -2931,7 +2931,7 @@ s32 portalFindNumByVertices(struct portalvertices *arg0) struct bgportal *portal = g_BgPortals; for (i = 0; portal[i].verticesoffset != 0; i++) { - struct portalvertices *pvertices = (struct portalvertices *)((u32)portal + portal[i].verticesoffset); + struct portalvertices *pvertices = (struct portalvertices *)((uintptr_t)portal + portal[i].verticesoffset); if (pvertices == arg0) { return i; @@ -3080,9 +3080,9 @@ Gfx *roomGetNextGdlInLayer(s32 roomnum, Gfx *start, u32 types) struct gfxvtx *roomFindVerticesForGdl(s32 roomnum, Gfx *gdl) { struct roomblock *block = g_Rooms[roomnum].gfxdata->blocks; - u32 end = (u32)g_Rooms[roomnum].gfxdata->vertices; + uintptr_t end = (uintptr_t)g_Rooms[roomnum].gfxdata->vertices; - while ((u32)(block + 1) <= end) { + while ((uintptr_t)(block + 1) <= end) { switch (block->type) { case ROOMBLOCKTYPE_LEAF: if (gdl == block->gdl) { @@ -3090,8 +3090,8 @@ struct gfxvtx *roomFindVerticesForGdl(s32 roomnum, Gfx *gdl) } break; case ROOMBLOCKTYPE_PARENT: - if ((u32)block->unk0c < end) { - end = (u32)block->unk0c; + if ((uintptr_t)block->unk0c < end) { + end = (uintptr_t)block->unk0c; } break; } @@ -4285,9 +4285,9 @@ void bgLoadRoom(s32 roomnum) u8 *vtxblocks[50]; // 140 u8 *sp78[50]; s32 len; - u32 end1; + uintptr_t end1; s32 i; // 6c - u32 end2; + uintptr_t end2; s32 prev; s32 v1; @@ -4352,56 +4352,56 @@ void bgLoadRoom(s32 roomnum) // Promote offsets to pointers in the gfxdata header if (g_Rooms[roomnum].gfxdata->vertices) { - g_Rooms[roomnum].gfxdata->vertices = (struct gfxvtx *)((u32)g_Rooms[roomnum].gfxdata->vertices - g_BgRooms[roomnum].unk00 + (u32)allocation); + g_Rooms[roomnum].gfxdata->vertices = (struct gfxvtx *)((uintptr_t)g_Rooms[roomnum].gfxdata->vertices - g_BgRooms[roomnum].unk00 + (uintptr_t)allocation); } if (g_Rooms[roomnum].gfxdata->colours) { - g_Rooms[roomnum].gfxdata->colours = (u32 *)((u32)g_Rooms[roomnum].gfxdata->colours - g_BgRooms[roomnum].unk00 + (u32)allocation); + g_Rooms[roomnum].gfxdata->colours = (u32 *)((uintptr_t)g_Rooms[roomnum].gfxdata->colours - g_BgRooms[roomnum].unk00 + (uintptr_t)allocation); } if (g_Rooms[roomnum].gfxdata->opablocks) { - g_Rooms[roomnum].gfxdata->opablocks = (struct roomblock *)((u32)g_Rooms[roomnum].gfxdata->opablocks - g_BgRooms[roomnum].unk00 + (u32)allocation); + g_Rooms[roomnum].gfxdata->opablocks = (struct roomblock *)((uintptr_t)g_Rooms[roomnum].gfxdata->opablocks - g_BgRooms[roomnum].unk00 + (uintptr_t)allocation); } if (g_Rooms[roomnum].gfxdata->xlublocks) { - g_Rooms[roomnum].gfxdata->xlublocks = (struct roomblock *)((u32)g_Rooms[roomnum].gfxdata->xlublocks - g_BgRooms[roomnum].unk00 + (u32)allocation); + g_Rooms[roomnum].gfxdata->xlublocks = (struct roomblock *)((uintptr_t)g_Rooms[roomnum].gfxdata->xlublocks - g_BgRooms[roomnum].unk00 + (uintptr_t)allocation); } // Promote offsets to pointers in each gfxdata block block1 = g_Rooms[roomnum].gfxdata->blocks; - end1 = (u32)g_Rooms[roomnum].gfxdata->vertices; + end1 = (uintptr_t)g_Rooms[roomnum].gfxdata->vertices; - while ((s32) (block1 + 1) <= end1) { + while ((intptr_t) (block1 + 1) <= end1) { switch (block1->type) { case ROOMBLOCKTYPE_LEAF: if (block1->next != NULL) { - block1->next = (struct roomblock *)((u32)block1->next - g_BgRooms[roomnum].unk00 + (u32)allocation); + block1->next = (struct roomblock *)((uintptr_t)block1->next - g_BgRooms[roomnum].unk00 + (uintptr_t)allocation); } if (block1->gdl != 0) { - block1->gdl = (Gfx *)((u32)block1->gdl - g_BgRooms[roomnum].unk00 + (u32)allocation); + block1->gdl = (Gfx *)((uintptr_t)block1->gdl - g_BgRooms[roomnum].unk00 + (uintptr_t)allocation); } if (block1->vertices != 0) { - block1->vertices = (struct gfxvtx *)((u32)block1->vertices - g_BgRooms[roomnum].unk00 + (u32)allocation); + block1->vertices = (struct gfxvtx *)((uintptr_t)block1->vertices - g_BgRooms[roomnum].unk00 + (uintptr_t)allocation); } if (block1->colours != 0) { - block1->colours = (u32 *)((u32)block1->colours - g_BgRooms[roomnum].unk00 + (u32)allocation); + block1->colours = (u32 *)((uintptr_t)block1->colours - g_BgRooms[roomnum].unk00 + (uintptr_t)allocation); } break; case ROOMBLOCKTYPE_PARENT: if (block1->next != NULL) { - block1->next = (struct roomblock *)((u32)block1->next - g_BgRooms[roomnum].unk00 + (u32)allocation); + block1->next = (struct roomblock *)((uintptr_t)block1->next - g_BgRooms[roomnum].unk00 + (uintptr_t)allocation); } if (block1->gdl != 0) { - block1->gdl = (Gfx *)((u32)block1->gdl - g_BgRooms[roomnum].unk00 + (u32)allocation); + block1->gdl = (Gfx *)((uintptr_t)block1->gdl - g_BgRooms[roomnum].unk00 + (uintptr_t)allocation); } if (block1->vertices != 0) { - block1->vertices = (struct gfxvtx *)((u32)block1->vertices - g_BgRooms[roomnum].unk00 + (u32)allocation); + block1->vertices = (struct gfxvtx *)((uintptr_t)block1->vertices - g_BgRooms[roomnum].unk00 + (uintptr_t)allocation); } if (block1->colours != 0) { - block1->colours = (u32 *)((u32)block1->colours - g_BgRooms[roomnum].unk00 + (u32)allocation); + block1->colours = (u32 *)((uintptr_t)block1->colours - g_BgRooms[roomnum].unk00 + (uintptr_t)allocation); } - if ((u32)block1->vertices < end1) { - end1 = (u32)block1->vertices; + if ((uintptr_t)block1->vertices < end1) { + end1 = (uintptr_t)block1->vertices; } break; } @@ -4410,8 +4410,8 @@ void bgLoadRoom(s32 roomnum) } // Calculate the number of vertices and colours - g_Rooms[roomnum].gfxdata->numvertices = ((u32)g_Rooms[roomnum].gfxdata->colours - (u32)g_Rooms[roomnum].gfxdata->vertices) / sizeof(struct gfxvtx); - g_Rooms[roomnum].gfxdata->numcolours = ((u32)roomGetNextGdlInLayer(roomnum, 0, VTXBATCHTYPE_OPA | VTXBATCHTYPE_XLU) - (u32)g_Rooms[roomnum].gfxdata->colours) / sizeof(u32); + g_Rooms[roomnum].gfxdata->numvertices = ((uintptr_t)g_Rooms[roomnum].gfxdata->colours - (uintptr_t)g_Rooms[roomnum].gfxdata->vertices) / sizeof(struct gfxvtx); + g_Rooms[roomnum].gfxdata->numcolours = ((uintptr_t)roomGetNextGdlInLayer(roomnum, 0, VTXBATCHTYPE_OPA | VTXBATCHTYPE_XLU) - (uintptr_t)g_Rooms[roomnum].gfxdata->colours) / sizeof(u32); // Build arrays of pointers to gfx blocks and vtx blocks len = 0; @@ -4450,7 +4450,7 @@ void bgLoadRoom(s32 roomnum) s32 byteswritten = texLoadFromGdl((void *) sp78[i], gfxblocks[i + 1] - gfxblocks[i], (void *) a2, NULL, vtxblocks[i]); sp78[i] = a2; a2 += byteswritten; - a2 = (u8 *) ALIGN8((s32) a2); + a2 = (u8 *) ALIGN8((intptr_t) a2); } sp78[len] = a2; @@ -4469,15 +4469,15 @@ void bgLoadRoom(s32 roomnum) g_Rooms[roomnum].loaded240 = 1; if (g_Rooms[roomnum].gfxdatalen != size) { - memaRealloc((s32) allocation, size, g_Rooms[roomnum].gfxdatalen); + memaRealloc((intptr_t) allocation, size, g_Rooms[roomnum].gfxdatalen); } // Update gdl pointers in the gfxdata so they point to the ones // that have been processed by the texture decompressor. block2 = g_Rooms[roomnum].gfxdata->blocks; // a1 = - end2 = (u32) g_Rooms[roomnum].gfxdata->vertices; // a3 = + end2 = (uintptr_t) g_Rooms[roomnum].gfxdata->vertices; // a3 = - while ((s32) (block2 + 1) <= end2) { + while ((intptr_t) (block2 + 1) <= end2) { switch (block2->type) { case ROOMBLOCKTYPE_LEAF: if (block2->gdl) { @@ -4492,8 +4492,8 @@ void bgLoadRoom(s32 roomnum) } break; case ROOMBLOCKTYPE_PARENT: - if ((u32) block2->unk0c < end2) { - end2 = (u32) block2->unk0c; + if ((uintptr_t) block2->unk0c < end2) { + end2 = (uintptr_t) block2->unk0c; } break; } @@ -4681,7 +4681,7 @@ void bgTickRooms(void) Gfx *bgRenderRoomPass(Gfx *gdl, s32 roomnum, struct roomblock *block, bool arg3) { - u32 v0; + uintptr_t v0; if (block == NULL) { return gdl; @@ -4697,13 +4697,13 @@ Gfx *bgRenderRoomPass(Gfx *gdl, s32 roomnum, struct roomblock *block, bool arg3) roomHighlight(roomnum); - v0 = (u32)g_Rooms[roomnum].colours; + v0 = (uintptr_t)g_Rooms[roomnum].colours; if (v0 != NULL) { - s32 addr = ALIGN8((u32)&g_Rooms[roomnum].gfxdata->vertices[g_Rooms[roomnum].gfxdata->numvertices]); - v0 += (((s32)block->colours - addr) >> 2) * 4; + s32 addr = ALIGN8((uintptr_t)&g_Rooms[roomnum].gfxdata->vertices[g_Rooms[roomnum].gfxdata->numvertices]); + v0 += (((intptr_t)block->colours - addr) >> 2) * 4; } else { - v0 = (u32)block->colours; + v0 = (uintptr_t)block->colours; } gSPSegment(gdl++, SPSEGMENT_BG_COL, OS_PHYSICAL_TO_K0(v0)); @@ -4826,7 +4826,7 @@ s32 bgPopulateVtxBatchType(s32 roomnum, struct vtxbatch *batches, Gfx *gdl, s32 } numvertices = (((u32)gdl[i].bytes[1] >> 4) & 0xf) + 1; - batchvertices = (struct gfxvtx *)((u32)vertices + (gdl[i].words.w1 & 0xffffff)); + batchvertices = (struct gfxvtx *)((uintptr_t)vertices + (gdl[i].words.w1 & 0xffffff)); for (j = 0; j < numvertices; j++) { f32 x = batchvertices[j].x; @@ -5137,7 +5137,7 @@ bool bgTestHitOnObj(struct coord *arg0, struct coord *arg1, struct coord *arg2, count = gdl->bytes[1] & 0xf; offset = (gdl->words.w1 & 0xffffff); numvertices = (((u32)gdl->bytes[1] >> 4) & 0xf) + 1; - vtx = (struct gfxvtx *)((u32)vertices + offset); + vtx = (struct gfxvtx *)((uintptr_t)vertices + offset); vtx -= count; ptr[0] = vtx->x; @@ -5438,7 +5438,7 @@ bool bgTestHitOnChr(struct model *model, struct coord *arg1, struct coord *arg2, count = (gdl->bytes[1] & 0xf); word = gdl->words.w1 & 0xffffff; numvertices = ((u32)gdl->bytes[1] >> 4) + 1; - vtx = (struct gfxvtx *)((u32)vertices + word); + vtx = (struct gfxvtx *)((uintptr_t)vertices + word); if (count < spdc) { spdc = count; @@ -7480,7 +7480,7 @@ void bgExpandRoomToPortals(s32 roomnum) for (i = 0; i < g_Rooms[roomnum].numportals; i++) { s32 portalnum = g_RoomPortals[g_Rooms[roomnum].roomportallistoffset + i]; - struct portalvertices *pvertices = (struct portalvertices *)((u32)g_BgPortals + g_BgPortals[portalnum].verticesoffset); + struct portalvertices *pvertices = (struct portalvertices *)((uintptr_t)g_BgPortals + g_BgPortals[portalnum].verticesoffset); for (j = 0; j < pvertices->count; j++) { for (k = 0; k < 3; k++) { @@ -7619,7 +7619,7 @@ void room0f164c64(s32 roomnum) continue; } - pvertices = (struct portalvertices *)((u32)g_BgPortals + g_BgPortals[portalnum2].verticesoffset); + pvertices = (struct portalvertices *)((uintptr_t)g_BgPortals + g_BgPortals[portalnum2].verticesoffset); for (k = 0; k < pvertices->count; k++) { tmp = thing.coord.f[0] * pvertices->vertices[k].f[0] @@ -7708,7 +7708,7 @@ void portalFindBbox(s32 portalnum, struct coord *bbmin, struct coord *bbmax) bbmax->y = MINFLOAT; bbmax->z = MINFLOAT; - pvertices = (struct portalvertices *)((u32)g_BgPortals + g_BgPortals[portalnum].verticesoffset); + pvertices = (struct portalvertices *)((uintptr_t)g_BgPortals + g_BgPortals[portalnum].verticesoffset); for (i = 0; i < pvertices->count; i++) { for (j = 0; j < 3; j++) { diff --git a/src/game/bondgun.c b/src/game/bondgun.c index f39035ec8..926adba53 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -3829,7 +3829,7 @@ void bgunTickGunLoad(void) // Tidy up the model modelPromoteTypeToPointer(modeldef); - modelPromoteOffsetsToPointers(modeldef, 0x05000000, (u32)modeldef); + modelPromoteOffsetsToPointers(modeldef, 0x05000000, (uintptr_t)modeldef); *player->gunctrl.loadtomodeldef = modeldef; @@ -6474,7 +6474,7 @@ s32 bgunCreateModelCmdList(struct model *model, struct modelnode *nodearg, s32 * rwdata = modelGetNodeRwData(model, node); rwdata->dl.vertices = rodata->dl.vertices; rwdata->dl.gdl = rodata->dl.opagdl; - rwdata->dl.colours = (void *)ALIGN8((u32)&rodata->dl.vertices[rodata->dl.numvertices]); + rwdata->dl.colours = (void *)ALIGN8((uintptr_t)&rodata->dl.vertices[rodata->dl.numvertices]); ptr[0] = 5; ptr[1] = (s32)rwdata; ptr[2] = (s32)rwdata->dl.vertices; @@ -6784,9 +6784,9 @@ void bgunUpdateLasersight(struct hand *hand, struct modeldef *modeldef, s32 hand if (node) { mtxindex = modelFindNodeMtxIndex(node, 0); - beamnear.x = ((Mtxf *)((u32)allocation + mtxindex * sizeof(Mtxf)))->m[3][0]; - beamnear.y = ((Mtxf *)((u32)allocation + mtxindex * sizeof(Mtxf)))->m[3][1]; - beamnear.z = ((Mtxf *)((u32)allocation + mtxindex * sizeof(Mtxf)))->m[3][2]; + beamnear.x = ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][0]; + beamnear.y = ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][1]; + beamnear.z = ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][2]; mtx4TransformVecInPlace(camGetProjectionMtxF(), &beamnear); @@ -6836,7 +6836,7 @@ void bgunUpdateLasersight(struct hand *hand, struct modeldef *modeldef, s32 hand beamfar.y = 0.0f; beamfar.z = 500.0f; - mtx4TransformVecInPlace((Mtxf *)((u32)allocation + mtxindex * sizeof(Mtxf)), &beamfar); + mtx4TransformVecInPlace((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)), &beamfar); } else { cam0f0b4c3c(g_Vars.currentplayer->crosspos, &beamfar, 1); @@ -6994,11 +6994,11 @@ void bgunUpdateSniperRifle(struct modeldef *modeldef, u8 *allocation) sp70.y = 0.0f; sp70.z = sp88[i]; - mtx4RotateVecInPlace((Mtxf *)((u32)allocation + mtxindex * sizeof(Mtxf)), &sp70); + mtx4RotateVecInPlace((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)), &sp70); - ((Mtxf *)((u32)allocation + mtxindex * sizeof(Mtxf)))->m[3][0] += sp70.x; - ((Mtxf *)((u32)allocation + mtxindex * sizeof(Mtxf)))->m[3][1] += sp70.y; - ((Mtxf *)((u32)allocation + mtxindex * sizeof(Mtxf)))->m[3][2] += sp70.z; + ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][0] += sp70.x; + ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][1] += sp70.y; + ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][2] += sp70.z; } } } @@ -7024,11 +7024,11 @@ void bgunUpdateDevastator(struct hand *hand, u8 *allocation, struct modeldef *mo sp24.y = 0.0f; sp24.z = 0.0f; - mtx4RotateVecInPlace((Mtxf *)((u32)allocation + mtxindex * sizeof(Mtxf)), &sp24); + mtx4RotateVecInPlace((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)), &sp24); - ((Mtxf *)((u32)allocation + mtxindex * sizeof(Mtxf)))->m[3][0] += sp24.x; - ((Mtxf *)((u32)allocation + mtxindex * sizeof(Mtxf)))->m[3][1] += sp24.y; - ((Mtxf *)((u32)allocation + mtxindex * sizeof(Mtxf)))->m[3][2] += sp24.z; + ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][0] += sp24.x; + ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][1] += sp24.y; + ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][2] += sp24.z; } } @@ -7063,9 +7063,9 @@ void bgunUpdateShotgun(struct hand *hand, u8 *allocation, bool *arg2, struct mod if (node) { sp34 = modelFindNodeMtxIndex(node, 0); - mtx00015ea8((1.0f - hand->matmot1) * 8.0f + 0.5f, (Mtxf *)((u32)allocation + sp34 * sizeof(Mtxf))); - mtx00015df0((1.0f - hand->matmot1) * 3.0f + 1.0f, (Mtxf *)((u32)allocation + sp34 * sizeof(Mtxf))); - mtx00015e4c((1.0f - hand->matmot1) * 3.0f + 1.0f, (Mtxf *)((u32)allocation + sp34 * sizeof(Mtxf))); + mtx00015ea8((1.0f - hand->matmot1) * 8.0f + 0.5f, (Mtxf *)((uintptr_t)allocation + sp34 * sizeof(Mtxf))); + mtx00015df0((1.0f - hand->matmot1) * 3.0f + 1.0f, (Mtxf *)((uintptr_t)allocation + sp34 * sizeof(Mtxf))); + mtx00015e4c((1.0f - hand->matmot1) * 3.0f + 1.0f, (Mtxf *)((uintptr_t)allocation + sp34 * sizeof(Mtxf))); } } } @@ -7932,7 +7932,7 @@ void bgun0f0a5550(s32 handnum) mtx4Copy(mtx, &hand->muzzlemat); mtx4TransformVecInPlace(camGetProjectionMtxF(), &hand->muzzlepos); - hand->muzzlez = -((Mtxf *)((u32)mtxallocation + sp6c * sizeof(Mtxf)))->m[3][2]; + hand->muzzlez = -((Mtxf *)((uintptr_t)mtxallocation + sp6c * sizeof(Mtxf)))->m[3][2]; if (hand->flashon && sp1e0 > 0 && weaponnum != WEAPON_SHOTGUN && g_Vars.lvupdate240 != 0) { bgun0f0a4e44(hand, weapondef, modeldef, funcdef, sp1e0, mtxallocation, weaponnum, sp1e4, sp6c, &sp234, &sp1f4); @@ -7954,7 +7954,7 @@ void bgun0f0a5550(s32 handnum) mtx4Copy(mtx, &hand->muzzlemat); mtx4TransformVecInPlace(camGetProjectionMtxF(), &hand->muzzlepos); - hand->muzzlez = -((Mtxf *)((u32)mtxallocation + sp6c * sizeof(Mtxf)))->m[3][2]; + hand->muzzlez = -((Mtxf *)((uintptr_t)mtxallocation + sp6c * sizeof(Mtxf)))->m[3][2]; } else { hand->muzzlepos.x = hand->posmtx.m[3][0]; hand->muzzlepos.y = hand->posmtx.m[3][1]; diff --git a/src/game/bondview.c b/src/game/bondview.c index cfc0f99f0..0616fbc03 100644 --- a/src/game/bondview.c +++ b/src/game/bondview.c @@ -97,7 +97,7 @@ Gfx *bview0f141a20(Gfx *gdl, s32 top, s32 height, s32 left, s32 width) Gfx *bviewCopyPixels(Gfx *gdl, u16 *fb, s32 top, u32 tile, s32 arg4, f32 arg5, s32 left, s32 width) { - u32 image; + uintptr_t image; s32 width2; s32 numparts; s32 lrs[1]; @@ -106,7 +106,7 @@ Gfx *bviewCopyPixels(Gfx *gdl, u16 *fb, s32 top, u32 tile, s32 arg4, f32 arg5, s numparts = 2; lrs[0] = width / numparts; - image = (u32) &fb[viGetWidth() * top + left] & 0x00ffffff; + image = (uintptr_t) &fb[viGetWidth() * top + left] & 0x00ffffff; gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, image); gDPLoadBlock(gdl++, tile, 0, 0, width / numparts - 1, 0); @@ -123,7 +123,7 @@ Gfx *bviewCopyPixels(Gfx *gdl, u16 *fb, s32 top, u32 tile, s32 arg4, f32 arg5, s left += lrs[0]; - image = (u32) &fb[viGetWidth() * top + left] & 0x00ffffff; + image = (uintptr_t) &fb[viGetWidth() * top + left] & 0x00ffffff; gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, image); gDPLoadBlock(gdl++, tile, 0, 0, lrs[0] - 1, 0); @@ -141,7 +141,7 @@ Gfx *bviewCopyPixels(Gfx *gdl, u16 *fb, s32 top, u32 tile, s32 arg4, f32 arg5, s } else { width2 = width; - image = (u32) &fb[viGetWidth() * top + left] & 0x00ffffff; + image = (uintptr_t) &fb[viGetWidth() * top + left] & 0x00ffffff; gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, image); gDPLoadBlock(gdl++, tile, 0, 0, width2 - 1, 0); diff --git a/src/game/camdraw.c b/src/game/camdraw.c index f76d2e7f4..aa16a398d 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -47,13 +47,13 @@ struct texpool var800a45a8; u32 var800a45b8; u32 var800a45bc; -const char var7f1b6050[] = "Init"; -const char var7f1b6058[] = "Start Header Read"; -const char var7f1b606c[] = "Header Read Done"; -const char var7f1b6080[] = "Null"; -const char var7f1b6088[] = "Exit 1"; -const char var7f1b6090[] = "Exit 2"; -const char var7f1b6098[] = "Exit 3"; +char *var8007f8c0 = "Init"; +char *var8007f8c4 = "Start Header Read"; +char *var8007f8c8 = "Header Read Done"; +char *var8007f8cc = "Null"; +char *var8007f8d0 = "Exit 1"; +char *var8007f8d4 = "Exit 2"; +char *var8007f8d8 = "Exit 3"; const u32 var7f1b60a0[][2] = { { 0, 0 }, @@ -189,13 +189,6 @@ const u32 var7f1b639c[] = {0x0c1857ff}; const char var7f1b63a0[] = "RWI : Cam Alloc : Guid=%d -> Total = %u (%d at %s)\n"; -u32 var8007f8c0 = (u32)&var7f1b6050; -u32 var8007f8c4 = (u32)&var7f1b6058; -u32 var8007f8c8 = (u32)&var7f1b606c; -u32 var8007f8cc = (u32)&var7f1b6080; -u32 var8007f8d0 = (u32)&var7f1b6088; -u32 var8007f8d4 = (u32)&var7f1b6090; -u32 var8007f8d8 = (u32)&var7f1b6098; struct var8007f8dc *var8007f8dc = NULL; struct var8007f8e0 *var8007f8e0 = NULL; u32 var8007f8e4 = 0x00000000; diff --git a/src/game/cheats.c b/src/game/cheats.c index 1c3123985..e18856868 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -294,7 +294,7 @@ void cheatsReset(void) } } -s32 cheatCheckboxMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult cheatCheckboxMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -345,7 +345,7 @@ s32 cheatCheckboxMenuHandler(s32 operation, struct menuitem *item, union handler return 0; } -s32 cheatMenuHandleBuddyCheckbox(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult cheatMenuHandleBuddyCheckbox(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -395,7 +395,7 @@ char *cheatGetNameIfUnlocked(struct menuitem *item) return langGet(L_MPWEAPONS_074); // "----------" } -s32 cheatMenuHandleDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult cheatMenuHandleDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { func0f14a52c(); @@ -802,7 +802,7 @@ char *cheatGetMarquee(struct menuitem *arg0) return langGet(L_MPWEAPONS_142); // "Select cheat for information" } -s32 cheatMenuHandleTurnOffAllCheats(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult cheatMenuHandleTurnOffAllCheats(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_CheatsEnabledBank0 = 0; @@ -864,7 +864,7 @@ struct menuitem g_CheatsFunMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_DKMODE, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -872,7 +872,7 @@ struct menuitem g_CheatsFunMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_SMALLJO, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -880,7 +880,7 @@ struct menuitem g_CheatsFunMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_SMALLCHARACTERS, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -888,7 +888,7 @@ struct menuitem g_CheatsFunMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_TEAMHEADSONLY, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -896,7 +896,7 @@ struct menuitem g_CheatsFunMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_PLAYASELVIS, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -904,7 +904,7 @@ struct menuitem g_CheatsFunMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_SLOMO, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -920,7 +920,7 @@ struct menuitem g_CheatsFunMenuItems[] = { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (u32)&cheatGetMarquee, + (uintptr_t)&cheatGetMarquee, 0, NULL, }, @@ -957,7 +957,7 @@ struct menuitem g_CheatsGameplayMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_INVINCIBLE, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -965,7 +965,7 @@ struct menuitem g_CheatsGameplayMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_CLOAKINGDEVICE, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -973,7 +973,7 @@ struct menuitem g_CheatsGameplayMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_MARQUIS, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -981,7 +981,7 @@ struct menuitem g_CheatsGameplayMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_JOSHIELD, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -989,7 +989,7 @@ struct menuitem g_CheatsGameplayMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_SUPERSHIELD, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -997,7 +997,7 @@ struct menuitem g_CheatsGameplayMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_ENEMYSHIELDS, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1005,7 +1005,7 @@ struct menuitem g_CheatsGameplayMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_ENEMYROCKETS, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1013,7 +1013,7 @@ struct menuitem g_CheatsGameplayMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_PERFECTDARKNESS, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1029,7 +1029,7 @@ struct menuitem g_CheatsGameplayMenuItems[] = { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (u32)&cheatGetMarquee, + (uintptr_t)&cheatGetMarquee, 0, NULL, }, @@ -1066,7 +1066,7 @@ struct menuitem g_CheatsSoloWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_ROCKETLAUNCHER, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1074,7 +1074,7 @@ struct menuitem g_CheatsSoloWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_SNIPERRIFLE, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1082,7 +1082,7 @@ struct menuitem g_CheatsSoloWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_SUPERDRAGON, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1090,7 +1090,7 @@ struct menuitem g_CheatsSoloWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_LAPTOPGUN, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1098,7 +1098,7 @@ struct menuitem g_CheatsSoloWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_PHOENIX, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1106,7 +1106,7 @@ struct menuitem g_CheatsSoloWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_PSYCHOSISGUN, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1114,7 +1114,7 @@ struct menuitem g_CheatsSoloWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_TRENTSMAGNUM, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1122,7 +1122,7 @@ struct menuitem g_CheatsSoloWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_FARSIGHT, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1138,7 +1138,7 @@ struct menuitem g_CheatsSoloWeaponsMenuItems[] = { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (u32)&cheatGetMarquee, + (uintptr_t)&cheatGetMarquee, 0, NULL, }, @@ -1175,7 +1175,7 @@ struct menuitem g_CheatsClassicWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_PP9I, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1183,7 +1183,7 @@ struct menuitem g_CheatsClassicWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_CC13, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1191,7 +1191,7 @@ struct menuitem g_CheatsClassicWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_KL01313, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1199,7 +1199,7 @@ struct menuitem g_CheatsClassicWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_KF7SPECIAL, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1207,7 +1207,7 @@ struct menuitem g_CheatsClassicWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_ZZT, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1215,7 +1215,7 @@ struct menuitem g_CheatsClassicWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_DMC, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1223,7 +1223,7 @@ struct menuitem g_CheatsClassicWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_AR53, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1231,7 +1231,7 @@ struct menuitem g_CheatsClassicWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_RCP45, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1284,7 +1284,7 @@ struct menuitem g_CheatsWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_CLASSICSIGHT, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1292,7 +1292,7 @@ struct menuitem g_CheatsWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_UNLIMITEDAMMOLAPTOP, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1300,7 +1300,7 @@ struct menuitem g_CheatsWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_HURRICANEFISTS, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1308,7 +1308,7 @@ struct menuitem g_CheatsWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_UNLIMITEDAMMO, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1316,7 +1316,7 @@ struct menuitem g_CheatsWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_UNLIMITEDAMMONORELOADS, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1324,7 +1324,7 @@ struct menuitem g_CheatsWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_XRAYSCANNER, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1332,7 +1332,7 @@ struct menuitem g_CheatsWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_RTRACKER, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1340,7 +1340,7 @@ struct menuitem g_CheatsWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_ALLGUNS, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatCheckboxMenuHandler, }, @@ -1356,7 +1356,7 @@ struct menuitem g_CheatsWeaponsMenuItems[] = { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (u32)&cheatGetMarquee, + (uintptr_t)&cheatGetMarquee, 0, NULL, }, @@ -1401,7 +1401,7 @@ struct menuitem g_CheatsBuddiesMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_PUGILIST, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatMenuHandleBuddyCheckbox, }, @@ -1409,7 +1409,7 @@ struct menuitem g_CheatsBuddiesMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_HOTSHOT, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatMenuHandleBuddyCheckbox, }, @@ -1417,7 +1417,7 @@ struct menuitem g_CheatsBuddiesMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_HITANDRUN, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatMenuHandleBuddyCheckbox, }, @@ -1425,7 +1425,7 @@ struct menuitem g_CheatsBuddiesMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_ALIEN, 0, - (u32)&cheatGetNameIfUnlocked, + (uintptr_t)&cheatGetNameIfUnlocked, 0, cheatMenuHandleBuddyCheckbox, }, @@ -1441,7 +1441,7 @@ struct menuitem g_CheatsBuddiesMenuItems[] = { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (u32)&cheatGetMarquee, + (uintptr_t)&cheatGetMarquee, 0, NULL, }, diff --git a/src/game/chr.c b/src/game/chr.c index e2ceeb3a0..0d283fc2c 100644 --- a/src/game/chr.c +++ b/src/game/chr.c @@ -4290,13 +4290,13 @@ void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struc // use the space... after the model definition's colour table? // Let's hope that's not being used by other instances... if (rwdata->gdl == rodata->opagdl) { - gdlptr = (Gfx *)((u32)rodata->colourtable + ((u32)rodata->opagdl & 0xffffff)); + gdlptr = (Gfx *)((uintptr_t)rodata->colourtable + ((uintptr_t)rodata->opagdl & 0xffffff)); } else { gdlptr = rwdata->gdl; } if (rodata->xlugdl) { - gdlptr2 = (Gfx *)((u32)rodata->colourtable + ((u32)rodata->xlugdl & 0xffffff)); + gdlptr2 = (Gfx *)((uintptr_t)rodata->colourtable + ((uintptr_t)rodata->xlugdl & 0xffffff)); } else { gdlptr2 = NULL; } @@ -4324,7 +4324,7 @@ void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struc s32 numverts; s32 i; - vertices = (struct gfxvtx *)((u32)rodata->vertices + word); + vertices = (struct gfxvtx *)((uintptr_t)rodata->vertices + word); numverts = (u32)ptr[1] / 16 + 1; if (posnode) { @@ -4409,13 +4409,13 @@ void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struc } if (rwdata->gdl == rodata->opagdl) { - gdlptr = (Gfx *)((u32)rodata->colourtable + ((u32)rodata->opagdl & 0xffffff)); + gdlptr = (Gfx *)((uintptr_t)rodata->colourtable + ((u32)rodata->opagdl & 0xffffff)); } else { gdlptr = rwdata->gdl; } if (rodata->xlugdl) { - gdlptr2 = (Gfx *)((u32)rodata->colourtable + ((u32)rodata->xlugdl & 0xffffff)); + gdlptr2 = (Gfx *)((uintptr_t)rodata->colourtable + ((u32)rodata->xlugdl & 0xffffff)); } else { gdlptr2 = NULL; } @@ -4438,7 +4438,7 @@ void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struc if (op == G_VTX) { u8 *ptr = (u8 *)&gdlptr->words.w0; u32 word = gdlptr->words.w1 & 0xffffff; - struct gfxvtx *vertices = (struct gfxvtx *)((u32)rodata->vertices + word); + struct gfxvtx *vertices = (struct gfxvtx *)((uintptr_t)rodata->vertices + word); s32 numverts = (u32)ptr[1] / 16 + 1; s32 i; @@ -4449,9 +4449,9 @@ void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struc s32 z = vertices[i].z + (s32)spd4.f[2]; if (x == bestcoords[0] && y == bestcoords[1] && z == bestcoords[2]) { - u32 tmp = ALIGN8((u32)&rodata->vertices[(u32)rodata->numvertices]); // u32 0xc + u32 tmp = ALIGN8((uintptr_t)&rodata->vertices[(u32)rodata->numvertices]); // u32 0xc - if ((u32)rwdata->colours == tmp) { + if ((uintptr_t)rwdata->colours == tmp) { struct colour *colours = vtxstoreAllocate(rodata->numcolours, VTXSTORETYPE_CHRCOL, 0, 0); s32 j; @@ -4462,15 +4462,15 @@ void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struc rwdata->colours = colours; - tmp = ALIGN8((s32)&rodata->vertices[rodata->numvertices]); // s32 0xc + tmp = ALIGN8((intptr_t)&rodata->vertices[rodata->numvertices]); // s32 0xc } else { - tmp = ALIGN8((s32)&rodata->vertices[rodata->numvertices]); // s32 0xc + tmp = ALIGN8((intptr_t)&rodata->vertices[rodata->numvertices]); // s32 0xc } } - if ((u32)rwdata->colours != tmp) { + if ((uintptr_t)rwdata->colours != tmp) { u32 offset = rwdata->vertices[word / 12u + i].colour >> 2; // u32 0xc (both divide and mult) - struct colour *colours = (struct colour *) ((u32)rwdata->colours + spac); + struct colour *colours = (struct colour *) ((uintptr_t)rwdata->colours + spac); colours[offset].a = alpha; } @@ -4570,13 +4570,13 @@ void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct // use the space... after the model definition's colour table? // Let's hope that's not being used by other instances... if (rwdata->gdl == rodata->opagdl) { - gdlptr = (Gfx *)((u32)rodata->colourtable + ((u32)rodata->opagdl & 0xffffff)); + gdlptr = (Gfx *)((uintptr_t)rodata->colourtable + ((u32)rodata->opagdl & 0xffffff)); } else { gdlptr = rwdata->gdl; } if (rodata->xlugdl) { - gdlptr2 = (Gfx *)((u32)rodata->colourtable + ((u32)rodata->xlugdl & 0xffffff)); + gdlptr2 = (Gfx *)((uintptr_t)rodata->colourtable + ((u32)rodata->xlugdl & 0xffffff)); } else { gdlptr2 = NULL; } @@ -4604,7 +4604,7 @@ void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct s32 numverts; s32 i; - vertices = (struct gfxvtx *)((u32)rodata->vertices + word); + vertices = (struct gfxvtx *)((uintptr_t)rodata->vertices + word); numverts = (u32)ptr[1] / 16 + 1; if (posnode) { @@ -4708,13 +4708,13 @@ void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct } if (rwdata->gdl == rodata->opagdl) { - gdlptr = (Gfx *)((u32)rodata->colourtable + ((u32)rodata->opagdl & 0xffffff)); + gdlptr = (Gfx *)((uintptr_t)rodata->colourtable + ((u32)rodata->opagdl & 0xffffff)); } else { gdlptr = rwdata->gdl; } if (rodata->xlugdl) { - gdlptr2 = (Gfx *)((u32)rodata->colourtable + ((u32)rodata->xlugdl & 0xffffff)); + gdlptr2 = (Gfx *)((uintptr_t)rodata->colourtable + ((u32)rodata->xlugdl & 0xffffff)); } else { gdlptr2 = NULL; } @@ -4737,7 +4737,7 @@ void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct if (op == G_VTX) { u8 *ptr = (u8 *)&gdlptr->words.w0; u32 word = gdlptr->words.w1 & 0xffffff; - struct gfxvtx *vertices = (struct gfxvtx *)((u32)rodata->vertices + word); + struct gfxvtx *vertices = (struct gfxvtx *)((uintptr_t)rodata->vertices + word); s32 numverts = (u32)ptr[1] / 16 + 1; s32 i; @@ -4752,7 +4752,7 @@ void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct coordinate = vertices[i].z + (s32)spd4.f[2]; if (coordinate == bestcoords[2]) { - if ((u32)rwdata->colours == ALIGN8((u32)rodata->vertices + rodata->numvertices * sizeof(struct gfxvtx))) { + if ((uintptr_t)rwdata->colours == ALIGN8((u32)rodata->vertices + rodata->numvertices * sizeof(struct gfxvtx))) { struct colour *colours = vtxstoreAllocate(rodata->numcolours, VTXSTORETYPE_CHRCOL, 0, 0); s32 j; @@ -4765,9 +4765,9 @@ void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct } } - if ((u32)rwdata->colours != ALIGN8((u32)rodata->vertices + rodata->numvertices * sizeof(struct gfxvtx))) { + if ((uintptr_t)rwdata->colours != ALIGN8((uintptr_t)rodata->vertices + rodata->numvertices * sizeof(struct gfxvtx))) { s32 offset = rwdata->vertices[word / sizeof(struct gfxvtx) + i].colour >> 2; - struct colour *colours = (struct colour *) ((u32)rwdata->colours + spac); + struct colour *colours = (struct colour *) ((uintptr_t)rwdata->colours + spac); colours[offset].a = alpha; } @@ -4882,7 +4882,7 @@ void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius) } // Copy the colours from the modeldef to the vtxstore - if ((u32)rwdata->colours == ALIGN8((u32)&rodata->vertices[rodata->numvertices])) { + if ((uintptr_t)rwdata->colours == ALIGN8((uintptr_t)&rodata->vertices[rodata->numvertices])) { colours = vtxstoreAllocate(rodata->numcolours, VTXSTORETYPE_CHRCOL, 0, 0); if (colours) { @@ -4897,15 +4897,15 @@ void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius) // Iterate the node's primary and secondary DLs, looking for // MTX and VTX pointers if (rwdata->vertices != rodata->vertices - && (u32)rwdata->colours != ALIGN8((u32)&rodata->vertices[rodata->numvertices])) { + && (uintptr_t)rwdata->colours != ALIGN8((uintptr_t)&rodata->vertices[rodata->numvertices])) { if (rwdata->gdl == rodata->opagdl) { - gdlptr = (Gfx *)((u32)rodata->colourtable + ((s32)rodata->opagdl & 0xffffff)); + gdlptr = (Gfx *)((uintptr_t)rodata->colourtable + ((s32)rodata->opagdl & 0xffffff)); } else { gdlptr = rwdata->gdl; } if (rodata->xlugdl) { - gdlptr2 = (Gfx *)((u32)rodata->colourtable + ((s32)rodata->xlugdl & 0xffffff)); + gdlptr2 = (Gfx *)((uintptr_t)rodata->colourtable + ((s32)rodata->xlugdl & 0xffffff)); } else { gdlptr2 = NULL; } @@ -4932,7 +4932,7 @@ void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius) s32 word = gdlptr->words.w1 & 0xffffff; s32 numverts; - vertices = (struct gfxvtx *)((u32)rwdata->vertices + word); + vertices = (struct gfxvtx *)((uintptr_t)rwdata->vertices + word); numverts = (u32)ptr[1] / 16 + 1; if (posnode) { diff --git a/src/game/chrai.c b/src/game/chrai.c index 43ad43095..0a604e513 100644 --- a/src/game/chrai.c +++ b/src/game/chrai.c @@ -729,7 +729,7 @@ void chraiExecute(void *entity, s32 proptype) if (g_Vars.chrdata->aishootingatmelist >= 0 && ailistFindById(g_Vars.chrdata->aishootingatmelist) != g_Vars.chrdata->ailist - && g_Vars.chrdata->dodgerating > (u32)random() % 100 + && g_Vars.chrdata->dodgerating > random() % 100 && chrHasFlag(g_Vars.chrdata, CHRFLAG1_INDARKROOM, BANK_1) == 0 && chrHasFlag(g_Vars.chrdata, CHRFLAG0_AIVSAI, BANK_0) == 0 && ailistFindById(g_Vars.chrdata->aishootingatmelist) != g_Vars.chrdata->ailist diff --git a/src/game/dlights.c b/src/game/dlights.c index e7cc92e55..2264236e8 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -2206,8 +2206,8 @@ void roomHighlight(s32 roomnum) g_Rooms[roomnum].colours = dst; extra = g_Rooms[roomnum].unk52; - src = (struct colour *)((u32)g_Rooms[roomnum].gfxdata->vertices + g_Rooms[roomnum].gfxdata->numvertices * sizeof(struct gfxvtx)); - src = (struct colour *)ALIGN8((s32)src); + src = (struct colour *)((uintptr_t)g_Rooms[roomnum].gfxdata->vertices + g_Rooms[roomnum].gfxdata->numvertices * sizeof(struct gfxvtx)); + src = (struct colour *)ALIGN8((uintptr_t)src); if (g_Rooms[roomnum].flags & ROOMFLAG_RENDERALWAYS) { g_Rooms[roomnum].colours = src; diff --git a/src/game/endscreen.c b/src/game/endscreen.c index de91560f9..2c8e88058 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -31,7 +31,7 @@ #include "data.h" #include "types.h" -s32 endscreenHandleDeclineMission(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult endscreenHandleDeclineMission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -41,7 +41,7 @@ s32 endscreenHandleDeclineMission(s32 operation, struct menuitem *item, union ha return 0; } -s32 endscreenHandleRetryMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult endscreenHandleRetryMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { switch (operation) { case MENUOP_TICK: @@ -129,7 +129,7 @@ char *endscreenMenuTitleNextMission(struct menudialogdef *dialogdef) return g_StringPointer; } -s32 endscreenHandleReplayPreviousMission(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult endscreenHandleReplayPreviousMission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MissionConfig.stageindex--; @@ -169,7 +169,7 @@ struct menuitem g_RetryMissionMenuItems[] = { struct menudialogdef g_RetryMissionMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&endscreenMenuTitleRetryMission, + (uintptr_t)&endscreenMenuTitleRetryMission, g_RetryMissionMenuItems, endscreenHandleRetryMission, MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_DISABLEITEMSCROLL, @@ -222,7 +222,7 @@ struct menuitem g_NextMissionMenuItems[] = { struct menudialogdef g_NextMissionMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&endscreenMenuTitleNextMission, + (uintptr_t)&endscreenMenuTitleNextMission, g_NextMissionMenuItems, endscreenHandleRetryMission, MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_DISABLEITEMSCROLL, @@ -448,7 +448,7 @@ void endscreen0f10d770(void) } #if VERSION >= VERSION_NTSC_1_0 -s32 endscreenHandleReplayLastLevel(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult endscreenHandleReplayLastLevel(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MissionConfig.stagenum = g_StageNames[g_MissionConfig.stageindex].stagenum; @@ -555,7 +555,7 @@ struct menudialogdef g_2PMissionEndscreenObjectivesCompletedVMenuDialog = { /** * Displayed after Defense and Skedar Ruins completion screens. */ -s32 endscreenHandleContinueMission(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult endscreenHandleContinueMission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { endscreenContinue(2); @@ -588,7 +588,7 @@ struct menuitem g_MissionContinueOrReplyMenuItems[] = { struct menudialogdef g_MissionContinueOrReplyMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&endscreenMenuTextCurrentStageName3, + (uintptr_t)&endscreenMenuTextCurrentStageName3, g_MissionContinueOrReplyMenuItems, NULL, MENUDIALOGFLAG_STARTSELECTS, @@ -700,7 +700,7 @@ void endscreenContinue(s32 context) } #endif -s32 endscreenHandle2PCompleted(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult endscreenHandle2PCompleted(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Menus[g_MpPlayerNum].endscreen.unke1c = 0; @@ -761,7 +761,7 @@ s32 endscreenHandle2PCompleted(s32 operation, struct menudialogdef *dialogdef, u return 0; } -s32 endscreenHandle2PFailed(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult endscreenHandle2PFailed(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Menus[g_MpPlayerNum].endscreen.unke1c = 0; @@ -816,7 +816,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)&endscreenMenuTextMissionStatus, + (uintptr_t)&endscreenMenuTextMissionStatus, 0, NULL, }, @@ -832,7 +832,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)&endscreenMenuTextAgentStatus, + (uintptr_t)&endscreenMenuTextAgentStatus, 0, NULL, }, @@ -848,7 +848,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)&endscreenMenuTextMissionTime, + (uintptr_t)&endscreenMenuTextMissionTime, 0, NULL, }, @@ -864,7 +864,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)soloMenuTextDifficulty, + (uintptr_t)soloMenuTextDifficulty, 0, NULL, }, @@ -888,7 +888,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)&mpMenuTextWeaponOfChoiceName, + (uintptr_t)&mpMenuTextWeaponOfChoiceName, 0, NULL, }, @@ -905,7 +905,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { 0, 0, L_OPTIONS_282, // "Kills:" - (u32)&endscreenMenuTextNumKills, + (uintptr_t)&endscreenMenuTextNumKills, NULL, }, { @@ -913,7 +913,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { 0, 0, L_OPTIONS_283, // "Accuracy:" - (u32)&endscreenMenuTextAccuracy, + (uintptr_t)&endscreenMenuTextAccuracy, NULL, }, { @@ -929,7 +929,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { 0, 0, L_OPTIONS_284, // "Shot Total:" - (u32)&endscreenMenuTextNumShots, + (uintptr_t)&endscreenMenuTextNumShots, NULL, }, { @@ -937,7 +937,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { 0, MENUITEMFLAG_SMALLFONT, L_OPTIONS_285, // "Head Shots:" - (u32)&endscreenMenuTextNumHeadShots, + (uintptr_t)&endscreenMenuTextNumHeadShots, NULL, }, { @@ -945,7 +945,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { 0, MENUITEMFLAG_SMALLFONT, L_OPTIONS_286, // "Body Shots:" - (u32)&endscreenMenuTextNumBodyShots, + (uintptr_t)&endscreenMenuTextNumBodyShots, NULL, }, { @@ -953,7 +953,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { 0, MENUITEMFLAG_SMALLFONT, L_OPTIONS_287, // "Limb Shots:" - (u32)&endscreenMenuTextNumLimbShots, + (uintptr_t)&endscreenMenuTextNumLimbShots, NULL, }, { @@ -961,7 +961,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { 0, MENUITEMFLAG_SMALLFONT, L_OPTIONS_288, // "Others:" - (u32)&endscreenMenuTextNumOtherShots, + (uintptr_t)&endscreenMenuTextNumOtherShots, NULL, }, { @@ -996,7 +996,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { * 5 = timed cheat name * 6 = limb shots */ -s32 endscreenHandleCheatInfo(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult endscreenHandleCheatInfo(s32 operation, struct menuitem *item, union handlerdata *data) { static u32 cheatcolour = 0xff7f7fff; @@ -1067,7 +1067,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_278, // "Mission Status:" - (u32)&endscreenMenuTextMissionStatus, + (uintptr_t)&endscreenMenuTextMissionStatus, NULL, }, { @@ -1075,7 +1075,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_279, // "Agent Status:" - (u32)&endscreenMenuTextAgentStatus, + (uintptr_t)&endscreenMenuTextAgentStatus, NULL, }, #if VERSION >= VERSION_NTSC_1_0 @@ -1084,7 +1084,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, MENUITEMFLAG_LABEL_CUSTOMCOLOUR, L_OPTIONS_280, // "Mission Time:" - (u32)&endscreenMenuTextMissionTime, + (uintptr_t)&endscreenMenuTextMissionTime, endscreenHandleCheatInfo, }, { @@ -1092,7 +1092,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 1, MENUITEMFLAG_LABEL_CUSTOMCOLOUR, L_MPWEAPONS_242, // "Target Time:" - (u32)&endscreenMenuTextTargetTime, + (uintptr_t)&endscreenMenuTextTargetTime, endscreenHandleCheatInfo, }, { @@ -1100,7 +1100,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_MPWEAPONS_129, // "Difficulty:" - (u32)&soloMenuTextDifficulty, + (uintptr_t)&soloMenuTextDifficulty, NULL, }, { @@ -1123,7 +1123,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { MENUITEMTYPE_LABEL, 3, MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_LABEL_CUSTOMCOLOUR, - (u32)&endscreenMenuTextTimedCheatName, + (uintptr_t)&endscreenMenuTextTimedCheatName, 0, endscreenHandleCheatInfo, }, @@ -1131,7 +1131,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { MENUITEMTYPE_LABEL, 5, MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_LABEL_CUSTOMCOLOUR, - (u32)&endscreenMenuTextCompletionCheatName, + (uintptr_t)&endscreenMenuTextCompletionCheatName, 0, endscreenHandleCheatInfo, }, @@ -1148,7 +1148,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_281, // "Weapon of Choice:" - (u32)&mpMenuTextWeaponOfChoiceName, + (uintptr_t)&mpMenuTextWeaponOfChoiceName, NULL, }, { @@ -1156,7 +1156,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_282, // "Kills:" - (u32)&endscreenMenuTextNumKills, + (uintptr_t)&endscreenMenuTextNumKills, NULL, }, { @@ -1164,7 +1164,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_283, // "Accuracy:" - (u32)&endscreenMenuTextAccuracy, + (uintptr_t)&endscreenMenuTextAccuracy, NULL, }, { @@ -1180,7 +1180,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_284, // "Shot Total:" - (u32)&endscreenMenuTextNumShots, + (uintptr_t)&endscreenMenuTextNumShots, NULL, }, { @@ -1188,7 +1188,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_285, // "Head Shots:" - (u32)&endscreenMenuTextNumHeadShots, + (uintptr_t)&endscreenMenuTextNumHeadShots, NULL, }, { @@ -1196,7 +1196,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_286, // "Body Shots:" - (u32)&endscreenMenuTextNumBodyShots, + (uintptr_t)&endscreenMenuTextNumBodyShots, NULL, }, { @@ -1204,7 +1204,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 6, 0, L_OPTIONS_287, // "Limb Shots:" - (u32)&endscreenMenuTextNumLimbShots, + (uintptr_t)&endscreenMenuTextNumLimbShots, endscreenHandleCheatInfo, }, { @@ -1212,7 +1212,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 4, 0, L_OPTIONS_288, // "Others:" - (u32)&endscreenMenuTextNumOtherShots, + (uintptr_t)&endscreenMenuTextNumOtherShots, endscreenHandleCheatInfo, }, #else @@ -1222,7 +1222,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_280, // "Mission Time:" - (u32)&endscreenMenuTextMissionTime, + (uintptr_t)&endscreenMenuTextMissionTime, NULL, }, { @@ -1230,7 +1230,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_MPWEAPONS_129, // "Difficulty:" - (u32)&soloMenuTextDifficulty, + (uintptr_t)&soloMenuTextDifficulty, NULL, }, { @@ -1246,7 +1246,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_281, // "Weapon of Choice:" - (u32)&mpMenuTextWeaponOfChoiceName, + (uintptr_t)&mpMenuTextWeaponOfChoiceName, NULL, }, { @@ -1254,7 +1254,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_282, // "Kills:" - (u32)&endscreenMenuTextNumKills, + (uintptr_t)&endscreenMenuTextNumKills, NULL, }, { @@ -1262,7 +1262,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_283, // "Accuracy:" - (u32)&endscreenMenuTextAccuracy, + (uintptr_t)&endscreenMenuTextAccuracy, NULL, }, { @@ -1278,7 +1278,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_284, // "Shot Total:" - (u32)&endscreenMenuTextNumShots, + (uintptr_t)&endscreenMenuTextNumShots, NULL, }, { @@ -1286,7 +1286,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_285, // "Head Shots:" - (u32)&endscreenMenuTextNumHeadShots, + (uintptr_t)&endscreenMenuTextNumHeadShots, NULL, }, { @@ -1294,7 +1294,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_286, // "Body Shots:" - (u32)&endscreenMenuTextNumBodyShots, + (uintptr_t)&endscreenMenuTextNumBodyShots, NULL, }, { @@ -1302,7 +1302,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_287, // "Limb Shots:" - (u32)&endscreenMenuTextNumLimbShots, + (uintptr_t)&endscreenMenuTextNumLimbShots, NULL, }, { @@ -1310,7 +1310,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_288, // "Others:" - (u32)&endscreenMenuTextNumOtherShots, + (uintptr_t)&endscreenMenuTextNumOtherShots, NULL, }, #endif @@ -1393,7 +1393,7 @@ void endscreenSetCoopCompleted(void) struct menudialogdef g_SoloMissionEndscreenCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, - (u32)&endscreenMenuTitleStageCompleted, + (uintptr_t)&endscreenMenuTitleStageCompleted, g_MissionEndscreenMenuItems, endscreenHandle2PCompleted, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, @@ -1402,7 +1402,7 @@ struct menudialogdef g_SoloMissionEndscreenCompletedMenuDialog = { struct menudialogdef g_SoloMissionEndscreenFailedMenuDialog = { MENUDIALOGTYPE_DANGER, - (u32)&endscreenMenuTitleStageFailed, + (uintptr_t)&endscreenMenuTitleStageFailed, g_MissionEndscreenMenuItems, endscreenHandle2PFailed, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, @@ -1637,7 +1637,7 @@ void endscreenPrepare(void) struct menudialogdef g_2PMissionEndscreenCompletedHMenuDialog = { MENUDIALOGTYPE_SUCCESS, - (u32)&endscreenMenuTitleStageCompleted, + (uintptr_t)&endscreenMenuTitleStageCompleted, g_MissionEndscreenMenuItems, endscreenHandle2PCompleted, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, @@ -1646,7 +1646,7 @@ struct menudialogdef g_2PMissionEndscreenCompletedHMenuDialog = { struct menudialogdef g_2PMissionEndscreenFailedHMenuDialog = { MENUDIALOGTYPE_DANGER, - (u32)&endscreenMenuTitleStageFailed, + (uintptr_t)&endscreenMenuTitleStageFailed, g_MissionEndscreenMenuItems, endscreenHandle2PFailed, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, diff --git a/src/game/file.c b/src/game/file.c index 7a5e0ea49..1f110e2c5 100644 --- a/src/game/file.c +++ b/src/game/file.c @@ -2078,2031 +2078,2031 @@ u32 var800aa570; u32 g_FileTable[] = { /*0x0000*/ 0, - /*0x0001*/ (u32) &_file_bg_sev_seg, - /*0x0002*/ (u32) &_file_bg_silo_seg, - /*0x0003*/ (u32) &_file_bg_stat_seg, - /*0x0004*/ (u32) &_file_bg_arec_seg, - /*0x0005*/ (u32) &_file_bg_arch_seg, - /*0x0006*/ (u32) &_file_bg_tra_seg, - /*0x0007*/ (u32) &_file_bg_dest_seg, - /*0x0008*/ (u32) &_file_bg_sevb_seg, - /*0x0009*/ (u32) &_file_bg_azt_seg, - /*0x000a*/ (u32) &_file_bg_pete_seg, - /*0x000b*/ (u32) &_file_bg_depo_seg, - /*0x000c*/ (u32) &_file_bg_ref_seg, - /*0x000d*/ (u32) &_file_bg_cryp_seg, - /*0x000e*/ (u32) &_file_bg_dam_seg, - /*0x000f*/ (u32) &_file_bg_ark_seg, - /*0x0010*/ (u32) &_file_bg_run_seg, - /*0x0011*/ (u32) &_file_bg_sevx_seg, - /*0x0012*/ (u32) &_file_bg_jun_seg, - /*0x0013*/ (u32) &_file_bg_dish_seg, - /*0x0014*/ (u32) &_file_bg_cave_seg, - /*0x0015*/ (u32) &_file_bg_cat_seg, - /*0x0016*/ (u32) &_file_bg_crad_seg, - /*0x0017*/ (u32) &_file_bg_sho_seg, - /*0x0018*/ (u32) &_file_bg_eld_seg, - /*0x0019*/ (u32) &_file_bg_imp_seg, - /*0x001a*/ (u32) &_file_bg_ash_seg, - /*0x001b*/ (u32) &_file_bg_lue_seg, - /*0x001c*/ (u32) &_file_bg_ame_seg, - /*0x001d*/ (u32) &_file_bg_rit_seg, - /*0x001e*/ (u32) &_file_bg_oat_seg, - /*0x001f*/ (u32) &_file_bg_ear_seg, - /*0x0020*/ (u32) &_file_bg_lee_seg, - /*0x0021*/ (u32) &_file_bg_lip_seg, - /*0x0022*/ (u32) &_file_bg_len_seg, - /*0x0023*/ (u32) &_file_bg_wax_seg, - /*0x0024*/ (u32) &_file_bg_pam_seg, - /*0x0025*/ (u32) &_file_bg_uff_seg, - /*0x0026*/ (u32) &_file_bg_old_seg, - /*0x0027*/ (u32) &_file_bg_ate_seg, - /*0x0028*/ (u32) &_file_bg_lam_seg, - /*0x0029*/ (u32) &_file_bg_mp1_seg, - /*0x002a*/ (u32) &_file_bg_mp2_seg, - /*0x002b*/ (u32) &_file_bg_mp3_seg, - /*0x002c*/ (u32) &_file_bg_mp4_seg, - /*0x002d*/ (u32) &_file_bg_mp5_seg, - /*0x002e*/ (u32) &_file_bg_mp6_seg, - /*0x002f*/ (u32) &_file_bg_mp7_seg, - /*0x0030*/ (u32) &_file_bg_mp8_seg, - /*0x0031*/ (u32) &_file_bg_mp9_seg, - /*0x0032*/ (u32) &_file_bg_mp10_seg, - /*0x0033*/ (u32) &_file_bg_mp11_seg, - /*0x0034*/ (u32) &_file_bg_mp12_seg, - /*0x0035*/ (u32) &_file_bg_mp13_seg, - /*0x0036*/ (u32) &_file_bg_mp14_seg, - /*0x0037*/ (u32) &_file_bg_mp15_seg, - /*0x0038*/ (u32) &_file_bg_mp16_seg, - /*0x0039*/ (u32) &_file_bg_mp17_seg, - /*0x003a*/ (u32) &_file_bg_mp18_seg, - /*0x003b*/ (u32) &_file_bg_mp19_seg, - /*0x003c*/ (u32) &_file_bg_mp20_seg, - /*0x003d*/ (u32) &_file_ob_mid_seg, - /*0x003e*/ (u32) &_file_Ca51guardZ, - /*0x003f*/ (u32) &_file_Carea51guardZ, - /*0x0040*/ (u32) &_file_CcarringtonZ, - /*0x0041*/ (u32) &_file_CcassandraZ, - /*0x0042*/ (u32) &_file_Cdark_combatZ, - /*0x0043*/ (u32) &_file_Cdark_frockZ, - /*0x0044*/ (u32) &_file_Cdark_trenchZ, - /*0x0045*/ (u32) &_file_CddshockZ, - /*0x0046*/ (u32) &_file_Cdd_secguardZ, - /*0x0047*/ (u32) &_file_CdjbondZ, - /*0x0048*/ (u32) &_file_CdrcarrollZ, - /*0x0049*/ (u32) &_file_CelvisZ, - /*0x004a*/ (u32) &_file_Celvis1Z, - /*0x004b*/ (u32) &_file_CeyespyZ, - /*0x004c*/ (u32) &_file_Cfem_guardZ, - /*0x004d*/ (u32) &_file_ClabtechZ, - /*0x004e*/ (u32) &_file_CmrblondeZ, - /*0x004f*/ (u32) &_file_CofficeworkerZ, - /*0x0050*/ (u32) &_file_Cofficeworker2Z, - /*0x0051*/ (u32) &_file_CoverallZ, - /*0x0052*/ (u32) &_file_CsecretaryZ, - /*0x0053*/ (u32) &_file_CskedarZ, - /*0x0054*/ (u32) &_file_CstripesZ, - /*0x0055*/ (u32) &_file_CtestchrZ, - /*0x0056*/ (u32) &_file_CthekingZ, - /*0x0057*/ (u32) &_file_CtrentZ, - /*0x0058*/ (u32) &_file_GcartblueZ, - /*0x0059*/ (u32) &_file_GcartridgeZ, - /*0x005a*/ (u32) &_file_GcartrifleZ, - /*0x005b*/ (u32) &_file_GcartshellZ, - /*0x005c*/ (u32) &_file_GjoypadZ, - /*0x005d*/ (u32) &_file_Pa51_crate1Z, - /*0x005e*/ (u32) &_file_Pa51_crate2Z, - /*0x005f*/ (u32) &_file_Pa51_crate3Z, - /*0x0060*/ (u32) &_file_Pa51_exp1Z, - /*0x0061*/ (u32) &_file_Pa51_exp2Z, - /*0x0062*/ (u32) &_file_Pa51_horiz_door_botZ, - /*0x0063*/ (u32) &_file_Pa51_horiz_door_glZ, - /*0x0064*/ (u32) &_file_Pa51_horiz_door_secretZ, - /*0x0065*/ (u32) &_file_Pa51_horiz_door_topZ, - /*0x0066*/ (u32) &_file_Pa51_lift_controlZ, - /*0x0067*/ (u32) &_file_Pa51_lift_hangarZ, - /*0x0068*/ (u32) &_file_Pa51_lift_storeZ, - /*0x0069*/ (u32) &_file_Pa51_lift_thinwallZ, - /*0x006a*/ (u32) &_file_Pa51_unexp1Z, - /*0x006b*/ (u32) &_file_Pa51_unexp2Z, - /*0x006c*/ (u32) &_file_Pa51_unexp3Z, - /*0x006d*/ (u32) &_file_Pa51_vert_door_leftZ, - /*0x006e*/ (u32) &_file_Pa51_vert_door_rightZ, - /*0x006f*/ (u32) &_file_Pa51_vert_door_stZ, - /*0x0070*/ (u32) &_file_Pa51boardZ, - /*0x0071*/ (u32) &_file_Pa51chairZ, - /*0x0072*/ (u32) &_file_Pa51deskentZ, - /*0x0073*/ (u32) &_file_Pa51divideZ, - /*0x0074*/ (u32) &_file_Pa51screenZ, - /*0x0075*/ (u32) &_file_Pa51tableZ, - /*0x0076*/ (u32) &_file_Pa51trolleyZ, - /*0x0077*/ (u32) &_file_Pa51wastebinZ, - /*0x0078*/ (u32) &_file_Paivillabot1Z, - /*0x0079*/ (u32) &_file_Paivillabot2Z, - /*0x007a*/ (u32) &_file_Paivillabot3Z, - /*0x007b*/ (u32) &_file_Paivilladoor1Z, - /*0x007c*/ (u32) &_file_Paivilladoor2aZ, - /*0x007d*/ (u32) &_file_Paivilladoor4Z, - /*0x007e*/ (u32) &_file_PaivillawindmillZ, - /*0x007f*/ (u32) &_file_Pal_airlockZ, - /*0x0080*/ (u32) &_file_Pal_dockliftZ, - /*0x0081*/ (u32) &_file_Paldoor_lZ, - /*0x0082*/ (u32) &_file_Paldoor_rZ, - /*0x0083*/ (u32) &_file_Pborg_crateZ, - /*0x0084*/ (u32) &_file_PcaseZ, - /*0x0085*/ (u32) &_file_Pch_shutter1Z, - /*0x0086*/ (u32) &_file_PchrbriefcaseZ, - /*0x0087*/ (u32) &_file_PchrbugZ, - /*0x0088*/ (u32) &_file_PchrdatathiefZ, - /*0x0089*/ (u32) &_file_Pcryptdoor1bZ, - /*0x008a*/ (u32) &_file_Pdd_ac_expZ, - /*0x008b*/ (u32) &_file_Pdd_ac_unexpZ, - /*0x008c*/ (u32) &_file_Pdd_acbot_expZ, - /*0x008d*/ (u32) &_file_Pdd_acbot_unexpZ, - /*0x008e*/ (u32) &_file_Pdd_bannerZ, - /*0x008f*/ (u32) &_file_Pdd_chairZ, - /*0x0090*/ (u32) &_file_Pdd_decodoorZ, - /*0x0091*/ (u32) &_file_Pdd_deskZ, - /*0x0092*/ (u32) &_file_Pdd_fanroofZ, - /*0x0093*/ (u32) &_file_Pdd_fanwallZ, - /*0x0094*/ (u32) &_file_Pdd_hovcabZ, - /*0x0095*/ (u32) &_file_Pdd_hovcarZ, - /*0x0096*/ (u32) &_file_Pdd_hovcopZ, - /*0x0097*/ (u32) &_file_Pdd_hovercopterZ, - /*0x0098*/ (u32) &_file_Pdd_hovmotoZ, - /*0x0099*/ (u32) &_file_Pdd_hovtruckZ, - /*0x009a*/ (u32) &_file_Pdd_lab_cautionZ, - /*0x009b*/ (u32) &_file_Pdd_lab_cautiontopZ, - /*0x009c*/ (u32) &_file_Pdd_lab_door_bsZ, - /*0x009d*/ (u32) &_file_Pdd_lab_door_secZ, - /*0x009e*/ (u32) &_file_Pdd_lab_door_windZ, - /*0x009f*/ (u32) &_file_Pdd_lab_hazardZ, - /*0x00a0*/ (u32) &_file_Pdd_lab_restrictedZ, - /*0x00a1*/ (u32) &_file_Pdd_lab_sector2botZ, - /*0x00a2*/ (u32) &_file_Pdd_lab_sector2topZ, - /*0x00a3*/ (u32) &_file_Pdd_lab_sector3Z, - /*0x00a4*/ (u32) &_file_Pdd_lab_sector3topZ, - /*0x00a5*/ (u32) &_file_Pdd_lab_sector3windZ, - /*0x00a6*/ (u32) &_file_Pdd_lab_sector4topZ, - /*0x00a7*/ (u32) &_file_Pdd_liftdoorZ, - /*0x00a8*/ (u32) &_file_Pdd_liftrZ, - /*0x00a9*/ (u32) &_file_Pdd_officedoorZ, - /*0x00aa*/ (u32) &_file_Pdd_plantrubberZ, - /*0x00ab*/ (u32) &_file_Pdd_plantspiderZ, - /*0x00ac*/ (u32) &_file_Pdd_plantspikeZ, - /*0x00ad*/ (u32) &_file_Pdd_redarmZ, - /*0x00ae*/ (u32) &_file_Pdd_redsofaZ, - /*0x00af*/ (u32) &_file_Pdd_secretdoorZ, - /*0x00b0*/ (u32) &_file_Pdd_secretdoor2Z, - /*0x00b1*/ (u32) &_file_Pdd_servicedoorZ, - /*0x00b2*/ (u32) &_file_Pdd_stonedeskZ, - /*0x00b3*/ (u32) &_file_Pdd_vertblindZ, - /*0x00b4*/ (u32) &_file_Pdd_winddoorZ, - /*0x00b5*/ (u32) &_file_Pdd_windowZ, - /*0x00b6*/ (u32) &_file_PddjumpshipZ, - /*0x00b7*/ (u32) &_file_Pdoor1a_G5Z, - /*0x00b8*/ (u32) &_file_Pdoor1atri_G5Z, - /*0x00b9*/ (u32) &_file_Pdoor1b_G5Z, - /*0x00ba*/ (u32) &_file_Pdoor2_G5Z, - /*0x00bb*/ (u32) &_file_Pdoor2a_G5Z, - /*0x00bc*/ (u32) &_file_Pdoor4a_G5Z, - /*0x00bd*/ (u32) &_file_Pdoor4b_G5Z, - /*0x00be*/ (u32) &_file_Pdoor_rollertrainZ, - /*0x00bf*/ (u32) &_file_PdoorconsoleZ, - /*0x00c0*/ (u32) &_file_Pdr_caroll_doorZ, - /*0x00c1*/ (u32) &_file_Pdr_caroll_door_baseZ, - /*0x00c2*/ (u32) &_file_Pdr_caroll_door_bleftZ, - /*0x00c3*/ (u32) &_file_Pdr_caroll_door_bmainZ, - /*0x00c4*/ (u32) &_file_Pdr_caroll_door_brightZ, - /*0x00c5*/ (u32) &_file_Pdr_caroll_door_leftZ, - /*0x00c6*/ (u32) &_file_Pdr_caroll_door_mainZ, - /*0x00c7*/ (u32) &_file_Pdr_caroll_door_rightZ, - /*0x00c8*/ (u32) &_file_PdropshipZ, - /*0x00c9*/ (u32) &_file_PdumpsterZ, - /*0x00ca*/ (u32) &_file_PexplosionbitZ, - /*0x00cb*/ (u32) &_file_PflagZ, - /*0x00cc*/ (u32) &_file_Pg5_escdoordownZ, - /*0x00cd*/ (u32) &_file_Pg5_escdoordownboomZ, - /*0x00ce*/ (u32) &_file_Pg5_escdoorupZ, - /*0x00cf*/ (u32) &_file_Pg5_escdoorupboomZ, - /*0x00d0*/ (u32) &_file_Pg5_mainframeZ, - /*0x00d1*/ (u32) &_file_Pg5safedoorZ, - /*0x00d2*/ (u32) &_file_Pg5carliftdoorZ, - /*0x00d3*/ (u32) &_file_PgoldeneyelogoZ, - /*0x00d4*/ (u32) &_file_PhooverbotZ, - /*0x00d5*/ (u32) &_file_PhovbikeZ, - /*0x00d6*/ (u32) &_file_PhoverbedZ, - /*0x00d7*/ (u32) &_file_Phovercrate1Z, - /*0x00d8*/ (u32) &_file_PlasdoorZ, - /*0x00d9*/ (u32) &_file_PmarkerZ, - /*0x00da*/ (u32) &_file_Pmedlabwin1Z, - /*0x00db*/ (u32) &_file_Pmedlabwin2Z, - /*0x00dc*/ (u32) &_file_PmodemboxZ, - /*0x00dd*/ (u32) &_file_PnintendologoZ, - /*0x00de*/ (u32) &_file_Pnlogo2Z, - /*0x00df*/ (u32) &_file_Pnlogo3Z, - /*0x00e0*/ (u32) &_file_PnlogoZ, - /*0x00e1*/ (u32) &_file_Ppc1Z, - /*0x00e2*/ (u32) &_file_PpdfourZ, - /*0x00e3*/ (u32) &_file_PpdoneZ, - /*0x00e4*/ (u32) &_file_PpdthreeZ, - /*0x00e5*/ (u32) &_file_PpdtwoZ, - /*0x00e6*/ (u32) &_file_PperfectdarkZ, - /*0x00e7*/ (u32) &_file_PpolicecarZ, - /*0x00e8*/ (u32) &_file_PravineliftZ, - /*0x00e9*/ (u32) &_file_PropeZ, - /*0x00ea*/ (u32) &_file_Psk_cryopod1_botZ, - /*0x00eb*/ (u32) &_file_Psk_cryopod1_topZ, - /*0x00ec*/ (u32) &_file_Psk_door1Z, - /*0x00ed*/ (u32) &_file_Psk_fighter1Z, - /*0x00ee*/ (u32) &_file_Psk_hangardoor_botZ, - /*0x00ef*/ (u32) &_file_Psk_hangardoor_topZ, - /*0x00f0*/ (u32) &_file_Psk_ship_door1Z, - /*0x00f1*/ (u32) &_file_Psk_ship_holo1Z, - /*0x00f2*/ (u32) &_file_Psk_ship_holo2Z, - /*0x00f3*/ (u32) &_file_Psk_ship_hulldoor1Z, - /*0x00f4*/ (u32) &_file_Psk_ship_hulldoor2Z, - /*0x00f5*/ (u32) &_file_Psk_ship_hulldoor3Z, - /*0x00f6*/ (u32) &_file_Psk_ship_hulldoor4Z, - /*0x00f7*/ (u32) &_file_Psk_under_generatorZ, - /*0x00f8*/ (u32) &_file_Psk_under_transZ, - /*0x00f9*/ (u32) &_file_Pskcrev_exp1Z, - /*0x00fa*/ (u32) &_file_Pskcrev_unexp1Z, - /*0x00fb*/ (u32) &_file_Psktnl_exp1Z, - /*0x00fc*/ (u32) &_file_Psktnl_unexp1Z, - /*0x00fd*/ (u32) &_file_PtaxicabZ, - /*0x00fe*/ (u32) &_file_PtesterbotZ, - /*0x00ff*/ (u32) &_file_PtestobjZ, - /*0x0100*/ (u32) &_file_PtvscreenZ, - /*0x0101*/ (u32) &_file_PwindowZ, - /*0x0102*/ (u32) &_file_Ump_setupameZ, - /*0x0103*/ (u32) &_file_Ump_setuparchZ, - /*0x0104*/ (u32) &_file_Ump_setuparecZ, - /*0x0105*/ (u32) &_file_Ump_setuparkZ, - /*0x0106*/ (u32) &_file_Ump_setupashZ, - /*0x0107*/ (u32) &_file_Ump_setupaztZ, - /*0x0108*/ (u32) &_file_Ump_setupcatZ, - /*0x0109*/ (u32) &_file_Ump_setupcaveZ, - /*0x010a*/ (u32) &_file_Ump_setupcradZ, - /*0x010b*/ (u32) &_file_Ump_setupcrypZ, - /*0x010c*/ (u32) &_file_Ump_setupdamZ, - /*0x010d*/ (u32) &_file_Ump_setupdepoZ, - /*0x010e*/ (u32) &_file_Ump_setupdestZ, - /*0x010f*/ (u32) &_file_Ump_setupdishZ, - /*0x0110*/ (u32) &_file_Ump_setupearZ, - /*0x0111*/ (u32) &_file_Ump_setupeldZ, - /*0x0112*/ (u32) &_file_Ump_setupimpZ, - /*0x0113*/ (u32) &_file_Ump_setupjunZ, - /*0x0114*/ (u32) &_file_Ump_setupleeZ, - /*0x0115*/ (u32) &_file_Ump_setuplenZ, - /*0x0116*/ (u32) &_file_Ump_setuplipZ, - /*0x0117*/ (u32) &_file_Ump_setuplueZ, - /*0x0118*/ (u32) &_file_Ump_setupoatZ, - /*0x0119*/ (u32) &_file_Ump_setuppamZ, - /*0x011a*/ (u32) &_file_Ump_setuppeteZ, - /*0x011b*/ (u32) &_file_Ump_setuprefZ, - /*0x011c*/ (u32) &_file_Ump_setupritZ, - /*0x011d*/ (u32) &_file_Ump_setuprunZ, - /*0x011e*/ (u32) &_file_Ump_setupsevZ, - /*0x011f*/ (u32) &_file_Ump_setupsevbZ, - /*0x0120*/ (u32) &_file_Ump_setupsevxZ, - /*0x0121*/ (u32) &_file_Ump_setupshoZ, - /*0x0122*/ (u32) &_file_Ump_setupsiloZ, - /*0x0123*/ (u32) &_file_Ump_setupstatZ, - /*0x0124*/ (u32) &_file_Ump_setuptraZ, - /*0x0125*/ (u32) &_file_Ump_setupwaxZ, - /*0x0126*/ (u32) &_file_UsetupameZ, - /*0x0127*/ (u32) &_file_UsetuparchZ, - /*0x0128*/ (u32) &_file_UsetuparecZ, - /*0x0129*/ (u32) &_file_UsetuparkZ, - /*0x012a*/ (u32) &_file_UsetupashZ, - /*0x012b*/ (u32) &_file_UsetupaztZ, - /*0x012c*/ (u32) &_file_UsetupcatZ, - /*0x012d*/ (u32) &_file_UsetupcaveZ, - /*0x012e*/ (u32) &_file_UsetupcradZ, - /*0x012f*/ (u32) &_file_UsetupcrypZ, - /*0x0130*/ (u32) &_file_UsetupdamZ, - /*0x0131*/ (u32) &_file_UsetupdepoZ, - /*0x0132*/ (u32) &_file_UsetupdestZ, - /*0x0133*/ (u32) &_file_UsetupdishZ, - /*0x0134*/ (u32) &_file_UsetupearZ, - /*0x0135*/ (u32) &_file_UsetupeldZ, - /*0x0136*/ (u32) &_file_UsetupimpZ, - /*0x0137*/ (u32) &_file_UsetupjunZ, - /*0x0138*/ (u32) &_file_UsetupleeZ, - /*0x0139*/ (u32) &_file_UsetuplenZ, - /*0x013a*/ (u32) &_file_UsetuplipZ, - /*0x013b*/ (u32) &_file_UsetuplueZ, - /*0x013c*/ (u32) &_file_UsetupoatZ, - /*0x013d*/ (u32) &_file_UsetuppamZ, - /*0x013e*/ (u32) &_file_UsetuppeteZ, - /*0x013f*/ (u32) &_file_UsetuprefZ, - /*0x0140*/ (u32) &_file_UsetupritZ, - /*0x0141*/ (u32) &_file_UsetuprunZ, - /*0x0142*/ (u32) &_file_UsetupsevZ, - /*0x0143*/ (u32) &_file_UsetupsevbZ, - /*0x0144*/ (u32) &_file_UsetupsevxZ, - /*0x0145*/ (u32) &_file_UsetupsevxbZ, - /*0x0146*/ (u32) &_file_UsetupshoZ, - /*0x0147*/ (u32) &_file_UsetupsiloZ, - /*0x0148*/ (u32) &_file_UsetupstatZ, - /*0x0149*/ (u32) &_file_UsetuptraZ, - /*0x014a*/ (u32) &_file_UsetupwaxZ, - /*0x014b*/ (u32) &_file_bg_ame_padsZ, - /*0x014c*/ (u32) &_file_bg_ame_tilesZ, - /*0x014d*/ (u32) &_file_bg_arch_padsZ, - /*0x014e*/ (u32) &_file_bg_arch_tilesZ, - /*0x014f*/ (u32) &_file_bg_arec_padsZ, - /*0x0150*/ (u32) &_file_bg_arec_tilesZ, - /*0x0151*/ (u32) &_file_bg_ark_padsZ, - /*0x0152*/ (u32) &_file_bg_ark_tilesZ, - /*0x0153*/ (u32) &_file_bg_ash_padsZ, - /*0x0154*/ (u32) &_file_bg_ash_tilesZ, - /*0x0155*/ (u32) &_file_bg_azt_padsZ, - /*0x0156*/ (u32) &_file_bg_azt_tilesZ, - /*0x0157*/ (u32) &_file_bg_cat_padsZ, - /*0x0158*/ (u32) &_file_bg_cat_tilesZ, - /*0x0159*/ (u32) &_file_bg_cave_padsZ, - /*0x015a*/ (u32) &_file_bg_cave_tilesZ, - /*0x015b*/ (u32) &_file_bg_crad_padsZ, - /*0x015c*/ (u32) &_file_bg_crad_tilesZ, - /*0x015d*/ (u32) &_file_bg_cryp_padsZ, - /*0x015e*/ (u32) &_file_bg_cryp_tilesZ, - /*0x015f*/ (u32) &_file_bg_dam_padsZ, - /*0x0160*/ (u32) &_file_bg_dam_tilesZ, - /*0x0161*/ (u32) &_file_bg_depo_padsZ, - /*0x0162*/ (u32) &_file_bg_depo_tilesZ, - /*0x0163*/ (u32) &_file_bg_dest_padsZ, - /*0x0164*/ (u32) &_file_bg_dest_tilesZ, - /*0x0165*/ (u32) &_file_bg_dish_padsZ, - /*0x0166*/ (u32) &_file_bg_dish_tilesZ, - /*0x0167*/ (u32) &_file_bg_ear_padsZ, - /*0x0168*/ (u32) &_file_bg_ear_tilesZ, - /*0x0169*/ (u32) &_file_bg_eld_padsZ, - /*0x016a*/ (u32) &_file_bg_eld_tilesZ, - /*0x016b*/ (u32) &_file_bg_imp_padsZ, - /*0x016c*/ (u32) &_file_bg_imp_tilesZ, - /*0x016d*/ (u32) &_file_bg_jun_padsZ, - /*0x016e*/ (u32) &_file_bg_jun_tilesZ, - /*0x016f*/ (u32) &_file_bg_lee_padsZ, - /*0x0170*/ (u32) &_file_bg_lee_tilesZ, - /*0x0171*/ (u32) &_file_bg_len_padsZ, - /*0x0172*/ (u32) &_file_bg_len_tilesZ, - /*0x0173*/ (u32) &_file_bg_lip_padsZ, - /*0x0174*/ (u32) &_file_bg_lip_tilesZ, - /*0x0175*/ (u32) &_file_bg_lue_padsZ, - /*0x0176*/ (u32) &_file_bg_lue_tilesZ, - /*0x0177*/ (u32) &_file_bg_oat_padsZ, - /*0x0178*/ (u32) &_file_bg_oat_tilesZ, - /*0x0179*/ (u32) &_file_bg_pam_padsZ, - /*0x017a*/ (u32) &_file_bg_pam_tilesZ, - /*0x017b*/ (u32) &_file_bg_pete_padsZ, - /*0x017c*/ (u32) &_file_bg_pete_tilesZ, - /*0x017d*/ (u32) &_file_bg_ref_padsZ, - /*0x017e*/ (u32) &_file_bg_ref_tilesZ, - /*0x017f*/ (u32) &_file_bg_rit_padsZ, - /*0x0180*/ (u32) &_file_bg_rit_tilesZ, - /*0x0181*/ (u32) &_file_bg_run_padsZ, - /*0x0182*/ (u32) &_file_bg_run_tilesZ, - /*0x0183*/ (u32) &_file_bg_sev_padsZ, - /*0x0184*/ (u32) &_file_bg_sev_tilesZ, - /*0x0185*/ (u32) &_file_bg_sevb_padsZ, - /*0x0186*/ (u32) &_file_bg_sevb_tilesZ, - /*0x0187*/ (u32) &_file_bg_sevx_padsZ, - /*0x0188*/ (u32) &_file_bg_sevx_tilesZ, - /*0x0189*/ (u32) &_file_bg_sho_padsZ, - /*0x018a*/ (u32) &_file_bg_sho_tilesZ, - /*0x018b*/ (u32) &_file_bg_silo_padsZ, - /*0x018c*/ (u32) &_file_bg_silo_tilesZ, - /*0x018d*/ (u32) &_file_bg_stat_padsZ, - /*0x018e*/ (u32) &_file_bg_stat_tilesZ, - /*0x018f*/ (u32) &_file_bg_tra_padsZ, - /*0x0190*/ (u32) &_file_bg_tra_tilesZ, - /*0x0191*/ (u32) &_file_bg_wax_padsZ, - /*0x0192*/ (u32) &_file_bg_wax_tilesZ, - /*0x0193*/ (u32) &_file_GtestgunZ, - /*0x0194*/ (u32) &_file_Cdd_labtechZ, - /*0x0195*/ (u32) &_file_Pcctv_pdZ, - /*0x0196*/ (u32) &_file_PcomhubZ, - /*0x0197*/ (u32) &_file_PquadpodZ, - /*0x0198*/ (u32) &_file_Ppd_consoleZ, - /*0x0199*/ (u32) &_file_CconneryZ, - /*0x019a*/ (u32) &_file_CmooreZ, - /*0x019b*/ (u32) &_file_CdaltonZ, - /*0x019c*/ (u32) &_file_Cheaddark_combatZ, - /*0x019d*/ (u32) &_file_CheadelvisZ, - /*0x019e*/ (u32) &_file_CheadrossZ, - /*0x019f*/ (u32) &_file_CheadcarringtonZ, - /*0x01a0*/ (u32) &_file_CheadmrblondeZ, - /*0x01a1*/ (u32) &_file_CheadtrentZ, - /*0x01a2*/ (u32) &_file_CheadddshockZ, - /*0x01a3*/ (u32) &_file_CheadgrahamZ, - /*0x01a4*/ (u32) &_file_Cheaddark_frockZ, - /*0x01a5*/ (u32) &_file_CheadsecretaryZ, - /*0x01a6*/ (u32) &_file_CheadcassandraZ, - /*0x01a7*/ (u32) &_file_CheadthekingZ, - /*0x01a8*/ (u32) &_file_Cheadfem_guardZ, - /*0x01a9*/ (u32) &_file_CheadjonZ, - /*0x01aa*/ (u32) &_file_Plift_platformZ, - /*0x01ab*/ (u32) &_file_Pdd_grateZ, - /*0x01ac*/ (u32) &_file_PlightswitchZ, - /*0x01ad*/ (u32) &_file_PblastshieldZ, - /*0x01ae*/ (u32) &_file_Plightswitch2Z, - /*0x01af*/ (u32) &_file_Pdd_accessdoorupZ, - /*0x01b0*/ (u32) &_file_Pdd_accessdoordnZ, - /*0x01b1*/ (u32) &_file_Cdark_rippedZ, - /*0x01b2*/ (u32) &_file_Cheadmark2Z, - /*0x01b3*/ (u32) &_file_CheadchristZ, - /*0x01b4*/ (u32) &_file_Plab_containerZ, - /*0x01b5*/ (u32) &_file_Plab_chairZ, - /*0x01b6*/ (u32) &_file_Plab_tableZ, - /*0x01b7*/ (u32) &_file_Plab_microscopeZ, - /*0x01b8*/ (u32) &_file_Plab_mainframeZ, - /*0x01b9*/ (u32) &_file_Pdd_labdoorZ, - /*0x01ba*/ (u32) &_file_Pdd_lab_doortopZ, - /*0x01bb*/ (u32) &_file_Pmulti_ammo_crateZ, - /*0x01bc*/ (u32) &_file_CheadrussZ, - /*0x01bd*/ (u32) &_file_CheadgreyZ, - /*0x01be*/ (u32) &_file_CheaddarlingZ, - /*0x01bf*/ (u32) &_file_Cdd_guardZ, - /*0x01c0*/ (u32) &_file_CheadrobertZ, - /*0x01c1*/ (u32) &_file_Cdd_shockZ, - /*0x01c2*/ (u32) &_file_CheadbeauZ, - /*0x01c3*/ (u32) &_file_PchrchainZ, - /*0x01c4*/ (u32) &_file_Cdd_shock_infZ, - /*0x01c5*/ (u32) &_file_Cheadfem_guard2Z, - /*0x01c6*/ (u32) &_file_ProofgunZ, - /*0x01c7*/ (u32) &_file_PtdoorZ, - /*0x01c8*/ (u32) &_file_CbiotechZ, - /*0x01c9*/ (u32) &_file_CfbiguyZ, - /*0x01ca*/ (u32) &_file_PgroundgunZ, - /*0x01cb*/ (u32) &_file_CciaguyZ, - /*0x01cc*/ (u32) &_file_Ca51trooperZ, - /*0x01cd*/ (u32) &_file_CheadbrianZ, - /*0x01ce*/ (u32) &_file_CheadjamieZ, - /*0x01cf*/ (u32) &_file_Cheadduncan2Z, - /*0x01d0*/ (u32) &_file_CheadbiotechZ, - /*0x01d1*/ (u32) &_file_UsetupuffZ, - /*0x01d2*/ (u32) &_file_Ump_setupuffZ, - /*0x01d3*/ (u32) &_file_bg_uff_padsZ, - /*0x01d4*/ (u32) &_file_bg_uff_tilesZ, - /*0x01d5*/ (u32) &_file_UsetupoldZ, - /*0x01d6*/ (u32) &_file_Ump_setupoldZ, - /*0x01d7*/ (u32) &_file_bg_old_padsZ, - /*0x01d8*/ (u32) &_file_bg_old_tilesZ, - /*0x01d9*/ (u32) &_file_UsetupateZ, - /*0x01da*/ (u32) &_file_Ump_setupateZ, - /*0x01db*/ (u32) &_file_bg_ate_padsZ, - /*0x01dc*/ (u32) &_file_bg_ate_tilesZ, - /*0x01dd*/ (u32) &_file_UsetuplamZ, - /*0x01de*/ (u32) &_file_Ump_setuplamZ, - /*0x01df*/ (u32) &_file_bg_lam_padsZ, - /*0x01e0*/ (u32) &_file_bg_lam_tilesZ, - /*0x01e1*/ (u32) &_file_Usetupmp1Z, - /*0x01e2*/ (u32) &_file_Ump_setupmp1Z, - /*0x01e3*/ (u32) &_file_bg_mp1_padsZ, - /*0x01e4*/ (u32) &_file_bg_mp1_tilesZ, - /*0x01e5*/ (u32) &_file_Usetupmp2Z, - /*0x01e6*/ (u32) &_file_Ump_setupmp2Z, - /*0x01e7*/ (u32) &_file_bg_mp2_padsZ, - /*0x01e8*/ (u32) &_file_bg_mp2_tilesZ, - /*0x01e9*/ (u32) &_file_Usetupmp3Z, - /*0x01ea*/ (u32) &_file_Ump_setupmp3Z, - /*0x01eb*/ (u32) &_file_bg_mp3_padsZ, - /*0x01ec*/ (u32) &_file_bg_mp3_tilesZ, - /*0x01ed*/ (u32) &_file_Usetupmp4Z, - /*0x01ee*/ (u32) &_file_Ump_setupmp4Z, - /*0x01ef*/ (u32) &_file_bg_mp4_padsZ, - /*0x01f0*/ (u32) &_file_bg_mp4_tilesZ, - /*0x01f1*/ (u32) &_file_Usetupmp5Z, - /*0x01f2*/ (u32) &_file_Ump_setupmp5Z, - /*0x01f3*/ (u32) &_file_bg_mp5_padsZ, - /*0x01f4*/ (u32) &_file_bg_mp5_tilesZ, - /*0x01f5*/ (u32) &_file_Usetupmp6Z, - /*0x01f6*/ (u32) &_file_Ump_setupmp6Z, - /*0x01f7*/ (u32) &_file_bg_mp6_padsZ, - /*0x01f8*/ (u32) &_file_bg_mp6_tilesZ, - /*0x01f9*/ (u32) &_file_Usetupmp7Z, - /*0x01fa*/ (u32) &_file_Ump_setupmp7Z, - /*0x01fb*/ (u32) &_file_bg_mp7_padsZ, - /*0x01fc*/ (u32) &_file_bg_mp7_tilesZ, - /*0x01fd*/ (u32) &_file_Usetupmp8Z, - /*0x01fe*/ (u32) &_file_Ump_setupmp8Z, - /*0x01ff*/ (u32) &_file_bg_mp8_padsZ, - /*0x0200*/ (u32) &_file_bg_mp8_tilesZ, - /*0x0201*/ (u32) &_file_Usetupmp9Z, - /*0x0202*/ (u32) &_file_Ump_setupmp9Z, - /*0x0203*/ (u32) &_file_bg_mp9_padsZ, - /*0x0204*/ (u32) &_file_bg_mp9_tilesZ, - /*0x0205*/ (u32) &_file_Usetupmp10Z, - /*0x0206*/ (u32) &_file_Ump_setupmp10Z, - /*0x0207*/ (u32) &_file_bg_mp10_padsZ, - /*0x0208*/ (u32) &_file_bg_mp10_tilesZ, - /*0x0209*/ (u32) &_file_Usetupmp11Z, - /*0x020a*/ (u32) &_file_Ump_setupmp11Z, - /*0x020b*/ (u32) &_file_bg_mp11_padsZ, - /*0x020c*/ (u32) &_file_bg_mp11_tilesZ, - /*0x020d*/ (u32) &_file_Usetupmp12Z, - /*0x020e*/ (u32) &_file_Ump_setupmp12Z, - /*0x020f*/ (u32) &_file_bg_mp12_padsZ, - /*0x0210*/ (u32) &_file_bg_mp12_tilesZ, - /*0x0211*/ (u32) &_file_Usetupmp13Z, - /*0x0212*/ (u32) &_file_Ump_setupmp13Z, - /*0x0213*/ (u32) &_file_bg_mp13_padsZ, - /*0x0214*/ (u32) &_file_bg_mp13_tilesZ, - /*0x0215*/ (u32) &_file_Usetupmp14Z, - /*0x0216*/ (u32) &_file_Ump_setupmp14Z, - /*0x0217*/ (u32) &_file_bg_mp14_padsZ, - /*0x0218*/ (u32) &_file_bg_mp14_tilesZ, - /*0x0219*/ (u32) &_file_Usetupmp15Z, - /*0x021a*/ (u32) &_file_Ump_setupmp15Z, - /*0x021b*/ (u32) &_file_bg_mp15_padsZ, - /*0x021c*/ (u32) &_file_bg_mp15_tilesZ, - /*0x021d*/ (u32) &_file_Usetupmp16Z, - /*0x021e*/ (u32) &_file_Ump_setupmp16Z, - /*0x021f*/ (u32) &_file_bg_mp16_padsZ, - /*0x0220*/ (u32) &_file_bg_mp16_tilesZ, - /*0x0221*/ (u32) &_file_Usetupmp17Z, - /*0x0222*/ (u32) &_file_Ump_setupmp17Z, - /*0x0223*/ (u32) &_file_bg_mp17_padsZ, - /*0x0224*/ (u32) &_file_bg_mp17_tilesZ, - /*0x0225*/ (u32) &_file_Usetupmp18Z, - /*0x0226*/ (u32) &_file_Ump_setupmp18Z, - /*0x0227*/ (u32) &_file_bg_mp18_padsZ, - /*0x0228*/ (u32) &_file_bg_mp18_tilesZ, - /*0x0229*/ (u32) &_file_Usetupmp19Z, - /*0x022a*/ (u32) &_file_Ump_setupmp19Z, - /*0x022b*/ (u32) &_file_bg_mp19_padsZ, - /*0x022c*/ (u32) &_file_bg_mp19_tilesZ, - /*0x022d*/ (u32) &_file_Usetupmp20Z, - /*0x022e*/ (u32) &_file_Ump_setupmp20Z, - /*0x022f*/ (u32) &_file_bg_mp20_padsZ, - /*0x0230*/ (u32) &_file_bg_mp20_tilesZ, - /*0x0231*/ (u32) &_file_Ca51airmanZ, - /*0x0232*/ (u32) &_file_Cheadneil2Z, - /*0x0233*/ (u32) &_file_Pci_sofaZ, - /*0x0234*/ (u32) &_file_Pci_liftZ, - /*0x0235*/ (u32) &_file_Pci_liftdoorZ, - /*0x0236*/ (u32) &_file_CchicrobZ, - /*0x0237*/ (u32) &_file_CstewardZ, - /*0x0238*/ (u32) &_file_CheadedmcgZ, - /*0x0239*/ (u32) &_file_CstewardessZ, - /*0x023a*/ (u32) &_file_CheadankaZ, - /*0x023b*/ (u32) &_file_CpresidentZ, - /*0x023c*/ (u32) &_file_Cstewardess_coatZ, - /*0x023d*/ (u32) &_file_Cheadleslie_sZ, - /*0x023e*/ (u32) &_file_PlasercutZ, - /*0x023f*/ (u32) &_file_Psk_shuttleZ, - /*0x0240*/ (u32) &_file_CminiskedarZ, - /*0x0241*/ (u32) &_file_PnewvilladoorZ, - /*0x0242*/ (u32) &_file_Cnsa_lackeyZ, - /*0x0243*/ (u32) &_file_Cheadmatt_cZ, - /*0x0244*/ (u32) &_file_Cpres_securityZ, - /*0x0245*/ (u32) &_file_Cheadpeer_sZ, - /*0x0246*/ (u32) &_file_CnegotiatorZ, - /*0x0247*/ (u32) &_file_Cheadeileen_tZ, - /*0x0248*/ (u32) &_file_Psk_pillarleftZ, - /*0x0249*/ (u32) &_file_Psk_pillarrightZ, - /*0x024a*/ (u32) &_file_Psk_plinth_tZ, - /*0x024b*/ (u32) &_file_Psk_plinth_mlZ, - /*0x024c*/ (u32) &_file_Psk_plinth_mrZ, - /*0x024d*/ (u32) &_file_Psk_plinth_blZ, - /*0x024e*/ (u32) &_file_Psk_plinth_brZ, - /*0x024f*/ (u32) &_file_Psk_fl_shad_tZ, - /*0x0250*/ (u32) &_file_Psk_fl_shad_mlZ, - /*0x0251*/ (u32) &_file_Psk_fl_shad_mrZ, - /*0x0252*/ (u32) &_file_Psk_fl_shad_blZ, - /*0x0253*/ (u32) &_file_Psk_fl_shad_brZ, - /*0x0254*/ (u32) &_file_Psk_fl_noshad_tZ, - /*0x0255*/ (u32) &_file_Psk_fl_noshad_mlZ, - /*0x0256*/ (u32) &_file_Psk_fl_noshad_mrZ, - /*0x0257*/ (u32) &_file_Psk_fl_noshad_blZ, - /*0x0258*/ (u32) &_file_Psk_fl_noshad_brZ, - /*0x0259*/ (u32) &_file_GhudpieceZ, - /*0x025a*/ (u32) &_file_Psk_templecolumn1Z, - /*0x025b*/ (u32) &_file_Psk_templecolumn2Z, - /*0x025c*/ (u32) &_file_Psk_templecolumn3Z, - /*0x025d*/ (u32) &_file_Psk_sunshad1Z, - /*0x025e*/ (u32) &_file_Psk_sunshad2Z, - /*0x025f*/ (u32) &_file_Psk_sunnoshad1Z, - /*0x0260*/ (u32) &_file_Psk_sunnoshad2Z, - /*0x0261*/ (u32) &_file_Cg5_guardZ, - /*0x0262*/ (u32) &_file_Cheadandy_rZ, - /*0x0263*/ (u32) &_file_Cpelagic_guardZ, - /*0x0264*/ (u32) &_file_Cg5_swat_guardZ, - /*0x0265*/ (u32) &_file_Calaskan_guardZ, - /*0x0266*/ (u32) &_file_Cmaian_soldierZ, - /*0x0267*/ (u32) &_file_Cheadben_rZ, - /*0x0268*/ (u32) &_file_Cheadsteve_kZ, - /*0x0269*/ (u32) &_file_PbarrelZ, - /*0x026a*/ (u32) &_file_Pglass_floorZ, - /*0x026b*/ (u32) &_file_Pesca_stepZ, - /*0x026c*/ (u32) &_file_Pmatrix_liftZ, - /*0x026d*/ (u32) &_file_Prubble1Z, - /*0x026e*/ (u32) &_file_Prubble2Z, - /*0x026f*/ (u32) &_file_Prubble3Z, - /*0x0270*/ (u32) &_file_Prubble4Z, - /*0x0271*/ (u32) &_file_Arecep01M, - /*0x0272*/ (u32) &_file_Arecep02M, - /*0x0273*/ (u32) &_file_Arecep03M, - /*0x0274*/ (u32) &_file_Arecep04M, - /*0x0275*/ (u32) &_file_Arecep05M, - /*0x0276*/ (u32) &_file_Arecep06M, - /*0x0277*/ (u32) &_file_Arlguard1M, - /*0x0278*/ (u32) &_file_Arltech01M, - /*0x0279*/ (u32) &_file_Arltech02M, - /*0x027a*/ (u32) &_file_Arltech03M, - /*0x027b*/ (u32) &_file_Arltech04M, - /*0x027c*/ (u32) &_file_Arltech05M, - /*0x027d*/ (u32) &_file_Arltech06M, - /*0x027e*/ (u32) &_file_Ascie2aM, - /*0x027f*/ (u32) &_file_Ascie2bM, - /*0x0280*/ (u32) &_file_Ascie2cM, - /*0x0281*/ (u32) &_file_Ascie2dM, - /*0x0282*/ (u32) &_file_Ascie2eM, - /*0x0283*/ (u32) &_file_Ascie2fM, - /*0x0284*/ (u32) &_file_Ascie2gM, - /*0x0285*/ (u32) &_file_Ascie3aM, - /*0x0286*/ (u32) &_file_Ascie3bM, - /*0x0287*/ (u32) &_file_Ascie3cM, - /*0x0288*/ (u32) &_file_Ascie3dM, - /*0x0289*/ (u32) &_file_Ascie3eM, - /*0x028a*/ (u32) &_file_Ascie3gM, - /*0x028b*/ (u32) &_file_Ascien10aM, - /*0x028c*/ (u32) &_file_Ascien2_aM, - /*0x028d*/ (u32) &_file_Ascien3_aM, - /*0x028e*/ (u32) &_file_Ascien4_aM, - /*0x028f*/ (u32) &_file_Ascien5_aM, - /*0x0290*/ (u32) &_file_Ascien6_aM, - /*0x0291*/ (u32) &_file_Ascien7_aM, - /*0x0292*/ (u32) &_file_Ascien9_aM, - /*0x0293*/ (u32) &_file_AvilgrimM, - /*0x0294*/ (u32) &_file_Awepgd01M, - /*0x0295*/ (u32) &_file_Awepgd02M, - /*0x0296*/ (u32) &_file_Awepgd03M, - /*0x0297*/ (u32) &_file_Awepsc01M, - /*0x0298*/ (u32) &_file_Awepsc02M, - /*0x0299*/ (u32) &_file_Awepsc03M, - /*0x029a*/ (u32) &_file_Aa51elv01M, - /*0x029b*/ (u32) &_file_Aa51elv02M, - /*0x029c*/ (u32) &_file_Aa51elv03M, - /*0x029d*/ (u32) &_file_Aa51grd01M, - /*0x029e*/ (u32) &_file_Aa51grd02M, - /*0x029f*/ (u32) &_file_Aa51grd03M, - /*0x02a0*/ (u32) &_file_Aa51grd04M, - /*0x02a1*/ (u32) &_file_Aa51grd05M, - /*0x02a2*/ (u32) &_file_Aa51grd06M, - /*0x02a3*/ (u32) &_file_Aa51grd07M, - /*0x02a4*/ (u32) &_file_Aa51grd08M, - /*0x02a5*/ (u32) &_file_Aa51grd09M, - /*0x02a6*/ (u32) &_file_Aa51grd10M, - /*0x02a7*/ (u32) &_file_Aa51jo1M, - /*0x02a8*/ (u32) &_file_Aa51jo2M, - /*0x02a9*/ (u32) &_file_Aa51jo3M, - /*0x02aa*/ (u32) &_file_Aa51jo4M, - /*0x02ab*/ (u32) &_file_Aa51jo5M, - /*0x02ac*/ (u32) &_file_Aa51jo6M, - /*0x02ad*/ (u32) &_file_Aa51jon01M, - /*0x02ae*/ (u32) &_file_Aa51jon02M, - /*0x02af*/ (u32) &_file_Aa51jon03M, - /*0x02b0*/ (u32) &_file_Aa51jon04M, - /*0x02b1*/ (u32) &_file_Aa51jon05M, - /*0x02b2*/ (u32) &_file_Aa51jon06M, - /*0x02b3*/ (u32) &_file_Aa51jon07M, - /*0x02b4*/ (u32) &_file_Aa51jon08M, - /*0x02b5*/ (u32) &_file_Aa51jon09M, - /*0x02b6*/ (u32) &_file_Aa51jon10M, - /*0x02b7*/ (u32) &_file_Aa51jon11M, - /*0x02b8*/ (u32) &_file_Aa51jon12M, - /*0x02b9*/ (u32) &_file_Aa51jon14M, - /*0x02ba*/ (u32) &_file_Aa51jon15M, - /*0x02bb*/ (u32) &_file_Aa51sci1M, - /*0x02bc*/ (u32) &_file_Aaf1jo01M, - /*0x02bd*/ (u32) &_file_Aaf1jo02M, - /*0x02be*/ (u32) &_file_Aaf1jo03M, - /*0x02bf*/ (u32) &_file_Aaf1pr01M, - /*0x02c0*/ (u32) &_file_Aaf1pr02M, - /*0x02c1*/ (u32) &_file_Aaf1pr03M, - /*0x02c2*/ (u32) &_file_Aaf1pr04M, - /*0x02c3*/ (u32) &_file_Aaf1pr05M, - /*0x02c4*/ (u32) &_file_Aaf1pr06M, - /*0x02c5*/ (u32) &_file_Aaf1pr07M, - /*0x02c6*/ (u32) &_file_Aaf1pr08M, - /*0x02c7*/ (u32) &_file_Aaf1pr09M, - /*0x02c8*/ (u32) &_file_Aaf1pr10M, - /*0x02c9*/ (u32) &_file_Aaf1tr01M, - /*0x02ca*/ (u32) &_file_Aaf1tr02M, - /*0x02cb*/ (u32) &_file_Aaf1tr03M, - /*0x02cc*/ (u32) &_file_Aairbgd01M, - /*0x02cd*/ (u32) &_file_Aairbgd02M, - /*0x02ce*/ (u32) &_file_Aairbgd03M, - /*0x02cf*/ (u32) &_file_Aairbgd04M, - /*0x02d0*/ (u32) &_file_Aairbgd05M, - /*0x02d1*/ (u32) &_file_Aairbgd06M, - /*0x02d2*/ (u32) &_file_Aairbgd07M, - /*0x02d3*/ (u32) &_file_Aairbgd08M, - /*0x02d4*/ (u32) &_file_Aairbgd09M, - /*0x02d5*/ (u32) &_file_Aairbgd10M, - /*0x02d6*/ (u32) &_file_Aairbgd11M, - /*0x02d7*/ (u32) &_file_Aairbgd12M, - /*0x02d8*/ (u32) &_file_Aairbgd13M, - /*0x02d9*/ (u32) &_file_Aairbgd14M, - /*0x02da*/ (u32) &_file_Aairbgd15M, - /*0x02db*/ (u32) &_file_Aairbgd16M, - /*0x02dc*/ (u32) &_file_Aairstw01M, - /*0x02dd*/ (u32) &_file_Aairstw02M, - /*0x02de*/ (u32) &_file_Aairstw03M, - /*0x02df*/ (u32) &_file_Aassael01M, - /*0x02e0*/ (u32) &_file_Aassael02M, - /*0x02e1*/ (u32) &_file_Aassael03M, - /*0x02e2*/ (u32) &_file_Aassael04M, - /*0x02e3*/ (u32) &_file_Aassael05M, - /*0x02e4*/ (u32) &_file_Aassael06M, - /*0x02e5*/ (u32) &_file_Absewrk01M, - /*0x02e6*/ (u32) &_file_Absewrk02M, - /*0x02e7*/ (u32) &_file_Absewrk03M, - /*0x02e8*/ (u32) &_file_Absewrk04M, - /*0x02e9*/ (u32) &_file_Absewrk05M, - /*0x02ea*/ (u32) &_file_Acetael01M, - /*0x02eb*/ (u32) &_file_Achdroid1M, - /*0x02ec*/ (u32) &_file_Achdroid2M, - /*0x02ed*/ (u32) &_file_Acsec01M, - /*0x02ee*/ (u32) &_file_Acsec02M, - /*0x02ef*/ (u32) &_file_Acsec03M, - /*0x02f0*/ (u32) &_file_Acstan1M, - /*0x02f1*/ (u32) &_file_Acstan2M, - /*0x02f2*/ (u32) &_file_Adevr01M, - /*0x02f3*/ (u32) &_file_Adevr02M, - /*0x02f4*/ (u32) &_file_Adevr03M, - /*0x02f5*/ (u32) &_file_Adevr04M, - /*0x02f6*/ (u32) &_file_Adevr05M, - /*0x02f7*/ (u32) &_file_Adevr06M, - /*0x02f8*/ (u32) &_file_Adevr07M, - /*0x02f9*/ (u32) &_file_Adevr08M, - /*0x02fa*/ (u32) &_file_Adevr09M, - /*0x02fb*/ (u32) &_file_Adevr10M, - /*0x02fc*/ (u32) &_file_Adevr11M, - /*0x02fd*/ (u32) &_file_Adevr12M, - /*0x02fe*/ (u32) &_file_Aexec01M, - /*0x02ff*/ (u32) &_file_Aexec02M, - /*0x0300*/ (u32) &_file_Aexec04M, - /*0x0301*/ (u32) &_file_Aexec05M, - /*0x0302*/ (u32) &_file_Aexec06M, - /*0x0303*/ (u32) &_file_Aexec07M, - /*0x0304*/ (u32) &_file_Aexec08M, - /*0x0305*/ (u32) &_file_Aexec09M, - /*0x0306*/ (u32) &_file_Aexec10M, - /*0x0307*/ (u32) &_file_Aexec11M, - /*0x0308*/ (u32) &_file_Aexec12M, - /*0x0309*/ (u32) &_file_Aexec13M, - /*0x030a*/ (u32) &_file_Aexec14M, - /*0x030b*/ (u32) &_file_Ahelic01M, - /*0x030c*/ (u32) &_file_Ahelic02M, - /*0x030d*/ (u32) &_file_Ahelic03M, - /*0x030e*/ (u32) &_file_Ahologd01M, - /*0x030f*/ (u32) &_file_AholohopkM, - /*0x0310*/ (u32) &_file_Ainvcar01M, - /*0x0311*/ (u32) &_file_Ainvcar02M, - /*0x0312*/ (u32) &_file_Ainvcar03M, - /*0x0313*/ (u32) &_file_Ainvcar04M, - /*0x0314*/ (u32) &_file_Ainvcar05M, - /*0x0315*/ (u32) &_file_Ainvcar06M, - /*0x0316*/ (u32) &_file_Ainvcar07M, - /*0x0317*/ (u32) &_file_Ainvcar08M, - /*0x0318*/ (u32) &_file_Ainvcar09M, - /*0x0319*/ (u32) &_file_Ainvcar10M, - /*0x031a*/ (u32) &_file_Ainvcar11M, - /*0x031b*/ (u32) &_file_Ainvcar12M, - /*0x031c*/ (u32) &_file_AinvfarrM, - /*0x031d*/ (u32) &_file_AinvfemaM, - /*0x031e*/ (u32) &_file_AinvfostM, - /*0x031f*/ (u32) &_file_AinvgrimM, - /*0x0320*/ (u32) &_file_AinvhopkM, - /*0x0321*/ (u32) &_file_AinvmaleM, - /*0x0322*/ (u32) &_file_Ajoexec01M, - /*0x0323*/ (u32) &_file_Ajoexec02M, - /*0x0324*/ (u32) &_file_Ajosci01M, - /*0x0325*/ (u32) &_file_Ajosci02M, - /*0x0326*/ (u32) &_file_Ajosci03M, - /*0x0327*/ (u32) &_file_Alabacc1M, - /*0x0328*/ (u32) &_file_Alabacc2M, - /*0x0329*/ (u32) &_file_Alabacc3M, - /*0x032a*/ (u32) &_file_Alabacc4M, - /*0x032b*/ (u32) &_file_Alabacc5M, - /*0x032c*/ (u32) &_file_Alabacc6M, - /*0x032d*/ (u32) &_file_Alabtech1M, - /*0x032e*/ (u32) &_file_Alabtech2M, - /*0x032f*/ (u32) &_file_Alabtech3M, - /*0x0330*/ (u32) &_file_Alabtech5M, - /*0x0331*/ (u32) &_file_Alabtech6M, - /*0x0332*/ (u32) &_file_Alabtech7M, - /*0x0333*/ (u32) &_file_Alabtech8M, - /*0x0334*/ (u32) &_file_Alabtech9M, - /*0x0335*/ (u32) &_file_Aoffwrk01M, - /*0x0336*/ (u32) &_file_Aoffwrk02M, - /*0x0337*/ (u32) &_file_Aoffwrk03M, - /*0x0338*/ (u32) &_file_Aoffwrk04M, - /*0x0339*/ (u32) &_file_Cpresident_cloneZ, - /*0x033a*/ (u32) &_file_CheadjonathanZ, - /*0x033b*/ (u32) &_file_Cheadmaian_sZ, - /*0x033c*/ (u32) &_file_Cdark_af1Z, - /*0x033d*/ (u32) &_file_Pcable_carZ, - /*0x033e*/ (u32) &_file_Pelvis_saucerZ, - /*0x033f*/ (u32) &_file_Pstewardess_trolleyZ, - /*0x0340*/ (u32) &_file_Pairbase_lift_enclosedZ, - /*0x0341*/ (u32) &_file_Pairbase_lift_angleZ, - /*0x0342*/ (u32) &_file_Pairbase_safedoorZ, - /*0x0343*/ (u32) &_file_Paf1_pilotchairZ, - /*0x0344*/ (u32) &_file_Paf1_passchairZ, - /*0x0345*/ (u32) &_file_CheadshaunZ, - /*0x0346*/ (u32) &_file_PchrnightsightZ, - /*0x0347*/ (u32) &_file_PchrshieldZ, - /*0x0348*/ (u32) &_file_Pchrfalcon2Z, - /*0x0349*/ (u32) &_file_Pchrleegun1Z, - /*0x034a*/ (u32) &_file_PchrmaulerZ, - /*0x034b*/ (u32) &_file_Pchrdy357Z, - /*0x034c*/ (u32) &_file_Pchrdy357trentZ, - /*0x034d*/ (u32) &_file_PchrmaianpistolZ, - /*0x034e*/ (u32) &_file_Pchrfalcon2silZ, - /*0x034f*/ (u32) &_file_Pchrfalcon2scopeZ, - /*0x0350*/ (u32) &_file_Pchrcmp150Z, - /*0x0351*/ (u32) &_file_Pchrar34Z, - /*0x0352*/ (u32) &_file_PchrdragonZ, - /*0x0353*/ (u32) &_file_PchrsuperdragonZ, - /*0x0354*/ (u32) &_file_PchravengerZ, - /*0x0355*/ (u32) &_file_PchrcycloneZ, - /*0x0356*/ (u32) &_file_PchrmaiansmgZ, - /*0x0357*/ (u32) &_file_Pchrrcp120Z, - /*0x0358*/ (u32) &_file_PchrpcgunZ, - /*0x0359*/ (u32) &_file_PchrshotgunZ, - /*0x035a*/ (u32) &_file_PchrskminigunZ, - /*0x035b*/ (u32) &_file_PchrdyrocketZ, - /*0x035c*/ (u32) &_file_PchrdevastatorZ, - /*0x035d*/ (u32) &_file_PchrskrocketZ, - /*0x035e*/ (u32) &_file_Pchrz2020Z, - /*0x035f*/ (u32) &_file_PchrsniperrifleZ, - /*0x0360*/ (u32) &_file_PchrcrossbowZ, - /*0x0361*/ (u32) &_file_PchrdruggunZ, - /*0x0362*/ (u32) &_file_PchrknifeZ, - /*0x0363*/ (u32) &_file_PchrnbombZ, - /*0x0364*/ (u32) &_file_PchrflashbangZ, - /*0x0365*/ (u32) &_file_PchrgrenadeZ, - /*0x0366*/ (u32) &_file_PchrtimedmineZ, - /*0x0367*/ (u32) &_file_PchrproximitymineZ, - /*0x0368*/ (u32) &_file_PchrremotemineZ, - /*0x0369*/ (u32) &_file_PchrecmmineZ, - /*0x036a*/ (u32) &_file_PchrwppkZ, - /*0x036b*/ (u32) &_file_Pchrtt33Z, - /*0x036c*/ (u32) &_file_PchrskorpionZ, - /*0x036d*/ (u32) &_file_PchrkalashZ, - /*0x036e*/ (u32) &_file_PchruziZ, - /*0x036f*/ (u32) &_file_Pchrmp5kZ, - /*0x0370*/ (u32) &_file_Pchrm16Z, - /*0x0371*/ (u32) &_file_Pchrfnp90Z, - /*0x0372*/ (u32) &_file_PchrdyrocketmisZ, - /*0x0373*/ (u32) &_file_PchrskrocketmisZ, - /*0x0374*/ (u32) &_file_PchrcrossboltZ, - /*0x0375*/ (u32) &_file_PchrdevgrenadeZ, - /*0x0376*/ (u32) &_file_PchrdraggrenadeZ, - /*0x0377*/ (u32) &_file_Gfalcon2Z, - /*0x0378*/ (u32) &_file_Gleegun1Z, - /*0x0379*/ (u32) &_file_GskpistolZ, - /*0x037a*/ (u32) &_file_Gdy357Z, - /*0x037b*/ (u32) &_file_Gdy357trentZ, - /*0x037c*/ (u32) &_file_GmaianpistolZ, - /*0x037d*/ (u32) &_file_Gcmp150Z, - /*0x037e*/ (u32) &_file_Gar34Z, - /*0x037f*/ (u32) &_file_GdydragonZ, - /*0x0380*/ (u32) &_file_GdysuperdragonZ, - /*0x0381*/ (u32) &_file_Gk7avengerZ, - /*0x0382*/ (u32) &_file_GcycloneZ, - /*0x0383*/ (u32) &_file_GmaiansmgZ, - /*0x0384*/ (u32) &_file_Grcp120Z, - /*0x0385*/ (u32) &_file_GpcgunZ, - /*0x0386*/ (u32) &_file_GshotgunZ, - /*0x0387*/ (u32) &_file_GskminigunZ, - /*0x0388*/ (u32) &_file_GdyrocketZ, - /*0x0389*/ (u32) &_file_GdydevastatorZ, - /*0x038a*/ (u32) &_file_GskrocketZ, - /*0x038b*/ (u32) &_file_Gz2020Z, - /*0x038c*/ (u32) &_file_GsniperrifleZ, - /*0x038d*/ (u32) &_file_GcrossbowZ, - /*0x038e*/ (u32) &_file_GdruggunZ, - /*0x038f*/ (u32) &_file_GknifeZ, - /*0x0390*/ (u32) &_file_GgrenadeZ, - /*0x0391*/ (u32) &_file_GtimedmineZ, - /*0x0392*/ (u32) &_file_GproximitymineZ, - /*0x0393*/ (u32) &_file_GremotemineZ, - /*0x0394*/ (u32) &_file_GwppkZ, - /*0x0395*/ (u32) &_file_Gtt33Z, - /*0x0396*/ (u32) &_file_GskorpionZ, - /*0x0397*/ (u32) &_file_Gak47Z, - /*0x0398*/ (u32) &_file_GuziZ, - /*0x0399*/ (u32) &_file_Gmp5kZ, - /*0x039a*/ (u32) &_file_Gm16Z, - /*0x039b*/ (u32) &_file_Gfnp90Z, - /*0x039c*/ (u32) &_file_Gfalcon2lodZ, - /*0x039d*/ (u32) &_file_GskminigunlodZ, - /*0x039e*/ (u32) &_file_Pa51_turretZ, - /*0x039f*/ (u32) &_file_PpelagicdoorZ, - /*0x03a0*/ (u32) &_file_Am1_l1_aM, - /*0x03a1*/ (u32) &_file_Am1_l1_bM, - /*0x03a2*/ (u32) &_file_Am1_l1_cM, - /*0x03a3*/ (u32) &_file_Am1_l1_dM, - /*0x03a4*/ (u32) &_file_Am1_l2_aM, - /*0x03a5*/ (u32) &_file_Am1_l2_bM, - /*0x03a6*/ (u32) &_file_Am1_l2_cM, - /*0x03a7*/ (u32) &_file_Am1_l2_dM, - /*0x03a8*/ (u32) &_file_Am1_l3_aM, - /*0x03a9*/ (u32) &_file_Am1_l3_bM, - /*0x03aa*/ (u32) &_file_Am1_l3_cM, - /*0x03ab*/ (u32) &_file_Am1_l3_dM, - /*0x03ac*/ (u32) &_file_Am2_l1_aM, - /*0x03ad*/ (u32) &_file_Am2_l1_bM, - /*0x03ae*/ (u32) &_file_Am2_l1_cM, - /*0x03af*/ (u32) &_file_Am2_l1_dM, - /*0x03b0*/ (u32) &_file_Am3_l1_aM, - /*0x03b1*/ (u32) &_file_Am3_l1_bM, - /*0x03b2*/ (u32) &_file_Am3_l1_cM, - /*0x03b3*/ (u32) &_file_Am3_l1_dM, - /*0x03b4*/ (u32) &_file_Am3_l2_aM, - /*0x03b5*/ (u32) &_file_Am3_l2_bM, - /*0x03b6*/ (u32) &_file_Am3_l2_cM, - /*0x03b7*/ (u32) &_file_Am3_l2_dM, - /*0x03b8*/ (u32) &_file_Am4_l1_aM, - /*0x03b9*/ (u32) &_file_Am4_l1_bM, - /*0x03ba*/ (u32) &_file_Am4_l1_cM, - /*0x03bb*/ (u32) &_file_Am4_l1_dM, - /*0x03bc*/ (u32) &_file_Am4_l2_aM, - /*0x03bd*/ (u32) &_file_Am4_l2_bM, - /*0x03be*/ (u32) &_file_Am4_l2_cM, - /*0x03bf*/ (u32) &_file_Am4_l2_dM, - /*0x03c0*/ (u32) &_file_Am4_l3_aM, - /*0x03c1*/ (u32) &_file_Am4_l3_bM, - /*0x03c2*/ (u32) &_file_Am4_l3_cM, - /*0x03c3*/ (u32) &_file_Am4_l3_dM, - /*0x03c4*/ (u32) &_file_Am5_l1_aM, - /*0x03c5*/ (u32) &_file_Am5_l1_bM, - /*0x03c6*/ (u32) &_file_Am5_l1_cM, - /*0x03c7*/ (u32) &_file_Am5_l1_dM, - /*0x03c8*/ (u32) &_file_Am5_l2_aM, - /*0x03c9*/ (u32) &_file_Am5_l2_bM, - /*0x03ca*/ (u32) &_file_Am5_l2_cM, - /*0x03cb*/ (u32) &_file_Am5_l2_dM, - /*0x03cc*/ (u32) &_file_Am5_l3_aM, - /*0x03cd*/ (u32) &_file_Am5_l3_bM, - /*0x03ce*/ (u32) &_file_Am5_l3_cM, - /*0x03cf*/ (u32) &_file_Am5_l3_dM, - /*0x03d0*/ (u32) &_file_Am6_l1_aM, - /*0x03d1*/ (u32) &_file_Am6_l1_bM, - /*0x03d2*/ (u32) &_file_Am6_l1_cM, - /*0x03d3*/ (u32) &_file_Am6_l1_dM, - /*0x03d4*/ (u32) &_file_Am6_l2_aM, - /*0x03d5*/ (u32) &_file_Am6_l2_bM, - /*0x03d6*/ (u32) &_file_Am6_l2_cM, - /*0x03d7*/ (u32) &_file_Am6_l2_dM, - /*0x03d8*/ (u32) &_file_Am7_l1_aM, - /*0x03d9*/ (u32) &_file_Am7_l1_bM, - /*0x03da*/ (u32) &_file_Am7_l1_cM, - /*0x03db*/ (u32) &_file_Am7_l1_dM, - /*0x03dc*/ (u32) &_file_Am8_l1_aM, - /*0x03dd*/ (u32) &_file_Am8_l1_bM, - /*0x03de*/ (u32) &_file_Am8_l1_cM, - /*0x03df*/ (u32) &_file_Am8_l1_dM, - /*0x03e0*/ (u32) &_file_Am9_l1_aM, - /*0x03e1*/ (u32) &_file_Am9_l1_bM, - /*0x03e2*/ (u32) &_file_Am9_l1_cM, - /*0x03e3*/ (u32) &_file_Am9_l1_dM, - /*0x03e4*/ (u32) &_file_Ap1_01_joM, - /*0x03e5*/ (u32) &_file_Ap1_02_caM, - /*0x03e6*/ (u32) &_file_Ap1_03_joM, - /*0x03e7*/ (u32) &_file_Ap1_04_caM, - /*0x03e8*/ (u32) &_file_Ap1_05_joM, - /*0x03e9*/ (u32) &_file_Ap1_06_caM, - /*0x03ea*/ (u32) &_file_Ap1_07_joM, - /*0x03eb*/ (u32) &_file_Ap1_08_caM, - /*0x03ec*/ (u32) &_file_Ap2_01_joM, - /*0x03ed*/ (u32) &_file_Ap2_02_joM, - /*0x03ee*/ (u32) &_file_Ap2_03_drM, - /*0x03ef*/ (u32) &_file_Ap2_04_joM, - /*0x03f0*/ (u32) &_file_Ap2_05_joM, - /*0x03f1*/ (u32) &_file_Ap2_06_drM, - /*0x03f2*/ (u32) &_file_Ap2_07_drM, - /*0x03f3*/ (u32) &_file_Ap3_01_gdM, - /*0x03f4*/ (u32) &_file_Ap3_02_joM, - /*0x03f5*/ (u32) &_file_Ap3_03_joM, - /*0x03f6*/ (u32) &_file_Ap4_01_dvM, - /*0x03f7*/ (u32) &_file_Ap4_02_joM, - /*0x03f8*/ (u32) &_file_Ap4_03_dvM, - /*0x03f9*/ (u32) &_file_Ap4_04_joM, - /*0x03fa*/ (u32) &_file_Ap4_05_dvM, - /*0x03fb*/ (u32) &_file_Ap4_06_joM, - /*0x03fc*/ (u32) &_file_Ap4_07_blM, - /*0x03fd*/ (u32) &_file_Ap4_08_dvM, - /*0x03fe*/ (u32) &_file_Ap4_09_dvM, - /*0x03ff*/ (u32) &_file_Ap5_01_joM, - /*0x0400*/ (u32) &_file_Ap5_02_joM, - /*0x0401*/ (u32) &_file_Ap5_03_joM, - /*0x0402*/ (u32) &_file_Ap6_01_joM, - /*0x0403*/ (u32) &_file_Ap6_02_caM, - /*0x0404*/ (u32) &_file_Ap6_03_joM, - /*0x0405*/ (u32) &_file_Ap6_04_caM, - /*0x0406*/ (u32) &_file_Ap6_05_joM, - /*0x0407*/ (u32) &_file_Ap6_06_caM, - /*0x0408*/ (u32) &_file_Ap7_01_caM, - /*0x0409*/ (u32) &_file_Ap7_02_joM, - /*0x040a*/ (u32) &_file_Ap7_03_caM, - /*0x040b*/ (u32) &_file_Ap7_04_joM, - /*0x040c*/ (u32) &_file_Ap8_01_dvM, - /*0x040d*/ (u32) &_file_Ap8_02_blM, - /*0x040e*/ (u32) &_file_Ap8_03_dvM, - /*0x040f*/ (u32) &_file_Ap8_04_blM, - /*0x0410*/ (u32) &_file_Ap8_06_blM, - /*0x0411*/ (u32) &_file_Ap8_07_trM, - /*0x0412*/ (u32) &_file_Ap8_08_dvM, - /*0x0413*/ (u32) &_file_Ap8_09_trM, - /*0x0414*/ (u32) &_file_Ap8_10_blM, - /*0x0415*/ (u32) &_file_Ap9_01_joM, - /*0x0416*/ (u32) &_file_Ap9_02_caM, - /*0x0417*/ (u32) &_file_Ap9_03_joM, - /*0x0418*/ (u32) &_file_Ap10_01_caM, - /*0x0419*/ (u32) &_file_Ap10_02_caM, - /*0x041a*/ (u32) &_file_Ap10_03_caM, - /*0x041b*/ (u32) &_file_Ap10_04_caM, - /*0x041c*/ (u32) &_file_Ap10_05_joM, - /*0x041d*/ (u32) &_file_Ap10_06_caM, - /*0x041e*/ (u32) &_file_Ap10_07_joM, - /*0x041f*/ (u32) &_file_Ap10_08_caM, - /*0x0420*/ (u32) &_file_Ap10_09_joM, - /*0x0421*/ (u32) &_file_Ap11_01_jnM, - /*0x0422*/ (u32) &_file_Ap11_02_joM, - /*0x0423*/ (u32) &_file_Ap11_03_jnM, - /*0x0424*/ (u32) &_file_Ap11_04_joM, - /*0x0425*/ (u32) &_file_Ap11_05_jnM, - /*0x0426*/ (u32) &_file_Ap11_06_joM, - /*0x0427*/ (u32) &_file_Ap11_07_jnM, - /*0x0428*/ (u32) &_file_Ap11_08_joM, - /*0x0429*/ (u32) &_file_Ap12_01_jnM, - /*0x042a*/ (u32) &_file_Ap12_02_joM, - /*0x042b*/ (u32) &_file_Ap12_03_jnM, - /*0x042c*/ (u32) &_file_Ap12_04_joM, - /*0x042d*/ (u32) &_file_Ap12_05_jnM, - /*0x042e*/ (u32) &_file_Ap12_06_joM, - /*0x042f*/ (u32) &_file_Ap12_07_jnM, - /*0x0430*/ (u32) &_file_Ap12_08_joM, - /*0x0431*/ (u32) &_file_Ap12_09_jnM, - /*0x0432*/ (u32) &_file_Ap12_10_joM, - /*0x0433*/ (u32) &_file_Ap13_01_joM, - /*0x0434*/ (u32) &_file_Ap13_02_suM, - /*0x0435*/ (u32) &_file_Ap13_03_joM, - /*0x0436*/ (u32) &_file_Ap13_04_suM, - /*0x0437*/ (u32) &_file_Ap13_06_suM, - /*0x0438*/ (u32) &_file_Ap14_03_suM, - /*0x0439*/ (u32) &_file_Ap14_04_joM, - /*0x043a*/ (u32) &_file_Ap14_05_suM, - /*0x043b*/ (u32) &_file_Ap14_07_joM, - /*0x043c*/ (u32) &_file_Ap15_01_elM, - /*0x043d*/ (u32) &_file_Ap15_02_elM, - /*0x043e*/ (u32) &_file_Ap15_03_joM, - /*0x043f*/ (u32) &_file_Ap15_04_jnM, - /*0x0440*/ (u32) &_file_Ap15_05_elM, - /*0x0441*/ (u32) &_file_Ap15_06_joM, - /*0x0442*/ (u32) &_file_Ap15_07_elM, - /*0x0443*/ (u32) &_file_Ap15_08_joM, - /*0x0444*/ (u32) &_file_Ap15_09_elM, - /*0x0445*/ (u32) &_file_Ap15_10_joM, - /*0x0446*/ (u32) &_file_Ap15_11_elM, - /*0x0447*/ (u32) &_file_Ap16_01_joM, - /*0x0448*/ (u32) &_file_Ap16_02_caM, - /*0x0449*/ (u32) &_file_Ap16_04_caM, - /*0x044a*/ (u32) &_file_Ap16_05_joM, - /*0x044b*/ (u32) &_file_Ap16_06_caM, - /*0x044c*/ (u32) &_file_Ap17_01_trM, - /*0x044d*/ (u32) &_file_Ap17_02_prM, - /*0x044e*/ (u32) &_file_Ap17_03_trM, - /*0x044f*/ (u32) &_file_Ap17_04_prM, - /*0x0450*/ (u32) &_file_Ap17_05_trM, - /*0x0451*/ (u32) &_file_Ap17_06_trM, - /*0x0452*/ (u32) &_file_Ap18_01_joM, - /*0x0453*/ (u32) &_file_Ap18_02_elM, - /*0x0454*/ (u32) &_file_Ap18_03_elM, - /*0x0455*/ (u32) &_file_Ap18_04_joM, - /*0x0456*/ (u32) &_file_Ap18_05_elM, - /*0x0457*/ (u32) &_file_Ap19_01_caM, - /*0x0458*/ (u32) &_file_Ap19_02_caM, - /*0x0459*/ (u32) &_file_Ap19_03_joM, - /*0x045a*/ (u32) &_file_Ap19_04_caM, - /*0x045b*/ (u32) &_file_Ap19_05_joM, - /*0x045c*/ (u32) &_file_Ap19_06_joM, - /*0x045d*/ (u32) &_file_Ap20_01_joM, - /*0x045e*/ (u32) &_file_Ap20_02_prM, - /*0x045f*/ (u32) &_file_Ap20_03_joM, - /*0x0460*/ (u32) &_file_Ap20_04_prM, - /*0x0461*/ (u32) &_file_Ap20_05_joM, - /*0x0462*/ (u32) &_file_Ap20_06_blM, - /*0x0463*/ (u32) &_file_Ap20_07_trM, - /*0x0464*/ (u32) &_file_Ap20_08_trM, - /*0x0465*/ (u32) &_file_Ap21_01_elM, - /*0x0466*/ (u32) &_file_Ap21_02_joM, - /*0x0467*/ (u32) &_file_Ap21_03_elM, - /*0x0468*/ (u32) &_file_Ap21_04_joM, - /*0x0469*/ (u32) &_file_Ap22_01_elM, - /*0x046a*/ (u32) &_file_Ap22_02_joM, - /*0x046b*/ (u32) &_file_Ap22_03_elM, - /*0x046c*/ (u32) &_file_Ap22_04_joM, - /*0x046d*/ (u32) &_file_Ap23_01_joM, - /*0x046e*/ (u32) &_file_Ap23_02_drM, - /*0x046f*/ (u32) &_file_Ap23_03_joM, - /*0x0470*/ (u32) &_file_Ap23_04_drM, - /*0x0471*/ (u32) &_file_Ap23_05_joM, - /*0x0472*/ (u32) &_file_Ap23_06_drM, - /*0x0473*/ (u32) &_file_Ap23_07_joM, - /*0x0474*/ (u32) &_file_Ap23_08_drM, - /*0x0475*/ (u32) &_file_Ap24_01_caM, - /*0x0476*/ (u32) &_file_Ap24_02_joM, - /*0x0477*/ (u32) &_file_Ap24_03_caM, - /*0x0478*/ (u32) &_file_Ap24_04_joM, - /*0x0479*/ (u32) &_file_Ap24_05_caM, - /*0x047a*/ (u32) &_file_Ap24_06_caM, - /*0x047b*/ (u32) &_file_Ap24_07_joM, - /*0x047c*/ (u32) &_file_Ap24_08_joM, - /*0x047d*/ (u32) &_file_Ap25_01_joM, - /*0x047e*/ (u32) &_file_Ap25_02_joM, - /*0x047f*/ (u32) &_file_Ap26_01_joM, - /*0x0480*/ (u32) &_file_Ap26_02_dvM, - /*0x0481*/ (u32) &_file_Ap26_03_joM, - /*0x0482*/ (u32) &_file_Ap26_04_dvM, - /*0x0483*/ (u32) &_file_Ap26_05_dvM, - /*0x0484*/ (u32) &_file_Ap26_06_joM, - /*0x0485*/ (u32) &_file_Ap26_07_dvM, - /*0x0486*/ (u32) &_file_Ap26_08_dvM, - /*0x0487*/ (u32) &_file_Ap27_01_joM, - /*0x0488*/ (u32) &_file_Ap27_02_elM, - /*0x0489*/ (u32) &_file_Ap27_03_elM, - /*0x048a*/ (u32) &_file_Ap27_04_joM, - /*0x048b*/ (u32) &_file_Ap27_05_joM, - /*0x048c*/ (u32) &_file_Ap27_06_elM, - /*0x048d*/ (u32) &_file_Ap28_01_elM, - /*0x048e*/ (u32) &_file_Ap28_02_joM, - /*0x048f*/ (u32) &_file_Ap28_03_elM, - /*0x0490*/ (u32) &_file_Ap28_04_joM, - /*0x0491*/ (u32) &_file_Ap28_05_elM, - /*0x0492*/ (u32) &_file_Ap28_06_joM, - /*0x0493*/ (u32) &_file_Ap29_01_elM, - /*0x0494*/ (u32) &_file_Ap29_02_joM, - /*0x0495*/ (u32) &_file_Ap29_03_elM, - /*0x0496*/ (u32) &_file_Ap29_04_joM, - /*0x0497*/ (u32) &_file_Ap29_05_joM, - /*0x0498*/ (u32) &_file_Ap29_06_elM, - /*0x0499*/ (u32) &_file_Ap29_07_joM, - /*0x049a*/ (u32) &_file_Ap29_08_elM, - /*0x049b*/ (u32) &_file_Ap29_09_joM, - /*0x049c*/ (u32) &_file_Ap29_10_elM, - /*0x049d*/ (u32) &_file_PautosurgeonZ, - /*0x049e*/ (u32) &_file_CdarkwetZ, - /*0x049f*/ (u32) &_file_CdarkaqualungZ, - /*0x04a0*/ (u32) &_file_CdarksnowZ, - /*0x04a1*/ (u32) &_file_CdarklabZ, - /*0x04a2*/ (u32) &_file_CfemlabtechZ, - /*0x04a3*/ (u32) &_file_CddsniperZ, - /*0x04a4*/ (u32) &_file_Cpilotaf1Z, - /*0x04a5*/ (u32) &_file_CcilabtechZ, - /*0x04a6*/ (u32) &_file_CcifemtechZ, - /*0x04a7*/ (u32) &_file_Cheadeileen_hZ, - /*0x04a8*/ (u32) &_file_Cheadscott_hZ, - /*0x04a9*/ (u32) &_file_CcarreveningsuitZ, - /*0x04aa*/ (u32) &_file_CjonathonZ, - /*0x04ab*/ (u32) &_file_CcisoldierZ, - /*0x04ac*/ (u32) &_file_CheadsanchezZ, - /*0x04ad*/ (u32) &_file_CheaddarkaquaZ, - /*0x04ae*/ (u32) &_file_CheadddsniperZ, - /*0x04af*/ (u32) &_file_PlimoZ, - /*0x04b0*/ (u32) &_file_PpdmenuZ, - /*0x04b1*/ (u32) &_file_Pa51interceptorZ, - /*0x04b2*/ (u32) &_file_Pa51dishZ, - /*0x04b3*/ (u32) &_file_Pa51radarconsoleZ, - /*0x04b4*/ (u32) &_file_Pa51lockerdoorZ, - /*0x04b5*/ (u32) &_file_Pg5generatorZ, - /*0x04b6*/ (u32) &_file_Pg5dumpsterZ, - /*0x04b7*/ (u32) &_file_Gar34lodZ, - /*0x04b8*/ (u32) &_file_GavengerlodZ, - /*0x04b9*/ (u32) &_file_Gcmp150lodZ, - /*0x04ba*/ (u32) &_file_GcrossbowlodZ, - /*0x04bb*/ (u32) &_file_GcyclonelodZ, - /*0x04bc*/ (u32) &_file_GdruggunlodZ, - /*0x04bd*/ (u32) &_file_Gdy357lodZ, - /*0x04be*/ (u32) &_file_Gdy357trentlodZ, - /*0x04bf*/ (u32) &_file_GdevastatorlodZ, - /*0x04c0*/ (u32) &_file_GdydragonlodZ, - /*0x04c1*/ (u32) &_file_GdysuperdragonlodZ, - /*0x04c2*/ (u32) &_file_GknifelodZ, - /*0x04c3*/ (u32) &_file_GlaserlodZ, - /*0x04c4*/ (u32) &_file_GmagseclodZ, - /*0x04c5*/ (u32) &_file_GmayanpistollodZ, - /*0x04c6*/ (u32) &_file_GmayansmglodZ, - /*0x04c7*/ (u32) &_file_GpcgunlodZ, - /*0x04c8*/ (u32) &_file_Grcp120lodZ, - /*0x04c9*/ (u32) &_file_GrocketlodZ, - /*0x04ca*/ (u32) &_file_GshotgunlodZ, - /*0x04cb*/ (u32) &_file_GskpistollodZ, - /*0x04cc*/ (u32) &_file_GskrocketlodZ, - /*0x04cd*/ (u32) &_file_GsniperlodZ, - /*0x04ce*/ (u32) &_file_Gz2020lodZ, - /*0x04cf*/ (u32) &_file_PchrcloakerZ, - /*0x04d0*/ (u32) &_file_PchrspeedpillZ, - /*0x04d1*/ (u32) &_file_PbaggagecarrierZ, - /*0x04d2*/ (u32) &_file_PminesignZ, - /*0x04d3*/ (u32) &_file_PchamberZ, - /*0x04d4*/ (u32) &_file_PisotopeexperimentZ, - /*0x04d5*/ (u32) &_file_PisotopeZ, - /*0x04d6*/ (u32) &_file_PreactordoorZ, - /*0x04d7*/ (u32) &_file_PsaucerinsideZ, - /*0x04d8*/ (u32) &_file_PvillastoolZ, - /*0x04d9*/ (u32) &_file_Pcetanwindow1Z, - /*0x04da*/ (u32) &_file_Pcetanwindow2Z, - /*0x04db*/ (u32) &_file_Pcetanwindow3Z, - /*0x04dc*/ (u32) &_file_Apelelv01M, - /*0x04dd*/ (u32) &_file_Apelgrd01M, - /*0x04de*/ (u32) &_file_Ap29_11_joM, - /*0x04df*/ (u32) &_file_GlaserZ, - /*0x04e0*/ (u32) &_file_PbigpelagicdoorZ, - /*0x04e1*/ (u32) &_file_Psk_jonrubble3Z, - /*0x04e2*/ (u32) &_file_Psk_jonrubble4Z, - /*0x04e3*/ (u32) &_file_Psk_jonrubble5Z, - /*0x04e4*/ (u32) &_file_Psk_jonrubble6Z, - /*0x04e5*/ (u32) &_file_GcombathandslodZ, - /*0x04e6*/ (u32) &_file_PbinocularsZ, - /*0x04e7*/ (u32) &_file_PsubmarineZ, - /*0x04e8*/ (u32) &_file_Pairforce1Z, - /*0x04e9*/ (u32) &_file_PenginepartZ, - /*0x04ea*/ (u32) &_file_Am3l2carrM, - /*0x04eb*/ (u32) &_file_Aelvcet01M, - /*0x04ec*/ (u32) &_file_Aelvcet02M, - /*0x04ed*/ (u32) &_file_Ajorep01M, - /*0x04ee*/ (u32) &_file_Ajorep02M, - /*0x04ef*/ (u32) &_file_Ajorep03M, - /*0x04f0*/ (u32) &_file_Ajorep04M, - /*0x04f1*/ (u32) &_file_PcetroofgunZ, - /*0x04f2*/ (u32) &_file_PcetansmalldoorZ, - /*0x04f3*/ (u32) &_file_PpowernodeZ, - /*0x04f4*/ (u32) &_file_PcetanbluegreenlZ, - /*0x04f5*/ (u32) &_file_PcetanbluegreenrZ, - /*0x04f6*/ (u32) &_file_PskedarconsoleZ, - /*0x04f7*/ (u32) &_file_PskedarconsolepanelZ, - /*0x04f8*/ (u32) &_file_Ajorpld01M, - /*0x04f9*/ (u32) &_file_Ajorpld02M, - /*0x04fa*/ (u32) &_file_Ajorpld03M, - /*0x04fb*/ (u32) &_file_Ajorpld04M, - /*0x04fc*/ (u32) &_file_GnbombZ, - /*0x04fd*/ (u32) &_file_GnbomblodZ, - /*0x04fe*/ (u32) &_file_GgrenadelodZ, - /*0x04ff*/ (u32) &_file_PweaponcdoorZ, - /*0x0500*/ (u32) &_file_PtargetZ, - /*0x0501*/ (u32) &_file_PdevicesecretdoorZ, - /*0x0502*/ (u32) &_file_PcarringtonsecretdoorZ, - /*0x0503*/ (u32) &_file_PsinisterpcZ, - /*0x0504*/ (u32) &_file_PsinisterstationZ, - /*0x0505*/ (u32) &_file_PkeypadlockZ, - /*0x0506*/ (u32) &_file_PthumbprintscannerZ, - /*0x0507*/ (u32) &_file_PretinalockZ, - /*0x0508*/ (u32) &_file_PcardlockZ, - /*0x0509*/ (u32) &_file_PgoodstationZ, - /*0x050a*/ (u32) &_file_PgoodpcZ, - /*0x050b*/ (u32) &_file_CskedarkingZ, - /*0x050c*/ (u32) &_file_CelviswaistcoatZ, - /*0x050d*/ (u32) &_file_CheadgriffeyZ, - /*0x050e*/ (u32) &_file_CheadmotoZ, - /*0x050f*/ (u32) &_file_CheadkeithZ, - /*0x0510*/ (u32) &_file_CheadwinnerZ, - /*0x0511*/ (u32) &_file_Ca51faceplateZ, - /*0x0512*/ (u32) &_file_PchrautogunZ, - /*0x0513*/ (u32) &_file_Pg5bigchairZ, - /*0x0514*/ (u32) &_file_Pg5smallchairZ, - /*0x0515*/ (u32) &_file_PkingsceptreZ, - /*0x0516*/ (u32) &_file_PlabcoatZ, - /*0x0517*/ (u32) &_file_Atrjo01M, - /*0x0518*/ (u32) &_file_Atrgrim01M, - /*0x0519*/ (u32) &_file_Atrgrim02M, - /*0x051a*/ (u32) &_file_Atrcarr06M, - /*0x051b*/ (u32) &_file_Atrcarr07M, - /*0x051c*/ (u32) &_file_Atrcarr08M, - /*0x051d*/ (u32) &_file_Atrcarr01M, - /*0x051e*/ (u32) &_file_Atrcarr02M, - /*0x051f*/ (u32) &_file_Atrcarr03M, - /*0x0520*/ (u32) &_file_Atrcarr04M, - /*0x0521*/ (u32) &_file_Atrcarr05M, - /*0x0522*/ (u32) &_file_Atrcarr12M, - /*0x0523*/ (u32) &_file_Abnblde01M, - /*0x0524*/ (u32) &_file_Abncass01M, - /*0x0525*/ (u32) &_file_Pcidoor1Z, - /*0x0526*/ (u32) &_file_Pg5_chairZ, - /*0x0527*/ (u32) &_file_Pg5_chair2Z, - /*0x0528*/ (u32) &_file_Pdd_window_foyerZ, - /*0x0529*/ (u32) &_file_Ghand_jowetsuitZ, - /*0x052a*/ (u32) &_file_Ghand_trentZ, - /*0x052b*/ (u32) &_file_Ghand_jofrockZ, - /*0x052c*/ (u32) &_file_Ghand_jotrenchZ, - /*0x052d*/ (u32) &_file_Ghand_ddsniperZ, - /*0x052e*/ (u32) &_file_Ghand_presidentZ, - /*0x052f*/ (u32) &_file_Ghand_joaf1Z, - /*0x0530*/ (u32) &_file_Ghand_jopilotZ, - /*0x0531*/ (u32) &_file_Ghand_carringtonZ, - /*0x0532*/ (u32) &_file_Ghand_mrblondeZ, - /*0x0533*/ (u32) &_file_Ghand_ciaZ, - /*0x0534*/ (u32) &_file_Ghand_cifemtechZ, - /*0x0535*/ (u32) &_file_Ghand_fbiarmZ, - /*0x0536*/ (u32) &_file_Ghand_josnowZ, - /*0x0537*/ (u32) &_file_Ghand_vriesZ, - /*0x0538*/ (u32) &_file_Ghand_ddsecurityZ, - /*0x0539*/ (u32) &_file_Ghand_tragic_pelagicZ, - /*0x053a*/ (u32) &_file_Ghand_stewardess_coatZ, - /*0x053b*/ (u32) &_file_Ghand_ddlabtechZ, - /*0x053c*/ (u32) &_file_Pci_cabinetZ, - /*0x053d*/ (u32) &_file_Pci_deskZ, - /*0x053e*/ (u32) &_file_Pci_carr_deskZ, - /*0x053f*/ (u32) &_file_Pci_f_chairZ, - /*0x0540*/ (u32) &_file_Pci_loungerZ, - /*0x0541*/ (u32) &_file_Pci_f_sofaZ, - /*0x0542*/ (u32) &_file_Pci_tableZ, - /*0x0543*/ (u32) &_file_Pcv_coffee_tableZ, - /*0x0544*/ (u32) &_file_Pcv_chair1Z, - /*0x0545*/ (u32) &_file_Pcv_chair2Z, - /*0x0546*/ (u32) &_file_Pcv_sofaZ, - /*0x0547*/ (u32) &_file_Pcv_chair4Z, - /*0x0548*/ (u32) &_file_Pcv_lampZ, - /*0x0549*/ (u32) &_file_Pcv_cabinetZ, - /*0x054a*/ (u32) &_file_Pcv_f_bedZ, - /*0x054b*/ (u32) &_file_Ppel_chair1Z, - /*0x054c*/ (u32) &_file_Psk_console2Z, - /*0x054d*/ (u32) &_file_Pdd_ear_tableZ, - /*0x054e*/ (u32) &_file_Pdd_ear_chairZ, - /*0x054f*/ (u32) &_file_Pairbase_table2Z, - /*0x0550*/ (u32) &_file_Pairbase_chair2Z, - /*0x0551*/ (u32) &_file_Pmisc_crateZ, - /*0x0552*/ (u32) &_file_Pmisc_irspecsZ, - /*0x0553*/ (u32) &_file_Cheadelvis_gogsZ, - /*0x0554*/ (u32) &_file_CheadstevemZ, - /*0x0555*/ (u32) &_file_Pa51_roofgunZ, - /*0x0556*/ (u32) &_file_Psk_drone_gunZ, - /*0x0557*/ (u32) &_file_Pci_roofgunZ, - /*0x0558*/ (u32) &_file_Pcv_tableZ, - /*0x0559*/ (u32) &_file_Cdark_leatherZ, - /*0x055a*/ (u32) &_file_Cheaddark_snowZ, - /*0x055b*/ (u32) &_file_CheadpresidentZ, - /*0x055c*/ (u32) &_file_Pcidoor1_refZ, - /*0x055d*/ (u32) &_file_Palaskadoor_outZ, - /*0x055e*/ (u32) &_file_Palaskadoor_inZ, - /*0x055f*/ (u32) &_file_PwirefenceZ, - /*0x0560*/ (u32) &_file_PrarelogoZ, - /*0x0561*/ (u32) &_file_Chead_vdZ, - /*0x0562*/ (u32) &_file_Apelelv02M, - /*0x0563*/ (u32) &_file_PkeycardZ, - /*0x0564*/ (u32) &_file_PbodyarmourZ, - /*0x0565*/ (u32) &_file_Pa51gate_rZ, - /*0x0566*/ (u32) &_file_Pa51gate_lZ, - /*0x0567*/ (u32) &_file_Paf1_lampZ, - /*0x0568*/ (u32) &_file_Paf1_toiletZ, - /*0x0569*/ (u32) &_file_Paf1_doorbig2Z, - /*0x056a*/ (u32) &_file_Paf1_phoneZ, - /*0x056b*/ (u32) &_file_Paf1_cargodoorZ, - /*0x056c*/ (u32) &_file_Pg5_alarmZ, - /*0x056d*/ (u32) &_file_Pg5_laser_switchZ, - /*0x056e*/ (u32) &_file_Psk_templecolumn4Z, - /*0x056f*/ (u32) &_file_PcorehatchZ, - /*0x0570*/ (u32) &_file_LameE, - /*0x0571*/ (u32) &_file_LameJ, - /*0x0572*/ (u32) &_file_LameP, - /*0x0573*/ (u32) &_file_Lame_str_gZ, - /*0x0574*/ (u32) &_file_Lame_str_fZ, - /*0x0575*/ (u32) &_file_Lame_str_sZ, - /*0x0576*/ (u32) &_file_Lame_str_iZ, - /*0x0577*/ (u32) &_file_LarchE, - /*0x0578*/ (u32) &_file_LarchJ, - /*0x0579*/ (u32) &_file_LarchP, - /*0x057a*/ (u32) &_file_Larch_str_gZ, - /*0x057b*/ (u32) &_file_Larch_str_fZ, - /*0x057c*/ (u32) &_file_Larch_str_sZ, - /*0x057d*/ (u32) &_file_Larch_str_iZ, - /*0x057e*/ (u32) &_file_LarecE, - /*0x057f*/ (u32) &_file_LarecJ, - /*0x0580*/ (u32) &_file_LarecP, - /*0x0581*/ (u32) &_file_Larec_str_gZ, - /*0x0582*/ (u32) &_file_Larec_str_fZ, - /*0x0583*/ (u32) &_file_Larec_str_sZ, - /*0x0584*/ (u32) &_file_Larec_str_iZ, - /*0x0585*/ (u32) &_file_LarkE, - /*0x0586*/ (u32) &_file_LarkJ, - /*0x0587*/ (u32) &_file_LarkP, - /*0x0588*/ (u32) &_file_Lark_str_gZ, - /*0x0589*/ (u32) &_file_Lark_str_fZ, - /*0x058a*/ (u32) &_file_Lark_str_sZ, - /*0x058b*/ (u32) &_file_Lark_str_iZ, - /*0x058c*/ (u32) &_file_LashE, - /*0x058d*/ (u32) &_file_LashJ, - /*0x058e*/ (u32) &_file_LashP, - /*0x058f*/ (u32) &_file_Lash_str_gZ, - /*0x0590*/ (u32) &_file_Lash_str_fZ, - /*0x0591*/ (u32) &_file_Lash_str_sZ, - /*0x0592*/ (u32) &_file_Lash_str_iZ, - /*0x0593*/ (u32) &_file_LateE, - /*0x0594*/ (u32) &_file_LateJ, - /*0x0595*/ (u32) &_file_LateP, - /*0x0596*/ (u32) &_file_Late_str_gZ, - /*0x0597*/ (u32) &_file_Late_str_fZ, - /*0x0598*/ (u32) &_file_Late_str_sZ, - /*0x0599*/ (u32) &_file_Late_str_iZ, - /*0x059a*/ (u32) &_file_LaztE, - /*0x059b*/ (u32) &_file_LaztJ, - /*0x059c*/ (u32) &_file_LaztP, - /*0x059d*/ (u32) &_file_Lazt_str_gZ, - /*0x059e*/ (u32) &_file_Lazt_str_fZ, - /*0x059f*/ (u32) &_file_Lazt_str_sZ, - /*0x05a0*/ (u32) &_file_Lazt_str_iZ, - /*0x05a1*/ (u32) &_file_LcatE, - /*0x05a2*/ (u32) &_file_LcatJ, - /*0x05a3*/ (u32) &_file_LcatP, - /*0x05a4*/ (u32) &_file_Lcat_str_gZ, - /*0x05a5*/ (u32) &_file_Lcat_str_fZ, - /*0x05a6*/ (u32) &_file_Lcat_str_sZ, - /*0x05a7*/ (u32) &_file_Lcat_str_iZ, - /*0x05a8*/ (u32) &_file_LcaveE, - /*0x05a9*/ (u32) &_file_LcaveJ, - /*0x05aa*/ (u32) &_file_LcaveP, - /*0x05ab*/ (u32) &_file_Lcave_str_gZ, - /*0x05ac*/ (u32) &_file_Lcave_str_fZ, - /*0x05ad*/ (u32) &_file_Lcave_str_sZ, - /*0x05ae*/ (u32) &_file_Lcave_str_iZ, - /*0x05af*/ (u32) &_file_LcradE, - /*0x05b0*/ (u32) &_file_LcradJ, - /*0x05b1*/ (u32) &_file_LcradP, - /*0x05b2*/ (u32) &_file_Lcrad_str_gZ, - /*0x05b3*/ (u32) &_file_Lcrad_str_fZ, - /*0x05b4*/ (u32) &_file_Lcrad_str_sZ, - /*0x05b5*/ (u32) &_file_Lcrad_str_iZ, - /*0x05b6*/ (u32) &_file_LcrypE, - /*0x05b7*/ (u32) &_file_LcrypJ, - /*0x05b8*/ (u32) &_file_LcrypP, - /*0x05b9*/ (u32) &_file_Lcryp_str_gZ, - /*0x05ba*/ (u32) &_file_Lcryp_str_fZ, - /*0x05bb*/ (u32) &_file_Lcryp_str_sZ, - /*0x05bc*/ (u32) &_file_Lcryp_str_iZ, - /*0x05bd*/ (u32) &_file_LdamE, - /*0x05be*/ (u32) &_file_LdamJ, - /*0x05bf*/ (u32) &_file_LdamP, - /*0x05c0*/ (u32) &_file_Ldam_str_gZ, - /*0x05c1*/ (u32) &_file_Ldam_str_fZ, - /*0x05c2*/ (u32) &_file_Ldam_str_sZ, - /*0x05c3*/ (u32) &_file_Ldam_str_iZ, - /*0x05c4*/ (u32) &_file_LdepoE, - /*0x05c5*/ (u32) &_file_LdepoJ, - /*0x05c6*/ (u32) &_file_LdepoP, - /*0x05c7*/ (u32) &_file_Ldepo_str_gZ, - /*0x05c8*/ (u32) &_file_Ldepo_str_fZ, - /*0x05c9*/ (u32) &_file_Ldepo_str_sZ, - /*0x05ca*/ (u32) &_file_Ldepo_str_iZ, - /*0x05cb*/ (u32) &_file_LdestE, - /*0x05cc*/ (u32) &_file_LdestJ, - /*0x05cd*/ (u32) &_file_LdestP, - /*0x05ce*/ (u32) &_file_Ldest_str_gZ, - /*0x05cf*/ (u32) &_file_Ldest_str_fZ, - /*0x05d0*/ (u32) &_file_Ldest_str_sZ, - /*0x05d1*/ (u32) &_file_Ldest_str_iZ, - /*0x05d2*/ (u32) &_file_LdishE, - /*0x05d3*/ (u32) &_file_LdishJ, - /*0x05d4*/ (u32) &_file_LdishP, - /*0x05d5*/ (u32) &_file_Ldish_str_gZ, - /*0x05d6*/ (u32) &_file_Ldish_str_fZ, - /*0x05d7*/ (u32) &_file_Ldish_str_sZ, - /*0x05d8*/ (u32) &_file_Ldish_str_iZ, - /*0x05d9*/ (u32) &_file_LearE, - /*0x05da*/ (u32) &_file_LearJ, - /*0x05db*/ (u32) &_file_LearP, - /*0x05dc*/ (u32) &_file_Lear_str_gZ, - /*0x05dd*/ (u32) &_file_Lear_str_fZ, - /*0x05de*/ (u32) &_file_Lear_str_sZ, - /*0x05df*/ (u32) &_file_Lear_str_iZ, - /*0x05e0*/ (u32) &_file_LeldE, - /*0x05e1*/ (u32) &_file_LeldJ, - /*0x05e2*/ (u32) &_file_LeldP, - /*0x05e3*/ (u32) &_file_Leld_str_gZ, - /*0x05e4*/ (u32) &_file_Leld_str_fZ, - /*0x05e5*/ (u32) &_file_Leld_str_sZ, - /*0x05e6*/ (u32) &_file_Leld_str_iZ, - /*0x05e7*/ (u32) &_file_LgunE, - /*0x05e8*/ (u32) &_file_LgunJ, - /*0x05e9*/ (u32) &_file_LgunP, - /*0x05ea*/ (u32) &_file_Lgun_str_gZ, - /*0x05eb*/ (u32) &_file_Lgun_str_fZ, - /*0x05ec*/ (u32) &_file_Lgun_str_sZ, - /*0x05ed*/ (u32) &_file_Lgun_str_iZ, - /*0x05ee*/ (u32) &_file_LimpE, - /*0x05ef*/ (u32) &_file_LimpJ, - /*0x05f0*/ (u32) &_file_LimpP, - /*0x05f1*/ (u32) &_file_Limp_str_gZ, - /*0x05f2*/ (u32) &_file_Limp_str_fZ, - /*0x05f3*/ (u32) &_file_Limp_str_sZ, - /*0x05f4*/ (u32) &_file_Limp_str_iZ, - /*0x05f5*/ (u32) &_file_LjunE, - /*0x05f6*/ (u32) &_file_LjunJ, - /*0x05f7*/ (u32) &_file_LjunP, - /*0x05f8*/ (u32) &_file_Ljun_str_gZ, - /*0x05f9*/ (u32) &_file_Ljun_str_fZ, - /*0x05fa*/ (u32) &_file_Ljun_str_sZ, - /*0x05fb*/ (u32) &_file_Ljun_str_iZ, - /*0x05fc*/ (u32) &_file_LlamE, - /*0x05fd*/ (u32) &_file_LlamJ, - /*0x05fe*/ (u32) &_file_LlamP, - /*0x05ff*/ (u32) &_file_Llam_str_gZ, - /*0x0600*/ (u32) &_file_Llam_str_fZ, - /*0x0601*/ (u32) &_file_Llam_str_sZ, - /*0x0602*/ (u32) &_file_Llam_str_iZ, - /*0x0603*/ (u32) &_file_LleeE, - /*0x0604*/ (u32) &_file_LleeJ, - /*0x0605*/ (u32) &_file_LleeP, - /*0x0606*/ (u32) &_file_Llee_str_gZ, - /*0x0607*/ (u32) &_file_Llee_str_fZ, - /*0x0608*/ (u32) &_file_Llee_str_sZ, - /*0x0609*/ (u32) &_file_Llee_str_iZ, - /*0x060a*/ (u32) &_file_LlenE, - /*0x060b*/ (u32) &_file_LlenJ, - /*0x060c*/ (u32) &_file_LlenP, - /*0x060d*/ (u32) &_file_Llen_str_gZ, - /*0x060e*/ (u32) &_file_Llen_str_fZ, - /*0x060f*/ (u32) &_file_Llen_str_sZ, - /*0x0610*/ (u32) &_file_Llen_str_iZ, - /*0x0611*/ (u32) &_file_LlipE, - /*0x0612*/ (u32) &_file_LlipJ, - /*0x0613*/ (u32) &_file_LlipP, - /*0x0614*/ (u32) &_file_Llip_str_gZ, - /*0x0615*/ (u32) &_file_Llip_str_fZ, - /*0x0616*/ (u32) &_file_Llip_str_sZ, - /*0x0617*/ (u32) &_file_Llip_str_iZ, - /*0x0618*/ (u32) &_file_LlueE, - /*0x0619*/ (u32) &_file_LlueJ, - /*0x061a*/ (u32) &_file_LlueP, - /*0x061b*/ (u32) &_file_Llue_str_gZ, - /*0x061c*/ (u32) &_file_Llue_str_fZ, - /*0x061d*/ (u32) &_file_Llue_str_sZ, - /*0x061e*/ (u32) &_file_Llue_str_iZ, - /*0x061f*/ (u32) &_file_LmiscE, - /*0x0620*/ (u32) &_file_LmiscJ, - /*0x0621*/ (u32) &_file_LmiscP, - /*0x0622*/ (u32) &_file_Lmisc_str_gZ, - /*0x0623*/ (u32) &_file_Lmisc_str_fZ, - /*0x0624*/ (u32) &_file_Lmisc_str_sZ, - /*0x0625*/ (u32) &_file_Lmisc_str_iZ, - /*0x0626*/ (u32) &_file_Lmp10E, - /*0x0627*/ (u32) &_file_Lmp10J, - /*0x0628*/ (u32) &_file_Lmp10P, - /*0x0629*/ (u32) &_file_Lmp10_str_gZ, - /*0x062a*/ (u32) &_file_Lmp10_str_fZ, - /*0x062b*/ (u32) &_file_Lmp10_str_sZ, - /*0x062c*/ (u32) &_file_Lmp10_str_iZ, - /*0x062d*/ (u32) &_file_Lmp11E, - /*0x062e*/ (u32) &_file_Lmp11J, - /*0x062f*/ (u32) &_file_Lmp11P, - /*0x0630*/ (u32) &_file_Lmp11_str_gZ, - /*0x0631*/ (u32) &_file_Lmp11_str_fZ, - /*0x0632*/ (u32) &_file_Lmp11_str_sZ, - /*0x0633*/ (u32) &_file_Lmp11_str_iZ, - /*0x0634*/ (u32) &_file_Lmp12E, - /*0x0635*/ (u32) &_file_Lmp12J, - /*0x0636*/ (u32) &_file_Lmp12P, - /*0x0637*/ (u32) &_file_Lmp12_str_gZ, - /*0x0638*/ (u32) &_file_Lmp12_str_fZ, - /*0x0639*/ (u32) &_file_Lmp12_str_sZ, - /*0x063a*/ (u32) &_file_Lmp12_str_iZ, - /*0x063b*/ (u32) &_file_Lmp13E, - /*0x063c*/ (u32) &_file_Lmp13J, - /*0x063d*/ (u32) &_file_Lmp13P, - /*0x063e*/ (u32) &_file_Lmp13_str_gZ, - /*0x063f*/ (u32) &_file_Lmp13_str_fZ, - /*0x0640*/ (u32) &_file_Lmp13_str_sZ, - /*0x0641*/ (u32) &_file_Lmp13_str_iZ, - /*0x0642*/ (u32) &_file_Lmp14E, - /*0x0643*/ (u32) &_file_Lmp14J, - /*0x0644*/ (u32) &_file_Lmp14P, - /*0x0645*/ (u32) &_file_Lmp14_str_gZ, - /*0x0646*/ (u32) &_file_Lmp14_str_fZ, - /*0x0647*/ (u32) &_file_Lmp14_str_sZ, - /*0x0648*/ (u32) &_file_Lmp14_str_iZ, - /*0x0649*/ (u32) &_file_Lmp15E, - /*0x064a*/ (u32) &_file_Lmp15J, - /*0x064b*/ (u32) &_file_Lmp15P, - /*0x064c*/ (u32) &_file_Lmp15_str_gZ, - /*0x064d*/ (u32) &_file_Lmp15_str_fZ, - /*0x064e*/ (u32) &_file_Lmp15_str_sZ, - /*0x064f*/ (u32) &_file_Lmp15_str_iZ, - /*0x0650*/ (u32) &_file_Lmp16E, - /*0x0651*/ (u32) &_file_Lmp16J, - /*0x0652*/ (u32) &_file_Lmp16P, - /*0x0653*/ (u32) &_file_Lmp16_str_gZ, - /*0x0654*/ (u32) &_file_Lmp16_str_fZ, - /*0x0655*/ (u32) &_file_Lmp16_str_sZ, - /*0x0656*/ (u32) &_file_Lmp16_str_iZ, - /*0x0657*/ (u32) &_file_Lmp17E, - /*0x0658*/ (u32) &_file_Lmp17J, - /*0x0659*/ (u32) &_file_Lmp17P, - /*0x065a*/ (u32) &_file_Lmp17_str_gZ, - /*0x065b*/ (u32) &_file_Lmp17_str_fZ, - /*0x065c*/ (u32) &_file_Lmp17_str_sZ, - /*0x065d*/ (u32) &_file_Lmp17_str_iZ, - /*0x065e*/ (u32) &_file_Lmp18E, - /*0x065f*/ (u32) &_file_Lmp18J, - /*0x0660*/ (u32) &_file_Lmp18P, - /*0x0661*/ (u32) &_file_Lmp18_str_gZ, - /*0x0662*/ (u32) &_file_Lmp18_str_fZ, - /*0x0663*/ (u32) &_file_Lmp18_str_sZ, - /*0x0664*/ (u32) &_file_Lmp18_str_iZ, - /*0x0665*/ (u32) &_file_Lmp19E, - /*0x0666*/ (u32) &_file_Lmp19J, - /*0x0667*/ (u32) &_file_Lmp19P, - /*0x0668*/ (u32) &_file_Lmp19_str_gZ, - /*0x0669*/ (u32) &_file_Lmp19_str_fZ, - /*0x066a*/ (u32) &_file_Lmp19_str_sZ, - /*0x066b*/ (u32) &_file_Lmp19_str_iZ, - /*0x066c*/ (u32) &_file_Lmp1E, - /*0x066d*/ (u32) &_file_Lmp1J, - /*0x066e*/ (u32) &_file_Lmp1P, - /*0x066f*/ (u32) &_file_Lmp1_str_gZ, - /*0x0670*/ (u32) &_file_Lmp1_str_fZ, - /*0x0671*/ (u32) &_file_Lmp1_str_sZ, - /*0x0672*/ (u32) &_file_Lmp1_str_iZ, - /*0x0673*/ (u32) &_file_Lmp20E, - /*0x0674*/ (u32) &_file_Lmp20J, - /*0x0675*/ (u32) &_file_Lmp20P, - /*0x0676*/ (u32) &_file_Lmp20_str_gZ, - /*0x0677*/ (u32) &_file_Lmp20_str_fZ, - /*0x0678*/ (u32) &_file_Lmp20_str_sZ, - /*0x0679*/ (u32) &_file_Lmp20_str_iZ, - /*0x067a*/ (u32) &_file_Lmp2E, - /*0x067b*/ (u32) &_file_Lmp2J, - /*0x067c*/ (u32) &_file_Lmp2P, - /*0x067d*/ (u32) &_file_Lmp2_str_gZ, - /*0x067e*/ (u32) &_file_Lmp2_str_fZ, - /*0x067f*/ (u32) &_file_Lmp2_str_sZ, - /*0x0680*/ (u32) &_file_Lmp2_str_iZ, - /*0x0681*/ (u32) &_file_Lmp3E, - /*0x0682*/ (u32) &_file_Lmp3J, - /*0x0683*/ (u32) &_file_Lmp3P, - /*0x0684*/ (u32) &_file_Lmp3_str_gZ, - /*0x0685*/ (u32) &_file_Lmp3_str_fZ, - /*0x0686*/ (u32) &_file_Lmp3_str_sZ, - /*0x0687*/ (u32) &_file_Lmp3_str_iZ, - /*0x0688*/ (u32) &_file_Lmp4E, - /*0x0689*/ (u32) &_file_Lmp4J, - /*0x068a*/ (u32) &_file_Lmp4P, - /*0x068b*/ (u32) &_file_Lmp4_str_gZ, - /*0x068c*/ (u32) &_file_Lmp4_str_fZ, - /*0x068d*/ (u32) &_file_Lmp4_str_sZ, - /*0x068e*/ (u32) &_file_Lmp4_str_iZ, - /*0x068f*/ (u32) &_file_Lmp5E, - /*0x0690*/ (u32) &_file_Lmp5J, - /*0x0691*/ (u32) &_file_Lmp5P, - /*0x0692*/ (u32) &_file_Lmp5_str_gZ, - /*0x0693*/ (u32) &_file_Lmp5_str_fZ, - /*0x0694*/ (u32) &_file_Lmp5_str_sZ, - /*0x0695*/ (u32) &_file_Lmp5_str_iZ, - /*0x0696*/ (u32) &_file_Lmp6E, - /*0x0697*/ (u32) &_file_Lmp6J, - /*0x0698*/ (u32) &_file_Lmp6P, - /*0x0699*/ (u32) &_file_Lmp6_str_gZ, - /*0x069a*/ (u32) &_file_Lmp6_str_fZ, - /*0x069b*/ (u32) &_file_Lmp6_str_sZ, - /*0x069c*/ (u32) &_file_Lmp6_str_iZ, - /*0x069d*/ (u32) &_file_Lmp7E, - /*0x069e*/ (u32) &_file_Lmp7J, - /*0x069f*/ (u32) &_file_Lmp7P, - /*0x06a0*/ (u32) &_file_Lmp7_str_gZ, - /*0x06a1*/ (u32) &_file_Lmp7_str_fZ, - /*0x06a2*/ (u32) &_file_Lmp7_str_sZ, - /*0x06a3*/ (u32) &_file_Lmp7_str_iZ, - /*0x06a4*/ (u32) &_file_Lmp8E, - /*0x06a5*/ (u32) &_file_Lmp8J, - /*0x06a6*/ (u32) &_file_Lmp8P, - /*0x06a7*/ (u32) &_file_Lmp8_str_gZ, - /*0x06a8*/ (u32) &_file_Lmp8_str_fZ, - /*0x06a9*/ (u32) &_file_Lmp8_str_sZ, - /*0x06aa*/ (u32) &_file_Lmp8_str_iZ, - /*0x06ab*/ (u32) &_file_Lmp9E, - /*0x06ac*/ (u32) &_file_Lmp9J, - /*0x06ad*/ (u32) &_file_Lmp9P, - /*0x06ae*/ (u32) &_file_Lmp9_str_gZ, - /*0x06af*/ (u32) &_file_Lmp9_str_fZ, - /*0x06b0*/ (u32) &_file_Lmp9_str_sZ, - /*0x06b1*/ (u32) &_file_Lmp9_str_iZ, - /*0x06b2*/ (u32) &_file_LmpmenuE, - /*0x06b3*/ (u32) &_file_LmpmenuJ, - /*0x06b4*/ (u32) &_file_LmpmenuP, - /*0x06b5*/ (u32) &_file_Lmpmenu_str_gZ, - /*0x06b6*/ (u32) &_file_Lmpmenu_str_fZ, - /*0x06b7*/ (u32) &_file_Lmpmenu_str_sZ, - /*0x06b8*/ (u32) &_file_Lmpmenu_str_iZ, - /*0x06b9*/ (u32) &_file_LmpweaponsE, - /*0x06ba*/ (u32) &_file_LmpweaponsJ, - /*0x06bb*/ (u32) &_file_LmpweaponsP, - /*0x06bc*/ (u32) &_file_Lmpweapons_str_gZ, - /*0x06bd*/ (u32) &_file_Lmpweapons_str_fZ, - /*0x06be*/ (u32) &_file_Lmpweapons_str_sZ, - /*0x06bf*/ (u32) &_file_Lmpweapons_str_iZ, - /*0x06c0*/ (u32) &_file_LoatE, - /*0x06c1*/ (u32) &_file_LoatJ, - /*0x06c2*/ (u32) &_file_LoatP, - /*0x06c3*/ (u32) &_file_Loat_str_gZ, - /*0x06c4*/ (u32) &_file_Loat_str_fZ, - /*0x06c5*/ (u32) &_file_Loat_str_sZ, - /*0x06c6*/ (u32) &_file_Loat_str_iZ, - /*0x06c7*/ (u32) &_file_LoldE, - /*0x06c8*/ (u32) &_file_LoldJ, - /*0x06c9*/ (u32) &_file_LoldP, - /*0x06ca*/ (u32) &_file_Lold_str_gZ, - /*0x06cb*/ (u32) &_file_Lold_str_fZ, - /*0x06cc*/ (u32) &_file_Lold_str_sZ, - /*0x06cd*/ (u32) &_file_Lold_str_iZ, - /*0x06ce*/ (u32) &_file_LoptionsE, - /*0x06cf*/ (u32) &_file_LoptionsJ, - /*0x06d0*/ (u32) &_file_LoptionsP, - /*0x06d1*/ (u32) &_file_Loptions_str_gZ, - /*0x06d2*/ (u32) &_file_Loptions_str_fZ, - /*0x06d3*/ (u32) &_file_Loptions_str_sZ, - /*0x06d4*/ (u32) &_file_Loptions_str_iZ, - /*0x06d5*/ (u32) &_file_LpamE, - /*0x06d6*/ (u32) &_file_LpamJ, - /*0x06d7*/ (u32) &_file_LpamP, - /*0x06d8*/ (u32) &_file_Lpam_str_gZ, - /*0x06d9*/ (u32) &_file_Lpam_str_fZ, - /*0x06da*/ (u32) &_file_Lpam_str_sZ, - /*0x06db*/ (u32) &_file_Lpam_str_iZ, - /*0x06dc*/ (u32) &_file_LpeteE, - /*0x06dd*/ (u32) &_file_LpeteJ, - /*0x06de*/ (u32) &_file_LpeteP, - /*0x06df*/ (u32) &_file_Lpete_str_gZ, - /*0x06e0*/ (u32) &_file_Lpete_str_fZ, - /*0x06e1*/ (u32) &_file_Lpete_str_sZ, - /*0x06e2*/ (u32) &_file_Lpete_str_iZ, - /*0x06e3*/ (u32) &_file_LpropobjE, - /*0x06e4*/ (u32) &_file_LpropobjJ, - /*0x06e5*/ (u32) &_file_LpropobjP, - /*0x06e6*/ (u32) &_file_Lpropobj_str_gZ, - /*0x06e7*/ (u32) &_file_Lpropobj_str_fZ, - /*0x06e8*/ (u32) &_file_Lpropobj_str_sZ, - /*0x06e9*/ (u32) &_file_Lpropobj_str_iZ, - /*0x06ea*/ (u32) &_file_LrefE, - /*0x06eb*/ (u32) &_file_LrefJ, - /*0x06ec*/ (u32) &_file_LrefP, - /*0x06ed*/ (u32) &_file_Lref_str_gZ, - /*0x06ee*/ (u32) &_file_Lref_str_fZ, - /*0x06ef*/ (u32) &_file_Lref_str_sZ, - /*0x06f0*/ (u32) &_file_Lref_str_iZ, - /*0x06f1*/ (u32) &_file_LritE, - /*0x06f2*/ (u32) &_file_LritJ, - /*0x06f3*/ (u32) &_file_LritP, - /*0x06f4*/ (u32) &_file_Lrit_str_gZ, - /*0x06f5*/ (u32) &_file_Lrit_str_fZ, - /*0x06f6*/ (u32) &_file_Lrit_str_sZ, - /*0x06f7*/ (u32) &_file_Lrit_str_iZ, - /*0x06f8*/ (u32) &_file_LrunE, - /*0x06f9*/ (u32) &_file_LrunJ, - /*0x06fa*/ (u32) &_file_LrunP, - /*0x06fb*/ (u32) &_file_Lrun_str_gZ, - /*0x06fc*/ (u32) &_file_Lrun_str_fZ, - /*0x06fd*/ (u32) &_file_Lrun_str_sZ, - /*0x06fe*/ (u32) &_file_Lrun_str_iZ, - /*0x06ff*/ (u32) &_file_LsevE, - /*0x0700*/ (u32) &_file_LsevJ, - /*0x0701*/ (u32) &_file_LsevP, - /*0x0702*/ (u32) &_file_Lsev_str_gZ, - /*0x0703*/ (u32) &_file_Lsev_str_fZ, - /*0x0704*/ (u32) &_file_Lsev_str_sZ, - /*0x0705*/ (u32) &_file_Lsev_str_iZ, - /*0x0706*/ (u32) &_file_LsevbE, - /*0x0707*/ (u32) &_file_LsevbJ, - /*0x0708*/ (u32) &_file_LsevbP, - /*0x0709*/ (u32) &_file_Lsevb_str_gZ, - /*0x070a*/ (u32) &_file_Lsevb_str_fZ, - /*0x070b*/ (u32) &_file_Lsevb_str_sZ, - /*0x070c*/ (u32) &_file_Lsevb_str_iZ, - /*0x070d*/ (u32) &_file_LsevxE, - /*0x070e*/ (u32) &_file_LsevxJ, - /*0x070f*/ (u32) &_file_LsevxP, - /*0x0710*/ (u32) &_file_Lsevx_str_gZ, - /*0x0711*/ (u32) &_file_Lsevx_str_fZ, - /*0x0712*/ (u32) &_file_Lsevx_str_sZ, - /*0x0713*/ (u32) &_file_Lsevx_str_iZ, - /*0x0714*/ (u32) &_file_LsevxbE, - /*0x0715*/ (u32) &_file_LsevxbJ, - /*0x0716*/ (u32) &_file_LsevxbP, - /*0x0717*/ (u32) &_file_Lsevxb_str_gZ, - /*0x0718*/ (u32) &_file_Lsevxb_str_fZ, - /*0x0719*/ (u32) &_file_Lsevxb_str_sZ, - /*0x071a*/ (u32) &_file_Lsevxb_str_iZ, - /*0x071b*/ (u32) &_file_LshoE, - /*0x071c*/ (u32) &_file_LshoJ, - /*0x071d*/ (u32) &_file_LshoP, - /*0x071e*/ (u32) &_file_Lsho_str_gZ, - /*0x071f*/ (u32) &_file_Lsho_str_fZ, - /*0x0720*/ (u32) &_file_Lsho_str_sZ, - /*0x0721*/ (u32) &_file_Lsho_str_iZ, - /*0x0722*/ (u32) &_file_LsiloE, - /*0x0723*/ (u32) &_file_LsiloJ, - /*0x0724*/ (u32) &_file_LsiloP, - /*0x0725*/ (u32) &_file_Lsilo_str_gZ, - /*0x0726*/ (u32) &_file_Lsilo_str_fZ, - /*0x0727*/ (u32) &_file_Lsilo_str_sZ, - /*0x0728*/ (u32) &_file_Lsilo_str_iZ, - /*0x0729*/ (u32) &_file_LstatE, - /*0x072a*/ (u32) &_file_LstatJ, - /*0x072b*/ (u32) &_file_LstatP, - /*0x072c*/ (u32) &_file_Lstat_str_gZ, - /*0x072d*/ (u32) &_file_Lstat_str_fZ, - /*0x072e*/ (u32) &_file_Lstat_str_sZ, - /*0x072f*/ (u32) &_file_Lstat_str_iZ, - /*0x0730*/ (u32) &_file_LtitleE, - /*0x0731*/ (u32) &_file_LtitleJ, - /*0x0732*/ (u32) &_file_LtitleP, - /*0x0733*/ (u32) &_file_Ltitle_str_gZ, - /*0x0734*/ (u32) &_file_Ltitle_str_fZ, - /*0x0735*/ (u32) &_file_Ltitle_str_sZ, - /*0x0736*/ (u32) &_file_Ltitle_str_iZ, - /*0x0737*/ (u32) &_file_LtraE, - /*0x0738*/ (u32) &_file_LtraJ, - /*0x0739*/ (u32) &_file_LtraP, - /*0x073a*/ (u32) &_file_Ltra_str_gZ, - /*0x073b*/ (u32) &_file_Ltra_str_fZ, - /*0x073c*/ (u32) &_file_Ltra_str_sZ, - /*0x073d*/ (u32) &_file_Ltra_str_iZ, - /*0x073e*/ (u32) &_file_LuffE, - /*0x073f*/ (u32) &_file_LuffJ, - /*0x0740*/ (u32) &_file_LuffP, - /*0x0741*/ (u32) &_file_Luff_str_gZ, - /*0x0742*/ (u32) &_file_Luff_str_fZ, - /*0x0743*/ (u32) &_file_Luff_str_sZ, - /*0x0744*/ (u32) &_file_Luff_str_iZ, - /*0x0745*/ (u32) &_file_LwaxE, - /*0x0746*/ (u32) &_file_LwaxJ, - /*0x0747*/ (u32) &_file_LwaxP, - /*0x0748*/ (u32) &_file_Lwax_str_gZ, - /*0x0749*/ (u32) &_file_Lwax_str_fZ, - /*0x074a*/ (u32) &_file_Lwax_str_sZ, - /*0x074b*/ (u32) &_file_Lwax_str_iZ, - /*0x074c*/ (u32) &_file_Pa51grateZ, - /*0x074d*/ (u32) &_file_GecmmineZ, - /*0x074e*/ (u32) &_file_GcommsuplinkZ, - /*0x074f*/ (u32) &_file_GirscannerZ, - /*0x0750*/ (u32) &_file_Paf1escapedoorZ, - /*0x0751*/ (u32) &_file_PprescapsuleZ, - /*0x0752*/ (u32) &_file_PskedarbridgeZ, - /*0x0753*/ (u32) &_file_Ppelagicdoor2Z, - /*0x0754*/ (u32) &_file_Avault2M, - /*0x0755*/ (u32) &_file_Ap29_12_elM, - /*0x0756*/ (u32) &_file_Pttb_boxZ, - /*0x0757*/ (u32) &_file_PinstfrontdoorZ, - /*0x0758*/ (u32) &_file_Ap14_09_joM, - /*0x0759*/ (u32) &_file_Ap19_07_joM, - /*0x075a*/ (u32) &_file_Ap19_08_joM, - /*0x075b*/ (u32) &_file_PchrlaserZ, - /*0x075c*/ (u32) &_file_PbaftaZ, - /*0x075d*/ (u32) &_file_PchrsonicscrewerZ, - /*0x075e*/ (u32) &_file_PchrlumphammerZ, - /*0x075f*/ (u32) &_file_PskedarbombZ, - /*0x0760*/ (u32) &_file_PexplosivebrickZ, - /*0x0761*/ (u32) &_file_PresearchtapeZ, - /*0x0762*/ (u32) &_file_PziggycardZ, - /*0x0763*/ (u32) &_file_PsafeitemZ, - /*0x0764*/ (u32) &_file_Ghand_elvisZ, - /*0x0765*/ (u32) &_file_Paf1_tableZ, - /*0x0766*/ (u32) &_file_Ghand_a51guardZ, - /*0x0767*/ (u32) &_file_Ghand_ddshockZ, - /*0x0768*/ (u32) &_file_Ghand_blackguardZ, - /*0x0769*/ (u32) &_file_Ghand_ddfodderZ, - /*0x076a*/ (u32) &_file_Ghand_ddbioZ, - /*0x076b*/ (u32) &_file_Ghand_a51airmanZ, - /*0x076c*/ (u32) &_file_Ghand_g5guardZ, - /*0x076d*/ (u32) &_file_Ghand_cisoldierZ, - /*0x076e*/ (u32) &_file_PsensitiveinfoZ, - /*0x076f*/ (u32) &_file_PrussdarZ, - /*0x0770*/ (u32) &_file_PxrayspecsZ, - /*0x0771*/ (u32) &_file_PchreyespyZ, - /*0x0772*/ (u32) &_file_PchrdoordecoderZ, - /*0x0773*/ (u32) &_file_PbriefcaseZ, - /*0x0774*/ (u32) &_file_PsuitcaseZ, - /*0x0775*/ (u32) &_file_PshuttledoorZ, - /*0x0776*/ (u32) &_file_PruinbridgeZ, - /*0x0777*/ (u32) &_file_PsecretindoorZ, - /*0x0778*/ (u32) &_file_PskpuzzleobjectZ, - /*0x0779*/ (u32) &_file_Pa51liftdoorZ, - /*0x077a*/ (u32) &_file_Acicarr06M, - /*0x077b*/ (u32) &_file_Acicarr11M, - /*0x077c*/ (u32) &_file_Acifarr08M, - /*0x077d*/ (u32) &_file_Acifarr12M, - /*0x077e*/ (u32) &_file_Acifema01M, - /*0x077f*/ (u32) &_file_Acifema04M, - /*0x0780*/ (u32) &_file_Acifema07M, - /*0x0781*/ (u32) &_file_Acifema08M, - /*0x0782*/ (u32) &_file_Acifema09M, - /*0x0783*/ (u32) &_file_Acifema14M, - /*0x0784*/ (u32) &_file_Acifost08M, - /*0x0785*/ (u32) &_file_Acifost12M, - /*0x0786*/ (u32) &_file_Acigrim05M, - /*0x0787*/ (u32) &_file_Acigrim06M, - /*0x0788*/ (u32) &_file_Acigrim07M, - /*0x0789*/ (u32) &_file_Acigrim08M, - /*0x078a*/ (u32) &_file_Acigrim09M, - /*0x078b*/ (u32) &_file_Acigrim10M, - /*0x078c*/ (u32) &_file_Acihopk09M, - /*0x078d*/ (u32) &_file_Acihopk11M, - /*0x078e*/ (u32) &_file_Acimale02M, - /*0x078f*/ (u32) &_file_Acimale03M, - /*0x0790*/ (u32) &_file_Acimale07M, - /*0x0791*/ (u32) &_file_Acimale09M, - /*0x0792*/ (u32) &_file_Acimale11M, - /*0x0793*/ (u32) &_file_Acimale13M, - /*0x0794*/ (u32) &_file_Aciroge08M, - /*0x0795*/ (u32) &_file_Aciroge12M, - /*0x0796*/ (u32) &_file_Cdark_negotiatorZ, - /*0x0797*/ (u32) &_file_PcihubZ, - /*0x0798*/ (u32) &_file_Psk_ship_door2Z, - /*0x0799*/ (u32) &_file_Psk_window1Z, - /*0x079a*/ (u32) &_file_Psk_hangardoorb_topZ, - /*0x079b*/ (u32) &_file_Psk_hangardoorb_botZ, - /*0x079c*/ (u32) &_file_Paf1_innerdoorZ, - /*0x079d*/ (u32) &_file_Plaser_postZ, - /*0x079e*/ (u32) &_file_Atrfost01M, - /*0x079f*/ (u32) &_file_Atrfost02M, - /*0x07a0*/ (u32) &_file_Atrfost03M, - /*0x07a1*/ (u32) &_file_Atrcarr09M, - /*0x07a2*/ (u32) &_file_Atrcarr10M, - /*0x07a3*/ (u32) &_file_Atrcarr11M, - /*0x07a4*/ (u32) &_file_Acifarr01M, - /*0x07a5*/ (u32) &_file_Acifarr02M, - /*0x07a6*/ (u32) &_file_Acifarr03M, - /*0x07a7*/ (u32) &_file_Acigrim01M, - /*0x07a8*/ (u32) &_file_Acigrim03M, - /*0x07a9*/ (u32) &_file_Acigrim04M, - /*0x07aa*/ (u32) &_file_Acihopk01M, - /*0x07ab*/ (u32) &_file_Acihopk04M, - /*0x07ac*/ (u32) &_file_Acihopk06M, - /*0x07ad*/ (u32) &_file_Aciroge01M, - /*0x07ae*/ (u32) &_file_Aciroge02M, - /*0x07af*/ (u32) &_file_Atrroge01M, - /*0x07b0*/ (u32) &_file_Acicarr07M, - /*0x07b1*/ (u32) &_file_Acicarr08M, - /*0x07b2*/ (u32) &_file_PtargetampZ, - /*0x07b3*/ (u32) &_file_Psk_liftZ, - /*0x07b4*/ (u32) &_file_PknockknockZ, - /*0x07b5*/ (u32) &_file_PcetandoorZ, - /*0x07b6*/ (u32) &_file_Ajoinst01M, - /*0x07b7*/ (u32) &_file_Ajoinst02M, - /*0x07b8*/ (u32) &_file_Ajoinst03M, - /*0x07b9*/ (u32) &_file_Ajoinst04M, - /*0x07ba*/ (u32) &_file_Ap25_03_joM, - /*0x07bb*/ (u32) &_file_Paf1rubbleZ, - /*0x07bc*/ (u32) &_file_Pdd_dr_nonrefZ, - /*0x07bd*/ (u32) &_file_CheadtimZ, - /*0x07be*/ (u32) &_file_CheadgrantZ, - /*0x07bf*/ (u32) &_file_CheadpennyZ, - /*0x07c0*/ (u32) &_file_CheadrobinZ, - /*0x07c1*/ (u32) &_file_CheadalexZ, - /*0x07c2*/ (u32) &_file_CheadjulianneZ, - /*0x07c3*/ (u32) &_file_CheadlauraZ, - /*0x07c4*/ (u32) &_file_CheaddavecZ, - /*0x07c5*/ (u32) &_file_CheadkenZ, - /*0x07c6*/ (u32) &_file_CheadjoelZ, - /*0x07c7*/ (u32) &_file_PcetandoorsideZ, - /*0x07c8*/ (u32) &_file_Ap29_13_joM, - /*0x07c9*/ (u32) &_file_Ap29_14_joM, - /*0x07ca*/ (u32) &_file_Acicarr09M, - /*0x07cb*/ (u32) &_file_Acicarr10M, - /*0x07cc*/ (u32) &_file_PbuddybridgeZ, - /*0x07cd*/ (u32) &_file_CheadcookZ, - /*0x07ce*/ (u32) &_file_CheadpryceZ, - /*0x07cf*/ (u32) &_file_CheadsilkeZ, - /*0x07d0*/ (u32) &_file_CheadsmithZ, - /*0x07d1*/ (u32) &_file_CheadgarethZ, - /*0x07d2*/ (u32) &_file_CheadmurchieZ, - /*0x07d3*/ (u32) &_file_CheadwongZ, - /*0x07d4*/ (u32) &_file_CheadcarterZ, - /*0x07d5*/ (u32) &_file_CheadtintinZ, - /*0x07d6*/ (u32) &_file_CheadmuntonZ, - /*0x07d7*/ (u32) &_file_CheadstamperZ, - /*0x07d8*/ (u32) &_file_CheadjonesZ, - /*0x07d9*/ (u32) &_file_CheadphelpsZ, - /*0x07da*/ (u32) &_file_Ap29_15_joM, - /*0x07db*/ (u32) &_file_Ap16_03_joM, - /*0x07dc*/ (u32) &_file_Acarrbye02M, + /*0x0001*/ (uintptr_t) &_file_bg_sev_seg, + /*0x0002*/ (uintptr_t) &_file_bg_silo_seg, + /*0x0003*/ (uintptr_t) &_file_bg_stat_seg, + /*0x0004*/ (uintptr_t) &_file_bg_arec_seg, + /*0x0005*/ (uintptr_t) &_file_bg_arch_seg, + /*0x0006*/ (uintptr_t) &_file_bg_tra_seg, + /*0x0007*/ (uintptr_t) &_file_bg_dest_seg, + /*0x0008*/ (uintptr_t) &_file_bg_sevb_seg, + /*0x0009*/ (uintptr_t) &_file_bg_azt_seg, + /*0x000a*/ (uintptr_t) &_file_bg_pete_seg, + /*0x000b*/ (uintptr_t) &_file_bg_depo_seg, + /*0x000c*/ (uintptr_t) &_file_bg_ref_seg, + /*0x000d*/ (uintptr_t) &_file_bg_cryp_seg, + /*0x000e*/ (uintptr_t) &_file_bg_dam_seg, + /*0x000f*/ (uintptr_t) &_file_bg_ark_seg, + /*0x0010*/ (uintptr_t) &_file_bg_run_seg, + /*0x0011*/ (uintptr_t) &_file_bg_sevx_seg, + /*0x0012*/ (uintptr_t) &_file_bg_jun_seg, + /*0x0013*/ (uintptr_t) &_file_bg_dish_seg, + /*0x0014*/ (uintptr_t) &_file_bg_cave_seg, + /*0x0015*/ (uintptr_t) &_file_bg_cat_seg, + /*0x0016*/ (uintptr_t) &_file_bg_crad_seg, + /*0x0017*/ (uintptr_t) &_file_bg_sho_seg, + /*0x0018*/ (uintptr_t) &_file_bg_eld_seg, + /*0x0019*/ (uintptr_t) &_file_bg_imp_seg, + /*0x001a*/ (uintptr_t) &_file_bg_ash_seg, + /*0x001b*/ (uintptr_t) &_file_bg_lue_seg, + /*0x001c*/ (uintptr_t) &_file_bg_ame_seg, + /*0x001d*/ (uintptr_t) &_file_bg_rit_seg, + /*0x001e*/ (uintptr_t) &_file_bg_oat_seg, + /*0x001f*/ (uintptr_t) &_file_bg_ear_seg, + /*0x0020*/ (uintptr_t) &_file_bg_lee_seg, + /*0x0021*/ (uintptr_t) &_file_bg_lip_seg, + /*0x0022*/ (uintptr_t) &_file_bg_len_seg, + /*0x0023*/ (uintptr_t) &_file_bg_wax_seg, + /*0x0024*/ (uintptr_t) &_file_bg_pam_seg, + /*0x0025*/ (uintptr_t) &_file_bg_uff_seg, + /*0x0026*/ (uintptr_t) &_file_bg_old_seg, + /*0x0027*/ (uintptr_t) &_file_bg_ate_seg, + /*0x0028*/ (uintptr_t) &_file_bg_lam_seg, + /*0x0029*/ (uintptr_t) &_file_bg_mp1_seg, + /*0x002a*/ (uintptr_t) &_file_bg_mp2_seg, + /*0x002b*/ (uintptr_t) &_file_bg_mp3_seg, + /*0x002c*/ (uintptr_t) &_file_bg_mp4_seg, + /*0x002d*/ (uintptr_t) &_file_bg_mp5_seg, + /*0x002e*/ (uintptr_t) &_file_bg_mp6_seg, + /*0x002f*/ (uintptr_t) &_file_bg_mp7_seg, + /*0x0030*/ (uintptr_t) &_file_bg_mp8_seg, + /*0x0031*/ (uintptr_t) &_file_bg_mp9_seg, + /*0x0032*/ (uintptr_t) &_file_bg_mp10_seg, + /*0x0033*/ (uintptr_t) &_file_bg_mp11_seg, + /*0x0034*/ (uintptr_t) &_file_bg_mp12_seg, + /*0x0035*/ (uintptr_t) &_file_bg_mp13_seg, + /*0x0036*/ (uintptr_t) &_file_bg_mp14_seg, + /*0x0037*/ (uintptr_t) &_file_bg_mp15_seg, + /*0x0038*/ (uintptr_t) &_file_bg_mp16_seg, + /*0x0039*/ (uintptr_t) &_file_bg_mp17_seg, + /*0x003a*/ (uintptr_t) &_file_bg_mp18_seg, + /*0x003b*/ (uintptr_t) &_file_bg_mp19_seg, + /*0x003c*/ (uintptr_t) &_file_bg_mp20_seg, + /*0x003d*/ (uintptr_t) &_file_ob_mid_seg, + /*0x003e*/ (uintptr_t) &_file_Ca51guardZ, + /*0x003f*/ (uintptr_t) &_file_Carea51guardZ, + /*0x0040*/ (uintptr_t) &_file_CcarringtonZ, + /*0x0041*/ (uintptr_t) &_file_CcassandraZ, + /*0x0042*/ (uintptr_t) &_file_Cdark_combatZ, + /*0x0043*/ (uintptr_t) &_file_Cdark_frockZ, + /*0x0044*/ (uintptr_t) &_file_Cdark_trenchZ, + /*0x0045*/ (uintptr_t) &_file_CddshockZ, + /*0x0046*/ (uintptr_t) &_file_Cdd_secguardZ, + /*0x0047*/ (uintptr_t) &_file_CdjbondZ, + /*0x0048*/ (uintptr_t) &_file_CdrcarrollZ, + /*0x0049*/ (uintptr_t) &_file_CelvisZ, + /*0x004a*/ (uintptr_t) &_file_Celvis1Z, + /*0x004b*/ (uintptr_t) &_file_CeyespyZ, + /*0x004c*/ (uintptr_t) &_file_Cfem_guardZ, + /*0x004d*/ (uintptr_t) &_file_ClabtechZ, + /*0x004e*/ (uintptr_t) &_file_CmrblondeZ, + /*0x004f*/ (uintptr_t) &_file_CofficeworkerZ, + /*0x0050*/ (uintptr_t) &_file_Cofficeworker2Z, + /*0x0051*/ (uintptr_t) &_file_CoverallZ, + /*0x0052*/ (uintptr_t) &_file_CsecretaryZ, + /*0x0053*/ (uintptr_t) &_file_CskedarZ, + /*0x0054*/ (uintptr_t) &_file_CstripesZ, + /*0x0055*/ (uintptr_t) &_file_CtestchrZ, + /*0x0056*/ (uintptr_t) &_file_CthekingZ, + /*0x0057*/ (uintptr_t) &_file_CtrentZ, + /*0x0058*/ (uintptr_t) &_file_GcartblueZ, + /*0x0059*/ (uintptr_t) &_file_GcartridgeZ, + /*0x005a*/ (uintptr_t) &_file_GcartrifleZ, + /*0x005b*/ (uintptr_t) &_file_GcartshellZ, + /*0x005c*/ (uintptr_t) &_file_GjoypadZ, + /*0x005d*/ (uintptr_t) &_file_Pa51_crate1Z, + /*0x005e*/ (uintptr_t) &_file_Pa51_crate2Z, + /*0x005f*/ (uintptr_t) &_file_Pa51_crate3Z, + /*0x0060*/ (uintptr_t) &_file_Pa51_exp1Z, + /*0x0061*/ (uintptr_t) &_file_Pa51_exp2Z, + /*0x0062*/ (uintptr_t) &_file_Pa51_horiz_door_botZ, + /*0x0063*/ (uintptr_t) &_file_Pa51_horiz_door_glZ, + /*0x0064*/ (uintptr_t) &_file_Pa51_horiz_door_secretZ, + /*0x0065*/ (uintptr_t) &_file_Pa51_horiz_door_topZ, + /*0x0066*/ (uintptr_t) &_file_Pa51_lift_controlZ, + /*0x0067*/ (uintptr_t) &_file_Pa51_lift_hangarZ, + /*0x0068*/ (uintptr_t) &_file_Pa51_lift_storeZ, + /*0x0069*/ (uintptr_t) &_file_Pa51_lift_thinwallZ, + /*0x006a*/ (uintptr_t) &_file_Pa51_unexp1Z, + /*0x006b*/ (uintptr_t) &_file_Pa51_unexp2Z, + /*0x006c*/ (uintptr_t) &_file_Pa51_unexp3Z, + /*0x006d*/ (uintptr_t) &_file_Pa51_vert_door_leftZ, + /*0x006e*/ (uintptr_t) &_file_Pa51_vert_door_rightZ, + /*0x006f*/ (uintptr_t) &_file_Pa51_vert_door_stZ, + /*0x0070*/ (uintptr_t) &_file_Pa51boardZ, + /*0x0071*/ (uintptr_t) &_file_Pa51chairZ, + /*0x0072*/ (uintptr_t) &_file_Pa51deskentZ, + /*0x0073*/ (uintptr_t) &_file_Pa51divideZ, + /*0x0074*/ (uintptr_t) &_file_Pa51screenZ, + /*0x0075*/ (uintptr_t) &_file_Pa51tableZ, + /*0x0076*/ (uintptr_t) &_file_Pa51trolleyZ, + /*0x0077*/ (uintptr_t) &_file_Pa51wastebinZ, + /*0x0078*/ (uintptr_t) &_file_Paivillabot1Z, + /*0x0079*/ (uintptr_t) &_file_Paivillabot2Z, + /*0x007a*/ (uintptr_t) &_file_Paivillabot3Z, + /*0x007b*/ (uintptr_t) &_file_Paivilladoor1Z, + /*0x007c*/ (uintptr_t) &_file_Paivilladoor2aZ, + /*0x007d*/ (uintptr_t) &_file_Paivilladoor4Z, + /*0x007e*/ (uintptr_t) &_file_PaivillawindmillZ, + /*0x007f*/ (uintptr_t) &_file_Pal_airlockZ, + /*0x0080*/ (uintptr_t) &_file_Pal_dockliftZ, + /*0x0081*/ (uintptr_t) &_file_Paldoor_lZ, + /*0x0082*/ (uintptr_t) &_file_Paldoor_rZ, + /*0x0083*/ (uintptr_t) &_file_Pborg_crateZ, + /*0x0084*/ (uintptr_t) &_file_PcaseZ, + /*0x0085*/ (uintptr_t) &_file_Pch_shutter1Z, + /*0x0086*/ (uintptr_t) &_file_PchrbriefcaseZ, + /*0x0087*/ (uintptr_t) &_file_PchrbugZ, + /*0x0088*/ (uintptr_t) &_file_PchrdatathiefZ, + /*0x0089*/ (uintptr_t) &_file_Pcryptdoor1bZ, + /*0x008a*/ (uintptr_t) &_file_Pdd_ac_expZ, + /*0x008b*/ (uintptr_t) &_file_Pdd_ac_unexpZ, + /*0x008c*/ (uintptr_t) &_file_Pdd_acbot_expZ, + /*0x008d*/ (uintptr_t) &_file_Pdd_acbot_unexpZ, + /*0x008e*/ (uintptr_t) &_file_Pdd_bannerZ, + /*0x008f*/ (uintptr_t) &_file_Pdd_chairZ, + /*0x0090*/ (uintptr_t) &_file_Pdd_decodoorZ, + /*0x0091*/ (uintptr_t) &_file_Pdd_deskZ, + /*0x0092*/ (uintptr_t) &_file_Pdd_fanroofZ, + /*0x0093*/ (uintptr_t) &_file_Pdd_fanwallZ, + /*0x0094*/ (uintptr_t) &_file_Pdd_hovcabZ, + /*0x0095*/ (uintptr_t) &_file_Pdd_hovcarZ, + /*0x0096*/ (uintptr_t) &_file_Pdd_hovcopZ, + /*0x0097*/ (uintptr_t) &_file_Pdd_hovercopterZ, + /*0x0098*/ (uintptr_t) &_file_Pdd_hovmotoZ, + /*0x0099*/ (uintptr_t) &_file_Pdd_hovtruckZ, + /*0x009a*/ (uintptr_t) &_file_Pdd_lab_cautionZ, + /*0x009b*/ (uintptr_t) &_file_Pdd_lab_cautiontopZ, + /*0x009c*/ (uintptr_t) &_file_Pdd_lab_door_bsZ, + /*0x009d*/ (uintptr_t) &_file_Pdd_lab_door_secZ, + /*0x009e*/ (uintptr_t) &_file_Pdd_lab_door_windZ, + /*0x009f*/ (uintptr_t) &_file_Pdd_lab_hazardZ, + /*0x00a0*/ (uintptr_t) &_file_Pdd_lab_restrictedZ, + /*0x00a1*/ (uintptr_t) &_file_Pdd_lab_sector2botZ, + /*0x00a2*/ (uintptr_t) &_file_Pdd_lab_sector2topZ, + /*0x00a3*/ (uintptr_t) &_file_Pdd_lab_sector3Z, + /*0x00a4*/ (uintptr_t) &_file_Pdd_lab_sector3topZ, + /*0x00a5*/ (uintptr_t) &_file_Pdd_lab_sector3windZ, + /*0x00a6*/ (uintptr_t) &_file_Pdd_lab_sector4topZ, + /*0x00a7*/ (uintptr_t) &_file_Pdd_liftdoorZ, + /*0x00a8*/ (uintptr_t) &_file_Pdd_liftrZ, + /*0x00a9*/ (uintptr_t) &_file_Pdd_officedoorZ, + /*0x00aa*/ (uintptr_t) &_file_Pdd_plantrubberZ, + /*0x00ab*/ (uintptr_t) &_file_Pdd_plantspiderZ, + /*0x00ac*/ (uintptr_t) &_file_Pdd_plantspikeZ, + /*0x00ad*/ (uintptr_t) &_file_Pdd_redarmZ, + /*0x00ae*/ (uintptr_t) &_file_Pdd_redsofaZ, + /*0x00af*/ (uintptr_t) &_file_Pdd_secretdoorZ, + /*0x00b0*/ (uintptr_t) &_file_Pdd_secretdoor2Z, + /*0x00b1*/ (uintptr_t) &_file_Pdd_servicedoorZ, + /*0x00b2*/ (uintptr_t) &_file_Pdd_stonedeskZ, + /*0x00b3*/ (uintptr_t) &_file_Pdd_vertblindZ, + /*0x00b4*/ (uintptr_t) &_file_Pdd_winddoorZ, + /*0x00b5*/ (uintptr_t) &_file_Pdd_windowZ, + /*0x00b6*/ (uintptr_t) &_file_PddjumpshipZ, + /*0x00b7*/ (uintptr_t) &_file_Pdoor1a_G5Z, + /*0x00b8*/ (uintptr_t) &_file_Pdoor1atri_G5Z, + /*0x00b9*/ (uintptr_t) &_file_Pdoor1b_G5Z, + /*0x00ba*/ (uintptr_t) &_file_Pdoor2_G5Z, + /*0x00bb*/ (uintptr_t) &_file_Pdoor2a_G5Z, + /*0x00bc*/ (uintptr_t) &_file_Pdoor4a_G5Z, + /*0x00bd*/ (uintptr_t) &_file_Pdoor4b_G5Z, + /*0x00be*/ (uintptr_t) &_file_Pdoor_rollertrainZ, + /*0x00bf*/ (uintptr_t) &_file_PdoorconsoleZ, + /*0x00c0*/ (uintptr_t) &_file_Pdr_caroll_doorZ, + /*0x00c1*/ (uintptr_t) &_file_Pdr_caroll_door_baseZ, + /*0x00c2*/ (uintptr_t) &_file_Pdr_caroll_door_bleftZ, + /*0x00c3*/ (uintptr_t) &_file_Pdr_caroll_door_bmainZ, + /*0x00c4*/ (uintptr_t) &_file_Pdr_caroll_door_brightZ, + /*0x00c5*/ (uintptr_t) &_file_Pdr_caroll_door_leftZ, + /*0x00c6*/ (uintptr_t) &_file_Pdr_caroll_door_mainZ, + /*0x00c7*/ (uintptr_t) &_file_Pdr_caroll_door_rightZ, + /*0x00c8*/ (uintptr_t) &_file_PdropshipZ, + /*0x00c9*/ (uintptr_t) &_file_PdumpsterZ, + /*0x00ca*/ (uintptr_t) &_file_PexplosionbitZ, + /*0x00cb*/ (uintptr_t) &_file_PflagZ, + /*0x00cc*/ (uintptr_t) &_file_Pg5_escdoordownZ, + /*0x00cd*/ (uintptr_t) &_file_Pg5_escdoordownboomZ, + /*0x00ce*/ (uintptr_t) &_file_Pg5_escdoorupZ, + /*0x00cf*/ (uintptr_t) &_file_Pg5_escdoorupboomZ, + /*0x00d0*/ (uintptr_t) &_file_Pg5_mainframeZ, + /*0x00d1*/ (uintptr_t) &_file_Pg5safedoorZ, + /*0x00d2*/ (uintptr_t) &_file_Pg5carliftdoorZ, + /*0x00d3*/ (uintptr_t) &_file_PgoldeneyelogoZ, + /*0x00d4*/ (uintptr_t) &_file_PhooverbotZ, + /*0x00d5*/ (uintptr_t) &_file_PhovbikeZ, + /*0x00d6*/ (uintptr_t) &_file_PhoverbedZ, + /*0x00d7*/ (uintptr_t) &_file_Phovercrate1Z, + /*0x00d8*/ (uintptr_t) &_file_PlasdoorZ, + /*0x00d9*/ (uintptr_t) &_file_PmarkerZ, + /*0x00da*/ (uintptr_t) &_file_Pmedlabwin1Z, + /*0x00db*/ (uintptr_t) &_file_Pmedlabwin2Z, + /*0x00dc*/ (uintptr_t) &_file_PmodemboxZ, + /*0x00dd*/ (uintptr_t) &_file_PnintendologoZ, + /*0x00de*/ (uintptr_t) &_file_Pnlogo2Z, + /*0x00df*/ (uintptr_t) &_file_Pnlogo3Z, + /*0x00e0*/ (uintptr_t) &_file_PnlogoZ, + /*0x00e1*/ (uintptr_t) &_file_Ppc1Z, + /*0x00e2*/ (uintptr_t) &_file_PpdfourZ, + /*0x00e3*/ (uintptr_t) &_file_PpdoneZ, + /*0x00e4*/ (uintptr_t) &_file_PpdthreeZ, + /*0x00e5*/ (uintptr_t) &_file_PpdtwoZ, + /*0x00e6*/ (uintptr_t) &_file_PperfectdarkZ, + /*0x00e7*/ (uintptr_t) &_file_PpolicecarZ, + /*0x00e8*/ (uintptr_t) &_file_PravineliftZ, + /*0x00e9*/ (uintptr_t) &_file_PropeZ, + /*0x00ea*/ (uintptr_t) &_file_Psk_cryopod1_botZ, + /*0x00eb*/ (uintptr_t) &_file_Psk_cryopod1_topZ, + /*0x00ec*/ (uintptr_t) &_file_Psk_door1Z, + /*0x00ed*/ (uintptr_t) &_file_Psk_fighter1Z, + /*0x00ee*/ (uintptr_t) &_file_Psk_hangardoor_botZ, + /*0x00ef*/ (uintptr_t) &_file_Psk_hangardoor_topZ, + /*0x00f0*/ (uintptr_t) &_file_Psk_ship_door1Z, + /*0x00f1*/ (uintptr_t) &_file_Psk_ship_holo1Z, + /*0x00f2*/ (uintptr_t) &_file_Psk_ship_holo2Z, + /*0x00f3*/ (uintptr_t) &_file_Psk_ship_hulldoor1Z, + /*0x00f4*/ (uintptr_t) &_file_Psk_ship_hulldoor2Z, + /*0x00f5*/ (uintptr_t) &_file_Psk_ship_hulldoor3Z, + /*0x00f6*/ (uintptr_t) &_file_Psk_ship_hulldoor4Z, + /*0x00f7*/ (uintptr_t) &_file_Psk_under_generatorZ, + /*0x00f8*/ (uintptr_t) &_file_Psk_under_transZ, + /*0x00f9*/ (uintptr_t) &_file_Pskcrev_exp1Z, + /*0x00fa*/ (uintptr_t) &_file_Pskcrev_unexp1Z, + /*0x00fb*/ (uintptr_t) &_file_Psktnl_exp1Z, + /*0x00fc*/ (uintptr_t) &_file_Psktnl_unexp1Z, + /*0x00fd*/ (uintptr_t) &_file_PtaxicabZ, + /*0x00fe*/ (uintptr_t) &_file_PtesterbotZ, + /*0x00ff*/ (uintptr_t) &_file_PtestobjZ, + /*0x0100*/ (uintptr_t) &_file_PtvscreenZ, + /*0x0101*/ (uintptr_t) &_file_PwindowZ, + /*0x0102*/ (uintptr_t) &_file_Ump_setupameZ, + /*0x0103*/ (uintptr_t) &_file_Ump_setuparchZ, + /*0x0104*/ (uintptr_t) &_file_Ump_setuparecZ, + /*0x0105*/ (uintptr_t) &_file_Ump_setuparkZ, + /*0x0106*/ (uintptr_t) &_file_Ump_setupashZ, + /*0x0107*/ (uintptr_t) &_file_Ump_setupaztZ, + /*0x0108*/ (uintptr_t) &_file_Ump_setupcatZ, + /*0x0109*/ (uintptr_t) &_file_Ump_setupcaveZ, + /*0x010a*/ (uintptr_t) &_file_Ump_setupcradZ, + /*0x010b*/ (uintptr_t) &_file_Ump_setupcrypZ, + /*0x010c*/ (uintptr_t) &_file_Ump_setupdamZ, + /*0x010d*/ (uintptr_t) &_file_Ump_setupdepoZ, + /*0x010e*/ (uintptr_t) &_file_Ump_setupdestZ, + /*0x010f*/ (uintptr_t) &_file_Ump_setupdishZ, + /*0x0110*/ (uintptr_t) &_file_Ump_setupearZ, + /*0x0111*/ (uintptr_t) &_file_Ump_setupeldZ, + /*0x0112*/ (uintptr_t) &_file_Ump_setupimpZ, + /*0x0113*/ (uintptr_t) &_file_Ump_setupjunZ, + /*0x0114*/ (uintptr_t) &_file_Ump_setupleeZ, + /*0x0115*/ (uintptr_t) &_file_Ump_setuplenZ, + /*0x0116*/ (uintptr_t) &_file_Ump_setuplipZ, + /*0x0117*/ (uintptr_t) &_file_Ump_setuplueZ, + /*0x0118*/ (uintptr_t) &_file_Ump_setupoatZ, + /*0x0119*/ (uintptr_t) &_file_Ump_setuppamZ, + /*0x011a*/ (uintptr_t) &_file_Ump_setuppeteZ, + /*0x011b*/ (uintptr_t) &_file_Ump_setuprefZ, + /*0x011c*/ (uintptr_t) &_file_Ump_setupritZ, + /*0x011d*/ (uintptr_t) &_file_Ump_setuprunZ, + /*0x011e*/ (uintptr_t) &_file_Ump_setupsevZ, + /*0x011f*/ (uintptr_t) &_file_Ump_setupsevbZ, + /*0x0120*/ (uintptr_t) &_file_Ump_setupsevxZ, + /*0x0121*/ (uintptr_t) &_file_Ump_setupshoZ, + /*0x0122*/ (uintptr_t) &_file_Ump_setupsiloZ, + /*0x0123*/ (uintptr_t) &_file_Ump_setupstatZ, + /*0x0124*/ (uintptr_t) &_file_Ump_setuptraZ, + /*0x0125*/ (uintptr_t) &_file_Ump_setupwaxZ, + /*0x0126*/ (uintptr_t) &_file_UsetupameZ, + /*0x0127*/ (uintptr_t) &_file_UsetuparchZ, + /*0x0128*/ (uintptr_t) &_file_UsetuparecZ, + /*0x0129*/ (uintptr_t) &_file_UsetuparkZ, + /*0x012a*/ (uintptr_t) &_file_UsetupashZ, + /*0x012b*/ (uintptr_t) &_file_UsetupaztZ, + /*0x012c*/ (uintptr_t) &_file_UsetupcatZ, + /*0x012d*/ (uintptr_t) &_file_UsetupcaveZ, + /*0x012e*/ (uintptr_t) &_file_UsetupcradZ, + /*0x012f*/ (uintptr_t) &_file_UsetupcrypZ, + /*0x0130*/ (uintptr_t) &_file_UsetupdamZ, + /*0x0131*/ (uintptr_t) &_file_UsetupdepoZ, + /*0x0132*/ (uintptr_t) &_file_UsetupdestZ, + /*0x0133*/ (uintptr_t) &_file_UsetupdishZ, + /*0x0134*/ (uintptr_t) &_file_UsetupearZ, + /*0x0135*/ (uintptr_t) &_file_UsetupeldZ, + /*0x0136*/ (uintptr_t) &_file_UsetupimpZ, + /*0x0137*/ (uintptr_t) &_file_UsetupjunZ, + /*0x0138*/ (uintptr_t) &_file_UsetupleeZ, + /*0x0139*/ (uintptr_t) &_file_UsetuplenZ, + /*0x013a*/ (uintptr_t) &_file_UsetuplipZ, + /*0x013b*/ (uintptr_t) &_file_UsetuplueZ, + /*0x013c*/ (uintptr_t) &_file_UsetupoatZ, + /*0x013d*/ (uintptr_t) &_file_UsetuppamZ, + /*0x013e*/ (uintptr_t) &_file_UsetuppeteZ, + /*0x013f*/ (uintptr_t) &_file_UsetuprefZ, + /*0x0140*/ (uintptr_t) &_file_UsetupritZ, + /*0x0141*/ (uintptr_t) &_file_UsetuprunZ, + /*0x0142*/ (uintptr_t) &_file_UsetupsevZ, + /*0x0143*/ (uintptr_t) &_file_UsetupsevbZ, + /*0x0144*/ (uintptr_t) &_file_UsetupsevxZ, + /*0x0145*/ (uintptr_t) &_file_UsetupsevxbZ, + /*0x0146*/ (uintptr_t) &_file_UsetupshoZ, + /*0x0147*/ (uintptr_t) &_file_UsetupsiloZ, + /*0x0148*/ (uintptr_t) &_file_UsetupstatZ, + /*0x0149*/ (uintptr_t) &_file_UsetuptraZ, + /*0x014a*/ (uintptr_t) &_file_UsetupwaxZ, + /*0x014b*/ (uintptr_t) &_file_bg_ame_padsZ, + /*0x014c*/ (uintptr_t) &_file_bg_ame_tilesZ, + /*0x014d*/ (uintptr_t) &_file_bg_arch_padsZ, + /*0x014e*/ (uintptr_t) &_file_bg_arch_tilesZ, + /*0x014f*/ (uintptr_t) &_file_bg_arec_padsZ, + /*0x0150*/ (uintptr_t) &_file_bg_arec_tilesZ, + /*0x0151*/ (uintptr_t) &_file_bg_ark_padsZ, + /*0x0152*/ (uintptr_t) &_file_bg_ark_tilesZ, + /*0x0153*/ (uintptr_t) &_file_bg_ash_padsZ, + /*0x0154*/ (uintptr_t) &_file_bg_ash_tilesZ, + /*0x0155*/ (uintptr_t) &_file_bg_azt_padsZ, + /*0x0156*/ (uintptr_t) &_file_bg_azt_tilesZ, + /*0x0157*/ (uintptr_t) &_file_bg_cat_padsZ, + /*0x0158*/ (uintptr_t) &_file_bg_cat_tilesZ, + /*0x0159*/ (uintptr_t) &_file_bg_cave_padsZ, + /*0x015a*/ (uintptr_t) &_file_bg_cave_tilesZ, + /*0x015b*/ (uintptr_t) &_file_bg_crad_padsZ, + /*0x015c*/ (uintptr_t) &_file_bg_crad_tilesZ, + /*0x015d*/ (uintptr_t) &_file_bg_cryp_padsZ, + /*0x015e*/ (uintptr_t) &_file_bg_cryp_tilesZ, + /*0x015f*/ (uintptr_t) &_file_bg_dam_padsZ, + /*0x0160*/ (uintptr_t) &_file_bg_dam_tilesZ, + /*0x0161*/ (uintptr_t) &_file_bg_depo_padsZ, + /*0x0162*/ (uintptr_t) &_file_bg_depo_tilesZ, + /*0x0163*/ (uintptr_t) &_file_bg_dest_padsZ, + /*0x0164*/ (uintptr_t) &_file_bg_dest_tilesZ, + /*0x0165*/ (uintptr_t) &_file_bg_dish_padsZ, + /*0x0166*/ (uintptr_t) &_file_bg_dish_tilesZ, + /*0x0167*/ (uintptr_t) &_file_bg_ear_padsZ, + /*0x0168*/ (uintptr_t) &_file_bg_ear_tilesZ, + /*0x0169*/ (uintptr_t) &_file_bg_eld_padsZ, + /*0x016a*/ (uintptr_t) &_file_bg_eld_tilesZ, + /*0x016b*/ (uintptr_t) &_file_bg_imp_padsZ, + /*0x016c*/ (uintptr_t) &_file_bg_imp_tilesZ, + /*0x016d*/ (uintptr_t) &_file_bg_jun_padsZ, + /*0x016e*/ (uintptr_t) &_file_bg_jun_tilesZ, + /*0x016f*/ (uintptr_t) &_file_bg_lee_padsZ, + /*0x0170*/ (uintptr_t) &_file_bg_lee_tilesZ, + /*0x0171*/ (uintptr_t) &_file_bg_len_padsZ, + /*0x0172*/ (uintptr_t) &_file_bg_len_tilesZ, + /*0x0173*/ (uintptr_t) &_file_bg_lip_padsZ, + /*0x0174*/ (uintptr_t) &_file_bg_lip_tilesZ, + /*0x0175*/ (uintptr_t) &_file_bg_lue_padsZ, + /*0x0176*/ (uintptr_t) &_file_bg_lue_tilesZ, + /*0x0177*/ (uintptr_t) &_file_bg_oat_padsZ, + /*0x0178*/ (uintptr_t) &_file_bg_oat_tilesZ, + /*0x0179*/ (uintptr_t) &_file_bg_pam_padsZ, + /*0x017a*/ (uintptr_t) &_file_bg_pam_tilesZ, + /*0x017b*/ (uintptr_t) &_file_bg_pete_padsZ, + /*0x017c*/ (uintptr_t) &_file_bg_pete_tilesZ, + /*0x017d*/ (uintptr_t) &_file_bg_ref_padsZ, + /*0x017e*/ (uintptr_t) &_file_bg_ref_tilesZ, + /*0x017f*/ (uintptr_t) &_file_bg_rit_padsZ, + /*0x0180*/ (uintptr_t) &_file_bg_rit_tilesZ, + /*0x0181*/ (uintptr_t) &_file_bg_run_padsZ, + /*0x0182*/ (uintptr_t) &_file_bg_run_tilesZ, + /*0x0183*/ (uintptr_t) &_file_bg_sev_padsZ, + /*0x0184*/ (uintptr_t) &_file_bg_sev_tilesZ, + /*0x0185*/ (uintptr_t) &_file_bg_sevb_padsZ, + /*0x0186*/ (uintptr_t) &_file_bg_sevb_tilesZ, + /*0x0187*/ (uintptr_t) &_file_bg_sevx_padsZ, + /*0x0188*/ (uintptr_t) &_file_bg_sevx_tilesZ, + /*0x0189*/ (uintptr_t) &_file_bg_sho_padsZ, + /*0x018a*/ (uintptr_t) &_file_bg_sho_tilesZ, + /*0x018b*/ (uintptr_t) &_file_bg_silo_padsZ, + /*0x018c*/ (uintptr_t) &_file_bg_silo_tilesZ, + /*0x018d*/ (uintptr_t) &_file_bg_stat_padsZ, + /*0x018e*/ (uintptr_t) &_file_bg_stat_tilesZ, + /*0x018f*/ (uintptr_t) &_file_bg_tra_padsZ, + /*0x0190*/ (uintptr_t) &_file_bg_tra_tilesZ, + /*0x0191*/ (uintptr_t) &_file_bg_wax_padsZ, + /*0x0192*/ (uintptr_t) &_file_bg_wax_tilesZ, + /*0x0193*/ (uintptr_t) &_file_GtestgunZ, + /*0x0194*/ (uintptr_t) &_file_Cdd_labtechZ, + /*0x0195*/ (uintptr_t) &_file_Pcctv_pdZ, + /*0x0196*/ (uintptr_t) &_file_PcomhubZ, + /*0x0197*/ (uintptr_t) &_file_PquadpodZ, + /*0x0198*/ (uintptr_t) &_file_Ppd_consoleZ, + /*0x0199*/ (uintptr_t) &_file_CconneryZ, + /*0x019a*/ (uintptr_t) &_file_CmooreZ, + /*0x019b*/ (uintptr_t) &_file_CdaltonZ, + /*0x019c*/ (uintptr_t) &_file_Cheaddark_combatZ, + /*0x019d*/ (uintptr_t) &_file_CheadelvisZ, + /*0x019e*/ (uintptr_t) &_file_CheadrossZ, + /*0x019f*/ (uintptr_t) &_file_CheadcarringtonZ, + /*0x01a0*/ (uintptr_t) &_file_CheadmrblondeZ, + /*0x01a1*/ (uintptr_t) &_file_CheadtrentZ, + /*0x01a2*/ (uintptr_t) &_file_CheadddshockZ, + /*0x01a3*/ (uintptr_t) &_file_CheadgrahamZ, + /*0x01a4*/ (uintptr_t) &_file_Cheaddark_frockZ, + /*0x01a5*/ (uintptr_t) &_file_CheadsecretaryZ, + /*0x01a6*/ (uintptr_t) &_file_CheadcassandraZ, + /*0x01a7*/ (uintptr_t) &_file_CheadthekingZ, + /*0x01a8*/ (uintptr_t) &_file_Cheadfem_guardZ, + /*0x01a9*/ (uintptr_t) &_file_CheadjonZ, + /*0x01aa*/ (uintptr_t) &_file_Plift_platformZ, + /*0x01ab*/ (uintptr_t) &_file_Pdd_grateZ, + /*0x01ac*/ (uintptr_t) &_file_PlightswitchZ, + /*0x01ad*/ (uintptr_t) &_file_PblastshieldZ, + /*0x01ae*/ (uintptr_t) &_file_Plightswitch2Z, + /*0x01af*/ (uintptr_t) &_file_Pdd_accessdoorupZ, + /*0x01b0*/ (uintptr_t) &_file_Pdd_accessdoordnZ, + /*0x01b1*/ (uintptr_t) &_file_Cdark_rippedZ, + /*0x01b2*/ (uintptr_t) &_file_Cheadmark2Z, + /*0x01b3*/ (uintptr_t) &_file_CheadchristZ, + /*0x01b4*/ (uintptr_t) &_file_Plab_containerZ, + /*0x01b5*/ (uintptr_t) &_file_Plab_chairZ, + /*0x01b6*/ (uintptr_t) &_file_Plab_tableZ, + /*0x01b7*/ (uintptr_t) &_file_Plab_microscopeZ, + /*0x01b8*/ (uintptr_t) &_file_Plab_mainframeZ, + /*0x01b9*/ (uintptr_t) &_file_Pdd_labdoorZ, + /*0x01ba*/ (uintptr_t) &_file_Pdd_lab_doortopZ, + /*0x01bb*/ (uintptr_t) &_file_Pmulti_ammo_crateZ, + /*0x01bc*/ (uintptr_t) &_file_CheadrussZ, + /*0x01bd*/ (uintptr_t) &_file_CheadgreyZ, + /*0x01be*/ (uintptr_t) &_file_CheaddarlingZ, + /*0x01bf*/ (uintptr_t) &_file_Cdd_guardZ, + /*0x01c0*/ (uintptr_t) &_file_CheadrobertZ, + /*0x01c1*/ (uintptr_t) &_file_Cdd_shockZ, + /*0x01c2*/ (uintptr_t) &_file_CheadbeauZ, + /*0x01c3*/ (uintptr_t) &_file_PchrchainZ, + /*0x01c4*/ (uintptr_t) &_file_Cdd_shock_infZ, + /*0x01c5*/ (uintptr_t) &_file_Cheadfem_guard2Z, + /*0x01c6*/ (uintptr_t) &_file_ProofgunZ, + /*0x01c7*/ (uintptr_t) &_file_PtdoorZ, + /*0x01c8*/ (uintptr_t) &_file_CbiotechZ, + /*0x01c9*/ (uintptr_t) &_file_CfbiguyZ, + /*0x01ca*/ (uintptr_t) &_file_PgroundgunZ, + /*0x01cb*/ (uintptr_t) &_file_CciaguyZ, + /*0x01cc*/ (uintptr_t) &_file_Ca51trooperZ, + /*0x01cd*/ (uintptr_t) &_file_CheadbrianZ, + /*0x01ce*/ (uintptr_t) &_file_CheadjamieZ, + /*0x01cf*/ (uintptr_t) &_file_Cheadduncan2Z, + /*0x01d0*/ (uintptr_t) &_file_CheadbiotechZ, + /*0x01d1*/ (uintptr_t) &_file_UsetupuffZ, + /*0x01d2*/ (uintptr_t) &_file_Ump_setupuffZ, + /*0x01d3*/ (uintptr_t) &_file_bg_uff_padsZ, + /*0x01d4*/ (uintptr_t) &_file_bg_uff_tilesZ, + /*0x01d5*/ (uintptr_t) &_file_UsetupoldZ, + /*0x01d6*/ (uintptr_t) &_file_Ump_setupoldZ, + /*0x01d7*/ (uintptr_t) &_file_bg_old_padsZ, + /*0x01d8*/ (uintptr_t) &_file_bg_old_tilesZ, + /*0x01d9*/ (uintptr_t) &_file_UsetupateZ, + /*0x01da*/ (uintptr_t) &_file_Ump_setupateZ, + /*0x01db*/ (uintptr_t) &_file_bg_ate_padsZ, + /*0x01dc*/ (uintptr_t) &_file_bg_ate_tilesZ, + /*0x01dd*/ (uintptr_t) &_file_UsetuplamZ, + /*0x01de*/ (uintptr_t) &_file_Ump_setuplamZ, + /*0x01df*/ (uintptr_t) &_file_bg_lam_padsZ, + /*0x01e0*/ (uintptr_t) &_file_bg_lam_tilesZ, + /*0x01e1*/ (uintptr_t) &_file_Usetupmp1Z, + /*0x01e2*/ (uintptr_t) &_file_Ump_setupmp1Z, + /*0x01e3*/ (uintptr_t) &_file_bg_mp1_padsZ, + /*0x01e4*/ (uintptr_t) &_file_bg_mp1_tilesZ, + /*0x01e5*/ (uintptr_t) &_file_Usetupmp2Z, + /*0x01e6*/ (uintptr_t) &_file_Ump_setupmp2Z, + /*0x01e7*/ (uintptr_t) &_file_bg_mp2_padsZ, + /*0x01e8*/ (uintptr_t) &_file_bg_mp2_tilesZ, + /*0x01e9*/ (uintptr_t) &_file_Usetupmp3Z, + /*0x01ea*/ (uintptr_t) &_file_Ump_setupmp3Z, + /*0x01eb*/ (uintptr_t) &_file_bg_mp3_padsZ, + /*0x01ec*/ (uintptr_t) &_file_bg_mp3_tilesZ, + /*0x01ed*/ (uintptr_t) &_file_Usetupmp4Z, + /*0x01ee*/ (uintptr_t) &_file_Ump_setupmp4Z, + /*0x01ef*/ (uintptr_t) &_file_bg_mp4_padsZ, + /*0x01f0*/ (uintptr_t) &_file_bg_mp4_tilesZ, + /*0x01f1*/ (uintptr_t) &_file_Usetupmp5Z, + /*0x01f2*/ (uintptr_t) &_file_Ump_setupmp5Z, + /*0x01f3*/ (uintptr_t) &_file_bg_mp5_padsZ, + /*0x01f4*/ (uintptr_t) &_file_bg_mp5_tilesZ, + /*0x01f5*/ (uintptr_t) &_file_Usetupmp6Z, + /*0x01f6*/ (uintptr_t) &_file_Ump_setupmp6Z, + /*0x01f7*/ (uintptr_t) &_file_bg_mp6_padsZ, + /*0x01f8*/ (uintptr_t) &_file_bg_mp6_tilesZ, + /*0x01f9*/ (uintptr_t) &_file_Usetupmp7Z, + /*0x01fa*/ (uintptr_t) &_file_Ump_setupmp7Z, + /*0x01fb*/ (uintptr_t) &_file_bg_mp7_padsZ, + /*0x01fc*/ (uintptr_t) &_file_bg_mp7_tilesZ, + /*0x01fd*/ (uintptr_t) &_file_Usetupmp8Z, + /*0x01fe*/ (uintptr_t) &_file_Ump_setupmp8Z, + /*0x01ff*/ (uintptr_t) &_file_bg_mp8_padsZ, + /*0x0200*/ (uintptr_t) &_file_bg_mp8_tilesZ, + /*0x0201*/ (uintptr_t) &_file_Usetupmp9Z, + /*0x0202*/ (uintptr_t) &_file_Ump_setupmp9Z, + /*0x0203*/ (uintptr_t) &_file_bg_mp9_padsZ, + /*0x0204*/ (uintptr_t) &_file_bg_mp9_tilesZ, + /*0x0205*/ (uintptr_t) &_file_Usetupmp10Z, + /*0x0206*/ (uintptr_t) &_file_Ump_setupmp10Z, + /*0x0207*/ (uintptr_t) &_file_bg_mp10_padsZ, + /*0x0208*/ (uintptr_t) &_file_bg_mp10_tilesZ, + /*0x0209*/ (uintptr_t) &_file_Usetupmp11Z, + /*0x020a*/ (uintptr_t) &_file_Ump_setupmp11Z, + /*0x020b*/ (uintptr_t) &_file_bg_mp11_padsZ, + /*0x020c*/ (uintptr_t) &_file_bg_mp11_tilesZ, + /*0x020d*/ (uintptr_t) &_file_Usetupmp12Z, + /*0x020e*/ (uintptr_t) &_file_Ump_setupmp12Z, + /*0x020f*/ (uintptr_t) &_file_bg_mp12_padsZ, + /*0x0210*/ (uintptr_t) &_file_bg_mp12_tilesZ, + /*0x0211*/ (uintptr_t) &_file_Usetupmp13Z, + /*0x0212*/ (uintptr_t) &_file_Ump_setupmp13Z, + /*0x0213*/ (uintptr_t) &_file_bg_mp13_padsZ, + /*0x0214*/ (uintptr_t) &_file_bg_mp13_tilesZ, + /*0x0215*/ (uintptr_t) &_file_Usetupmp14Z, + /*0x0216*/ (uintptr_t) &_file_Ump_setupmp14Z, + /*0x0217*/ (uintptr_t) &_file_bg_mp14_padsZ, + /*0x0218*/ (uintptr_t) &_file_bg_mp14_tilesZ, + /*0x0219*/ (uintptr_t) &_file_Usetupmp15Z, + /*0x021a*/ (uintptr_t) &_file_Ump_setupmp15Z, + /*0x021b*/ (uintptr_t) &_file_bg_mp15_padsZ, + /*0x021c*/ (uintptr_t) &_file_bg_mp15_tilesZ, + /*0x021d*/ (uintptr_t) &_file_Usetupmp16Z, + /*0x021e*/ (uintptr_t) &_file_Ump_setupmp16Z, + /*0x021f*/ (uintptr_t) &_file_bg_mp16_padsZ, + /*0x0220*/ (uintptr_t) &_file_bg_mp16_tilesZ, + /*0x0221*/ (uintptr_t) &_file_Usetupmp17Z, + /*0x0222*/ (uintptr_t) &_file_Ump_setupmp17Z, + /*0x0223*/ (uintptr_t) &_file_bg_mp17_padsZ, + /*0x0224*/ (uintptr_t) &_file_bg_mp17_tilesZ, + /*0x0225*/ (uintptr_t) &_file_Usetupmp18Z, + /*0x0226*/ (uintptr_t) &_file_Ump_setupmp18Z, + /*0x0227*/ (uintptr_t) &_file_bg_mp18_padsZ, + /*0x0228*/ (uintptr_t) &_file_bg_mp18_tilesZ, + /*0x0229*/ (uintptr_t) &_file_Usetupmp19Z, + /*0x022a*/ (uintptr_t) &_file_Ump_setupmp19Z, + /*0x022b*/ (uintptr_t) &_file_bg_mp19_padsZ, + /*0x022c*/ (uintptr_t) &_file_bg_mp19_tilesZ, + /*0x022d*/ (uintptr_t) &_file_Usetupmp20Z, + /*0x022e*/ (uintptr_t) &_file_Ump_setupmp20Z, + /*0x022f*/ (uintptr_t) &_file_bg_mp20_padsZ, + /*0x0230*/ (uintptr_t) &_file_bg_mp20_tilesZ, + /*0x0231*/ (uintptr_t) &_file_Ca51airmanZ, + /*0x0232*/ (uintptr_t) &_file_Cheadneil2Z, + /*0x0233*/ (uintptr_t) &_file_Pci_sofaZ, + /*0x0234*/ (uintptr_t) &_file_Pci_liftZ, + /*0x0235*/ (uintptr_t) &_file_Pci_liftdoorZ, + /*0x0236*/ (uintptr_t) &_file_CchicrobZ, + /*0x0237*/ (uintptr_t) &_file_CstewardZ, + /*0x0238*/ (uintptr_t) &_file_CheadedmcgZ, + /*0x0239*/ (uintptr_t) &_file_CstewardessZ, + /*0x023a*/ (uintptr_t) &_file_CheadankaZ, + /*0x023b*/ (uintptr_t) &_file_CpresidentZ, + /*0x023c*/ (uintptr_t) &_file_Cstewardess_coatZ, + /*0x023d*/ (uintptr_t) &_file_Cheadleslie_sZ, + /*0x023e*/ (uintptr_t) &_file_PlasercutZ, + /*0x023f*/ (uintptr_t) &_file_Psk_shuttleZ, + /*0x0240*/ (uintptr_t) &_file_CminiskedarZ, + /*0x0241*/ (uintptr_t) &_file_PnewvilladoorZ, + /*0x0242*/ (uintptr_t) &_file_Cnsa_lackeyZ, + /*0x0243*/ (uintptr_t) &_file_Cheadmatt_cZ, + /*0x0244*/ (uintptr_t) &_file_Cpres_securityZ, + /*0x0245*/ (uintptr_t) &_file_Cheadpeer_sZ, + /*0x0246*/ (uintptr_t) &_file_CnegotiatorZ, + /*0x0247*/ (uintptr_t) &_file_Cheadeileen_tZ, + /*0x0248*/ (uintptr_t) &_file_Psk_pillarleftZ, + /*0x0249*/ (uintptr_t) &_file_Psk_pillarrightZ, + /*0x024a*/ (uintptr_t) &_file_Psk_plinth_tZ, + /*0x024b*/ (uintptr_t) &_file_Psk_plinth_mlZ, + /*0x024c*/ (uintptr_t) &_file_Psk_plinth_mrZ, + /*0x024d*/ (uintptr_t) &_file_Psk_plinth_blZ, + /*0x024e*/ (uintptr_t) &_file_Psk_plinth_brZ, + /*0x024f*/ (uintptr_t) &_file_Psk_fl_shad_tZ, + /*0x0250*/ (uintptr_t) &_file_Psk_fl_shad_mlZ, + /*0x0251*/ (uintptr_t) &_file_Psk_fl_shad_mrZ, + /*0x0252*/ (uintptr_t) &_file_Psk_fl_shad_blZ, + /*0x0253*/ (uintptr_t) &_file_Psk_fl_shad_brZ, + /*0x0254*/ (uintptr_t) &_file_Psk_fl_noshad_tZ, + /*0x0255*/ (uintptr_t) &_file_Psk_fl_noshad_mlZ, + /*0x0256*/ (uintptr_t) &_file_Psk_fl_noshad_mrZ, + /*0x0257*/ (uintptr_t) &_file_Psk_fl_noshad_blZ, + /*0x0258*/ (uintptr_t) &_file_Psk_fl_noshad_brZ, + /*0x0259*/ (uintptr_t) &_file_GhudpieceZ, + /*0x025a*/ (uintptr_t) &_file_Psk_templecolumn1Z, + /*0x025b*/ (uintptr_t) &_file_Psk_templecolumn2Z, + /*0x025c*/ (uintptr_t) &_file_Psk_templecolumn3Z, + /*0x025d*/ (uintptr_t) &_file_Psk_sunshad1Z, + /*0x025e*/ (uintptr_t) &_file_Psk_sunshad2Z, + /*0x025f*/ (uintptr_t) &_file_Psk_sunnoshad1Z, + /*0x0260*/ (uintptr_t) &_file_Psk_sunnoshad2Z, + /*0x0261*/ (uintptr_t) &_file_Cg5_guardZ, + /*0x0262*/ (uintptr_t) &_file_Cheadandy_rZ, + /*0x0263*/ (uintptr_t) &_file_Cpelagic_guardZ, + /*0x0264*/ (uintptr_t) &_file_Cg5_swat_guardZ, + /*0x0265*/ (uintptr_t) &_file_Calaskan_guardZ, + /*0x0266*/ (uintptr_t) &_file_Cmaian_soldierZ, + /*0x0267*/ (uintptr_t) &_file_Cheadben_rZ, + /*0x0268*/ (uintptr_t) &_file_Cheadsteve_kZ, + /*0x0269*/ (uintptr_t) &_file_PbarrelZ, + /*0x026a*/ (uintptr_t) &_file_Pglass_floorZ, + /*0x026b*/ (uintptr_t) &_file_Pesca_stepZ, + /*0x026c*/ (uintptr_t) &_file_Pmatrix_liftZ, + /*0x026d*/ (uintptr_t) &_file_Prubble1Z, + /*0x026e*/ (uintptr_t) &_file_Prubble2Z, + /*0x026f*/ (uintptr_t) &_file_Prubble3Z, + /*0x0270*/ (uintptr_t) &_file_Prubble4Z, + /*0x0271*/ (uintptr_t) &_file_Arecep01M, + /*0x0272*/ (uintptr_t) &_file_Arecep02M, + /*0x0273*/ (uintptr_t) &_file_Arecep03M, + /*0x0274*/ (uintptr_t) &_file_Arecep04M, + /*0x0275*/ (uintptr_t) &_file_Arecep05M, + /*0x0276*/ (uintptr_t) &_file_Arecep06M, + /*0x0277*/ (uintptr_t) &_file_Arlguard1M, + /*0x0278*/ (uintptr_t) &_file_Arltech01M, + /*0x0279*/ (uintptr_t) &_file_Arltech02M, + /*0x027a*/ (uintptr_t) &_file_Arltech03M, + /*0x027b*/ (uintptr_t) &_file_Arltech04M, + /*0x027c*/ (uintptr_t) &_file_Arltech05M, + /*0x027d*/ (uintptr_t) &_file_Arltech06M, + /*0x027e*/ (uintptr_t) &_file_Ascie2aM, + /*0x027f*/ (uintptr_t) &_file_Ascie2bM, + /*0x0280*/ (uintptr_t) &_file_Ascie2cM, + /*0x0281*/ (uintptr_t) &_file_Ascie2dM, + /*0x0282*/ (uintptr_t) &_file_Ascie2eM, + /*0x0283*/ (uintptr_t) &_file_Ascie2fM, + /*0x0284*/ (uintptr_t) &_file_Ascie2gM, + /*0x0285*/ (uintptr_t) &_file_Ascie3aM, + /*0x0286*/ (uintptr_t) &_file_Ascie3bM, + /*0x0287*/ (uintptr_t) &_file_Ascie3cM, + /*0x0288*/ (uintptr_t) &_file_Ascie3dM, + /*0x0289*/ (uintptr_t) &_file_Ascie3eM, + /*0x028a*/ (uintptr_t) &_file_Ascie3gM, + /*0x028b*/ (uintptr_t) &_file_Ascien10aM, + /*0x028c*/ (uintptr_t) &_file_Ascien2_aM, + /*0x028d*/ (uintptr_t) &_file_Ascien3_aM, + /*0x028e*/ (uintptr_t) &_file_Ascien4_aM, + /*0x028f*/ (uintptr_t) &_file_Ascien5_aM, + /*0x0290*/ (uintptr_t) &_file_Ascien6_aM, + /*0x0291*/ (uintptr_t) &_file_Ascien7_aM, + /*0x0292*/ (uintptr_t) &_file_Ascien9_aM, + /*0x0293*/ (uintptr_t) &_file_AvilgrimM, + /*0x0294*/ (uintptr_t) &_file_Awepgd01M, + /*0x0295*/ (uintptr_t) &_file_Awepgd02M, + /*0x0296*/ (uintptr_t) &_file_Awepgd03M, + /*0x0297*/ (uintptr_t) &_file_Awepsc01M, + /*0x0298*/ (uintptr_t) &_file_Awepsc02M, + /*0x0299*/ (uintptr_t) &_file_Awepsc03M, + /*0x029a*/ (uintptr_t) &_file_Aa51elv01M, + /*0x029b*/ (uintptr_t) &_file_Aa51elv02M, + /*0x029c*/ (uintptr_t) &_file_Aa51elv03M, + /*0x029d*/ (uintptr_t) &_file_Aa51grd01M, + /*0x029e*/ (uintptr_t) &_file_Aa51grd02M, + /*0x029f*/ (uintptr_t) &_file_Aa51grd03M, + /*0x02a0*/ (uintptr_t) &_file_Aa51grd04M, + /*0x02a1*/ (uintptr_t) &_file_Aa51grd05M, + /*0x02a2*/ (uintptr_t) &_file_Aa51grd06M, + /*0x02a3*/ (uintptr_t) &_file_Aa51grd07M, + /*0x02a4*/ (uintptr_t) &_file_Aa51grd08M, + /*0x02a5*/ (uintptr_t) &_file_Aa51grd09M, + /*0x02a6*/ (uintptr_t) &_file_Aa51grd10M, + /*0x02a7*/ (uintptr_t) &_file_Aa51jo1M, + /*0x02a8*/ (uintptr_t) &_file_Aa51jo2M, + /*0x02a9*/ (uintptr_t) &_file_Aa51jo3M, + /*0x02aa*/ (uintptr_t) &_file_Aa51jo4M, + /*0x02ab*/ (uintptr_t) &_file_Aa51jo5M, + /*0x02ac*/ (uintptr_t) &_file_Aa51jo6M, + /*0x02ad*/ (uintptr_t) &_file_Aa51jon01M, + /*0x02ae*/ (uintptr_t) &_file_Aa51jon02M, + /*0x02af*/ (uintptr_t) &_file_Aa51jon03M, + /*0x02b0*/ (uintptr_t) &_file_Aa51jon04M, + /*0x02b1*/ (uintptr_t) &_file_Aa51jon05M, + /*0x02b2*/ (uintptr_t) &_file_Aa51jon06M, + /*0x02b3*/ (uintptr_t) &_file_Aa51jon07M, + /*0x02b4*/ (uintptr_t) &_file_Aa51jon08M, + /*0x02b5*/ (uintptr_t) &_file_Aa51jon09M, + /*0x02b6*/ (uintptr_t) &_file_Aa51jon10M, + /*0x02b7*/ (uintptr_t) &_file_Aa51jon11M, + /*0x02b8*/ (uintptr_t) &_file_Aa51jon12M, + /*0x02b9*/ (uintptr_t) &_file_Aa51jon14M, + /*0x02ba*/ (uintptr_t) &_file_Aa51jon15M, + /*0x02bb*/ (uintptr_t) &_file_Aa51sci1M, + /*0x02bc*/ (uintptr_t) &_file_Aaf1jo01M, + /*0x02bd*/ (uintptr_t) &_file_Aaf1jo02M, + /*0x02be*/ (uintptr_t) &_file_Aaf1jo03M, + /*0x02bf*/ (uintptr_t) &_file_Aaf1pr01M, + /*0x02c0*/ (uintptr_t) &_file_Aaf1pr02M, + /*0x02c1*/ (uintptr_t) &_file_Aaf1pr03M, + /*0x02c2*/ (uintptr_t) &_file_Aaf1pr04M, + /*0x02c3*/ (uintptr_t) &_file_Aaf1pr05M, + /*0x02c4*/ (uintptr_t) &_file_Aaf1pr06M, + /*0x02c5*/ (uintptr_t) &_file_Aaf1pr07M, + /*0x02c6*/ (uintptr_t) &_file_Aaf1pr08M, + /*0x02c7*/ (uintptr_t) &_file_Aaf1pr09M, + /*0x02c8*/ (uintptr_t) &_file_Aaf1pr10M, + /*0x02c9*/ (uintptr_t) &_file_Aaf1tr01M, + /*0x02ca*/ (uintptr_t) &_file_Aaf1tr02M, + /*0x02cb*/ (uintptr_t) &_file_Aaf1tr03M, + /*0x02cc*/ (uintptr_t) &_file_Aairbgd01M, + /*0x02cd*/ (uintptr_t) &_file_Aairbgd02M, + /*0x02ce*/ (uintptr_t) &_file_Aairbgd03M, + /*0x02cf*/ (uintptr_t) &_file_Aairbgd04M, + /*0x02d0*/ (uintptr_t) &_file_Aairbgd05M, + /*0x02d1*/ (uintptr_t) &_file_Aairbgd06M, + /*0x02d2*/ (uintptr_t) &_file_Aairbgd07M, + /*0x02d3*/ (uintptr_t) &_file_Aairbgd08M, + /*0x02d4*/ (uintptr_t) &_file_Aairbgd09M, + /*0x02d5*/ (uintptr_t) &_file_Aairbgd10M, + /*0x02d6*/ (uintptr_t) &_file_Aairbgd11M, + /*0x02d7*/ (uintptr_t) &_file_Aairbgd12M, + /*0x02d8*/ (uintptr_t) &_file_Aairbgd13M, + /*0x02d9*/ (uintptr_t) &_file_Aairbgd14M, + /*0x02da*/ (uintptr_t) &_file_Aairbgd15M, + /*0x02db*/ (uintptr_t) &_file_Aairbgd16M, + /*0x02dc*/ (uintptr_t) &_file_Aairstw01M, + /*0x02dd*/ (uintptr_t) &_file_Aairstw02M, + /*0x02de*/ (uintptr_t) &_file_Aairstw03M, + /*0x02df*/ (uintptr_t) &_file_Aassael01M, + /*0x02e0*/ (uintptr_t) &_file_Aassael02M, + /*0x02e1*/ (uintptr_t) &_file_Aassael03M, + /*0x02e2*/ (uintptr_t) &_file_Aassael04M, + /*0x02e3*/ (uintptr_t) &_file_Aassael05M, + /*0x02e4*/ (uintptr_t) &_file_Aassael06M, + /*0x02e5*/ (uintptr_t) &_file_Absewrk01M, + /*0x02e6*/ (uintptr_t) &_file_Absewrk02M, + /*0x02e7*/ (uintptr_t) &_file_Absewrk03M, + /*0x02e8*/ (uintptr_t) &_file_Absewrk04M, + /*0x02e9*/ (uintptr_t) &_file_Absewrk05M, + /*0x02ea*/ (uintptr_t) &_file_Acetael01M, + /*0x02eb*/ (uintptr_t) &_file_Achdroid1M, + /*0x02ec*/ (uintptr_t) &_file_Achdroid2M, + /*0x02ed*/ (uintptr_t) &_file_Acsec01M, + /*0x02ee*/ (uintptr_t) &_file_Acsec02M, + /*0x02ef*/ (uintptr_t) &_file_Acsec03M, + /*0x02f0*/ (uintptr_t) &_file_Acstan1M, + /*0x02f1*/ (uintptr_t) &_file_Acstan2M, + /*0x02f2*/ (uintptr_t) &_file_Adevr01M, + /*0x02f3*/ (uintptr_t) &_file_Adevr02M, + /*0x02f4*/ (uintptr_t) &_file_Adevr03M, + /*0x02f5*/ (uintptr_t) &_file_Adevr04M, + /*0x02f6*/ (uintptr_t) &_file_Adevr05M, + /*0x02f7*/ (uintptr_t) &_file_Adevr06M, + /*0x02f8*/ (uintptr_t) &_file_Adevr07M, + /*0x02f9*/ (uintptr_t) &_file_Adevr08M, + /*0x02fa*/ (uintptr_t) &_file_Adevr09M, + /*0x02fb*/ (uintptr_t) &_file_Adevr10M, + /*0x02fc*/ (uintptr_t) &_file_Adevr11M, + /*0x02fd*/ (uintptr_t) &_file_Adevr12M, + /*0x02fe*/ (uintptr_t) &_file_Aexec01M, + /*0x02ff*/ (uintptr_t) &_file_Aexec02M, + /*0x0300*/ (uintptr_t) &_file_Aexec04M, + /*0x0301*/ (uintptr_t) &_file_Aexec05M, + /*0x0302*/ (uintptr_t) &_file_Aexec06M, + /*0x0303*/ (uintptr_t) &_file_Aexec07M, + /*0x0304*/ (uintptr_t) &_file_Aexec08M, + /*0x0305*/ (uintptr_t) &_file_Aexec09M, + /*0x0306*/ (uintptr_t) &_file_Aexec10M, + /*0x0307*/ (uintptr_t) &_file_Aexec11M, + /*0x0308*/ (uintptr_t) &_file_Aexec12M, + /*0x0309*/ (uintptr_t) &_file_Aexec13M, + /*0x030a*/ (uintptr_t) &_file_Aexec14M, + /*0x030b*/ (uintptr_t) &_file_Ahelic01M, + /*0x030c*/ (uintptr_t) &_file_Ahelic02M, + /*0x030d*/ (uintptr_t) &_file_Ahelic03M, + /*0x030e*/ (uintptr_t) &_file_Ahologd01M, + /*0x030f*/ (uintptr_t) &_file_AholohopkM, + /*0x0310*/ (uintptr_t) &_file_Ainvcar01M, + /*0x0311*/ (uintptr_t) &_file_Ainvcar02M, + /*0x0312*/ (uintptr_t) &_file_Ainvcar03M, + /*0x0313*/ (uintptr_t) &_file_Ainvcar04M, + /*0x0314*/ (uintptr_t) &_file_Ainvcar05M, + /*0x0315*/ (uintptr_t) &_file_Ainvcar06M, + /*0x0316*/ (uintptr_t) &_file_Ainvcar07M, + /*0x0317*/ (uintptr_t) &_file_Ainvcar08M, + /*0x0318*/ (uintptr_t) &_file_Ainvcar09M, + /*0x0319*/ (uintptr_t) &_file_Ainvcar10M, + /*0x031a*/ (uintptr_t) &_file_Ainvcar11M, + /*0x031b*/ (uintptr_t) &_file_Ainvcar12M, + /*0x031c*/ (uintptr_t) &_file_AinvfarrM, + /*0x031d*/ (uintptr_t) &_file_AinvfemaM, + /*0x031e*/ (uintptr_t) &_file_AinvfostM, + /*0x031f*/ (uintptr_t) &_file_AinvgrimM, + /*0x0320*/ (uintptr_t) &_file_AinvhopkM, + /*0x0321*/ (uintptr_t) &_file_AinvmaleM, + /*0x0322*/ (uintptr_t) &_file_Ajoexec01M, + /*0x0323*/ (uintptr_t) &_file_Ajoexec02M, + /*0x0324*/ (uintptr_t) &_file_Ajosci01M, + /*0x0325*/ (uintptr_t) &_file_Ajosci02M, + /*0x0326*/ (uintptr_t) &_file_Ajosci03M, + /*0x0327*/ (uintptr_t) &_file_Alabacc1M, + /*0x0328*/ (uintptr_t) &_file_Alabacc2M, + /*0x0329*/ (uintptr_t) &_file_Alabacc3M, + /*0x032a*/ (uintptr_t) &_file_Alabacc4M, + /*0x032b*/ (uintptr_t) &_file_Alabacc5M, + /*0x032c*/ (uintptr_t) &_file_Alabacc6M, + /*0x032d*/ (uintptr_t) &_file_Alabtech1M, + /*0x032e*/ (uintptr_t) &_file_Alabtech2M, + /*0x032f*/ (uintptr_t) &_file_Alabtech3M, + /*0x0330*/ (uintptr_t) &_file_Alabtech5M, + /*0x0331*/ (uintptr_t) &_file_Alabtech6M, + /*0x0332*/ (uintptr_t) &_file_Alabtech7M, + /*0x0333*/ (uintptr_t) &_file_Alabtech8M, + /*0x0334*/ (uintptr_t) &_file_Alabtech9M, + /*0x0335*/ (uintptr_t) &_file_Aoffwrk01M, + /*0x0336*/ (uintptr_t) &_file_Aoffwrk02M, + /*0x0337*/ (uintptr_t) &_file_Aoffwrk03M, + /*0x0338*/ (uintptr_t) &_file_Aoffwrk04M, + /*0x0339*/ (uintptr_t) &_file_Cpresident_cloneZ, + /*0x033a*/ (uintptr_t) &_file_CheadjonathanZ, + /*0x033b*/ (uintptr_t) &_file_Cheadmaian_sZ, + /*0x033c*/ (uintptr_t) &_file_Cdark_af1Z, + /*0x033d*/ (uintptr_t) &_file_Pcable_carZ, + /*0x033e*/ (uintptr_t) &_file_Pelvis_saucerZ, + /*0x033f*/ (uintptr_t) &_file_Pstewardess_trolleyZ, + /*0x0340*/ (uintptr_t) &_file_Pairbase_lift_enclosedZ, + /*0x0341*/ (uintptr_t) &_file_Pairbase_lift_angleZ, + /*0x0342*/ (uintptr_t) &_file_Pairbase_safedoorZ, + /*0x0343*/ (uintptr_t) &_file_Paf1_pilotchairZ, + /*0x0344*/ (uintptr_t) &_file_Paf1_passchairZ, + /*0x0345*/ (uintptr_t) &_file_CheadshaunZ, + /*0x0346*/ (uintptr_t) &_file_PchrnightsightZ, + /*0x0347*/ (uintptr_t) &_file_PchrshieldZ, + /*0x0348*/ (uintptr_t) &_file_Pchrfalcon2Z, + /*0x0349*/ (uintptr_t) &_file_Pchrleegun1Z, + /*0x034a*/ (uintptr_t) &_file_PchrmaulerZ, + /*0x034b*/ (uintptr_t) &_file_Pchrdy357Z, + /*0x034c*/ (uintptr_t) &_file_Pchrdy357trentZ, + /*0x034d*/ (uintptr_t) &_file_PchrmaianpistolZ, + /*0x034e*/ (uintptr_t) &_file_Pchrfalcon2silZ, + /*0x034f*/ (uintptr_t) &_file_Pchrfalcon2scopeZ, + /*0x0350*/ (uintptr_t) &_file_Pchrcmp150Z, + /*0x0351*/ (uintptr_t) &_file_Pchrar34Z, + /*0x0352*/ (uintptr_t) &_file_PchrdragonZ, + /*0x0353*/ (uintptr_t) &_file_PchrsuperdragonZ, + /*0x0354*/ (uintptr_t) &_file_PchravengerZ, + /*0x0355*/ (uintptr_t) &_file_PchrcycloneZ, + /*0x0356*/ (uintptr_t) &_file_PchrmaiansmgZ, + /*0x0357*/ (uintptr_t) &_file_Pchrrcp120Z, + /*0x0358*/ (uintptr_t) &_file_PchrpcgunZ, + /*0x0359*/ (uintptr_t) &_file_PchrshotgunZ, + /*0x035a*/ (uintptr_t) &_file_PchrskminigunZ, + /*0x035b*/ (uintptr_t) &_file_PchrdyrocketZ, + /*0x035c*/ (uintptr_t) &_file_PchrdevastatorZ, + /*0x035d*/ (uintptr_t) &_file_PchrskrocketZ, + /*0x035e*/ (uintptr_t) &_file_Pchrz2020Z, + /*0x035f*/ (uintptr_t) &_file_PchrsniperrifleZ, + /*0x0360*/ (uintptr_t) &_file_PchrcrossbowZ, + /*0x0361*/ (uintptr_t) &_file_PchrdruggunZ, + /*0x0362*/ (uintptr_t) &_file_PchrknifeZ, + /*0x0363*/ (uintptr_t) &_file_PchrnbombZ, + /*0x0364*/ (uintptr_t) &_file_PchrflashbangZ, + /*0x0365*/ (uintptr_t) &_file_PchrgrenadeZ, + /*0x0366*/ (uintptr_t) &_file_PchrtimedmineZ, + /*0x0367*/ (uintptr_t) &_file_PchrproximitymineZ, + /*0x0368*/ (uintptr_t) &_file_PchrremotemineZ, + /*0x0369*/ (uintptr_t) &_file_PchrecmmineZ, + /*0x036a*/ (uintptr_t) &_file_PchrwppkZ, + /*0x036b*/ (uintptr_t) &_file_Pchrtt33Z, + /*0x036c*/ (uintptr_t) &_file_PchrskorpionZ, + /*0x036d*/ (uintptr_t) &_file_PchrkalashZ, + /*0x036e*/ (uintptr_t) &_file_PchruziZ, + /*0x036f*/ (uintptr_t) &_file_Pchrmp5kZ, + /*0x0370*/ (uintptr_t) &_file_Pchrm16Z, + /*0x0371*/ (uintptr_t) &_file_Pchrfnp90Z, + /*0x0372*/ (uintptr_t) &_file_PchrdyrocketmisZ, + /*0x0373*/ (uintptr_t) &_file_PchrskrocketmisZ, + /*0x0374*/ (uintptr_t) &_file_PchrcrossboltZ, + /*0x0375*/ (uintptr_t) &_file_PchrdevgrenadeZ, + /*0x0376*/ (uintptr_t) &_file_PchrdraggrenadeZ, + /*0x0377*/ (uintptr_t) &_file_Gfalcon2Z, + /*0x0378*/ (uintptr_t) &_file_Gleegun1Z, + /*0x0379*/ (uintptr_t) &_file_GskpistolZ, + /*0x037a*/ (uintptr_t) &_file_Gdy357Z, + /*0x037b*/ (uintptr_t) &_file_Gdy357trentZ, + /*0x037c*/ (uintptr_t) &_file_GmaianpistolZ, + /*0x037d*/ (uintptr_t) &_file_Gcmp150Z, + /*0x037e*/ (uintptr_t) &_file_Gar34Z, + /*0x037f*/ (uintptr_t) &_file_GdydragonZ, + /*0x0380*/ (uintptr_t) &_file_GdysuperdragonZ, + /*0x0381*/ (uintptr_t) &_file_Gk7avengerZ, + /*0x0382*/ (uintptr_t) &_file_GcycloneZ, + /*0x0383*/ (uintptr_t) &_file_GmaiansmgZ, + /*0x0384*/ (uintptr_t) &_file_Grcp120Z, + /*0x0385*/ (uintptr_t) &_file_GpcgunZ, + /*0x0386*/ (uintptr_t) &_file_GshotgunZ, + /*0x0387*/ (uintptr_t) &_file_GskminigunZ, + /*0x0388*/ (uintptr_t) &_file_GdyrocketZ, + /*0x0389*/ (uintptr_t) &_file_GdydevastatorZ, + /*0x038a*/ (uintptr_t) &_file_GskrocketZ, + /*0x038b*/ (uintptr_t) &_file_Gz2020Z, + /*0x038c*/ (uintptr_t) &_file_GsniperrifleZ, + /*0x038d*/ (uintptr_t) &_file_GcrossbowZ, + /*0x038e*/ (uintptr_t) &_file_GdruggunZ, + /*0x038f*/ (uintptr_t) &_file_GknifeZ, + /*0x0390*/ (uintptr_t) &_file_GgrenadeZ, + /*0x0391*/ (uintptr_t) &_file_GtimedmineZ, + /*0x0392*/ (uintptr_t) &_file_GproximitymineZ, + /*0x0393*/ (uintptr_t) &_file_GremotemineZ, + /*0x0394*/ (uintptr_t) &_file_GwppkZ, + /*0x0395*/ (uintptr_t) &_file_Gtt33Z, + /*0x0396*/ (uintptr_t) &_file_GskorpionZ, + /*0x0397*/ (uintptr_t) &_file_Gak47Z, + /*0x0398*/ (uintptr_t) &_file_GuziZ, + /*0x0399*/ (uintptr_t) &_file_Gmp5kZ, + /*0x039a*/ (uintptr_t) &_file_Gm16Z, + /*0x039b*/ (uintptr_t) &_file_Gfnp90Z, + /*0x039c*/ (uintptr_t) &_file_Gfalcon2lodZ, + /*0x039d*/ (uintptr_t) &_file_GskminigunlodZ, + /*0x039e*/ (uintptr_t) &_file_Pa51_turretZ, + /*0x039f*/ (uintptr_t) &_file_PpelagicdoorZ, + /*0x03a0*/ (uintptr_t) &_file_Am1_l1_aM, + /*0x03a1*/ (uintptr_t) &_file_Am1_l1_bM, + /*0x03a2*/ (uintptr_t) &_file_Am1_l1_cM, + /*0x03a3*/ (uintptr_t) &_file_Am1_l1_dM, + /*0x03a4*/ (uintptr_t) &_file_Am1_l2_aM, + /*0x03a5*/ (uintptr_t) &_file_Am1_l2_bM, + /*0x03a6*/ (uintptr_t) &_file_Am1_l2_cM, + /*0x03a7*/ (uintptr_t) &_file_Am1_l2_dM, + /*0x03a8*/ (uintptr_t) &_file_Am1_l3_aM, + /*0x03a9*/ (uintptr_t) &_file_Am1_l3_bM, + /*0x03aa*/ (uintptr_t) &_file_Am1_l3_cM, + /*0x03ab*/ (uintptr_t) &_file_Am1_l3_dM, + /*0x03ac*/ (uintptr_t) &_file_Am2_l1_aM, + /*0x03ad*/ (uintptr_t) &_file_Am2_l1_bM, + /*0x03ae*/ (uintptr_t) &_file_Am2_l1_cM, + /*0x03af*/ (uintptr_t) &_file_Am2_l1_dM, + /*0x03b0*/ (uintptr_t) &_file_Am3_l1_aM, + /*0x03b1*/ (uintptr_t) &_file_Am3_l1_bM, + /*0x03b2*/ (uintptr_t) &_file_Am3_l1_cM, + /*0x03b3*/ (uintptr_t) &_file_Am3_l1_dM, + /*0x03b4*/ (uintptr_t) &_file_Am3_l2_aM, + /*0x03b5*/ (uintptr_t) &_file_Am3_l2_bM, + /*0x03b6*/ (uintptr_t) &_file_Am3_l2_cM, + /*0x03b7*/ (uintptr_t) &_file_Am3_l2_dM, + /*0x03b8*/ (uintptr_t) &_file_Am4_l1_aM, + /*0x03b9*/ (uintptr_t) &_file_Am4_l1_bM, + /*0x03ba*/ (uintptr_t) &_file_Am4_l1_cM, + /*0x03bb*/ (uintptr_t) &_file_Am4_l1_dM, + /*0x03bc*/ (uintptr_t) &_file_Am4_l2_aM, + /*0x03bd*/ (uintptr_t) &_file_Am4_l2_bM, + /*0x03be*/ (uintptr_t) &_file_Am4_l2_cM, + /*0x03bf*/ (uintptr_t) &_file_Am4_l2_dM, + /*0x03c0*/ (uintptr_t) &_file_Am4_l3_aM, + /*0x03c1*/ (uintptr_t) &_file_Am4_l3_bM, + /*0x03c2*/ (uintptr_t) &_file_Am4_l3_cM, + /*0x03c3*/ (uintptr_t) &_file_Am4_l3_dM, + /*0x03c4*/ (uintptr_t) &_file_Am5_l1_aM, + /*0x03c5*/ (uintptr_t) &_file_Am5_l1_bM, + /*0x03c6*/ (uintptr_t) &_file_Am5_l1_cM, + /*0x03c7*/ (uintptr_t) &_file_Am5_l1_dM, + /*0x03c8*/ (uintptr_t) &_file_Am5_l2_aM, + /*0x03c9*/ (uintptr_t) &_file_Am5_l2_bM, + /*0x03ca*/ (uintptr_t) &_file_Am5_l2_cM, + /*0x03cb*/ (uintptr_t) &_file_Am5_l2_dM, + /*0x03cc*/ (uintptr_t) &_file_Am5_l3_aM, + /*0x03cd*/ (uintptr_t) &_file_Am5_l3_bM, + /*0x03ce*/ (uintptr_t) &_file_Am5_l3_cM, + /*0x03cf*/ (uintptr_t) &_file_Am5_l3_dM, + /*0x03d0*/ (uintptr_t) &_file_Am6_l1_aM, + /*0x03d1*/ (uintptr_t) &_file_Am6_l1_bM, + /*0x03d2*/ (uintptr_t) &_file_Am6_l1_cM, + /*0x03d3*/ (uintptr_t) &_file_Am6_l1_dM, + /*0x03d4*/ (uintptr_t) &_file_Am6_l2_aM, + /*0x03d5*/ (uintptr_t) &_file_Am6_l2_bM, + /*0x03d6*/ (uintptr_t) &_file_Am6_l2_cM, + /*0x03d7*/ (uintptr_t) &_file_Am6_l2_dM, + /*0x03d8*/ (uintptr_t) &_file_Am7_l1_aM, + /*0x03d9*/ (uintptr_t) &_file_Am7_l1_bM, + /*0x03da*/ (uintptr_t) &_file_Am7_l1_cM, + /*0x03db*/ (uintptr_t) &_file_Am7_l1_dM, + /*0x03dc*/ (uintptr_t) &_file_Am8_l1_aM, + /*0x03dd*/ (uintptr_t) &_file_Am8_l1_bM, + /*0x03de*/ (uintptr_t) &_file_Am8_l1_cM, + /*0x03df*/ (uintptr_t) &_file_Am8_l1_dM, + /*0x03e0*/ (uintptr_t) &_file_Am9_l1_aM, + /*0x03e1*/ (uintptr_t) &_file_Am9_l1_bM, + /*0x03e2*/ (uintptr_t) &_file_Am9_l1_cM, + /*0x03e3*/ (uintptr_t) &_file_Am9_l1_dM, + /*0x03e4*/ (uintptr_t) &_file_Ap1_01_joM, + /*0x03e5*/ (uintptr_t) &_file_Ap1_02_caM, + /*0x03e6*/ (uintptr_t) &_file_Ap1_03_joM, + /*0x03e7*/ (uintptr_t) &_file_Ap1_04_caM, + /*0x03e8*/ (uintptr_t) &_file_Ap1_05_joM, + /*0x03e9*/ (uintptr_t) &_file_Ap1_06_caM, + /*0x03ea*/ (uintptr_t) &_file_Ap1_07_joM, + /*0x03eb*/ (uintptr_t) &_file_Ap1_08_caM, + /*0x03ec*/ (uintptr_t) &_file_Ap2_01_joM, + /*0x03ed*/ (uintptr_t) &_file_Ap2_02_joM, + /*0x03ee*/ (uintptr_t) &_file_Ap2_03_drM, + /*0x03ef*/ (uintptr_t) &_file_Ap2_04_joM, + /*0x03f0*/ (uintptr_t) &_file_Ap2_05_joM, + /*0x03f1*/ (uintptr_t) &_file_Ap2_06_drM, + /*0x03f2*/ (uintptr_t) &_file_Ap2_07_drM, + /*0x03f3*/ (uintptr_t) &_file_Ap3_01_gdM, + /*0x03f4*/ (uintptr_t) &_file_Ap3_02_joM, + /*0x03f5*/ (uintptr_t) &_file_Ap3_03_joM, + /*0x03f6*/ (uintptr_t) &_file_Ap4_01_dvM, + /*0x03f7*/ (uintptr_t) &_file_Ap4_02_joM, + /*0x03f8*/ (uintptr_t) &_file_Ap4_03_dvM, + /*0x03f9*/ (uintptr_t) &_file_Ap4_04_joM, + /*0x03fa*/ (uintptr_t) &_file_Ap4_05_dvM, + /*0x03fb*/ (uintptr_t) &_file_Ap4_06_joM, + /*0x03fc*/ (uintptr_t) &_file_Ap4_07_blM, + /*0x03fd*/ (uintptr_t) &_file_Ap4_08_dvM, + /*0x03fe*/ (uintptr_t) &_file_Ap4_09_dvM, + /*0x03ff*/ (uintptr_t) &_file_Ap5_01_joM, + /*0x0400*/ (uintptr_t) &_file_Ap5_02_joM, + /*0x0401*/ (uintptr_t) &_file_Ap5_03_joM, + /*0x0402*/ (uintptr_t) &_file_Ap6_01_joM, + /*0x0403*/ (uintptr_t) &_file_Ap6_02_caM, + /*0x0404*/ (uintptr_t) &_file_Ap6_03_joM, + /*0x0405*/ (uintptr_t) &_file_Ap6_04_caM, + /*0x0406*/ (uintptr_t) &_file_Ap6_05_joM, + /*0x0407*/ (uintptr_t) &_file_Ap6_06_caM, + /*0x0408*/ (uintptr_t) &_file_Ap7_01_caM, + /*0x0409*/ (uintptr_t) &_file_Ap7_02_joM, + /*0x040a*/ (uintptr_t) &_file_Ap7_03_caM, + /*0x040b*/ (uintptr_t) &_file_Ap7_04_joM, + /*0x040c*/ (uintptr_t) &_file_Ap8_01_dvM, + /*0x040d*/ (uintptr_t) &_file_Ap8_02_blM, + /*0x040e*/ (uintptr_t) &_file_Ap8_03_dvM, + /*0x040f*/ (uintptr_t) &_file_Ap8_04_blM, + /*0x0410*/ (uintptr_t) &_file_Ap8_06_blM, + /*0x0411*/ (uintptr_t) &_file_Ap8_07_trM, + /*0x0412*/ (uintptr_t) &_file_Ap8_08_dvM, + /*0x0413*/ (uintptr_t) &_file_Ap8_09_trM, + /*0x0414*/ (uintptr_t) &_file_Ap8_10_blM, + /*0x0415*/ (uintptr_t) &_file_Ap9_01_joM, + /*0x0416*/ (uintptr_t) &_file_Ap9_02_caM, + /*0x0417*/ (uintptr_t) &_file_Ap9_03_joM, + /*0x0418*/ (uintptr_t) &_file_Ap10_01_caM, + /*0x0419*/ (uintptr_t) &_file_Ap10_02_caM, + /*0x041a*/ (uintptr_t) &_file_Ap10_03_caM, + /*0x041b*/ (uintptr_t) &_file_Ap10_04_caM, + /*0x041c*/ (uintptr_t) &_file_Ap10_05_joM, + /*0x041d*/ (uintptr_t) &_file_Ap10_06_caM, + /*0x041e*/ (uintptr_t) &_file_Ap10_07_joM, + /*0x041f*/ (uintptr_t) &_file_Ap10_08_caM, + /*0x0420*/ (uintptr_t) &_file_Ap10_09_joM, + /*0x0421*/ (uintptr_t) &_file_Ap11_01_jnM, + /*0x0422*/ (uintptr_t) &_file_Ap11_02_joM, + /*0x0423*/ (uintptr_t) &_file_Ap11_03_jnM, + /*0x0424*/ (uintptr_t) &_file_Ap11_04_joM, + /*0x0425*/ (uintptr_t) &_file_Ap11_05_jnM, + /*0x0426*/ (uintptr_t) &_file_Ap11_06_joM, + /*0x0427*/ (uintptr_t) &_file_Ap11_07_jnM, + /*0x0428*/ (uintptr_t) &_file_Ap11_08_joM, + /*0x0429*/ (uintptr_t) &_file_Ap12_01_jnM, + /*0x042a*/ (uintptr_t) &_file_Ap12_02_joM, + /*0x042b*/ (uintptr_t) &_file_Ap12_03_jnM, + /*0x042c*/ (uintptr_t) &_file_Ap12_04_joM, + /*0x042d*/ (uintptr_t) &_file_Ap12_05_jnM, + /*0x042e*/ (uintptr_t) &_file_Ap12_06_joM, + /*0x042f*/ (uintptr_t) &_file_Ap12_07_jnM, + /*0x0430*/ (uintptr_t) &_file_Ap12_08_joM, + /*0x0431*/ (uintptr_t) &_file_Ap12_09_jnM, + /*0x0432*/ (uintptr_t) &_file_Ap12_10_joM, + /*0x0433*/ (uintptr_t) &_file_Ap13_01_joM, + /*0x0434*/ (uintptr_t) &_file_Ap13_02_suM, + /*0x0435*/ (uintptr_t) &_file_Ap13_03_joM, + /*0x0436*/ (uintptr_t) &_file_Ap13_04_suM, + /*0x0437*/ (uintptr_t) &_file_Ap13_06_suM, + /*0x0438*/ (uintptr_t) &_file_Ap14_03_suM, + /*0x0439*/ (uintptr_t) &_file_Ap14_04_joM, + /*0x043a*/ (uintptr_t) &_file_Ap14_05_suM, + /*0x043b*/ (uintptr_t) &_file_Ap14_07_joM, + /*0x043c*/ (uintptr_t) &_file_Ap15_01_elM, + /*0x043d*/ (uintptr_t) &_file_Ap15_02_elM, + /*0x043e*/ (uintptr_t) &_file_Ap15_03_joM, + /*0x043f*/ (uintptr_t) &_file_Ap15_04_jnM, + /*0x0440*/ (uintptr_t) &_file_Ap15_05_elM, + /*0x0441*/ (uintptr_t) &_file_Ap15_06_joM, + /*0x0442*/ (uintptr_t) &_file_Ap15_07_elM, + /*0x0443*/ (uintptr_t) &_file_Ap15_08_joM, + /*0x0444*/ (uintptr_t) &_file_Ap15_09_elM, + /*0x0445*/ (uintptr_t) &_file_Ap15_10_joM, + /*0x0446*/ (uintptr_t) &_file_Ap15_11_elM, + /*0x0447*/ (uintptr_t) &_file_Ap16_01_joM, + /*0x0448*/ (uintptr_t) &_file_Ap16_02_caM, + /*0x0449*/ (uintptr_t) &_file_Ap16_04_caM, + /*0x044a*/ (uintptr_t) &_file_Ap16_05_joM, + /*0x044b*/ (uintptr_t) &_file_Ap16_06_caM, + /*0x044c*/ (uintptr_t) &_file_Ap17_01_trM, + /*0x044d*/ (uintptr_t) &_file_Ap17_02_prM, + /*0x044e*/ (uintptr_t) &_file_Ap17_03_trM, + /*0x044f*/ (uintptr_t) &_file_Ap17_04_prM, + /*0x0450*/ (uintptr_t) &_file_Ap17_05_trM, + /*0x0451*/ (uintptr_t) &_file_Ap17_06_trM, + /*0x0452*/ (uintptr_t) &_file_Ap18_01_joM, + /*0x0453*/ (uintptr_t) &_file_Ap18_02_elM, + /*0x0454*/ (uintptr_t) &_file_Ap18_03_elM, + /*0x0455*/ (uintptr_t) &_file_Ap18_04_joM, + /*0x0456*/ (uintptr_t) &_file_Ap18_05_elM, + /*0x0457*/ (uintptr_t) &_file_Ap19_01_caM, + /*0x0458*/ (uintptr_t) &_file_Ap19_02_caM, + /*0x0459*/ (uintptr_t) &_file_Ap19_03_joM, + /*0x045a*/ (uintptr_t) &_file_Ap19_04_caM, + /*0x045b*/ (uintptr_t) &_file_Ap19_05_joM, + /*0x045c*/ (uintptr_t) &_file_Ap19_06_joM, + /*0x045d*/ (uintptr_t) &_file_Ap20_01_joM, + /*0x045e*/ (uintptr_t) &_file_Ap20_02_prM, + /*0x045f*/ (uintptr_t) &_file_Ap20_03_joM, + /*0x0460*/ (uintptr_t) &_file_Ap20_04_prM, + /*0x0461*/ (uintptr_t) &_file_Ap20_05_joM, + /*0x0462*/ (uintptr_t) &_file_Ap20_06_blM, + /*0x0463*/ (uintptr_t) &_file_Ap20_07_trM, + /*0x0464*/ (uintptr_t) &_file_Ap20_08_trM, + /*0x0465*/ (uintptr_t) &_file_Ap21_01_elM, + /*0x0466*/ (uintptr_t) &_file_Ap21_02_joM, + /*0x0467*/ (uintptr_t) &_file_Ap21_03_elM, + /*0x0468*/ (uintptr_t) &_file_Ap21_04_joM, + /*0x0469*/ (uintptr_t) &_file_Ap22_01_elM, + /*0x046a*/ (uintptr_t) &_file_Ap22_02_joM, + /*0x046b*/ (uintptr_t) &_file_Ap22_03_elM, + /*0x046c*/ (uintptr_t) &_file_Ap22_04_joM, + /*0x046d*/ (uintptr_t) &_file_Ap23_01_joM, + /*0x046e*/ (uintptr_t) &_file_Ap23_02_drM, + /*0x046f*/ (uintptr_t) &_file_Ap23_03_joM, + /*0x0470*/ (uintptr_t) &_file_Ap23_04_drM, + /*0x0471*/ (uintptr_t) &_file_Ap23_05_joM, + /*0x0472*/ (uintptr_t) &_file_Ap23_06_drM, + /*0x0473*/ (uintptr_t) &_file_Ap23_07_joM, + /*0x0474*/ (uintptr_t) &_file_Ap23_08_drM, + /*0x0475*/ (uintptr_t) &_file_Ap24_01_caM, + /*0x0476*/ (uintptr_t) &_file_Ap24_02_joM, + /*0x0477*/ (uintptr_t) &_file_Ap24_03_caM, + /*0x0478*/ (uintptr_t) &_file_Ap24_04_joM, + /*0x0479*/ (uintptr_t) &_file_Ap24_05_caM, + /*0x047a*/ (uintptr_t) &_file_Ap24_06_caM, + /*0x047b*/ (uintptr_t) &_file_Ap24_07_joM, + /*0x047c*/ (uintptr_t) &_file_Ap24_08_joM, + /*0x047d*/ (uintptr_t) &_file_Ap25_01_joM, + /*0x047e*/ (uintptr_t) &_file_Ap25_02_joM, + /*0x047f*/ (uintptr_t) &_file_Ap26_01_joM, + /*0x0480*/ (uintptr_t) &_file_Ap26_02_dvM, + /*0x0481*/ (uintptr_t) &_file_Ap26_03_joM, + /*0x0482*/ (uintptr_t) &_file_Ap26_04_dvM, + /*0x0483*/ (uintptr_t) &_file_Ap26_05_dvM, + /*0x0484*/ (uintptr_t) &_file_Ap26_06_joM, + /*0x0485*/ (uintptr_t) &_file_Ap26_07_dvM, + /*0x0486*/ (uintptr_t) &_file_Ap26_08_dvM, + /*0x0487*/ (uintptr_t) &_file_Ap27_01_joM, + /*0x0488*/ (uintptr_t) &_file_Ap27_02_elM, + /*0x0489*/ (uintptr_t) &_file_Ap27_03_elM, + /*0x048a*/ (uintptr_t) &_file_Ap27_04_joM, + /*0x048b*/ (uintptr_t) &_file_Ap27_05_joM, + /*0x048c*/ (uintptr_t) &_file_Ap27_06_elM, + /*0x048d*/ (uintptr_t) &_file_Ap28_01_elM, + /*0x048e*/ (uintptr_t) &_file_Ap28_02_joM, + /*0x048f*/ (uintptr_t) &_file_Ap28_03_elM, + /*0x0490*/ (uintptr_t) &_file_Ap28_04_joM, + /*0x0491*/ (uintptr_t) &_file_Ap28_05_elM, + /*0x0492*/ (uintptr_t) &_file_Ap28_06_joM, + /*0x0493*/ (uintptr_t) &_file_Ap29_01_elM, + /*0x0494*/ (uintptr_t) &_file_Ap29_02_joM, + /*0x0495*/ (uintptr_t) &_file_Ap29_03_elM, + /*0x0496*/ (uintptr_t) &_file_Ap29_04_joM, + /*0x0497*/ (uintptr_t) &_file_Ap29_05_joM, + /*0x0498*/ (uintptr_t) &_file_Ap29_06_elM, + /*0x0499*/ (uintptr_t) &_file_Ap29_07_joM, + /*0x049a*/ (uintptr_t) &_file_Ap29_08_elM, + /*0x049b*/ (uintptr_t) &_file_Ap29_09_joM, + /*0x049c*/ (uintptr_t) &_file_Ap29_10_elM, + /*0x049d*/ (uintptr_t) &_file_PautosurgeonZ, + /*0x049e*/ (uintptr_t) &_file_CdarkwetZ, + /*0x049f*/ (uintptr_t) &_file_CdarkaqualungZ, + /*0x04a0*/ (uintptr_t) &_file_CdarksnowZ, + /*0x04a1*/ (uintptr_t) &_file_CdarklabZ, + /*0x04a2*/ (uintptr_t) &_file_CfemlabtechZ, + /*0x04a3*/ (uintptr_t) &_file_CddsniperZ, + /*0x04a4*/ (uintptr_t) &_file_Cpilotaf1Z, + /*0x04a5*/ (uintptr_t) &_file_CcilabtechZ, + /*0x04a6*/ (uintptr_t) &_file_CcifemtechZ, + /*0x04a7*/ (uintptr_t) &_file_Cheadeileen_hZ, + /*0x04a8*/ (uintptr_t) &_file_Cheadscott_hZ, + /*0x04a9*/ (uintptr_t) &_file_CcarreveningsuitZ, + /*0x04aa*/ (uintptr_t) &_file_CjonathonZ, + /*0x04ab*/ (uintptr_t) &_file_CcisoldierZ, + /*0x04ac*/ (uintptr_t) &_file_CheadsanchezZ, + /*0x04ad*/ (uintptr_t) &_file_CheaddarkaquaZ, + /*0x04ae*/ (uintptr_t) &_file_CheadddsniperZ, + /*0x04af*/ (uintptr_t) &_file_PlimoZ, + /*0x04b0*/ (uintptr_t) &_file_PpdmenuZ, + /*0x04b1*/ (uintptr_t) &_file_Pa51interceptorZ, + /*0x04b2*/ (uintptr_t) &_file_Pa51dishZ, + /*0x04b3*/ (uintptr_t) &_file_Pa51radarconsoleZ, + /*0x04b4*/ (uintptr_t) &_file_Pa51lockerdoorZ, + /*0x04b5*/ (uintptr_t) &_file_Pg5generatorZ, + /*0x04b6*/ (uintptr_t) &_file_Pg5dumpsterZ, + /*0x04b7*/ (uintptr_t) &_file_Gar34lodZ, + /*0x04b8*/ (uintptr_t) &_file_GavengerlodZ, + /*0x04b9*/ (uintptr_t) &_file_Gcmp150lodZ, + /*0x04ba*/ (uintptr_t) &_file_GcrossbowlodZ, + /*0x04bb*/ (uintptr_t) &_file_GcyclonelodZ, + /*0x04bc*/ (uintptr_t) &_file_GdruggunlodZ, + /*0x04bd*/ (uintptr_t) &_file_Gdy357lodZ, + /*0x04be*/ (uintptr_t) &_file_Gdy357trentlodZ, + /*0x04bf*/ (uintptr_t) &_file_GdevastatorlodZ, + /*0x04c0*/ (uintptr_t) &_file_GdydragonlodZ, + /*0x04c1*/ (uintptr_t) &_file_GdysuperdragonlodZ, + /*0x04c2*/ (uintptr_t) &_file_GknifelodZ, + /*0x04c3*/ (uintptr_t) &_file_GlaserlodZ, + /*0x04c4*/ (uintptr_t) &_file_GmagseclodZ, + /*0x04c5*/ (uintptr_t) &_file_GmayanpistollodZ, + /*0x04c6*/ (uintptr_t) &_file_GmayansmglodZ, + /*0x04c7*/ (uintptr_t) &_file_GpcgunlodZ, + /*0x04c8*/ (uintptr_t) &_file_Grcp120lodZ, + /*0x04c9*/ (uintptr_t) &_file_GrocketlodZ, + /*0x04ca*/ (uintptr_t) &_file_GshotgunlodZ, + /*0x04cb*/ (uintptr_t) &_file_GskpistollodZ, + /*0x04cc*/ (uintptr_t) &_file_GskrocketlodZ, + /*0x04cd*/ (uintptr_t) &_file_GsniperlodZ, + /*0x04ce*/ (uintptr_t) &_file_Gz2020lodZ, + /*0x04cf*/ (uintptr_t) &_file_PchrcloakerZ, + /*0x04d0*/ (uintptr_t) &_file_PchrspeedpillZ, + /*0x04d1*/ (uintptr_t) &_file_PbaggagecarrierZ, + /*0x04d2*/ (uintptr_t) &_file_PminesignZ, + /*0x04d3*/ (uintptr_t) &_file_PchamberZ, + /*0x04d4*/ (uintptr_t) &_file_PisotopeexperimentZ, + /*0x04d5*/ (uintptr_t) &_file_PisotopeZ, + /*0x04d6*/ (uintptr_t) &_file_PreactordoorZ, + /*0x04d7*/ (uintptr_t) &_file_PsaucerinsideZ, + /*0x04d8*/ (uintptr_t) &_file_PvillastoolZ, + /*0x04d9*/ (uintptr_t) &_file_Pcetanwindow1Z, + /*0x04da*/ (uintptr_t) &_file_Pcetanwindow2Z, + /*0x04db*/ (uintptr_t) &_file_Pcetanwindow3Z, + /*0x04dc*/ (uintptr_t) &_file_Apelelv01M, + /*0x04dd*/ (uintptr_t) &_file_Apelgrd01M, + /*0x04de*/ (uintptr_t) &_file_Ap29_11_joM, + /*0x04df*/ (uintptr_t) &_file_GlaserZ, + /*0x04e0*/ (uintptr_t) &_file_PbigpelagicdoorZ, + /*0x04e1*/ (uintptr_t) &_file_Psk_jonrubble3Z, + /*0x04e2*/ (uintptr_t) &_file_Psk_jonrubble4Z, + /*0x04e3*/ (uintptr_t) &_file_Psk_jonrubble5Z, + /*0x04e4*/ (uintptr_t) &_file_Psk_jonrubble6Z, + /*0x04e5*/ (uintptr_t) &_file_GcombathandslodZ, + /*0x04e6*/ (uintptr_t) &_file_PbinocularsZ, + /*0x04e7*/ (uintptr_t) &_file_PsubmarineZ, + /*0x04e8*/ (uintptr_t) &_file_Pairforce1Z, + /*0x04e9*/ (uintptr_t) &_file_PenginepartZ, + /*0x04ea*/ (uintptr_t) &_file_Am3l2carrM, + /*0x04eb*/ (uintptr_t) &_file_Aelvcet01M, + /*0x04ec*/ (uintptr_t) &_file_Aelvcet02M, + /*0x04ed*/ (uintptr_t) &_file_Ajorep01M, + /*0x04ee*/ (uintptr_t) &_file_Ajorep02M, + /*0x04ef*/ (uintptr_t) &_file_Ajorep03M, + /*0x04f0*/ (uintptr_t) &_file_Ajorep04M, + /*0x04f1*/ (uintptr_t) &_file_PcetroofgunZ, + /*0x04f2*/ (uintptr_t) &_file_PcetansmalldoorZ, + /*0x04f3*/ (uintptr_t) &_file_PpowernodeZ, + /*0x04f4*/ (uintptr_t) &_file_PcetanbluegreenlZ, + /*0x04f5*/ (uintptr_t) &_file_PcetanbluegreenrZ, + /*0x04f6*/ (uintptr_t) &_file_PskedarconsoleZ, + /*0x04f7*/ (uintptr_t) &_file_PskedarconsolepanelZ, + /*0x04f8*/ (uintptr_t) &_file_Ajorpld01M, + /*0x04f9*/ (uintptr_t) &_file_Ajorpld02M, + /*0x04fa*/ (uintptr_t) &_file_Ajorpld03M, + /*0x04fb*/ (uintptr_t) &_file_Ajorpld04M, + /*0x04fc*/ (uintptr_t) &_file_GnbombZ, + /*0x04fd*/ (uintptr_t) &_file_GnbomblodZ, + /*0x04fe*/ (uintptr_t) &_file_GgrenadelodZ, + /*0x04ff*/ (uintptr_t) &_file_PweaponcdoorZ, + /*0x0500*/ (uintptr_t) &_file_PtargetZ, + /*0x0501*/ (uintptr_t) &_file_PdevicesecretdoorZ, + /*0x0502*/ (uintptr_t) &_file_PcarringtonsecretdoorZ, + /*0x0503*/ (uintptr_t) &_file_PsinisterpcZ, + /*0x0504*/ (uintptr_t) &_file_PsinisterstationZ, + /*0x0505*/ (uintptr_t) &_file_PkeypadlockZ, + /*0x0506*/ (uintptr_t) &_file_PthumbprintscannerZ, + /*0x0507*/ (uintptr_t) &_file_PretinalockZ, + /*0x0508*/ (uintptr_t) &_file_PcardlockZ, + /*0x0509*/ (uintptr_t) &_file_PgoodstationZ, + /*0x050a*/ (uintptr_t) &_file_PgoodpcZ, + /*0x050b*/ (uintptr_t) &_file_CskedarkingZ, + /*0x050c*/ (uintptr_t) &_file_CelviswaistcoatZ, + /*0x050d*/ (uintptr_t) &_file_CheadgriffeyZ, + /*0x050e*/ (uintptr_t) &_file_CheadmotoZ, + /*0x050f*/ (uintptr_t) &_file_CheadkeithZ, + /*0x0510*/ (uintptr_t) &_file_CheadwinnerZ, + /*0x0511*/ (uintptr_t) &_file_Ca51faceplateZ, + /*0x0512*/ (uintptr_t) &_file_PchrautogunZ, + /*0x0513*/ (uintptr_t) &_file_Pg5bigchairZ, + /*0x0514*/ (uintptr_t) &_file_Pg5smallchairZ, + /*0x0515*/ (uintptr_t) &_file_PkingsceptreZ, + /*0x0516*/ (uintptr_t) &_file_PlabcoatZ, + /*0x0517*/ (uintptr_t) &_file_Atrjo01M, + /*0x0518*/ (uintptr_t) &_file_Atrgrim01M, + /*0x0519*/ (uintptr_t) &_file_Atrgrim02M, + /*0x051a*/ (uintptr_t) &_file_Atrcarr06M, + /*0x051b*/ (uintptr_t) &_file_Atrcarr07M, + /*0x051c*/ (uintptr_t) &_file_Atrcarr08M, + /*0x051d*/ (uintptr_t) &_file_Atrcarr01M, + /*0x051e*/ (uintptr_t) &_file_Atrcarr02M, + /*0x051f*/ (uintptr_t) &_file_Atrcarr03M, + /*0x0520*/ (uintptr_t) &_file_Atrcarr04M, + /*0x0521*/ (uintptr_t) &_file_Atrcarr05M, + /*0x0522*/ (uintptr_t) &_file_Atrcarr12M, + /*0x0523*/ (uintptr_t) &_file_Abnblde01M, + /*0x0524*/ (uintptr_t) &_file_Abncass01M, + /*0x0525*/ (uintptr_t) &_file_Pcidoor1Z, + /*0x0526*/ (uintptr_t) &_file_Pg5_chairZ, + /*0x0527*/ (uintptr_t) &_file_Pg5_chair2Z, + /*0x0528*/ (uintptr_t) &_file_Pdd_window_foyerZ, + /*0x0529*/ (uintptr_t) &_file_Ghand_jowetsuitZ, + /*0x052a*/ (uintptr_t) &_file_Ghand_trentZ, + /*0x052b*/ (uintptr_t) &_file_Ghand_jofrockZ, + /*0x052c*/ (uintptr_t) &_file_Ghand_jotrenchZ, + /*0x052d*/ (uintptr_t) &_file_Ghand_ddsniperZ, + /*0x052e*/ (uintptr_t) &_file_Ghand_presidentZ, + /*0x052f*/ (uintptr_t) &_file_Ghand_joaf1Z, + /*0x0530*/ (uintptr_t) &_file_Ghand_jopilotZ, + /*0x0531*/ (uintptr_t) &_file_Ghand_carringtonZ, + /*0x0532*/ (uintptr_t) &_file_Ghand_mrblondeZ, + /*0x0533*/ (uintptr_t) &_file_Ghand_ciaZ, + /*0x0534*/ (uintptr_t) &_file_Ghand_cifemtechZ, + /*0x0535*/ (uintptr_t) &_file_Ghand_fbiarmZ, + /*0x0536*/ (uintptr_t) &_file_Ghand_josnowZ, + /*0x0537*/ (uintptr_t) &_file_Ghand_vriesZ, + /*0x0538*/ (uintptr_t) &_file_Ghand_ddsecurityZ, + /*0x0539*/ (uintptr_t) &_file_Ghand_tragic_pelagicZ, + /*0x053a*/ (uintptr_t) &_file_Ghand_stewardess_coatZ, + /*0x053b*/ (uintptr_t) &_file_Ghand_ddlabtechZ, + /*0x053c*/ (uintptr_t) &_file_Pci_cabinetZ, + /*0x053d*/ (uintptr_t) &_file_Pci_deskZ, + /*0x053e*/ (uintptr_t) &_file_Pci_carr_deskZ, + /*0x053f*/ (uintptr_t) &_file_Pci_f_chairZ, + /*0x0540*/ (uintptr_t) &_file_Pci_loungerZ, + /*0x0541*/ (uintptr_t) &_file_Pci_f_sofaZ, + /*0x0542*/ (uintptr_t) &_file_Pci_tableZ, + /*0x0543*/ (uintptr_t) &_file_Pcv_coffee_tableZ, + /*0x0544*/ (uintptr_t) &_file_Pcv_chair1Z, + /*0x0545*/ (uintptr_t) &_file_Pcv_chair2Z, + /*0x0546*/ (uintptr_t) &_file_Pcv_sofaZ, + /*0x0547*/ (uintptr_t) &_file_Pcv_chair4Z, + /*0x0548*/ (uintptr_t) &_file_Pcv_lampZ, + /*0x0549*/ (uintptr_t) &_file_Pcv_cabinetZ, + /*0x054a*/ (uintptr_t) &_file_Pcv_f_bedZ, + /*0x054b*/ (uintptr_t) &_file_Ppel_chair1Z, + /*0x054c*/ (uintptr_t) &_file_Psk_console2Z, + /*0x054d*/ (uintptr_t) &_file_Pdd_ear_tableZ, + /*0x054e*/ (uintptr_t) &_file_Pdd_ear_chairZ, + /*0x054f*/ (uintptr_t) &_file_Pairbase_table2Z, + /*0x0550*/ (uintptr_t) &_file_Pairbase_chair2Z, + /*0x0551*/ (uintptr_t) &_file_Pmisc_crateZ, + /*0x0552*/ (uintptr_t) &_file_Pmisc_irspecsZ, + /*0x0553*/ (uintptr_t) &_file_Cheadelvis_gogsZ, + /*0x0554*/ (uintptr_t) &_file_CheadstevemZ, + /*0x0555*/ (uintptr_t) &_file_Pa51_roofgunZ, + /*0x0556*/ (uintptr_t) &_file_Psk_drone_gunZ, + /*0x0557*/ (uintptr_t) &_file_Pci_roofgunZ, + /*0x0558*/ (uintptr_t) &_file_Pcv_tableZ, + /*0x0559*/ (uintptr_t) &_file_Cdark_leatherZ, + /*0x055a*/ (uintptr_t) &_file_Cheaddark_snowZ, + /*0x055b*/ (uintptr_t) &_file_CheadpresidentZ, + /*0x055c*/ (uintptr_t) &_file_Pcidoor1_refZ, + /*0x055d*/ (uintptr_t) &_file_Palaskadoor_outZ, + /*0x055e*/ (uintptr_t) &_file_Palaskadoor_inZ, + /*0x055f*/ (uintptr_t) &_file_PwirefenceZ, + /*0x0560*/ (uintptr_t) &_file_PrarelogoZ, + /*0x0561*/ (uintptr_t) &_file_Chead_vdZ, + /*0x0562*/ (uintptr_t) &_file_Apelelv02M, + /*0x0563*/ (uintptr_t) &_file_PkeycardZ, + /*0x0564*/ (uintptr_t) &_file_PbodyarmourZ, + /*0x0565*/ (uintptr_t) &_file_Pa51gate_rZ, + /*0x0566*/ (uintptr_t) &_file_Pa51gate_lZ, + /*0x0567*/ (uintptr_t) &_file_Paf1_lampZ, + /*0x0568*/ (uintptr_t) &_file_Paf1_toiletZ, + /*0x0569*/ (uintptr_t) &_file_Paf1_doorbig2Z, + /*0x056a*/ (uintptr_t) &_file_Paf1_phoneZ, + /*0x056b*/ (uintptr_t) &_file_Paf1_cargodoorZ, + /*0x056c*/ (uintptr_t) &_file_Pg5_alarmZ, + /*0x056d*/ (uintptr_t) &_file_Pg5_laser_switchZ, + /*0x056e*/ (uintptr_t) &_file_Psk_templecolumn4Z, + /*0x056f*/ (uintptr_t) &_file_PcorehatchZ, + /*0x0570*/ (uintptr_t) &_file_LameE, + /*0x0571*/ (uintptr_t) &_file_LameJ, + /*0x0572*/ (uintptr_t) &_file_LameP, + /*0x0573*/ (uintptr_t) &_file_Lame_str_gZ, + /*0x0574*/ (uintptr_t) &_file_Lame_str_fZ, + /*0x0575*/ (uintptr_t) &_file_Lame_str_sZ, + /*0x0576*/ (uintptr_t) &_file_Lame_str_iZ, + /*0x0577*/ (uintptr_t) &_file_LarchE, + /*0x0578*/ (uintptr_t) &_file_LarchJ, + /*0x0579*/ (uintptr_t) &_file_LarchP, + /*0x057a*/ (uintptr_t) &_file_Larch_str_gZ, + /*0x057b*/ (uintptr_t) &_file_Larch_str_fZ, + /*0x057c*/ (uintptr_t) &_file_Larch_str_sZ, + /*0x057d*/ (uintptr_t) &_file_Larch_str_iZ, + /*0x057e*/ (uintptr_t) &_file_LarecE, + /*0x057f*/ (uintptr_t) &_file_LarecJ, + /*0x0580*/ (uintptr_t) &_file_LarecP, + /*0x0581*/ (uintptr_t) &_file_Larec_str_gZ, + /*0x0582*/ (uintptr_t) &_file_Larec_str_fZ, + /*0x0583*/ (uintptr_t) &_file_Larec_str_sZ, + /*0x0584*/ (uintptr_t) &_file_Larec_str_iZ, + /*0x0585*/ (uintptr_t) &_file_LarkE, + /*0x0586*/ (uintptr_t) &_file_LarkJ, + /*0x0587*/ (uintptr_t) &_file_LarkP, + /*0x0588*/ (uintptr_t) &_file_Lark_str_gZ, + /*0x0589*/ (uintptr_t) &_file_Lark_str_fZ, + /*0x058a*/ (uintptr_t) &_file_Lark_str_sZ, + /*0x058b*/ (uintptr_t) &_file_Lark_str_iZ, + /*0x058c*/ (uintptr_t) &_file_LashE, + /*0x058d*/ (uintptr_t) &_file_LashJ, + /*0x058e*/ (uintptr_t) &_file_LashP, + /*0x058f*/ (uintptr_t) &_file_Lash_str_gZ, + /*0x0590*/ (uintptr_t) &_file_Lash_str_fZ, + /*0x0591*/ (uintptr_t) &_file_Lash_str_sZ, + /*0x0592*/ (uintptr_t) &_file_Lash_str_iZ, + /*0x0593*/ (uintptr_t) &_file_LateE, + /*0x0594*/ (uintptr_t) &_file_LateJ, + /*0x0595*/ (uintptr_t) &_file_LateP, + /*0x0596*/ (uintptr_t) &_file_Late_str_gZ, + /*0x0597*/ (uintptr_t) &_file_Late_str_fZ, + /*0x0598*/ (uintptr_t) &_file_Late_str_sZ, + /*0x0599*/ (uintptr_t) &_file_Late_str_iZ, + /*0x059a*/ (uintptr_t) &_file_LaztE, + /*0x059b*/ (uintptr_t) &_file_LaztJ, + /*0x059c*/ (uintptr_t) &_file_LaztP, + /*0x059d*/ (uintptr_t) &_file_Lazt_str_gZ, + /*0x059e*/ (uintptr_t) &_file_Lazt_str_fZ, + /*0x059f*/ (uintptr_t) &_file_Lazt_str_sZ, + /*0x05a0*/ (uintptr_t) &_file_Lazt_str_iZ, + /*0x05a1*/ (uintptr_t) &_file_LcatE, + /*0x05a2*/ (uintptr_t) &_file_LcatJ, + /*0x05a3*/ (uintptr_t) &_file_LcatP, + /*0x05a4*/ (uintptr_t) &_file_Lcat_str_gZ, + /*0x05a5*/ (uintptr_t) &_file_Lcat_str_fZ, + /*0x05a6*/ (uintptr_t) &_file_Lcat_str_sZ, + /*0x05a7*/ (uintptr_t) &_file_Lcat_str_iZ, + /*0x05a8*/ (uintptr_t) &_file_LcaveE, + /*0x05a9*/ (uintptr_t) &_file_LcaveJ, + /*0x05aa*/ (uintptr_t) &_file_LcaveP, + /*0x05ab*/ (uintptr_t) &_file_Lcave_str_gZ, + /*0x05ac*/ (uintptr_t) &_file_Lcave_str_fZ, + /*0x05ad*/ (uintptr_t) &_file_Lcave_str_sZ, + /*0x05ae*/ (uintptr_t) &_file_Lcave_str_iZ, + /*0x05af*/ (uintptr_t) &_file_LcradE, + /*0x05b0*/ (uintptr_t) &_file_LcradJ, + /*0x05b1*/ (uintptr_t) &_file_LcradP, + /*0x05b2*/ (uintptr_t) &_file_Lcrad_str_gZ, + /*0x05b3*/ (uintptr_t) &_file_Lcrad_str_fZ, + /*0x05b4*/ (uintptr_t) &_file_Lcrad_str_sZ, + /*0x05b5*/ (uintptr_t) &_file_Lcrad_str_iZ, + /*0x05b6*/ (uintptr_t) &_file_LcrypE, + /*0x05b7*/ (uintptr_t) &_file_LcrypJ, + /*0x05b8*/ (uintptr_t) &_file_LcrypP, + /*0x05b9*/ (uintptr_t) &_file_Lcryp_str_gZ, + /*0x05ba*/ (uintptr_t) &_file_Lcryp_str_fZ, + /*0x05bb*/ (uintptr_t) &_file_Lcryp_str_sZ, + /*0x05bc*/ (uintptr_t) &_file_Lcryp_str_iZ, + /*0x05bd*/ (uintptr_t) &_file_LdamE, + /*0x05be*/ (uintptr_t) &_file_LdamJ, + /*0x05bf*/ (uintptr_t) &_file_LdamP, + /*0x05c0*/ (uintptr_t) &_file_Ldam_str_gZ, + /*0x05c1*/ (uintptr_t) &_file_Ldam_str_fZ, + /*0x05c2*/ (uintptr_t) &_file_Ldam_str_sZ, + /*0x05c3*/ (uintptr_t) &_file_Ldam_str_iZ, + /*0x05c4*/ (uintptr_t) &_file_LdepoE, + /*0x05c5*/ (uintptr_t) &_file_LdepoJ, + /*0x05c6*/ (uintptr_t) &_file_LdepoP, + /*0x05c7*/ (uintptr_t) &_file_Ldepo_str_gZ, + /*0x05c8*/ (uintptr_t) &_file_Ldepo_str_fZ, + /*0x05c9*/ (uintptr_t) &_file_Ldepo_str_sZ, + /*0x05ca*/ (uintptr_t) &_file_Ldepo_str_iZ, + /*0x05cb*/ (uintptr_t) &_file_LdestE, + /*0x05cc*/ (uintptr_t) &_file_LdestJ, + /*0x05cd*/ (uintptr_t) &_file_LdestP, + /*0x05ce*/ (uintptr_t) &_file_Ldest_str_gZ, + /*0x05cf*/ (uintptr_t) &_file_Ldest_str_fZ, + /*0x05d0*/ (uintptr_t) &_file_Ldest_str_sZ, + /*0x05d1*/ (uintptr_t) &_file_Ldest_str_iZ, + /*0x05d2*/ (uintptr_t) &_file_LdishE, + /*0x05d3*/ (uintptr_t) &_file_LdishJ, + /*0x05d4*/ (uintptr_t) &_file_LdishP, + /*0x05d5*/ (uintptr_t) &_file_Ldish_str_gZ, + /*0x05d6*/ (uintptr_t) &_file_Ldish_str_fZ, + /*0x05d7*/ (uintptr_t) &_file_Ldish_str_sZ, + /*0x05d8*/ (uintptr_t) &_file_Ldish_str_iZ, + /*0x05d9*/ (uintptr_t) &_file_LearE, + /*0x05da*/ (uintptr_t) &_file_LearJ, + /*0x05db*/ (uintptr_t) &_file_LearP, + /*0x05dc*/ (uintptr_t) &_file_Lear_str_gZ, + /*0x05dd*/ (uintptr_t) &_file_Lear_str_fZ, + /*0x05de*/ (uintptr_t) &_file_Lear_str_sZ, + /*0x05df*/ (uintptr_t) &_file_Lear_str_iZ, + /*0x05e0*/ (uintptr_t) &_file_LeldE, + /*0x05e1*/ (uintptr_t) &_file_LeldJ, + /*0x05e2*/ (uintptr_t) &_file_LeldP, + /*0x05e3*/ (uintptr_t) &_file_Leld_str_gZ, + /*0x05e4*/ (uintptr_t) &_file_Leld_str_fZ, + /*0x05e5*/ (uintptr_t) &_file_Leld_str_sZ, + /*0x05e6*/ (uintptr_t) &_file_Leld_str_iZ, + /*0x05e7*/ (uintptr_t) &_file_LgunE, + /*0x05e8*/ (uintptr_t) &_file_LgunJ, + /*0x05e9*/ (uintptr_t) &_file_LgunP, + /*0x05ea*/ (uintptr_t) &_file_Lgun_str_gZ, + /*0x05eb*/ (uintptr_t) &_file_Lgun_str_fZ, + /*0x05ec*/ (uintptr_t) &_file_Lgun_str_sZ, + /*0x05ed*/ (uintptr_t) &_file_Lgun_str_iZ, + /*0x05ee*/ (uintptr_t) &_file_LimpE, + /*0x05ef*/ (uintptr_t) &_file_LimpJ, + /*0x05f0*/ (uintptr_t) &_file_LimpP, + /*0x05f1*/ (uintptr_t) &_file_Limp_str_gZ, + /*0x05f2*/ (uintptr_t) &_file_Limp_str_fZ, + /*0x05f3*/ (uintptr_t) &_file_Limp_str_sZ, + /*0x05f4*/ (uintptr_t) &_file_Limp_str_iZ, + /*0x05f5*/ (uintptr_t) &_file_LjunE, + /*0x05f6*/ (uintptr_t) &_file_LjunJ, + /*0x05f7*/ (uintptr_t) &_file_LjunP, + /*0x05f8*/ (uintptr_t) &_file_Ljun_str_gZ, + /*0x05f9*/ (uintptr_t) &_file_Ljun_str_fZ, + /*0x05fa*/ (uintptr_t) &_file_Ljun_str_sZ, + /*0x05fb*/ (uintptr_t) &_file_Ljun_str_iZ, + /*0x05fc*/ (uintptr_t) &_file_LlamE, + /*0x05fd*/ (uintptr_t) &_file_LlamJ, + /*0x05fe*/ (uintptr_t) &_file_LlamP, + /*0x05ff*/ (uintptr_t) &_file_Llam_str_gZ, + /*0x0600*/ (uintptr_t) &_file_Llam_str_fZ, + /*0x0601*/ (uintptr_t) &_file_Llam_str_sZ, + /*0x0602*/ (uintptr_t) &_file_Llam_str_iZ, + /*0x0603*/ (uintptr_t) &_file_LleeE, + /*0x0604*/ (uintptr_t) &_file_LleeJ, + /*0x0605*/ (uintptr_t) &_file_LleeP, + /*0x0606*/ (uintptr_t) &_file_Llee_str_gZ, + /*0x0607*/ (uintptr_t) &_file_Llee_str_fZ, + /*0x0608*/ (uintptr_t) &_file_Llee_str_sZ, + /*0x0609*/ (uintptr_t) &_file_Llee_str_iZ, + /*0x060a*/ (uintptr_t) &_file_LlenE, + /*0x060b*/ (uintptr_t) &_file_LlenJ, + /*0x060c*/ (uintptr_t) &_file_LlenP, + /*0x060d*/ (uintptr_t) &_file_Llen_str_gZ, + /*0x060e*/ (uintptr_t) &_file_Llen_str_fZ, + /*0x060f*/ (uintptr_t) &_file_Llen_str_sZ, + /*0x0610*/ (uintptr_t) &_file_Llen_str_iZ, + /*0x0611*/ (uintptr_t) &_file_LlipE, + /*0x0612*/ (uintptr_t) &_file_LlipJ, + /*0x0613*/ (uintptr_t) &_file_LlipP, + /*0x0614*/ (uintptr_t) &_file_Llip_str_gZ, + /*0x0615*/ (uintptr_t) &_file_Llip_str_fZ, + /*0x0616*/ (uintptr_t) &_file_Llip_str_sZ, + /*0x0617*/ (uintptr_t) &_file_Llip_str_iZ, + /*0x0618*/ (uintptr_t) &_file_LlueE, + /*0x0619*/ (uintptr_t) &_file_LlueJ, + /*0x061a*/ (uintptr_t) &_file_LlueP, + /*0x061b*/ (uintptr_t) &_file_Llue_str_gZ, + /*0x061c*/ (uintptr_t) &_file_Llue_str_fZ, + /*0x061d*/ (uintptr_t) &_file_Llue_str_sZ, + /*0x061e*/ (uintptr_t) &_file_Llue_str_iZ, + /*0x061f*/ (uintptr_t) &_file_LmiscE, + /*0x0620*/ (uintptr_t) &_file_LmiscJ, + /*0x0621*/ (uintptr_t) &_file_LmiscP, + /*0x0622*/ (uintptr_t) &_file_Lmisc_str_gZ, + /*0x0623*/ (uintptr_t) &_file_Lmisc_str_fZ, + /*0x0624*/ (uintptr_t) &_file_Lmisc_str_sZ, + /*0x0625*/ (uintptr_t) &_file_Lmisc_str_iZ, + /*0x0626*/ (uintptr_t) &_file_Lmp10E, + /*0x0627*/ (uintptr_t) &_file_Lmp10J, + /*0x0628*/ (uintptr_t) &_file_Lmp10P, + /*0x0629*/ (uintptr_t) &_file_Lmp10_str_gZ, + /*0x062a*/ (uintptr_t) &_file_Lmp10_str_fZ, + /*0x062b*/ (uintptr_t) &_file_Lmp10_str_sZ, + /*0x062c*/ (uintptr_t) &_file_Lmp10_str_iZ, + /*0x062d*/ (uintptr_t) &_file_Lmp11E, + /*0x062e*/ (uintptr_t) &_file_Lmp11J, + /*0x062f*/ (uintptr_t) &_file_Lmp11P, + /*0x0630*/ (uintptr_t) &_file_Lmp11_str_gZ, + /*0x0631*/ (uintptr_t) &_file_Lmp11_str_fZ, + /*0x0632*/ (uintptr_t) &_file_Lmp11_str_sZ, + /*0x0633*/ (uintptr_t) &_file_Lmp11_str_iZ, + /*0x0634*/ (uintptr_t) &_file_Lmp12E, + /*0x0635*/ (uintptr_t) &_file_Lmp12J, + /*0x0636*/ (uintptr_t) &_file_Lmp12P, + /*0x0637*/ (uintptr_t) &_file_Lmp12_str_gZ, + /*0x0638*/ (uintptr_t) &_file_Lmp12_str_fZ, + /*0x0639*/ (uintptr_t) &_file_Lmp12_str_sZ, + /*0x063a*/ (uintptr_t) &_file_Lmp12_str_iZ, + /*0x063b*/ (uintptr_t) &_file_Lmp13E, + /*0x063c*/ (uintptr_t) &_file_Lmp13J, + /*0x063d*/ (uintptr_t) &_file_Lmp13P, + /*0x063e*/ (uintptr_t) &_file_Lmp13_str_gZ, + /*0x063f*/ (uintptr_t) &_file_Lmp13_str_fZ, + /*0x0640*/ (uintptr_t) &_file_Lmp13_str_sZ, + /*0x0641*/ (uintptr_t) &_file_Lmp13_str_iZ, + /*0x0642*/ (uintptr_t) &_file_Lmp14E, + /*0x0643*/ (uintptr_t) &_file_Lmp14J, + /*0x0644*/ (uintptr_t) &_file_Lmp14P, + /*0x0645*/ (uintptr_t) &_file_Lmp14_str_gZ, + /*0x0646*/ (uintptr_t) &_file_Lmp14_str_fZ, + /*0x0647*/ (uintptr_t) &_file_Lmp14_str_sZ, + /*0x0648*/ (uintptr_t) &_file_Lmp14_str_iZ, + /*0x0649*/ (uintptr_t) &_file_Lmp15E, + /*0x064a*/ (uintptr_t) &_file_Lmp15J, + /*0x064b*/ (uintptr_t) &_file_Lmp15P, + /*0x064c*/ (uintptr_t) &_file_Lmp15_str_gZ, + /*0x064d*/ (uintptr_t) &_file_Lmp15_str_fZ, + /*0x064e*/ (uintptr_t) &_file_Lmp15_str_sZ, + /*0x064f*/ (uintptr_t) &_file_Lmp15_str_iZ, + /*0x0650*/ (uintptr_t) &_file_Lmp16E, + /*0x0651*/ (uintptr_t) &_file_Lmp16J, + /*0x0652*/ (uintptr_t) &_file_Lmp16P, + /*0x0653*/ (uintptr_t) &_file_Lmp16_str_gZ, + /*0x0654*/ (uintptr_t) &_file_Lmp16_str_fZ, + /*0x0655*/ (uintptr_t) &_file_Lmp16_str_sZ, + /*0x0656*/ (uintptr_t) &_file_Lmp16_str_iZ, + /*0x0657*/ (uintptr_t) &_file_Lmp17E, + /*0x0658*/ (uintptr_t) &_file_Lmp17J, + /*0x0659*/ (uintptr_t) &_file_Lmp17P, + /*0x065a*/ (uintptr_t) &_file_Lmp17_str_gZ, + /*0x065b*/ (uintptr_t) &_file_Lmp17_str_fZ, + /*0x065c*/ (uintptr_t) &_file_Lmp17_str_sZ, + /*0x065d*/ (uintptr_t) &_file_Lmp17_str_iZ, + /*0x065e*/ (uintptr_t) &_file_Lmp18E, + /*0x065f*/ (uintptr_t) &_file_Lmp18J, + /*0x0660*/ (uintptr_t) &_file_Lmp18P, + /*0x0661*/ (uintptr_t) &_file_Lmp18_str_gZ, + /*0x0662*/ (uintptr_t) &_file_Lmp18_str_fZ, + /*0x0663*/ (uintptr_t) &_file_Lmp18_str_sZ, + /*0x0664*/ (uintptr_t) &_file_Lmp18_str_iZ, + /*0x0665*/ (uintptr_t) &_file_Lmp19E, + /*0x0666*/ (uintptr_t) &_file_Lmp19J, + /*0x0667*/ (uintptr_t) &_file_Lmp19P, + /*0x0668*/ (uintptr_t) &_file_Lmp19_str_gZ, + /*0x0669*/ (uintptr_t) &_file_Lmp19_str_fZ, + /*0x066a*/ (uintptr_t) &_file_Lmp19_str_sZ, + /*0x066b*/ (uintptr_t) &_file_Lmp19_str_iZ, + /*0x066c*/ (uintptr_t) &_file_Lmp1E, + /*0x066d*/ (uintptr_t) &_file_Lmp1J, + /*0x066e*/ (uintptr_t) &_file_Lmp1P, + /*0x066f*/ (uintptr_t) &_file_Lmp1_str_gZ, + /*0x0670*/ (uintptr_t) &_file_Lmp1_str_fZ, + /*0x0671*/ (uintptr_t) &_file_Lmp1_str_sZ, + /*0x0672*/ (uintptr_t) &_file_Lmp1_str_iZ, + /*0x0673*/ (uintptr_t) &_file_Lmp20E, + /*0x0674*/ (uintptr_t) &_file_Lmp20J, + /*0x0675*/ (uintptr_t) &_file_Lmp20P, + /*0x0676*/ (uintptr_t) &_file_Lmp20_str_gZ, + /*0x0677*/ (uintptr_t) &_file_Lmp20_str_fZ, + /*0x0678*/ (uintptr_t) &_file_Lmp20_str_sZ, + /*0x0679*/ (uintptr_t) &_file_Lmp20_str_iZ, + /*0x067a*/ (uintptr_t) &_file_Lmp2E, + /*0x067b*/ (uintptr_t) &_file_Lmp2J, + /*0x067c*/ (uintptr_t) &_file_Lmp2P, + /*0x067d*/ (uintptr_t) &_file_Lmp2_str_gZ, + /*0x067e*/ (uintptr_t) &_file_Lmp2_str_fZ, + /*0x067f*/ (uintptr_t) &_file_Lmp2_str_sZ, + /*0x0680*/ (uintptr_t) &_file_Lmp2_str_iZ, + /*0x0681*/ (uintptr_t) &_file_Lmp3E, + /*0x0682*/ (uintptr_t) &_file_Lmp3J, + /*0x0683*/ (uintptr_t) &_file_Lmp3P, + /*0x0684*/ (uintptr_t) &_file_Lmp3_str_gZ, + /*0x0685*/ (uintptr_t) &_file_Lmp3_str_fZ, + /*0x0686*/ (uintptr_t) &_file_Lmp3_str_sZ, + /*0x0687*/ (uintptr_t) &_file_Lmp3_str_iZ, + /*0x0688*/ (uintptr_t) &_file_Lmp4E, + /*0x0689*/ (uintptr_t) &_file_Lmp4J, + /*0x068a*/ (uintptr_t) &_file_Lmp4P, + /*0x068b*/ (uintptr_t) &_file_Lmp4_str_gZ, + /*0x068c*/ (uintptr_t) &_file_Lmp4_str_fZ, + /*0x068d*/ (uintptr_t) &_file_Lmp4_str_sZ, + /*0x068e*/ (uintptr_t) &_file_Lmp4_str_iZ, + /*0x068f*/ (uintptr_t) &_file_Lmp5E, + /*0x0690*/ (uintptr_t) &_file_Lmp5J, + /*0x0691*/ (uintptr_t) &_file_Lmp5P, + /*0x0692*/ (uintptr_t) &_file_Lmp5_str_gZ, + /*0x0693*/ (uintptr_t) &_file_Lmp5_str_fZ, + /*0x0694*/ (uintptr_t) &_file_Lmp5_str_sZ, + /*0x0695*/ (uintptr_t) &_file_Lmp5_str_iZ, + /*0x0696*/ (uintptr_t) &_file_Lmp6E, + /*0x0697*/ (uintptr_t) &_file_Lmp6J, + /*0x0698*/ (uintptr_t) &_file_Lmp6P, + /*0x0699*/ (uintptr_t) &_file_Lmp6_str_gZ, + /*0x069a*/ (uintptr_t) &_file_Lmp6_str_fZ, + /*0x069b*/ (uintptr_t) &_file_Lmp6_str_sZ, + /*0x069c*/ (uintptr_t) &_file_Lmp6_str_iZ, + /*0x069d*/ (uintptr_t) &_file_Lmp7E, + /*0x069e*/ (uintptr_t) &_file_Lmp7J, + /*0x069f*/ (uintptr_t) &_file_Lmp7P, + /*0x06a0*/ (uintptr_t) &_file_Lmp7_str_gZ, + /*0x06a1*/ (uintptr_t) &_file_Lmp7_str_fZ, + /*0x06a2*/ (uintptr_t) &_file_Lmp7_str_sZ, + /*0x06a3*/ (uintptr_t) &_file_Lmp7_str_iZ, + /*0x06a4*/ (uintptr_t) &_file_Lmp8E, + /*0x06a5*/ (uintptr_t) &_file_Lmp8J, + /*0x06a6*/ (uintptr_t) &_file_Lmp8P, + /*0x06a7*/ (uintptr_t) &_file_Lmp8_str_gZ, + /*0x06a8*/ (uintptr_t) &_file_Lmp8_str_fZ, + /*0x06a9*/ (uintptr_t) &_file_Lmp8_str_sZ, + /*0x06aa*/ (uintptr_t) &_file_Lmp8_str_iZ, + /*0x06ab*/ (uintptr_t) &_file_Lmp9E, + /*0x06ac*/ (uintptr_t) &_file_Lmp9J, + /*0x06ad*/ (uintptr_t) &_file_Lmp9P, + /*0x06ae*/ (uintptr_t) &_file_Lmp9_str_gZ, + /*0x06af*/ (uintptr_t) &_file_Lmp9_str_fZ, + /*0x06b0*/ (uintptr_t) &_file_Lmp9_str_sZ, + /*0x06b1*/ (uintptr_t) &_file_Lmp9_str_iZ, + /*0x06b2*/ (uintptr_t) &_file_LmpmenuE, + /*0x06b3*/ (uintptr_t) &_file_LmpmenuJ, + /*0x06b4*/ (uintptr_t) &_file_LmpmenuP, + /*0x06b5*/ (uintptr_t) &_file_Lmpmenu_str_gZ, + /*0x06b6*/ (uintptr_t) &_file_Lmpmenu_str_fZ, + /*0x06b7*/ (uintptr_t) &_file_Lmpmenu_str_sZ, + /*0x06b8*/ (uintptr_t) &_file_Lmpmenu_str_iZ, + /*0x06b9*/ (uintptr_t) &_file_LmpweaponsE, + /*0x06ba*/ (uintptr_t) &_file_LmpweaponsJ, + /*0x06bb*/ (uintptr_t) &_file_LmpweaponsP, + /*0x06bc*/ (uintptr_t) &_file_Lmpweapons_str_gZ, + /*0x06bd*/ (uintptr_t) &_file_Lmpweapons_str_fZ, + /*0x06be*/ (uintptr_t) &_file_Lmpweapons_str_sZ, + /*0x06bf*/ (uintptr_t) &_file_Lmpweapons_str_iZ, + /*0x06c0*/ (uintptr_t) &_file_LoatE, + /*0x06c1*/ (uintptr_t) &_file_LoatJ, + /*0x06c2*/ (uintptr_t) &_file_LoatP, + /*0x06c3*/ (uintptr_t) &_file_Loat_str_gZ, + /*0x06c4*/ (uintptr_t) &_file_Loat_str_fZ, + /*0x06c5*/ (uintptr_t) &_file_Loat_str_sZ, + /*0x06c6*/ (uintptr_t) &_file_Loat_str_iZ, + /*0x06c7*/ (uintptr_t) &_file_LoldE, + /*0x06c8*/ (uintptr_t) &_file_LoldJ, + /*0x06c9*/ (uintptr_t) &_file_LoldP, + /*0x06ca*/ (uintptr_t) &_file_Lold_str_gZ, + /*0x06cb*/ (uintptr_t) &_file_Lold_str_fZ, + /*0x06cc*/ (uintptr_t) &_file_Lold_str_sZ, + /*0x06cd*/ (uintptr_t) &_file_Lold_str_iZ, + /*0x06ce*/ (uintptr_t) &_file_LoptionsE, + /*0x06cf*/ (uintptr_t) &_file_LoptionsJ, + /*0x06d0*/ (uintptr_t) &_file_LoptionsP, + /*0x06d1*/ (uintptr_t) &_file_Loptions_str_gZ, + /*0x06d2*/ (uintptr_t) &_file_Loptions_str_fZ, + /*0x06d3*/ (uintptr_t) &_file_Loptions_str_sZ, + /*0x06d4*/ (uintptr_t) &_file_Loptions_str_iZ, + /*0x06d5*/ (uintptr_t) &_file_LpamE, + /*0x06d6*/ (uintptr_t) &_file_LpamJ, + /*0x06d7*/ (uintptr_t) &_file_LpamP, + /*0x06d8*/ (uintptr_t) &_file_Lpam_str_gZ, + /*0x06d9*/ (uintptr_t) &_file_Lpam_str_fZ, + /*0x06da*/ (uintptr_t) &_file_Lpam_str_sZ, + /*0x06db*/ (uintptr_t) &_file_Lpam_str_iZ, + /*0x06dc*/ (uintptr_t) &_file_LpeteE, + /*0x06dd*/ (uintptr_t) &_file_LpeteJ, + /*0x06de*/ (uintptr_t) &_file_LpeteP, + /*0x06df*/ (uintptr_t) &_file_Lpete_str_gZ, + /*0x06e0*/ (uintptr_t) &_file_Lpete_str_fZ, + /*0x06e1*/ (uintptr_t) &_file_Lpete_str_sZ, + /*0x06e2*/ (uintptr_t) &_file_Lpete_str_iZ, + /*0x06e3*/ (uintptr_t) &_file_LpropobjE, + /*0x06e4*/ (uintptr_t) &_file_LpropobjJ, + /*0x06e5*/ (uintptr_t) &_file_LpropobjP, + /*0x06e6*/ (uintptr_t) &_file_Lpropobj_str_gZ, + /*0x06e7*/ (uintptr_t) &_file_Lpropobj_str_fZ, + /*0x06e8*/ (uintptr_t) &_file_Lpropobj_str_sZ, + /*0x06e9*/ (uintptr_t) &_file_Lpropobj_str_iZ, + /*0x06ea*/ (uintptr_t) &_file_LrefE, + /*0x06eb*/ (uintptr_t) &_file_LrefJ, + /*0x06ec*/ (uintptr_t) &_file_LrefP, + /*0x06ed*/ (uintptr_t) &_file_Lref_str_gZ, + /*0x06ee*/ (uintptr_t) &_file_Lref_str_fZ, + /*0x06ef*/ (uintptr_t) &_file_Lref_str_sZ, + /*0x06f0*/ (uintptr_t) &_file_Lref_str_iZ, + /*0x06f1*/ (uintptr_t) &_file_LritE, + /*0x06f2*/ (uintptr_t) &_file_LritJ, + /*0x06f3*/ (uintptr_t) &_file_LritP, + /*0x06f4*/ (uintptr_t) &_file_Lrit_str_gZ, + /*0x06f5*/ (uintptr_t) &_file_Lrit_str_fZ, + /*0x06f6*/ (uintptr_t) &_file_Lrit_str_sZ, + /*0x06f7*/ (uintptr_t) &_file_Lrit_str_iZ, + /*0x06f8*/ (uintptr_t) &_file_LrunE, + /*0x06f9*/ (uintptr_t) &_file_LrunJ, + /*0x06fa*/ (uintptr_t) &_file_LrunP, + /*0x06fb*/ (uintptr_t) &_file_Lrun_str_gZ, + /*0x06fc*/ (uintptr_t) &_file_Lrun_str_fZ, + /*0x06fd*/ (uintptr_t) &_file_Lrun_str_sZ, + /*0x06fe*/ (uintptr_t) &_file_Lrun_str_iZ, + /*0x06ff*/ (uintptr_t) &_file_LsevE, + /*0x0700*/ (uintptr_t) &_file_LsevJ, + /*0x0701*/ (uintptr_t) &_file_LsevP, + /*0x0702*/ (uintptr_t) &_file_Lsev_str_gZ, + /*0x0703*/ (uintptr_t) &_file_Lsev_str_fZ, + /*0x0704*/ (uintptr_t) &_file_Lsev_str_sZ, + /*0x0705*/ (uintptr_t) &_file_Lsev_str_iZ, + /*0x0706*/ (uintptr_t) &_file_LsevbE, + /*0x0707*/ (uintptr_t) &_file_LsevbJ, + /*0x0708*/ (uintptr_t) &_file_LsevbP, + /*0x0709*/ (uintptr_t) &_file_Lsevb_str_gZ, + /*0x070a*/ (uintptr_t) &_file_Lsevb_str_fZ, + /*0x070b*/ (uintptr_t) &_file_Lsevb_str_sZ, + /*0x070c*/ (uintptr_t) &_file_Lsevb_str_iZ, + /*0x070d*/ (uintptr_t) &_file_LsevxE, + /*0x070e*/ (uintptr_t) &_file_LsevxJ, + /*0x070f*/ (uintptr_t) &_file_LsevxP, + /*0x0710*/ (uintptr_t) &_file_Lsevx_str_gZ, + /*0x0711*/ (uintptr_t) &_file_Lsevx_str_fZ, + /*0x0712*/ (uintptr_t) &_file_Lsevx_str_sZ, + /*0x0713*/ (uintptr_t) &_file_Lsevx_str_iZ, + /*0x0714*/ (uintptr_t) &_file_LsevxbE, + /*0x0715*/ (uintptr_t) &_file_LsevxbJ, + /*0x0716*/ (uintptr_t) &_file_LsevxbP, + /*0x0717*/ (uintptr_t) &_file_Lsevxb_str_gZ, + /*0x0718*/ (uintptr_t) &_file_Lsevxb_str_fZ, + /*0x0719*/ (uintptr_t) &_file_Lsevxb_str_sZ, + /*0x071a*/ (uintptr_t) &_file_Lsevxb_str_iZ, + /*0x071b*/ (uintptr_t) &_file_LshoE, + /*0x071c*/ (uintptr_t) &_file_LshoJ, + /*0x071d*/ (uintptr_t) &_file_LshoP, + /*0x071e*/ (uintptr_t) &_file_Lsho_str_gZ, + /*0x071f*/ (uintptr_t) &_file_Lsho_str_fZ, + /*0x0720*/ (uintptr_t) &_file_Lsho_str_sZ, + /*0x0721*/ (uintptr_t) &_file_Lsho_str_iZ, + /*0x0722*/ (uintptr_t) &_file_LsiloE, + /*0x0723*/ (uintptr_t) &_file_LsiloJ, + /*0x0724*/ (uintptr_t) &_file_LsiloP, + /*0x0725*/ (uintptr_t) &_file_Lsilo_str_gZ, + /*0x0726*/ (uintptr_t) &_file_Lsilo_str_fZ, + /*0x0727*/ (uintptr_t) &_file_Lsilo_str_sZ, + /*0x0728*/ (uintptr_t) &_file_Lsilo_str_iZ, + /*0x0729*/ (uintptr_t) &_file_LstatE, + /*0x072a*/ (uintptr_t) &_file_LstatJ, + /*0x072b*/ (uintptr_t) &_file_LstatP, + /*0x072c*/ (uintptr_t) &_file_Lstat_str_gZ, + /*0x072d*/ (uintptr_t) &_file_Lstat_str_fZ, + /*0x072e*/ (uintptr_t) &_file_Lstat_str_sZ, + /*0x072f*/ (uintptr_t) &_file_Lstat_str_iZ, + /*0x0730*/ (uintptr_t) &_file_LtitleE, + /*0x0731*/ (uintptr_t) &_file_LtitleJ, + /*0x0732*/ (uintptr_t) &_file_LtitleP, + /*0x0733*/ (uintptr_t) &_file_Ltitle_str_gZ, + /*0x0734*/ (uintptr_t) &_file_Ltitle_str_fZ, + /*0x0735*/ (uintptr_t) &_file_Ltitle_str_sZ, + /*0x0736*/ (uintptr_t) &_file_Ltitle_str_iZ, + /*0x0737*/ (uintptr_t) &_file_LtraE, + /*0x0738*/ (uintptr_t) &_file_LtraJ, + /*0x0739*/ (uintptr_t) &_file_LtraP, + /*0x073a*/ (uintptr_t) &_file_Ltra_str_gZ, + /*0x073b*/ (uintptr_t) &_file_Ltra_str_fZ, + /*0x073c*/ (uintptr_t) &_file_Ltra_str_sZ, + /*0x073d*/ (uintptr_t) &_file_Ltra_str_iZ, + /*0x073e*/ (uintptr_t) &_file_LuffE, + /*0x073f*/ (uintptr_t) &_file_LuffJ, + /*0x0740*/ (uintptr_t) &_file_LuffP, + /*0x0741*/ (uintptr_t) &_file_Luff_str_gZ, + /*0x0742*/ (uintptr_t) &_file_Luff_str_fZ, + /*0x0743*/ (uintptr_t) &_file_Luff_str_sZ, + /*0x0744*/ (uintptr_t) &_file_Luff_str_iZ, + /*0x0745*/ (uintptr_t) &_file_LwaxE, + /*0x0746*/ (uintptr_t) &_file_LwaxJ, + /*0x0747*/ (uintptr_t) &_file_LwaxP, + /*0x0748*/ (uintptr_t) &_file_Lwax_str_gZ, + /*0x0749*/ (uintptr_t) &_file_Lwax_str_fZ, + /*0x074a*/ (uintptr_t) &_file_Lwax_str_sZ, + /*0x074b*/ (uintptr_t) &_file_Lwax_str_iZ, + /*0x074c*/ (uintptr_t) &_file_Pa51grateZ, + /*0x074d*/ (uintptr_t) &_file_GecmmineZ, + /*0x074e*/ (uintptr_t) &_file_GcommsuplinkZ, + /*0x074f*/ (uintptr_t) &_file_GirscannerZ, + /*0x0750*/ (uintptr_t) &_file_Paf1escapedoorZ, + /*0x0751*/ (uintptr_t) &_file_PprescapsuleZ, + /*0x0752*/ (uintptr_t) &_file_PskedarbridgeZ, + /*0x0753*/ (uintptr_t) &_file_Ppelagicdoor2Z, + /*0x0754*/ (uintptr_t) &_file_Avault2M, + /*0x0755*/ (uintptr_t) &_file_Ap29_12_elM, + /*0x0756*/ (uintptr_t) &_file_Pttb_boxZ, + /*0x0757*/ (uintptr_t) &_file_PinstfrontdoorZ, + /*0x0758*/ (uintptr_t) &_file_Ap14_09_joM, + /*0x0759*/ (uintptr_t) &_file_Ap19_07_joM, + /*0x075a*/ (uintptr_t) &_file_Ap19_08_joM, + /*0x075b*/ (uintptr_t) &_file_PchrlaserZ, + /*0x075c*/ (uintptr_t) &_file_PbaftaZ, + /*0x075d*/ (uintptr_t) &_file_PchrsonicscrewerZ, + /*0x075e*/ (uintptr_t) &_file_PchrlumphammerZ, + /*0x075f*/ (uintptr_t) &_file_PskedarbombZ, + /*0x0760*/ (uintptr_t) &_file_PexplosivebrickZ, + /*0x0761*/ (uintptr_t) &_file_PresearchtapeZ, + /*0x0762*/ (uintptr_t) &_file_PziggycardZ, + /*0x0763*/ (uintptr_t) &_file_PsafeitemZ, + /*0x0764*/ (uintptr_t) &_file_Ghand_elvisZ, + /*0x0765*/ (uintptr_t) &_file_Paf1_tableZ, + /*0x0766*/ (uintptr_t) &_file_Ghand_a51guardZ, + /*0x0767*/ (uintptr_t) &_file_Ghand_ddshockZ, + /*0x0768*/ (uintptr_t) &_file_Ghand_blackguardZ, + /*0x0769*/ (uintptr_t) &_file_Ghand_ddfodderZ, + /*0x076a*/ (uintptr_t) &_file_Ghand_ddbioZ, + /*0x076b*/ (uintptr_t) &_file_Ghand_a51airmanZ, + /*0x076c*/ (uintptr_t) &_file_Ghand_g5guardZ, + /*0x076d*/ (uintptr_t) &_file_Ghand_cisoldierZ, + /*0x076e*/ (uintptr_t) &_file_PsensitiveinfoZ, + /*0x076f*/ (uintptr_t) &_file_PrussdarZ, + /*0x0770*/ (uintptr_t) &_file_PxrayspecsZ, + /*0x0771*/ (uintptr_t) &_file_PchreyespyZ, + /*0x0772*/ (uintptr_t) &_file_PchrdoordecoderZ, + /*0x0773*/ (uintptr_t) &_file_PbriefcaseZ, + /*0x0774*/ (uintptr_t) &_file_PsuitcaseZ, + /*0x0775*/ (uintptr_t) &_file_PshuttledoorZ, + /*0x0776*/ (uintptr_t) &_file_PruinbridgeZ, + /*0x0777*/ (uintptr_t) &_file_PsecretindoorZ, + /*0x0778*/ (uintptr_t) &_file_PskpuzzleobjectZ, + /*0x0779*/ (uintptr_t) &_file_Pa51liftdoorZ, + /*0x077a*/ (uintptr_t) &_file_Acicarr06M, + /*0x077b*/ (uintptr_t) &_file_Acicarr11M, + /*0x077c*/ (uintptr_t) &_file_Acifarr08M, + /*0x077d*/ (uintptr_t) &_file_Acifarr12M, + /*0x077e*/ (uintptr_t) &_file_Acifema01M, + /*0x077f*/ (uintptr_t) &_file_Acifema04M, + /*0x0780*/ (uintptr_t) &_file_Acifema07M, + /*0x0781*/ (uintptr_t) &_file_Acifema08M, + /*0x0782*/ (uintptr_t) &_file_Acifema09M, + /*0x0783*/ (uintptr_t) &_file_Acifema14M, + /*0x0784*/ (uintptr_t) &_file_Acifost08M, + /*0x0785*/ (uintptr_t) &_file_Acifost12M, + /*0x0786*/ (uintptr_t) &_file_Acigrim05M, + /*0x0787*/ (uintptr_t) &_file_Acigrim06M, + /*0x0788*/ (uintptr_t) &_file_Acigrim07M, + /*0x0789*/ (uintptr_t) &_file_Acigrim08M, + /*0x078a*/ (uintptr_t) &_file_Acigrim09M, + /*0x078b*/ (uintptr_t) &_file_Acigrim10M, + /*0x078c*/ (uintptr_t) &_file_Acihopk09M, + /*0x078d*/ (uintptr_t) &_file_Acihopk11M, + /*0x078e*/ (uintptr_t) &_file_Acimale02M, + /*0x078f*/ (uintptr_t) &_file_Acimale03M, + /*0x0790*/ (uintptr_t) &_file_Acimale07M, + /*0x0791*/ (uintptr_t) &_file_Acimale09M, + /*0x0792*/ (uintptr_t) &_file_Acimale11M, + /*0x0793*/ (uintptr_t) &_file_Acimale13M, + /*0x0794*/ (uintptr_t) &_file_Aciroge08M, + /*0x0795*/ (uintptr_t) &_file_Aciroge12M, + /*0x0796*/ (uintptr_t) &_file_Cdark_negotiatorZ, + /*0x0797*/ (uintptr_t) &_file_PcihubZ, + /*0x0798*/ (uintptr_t) &_file_Psk_ship_door2Z, + /*0x0799*/ (uintptr_t) &_file_Psk_window1Z, + /*0x079a*/ (uintptr_t) &_file_Psk_hangardoorb_topZ, + /*0x079b*/ (uintptr_t) &_file_Psk_hangardoorb_botZ, + /*0x079c*/ (uintptr_t) &_file_Paf1_innerdoorZ, + /*0x079d*/ (uintptr_t) &_file_Plaser_postZ, + /*0x079e*/ (uintptr_t) &_file_Atrfost01M, + /*0x079f*/ (uintptr_t) &_file_Atrfost02M, + /*0x07a0*/ (uintptr_t) &_file_Atrfost03M, + /*0x07a1*/ (uintptr_t) &_file_Atrcarr09M, + /*0x07a2*/ (uintptr_t) &_file_Atrcarr10M, + /*0x07a3*/ (uintptr_t) &_file_Atrcarr11M, + /*0x07a4*/ (uintptr_t) &_file_Acifarr01M, + /*0x07a5*/ (uintptr_t) &_file_Acifarr02M, + /*0x07a6*/ (uintptr_t) &_file_Acifarr03M, + /*0x07a7*/ (uintptr_t) &_file_Acigrim01M, + /*0x07a8*/ (uintptr_t) &_file_Acigrim03M, + /*0x07a9*/ (uintptr_t) &_file_Acigrim04M, + /*0x07aa*/ (uintptr_t) &_file_Acihopk01M, + /*0x07ab*/ (uintptr_t) &_file_Acihopk04M, + /*0x07ac*/ (uintptr_t) &_file_Acihopk06M, + /*0x07ad*/ (uintptr_t) &_file_Aciroge01M, + /*0x07ae*/ (uintptr_t) &_file_Aciroge02M, + /*0x07af*/ (uintptr_t) &_file_Atrroge01M, + /*0x07b0*/ (uintptr_t) &_file_Acicarr07M, + /*0x07b1*/ (uintptr_t) &_file_Acicarr08M, + /*0x07b2*/ (uintptr_t) &_file_PtargetampZ, + /*0x07b3*/ (uintptr_t) &_file_Psk_liftZ, + /*0x07b4*/ (uintptr_t) &_file_PknockknockZ, + /*0x07b5*/ (uintptr_t) &_file_PcetandoorZ, + /*0x07b6*/ (uintptr_t) &_file_Ajoinst01M, + /*0x07b7*/ (uintptr_t) &_file_Ajoinst02M, + /*0x07b8*/ (uintptr_t) &_file_Ajoinst03M, + /*0x07b9*/ (uintptr_t) &_file_Ajoinst04M, + /*0x07ba*/ (uintptr_t) &_file_Ap25_03_joM, + /*0x07bb*/ (uintptr_t) &_file_Paf1rubbleZ, + /*0x07bc*/ (uintptr_t) &_file_Pdd_dr_nonrefZ, + /*0x07bd*/ (uintptr_t) &_file_CheadtimZ, + /*0x07be*/ (uintptr_t) &_file_CheadgrantZ, + /*0x07bf*/ (uintptr_t) &_file_CheadpennyZ, + /*0x07c0*/ (uintptr_t) &_file_CheadrobinZ, + /*0x07c1*/ (uintptr_t) &_file_CheadalexZ, + /*0x07c2*/ (uintptr_t) &_file_CheadjulianneZ, + /*0x07c3*/ (uintptr_t) &_file_CheadlauraZ, + /*0x07c4*/ (uintptr_t) &_file_CheaddavecZ, + /*0x07c5*/ (uintptr_t) &_file_CheadkenZ, + /*0x07c6*/ (uintptr_t) &_file_CheadjoelZ, + /*0x07c7*/ (uintptr_t) &_file_PcetandoorsideZ, + /*0x07c8*/ (uintptr_t) &_file_Ap29_13_joM, + /*0x07c9*/ (uintptr_t) &_file_Ap29_14_joM, + /*0x07ca*/ (uintptr_t) &_file_Acicarr09M, + /*0x07cb*/ (uintptr_t) &_file_Acicarr10M, + /*0x07cc*/ (uintptr_t) &_file_PbuddybridgeZ, + /*0x07cd*/ (uintptr_t) &_file_CheadcookZ, + /*0x07ce*/ (uintptr_t) &_file_CheadpryceZ, + /*0x07cf*/ (uintptr_t) &_file_CheadsilkeZ, + /*0x07d0*/ (uintptr_t) &_file_CheadsmithZ, + /*0x07d1*/ (uintptr_t) &_file_CheadgarethZ, + /*0x07d2*/ (uintptr_t) &_file_CheadmurchieZ, + /*0x07d3*/ (uintptr_t) &_file_CheadwongZ, + /*0x07d4*/ (uintptr_t) &_file_CheadcarterZ, + /*0x07d5*/ (uintptr_t) &_file_CheadtintinZ, + /*0x07d6*/ (uintptr_t) &_file_CheadmuntonZ, + /*0x07d7*/ (uintptr_t) &_file_CheadstamperZ, + /*0x07d8*/ (uintptr_t) &_file_CheadjonesZ, + /*0x07d9*/ (uintptr_t) &_file_CheadphelpsZ, + /*0x07da*/ (uintptr_t) &_file_Ap29_15_joM, + /*0x07db*/ (uintptr_t) &_file_Ap16_03_joM, + /*0x07dc*/ (uintptr_t) &_file_Acarrbye02M, #if VERSION >= VERSION_NTSC_1_0 - /*0x07dd*/ (u32) &_file_Asaucerexp1M, + /*0x07dd*/ (uintptr_t) &_file_Asaucerexp1M, #endif #if VERSION == VERSION_JPN_FINAL - /*0x07de*/ (u32) &_file_PjaplogoZ, - /*0x07df*/ (u32) &_file_PjappdZ, + /*0x07de*/ (uintptr_t) &_file_PjaplogoZ, + /*0x07df*/ (uintptr_t) &_file_PjappdZ, #endif - (u32) &_filenamesSegmentRomStart, + (uintptr_t) &_filenamesSegmentRomStart, }; -u32 fileGetRomAddress(s32 filenum) +romptr_t fileGetRomAddress(s32 filenum) { - return (u32)g_FileTable[filenum]; + return (romptr_t) g_FileTable[filenum]; } u32 fileGetRomSizeByTableAddress(u32 *filetableaddr) @@ -4140,7 +4140,7 @@ void fileLoad(u8 *dst, u32 allocationlen, u32 *romaddrptr, struct fileinfo *info // DMA the compressed data to scratch space then inflate u8 *scratch = (dst + allocationlen) - ((romsize + 7) & 0xfffffff8); - if ((u32)scratch - (u32)dst < 8) { + if ((uintptr_t)scratch - (uintptr_t)dst < 8) { info->loadedsize = 0; } else { s32 result; @@ -4195,7 +4195,7 @@ void fileLoadPartToAddr(u16 filenum, void *memaddr, s32 offset, u32 len) u32 stack[2]; if (fileGetRomSizeByTableAddress((u32 *)&g_FileTable[filenum])) { - dmaExec(memaddr, (u32)g_FileTable[filenum] + offset, len); + dmaExec(memaddr, (romptr_t) g_FileTable[filenum] + offset, len); } } @@ -4214,7 +4214,7 @@ u32 fileGetInflatedSize(s32 filenum) if (1); romaddr = *romaddrptr; - ptr = (u8 *) ((u32) &buffer[0x10] & ~0xf); + ptr = (u8 *) ((uintptr_t) &buffer[0x10] & ~0xf); if (romaddr == 0) { stub0f175f58(file0f166ea8(&g_FileTable[filenum]), ptr, 16); diff --git a/src/game/filemgr.c b/src/game/filemgr.c index 4efc96ae3..dc062af5e 100644 --- a/src/game/filemgr.c +++ b/src/game/filemgr.c @@ -62,7 +62,7 @@ struct menudialogdef g_FilemgrRenameMenuDialog; #endif #if PAL -s32 filemgrHandleSetLanguage(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrHandleSetLanguage(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Vars.language = item->param; @@ -163,7 +163,7 @@ char *filemgrGetDeviceName(s32 index) return NULL; } -s32 filemgrDeviceNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrDeviceNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if ((g_Menus[g_MpPlayerNum].fm.device1 & 0x7f) >= SAVEDEVICE_INVALID) { @@ -231,7 +231,7 @@ const char var7f1b2f28[] = "Setup: item = %x\n"; // game, mpsetup, mpplayer, perfect head const u32 g_FileTypeSizes[] = {0xa0, 0x31, 0x4e, 0x4a0}; -s32 filemgrFileNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrFileNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_Menus[g_MpPlayerNum].fm.filetodelete == 0) { @@ -307,7 +307,7 @@ char *filemgr0f108484(struct menuitem *item) return g_StringPointer; } -s32 filemgrDeviceNameForErrorMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrDeviceNameForErrorMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if ((g_Menus[g_MpPlayerNum].fm.device1 & 0x7f) >= SAVEDEVICE_INVALID) { @@ -375,7 +375,7 @@ struct menuitem g_FilemgrErrorMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING, - (u32)&filemgrMenuTextDeviceNameForError, + (uintptr_t) &filemgrMenuTextDeviceNameForError, 0, filemgrDeviceNameForErrorMenuHandler, }, @@ -383,7 +383,7 @@ struct menuitem g_FilemgrErrorMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING, - (u32)&filemgrMenuTextFailReason, + (uintptr_t) &filemgrMenuTextFailReason, 0, NULL, }, @@ -584,7 +584,7 @@ void filemgrHandleSuccess(void) } } -s32 filemgrRetrySaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrRetrySaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { filemgrRetrySave(2); @@ -593,7 +593,7 @@ s32 filemgrRetrySaveMenuHandler(s32 operation, struct menuitem *item, union hand return 0; } -s32 filemgrSaveElsewhereYesMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrSaveElsewhereYesMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 filetype; @@ -623,7 +623,7 @@ s32 filemgrSaveElsewhereYesMenuHandler(s32 operation, struct menuitem *item, uni return 0; } -s32 filemgrCancelSave2MenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrCancelSave2MenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuCloseDialog(); @@ -637,7 +637,7 @@ s32 filemgrCancelSave2MenuHandler(s32 operation, struct menuitem *item, union ha /** * Unused. */ -s32 filemgr0f108d14(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr0f108d14(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { filemgrRetrySave(2); @@ -646,7 +646,7 @@ s32 filemgr0f108d14(s32 operation, struct menuitem *item, union handlerdata *dat return 0; } -s32 filemgrAcknowledgeFileLostMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrAcknowledgeFileLostMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuCloseDialog(); @@ -679,7 +679,7 @@ void filemgrEraseCorruptFile(void) } #endif -s32 filemgrInsertOriginalPakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult filemgrInsertOriginalPakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curdialog && @@ -691,7 +691,7 @@ s32 filemgrInsertOriginalPakMenuDialog(s32 operation, struct menudialogdef *dial return false; } -s32 filemgrReinsertedOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrReinsertedOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { pakExecuteDebugOperations(); @@ -701,7 +701,7 @@ s32 filemgrReinsertedOkMenuHandler(s32 operation, struct menuitem *item, union h return 0; } -s32 filemgrReinsertedCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrReinsertedCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (FILEOP_IS_SAVE(g_Menus[g_MpPlayerNum].fm.fileop) && g_Menus[g_MpPlayerNum].fm.fileop != FILEOP_SAVE_GAME_001) { @@ -1057,7 +1057,7 @@ struct menuitem g_FilemgrSaveErrorMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING, - (u32)&filemgrMenuTextDeviceName, + (uintptr_t) &filemgrMenuTextDeviceName, 0, filemgrDeviceNameMenuHandler, }, @@ -1098,7 +1098,7 @@ struct menuitem g_FilemgrSaveErrorMenuItems[] = { struct menudialogdef g_FilemgrSaveErrorMenuDialog = { MENUDIALOGTYPE_DANGER, - (u32)&filemgrMenuTextErrorTitle, + (uintptr_t) &filemgrMenuTextErrorTitle, g_FilemgrSaveErrorMenuItems, NULL, MENUDIALOGFLAG_IGNOREBACK | MENUDIALOGFLAG_DISABLEBANNER, @@ -1110,7 +1110,7 @@ struct menuitem g_FilemgrFileLostMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING, - (u32)&filemgrMenuTextDeviceName, + (uintptr_t) &filemgrMenuTextDeviceName, 0, filemgrDeviceNameMenuHandler, }, @@ -1154,7 +1154,7 @@ struct menuitem g_FilemgrFileLostMenuItems[] = { struct menudialogdef g_FilemgrFileLostMenuDialog = { MENUDIALOGTYPE_DANGER, - (u32)&filemgrMenuTextErrorTitle, + (uintptr_t) &filemgrMenuTextErrorTitle, g_FilemgrFileLostMenuItems, NULL, MENUDIALOGFLAG_IGNOREBACK | MENUDIALOGFLAG_DISABLEBANNER, @@ -1204,7 +1204,7 @@ struct menuitem g_PakNotOriginalMenuItems[] = { 0, MENUITEMFLAG_LESSLEFTPADDING, #if VERSION >= VERSION_NTSC_1_0 - (u32)&filemgrMenuTextInsertOriginalPak, + (uintptr_t) &filemgrMenuTextInsertOriginalPak, #else L_OPTIONS_363, // "Please insert the Controller Pak containing your %s into any controller." #endif @@ -1232,7 +1232,7 @@ struct menuitem g_PakNotOriginalMenuItems[] = { struct menudialogdef g_PakNotOriginalMenuDialog = { MENUDIALOGTYPE_DANGER, - (u32)&filemgrMenuTextErrorTitle, + (uintptr_t) &filemgrMenuTextErrorTitle, g_PakNotOriginalMenuItems, filemgrInsertOriginalPakMenuDialog, MENUDIALOGFLAG_IGNOREBACK | MENUDIALOGFLAG_DISABLEBANNER, @@ -1514,7 +1514,7 @@ void filemgrSaveToDevice(void) #endif #if VERSION >= VERSION_NTSC_1_0 -s32 filemgrConfirmRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrConfirmRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { char *name = data->keyboard.string; @@ -1535,7 +1535,7 @@ s32 filemgrConfirmRenameMenuHandler(s32 operation, struct menuitem *item, union #endif #if VERSION >= VERSION_NTSC_1_0 -s32 filemgrDuplicateRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrDuplicateRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -1547,7 +1547,7 @@ s32 filemgrDuplicateRenameMenuHandler(s32 operation, struct menuitem *item, unio #endif #if VERSION >= VERSION_NTSC_1_0 -s32 filemgrDuplicateCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrDuplicateCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -1614,7 +1614,7 @@ struct menuitem g_FilemgrDuplicateMenuMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)&filemgrMenuTextDeviceNameContainingDuplicateFile, + (uintptr_t) &filemgrMenuTextDeviceNameContainingDuplicateFile, 0, NULL, }, @@ -1638,7 +1638,7 @@ struct menuitem g_FilemgrDuplicateMenuMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_LESSHEIGHT, - (u32)&filemgrMenuTextDuplicateFileName, + (uintptr_t) &filemgrMenuTextDuplicateFileName, 0, NULL, }, @@ -1744,7 +1744,7 @@ const char var7f1b34ac[] = "Deleting files, wad %d\n"; /** * item->param is a SAVEDEVICE constant. */ -s32 filemgrSelectLocationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrSelectLocationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum] == NULL) { return 0; @@ -1791,7 +1791,7 @@ s32 filemgrSelectLocationMenuHandler(s32 operation, struct menuitem *item, union return 0; } -s32 filemgrCancelSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrCancelSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -1800,7 +1800,7 @@ s32 filemgrCancelSaveMenuHandler(s32 operation, struct menuitem *item, union han return 0; } -s32 filemgrDeleteFilesForSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrDeleteFilesForSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { filemgrPushDeleteFileDialog(g_Menus[g_MpPlayerNum].fm.listnum); @@ -1872,7 +1872,7 @@ bool filemgrIsFileInUse(struct filelistfile *file) } #endif -s32 filemgrConfirmDeleteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrConfirmDeleteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { #if VERSION >= VERSION_JPN_FINAL @@ -2013,7 +2013,7 @@ bool filemgrIsFileInUse(struct filelistfile *file) /** * item->param is 0 if copying, 1 if deleting. */ -s32 filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, bool isdelete) +MenuItemHandlerResult filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, bool isdelete) { s32 x; s32 y; @@ -2068,7 +2068,7 @@ s32 filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, struct menuitem *ite gdl = text0f153780(gdl); } - return (u32)gdl; + return (uintptr_t) gdl; } case MENUOP_GETOPTIONHEIGHT: data->list.value = 11; @@ -2086,7 +2086,7 @@ s32 filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, struct menuitem *ite return 0; } -s32 filemgrFileToDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrFileToDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum] == NULL) { return 0; @@ -2116,7 +2116,7 @@ s32 filemgrFileToDeleteListMenuHandler(s32 operation, struct menuitem *item, uni return filemgrFileToCopyOrDeleteListMenuHandler(operation, item, data, true); } -s32 filemgrFileToCopyListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrFileToCopyListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { struct filelist *list = g_FileLists[0]; @@ -2141,7 +2141,7 @@ s32 filemgrFileToCopyListMenuHandler(s32 operation, struct menuitem *item, union return filemgrFileToCopyOrDeleteListMenuHandler(operation, item, data, false); } -s32 filemgrCopyOrDeleteListMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult filemgrCopyOrDeleteListMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_CLOSE) { if (g_Menus[g_MpPlayerNum].fm.isdeletingforsave == true) { @@ -2172,7 +2172,7 @@ void filemgrPushDeleteFileDialog(s32 listnum) menuPushDialog(&g_FilemgrDeleteMenuDialog); } -s32 pakDeleteGameNoteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult pakDeleteGameNoteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { OSPfsState *note = &g_EditingPak->notes[g_Menus[g_MpPlayerNum].fm.noteindex]; @@ -2198,7 +2198,7 @@ s32 pakDeleteGameNoteMenuHandler(s32 operation, struct menuitem *item, union han /** * Handler for the note listing in the controller pak menu. */ -s32 pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 x; s32 y; @@ -2286,7 +2286,7 @@ s32 pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handl gdl = textRenderProjected(gdl, &x, &y, pagesbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, viGetWidth(), viGetHeight(), 0, 1); - return (u32)gdl; + return (uintptr_t) gdl; case MENUOP_GETOPTIONHEIGHT: data->list.value = VERSION == VERSION_JPN_FINAL ? LINEHEIGHT - 1 : LINEHEIGHT; break; @@ -2309,7 +2309,7 @@ const char var7f1b34e8[] = "Try to find last opened file...\n"; /** * Controller pak note listing dialog. */ -s32 pakGameNotesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult pakGameNotesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curdialog @@ -2400,7 +2400,7 @@ char *pakMenuTextEditingPakName(struct menuitem *item) * * Selecting one takes you to the note listing dialog. */ -s32 pakSelectionMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult pakSelectionMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED) { if (!pakIsMemoryPak((s8)item->param)) { @@ -2421,7 +2421,7 @@ s32 pakSelectionMenuHandler(s32 operation, struct menuitem *item, union handlerd * * Lists the connected controller paks. */ -s32 pakChoosePakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult pakChoosePakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { #if VERSION >= VERSION_NTSC_1_0 switch (operation) { @@ -2476,7 +2476,7 @@ s32 pakChoosePakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union return 0; } -s32 filemgrOpenCopyFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrOpenCopyFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Menus[g_MpPlayerNum].fm.filetypeplusone = item->param + 1; @@ -2493,7 +2493,7 @@ s32 filemgrOpenCopyFileMenuHandler(s32 operation, struct menuitem *item, union h return 0; } -s32 filemgrOpenDeleteFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrOpenDeleteFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Menus[g_MpPlayerNum].fm.filetypeplusone = item->param + 1; @@ -2505,7 +2505,7 @@ s32 filemgrOpenDeleteFileMenuHandler(s32 operation, struct menuitem *item, union return 0; } -s32 filemgrAgentNameKeyboardMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrAgentNameKeyboardMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { char *name = data->keyboard.string; @@ -2529,7 +2529,7 @@ s32 filemgrAgentNameKeyboardMenuHandler(s32 operation, struct menuitem *item, un return 0; } -s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 x; s32 y; @@ -2722,7 +2722,7 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio g_CharsHandelGothicXs, g_FontHandelGothicXs, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0); } gdl = text0f153780(gdl); - return (u32) gdl; + return (uintptr_t) gdl; case MENUOP_GETOPTIONHEIGHT: data->list.value = 40; break; @@ -2746,7 +2746,7 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio break; case MENUOP_GETOPTGROUPTEXT: if (data->list.value >= g_FileLists[0]->numdevices) { - return (u32) langGet(L_OPTIONS_402); // "New..." + return (uintptr_t) langGet(L_OPTIONS_402); // "New..." } return filemgrGetDeviceNameOrStartIndex(0, operation, data->list.value); case MENUOP_GETGROUPSTARTINDEX: @@ -2761,7 +2761,7 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio return 0; } -s32 filemgrMainMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult filemgrMainMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { s32 i; @@ -2839,40 +2839,40 @@ struct menuitem g_FilemgrSelectLocationMenuItems[] = { MENUITEMTYPE_SELECTABLE, SAVEDEVICE_GAMEPAK, 0, - (u32)&filemgrMenuTextLocationName2, - (u32)&filemgrMenuTextSaveLocationSpaces, + (uintptr_t)&filemgrMenuTextLocationName2, + (uintptr_t)&filemgrMenuTextSaveLocationSpaces, filemgrSelectLocationMenuHandler, }, { MENUITEMTYPE_SELECTABLE, SAVEDEVICE_CONTROLLERPAK1, 0, - (u32)&filemgrMenuTextLocationName2, - (u32)&filemgrMenuTextSaveLocationSpaces, + (uintptr_t)&filemgrMenuTextLocationName2, + (uintptr_t)&filemgrMenuTextSaveLocationSpaces, filemgrSelectLocationMenuHandler, }, { MENUITEMTYPE_SELECTABLE, SAVEDEVICE_CONTROLLERPAK2, 0, - (u32)&filemgrMenuTextLocationName2, - (u32)&filemgrMenuTextSaveLocationSpaces, + (uintptr_t)&filemgrMenuTextLocationName2, + (uintptr_t)&filemgrMenuTextSaveLocationSpaces, filemgrSelectLocationMenuHandler, }, { MENUITEMTYPE_SELECTABLE, SAVEDEVICE_CONTROLLERPAK3, 0, - (u32)&filemgrMenuTextLocationName2, - (u32)&filemgrMenuTextSaveLocationSpaces, + (uintptr_t)&filemgrMenuTextLocationName2, + (uintptr_t)&filemgrMenuTextSaveLocationSpaces, filemgrSelectLocationMenuHandler, }, { MENUITEMTYPE_SELECTABLE, SAVEDEVICE_CONTROLLERPAK4, 0, - (u32)&filemgrMenuTextLocationName2, - (u32)&filemgrMenuTextSaveLocationSpaces, + (uintptr_t)&filemgrMenuTextLocationName2, + (uintptr_t)&filemgrMenuTextSaveLocationSpaces, filemgrSelectLocationMenuHandler, }, { @@ -2916,7 +2916,7 @@ struct menuitem g_FilemgrConfirmDeleteMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)&filemgrMenuTextDeleteFileName, + (uintptr_t)&filemgrMenuTextDeleteFileName, 0, filemgrFileNameMenuHandler, }, @@ -2924,7 +2924,7 @@ struct menuitem g_FilemgrConfirmDeleteMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_SMALLFONT, - (u32)&filemgrMenuTextDeviceName, + (uintptr_t)&filemgrMenuTextDeviceName, 0, filemgrDeviceNameMenuHandler, }, @@ -2969,7 +2969,7 @@ struct menuitem g_FilemgrFileInUseMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)&filemgrMenuTextDeleteFileName, + (uintptr_t)&filemgrMenuTextDeleteFileName, 0, filemgrFileNameMenuHandler, }, @@ -2977,7 +2977,7 @@ struct menuitem g_FilemgrFileInUseMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_SMALLFONT, - (u32)&filemgrMenuTextDeviceName, + (uintptr_t)&filemgrMenuTextDeviceName, 0, filemgrDeviceNameMenuHandler, }, @@ -2986,7 +2986,7 @@ struct menuitem g_FilemgrFileInUseMenuItems[] = { 0, MENUITEMFLAG_LESSLEFTPADDING, #if VERSION >= VERSION_NTSC_1_0 - (u32)&filemgrMenuTextFileInUseDescription, + (uintptr_t)&filemgrMenuTextFileInUseDescription, #else 0x54a0, #endif @@ -3132,7 +3132,7 @@ struct menuitem g_PakGameNotesMenuItems[] = { 0, MENUITEMFLAG_LESSLEFTPADDING, L_OPTIONS_388, // "Delete Game Notes:" - (u32)&pakMenuTextEditingPakName, + (uintptr_t)&pakMenuTextEditingPakName, NULL, }, { @@ -3163,15 +3163,15 @@ struct menuitem g_PakGameNotesMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING, - (u32)&pakMenuTextPagesFree, - (u32)&pakMenuTextPagesUsed, + (uintptr_t)&pakMenuTextPagesFree, + (uintptr_t)&pakMenuTextPagesUsed, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING, - (u32)&pakMenuTextStatusMessage, + (uintptr_t)&pakMenuTextStatusMessage, 0, NULL, }, diff --git a/src/game/fmb.c b/src/game/fmb.c index 3e3e016ae..76538943d 100644 --- a/src/game/fmb.c +++ b/src/game/fmb.c @@ -12,7 +12,7 @@ #include "data.h" #include "types.h" -s32 fmbHandleDropOut(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult fmbHandleDropOut(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -26,7 +26,7 @@ s32 fmbHandleDropOut(s32 operation, struct menuitem *item, union handlerdata *da return 0; } -s32 fmdHandleAbortGame(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult fmdHandleAbortGame(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (g_Vars.stagenum == STAGE_4MBMENU) { @@ -39,7 +39,7 @@ s32 fmdHandleAbortGame(s32 operation, struct menuitem *item, union handlerdata * return 0; } -s32 fmbHandleAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult fmbHandleAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f0f820c(&g_AdvancedSetup4MbMenuDialog, MENUROOT_4MBMAINMENU); @@ -48,7 +48,7 @@ s32 fmbHandleAdvancedSetup(s32 operation, struct menuitem *item, union handlerda return 0; } -s32 fmbHandleAcceptChallenge(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult fmbHandleAcceptChallenge(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { challengeSetCurrentBySlot(g_Menus[g_MpPlayerNum].main4mb.slotindex); @@ -94,7 +94,7 @@ void fmbReset(void) g_MpPlayerNum = prevplayernum; } -s32 fmbHandleMainMenu(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult fmbHandleMainMenu(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Vars.waitingtojoin[0] = false; @@ -350,7 +350,7 @@ struct menuitem g_MpPlayerSetup4MbMenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, L_MPMENU_030, // "Name" - (u32)&mpGetCurrentPlayerName, + (uintptr_t)&mpGetCurrentPlayerName, (void *)&g_MpPlayerNameMenuDialog, }, { @@ -397,7 +397,7 @@ struct menuitem g_MpPlayerSetup4MbMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, 0, - (u32)&mpMenuTextSavePlayerOrCopy, + (uintptr_t)&mpMenuTextSavePlayerOrCopy, 0, menuhandlerMpSavePlayer, }, @@ -500,7 +500,7 @@ struct menuitem g_MpConfirmChallenge4MbMenuItems[] = { struct menudialogdef g_MpConfirmChallenge4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&func0f17e318, + (uintptr_t)&func0f17e318, g_MpConfirmChallenge4MbMenuItems, menudialog0017e3fc, 0, @@ -717,7 +717,7 @@ struct menuitem g_MpEditSimulant4MbMenuItems[] = { struct menudialogdef g_MpEditSimulant4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&mpMenuTitleEditSimulant, + (uintptr_t)&mpMenuTitleEditSimulant, g_MpEditSimulant4MbMenuItems, menudialogMpSimulant, MENUDIALOGFLAG_MPLOCKABLE, @@ -730,7 +730,7 @@ struct menuitem g_AdvancedSetup4MbMenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG | MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_019, // "Scenario" - (u32)&mpMenuTextScenarioShortName, + (uintptr_t)&mpMenuTextScenarioShortName, (void *)&g_MpScenarioMenuDialog, }, { @@ -746,7 +746,7 @@ struct menuitem g_AdvancedSetup4MbMenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, L_MPMENU_020, // "Arena" - (u32)&mpMenuTextArenaName, + (uintptr_t)&mpMenuTextArenaName, (void *)&g_MpArenaMenuDialog, }, { diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index d221c82af..1c06027dd 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -431,7 +431,7 @@ Gfx *artifactsRenderGlaresForRoom(Gfx *gdl, s32 roomnum) if (count > 0) { if (roomnum == light->roomnum) { - lightindex = ((u32)light - (u32)g_BgLightsFileData) / sizeof(struct light); + lightindex = ((uintptr_t)light - (uintptr_t)g_BgLightsFileData) / sizeof(struct light); s3 = &var800a41a0[lightindex * 3]; t2 = 0; min = 0xffff; diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 8997003a7..a3de6e703 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -224,15 +224,15 @@ void textLoadFont(u8 *romstart, u8 *romend, struct font **fontptr, struct fontch #define NUMCHARS() 94 #endif - len = (u32)romend - (u32)romstart; + len = (romptr_t)romend - (romptr_t)romstart; font = mempAlloc(len, MEMPOOL_STAGE); chars = font->chars; - dmaExec(font, (u32) romstart, len); + dmaExec(font, (romptr_t) romstart, len); // Convert pointers for (i = 0; i < NUMCHARS(); i++) { - chars[i].pixeldata += (u32)font; + chars[i].pixeldata += (uintptr_t)font; } #if VERSION >= VERSION_JPN_FINAL diff --git a/src/game/game_176080.c b/src/game/game_176080.c index 65fd99f9c..f5f79eb99 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -56,7 +56,7 @@ void mblurAllocate(void) } var800844f0 = mempAlloc(var800ab7c0 * var800ab7c4 * 2 + 0x40, MEMPOOL_STAGE); - var800844f0 = (void *)(((u32) var800844f0 + 0x3f) & ~0x3f); + var800844f0 = (void *)(((uintptr_t) var800844f0 + 0x3f) & ~0x3f); var800844f4 = var800844f0; } @@ -81,7 +81,7 @@ Gfx *mblur0f1762ac(Gfx *gdl) subamount = 0; } - addr = (u32)var800844f4 - subamount; + addr = (uintptr_t)var800844f4 - subamount; addr &= ~0x3f; gDPPipeSync(gdl++); @@ -135,7 +135,7 @@ u16 *mblur0f176668(s32 arg0) addr = var800abdc8; } - addr = (u16 *)(((u32)addr + 0x3f) & ~0x3f); + addr = (u16 *)(((uintptr_t)addr + 0x3f) & ~0x3f); return addr; } diff --git a/src/game/getitle.c b/src/game/getitle.c index 40c863c69..ab0bce3bd 100644 --- a/src/game/getitle.c +++ b/src/game/getitle.c @@ -144,7 +144,7 @@ extern u8 _getitleSegmentEnd; void getitleLoad(void *addr, u32 arg1) { - u32 len = (u32)&_getitleSegmentEnd - (u32)&_getitleSegmentStart; + u32 len = (romptr_t)&_getitleSegmentEnd - (romptr_t)&_getitleSegmentStart; var80062414 = 0; var8009cc8c = 880; @@ -152,7 +152,7 @@ void getitleLoad(void *addr, u32 arg1) var80062498 = 0; var8009cc90 = addr; - dmaExec(var8009cc90, (u32) &_getitleSegmentRomStart, ALIGN64(len)); + dmaExec(var8009cc90, (romptr_t) &_getitleSegmentRomStart, ALIGN64(len)); } Gfx *getitleRender(Gfx *gdl) diff --git a/src/game/gfxmemory.c b/src/game/gfxmemory.c index 301920841..143c9f6f4 100644 --- a/src/game/gfxmemory.c +++ b/src/game/gfxmemory.c @@ -127,7 +127,7 @@ struct gfxvtx *gfxAllocateVertices(u32 count) { void *ptr = g_GfxMemPos; g_GfxMemPos += count * sizeof(struct gfxvtx); - g_GfxMemPos = (u8 *)ALIGN16((u32)g_GfxMemPos); + g_GfxMemPos = (u8 *)ALIGN16((uintptr_t)g_GfxMemPos); return ptr; } diff --git a/src/game/lang.c b/src/game/lang.c index 06a5a2f71..74c770403 100644 --- a/src/game/lang.c +++ b/src/game/lang.c @@ -288,8 +288,8 @@ struct jpncharpixels *langGetJpnCharPixels(s32 codepoint) g_JpnCacheCacheItems[freeindexsingle].ttl = 2; g_JpnCacheCacheItems[freeindexsingle].codepoint = codepoint; - dmaExec((u8 *) (freeindexsingle * (TMUL * 0x0c) + (u32)&g_JpnCharCachePixels[0]), - (u32) &_fontjpnSegmentRomStart + ((codepoint * TMUL) * 0xc + TMUL * (24 * 0xc)), + dmaExec((u8 *) (freeindexsingle * (TMUL * 0x0c) + (romptr_t) &g_JpnCharCachePixels[0]), + (romptr_t) &_fontjpnSegmentRomStart + ((codepoint * TMUL) * 0xc + TMUL * (24 * 0xc)), TMUL * 0x0c); return &g_JpnCharCachePixels[TMUL * freeindexsingle]; @@ -310,7 +310,7 @@ struct jpncharpixels *langGetJpnCharPixels(s32 codepoint) g_JpnCacheCacheItems[freeindexsingle].ttl = 2; g_JpnCacheCacheItems[freeindexsingle].codepoint = codepoint >> 1; - dmaExec(&g_JpnCharCachePixels[freeindexsingle * 8], (u32)&_fontjpnsingleSegmentRomStart + (codepoint >> SHIFTAMOUNT) * 0x60, 0x60); + dmaExec(&g_JpnCharCachePixels[freeindexsingle * 8], (romptr_t) &_fontjpnsingleSegmentRomStart + (codepoint >> SHIFTAMOUNT) * 0x60, 0x60); return &g_JpnCharCachePixels[freeindexsingle * 8]; } @@ -321,7 +321,7 @@ struct jpncharpixels *langGetJpnCharPixels(s32 codepoint) g_JpnCacheCacheItems[freeindexmulti + 0].codepoint = codepoint >> 1; g_JpnCacheCacheItems[freeindexmulti + 1].codepoint = codepoint >> 1; - dmaExec(&g_JpnCharCachePixels[freeindexmulti * 8], (u32)&_fontjpnmultiSegmentRomStart + ((codepoint & 0x1fff) >> SHIFTAMOUNT) * 0x80, 0x80); + dmaExec(&g_JpnCharCachePixels[freeindexmulti * 8], (romptr_t) &_fontjpnmultiSegmentRomStart + ((codepoint & 0x1fff) >> SHIFTAMOUNT) * 0x80, 0x80); return &g_JpnCharCachePixels[freeindexmulti * 8]; } @@ -403,7 +403,7 @@ char *langGet(s32 textid) u32 addr; if (bank && bank[textindex]) { - addr = (u32)bank + bank[textindex]; + addr = (uintptr_t)bank + bank[textindex]; } else { addr = 0; } @@ -416,7 +416,7 @@ void langReload(void) { s32 i; - g_LangBufferPos = (u8 *) align32((u32) g_LangBuffer); + g_LangBufferPos = (u8 *) align32((uintptr_t) g_LangBuffer); for (i = 0; i < ARRAYCOUNT(g_LangBanks); i++) { if (g_LangBanks[i] != NULL) { diff --git a/src/game/lv.c b/src/game/lv.c index 0840672e3..ccc370929 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -1718,8 +1718,8 @@ Gfx *lvRender(Gfx *gdl) gDPSetScissor(gdl++, G_SC_NON_INTERLACE, 0, 0, viGetWidth(), viGetHeight()); #if VERSION < VERSION_NTSC_1_0 - if ((u32)gdl < (u32)g_GfxBuffers[g_GfxActiveBufferIndex] - || (u32)gdl > (u32)g_GfxBuffers[g_GfxActiveBufferIndex + 1]) { + if ((uintptr_t)gdl < (uintptr_t)g_GfxBuffers[g_GfxActiveBufferIndex] + || (uintptr_t)gdl > (uintptr_t)g_GfxBuffers[g_GfxActiveBufferIndex + 1]) { crashSetMessage("lv.c Master DL overrun!"); CRASH(); } @@ -1958,7 +1958,7 @@ s32 lvGetSlowMotionType(void) if (actual != expected) { u32 *ptr = (u32 *)&rspbootTextStart; - u32 *end = (u32 *)(u32)ptr + 1024; + u32 *end = (u32 *)(uintptr_t)ptr + 1024; while (ptr < end) { *ptr += 8; diff --git a/src/game/mainmenu.c b/src/game/mainmenu.c index 1d1caa9e2..77d781698 100644 --- a/src/game/mainmenu.c +++ b/src/game/mainmenu.c @@ -75,7 +75,7 @@ u16 g_ControlStyleOptions[] = { L_OPTIONS_246, // "2.4" }; -s32 menuhandlerControlStyleImpl(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpindex) +MenuItemHandlerResult menuhandlerControlStyleImpl(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpindex) { u16 categories[] = { L_OPTIONS_237, // "Single" @@ -118,17 +118,17 @@ s32 menuhandlerControlStyleImpl(s32 operation, struct menuitem *item, union hand return 0; } -s32 menuhandler001024dc(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler001024dc(s32 operation, struct menuitem *item, union handlerdata *data) { return menuhandlerControlStyleImpl(operation, item, data, 4); } -s32 menuhandler001024fc(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler001024fc(s32 operation, struct menuitem *item, union handlerdata *data) { return menuhandlerControlStyleImpl(operation, item, data, 5); } -s32 menuhandlerReversePitch(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerReversePitch(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -149,7 +149,7 @@ s32 menuhandlerReversePitch(s32 operation, struct menuitem *item, union handlerd return 0; } -s32 menuhandlerAimControl(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerAimControl(s32 operation, struct menuitem *item, union handlerdata *data) { u32 playernum = (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) ? g_Vars.currentplayerstats->mpindex : item->param3; @@ -193,7 +193,7 @@ s32 menuhandlerAimControl(s32 operation, struct menuitem *item, union handlerdat return 0; } -s32 menuhandlerSoundMode(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerSoundMode(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { L_OPTIONS_232, // "Mono" @@ -219,7 +219,7 @@ s32 menuhandlerSoundMode(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerScreenSize(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerScreenSize(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { L_OPTIONS_220, // "Full" @@ -244,7 +244,7 @@ s32 menuhandlerScreenSize(s32 operation, struct menuitem *item, union handlerdat return 0; } -s32 menuhandlerScreenRatio(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerScreenRatio(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { L_OPTIONS_223, // "Normal" @@ -269,7 +269,7 @@ s32 menuhandlerScreenRatio(s32 operation, struct menuitem *item, union handlerda } #if PAL -s32 menuhandlerLanguage(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerLanguage(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[] = { L_MPWEAPONS_262, // English @@ -303,7 +303,7 @@ s32 menuhandlerLanguage(s32 operation, struct menuitem *item, union handlerdata } #endif -s32 menuhandlerScreenSplit(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerScreenSplit(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { L_OPTIONS_225, // "Horizontal" @@ -340,7 +340,7 @@ s32 menuhandlerScreenSplit(s32 operation, struct menuitem *item, union handlerda return 0; } -s32 menuhandlerLookAhead(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerLookAhead(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -361,7 +361,7 @@ s32 menuhandlerLookAhead(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerHeadRoll(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerHeadRoll(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -382,7 +382,7 @@ s32 menuhandlerHeadRoll(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerInGameSubtitles(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerInGameSubtitles(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -395,7 +395,7 @@ s32 menuhandlerInGameSubtitles(s32 operation, struct menuitem *item, union handl return 0; } -s32 menuhandlerCutsceneSubtitles(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerCutsceneSubtitles(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -408,7 +408,7 @@ s32 menuhandlerCutsceneSubtitles(s32 operation, struct menuitem *item, union han return 0; } -s32 menuhandlerAlternativeTitle(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerAlternativeTitle(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_CHECKHIDDEN: @@ -426,7 +426,7 @@ s32 menuhandlerAlternativeTitle(s32 operation, struct menuitem *item, union hand return 0; } -s32 menuhandlerHiRes(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerHiRes(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_CHECKHIDDEN: @@ -449,7 +449,7 @@ s32 menuhandlerHiRes(s32 operation, struct menuitem *item, union handlerdata *da return 0; } -s32 menuhandlerAmmoOnScreen(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerAmmoOnScreen(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -470,7 +470,7 @@ s32 menuhandlerAmmoOnScreen(s32 operation, struct menuitem *item, union handlerd return 0; } -s32 menuhandlerShowGunFunction(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerShowGunFunction(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -496,7 +496,7 @@ s32 menuhandlerShowGunFunction(s32 operation, struct menuitem *item, union handl return 0; } -s32 menuhandlerShowMissionTime(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerShowMissionTime(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -517,7 +517,7 @@ s32 menuhandlerShowMissionTime(s32 operation, struct menuitem *item, union handl return 0; } -s32 menuhandlerAlwaysShowTarget(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerAlwaysShowTarget(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -543,7 +543,7 @@ s32 menuhandlerAlwaysShowTarget(s32 operation, struct menuitem *item, union hand return 0; } -s32 menuhandlerShowZoomRange(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerShowZoomRange(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -569,7 +569,7 @@ s32 menuhandlerShowZoomRange(s32 operation, struct menuitem *item, union handler return 0; } -s32 menuhandlerPaintball(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerPaintball(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -590,7 +590,7 @@ s32 menuhandlerPaintball(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerSightOnScreen(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerSightOnScreen(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -611,7 +611,7 @@ s32 menuhandlerSightOnScreen(s32 operation, struct menuitem *item, union handler return 0; } -s32 menuhandlerAutoAim(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerAutoAim(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -632,7 +632,7 @@ s32 menuhandlerAutoAim(s32 operation, struct menuitem *item, union handlerdata * return 0; } -s32 menuhandlerMusicVolume(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMusicVolume(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -646,7 +646,7 @@ s32 menuhandlerMusicVolume(s32 operation, struct menuitem *item, union handlerda return 0; } -s32 menuhandlerSfxVolume(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerSfxVolume(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -660,7 +660,7 @@ s32 menuhandlerSfxVolume(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menudialogBriefing(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialogBriefing(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curdialog @@ -699,7 +699,7 @@ struct menudialogdef g_PreAndPostMissionBriefingMenuDialog = { NULL, }; -s32 menuhandlerAcceptMission(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerAcceptMission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuStop(); @@ -768,7 +768,7 @@ char *soloMenuTitleStageOverview(struct menudialogdef *dialogdef) return g_StringPointer; } -s32 menudialog00103608(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog00103608(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -816,7 +816,7 @@ struct menuitem g_AcceptMissionMenuItems[] = { struct menudialogdef g_AcceptMissionMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&soloMenuTitleStageOverview, + (uintptr_t)&soloMenuTitleStageOverview, g_AcceptMissionMenuItems, menudialog00103608, MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_DISABLEITEMSCROLL, @@ -832,7 +832,7 @@ f32 func0f1036ac(u8 value, s32 prop) return mpHandicapToDamageScale(value); } -s32 menuhandlerPdModeSetting(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerPdModeSetting(s32 operation, struct menuitem *item, union handlerdata *data) { u8 *property; f32 fvalue; @@ -864,7 +864,7 @@ s32 menuhandlerPdModeSetting(s32 operation, struct menuitem *item, union handler return 0; } -s32 menuhandlerAcceptPdModeSettings(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerAcceptPdModeSettings(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MissionConfig.pdmode = true; @@ -1097,7 +1097,7 @@ bool isStageDifficultyUnlocked(s32 stageindex, s32 difficulty) return false; } -s32 menuhandlerSoloDifficulty(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerSoloDifficulty(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_CHECKPREFOCUSED: @@ -1135,7 +1135,7 @@ s32 menuhandlerSoloDifficulty(s32 operation, struct menuitem *item, union handle return 0; } -s32 menuhandlerPdMode(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerPdMode(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: @@ -1188,7 +1188,7 @@ struct menuitem g_SoloMissionDifficultyMenuItems[] = { 0, 0, L_OPTIONS_251, // "Agent" - (u32)&soloMenuTextBestTime, + (uintptr_t)&soloMenuTextBestTime, menuhandlerSoloDifficulty, }, { @@ -1196,7 +1196,7 @@ struct menuitem g_SoloMissionDifficultyMenuItems[] = { 1, 0, L_OPTIONS_252, // "Special Agent" - (u32)&soloMenuTextBestTime, + (uintptr_t)&soloMenuTextBestTime, menuhandlerSoloDifficulty, }, { @@ -1204,7 +1204,7 @@ struct menuitem g_SoloMissionDifficultyMenuItems[] = { 2, 0, L_OPTIONS_253, // "Perfect Agent" - (u32)&soloMenuTextBestTime, + (uintptr_t)&soloMenuTextBestTime, menuhandlerSoloDifficulty, }, { @@ -1243,7 +1243,7 @@ struct menudialogdef g_SoloMissionDifficultyMenuDialog = { NULL, }; -s32 menuhandlerBuddyOptionsContinue(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerBuddyOptionsContinue(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -1291,7 +1291,7 @@ s32 getMaxAiBuddies(void) } #endif -s32 menudialogCoopAntiOptions(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialogCoopAntiOptions(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { #if VERSION >= VERSION_NTSC_1_0 if (operation == MENUOP_OPEN) { @@ -1318,7 +1318,7 @@ s32 menudialogCoopAntiOptions(s32 operation, struct menudialogdef *dialogdef, un return 0; } -s32 menuhandlerCoopRadar(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerCoopRadar(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -1331,7 +1331,7 @@ s32 menuhandlerCoopRadar(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerCoopFriendlyFire(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerCoopFriendlyFire(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -1344,7 +1344,7 @@ s32 menuhandlerCoopFriendlyFire(s32 operation, struct menuitem *item, union hand return 0; } -s32 menuhandlerCoopBuddy(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerCoopBuddy(s32 operation, struct menuitem *item, union handlerdata *data) { const u16 labels[] = { L_OPTIONS_261, // "Human" @@ -1505,7 +1505,7 @@ struct menudialogdef g_CoopOptionsMenuDialog = { NULL, }; -s32 menuhandlerAntiRadar(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerAntiRadar(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -1518,7 +1518,7 @@ s32 menuhandlerAntiRadar(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerAntiPlayer(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerAntiPlayer(s32 operation, struct menuitem *item, union handlerdata *data) { const u16 labels[] = {L_OPTIONS_271, L_OPTIONS_272}; @@ -1593,7 +1593,7 @@ struct menudialogdef g_AntiOptionsMenuDialog = { NULL, }; -s32 menuhandlerCoopDifficulty(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerCoopDifficulty(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: @@ -1665,7 +1665,7 @@ struct menudialogdef g_CoopMissionDifficultyMenuDialog = { NULL, }; -s32 menuhandlerAntiDifficulty(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerAntiDifficulty(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: @@ -1800,7 +1800,7 @@ s32 func0f104720(s32 value) return 20; } -s32 menuhandlerMissionList(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMissionList(s32 operation, struct menuitem *item, union handlerdata *data) { struct optiongroup groups[] = { { 0, L_OPTIONS_123 }, // "Mission 1" @@ -2095,7 +2095,7 @@ s32 menuhandlerMissionList(s32 operation, struct menuitem *item, union handlerda return 0; } -s32 menudialog0010559c(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog0010559c(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -2188,7 +2188,7 @@ char *func0f1056a0(struct menuitem *item) return (char *)menuhandler001024fc(MENUOP_GETOPTIONTEXT, item, &data); } -s32 menuhandlerLangFilter(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerLangFilter(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -2201,7 +2201,7 @@ s32 menuhandlerLangFilter(s32 operation, struct menuitem *item, union handlerdat return 0; } -s32 menuhandlerControlStyle(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerControlStyle(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (PLAYERCOUNT() >= 2) { @@ -2214,7 +2214,7 @@ s32 menuhandlerControlStyle(s32 operation, struct menuitem *item, union handlerd return 0; } -s32 menuhandler001057ec(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler001057ec(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { filemgrSaveOrLoad(&g_GameFileGuid, FILEOP_SAVE_GAME_002, 0); @@ -2223,7 +2223,7 @@ s32 menuhandler001057ec(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerChangeAgent(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerChangeAgent(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f0f820c(NULL, -7); @@ -3062,7 +3062,7 @@ struct menuitem g_MissionControlOptionsMenuItems[] = { 0, 0, L_OPTIONS_194, // "Control Style" - (u32)&func0f105664, + (uintptr_t)&func0f105664, menuhandlerControlStyle, }, { @@ -3140,7 +3140,7 @@ struct menuitem g_CiControlOptionsMenuItems2[] = { 0, 0, L_MPWEAPONS_270, // "" - (u32)&func0f105664, + (uintptr_t)&func0f105664, menuhandlerControlStyle, }, { @@ -3218,7 +3218,7 @@ struct menuitem g_CiControlOptionsMenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, L_OPTIONS_194, // "Control Style" - (u32)&func0f105664, + (uintptr_t)&func0f105664, (void *)&g_CiControlStyleMenuDialog, }, { @@ -3295,7 +3295,7 @@ struct menuitem g_CiControlPlayer2MenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, L_OPTIONS_194, // "Control Style" - (u32)&func0f1056a0, + (uintptr_t)&func0f1056a0, (void *)&g_CiControlStylePlayer2MenuDialog, }, { @@ -3484,7 +3484,7 @@ struct menuitem g_2PMissionOptionsHMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, 0, - (u32)&menutextPauseOrUnpause, + (uintptr_t)&menutextPauseOrUnpause, 0, menuhandlerMpPause, }, @@ -3540,7 +3540,7 @@ struct menuitem g_2PMissionOptionsVMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, 0, - (u32)&menutextPauseOrUnpause, + (uintptr_t)&menutextPauseOrUnpause, 0, menuhandlerMpPause, }, @@ -3823,7 +3823,7 @@ void func0f105948(s32 weaponnum) } } -s32 inventoryMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult inventoryMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curdialog && g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef) { @@ -3987,7 +3987,7 @@ struct menuitem g_SoloMissionInventoryMenuItems[] = { 0, MENUITEMFLAG_NEWCOLUMN | MENUITEMFLAG_00000002 | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (u32)&invMenuTextWeaponManufacturer, + (uintptr_t)&invMenuTextWeaponManufacturer, NULL, }, { @@ -3995,7 +3995,7 @@ struct menuitem g_SoloMissionInventoryMenuItems[] = { 0, MENUITEMFLAG_00000002 | MENUITEMFLAG_LABEL_ALTCOLOUR | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (u32)&invMenuTextWeaponName, + (uintptr_t)&invMenuTextWeaponName, NULL, }, { @@ -4011,7 +4011,7 @@ struct menuitem g_SoloMissionInventoryMenuItems[] = { 0, MENUITEMFLAG_00000002 | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (u32)&invMenuTextPrimaryFunction, + (uintptr_t)&invMenuTextPrimaryFunction, NULL, }, { @@ -4019,14 +4019,14 @@ struct menuitem g_SoloMissionInventoryMenuItems[] = { 0, MENUITEMFLAG_00000002 | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (u32)&invMenuTextSecondaryFunction, + (uintptr_t)&invMenuTextSecondaryFunction, NULL, }, { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (u32)&invMenuTextWeaponDescription, + (uintptr_t)&invMenuTextWeaponDescription, 0, NULL, }, @@ -4047,7 +4047,7 @@ struct menuitem g_FrWeaponsAvailableMenuItems[] = { 0, MENUITEMFLAG_NEWCOLUMN | MENUITEMFLAG_00000002 | MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (u32)&invMenuTextWeaponManufacturer, + (uintptr_t)&invMenuTextWeaponManufacturer, NULL, }, { @@ -4055,7 +4055,7 @@ struct menuitem g_FrWeaponsAvailableMenuItems[] = { 0, MENUITEMFLAG_00000002 | MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_LABEL_ALTCOLOUR | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (u32)&invMenuTextWeaponName, + (uintptr_t)&invMenuTextWeaponName, NULL, }, { @@ -4071,7 +4071,7 @@ struct menuitem g_FrWeaponsAvailableMenuItems[] = { 0, MENUITEMFLAG_00000002 | MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (u32)&invMenuTextPrimaryFunction, + (uintptr_t)&invMenuTextPrimaryFunction, NULL, }, { @@ -4079,14 +4079,14 @@ struct menuitem g_FrWeaponsAvailableMenuItems[] = { 0, MENUITEMFLAG_00000002 | MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (u32)&invMenuTextSecondaryFunction, + (uintptr_t)&invMenuTextSecondaryFunction, NULL, }, { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (u32)&invMenuTextWeaponDescription, + (uintptr_t)&invMenuTextWeaponDescription, 0, NULL, }, @@ -4115,7 +4115,7 @@ struct menudialogdef g_FrWeaponsAvailableMenuDialog = { NULL, }; -s32 menuhandlerFrInventoryList(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerFrInventoryList(s32 operation, struct menuitem *item, union handlerdata *data) { static u8 g_FrFocusedSlotIndex = 0; @@ -4156,7 +4156,7 @@ s32 menuhandlerFrInventoryList(s32 operation, struct menuitem *item, union handl return 0; } -s32 menuhandlerInventoryList(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerInventoryList(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -4230,7 +4230,7 @@ s32 menuhandlerInventoryList(s32 operation, struct menuitem *item, union handler return 0; } -s32 menuhandlerAbortMission(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerAbortMission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Vars.currentplayer->aborted = true; @@ -4240,7 +4240,7 @@ s32 menuhandlerAbortMission(s32 operation, struct menuitem *item, union handlerd return 0; } -s32 menudialogAbortMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialogAbortMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { // empty @@ -4323,7 +4323,7 @@ struct menudialogdef g_2PMissionAbortVMenuDialog = { NULL, }; -s32 soloMenuDialogPauseStatus(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult soloMenuDialogPauseStatus(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { struct briefingobj *briefing = g_BriefingObjs; @@ -4420,7 +4420,7 @@ struct menuitem g_MissionPauseMenuItems[] = { struct menudialogdef g_SoloMissionPauseMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&soloMenuTitlePauseStatus, + (uintptr_t)&soloMenuTitlePauseStatus, g_MissionPauseMenuItems, soloMenuDialogPauseStatus, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, @@ -4429,7 +4429,7 @@ struct menudialogdef g_SoloMissionPauseMenuDialog = { struct menudialogdef g_2PMissionPauseHMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&soloMenuTitlePauseStatus, + (uintptr_t)&soloMenuTitlePauseStatus, g_MissionPauseMenuItems, soloMenuDialogPauseStatus, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, @@ -4560,7 +4560,7 @@ struct cutscenegroup { u16 name; }; -s32 menuhandlerCinema(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerCinema(s32 operation, struct menuitem *item, union handlerdata *data) { struct cutscenegroup groups[] = { { /* 0*/ 0, L_OPTIONS_436 }, // "Special" @@ -4672,7 +4672,7 @@ struct menudialogdef g_SelectMissionMenuDialog = { NULL, }; -s32 menuhandlerMainMenuSoloMissions(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMainMenuSoloMissions(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MissionConfig.iscoop = false; @@ -4689,7 +4689,7 @@ s32 menuhandlerMainMenuSoloMissions(s32 operation, struct menuitem *item, union return 0; } -s32 menuhandlerMainMenuCombatSimulator(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMainMenuCombatSimulator(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Vars.bondplayernum = 0; @@ -4704,7 +4704,7 @@ s32 menuhandlerMainMenuCombatSimulator(s32 operation, struct menuitem *item, uni return 0; } -s32 menuhandlerMainMenuCooperative(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMainMenuCooperative(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MissionConfig.iscoop = true; @@ -4715,7 +4715,7 @@ s32 menuhandlerMainMenuCooperative(s32 operation, struct menuitem *item, union h return 0; } -s32 menuhandlerMainMenuCounterOperative(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMainMenuCounterOperative(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED) { if ((joyGetConnectedControllers() & 2) == 0) { @@ -4732,7 +4732,7 @@ s32 menuhandlerMainMenuCounterOperative(s32 operation, struct menuitem *item, un return 0; } -s32 menudialogMainMenu(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialogMainMenu(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -4786,7 +4786,7 @@ struct menuitem g_MainMenuMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_BIGFONT, - (u32)&mainMenuTextLabel, + (uintptr_t)&mainMenuTextLabel, 0x00000002, menuhandlerMainMenuSoloMissions, }, @@ -4794,7 +4794,7 @@ struct menuitem g_MainMenuMenuItems[] = { MENUITEMTYPE_SELECTABLE, 1, MENUITEMFLAG_BIGFONT, - (u32)&mainMenuTextLabel, + (uintptr_t)&mainMenuTextLabel, 0x00000003, menuhandlerMainMenuCombatSimulator, }, @@ -4802,7 +4802,7 @@ struct menuitem g_MainMenuMenuItems[] = { MENUITEMTYPE_SELECTABLE, 2, MENUITEMFLAG_BIGFONT, - (u32)&mainMenuTextLabel, + (uintptr_t)&mainMenuTextLabel, 0x00000004, menuhandlerMainMenuCooperative, }, @@ -4810,7 +4810,7 @@ struct menuitem g_MainMenuMenuItems[] = { MENUITEMTYPE_SELECTABLE, 3, MENUITEMFLAG_BIGFONT, - (u32)&mainMenuTextLabel, + (uintptr_t)&mainMenuTextLabel, 0x00000005, menuhandlerMainMenuCounterOperative, }, diff --git a/src/game/menu.c b/src/game/menu.c index ccd535b9b..4b1c70109 100644 --- a/src/game/menu.c +++ b/src/game/menu.c @@ -451,7 +451,7 @@ void func0f0f1494(void) } } -char *menuResolveText(u32 thing, void *dialogoritem) +char *menuResolveText(uintptr_t thing, void *dialogoritem) { char *(*handler)(void *dialogoritem) = (void *)thing; @@ -465,7 +465,7 @@ char *menuResolveText(u32 thing, void *dialogoritem) return langGet((u32)thing); } - if (thing > (u32)func0f1a78b0) { + if (thing > (uintptr_t)func0f1a78b0) { #if VERSION < VERSION_NTSC_1_0 CRASH(); #endif @@ -2280,8 +2280,8 @@ Gfx *menuRenderModels(Gfx *gdl, struct menu840 *thing, s32 arg2) sp160 = modelFindNodeMtxIndex(node, 0); mtx4LoadIdentity(&sp120); mtx4LoadXRotation(menuGetCosOscFrac(4), &sp120); - mtx4MultMtx4((Mtxf *)((u32)sp3b4 + sp160 * sizeof(Mtxf)), &sp120, &spe0); - mtx4Copy(&spe0, (Mtxf *)((u32)sp3b4 + sp160 * sizeof(Mtxf))); + mtx4MultMtx4((Mtxf *)((uintptr_t)sp3b4 + sp160 * sizeof(Mtxf)), &sp120, &spe0); + mtx4Copy(&spe0, (Mtxf *)((uintptr_t)sp3b4 + sp160 * sizeof(Mtxf))); } node = modelGetPart(thing->bodymodeldef, MODELPART_HUDPIECE_0001); @@ -2325,7 +2325,7 @@ Gfx *menuRenderModels(Gfx *gdl, struct menu840 *thing, s32 arg2) for (i = 0; i < thing->bodymodeldef->nummatrices; i++) { Mtxf sp70; - mtx4Copy((Mtxf *)((u32)thing->bodymodel.matrices + i * sizeof(Mtxf)), &sp70); + mtx4Copy((Mtxf *)((uintptr_t)thing->bodymodel.matrices + i * sizeof(Mtxf)), &sp70); mtxF2L(&sp70, &thing->bodymodel.matrices[i]); } @@ -5590,7 +5590,7 @@ u32 menuGetRoot(void) #if VERSION >= VERSION_NTSC_1_0 struct menudialogdef g_PakAttemptRepairMenuDialog; -s32 menuhandler000fcc34(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler000fcc34(s32 operation, struct menuitem *item, union handlerdata *data) { bool done = false; @@ -5616,7 +5616,7 @@ s32 menuhandler000fcc34(s32 operation, struct menuitem *item, union handlerdata } #endif -s32 menudialog000fcd48(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog000fcd48(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curdialog @@ -5630,7 +5630,7 @@ s32 menudialog000fcd48(s32 operation, struct menudialogdef *dialogdef, union han } #if VERSION >= VERSION_NTSC_1_0 -s32 func0f0fcdd0(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult func0f0fcdd0(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f0f3704(&g_PakDamagedMenuDialog); @@ -5640,7 +5640,7 @@ s32 func0f0fcdd0(s32 operation, struct menuitem *item, union handlerdata *data) } #endif -s32 menuhandlerRepairPak(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerRepairPak(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (pakRepair(g_Menus[g_MpPlayerNum].fm.device3)) { @@ -5872,7 +5872,7 @@ char *menuTextSaveDeviceName(struct menuitem *item) return NULL; } -s32 menuhandlerRetrySavePak(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerRetrySavePak(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -5889,7 +5889,7 @@ s32 menuhandlerRetrySavePak(s32 operation, struct menuitem *item, union handlerd return 0; } -s32 menuhandlerWarnRepairPak(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerWarnRepairPak(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { #if VERSION >= VERSION_NTSC_1_0 @@ -6049,7 +6049,7 @@ struct menuitem g_PakDamagedMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)&menuTextSaveDeviceName, + (uintptr_t)&menuTextSaveDeviceName, 0, NULL, }, @@ -6122,7 +6122,7 @@ struct menuitem g_PakFullMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)&menuTextSaveDeviceName, + (uintptr_t)&menuTextSaveDeviceName, 0, NULL, }, @@ -6227,7 +6227,7 @@ struct menuitem g_PakDataLostMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)&menuTextSaveDeviceName, + (uintptr_t)&menuTextSaveDeviceName, 0, NULL, }, diff --git a/src/game/menuitem.c b/src/game/menuitem.c index 021dd6481..7a5999d98 100644 --- a/src/game/menuitem.c +++ b/src/game/menuitem.c @@ -576,7 +576,7 @@ Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context) spb8.type19.gdl = gdl; spb8.type19.unk04 = optionindex; - spb8.type19.renderdata2 = (void *)((u32)&renderdata & 0xffffffff); + spb8.type19.renderdata2 = (void *)((uintptr_t)&renderdata & 0xffffffff); spb8.type19.unk0c = sp15c.list.unk04; gdl = (Gfx *) context->item->handler(MENUOP_RENDER, context->item, &spb8); diff --git a/src/game/modeldef.c b/src/game/modeldef.c index 560df33dd..546c48ebe 100644 --- a/src/game/modeldef.c +++ b/src/game/modeldef.c @@ -113,10 +113,10 @@ void modeldef0f1a7560(struct modeldef *modeldef, u16 filenum, u32 arg2, struct m s32 sp84; u32 s0; u32 s4; - u32 s5; + uintptr_t s5; struct modelnode *node; struct modelnode *prevnode; - u32 gdl; + uintptr_t gdl; struct gfxvtx *vertices; allocsize = fileGetAllocationSize(filenum); @@ -128,11 +128,13 @@ void modeldef0f1a7560(struct modeldef *modeldef, u16 filenum, u32 arg2, struct m s5 = gdl; if (gdl) { - s32 v1 = allocsize - (loadedsize - (s32)(((u32)modeldef + (gdl & 0xffffff)) - (u32)modeldef)); - sp84 = (s32)v1 + (s32)((s32)modeldef - ((u32)modeldef + (gdl & 0xffffff))); + s32 v1 = allocsize - (loadedsize - (s32)(((uintptr_t)modeldef + (gdl & 0xffffff)) - (uintptr_t)modeldef)); + sp84 = (s32)v1 + (s32)((uintptr_t)modeldef - ((uintptr_t)modeldef + (gdl & 0xffffff))); - texCopyGdls((Gfx *)((u32)modeldef + (gdl & 0xffffff)), (Gfx *)(v1 + (u32)modeldef), loadedsize - (s32)(((u32)modeldef + (gdl & 0xffffff)) - (u32)modeldef)); - texLoadFromConfigs(modeldef->texconfigs, modeldef->numtexconfigs, texpool, (u32)modeldef2 - arg2); + texCopyGdls((Gfx *)((uintptr_t)modeldef + (gdl & 0xffffff)), + (Gfx *)(v1 + (uintptr_t)modeldef), + loadedsize - (s32)(((uintptr_t)modeldef + (gdl & 0xffffff)) - (uintptr_t)modeldef)); + texLoadFromConfigs(modeldef->texconfigs, modeldef->numtexconfigs, texpool, (uintptr_t)modeldef2 - arg2); while (node) { prevnode = node; @@ -143,7 +145,7 @@ void modeldef0f1a7560(struct modeldef *modeldef, u16 filenum, u32 arg2, struct m if (gdl) { s4 = gdl - s0; } else { - s4 = loadedsize + (u32)modeldef - (u32)modeldef - (s0 & 0xffffff); + s4 = loadedsize + (uintptr_t)modeldef - (uintptr_t)modeldef - (s0 & 0xffffff); } modelNodeReplaceGdl(modeldef, prevnode, (Gfx *) s0, (Gfx *) s5); @@ -155,10 +157,10 @@ void modeldef0f1a7560(struct modeldef *modeldef, u16 filenum, u32 arg2, struct m vertices = NULL; } - s5 += texLoadFromGdl((Gfx *)((u32)modeldef + (s0 & 0xffffff) + sp84), s4, (Gfx *)((u32)modeldef + (s5 & 0xffffff)), texpool, (u8 *) vertices); + s5 += texLoadFromGdl((Gfx *)((uintptr_t)modeldef + (s0 & 0xffffff) + sp84), s4, (Gfx *)((uintptr_t)modeldef + (s5 & 0xffffff)), texpool, (u8 *) vertices); } - fileSetSize(filenum, modeldef, (((u32)modeldef + (s5 & 0xffffff)) - (u32)modeldef + 0xf) & ~0xf, arg5); + fileSetSize(filenum, modeldef, (((uintptr_t)modeldef + (s5 & 0xffffff)) - (uintptr_t)modeldef + 0xf) & ~0xf, arg5); } } @@ -189,7 +191,7 @@ struct modeldef *modeldefLoad(u16 fileid, u8 *dst, s32 size, struct texpool *arg } modelPromoteTypeToPointer(modeldef); - modelPromoteOffsetsToPointers(modeldef, 0x5000000, (u32) modeldef); + modelPromoteOffsetsToPointers(modeldef, 0x5000000, (uintptr_t) modeldef); modeldef0f1a7560(modeldef, fileid, 0x5000000, modeldef, arg3, dst == NULL); return modeldef; diff --git a/src/game/mplayer/ingame.c b/src/game/mplayer/ingame.c index f89ea2d30..6eaa5646a 100644 --- a/src/game/mplayer/ingame.c +++ b/src/game/mplayer/ingame.c @@ -28,7 +28,7 @@ struct menudialogdef g_MpEndscreenTeamGameOverMenuDialog; struct menudialogdef g_MpEndscreenSavePlayerMenuDialog; #endif -s32 mpStatsForPlayerDropdownHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpStatsForPlayerDropdownHandler(s32 operation, struct menuitem *item, union handlerdata *data) { struct mpchrconfig *mpchr; s32 v0; @@ -98,7 +98,7 @@ s32 mpStatsForPlayerDropdownHandler(s32 operation, struct menuitem *item, union return 0; } -s32 menuhandlerMpEndGame(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpEndGame(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Vars.currentplayer->aborted = true; @@ -111,7 +111,7 @@ s32 menuhandlerMpEndGame(s32 operation, struct menuitem *item, union handlerdata /** * This is something near the top of the "End Game" dialog during gameplay. */ -s32 menuhandler00178018(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler00178018(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_BossFile.locktype != MPLOCKTYPE_CHALLENGE) { @@ -141,7 +141,7 @@ char *mpMenuTextInGameLimit(struct menuitem *item) return g_StringPointer; } -s32 menuhandlerMpInGameLimitLabel(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpInGameLimitLabel(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { switch (item->param) { @@ -154,7 +154,7 @@ s32 menuhandlerMpInGameLimitLabel(s32 operation, struct menuitem *item, union ha return 0; } -s32 menuhandlerMpPause(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpPause(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (mpIsPaused()) { @@ -249,7 +249,7 @@ struct menuitem g_MpPauseControlMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)&mpMenuTextChallengeName, + (uintptr_t) &mpMenuTextChallengeName, 0, menuhandler00178018, }, @@ -258,7 +258,7 @@ struct menuitem g_MpPauseControlMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)&mpMenuTextScenarioName, + (uintptr_t) &mpMenuTextScenarioName, 0, NULL, }, @@ -272,7 +272,7 @@ struct menuitem g_MpPauseControlMenuItems[] = { MENUITEMFLAG_SMALLFONT, #endif L_MPWEAPONS_162, // "Time Limit:" - (u32)&mpMenuTextInGameLimit, + (uintptr_t) &mpMenuTextInGameLimit, menuhandlerMpInGameLimitLabel, }, { @@ -284,7 +284,7 @@ struct menuitem g_MpPauseControlMenuItems[] = { MENUITEMFLAG_SMALLFONT, #endif L_MPWEAPONS_163, // "Score Limit:" - (u32)&mpMenuTextInGameLimit, + (uintptr_t) &mpMenuTextInGameLimit, menuhandlerMpInGameLimitLabel, }, { @@ -296,7 +296,7 @@ struct menuitem g_MpPauseControlMenuItems[] = { MENUITEMFLAG_SMALLFONT, #endif L_MPWEAPONS_164, // "Team Score Limit:" - (u32)&mpMenuTextInGameLimit, + (uintptr_t) &mpMenuTextInGameLimit, menuhandlerMpInGameLimitLabel, }, { @@ -316,14 +316,14 @@ struct menuitem g_MpPauseControlMenuItems[] = { 0, #endif L_MPMENU_286, // "Game Time:" - (u32)&menutextMatchTime, + (uintptr_t)&menutextMatchTime, NULL, }, { MENUITEMTYPE_SELECTABLE, 1, MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)&menutextPauseOrUnpause, + (uintptr_t)&menutextPauseOrUnpause, 0, menuhandlerMpPause, }, @@ -341,7 +341,7 @@ struct menuitem g_MpPauseControlMenuItems[] = { struct menudialogdef g_MpPauseControlMenuDialog = { MENUDIALOGTYPE_DEFAULT, #if VERSION >= VERSION_JPN_FINAL - (u32)&mpMenuTextScenarioName, + (uintptr_t)&mpMenuTextScenarioName, #else L_MPMENU_285, // "Control" #endif @@ -444,7 +444,7 @@ char *mpMenuTitleStatsFor(struct menudialogdef *dialogdef) return g_StringPointer; } -s32 func0f178440(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult func0f178440(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation); @@ -479,7 +479,7 @@ struct menuitem g_Mp2PMissionInventoryMenuItems[] = { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (u32)&mpMenuTextWeaponDescription, + (uintptr_t)&mpMenuTextWeaponDescription, 0, NULL, }, @@ -527,7 +527,7 @@ struct menuitem g_MpInGamePlayerStatsMenuItems[] = { struct menudialogdef g_MpPausePlayerStatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&mpMenuTitleStatsFor, + (uintptr_t)&mpMenuTitleStatsFor, g_MpInGamePlayerStatsMenuItems, NULL, VERSION >= VERSION_JPN_FINAL ? MENUDIALOGFLAG_1000 : 0, @@ -536,7 +536,7 @@ struct menudialogdef g_MpPausePlayerStatsMenuDialog = { struct menudialogdef g_MpEndscreenPlayerStatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&mpMenuTitleStatsFor, + (uintptr_t)&mpMenuTitleStatsFor, g_MpInGamePlayerStatsMenuItems, NULL, VERSION >= VERSION_JPN_FINAL ? MENUDIALOGFLAG_1000 : 0, @@ -623,7 +623,7 @@ char *mpMenuTextPlacementWithSuffix(struct menuitem *item) return langGet(suffixes[g_PlayerConfigsArray[g_MpPlayerNum].base.placement]); } -s32 mpPlacementMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpPlacementMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_GETCOLOUR) { if (g_PlayerConfigsArray[g_MpPlayerNum].base.placement == 0) { // winner @@ -634,7 +634,7 @@ s32 mpPlacementMenuHandler(s32 operation, struct menuitem *item, union handlerda return 0; } -s32 mpAwardsMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpAwardsMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_RENDER) { Gfx *gdl = data->type19.gdl; @@ -704,7 +704,7 @@ s32 mpAwardsMenuHandler(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 mpPlayerTitleMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpPlayerTitleMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_GETCOLOUR) { if (g_PlayerConfigsArray[g_MpPlayerNum].title != g_PlayerConfigsArray[g_MpPlayerNum].newtitle) { @@ -721,7 +721,7 @@ char *mpMenuTextPlayerTitle(s32 arg0) } #if VERSION >= VERSION_NTSC_1_0 -s32 mpConfirmPlayerNameHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpConfirmPlayerNameHandler(s32 operation, struct menuitem *item, union handlerdata *data) { char *name = data->keyboard.string; s32 i; @@ -844,8 +844,8 @@ struct menuitem g_MpGameOverMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_LABEL_CUSTOMCOLOUR, - (u32)&mpGetCurrentPlayerName, - (u32)&mpMenuTextPlacementWithSuffix, + (uintptr_t)&mpGetCurrentPlayerName, + (uintptr_t)&mpMenuTextPlacementWithSuffix, mpPlacementMenuHandler, }, { @@ -853,12 +853,12 @@ struct menuitem g_MpGameOverMenuItems[] = { 0, #if VERSION >= VERSION_JPN_FINAL MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_LABEL_CUSTOMCOLOUR, - (u32)&mpMenuTextPlayerTitle, + (uintptr_t)&mpMenuTextPlayerTitle, 0, #else MENUITEMFLAG_LABEL_CUSTOMCOLOUR, L_MPMENU_261, // "Title:" - (u32)&mpMenuTextPlayerTitle, + (uintptr_t)&mpMenuTextPlayerTitle, #endif mpPlayerTitleMenuHandler, }, @@ -882,7 +882,7 @@ struct menuitem g_MpGameOverMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_LABEL_ALTCOLOUR, - (u32)&mpMenuTextWeaponOfChoiceName, + (uintptr_t)&mpMenuTextWeaponOfChoiceName, 0, NULL, }, @@ -931,7 +931,7 @@ struct menuitem g_MpGameOverMenuItems[] = { #else MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_LABEL_ALTCOLOUR, #endif - (u32)&mpMenuTextAward1, + (uintptr_t)&mpMenuTextAward1, 0, NULL, }, @@ -943,7 +943,7 @@ struct menuitem g_MpGameOverMenuItems[] = { #else MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_LABEL_ALTCOLOUR, #endif - (u32)&mpMenuTextAward2, + (uintptr_t)&mpMenuTextAward2, 0, NULL, }, diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index 619c8904c..8606250f6 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -95,7 +95,7 @@ char *scenarioRemoveLineBreaks(char *src, s32 stringnum) struct scenariodata g_ScenarioData; -s32 menuhandlerMpDisplayTeam(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpDisplayTeam(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED) { if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { @@ -108,7 +108,7 @@ s32 menuhandlerMpDisplayTeam(s32 operation, struct menuitem *item, union handler return menuhandlerMpCheckboxOption(operation, item, data); } -s32 menuhandlerMpOneHitKills(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpOneHitKills(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED || operation == MENUOP_CHECKHIDDEN) { if (challengeIsFeatureUnlocked(MPFEATURE_ONEHITKILLS)) { @@ -121,7 +121,7 @@ s32 menuhandlerMpOneHitKills(s32 operation, struct menuitem *item, union handler return menuhandlerMpCheckboxOption(operation, item, data); } -s32 menuhandlerMpSlowMotion(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpSlowMotion(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[] = { L_MPMENU_240, // "Off" @@ -264,7 +264,7 @@ struct mpscenariooverview g_MpScenarioOverviews[] = { * While the options dialog is open, check if another player has changed the * scenario to a different one. If so, replace this dialog with the new one. */ -s32 mpOptionsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult mpOptionsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curdialog->definition != g_MpScenarios[g_MpSetup.scenario].optionsdialog) { @@ -304,7 +304,7 @@ struct scenariogroup { u16 textid; }; -s32 scenarioScenarioMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult scenarioScenarioMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { struct scenariogroup groups[] = { { 0, L_MPMENU_244 }, // "Free for All!" @@ -398,7 +398,7 @@ s32 scenarioScenarioMenuHandler(s32 operation, struct menuitem *item, union hand return 0; } -s32 menuhandlerMpOpenOptions(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpOpenOptions(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPushDialog(g_MpScenarios[g_MpSetup.scenario].optionsdialog); diff --git a/src/game/mplayer/scenarios/kingofthehill.inc b/src/game/mplayer/scenarios/kingofthehill.inc index 31b72100e..b1fcff644 100644 --- a/src/game/mplayer/scenarios/kingofthehill.inc +++ b/src/game/mplayer/scenarios/kingofthehill.inc @@ -13,7 +13,7 @@ * Points are awarded to each player in the hill at the time that it is won. */ -s32 menuhandlerMpHillTime(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpHillTime(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index be23492fb..22527f322 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -31,7 +31,7 @@ struct menudialogdef g_MpChangeTeamNameMenuDialog; struct menudialogdef g_MpEditSimulantMenuDialog; struct menudialogdef g_MpSaveSetupNameMenuDialog; -s32 menuhandlerMpDropOut(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpDropOut(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -46,7 +46,7 @@ char *mpGetCurrentPlayerName(struct menuitem *item) return g_PlayerConfigsArray[g_MpPlayerNum].base.name; } -s32 menuhandlerMpTeamsLabel(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpTeamsLabel(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED) { if ((g_MpSetup.options & MPOPTION_TEAMSENABLED) == 0) { @@ -147,7 +147,7 @@ s16 mpChooseRandomStage(void) return STAGE_MP_SKEDAR; } -s32 mpArenaMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpArenaMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { struct optiongroup groups[] = { { 0, L_MPMENU_116 }, // "Dark" @@ -245,7 +245,7 @@ s32 mpArenaMenuHandler(s32 operation, struct menuitem *item, union handlerdata * return 0; } -s32 menuhandlerMpControlStyle(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpControlStyle(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[] = { L_OPTIONS_239, // "1.1" @@ -271,7 +271,7 @@ s32 menuhandlerMpControlStyle(s32 operation, struct menuitem *item, union handle return 0; } -s32 menuhandlerMpWeaponSlot(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpWeaponSlot(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -294,7 +294,7 @@ char *mpMenuTextWeaponNameForSlot(struct menuitem *item) return mpGetWeaponLabel(mpGetWeaponSlot(item->param)); } -s32 menuhandlerMpWeaponSetDropdown(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpWeaponSetDropdown(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -313,7 +313,7 @@ s32 menuhandlerMpWeaponSetDropdown(s32 operation, struct menuitem *item, union h return 0; } -s32 menuhandlerMpControlCheckbox(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpControlCheckbox(s32 operation, struct menuitem *item, union handlerdata *data) { s32 val; @@ -350,7 +350,7 @@ s32 menuhandlerMpControlCheckbox(s32 operation, struct menuitem *item, union han return 0; } -s32 menuhandlerMpAimControl(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpAimControl(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[] = { #if VERSION >= VERSION_PAL_FINAL @@ -379,7 +379,7 @@ s32 menuhandlerMpAimControl(s32 operation, struct menuitem *item, union handlerd return 0; } -s32 menuhandlerMpCheckboxOption(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpCheckboxOption(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -397,7 +397,7 @@ s32 menuhandlerMpCheckboxOption(s32 operation, struct menuitem *item, union hand return 0; } -s32 menuhandlerMpTeamsEnabled(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpTeamsEnabled(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED) { if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE || @@ -411,7 +411,7 @@ s32 menuhandlerMpTeamsEnabled(s32 operation, struct menuitem *item, union handle return menuhandlerMpCheckboxOption(operation, item, data); } -s32 menuhandlerMpDisplayOptionCheckbox(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpDisplayOptionCheckbox(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -431,7 +431,7 @@ s32 menuhandlerMpDisplayOptionCheckbox(s32 operation, struct menuitem *item, uni return 0; } -s32 menuhandlerMpConfirmSaveChr(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpConfirmSaveChr(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -441,7 +441,7 @@ s32 menuhandlerMpConfirmSaveChr(s32 operation, struct menuitem *item, union hand return 0; } -s32 menuhandlerMpSetupName(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpSetupName(s32 operation, struct menuitem *item, union handlerdata *data) { char *name = data->keyboard.string; @@ -460,7 +460,7 @@ s32 menuhandlerMpSetupName(s32 operation, struct menuitem *item, union handlerda return 0; } -s32 menuhandlerMpSaveSetupOverwrite(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpSaveSetupOverwrite(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -470,7 +470,7 @@ s32 menuhandlerMpSaveSetupOverwrite(s32 operation, struct menuitem *item, union return 0; } -s32 menuhandlerMpSaveSetupCopy(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpSaveSetupCopy(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -487,7 +487,7 @@ char *mpMenuTextSetupName(struct menuitem *item) } #endif -s32 func0f179b68(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult func0f179b68(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -504,7 +504,7 @@ s32 func0f179b68(s32 operation, struct menuitem *item, union handlerdata *data) return 0; } -s32 func0f179c14(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult func0f179c14(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -521,7 +521,7 @@ s32 func0f179c14(s32 operation, struct menuitem *item, union handlerdata *data) return 0; } -s32 func0f179cc0(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult func0f179cc0(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -538,7 +538,7 @@ s32 func0f179cc0(s32 operation, struct menuitem *item, union handlerdata *data) return 0; } -s32 func0f179d6c(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult func0f179d6c(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f187fbc(g_MpPlayerNum); @@ -550,7 +550,7 @@ s32 func0f179d6c(s32 operation, struct menuitem *item, union handlerdata *data) /** * This function is used by both player body selection and bot body selection. */ -s32 mpCharacterBodyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, s32 mpbodynum, bool isplayer) +MenuItemHandlerResult mpCharacterBodyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, s32 mpbodynum, bool isplayer) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -624,7 +624,7 @@ s32 mpCharacterBodyMenuHandler(s32 operation, struct menuitem *item, union handl return 0; } -s32 menuhandlerMpCharacterBody(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpCharacterBody(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: @@ -653,7 +653,7 @@ s32 menuhandlerMpCharacterBody(s32 operation, struct menuitem *item, union handl g_PlayerConfigsArray[g_MpPlayerNum].base.mpheadnum, true); } -s32 menudialog0017a174(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog0017a174(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -672,7 +672,7 @@ s32 menudialog0017a174(s32 operation, struct menudialogdef *dialogdef, union han return 0; } -s32 mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerdata *data) { Gfx *gdl; struct menuitemrenderdata *renderdata; @@ -937,7 +937,7 @@ char *mpMenuTextDamageDealt(struct menuitem *item) return g_StringPointer; } -s32 mpMedalMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpMedalMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_RENDER) { Gfx *gdl = data->type19.gdl; @@ -1002,7 +1002,7 @@ char *mpMenuTitleStatsForPlayerName(struct menudialogdef *dialogdef) return g_StringPointer; } -s32 menuhandlerMpUsernamePassword(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpUsernamePassword(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_PlayerConfigsArray[g_MpPlayerNum].title != MPPLAYERTITLE_PERFECT) { @@ -1096,14 +1096,14 @@ struct menuitem g_MpSaveSetupExistsMenuItems[] = { 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SMALLFONT, L_MPWEAPONS_230, // "Name:" - (u32)&mpMenuTextSetupName, + (uintptr_t)&mpMenuTextSetupName, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_SMALLFONT, - (u32)&filemgrMenuTextDeviceName, + (uintptr_t)&filemgrMenuTextDeviceName, 0, NULL, }, @@ -1275,7 +1275,7 @@ struct menuitem g_MpQuickTeamWeaponsMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_176, // "1:" - (u32)&mpMenuTextWeaponNameForSlot, + (uintptr_t)&mpMenuTextWeaponNameForSlot, NULL, }, { @@ -1283,7 +1283,7 @@ struct menuitem g_MpQuickTeamWeaponsMenuItems[] = { 1, MENUITEMFLAG_00000002, L_MPMENU_177, // "2:" - (u32)&mpMenuTextWeaponNameForSlot, + (uintptr_t)&mpMenuTextWeaponNameForSlot, NULL, }, { @@ -1291,7 +1291,7 @@ struct menuitem g_MpQuickTeamWeaponsMenuItems[] = { 2, MENUITEMFLAG_00000002, L_MPMENU_178, // "3:" - (u32)&mpMenuTextWeaponNameForSlot, + (uintptr_t)&mpMenuTextWeaponNameForSlot, NULL, }, { @@ -1299,7 +1299,7 @@ struct menuitem g_MpQuickTeamWeaponsMenuItems[] = { 3, MENUITEMFLAG_00000002, L_MPMENU_179, // "4:" - (u32)&mpMenuTextWeaponNameForSlot, + (uintptr_t)&mpMenuTextWeaponNameForSlot, NULL, }, { @@ -1307,7 +1307,7 @@ struct menuitem g_MpQuickTeamWeaponsMenuItems[] = { 4, MENUITEMFLAG_00000002, L_MPMENU_180, // "5:" - (u32)&mpMenuTextWeaponNameForSlot, + (uintptr_t)&mpMenuTextWeaponNameForSlot, NULL, }, { @@ -1614,7 +1614,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_146, // "Kills:" - (u32)&mpMenuTextKills, + (uintptr_t)&mpMenuTextKills, NULL, }, { @@ -1622,7 +1622,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_147, // "Deaths:" - (u32)&mpMenuTextDeaths, + (uintptr_t)&mpMenuTextDeaths, NULL, }, { @@ -1630,7 +1630,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_148, // "Accuracy:" - (u32)&mpMenuTextAccuracy, + (uintptr_t)&mpMenuTextAccuracy, NULL, }, { @@ -1638,7 +1638,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_149, // "Head Shots:" - (u32)&mpMenuTextHeadShots, + (uintptr_t)&mpMenuTextHeadShots, NULL, }, { @@ -1654,7 +1654,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_150, // "Ammo Used:" - (u32)&mpMenuTextAmmoUsed, + (uintptr_t)&mpMenuTextAmmoUsed, NULL, }, { @@ -1662,7 +1662,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_151, // "Damage Dealt:" - (u32)&mpMenuTextDamageDealt, + (uintptr_t)&mpMenuTextDamageDealt, NULL, }, { @@ -1670,7 +1670,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_152, // "Pain Received:" - (u32)&mpMenuTextPainReceived, + (uintptr_t)&mpMenuTextPainReceived, NULL, }, { @@ -1686,7 +1686,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_153, // "Games Played:" - (u32)&mpMenuTextGamesPlayed, + (uintptr_t)&mpMenuTextGamesPlayed, NULL, }, { @@ -1694,7 +1694,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_154, // "Games Won:" - (u32)&mpMenuTextGamesWon, + (uintptr_t)&mpMenuTextGamesWon, NULL, }, { @@ -1702,7 +1702,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_155, // "Games Lost:" - (u32)&mpMenuTextGamesLost, + (uintptr_t)&mpMenuTextGamesLost, NULL, }, { @@ -1710,7 +1710,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_156, // "Time:" - (u32)&mpMenuTextTime, + (uintptr_t)&mpMenuTextTime, NULL, }, { @@ -1718,7 +1718,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_157, // "Distance:" - (u32)&mpMenuTextDistance, + (uintptr_t)&mpMenuTextDistance, NULL, }, { @@ -1742,7 +1742,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 2, MENUITEMFLAG_LIST_CUSTOMRENDER, L_MPMENU_159, // "Accuracy:" - (u32)&mpMenuTextMedalAccuracy, + (uintptr_t)&mpMenuTextMedalAccuracy, mpMedalMenuHandler, }, { @@ -1750,7 +1750,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 1, MENUITEMFLAG_LIST_CUSTOMRENDER, L_MPMENU_160, // "Head Shot:" - (u32)&mpMenuTextMedalHeadShot, + (uintptr_t)&mpMenuTextMedalHeadShot, mpMedalMenuHandler, }, { @@ -1758,7 +1758,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, MENUITEMFLAG_LIST_CUSTOMRENDER, L_MPMENU_161, // "KillMaster:" - (u32)&mpMenuTextMedalKillMaster, + (uintptr_t)&mpMenuTextMedalKillMaster, mpMedalMenuHandler, }, { @@ -1766,7 +1766,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 3, MENUITEMFLAG_LIST_CUSTOMRENDER, L_MPMENU_162, // "Survivor:" - (u32)&mpMenuTextMedalSurvivor, + (uintptr_t)&mpMenuTextMedalSurvivor, mpMedalMenuHandler, }, { @@ -1789,7 +1789,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)&mpMenuTextPlayerTitle, + (uintptr_t)&mpMenuTextPlayerTitle, 0, NULL, }, @@ -1806,7 +1806,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_SMALLFONT, #if VERSION >= VERSION_NTSC_1_0 - (u32)&mpMenuTextUsernamePassword, + (uintptr_t)&mpMenuTextUsernamePassword, #else 0x51f0, #endif @@ -1826,7 +1826,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { (VERSION >= VERSION_NTSC_1_0 ? 1 : 0), MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_SMALLFONT, #if VERSION >= VERSION_NTSC_1_0 - (u32)&mpMenuTextUsernamePassword, + (uintptr_t)&mpMenuTextUsernamePassword, #else 0x51f1, #endif @@ -1854,14 +1854,14 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { struct menudialogdef g_MpPlayerStatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&mpMenuTitleStatsForPlayerName, + (uintptr_t)&mpMenuTitleStatsForPlayerName, g_MpPlayerStatsMenuItems, NULL, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_MpCompletedChallengesMenuDialog, }; -s32 mpCharacterHeadMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, bool arg4) +MenuItemHandlerResult mpCharacterHeadMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, bool arg4) { f32 diffframe; s32 headnum; @@ -1937,7 +1937,7 @@ s32 mpCharacterHeadMenuHandler(s32 operation, struct menuitem *item, union handl return 0; } -s32 menuhandlerMpCharacterHead(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpCharacterHead(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_PlayerConfigsArray[g_MpPlayerNum].base.mpheadnum = data->carousel.value; @@ -1956,7 +1956,7 @@ void func0f17b8f0(void) func0f0f139c(g_MpCharacterMenuItems, -0.4f); } -s32 mpPlayerNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpPlayerNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { char *name = data->keyboard.string; s32 i; @@ -1998,7 +1998,7 @@ s32 mpPlayerNameMenuHandler(s32 operation, struct menuitem *item, union handlerd return 0; } -s32 mpLoadSettingsMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpLoadSettingsMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -2132,7 +2132,7 @@ char *mpMenuTextMpconfigMarquee(struct menuitem *item) return ""; } -s32 mpLoadPlayerMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpLoadPlayerMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 i; struct fileguid guid; @@ -2192,7 +2192,7 @@ s32 mpLoadPlayerMenuHandler(s32 operation, struct menuitem *item, union handlerd return 0; } -s32 menuhandlerMpTimeLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpTimeLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -2211,7 +2211,7 @@ s32 menuhandlerMpTimeLimitSlider(s32 operation, struct menuitem *item, union han return 0; } -s32 menuhandlerMpScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -2231,7 +2231,7 @@ s32 menuhandlerMpScoreLimitSlider(s32 operation, struct menuitem *item, union ha return 0; } -s32 menuhandlerMpTeamScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpTeamScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -2251,7 +2251,7 @@ s32 menuhandlerMpTeamScoreLimitSlider(s32 operation, struct menuitem *item, unio return 0; } -s32 menuhandlerMpRestoreScoreDefaults(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpRestoreScoreDefaults(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f187fec(); @@ -2260,7 +2260,7 @@ s32 menuhandlerMpRestoreScoreDefaults(s32 operation, struct menuitem *item, unio return 0; } -s32 menuhandlerMpHandicapPlayer(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpHandicapPlayer(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_CHECKHIDDEN: @@ -2291,7 +2291,7 @@ char *mpMenuTextHandicapPlayerName(struct menuitem *item) return ""; } -s32 menuhandlerMpRestoreHandicapDefaults(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpRestoreHandicapDefaults(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 i; @@ -2304,7 +2304,7 @@ s32 menuhandlerMpRestoreHandicapDefaults(s32 operation, struct menuitem *item, u return 0; } -s32 menudialogMpReady(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialogMpReady(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { if (g_PlayerConfigsArray[g_MpPlayerNum].fileguid.fileid && g_PlayerConfigsArray[g_MpPlayerNum].fileguid.deviceserial) { @@ -2315,7 +2315,7 @@ s32 menudialogMpReady(s32 operation, struct menudialogdef *dialogdef, union hand return false; } -s32 menudialogMpSimulant(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialogMpSimulant(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { if ((u8)g_BotConfigsArray[g_Menus[g_MpPlayerNum].mpsetup.slotindex].base.name[0] == '\0') { @@ -2331,7 +2331,7 @@ struct menuitem g_MpCharacterMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_DARKERBG, - (u32)&mpMenuTextBodyName, + (uintptr_t)&mpMenuTextBodyName, 0, NULL, }, @@ -2397,7 +2397,7 @@ struct menuitem g_MpLoadSettingsMenuItems[] = { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (u32)&mpMenuTextMpconfigMarquee, + (uintptr_t)&mpMenuTextMpconfigMarquee, 0, NULL, }, @@ -2426,7 +2426,7 @@ struct menuitem g_MpLoadPresetMenuItems[] = { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (u32)&mpMenuTextMpconfigMarquee, + (uintptr_t)&mpMenuTextMpconfigMarquee, 0, NULL, }, @@ -2558,7 +2558,7 @@ struct menuitem g_MpHandicapsMenuItems[] = { MENUITEMTYPE_SLIDER, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextHandicapPlayerName, + (uintptr_t)&mpMenuTextHandicapPlayerName, 0x000000ff, menuhandlerMpHandicapPlayer, }, @@ -2566,7 +2566,7 @@ struct menuitem g_MpHandicapsMenuItems[] = { MENUITEMTYPE_SLIDER, 1, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextHandicapPlayerName, + (uintptr_t)&mpMenuTextHandicapPlayerName, 0x000000ff, menuhandlerMpHandicapPlayer, }, @@ -2574,7 +2574,7 @@ struct menuitem g_MpHandicapsMenuItems[] = { MENUITEMTYPE_SLIDER, 2, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextHandicapPlayerName, + (uintptr_t)&mpMenuTextHandicapPlayerName, 0x000000ff, menuhandlerMpHandicapPlayer, }, @@ -2582,7 +2582,7 @@ struct menuitem g_MpHandicapsMenuItems[] = { MENUITEMTYPE_SLIDER, 3, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextHandicapPlayerName, + (uintptr_t)&mpMenuTextHandicapPlayerName, 0x000000ff, menuhandlerMpHandicapPlayer, }, @@ -2643,7 +2643,7 @@ struct menudialogdef g_MpReadyMenuDialog = { NULL, }; -s32 mpAddChangeSimulantMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpAddChangeSimulantMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 i; s32 count = 0; @@ -2751,7 +2751,7 @@ char *mpMenuTextSimulantDescription(struct menuitem *item) return langGet(L_MISC_106 + g_Menus[g_MpPlayerNum].mpsetup.unke24); } -s32 menuhandlerMpSimulantHead(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpSimulantHead(s32 operation, struct menuitem *item, union handlerdata *data) { s32 start = 0; @@ -2779,7 +2779,7 @@ s32 menuhandlerMpSimulantHead(s32 operation, struct menuitem *item, union handle return mpCharacterHeadMenuHandler(operation, item, data, g_BotConfigsArray[g_Menus[g_MpPlayerNum].mpsetup.slotindex].base.mpheadnum, 0); } -s32 menuhandlerMpSimulantBody(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpSimulantBody(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_BotConfigsArray[g_Menus[g_MpPlayerNum].mpsetup.slotindex].base.mpbodynum = data->carousel.value; @@ -2791,7 +2791,7 @@ s32 menuhandlerMpSimulantBody(s32 operation, struct menuitem *item, union handle false); } -s32 menudialog0017ccfc(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog0017ccfc(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { switch (operation) { case MENUOP_TICK: @@ -2806,7 +2806,7 @@ s32 menudialog0017ccfc(s32 operation, struct menudialogdef *dialogdef, union han return menudialogMpSimulant(operation, dialogdef, data); } -s32 mpBotDifficultyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpBotDifficultyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 count = 0; s32 i; @@ -2851,7 +2851,7 @@ s32 mpBotDifficultyMenuHandler(s32 operation, struct menuitem *item, union handl return 0; } -s32 menuhandlerMpDeleteSimulant(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpDeleteSimulant(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { mpRemoveSimulant(g_Menus[g_MpPlayerNum].mpsetup.slotindex); @@ -2867,7 +2867,7 @@ char *mpMenuTitleEditSimulant(struct menudialogdef *dialogdef) return g_StringPointer; } -s32 menuhandlerMpChangeSimulantType(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpChangeSimulantType(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 i; @@ -2890,7 +2890,7 @@ s32 menuhandlerMpChangeSimulantType(s32 operation, struct menuitem *item, union return 0; } -s32 menuhandlerMpClearAllSimulants(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpClearAllSimulants(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 i; @@ -2902,7 +2902,7 @@ s32 menuhandlerMpClearAllSimulants(s32 operation, struct menuitem *item, union h return 0; } -s32 menuhandlerMpAddSimulant(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpAddSimulant(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: @@ -2918,7 +2918,7 @@ s32 menuhandlerMpAddSimulant(s32 operation, struct menuitem *item, union handler return 0; } -s32 menuhandlerMpSimulantSlot(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpSimulantSlot(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: @@ -2970,7 +2970,7 @@ char *func0f17d3dc(struct menuitem *item) return g_StringPointer; } -s32 menudialogMpSimulants(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialogMpSimulants(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Menus[g_MpPlayerNum].mpsetup.slotcount = 0; @@ -2992,7 +2992,7 @@ struct menuitem g_MpAddChangeSimulantMenuItems[] = { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (u32)&mpMenuTextSimulantDescription, + (uintptr_t)&mpMenuTextSimulantDescription, 0, NULL, }, @@ -3100,7 +3100,7 @@ struct menuitem g_MpEditSimulantMenuItems[] = { struct menudialogdef g_MpEditSimulantMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&mpMenuTitleEditSimulant, + (uintptr_t)&mpMenuTitleEditSimulant, g_MpEditSimulantMenuItems, menudialogMpSimulant, MENUDIALOGFLAG_MPLOCKABLE, @@ -3129,7 +3129,7 @@ struct menuitem g_MpSimulantsMenuItems[] = { 0, 0, L_MPMENU_085, // "1:" - (u32)&mpMenuTextSimulantName, + (uintptr_t)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot, }, { @@ -3137,7 +3137,7 @@ struct menuitem g_MpSimulantsMenuItems[] = { 1, 0, L_MPMENU_086, // "2:" - (u32)&mpMenuTextSimulantName, + (uintptr_t)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot, }, { @@ -3145,7 +3145,7 @@ struct menuitem g_MpSimulantsMenuItems[] = { 2, 0, L_MPMENU_087, // "3:" - (u32)&mpMenuTextSimulantName, + (uintptr_t)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot, }, { @@ -3153,7 +3153,7 @@ struct menuitem g_MpSimulantsMenuItems[] = { 3, 0, L_MPMENU_088, // "4:" - (u32)&mpMenuTextSimulantName, + (uintptr_t)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot, }, { @@ -3161,7 +3161,7 @@ struct menuitem g_MpSimulantsMenuItems[] = { 4, 0, L_MPMENU_089, // "5:" - (u32)&mpMenuTextSimulantName, + (uintptr_t)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot, }, { @@ -3169,7 +3169,7 @@ struct menuitem g_MpSimulantsMenuItems[] = { 5, 0, L_MPMENU_090, // "6:" - (u32)&mpMenuTextSimulantName, + (uintptr_t)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot, }, { @@ -3177,7 +3177,7 @@ struct menuitem g_MpSimulantsMenuItems[] = { 6, 0, L_MPMENU_091, // "7:" - (u32)&mpMenuTextSimulantName, + (uintptr_t)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot, }, { @@ -3185,7 +3185,7 @@ struct menuitem g_MpSimulantsMenuItems[] = { 7, 0, L_MPMENU_092, // "8:" - (u32)&mpMenuTextSimulantName, + (uintptr_t)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot, }, { @@ -3224,7 +3224,7 @@ struct menudialogdef g_MpSimulantsMenuDialog = { NULL, }; -s32 menuhandlerMpNTeams(s32 operation, struct menuitem *item, union handlerdata *data, s32 numteams) +MenuItemHandlerResult menuhandlerMpNTeams(s32 operation, struct menuitem *item, union handlerdata *data, s32 numteams) { if (operation == MENUOP_SET) { s32 numchrs = mpGetNumChrs(); @@ -3302,22 +3302,22 @@ s32 menuhandlerMpNTeams(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerMpTwoTeams(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpTwoTeams(s32 operation, struct menuitem *item, union handlerdata *data) { return menuhandlerMpNTeams(operation, item, data, 2); } -s32 menuhandlerMpThreeTeams(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpThreeTeams(s32 operation, struct menuitem *item, union handlerdata *data) { return menuhandlerMpNTeams(operation, item, data, 3); } -s32 menuhandlerMpFourTeams(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpFourTeams(s32 operation, struct menuitem *item, union handlerdata *data) { return menuhandlerMpNTeams(operation, item, data, 4); } -s32 menuhandlerMpMaximumTeams(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpMaximumTeams(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 i; @@ -3341,7 +3341,7 @@ s32 menuhandlerMpMaximumTeams(s32 operation, struct menuitem *item, union handle return 0; } -s32 menuhandlerMpHumansVsSimulants(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpHumansVsSimulants(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 i; @@ -3360,7 +3360,7 @@ s32 menuhandlerMpHumansVsSimulants(s32 operation, struct menuitem *item, union h return 0; } -s32 menuhandlerMpHumanSimulantPairs(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpHumanSimulantPairs(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { u8 team_ids[4] = {0, 1, 2, 3}; @@ -3401,7 +3401,7 @@ char *mpMenuTextChrNameForTeamSetup(struct menuitem *item) return ""; } -s32 func0f17dac4(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult func0f17dac4(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -3418,7 +3418,7 @@ s32 func0f17dac4(s32 operation, struct menuitem *item, union handlerdata *data) return menuhandlerMpTeamsLabel(operation, item, data); } -s32 menuhandlerMpTeamSlot(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpTeamSlot(s32 operation, struct menuitem *item, union handlerdata *data) { struct mpchrconfig *mpchr; @@ -3566,7 +3566,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 0, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3574,7 +3574,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 1, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3582,7 +3582,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 2, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3590,7 +3590,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 3, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3598,7 +3598,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 4, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3606,7 +3606,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 5, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3614,7 +3614,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 6, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3622,7 +3622,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 7, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3630,7 +3630,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 8, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3638,7 +3638,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 9, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3646,7 +3646,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 10, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3654,7 +3654,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 11, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3679,7 +3679,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 0, MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3687,7 +3687,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 1, MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3695,7 +3695,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 2, MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3703,7 +3703,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 3, MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3711,7 +3711,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 4, MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3719,7 +3719,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 5, MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3727,7 +3727,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 6, MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3735,7 +3735,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 7, MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3743,7 +3743,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 8, MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3751,7 +3751,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 9, MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3759,7 +3759,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 10, MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3767,7 +3767,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMTYPE_DROPDOWN, 11, MENUITEMFLAG_LOCKABLEMINOR, - (u32)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mpMenuTextChrNameForTeamSetup, 0, menuhandlerMpTeamSlot, }, @@ -3824,7 +3824,7 @@ u32 var80085ce8[] = { * If multiple tracks are disabled, the listing contains the track listing plus * 3 items for Select All, Select None and Randomize. */ -s32 mpSelectTuneListHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpSelectTuneListHandler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -3914,7 +3914,7 @@ s32 mpSelectTuneListHandler(s32 operation, struct menuitem *item, union handlerd return 0; } -s32 menudialogMpSelectTune(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialogMpSelectTune(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { var800840e0 = 80; @@ -3944,7 +3944,7 @@ char *mpMenuTextCurrentTrack(struct menuitem *item) return langGet(L_MPMENU_067); // "Random" } -s32 menuhandlerMpMultipleTunes(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpMultipleTunes(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -3957,7 +3957,7 @@ s32 menuhandlerMpMultipleTunes(s32 operation, struct menuitem *item, union handl return 0; } -s32 mpTeamNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpTeamNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { char *name = data->keyboard.string; s32 i; @@ -4014,7 +4014,7 @@ char *mpMenuTextTeamName(struct menuitem *item) return g_BossFile.teamnames[index]; } -s32 menuhandlerMpTeamNameSlot(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpTeamNameSlot(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Menus[g_MpPlayerNum].mpsetup.slotindex = item->param2 - 0x5608; @@ -4033,7 +4033,7 @@ char *func0f17e318(struct menudialogdef *dialogdef) /** * An "Accept" item somewhere. Probably accepting a challenge. */ -s32 menuhandler0017e38c(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler0017e38c(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { #if VERSION >= VERSION_NTSC_1_0 @@ -4047,7 +4047,7 @@ s32 menuhandler0017e38c(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menudialog0017e3fc(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog0017e3fc(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -4084,7 +4084,7 @@ struct menuitem g_MpSelectTunesMenuItems[] = { struct menudialogdef g_MpSelectTunesMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&mpMenuTextSelectTuneOrTunes, + (uintptr_t)&mpMenuTextSelectTuneOrTunes, g_MpSelectTunesMenuItems, menudialogMpSelectTune, MENUDIALOGFLAG_MPLOCKABLE, @@ -4105,7 +4105,7 @@ struct menuitem g_MpSoundtrackMenuItems[] = { 0, 0, L_OPTIONS_003, // "" - (u32)&mpMenuTextCurrentTrack, + (uintptr_t)&mpMenuTextCurrentTrack, NULL, }, { @@ -4120,7 +4120,7 @@ struct menuitem g_MpSoundtrackMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, - (u32)&mpMenuTextSelectTuneOrTunes, + (uintptr_t)&mpMenuTextSelectTuneOrTunes, 0, (void *)&g_MpSelectTunesMenuDialog, }, @@ -4187,7 +4187,7 @@ struct menuitem g_MpTeamNamesMenuItems[] = { 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_008, // "Red" - (u32)&mpMenuTextTeamName, + (uintptr_t)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot, }, { @@ -4195,7 +4195,7 @@ struct menuitem g_MpTeamNamesMenuItems[] = { 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_009, // "Yellow" - (u32)&mpMenuTextTeamName, + (uintptr_t)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot, }, { @@ -4203,7 +4203,7 @@ struct menuitem g_MpTeamNamesMenuItems[] = { 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_010, // "Blue" - (u32)&mpMenuTextTeamName, + (uintptr_t)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot, }, { @@ -4211,7 +4211,7 @@ struct menuitem g_MpTeamNamesMenuItems[] = { 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_011, // "Magenta" - (u32)&mpMenuTextTeamName, + (uintptr_t)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot, }, { @@ -4219,7 +4219,7 @@ struct menuitem g_MpTeamNamesMenuItems[] = { 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_012, // "Cyan" - (u32)&mpMenuTextTeamName, + (uintptr_t)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot, }, { @@ -4227,7 +4227,7 @@ struct menuitem g_MpTeamNamesMenuItems[] = { 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_013, // "Orange" - (u32)&mpMenuTextTeamName, + (uintptr_t)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot, }, { @@ -4235,7 +4235,7 @@ struct menuitem g_MpTeamNamesMenuItems[] = { 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_014, // "Pink" - (u32)&mpMenuTextTeamName, + (uintptr_t)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot, }, { @@ -4243,7 +4243,7 @@ struct menuitem g_MpTeamNamesMenuItems[] = { 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_015, // "Brown" - (u32)&mpMenuTextTeamName, + (uintptr_t)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot, }, { @@ -4312,7 +4312,7 @@ struct menuitem g_MpConfirmChallengeViaListOrDetailsMenuItems[] = { struct menudialogdef g_MpConfirmChallengeViaListOrDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&func0f17e318, + (uintptr_t)&func0f17e318, g_MpConfirmChallengeViaListOrDetailsMenuItems, menudialog0017e3fc, MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_MPLOCKABLE, @@ -4376,7 +4376,7 @@ struct menuitem g_MpChallengesListOrDetailsMenuItems[] = { struct menudialogdef g_MpChallengeListOrDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, #if VERSION >= VERSION_NTSC_1_0 - (u32)&mpMenuTextChallengeName, + (uintptr_t)&mpMenuTextChallengeName, #else 0x5032, #endif @@ -4395,7 +4395,7 @@ struct menudialogdef g_MpAdvancedSetupViaAdvChallengeMenuDialog; struct menudialogdef g_MpChallengeListOrDetailsViaAdvChallengeMenuDialog = { MENUDIALOGTYPE_DEFAULT, #if VERSION >= VERSION_NTSC_1_0 - (u32)&mpMenuTextChallengeName, + (uintptr_t)&mpMenuTextChallengeName, #else 0x5032, #endif @@ -4448,14 +4448,14 @@ struct menuitem g_MpConfirmChallengeMenuItems[] = { struct menudialogdef g_MpConfirmChallengeMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&func0f17e318, + (uintptr_t)&func0f17e318, g_MpConfirmChallengeMenuItems, menudialog0017e3fc, MENUDIALOGFLAG_STARTSELECTS, NULL, }; -s32 mpChallengesListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpChallengesListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { Gfx *gdl; struct menuitemrenderdata *renderdata; @@ -4569,7 +4569,7 @@ s32 mpChallengesListMenuHandler(s32 operation, struct menuitem *item, union hand * This is for a separator and fixed height thing in the dialog at: * Combat Simulator > Advanced Setup > Challenges > pick one > Accept */ -s32 menuhandler0017e9d8(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler0017e9d8(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_BossFile.locktype != MPLOCKTYPE_CHALLENGE) { @@ -4580,7 +4580,7 @@ s32 menuhandler0017e9d8(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerMpAbortChallenge(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpAbortChallenge(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_BossFile.locktype != MPLOCKTYPE_CHALLENGE) { @@ -4595,7 +4595,7 @@ s32 menuhandlerMpAbortChallenge(s32 operation, struct menuitem *item, union hand return 0; } -s32 menuhandlerMpStartChallenge(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpStartChallenge(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_BossFile.locktype != MPLOCKTYPE_CHALLENGE) { @@ -4621,7 +4621,7 @@ char *mpMenuTextChallengeName(struct menuitem *item) return g_StringPointer; } -s32 mpCombatChallengesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult mpCombatChallengesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_BossFile.locktype == MPLOCKTYPE_CHALLENGE @@ -4645,7 +4645,7 @@ s32 mpCombatChallengesMenuDialog(s32 operation, struct menudialogdef *dialogdef, return 0; } -s32 menuhandler0017ec64(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler0017ec64(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { challengeSetCurrentBySlot(g_Menus[g_MpPlayerNum].mpsetup.slotindex); @@ -4676,7 +4676,7 @@ struct menudialogdef g_MpChallengesMenuDialog = { NULL, }; -s32 menuhandlerMpLock(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpLock(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[] = { L_MPMENU_045, // "None" @@ -4714,7 +4714,7 @@ s32 menuhandlerMpLock(s32 operation, struct menuitem *item, union handlerdata *d return 0; } -s32 menuhandlerMpSavePlayer(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpSavePlayer(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (g_PlayerConfigsArray[g_MpPlayerNum].fileguid.fileid == 0) { @@ -4736,7 +4736,7 @@ char *mpMenuTextSavePlayerOrCopy(struct menuitem *item) return langGet(L_MPMENU_039); // "Save Copy of Player" } -s32 menuhandler0017ef30(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler0017ef30(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (g_Vars.stagenum == STAGE_CITRAINING) { @@ -4753,7 +4753,7 @@ s32 menuhandler0017ef30(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerMpSaveSettings(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpSaveSettings(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (g_MpSetup.fileguid.fileid == 0) { @@ -4788,7 +4788,7 @@ char *mpMenuTextWeaponSetName(struct menuitem *item) return mpGetWeaponSetName(mpGetWeaponSet()); } -s32 menudialogMpGameSetup(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialogMpGameSetup(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Vars.mpsetupmenu = MPSETUPMENU_ADVSETUP; @@ -4798,7 +4798,7 @@ s32 menudialogMpGameSetup(s32 operation, struct menudialogdef *dialogdef, union return false; } -s32 menudialogMpQuickGo(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialogMpQuickGo(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Vars.mpsetupmenu = MPSETUPMENU_QUICKGO; @@ -4922,7 +4922,7 @@ void func0f17f428(void) } } -s32 menuhandlerMpFinishedSetup(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpFinishedSetup(s32 operation, struct menuitem *item, union handlerdata *data) { #if VERSION >= VERSION_NTSC_1_0 if (operation == MENUOP_CHECKPREFOCUSED) { @@ -4937,7 +4937,7 @@ s32 menuhandlerMpFinishedSetup(s32 operation, struct menuitem *item, union handl return 0; } -s32 menuhandlerQuickTeamSeparator(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerQuickTeamSeparator(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_Vars.mpquickteam == MPQUICKTEAM_PLAYERSONLY) { @@ -4948,7 +4948,7 @@ s32 menuhandlerQuickTeamSeparator(s32 operation, struct menuitem *item, union ha return 0; } -s32 menuhandlerPlayerTeam(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerPlayerTeam(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -4981,7 +4981,7 @@ s32 menuhandlerPlayerTeam(s32 operation, struct menuitem *item, union handlerdat return 0; } -s32 menuhandlerMpNumberOfSimulants(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpNumberOfSimulants(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -5007,7 +5007,7 @@ s32 menuhandlerMpNumberOfSimulants(s32 operation, struct menuitem *item, union h return 0; } -s32 menuhandlerMpSimulantsPerTeam(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpSimulantsPerTeam(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -5032,7 +5032,7 @@ s32 menuhandlerMpSimulantsPerTeam(s32 operation, struct menuitem *item, union ha return 0; } -s32 mpQuickTeamSimulantDifficultyHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mpQuickTeamSimulantDifficultyHandler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 count = 0; s32 i; @@ -5073,7 +5073,7 @@ s32 mpQuickTeamSimulantDifficultyHandler(s32 operation, struct menuitem *item, u return 0; } -s32 menuhandlerMpQuickTeamOption(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpQuickTeamOption(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Vars.mpquickteam = item->param; @@ -5096,7 +5096,7 @@ s32 menuhandlerMpQuickTeamOption(s32 operation, struct menuitem *item, union han return 0; } -s32 menudialogCombatSimulator(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialogCombatSimulator(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Vars.waitingtojoin[0] = false; @@ -5118,7 +5118,7 @@ s32 menudialogCombatSimulator(s32 operation, struct menudialogdef *dialogdef, un return false; } -s32 menuhandlerMpAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerMpAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f0f820c(&g_MpAdvancedSetupMenuDialog, 3); @@ -5294,7 +5294,7 @@ struct menuitem g_MpPlayerSetup234MenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, L_MPMENU_030, // "Name" - (u32)&mpGetCurrentPlayerName, + (uintptr_t)&mpGetCurrentPlayerName, (void *)&g_MpPlayerNameMenuDialog, }, { @@ -5349,7 +5349,7 @@ struct menuitem g_MpPlayerSetup234MenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, 0, - (u32)&mpMenuTextSavePlayerOrCopy, + (uintptr_t)&mpMenuTextSavePlayerOrCopy, 0, menuhandlerMpSavePlayer, }, @@ -5426,7 +5426,7 @@ struct menuitem g_MpAdvancedSetupMenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG | MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_019, // "Scenario" - (u32)&mpMenuTextScenarioShortName, + (uintptr_t)&mpMenuTextScenarioShortName, (void *)&g_MpScenarioMenuDialog, }, { @@ -5442,7 +5442,7 @@ struct menuitem g_MpAdvancedSetupMenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, L_MPMENU_020, // "Arena" - (u32)&mpMenuTextArenaName, + (uintptr_t)&mpMenuTextArenaName, (void *)&g_MpArenaMenuDialog, }, { @@ -5583,7 +5583,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG | MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_019, // "Scenario" - (u32)&mpMenuTextScenarioShortName, + (uintptr_t)&mpMenuTextScenarioShortName, (void *)&g_MpQuickTeamScenarioMenuDialog, }, { @@ -5599,7 +5599,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, L_MPMENU_020, // "Arena" - (u32)&mpMenuTextArenaName, + (uintptr_t)&mpMenuTextArenaName, (void *)&g_MpArenaMenuDialog, }, { @@ -5607,7 +5607,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, L_MPMENU_023, // "Weapons" - (u32)&mpMenuTextWeaponSetName, + (uintptr_t)&mpMenuTextWeaponSetName, (void *)&g_MpQuickTeamWeaponsMenuDialog, }, { diff --git a/src/game/objectives.c b/src/game/objectives.c index 1831d442e..7cc60ae29 100644 --- a/src/game/objectives.c +++ b/src/game/objectives.c @@ -68,7 +68,7 @@ void func0f095350(u32 arg0, u32 *arg1) value = *ptr; } - *arg1 = *(u32 *)((u32)osRomBase | arg0 | 0xa0000000); + *arg1 = *(u32 *)((uintptr_t)osRomBase | arg0 | 0xa0000000); __osPiRelAccess(); } diff --git a/src/game/player.c b/src/game/player.c index 41a6f0c2e..c17862fc5 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -1367,7 +1367,7 @@ void playerTickChrBody(void) allocation = g_Vars.currentplayer->gunmem2; model = (struct model *)(allocation + offset1); - osSyncPrintf("Gunmem: bondsub 0x%08x\n", (u32)model); + osSyncPrintf("Gunmem: bondsub 0x%08x\n", (uintptr_t)model); offset1 += ALIGN64(sizeof(struct model)); model->anim = (struct anim *)(allocation + offset1); @@ -1376,12 +1376,12 @@ void playerTickChrBody(void) offset1 = ALIGN64(offset1); rwdatas = (union modelrwdata **)(allocation + offset1); - osSyncPrintf("Gunmem: savedata 0x%08x\n", (u32)rwdatas); + osSyncPrintf("Gunmem: savedata 0x%08x\n", (uintptr_t)rwdatas); offset1 += 0x400; offset1 = ALIGN64(offset1); weaponobj = (struct weaponobj *)(allocation + offset1); - osSyncPrintf("Gunmem: wo 0x%08x\n", (u32)weaponobj); + osSyncPrintf("Gunmem: wo 0x%08x\n", (uintptr_t)weaponobj); offset1 += sizeof(struct weaponobj); offset1 = ALIGN64(offset1); @@ -5706,7 +5706,7 @@ void player0f0c3320(Mtxf *matrices, s32 count) s32 j; for (i = 0, j = 0; i < count; i++, j += sizeof(Mtxf)) { - mtx00015be4(camGetProjectionMtxF(), (Mtxf *)((u32)matrices + j), &sp40); + mtx00015be4(camGetProjectionMtxF(), (Mtxf *)((uintptr_t)matrices + j), &sp40); sp40.m[3][0] -= g_Vars.currentplayer->globaldrawworldoffset.x; sp40.m[3][1] -= g_Vars.currentplayer->globaldrawworldoffset.y; diff --git a/src/game/playerreset.c b/src/game/playerreset.c index 8ec70b9db..90c7bbfcf 100644 --- a/src/game/playerreset.c +++ b/src/game/playerreset.c @@ -170,14 +170,14 @@ void playerReset(void) if (cmd->param2 == 0) { g_SpawnPoints[g_NumSpawnPoints++] = cmd->param1; } - cmd = (struct cmd32 *)((u32)cmd + 12); + cmd = (struct cmd32 *)((uintptr_t)cmd + 12); break; case INTROCMD_CASE: case INTROCMD_CASERESPAWN: - cmd = (struct cmd32 *)((u32)cmd + 12); + cmd = (struct cmd32 *)((uintptr_t)cmd + 12); break; case INTROCMD_HILL: - cmd = (struct cmd32 *)((u32)cmd + 8); + cmd = (struct cmd32 *)((uintptr_t)cmd + 8); break; case INTROCMD_WEAPON: if (cmd->param3 == 0 && g_Vars.currentplayer != g_Vars.anti) { @@ -204,26 +204,26 @@ void playerReset(void) haseyespy = true; } } - cmd = (struct cmd32 *)((u32)cmd + 16); + cmd = (struct cmd32 *)((uintptr_t)cmd + 16); break; case INTROCMD_AMMO: if (cmd->param3 == 0 && g_Vars.currentplayer != g_Vars.anti) { bgunSetAmmoQuantity(cmd->param1, cmd->param2); } - cmd = (struct cmd32 *)((u32)cmd + 16); + cmd = (struct cmd32 *)((uintptr_t)cmd + 16); break; case INTROCMD_3: - cmd = (struct cmd32 *)((u32)cmd + 32); + cmd = (struct cmd32 *)((uintptr_t)cmd + 32); break; case INTROCMD_4: - cmd = (struct cmd32 *)((u32)cmd + 8); + cmd = (struct cmd32 *)((uintptr_t)cmd + 8); break; case INTROCMD_OUTFIT: g_Vars.currentplayer->bondtype = cmd->param1; - cmd = (struct cmd32 *)((u32)cmd + 8); + cmd = (struct cmd32 *)((uintptr_t)cmd + 8); break; case INTROCMD_6: - cmd = (struct cmd32 *)((u32)cmd + 40); + cmd = (struct cmd32 *)((uintptr_t)cmd + 40); break; case INTROCMD_WATCHTIME: g_Vars.currentplayer->bondwatchtime60 = 0; @@ -233,7 +233,7 @@ void playerReset(void) if (cmd->param1 > 0) { g_Vars.currentplayer->bondwatchtime60 += (cmd->param1 % 12) * 3600 * 60; } - cmd = (struct cmd32 *)((u32)cmd + 12); + cmd = (struct cmd32 *)((uintptr_t)cmd + 12); break; case INTROCMD_CREDITOFFSET: thing = (struct gecreditsdata *)((s32)g_GeCreditsData + cmd->param1); @@ -241,10 +241,10 @@ void playerReset(void) while (thing->text1 || thing->text2) { thing++; } - cmd = (struct cmd32 *)((u32)cmd + 8); + cmd = (struct cmd32 *)((uintptr_t)cmd + 8); break; default: - cmd = (struct cmd32 *)((u32)cmd + 4); + cmd = (struct cmd32 *)((uintptr_t)cmd + 4); } } } diff --git a/src/game/portalconv.c b/src/game/portalconv.c index 4718f4489..f968ce872 100644 --- a/src/game/portalconv.c +++ b/src/game/portalconv.c @@ -14,7 +14,7 @@ s32 portalConvertCoordinates(s32 portalnum, s32 *start, struct portalthing2 *things) { Mtxf *mtx = g_Vars.currentplayer->worldtoscreenmtx; - struct portalvertices *pvertices = (struct portalvertices *) ((u32) g_BgPortals + g_BgPortals[portalnum].verticesoffset); + struct portalvertices *pvertices = (struct portalvertices *) ((uintptr_t) g_BgPortals + g_BgPortals[portalnum].verticesoffset); struct portalthing2 *left; struct portalthing2 *right = &things[39]; bool anybehind = false; diff --git a/src/game/propobj.c b/src/game/propobj.c index ebbc47b14..d43f2c8a3 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -2914,13 +2914,13 @@ bool func0f06bea0(struct model *model, struct modelnode *endnode, struct modelno if (rwdata->gdl != NULL) { if (rwdata->gdl == rodata->dl.opagdl) { - s4 = (Gfx *)((u32)rodata->dl.colourtable + ((u32)rodata->dl.opagdl & 0xffffff)); + s4 = (Gfx *)((uintptr_t)rodata->dl.colourtable + ((uintptr_t)rodata->dl.opagdl & 0xffffff)); } else { s4 = rwdata->gdl; } if (rodata->dl.xlugdl != NULL) { - s6 = (Gfx *)((u32)rodata->dl.colourtable + ((u32)rodata->dl.xlugdl & 0xffffff)); + s6 = (Gfx *)((uintptr_t)rodata->dl.colourtable + ((uintptr_t)rodata->dl.xlugdl & 0xffffff)); } vertices = rwdata->vertices; @@ -2930,12 +2930,12 @@ bool func0f06bea0(struct model *model, struct modelnode *endnode, struct modelno case MODELNODETYPE_GUNDL: if (s7) { if (node->rodata->gundl.opagdl != NULL) { - s32 base = (s32)node->rodata->gundl.baseaddr; + s32 base = (intptr_t)node->rodata->gundl.baseaddr; - s4 = (Gfx *)(base + ((u32)node->rodata->gundl.opagdl & 0xffffff)); + s4 = (Gfx *)(base + ((uintptr_t)node->rodata->gundl.opagdl & 0xffffff)); if (node->rodata->gundl.xlugdl != NULL) { - s6 = (Gfx *)(base + ((u32)node->rodata->gundl.xlugdl & 0xffffff)); + s6 = (Gfx *)(base + ((uintptr_t)node->rodata->gundl.xlugdl & 0xffffff)); } vertices = (struct gfxvtx *)base; @@ -7737,7 +7737,7 @@ void doorUpdatePortalIfWindowed(struct prop *doorprop, s32 playercount) } } -#define MTX(i) ((Mtxf *)((u32)matrices + i * sizeof(Mtxf))) +#define MTX(i) ((Mtxf *)((uintptr_t)matrices + i * sizeof(Mtxf))) void doorInitMatrices(struct prop *prop) { @@ -13659,7 +13659,7 @@ Gfx *objRender(struct prop *prop, Gfx *gdl, bool xlupass) node = func0f0687e4(obj->model); dldata1 = &node->rodata->dl; dldata2 = (struct modelrwdata_dl *) modelGetNodeRwData(obj->model, node); - oldcolours = (struct colour *) ((((u32) &dldata1->vertices[dldata1->numvertices] + 7) | 7) ^ 7); + oldcolours = (struct colour *) ((((uintptr_t) &dldata1->vertices[dldata1->numvertices] + 7) | 7) ^ 7); newcolours = (struct colour *) gfxAllocateColours(dldata1->numcolours); for (i = 0; i < dldata1->numcolours; i++) { @@ -13977,7 +13977,7 @@ void objDeform(struct defaultobj *obj, s32 level) ok = false; } - if ((u32)rwdata->colours == ALIGN8((u32)&rodata->vertices[rodata->numvertices])) { + if ((uintptr_t)rwdata->colours == ALIGN8((uintptr_t)&rodata->vertices[rodata->numvertices])) { struct colour *colours = vtxstoreAllocate(rodata->numcolours, VTXSTORETYPE_OBJCOL, NULL, 0); if (colours) { @@ -14288,12 +14288,12 @@ void piracyRestore(void) ptr = (u32 *)buffer; // Align ptr to an 8 byte boundary - while ((u32)ptr % 8) { + while ((uintptr_t)ptr % 8) { ptr++; } // Copy the writeaddr/copylen pairs from ROM to the buffer - dmaExec(ptr, (u32) &_blankSegmentRomStart, 0x40); + dmaExec(ptr, (romptr_t) &_blankSegmentRomStart, 0x40); // Calculate what needs to be copied and where i = 0; @@ -14311,7 +14311,7 @@ void piracyRestore(void) // Copy it if (copylen != 0) { - dmaExec((void *) writeaddr, (u32) &_blankSegmentRomStart + readoffset, copylen); + dmaExec((void *) writeaddr, (romptr_t) &_blankSegmentRomStart + readoffset, copylen); } // Increment the index, so the next time the function is called @@ -14972,13 +14972,13 @@ bool func0f0849dc(struct model *model, struct modelnode *nodearg, struct coord * if (rwdata->gdl != NULL) { if (rwdata->gdl == rodata->opagdl) { - s3 = (Gfx *)((u32)rodata->colourtable + ((u32)rodata->opagdl & 0xffffff)); + s3 = (Gfx *)((uintptr_t)rodata->colourtable + ((u32)rodata->opagdl & 0xffffff)); } else { s3 = rwdata->gdl; } if (rodata->xlugdl != NULL) { - s5 = (void *)((u32)rodata->colourtable + ((u32)rodata->xlugdl & 0xffffff)); + s5 = (void *)((uintptr_t)rodata->colourtable + ((u32)rodata->xlugdl & 0xffffff)); } vertices = rwdata->vertices; @@ -14990,13 +14990,13 @@ bool func0f0849dc(struct model *model, struct modelnode *nodearg, struct coord * struct modelrodata_gundl *rodata = &node->rodata->gundl; if (rodata->opagdl != NULL) { - s3 = (Gfx *)((u32)rodata->baseaddr + ((u32)rodata->opagdl & 0xffffff)); + s3 = (Gfx *)((uintptr_t)rodata->baseaddr + ((u32)rodata->opagdl & 0xffffff)); if (rodata->xlugdl != NULL) { - s5 = (Gfx *)((u32)rodata->baseaddr + ((u32)rodata->xlugdl & 0xffffff)); + s5 = (Gfx *)((uintptr_t)rodata->baseaddr + ((u32)rodata->xlugdl & 0xffffff)); } - vertices = (void *)(u32)rodata->baseaddr; + vertices = (void *)(uintptr_t)rodata->baseaddr; } } break; @@ -15105,7 +15105,7 @@ void glassDestroy(struct defaultobj *obj) u8 buffer[0x20]; u32 *ptr; u32 romaddr = add43214321(0x00000dc0 - 0x43214321); - ptr = (u32 *) ALIGN16((u32)buffer); + ptr = (u32 *) ALIGN16((uintptr_t)buffer); dmaExec(ptr, romaddr, 0x10); if (ptr[1] + ptr[0] != add43214321(0x10a78f00e - 0x43214321)) { @@ -16198,7 +16198,7 @@ bool objUpdateGeometry(struct prop *prop, u8 **start, u8 **end) if (obj->flags & OBJFLAG_00000100) { if ((obj->hidden & (OBJHFLAG_PERIMDISABLED | OBJHFLAG_DOORPERIMDISABLED)) == 0) { *start = (void *) obj->unkgeo; - *end = (void *)((u32)obj->unkgeo + len); + *end = (void *)((uintptr_t)obj->unkgeo + len); if (obj->geocount >= 2) { *end += obj->geocount * 0x40 - 0x40; @@ -16209,7 +16209,7 @@ bool objUpdateGeometry(struct prop *prop, u8 **start, u8 **end) } if (obj->geocount >= 2) { - *start = (void *)((u32)obj->unkgeo + len); + *start = (void *)((uintptr_t)obj->unkgeo + len); *end = (void *)(*start + obj->geocount * 0x40 - 0x40); return true; } @@ -16220,7 +16220,7 @@ bool objUpdateGeometry(struct prop *prop, u8 **start, u8 **end) } *start = (void *) obj->unkgeo; - *end = (void *) ((u32)obj->unkgeo + obj->geocount * 0x40); + *end = (void *) ((uintptr_t)obj->unkgeo + obj->geocount * 0x40); return true; } @@ -17685,7 +17685,7 @@ void modelFreeVertices(s32 vtxstoretype, struct model *model) rwdata->dl.vertices = rodata->dl.vertices; } - if ((u32)rwdata->dl.colours != ALIGN8((u32)rodata->dl.vertices + rodata->dl.numvertices * sizeof(struct gfxvtx))) { + if ((uintptr_t)rwdata->dl.colours != ALIGN8((uintptr_t)rodata->dl.vertices + rodata->dl.numvertices * sizeof(struct gfxvtx))) { if (vtxstoretype == VTXSTORETYPE_OBJVTX) { newtype = VTXSTORETYPE_OBJCOL; } else { @@ -17694,7 +17694,7 @@ void modelFreeVertices(s32 vtxstoretype, struct model *model) vtxstoreFree(newtype, rwdata->dl.colours); - rwdata->dl.colours = (struct colour *)ALIGN8((u32)rodata->dl.vertices + rodata->dl.numvertices * sizeof(struct gfxvtx)); + rwdata->dl.colours = (struct colour *)ALIGN8((uintptr_t)rodata->dl.vertices + rodata->dl.numvertices * sizeof(struct gfxvtx)); } } break; diff --git a/src/game/setup.c b/src/game/setup.c index 9e144733b..1fd0d8698 100644 --- a/src/game/setup.c +++ b/src/game/setup.c @@ -1237,7 +1237,7 @@ void setupLoadBriefing(s32 stagenum, u8 *buffer, s32 bufferlen, struct briefing langLoadToAddr(briefing->langbank, langbuffer, langbufferlen); - start = (struct defaultobj *)((u32)setup + (u32)setup->props); + start = (struct defaultobj *)((uintptr_t)setup + (u32)setup->props); if (start != NULL) { struct defaultobj *obj; @@ -1323,10 +1323,10 @@ void setupLoadFiles(s32 stagenum) setup = (struct stagesetup *)g_GeCreditsData; langLoad(langGetLangBankIndexFromStagenum(stagenum)); - g_StageSetup.intro = (s32 *)((u32)setup + (u32)setup->intro); - g_StageSetup.props = (u32 *)((u32)setup + (u32)setup->props); - g_StageSetup.paths = (struct path *)((u32)setup + (u32)setup->paths); - g_StageSetup.ailists = (struct ailist *)((u32)setup + (u32)setup->ailists); + g_StageSetup.intro = (s32 *)((uintptr_t)setup + (u32)setup->intro); + g_StageSetup.props = (u32 *)((uintptr_t)setup + (u32)setup->props); + g_StageSetup.paths = (struct path *)((uintptr_t)setup + (u32)setup->paths); + g_StageSetup.ailists = (struct ailist *)((uintptr_t)setup + (u32)setup->ailists); g_LoadType = LOADTYPE_PADS; @@ -1339,7 +1339,7 @@ void setupLoadFiles(s32 stagenum) // Convert ailist pointers from file-local to proper pointers if (g_StageSetup.ailists) { for (i = 0; g_StageSetup.ailists[i].list != NULL; i++) { - g_StageSetup.ailists[i].list = (u8 *)((u32)setup + (u32)g_StageSetup.ailists[i].list); + g_StageSetup.ailists[i].list = (u8 *)((uintptr_t)setup + (u32)g_StageSetup.ailists[i].list); } } @@ -1383,7 +1383,7 @@ void setupLoadFiles(s32 stagenum) // and calculate the path lengths if (g_StageSetup.paths) { for (i = 0; g_StageSetup.paths[i].pads != NULL; i++) { - g_StageSetup.paths[i].pads = (s32 *)((u32)g_StageSetup.paths[i].pads + (u32)setup); + g_StageSetup.paths[i].pads = (s32 *)((uintptr_t)g_StageSetup.paths[i].pads + (u32)setup); for (j = 0; g_StageSetup.paths[i].pads[j] >= 0; j++); diff --git a/src/game/setuppads.c b/src/game/setuppads.c index 693f3a430..d4f4a9a8f 100644 --- a/src/game/setuppads.c +++ b/src/game/setuppads.c @@ -87,9 +87,9 @@ void setupPreparePads(void) } } - g_StageSetup.waypoints = (struct waypoint *) ((u32)g_StageSetup.padfiledata + g_PadsFile->waypointsoffset); - g_StageSetup.waygroups = (struct waygroup *) ((u32)g_StageSetup.padfiledata + g_PadsFile->waygroupsoffset); - g_StageSetup.cover = (void *) ((s32)g_StageSetup.padfiledata + g_PadsFile->coversoffset); + g_StageSetup.waypoints = (struct waypoint *) ((uintptr_t)g_StageSetup.padfiledata + g_PadsFile->waypointsoffset); + g_StageSetup.waygroups = (struct waygroup *) ((uintptr_t)g_StageSetup.padfiledata + g_PadsFile->waygroupsoffset); + g_StageSetup.cover = (void *) ((intptr_t)g_StageSetup.padfiledata + g_PadsFile->coversoffset); if (g_StageSetup.cover != NULL) { setupPrepareCover(); @@ -99,7 +99,7 @@ void setupPreparePads(void) waypoint = g_StageSetup.waypoints; while (waypoint->padnum >= 0) { - waypoint->neighbours = (s32 *)((u32)g_StageSetup.padfiledata + (u32)waypoint->neighbours); + waypoint->neighbours = (s32 *)((uintptr_t)g_StageSetup.padfiledata + (uintptr_t)waypoint->neighbours); waypoint++; } @@ -107,8 +107,8 @@ void setupPreparePads(void) waygroup = g_StageSetup.waygroups; while (waygroup->neighbours != NULL) { - waygroup->neighbours = (s32 *)((u32)g_StageSetup.padfiledata + (u32)waygroup->neighbours); - waygroup->waypoints = (s32 *)((u32)g_StageSetup.padfiledata + (u32)waygroup->waypoints); + waygroup->neighbours = (s32 *)((uintptr_t)g_StageSetup.padfiledata + (uintptr_t)waygroup->neighbours); + waygroup->waypoints = (s32 *)((uintptr_t)g_StageSetup.padfiledata + (uintptr_t)waygroup->waypoints); waygroup++; } } diff --git a/src/game/splat.c b/src/game/splat.c index ac003398e..41e41146e 100644 --- a/src/game/splat.c +++ b/src/game/splat.c @@ -514,7 +514,7 @@ void splat0f14986c(struct splatdata *splat) void splatResetChr(struct chrdata *chr) { - osSyncPrintf("Splat_ResetChr : Reset One Char : chrdata = %x\n", (u32)chr); + osSyncPrintf("Splat_ResetChr : Reset One Char : chrdata = %x\n", (uintptr_t) chr); chr->bulletstaken = 0; chr->tickssincesplat = 0; diff --git a/src/game/stagetable.c b/src/game/stagetable.c index 5a1e5745f..92e947802 100644 --- a/src/game/stagetable.c +++ b/src/game/stagetable.c @@ -74,7 +74,7 @@ struct stagetableentry g_Stages[61] = { struct stagetableentry *stageGetCurrent(void) { struct stagetableentry *stage = g_Stages; - struct stagetableentry *end = (struct stagetableentry *)(u32)stage + ARRAYCOUNT(g_Stages); + struct stagetableentry *end = (struct stagetableentry *)(uintptr_t)stage + ARRAYCOUNT(g_Stages); s32 stagenum = g_Vars.stagenum; while (stage < end) { @@ -91,7 +91,7 @@ struct stagetableentry *stageGetCurrent(void) s32 stageGetIndex(s32 stagenum) { struct stagetableentry *stage = g_Stages; - struct stagetableentry *end = (struct stagetableentry *)(u32)stage + ARRAYCOUNT(g_Stages); + struct stagetableentry *end = (struct stagetableentry *)(uintptr_t)stage + ARRAYCOUNT(g_Stages); s32 i = 0; while (stage < end) { diff --git a/src/game/tex.c b/src/game/tex.c index ff84a0371..b34b3c993 100644 --- a/src/game/tex.c +++ b/src/game/tex.c @@ -1108,7 +1108,7 @@ s32 texLoadFromGdl(Gfx *arg0, s32 gdlsizeinbytes, Gfx *arg2, struct texpool *poo } } - return (u32) s6 - (u32) arg2; + return (uintptr_t) s6 - (uintptr_t) arg2; } void texCopyGdls(Gfx *src, Gfx *dst, s32 arg2) diff --git a/src/game/texdecompress.c b/src/game/texdecompress.c index 7af45cd07..219e37796 100644 --- a/src/game/texdecompress.c +++ b/src/game/texdecompress.c @@ -342,7 +342,7 @@ s32 texAlignIndices(u8 *src, s32 width, s32 height, s32 format, u8 *dst) src++; } - outptr = (u8 *)(((u32)outptr + 7) & ~7); + outptr = (u8 *)(((uintptr_t)outptr + 7) & ~7); } return outptr - dst; @@ -1457,9 +1457,9 @@ void texReadAlphaBits(u8 *dst, s32 count) */ s32 texReadUncompressed(u8 *dst, s32 width, s32 height, s32 format) { - u32 *dst32 = (u32 *)(((u32)dst + 0xf) & ~0xf); - u16 *dst16 = (u16 *)(((u32)dst + 7) & ~7); - u8 *dst8 = (u8 *)(((u32)dst + 7) & ~7); + u32 *dst32 = (u32 *)(((uintptr_t)dst + 0xf) & ~0xf); + u16 *dst16 = (u16 *)(((uintptr_t)dst + 7) & ~7); + u8 *dst8 = (u8 *)(((uintptr_t)dst + 7) & ~7); s32 x; s32 y; @@ -2161,7 +2161,7 @@ void texLoad(s32 *updateword, struct texpool *pool, bool arg2) return; } - alignedcompbuffer = (u8 *) (((u32)compbuffer + 0xf) >> 4 << 4); + alignedcompbuffer = (u8 *) (((uintptr_t)compbuffer + 0xf) >> 4 << 4); if (alignedcompbuffer); if (tex); @@ -2179,7 +2179,7 @@ void texLoad(s32 *updateword, struct texpool *pool, bool arg2) // Copy the compressed texture to RAM dmaExec(alignedcompbuffer, - (u32) &_texturesdataSegmentRomStart + (thisoffset & 0xfffffff8), + (romptr_t) &_texturesdataSegmentRomStart + (thisoffset & 0xfffffff8), ((u32) (nextoffset - thisoffset) + 0x1f) >> 4 << 4); compptr = (u8 *) alignedcompbuffer + (thisoffset & 7); @@ -2215,7 +2215,7 @@ void texLoad(s32 *updateword, struct texpool *pool, bool arg2) // - set leftpos to 0x10 after rightpos if (usingsharedpool) { tail = pool->rightpos; - pool->rightpos = (struct tex *) ((((u32) buffer5kb + 0xf) >> 4 << 4) + sizeof(struct tex)); + pool->rightpos = (struct tex *) ((((uintptr_t) buffer5kb + 0xf) >> 4 << 4) + sizeof(struct tex)); pool->leftpos = ((u8 *) pool->rightpos + sizeof(struct tex)); while (tail) { @@ -2263,7 +2263,7 @@ void texLoad(s32 *updateword, struct texpool *pool, bool arg2) pool->rightpos->next = 0; if (tail != NULL) { - tail->next = (u32) pool->rightpos & 0xffffff; + tail->next = (uintptr_t) pool->rightpos & 0xffffff; } else { pool->head = pool->rightpos; } diff --git a/src/game/texinit.c b/src/game/texinit.c index 14a37d86e..4c0a11314 100644 --- a/src/game/texinit.c +++ b/src/game/texinit.c @@ -15,5 +15,5 @@ void texInit(void) g_Textures = mempAlloc(len, MEMPOOL_PERMANENT); - dmaExec(g_Textures, (u32) &_textureslistSegmentRomStart, len); + dmaExec(g_Textures, (romptr_t) &_textureslistSegmentRomStart, len); } diff --git a/src/game/texreset.c b/src/game/texreset.c index 7a8e077b1..e4f78debd 100644 --- a/src/game/texreset.c +++ b/src/game/texreset.c @@ -48,31 +48,31 @@ void texReset(void) s32 i; g_TextureConfigSegment = mempAlloc(len, MEMPOOL_STAGE); - dmaExec(g_TextureConfigSegment, (u32)&_textureconfigSegmentRomStart, len); + dmaExec(g_TextureConfigSegment, (romptr_t)&_textureconfigSegmentRomStart, len); - g_TexBase = (u32)g_TextureConfigSegment - ROM_SIZE * 1024 * 1024; - g_TexGdl1 = (Gfx *)(g_TexBase + (u32)g_TcGdl1); - g_TexGdl2 = (Gfx *)(g_TexBase + (u32)g_TcGdl2); - g_TexGdl3 = (Gfx *)(g_TexBase + (u32)g_TcGdl3); - g_ExplosionTexturePairs = (void *)(g_TexBase + (u32)g_TcExplosionTexturePairs); - g_TexWallhitConfigs = (struct textureconfig *)(g_TexBase + (u32)g_TcWallhitConfigs); - g_TexBeamConfigs = (struct textureconfig *)(g_TexBase + (u32)g_TcBeamConfigs); - g_TexLaserConfigs = (struct textureconfig *)(g_TexBase + (u32)g_TcLaserConfigs); - g_TexGroup03Configs = (struct textureconfig *)(g_TexBase + (u32)g_TcGroup03Configs); - g_TexGeCrosshairConfigs = (struct textureconfig *)(g_TexBase + (u32)g_TcGeCrosshairConfigs); - g_TexRedLinesConfigs = (struct textureconfig *)(g_TexBase + (u32)g_TcRedLineConfigs); - g_TexShadowConfigs = (struct textureconfig *)(g_TexBase + (u32)g_TcGroup06Configs); - g_TexShieldConfigs = (struct textureconfig *)(g_TexBase + (u32)g_TcShieldConfigs); - g_TexShardConfigs = (struct textureconfig *)(g_TexBase + (u32)g_TcShardConfigs); - g_TexScreenConfigs = (struct textureconfig *)(g_TexBase + (u32)g_TcScreenConfigs); - g_TexWaterConfigs = (struct textureconfig *)(g_TexBase + (u32)g_TcWaterConfigs); - g_TexSkyConfigs = (struct textureconfig *)(g_TexBase + (u32)g_TcSkyConfigs); - g_TexLightGlareConfigs = (struct textureconfig *)(g_TexBase + (u32)g_TcLightGlareConfigs); - g_TexSparkConfigs = (struct textureconfig *)(g_TexBase + (u32)g_TcSparkConfigs); - g_TexGeneralConfigs = (struct textureconfig *)(g_TexBase + (u32)g_TcGeneralConfigs); - g_TexRadarConfigs = (struct textureconfig *)(g_TexBase + (u32)g_TcRadarConfigs); + g_TexBase = (uintptr_t)g_TextureConfigSegment - ROM_SIZE * 1024 * 1024; + g_TexGdl1 = (Gfx *)(g_TexBase + (uintptr_t)g_TcGdl1); + g_TexGdl2 = (Gfx *)(g_TexBase + (uintptr_t)g_TcGdl2); + g_TexGdl3 = (Gfx *)(g_TexBase + (uintptr_t)g_TcGdl3); + g_ExplosionTexturePairs = (void *)(g_TexBase + (uintptr_t)g_TcExplosionTexturePairs); + g_TexWallhitConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcWallhitConfigs); + g_TexBeamConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcBeamConfigs); + g_TexLaserConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcLaserConfigs); + g_TexGroup03Configs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcGroup03Configs); + g_TexGeCrosshairConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcGeCrosshairConfigs); + g_TexRedLinesConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcRedLineConfigs); + g_TexShadowConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcGroup06Configs); + g_TexShieldConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcShieldConfigs); + g_TexShardConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcShardConfigs); + g_TexScreenConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcScreenConfigs); + g_TexWaterConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcWaterConfigs); + g_TexSkyConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcSkyConfigs); + g_TexLightGlareConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcLightGlareConfigs); + g_TexSparkConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcSparkConfigs); + g_TexGeneralConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcGeneralConfigs); + g_TexRadarConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcRadarConfigs); - g_TexNumConfigs = (len - (u32)&g_TcWallhitConfigs + ROM_SIZE * 1024 * 1024) / sizeof(struct textureconfig); + g_TexNumConfigs = (len - (uintptr_t)&g_TcWallhitConfigs + ROM_SIZE * 1024 * 1024) / sizeof(struct textureconfig); g_TexWords = mempAlloc(ALIGN16(g_TexNumConfigs * 4), MEMPOOL_STAGE); for (i = 0; i < g_TexNumConfigs; i++) { diff --git a/src/game/tilesreset.c b/src/game/tilesreset.c index 34aceba11..4f10f1834 100644 --- a/src/game/tilesreset.c +++ b/src/game/tilesreset.c @@ -41,9 +41,9 @@ void stageParseTiles(void) tile->ymax = mult6(tile->ymax) + 16; tile->zmin = mult6(tile->zmin) + 18; tile->zmax = mult6(tile->zmax) + 18; - geo = (struct geo *)((u8 *)geo + (u32)(geo->numvertices - 0x40) * 6 + 0x18e); + geo = (struct geo *)((u8 *)geo + (uintptr_t)(geo->numvertices - 0x40) * 6 + 0x18e); } else if (geo->type == GEOTYPE_TILE_F) { - geo = (struct geo *)((u8 *)geo + (u32)(geo->numvertices - 0x40) * 12 + 0x310); + geo = (struct geo *)((u8 *)geo + (uintptr_t)(geo->numvertices - 0x40) * 12 + 0x310); } else if (geo->type == GEOTYPE_BLOCK) { geo = (struct geo *)((u8 *)geo + sizeof(struct geoblock)); } else if (geo->type == GEOTYPE_CYL) { diff --git a/src/game/title.c b/src/game/title.c index 3a3cbdc9e..5d4c110f1 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -897,7 +897,7 @@ Gfx *titleRenderPdLogoModel(Gfx *gdl, struct model *model, bool arg2, f32 arg3, gdl = renderdata.gdl; for (j = 0, k = 0; j < model->definition->nummatrices; j++, k += sizeof(Mtxf)) { - mtx4Copy((Mtxf *)((u32)model->matrices + k), &sp6c); + mtx4Copy((Mtxf *)((uintptr_t)model->matrices + k), &sp6c); mtxF2L(&sp6c, model->matrices + j); } @@ -7588,7 +7588,7 @@ Gfx *titleRenderPdLogo(Gfx *gdl) s32 j; for (sp19c = 0, j = 0; sp19c < g_TitleModelJpnLogo2->definition->nummatrices; sp19c++, j += sizeof(Mtxf)) { - mtx4Copy((Mtxf *)((u32)g_TitleModelJpnLogo2->matrices + j), &sp158); + mtx4Copy((Mtxf *)((uintptr_t)g_TitleModelJpnLogo2->matrices + j), &sp158); mtxF2L(&sp158, g_TitleModelJpnLogo2->matrices + sp19c); } } @@ -7649,7 +7649,7 @@ Gfx *titleRenderPdLogo(Gfx *gdl) s32 j; for (sp14c = 0, j = 0; sp14c < g_TitleModelJpnPd->definition->nummatrices; sp14c++, j += sizeof(Mtxf)) { - mtx4Copy((Mtxf *)((u32)g_TitleModelJpnPd->matrices + j), &spf4); + mtx4Copy((Mtxf *)((uintptr_t)g_TitleModelJpnPd->matrices + j), &spf4); mtxF2L(&spf4, g_TitleModelJpnPd->matrices + sp14c); } } @@ -7683,7 +7683,7 @@ Gfx *titleRenderPdLogo(Gfx *gdl) s32 j; for (sp9c = 0, j = 0; sp9c < g_TitleModelJpnLogo1->definition->nummatrices; sp9c++, j += sizeof(Mtxf)) { - mtx4Copy((Mtxf *)((u32)g_TitleModelJpnLogo1->matrices + j), &sp5c); + mtx4Copy((Mtxf *)((uintptr_t)g_TitleModelJpnLogo1->matrices + j), &sp5c); mtxF2L(&sp5c, g_TitleModelJpnLogo1->matrices + sp9c); } } @@ -8009,7 +8009,7 @@ Gfx *titleRenderNintendoLogo(Gfx *gdl) gdl = renderdata.gdl; for (i = 0, j = 0; i < g_TitleModel->definition->nummatrices; i++, j += sizeof(Mtxf)) { - mtx4Copy((Mtxf *)((u32)g_TitleModel->matrices + j), &sp54); + mtx4Copy((Mtxf *)((uintptr_t)g_TitleModel->matrices + j), &sp54); mtxF2L(&sp54, g_TitleModel->matrices + i); } } @@ -8256,7 +8256,7 @@ Gfx *titleRenderRareLogo(Gfx *gdl) for (i = 0, j = 0; i < g_TitleModel->definition->nummatrices; i++, j += sizeof(Mtxf)) { Mtxf sp58; - mtx4Copy((Mtxf *)((u32)g_TitleModel->matrices + j), &sp58); + mtx4Copy((Mtxf *)((uintptr_t)g_TitleModel->matrices + j), &sp58); mtxF2L(&sp58, g_TitleModel->matrices + i); } } diff --git a/src/game/training.c b/src/game/training.c index d5563718a..2d276fb54 100644 --- a/src/game/training.c +++ b/src/game/training.c @@ -479,7 +479,7 @@ void *frLoadRomData(u32 len) g_FrRomData = mempAlloc(ALIGN16(len), MEMPOOL_STAGE); if (g_FrRomData) { - return dmaExecWithAutoAlign(g_FrRomData, (u32)&_firingrangeSegmentRomStart, len); + return dmaExecWithAutoAlign(g_FrRomData, (romptr_t) &_firingrangeSegmentRomStart, len); } return NULL; diff --git a/src/game/trainingmenus.c b/src/game/trainingmenus.c index 004546567..ecbe54bf6 100644 --- a/src/game/trainingmenus.c +++ b/src/game/trainingmenus.c @@ -30,7 +30,7 @@ struct menudialogdef g_BioTextMenuDialog; struct menudialogdef g_HangarLocationDetailsMenuDialog; struct menudialogdef g_HangarVehicleDetailsMenuDialog; -s32 frDetailsOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult frDetailsOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 i; @@ -72,7 +72,7 @@ s32 frDetailsOkMenuHandler(s32 operation, struct menuitem *item, union handlerda return 0; } -s32 frAbortMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult frAbortMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (frIsInTraining()) { @@ -85,7 +85,7 @@ s32 frAbortMenuHandler(s32 operation, struct menuitem *item, union handlerdata * struct menudialogdef g_FrDifficultyMenuDialog; -s32 frWeaponListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult frWeaponListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 weaponnum; s32 score; @@ -212,7 +212,7 @@ s32 frWeaponListMenuHandler(s32 operation, struct menuitem *item, union handlerd return 0; } -s32 frTrainingInfoMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult frTrainingInfoMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { u32 stack; s32 weaponnum; @@ -246,7 +246,7 @@ s32 frTrainingInfoMenuDialog(s32 operation, struct menudialogdef *dialogdef, uni return 0; } -s32 frTrainingStatsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult frTrainingStatsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_CLOSE) { if (frIsInTraining() == false) { @@ -261,7 +261,7 @@ s32 frTrainingStatsMenuDialog(s32 operation, struct menudialogdef *dialogdef, un * This is an unused menu handler which implements the difficulty selection * using a dropdown. */ -s32 frDifficultyDropdownMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult frDifficultyDropdownMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { u16 names[] = { L_MPMENU_439, // "Bronze" @@ -291,7 +291,7 @@ s32 frDifficultyDropdownMenuHandler(s32 operation, struct menuitem *item, union return 0; } -s32 frDifficultyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult frDifficultyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_CHECKHIDDEN: @@ -570,7 +570,7 @@ char *frMenuTextAmmoLimitValue(struct menuitem *item) * as well as the player's score chart. There are lines leading from * the score chart to the diagram. */ -s32 frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_RENDER) { Gfx *gdl = data->type19.gdl; @@ -882,7 +882,7 @@ s32 frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata } #if VERSION >= VERSION_NTSC_1_0 -s32 menuhandlerFrFailedContinue(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerFrFailedContinue(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (g_Vars.currentplayer->prop->rooms[0] == 0xa) { @@ -984,39 +984,39 @@ struct menuitem g_FrTrainingInfoInGameMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_443, // "Difficulty:" - (u32)&frMenuTextDifficultyName, + (uintptr_t)&frMenuTextDifficultyName, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (u32)&frMenuTextGoalScoreLabel, - (u32)&frMenuTextGoalScoreValue, + (uintptr_t)&frMenuTextGoalScoreLabel, + (uintptr_t)&frMenuTextGoalScoreValue, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (u32)&frMenuTextMinAccuracyOrTargetsLabel, - (u32)&frMenuTextMinAccuracyOrTargetsValue, + (uintptr_t)&frMenuTextMinAccuracyOrTargetsLabel, + (uintptr_t)&frMenuTextMinAccuracyOrTargetsValue, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (u32)&frMenuTextTimeLimitLabel, - (u32)&frMenuTextTimeLimitValue, + (uintptr_t)&frMenuTextTimeLimitLabel, + (uintptr_t)&frMenuTextTimeLimitValue, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (u32)&frMenuTextAmmoLimitLabel, - (u32)&frMenuTextAmmoLimitValue, + (uintptr_t)&frMenuTextAmmoLimitLabel, + (uintptr_t)&frMenuTextAmmoLimitValue, NULL, }, { @@ -1077,39 +1077,39 @@ struct menuitem g_FrTrainingInfoPreGameMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_443, // "Difficulty:" - (u32)&frMenuTextDifficultyName, + (uintptr_t)&frMenuTextDifficultyName, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (u32)&frMenuTextGoalScoreLabel, - (u32)&frMenuTextGoalScoreValue, + (uintptr_t)&frMenuTextGoalScoreLabel, + (uintptr_t)&frMenuTextGoalScoreValue, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (u32)&frMenuTextMinAccuracyOrTargetsLabel, - (u32)&frMenuTextMinAccuracyOrTargetsValue, + (uintptr_t)&frMenuTextMinAccuracyOrTargetsLabel, + (uintptr_t)&frMenuTextMinAccuracyOrTargetsValue, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (u32)&frMenuTextTimeLimitLabel, - (u32)&frMenuTextTimeLimitValue, + (uintptr_t)&frMenuTextTimeLimitLabel, + (uintptr_t)&frMenuTextTimeLimitValue, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (u32)&frMenuTextAmmoLimitLabel, - (u32)&frMenuTextAmmoLimitValue, + (uintptr_t)&frMenuTextAmmoLimitLabel, + (uintptr_t)&frMenuTextAmmoLimitValue, NULL, }, { @@ -1188,7 +1188,7 @@ struct menuitem g_FrCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_450, // "Score:" - (u32)&frMenuTextScoreValue, + (uintptr_t)&frMenuTextScoreValue, NULL, }, { @@ -1196,7 +1196,7 @@ struct menuitem g_FrCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_451, // "Targets Destroyed:" - (u32)&frMenuTextTargetsDestroyedValue, + (uintptr_t)&frMenuTextTargetsDestroyedValue, NULL, }, { @@ -1212,7 +1212,7 @@ struct menuitem g_FrCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_452, // "Difficulty:" - (u32)&frMenuTextDifficultyName, + (uintptr_t)&frMenuTextDifficultyName, NULL, }, { @@ -1220,7 +1220,7 @@ struct menuitem g_FrCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_453, // "Time Taken:" - (u32)&frMenuTextTimeTakenValue, + (uintptr_t)&frMenuTextTimeTakenValue, NULL, }, { @@ -1236,7 +1236,7 @@ struct menuitem g_FrCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_454, // "Weapon:" - (u32)&frMenuTextWeaponName, + (uintptr_t)&frMenuTextWeaponName, NULL, }, { @@ -1244,7 +1244,7 @@ struct menuitem g_FrCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_455, // "Accuracy:" - (u32)&frMenuTextAccuracyValue, + (uintptr_t)&frMenuTextAccuracyValue, NULL, }, { @@ -1295,7 +1295,7 @@ struct menuitem g_FrFailedMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (u32)&frMenuTextFailReason, + (uintptr_t)&frMenuTextFailReason, 0, NULL, }, @@ -1314,7 +1314,7 @@ struct menuitem g_FrFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_450, // "Score:" - (u32)&frMenuTextScoreValue, + (uintptr_t)&frMenuTextScoreValue, NULL, }, { @@ -1322,7 +1322,7 @@ struct menuitem g_FrFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_451, // "Targets Destroyed:" - (u32)&frMenuTextTargetsDestroyedValue, + (uintptr_t)&frMenuTextTargetsDestroyedValue, NULL, }, { @@ -1338,7 +1338,7 @@ struct menuitem g_FrFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_452, // "Difficulty:" - (u32)&frMenuTextDifficultyName, + (uintptr_t)&frMenuTextDifficultyName, NULL, }, { @@ -1346,7 +1346,7 @@ struct menuitem g_FrFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_453, // "Time Taken:" - (u32)&frMenuTextTimeTakenValue, + (uintptr_t)&frMenuTextTimeTakenValue, NULL, }, { @@ -1362,7 +1362,7 @@ struct menuitem g_FrFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_454, // "Weapon:" - (u32)&frMenuTextWeaponName, + (uintptr_t)&frMenuTextWeaponName, NULL, }, { @@ -1370,7 +1370,7 @@ struct menuitem g_FrFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_455, // "Accuracy:" - (u32)&frMenuTextAccuracyValue, + (uintptr_t)&frMenuTextAccuracyValue, NULL, }, { @@ -1416,7 +1416,7 @@ struct menudialogdef g_FrFailedMenuDialog = { #endif }; -s32 ciOfficeInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult ciOfficeInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { struct optiongroup groups[2] = { { 0, L_MPMENU_421 }, // "Character Profiles" @@ -1525,7 +1525,7 @@ struct menudialogdef g_NowSafeMenuDialog = { NULL, }; -s32 ciCharacterProfileMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult ciCharacterProfileMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { u32 bodynum = ciGetChrBioBodynumBySlot(g_ChrBioSlot); u32 mpbodynum = mpGetMpbodynumByBodynum(bodynum); @@ -1682,7 +1682,7 @@ char *ciMenuTextMiscBioName(struct menuitem *item) return g_StringPointer; } -s32 dtDeviceListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult dtDeviceListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -1717,7 +1717,7 @@ char *dtMenuTextName(struct menuitem *item) return bgunGetName(weaponnum); } -s32 menuhandlerDtOkOrResume(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandlerDtOkOrResume(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { // @bug: dtBegin() should not be called if training is already in @@ -1729,7 +1729,7 @@ s32 menuhandlerDtOkOrResume(s32 operation, struct menuitem *item, union handlerd return 0; } -s32 menuhandler001a6514(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler001a6514(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { dtEnd(); @@ -1752,7 +1752,7 @@ struct menuitem g_BioProfileMenuItems[] = { 0, MENUITEMFLAG_NEWCOLUMN | MENUITEMFLAG_00000002, L_MPMENU_432, // "Name:" - (u32)&ciMenuTextChrBioName, + (uintptr_t)&ciMenuTextChrBioName, NULL, }, { @@ -1760,7 +1760,7 @@ struct menuitem g_BioProfileMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_433, // "Age:" - (u32)&ciMenuTextChrBioAge, + (uintptr_t)&ciMenuTextChrBioAge, NULL, }, { @@ -1768,7 +1768,7 @@ struct menuitem g_BioProfileMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_434, // "Race:" - (u32)&ciMenuTextChrBioRace, + (uintptr_t)&ciMenuTextChrBioRace, NULL, }, { @@ -1845,7 +1845,7 @@ struct menuitem g_BioTextMenuItems[] = { struct menudialogdef g_BioTextMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&ciMenuTextMiscBioName, + (uintptr_t)&ciMenuTextMiscBioName, g_BioTextMenuItems, NULL, MENUDIALOGFLAG_DISABLERESIZE, @@ -1873,7 +1873,7 @@ struct menudialogdef g_DtListMenuDialog = { NULL, }; -s32 dtTrainingDetailsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult dtTrainingDetailsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -1990,7 +1990,7 @@ char *dtMenuTextTimeTakenValue(struct menuitem *item) return g_StringPointer; } -s32 menudialogDeviceTrainingResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialogDeviceTrainingResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_CLOSE) { chrSetStageFlag(NULL, 0x08000000); @@ -1999,7 +1999,7 @@ s32 menudialogDeviceTrainingResults(s32 operation, struct menudialogdef *dialogd return false; } -s32 htHoloListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult htHoloListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -2032,7 +2032,7 @@ char *htMenuTextName(struct menuitem *item) return htGetName(htGetIndexBySlot(var80088bb4)); } -s32 menuhandler001a6a34(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler001a6a34(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { htBegin(); @@ -2042,7 +2042,7 @@ s32 menuhandler001a6a34(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandler001a6a70(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler001a6a70(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { htEnd(); @@ -2051,7 +2051,7 @@ s32 menuhandler001a6a70(s32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menudialog001a6aa4(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog001a6aa4(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -2108,7 +2108,7 @@ char *htMenuTextTimeTakenValue(struct menuitem *item) return g_StringPointer; } -s32 menudialogFiringRangeResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialogFiringRangeResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_CLOSE) { chrSetStageFlag(NULL, 0x08000000); @@ -2172,7 +2172,7 @@ struct menuitem g_DtDetailsMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_SELECTABLE_CLOSESDIALOG, - (u32)&dtMenuTextOkOrResume, + (uintptr_t)&dtMenuTextOkOrResume, 0, menuhandlerDtOkOrResume, }, @@ -2180,7 +2180,7 @@ struct menuitem g_DtDetailsMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_SELECTABLE_CLOSESDIALOG, - (u32)&dtMenuTextCancelOrAbort, + (uintptr_t)&dtMenuTextCancelOrAbort, 0, menuhandler001a6514, }, @@ -2189,7 +2189,7 @@ struct menuitem g_DtDetailsMenuItems[] = { struct menudialogdef g_DtDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&dtMenuTextName, + (uintptr_t)&dtMenuTextName, g_DtDetailsMenuItems, dtTrainingDetailsMenuDialog, MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_DISABLERESIZE, @@ -2218,7 +2218,7 @@ struct menuitem g_DtFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_424, // "Time Taken:" - (u32)&dtMenuTextTimeTakenValue, + (uintptr_t)&dtMenuTextTimeTakenValue, NULL, }, { @@ -2271,7 +2271,7 @@ struct menuitem g_DtCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_424, // "Time Taken:" - (u32)&dtMenuTextTimeTakenValue, + (uintptr_t)&dtMenuTextTimeTakenValue, NULL, }, { @@ -2352,7 +2352,7 @@ struct menuitem g_HtDetailsMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_SELECTABLE_CLOSESDIALOG, - (u32)&htMenuTextOkOrResume, + (uintptr_t)&htMenuTextOkOrResume, 0, menuhandler001a6a34, }, @@ -2360,7 +2360,7 @@ struct menuitem g_HtDetailsMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_SELECTABLE_CLOSESDIALOG, - (u32)&htMenuTextCancelOrAbort, + (uintptr_t)&htMenuTextCancelOrAbort, 0, menuhandler001a6a70, }, @@ -2369,7 +2369,7 @@ struct menuitem g_HtDetailsMenuItems[] = { struct menudialogdef g_HtDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&htMenuTextName, + (uintptr_t)&htMenuTextName, g_HtDetailsMenuItems, menudialog001a6aa4, MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_DISABLERESIZE, @@ -2398,7 +2398,7 @@ struct menuitem g_HtFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_424, // "Time Taken:" - (u32)&htMenuTextTimeTakenValue, + (uintptr_t)&htMenuTextTimeTakenValue, NULL, }, { @@ -2457,7 +2457,7 @@ struct menuitem g_HtCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_424, // "Time Taken:" - (u32)&htMenuTextTimeTakenValue, + (uintptr_t)&htMenuTextTimeTakenValue, NULL, }, { @@ -2494,7 +2494,7 @@ struct menudialogdef g_HtCompletedMenuDialog = { &g_HtListMenuDialog, }; -s32 ciHangarInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult ciHangarInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { struct optiongroup groups[2] = { { 0, L_MPMENU_419 }, // "Locations" @@ -2539,7 +2539,7 @@ s32 ciHangarInformationMenuHandler(s32 operation, struct menuitem *item, union h return 0; } -s32 ciHangarTitleMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult ciHangarTitleMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_RENDER) { Gfx *gdl = data->type19.gdl; @@ -2631,7 +2631,7 @@ struct modelpartvisibility g_BioPartVisibility[] = { { 255 }, }; -s32 ciHangarHolographMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult ciHangarHolographMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { s32 index = ciGetHangarBioIndexBySlot(g_HangarBioSlot); @@ -2819,7 +2819,7 @@ struct menudialogdef g_HangarVehicleHolographMenuDialog = { struct menudialogdef g_HangarVehicleDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&bioMenuTextName, + (uintptr_t)&bioMenuTextName, g_HangarDetailsMenuItems, NULL, MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE, @@ -2828,7 +2828,7 @@ struct menudialogdef g_HangarVehicleDetailsMenuDialog = { struct menudialogdef g_HangarLocationDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (u32)&bioMenuTextName, + (uintptr_t)&bioMenuTextName, g_HangarDetailsMenuItems, NULL, MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE, diff --git a/src/game/wallhitreset.c b/src/game/wallhitreset.c index ee4a2c193..6ca25d69f 100644 --- a/src/game/wallhitreset.c +++ b/src/game/wallhitreset.c @@ -111,7 +111,7 @@ void wallhitReset(void) ptr = mempAlloc(structssize + numberssize, MEMPOOL_STAGE); g_WallhitCountsPerRoom = ptr; - g_Wallhits = (struct wallhit *)((u32)ptr + numberssize); + g_Wallhits = (struct wallhit *)((uintptr_t)ptr + numberssize); g_FreeWallhits = NULL; g_ActiveWallhits = 0; diff --git a/src/include/game/activemenu.h b/src/include/game/activemenu.h index c120475ac..20bd6bef4 100644 --- a/src/include/game/activemenu.h +++ b/src/include/game/activemenu.h @@ -7,8 +7,8 @@ void amTick(void); void amOpenPickTarget(void); -s32 menudialog000fcd48(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 amPickTargetMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult menudialog000fcd48(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult amPickTargetMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); void amSetAiBuddyTemperament(bool aggressive); void amSetAiBuddyStealth(void); s32 amGetFirstBuddyIndex(void); diff --git a/src/include/game/cheats.h b/src/include/game/cheats.h index 32c4a823c..384324dc8 100644 --- a/src/include/game/cheats.h +++ b/src/include/game/cheats.h @@ -24,9 +24,9 @@ s32 cheatGetByTimedStageIndex(s32 stage_index, s32 difficulty); s32 cheatGetByCompletedStageIndex(s32 stage_index); s32 cheatGetTime(s32 cheat_id); char *cheatGetName(s32 cheat_id); -s32 cheatMenuHandleDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 cheatCheckboxMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 cheatMenuHandleBuddyCheckbox(s32 operation, struct menuitem *item, union handlerdata *data); -s32 cheatMenuHandleTurnOffAllCheats(s32 operation, struct menuitem *item, union handlerdata *data); +MenuDialogHandlerResult cheatMenuHandleDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuItemHandlerResult cheatCheckboxMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult cheatMenuHandleBuddyCheckbox(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult cheatMenuHandleTurnOffAllCheats(s32 operation, struct menuitem *item, union handlerdata *data); #endif diff --git a/src/include/game/endscreen.h b/src/include/game/endscreen.h index 44755878b..f8b6ccfe2 100644 --- a/src/include/game/endscreen.h +++ b/src/include/game/endscreen.h @@ -4,14 +4,14 @@ #include "data.h" #include "types.h" -s32 endscreenHandleRetryMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 endscreenHandle2PCompleted(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 endscreenHandle2PFailed(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 endscreenHandleDeclineMission(s32 operation, struct menuitem *item, union handlerdata *data); -s32 endscreenHandleCheatInfo(s32 operation, struct menuitem *item, union handlerdata *data); -s32 endscreenHandleContinueMission(s32 operation, struct menuitem *item, union handlerdata *data); -s32 endscreenHandleReplayLastLevel(s32 operation, struct menuitem *item, union handlerdata *data); -s32 endscreenHandleReplayPreviousMission(s32 operation, struct menuitem *item, union handlerdata *data); +MenuDialogHandlerResult endscreenHandleRetryMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult endscreenHandle2PCompleted(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult endscreenHandle2PFailed(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuItemHandlerResult endscreenHandleDeclineMission(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult endscreenHandleCheatInfo(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult endscreenHandleContinueMission(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult endscreenHandleReplayLastLevel(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult endscreenHandleReplayPreviousMission(s32 operation, struct menuitem *item, union handlerdata *data); char *endscreenMenuTitleRetryMission(struct menudialogdef *dialogdef); char *endscreenMenuTitleNextMission(struct menudialogdef *dialogdef); char *endscreenMenuTextNumKills(struct menuitem *item); diff --git a/src/include/game/file.h b/src/include/game/file.h index 768c2e270..d26f6ca61 100644 --- a/src/include/game/file.h +++ b/src/include/game/file.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -u32 fileGetRomAddress(s32 filenum); +romptr_t fileGetRomAddress(s32 filenum); s32 fileGetRomSize(s32 filenum); void filesInit(void); void fileLoadPartToAddr(u16 filenum, void *memaddr, s32 offset, u32 len); diff --git a/src/include/game/filemgr.h b/src/include/game/filemgr.h index e541ea381..d1f56f76b 100644 --- a/src/include/game/filemgr.h +++ b/src/include/game/filemgr.h @@ -42,7 +42,7 @@ void filemgrPushSelectLocationDialog(s32 arg0, u32 filetype); char *filemgrMenuTextFileInUseDescription(struct menuitem *item); Gfx *filemgrRenderPerfectHeadThumbnail(Gfx *gdl, struct menuitemrenderdata *renderdata, s32 filenum, s32 deviceserial); bool filemgrIsFileInUse(struct filelistfile *file); -s32 filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, bool isdelete); +MenuItemHandlerResult filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, bool isdelete); void filemgrPushDeleteFileDialog(s32 listnum); char *pakMenuTextPagesFree(struct menuitem *item); char *pakMenuTextPagesUsed(struct menuitem *item); @@ -50,36 +50,36 @@ char *pakMenuTextStatusMessage(struct menuitem *item); char *pakMenuTextEditingPakName(struct menuitem *item); bool filemgrConsiderPushingFileSelectDialog(void); void bootmenuReset(void); -s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrFileToCopyListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrFileToDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrInsertOriginalPakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 filemgrCopyOrDeleteListMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 pakGameNotesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 pakChoosePakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 filemgrMainMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 filemgrDeviceNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrFileNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrDeviceNameForErrorMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrRetrySaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrCancelSave2MenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrAcknowledgeFileLostMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrReinsertedOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrReinsertedCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrDuplicateRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrDuplicateCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrCancelSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrDeleteFilesForSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrConfirmDeleteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 pakDeleteGameNoteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 pakSelectionMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrAgentNameKeyboardMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrOpenCopyFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrOpenDeleteFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrConfirmRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrSaveElsewhereYesMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrSelectLocationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrFileToCopyListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrFileToDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuDialogHandlerResult filemgrInsertOriginalPakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult filemgrCopyOrDeleteListMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult pakGameNotesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult pakChoosePakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult filemgrMainMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuItemHandlerResult filemgrDeviceNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrFileNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrDeviceNameForErrorMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrRetrySaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrCancelSave2MenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrAcknowledgeFileLostMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrReinsertedOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrReinsertedCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrDuplicateRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrDuplicateCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrCancelSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrDeleteFilesForSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrConfirmDeleteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult pakDeleteGameNoteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult pakSelectionMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrAgentNameKeyboardMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrOpenCopyFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrOpenDeleteFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrConfirmRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrSaveElsewhereYesMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult filemgrSelectLocationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); extern const char var7f1b3214[]; extern const char var7f1b3218[]; diff --git a/src/include/game/fmb.h b/src/include/game/fmb.h index 64254958e..591da78ef 100644 --- a/src/include/game/fmb.h +++ b/src/include/game/fmb.h @@ -5,10 +5,10 @@ #include "types.h" void fmbReset(void); -s32 fmbHandleDropOut(s32 operation, struct menuitem *item, union handlerdata *data); -s32 fmdHandleAbortGame(s32 operation, struct menuitem *item, union handlerdata *data); -s32 fmbHandleAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data); -s32 fmbHandleAcceptChallenge(s32 operation, struct menuitem *item, union handlerdata *data); -s32 fmbHandleMainMenu(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuItemHandlerResult fmbHandleDropOut(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult fmdHandleAbortGame(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult fmbHandleAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult fmbHandleAcceptChallenge(s32 operation, struct menuitem *item, union handlerdata *data); +MenuDialogHandlerResult fmbHandleMainMenu(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); #endif diff --git a/src/include/game/mainmenu.h b/src/include/game/mainmenu.h index 9a3275ca5..349d7458c 100644 --- a/src/include/game/mainmenu.h +++ b/src/include/game/mainmenu.h @@ -13,7 +13,7 @@ extern struct menudialogdef g_NextMissionMenuDialog; char *menuTextCurrentStageName(struct menuitem *item); char *soloMenuTextDifficulty(struct menuitem *item); -s32 menuhandlerControlStyleImpl(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpindex); +MenuItemHandlerResult menuhandlerControlStyleImpl(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpindex); char *soloMenuTitleStageOverview(struct menudialogdef *dialogdef); f32 func0f1036ac(u8 value, s32 prop); bool isStageDifficultyUnlocked(s32 stageindex, s32 difficulty); @@ -30,60 +30,60 @@ char *invMenuTextWeaponName(struct menuitem *item); char *invMenuTextWeaponManufacturer(struct menuitem *item); char *invMenuTextWeaponDescription(struct menuitem *item); bool soloChoosePauseDialog(void); -s32 menudialogBriefing(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 menudialog00103608(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 menudialogCoopAntiOptions(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 menudialog0010559c(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 inventoryMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 menudialogAbortMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 soloMenuDialogPauseStatus(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 menuhandler001024dc(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler001024fc(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAcceptMission(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAcceptPdModeSettings(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerBuddyOptionsContinue(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerCoopDifficulty(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAntiDifficulty(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMissionList(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerControlStyle(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerFrInventoryList(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerInventoryList(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAbortMission(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerCinema(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAimControl(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAlternativeTitle(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAlwaysShowTarget(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAmmoOnScreen(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAntiPlayer(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAntiRadar(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAutoAim(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerChangeAgent(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerCoopBuddy(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerCoopFriendlyFire(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerCoopRadar(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerCutsceneSubtitles(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerHeadRoll(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerHiRes(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerInGameSubtitles(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerLangFilter(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerLookAhead(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMusicVolume(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerPaintball(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerPdMode(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerPdModeSetting(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerReversePitch(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerScreenRatio(s32 operation, struct menuitem *item, union handlerdata *data); +MenuDialogHandlerResult menudialogBriefing(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult menudialog00103608(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult menudialogCoopAntiOptions(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult menudialog0010559c(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult inventoryMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult menudialogAbortMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult soloMenuDialogPauseStatus(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuItemHandlerResult menuhandler001024dc(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandler001024fc(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerAcceptMission(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerAcceptPdModeSettings(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerBuddyOptionsContinue(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerCoopDifficulty(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerAntiDifficulty(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMissionList(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerControlStyle(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerFrInventoryList(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerInventoryList(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerAbortMission(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerCinema(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerAimControl(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerAlternativeTitle(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerAlwaysShowTarget(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerAmmoOnScreen(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerAntiPlayer(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerAntiRadar(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerAutoAim(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerChangeAgent(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerCoopBuddy(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerCoopFriendlyFire(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerCoopRadar(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerCutsceneSubtitles(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerHeadRoll(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerHiRes(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerInGameSubtitles(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerLangFilter(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerLookAhead(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMusicVolume(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerPaintball(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerPdMode(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerPdModeSetting(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerReversePitch(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerScreenRatio(s32 operation, struct menuitem *item, union handlerdata *data); #if PAL -s32 menuhandlerLanguage(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerLanguage(s32 operation, struct menuitem *item, union handlerdata *data); #endif -s32 menuhandlerScreenSize(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerScreenSplit(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerSfxVolume(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerShowGunFunction(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerShowMissionTime(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerShowZoomRange(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerSightOnScreen(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerSoloDifficulty(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerSoundMode(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerScreenSize(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerScreenSplit(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerSfxVolume(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerShowGunFunction(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerShowMissionTime(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerShowZoomRange(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerSightOnScreen(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerSoloDifficulty(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerSoundMode(s32 operation, struct menuitem *item, union handlerdata *data); #endif diff --git a/src/include/game/menu.h b/src/include/game/menu.h index ed0fa8bbf..168ad63b8 100644 --- a/src/include/game/menu.h +++ b/src/include/game/menu.h @@ -29,7 +29,7 @@ void func0f0f139c(struct menuitem *item, f32 arg1); void func0f0f13ec(struct menuitem *item); void func0f0f1418(void); void func0f0f1494(void); -char *menuResolveText(u32 thing, void *dialogoritem); +char *menuResolveText(uintptr_t thing, void *dialogoritem); char *menuResolveParam2Text(struct menuitem *item); char *menuResolveDialogTitle(struct menudialogdef *dialogdef); void func0f0f15a4(struct menuitem *item, s32 *arg1); @@ -107,11 +107,11 @@ void func0f0fd548(s32 arg0); struct menudialog *menuIsDialogOpen(struct menudialogdef *dialogdef); struct chrdata *currentPlayerGetCommandingAibot(void); -s32 menuhandler000fcc34(s32 operation, struct menuitem *item, union handlerdata *data); -s32 amPickTargetMenuList(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerRepairPak(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerRetrySavePak(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerWarnRepairPak(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandler000fcc34(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult amPickTargetMenuList(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerRepairPak(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerRetrySavePak(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerWarnRepairPak(s32 operation, struct menuitem *item, union handlerdata *data); extern const char var7f1b2658[]; extern const char var7f1b265c[]; diff --git a/src/include/game/mplayer/ingame.h b/src/include/game/mplayer/ingame.h index 72205e79a..5aea7031e 100644 --- a/src/include/game/mplayer/ingame.h +++ b/src/include/game/mplayer/ingame.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -s32 mpStatsForPlayerDropdownHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult mpStatsForPlayerDropdownHandler(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextInGameLimit(struct menuitem *item); char *menutextPauseOrUnpause(s32 arg0); char *menutextMatchTime(s32 arg0); @@ -14,16 +14,16 @@ char *mpMenuTextWeaponOfChoiceName(struct menuitem *item); char *mpMenuTextAward1(struct menuitem *item); char *mpMenuTextAward2(struct menuitem *item); char *mpMenuTextPlacementWithSuffix(struct menuitem *item); -s32 mpPlacementMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 mpAwardsMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 mpPlayerTitleMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult mpPlacementMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult mpAwardsMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult mpPlayerTitleMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextPlayerTitle(s32 arg0); -s32 mpConfirmPlayerNameHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult mpConfirmPlayerNameHandler(s32 operation, struct menuitem *item, union handlerdata *data); void mpPushPauseDialog(void); void mpPushEndscreenDialog(u32 arg0, u32 playernum); -s32 menuhandlerMpEndGame(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler00178018(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpInGameLimitLabel(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpPause(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpEndGame(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandler00178018(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpInGameLimitLabel(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpPause(s32 operation, struct menuitem *item, union handlerdata *data); #endif diff --git a/src/include/game/mplayer/scenarios.h b/src/include/game/mplayer/scenarios.h index fd4f151a0..d47594e0f 100644 --- a/src/include/game/mplayer/scenarios.h +++ b/src/include/game/mplayer/scenarios.h @@ -16,7 +16,7 @@ struct mpscenariooverview { extern struct mpscenariooverview g_MpScenarioOverviews[6]; -s32 menuhandlerMpOpenOptions(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpOpenOptions(s32 operation, struct menuitem *item, union handlerdata *data); void scenarioReadSave(struct savebuffer *buffer); void scenarioWriteSave(struct savebuffer *buffer); void scenarioInit(void); diff --git a/src/include/game/mplayer/setup.h b/src/include/game/mplayer/setup.h index 4c9ca1950..b8c21972a 100644 --- a/src/include/game/mplayer/setup.h +++ b/src/include/game/mplayer/setup.h @@ -6,12 +6,12 @@ char *mpGetCurrentPlayerName(struct menuitem *item); s16 mpChooseRandomStage(void); -s32 mpArenaMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult mpArenaMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextWeaponNameForSlot(struct menuitem *item); char *mpMenuTextSetupName(struct menuitem *item); -s32 mpCharacterBodyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, s32 mpbodynum, bool isplayer); -s32 menudialog0017a174(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult mpCharacterBodyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, s32 mpbodynum, bool isplayer); +MenuDialogHandlerResult menudialog0017a174(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuItemHandlerResult mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextKills(struct menuitem *item); char *mpMenuTextDeaths(struct menuitem *item); char *mpMenuTextGamesPlayed(struct menuitem *item); @@ -29,50 +29,50 @@ char *mpMenuTextAccuracy(struct menuitem *item); void mpFormatDamageValue(char *dst, f32 damage); char *mpMenuTextPainReceived(struct menuitem *item); char *mpMenuTextDamageDealt(struct menuitem *item); -s32 mpMedalMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult mpMedalMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTitleStatsForPlayerName(struct menudialogdef *dialogdef); char *mpMenuTextUsernamePassword(struct menuitem *item); -s32 mpCharacterHeadMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, bool arg4); +MenuItemHandlerResult mpCharacterHeadMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, bool arg4); char *mpMenuTextBodyName(struct menuitem *item); void func0f17b8f0(void); -s32 mpPlayerNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 mpLoadSettingsMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult mpPlayerNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult mpLoadSettingsMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextMpconfigMarquee(struct menuitem *item); -s32 mpLoadPlayerMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpHandicapPlayer(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult mpLoadPlayerMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpHandicapPlayer(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextHandicapPlayerName(struct menuitem *item); -s32 mpAddChangeSimulantMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult mpAddChangeSimulantMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextSimulantDescription(struct menuitem *item); -s32 menudialog0017ccfc(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 mpBotDifficultyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuDialogHandlerResult menudialog0017ccfc(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuItemHandlerResult mpBotDifficultyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTitleEditSimulant(struct menudialogdef *dialogdef); char *mpMenuTextSimulantName(struct menuitem *item); -s32 menuhandlerMpNTeams(s32 operation, struct menuitem *item, union handlerdata *data, s32 numteams); +MenuItemHandlerResult menuhandlerMpNTeams(s32 operation, struct menuitem *item, union handlerdata *data, s32 numteams); char *mpMenuTextChrNameForTeamSetup(struct menuitem *item); -s32 func0f17dac4(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult func0f17dac4(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextSelectTuneOrTunes(struct menuitem *item); -s32 mpSelectTuneListHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult mpSelectTuneListHandler(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextCurrentTrack(struct menuitem *item); -s32 mpTeamNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult mpTeamNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextTeamName(struct menuitem *item); char *func0f17e318(struct menudialogdef *dialogdef); -s32 menudialog0017e3fc(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 mpChallengesListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuDialogHandlerResult menudialog0017e3fc(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuItemHandlerResult mpChallengesListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextChallengeName(struct menuitem *item); -s32 mpCombatChallengesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult mpCombatChallengesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); char *mpMenuTextSavePlayerOrCopy(struct menuitem *item); char *mpMenuTextArenaName(struct menuitem *item); char *mpMenuTextWeaponSetName(struct menuitem *item); void mpConfigureQuickTeamPlayers(void); void mpConfigureQuickTeamSimulants(void); void func0f17f428(void); -s32 menuhandlerPlayerTeam(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpNumberOfSimulants(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpSimulantsPerTeam(s32 operation, struct menuitem *item, union handlerdata *data); -s32 mpQuickTeamSimulantDifficultyHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerPlayerTeam(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpNumberOfSimulants(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpSimulantsPerTeam(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult mpQuickTeamSimulantDifficultyHandler(s32 operation, struct menuitem *item, union handlerdata *data); void mpCloseDialogsForNewSetup(void); void func0f17fcb0(s32 silent); -s32 menuhandlerMpSlowMotion(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpSlowMotion(s32 operation, struct menuitem *item, union handlerdata *data); void htbAddPad(s16 padnum); void htbRemoveAmmoCrateAtPad(s16 padnum); void htbReset(void); @@ -100,10 +100,10 @@ void pacHandleDeath(s32 cplayernum, s32 vplayernum); void pacTick(void); Gfx *pacRenderHud(Gfx *gdl); bool pacRadarChr(Gfx **gdl, struct prop *prop); -s32 mpOptionsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult mpOptionsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); char *mpMenuTextScenarioShortName(struct menuitem *item); char *mpMenuTextScenarioName(struct menuitem *item); -s32 scenarioScenarioMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult scenarioScenarioMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); void scenarioCreateMatchStartHudmsgs(void); Gfx *scenarioRenderHud(Gfx *gdl); void scenarioCalculatePlayerScore(struct mpchrconfig *mpchr, s32 chrnum, s32 *arg2, s32 *arg3); @@ -116,66 +116,66 @@ s32 scenarioPickUpBriefcase(struct chrdata *chr, struct prop *prop); void scenarioHandleDroppedToken(struct chrdata *chr, struct prop *prop); s32 scenarioPickUpUplink(struct chrdata *chr, struct prop *prop); void scenarioHandleActivatedProp(struct chrdata *chr, struct prop *prop); -s32 menuhandlerMpDropOut(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpTeamsLabel(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpDropOut(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpTeamsLabel(s32 operation, struct menuitem *item, union handlerdata *data); s32 mpGetNumStages(void); -s32 menuhandlerMpControlStyle(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpWeaponSlot(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpWeaponSetDropdown(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpControlCheckbox(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpAimControl(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpCheckboxOption(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpTeamsEnabled(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpDisplayOptionCheckbox(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpConfirmSaveChr(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpSetupName(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpSaveSetupOverwrite(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpSaveSetupCopy(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpCharacterBody(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpUsernamePassword(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpCharacterHead(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpTimeLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpTeamScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpRestoreScoreDefaults(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpRestoreHandicapDefaults(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menudialogMpReady(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 menudialogMpSimulant(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 menuhandlerMpSimulantHead(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpSimulantBody(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpDeleteSimulant(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpChangeSimulantType(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpClearAllSimulants(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpAddSimulant(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpSimulantSlot(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menudialogMpSimulants(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 menuhandlerMpTwoTeams(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpThreeTeams(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpFourTeams(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpMaximumTeams(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpHumansVsSimulants(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpHumanSimulantPairs(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpTeamSlot(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menudialogMpSelectTune(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 menuhandlerMpMultipleTunes(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpTeamNameSlot(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler0017e38c(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler0017e9d8(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpAbortChallenge(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpStartChallenge(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler0017ec64(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpLock(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpSavePlayer(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler0017ef30(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpSaveSettings(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menudialogMpGameSetup(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 menudialogMpQuickGo(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 menuhandlerMpFinishedSetup(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerQuickTeamSeparator(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpQuickTeamOption(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menudialogCombatSimulator(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 menuhandlerMpAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpDisplayTeam(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpOneHitKills(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpControlStyle(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpWeaponSlot(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpWeaponSetDropdown(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpControlCheckbox(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpAimControl(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpCheckboxOption(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpTeamsEnabled(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpDisplayOptionCheckbox(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpConfirmSaveChr(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpSetupName(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpSaveSetupOverwrite(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpSaveSetupCopy(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpCharacterBody(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpUsernamePassword(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpCharacterHead(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpTimeLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpTeamScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpRestoreScoreDefaults(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpRestoreHandicapDefaults(s32 operation, struct menuitem *item, union handlerdata *data); +MenuDialogHandlerResult menudialogMpReady(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult menudialogMpSimulant(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpSimulantHead(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpSimulantBody(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpDeleteSimulant(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpChangeSimulantType(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpClearAllSimulants(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpAddSimulant(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpSimulantSlot(s32 operation, struct menuitem *item, union handlerdata *data); +MenuDialogHandlerResult menudialogMpSimulants(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpTwoTeams(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpThreeTeams(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpFourTeams(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpMaximumTeams(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpHumansVsSimulants(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpHumanSimulantPairs(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpTeamSlot(s32 operation, struct menuitem *item, union handlerdata *data); +MenuDialogHandlerResult menudialogMpSelectTune(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpMultipleTunes(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpTeamNameSlot(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandler0017e38c(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandler0017e9d8(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpAbortChallenge(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpStartChallenge(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandler0017ec64(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpLock(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpSavePlayer(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandler0017ef30(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpSaveSettings(s32 operation, struct menuitem *item, union handlerdata *data); +MenuDialogHandlerResult menudialogMpGameSetup(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult menudialogMpQuickGo(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpFinishedSetup(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerQuickTeamSeparator(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpQuickTeamOption(s32 operation, struct menuitem *item, union handlerdata *data); +MenuDialogHandlerResult menudialogCombatSimulator(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpDisplayTeam(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerMpOneHitKills(s32 operation, struct menuitem *item, union handlerdata *data); #endif diff --git a/src/include/game/trainingmenus.h b/src/include/game/trainingmenus.h index 8bdfbdec9..4feaa1923 100644 --- a/src/include/game/trainingmenus.h +++ b/src/include/game/trainingmenus.h @@ -34,28 +34,28 @@ char *htMenuTextTimeTakenValue(struct menuitem *item); char *bioMenuTextName(struct menuitem *item); char *ciMenuTextHangarBioSubheading(struct menuitem *item); struct menudialogdef *ciGetFrWeaponListMenuDialog(void); -s32 frTrainingInfoMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 frTrainingStatsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 ciCharacterProfileMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 dtTrainingDetailsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 menudialogDeviceTrainingResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 menudialog001a6aa4(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 menudialogFiringRangeResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 ciHangarHolographMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -s32 frDetailsOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 frAbortMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 frWeaponListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerFrFailedContinue(s32 operation, struct menuitem *item, union handlerdata *data); -s32 ciOfficeInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 dtDeviceListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerDtOkOrResume(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler001a6514(s32 operation, struct menuitem *item, union handlerdata *data); -s32 htHoloListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler001a6a34(s32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler001a6a70(s32 operation, struct menuitem *item, union handlerdata *data); -s32 ciHangarInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 ciHangarTitleMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -s32 frDifficultyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuDialogHandlerResult frTrainingInfoMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult frTrainingStatsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult ciCharacterProfileMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult dtTrainingDetailsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult menudialogDeviceTrainingResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult menudialog001a6aa4(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult menudialogFiringRangeResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuDialogHandlerResult ciHangarHolographMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +MenuItemHandlerResult frDetailsOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult frAbortMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult frWeaponListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerFrFailedContinue(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult ciOfficeInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult dtDeviceListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandlerDtOkOrResume(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandler001a6514(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult htHoloListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandler001a6a34(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandler001a6a70(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult ciHangarInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult ciHangarTitleMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult frDifficultyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); #endif diff --git a/src/include/lib/model.h b/src/include/lib/model.h index d34b64df2..777eebbaf 100644 --- a/src/include/lib/model.h +++ b/src/include/lib/model.h @@ -97,7 +97,7 @@ void modelRender(struct modelrenderdata *renderdata, struct model *model); bool modelTestBboxNodeForHit(struct modelrodata_bbox *bbox, Mtxf *mtx, struct coord *arg2, struct coord *arg3); s32 modelTestForHit(struct model *model, struct coord *arg1, struct coord *arg2, struct modelnode **startnode); void modelPromoteNodeOffsetsToPointers(struct modelnode *node, u32 vma, u32 fileramaddr); -void modelPromoteOffsetsToPointers(struct modeldef *modeldef, u32 arg1, u32 arg2); +void modelPromoteOffsetsToPointers(struct modeldef *modeldef, u32 arg1, uintptr_t arg2); s32 modelCalculateRwDataIndexes(struct modelnode *node); void modelAllocateRwData(struct modeldef *modeldef); void modelInitRwData(struct model *model, struct modelnode *node); diff --git a/src/include/types.h b/src/include/types.h index 3170327c8..88e4477c3 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -11,9 +11,14 @@ #define bool s32 #define ubool u32 +#define intptr_t s32 +#define uintptr_t u32 +#define romptr_t u32 typedef s32 PakErr1; typedef s32 PakErr2; +typedef s32 MenuDialogHandlerResult; +typedef intptr_t MenuItemHandlerResult; // Float version of a graphics matrix, which has higher precision than an Mtx. // Matrices are stored as Mtxfs then converted to an Mtx when passed to the GPU. @@ -3422,8 +3427,8 @@ struct menuitem { u8 type; u8 param; u32 flags; - s32 param2; - s32 param3; + intptr_t param2; + intptr_t param3; union { s32 (*handler)(s32 operation, struct menuitem *item, union handlerdata *data); @@ -3433,7 +3438,7 @@ struct menuitem { struct menudialogdef { u8 type; - u32 title; + uintptr_t title; struct menuitem *items; s32 (*handler)(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); u32 flags; diff --git a/src/lib/anim.c b/src/lib/anim.c index d28e7c3da..ac83703ca 100644 --- a/src/lib/anim.c +++ b/src/lib/anim.c @@ -49,7 +49,7 @@ void animsInit(void) u32 tablelen = ALIGN64(&_animationsTableRomEnd - &_animationsTableRomStart); ptr = mempAlloc(tablelen, MEMPOOL_PERMANENT); - dmaExec(ptr, (s32)&_animationsTableRomStart, tablelen); + dmaExec(ptr, (romptr_t) &_animationsTableRomStart, tablelen); g_NumAnimations = g_NumRomAnimations = ptr[0]; g_Anims = g_RomAnims = (struct animtableentry *)&ptr[1]; @@ -140,7 +140,7 @@ u8 *animDma(u8 *dst, u32 segoffset, u32 len) return dst; } - return dmaExecWithAutoAlign(dst, (u32)&_animationsSegmentRomStart + segoffset, len); + return dmaExecWithAutoAlign(dst, (romptr_t) &_animationsSegmentRomStart + segoffset, len); } /** diff --git a/src/lib/audiomgr.c b/src/lib/audiomgr.c index d0409744a..c9da2ef09 100644 --- a/src/lib/audiomgr.c +++ b/src/lib/audiomgr.c @@ -281,7 +281,7 @@ void amgrHandleFrameMsg(AudioInfo *info, AudioInfo *previnfo) g_AmgrCurrentCmdList->list.t.type = M_AUDTASK; g_AmgrCurrentCmdList->list.t.flags = 0; g_AmgrCurrentCmdList->list.t.ucode_boot = (u64 *) &rspbootTextStart; - g_AmgrCurrentCmdList->list.t.ucode_boot_size = (u32) &rspbootTextEnd - (u32) &rspbootTextStart; + g_AmgrCurrentCmdList->list.t.ucode_boot_size = (uintptr_t) &rspbootTextEnd - (uintptr_t) &rspbootTextStart; g_AmgrCurrentCmdList->list.t.ucode = (u64 *) &aspTextStart; g_AmgrCurrentCmdList->list.t.ucode_data = (u64 *) &aspDataStart; g_AmgrCurrentCmdList->list.t.ucode_size = SP_UCODE_SIZE; diff --git a/src/lib/boot.c b/src/lib/boot.c index 553265eab..e66d95f7e 100644 --- a/src/lib/boot.c +++ b/src/lib/boot.c @@ -97,17 +97,17 @@ void bootPhase1(void) // Copy compressed .data and inflate segments // .data is copied from ROM to 0x701eb000 - 0x70200000 // inflate is copied from ROM to 0x70200000 - 0x702013f0 - datacomplen = (s32) &_datazipSegmentRomEnd - (s32) &_datazipSegmentRomStart; + datacomplen = (romptr_t) &_datazipSegmentRomEnd - (romptr_t) &_datazipSegmentRomStart; #if VERSION >= VERSION_NTSC_1_0 if (1); #endif - inflatelen = (s32) &_inflateSegmentRomEnd - (s32) &_inflateSegmentRomStart; + inflatelen = (romptr_t) &_inflateSegmentRomEnd - (romptr_t) &_inflateSegmentRomStart; copylen = datacomplen + inflatelen; - libram = (u32 *) ((u32) &_libSegmentStart + 0x2000); + libram = (u32 *) ((romptr_t) &_libSegmentStart + 0x2000); libzipram = (u32 *) 0x70280000; - dataziprom = (u8 *) ((s32) &_datazipSegmentRomStart | 0x70000000); + dataziprom = (u8 *) ((romptr_t) &_datazipSegmentRomStart | 0x70000000); datazipram = (u8 *) (0x70200000 - datacomplen); - dataram = (u32) &_dataSegmentStart; + dataram = (romptr_t) &_dataSegmentStart; for (i = copylen - 1; i >= 0; i--) { datazipram[i] = dataziprom[i]; diff --git a/src/lib/collision.c b/src/lib/collision.c index ae8b28ea8..60e44484f 100644 --- a/src/lib/collision.c +++ b/src/lib/collision.c @@ -575,15 +575,15 @@ f32 cdFindGroundInIntTileAtVertex(struct geotilei *tile, f32 x, f32 z, s32 verte + sp68 * tile->vertices[0][2]; if (sp60 == 0) { - return *(s16 *)(tile->ymax + (u32)tile); + return *(s16 *)(tile->ymax + (uintptr_t)tile); } ground = (tmp - (f64)x * sp58 - (f64)z * sp68) / sp60; - if (ground > *(s16 *)(tile->ymax + (u32)tile)) { - ground = *(s16 *)(tile->ymax + (u32)tile); - } else if (ground < *(s16 *)(tile->ymin + (u32)tile)) { - ground = *(s16 *)(tile->ymin + (u32)tile); + if (ground > *(s16 *)(tile->ymax + (uintptr_t)tile)) { + ground = *(s16 *)(tile->ymax + (uintptr_t)tile); + } else if (ground < *(s16 *)(tile->ymin + (uintptr_t)tile)) { + ground = *(s16 *)(tile->ymin + (uintptr_t)tile); } return ground; @@ -821,7 +821,7 @@ void cdGetPropsOnPlatform(struct prop *platform, s16 *propnums, s32 maxlen) while (geo < (struct geo *) end) { if (geo->type == GEOTYPE_TILE_I) { struct geotilei *tile = (struct geotilei *) geo; - geo = (struct geo *)((u32)geo + sizeof(struct geotilei) + sizeof(tile->vertices[0]) * (tile->header.numvertices - ARRAYCOUNT(tile->vertices))); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geotilei) + sizeof(tile->vertices[0]) * (tile->header.numvertices - ARRAYCOUNT(tile->vertices))); } else if (geo->type == GEOTYPE_TILE_F) { struct geotilef *tile = (struct geotilef *) geo; struct coord *pos = &prop->pos; @@ -837,11 +837,11 @@ void cdGetPropsOnPlatform(struct prop *platform, s16 *propnums, s32 maxlen) break; } - geo = (struct geo *)((u32)geo + sizeof(struct geotilef) + sizeof(struct coord) * (tile->header.numvertices - ARRAYCOUNT(tile->vertices))); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geotilef) + sizeof(struct coord) * (tile->header.numvertices - ARRAYCOUNT(tile->vertices))); } else if (geo->type == GEOTYPE_BLOCK) { - geo = (struct geo *)((u32)geo + sizeof(struct geoblock)); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geoblock)); } else if (geo->type == GEOTYPE_CYL) { - geo = (struct geo *)((u32)geo + sizeof(struct geocyl)); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geocyl)); } } @@ -874,20 +874,20 @@ void cdSetPropYBounds(struct prop *prop, f32 ymax, f32 ymin) while (geo < (struct geo *) end) { if (geo->type == GEOTYPE_TILE_I) { struct geotilei *tile = (struct geotilei *) geo; - geo = (struct geo *)((u32)geo + sizeof(struct geotilei) + sizeof(tile->vertices[0]) * (tile->header.numvertices - ARRAYCOUNT(tile->vertices))); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geotilei) + sizeof(tile->vertices[0]) * (tile->header.numvertices - ARRAYCOUNT(tile->vertices))); } else if (geo->type == GEOTYPE_TILE_F) { struct geotilef *tile = (struct geotilef *) geo; - geo = (struct geo *)((u32)geo + sizeof(struct geotilef) + sizeof(struct coord) * (tile->header.numvertices - ARRAYCOUNT(tile->vertices))); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geotilef) + sizeof(struct coord) * (tile->header.numvertices - ARRAYCOUNT(tile->vertices))); } else if (geo->type == GEOTYPE_BLOCK) { struct geoblock *block = (struct geoblock *) geo; block->ymax = ymax; block->ymin = ymin; - geo = (struct geo *)((u32)geo + sizeof(struct geoblock)); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geoblock)); } else if (geo->type == GEOTYPE_CYL) { struct geocyl *cyl = (struct geocyl *) geo; cyl->ymax = ymax; cyl->ymin = ymin; - geo = (struct geo *)((u32)geo + sizeof(struct geocyl)); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geocyl)); } } } @@ -906,12 +906,12 @@ bool cd00026a04(struct coord *pos, u8 *start, u8 *end, u16 geoflags, s32 room, s struct geotilei *tile = (struct geotilei *) geo; if ((geo->flags & geoflags) - && pos->x >= *(s16 *)(tile->xmin + (u32)tile) - && pos->x <= *(s16 *)(tile->xmax + (u32)tile) - && pos->z >= *(s16 *)(tile->zmin + (u32)tile) - && pos->z <= *(s16 *)(tile->zmax + (u32)tile)) { - if ((!ceiling && pos->y >= *(s16 *)(tile->ymin + (u32)tile)) - || (ceiling && pos->y <= *(s16 *)(tile->ymax + (u32)tile))) { + && pos->x >= *(s16 *)(tile->xmin + (uintptr_t)tile) + && pos->x <= *(s16 *)(tile->xmax + (uintptr_t)tile) + && pos->z >= *(s16 *)(tile->zmin + (uintptr_t)tile) + && pos->z <= *(s16 *)(tile->zmax + (uintptr_t)tile)) { + if ((!ceiling && pos->y >= *(s16 *)(tile->ymin + (uintptr_t)tile)) + || (ceiling && pos->y <= *(s16 *)(tile->ymax + (uintptr_t)tile))) { if (cdIs2dPointInIntTile(tile, pos->x, pos->z)) { f32 ground = cdFindGroundInIntTile(tile, pos->x, pos->z); @@ -926,7 +926,7 @@ bool cd00026a04(struct coord *pos, u8 *start, u8 *end, u16 geoflags, s32 room, s } } - geo = (struct geo *)((u32)geo + sizeof(struct geotilei) + sizeof(tile->vertices[0]) * (tile->header.numvertices - ARRAYCOUNT(tile->vertices))); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geotilei) + sizeof(tile->vertices[0]) * (tile->header.numvertices - ARRAYCOUNT(tile->vertices))); } else if (geo->type == GEOTYPE_TILE_F) { struct geotilef *tile = (struct geotilef *) geo; @@ -951,11 +951,11 @@ bool cd00026a04(struct coord *pos, u8 *start, u8 *end, u16 geoflags, s32 room, s } } - geo = (struct geo *)((u32)geo + sizeof(struct geotilef) + sizeof(struct coord) * (tile->header.numvertices - ARRAYCOUNT(tile->vertices))); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geotilef) + sizeof(struct coord) * (tile->header.numvertices - ARRAYCOUNT(tile->vertices))); } else if (geo->type == GEOTYPE_BLOCK) { - geo = (struct geo *)((u32)geo + sizeof(struct geoblock)); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geoblock)); } else if (geo->type == GEOTYPE_CYL) { - geo = (struct geo *)((u32)geo + sizeof(struct geocyl)); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geocyl)); } } @@ -1173,12 +1173,12 @@ void cdCollectGeoForCylFromList(struct coord *pos, f32 radius, u8 *start, u8 *en struct geotilei *tile = (struct geotilei *) geo; if ((geo->flags & geoflags) - && pos->x >= *(s16 *)(tile->xmin + (u32)tile) - radius - && pos->x <= *(s16 *)(tile->xmax + (u32)tile) + radius - && pos->z >= *(s16 *)(tile->zmin + (u32)tile) - radius - && pos->z <= *(s16 *)(tile->zmax + (u32)tile) + radius - && (!checkvertical || (pos->y + arg6 >= *(s16 *)(tile->ymin + (u32)tile) - && pos->y + arg7 <= *(s16 *)(tile->ymax + (u32)tile)))) { + && pos->x >= *(s16 *)(tile->xmin + (uintptr_t)tile) - radius + && pos->x <= *(s16 *)(tile->xmax + (uintptr_t)tile) + radius + && pos->z >= *(s16 *)(tile->zmin + (uintptr_t)tile) - radius + && pos->z <= *(s16 *)(tile->zmax + (uintptr_t)tile) + radius + && (!checkvertical || (pos->y + arg6 >= *(s16 *)(tile->ymin + (uintptr_t)tile) + && pos->y + arg7 <= *(s16 *)(tile->ymax + (uintptr_t)tile)))) { if (geo->flags & GEOFLAG_RAMPWALL) { result = cdTestRampWall(tile, pos, radius, pos->y + arg7, pos->y + arg6); } else { @@ -1197,18 +1197,18 @@ void cdCollectGeoForCylFromList(struct coord *pos, f32 radius, u8 *start, u8 *en } } - geo = (struct geo *)((u32)geo + tile->header.numvertices * 6 + 0xe); + geo = (struct geo *)((uintptr_t)geo + tile->header.numvertices * 6 + 0xe); } else if (geo->type == GEOTYPE_TILE_F) { struct geotilef *tile = (struct geotilef *) geo; s32 tmp = 0x40; if ((geo->flags & geoflags) - && pos->x >= *(f32 *)((u32)tile + tile->xmin * 0xc + 0x10) - radius - && pos->x <= *(f32 *)((u32)tile + tile->xmax * 0xc + 0x10) + radius - && pos->z >= *(f32 *)((u32)tile + tile->zmin * 0xc + 0x18) - radius - && pos->z <= *(f32 *)((u32)tile + tile->zmax * 0xc + 0x18) + radius - && (!checkvertical || (pos->y + arg6 >= *(f32*)((u32)tile + tile->ymin * 0xc + 0x14) - && pos->y + arg7 <= *(f32 *)((u32)tile + tile->ymax * 0xc + 0x14)))) { + && pos->x >= *(f32 *)((uintptr_t)tile + tile->xmin * 0xc + 0x10) - radius + && pos->x <= *(f32 *)((uintptr_t)tile + tile->xmax * 0xc + 0x10) + radius + && pos->z >= *(f32 *)((uintptr_t)tile + tile->zmin * 0xc + 0x18) - radius + && pos->z <= *(f32 *)((uintptr_t)tile + tile->zmax * 0xc + 0x18) + radius + && (!checkvertical || (pos->y + arg6 >= *(f32*)((uintptr_t)tile + tile->ymin * 0xc + 0x14) + && pos->y + arg7 <= *(f32 *)((uintptr_t)tile + tile->ymax * 0xc + 0x14)))) { result = cd000272f8FltTile(tile, pos->x, pos->z, radius, prop, &collisions[*numcollisions]); if (result != 0) { @@ -1221,7 +1221,7 @@ void cdCollectGeoForCylFromList(struct coord *pos, f32 radius, u8 *start, u8 *en } } - geo = (struct geo *)((u32)geo + (tile->header.numvertices - tmp) * 0xc + 0x310); + geo = (struct geo *)((uintptr_t)geo + (tile->header.numvertices - tmp) * 0xc + 0x310); } else if (geo->type == GEOTYPE_BLOCK) { struct geoblock *block = (struct geoblock *) geo; @@ -1239,7 +1239,7 @@ void cdCollectGeoForCylFromList(struct coord *pos, f32 radius, u8 *start, u8 *en } } - geo = (struct geo *)((u32)geo + 0x4c); + geo = (struct geo *)((uintptr_t)geo + 0x4c); } else if (geo->type == GEOTYPE_CYL) { struct geocyl *cyl = (struct geocyl *) geo; @@ -1257,7 +1257,7 @@ void cdCollectGeoForCylFromList(struct coord *pos, f32 radius, u8 *start, u8 *en } } - geo = (struct geo *)((u32)geo + 0x18); + geo = (struct geo *)((uintptr_t)geo + 0x18); } } } @@ -1533,12 +1533,12 @@ void cdCollectGeoForCylMoveFromList(u8 *start, u8 *end, struct coord *pos, f32 r struct geotilei *tile = (struct geotilei *) geo; if (geo->flags & geoflags) { - if (pos->x >= *(s16 *)(tile->xmin + (u32)tile) - radius - && pos->x <= *(s16 *)(tile->xmax + (u32)tile) + radius - && pos->z >= *(s16 *)(tile->zmin + (u32)tile) - radius - && pos->z <= *(s16 *)(tile->zmax + (u32)tile) + radius - && (!checkvertical || (pos->y + arg6 >= *(s16 *)(tile->ymin + (u32)tile) - && pos->y + arg7 <= *(s16 *)(tile->ymax + (u32)tile)))) { + if (pos->x >= *(s16 *)(tile->xmin + (uintptr_t)tile) - radius + && pos->x <= *(s16 *)(tile->xmax + (uintptr_t)tile) + radius + && pos->z >= *(s16 *)(tile->zmin + (uintptr_t)tile) - radius + && pos->z <= *(s16 *)(tile->zmax + (uintptr_t)tile) + radius + && (!checkvertical || (pos->y + arg6 >= *(s16 *)(tile->ymin + (uintptr_t)tile) + && pos->y + arg7 <= *(s16 *)(tile->ymax + (uintptr_t)tile)))) { bool pass; if (geo->flags & GEOFLAG_RAMPWALL) { @@ -1553,7 +1553,7 @@ void cdCollectGeoForCylMoveFromList(u8 *start, u8 *end, struct coord *pos, f32 r } } - geo = (struct geo *)((u32)geo + tile->header.numvertices * 6 + 0xe); + geo = (struct geo *)((uintptr_t)geo + tile->header.numvertices * 6 + 0xe); } else if (geo->type == GEOTYPE_TILE_F) { struct geotilef *tile = (struct geotilef *) geo; @@ -1567,7 +1567,7 @@ void cdCollectGeoForCylMoveFromList(u8 *start, u8 *end, struct coord *pos, f32 r cd0002840c(tile, pos->x, pos->z, radius, prop, collisions, maxcollisions, numcollisions); } - geo = (struct geo *)((u32)geo + (u32)(tile->header.numvertices - 0x40) * 0xc + 0x310); + geo = (struct geo *)((uintptr_t)geo + (uintptr_t)(tile->header.numvertices - 0x40) * 0xc + 0x310); } else if (geo->type == GEOTYPE_BLOCK) { struct geoblock *block = (struct geoblock *) geo; @@ -1576,7 +1576,7 @@ void cdCollectGeoForCylMoveFromList(u8 *start, u8 *end, struct coord *pos, f32 r cd00028638(block, pos->x, pos->z, radius, prop, collisions, maxcollisions, numcollisions); } - geo = (struct geo *)((u32)geo + sizeof(struct geoblock)); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geoblock)); } else if (geo->type == GEOTYPE_CYL) { struct geocyl *cyl = (struct geocyl *) geo; @@ -1585,7 +1585,7 @@ void cdCollectGeoForCylMoveFromList(u8 *start, u8 *end, struct coord *pos, f32 r cd0002885c(cyl, pos->x, pos->z, radius, prop, collisions, maxcollisions, numcollisions); } - geo = (struct geo *)((u32)geo + sizeof(struct geocyl)); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geocyl)); } } } @@ -2746,8 +2746,8 @@ bool cd0002ac70IntTile(struct coord *arg0, struct coord *arg1, struct coord *arg s32 spb0; f32 spac; f32 spa8; - f32 ymax = *(s16 *)(tile->ymax + (u32)tile); - f32 ymin = *(s16 *)(tile->ymin + (u32)tile); + f32 ymax = *(s16 *)(tile->ymax + (uintptr_t)tile); + f32 ymin = *(s16 *)(tile->ymin + (uintptr_t)tile); f32 spa0[2]; f32 sp98[2]; f32 sp90[2]; @@ -3093,22 +3093,22 @@ bool cdTestAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg struct coord spb8; if (tile->header.flags & geoflags) { - min.x = *(s16 *)(tile->xmin + (u32)tile); + min.x = *(s16 *)(tile->xmin + (uintptr_t)tile); if ((!(arg2->x < min.x)) || !(arg3->x < min.x)) { - max.x = *(s16 *)(tile->xmax + (u32)tile); + max.x = *(s16 *)(tile->xmax + (uintptr_t)tile); if ((!(arg2->x > max.x)) || !(arg3->x > max.x)) { - min.z = *(s16 *)(tile->zmin + (u32)tile); + min.z = *(s16 *)(tile->zmin + (uintptr_t)tile); if ((!(arg2->z < min.z)) || !(arg3->z < min.z)) { - max.z = *(s16 *)(tile->zmax + (u32)tile); + max.z = *(s16 *)(tile->zmax + (uintptr_t)tile); if ((!(arg2->z > max.z)) || !(arg3->z > max.z)) { if (1); if (checkvertical) { - min.y = *(s16 *)(tile->ymin + (u32)tile); - max.y = *(s16 *)(tile->ymax + (u32)tile); + min.y = *(s16 *)(tile->ymin + (uintptr_t)tile); + max.y = *(s16 *)(tile->ymax + (uintptr_t)tile); if ((!(arg2->y < min.y) || !(arg3->y < min.y)) && (!(arg2->y > max.y) || !(arg3->y > max.y)) @@ -3125,7 +3125,7 @@ bool cdTestAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg } } - geo = (struct geo *)((u32)geo + tile->header.numvertices * 6 + 0xe); + geo = (struct geo *)((uintptr_t)geo + tile->header.numvertices * 6 + 0xe); } else if (geo->type == GEOTYPE_TILE_F) { struct geotilef *tile = (struct geotilef *) geo; struct coord min; @@ -3159,7 +3159,7 @@ bool cdTestAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg } } - geo = (struct geo *)((u32)geo + (u32)(tile->header.numvertices - 0x40) * 0xc + 0x310); + geo = (struct geo *)((uintptr_t)geo + (uintptr_t)(tile->header.numvertices - 0x40) * 0xc + 0x310); } else if (geo->type == GEOTYPE_BLOCK) { struct coord sp78; struct geoblock *block = (struct geoblock *) geo; @@ -3169,7 +3169,7 @@ bool cdTestAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg return false; } - geo = (struct geo *)((u32)geo + sizeof(struct geoblock)); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geoblock)); } else if (geo->type == GEOTYPE_CYL) { struct coord sp68; struct geocyl *cyl = (struct geocyl *) geo; @@ -3179,7 +3179,7 @@ bool cdTestAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg return false; } - geo = (struct geo *)((u32)geo + sizeof(struct geocyl)); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geocyl)); } } @@ -3325,21 +3325,21 @@ bool cdExamAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg } if (ok && (geo->flags & geoflags)) { - min.x = *(s16 *)(tile->xmin + (u32)tile); + min.x = *(s16 *)(tile->xmin + (uintptr_t)tile); if (!(arg2->x < min.x) || !(arg3->x < min.x)) { - max.x = *(s16 *)(tile->xmax + (u32)tile); + max.x = *(s16 *)(tile->xmax + (uintptr_t)tile); if (!(arg2->x > max.x) || !(arg3->x > max.x)) { - min.z = *(s16 *)(tile->zmin + (u32)tile); + min.z = *(s16 *)(tile->zmin + (uintptr_t)tile); if (!(arg2->z < min.z) || !(arg3->z < min.z)) { - max.z = *(s16 *)(tile->zmax + (u32)tile); + max.z = *(s16 *)(tile->zmax + (uintptr_t)tile); if (!(arg2->z > max.z) || !(arg3->z > max.z)) { if (checkvertical) { - min.y = *(s16 *)(tile->ymin + (u32)tile); - max.y = *(s16 *)(tile->ymax + (u32)tile); + min.y = *(s16 *)(tile->ymin + (uintptr_t)tile); + max.y = *(s16 *)(tile->ymax + (uintptr_t)tile); if ((!(arg2->y < min.y) || !(arg3->y < min.y)) && (!(arg2->y > max.y) || !(arg3->y > max.y)) @@ -3396,7 +3396,7 @@ bool cdExamAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg } } - geo = (struct geo *)((u32)geo + (u32)(tile->header.numvertices * 6) + 0xe); + geo = (struct geo *)((uintptr_t)geo + (uintptr_t)(tile->header.numvertices * 6) + 0xe); } else if (geo->type == GEOTYPE_TILE_F) { struct geotilef *tile = (struct geotilef *) geo; struct coord min; @@ -3472,7 +3472,7 @@ bool cdExamAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg } } - geo = (struct geo *)((u32)geo + (u32)(tile->header.numvertices - 0x40) * 0xc + 0x310); + geo = (struct geo *)((uintptr_t)geo + (uintptr_t)(tile->header.numvertices - 0x40) * 0xc + 0x310); } else if (geo->type == GEOTYPE_BLOCK) { struct coord spb0; struct coord spa4; @@ -3506,7 +3506,7 @@ bool cdExamAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg } } - geo = (struct geo *)((u32)geo + sizeof(struct geoblock)); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geoblock)); } else if (geo->type == GEOTYPE_CYL) { struct geocyl *cyl = (struct geocyl *) geo; struct coord sp88; @@ -3541,7 +3541,7 @@ bool cdExamAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg } } - geo = (struct geo *)((u32)geo + sizeof(struct geocyl)); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geocyl)); } } @@ -3962,10 +3962,10 @@ s32 cdTestBlockOverlapsGeolist(u8 *start, u8 *end, struct geoblock *block, u16 g while (geo < (struct geo *) end) { if (geo->type == GEOTYPE_TILE_I) { struct geotilei *tile = (struct geotilei *) geo; - geo = (struct geo *)((u32)geo + tile->header.numvertices * 6 + 0xe); + geo = (struct geo *)((uintptr_t)geo + tile->header.numvertices * 6 + 0xe); } else if (geo->type == GEOTYPE_TILE_F) { struct geotilef *tile = (struct geotilef *) geo; - geo = (struct geo *)((u32)geo + tile->header.numvertices * 0xc + 0x10); + geo = (struct geo *)((uintptr_t)geo + tile->header.numvertices * 0xc + 0x10); } else if (geo->type == GEOTYPE_BLOCK) { struct geoblock *thisblock = (struct geoblock *) geo; @@ -3994,7 +3994,7 @@ s32 cdTestBlockOverlapsGeolist(u8 *start, u8 *end, struct geoblock *block, u16 g } } - geo = (struct geo *)((u32)geo + 0x4c); + geo = (struct geo *)((uintptr_t)geo + 0x4c); } else if (geo->type == GEOTYPE_CYL) { struct geocyl *cyl = (struct geocyl *) geo; @@ -4005,7 +4005,7 @@ s32 cdTestBlockOverlapsGeolist(u8 *start, u8 *end, struct geoblock *block, u16 g return CDRESULT_COLLISION; } - geo = (struct geo *)((u32)geo + 0x18); + geo = (struct geo *)((uintptr_t)geo + 0x18); } } @@ -4099,12 +4099,12 @@ bool cd0002e680IntTile(struct geotilei *tile, s32 numvertices, struct coord *ver curr = i; } - if (cd0002ac70IntTile((struct coord *)((u32)verts + curr * sizeof(struct coord)), - (struct coord *)((u32)verts + next * sizeof(struct coord)), - (struct coord *)((u32)diffs + curr * sizeof(struct coord)), + if (cd0002ac70IntTile((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), + (struct coord *)((uintptr_t)verts + next * sizeof(struct coord)), + (struct coord *)((uintptr_t)diffs + curr * sizeof(struct coord)), tile, &sp6c, &sp84, &sp78, 0, 0.0f, 0.0f)) { cdSetObstacleVtxColProp(&sp84, &sp78, &sp6c, prop); - cdSetSavedPos((struct coord *)((u32)verts + curr * sizeof(struct coord)), (struct coord *)((u32)verts + next * sizeof(struct coord))); + cdSetSavedPos((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)verts + next * sizeof(struct coord))); cdSetSavedBlock(block); result = true; break; @@ -4134,12 +4134,12 @@ bool cd0002e82cIntTile(struct geotilef *tile, s32 numvertices, struct coord *ver curr = i; } - if (cd0002b128FltTile((struct coord *)((u32)verts + curr * sizeof(struct coord)), - (struct coord *)((u32)verts + next * sizeof(struct coord)), - (struct coord *)((u32)diffs + curr * sizeof(struct coord)), + if (cd0002b128FltTile((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), + (struct coord *)((uintptr_t)verts + next * sizeof(struct coord)), + (struct coord *)((uintptr_t)diffs + curr * sizeof(struct coord)), tile, &sp6c, &sp84, &sp78, 0, 0.0f, 0.0f)) { cdSetObstacleVtxColProp(&sp84, &sp78, &sp6c, prop); - cdSetSavedPos((struct coord *)((u32)verts + curr * sizeof(struct coord)), (struct coord *)((u32)verts + next * sizeof(struct coord))); + cdSetSavedPos((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)verts + next * sizeof(struct coord))); cdSetSavedBlock(block); result = true; break; @@ -4169,12 +4169,12 @@ bool cd0002e9d8Block(struct geoblock *thisblock, s32 numvertices, struct coord * curr = i; } - if (cd0002b560Block((struct coord *)((u32)verts + curr * sizeof(struct coord)), - (struct coord *)((u32)verts + next * sizeof(struct coord)), - (struct coord *)((u32)diffs + curr * sizeof(struct coord)), + if (cd0002b560Block((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), + (struct coord *)((uintptr_t)verts + next * sizeof(struct coord)), + (struct coord *)((uintptr_t)diffs + curr * sizeof(struct coord)), thisblock, &sp6c, &sp84, &sp78, 0, 0.0f, 0.0f)) { cdSetObstacleVtxColProp(&sp84, &sp78, &sp6c, prop); - cdSetSavedPos((struct coord *)((u32)verts + curr * sizeof(struct coord)), (struct coord *)((u32)verts + next * sizeof(struct coord))); + cdSetSavedPos((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)verts + next * sizeof(struct coord))); cdSetSavedBlock(block); result = true; break; @@ -4204,12 +4204,12 @@ bool cd0002eb84Cyl(struct geocyl *cyl, s32 numvertices, struct coord *arg2, stru curr = i; } - if (cd0002b954Cyl((struct coord *)((u32)arg2 + curr * sizeof(struct coord)), - (struct coord *)((u32)arg2 + next * sizeof(struct coord)), - (struct coord *)((u32)arg3 + curr * sizeof(struct coord)), + if (cd0002b954Cyl((struct coord *)((uintptr_t)arg2 + curr * sizeof(struct coord)), + (struct coord *)((uintptr_t)arg2 + next * sizeof(struct coord)), + (struct coord *)((uintptr_t)arg3 + curr * sizeof(struct coord)), cyl, &sp6c, &sp84, &sp78, 0, 0.0f, 0.0f)) { cdSetObstacleVtxColProp(&sp84, &sp78, &sp6c, prop); - cdSetSavedPos((struct coord *)((u32)arg2 + curr * sizeof(struct coord)), (struct coord *)((u32)arg2 + next * sizeof(struct coord))); + cdSetSavedPos((struct coord *)((uintptr_t)arg2 + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)arg2 + next * sizeof(struct coord))); cdSetSavedBlock(block); result = true; break; @@ -4230,13 +4230,13 @@ bool cd0002ed30(u8 *start, u8 *end, struct geoblock *block, s32 numvertices, str struct geotilei *tile = (struct geotilei *)geo; if ((geoflags & geo->flags) - && *(s16 *)(tile->ymax + (u32)tile) >= block->ymin - && *(s16 *)(tile->ymin + (u32)tile) <= block->ymax + && *(s16 *)(tile->ymax + (uintptr_t)tile) >= block->ymin + && *(s16 *)(tile->ymin + (uintptr_t)tile) <= block->ymax && cd0002e680IntTile(tile, numvertices, verts, diffs, prop, block)) { return false; } - geo = (struct geo *)((u32)geo + tile->header.numvertices * 6 + 0xe); + geo = (struct geo *)((uintptr_t)geo + tile->header.numvertices * 6 + 0xe); } else if (geo->type == GEOTYPE_TILE_F) { struct geotilef *tile = (struct geotilef *)geo; @@ -4247,7 +4247,7 @@ bool cd0002ed30(u8 *start, u8 *end, struct geoblock *block, s32 numvertices, str return false; } - geo = (struct geo *)((u32)geo + (u32)(tile->header.numvertices - 0x40) * 0xc + 0x310); + geo = (struct geo *)((uintptr_t)geo + (uintptr_t)(tile->header.numvertices - 0x40) * 0xc + 0x310); } else if (geo->type == GEOTYPE_BLOCK) { struct geoblock *block2 = (struct geoblock *)geo; @@ -4258,7 +4258,7 @@ bool cd0002ed30(u8 *start, u8 *end, struct geoblock *block, s32 numvertices, str return false; } - geo = (struct geo *)((u32)geo + sizeof(struct geoblock)); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geoblock)); } else if (geo->type == GEOTYPE_CYL) { struct geocyl *cyl = (struct geocyl *)geo; @@ -4269,7 +4269,7 @@ bool cd0002ed30(u8 *start, u8 *end, struct geoblock *block, s32 numvertices, str return false; } - geo = (struct geo *)((u32)geo + sizeof(struct geocyl)); + geo = (struct geo *)((uintptr_t)geo + sizeof(struct geocyl)); } } diff --git a/src/lib/crash.c b/src/lib/crash.c index 476ad8cd6..200991d31 100644 --- a/src/lib/crash.c +++ b/src/lib/crash.c @@ -353,9 +353,9 @@ u32 crashGetParentStackFrame(u32 *origptr, u32 *minaddr, u32 origsp, u32 *regs) bool crashIsReturnAddress(u32 *instruction) { - if (((u32)instruction % 4) == 0 - && (u32)instruction >= (u32)tlbInit - && (u32)instruction <= (u32)&_libSegmentEnd) { + if (((uintptr_t)instruction % 4) == 0 + && (uintptr_t)instruction >= (uintptr_t)tlbInit + && (uintptr_t)instruction <= (uintptr_t)&_libSegmentEnd) { // This condition can never pass because 9 is masked out if ((instruction[-2] & 0xfc00003c) == 9) { return true; @@ -399,7 +399,7 @@ u32 crash0000c52cnb(u32 romaddr) var8009710cnb = var80097118nb[0]; var80097110nb = (char *)&var80097118nb[1]; - var80097114nb = (char *)(crashGetStrLen(var80097110nb) + (u32)var80097110nb + 1); + var80097114nb = (char *)(crashGetStrLen(var80097110nb) + (uintptr_t)var80097110nb + 1); addr = romaddr + crashGetStrLen(var80097110nb) + crashGetStrLen(var80097114nb) + 6; @@ -512,8 +512,8 @@ u32 crashGetStackEnd(u32 sp, s32 tid) return 0; } - start = (u32)g_StackLeftAddrs[tid]; - end = (u32)g_StackRightAddrs[tid]; + start = (uintptr_t)g_StackLeftAddrs[tid]; + end = (uintptr_t)g_StackRightAddrs[tid]; if (sp >= K0BASE) { return end; @@ -531,7 +531,7 @@ u32 crashGetStackStart(u32 sp, s32 tid) return 0; } - start = (u32)g_StackLeftAddrs[tid]; + start = (uintptr_t)g_StackLeftAddrs[tid]; if (sp >= K0BASE) { return start; @@ -686,14 +686,14 @@ u32 crashGenerate(OSThread *thread, u32 *callstack, s32 *tracelen) i = 0; done = false; sp = (u32 *)ctx->sp; - stackend = (u32 *) crashGetStackEnd((u32)sp, thread->id); - stackstart = (u32 *) crashGetStackStart((u32)sp, thread->id); + stackend = (u32 *) crashGetStackEnd((uintptr_t)sp, thread->id); + stackstart = (u32 *) crashGetStackStart((uintptr_t)sp, thread->id); ptr = ctx->pc; *tracelen = 0; rmonPrintf("nearl: "); while (!done) { - sp = (u32 *) crashGetParentStackFrame((u32 *) ptr, &_libSegmentStart, (u32)sp, regs); + sp = (u32 *) crashGetParentStackFrame((u32 *) ptr, &_libSegmentStart, (uintptr_t)sp, regs); rmonPrintf(" %08x ", ptr); callstack[*tracelen] = ptr; diff --git a/src/lib/debughud.c b/src/lib/debughud.c index d7e1eb921..355dbe30d 100644 --- a/src/lib/debughud.c +++ b/src/lib/debughud.c @@ -354,7 +354,7 @@ Gfx *dhudRender(Gfx *gdl) // Make sure there'll be a least 256 GBI commands free (2KB) available = gfxGetFreeGfx(gdl) - 256 * sizeof(Gfx); - needed = (u32)gdl2 - (u32)gdl; + needed = (uintptr_t) gdl2 - (uintptr_t) gdl; if (needed <= 0) { // shouldn't be possible return gdl; diff --git a/src/lib/dma.c b/src/lib/dma.c index 056342195..e21605c3a 100644 --- a/src/lib/dma.c +++ b/src/lib/dma.c @@ -64,7 +64,7 @@ void dmaStart(void *memaddr, u32 romaddr, u32 len, bool priority) osPiStartDma(&g_DmaIoMsgs[i], priority, 0, romaddr, memaddr, 0x4000, &g_DmaMesgQueue); romaddr += 0x4000; - memaddr = (void *)((u32)memaddr + 0x4000); + memaddr = (void *)((uintptr_t) memaddr + 0x4000); } if (remainder) { @@ -175,7 +175,7 @@ void dmaExecHighPriority(void *memaddr, u32 romaddr, u32 len) void *dmaExecWithAutoAlign(void *memaddr, u32 romaddr, u32 len) { u32 alignedrom = ALIGN2(romaddr); - u32 alignedmem = ALIGN16((u32)memaddr); + u32 alignedmem = ALIGN16((uintptr_t) memaddr); u32 offset = romaddr - alignedrom; // 0 or 1 u32 alignedlen = ALIGN16(offset + len); diff --git a/src/lib/lib_17ce0.c b/src/lib/lib_17ce0.c index ae58a63fe..e029909ef 100644 --- a/src/lib/lib_17ce0.c +++ b/src/lib/lib_17ce0.c @@ -13,7 +13,7 @@ u8 var8009a4e0[456][2]; void portalGetAvgVertexPos(s32 portalnum, struct coord *avg) { - struct portalvertices *pvertices = (struct portalvertices *)((u32)g_BgPortals + g_BgPortals[portalnum].verticesoffset); + struct portalvertices *pvertices = (struct portalvertices *)((uintptr_t)g_BgPortals + g_BgPortals[portalnum].verticesoffset); f32 f0; s32 i; @@ -91,7 +91,7 @@ s32 portal00017e30(s32 portalnum, struct coord *arg1, struct coord *arg2) u32 stack; lastside = 0; - pvertices = (struct portalvertices *)((u32)g_BgPortals + g_BgPortals[portalnum].verticesoffset); + pvertices = (struct portalvertices *)((uintptr_t)g_BgPortals + g_BgPortals[portalnum].verticesoffset); value1 = arg1->f[0] * (var800a4ccc + portalnum)->coord.f[0] + arg1->f[1] * (var800a4ccc + portalnum)->coord.f[1] + arg1->f[2] * (var800a4ccc + portalnum)->coord.f[2]; value2 = arg2->f[0] * (var800a4ccc + portalnum)->coord.f[0] + arg2->f[1] * (var800a4ccc + portalnum)->coord.f[1] + arg2->f[2] * (var800a4ccc + portalnum)->coord.f[2]; diff --git a/src/lib/main.c b/src/lib/main.c index e644f92a9..397b6223b 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -433,11 +433,11 @@ void mainInit(void) if (g_DoBootPakMenu) { start = &_accessingpakSegmentRomStart; end = &_accessingpakSegmentRomEnd; - dmaExec(fb, (u32) start, end - start); + dmaExec(fb, (romptr_t) start, end - start); } else { start = &_copyrightSegmentRomStart; end = &_copyrightSegmentRomEnd; - dmaExec(fb, (u32) start, end - start); + dmaExec(fb, (romptr_t) start, end - start); } // This is required for a match @@ -577,7 +577,7 @@ void mainInit(void) // It's using the framebuffer as a temporary data buffer. start = &_copyrightSegmentRomStart; end = &_copyrightSegmentRomEnd; - dmaExec(fb, (u32) start, end - start); + dmaExec(fb, (romptr_t) start, end - start); // Unzip the compressed texture from fb to texture rzipInflate(fb, texture, scratch); diff --git a/src/lib/mema.c b/src/lib/mema.c index 8753675ba..4838950dd 100644 --- a/src/lib/mema.c +++ b/src/lib/mema.c @@ -138,7 +138,7 @@ struct memaspace *memaMakeSlot(struct memaheap *heap) return curr; } - if ((u32)curr[1].addr < (u32)curr[0].addr) { + if ((uintptr_t) curr[1].addr < (uintptr_t) curr[0].addr) { memaSwap(&curr[0], &curr[1]); } @@ -243,7 +243,7 @@ void memaReset(void *heapaddr, u32 heapsize) space->size = 0; } - g_MemaHeap.spaces[0].addr = g_MemaHeapStart = (u32)heapaddr; + g_MemaHeap.spaces[0].addr = g_MemaHeapStart = (uintptr_t) heapaddr; g_MemaHeap.spaces[0].size = g_MemaHeapSize = heapsize; #if VERSION == VERSION_PAL_BETA @@ -386,7 +386,7 @@ void memaPrint(void) dhudPrintString(buffer); line++; - sprintf(buffer, "Audio Free: %d", g_SndHeap.base + (g_SndHeap.len - (u32)g_SndHeap.cur)); + sprintf(buffer, "Audio Free: %d", g_SndHeap.base + (g_SndHeap.len - (uintptr_t) g_SndHeap.cur)); dhudSetPos(30, line); dhudPrintString(buffer); line++; @@ -627,7 +627,7 @@ found: void memaFree(void *addr, s32 size) { - _memaFree((u32)addr, size); + _memaFree((uintptr_t) addr, size); } void mema00012cd4(void) diff --git a/src/lib/memp.c b/src/lib/memp.c index aeba8348d..09bdea64b 100644 --- a/src/lib/memp.c +++ b/src/lib/memp.c @@ -239,7 +239,7 @@ s32 mempRealloc(void *allocation, s32 newsize, u8 poolnum) if (growsize <= 0) { pool->leftpos += growsize; - pool->leftpos = (u8 *)ALIGN16((u32)pool->leftpos); + pool->leftpos = (u8 *)ALIGN16((uintptr_t) pool->leftpos); return 1; } diff --git a/src/lib/model.c b/src/lib/model.c index b2a651fc3..34213a12c 100644 --- a/src/lib/model.c +++ b/src/lib/model.c @@ -3289,7 +3289,7 @@ void modelRenderNodeStarGunfire(struct modelrenderdata *renderdata, struct model struct gfxvtx *dst = g_ModelVtxAllocatorFunc(rodata->unk00 * 4); gSPSegment(renderdata->gdl++, SPSEGMENT_MODEL_VTX, osVirtualToPhysical(dst)); - gSPSegment(renderdata->gdl++, SPSEGMENT_MODEL_COL2, osVirtualToPhysical((void *)ALIGN8((u32)&rodata->vertices[rodata->unk00 << 2]))); + gSPSegment(renderdata->gdl++, SPSEGMENT_MODEL_COL2, osVirtualToPhysical((void *)ALIGN8((uintptr_t)&rodata->vertices[rodata->unk00 << 2]))); gSPSegment(renderdata->gdl++, SPSEGMENT_MODEL_COL1, osVirtualToPhysical(rodata->baseaddr)); gDPSetFogColor(renderdata->gdl++, 0x00, 0x00, 0x00, 0x00); @@ -3851,7 +3851,7 @@ s32 modelTestForHit(struct model *model, struct coord *arg1, struct coord *arg2, #define PROMOTE(var) \ if (var) \ - var = (void *)((u32)var + diff) + var = (void *)((uintptr_t)var + diff) void modelPromoteNodeOffsetsToPointers(struct modelnode *node, u32 vma, u32 fileramaddr) { @@ -3947,7 +3947,7 @@ void modelPromoteNodeOffsetsToPointers(struct modelnode *node, u32 vma, u32 file * Offsets in model files are based from virtual memory address 0x0f000000. * This vma address is specified as an argument to the function. */ -void modelPromoteOffsetsToPointers(struct modeldef *modeldef, u32 vma, u32 fileramaddr) +void modelPromoteOffsetsToPointers(struct modeldef *modeldef, u32 vma, uintptr_t fileramaddr) { s32 diff = fileramaddr - vma; s32 i; @@ -4152,7 +4152,7 @@ void modelInitRwData(struct model *model, struct modelnode *startnode) rwdata = modelGetNodeRwData(model, node); rwdata->dl.vertices = rodata->dl.vertices; rwdata->dl.gdl = rodata->dl.opagdl; - rwdata->dl.colours = (void *) ALIGN8((u32)(rodata->dl.vertices + rodata->dl.numvertices)); + rwdata->dl.colours = (void *) ALIGN8((uintptr_t)(rodata->dl.vertices + rodata->dl.numvertices)); if (rodata->dl.numvertices); if (rodata->dl.numvertices); if (rodata->dl.numvertices); diff --git a/src/lib/mp3.c b/src/lib/mp3.c index e53864127..f65ee5335 100644 --- a/src/lib/mp3.c +++ b/src/lib/mp3.c @@ -53,7 +53,7 @@ void mp3Init(ALHeap *heap) mp3mainInit(); g_Mp3Vars.var8009c398 = alHeapAlloc(heap, 1, 0x50); - *(u8 **)((u32)&g_Mp3Vars+0x44) = alHeapAlloc(heap, 1, 0x440); + *(u8 **)((uintptr_t)&g_Mp3Vars+0x44) = alHeapAlloc(heap, 1, 0x440); g_Mp3Vars.var8009c3e0 = 0; g_Mp3Vars.var8009c3e4 = 0x7fff; @@ -268,7 +268,7 @@ s32 func00037fc0(s32 arg0, Acmd **cmd) } if (arg0 > 0 && g_Mp3Vars.var8009c3c8) { - sp54 = (struct mp3thing *)(g_Mp3Vars.var8009c3d0 * 2 + (u32)g_Mp3Vars.var8009c3c8); + sp54 = (struct mp3thing *)(g_Mp3Vars.var8009c3d0 * 2 + (uintptr_t)g_Mp3Vars.var8009c3c8); n_aLoadBuffer((*cmd)++, arg0 + arg0, sp4c, osVirtualToPhysical(sp54)); diff --git a/src/lib/mtxc.c b/src/lib/mtxc.c index cc0529b75..3a9f5ae59 100644 --- a/src/lib/mtxc.c +++ b/src/lib/mtxc.c @@ -307,7 +307,7 @@ u32 mtxGetObfuscatedRomBase(void) // osRomBase is 0xb0000000 // load address is 0xb0000a5c // value is 0x1740fff9 - value = *(u32 *) (((u32) osRomBase | 0xb764b4fd) ^ 0x0764bea1); + value = *(u32 *) (((uintptr_t) osRomBase | 0xb764b4fd) ^ 0x0764bea1); osSendMesg(&__osPiAccessQueue, 0, 0); diff --git a/src/lib/naudio/n_csq.c b/src/lib/naudio/n_csq.c index 5afe84505..15d337cf6 100644 --- a/src/lib/naudio/n_csq.c +++ b/src/lib/naudio/n_csq.c @@ -2,6 +2,7 @@ #include "n_libaudio.h" #include #include +#include "types.h" u32 __n_alCSeqGetTrackEvent(ALCSeq *seq, u32 track, N_ALEvent *event, s32 arg3); u8 __getTrackByte(ALCSeq *seq, u32 track); @@ -27,7 +28,7 @@ void n_alCSeqNew(ALCSeq *seq, u8 *ptr) if (tmpOff) { flagTmp = 1 << i; seq->validTracks |= flagTmp; - seq->curLoc[i] = (u8*)((u32)ptr + tmpOff); + seq->curLoc[i] = (u8*)((uintptr_t)ptr + tmpOff); seq->evtDeltaTicks[i] = __readVarLen(seq,i); } else { seq->curLoc[i] = 0; diff --git a/src/lib/naudio/n_load.c b/src/lib/naudio/n_load.c index 6ed37f9cb..365774c4d 100644 --- a/src/lib/naudio/n_load.c +++ b/src/lib/naudio/n_load.c @@ -74,7 +74,7 @@ Acmd *n_alAdpcmPull(N_PVoice *filter, s16 *outp, s32 outCount, Acmd *p) * Now fix up state info to reflect the loop start point */ f->dc_lastsam = f->dc_loop.start &0xf; - f->dc_memin = (s32) f->dc_table->base + ADPCMFBYTES * ((s32) (f->dc_loop.start>>LFSAMPLES) + 1); + f->dc_memin = (intptr_t) f->dc_table->base + ADPCMFBYTES * ((s32) (f->dc_loop.start>>LFSAMPLES) + 1); f->dc_sample = f->dc_loop.start; bEnd = *outp; @@ -138,7 +138,7 @@ Acmd *n_alAdpcmPull(N_PVoice *filter, s16 *outp, s32 outCount, Acmd *p) * overFlow is the number of bytes past the end * of the bitstream I try to generate */ - overFlow = f->dc_memin + nbytes - ((s32) f->dc_table->base + f->dc_table->len); + overFlow = f->dc_memin + nbytes - ((intptr_t) f->dc_table->base + f->dc_table->len); if (overFlow < 0) { overFlow = 0; @@ -195,7 +195,7 @@ s32 n_alLoadParam(N_PVoice *filter, s32 paramID, void *param) switch (paramID) { case (AL_FILTER_SET_WAVETABLE): a->dc_table = (ALWaveTable *) param; - a->dc_memin = (s32) a->dc_table->base; + a->dc_memin = (intptr_t) a->dc_table->base; a->dc_sample = 0; switch (a->dc_table->type) { @@ -236,7 +236,7 @@ s32 n_alLoadParam(N_PVoice *filter, s32 paramID, void *param) /* sct 2/14/96 - Check table since it is initialized to null and */ /* Get loop info according to table type. */ if (a->dc_table) { - a->dc_memin = (s32) a->dc_table->base; + a->dc_memin = (intptr_t) a->dc_table->base; if (a->dc_table->type == AL_ADPCM_WAVE) { if (a->dc_table->waveInfo.adpcmWave.loop) { diff --git a/src/lib/naudio/n_resample2.c b/src/lib/naudio/n_resample2.c index be0548c10..4e355f275 100644 --- a/src/lib/naudio/n_resample2.c +++ b/src/lib/naudio/n_resample2.c @@ -1,6 +1,7 @@ #include "n_synthInternals.h" #include #include +#include "types.h" void func0003ba64(struct fx *fx, f32 outputrate); diff --git a/src/lib/naudio/n_reverb.c b/src/lib/naudio/n_reverb.c index c9d1bf1d2..39657dd89 100644 --- a/src/lib/naudio/n_reverb.c +++ b/src/lib/naudio/n_reverb.c @@ -254,7 +254,7 @@ Acmd *_n_loadOutputBuffer(ALFx *r, ALDelay *d, s32 arg2, s32 buff, Acmd *p) count = (s32) fincount; d->rs->delta = fincount - (f32)count; out_ptr = &r->input[arg2][-(d->output - d->rsdelta)]; - ramalign = ((s32)out_ptr & 0x7) >> 1; + ramalign = ((intptr_t)out_ptr & 0x7) >> 1; ptr = _n_loadBuffer(r, arg2, out_ptr - ramalign, rbuff, count + ramalign, ptr); ratio = (s32)(fratio * UNITY_PITCH); diff --git a/src/lib/naudio/n_sndplayer.c b/src/lib/naudio/n_sndplayer.c index 4fb66142d..57a71e856 100644 --- a/src/lib/naudio/n_sndplayer.c +++ b/src/lib/naudio/n_sndplayer.c @@ -137,7 +137,7 @@ void _n_handleEvent(N_ALSndpEvent *event) state = (struct sndstate *)event->common.state; - if (((u32)state & 0x80000000) == 0) { + if (((uintptr_t) state & 0x80000000) == 0) { // empty } diff --git a/src/lib/naudio/n_synthInternals.h b/src/lib/naudio/n_synthInternals.h index dae68a31b..a5f91400b 100644 --- a/src/lib/naudio/n_synthInternals.h +++ b/src/lib/naudio/n_synthInternals.h @@ -23,6 +23,7 @@ #include #include #include "n_abi.h" +#include "types.h" #define SAMPLE_ROUND #undef SAMPLE_ROUND @@ -67,7 +68,7 @@ typedef struct N_PVoice_s { s32 dc_sample; s32 dc_lastsam; s32 dc_first; - s32 dc_memin; + intptr_t dc_memin; /** ALResampler *********************************/ RESAMPLE_STATE *rs_state; f32 rs_ratio; diff --git a/src/lib/naudio/n_synthesizer.c b/src/lib/naudio/n_synthesizer.c index 778af119b..9d335dff3 100644 --- a/src/lib/naudio/n_synthesizer.c +++ b/src/lib/naudio/n_synthesizer.c @@ -143,7 +143,7 @@ Acmd *n_alAudioFrame(Acmd *cmdList, s32 *cmdLen, s16 *outBuf, s32 outLen) nOut = MIN(n_syn->maxOutSamples, outLen); cmdPtr = cmdlEnd; - n_syn->sv_dramout = (s32)lOutBuf; + n_syn->sv_dramout = (intptr_t) lOutBuf; cmdlEnd = n_alSavePull(n_syn->curSamples, cmdPtr); diff --git a/src/lib/rdp.c b/src/lib/rdp.c index 7dec33db0..59db11fde 100644 --- a/src/lib/rdp.c +++ b/src/lib/rdp.c @@ -72,7 +72,7 @@ void rdpInit(void) } g_RdpOutBufferStart = mempAlloc(size, MEMPOOL_PERMANENT); - g_RdpOutBufferEnd = (u16 *)((u32)g_RdpOutBufferStart + size); + g_RdpOutBufferEnd = (u16 *) ((uintptr_t) g_RdpOutBufferStart + size); } void rdpCreateTask(Gfx *gdlstart, Gfx *gdlend, u32 arg2, void *msg) @@ -84,7 +84,7 @@ void rdpCreateTask(Gfx *gdlstart, Gfx *gdlend, u32 arg2, void *msg) task = &sctask->list; task->t.ucode_boot = (u64 *) rspbootTextStart; - task->t.ucode_boot_size = (u32) ((u32)rspbootTextEnd - (u32)rspbootTextStart); + task->t.ucode_boot_size = (uintptr_t) rspbootTextEnd - (uintptr_t) rspbootTextStart; if (rspbootTextStart); @@ -107,5 +107,5 @@ void rdpCreateTask(Gfx *gdlstart, Gfx *gdlend, u32 arg2, void *msg) schedAppendTasks(&g_Sched, sctask); // Swap g_RdpCurTask - g_RdpCurTask = (struct rdptask *)((u32)g_RdpCurTask ^ (u32) &g_RdpTaskA ^ (u32) &g_RdpTaskB); + g_RdpCurTask = (struct rdptask *)((uintptr_t) g_RdpCurTask ^ (uintptr_t) &g_RdpTaskA ^ (uintptr_t) &g_RdpTaskB); } diff --git a/src/lib/snd.c b/src/lib/snd.c index b7d15ce5d..b8674bc34 100644 --- a/src/lib/snd.c +++ b/src/lib/snd.c @@ -928,23 +928,23 @@ void sndLoadSfxCtl(void) u32 size; g_ALSoundRomOffsets = NULL; - buffer = (u8 *) ALIGN16((u32)unalignedbuffer); + buffer = (u8 *) ALIGN16((uintptr_t)unalignedbuffer); // Load the first 256 bytes of the ctl file. size = 256; - dmaExec(buffer, (u32) &_sfxctlSegmentRomStart, size); + dmaExec(buffer, (romptr_t) &_sfxctlSegmentRomStart, size); // Get the ROM address of the first (and only) bank, // then load the first 256 bytes of the bank. file = (ALBankFile *) buffer; - romaddr = (u32)&_sfxctlSegmentRomStart; + romaddr = (romptr_t)&_sfxctlSegmentRomStart; romaddr += (u32)file->bankArray[0]; dmaExec(buffer, romaddr, size); // Get the ROM address of the first (and only) instrument, // then load the first 256 bytes of the instrument. bank = (ALBank *) buffer; - romaddr = (u32)&_sfxctlSegmentRomStart; + romaddr = (romptr_t)&_sfxctlSegmentRomStart; romaddr += (u32)bank->instArray[0]; dmaExec(buffer, romaddr, size); @@ -965,7 +965,7 @@ void sndLoadSfxCtl(void) // Convert ctl-local offsets to ROM offsets for (i = 0; i < g_NumSounds; i++) { - g_ALSoundRomOffsets[i] += (u32) &_sfxctlSegmentRomStart; + g_ALSoundRomOffsets[i] += (romptr_t) &_sfxctlSegmentRomStart; } // Allocate and initialise cache @@ -1004,13 +1004,13 @@ ALEnvelope *sndLoadEnvelope(u32 offset, u16 cacheindex) #if VERSION >= VERSION_NTSC_1_0 u8 spaf[0x50]; u8 sp5f[0x50]; - ALEnvelope *s2 = (ALEnvelope *)ALIGN16((u32)spaf); - ALEnvelope *s1 = (ALEnvelope *)ALIGN16((u32)sp5f); + ALEnvelope *s2 = (ALEnvelope *)ALIGN16((uintptr_t)spaf); + ALEnvelope *s1 = (ALEnvelope *)ALIGN16((uintptr_t)sp5f); s32 i; s32 sum1; s32 sum2; - offset += (u32)&_sfxctlSegmentRomStart; + offset += (romptr_t)&_sfxctlSegmentRomStart; do { dmaExecHighPriority(s2, offset, 0x40); @@ -1031,9 +1031,9 @@ ALEnvelope *sndLoadEnvelope(u32 offset, u16 cacheindex) } while (sum1 != sum2); #else u8 sp5f[0x50]; - ALEnvelope *s1 = (ALEnvelope *)ALIGN16((u32)sp5f); + ALEnvelope *s1 = (ALEnvelope *)ALIGN16((uintptr_t)sp5f); - offset += (u32)&_sfxctlSegmentRomStart; + offset += (romptr_t)&_sfxctlSegmentRomStart; dmaExecHighPriority(s1, offset, 0x40); #endif @@ -1051,13 +1051,13 @@ ALKeyMap *sndLoadKeymap(u32 offset, u16 cacheindex) #if VERSION >= VERSION_NTSC_1_0 u8 spaf[0x50]; u8 sp5f[0x50]; - ALKeyMap *s2 = (ALKeyMap *)ALIGN16((u32)spaf); - ALKeyMap *s1 = (ALKeyMap *)ALIGN16((u32)sp5f); + ALKeyMap *s2 = (ALKeyMap *)ALIGN16((uintptr_t)spaf); + ALKeyMap *s1 = (ALKeyMap *)ALIGN16((uintptr_t)sp5f); s32 i; s32 sum1; s32 sum2; - offset += (u32)&_sfxctlSegmentRomStart; + offset += (romptr_t)&_sfxctlSegmentRomStart; do { dmaExecHighPriority(s2, offset, 0x40); @@ -1078,9 +1078,9 @@ ALKeyMap *sndLoadKeymap(u32 offset, u16 cacheindex) } while (sum1 != sum2); #else u8 sp5f[0x50]; - ALKeyMap *s1 = (ALKeyMap *)ALIGN16((u32)sp5f); + ALKeyMap *s1 = (ALKeyMap *)ALIGN16((uintptr_t)sp5f); - offset += (u32)&_sfxctlSegmentRomStart; + offset += (romptr_t)&_sfxctlSegmentRomStart; dmaExecHighPriority(s1, offset, 0x40); #endif @@ -1098,13 +1098,13 @@ ALADPCMBook *sndLoadAdpcmBook(u32 offset, u16 cacheindex) #if VERSION >= VERSION_NTSC_1_0 u8 spaf[0x150]; u8 sp5f[0x150]; - ALADPCMBook *s2 = (ALADPCMBook *)ALIGN16((u32)spaf); - ALADPCMBook *s1 = (ALADPCMBook *)ALIGN16((u32)sp5f); + ALADPCMBook *s2 = (ALADPCMBook *)ALIGN16((uintptr_t)spaf); + ALADPCMBook *s1 = (ALADPCMBook *)ALIGN16((uintptr_t)sp5f); s32 i; s32 sum1; s32 sum2; - offset += (u32)&_sfxctlSegmentRomStart; + offset += (romptr_t)&_sfxctlSegmentRomStart; do { dmaExecHighPriority(s2, offset, 0x140); @@ -1125,9 +1125,9 @@ ALADPCMBook *sndLoadAdpcmBook(u32 offset, u16 cacheindex) } while (sum1 != sum2); #else u8 sp5f[0x150]; - ALADPCMBook *s1 = (ALADPCMBook *)ALIGN16((u32)sp5f); + ALADPCMBook *s1 = (ALADPCMBook *)ALIGN16((uintptr_t)sp5f); - offset += (u32)&_sfxctlSegmentRomStart; + offset += (romptr_t)&_sfxctlSegmentRomStart; dmaExecHighPriority(s1, offset, 0x140); #endif @@ -1145,8 +1145,8 @@ ALADPCMloop *sndLoadAdpcmLoop(u32 offset, u16 cacheindex) #if VERSION >= VERSION_NTSC_1_0 u8 spaf[0x50]; u8 sp5f[0x50]; - ALADPCMloop *s2 = (ALADPCMloop *)ALIGN16((u32)spaf); - ALADPCMloop *s1 = (ALADPCMloop *)ALIGN16((u32)sp5f); + ALADPCMloop *s2 = (ALADPCMloop *)ALIGN16((uintptr_t)spaf); + ALADPCMloop *s1 = (ALADPCMloop *)ALIGN16((uintptr_t)sp5f); s32 i; s32 sum1; s32 sum2; @@ -1155,7 +1155,7 @@ ALADPCMloop *sndLoadAdpcmLoop(u32 offset, u16 cacheindex) return NULL; } - offset += (u32)&_sfxctlSegmentRomStart; + offset += (romptr_t)&_sfxctlSegmentRomStart; do { dmaExecHighPriority(s2, offset, 0x40); @@ -1176,13 +1176,13 @@ ALADPCMloop *sndLoadAdpcmLoop(u32 offset, u16 cacheindex) } while (sum1 != sum2); #else u8 sp5f[0x50]; - ALADPCMloop *s1 = (ALADPCMloop *)ALIGN16((u32)sp5f); + ALADPCMloop *s1 = (ALADPCMloop *)ALIGN16((uintptr_t)sp5f); if (offset == 0) { return NULL; } - offset += (u32)&_sfxctlSegmentRomStart; + offset += (romptr_t)&_sfxctlSegmentRomStart; dmaExecHighPriority(s1, offset, 0x40); #endif @@ -1200,14 +1200,14 @@ ALWaveTable *sndLoadWavetable(u32 offset, u16 cacheindex) #if VERSION >= VERSION_NTSC_1_0 u8 spaf[0x50]; u8 sp5f[0x50]; - ALWaveTable *s2 = (ALWaveTable *)ALIGN16((u32)spaf); - ALWaveTable *s1 = (ALWaveTable *)ALIGN16((u32)sp5f); + ALWaveTable *s2 = (ALWaveTable *)ALIGN16((uintptr_t)spaf); + ALWaveTable *s1 = (ALWaveTable *)ALIGN16((uintptr_t)sp5f); s32 i; s32 sum1; s32 sum2; ALWaveTable *tmp; - offset += (u32)&_sfxctlSegmentRomStart; + offset += (romptr_t)&_sfxctlSegmentRomStart; do { dmaExecHighPriority(s2, offset, 0x40); @@ -1228,10 +1228,10 @@ ALWaveTable *sndLoadWavetable(u32 offset, u16 cacheindex) } while (sum1 != sum2); #else u8 sp5f[0x50]; - ALWaveTable *s1 = (ALWaveTable *)ALIGN16((u32)sp5f); + ALWaveTable *s1 = (ALWaveTable *)ALIGN16((uintptr_t)sp5f); ALWaveTable *tmp; - offset += (u32)&_sfxctlSegmentRomStart; + offset += (romptr_t)&_sfxctlSegmentRomStart; dmaExecHighPriority(s1, offset, 0x40); #endif @@ -1240,11 +1240,11 @@ ALWaveTable *sndLoadWavetable(u32 offset, u16 cacheindex) *tmp = *s1; - tmp->base += (u32)&_sfxtblSegmentRomStart; + tmp->base += (romptr_t)&_sfxtblSegmentRomStart; if (tmp->type == AL_ADPCM_WAVE) { - tmp->waveInfo.adpcmWave.book = sndLoadAdpcmBook((u32)tmp->waveInfo.adpcmWave.book, cacheindex); - tmp->waveInfo.adpcmWave.loop = sndLoadAdpcmLoop((u32)tmp->waveInfo.adpcmWave.loop, cacheindex); + tmp->waveInfo.adpcmWave.book = sndLoadAdpcmBook((uintptr_t)tmp->waveInfo.adpcmWave.book, cacheindex); + tmp->waveInfo.adpcmWave.loop = sndLoadAdpcmLoop((uintptr_t)tmp->waveInfo.adpcmWave.loop, cacheindex); } return tmp; @@ -1296,7 +1296,7 @@ ALSound *sndLoadSound(s16 soundnum) s16 sfxnum; u8 sp47[0x58]; - sound = (ALSound *)ALIGN16((u32)sp47); + sound = (ALSound *)ALIGN16((uintptr_t)sp47); tmp.packed = soundnum; sfxnum = tmp.id; @@ -1348,9 +1348,9 @@ ALSound *sndLoadSound(s16 soundnum) dmaExecHighPriority(sound, g_ALSoundRomOffsets[sfxnum - 1], 0x40); // Promote segment offsets to pointers and load their child data - sound->envelope = sndLoadEnvelope((u32)sound->envelope, cacheindex); - sound->wavetable = sndLoadWavetable((u32)sound->wavetable, cacheindex); - sound->keyMap = sndLoadKeymap((u32)sound->keyMap, cacheindex); + sound->envelope = sndLoadEnvelope((uintptr_t)sound->envelope, cacheindex); + sound->wavetable = sndLoadWavetable((uintptr_t)sound->wavetable, cacheindex); + sound->keyMap = sndLoadKeymap((uintptr_t)sound->keyMap, cacheindex); // Save the ALSound into the cache g_SndCache.sounds[cacheindex] = *sound; @@ -1477,7 +1477,7 @@ void sndInit(void) // Load seq.ctl var80095200 = 0xffffffff; bankfile = alHeapAlloc(&g_SndHeap, 1, len); - dmaExec(bankfile, (u32) &_seqctlSegmentRomStart, len); + dmaExec(bankfile, (romptr_t) &_seqctlSegmentRomStart, len); // Load seq.tbl alBnkfNew(bankfile, &_seqtblSegmentRomStart); @@ -1487,15 +1487,15 @@ void sndInit(void) // enough space for the table and load it. var80095204 = bankfile->bankArray[0]; g_SeqTable = alHeapDBAlloc(0, 0, &g_SndHeap, 1, 0x10); - dmaExec(g_SeqTable, (u32) &_sequencesSegmentRomStart, 0x10); + dmaExec(g_SeqTable, (romptr_t) &_sequencesSegmentRomStart, 0x10); len = g_SeqTable->count * sizeof(struct seqtableentry) + 4; g_SeqTable = alHeapDBAlloc(0, 0, &g_SndHeap, 1, len); - dmaExec(g_SeqTable, (u32) &_sequencesSegmentRomStart, (len + 0xf) & 0xfffffff0); + dmaExec(g_SeqTable, (romptr_t) &_sequencesSegmentRomStart, (len + 0xf) & 0xfffffff0); // Promote segment-relative offsets to ROM addresses for (i = 0; i < g_SeqTable->count; i++) { - g_SeqTable->entries[i].romaddr += (u32) &_sequencesSegmentRomStart; + g_SeqTable->entries[i].romaddr += (romptr_t) &_sequencesSegmentRomStart; } synconfig.maxVVoices = 44; diff --git a/src/lib/str.c b/src/lib/str.c index a24b8f15f..9944019a3 100644 --- a/src/lib/str.c +++ b/src/lib/str.c @@ -217,11 +217,11 @@ s32 strtol(const char *src, const char **endptr, s32 base) break; } - if (value > cutoff || (value == cutoff && (u32)c > cutlim)) { + if (value > cutoff || (value == cutoff && (uintptr_t) c > cutlim)) { overflow = true; } else { value *= base; - value += (u32)c; + value += (uintptr_t) c; } } diff --git a/src/lib/ultra/audio/bnkf.c b/src/lib/ultra/audio/bnkf.c index 30ec2d12e..3715d4280 100644 --- a/src/lib/ultra/audio/bnkf.c +++ b/src/lib/ultra/audio/bnkf.c @@ -1,6 +1,7 @@ #include #include #include +#include "types.h" void _bnkfPatchBank(ALBank *bank, s32 offset, s32 table); void _bnkfPatchInst(ALInstrument *inst, s32 offset, s32 table); @@ -9,7 +10,7 @@ void _bnkfPatchWaveTable(ALWaveTable *w, s32 offset, s32 table); void alSeqFileNew(ALSeqFile *file, u8 *base) { - s32 offset = (s32) base; + intptr_t offset = (intptr_t) base; s32 i; /* @@ -22,8 +23,8 @@ void alSeqFileNew(ALSeqFile *file, u8 *base) void alBnkfNew(ALBankFile *file, u8 *table) { - s32 offset = (s32) file; - s32 woffset = (s32) table; + intptr_t offset = (intptr_t) file; + intptr_t woffset = (intptr_t) table; s32 i; diff --git a/src/lib/ultra/io/aisetnextbuf.c b/src/lib/ultra/io/aisetnextbuf.c index 6026716fa..d9371dc4e 100644 --- a/src/lib/ultra/io/aisetnextbuf.c +++ b/src/lib/ultra/io/aisetnextbuf.c @@ -1,6 +1,7 @@ #include #include #include "../os/osint.h" +#include "types.h" s32 osAiSetNextBuffer(void *bufPtr, u32 size) { @@ -11,7 +12,7 @@ s32 osAiSetNextBuffer(void *bufPtr, u32 size) bptr -= 0x2000; } - if ((((u32)bufPtr + size) & 0x1fff) == 0) { + if ((((uintptr_t) bufPtr + size) & 0x1fff) == 0) { hdwrBugFlag = 1; } else { hdwrBugFlag = 0; diff --git a/src/lib/ultra/io/contpfs.c b/src/lib/ultra/io/contpfs.c index c574853b7..64bc9b860 100644 --- a/src/lib/ultra/io/contpfs.c +++ b/src/lib/ultra/io/contpfs.c @@ -1,5 +1,6 @@ #include #include "controller.h" +#include "types.h" s32 g_PfsPrevChannel = -1; u8 g_PfsPrevBank = 250; @@ -28,7 +29,7 @@ s32 __osIdCheckSum(u16 *ptr, u16 *csum, u16 *icsum) *csum = *icsum = 0; for (i = 0; i < ((sizeof(__OSPackId) - sizeof(u32)) / sizeof(u8)); i += 2) { - data = *(u16 *)((u32)ptr + i); + data = *(u16 *)((uintptr_t) ptr + i); *csum += data; *icsum += ~data; } diff --git a/src/lib/ultra/io/devmgr.c b/src/lib/ultra/io/devmgr.c index a5f27f785..857f27fcc 100644 --- a/src/lib/ultra/io/devmgr.c +++ b/src/lib/ultra/io/devmgr.c @@ -1,6 +1,7 @@ #include #include #include "piint.h" +#include "types.h" void __osDevMgrMain(void *args) { @@ -30,7 +31,7 @@ void __osDevMgrMain(void *args) info->sectorNum = -1; if (info->transferMode != LEO_SECTOR_MODE) { - blockInfo->dramAddr = (void *)((u32)blockInfo->dramAddr - blockInfo->sectorSize); + blockInfo->dramAddr = (void *)((uintptr_t)blockInfo->dramAddr - blockInfo->sectorSize); } if (info->transferMode == LEO_TRACK_MODE && mb->piHandle->transferInfo.cmdType == LEO_CMD_TYPE_0) { diff --git a/src/lib/ultra/io/pirawdma.c b/src/lib/ultra/io/pirawdma.c index ad02785b9..d1f0248b3 100644 --- a/src/lib/ultra/io/pirawdma.c +++ b/src/lib/ultra/io/pirawdma.c @@ -1,5 +1,6 @@ #include #include "piint.h" +#include "types.h" s32 osPiRawStartDma(s32 direction, u32 devAddr, void *dramAddr, u32 size) { @@ -8,7 +9,7 @@ s32 osPiRawStartDma(s32 direction, u32 devAddr, void *dramAddr, u32 size) WAIT_ON_IOBUSY(stat); IO_WRITE(PI_DRAM_ADDR_REG, osVirtualToPhysical(dramAddr)); - IO_WRITE(PI_CART_ADDR_REG, K1_TO_PHYS((u32)osRomBase | devAddr)); + IO_WRITE(PI_CART_ADDR_REG, K1_TO_PHYS((uintptr_t) osRomBase | devAddr)); switch (direction) { case OS_READ: diff --git a/src/lib/ultra/io/pirawread.c b/src/lib/ultra/io/pirawread.c index 4e705c825..30f60b6c7 100644 --- a/src/lib/ultra/io/pirawread.c +++ b/src/lib/ultra/io/pirawread.c @@ -1,6 +1,7 @@ #include #include "controller.h" #include "piint.h" +#include "types.h" s32 osPiRawReadIo(u32 devAddr, u32 *data) { @@ -8,7 +9,7 @@ s32 osPiRawReadIo(u32 devAddr, u32 *data) WAIT_ON_IOBUSY(stat); - *data = IO_READ((u32)osRomBase | devAddr); + *data = IO_READ((uintptr_t) osRomBase | devAddr); return 0; } diff --git a/src/lib/ultra/io/sptask.c b/src/lib/ultra/io/sptask.c index b55161ca2..31b913fa3 100644 --- a/src/lib/ultra/io/sptask.c +++ b/src/lib/ultra/io/sptask.c @@ -2,6 +2,7 @@ #include #include #include "../os/osint.h" +#include "types.h" OSTask tmp_task; @@ -40,7 +41,7 @@ void osSpTaskLoad(OSTask *intp) intp->t.flags &= ~OS_TASK_YIELDED; if (tp->t.flags & OS_TASK_LOADABLE) { - tp->t.ucode = (u64 *)IO_READ((u32)intp->t.yield_data_ptr + OS_YIELD_DATA_SIZE - 4); + tp->t.ucode = (u64 *)IO_READ((uintptr_t) intp->t.yield_data_ptr + OS_YIELD_DATA_SIZE - 4); } } diff --git a/src/lib/ultra/io/visetxscale.c b/src/lib/ultra/io/visetxscale.c index 0995bc5ad..f474b77ed 100644 --- a/src/lib/ultra/io/visetxscale.c +++ b/src/lib/ultra/io/visetxscale.c @@ -1,5 +1,6 @@ #include #include "viint.h" +#include "types.h" void osViSetXScale(f32 value) { @@ -11,7 +12,7 @@ void osViSetXScale(f32 value) __osViNext->x.factor = value; __osViNext->state |= VI_STATE_XSCALE_UPDATED; nomValue = __osViNext->modep->comRegs.xScale & VI_SCALE_MASK; - __osViNext->x.scale = (u32)(__osViNext->x.factor * nomValue) & VI_SCALE_MASK; + __osViNext->x.scale = (uintptr_t) (__osViNext->x.factor * nomValue) & VI_SCALE_MASK; __osRestoreInt(saveMask); } diff --git a/src/lib/ultra/os/createthread.c b/src/lib/ultra/os/createthread.c index 472bc26f0..5c87dd497 100644 --- a/src/lib/ultra/os/createthread.c +++ b/src/lib/ultra/os/createthread.c @@ -1,6 +1,7 @@ #include #include #include "osint.h" +#include "types.h" void __osCleanupThread(void); @@ -12,13 +13,13 @@ void osCreateThread(OSThread *t, OSId id, void (*entry)(void *), void *arg, void t->priority = p; t->next = NULL; t->queue = NULL; - t->context.pc = (u32) entry; + t->context.pc = (uintptr_t) entry; t->context.a0 = (u64) arg; t->context.sp = (u64) sp - 16; t->context.ra = (u64) __osCleanupThread; t->context.sr = SR_FR | SR_IMASK | SR_EXL | SR_IE; t->context.rcp = (OS_IM_ALL & RCP_IMASK) >> RCP_IMASKSHIFT; - t->context.fpcsr = (u32) (FPCSR_FS | FPCSR_EV); + t->context.fpcsr = (uintptr_t) (FPCSR_FS | FPCSR_EV); t->fp = 0; t->state = OS_STATE_STOPPED; t->flags = 0; diff --git a/src/lib/vi.c b/src/lib/vi.c index f5385b0f0..cb121c28d 100644 --- a/src/lib/vi.c +++ b/src/lib/vi.c @@ -226,7 +226,7 @@ void viReset(s32 stagenum) ptr = mempAlloc(fbsize * 2 + 0x40, MEMPOOL_STAGE); - ptr = (u8 *)(((u32)ptr + 0x3f) & 0xffffffc0); + ptr = (u8 *)(((uintptr_t) ptr + 0x3f) & 0xffffffc0); g_FrameBuffers[0] = (u16 *) ptr; g_FrameBuffers[1] = (u16 *) (fbsize + ptr); diff --git a/src/lib/vm.c b/src/lib/vm.c index faa8749f9..f1f10e4f5 100644 --- a/src/lib/vm.c +++ b/src/lib/vm.c @@ -221,17 +221,17 @@ void vmInit(void) gameseg = (u8 *) (STACK_START - g_VmNumPages * 8); g_VmStateTable = (u32 *) gameseg; - numpages = (u32) (((u32) &_gameSegmentEnd - (u32) &_gameSegmentStart) + (PAGE_SIZE - 1)) / PAGE_SIZE; + numpages = (u32) (((uintptr_t) &_gameSegmentEnd - (uintptr_t) &_gameSegmentStart) + (PAGE_SIZE - 1)) / PAGE_SIZE; numentries = numpages + 1; - g_VmZipTable = (u32 *) ((u32) ((u32 *) gameseg - (numentries + 4)) & ~0xf); + g_VmZipTable = (u32 *) ((uintptr_t) ((u32 *) gameseg - (numentries + 4)) & ~0xf); // Load gamezips pointer list - dmaExec(g_VmZipTable, (u32) &_gamezipSegmentRomStart, ALIGN16((numentries + 1) << 2)); + dmaExec(g_VmZipTable, (romptr_t) &_gamezipSegmentRomStart, ALIGN16((numentries + 1) << 2)); // Make pointers absolute instead of relative to their segment for (pagenum = 0; pagenum < numentries; pagenum++) { - g_VmZipTable[pagenum] += (u32) &_gamezipSegmentRomStart; + g_VmZipTable[pagenum] += (romptr_t) &_gamezipSegmentRomStart; } // Find the size of the biggest compressed zip @@ -247,11 +247,11 @@ void vmInit(void) s1 += 0x40; s1 &= (u32) ~0xf; - g_VmZipBuffer = (u32) g_VmZipTable - s1; + g_VmZipBuffer = (uintptr_t) g_VmZipTable - s1; g_VmZipBuffer &= ~0xf; gameseg = (u8 *) (g_VmZipBuffer - MAX_LOADED_PAGES * PAGE_SIZE); - gameseg -= (u32) gameseg & 0x1fff; - var8008ae20 = (u32) gameseg; + gameseg -= (uintptr_t) gameseg & 0x1fff; + var8008ae20 = (uintptr_t) gameseg; g_VmMarker = gameseg; tlb000010a4(); @@ -274,18 +274,18 @@ void vmInit(void) #if VERSION >= VERSION_NTSC_1_0 numentries = numpages + 1; - gameseg = (u8 *) ((u32) (s7 - (u8 *) ALIGN64((u32) &_gameSegmentEnd - (u32) &_gameSegmentStart)) & 0xfffe0000); + gameseg = (u8 *) ((uintptr_t) (s7 - (u8 *) ALIGN64((uintptr_t) &_gameSegmentEnd - (uintptr_t) &_gameSegmentStart)) & 0xfffe0000); #else - gameseg = (u8 *) ((u32) (s7 - (u8 *) ALIGN64((u32) &_gameSegmentEnd - (u32) &_gameSegmentStart)) & 0xfffe0000); + gameseg = (u8 *) ((uintptr_t) (s7 - (u8 *) ALIGN64((uintptr_t) &_gameSegmentEnd - (uintptr_t) &_gameSegmentStart)) & 0xfffe0000); numentries = numpages + 1; #endif - romaddrs = (u32 *) (((u32) gameseg - ((numentries + 4) << 2)) & ~0xf); + romaddrs = (u32 *) (((uintptr_t) gameseg - ((numentries + 4) << 2)) & ~0xf); g_VmMarker = gameseg; numentries2 = numentries; // Load gamezips pointer list - dmaExec(romaddrs, (u32) &_gamezipSegmentRomStart, ALIGN16((numentries2 + 1) << 2)); + dmaExec(romaddrs, (romptr_t) &_gamezipSegmentRomStart, ALIGN16((numentries2 + 1) << 2)); if (pagenum); @@ -297,12 +297,12 @@ void vmInit(void) // Make pointers absolute instead of relative to their segment for (ITER = 0; ITER < numentries2; ITER++) { \ - romaddrs[ITER] += (u32) &_gamezipSegmentRomStart; + romaddrs[ITER] += (romptr_t) &_gamezipSegmentRomStart; } // Load each zip from the ROM and inflate them to the game segment s2 = gameseg; - chunkbuffer = (u8 *) ((u32) romaddrs - PAGE_SIZE * 2); + chunkbuffer = (u8 *) ((uintptr_t) romaddrs - PAGE_SIZE * 2); zip = chunkbuffer + 2; for (ITER = 0; ITER < numentries2 - 1;) {