migrate data

include/z64map.h

@@ -91,7 +91,7 @@ typedef struct {
     /* 0x3C */ s16* unk3C;
     /* 0x40 */ s16 unk40;
     /* 0x42 */ s16 unk42;
-    /* 0x44 */ s16 unk44;
+    /* 0x44 */ s16 lowestFloor;
     /* 0x48 */ s16* unk48;
     /* 0x4C */ s16 unk4C;
     /* 0x50 */ s32 numChests;
@@ -101,16 +101,16 @@ typedef struct {
 } struct_801BEBB8; // size = 0x5C
 
 typedef struct {
-    /* 0x0 */ s16 unk0; //scene
-    /* 0x2 */ s16 unk2;
-} struct_801BEC5C; // size = 0x4
+    /* 0x0 */ s16 sceneId;
+    /* 0x2 */ s16 lowestFloor;
+} MapCustomLowestFloor; // size = 0x4
 
 typedef struct {
     /* 0x00 */ s32 unk0[5];
 } struct_801BEC70; // size = 0x14
 
 typedef struct {
-    /* 0x0 */ s16 unk0;
+    /* 0x0 */ s16 sceneId;
     /* 0x4 */ s32 unk4;
     /* 0x8 */ s32 unk8;
 } struct_801BED24; // size = 0xC
@@ -143,6 +143,7 @@ void func_80108AF8(struct PlayState* play);
 s32 func_801090B0(s32 arg0);
 s32 func_80109124(s16 arg0);
 void func_801091F0(struct PlayState* play);
+void func_80109428(struct PlayState* play);
 
 /* z_map_data */
 void MapData_GetMapColor(s32 colorIndex, Color_RGBA8* color);

spec

@@ -481,8 +481,6 @@ beginseg
     include "build/src/code/z_lights.o"
     include "build/src/code/z_malloc.o"
     include "build/src/code/z_map_disp.o"
-    include "build/data/code/z_map_disp.data.o"
-    include "build/data/code/z_map_disp.bss.o"
     include "build/src/code/z_map_data.o"
     include "build/src/code/z_map_exp.o"
     include "build/src/code/z_msgevent.o"
@@ -656,7 +654,7 @@ beginseg
     include "build/src/overlays/gamestates/ovl_file_choose/z_file_choose_NES.o"
     #ifdef NON_MATCHING
         include "build/src/overlays/gamestates/ovl_file_choose/ovl_file_choose_reloc.o"
-    #else 
+    #else
         include "build/data/ovl_file_choose/ovl_file_choose.reloc.o"
     #endif
 endseg

src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c

@@ -5,6 +5,7 @@
  */
 
 #include "z_kaleido_scope.h"
+#include "z64map.h"
 #include "z64view.h"
 #include "overlays/gamestates/ovl_opening/z_opening.h"
 #include "archives/icon_item_static/icon_item_static_yar.h"

tools/disasm/functions.txt

@@ -1943,12 +1943,12 @@
     0x801068D8:("MapDisp_DestroyMapI",),
     0x801068FC:("func_801068FC",),
     0x80106BEC:("func_80106BEC",),
-    0x80106D08:("func_80106D08",),
+    0x80106D08:("MapDisp_ConvertBossSceneToDungeonScene",),
     0x80106D5C:("func_80106D5C",),
     0x80107B78:("func_80107B78",),
     0x80108124:("func_80108124",),
     0x80108558:("func_80108558",),
-    0x80108A10:("func_80108A10",),
+    0x80108A10:("MapDisp_GetDungeonMapFloorTexture",),
     0x80108A64:("func_80108A64",),
     0x80108AF8:("func_80108AF8",),
     0x801090B0:("func_801090B0",),

tools/disasm/variables.txt

@@ -992,17 +992,17 @@
     0x801BEB00:("D_801BEB00","s32","[4]",0x10),
     0x801BEB10:("D_801BEB10","u32","[4]",0x10),
     0x801BEB20:("D_801BEB20","u32","[4]",0x10),
-    0x801BEB38:("D_801BEB38","UNK_TYPE1","",0x1),
+    0x801BEB38:("sWhiteSquareTex","UNK_TYPE1","",0x1),
     0x801BEBB8:("D_801BEBB8","UNK_TYPE4","",0x40),
     0x801BEBF8:("D_801BEBF8","UNK_TYPE2","",0x2),
     0x801BEBFA:("D_801BEBFA","UNK_TYPE2","",0x2),
     0x801BEBFC:("D_801BEBFC","UNK_TYPE2","",0x18),
     0x801BEC14:("D_801BEC14","MinimapList","",0x8),
-    0x801BEC1C:("D_801BEC1C","UNK_TYPE4","",0x4),
-    0x801BEC20:("D_801BEC20","UNK_TYPE4","",0x4),
+    0x801BEC1C:("sSceneNumRooms","s32","",0x4),
+    0x801BEC20:("sNumChests","s32","",0x4),
     0x801BEC24:("D_801BEC24","UNK_TYPE1","",0x8),
     0x801BEC2C:("D_801BEC2C","Color_RGBA8","[12]",0x30),
-    0x801BEC5C:("D_801BEC5C","struct_801BEC5C","[5]",0x14),
+    0x801BEC5C:("sCustomLowestFloor","MapCustomLowestFloor","[5]",0x14),
     0x801BEC70:("D_801BEC70","UNK_TYPE4","",0x14),
     0x801BEC84:("D_801BEC84","u16","[16]",0x10),
     0x801BECA4:("D_801BECA4","u16","[16]",0x10),

tools/sizes/code_functions.csv

@@ -1457,12 +1457,12 @@ asm/non_matchings/code/z_map_disp/MapDisp_InitMapI.s,MapDisp_InitMapI,0x801068B4
 asm/non_matchings/code/z_map_disp/MapDisp_DestroyMapI.s,MapDisp_DestroyMapI,0x801068D8,0x9
 asm/non_matchings/code/z_map_disp/func_801068FC.s,func_801068FC,0x801068FC,0xBC
 asm/non_matchings/code/z_map_disp/func_80106BEC.s,func_80106BEC,0x80106BEC,0x47
-asm/non_matchings/code/z_map_disp/func_80106D08.s,func_80106D08,0x80106D08,0x15
+asm/non_matchings/code/z_map_disp/MapDisp_ConvertBossSceneToDungeonScene.s,MapDisp_ConvertBossSceneToDungeonScene,0x80106D08,0x15
 asm/non_matchings/code/z_map_disp/func_80106D5C.s,func_80106D5C,0x80106D5C,0x387
 asm/non_matchings/code/z_map_disp/func_80107B78.s,func_80107B78,0x80107B78,0x16B
 asm/non_matchings/code/z_map_disp/func_80108124.s,func_80108124,0x80108124,0x10D
 asm/non_matchings/code/z_map_disp/func_80108558.s,func_80108558,0x80108558,0x12E
-asm/non_matchings/code/z_map_disp/func_80108A10.s,func_80108A10,0x80108A10,0x15
+asm/non_matchings/code/z_map_disp/MapDisp_GetDungeonMapFloorTexture.s,MapDisp_GetDungeonMapFloorTexture,0x80108A10,0x15
 asm/non_matchings/code/z_map_disp/func_80108A64.s,func_80108A64,0x80108A64,0x25
 asm/non_matchings/code/z_map_disp/func_80108AF8.s,func_80108AF8,0x80108AF8,0x16E
 asm/non_matchings/code/z_map_disp/func_801090B0.s,func_801090B0,0x801090B0,0x1D

undefined_syms.txt

@@ -630,3 +630,7 @@ D_0E0002C8 = 0x0E0002C8;
 // segment 0x0F
 
 D_0F000000 = 0x0F000000;
+
+// z_map_disp
+// fake symbol
+D_801BEBFA = 0x801BEBFA;