mirror of
https://github.com/zeldaret/mm.git
synced 2026-05-26 07:38:45 -04:00
z_map decompiled (#1032)
* First batch of functions * more ok * z_map_data OK * More OKs, MinimapList ZAPD breaking change * func_80103A58 improvements, more OK * func_80106D5C and func_801091F0 decomped * func_801031D0 decomped and some fixes * house cleaning, more OKs more decomp * Even more OKs * func_80105C40 almost OK, more OKs * func_80108AF8 OK and more * All functions attempted * func_8010534C OK * Start documentation, rename DoorCtx * More OKs, split map_data.data, more doc * incremental clean-up, more function names * more function names * func_801068FC OK * old uncommitted changes * minor tweaks * implement easy fixes * more fixes * z_map_disp OK, implement more suggestions * delete utility program * migrate data * TransiActor ->TransitionActor * Major documentation pass * first pass of changes * warning fix attempt, revert ZFile.cpp * Fix FAKE match * Easy fixes * implement gDPLoadTextureBlock_Runtime * z_demo bss patch * Extract white square texture * Implement more suggestions * rework MapIndex/DungeonIndex * revert dungeonSceneIndex -> mapIndex in some spots, implement suggestions * more suggestions * minor nits * fix #include
This commit is contained in:
mzxrules
@@ -0,0 +1,62 @@
|
||||
#ifndef GDP_LOADTEXTUREBLOCK_RUNTIME_INC_C
|
||||
#define GDP_LOADTEXTUREBLOCK_RUNTIME_INC_C
|
||||
|
||||
#include "gfx.h"
|
||||
|
||||
static u32 sLoadTextureBlock_siz[] = {
|
||||
G_IM_SIZ_4b,
|
||||
G_IM_SIZ_8b,
|
||||
G_IM_SIZ_16b,
|
||||
G_IM_SIZ_32b,
|
||||
};
|
||||
static u32 sLoadTextureBlock_siz_LOAD_BLOCK[] = {
|
||||
G_IM_SIZ_4b_LOAD_BLOCK,
|
||||
G_IM_SIZ_8b_LOAD_BLOCK,
|
||||
G_IM_SIZ_16b_LOAD_BLOCK,
|
||||
G_IM_SIZ_32b_LOAD_BLOCK,
|
||||
};
|
||||
static u32 sLoadTextureBlock_siz_INCR[] = {
|
||||
G_IM_SIZ_4b_INCR,
|
||||
G_IM_SIZ_8b_INCR,
|
||||
G_IM_SIZ_16b_INCR,
|
||||
G_IM_SIZ_32b_INCR,
|
||||
};
|
||||
static u32 sLoadTextureBlock_siz_SHIFT[] = {
|
||||
G_IM_SIZ_4b_SHIFT,
|
||||
G_IM_SIZ_8b_SHIFT,
|
||||
G_IM_SIZ_16b_SHIFT,
|
||||
G_IM_SIZ_32b_SHIFT,
|
||||
};
|
||||
static u32 sLoadTextureBlock_siz_BYTES[] = {
|
||||
G_IM_SIZ_4b_BYTES,
|
||||
G_IM_SIZ_8b_BYTES,
|
||||
G_IM_SIZ_16b_BYTES,
|
||||
G_IM_SIZ_32b_BYTES,
|
||||
};
|
||||
static u32 sLoadTextureBlock_siz_LINE_BYTES[] = {
|
||||
G_IM_SIZ_4b_LINE_BYTES,
|
||||
G_IM_SIZ_8b_LINE_BYTES,
|
||||
G_IM_SIZ_16b_LINE_BYTES,
|
||||
G_IM_SIZ_32b_LINE_BYTES,
|
||||
};
|
||||
|
||||
/**
|
||||
* Implements a version of gDPLoadTextureBlock using table lookups instead of token pasting, to allow values to be
|
||||
* passed into `siz` during runtime.
|
||||
*/
|
||||
#define gDPLoadTextureBlock_Runtime(pkt, timg, fmt, siz, width, height, pal, cms, cmt, masks, maskt, shifts, shiftt) \
|
||||
_DW({ \
|
||||
gDPSetTextureImage(pkt, fmt, sLoadTextureBlock_siz_LOAD_BLOCK[siz], 1, timg); \
|
||||
gDPSetTile(pkt, fmt, sLoadTextureBlock_siz_LOAD_BLOCK[siz], 0, 0, G_TX_LOADTILE, 0, cmt, maskt, shiftt, cms, \
|
||||
masks, shifts); \
|
||||
gDPLoadSync(pkt); \
|
||||
gDPLoadBlock(pkt, G_TX_LOADTILE, 0, 0, \
|
||||
(((width) * (height) + sLoadTextureBlock_siz_INCR[siz]) >> sLoadTextureBlock_siz_SHIFT[siz]) - 1, \
|
||||
CALC_DXT(width, sLoadTextureBlock_siz_BYTES[siz])); \
|
||||
gDPPipeSync(pkt); \
|
||||
gDPSetTile(pkt, fmt, sLoadTextureBlock_siz[siz], (((width)*sLoadTextureBlock_siz_LINE_BYTES[siz]) + 7) >> 3, \
|
||||
0, G_TX_RENDERTILE, pal, cmt, maskt, shiftt, cms, masks, shifts); \
|
||||
gDPSetTileSize(pkt, G_TX_RENDERTILE, 0, 0, ((width)-1) << G_TEXTURE_IMAGE_FRAC, \
|
||||
((height)-1) << G_TEXTURE_IMAGE_FRAC); \
|
||||
})
|
||||
#endif
|
||||
@@ -32,7 +32,7 @@ void Setup_InitRegs(void) {
|
||||
XREG(90) = 0x1C2;
|
||||
|
||||
R_STORY_FILL_SCREEN_ALPHA = 0;
|
||||
R_REVERSE_FLOOR_INDEX = 0;
|
||||
R_PLAYER_FLOOR_REVERSE_INDEX = 0;
|
||||
R_MINIMAP_DISABLED = false;
|
||||
|
||||
R_PICTO_FOCUS_BORDER_TOPLEFT_X = 80;
|
||||
|
||||
+3
-3
@@ -3413,9 +3413,9 @@ Actor* Actor_SpawnAsChild(ActorContext* actorCtx, Actor* parent, PlayState* play
|
||||
}
|
||||
|
||||
void Actor_SpawnTransitionActors(PlayState* play, ActorContext* actorCtx) {
|
||||
TransitionActorEntry* transitionActorList = play->doorCtx.transitionActorList;
|
||||
TransitionActorEntry* transitionActorList = play->transitionActors.list;
|
||||
s32 i;
|
||||
s16 numTransitionActors = play->doorCtx.numTransitionActors;
|
||||
s16 numTransitionActors = play->transitionActors.count;
|
||||
|
||||
for (i = 0; i < numTransitionActors; transitionActorList++, i++) {
|
||||
if (transitionActorList->id >= 0) {
|
||||
@@ -3434,7 +3434,7 @@ void Actor_SpawnTransitionActors(PlayState* play, ActorContext* actorCtx) {
|
||||
transitionActorList->rotY & 0x7F, HALFDAYBIT_ALL, 0) != NULL) {
|
||||
transitionActorList->id = -transitionActorList->id;
|
||||
}
|
||||
numTransitionActors = play->doorCtx.numTransitionActors;
|
||||
numTransitionActors = play->transitionActors.count;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -160,18 +160,18 @@ void KaleidoSetup_Init(PlayState* play) {
|
||||
pauseCtx->unk_20C = 936.0f;
|
||||
pauseCtx->roll = -314.0f;
|
||||
|
||||
pauseCtx->cursorPoint[PAUSE_MAP] = R_REVERSE_FLOOR_INDEX + (DUNGEON_FLOOR_INDEX_4 - 1);
|
||||
pauseCtx->cursorPoint[PAUSE_MAP] = R_PLAYER_FLOOR_REVERSE_INDEX + (DUNGEON_FLOOR_INDEX_4 - 1);
|
||||
|
||||
pauseCtx->cursorSpecialPos = PAUSE_CURSOR_PAGE_RIGHT;
|
||||
pauseCtx->pageSwitchInputTimer = 0;
|
||||
|
||||
pauseCtx->cursorItem[PAUSE_ITEM] = PAUSE_ITEM_NONE;
|
||||
pauseCtx->cursorItem[PAUSE_MAP] = R_REVERSE_FLOOR_INDEX + (DUNGEON_FLOOR_INDEX_4 - 1);
|
||||
pauseCtx->cursorItem[PAUSE_MAP] = R_PLAYER_FLOOR_REVERSE_INDEX + (DUNGEON_FLOOR_INDEX_4 - 1);
|
||||
pauseCtx->cursorItem[PAUSE_QUEST] = PAUSE_ITEM_NONE;
|
||||
pauseCtx->cursorItem[PAUSE_MASK] = PAUSE_ITEM_NONE;
|
||||
|
||||
pauseCtx->cursorSlot[PAUSE_ITEM] = 0;
|
||||
pauseCtx->cursorSlot[PAUSE_MAP] = R_REVERSE_FLOOR_INDEX + (DUNGEON_FLOOR_INDEX_4 - 1);
|
||||
pauseCtx->cursorSlot[PAUSE_MAP] = R_PLAYER_FLOOR_REVERSE_INDEX + (DUNGEON_FLOOR_INDEX_4 - 1);
|
||||
|
||||
pauseCtx->cursorColorSet = PAUSE_CURSOR_COLOR_SET_YELLOW;
|
||||
pauseCtx->ocarinaSongIndex = -1;
|
||||
|
||||
+582
-39
@@ -1,79 +1,622 @@
|
||||
#include "global.h"
|
||||
#include "z64map.h"
|
||||
#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801094A0.s")
|
||||
typedef struct {
|
||||
/* 0x0 */ u8 texWidth;
|
||||
/* 0x1 */ u8 texHeight;
|
||||
/* 0x2 */ s16 offsetX;
|
||||
/* 0x4 */ s16 offsetY;
|
||||
/* 0x6 */ u8 drawType;
|
||||
/* 0x7 */ u8 colorIndex;
|
||||
/* 0x8 */ s16 scale;
|
||||
} MapSpriteInfo; // size = 0xA
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801094C8.s")
|
||||
typedef struct {
|
||||
/* 0x0 */ TexturePtr spriteTex;
|
||||
/* 0x4 */ u8 width;
|
||||
/* 0x5 */ u8 height;
|
||||
/* 0x6 */ u8 offsetX;
|
||||
/* 0x7 */ u8 offsetY;
|
||||
/* 0x8 */ u8 drawType;
|
||||
/* 0x9 */ u8 colorIndex;
|
||||
/* 0xA */ s16 scale;
|
||||
} MapSpriteInfo2; // size = 0xC
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801094F8.s")
|
||||
static Color_RGBA8 sMapColorTable[] = {
|
||||
{ 255, 255, 255, 255 },
|
||||
{ 0, 255, 255, 160 }, // Blue
|
||||
{ 100, 255, 255, 255 },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109528.s")
|
||||
static MapSpriteInfo2 sGameplayDangeonKeepInfo[5] = {
|
||||
{ gameplay_dangeon_keep_Tex_0022C8, 96, 85, 48, 42, MAPDATA_DRAW_0, 0, 20 },
|
||||
{ gameplay_dangeon_keep_Tex_0042C8, 96, 85, 48, 62, MAPDATA_DRAW_0, 0, 20 },
|
||||
{ gameplay_dangeon_keep_Tex_0052C8, 96, 85, 68, 42, MAPDATA_DRAW_0, 0, 20 },
|
||||
{ gameplay_dangeon_keep_Tex_0032C8, 96, 85, 48, 62, MAPDATA_DRAW_0, 0, 20 },
|
||||
{ gameplay_dangeon_keep_Tex_0062C8, 96, 85, 68, 62, MAPDATA_DRAW_0, 0, 20 },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_8010954C.s")
|
||||
static MapSpriteInfo sMapGrandStaticInfo[98] = {
|
||||
{ 96, 85, 48, 42, MAPDATA_DRAW_0, 0, 20 }, { 96, 85, 48, 62, MAPDATA_DRAW_0, 0, 20 },
|
||||
{ 96, 85, 68, 42, MAPDATA_DRAW_0, 0, 20 }, { 96, 85, 48, 62, MAPDATA_DRAW_0, 0, 20 },
|
||||
{ 96, 85, 68, 62, MAPDATA_DRAW_0, 0, 20 }, { 80, 72, 40, 35, MAPDATA_DRAW_1, 1, 52 },
|
||||
{ 96, 85, 49, 43, MAPDATA_DRAW_3, 2, 20 }, { 96, 85, 49, 43, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 96, 85, 49, 43, MAPDATA_DRAW_3, 2, 20 }, { 96, 85, 49, 49, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 48, 44, 25, 23, MAPDATA_DRAW_3, 2, 20 }, { 96, 85, 49, 43, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 48, 46, 25, 24, MAPDATA_DRAW_3, 2, 20 }, { 64, 61, 32, 31, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 96, 85, 49, 50, MAPDATA_DRAW_3, 2, 20 }, { 96, 85, 49, 62, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 96, 85, 49, 43, MAPDATA_DRAW_3, 2, 20 }, { 48, 80, 21, 41, MAPDATA_DRAW_1, 1, 198 },
|
||||
{ 32, 128, 17, 87, MAPDATA_DRAW_1, 1, 138 }, { 80, 53, 40, 27, MAPDATA_DRAW_1, 1, 54 },
|
||||
{ 32, 81, 16, 15, MAPDATA_DRAW_3, 2, 20 }, { 80, 45, 35, 23, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 64, 87, 36, 44, MAPDATA_DRAW_3, 2, 20 }, { 64, 51, 31, 23, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 80, 79, 40, 40, MAPDATA_DRAW_3, 2, 20 }, { 96, 75, 36, 26, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 48, 41, 24, 20, MAPDATA_DRAW_3, 2, 20 }, { 64, 45, 31, 20, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 80, 52, 38, 28, MAPDATA_DRAW_3, 2, 20 }, { 48, 45, 23, 20, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 48, 59, 25, 37, MAPDATA_DRAW_3, 2, 20 }, { 48, 60, 21, 38, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 48, 81, 24, 40, MAPDATA_DRAW_3, 2, 20 }, { 48, 81, 24, 40, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 80, 89, 41, 26, MAPDATA_DRAW_3, 2, 20 }, { 80, 53, 39, 26, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 64, 78, 37, 36, MAPDATA_DRAW_3, 2, 20 }, { 64, 68, 33, 33, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 48, 68, 23, 35, MAPDATA_DRAW_3, 2, 20 }, { 48, 36, 25, 17, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 48, 25, 24, 12, MAPDATA_DRAW_3, 2, 20 }, { 64, 75, 24, 37, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 32, 53, 17, 26, MAPDATA_DRAW_3, 2, 20 }, { 80, 62, 35, 27, MAPDATA_DRAW_1, 1, 105 },
|
||||
{ 64, 76, 31, 31, MAPDATA_DRAW_1, 1, 133 }, { 96, 85, 47, 43, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 80, 71, 48, 33, MAPDATA_DRAW_1, 1, 180 }, { 80, 87, 44, 44, MAPDATA_DRAW_1, 1, 72 },
|
||||
{ 64, 65, 31, 36, MAPDATA_DRAW_1, 1, 57 }, { 48, 41, 28, 20, MAPDATA_DRAW_1, 1, 60 },
|
||||
{ 64, 76, 17, 36, MAPDATA_DRAW_1, 1, 58 }, { 80, 60, 27, 22, MAPDATA_DRAW_1, 1, 83 },
|
||||
{ 80, 47, 38, 23, MAPDATA_DRAW_1, 1, 69 }, { 80, 60, 40, 38, MAPDATA_DRAW_1, 1, 29 },
|
||||
{ 48, 19, 17, 8, MAPDATA_DRAW_1, 1, 25 }, { 32, 99, 17, 16, MAPDATA_DRAW_1, 1, 88 },
|
||||
{ 48, 69, 19, 28, MAPDATA_DRAW_1, 1, 76 }, { 48, 83, 34, 47, MAPDATA_DRAW_1, 1, 104 },
|
||||
{ 80, 54, 45, 27, MAPDATA_DRAW_1, 1, 61 }, { 80, 92, 35, 50, MAPDATA_DRAW_1, 1, 60 },
|
||||
{ 48, 75, 24, 37, MAPDATA_DRAW_3, 2, 20 }, { 64, 49, 32, 23, MAPDATA_DRAW_3, 2, 20 },
|
||||
{ 64, 49, 25, 24, MAPDATA_DRAW_3, 2, 20 }, { 64, 52, 32, 24, MAPDATA_DRAW_3, 2, 34 },
|
||||
{ 64, 49, 31, 24, MAPDATA_DRAW_3, 2, 34 }, { 32, 33, 18, 14, MAPDATA_DRAW_3, 2, 34 },
|
||||
{ 48, 50, 25, 25, MAPDATA_DRAW_3, 2, 34 }, { 64, 52, 32, 25, MAPDATA_DRAW_3, 2, 34 },
|
||||
{ 48, 35, 24, 18, MAPDATA_DRAW_3, 2, 34 }, { 64, 51, 32, 26, MAPDATA_DRAW_3, 2, 34 },
|
||||
{ 48, 35, 24, 18, MAPDATA_DRAW_3, 2, 34 }, { 48, 53, 24, 28, MAPDATA_DRAW_3, 2, 34 },
|
||||
{ 64, 53, 33, 25, MAPDATA_DRAW_3, 2, 34 }, { 64, 47, 31, 24, MAPDATA_DRAW_3, 2, 34 },
|
||||
{ 64, 52, 32, 35, MAPDATA_DRAW_3, 2, 34 }, { 48, 48, 24, 23, MAPDATA_DRAW_3, 2, 34 },
|
||||
{ 64, 87, 32, 26, MAPDATA_DRAW_3, 2, 34 }, { 48, 30, 24, 14, MAPDATA_DRAW_3, 2, 34 },
|
||||
{ 80, 74, 40, 36, MAPDATA_DRAW_1, 1, 50 }, { 80, 87, 6, 41, MAPDATA_DRAW_1, 1, 42 },
|
||||
{ 80, 56, 19, 27, MAPDATA_DRAW_1, 1, 40 }, { 80, 65, 25, 33, MAPDATA_DRAW_1, 1, 40 },
|
||||
{ 16, 38, 8, 12, MAPDATA_DRAW_1, 1, 47 }, { 80, 78, 46, 33, MAPDATA_DRAW_1, 1, 142 },
|
||||
{ 80, 55, 32, 29, MAPDATA_DRAW_1, 1, 155 }, { 80, 98, 67, 48, MAPDATA_DRAW_1, 1, 51 },
|
||||
{ 80, 62, 47, 19, MAPDATA_DRAW_1, 1, 55 }, { 32, 123, 15, 83, MAPDATA_DRAW_1, 1, 140 },
|
||||
{ 80, 60, 47, 14, MAPDATA_DRAW_1, 1, 170 }, { 48, 77, 18, 59, MAPDATA_DRAW_1, 1, 79 },
|
||||
{ 80, 64, 35, 30, MAPDATA_DRAW_1, 1, 33 }, { 64, 50, 29, 22, MAPDATA_DRAW_1, 1, 40 },
|
||||
{ 80, 65, 39, 5, MAPDATA_DRAW_1, 1, 37 }, { 32, 61, 8, 56, MAPDATA_DRAW_1, 1, 35 },
|
||||
{ 80, 83, 37, 42, MAPDATA_DRAW_1, 1, 95 }, { 80, 27, 30, 21, MAPDATA_DRAW_1, 1, 134 },
|
||||
{ 80, 23, 122, -18, MAPDATA_DRAW_1, 1, 53 }, { 80, 60, 27, 22, MAPDATA_DRAW_1, 1, 83 },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_8010956C.s")
|
||||
static s32 D_801BF15C[5] = {
|
||||
0x50, 0x50, 0x8D, 0x50, 0x50,
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_8010958C.s")
|
||||
static MapSpriteInfo sMapIStaticInfo[MAPDATA_MAP_I_MAX] = {
|
||||
{ 96, 85, 73, 67, MAPDATA_DRAW_0, 0, 60 }, { 96, 85, 73, 74, MAPDATA_DRAW_0, 0, 60 },
|
||||
{ 96, 85, 80, 67, MAPDATA_DRAW_0, 0, 60 }, { 96, 85, 73, 67, MAPDATA_DRAW_0, 0, 60 },
|
||||
{ 96, 85, 80, 74, MAPDATA_DRAW_0, 0, 60 }, { 32, 29, 17, 14, MAPDATA_DRAW_2, 0, 50 },
|
||||
{ 32, 27, 16, 13, MAPDATA_DRAW_2, 0, 50 }, { 32, 30, 16, 15, MAPDATA_DRAW_2, 0, 50 },
|
||||
{ 16, 32, 8, 20, MAPDATA_DRAW_2, 0, 50 }, { 16, 12, 8, 6, MAPDATA_DRAW_2, 0, 50 },
|
||||
{ 32, 27, 16, 13, MAPDATA_DRAW_2, 0, 50 }, { 16, 14, 8, 7, MAPDATA_DRAW_2, 0, 50 },
|
||||
{ 32, 19, 16, 9, MAPDATA_DRAW_2, 0, 50 }, { 32, 26, 16, 16, MAPDATA_DRAW_2, 0, 50 },
|
||||
{ 16, 32, 8, 22, MAPDATA_DRAW_2, 0, 50 }, { 32, 27, 16, 13, MAPDATA_DRAW_2, 0, 50 },
|
||||
{ 16, 35, 9, 5, MAPDATA_DRAW_2, 0, 45 }, { 32, 18, 14, 9, MAPDATA_DRAW_2, 0, 45 },
|
||||
{ 32, 38, 18, 19, MAPDATA_DRAW_2, 0, 45 }, { 32, 21, 16, 9, MAPDATA_DRAW_2, 0, 45 },
|
||||
{ 32, 34, 16, 17, MAPDATA_DRAW_2, 0, 45 }, { 48, 32, 19, 11, MAPDATA_DRAW_2, 0, 45 },
|
||||
{ 32, 17, 16, 8, MAPDATA_DRAW_2, 0, 45 }, { 32, 17, 16, 7, MAPDATA_DRAW_2, 0, 45 },
|
||||
{ 32, 21, 16, 11, MAPDATA_DRAW_2, 0, 45 }, { 32, 18, 16, 8, MAPDATA_DRAW_2, 0, 45 },
|
||||
{ 16, 24, 9, 15, MAPDATA_DRAW_2, 0, 45 }, { 16, 25, 7, 16, MAPDATA_DRAW_2, 0, 45 },
|
||||
{ 32, 35, 16, 17, MAPDATA_DRAW_2, 0, 45 }, { 16, 19, 5, 9, MAPDATA_DRAW_2, 0, 80 },
|
||||
{ 32, 28, 17, 7, MAPDATA_DRAW_2, 0, 66 }, { 32, 16, 16, 8, MAPDATA_DRAW_2, 0, 66 },
|
||||
{ 32, 24, 18, 11, MAPDATA_DRAW_2, 0, 66 }, { 32, 21, 16, 10, MAPDATA_DRAW_2, 0, 66 },
|
||||
{ 16, 21, 8, 11, MAPDATA_DRAW_2, 0, 66 }, { 16, 10, 8, 4, MAPDATA_DRAW_2, 0, 66 },
|
||||
{ 16, 7, 8, 3, MAPDATA_DRAW_2, 0, 66 }, { 32, 23, 13, 11, MAPDATA_DRAW_2, 0, 66 },
|
||||
{ 16, 16, 8, 8, MAPDATA_DRAW_2, 0, 66 }, { 16, 17, 8, 7, MAPDATA_DRAW_2, 0, 50 },
|
||||
{ 16, 23, 9, 10, MAPDATA_DRAW_2, 0, 66 }, { 16, 15, 8, 7, MAPDATA_DRAW_2, 0, 66 },
|
||||
{ 32, 15, 15, 7, MAPDATA_DRAW_2, 0, 66 }, { 32, 17, 16, 8, MAPDATA_DRAW_2, 0, 90 },
|
||||
{ 32, 16, 16, 8, MAPDATA_DRAW_2, 0, 90 }, { 16, 10, 8, 5, MAPDATA_DRAW_2, 0, 90 },
|
||||
{ 16, 17, 8, 8, MAPDATA_DRAW_2, 0, 90 }, { 32, 17, 17, 8, MAPDATA_DRAW_2, 0, 90 },
|
||||
{ 16, 11, 8, 5, MAPDATA_DRAW_2, 0, 90 }, { 32, 17, 15, 9, MAPDATA_DRAW_2, 0, 90 },
|
||||
{ 16, 12, 8, 6, MAPDATA_DRAW_2, 0, 90 }, { 16, 18, 9, 9, MAPDATA_DRAW_2, 0, 90 },
|
||||
{ 32, 17, 17, 8, MAPDATA_DRAW_2, 0, 90 }, { 32, 15, 16, 8, MAPDATA_DRAW_2, 0, 90 },
|
||||
{ 16, 18, 9, 13, MAPDATA_DRAW_2, 0, 90 }, { 16, 16, 8, 7, MAPDATA_DRAW_2, 0, 90 },
|
||||
{ 16, 30, 9, 8, MAPDATA_DRAW_2, 0, 90 }, { 16, 9, 9, 4, MAPDATA_DRAW_2, 0, 90 },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801095AC.s")
|
||||
static s32 sMapIForGameplayDangeonKeep[5] = {
|
||||
0x00, 0x01, 0x02, 0x03, 0x04,
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801095DC.s")
|
||||
static s32 sMapIForMapGrand[98] = {
|
||||
MAPDATA_MAP_I_MAX,
|
||||
0x01,
|
||||
0x02,
|
||||
0x03,
|
||||
0x04,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
0x05,
|
||||
0x06,
|
||||
0x07,
|
||||
0x08,
|
||||
0x09,
|
||||
0x0A,
|
||||
0x0B,
|
||||
0x0C,
|
||||
0x0D,
|
||||
0x0E,
|
||||
0x0F,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
0x10,
|
||||
0x11,
|
||||
0x12,
|
||||
0x13,
|
||||
0x14,
|
||||
0x15,
|
||||
0x16,
|
||||
0x17,
|
||||
0x18,
|
||||
0x19,
|
||||
0x1A,
|
||||
0x1B,
|
||||
0x1C,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
0x1E,
|
||||
0x1F,
|
||||
0x20,
|
||||
0x21,
|
||||
0x22,
|
||||
0x23,
|
||||
0x24,
|
||||
0x25,
|
||||
0x26,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
0x27,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
0x28,
|
||||
0x29,
|
||||
0x2A,
|
||||
0x2B,
|
||||
0x2C,
|
||||
0x2D,
|
||||
0x2E,
|
||||
0x2F,
|
||||
0x30,
|
||||
0x31,
|
||||
0x32,
|
||||
0x33,
|
||||
0x34,
|
||||
0x35,
|
||||
0x36,
|
||||
0x37,
|
||||
0x38,
|
||||
0x39,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
MAPDATA_MAP_I_MAX,
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_8010960C.s")
|
||||
void MapData_GetMapColor(s32 colorIndex, Color_RGBA8* color) {
|
||||
*color = sMapColorTable[colorIndex];
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109630.s")
|
||||
void MapData_GetMapTexDimGameplayDangeonKeep(s32 mapId, s32* width, s32* height) {
|
||||
*width = sGameplayDangeonKeepInfo[mapId].width;
|
||||
*height = sGameplayDangeonKeepInfo[mapId].height;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109650.s")
|
||||
void MapData_GetMapTexOffsetGameplayDangeonKeep(s32 mapId, s32* offsetX, s32* offsetY) {
|
||||
*offsetX = sGameplayDangeonKeepInfo[mapId].offsetX;
|
||||
*offsetY = sGameplayDangeonKeepInfo[mapId].offsetY;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109670.s")
|
||||
void MapData_GetMapDrawTypeGameplayDangeonKeep(s32 mapId, s32* drawType) {
|
||||
*drawType = sGameplayDangeonKeepInfo[mapId].drawType;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801096D4.s")
|
||||
u8 MapData_GetMapColorIndexGameplayDangeonKeep(s32 mapId) {
|
||||
return sGameplayDangeonKeepInfo[mapId].colorIndex;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109714.s")
|
||||
s16 MapData_GetMapGameplayDangeonKeepScale(s32 mapId) {
|
||||
return sGameplayDangeonKeepInfo[mapId].scale;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109754.s")
|
||||
TexturePtr MapData_GetMapTexGameplayDangeonKeep(s32 mapId) {
|
||||
return sGameplayDangeonKeepInfo[mapId].spriteTex;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801097C8.s")
|
||||
void MapData_GetMapTexGameplayDangeonKeepDim(s32 mapId, s32* width, s32* height) {
|
||||
*width = sMapGrandStaticInfo[MAPDATA_GET_MAP_GRAND_ID_FROM_MAP_ID(mapId)].texWidth;
|
||||
*height = sMapGrandStaticInfo[MAPDATA_GET_MAP_GRAND_ID_FROM_MAP_ID(mapId)].texHeight;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_8010983C.s")
|
||||
void MapData_GetMapTexGameplayDangeonKeepOffset(s32 mapId, s32* offsetX, s32* offsetY) {
|
||||
*offsetX = sMapGrandStaticInfo[MAPDATA_GET_MAP_GRAND_ID_FROM_MAP_ID(mapId)].offsetX;
|
||||
*offsetY = sMapGrandStaticInfo[MAPDATA_GET_MAP_GRAND_ID_FROM_MAP_ID(mapId)].offsetY;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801098A0.s")
|
||||
void MapData_GetMapGrandDrawType(s32 mapId, s32* drawType) {
|
||||
*drawType = sMapGrandStaticInfo[MAPDATA_GET_MAP_GRAND_ID_FROM_MAP_ID(mapId)].drawType;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109908.s")
|
||||
u8 MapData_GetMapGrandColorIndex(s32 mapId) {
|
||||
return sMapGrandStaticInfo[MAPDATA_GET_MAP_GRAND_ID_FROM_MAP_ID(mapId)].colorIndex;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109964.s")
|
||||
s16 MapData_GetMapGrandScale(s32 mapId) {
|
||||
return sMapGrandStaticInfo[MAPDATA_GET_MAP_GRAND_ID_FROM_MAP_ID(mapId)].scale;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_8010997C.s")
|
||||
s32 MapData_MapGrandTexSizeTest(s32 mapId) {
|
||||
s32 endMap = mapId - MAPDATA_MAP_GRAND;
|
||||
s32 size = 0;
|
||||
s32 i;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801099AC.s")
|
||||
for (i = 1; i < endMap + 1; i++) {
|
||||
size += MapData_GetSizeOfMapGrandTex((i - 1) + MAPDATA_MAP_GRAND);
|
||||
}
|
||||
return size;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_801099DC.s")
|
||||
s32 MapData_GetSizeOfMapGrandTex(s32 mapId) {
|
||||
return (sMapGrandStaticInfo[MAPDATA_GET_MAP_GRAND_ID_FROM_MAP_ID(mapId)].texWidth *
|
||||
sMapGrandStaticInfo[MAPDATA_GET_MAP_GRAND_ID_FROM_MAP_ID(mapId)].texHeight) /
|
||||
2;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109A00.s")
|
||||
s32 MapData_MID_GetType(s32 mapId) {
|
||||
if ((mapId >= 0) && (mapId < 5)) {
|
||||
return MAPDATA_MID_GAMEPLAY_DANGEON_KEEP;
|
||||
}
|
||||
if ((mapId >= 0x100) && (mapId < 0x162)) {
|
||||
return MAPDATA_MID_MAP_GRAND_STATIC;
|
||||
}
|
||||
return MAPDATA_MID_MAP_I_STATIC;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109A20.s")
|
||||
void MapData_GetMapTexDim(s32 mapId, s32* width, s32* height) {
|
||||
switch (MapData_MID_GetType(mapId)) {
|
||||
case MAPDATA_MID_GAMEPLAY_DANGEON_KEEP:
|
||||
MapData_GetMapTexDimGameplayDangeonKeep(mapId, width, height);
|
||||
return;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109A40.s")
|
||||
case MAPDATA_MID_MAP_GRAND_STATIC:
|
||||
MapData_GetMapTexGameplayDangeonKeepDim(mapId, width, height);
|
||||
return;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109A98.s")
|
||||
default:
|
||||
*width = *height = 0;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109AD8.s")
|
||||
void MapData_GetMapTexOffset(s32 mapId, s32* offsetX, s32* offsetY) {
|
||||
switch (MapData_MID_GetType(mapId)) {
|
||||
case MAPDATA_MID_GAMEPLAY_DANGEON_KEEP:
|
||||
MapData_GetMapTexOffsetGameplayDangeonKeep(mapId, offsetX, offsetY);
|
||||
return;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109B38.s")
|
||||
case MAPDATA_MID_MAP_GRAND_STATIC:
|
||||
MapData_GetMapTexGameplayDangeonKeepOffset(mapId, offsetX, offsetY);
|
||||
return;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109BA0.s")
|
||||
default:
|
||||
*offsetX = *offsetY = 0;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109BF4.s")
|
||||
void MapData_GetMapScale(s32 mapId, s32* scale) {
|
||||
switch (MapData_MID_GetType(mapId)) {
|
||||
default:
|
||||
*scale = 0;
|
||||
return;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109C38.s")
|
||||
case MAPDATA_MID_GAMEPLAY_DANGEON_KEEP:
|
||||
*scale = MapData_GetMapGameplayDangeonKeepScale(mapId);
|
||||
return;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109CBC.s")
|
||||
case MAPDATA_MID_MAP_GRAND_STATIC:
|
||||
*scale = MapData_GetMapGrandScale(mapId);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109D40.s")
|
||||
void MapData_GetDrawType(s32 mapId, s32* drawType) {
|
||||
switch (MapData_MID_GetType(mapId)) {
|
||||
case MAPDATA_MID_GAMEPLAY_DANGEON_KEEP:
|
||||
MapData_GetMapDrawTypeGameplayDangeonKeep(mapId, drawType);
|
||||
return;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109DD8.s")
|
||||
case MAPDATA_MID_MAP_GRAND_STATIC:
|
||||
MapData_GetMapGrandDrawType(mapId, drawType);
|
||||
return;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109E70.s")
|
||||
default:
|
||||
*drawType = 0;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109EF8.s")
|
||||
s32 MapData_GetMapColorIndex(s32 mapId) {
|
||||
switch (MapData_MID_GetType(mapId)) {
|
||||
case MAPDATA_MID_GAMEPLAY_DANGEON_KEEP:
|
||||
return MapData_GetMapColorIndexGameplayDangeonKeep(mapId);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_map_data/func_80109F78.s")
|
||||
case MAPDATA_MID_MAP_GRAND_STATIC:
|
||||
return MapData_GetMapGrandColorIndex(mapId);
|
||||
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
s32 func_80109964(s32 arg0) {
|
||||
return D_801BF15C[arg0];
|
||||
}
|
||||
|
||||
void MapData_GetMapITexDim(s32 mapId, s32* width, s32* height) {
|
||||
*width = sMapIStaticInfo[mapId].texWidth;
|
||||
*height = sMapIStaticInfo[mapId].texHeight;
|
||||
}
|
||||
|
||||
void MapData_GetMapITexOffset(s32 mapId, s32* offsetX, s32* offsetY) {
|
||||
*offsetX = sMapIStaticInfo[mapId].offsetX;
|
||||
*offsetY = sMapIStaticInfo[mapId].offsetY;
|
||||
}
|
||||
|
||||
void MapData_GetMapIDrawType(s32 mapId, s32* drawType) {
|
||||
*drawType = sMapIStaticInfo[mapId].drawType;
|
||||
}
|
||||
|
||||
u8 MapData_GetMapIColorIndex(s32 mapId) {
|
||||
return sMapIStaticInfo[mapId].colorIndex;
|
||||
}
|
||||
|
||||
s16 MapData_GetMapIScale(s32 mapId) {
|
||||
return sMapIStaticInfo[mapId].scale;
|
||||
}
|
||||
|
||||
s32 MapData_MapITexSizeTest(s32 mapId) {
|
||||
s32 i;
|
||||
s32 size = 0;
|
||||
|
||||
for (i = 1; i < mapId + 1; i++) {
|
||||
size += MapDisp_GetSizeOfMapITex(i - 1);
|
||||
}
|
||||
|
||||
return size;
|
||||
}
|
||||
|
||||
s32 MapDisp_GetSizeOfMapITex(s32 mapCompactId) {
|
||||
return (sMapIStaticInfo[mapCompactId].texWidth * sMapIStaticInfo[mapCompactId].texHeight) / 2;
|
||||
}
|
||||
|
||||
s32 MapData_GetMapIId(s32 mapId) {
|
||||
switch (MapData_MID_GetType(mapId)) {
|
||||
case MAPDATA_MID_GAMEPLAY_DANGEON_KEEP:
|
||||
return sMapIForGameplayDangeonKeep[mapId];
|
||||
|
||||
case MAPDATA_MID_MAP_GRAND_STATIC:
|
||||
return sMapIForMapGrand[MAPDATA_GET_MAP_GRAND_ID_FROM_MAP_ID(mapId)];
|
||||
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
s32 func_80109B38(s32 mapId) {
|
||||
if (MapData_GetMapIId(mapId) != MAPDATA_MAP_I_MAX) {
|
||||
return 1;
|
||||
}
|
||||
switch (MapData_MID_GetType(mapId)) {
|
||||
case MAPDATA_MID_GAMEPLAY_DANGEON_KEEP:
|
||||
return 2;
|
||||
|
||||
case MAPDATA_MID_MAP_GRAND_STATIC:
|
||||
return 0;
|
||||
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
s32 MapData_GetMapCompactId(s32 mapId) {
|
||||
s32 mapI = MapData_GetMapIId(mapId);
|
||||
|
||||
if (mapI != MAPDATA_MAP_I_MAX) {
|
||||
return mapI;
|
||||
}
|
||||
if ((mapId >= 0x100) && (mapId < 0x162)) {
|
||||
return mapId - 0xC6;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
s32 MapData_CPID_GetType(s32 mapCompactId) {
|
||||
if (mapCompactId == -1) {
|
||||
return MAPDATA_CPID_2;
|
||||
}
|
||||
if (mapCompactId < MAPDATA_MAP_I_MAX) {
|
||||
return MAPDATA_CPID_MAP_I_STATIC;
|
||||
}
|
||||
if (mapCompactId >= MAPDATA_MAP_I_MAX) {
|
||||
return MAPDATA_CPID_MAP_GRAND_STATIC;
|
||||
}
|
||||
return MAPDATA_CPID_2;
|
||||
}
|
||||
|
||||
// Unused
|
||||
s32 func_80109C38(s32 mapCompactId) {
|
||||
if (mapCompactId == -1) {
|
||||
return 0;
|
||||
}
|
||||
switch (MapData_CPID_GetType(mapCompactId)) {
|
||||
case MAPDATA_CPID_MAP_GRAND_STATIC:
|
||||
return MapData_MapGrandTexSizeTest(MAPDATA_GET_MAP_GRAND_ID_FROM_COMPACT_ID(mapCompactId));
|
||||
|
||||
case MAPDATA_CPID_MAP_I_STATIC:
|
||||
return MapData_MapITexSizeTest(mapCompactId);
|
||||
|
||||
case MAPDATA_CPID_2:
|
||||
return 0;
|
||||
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
s32 MapData_CPID_GetSizeOfMapTex(s32 mapCompactId) {
|
||||
if (mapCompactId == -1) {
|
||||
return 0;
|
||||
}
|
||||
switch (MapData_CPID_GetType(mapCompactId)) {
|
||||
case MAPDATA_CPID_MAP_GRAND_STATIC:
|
||||
return MapData_GetSizeOfMapGrandTex(MAPDATA_GET_MAP_GRAND_ID_FROM_COMPACT_ID(mapCompactId));
|
||||
|
||||
case MAPDATA_CPID_MAP_I_STATIC:
|
||||
return MapDisp_GetSizeOfMapITex(mapCompactId);
|
||||
|
||||
case MAPDATA_CPID_2:
|
||||
return 0;
|
||||
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
void MapData_CPID_GetTexDim(s32 mapCompactId, s32* width, s32* height) {
|
||||
if (mapCompactId == -1) {
|
||||
*width = *height = 0;
|
||||
return;
|
||||
}
|
||||
switch (MapData_CPID_GetType(mapCompactId)) {
|
||||
case MAPDATA_CPID_MAP_GRAND_STATIC:
|
||||
MapData_GetMapTexGameplayDangeonKeepDim(MAPDATA_GET_MAP_GRAND_ID_FROM_COMPACT_ID(mapCompactId), width,
|
||||
height);
|
||||
return;
|
||||
|
||||
case MAPDATA_CPID_MAP_I_STATIC:
|
||||
MapData_GetMapITexDim(mapCompactId, width, height);
|
||||
return;
|
||||
|
||||
case MAPDATA_CPID_2:
|
||||
default:
|
||||
*width = *height = 0;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void MapData_CPID_GetTexOffset(s32 mapCompactId, s32* offsetX, s32* offsetY) {
|
||||
if (mapCompactId == -1) {
|
||||
*offsetX = *offsetY = 0;
|
||||
return;
|
||||
}
|
||||
switch (MapData_CPID_GetType(mapCompactId)) {
|
||||
case MAPDATA_CPID_MAP_GRAND_STATIC:
|
||||
MapData_GetMapTexGameplayDangeonKeepOffset(MAPDATA_GET_MAP_GRAND_ID_FROM_COMPACT_ID(mapCompactId), offsetX,
|
||||
offsetY);
|
||||
return;
|
||||
|
||||
case MAPDATA_CPID_MAP_I_STATIC:
|
||||
MapData_GetMapITexOffset(mapCompactId, offsetX, offsetY);
|
||||
return;
|
||||
|
||||
case MAPDATA_CPID_2:
|
||||
default:
|
||||
*offsetX = *offsetY = 0;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Unused
|
||||
void MapData_CPID_GetDrawType(s32 mapCompactId, s32* drawType) {
|
||||
if (mapCompactId == -1) {
|
||||
*drawType = MAPDATA_DRAW_0;
|
||||
return;
|
||||
}
|
||||
switch (MapData_CPID_GetType(mapCompactId)) {
|
||||
case MAPDATA_CPID_MAP_GRAND_STATIC:
|
||||
MapData_GetMapGrandDrawType(MAPDATA_GET_MAP_GRAND_ID_FROM_COMPACT_ID(mapCompactId), drawType);
|
||||
return;
|
||||
|
||||
case MAPDATA_CPID_MAP_I_STATIC:
|
||||
MapData_GetMapIDrawType(mapCompactId, drawType);
|
||||
return;
|
||||
|
||||
case MAPDATA_CPID_2:
|
||||
default:
|
||||
*drawType = MAPDATA_DRAW_0;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Unused
|
||||
u8 MapData_CPID_GetMapColorIndex(s32 mapCompactId) {
|
||||
if (mapCompactId == -1) {
|
||||
return 0;
|
||||
}
|
||||
switch (MapData_CPID_GetType(mapCompactId)) {
|
||||
case MAPDATA_CPID_MAP_GRAND_STATIC:
|
||||
return MapData_GetMapGrandColorIndex(MAPDATA_GET_MAP_GRAND_ID_FROM_COMPACT_ID(mapCompactId));
|
||||
|
||||
case MAPDATA_CPID_MAP_I_STATIC:
|
||||
return MapData_GetMapIColorIndex(mapCompactId);
|
||||
|
||||
case MAPDATA_CPID_2:
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
s16 MapData_CPID_GetMapScale(s32 mapCompactId) {
|
||||
if (mapCompactId == -1) {
|
||||
return 0;
|
||||
}
|
||||
switch (MapData_CPID_GetType(mapCompactId)) {
|
||||
case MAPDATA_CPID_MAP_GRAND_STATIC:
|
||||
return MapData_GetMapGrandScale(MAPDATA_GET_MAP_GRAND_ID_FROM_COMPACT_ID(mapCompactId));
|
||||
|
||||
case MAPDATA_CPID_MAP_I_STATIC:
|
||||
return MapData_GetMapIScale(mapCompactId);
|
||||
|
||||
case MAPDATA_CPID_2:
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
+1773
-54
File diff suppressed because it is too large
Load Diff
+127
-102
@@ -1,19 +1,26 @@
|
||||
#include "global.h"
|
||||
|
||||
s16 sMinimapInitPosX = 0;
|
||||
s16 sMinimapInitPosZ = 0;
|
||||
s16 sMinimapInitDir = 0;
|
||||
|
||||
s32 sDungeonAndBossSceneIds[] = {
|
||||
SCENE_MITURIN, SCENE_HAKUGIN, SCENE_SEA, SCENE_INISIE_N, SCENE_INISIE_R,
|
||||
SCENE_MITURIN_BS, SCENE_HAKUGIN_BS, SCENE_SEA_BS, SCENE_INISIE_BS,
|
||||
};
|
||||
s16 sPlayerInitPosX = 0;
|
||||
s16 sPlayerInitPosZ = 0;
|
||||
s16 sPlayerInitDir = 0;
|
||||
|
||||
/**
|
||||
* If the current scene is a dungeon or boss scene, this function returns an index
|
||||
* indicating which one it is. Otherwise, it returns -1.
|
||||
* Gets the mapIndex for the current dungeon scene
|
||||
* @return the current scene's DungeonSceneIndex, or -1 if it isn't a dungeon or boss scene.
|
||||
*/
|
||||
s32 Map_GetDungeonOrBossAreaIndex(PlayState* play) {
|
||||
s32 Map_GetDungeonSceneIndex(PlayState* play) {
|
||||
static s32 sDungeonAndBossSceneIds[] = {
|
||||
SCENE_MITURIN, // DUNGEON_SCENE_INDEX_WOODFALL_TEMPLE
|
||||
SCENE_HAKUGIN, // DUNGEON_SCENE_INDEX_SNOWHEAD_TEMPLE
|
||||
SCENE_SEA, // DUNGEON_SCENE_INDEX_GREAT_BAY_TEMPLE
|
||||
SCENE_INISIE_N, // DUNGEON_SCENE_INDEX_STONE_TOWER_TEMPLE
|
||||
SCENE_INISIE_R, // Play_GetOriginalSceneId converts play->sceneId to SCENE_INISIE_N, returning
|
||||
// DUNGEON_SCENE_INDEX_STONE_TOWER_TEMPLE
|
||||
SCENE_MITURIN_BS, // DUNGEON_SCENE_INDEX_WOODFALL_TEMPLE_BOSS
|
||||
SCENE_HAKUGIN_BS, // DUNGEON_SCENE_INDEX_SNOWHEAD_TEMPLE_BOSS
|
||||
SCENE_SEA_BS, // DUNGEON_SCENE_INDEX_GREAT_BAY_TEMPLE_BOSS
|
||||
SCENE_INISIE_BS, // DUNGEON_SCENE_INDEX_STONE_TOWER_TEMPLE_BOSS
|
||||
};
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < ARRAY_COUNT(sDungeonAndBossSceneIds); i++) {
|
||||
@@ -26,33 +33,38 @@ s32 Map_GetDungeonOrBossAreaIndex(PlayState* play) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if the current scene is a dungeon or boss scene, false otherwise.
|
||||
* Tests if the current scene is in a dungeon or boss scene.
|
||||
* @return true if the current scene is a dungeon or boss scene, false otherwise.
|
||||
*/
|
||||
s32 Map_IsInDungeonOrBossArea(PlayState* play) {
|
||||
if (Map_GetDungeonOrBossAreaIndex(play) == -1) {
|
||||
s32 Map_IsInDungeonOrBossScene(PlayState* play) {
|
||||
if (Map_GetDungeonSceneIndex(play) == -1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
s32 func_8010A0A4(PlayState* play) {
|
||||
if ((Map_GetDungeonOrBossAreaIndex(play) == -1) || !func_80102EF0(play)) {
|
||||
s32 Map_CurRoomHasMapI(PlayState* play) {
|
||||
if ((Map_GetDungeonSceneIndex(play) == -1) || !MapDisp_CurRoomHasMapI(play)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
s32 sDungeonSceneIds[] = {
|
||||
SCENE_MITURIN, SCENE_HAKUGIN, SCENE_SEA, SCENE_INISIE_N, SCENE_INISIE_R,
|
||||
};
|
||||
|
||||
/**
|
||||
* If the current scene is a dungeon scene, this function returns an index
|
||||
* indicating which one it is. Otherwise, it returns -1.
|
||||
* Tests if the current scene is a dungeon scene, excluding boss scenes.
|
||||
* @return -1 if not a dungeon scene, else returns the DungeonSceneIndex of the dungeon scene
|
||||
*/
|
||||
s32 Map_GetDungeonAreaIndex(PlayState* play) {
|
||||
s32 Map_GetDungeonSceneIndexForDungeon(PlayState* play) {
|
||||
static s32 sDungeonSceneIds[] = {
|
||||
SCENE_MITURIN, // DUNGEON_SCENE_INDEX_WOODFALL_TEMPLE
|
||||
SCENE_HAKUGIN, // DUNGEON_SCENE_INDEX_SNOWHEAD_TEMPLE
|
||||
SCENE_SEA, // DUNGEON_SCENE_INDEX_GREAT_BAY_TEMPLE
|
||||
SCENE_INISIE_N, // DUNGEON_SCENE_INDEX_STONE_TOWER_TEMPLE
|
||||
SCENE_INISIE_R, // Play_GetOriginalSceneId converts play->sceneId to SCENE_INISIE_N, returning
|
||||
// DUNGEON_SCENE_INDEX_STONE_TOWER_TEMPLE
|
||||
};
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < ARRAY_COUNT(sDungeonSceneIds); i++) {
|
||||
@@ -65,28 +77,29 @@ s32 Map_GetDungeonAreaIndex(PlayState* play) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if the current scene is a dungeon scene, false otherwise.
|
||||
* Test if the current scene is a dungeon scene, excluding boss rooms
|
||||
* @return true if the current scene is a dungeon scene, false otherwise.
|
||||
*/
|
||||
s32 Map_IsInDungeonArea(PlayState* play) {
|
||||
if (Map_GetDungeonAreaIndex(play) == -1) {
|
||||
s32 Map_IsInDungeonScene(PlayState* play) {
|
||||
if (Map_GetDungeonSceneIndexForDungeon(play) == -1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
s32 sBossSceneIds[] = {
|
||||
SCENE_MITURIN_BS, // DUNGEON_INDEX_WOODFALL_TEMPLE
|
||||
SCENE_HAKUGIN_BS, // DUNGEON_INDEX_SNOWHEAD_TEMPLE
|
||||
SCENE_SEA_BS, // DUNGEON_INDEX_GREAT_BAY_TEMPLE
|
||||
SCENE_INISIE_BS, // DUNGEON_INDEX_STONE_TOWER_TEMPLE
|
||||
};
|
||||
|
||||
/**
|
||||
* If the current scene is a boss scene, this function returns an index
|
||||
* indicating which one it is. Otherwise, it returns -1.
|
||||
* Tests if the current scene is a boss scene.
|
||||
* @return -1 if not a boss scene, else returns the DungeonSceneIndex corresponding to that boss scene's primary dungeon
|
||||
* scene
|
||||
*/
|
||||
s32 Map_GetBossAreaIndex(PlayState* play) {
|
||||
s32 Map_GetDungeonSceneIndexForBoss(PlayState* play) {
|
||||
static s32 sBossSceneIds[] = {
|
||||
SCENE_MITURIN_BS, // DUNGEON_SCENE_INDEX_WOODFALL_TEMPLE
|
||||
SCENE_HAKUGIN_BS, // DUNGEON_SCENE_INDEX_SNOWHEAD_TEMPLE
|
||||
SCENE_SEA_BS, // DUNGEON_SCENE_INDEX_GREAT_BAY_TEMPLE
|
||||
SCENE_INISIE_BS, // DUNGEON_SCENE_INDEX_STONE_TOWER_TEMPLE
|
||||
};
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < ARRAY_COUNT(sBossSceneIds); i++) {
|
||||
@@ -99,36 +112,11 @@ s32 Map_GetBossAreaIndex(PlayState* play) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if the current scene is a boss scene, false otherwise.
|
||||
* Checks if the current scene is a boss scene.
|
||||
* @return true if the current scene is a boss scene, false otherwise.
|
||||
*/
|
||||
s32 Map_IsInBossArea(PlayState* play) {
|
||||
if (Map_GetBossAreaIndex(play) == -1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
s32 D_801BF5A4[] = {
|
||||
SCENE_22DEKUCITY,
|
||||
SCENE_KOEPONARACE,
|
||||
SCENE_F01,
|
||||
};
|
||||
|
||||
s32 func_8010A238(PlayState* play) {
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < ARRAY_COUNT(D_801BF5A4); i++) {
|
||||
if (Play_GetOriginalSceneId(play->sceneId) == D_801BF5A4[i]) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
s32 func_8010A2AC(PlayState* play) {
|
||||
if (func_8010A238(play) == -1) {
|
||||
s32 Map_IsInBossScene(PlayState* play) {
|
||||
if (Map_GetDungeonSceneIndexForBoss(play) == -1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -136,29 +124,65 @@ s32 func_8010A2AC(PlayState* play) {
|
||||
}
|
||||
|
||||
/**
|
||||
* When a room is loaded, this function is used to save the player's position and rotation
|
||||
* so that the red arrow on the minimap can be drawn correctly.
|
||||
* Intended to check if the current scene is an overworld scene with a minimap.
|
||||
* The implementation is incomplete due to a complete rewrite of z_map_exp.c and other map systems, making the function
|
||||
* obsolete.
|
||||
* @return -1 if not in the list, else returns the MapIndex for the overworld scene
|
||||
*/
|
||||
void Minimap_SavePlayerRoomInitInfo(PlayState* play) {
|
||||
s32 Map_GetMapIndexForOverworld(PlayState* play) {
|
||||
static s32 sSceneIds[] = {
|
||||
SCENE_22DEKUCITY,
|
||||
SCENE_KOEPONARACE,
|
||||
SCENE_F01,
|
||||
};
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < ARRAY_COUNT(sSceneIds); i++) {
|
||||
if (Play_GetOriginalSceneId(play->sceneId) == sSceneIds[i]) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Intended to check if the current scene is an overworld scene with a minimap.
|
||||
* The implementation is incomplete due to a complete rewrite of z_map_exp.c and other map systems, making the function
|
||||
* obsolete.
|
||||
* @return true if the current scene is in the set, false otherwise.
|
||||
*/
|
||||
s32 Map_IsInOverworldSceneWithMapIndex(PlayState* play) {
|
||||
if (Map_GetMapIndexForOverworld(play) == -1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the position and rotation of where the player has entered the area.
|
||||
* Used to draw the red marker on the minimap.
|
||||
*/
|
||||
void Map_SetAreaEntrypoint(PlayState* play) {
|
||||
Player* player = GET_PLAYER(play);
|
||||
|
||||
sMinimapInitPosX = player->actor.world.pos.x;
|
||||
sMinimapInitPosZ = player->actor.world.pos.z;
|
||||
sMinimapInitDir = (0x7FFF - player->actor.shape.rot.y) / 0x400;
|
||||
sPlayerInitPosX = player->actor.world.pos.x;
|
||||
sPlayerInitPosZ = player->actor.world.pos.z;
|
||||
sPlayerInitDir = (0x7FFF - player->actor.shape.rot.y) / 0x400;
|
||||
}
|
||||
|
||||
void Map_InitRoomData(PlayState* play, s16 room) {
|
||||
s32 mapIndex = gSaveContext.mapIndex;
|
||||
InterfaceContext* interfaceCtx = &play->interfaceCtx;
|
||||
|
||||
func_80105C40(room);
|
||||
MapDisp_SwapRooms(room);
|
||||
|
||||
if (room >= 0) {
|
||||
if (Map_IsInDungeonOrBossArea(play)) {
|
||||
gSaveContext.save.saveInfo.permanentSceneFlags[Play_GetOriginalSceneId(play->sceneId)].rooms |=
|
||||
gBitFlags[room];
|
||||
if (Map_IsInDungeonOrBossScene(play)) {
|
||||
SET_ROOM_VISITED(Play_GetOriginalSceneId(play->sceneId), room);
|
||||
interfaceCtx->mapRoomNum = room;
|
||||
interfaceCtx->dungeonOrBossAreaMapIndex = mapIndex;
|
||||
interfaceCtx->dungeonSceneIndex = mapIndex;
|
||||
}
|
||||
} else {
|
||||
interfaceCtx->mapRoomNum = 0;
|
||||
@@ -170,50 +194,52 @@ void Map_InitRoomData(PlayState* play, s16 room) {
|
||||
}
|
||||
|
||||
void Map_Destroy(PlayState* play) {
|
||||
func_80105A40(play);
|
||||
MapDisp_Destroy(play);
|
||||
}
|
||||
|
||||
void Map_Init(PlayState* play) {
|
||||
InterfaceContext* interfaceCtx = &play->interfaceCtx;
|
||||
s32 dungeonIndex;
|
||||
s32 dungeonSceneSharedIndex;
|
||||
|
||||
func_80105C40(play->roomCtx.curRoom.num);
|
||||
MapDisp_SwapRooms(play->roomCtx.curRoom.num);
|
||||
interfaceCtx->unk_278 = -1;
|
||||
interfaceCtx->dungeonOrBossAreaMapIndex = -1;
|
||||
interfaceCtx->dungeonSceneIndex = -1;
|
||||
interfaceCtx->mapSegment = THA_AllocTailAlign16(&play->state.tha, 0x1000);
|
||||
if (func_8010A2AC(play)) {
|
||||
gSaveContext.mapIndex = func_8010A238(play);
|
||||
|
||||
//! This block does pretty much nothing, as z_map_exp.c and other map systems were heavily rewritten after OoT to no
|
||||
//! longer need mapIndex to retrieve minimap data.
|
||||
if (Map_IsInOverworldSceneWithMapIndex(play)) {
|
||||
gSaveContext.mapIndex = Map_GetMapIndexForOverworld(play);
|
||||
return;
|
||||
}
|
||||
|
||||
if (Map_IsInDungeonOrBossArea(play)) {
|
||||
dungeonIndex = Map_GetDungeonOrBossAreaIndex(play);
|
||||
gSaveContext.mapIndex = dungeonIndex;
|
||||
if (Map_IsInDungeonOrBossScene(play)) {
|
||||
gSaveContext.mapIndex = dungeonSceneSharedIndex = Map_GetDungeonSceneIndex(play);
|
||||
switch (play->sceneId) {
|
||||
case SCENE_MITURIN_BS:
|
||||
dungeonIndex = DUNGEON_INDEX_WOODFALL_TEMPLE;
|
||||
dungeonSceneSharedIndex = DUNGEON_SCENE_INDEX_WOODFALL_TEMPLE;
|
||||
break;
|
||||
|
||||
case SCENE_HAKUGIN_BS:
|
||||
dungeonIndex = DUNGEON_INDEX_SNOWHEAD_TEMPLE;
|
||||
dungeonSceneSharedIndex = DUNGEON_SCENE_INDEX_SNOWHEAD_TEMPLE;
|
||||
break;
|
||||
|
||||
case SCENE_SEA_BS:
|
||||
dungeonIndex = DUNGEON_INDEX_GREAT_BAY_TEMPLE;
|
||||
dungeonSceneSharedIndex = DUNGEON_SCENE_INDEX_GREAT_BAY_TEMPLE;
|
||||
break;
|
||||
|
||||
case SCENE_INISIE_BS:
|
||||
dungeonIndex = DUNGEON_INDEX_STONE_TOWER_TEMPLE;
|
||||
dungeonSceneSharedIndex = DUNGEON_SCENE_INDEX_STONE_TOWER_TEMPLE;
|
||||
break;
|
||||
}
|
||||
|
||||
gSaveContext.dungeonIndex = dungeonIndex;
|
||||
gSaveContext.dungeonSceneSharedIndex = dungeonSceneSharedIndex;
|
||||
Map_InitRoomData(play, play->roomCtx.curRoom.num);
|
||||
}
|
||||
}
|
||||
|
||||
void Minimap_Draw(PlayState* play) {
|
||||
func_80106644(play, sMinimapInitPosX, sMinimapInitPosZ, sMinimapInitDir);
|
||||
void Map_DrawMinimap(PlayState* play) {
|
||||
MapDisp_DrawMinimap(play, sPlayerInitPosX, sPlayerInitPosZ, sPlayerInitDir);
|
||||
}
|
||||
|
||||
s16 sLastRoomNum = 99;
|
||||
@@ -227,7 +253,7 @@ void Map_Update(PlayState* play) {
|
||||
s32 pad2;
|
||||
|
||||
if ((play->pauseCtx.state <= PAUSE_STATE_OPENING_2) && (CHECK_BTN_ALL(controller->press.button, BTN_L)) &&
|
||||
!Play_InCsMode(play) && !func_80106530(play)) {
|
||||
!Play_InCsMode(play) && !MapDisp_IsMinimapToggleBlocked(play)) {
|
||||
if (!R_MINIMAP_DISABLED) {
|
||||
Audio_PlaySfx(NA_SE_SY_CAMERA_ZOOM_UP);
|
||||
} else {
|
||||
@@ -237,22 +263,21 @@ void Map_Update(PlayState* play) {
|
||||
R_MINIMAP_DISABLED ^= 1;
|
||||
}
|
||||
|
||||
func_80105B34(play);
|
||||
MapDisp_Update(play);
|
||||
|
||||
if (!IS_PAUSED(&play->pauseCtx)) {
|
||||
if (Map_IsInDungeonArea(play)) {
|
||||
floor = func_80109124(player->actor.world.pos.y);
|
||||
if (Map_IsInDungeonScene(play)) {
|
||||
floor = MapDisp_GetPlayerStorey(player->actor.world.pos.y);
|
||||
if (floor != -1) {
|
||||
gSaveContext.save.saveInfo.permanentSceneFlags[Play_GetOriginalSceneId(play->sceneId)].unk_14 |=
|
||||
gBitFlags[FLOOR_INDEX_MAX - floor];
|
||||
R_REVERSE_FLOOR_INDEX = FLOOR_INDEX_MAX - floor;
|
||||
SET_DUNGEON_FLOOR_VISITED(Play_GetOriginalSceneId(play->sceneId), FLOOR_INDEX_MAX - floor);
|
||||
R_PLAYER_FLOOR_REVERSE_INDEX = FLOOR_INDEX_MAX - floor;
|
||||
if (interfaceCtx->mapRoomNum != sLastRoomNum) {
|
||||
sLastRoomNum = interfaceCtx->mapRoomNum;
|
||||
}
|
||||
}
|
||||
} else if (Map_IsInBossArea(play)) {
|
||||
func_80105294();
|
||||
R_REVERSE_FLOOR_INDEX = FLOOR_INDEX_MAX - func_80105318();
|
||||
} else if (Map_IsInBossScene(play)) {
|
||||
MapDisp_GetBossIconY();
|
||||
R_PLAYER_FLOOR_REVERSE_INDEX = FLOOR_INDEX_MAX - MapDisp_GetBossRoomStorey();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+15
-13
@@ -930,21 +930,22 @@ void Message_DrawItemIcon(PlayState* play, Gfx** gfxP) {
|
||||
} else if (msgCtx->itemId == ITEM_STRAY_FAIRIES) {
|
||||
msgCtx->unk12016 = 0x18;
|
||||
gDPPipeSync(gfx++);
|
||||
gDPSetPrimColor(gfx++, 0, 0, sStrayFairyIconPrimColors[((void)0, gSaveContext.dungeonIndex)].r,
|
||||
sStrayFairyIconPrimColors[((void)0, gSaveContext.dungeonIndex)].g,
|
||||
sStrayFairyIconPrimColors[((void)0, gSaveContext.dungeonIndex)].b, msgCtx->textColorAlpha);
|
||||
gDPSetEnvColor(gfx++, sStrayFairyIconEnvColors[((void)0, gSaveContext.dungeonIndex)].r,
|
||||
sStrayFairyIconEnvColors[((void)0, gSaveContext.dungeonIndex)].g,
|
||||
sStrayFairyIconEnvColors[((void)0, gSaveContext.dungeonIndex)].b, 0);
|
||||
gDPSetPrimColor(gfx++, 0, 0, sStrayFairyIconPrimColors[((void)0, gSaveContext.dungeonSceneSharedIndex)].r,
|
||||
sStrayFairyIconPrimColors[((void)0, gSaveContext.dungeonSceneSharedIndex)].g,
|
||||
sStrayFairyIconPrimColors[((void)0, gSaveContext.dungeonSceneSharedIndex)].b,
|
||||
msgCtx->textColorAlpha);
|
||||
gDPSetEnvColor(gfx++, sStrayFairyIconEnvColors[((void)0, gSaveContext.dungeonSceneSharedIndex)].r,
|
||||
sStrayFairyIconEnvColors[((void)0, gSaveContext.dungeonSceneSharedIndex)].g,
|
||||
sStrayFairyIconEnvColors[((void)0, gSaveContext.dungeonSceneSharedIndex)].b, 0);
|
||||
gDPLoadTextureBlock_4b(gfx++, gStrayFairyGlowingCircleIconTex, G_IM_FMT_I, 32, 24, 0, G_TX_NOMIRROR | G_TX_WRAP,
|
||||
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
|
||||
gSPTextureRectangle(gfx++, msgCtx->unk12010 << 2, msgCtx->unk12012 << 2,
|
||||
(msgCtx->unk12010 + msgCtx->unk12014) << 2, (msgCtx->unk12012 + msgCtx->unk12016) << 2,
|
||||
G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
|
||||
gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, msgCtx->textColorAlpha);
|
||||
gDPLoadTextureBlock(gfx++, sStrayFairyIconTextures[((void)0, gSaveContext.dungeonIndex)], G_IM_FMT_RGBA,
|
||||
G_IM_SIZ_32b, 32, 24, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
|
||||
G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
|
||||
gDPLoadTextureBlock(gfx++, sStrayFairyIconTextures[((void)0, gSaveContext.dungeonSceneSharedIndex)],
|
||||
G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 24, 0, G_TX_NOMIRROR | G_TX_WRAP,
|
||||
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
|
||||
} else if ((msgCtx->itemId >= ITEM_SONG_SONATA) && (msgCtx->itemId <= ITEM_SONG_SUN)) {
|
||||
index = msgCtx->itemId - ITEM_SONG_SONATA;
|
||||
gDPSetPrimColor(gfx++, 0, 0, D_801CFE04[index], D_801CFE1C[index], D_801CFE34[index], msgCtx->textColorAlpha);
|
||||
@@ -2134,7 +2135,7 @@ void Message_LoadOwlWarpText(PlayState* play, s32* offset, f32* arg2, s16* decod
|
||||
s16 owlWarpId;
|
||||
s16 i;
|
||||
|
||||
if (func_8010A0A4(play) || (play->sceneId == SCENE_SECOM)) {
|
||||
if (Map_CurRoomHasMapI(play) || (play->sceneId == SCENE_SECOM)) {
|
||||
owlWarpId = OWL_WARP_ENTRANCE;
|
||||
} else {
|
||||
owlWarpId = pauseCtx->cursorPoint[PAUSE_WORLD_MAP];
|
||||
@@ -2463,7 +2464,8 @@ void Message_Decode(PlayState* play) {
|
||||
Message_LoadTime(play, curChar, &charTexIndex, &spC0, &decodedBufPos);
|
||||
} else if (curChar == 0x21C) {
|
||||
digits[0] = digits[1] = 0;
|
||||
digits[2] = gSaveContext.save.saveInfo.inventory.strayFairies[(void)0, gSaveContext.dungeonIndex];
|
||||
digits[2] =
|
||||
gSaveContext.save.saveInfo.inventory.strayFairies[(void)0, gSaveContext.dungeonSceneSharedIndex];
|
||||
|
||||
while (digits[2] >= 100) {
|
||||
digits[0]++;
|
||||
@@ -3121,7 +3123,7 @@ void Message_OpenText(PlayState* play, u16 textId) {
|
||||
if (msgCtx) {}
|
||||
textId = 0xC9;
|
||||
} else if (textId == 0x11) {
|
||||
if (gSaveContext.save.saveInfo.inventory.strayFairies[((void)0, gSaveContext.dungeonIndex)] == 0xF) {
|
||||
if (gSaveContext.save.saveInfo.inventory.strayFairies[((void)0, gSaveContext.dungeonSceneSharedIndex)] == 0xF) {
|
||||
textId = 0xF3;
|
||||
}
|
||||
} else if ((textId == 0x92) && (play->sceneId == SCENE_KOEPONARACE)) {
|
||||
@@ -5687,7 +5689,7 @@ void Message_Update(PlayState* play) {
|
||||
|
||||
if (sLastPlayedSong == OCARINA_SONG_SOARING) {
|
||||
if (interfaceCtx->restrictions.songOfSoaring == 0) {
|
||||
if (func_8010A0A4(play) || (play->sceneId == SCENE_SECOM)) {
|
||||
if (Map_CurRoomHasMapI(play) || (play->sceneId == SCENE_SECOM)) {
|
||||
Message_StartTextbox(play, 0x1B93, NULL);
|
||||
play->msgCtx.ocarinaMode = OCARINA_MODE_1B;
|
||||
sLastPlayedSong = 0xFF;
|
||||
|
||||
@@ -280,7 +280,7 @@ void Message_LoadOwlWarpTextNES(PlayState* play, s32* offset, f32* arg2, s16* de
|
||||
s16 owlWarpId;
|
||||
s16 stringLimit;
|
||||
|
||||
if (func_8010A0A4(play) || (play->sceneId == SCENE_SECOM)) {
|
||||
if (Map_CurRoomHasMapI(play) || (play->sceneId == SCENE_SECOM)) {
|
||||
owlWarpId = OWL_WARP_ENTRANCE;
|
||||
} else {
|
||||
owlWarpId = play->pauseCtx.cursorPoint[PAUSE_WORLD_MAP];
|
||||
@@ -1310,7 +1310,8 @@ void Message_DecodeNES(PlayState* play) {
|
||||
Message_LoadTimeNES(play, curChar, &charTexIndex, &spA4, &decodedBufPos);
|
||||
} else if (curChar == MESSAGE_STRAY_FAIRIES) {
|
||||
digits[0] = digits[1] = 0;
|
||||
digits[2] = gSaveContext.save.saveInfo.inventory.strayFairies[(void)0, gSaveContext.dungeonIndex];
|
||||
digits[2] =
|
||||
gSaveContext.save.saveInfo.inventory.strayFairies[(void)0, gSaveContext.dungeonSceneSharedIndex];
|
||||
|
||||
while (digits[2] >= 100) {
|
||||
digits[0]++;
|
||||
@@ -1332,18 +1333,24 @@ void Message_DecodeNES(PlayState* play) {
|
||||
}
|
||||
}
|
||||
|
||||
if ((gSaveContext.save.saveInfo.inventory.strayFairies[(void)0, gSaveContext.dungeonIndex] == 1) ||
|
||||
(gSaveContext.save.saveInfo.inventory.strayFairies[(void)0, gSaveContext.dungeonIndex] == 21)) {
|
||||
if ((gSaveContext.save.saveInfo.inventory.strayFairies[(void)0, gSaveContext.dungeonSceneSharedIndex] ==
|
||||
1) ||
|
||||
(gSaveContext.save.saveInfo.inventory.strayFairies[(void)0, gSaveContext.dungeonSceneSharedIndex] ==
|
||||
21)) {
|
||||
Message_LoadCharNES(play, 's', &charTexIndex, &spA4, decodedBufPos);
|
||||
decodedBufPos++;
|
||||
Message_LoadCharNES(play, 't', &charTexIndex, &spA4, decodedBufPos);
|
||||
} else if ((gSaveContext.save.saveInfo.inventory.strayFairies[(void)0, gSaveContext.dungeonIndex] == 2) ||
|
||||
(gSaveContext.save.saveInfo.inventory.strayFairies[(void)0, gSaveContext.dungeonIndex] == 22)) {
|
||||
} else if ((gSaveContext.save.saveInfo.inventory
|
||||
.strayFairies[(void)0, gSaveContext.dungeonSceneSharedIndex] == 2) ||
|
||||
(gSaveContext.save.saveInfo.inventory
|
||||
.strayFairies[(void)0, gSaveContext.dungeonSceneSharedIndex] == 22)) {
|
||||
Message_LoadCharNES(play, 'n', &charTexIndex, &spA4, decodedBufPos);
|
||||
decodedBufPos++;
|
||||
Message_LoadCharNES(play, 'd', &charTexIndex, &spA4, decodedBufPos);
|
||||
} else if ((gSaveContext.save.saveInfo.inventory.strayFairies[(void)0, gSaveContext.dungeonIndex] == 3) ||
|
||||
(gSaveContext.save.saveInfo.inventory.strayFairies[(void)0, gSaveContext.dungeonIndex] == 23)) {
|
||||
} else if ((gSaveContext.save.saveInfo.inventory
|
||||
.strayFairies[(void)0, gSaveContext.dungeonSceneSharedIndex] == 3) ||
|
||||
(gSaveContext.save.saveInfo.inventory
|
||||
.strayFairies[(void)0, gSaveContext.dungeonSceneSharedIndex] == 23)) {
|
||||
Message_LoadCharNES(play, 'r', &charTexIndex, &spA4, decodedBufPos);
|
||||
decodedBufPos++;
|
||||
Message_LoadCharNES(play, 'd', &charTexIndex, &spA4, decodedBufPos);
|
||||
|
||||
@@ -6428,7 +6428,7 @@ void Interface_Draw(PlayState* play) {
|
||||
}
|
||||
|
||||
Magic_DrawMeter(play);
|
||||
Minimap_Draw(play);
|
||||
Map_DrawMinimap(play);
|
||||
|
||||
if ((R_PAUSE_BG_PRERENDER_STATE != 2) && (R_PAUSE_BG_PRERENDER_STATE != 3)) {
|
||||
Target_Draw(&play->actorCtx.targetCtx, play);
|
||||
|
||||
+2
-2
@@ -1575,7 +1575,7 @@ void Play_InitScene(PlayState* this, s32 spawn) {
|
||||
this->numSetupActors = 0;
|
||||
Object_InitContext(&this->state, &this->objectCtx);
|
||||
LightContext_Init(this, &this->lightCtx);
|
||||
Door_InitContext(&this->state, &this->doorCtx);
|
||||
Scene_ResetTransitionActorList(&this->state, &this->transitionActors);
|
||||
Room_Init(this, &this->roomCtx);
|
||||
gSaveContext.worldMapArea = 0;
|
||||
Scene_ExecuteCommands(this, this->sceneSegment);
|
||||
@@ -1975,7 +1975,7 @@ s32 func_8016A02C(GameState* thisx, Actor* actor, s16* yaw) {
|
||||
return false;
|
||||
}
|
||||
|
||||
transitionActor = &this->doorCtx.transitionActorList[(u16)actor->params >> 10];
|
||||
transitionActor = &this->transitionActors.list[(u16)actor->params >> 10];
|
||||
frontRoom = transitionActor->sides[0].room;
|
||||
if (frontRoom == transitionActor->sides[1].room) {
|
||||
return false;
|
||||
|
||||
+4
-4
@@ -502,11 +502,11 @@ size_t Room_AllocateAndLoad(PlayState* play, RoomContext* roomCtx) {
|
||||
}
|
||||
}
|
||||
|
||||
if ((u32)play->doorCtx.numTransitionActors != 0) {
|
||||
if ((u32)play->transitionActors.count != 0) {
|
||||
RomFile* roomList = play->roomList;
|
||||
TransitionActorEntry* transitionActor = &play->doorCtx.transitionActorList[0];
|
||||
TransitionActorEntry* transitionActor = &play->transitionActors.list[0];
|
||||
|
||||
for (j = 0; j < play->doorCtx.numTransitionActors; j++) {
|
||||
for (j = 0; j < play->transitionActors.count; j++) {
|
||||
frontRoom = transitionActor->sides[0].room;
|
||||
backRoom = transitionActor->sides[1].room;
|
||||
frontRoomSize = (frontRoom < 0) ? 0 : roomList[frontRoom].vromEnd - roomList[frontRoom].vromStart;
|
||||
@@ -620,7 +620,7 @@ void func_8012EBF8(PlayState* play, RoomContext* roomCtx) {
|
||||
Actor_SpawnTransitionActors(play, &play->actorCtx);
|
||||
if (roomCtx->curRoom.num > -1) {
|
||||
Map_InitRoomData(play, roomCtx->curRoom.num);
|
||||
Minimap_SavePlayerRoomInitInfo(play);
|
||||
Map_SetAreaEntrypoint(play);
|
||||
}
|
||||
Audio_SetEnvReverb(play->roomCtx.curRoom.echo);
|
||||
}
|
||||
|
||||
+16
-16
@@ -334,15 +334,15 @@ void Scene_CommandPathList(PlayState* play, SceneCmd* cmd) {
|
||||
}
|
||||
|
||||
// SceneTableEntry Header Command 0x0E: Transition Actor List
|
||||
void Scene_CommandTransiActorList(PlayState* play, SceneCmd* cmd) {
|
||||
play->doorCtx.numTransitionActors = cmd->transiActorList.num;
|
||||
play->doorCtx.transitionActorList = Lib_SegmentedToVirtual(cmd->transiActorList.segment);
|
||||
func_80105818(play, play->doorCtx.numTransitionActors, play->doorCtx.transitionActorList);
|
||||
void Scene_CommandTransitionActorList(PlayState* play, SceneCmd* cmd) {
|
||||
play->transitionActors.count = cmd->transitionActorList.num;
|
||||
play->transitionActors.list = Lib_SegmentedToVirtual(cmd->transitionActorList.segment);
|
||||
MapDisp_InitTransitionActorData(play, play->transitionActors.count, play->transitionActors.list);
|
||||
}
|
||||
|
||||
// Init function for the transition system.
|
||||
void Door_InitContext(GameState* state, DoorContext* doorCtx) {
|
||||
doorCtx->numTransitionActors = 0;
|
||||
void Scene_ResetTransitionActorList(GameState* state, TransitionActorList* transitionActors) {
|
||||
transitionActors->count = 0;
|
||||
}
|
||||
|
||||
// SceneTableEntry Header Command 0x0F: Environment Light Settings List
|
||||
@@ -495,19 +495,19 @@ void Scene_CommandCutsceneList(PlayState* play, SceneCmd* cmd) {
|
||||
CutsceneManager_Init(play, Lib_SegmentedToVirtual(cmd->cutsceneList.segment), cmd->cutsceneList.num);
|
||||
}
|
||||
|
||||
// SceneTableEntry Header Command 0x1C: Mini Maps
|
||||
void Scene_CommandMiniMap(PlayState* play, SceneCmd* cmd) {
|
||||
func_80104CF4(play);
|
||||
func_8010549C(play, cmd->minimapSettings.segment);
|
||||
// SceneTableEntry Header Command 0x1C: Map Data
|
||||
void Scene_CommandMapData(PlayState* play, SceneCmd* cmd) {
|
||||
MapDisp_Init(play);
|
||||
MapDisp_InitMapData(play, cmd->mapData.segment);
|
||||
}
|
||||
|
||||
// SceneTableEntry Header Command 0x1D: Undefined
|
||||
void Scene_Command1D(PlayState* play, SceneCmd* cmd) {
|
||||
}
|
||||
|
||||
// SceneTableEntry Header Command 0x1E: Minimap Compass Icon Info
|
||||
void Scene_CommandMiniMapCompassInfo(PlayState* play, SceneCmd* cmd) {
|
||||
func_8010565C(play, cmd->minimapChests.num, cmd->minimapChests.segment);
|
||||
// SceneTableEntry Header Command 0x1E: Map Data Chests
|
||||
void Scene_CommandMapDataChests(PlayState* play, SceneCmd* cmd) {
|
||||
MapDisp_InitChestData(play, cmd->mapDataChests.num, cmd->mapDataChests.segment);
|
||||
}
|
||||
|
||||
// SceneTableEntry Header Command 0x19: Sets Region Visited Flag
|
||||
@@ -565,7 +565,7 @@ void (*sSceneCmdHandlers[SCENE_CMD_MAX])(PlayState*, SceneCmd*) = {
|
||||
Scene_CommandObjectList, // SCENE_CMD_ID_OBJECT_LIST
|
||||
Scene_CommandLightList, // SCENE_CMD_ID_LIGHT_LIST
|
||||
Scene_CommandPathList, // SCENE_CMD_ID_PATH_LIST
|
||||
Scene_CommandTransiActorList, // SCENE_CMD_ID_TRANSI_ACTOR_LIST
|
||||
Scene_CommandTransitionActorList, // SCENE_CMD_ID_TRANSI_ACTOR_LIST
|
||||
Scene_CommandEnvLightSettings, // SCENE_CMD_ID_ENV_LIGHT_SETTINGS
|
||||
Scene_CommandTimeSettings, // SCENE_CMD_ID_TIME_SETTINGS
|
||||
Scene_CommandSkyboxSettings, // SCENE_CMD_ID_SKYBOX_SETTINGS
|
||||
@@ -579,9 +579,9 @@ void (*sSceneCmdHandlers[SCENE_CMD_MAX])(PlayState*, SceneCmd*) = {
|
||||
Scene_CommandSetRegionVisitedFlag, // SCENE_CMD_ID_SET_REGION_VISITED
|
||||
Scene_CommandAnimatedMaterials, // SCENE_CMD_ID_ANIMATED_MATERIAL_LIST
|
||||
Scene_CommandCutsceneList, // SCENE_CMD_ID_ACTOR_CUTSCENE_LIST
|
||||
Scene_CommandMiniMap, // SCENE_CMD_ID_MINIMAP_INFO
|
||||
Scene_CommandMapData, // SCENE_CMD_ID_MAP_DATA
|
||||
Scene_Command1D, // SCENE_CMD_ID_UNUSED_1D
|
||||
Scene_CommandMiniMapCompassInfo, // SCENE_CMD_ID_MINIMAP_COMPASS_ICON_INFO
|
||||
Scene_CommandMapDataChests, // SCENE_CMD_ID_MAP_DATA_CHESTS
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user