mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Code Issues Projects Releases Wiki Activity

Set up gc-eu and match all code (#1938)

Browse source 
* Set up gc-eu and match all code

* Format

* Mark gc-eu-mq as WIP until it builds OK

* Move original/MQ map mark data to separate files

* Add #includes to .inc.c files to help out VS Code

* Use #if in spec instead of .inc.c files
This commit is contained in:
cadmic 2024-04-15 10:36:29 -07:00 committed by GitHub
parent 295a8669b8
commit d59ca6cea2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 3850 additions and 272 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -17,6 +17,7 @@ COMPILER := ido
# Target game version. Currently only the following version is supported:
# gc-eu-mq-dbg GameCube Europe/PAL Master Quest Debug (default)
# The following versions are work-in-progress and not yet matching:
# gc-eu GameCube Europe/PAL
# gc-eu-mq GameCube Europe/PAL Master Quest
VERSION := gc-eu-mq-dbg
# Number of threads to extract and compress with
@ -51,10 +52,17 @@ ifeq ($(NON_MATCHING),1)
endif
# Version-specific settings
ifeq ($(VERSION),gc-eu-mq)
ifeq ($(VERSION),gc-eu)
DEBUG := 0
COMPARE := 0
else ifeq ($(VERSION),gc-eu-mq)
DEBUG := 0
CFLAGS += -DOOT_MQ
CPPFLAGS += -DOOT_MQ
else ifeq ($(VERSION),gc-eu-mq-dbg)
DEBUG := 1
CFLAGS += -DOOT_MQ
CPPFLAGS += -DOOT_MQ
else
$(error Unsupported version $(VERSION))
endif

1
baseroms/gc-eu/checksum-compressed.md5 Normal file
View file

@ -0,0 +1 @@
2c27b4e000e85fd78dbca551f1b1c965 build/gc-eu/oot-gc-eu-compressed.z64

1
baseroms/gc-eu/checksum.md5 Normal file
View file

@ -0,0 +1 @@
05d6c0a3528d6de7472e5a98520d9f46 build/gc-eu/oot-gc-eu.z64

1510
baseroms/gc-eu/dmadata_names.txt Normal file
View file

File diff suppressed because it is too large Load diff

1
baseroms/gc-eu/dmadata_start.txt Normal file
View file

@ -0,0 +1 @@
0x07170

8
spec
View file

@ -655,7 +655,11 @@ beginseg
include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.o"
include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.o"
include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.o"
#if !OOT_MQ
include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.o"
#else
include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data_mq.o"
#endif
include "$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/ovl_kaleido_scope_reloc.o"
endseg
@ -669,7 +673,11 @@ endseg
beginseg
name "ovl_map_mark_data"
compress
#if !OOT_MQ
include "$(BUILD_DIR)/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.o"
#else
include "$(BUILD_DIR)/src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.o"
#endif
include "$(BUILD_DIR)/src/overlays/misc/ovl_map_mark_data/ovl_map_mark_data_reloc.o"
endseg

4
src/boot/build.c
View file

@ -3,7 +3,9 @@ const char gBuildTeam[] = "zelda@srd022j";
// TODO: Use per-version preprocessor defines
#if OOT_DEBUG // gc-eu-mq-dbg
const char gBuildDate[] = "03-02-21 00:16:31";
#else // gc-eu-mq
#elif !OOT_MQ // gc-eu
const char gBuildDate[] = "03-02-21 20:12:23";
#else // gc-eu-mq
const char gBuildDate[] = "03-02-21 20:37:19";
#endif

4
src/code/z_scene_table.c
View file

@ -418,7 +418,11 @@ void Scene_DrawConfigWaterTemple(PlayState* play) {
spAC = play->roomCtx.unk_74[1] & 0xFF;
gameplayFrames = play->gameplayFrames;
#if !OOT_MQ
gSPSegment(POLY_XLU_DISP++, 0x06, SEGMENTED_TO_VIRTUAL(D_8012A330[((void)0, gSaveContext.save.nightFlag)]));
#else
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A330[((void)0, gSaveContext.save.nightFlag)]));
#endif
if (spB0 == 1) {
gSPSegment(POLY_OPA_DISP++, 0x08,

57
src/overlays/actors/ovl_En_Mag/z_en_mag.c
View file

@ -76,12 +76,20 @@ void EnMag_Init(Actor* thisx, PlayState* play) {
this->effectPrimLodFrac = 128.0f;
this->effectAlpha = 255.0f;
#if !OOT_MQ
this->effectPrimColor[0] = 255.0f;
this->effectPrimColor[1] = 255.0f;
this->effectPrimColor[2] = 170;
this->effectEnvColor[0] = 255.0f;
this->effectEnvColor[1] = 100;
#else
this->effectPrimColor[0] = 170;
this->effectPrimColor[1] = 255.0f;
this->effectPrimColor[2] = 255.0f;
this->effectEnvColor[0] = 200.0f;
this->effectEnvColor[1] = 255.0f;
this->effectEnvColor[2] = 0;
#endif
gSaveContext.forceRisingButtonAlphas = false;
this->globalState = MAG_STATE_DISPLAY;
@ -121,12 +129,20 @@ void EnMag_Update(Actor* thisx, PlayState* play) {
this->effectPrimLodFrac = 128.0f;
this->effectAlpha = 255.0f;
#if !OOT_MQ
this->effectPrimColor[0] = 255.0f;
this->effectPrimColor[1] = 255.0f;
this->effectPrimColor[2] = 170;
this->effectEnvColor[0] = 255.0f;
this->effectEnvColor[1] = 100;
#else
this->effectPrimColor[0] = 170;
this->effectPrimColor[1] = 255.0f;
this->effectPrimColor[2] = 255.0f;
this->effectEnvColor[0] = 200.0f;
this->effectEnvColor[1] = 255.0f;
this->effectEnvColor[2] = 0;
#endif
this->globalState = MAG_STATE_DISPLAY;
sDelayTimer = 20;
@ -187,8 +203,13 @@ void EnMag_Update(Actor* thisx, PlayState* play) {
this->effectFadeInState = 1;
}
} else if (this->effectFadeInState == 1) {
#if !OOT_MQ
this->effectPrimColor[2] += -2.125f;
this->effectEnvColor[1] += -3.875f;
#else
this->effectPrimColor[0] += -2.125f;
this->effectEnvColor[0] += -1.375f;
#endif
this->effectPrimLodFrac += 2.4f;
@ -197,8 +218,13 @@ void EnMag_Update(Actor* thisx, PlayState* play) {
if (this->effectFadeInTimer == 0) {
this->effectPrimLodFrac = 128.0f;
#if !OOT_MQ
this->effectPrimColor[2] = 170.0f;
this->effectEnvColor[1] = 100.0f;
#else
this->effectPrimColor[0] = 170.0f;
this->effectEnvColor[0] = 200.0f;
#endif
this->effectFadeInTimer = 32;
this->effectFadeInState = 2;
@ -371,6 +397,13 @@ void EnMag_DrawCharTexture(Gfx** gfxP, u8* texture, s32 rectLeft, s32 rectTop) {
*gfxP = gfx;
}
// Title logo is shifted to the left in Master Quest
#if !OOT_MQ
#define LOGO_X_SHIFT 0
#else
#define LOGO_X_SHIFT (-8)
#endif
void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxP) {
static s16 textAlpha = 0;
static s16 textFadeDirection = 0;
@ -413,7 +446,7 @@ void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxP) {
if ((s16)this->effectPrimLodFrac != 0) {
for (k = 0, i = 0, rectTop = 0; i < 3; i++, rectTop += 64) {
for (j = 0, rectLeft = 56; j < 3; j++, k++, rectLeft += 64) {
for (j = 0, rectLeft = 64 + LOGO_X_SHIFT; j < 3; j++, k++, rectLeft += 64) {
EnMag_DrawEffectTextures(&gfx, effectMaskTextures[k], gTitleFlameEffectTex, 64, 64, 32, 32, rectLeft,
rectTop, 64, 64, 1024, 1024, 1, 1, k, this);
}
@ -423,7 +456,7 @@ void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxP) {
gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->mainAlpha);
if ((s16)this->mainAlpha != 0) {
EnMag_DrawImageRGBA32(&gfx, 152, 100, (u8*)gTitleZeldaShieldLogoMQTex, 160, 160);
EnMag_DrawImageRGBA32(&gfx, 160 + LOGO_X_SHIFT, 100, (u8*)gTitleZeldaShieldLogoMQTex, 160, 160);
}
Gfx_SetupDL_39Ptr(&gfx);
@ -440,23 +473,35 @@ void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxP) {
}
gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, (s16)this->mainAlpha);
#if !OOT_MQ
gDPSetEnvColor(gfx++, 100, 0, 100, 255);
#else
gDPSetEnvColor(gfx++, 0, 0, 100, 255);
#endif
if ((s16)this->mainAlpha != 0) {
EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 146, 73, 72, 8, 1024, 1024);
EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 144, 127, 96, 8, 1024, 1024);
EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 154 + LOGO_X_SHIFT, 73, 72, 8, 1024, 1024);
EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 152 + LOGO_X_SHIFT, 127, 96, 8, 1024, 1024);
gDPPipeSync(gfx++);
#if !OOT_MQ
gDPSetPrimColor(gfx++, 0, 0, 200, 200, 150, (s16)this->mainAlpha);
gDPSetEnvColor(gfx++, 100, 100, 50, 255);
#else
gDPSetPrimColor(gfx++, 0, 0, 100, 150, 255, (s16)this->mainAlpha);
gDPSetEnvColor(gfx++, 20, 80, 160, 255);
#endif
EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 145, 72, 72, 8, 1024, 1024);
EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 143, 126, 96, 8, 1024, 1024);
EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 153 + LOGO_X_SHIFT, 72, 72, 8, 1024, 1024);
EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 151 + LOGO_X_SHIFT, 126, 96, 8, 1024, 1024);
#if OOT_MQ
gDPPipeSync(gfx++);
gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->subAlpha);
EnMag_DrawImageRGBA32(&gfx, 174, 145, (u8*)gTitleMasterQuestSubtitleTex, 128, 32);
#endif
}
Gfx_SetupDL_39Ptr(&gfx);

182
src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.c
View file

@ -34,9 +34,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23,
sMarkChestVtx,
4,
1,
2,
{
{ 1, 48.0f, -63.0f },
{ 5, 52.0f, -68.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
@ -58,11 +59,9 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23,
sMarkChestVtx,
4,
3,
1,
{
{ 0, 46.0f, -59.0f },
{ 4, 77.0f, -26.0f },
{ 5, 65.0f, -61.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
@ -86,9 +85,9 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4,
3,
{
{ 2, 55.0f, -36.0f },
{ 3, 54.0f, -51.0f },
{ 5, 13.0f, -61.0f },
{ 10, 25.0f, -41.0f },
{ 4, 53.0f, -47.0f },
{ 6, 58.0f, -59.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
@ -98,11 +97,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23,
sMarkChestVtx,
4,
3,
2,
{
{ 0, 47.0f, -40.0f },
{ 1, 51.0f, -3.0f },
{ 4, 47.0f, -47.0f },
{ 5, 13.0f, -60.0f },
{ 8, 20.0f, -49.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
@ -120,13 +118,11 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23,
sMarkChestVtx,
4,
5,
3,
{
{ 3, 48.0f, -68.0f },
{ 5, 50.0f, -66.0f },
{ 7, 55.0f, -50.0f },
{ 9, 58.0f, 1.0f },
{ 10, 62.0f, -45.0f },
{ 1, 67.0f, -13.0f },
{ 2, 28.0f, -13.0f },
{ 4, 38.0f, 0.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
@ -140,19 +136,6 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
},
// Jabu-Jabu's Belly map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
6,
{
{ 0, 37.0f, -49.0f },
{ 1, 65.0f, -38.0f },
{ 2, 52.0f, -48.0f },
{ 4, 46.0f, -36.0f },
{ 6, 59.0f, -41.0f },
{ 8, 52.0f, -26.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Forest Temple map 0
@ -161,12 +144,13 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23,
sMarkChestVtx,
4,
6,
7,
{
{ 3, 53.0f, -64.0f },
{ 5, 65.0f, -9.0f },
{ 12, 49.0f, -1.0f },
{ 13, 40.0f, 0.0f },
{ 1, 50.0f, -12.0f },
{ 3, 46.0f, -66.0f },
{ 4, 20.0f, -38.0f },
{ 12, 49.0f, -3.0f },
{ 13, 39.0f, 0.0f },
{ 14, 18.0f, -2.0f },
{ 15, 59.0f, 0.0f },
} },
@ -180,10 +164,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4,
4,
{
{ 0, 49.0f, -1.0f },
{ 1, 71.0f, -13.0f },
{ 2, 11.0f, -25.0f },
{ 6, 84.0f, -16.0f },
{ 0, 49.0f, -3.0f },
{ 2, 12.0f, -26.0f },
{ 5, 74.0f, -13.0f },
{ 7, 82.0f, -22.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
@ -195,7 +179,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4,
1,
{
{ 9, 65.0f, -30.0f },
{ 9, 31.0f, -29.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
@ -207,7 +191,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4,
1,
{
{ 11, 41.0f, -24.0f },
{ 11, 40.0f, -41.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
@ -225,9 +209,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23,
sMarkChestVtx,
4,
1,
2,
{
{ 5, 24.0f, -40.0f },
{ 5, 22.0f, -41.0f },
{ 13, 74.0f, -29.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
@ -241,11 +226,14 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23,
sMarkChestVtx,
4,
3,
6,
{
{ 3, 75.0f, -47.0f },
{ 6, 72.0f, -51.0f },
{ 8, 65.0f, -12.0f },
{ 3, 76.0f, -48.0f },
{ 6, 72.0f, -50.0f },
{ 7, 44.0f, -17.0f },
{ 8, 63.0f, -12.0f },
{ 9, 30.0f, -34.0f },
{ 10, 61.0f, -31.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
@ -257,7 +245,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4,
1,
{
{ 11, 78.0f, -35.0f },
{ 11, 78.0f, -34.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
@ -269,11 +257,11 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4,
5,
{
{ 1, 67.0f, -58.0f },
{ 2, 48.0f, -30.0f },
{ 4, 63.0f, -14.0f },
{ 7, 36.0f, -45.0f },
{ 12, 47.0f, -26.0f },
{ 0, 48.0f, -17.0f },
{ 1, 35.0f, -45.0f },
{ 2, 67.0f, -58.0f },
{ 4, 74.0f, -15.0f },
{ 12, 47.0f, -27.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
@ -291,9 +279,11 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23,
sMarkChestVtx,
4,
1,
3,
{
{ 2, 88.0f, -60.0f },
{ 7, 23.0f, -2.0f },
{ 9, 84.0f, -45.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
@ -311,9 +301,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23,
sMarkChestVtx,
4,
1,
2,
{
{ 0, 88.0f, -60.0f },
{ 0, 86.0f, -60.0f },
{ 8, 76.0f, -72.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
@ -323,10 +314,12 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23,
sMarkChestVtx,
4,
2,
4,
{
{ 1, 88.0f, -60.0f },
{ 5, 49.0f, -43.0f },
{ 3, 42.0f, -21.0f },
{ 5, 47.0f, -15.0f },
{ 10, 33.0f, -31.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
@ -338,7 +331,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4,
1,
{
{ 6, 75.0f, -65.0f },
{ 6, 77.0f, -66.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
@ -348,9 +341,10 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23,
sMarkChestVtx,
4,
1,
2,
{
{ 18, 46.0f, -30.0f },
{ 10, 59.0f, -9.0f },
{ 18, 32.0f, -20.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
@ -362,11 +356,11 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4,
5,
{
{ 1, 23.0f, -33.0f },
{ 2, 56.0f, -11.0f },
{ 5, 83.0f, -25.0f },
{ 24, 84.0f, -39.0f },
{ 25, 74.0f, -37.0f },
{ 1, 20.0f, -43.0f },
{ 5, 83.0f, -26.0f },
{ 15, 57.0f, -14.0f },
{ 20, 81.0f, -55.0f },
{ 21, 87.0f, -55.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
@ -384,13 +378,14 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23,
sMarkChestVtx,
4,
5,
6,
{
{ 3, 46.0f, -20.0f },
{ 6, 28.0f, -19.0f },
{ 12, 25.0f, -25.0f },
{ 15, 50.0f, -13.0f },
{ 28, 48.0f, -29.0f },
{ 2, 41.0f, -16.0f },
{ 3, 47.0f, -17.0f },
{ 6, 27.0f, -16.0f },
{ 12, 29.0f, -20.0f },
{ 13, 70.0f, -22.0f },
{ 14, 70.0f, -25.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
@ -400,17 +395,12 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23,
sMarkChestVtx,
4,
9,
4,
{
{ 0, 14.0f, -24.0f },
{ 0, 38.0f, -17.0f },
{ 4, 55.0f, -14.0f },
{ 7, 78.0f, -2.0f },
{ 8, 14.0f, -16.0f },
{ 26, 42.0f, -43.0f },
{ 27, 50.0f, -43.0f },
{ 29, 25.0f, -35.0f },
{ 30, 42.0f, -36.0f },
{ 31, 50.0f, -36.0f },
{ 8, 15.0f, -14.0f },
{ 7, 78.0f, -3.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
@ -449,7 +439,6 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
2,
{
{ 12, 96.0f, -51.0f },
{ 16, 46.0f, -42.0f },
{ 22, 96.0f, -55.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
@ -460,7 +449,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23,
sMarkChestVtx,
4,
12,
10,
{
{ 4, 43.0f, -66.0f },
{ 5, 37.0f, -66.0f },
@ -470,8 +459,6 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
{ 10, 15.0f, -4.0f },
{ 11, 25.0f, -4.0f },
{ 13, 19.0f, -29.0f },
{ 14, 78.0f, -15.0f },
{ 15, 60.0f, -70.0f },
{ 21, 92.0f, -29.0f },
{ 20, 87.0f, -20.0f },
} },
@ -491,15 +478,32 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
23,
sMarkChestVtx,
4,
2,
9,
{
{ 2, 84.0f, -38.0f },
{ 3, 57.0f, -18.0f },
{ 1, 51.0f, -24.0f },
{ 3, 84.0f, -38.0f },
{ 4, 31.0f, -2.0f },
{ 5, 67.0f, -27.0f },
{ 8, 46.0f, -27.0f },
{ 10, 82.0f, -12.0f },
{ 12, 80.0f, -16.0f },
{ 14, 62.0f, -24.0f },
{ 20, 89.0f, -38.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Bottom of the Well map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
3,
{
{ 2, 54.0f, -27.0f },
{ 9, 28.0f, -17.0f },
{ 16, 56.0f, -38.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Bottom of the Well map 2
@ -510,7 +514,7 @@ PauseMapMarksData gPauseMapMarkDataTable[] = {
4,
1,
{
{ 1, 72.0f, -32.0f },
{ 7, 71.0f, -33.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},

531
src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data_mq.c Normal file
View file

@ -0,0 +1,531 @@
#include "z_kaleido_scope.h"
static const Vtx sMarkBossVtx[] = {
VTX(-4, 4, 0, 0, 0, 255, 255, 255, 255),
VTX(-4, -4, 0, 0, 256, 255, 255, 255, 255),
VTX(4, 4, 0, 256, 0, 255, 255, 255, 255),
VTX(4, -4, 0, 256, 256, 255, 255, 255, 255),
};
static const Vtx sMarkChestVtx[] = {
VTX(-4, 4, 0, 0, 0, 255, 255, 255, 255),
VTX(-4, -4, 0, 0, 256, 255, 255, 255, 255),
VTX(4, 4, 0, 256, 0, 255, 255, 255, 255),
VTX(4, -4, 0, 256, 256, 255, 255, 255, 255),
};
PauseMapMarksData gPauseMapMarkDataTable[] = {
// Deku Tree map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
2,
{
{ 2, 40.0f, -33.0f },
{ 6, 49.0f, -42.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Deku Tree map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 1, 48.0f, -63.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Deku Tree map 2
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 3, 84.0f, -39.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Deku Tree map 3
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
3,
{
{ 0, 46.0f, -59.0f },
{ 4, 77.0f, -26.0f },
{ 5, 65.0f, -61.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Deku Tree map 4
{
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 55.0f, 0.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Dodongo's Cavern map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
3,
{
{ 2, 55.0f, -36.0f },
{ 3, 54.0f, -51.0f },
{ 5, 13.0f, -61.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Dodongo's Cavern map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
3,
{
{ 0, 47.0f, -40.0f },
{ 1, 51.0f, -3.0f },
{ 4, 47.0f, -47.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 23.0f, -25.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Jabu-Jabu's Belly map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
5,
{
{ 3, 48.0f, -68.0f },
{ 5, 50.0f, -66.0f },
{ 7, 55.0f, -50.0f },
{ 9, 58.0f, 1.0f },
{ 10, 62.0f, -45.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 65.0f, -37.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Jabu-Jabu's Belly map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
6,
{
{ 0, 37.0f, -49.0f },
{ 1, 65.0f, -38.0f },
{ 2, 52.0f, -48.0f },
{ 4, 46.0f, -36.0f },
{ 6, 59.0f, -41.0f },
{ 8, 52.0f, -26.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Forest Temple map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
6,
{
{ 3, 53.0f, -64.0f },
{ 5, 65.0f, -9.0f },
{ 12, 49.0f, -1.0f },
{ 13, 40.0f, 0.0f },
{ 14, 18.0f, -2.0f },
{ 15, 59.0f, 0.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Forest Temple map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
4,
{
{ 0, 49.0f, -1.0f },
{ 1, 71.0f, -13.0f },
{ 2, 11.0f, -25.0f },
{ 6, 84.0f, -16.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Forest Temple map 2
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 9, 65.0f, -30.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Forest Temple map 3
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 11, 41.0f, -24.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 50.0f, -11.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Fire Temple map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 5, 24.0f, -40.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Fire Temple map 1
{
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Fire Temple map 2
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
3,
{
{ 3, 75.0f, -47.0f },
{ 6, 72.0f, -51.0f },
{ 8, 65.0f, -12.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Fire Temple map 3
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 11, 78.0f, -35.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Fire Temple map 4
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
5,
{
{ 1, 67.0f, -58.0f },
{ 2, 48.0f, -30.0f },
{ 4, 63.0f, -14.0f },
{ 7, 36.0f, -45.0f },
{ 12, 47.0f, -26.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 26.0f, -34.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Water Temple map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 2, 88.0f, -60.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 62.0f, -23.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Water Temple map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 0, 88.0f, -60.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Water Temple map 2
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
2,
{
{ 1, 88.0f, -60.0f },
{ 5, 49.0f, -43.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Water Temple map 3
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 6, 75.0f, -65.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Spirit Temple map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 18, 46.0f, -30.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Spirit Temple map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
5,
{
{ 1, 23.0f, -33.0f },
{ 2, 56.0f, -11.0f },
{ 5, 83.0f, -25.0f },
{ 24, 84.0f, -39.0f },
{ 25, 74.0f, -37.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 47.0f, 0.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Spirit Temple map 2
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
5,
{
{ 3, 46.0f, -20.0f },
{ 6, 28.0f, -19.0f },
{ 12, 25.0f, -25.0f },
{ 15, 50.0f, -13.0f },
{ 28, 48.0f, -29.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Spirit Temple map 3
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
9,
{
{ 0, 14.0f, -24.0f },
{ 4, 55.0f, -14.0f },
{ 7, 78.0f, -2.0f },
{ 8, 14.0f, -16.0f },
{ 26, 42.0f, -43.0f },
{ 27, 50.0f, -43.0f },
{ 29, 25.0f, -35.0f },
{ 30, 42.0f, -36.0f },
{ 31, 50.0f, -36.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Shadow Temple map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
2,
{
{ 1, 41.0f, -17.0f },
{ 7, 27.0f, -24.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Shadow Temple map 1
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
2,
{
{ 2, 81.0f, -20.0f },
{ 3, 74.0f, -37.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Shadow Temple map 2
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
2,
{
{ 12, 96.0f, -51.0f },
{ 16, 46.0f, -42.0f },
{ 22, 96.0f, -55.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Shadow Temple map 3
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
12,
{
{ 4, 43.0f, -66.0f },
{ 5, 37.0f, -66.0f },
{ 6, 33.0f, -72.0f },
{ 8, 85.0f, -18.0f },
{ 9, 61.0f, -42.0f },
{ 10, 15.0f, -4.0f },
{ 11, 25.0f, -4.0f },
{ 13, 19.0f, -29.0f },
{ 14, 78.0f, -15.0f },
{ 15, 60.0f, -70.0f },
{ 21, 92.0f, -29.0f },
{ 20, 87.0f, -20.0f },
} },
{ PAUSE_MAP_MARK_BOSS,
23,
sMarkBossVtx,
4,
1,
{
{ -1, 31.0f, -45.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Bottom of the Well map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
2,
{
{ 2, 84.0f, -38.0f },
{ 3, 57.0f, -18.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Bottom of the Well map 1
{
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Bottom of the Well map 2
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
1,
{
{ 1, 72.0f, -32.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
// Ice Cavern map 0
{
{ PAUSE_MAP_MARK_CHEST,
23,
sMarkChestVtx,
4,
3,
{
{ 0, 66.0f, -2.0f },
{ 1, 77.0f, -46.0f },
{ 2, 27.0f, -45.0f },
} },
{ PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
},
};

361
src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c
View file

@ -17,9 +17,10 @@ static MapMarkData sMapMarkDekuTree[] = {
// Deku Tree minimap 2
{
{ MAP_MARK_CHEST,
1,
2,
{
{ 1, 64, 62 },
{ 5, 71, 69 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -38,12 +39,6 @@ static MapMarkData sMapMarkDekuTree[] = {
},
// Deku Tree minimap 5
{
{ MAP_MARK_CHEST,
2,
{
{ 0, 46, 50 },
{ 5, 76, 52 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Deku Tree minimap 6
@ -91,10 +86,9 @@ static MapMarkData sMapMarkDodongosCavern[] = {
// Dodongo's Cavern minimap 0
{
{ MAP_MARK_CHEST,
2,
1,
{
{ 0, 69, 14 },
{ 4, 69, 30 },
{ 8, 22, 32 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -116,20 +110,10 @@ static MapMarkData sMapMarkDodongosCavern[] = {
},
// Dodongo's Cavern minimap 5
{
{ MAP_MARK_CHEST,
1,
{
{ 5, 54, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Dodongo's Cavern minimap 6
{
{ MAP_MARK_CHEST,
1,
{
{ 2, 69, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Dodongo's Cavern minimap 7
@ -148,9 +132,10 @@ static MapMarkData sMapMarkDodongosCavern[] = {
// Dodongo's Cavern minimap 9
{
{ MAP_MARK_CHEST,
1,
2,
{
{ 3, 59, 53 },
{ 4, 58, 40 },
{ 6, 65, 64 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -172,19 +157,24 @@ static MapMarkData sMapMarkDodongosCavern[] = {
},
// Dodongo's Cavern minimap 14
{
{ MAP_MARK_CHEST,
1,
{
{ 1, 68, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Dodongo's Cavern minimap 15
{
{ MAP_MARK_CHEST,
1,
{
{ 5, 68, 64 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Dodongo's Cavern minimap 16
{
{ MAP_MARK_CHEST,
1,
{
{ 10, 31, 27 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Dodongo's Cavern minimap 17
@ -200,21 +190,10 @@ static MapMarkData sMapMarkDodongosCavern[] = {
static MapMarkData sMapMarkJabuJabuBelly[] = {
// Jabu-Jabu's Belly minimap 0
{
{ MAP_MARK_CHEST,
2,
{
{ 3, 66, 50 },
{ 5, 72, 47 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Jabu-Jabu's Belly minimap 1
{
{ MAP_MARK_CHEST,
1,
{
{ 7, 72, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Jabu-Jabu's Belly minimap 2
@ -223,12 +202,6 @@ static MapMarkData sMapMarkJabuJabuBelly[] = {
},
// Jabu-Jabu's Belly minimap 3
{
{ MAP_MARK_CHEST,
2,
{
{ 4, 64, 62 },
{ 8, 79, 38 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Jabu-Jabu's Belly minimap 4
@ -237,11 +210,6 @@ static MapMarkData sMapMarkJabuJabuBelly[] = {
},
// Jabu-Jabu's Belly minimap 5
{
{ MAP_MARK_CHEST,
1,
{
{ 10, 64, 45 },
} },
{ MAP_MARK_BOSS,
1,
{
@ -263,23 +231,33 @@ static MapMarkData sMapMarkJabuJabuBelly[] = {
},
// Jabu-Jabu's Belly minimap 9
{
{ MAP_MARK_CHEST,
1,
{
{ 1, 74, 57 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Jabu-Jabu's Belly minimap 10
{
{ MAP_MARK_CHEST,
1,
{
{ 2, 59, 57 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Jabu-Jabu's Belly minimap 11
{
{ MAP_MARK_CHEST,
1,
{
{ 9, 68, 45 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Jabu-Jabu's Belly minimap 12
{
{ MAP_MARK_CHEST,
1,
{
{ 4, 68, 51 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Jabu-Jabu's Belly minimap 13
@ -288,22 +266,14 @@ static MapMarkData sMapMarkJabuJabuBelly[] = {
},
// Jabu-Jabu's Belly minimap 14
{
{ MAP_MARK_CHEST,
2,
{
{ 1, 79, 33 },
{ 6, 61, 41 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Jabu-Jabu's Belly minimap 15
{
{ MAP_MARK_CHEST,
2,
{
{ 0, 48, 57 },
{ 2, 77, 55 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Jabu-Jabu's Belly minimap 16
{
{ MAP_MARK_NONE, 0, { 0 } },
},
};
@ -338,22 +308,26 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 0, 72, 57 },
{ 0, 72, 60 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Forest Temple minimap 7
{
{ MAP_MARK_CHEST,
2,
1,
{
{ 1, 69, 39 },
{ 9, 62, 65 },
{ 5, 76, 38 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Forest Temple minimap 8
{
{ MAP_MARK_CHEST,
1,
{
{ 9, 59, 66 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Forest Temple minimap 9
@ -361,12 +335,17 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 9, 71, 59 },
{ 9, 15, 58 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Forest Temple minimap 10
{
{ MAP_MARK_CHEST,
1,
{
{ 1, 69, 56 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Forest Temple minimap 11
@ -378,7 +357,7 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 13, 80, 53 },
{ 13, 80, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -400,7 +379,7 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 6, 65, 53 },
{ 7, 61, 61 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -413,7 +392,7 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 11, 39, 35 },
{ 11, 39, 63 },
} },
{ MAP_MARK_BOSS,
1,
@ -427,7 +406,7 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 2, 65, 54 },
{ 2, 66, 57 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -453,7 +432,7 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 3, 75, 53 },
{ 3, 63, 56 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -462,17 +441,12 @@ static MapMarkData sMapMarkForestTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 12, 69, 52 },
{ 12, 69, 59 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Forest Temple minimap 24
{
{ MAP_MARK_CHEST,
1,
{
{ 5, 58, 27 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Forest Temple minimap 25
@ -481,6 +455,11 @@ static MapMarkData sMapMarkForestTemple[] = {
},
// Forest Temple minimap 26
{
{ MAP_MARK_CHEST,
1,
{
{ 4, 73, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
};
@ -499,7 +478,7 @@ static MapMarkData sMapMarkFireTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 7, 53, 70 },
{ 1, 53, 70 },
} },
{ MAP_MARK_BOSS,
1,
@ -510,6 +489,11 @@ static MapMarkData sMapMarkFireTemple[] = {
},
// Fire Temple minimap 3
{
{ MAP_MARK_CHEST,
1,
{
{ 0, 71, 60 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Fire Temple minimap 4
@ -517,7 +501,7 @@ static MapMarkData sMapMarkFireTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 11, 57, 48 },
{ 11, 59, 46 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -526,8 +510,8 @@ static MapMarkData sMapMarkFireTemple[] = {
{ MAP_MARK_CHEST,
2,
{
{ 3, 67, 73 },
{ 6, 58, 76 },
{ 6, 57, 73 },
{ 3, 66, 71 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -541,6 +525,11 @@ static MapMarkData sMapMarkFireTemple[] = {
},
// Fire Temple minimap 8
{
{ MAP_MARK_CHEST,
1,
{
{ 13, 72, 38 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Fire Temple minimap 9
@ -553,6 +542,11 @@ static MapMarkData sMapMarkFireTemple[] = {
},
// Fire Temple minimap 11
{
{ MAP_MARK_CHEST,
1,
{
{ 9, 80, 61 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Fire Temple minimap 12
@ -573,14 +567,18 @@ static MapMarkData sMapMarkFireTemple[] = {
},
// Fire Temple minimap 16
{
{ MAP_MARK_CHEST,
1,
{
{ 10, 71, 36 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Fire Temple minimap 17
{
{ MAP_MARK_CHEST,
2,
1,
{
{ 2, 78, 62 },
{ 12, 77, 58 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
@ -591,15 +589,15 @@ static MapMarkData sMapMarkFireTemple[] = {
},
// Fire Temple minimap 19
{
{ MAP_MARK_CHEST,
1,
{
{ 4, 60, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Fire Temple minimap 20
{
{ MAP_MARK_CHEST,
1,
{
{ 4, 78, 59 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Fire Temple minimap 21
@ -611,7 +609,7 @@ static MapMarkData sMapMarkFireTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 1, 72, 68 },
{ 2, 71, 68 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -620,7 +618,7 @@ static MapMarkData sMapMarkFireTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 8, 66, 57 },
{ 8, 66, 58 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -630,6 +628,11 @@ static MapMarkData sMapMarkFireTemple[] = {
},
// Fire Temple minimap 25
{
{ MAP_MARK_CHEST,
1,
{
{ 7, 77, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Fire Temple minimap 26
@ -673,7 +676,7 @@ static MapMarkData sMapMarkFireTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 5, 51, 61 },
{ 5, 49, 62 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -701,7 +704,7 @@ static MapMarkData sMapMarkWaterTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 6, 81, 68 },
{ 6, 79, 68 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -711,6 +714,11 @@ static MapMarkData sMapMarkWaterTemple[] = {
},
// Water Temple minimap 4
{
{ MAP_MARK_CHEST,
1,
{
{ 9, 81, 62 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Water Temple minimap 5
@ -723,19 +731,24 @@ static MapMarkData sMapMarkWaterTemple[] = {
},
// Water Temple minimap 7
{
{ MAP_MARK_CHEST,
1,
{
{ 7, 74, 62 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Water Temple minimap 8
{
{ MAP_MARK_CHEST,
1,
{
{ 10, 57, 66 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Water Temple minimap 9
{
{ MAP_MARK_CHEST,
1,
{
{ 5, 75, 55 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Water Temple minimap 10
@ -769,6 +782,11 @@ static MapMarkData sMapMarkWaterTemple[] = {
},
// Water Temple minimap 16
{
{ MAP_MARK_CHEST,
1,
{
{ 5, 76, 64 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Water Temple minimap 17
@ -789,7 +807,7 @@ static MapMarkData sMapMarkWaterTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 2, 73, 65 },
{ 2, 74, 63 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -874,7 +892,7 @@ static MapMarkData sMapMarkWaterTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 0, 73, 63 },
{ 0, 74, 64 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -884,10 +902,20 @@ static MapMarkData sMapMarkWaterTemple[] = {
},
// Water Temple minimap 41
{
{ MAP_MARK_CHEST,
1,
{
{ 8, 75, 67 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Water Temple minimap 42
{
{ MAP_MARK_CHEST,
1,
{
{ 3, 82, 65 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Water Temple minimap 43
@ -899,36 +927,27 @@ static MapMarkData sMapMarkWaterTemple[] = {
static MapMarkData sMapMarkSpiritTemple[] = {
// Spirit Temple minimap 0
{
{ MAP_MARK_CHEST,
4,
{
{ 26, 27, 35 },
{ 27, 36, 35 },
{ 30, 27, 28 },
{ 31, 36, 28 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Spirit Temple minimap 1
{
{ MAP_MARK_CHEST,
1,
{
{ 29, 67, 63 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Spirit Temple minimap 2
{
{ MAP_MARK_CHEST,
1,
{
{ 0, 78, 43 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Spirit Temple minimap 3
{
{ MAP_MARK_CHEST,
2,
1,
{
{ 0, 71, 62 },
{ 8, 71, 48 },
{ 8, 69, 40 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -941,18 +960,13 @@ static MapMarkData sMapMarkSpiritTemple[] = {
{ MAP_MARK_CHEST,
2,
{
{ 2, 43, 50 },
{ 3, 56, 54 },
{ 15, 69, 42 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Spirit Temple minimap 6
{
{ MAP_MARK_CHEST,
1,
{
{ 28, 60, 54 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Spirit Temple minimap 7
@ -964,7 +978,7 @@ static MapMarkData sMapMarkSpiritTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 1, 76, 40 },
{ 1, 70, 67 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -985,7 +999,7 @@ static MapMarkData sMapMarkSpiritTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 7, 70, 53 },
{ 7, 70, 58 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -1012,24 +1026,20 @@ static MapMarkData sMapMarkSpiritTemple[] = {
},
// Spirit Temple minimap 17
{
{ MAP_MARK_CHEST,
1,
{
{ 25, 78, 58 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Spirit Temple minimap 18
{
{ MAP_MARK_CHEST,
1,
{
{ 24, 78, 58 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Spirit Temple minimap 19
{
{ MAP_MARK_CHEST,
2,
{
{ 20, 75, 58 },
{ 21, 83, 58 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Spirit Temple minimap 20
@ -1047,6 +1057,11 @@ static MapMarkData sMapMarkSpiritTemple[] = {
},
// Spirit Temple minimap 22
{
{ MAP_MARK_CHEST,
1,
{
{ 10, 72, 49 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Spirit Temple minimap 23
@ -1066,7 +1081,7 @@ static MapMarkData sMapMarkSpiritTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 18, 75, 54 },
{ 18, 50, 41 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -1079,8 +1094,8 @@ static MapMarkData sMapMarkSpiritTemple[] = {
{ MAP_MARK_CHEST,
2,
{
{ 6, 78, 55 },
{ 12, 70, 70 },
{ 6, 73, 49 },
{ 12, 79, 55 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -1089,7 +1104,7 @@ static MapMarkData sMapMarkSpiritTemple[] = {
{ MAP_MARK_CHEST,
1,
{
{ 2, 76, 37 },
{ 15, 77, 42 },
} },
{ MAP_MARK_BOSS,
1,
@ -1100,6 +1115,12 @@ static MapMarkData sMapMarkSpiritTemple[] = {
},
// Spirit Temple minimap 30
{
{ MAP_MARK_CHEST,
2,
{
{ 13, 77, 63 },
{ 14, 77, 68 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Spirit Temple minimap 31
@ -1155,10 +1176,9 @@ static MapMarkData sMapMarkShadowTemple[] = {
// Shadow Temple minimap 6
{
{ MAP_MARK_CHEST,
2,
1,
{
{ 2, 83, 67 },
{ 14, 84, 59 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -1215,11 +1235,6 @@ static MapMarkData sMapMarkShadowTemple[] = {
},
// Shadow Temple minimap 14
{
{ MAP_MARK_CHEST,
1,
{
{ 16, 73, 64 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Shadow Temple minimap 15
@ -1270,11 +1285,6 @@ static MapMarkData sMapMarkShadowTemple[] = {
},
// Shadow Temple minimap 21
{
{ MAP_MARK_CHEST,
1,
{
{ 14, 77, 62 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Shadow Temple minimap 22
@ -1283,11 +1293,6 @@ static MapMarkData sMapMarkShadowTemple[] = {
},
// Shadow Temple minimap 23
{
{ MAP_MARK_CHEST,
1,
{
{ 15, 56, 67 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Shadow Temple minimap 24
@ -1296,20 +1301,10 @@ static MapMarkData sMapMarkShadowTemple[] = {
},
// Shadow Temple minimap 25
{
{ MAP_MARK_CHEST,
1,
{
{ 16, 73, 64 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Shadow Temple minimap 26
{
{ MAP_MARK_CHEST,
1,
{
{ 14, 77, 62 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
};
@ -1318,9 +1313,14 @@ static MapMarkData sMapMarkBottomWell[] = {
// Bottom of the Well minimap 0
{
{ MAP_MARK_CHEST,
1,
6,
{
{ 3, 60, 18 },
{ 1, 56, 26 },
{ 4, 39, 3 },
{ 5, 69, 30 },
{ 8, 53, 30 },
{ 12, 83, 16 },
{ 14, 67, 26 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -1334,14 +1334,20 @@ static MapMarkData sMapMarkBottomWell[] = {
},
// Bottom of the Well minimap 3
{
{ MAP_MARK_CHEST,
1,
{
{ 10, 79, 67 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Bottom of the Well minimap 4
{
{ MAP_MARK_CHEST,
1,
2,
{
{ 2, 73, 61 },
{ 3, 73, 62 },
{ 20, 81, 62 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
@ -1355,6 +1361,13 @@ static MapMarkData sMapMarkBottomWell[] = {
},
// Bottom of the Well minimap 7
{
{ MAP_MARK_CHEST,
3,
{
{ 2, 59, 28 },
{ 9, 36, 19 },
{ 16, 62, 38 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},
// Bottom of the Well minimap 8
@ -1366,7 +1379,7 @@ static MapMarkData sMapMarkBottomWell[] = {
{ MAP_MARK_CHEST,
1,
{
{ 1, 74, 66 },
{ 7, 75, 66 },
} },
{ MAP_MARK_NONE, 0, { 0 } },
},

1444
src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.c Normal file
View file

File diff suppressed because it is too large Load diff

8
tools/msgdis.py
View file

@ -426,7 +426,7 @@ def main():
parser = argparse.ArgumentParser(
description="Extract text from the baserom into .h files"
)
parser.add_argument("--oot-version", help="OOT version", default="gc-eu-mq-dbg", choices=["gc-eu-mq", "gc-eu-mq-dbg"])
parser.add_argument("--oot-version", help="OOT version", default="gc-eu-mq-dbg")
parser.add_argument("--text-out", help="Path to output .h file for text")
parser.add_argument(
"--staff-text-out", help="Path to output .h file for staff text"
@ -449,6 +449,12 @@ def main():
fra_message_entry_table_addr = 0x00B84C28
staff_message_entry_table_addr = 0x00B86D38
staff_message_entry_table_addr_end = 0x00B86EC0
elif version == "gc-eu":
nes_message_entry_table_addr = 0x00B7E910
ger_message_entry_table_addr = 0x00B82B38
fra_message_entry_table_addr = 0x00B84C48
staff_message_entry_table_addr = 0x00B86D58
staff_message_entry_table_addr_end = 0x00B86EE0
else:
parser.error("Unsupported OOT version")