core2 .data defininitions

This commit is contained in:
Banjo Kazooie
2022-08-10 16:06:32 -05:00
parent e651f96508
commit bd0dfb3ea5
23 changed files with 486 additions and 117 deletions

View File

@@ -4,8 +4,88 @@
extern f32 func_80294404(void);
extern s16 D_80364580[];
/* .data */
s16 D_80364580[] = {
MAP_7_TTC_TREASURE_TROVE_COVE,
MAP_2_MM_MUMBOS_MOUNTAIN,
MAP_1B_MMM_MAD_MONSTER_MANSION,
MAP_B_CC_CLANKERS_CAVERN,
MAP_21_CC_WITCH_SWITCH_ROOM,
MAP_22_CC_INSIDE_CLANKER,
MAP_23_CC_GOLDFEATHER_ROOM,
MAP_28_MMM_EGG_ROOM,
MAP_29_MMM_NOTE_ROOM,
MAP_2A_MMM_FEATHER_ROOM,
MAP_2C_MMM_BATHROOM,
MAP_2D_MMM_BEDROOM,
MAP_2E_MMM_HONEYCOMB_ROOM,
MAP_2B_MMM_SECRET_CHURCH_ROOM,
MAP_26_MMM_NAPPERS_ROOM,
MAP_1C_MMM_CHURCH,
MAP_1D_MMM_CELLAR,
MAP_31_RBB_RUSTY_BUCKET_BAY,
MAP_34_RBB_ENGINE_ROOM,
MAP_35_RBB_WAREHOUSE,
MAP_36_RBB_BOATHOUSE,
MAP_3A_RBB_BOSS_BOOM_BOX,
MAP_37_RBB_CONTAINER_1,
MAP_3E_RBB_CONTAINER_2,
MAP_38_RBB_CONTAINER_3,
MAP_39_RBB_CREW_CABIN,
MAP_3F_RBB_CAPTAINS_CABIN,
MAP_3B_RBB_STORAGE_ROOM,
MAP_3C_RBB_KITCHEN,
MAP_3D_RBB_NAVIGATION_ROOM,
MAP_8B_RBB_ANCHOR_ROOM,
MAP_43_CCW_SPRING,
MAP_44_CCW_SUMMER,
MAP_45_CCW_AUTUMN,
MAP_46_CCW_WINTER,
MAP_5A_CCW_SUMMER_ZUBBA_HIVE,
MAP_5B_CCW_SPRING_ZUBBA_HIVE,
MAP_5C_CCW_AUTUMN_ZUBBA_HIVE,
MAP_5E_CCW_SPRING_NABNUTS_HOUSE,
MAP_5F_CCW_SUMMER_NABNUTS_HOUSE,
MAP_60_CCW_AUTUMN_NABNUTS_HOUSE,
MAP_61_CCW_WINTER_NABNUTS_HOUSE,
MAP_62_CCW_WINTER_HONEYCOMB_ROOM,
MAP_63_CCW_AUTUMN_NABNUTS_WATER_SUPPLY,
MAP_64_CCW_WINTER_NABNUTS_WATER_SUPPLY,
MAP_65_CCW_SPRING_WHIPCRACK_ROOM,
MAP_66_CCW_SUMMER_WHIPCRACK_ROOM,
MAP_67_CCW_AUTUMN_WHIPCRACK_ROOM,
MAP_68_CCW_WINTER_WHIPCRACK_ROOM,
MAP_11_BGS_TIPTUP,
MAP_10_BGS_MR_VILE,
MAP_C_MM_TICKERS_TOWER,
MAP_8F_TTC_SHARKFOOD_ISLAND,
MAP_8D_MMM_INSIDE_LOGGO,
MAP_69_GL_MM_LOBBY,
MAP_6A_GL_TTC_AND_CC_PUZZLE,
MAP_6B_GL_180_NOTE_DOOR,
MAP_6C_GL_RED_CAULDRON_ROOM,
MAP_6D_GL_TTC_LOBBY,
MAP_70_GL_CC_LOBBY,
MAP_71_GL_STATUE_ROOM,
MAP_72_GL_BGS_LOBBY,
MAP_6E_GL_GV_LOBBY,
MAP_6F_GL_FP_LOBBY,
MAP_74_GL_GV_PUZZLE,
MAP_75_GL_MMM_LOBBY,
MAP_7A_GL_CRYPT,
MAP_76_GL_640_NOTE_DOOR,
MAP_77_GL_RBB_LOBBY,
MAP_78_GL_RBB_AND_MMM_PUZZLE,
MAP_79_GL_CCW_LOBBY,
MAP_80_GL_FF_ENTRANCE,
MAP_90_GL_BATTLEMENTS,
MAP_93_GL_DINGPOT,
MAP_92_GV_SNS_CHAMBER,
MAP_8C_SM_BANJOS_HOUSE,
0
};
/* .rodata */
extern f32 D_80374CF0;
extern f64 D_80374CF8;
extern f64 D_80374D00;
@@ -147,7 +227,7 @@ void func_8029A4D0(void){
D_8037C6F0.unk4[0] = 255.0f;
D_8037C6F0.unk4[1] = 255.0f;
D_8037C6F0.unk4[2] = 255.0f;
for(i = 0; D_80364580[i]; i++){
for(i = 0; D_80364580[i] != 0; i++){
if(map_id == D_80364580[i]){
D_8037C6F0.unk0 = 1;
break;