diff --git a/include/functions.h b/include/functions.h index 69c38ca7d5..96b927ce13 100644 --- a/include/functions.h +++ b/include/functions.h @@ -462,4 +462,6 @@ void sin_cos_rad(f32 rad, f32* outSinTheta, f32* outCosTheta); void playFX_08(f32 arg0, f32 arg1, f32 arg2, f32 arg3); void playFX_09(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5); +void* load_asset_by_name(const char* assetName, u32* decompressedSize); + #endif diff --git a/include/map.h b/include/map.h index 4e6d238b1a..31c1d1c1d5 100644 --- a/include/map.h +++ b/include/map.h @@ -15,7 +15,8 @@ typedef Vec4f EntryList[]; typedef struct MapConfig { /* 0x00 */ ModelNode* modelTreeRoot; /* 0x04 */ UNK_PTR collision; - /* 0x08 */ char unk_08[8]; + /* 0x08 */ UNK_PTR unk_08; + /* 0x0C */ char unk_0C[4]; /* 0x10 */ Script* main; /* 0x14 */ EntryList* entryList; /* 0x18 */ s32 entryCount; diff --git a/include/variables.h b/include/variables.h index 9961cea21c..58f2da1b35 100644 --- a/include/variables.h +++ b/include/variables.h @@ -230,9 +230,9 @@ extern s8 D_800A0920; extern s32 D_800A0924; extern s8 D_800A0921; extern s16 D_800A0922; -extern s32 D_800B0CF0; -extern s32 D_800D91E0; -extern s32 D_800D9230; +extern s32 mapTexName; +extern char* mapHitName; +extern s32 mapShapeName; extern s32* D_80210000; extern u8 D_802D9D70; // player alpha1 copy? extern u8 D_802D9D71; // player alpha2 copy? diff --git a/src/362a0_len_2f70.c b/src/362a0_len_2f70.c index c0e3cdb7b9..64517d4208 100644 --- a/src/362a0_len_2f70.c +++ b/src/362a0_len_2f70.c @@ -2,6 +2,13 @@ extern s16 D_800D91DC; +typedef struct { + UNK_PTR collision; + UNK_PTR unk_08; +} HitAsset; + +void load_hit_data(s32 idx, HitAsset* hit); + INCLUDE_ASM(s32, "362a0_len_2f70", allocate_hit_tables); void func_8005AF84(void) { @@ -16,13 +23,47 @@ void initialize_collision(void) { collision_heap_create(); } -INCLUDE_ASM(s32, "362a0_len_2f70", load_hit_asset); +void load_hit_asset(void) { + u32 assetSize; + MapConfig* map = get_current_map_header(); + void* compressedData = load_asset_by_name(&mapHitName, &assetSize); + HitAsset* uncompressedData = heap_malloc(assetSize); + + decode_yay0(compressedData, uncompressedData); + general_heap_free(compressedData); + + map->collision = uncompressedData->collision; + map->unk_08 = uncompressedData->unk_08; + + load_hit_data(0, uncompressedData); + load_hit_data(1, uncompressedData); + + heap_free(uncompressedData); +} INCLUDE_ASM(s32, "362a0_len_2f70", load_collision); -INCLUDE_ASM(s32, "362a0_len_2f70", load_stage_collision); +void load_stage_collision(const char* hitName) { + if (hitName == NULL) { + gCollisionData.numColliders = 0; + } else { + u32 assetSize; + MapConfig* map = get_current_map_header(); + void* compressedData = load_asset_by_name(hitName, &assetSize); + HitAsset* uncompressedData = heap_malloc(assetSize); -INCLUDE_ASM(s32, "362a0_len_2f70", load_hit_data); + decode_yay0(compressedData, uncompressedData); + general_heap_free(compressedData); + + map->collision = uncompressedData->collision; + + load_hit_data(0, uncompressedData); + + heap_free(uncompressedData); + } +} + +INCLUDE_ASM(void, "362a0_len_2f70", load_hit_data, s32 idx, HitAsset* hit); INCLUDE_ASM(void, "362a0_len_2f70", parent_collider_to_model, s32 colliderID, s16 modelIndex); diff --git a/src/state_pause.c b/src/state_pause.c index 0e0a6e3846..f09fc01c41 100644 --- a/src/state_pause.c +++ b/src/state_pause.c @@ -159,7 +159,7 @@ void state_step_unpause(void) { func_801497FC(D_800A0924); bgm_reset_max_volume(); load_map_script_lib(); - assetData = load_asset_by_name(&D_800D9230, &assetSize); + assetData = load_asset_by_name(&mapShapeName, &assetSize); decode_yay0(assetData, &D_80210000); general_heap_free(assetData); initialize_collision(); diff --git a/src/world/area_dgb/dgb_00/BFA0A0.c b/src/world/area_dgb/dgb_00/BFA0A0.c index cddb5bce08..03e395b033 100644 --- a/src/world/area_dgb/dgb_00/BFA0A0.c +++ b/src/world/area_dgb/dgb_00/BFA0A0.c @@ -2,9 +2,9 @@ #include "message_ids.h" ApiStatus N(func_80240000_BFA0A0)(ScriptInstance* script, s32 isInitialCall) { - sprintf(&D_800D9230, "arn_20_shape"); - sprintf(&D_800D91E0, "arn_20_hit"); - sprintf(&D_800B0CF0, "arn_tex"); + sprintf(&mapShapeName, "arn_20_shape"); + sprintf(&mapHitName, "arn_20_hit"); + sprintf(&mapTexName, "arn_tex"); return ApiStatus_BLOCK; } diff --git a/src/world/world.c b/src/world/world.c index fc887a6cb4..581243243c 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -20,8 +20,8 @@ const s32 D_800989A0[] = { }; // bss -extern MapConfig D_800A41E8; // gMapHeader? -extern s32 D_800A41E0; // gMapConfig? +extern MapConfig gMapConfig; +extern s32 gMap; extern s32 D_800D9668; @@ -40,7 +40,7 @@ void load_map_script_lib(void) { void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { s32 initStatus = 0; Map* map; - MapConfig* temp800A41E8; + MapConfig* mapConfig; char texStr[17]; s32 decompressedSize; @@ -73,13 +73,13 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { map = &gAreas[areaID].maps[mapID]; - sprintf(&D_800D9230, "%s_shape", map->id); - sprintf(&D_800D91E0, "%s_hit", map->id); + sprintf(&mapShapeName, "%s_shape", map->id); + sprintf(&mapHitName, "%s_hit", map->id); strcpy(texStr, map->id); texStr[3] = '\0'; - sprintf(&D_800B0CF0, "%s_tex", texStr); + sprintf(&mapTexName, "%s_tex", texStr); - D_800A41E0 = map; + gMap = map; if (map->bgName != NULL) { strcpy(&D_800D9668, map->bgName); } @@ -89,24 +89,24 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { dma_copy(map->dmaStart, map->dmaEnd, map->dmaDest); } - D_800A41E8 = *map->config; + gMapConfig = *map->config; - temp800A41E8 = &D_800A41E8; + mapConfig = &gMapConfig; if (map->init != 0) { initStatus = map->init(); } if (initStatus == 0) { s32* place = &D_80210000; - s32 yay0Asset = load_asset_by_name(&D_800D9230, &decompressedSize); + s32 yay0Asset = load_asset_by_name(&mapShapeName, &decompressedSize); decode_yay0(yay0Asset, place); general_heap_free(yay0Asset); - temp800A41E8->modelTreeRoot = place[0]; - temp800A41E8->modelNameList = place[2]; - temp800A41E8->colliderNameList = place[3]; - temp800A41E8->zoneNameList = place[4]; + mapConfig->modelTreeRoot = place[0]; + mapConfig->modelNameList = place[2]; + mapConfig->colliderNameList = place[3]; + mapConfig->zoneNameList = place[4]; } if (map->bgName != NULL) { @@ -154,15 +154,15 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { sfx_reset_door_sounds(); if (initStatus == 0) { - s32 thing = get_asset_offset(&D_800B0CF0, &decompressedSize); + s32 thing = get_asset_offset(&mapTexName, &decompressedSize); - if (temp800A41E8->modelTreeRoot != NULL) { - load_data_for_models(temp800A41E8->modelTreeRoot, thing, decompressedSize); + if (mapConfig->modelTreeRoot != NULL) { + load_data_for_models(mapConfig->modelTreeRoot, thing, decompressedSize); } } - if (temp800A41E8->background != NULL) { - read_background_size(temp800A41E8->background); + if (mapConfig->background != NULL) { + read_background_size(mapConfig->background); } else { set_background_size(296, 200, 12, 20); } @@ -182,15 +182,15 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { initialize_status_menu(); gGameStatusPtr->unk_90 = 1000; gGameStatusPtr->unk_92 = 1000; - gGameStatusPtr->mainScriptID = start_script_in_group(temp800A41E8->main, 0, 0, 0)->id; + gGameStatusPtr->mainScriptID = start_script_in_group(mapConfig->main, 0, 0, 0)->id; } s32 get_current_map_config() { - return D_800A41E0; + return gMap; } MapConfig* get_current_map_header() { - return &D_800A41E8; + return &gMapConfig; } // weirdness with gAreas loading, extra lw @@ -217,7 +217,7 @@ s32 get_map_IDs_by_name(const char* mapName, s16* areaID, s16* mapID) { INCLUDE_ASM(s32, "world/world", get_map_IDs_by_name); #endif -void* load_asset_by_name(char* assetName, s32* decompressedSize) { +void* load_asset_by_name(const char* assetName, u32* decompressedSize) { AssetHeader firstHeader; AssetHeader* assetTableBuffer; AssetHeader* curAsset; diff --git a/tools/build/configure.py b/tools/build/configure.py index f625a600b8..46a7aabe8c 100755 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -165,7 +165,7 @@ def write_ninja_rules(ninja: ninja_syntax.Writer, cpp: str): ninja.rule("mapfs", description="mapfs $out", - command=f"$python {BUILD_TOOLS}/mapfs/combine.py $out $in", + command=f"$python {BUILD_TOOLS}/mapfs/combine.py $version $out $in", ) ninja.rule("pack_title_data", @@ -440,7 +440,6 @@ class Configure: if name.startswith("party_"): compress = True - yay0_path = bin_path.with_suffix(".Yay0") build(bin_path, [path], "img", variables={ "img_type": "party", "img_flags": "", @@ -450,26 +449,36 @@ class Configure: logotype_path = out_dir / "title_logotype.bin" copyright_path = out_dir / "title_copyright.bin" + copyright_pal_path = out_dir / "title_copyright.pal" # jp only press_start_path = out_dir / "title_press_start.bin" build(logotype_path, [src_dir / "title/logotype.png"], "img", variables={ "img_type": "rgba32", "img_flags": "", }) - build(copyright_path, [src_dir / "title/copyright.png"], "img", variables={ - "img_type": "ia8", - "img_flags": "", - }) build(press_start_path, [src_dir / "title/press_start.png"], "img", variables={ "img_type": "ia8", "img_flags": "", }) - build(bin_path, [ - logotype_path, - copyright_path, - press_start_path, - ], "pack_title_data") + if self.version == "jp": + build(copyright_path, [src_dir / "title/copyright.png"], "img", variables={ + "img_type": "ci4", + "img_flags": "", + }) + build(copyright_pal_path, [src_dir / "title/copyright.png"], "img", variables={ + "img_type": "palette", + "img_flags": "", + }) + imgs = [logotype_path, copyright_path, press_start_path, copyright_pal_path] + else: + build(copyright_path, [src_dir / "title/copyright.png"], "img", variables={ + "img_type": "ia8", + "img_flags": "", + }) + imgs = [logotype_path, copyright_path, press_start_path] + + build(bin_path, imgs, "pack_title_data") elif name.endswith("_bg"): compress = True bin_path = self.build_path() / bin_path @@ -504,7 +513,7 @@ class Configure: bin_path = path if compress: - yay0_path = bin_path.with_suffix(".Yay0") + yay0_path = out_dir / f"{name}.Yay0" build(yay0_path, [bin_path], "yay0") else: yay0_path = bin_path diff --git a/tools/build/mapfs/combine.py b/tools/build/mapfs/combine.py index 4818da8599..db0f724439 100755 --- a/tools/build/mapfs/combine.py +++ b/tools/build/mapfs/combine.py @@ -8,14 +8,22 @@ from itertools import tee def next_multiple(pos, multiple): return pos + pos % multiple -def build_mapfs(out_bin, assets): +def get_version_date(version): + if version == "us": + return "Map Ver.00/11/07 15:36" + elif version == "jp": + return "Map Ver.00/07/05 19:13" + else: + return "Map Ver.??/??/?? ??:??" + +def build_mapfs(out_bin, assets, version): # every TOC entry's name field has data after the null terminator made up from all the previous name fields. # we probably don't have to do this for the game to read the data properly (it doesn't read past the null terminator # of `string`), but the original devs' equivalent of this script had this bug so we need to replicate it to match. written_names = [] with open(out_bin, "wb") as f: - f.write("Map Ver.00/11/07 15:36".encode("ascii")) + f.write(get_version_date(version).encode("ascii")) next_data_pos = (len(assets) + 1) * 0x1C @@ -63,6 +71,7 @@ def build_mapfs(out_bin, assets): if __name__ == "__main__": argv.pop(0) # python3 + version = argv.pop(0) out = argv.pop(0) assets = [] @@ -71,4 +80,4 @@ if __name__ == "__main__": for i in range(0, len(argv), 2): assets.append((Path(argv[i]), Path(argv[i+1]))) - build_mapfs(out, assets) + build_mapfs(out, assets, version) diff --git a/tools/build/mapfs/pack_title_data.py b/tools/build/mapfs/pack_title_data.py index ea0a6538ca..19dd54ab27 100755 --- a/tools/build/mapfs/pack_title_data.py +++ b/tools/build/mapfs/pack_title_data.py @@ -4,7 +4,12 @@ from sys import argv if __name__ == "__main__": argv.pop(0) # python3 - out, img1, img2, img3 = argv + + if len(argv) > 4: + out, img1, img2, img3, img2_pal = argv + else: + out, img1, img2, img3 = argv + img2_pal = None with open(img1, "rb") as f: img1 = f.read() @@ -15,19 +20,35 @@ if __name__ == "__main__": with open(img3, "rb") as f: img3 = f.read() + if img2_pal: + with open(img2_pal, "rb") as f: + img2_pal = f.read() + with open(out, "wb") as f: f.seek(0x10) pos2 = f.tell() f.write(img2) + if img2_pal: + pos2_pal = f.tell() + f.write(img2_pal) + else: + pos2_pal = None + pos3 = f.tell() f.write(img3) pos1 = f.tell() f.write(img1) + if img2_pal: + # jp padding? + f.write(b"\x00" * 0x10) + f.seek(0) f.write(pos1.to_bytes(4, byteorder="big")) f.write(pos2.to_bytes(4, byteorder="big")) f.write(pos3.to_bytes(4, byteorder="big")) + if pos2_pal: + f.write(pos2_pal.to_bytes(4, byteorder="big")) diff --git a/tools/splat_ext/pm_map_data.py b/tools/splat_ext/pm_map_data.py index f49c0405a6..62c6c23d95 100644 --- a/tools/splat_ext/pm_map_data.py +++ b/tools/splat_ext/pm_map_data.py @@ -1,6 +1,7 @@ from segtypes.n64.segment import N64Segment from segtypes.n64.ia8 import N64SegIa8 from segtypes.n64.rgba32 import N64SegRgba32 +from segtypes.n64.ci4 import N64SegCi4 from util.n64 import Yay0decompress from util.color import unpack_color from util.iter import iter_in_groups @@ -80,20 +81,38 @@ class N64SegPm_map_data(N64Segment): w = png.Writer(150, 105, palette=parse_palette(bytes[:0x200])) w.write_array(f, bytes[0x200:]) elif name == "title_data": - with open(fs_dir / "title/logotype.png", "wb") as f: - width = 200 - height = 112 - N64SegRgba32.get_writer(width, height).write_array(f, N64SegRgba32.parse_image(bytes[0x2210 : 0x2210 + width * height * 4], width, height)) + if "ver/us" in options.opts["target_path"]: + with open(fs_dir / "title/logotype.png", "wb") as f: + width = 200 + height = 112 + N64SegRgba32.get_writer(width, height).write_array(f, N64SegRgba32.parse_image(bytes[0x2210 : 0x2210 + width * height * 4], width, height)) - with open(fs_dir / "title/copyright.png", "wb") as f: - width = 144 - height = 32 - N64SegIa8.get_writer(width, height).write_array(f, N64SegIa8.parse_image(bytes[0x10 : 0x10 + width * height], width, height)) + with open(fs_dir / "title/copyright.png", "wb") as f: + width = 144 + height = 32 + N64SegIa8.get_writer(width, height).write_array(f, N64SegIa8.parse_image(bytes[0x10 : 0x10 + width * height], width, height)) - with open(fs_dir / "title/press_start.png", "wb") as f: - width = 128 - height = 32 - N64SegIa8.get_writer(width, height).write_array(f, N64SegIa8.parse_image(bytes[0x1210 : 0x1210 + width * height], width, height)) + with open(fs_dir / "title/press_start.png", "wb") as f: + width = 128 + height = 32 + N64SegIa8.get_writer(width, height).write_array(f, N64SegIa8.parse_image(bytes[0x1210 : 0x1210 + width * height], width, height)) + else: + with open(fs_dir / "title/logotype.png", "wb") as f: + width = 272 + height = 88 + N64SegRgba32.get_writer(width, height).write_array(f, N64SegRgba32.parse_image(bytes[0x1830 : 0x1830 + width * height * 4], width, height)) + + with open(fs_dir / "title/copyright.png", "wb") as f: + width = 128 + height = 32 + + w = png.Writer(width, height, palette=parse_palette(bytes[0x810:0x830])) + w.write_array(f, N64SegCi4.parse_image(bytes[0x10 : 0x10 + width * height], width, height)) + + with open(fs_dir / "title/press_start.png", "wb") as f: + width = 128 + height = 32 + N64SegIa8.get_writer(width, height).write_array(f, N64SegIa8.parse_image(bytes[0x830 : 0x830 + width * height], width, height)) elif name.endswith("_bg"): def write_bg_png(bytes, path, header_offset=0): header = bytes[header_offset:header_offset+0x10] diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml index 3594832a61..1ac7219f88 100644 --- a/ver/jp/splat.yaml +++ b/ver/jp/splat.yaml @@ -224,6 +224,1043 @@ segments: - [0x4A190, c] - [0x4A1D0, c] - [0x4AC70, c] - - type: bin - start: 0x4E580 + - [0x4E580, bin] + - name: mapfs + type: pm_map_data + start: 0x1E00000 + files: + - dro_01_shape + - dro_01_hit + - dro_02_shape + - dro_02_hit + - hos_00_shape + - hos_00_hit + - hos_01_shape + - hos_01_hit + - hos_02_shape + - hos_02_hit + - hos_03_shape + - hos_03_hit + - hos_04_shape + - hos_04_hit + - hos_05_shape + - hos_05_hit + - hos_06_shape + - hos_06_hit + - hos_10_shape + - hos_10_hit + - hos_20_shape + - hos_20_hit + - isk_01_shape + - isk_01_hit + - isk_02_shape + - isk_02_hit + - isk_03_shape + - isk_03_hit + - isk_04_shape + - isk_04_hit + - isk_05_shape + - isk_05_hit + - isk_06_shape + - isk_06_hit + - isk_07_shape + - isk_07_hit + - isk_08_shape + - isk_08_hit + - isk_09_shape + - isk_09_hit + - isk_10_shape + - isk_10_hit + - isk_11_shape + - isk_11_hit + - isk_12_shape + - isk_12_hit + - isk_13_shape + - isk_13_hit + - isk_14_shape + - isk_14_hit + - isk_16_shape + - isk_16_hit + - isk_18_shape + - isk_18_hit + - isk_19_shape + - isk_19_hit + - iwa_00_shape + - iwa_00_hit + - iwa_01_shape + - iwa_01_hit + - iwa_02_shape + - iwa_02_hit + - iwa_03_shape + - iwa_03_hit + - iwa_04_shape + - iwa_04_hit + - iwa_10_shape + - iwa_10_hit + - iwa_11_shape + - iwa_11_hit + - osr_00_shape + - osr_00_hit + - osr_01_shape + - osr_01_hit + - osr_02_shape + - osr_02_hit + - osr_03_shape + - osr_03_hit + - kkj_00_shape + - kkj_00_hit + - kkj_01_shape + - kkj_01_hit + - kkj_02_shape + - kkj_02_hit + - kkj_03_shape + - kkj_03_hit + - kkj_10_shape + - kkj_10_hit + - kkj_11_shape + - kkj_11_hit + - kkj_12_shape + - kkj_12_hit + - kkj_13_shape + - kkj_13_hit + - kkj_14_shape + - kkj_14_hit + - kkj_15_shape + - kkj_15_hit + - kkj_16_shape + - kkj_16_hit + - kkj_17_shape + - kkj_17_hit + - kkj_18_shape + - kkj_18_hit + - kkj_19_shape + - kkj_19_hit + - kkj_20_shape + - kkj_20_hit + - kkj_21_shape + - kkj_21_hit + - kkj_22_shape + - kkj_22_hit + - kkj_23_shape + - kkj_23_hit + - kkj_24_shape + - kkj_24_hit + - kkj_25_shape + - kkj_25_hit + - kkj_26_shape + - kkj_26_hit + - kkj_27_shape + - kkj_27_hit + - kkj_28_shape + - kkj_28_hit + - kkj_29_shape + - kkj_29_hit + - kmr_00_shape + - kmr_00_hit + - kmr_02_shape + - kmr_02_hit + - kmr_03_shape + - kmr_03_hit + - kmr_04_shape + - kmr_04_hit + - kmr_05_shape + - kmr_05_hit + - kmr_06_shape + - kmr_06_hit + - kmr_07_shape + - kmr_07_hit + - kmr_09_shape + - kmr_09_hit + - kmr_10_shape + - kmr_10_hit + - kmr_11_shape + - kmr_11_hit + - kmr_12_shape + - kmr_12_hit + - kmr_20_shape + - kmr_20_hit + - kmr_30_shape + - kmr_30_hit + - kpa_01_shape + - kpa_01_hit + - kpa_03_shape + - kpa_03_hit + - kpa_04_shape + - kpa_04_hit + - kpa_08_shape + - kpa_08_hit + - kpa_09_shape + - kpa_09_hit + - kpa_10_shape + - kpa_10_hit + - kpa_11_shape + - kpa_11_hit + - kpa_12_shape + - kpa_12_hit + - kpa_13_shape + - kpa_13_hit + - kpa_14_shape + - kpa_14_hit + - kpa_15_shape + - kpa_15_hit + - kpa_16_shape + - kpa_16_hit + - kpa_17_shape + - kpa_17_hit + - kpa_32_shape + - kpa_32_hit + - kpa_33_shape + - kpa_33_hit + - kpa_40_shape + - kpa_40_hit + - kpa_41_shape + - kpa_41_hit + - kpa_50_shape + - kpa_50_hit + - kpa_52_shape + - kpa_52_hit + - kpa_60_shape + - kpa_60_hit + - kpa_61_shape + - kpa_61_hit + - kpa_62_shape + - kpa_62_hit + - kpa_63_shape + - kpa_63_hit + - kpa_70_shape + - kpa_70_hit + - kpa_80_shape + - kpa_80_hit + - kpa_90_shape + - kpa_90_hit + - kpa_91_shape + - kpa_91_hit + - kpa_94_shape + - kpa_94_hit + - kpa_95_shape + - kpa_95_hit + - kpa_96_shape + - kpa_96_hit + - kpa_102_shape + - kpa_102_hit + - kpa_111_shape + - kpa_111_hit + - kpa_112_shape + - kpa_112_hit + - kpa_113_shape + - kpa_113_hit + - kpa_115_shape + - kpa_115_hit + - kpa_116_shape + - kpa_116_hit + - kpa_117_shape + - kpa_117_hit + - kpa_118_shape + - kpa_118_hit + - kpa_119_shape + - kpa_119_hit + - kpa_121_shape + - kpa_121_hit + - kpa_130_shape + - kpa_130_hit + - kpa_133_shape + - kpa_133_hit + - kpa_134_shape + - kpa_134_hit + - machi_shape + - machi_hit + - mac_00_shape + - mac_00_hit + - mac_01_shape + - mac_01_hit + - mac_02_shape + - mac_02_hit + - mac_03_shape + - mac_03_hit + - mac_04_shape + - mac_04_hit + - mac_05_shape + - mac_05_hit + - mac_06_shape + - mac_06_hit + - tik_01_shape + - tik_01_hit + - tik_02_shape + - tik_02_hit + - tik_03_shape + - tik_03_hit + - tik_04_shape + - tik_04_hit + - tik_05_shape + - tik_05_hit + - tik_06_shape + - tik_06_hit + - tik_07_shape + - tik_07_hit + - tik_08_shape + - tik_08_hit + - tik_09_shape + - tik_09_hit + - tik_10_shape + - tik_10_hit + - tik_12_shape + - tik_12_hit + - tik_14_shape + - tik_14_hit + - tik_15_shape + - tik_15_hit + - tik_17_shape + - tik_17_hit + - tik_18_shape + - tik_18_hit + - tik_19_shape + - tik_19_hit + - tik_20_shape + - tik_20_hit + - tik_21_shape + - tik_21_hit + - tik_22_shape + - tik_22_hit + - tik_23_shape + - tik_23_hit + - tik_25_shape + - tik_25_hit + - kgr_01_shape + - kgr_01_hit + - kgr_02_shape + - kgr_02_hit + - nok_01_shape + - nok_01_hit + - nok_02_shape + - nok_02_hit + - nok_03_shape + - nok_03_hit + - nok_04_shape + - nok_04_hit + - nok_11_shape + - nok_11_hit + - nok_12_shape + - nok_12_hit + - nok_13_shape + - nok_13_hit + - nok_14_shape + - nok_14_hit + - nok_15_shape + - nok_15_hit + - sbk_00_shape + - sbk_00_hit + - sbk_01_shape + - sbk_01_hit + - sbk_02_shape + - sbk_02_hit + - sbk_03_shape + - sbk_03_hit + - sbk_04_shape + - sbk_04_hit + - sbk_05_shape + - sbk_05_hit + - sbk_06_shape + - sbk_06_hit + - sbk_10_shape + - sbk_10_hit + - sbk_11_shape + - sbk_11_hit + - sbk_12_shape + - sbk_12_hit + - sbk_13_shape + - sbk_13_hit + - sbk_14_shape + - sbk_14_hit + - sbk_15_shape + - sbk_15_hit + - sbk_16_shape + - sbk_16_hit + - sbk_20_shape + - sbk_20_hit + - sbk_21_shape + - sbk_21_hit + - sbk_22_shape + - sbk_22_hit + - sbk_23_shape + - sbk_23_hit + - sbk_24_shape + - sbk_24_hit + - sbk_25_shape + - sbk_25_hit + - sbk_26_shape + - sbk_26_hit + - sbk_30_shape + - sbk_30_hit + - sbk_31_shape + - sbk_31_hit + - sbk_32_shape + - sbk_32_hit + - sbk_33_shape + - sbk_33_hit + - sbk_34_shape + - sbk_34_hit + - sbk_35_shape + - sbk_35_hit + - sbk_36_shape + - sbk_36_hit + - sbk_40_shape + - sbk_40_hit + - sbk_41_shape + - sbk_41_hit + - sbk_42_shape + - sbk_42_hit + - sbk_43_shape + - sbk_43_hit + - sbk_44_shape + - sbk_44_hit + - sbk_45_shape + - sbk_45_hit + - sbk_46_shape + - sbk_46_hit + - sbk_50_shape + - sbk_50_hit + - sbk_51_shape + - sbk_51_hit + - sbk_52_shape + - sbk_52_hit + - sbk_53_shape + - sbk_53_hit + - sbk_54_shape + - sbk_54_hit + - sbk_55_shape + - sbk_55_hit + - sbk_56_shape + - sbk_56_hit + - sbk_60_shape + - sbk_60_hit + - sbk_61_shape + - sbk_61_hit + - sbk_62_shape + - sbk_62_hit + - sbk_63_shape + - sbk_63_hit + - sbk_64_shape + - sbk_64_hit + - sbk_65_shape + - sbk_65_hit + - sbk_66_shape + - sbk_66_hit + - sbk_99_shape + - sbk_99_hit + - trd_00_shape + - trd_00_hit + - trd_01_shape + - trd_01_hit + - trd_02_shape + - trd_02_hit + - trd_03_shape + - trd_03_hit + - trd_04_shape + - trd_04_hit + - trd_05_shape + - trd_05_hit + - trd_06_shape + - trd_06_hit + - trd_07_shape + - trd_07_hit + - trd_08_shape + - trd_08_hit + - trd_09_shape + - trd_09_hit + - trd_10_shape + - trd_10_hit + - tst_01_shape + - tst_01_hit + - tst_02_shape + - tst_02_hit + - tst_03_shape + - tst_03_hit + - tst_04_shape + - tst_04_hit + - tst_10_shape + - tst_10_hit + - tst_11_shape + - tst_11_hit + - tst_12_shape + - tst_12_hit + - tst_13_shape + - tst_13_hit + - tst_20_shape + - tst_20_hit + - jan_00_shape + - jan_00_hit + - jan_01_shape + - jan_01_hit + - jan_02_shape + - jan_02_hit + - jan_03_shape + - jan_03_hit + - jan_04_shape + - jan_04_hit + - jan_05_shape + - jan_05_hit + - jan_06_shape + - jan_06_hit + - jan_07_shape + - jan_07_hit + - jan_08_shape + - jan_08_hit + - jan_09_shape + - jan_09_hit + - jan_10_shape + - jan_10_hit + - jan_11_shape + - jan_11_hit + - jan_12_shape + - jan_12_hit + - jan_13_shape + - jan_13_hit + - jan_14_shape + - jan_14_hit + - jan_15_shape + - jan_15_hit + - jan_16_shape + - jan_16_hit + - jan_17_shape + - jan_17_hit + - jan_18_shape + - jan_18_hit + - jan_19_shape + - jan_19_hit + - jan_22_shape + - jan_22_hit + - jan_23_shape + - jan_23_hit + - mim_01_shape + - mim_01_hit + - mim_02_shape + - mim_02_hit + - mim_03_shape + - mim_03_hit + - mim_04_shape + - mim_04_hit + - mim_05_shape + - mim_05_hit + - mim_06_shape + - mim_06_hit + - mim_07_shape + - mim_07_hit + - mim_08_shape + - mim_08_hit + - mim_09_shape + - mim_09_hit + - mim_10_shape + - mim_10_hit + - mim_11_shape + - mim_11_hit + - mim_12_shape + - mim_12_hit + - obk_01_shape + - obk_01_hit + - obk_02_shape + - obk_02_hit + - obk_03_shape + - obk_03_hit + - obk_04_shape + - obk_04_hit + - obk_05_shape + - obk_05_hit + - obk_06_shape + - obk_06_hit + - obk_07_shape + - obk_07_hit + - obk_08_shape + - obk_08_hit + - obk_09_shape + - obk_09_hit + - arn_02_shape + - arn_02_hit + - arn_03_shape + - arn_03_hit + - arn_04_shape + - arn_04_hit + - arn_05_shape + - arn_05_hit + - arn_07_shape + - arn_07_hit + - arn_08_shape + - arn_08_hit + - arn_09_shape + - arn_09_hit + - arn_10_shape + - arn_10_hit + - arn_11_shape + - arn_11_hit + - arn_12_shape + - arn_12_hit + - arn_13_shape + - arn_13_hit + - arn_20_shape + - arn_20_hit + - dgb_01_shape + - dgb_01_hit + - dgb_02_shape + - dgb_02_hit + - dgb_03_shape + - dgb_03_hit + - dgb_04_shape + - dgb_04_hit + - dgb_05_shape + - dgb_05_hit + - dgb_06_shape + - dgb_06_hit + - dgb_07_shape + - dgb_07_hit + - dgb_08_shape + - dgb_08_hit + - dgb_09_shape + - dgb_09_hit + - dgb_10_shape + - dgb_10_hit + - dgb_11_shape + - dgb_11_hit + - dgb_12_shape + - dgb_12_hit + - dgb_13_shape + - dgb_13_hit + - dgb_14_shape + - dgb_14_hit + - dgb_15_shape + - dgb_15_hit + - dgb_16_shape + - dgb_16_hit + - dgb_17_shape + - dgb_17_hit + - dgb_18_shape + - dgb_18_hit + - kzn_01_shape + - kzn_01_hit + - kzn_02_shape + - kzn_02_hit + - kzn_03_shape + - kzn_03_hit + - kzn_04_shape + - kzn_04_hit + - kzn_05_shape + - kzn_05_hit + - kzn_06_shape + - kzn_06_hit + - kzn_07_shape + - kzn_07_hit + - kzn_08_shape + - kzn_08_hit + - kzn_09_shape + - kzn_09_hit + - kzn_10_shape + - kzn_10_hit + - kzn_11_shape + - kzn_11_hit + - kzn_17_shape + - kzn_17_hit + - kzn_18_shape + - kzn_18_hit + - kzn_19_shape + - kzn_19_hit + - kzn_20_shape + - kzn_20_hit + - kzn_22_shape + - kzn_22_hit + - kzn_23_shape + - kzn_23_hit + - flo_00_shape + - flo_00_hit + - flo_03_shape + - flo_03_hit + - flo_07_shape + - flo_07_hit + - flo_08_shape + - flo_08_hit + - flo_09_shape + - flo_09_hit + - flo_10_shape + - flo_10_hit + - flo_11_shape + - flo_11_hit + - flo_12_shape + - flo_12_hit + - flo_13_shape + - flo_13_hit + - flo_14_shape + - flo_14_hit + - flo_15_shape + - flo_15_hit + - flo_16_shape + - flo_16_hit + - flo_17_shape + - flo_17_hit + - flo_18_shape + - flo_18_hit + - flo_19_shape + - flo_19_hit + - flo_21_shape + - flo_21_hit + - flo_22_shape + - flo_22_hit + - flo_23_shape + - flo_23_hit + - flo_24_shape + - flo_24_hit + - flo_25_shape + - flo_25_hit + - sam_01_shape + - sam_01_hit + - sam_02_shape + - sam_02_hit + - sam_03_shape + - sam_03_hit + - sam_04_shape + - sam_04_hit + - sam_05_shape + - sam_05_hit + - sam_06_shape + - sam_06_hit + - sam_07_shape + - sam_07_hit + - sam_08_shape + - sam_08_hit + - sam_09_shape + - sam_09_hit + - sam_10_shape + - sam_10_hit + - sam_11_shape + - sam_11_hit + - sam_12_shape + - sam_12_hit + - pra_01_shape + - pra_01_hit + - pra_02_shape + - pra_02_hit + - pra_03_shape + - pra_03_hit + - pra_04_shape + - pra_04_hit + - pra_05_shape + - pra_05_hit + - pra_09_shape + - pra_09_hit + - pra_10_shape + - pra_10_hit + - pra_11_shape + - pra_11_hit + - pra_13_shape + - pra_13_hit + - pra_14_shape + - pra_14_hit + - pra_15_shape + - pra_15_hit + - pra_16_shape + - pra_16_hit + - pra_18_shape + - pra_18_hit + - pra_19_shape + - pra_19_hit + - pra_20_shape + - pra_20_hit + - pra_21_shape + - pra_21_hit + - pra_22_shape + - pra_22_hit + - pra_29_shape + - pra_29_hit + - pra_31_shape + - pra_31_hit + - pra_32_shape + - pra_32_hit + - pra_33_shape + - pra_33_hit + - pra_34_shape + - pra_34_hit + - pra_35_shape + - pra_35_hit + - pra_40_shape + - pra_40_hit + - omo_01_shape + - omo_01_hit + - omo_02_shape + - omo_02_hit + - omo_03_shape + - omo_03_hit + - omo_04_shape + - omo_04_hit + - omo_05_shape + - omo_05_hit + - omo_06_shape + - omo_06_hit + - omo_07_shape + - omo_07_hit + - omo_08_shape + - omo_08_hit + - omo_09_shape + - omo_09_hit + - omo_10_shape + - omo_10_hit + - omo_11_shape + - omo_11_hit + - omo_12_shape + - omo_12_hit + - omo_13_shape + - omo_13_hit + - omo_14_shape + - omo_14_hit + - omo_15_shape + - omo_15_hit + - omo_16_shape + - omo_16_hit + - omo_17_shape + - omo_17_hit + - end_00_shape + - end_00_hit + - end_01_shape + - end_01_hit + - mgm_00_shape + - mgm_00_hit + - mgm_01_shape + - mgm_01_hit + - mgm_02_shape + - mgm_02_hit + - mgm_03_shape + - mgm_03_hit + - gv_01_shape + - gv_01_hit + - kmr_bt03_shape + - kmr_bt03_hit + - kmr_bt04_shape + - kmr_bt04_hit + - kmr_bt05_shape + - kmr_bt05_hit + - kmr_bt06_shape + - kmr_bt06_hit + - nok_bt01_shape + - nok_bt01_hit + - nok_bt02_shape + - nok_bt02_hit + - nok_bt03_shape + - nok_bt03_hit + - nok_bt04_shape + - nok_bt04_hit + - trd_bt00_shape + - trd_bt00_hit + - trd_bt01_shape + - trd_bt01_hit + - trd_bt02_shape + - trd_bt02_hit + - trd_bt03_shape + - trd_bt03_hit + - trd_bt04_shape + - trd_bt04_hit + - trd_bt05_shape + - trd_bt05_hit + - iwa_bt01_shape + - iwa_bt01_hit + - iwa_bt02_shape + - iwa_bt02_hit + - sbk_bt02_shape + - sbk_bt02_hit + - isk_bt01_shape + - isk_bt01_hit + - isk_bt02_shape + - isk_bt02_hit + - isk_bt03_shape + - isk_bt03_hit + - isk_bt04_shape + - isk_bt04_hit + - isk_bt05_shape + - isk_bt05_hit + - isk_bt06_shape + - isk_bt06_hit + - isk_bt07_shape + - isk_bt07_hit + - isk_bt08_shape + - isk_bt08_hit + - arn_bt01_shape + - arn_bt01_hit + - arn_bt02_shape + - arn_bt02_hit + - arn_bt03_shape + - arn_bt03_hit + - arn_bt04_shape + - arn_bt04_hit + - arn_bt05_shape + - arn_bt05_hit + - arn_bt06_shape + - arn_bt06_hit + - dgb_bt01_shape + - dgb_bt01_hit + - dgb_bt02_shape + - dgb_bt02_hit + - dgb_bt03_shape + - dgb_bt03_hit + - dgb_bt04_shape + - dgb_bt04_hit + - dgb_bt05_shape + - dgb_bt05_hit + - mim_bt01_shape + - mim_bt01_hit + - omo_bt01_shape + - omo_bt01_hit + - omo_bt02_shape + - omo_bt02_hit + - omo_bt03_shape + - omo_bt03_hit + - omo_bt04_shape + - omo_bt04_hit + - omo_bt05_shape + - omo_bt05_hit + - omo_bt06_shape + - omo_bt06_hit + - omo_bt07_shape + - omo_bt07_hit + - kgr_bt01_shape + - kgr_bt01_hit + - flo_bt01_shape + - flo_bt01_hit + - flo_bt02_shape + - flo_bt02_hit + - flo_bt03_shape + - flo_bt03_hit + - flo_bt04_shape + - flo_bt04_hit + - flo_bt05_shape + - flo_bt05_hit + - flo_bt06_shape + - flo_bt06_hit + - jan_bt00_shape + - jan_bt00_hit + - jan_bt01_shape + - jan_bt01_hit + - jan_bt02_shape + - jan_bt02_hit + - jan_bt03_shape + - jan_bt03_hit + - jan_bt04_shape + - jan_bt04_hit + - kzn_bt01_shape + - kzn_bt01_hit + - kzn_bt02_shape + - kzn_bt02_hit + - kzn_bt04_shape + - kzn_bt04_hit + - kzn_bt05_shape + - kzn_bt05_hit + - sam_bt01_shape + - sam_bt01_hit + - sam_bt02_shape + - sam_bt02_hit + - sam_bt03_shape + - sam_bt03_hit + - sam_bt04_shape + - sam_bt04_hit + - tik_bt01_shape + - tik_bt01_hit + - tik_bt02_shape + - tik_bt02_hit + - tik_bt03_shape + - tik_bt03_hit + - tik_bt04_shape + - tik_bt04_hit + - tik_bt05_shape + - tik_bt05_hit + - pra_bt01_shape + - pra_bt01_hit + - pra_bt02_shape + - pra_bt02_hit + - pra_bt03_shape + - pra_bt03_hit + - pra_bt04_shape + - pra_bt04_hit + - mac_bt01_shape + - mac_bt01_hit + - mac_bt02_shape + - mac_bt02_hit + - kpa_bt01_shape + - kpa_bt01_hit + - kpa_bt02_shape + - kpa_bt02_hit + - kpa_bt03_shape + - kpa_bt03_hit + - kpa_bt04_shape + - kpa_bt04_hit + - kpa_bt05_shape + - kpa_bt05_hit + - kpa_bt07_shape + - kpa_bt07_hit + - kpa_bt08_shape + - kpa_bt08_hit + - kpa_bt09_shape + - kpa_bt09_hit + - kpa_bt11_shape + - kpa_bt11_hit + - kpa_bt13_shape + - kpa_bt13_hit + - kpa_bt14_shape + - kpa_bt14_hit + - hos_bt01_shape + - hos_bt01_hit + - hos_bt02_shape + - hos_bt02_hit + - kkj_bt01_shape + - kkj_bt01_hit + - kkj_bt02_shape + - kkj_bt02_hit + - mac_tex + - tik_tex + - kgr_tex + - kmr_tex + - iwa_tex + - sbk_tex + - dro_tex + - isk_tex + - trd_tex + - nok_tex + - hos_tex + - kpa_tex + - osr_tex + - kkj_tex + - tst_tex + - jan_tex + - mim_tex + - obk_tex + - arn_tex + - dgb_tex + - kzn_tex + - flo_tex + - sam_tex + - pra_tex + - omo_tex + - end_tex + - mgm_tex + - gv__tex + - kmr_bg + - nok_bg + - sbk_bg + - sbk3_bg + - iwa_bg + - hos_bg + - arn_bg + - obk_bg + - omo_bg + - yos_bg + - jan_bg + - fla_bg + - flb_bg + - sra_bg + - yki_bg + - sam_bg + - kpa_bg + - title_bg + - title_data + - party_kurio + - party_kameki + - party_pinki + - party_pareta + - party_resa + - party_akari + - party_opuku + - party_pokopi + - [0x027BCB14, bin] - [0x2800000] diff --git a/ver/us/asm/nonmatchings/362a0_len_2f70/load_hit_asset.s b/ver/us/asm/nonmatchings/362a0_len_2f70/load_hit_asset.s deleted file mode 100644 index e43334ba35..0000000000 --- a/ver/us/asm/nonmatchings/362a0_len_2f70/load_hit_asset.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel load_hit_asset -/* 363C0 8005AFC0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 363C4 8005AFC4 AFBF0024 */ sw $ra, 0x24($sp) -/* 363C8 8005AFC8 AFB20020 */ sw $s2, 0x20($sp) -/* 363CC 8005AFCC AFB1001C */ sw $s1, 0x1c($sp) -/* 363D0 8005AFD0 0C016AFA */ jal get_current_map_header -/* 363D4 8005AFD4 AFB00018 */ sw $s0, 0x18($sp) -/* 363D8 8005AFD8 3C04800E */ lui $a0, %hi(D_800D91E0) -/* 363DC 8005AFDC 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) -/* 363E0 8005AFE0 27A50010 */ addiu $a1, $sp, 0x10 -/* 363E4 8005AFE4 0C016B3A */ jal load_asset_by_name -/* 363E8 8005AFE8 0040902D */ daddu $s2, $v0, $zero -/* 363EC 8005AFEC 8FA40010 */ lw $a0, 0x10($sp) -/* 363F0 8005AFF0 0C00AB39 */ jal heap_malloc -/* 363F4 8005AFF4 0040882D */ daddu $s1, $v0, $zero -/* 363F8 8005AFF8 0220202D */ daddu $a0, $s1, $zero -/* 363FC 8005AFFC 0040802D */ daddu $s0, $v0, $zero -/* 36400 8005B000 0C01BB7C */ jal decode_yay0 -/* 36404 8005B004 0200282D */ daddu $a1, $s0, $zero -/* 36408 8005B008 0C00AB1E */ jal general_heap_free -/* 3640C 8005B00C 0220202D */ daddu $a0, $s1, $zero -/* 36410 8005B010 8E020000 */ lw $v0, ($s0) -/* 36414 8005B014 0000202D */ daddu $a0, $zero, $zero -/* 36418 8005B018 AE420004 */ sw $v0, 4($s2) -/* 3641C 8005B01C 8E020004 */ lw $v0, 4($s0) -/* 36420 8005B020 0200282D */ daddu $a1, $s0, $zero -/* 36424 8005B024 0C016C8F */ jal load_hit_data -/* 36428 8005B028 AE420008 */ sw $v0, 8($s2) -/* 3642C 8005B02C 24040001 */ addiu $a0, $zero, 1 -/* 36430 8005B030 0C016C8F */ jal load_hit_data -/* 36434 8005B034 0200282D */ daddu $a1, $s0, $zero -/* 36438 8005B038 0C00AB4B */ jal heap_free -/* 3643C 8005B03C 0200202D */ daddu $a0, $s0, $zero -/* 36440 8005B040 8FBF0024 */ lw $ra, 0x24($sp) -/* 36444 8005B044 8FB20020 */ lw $s2, 0x20($sp) -/* 36448 8005B048 8FB1001C */ lw $s1, 0x1c($sp) -/* 3644C 8005B04C 8FB00018 */ lw $s0, 0x18($sp) -/* 36450 8005B050 03E00008 */ jr $ra -/* 36454 8005B054 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/362a0_len_2f70/load_stage_collision.s b/ver/us/asm/nonmatchings/362a0_len_2f70/load_stage_collision.s deleted file mode 100644 index 009a28ee37..0000000000 --- a/ver/us/asm/nonmatchings/362a0_len_2f70/load_stage_collision.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel load_stage_collision -/* 365A0 8005B1A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 365A4 8005B1A4 AFB00018 */ sw $s0, 0x18($sp) -/* 365A8 8005B1A8 0080802D */ daddu $s0, $a0, $zero -/* 365AC 8005B1AC AFBF0024 */ sw $ra, 0x24($sp) -/* 365B0 8005B1B0 AFB20020 */ sw $s2, 0x20($sp) -/* 365B4 8005B1B4 16000005 */ bnez $s0, .L8005B1CC -/* 365B8 8005B1B8 AFB1001C */ sw $s1, 0x1c($sp) -/* 365BC 8005B1BC 3C01800B */ lui $at, %hi(gCollisionData+0xC) -/* 365C0 8005B1C0 A42042EC */ sh $zero, %lo(gCollisionData+0xC)($at) -/* 365C4 8005B1C4 08016C89 */ j .L8005B224 -/* 365C8 8005B1C8 00000000 */ nop -.L8005B1CC: -/* 365CC 8005B1CC 0C016AFA */ jal get_current_map_header -/* 365D0 8005B1D0 00000000 */ nop -/* 365D4 8005B1D4 0200202D */ daddu $a0, $s0, $zero -/* 365D8 8005B1D8 27A50010 */ addiu $a1, $sp, 0x10 -/* 365DC 8005B1DC 0C016B3A */ jal load_asset_by_name -/* 365E0 8005B1E0 0040902D */ daddu $s2, $v0, $zero -/* 365E4 8005B1E4 8FA40010 */ lw $a0, 0x10($sp) -/* 365E8 8005B1E8 0C00AB39 */ jal heap_malloc -/* 365EC 8005B1EC 0040882D */ daddu $s1, $v0, $zero -/* 365F0 8005B1F0 0220202D */ daddu $a0, $s1, $zero -/* 365F4 8005B1F4 0040802D */ daddu $s0, $v0, $zero -/* 365F8 8005B1F8 0C01BB7C */ jal decode_yay0 -/* 365FC 8005B1FC 0200282D */ daddu $a1, $s0, $zero -/* 36600 8005B200 0C00AB1E */ jal general_heap_free -/* 36604 8005B204 0220202D */ daddu $a0, $s1, $zero -/* 36608 8005B208 0000202D */ daddu $a0, $zero, $zero -/* 3660C 8005B20C 8E020000 */ lw $v0, ($s0) -/* 36610 8005B210 0200282D */ daddu $a1, $s0, $zero -/* 36614 8005B214 0C016C8F */ jal load_hit_data -/* 36618 8005B218 AE420004 */ sw $v0, 4($s2) -/* 3661C 8005B21C 0C00AB4B */ jal heap_free -/* 36620 8005B220 0200202D */ daddu $a0, $s0, $zero -.L8005B224: -/* 36624 8005B224 8FBF0024 */ lw $ra, 0x24($sp) -/* 36628 8005B228 8FB20020 */ lw $s2, 0x20($sp) -/* 3662C 8005B22C 8FB1001C */ lw $s1, 0x1c($sp) -/* 36630 8005B230 8FB00018 */ lw $s0, 0x18($sp) -/* 36634 8005B234 03E00008 */ jr $ra -/* 36638 8005B238 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/state_battle/state_step_end_battle.s b/ver/us/asm/nonmatchings/state_battle/state_step_end_battle.s index 7575789489..d67b2e4990 100644 --- a/ver/us/asm/nonmatchings/state_battle/state_step_end_battle.s +++ b/ver/us/asm/nonmatchings/state_battle/state_step_end_battle.s @@ -108,8 +108,8 @@ glabel state_step_end_battle /* F158 80033D58 80440012 */ lb $a0, 0x12($v0) /* F15C 80033D5C 0C0169B0 */ jal load_map_script_lib /* F160 80033D60 00000000 */ nop -/* F164 80033D64 3C04800E */ lui $a0, %hi(D_800D9230) -/* F168 80033D68 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* F164 80033D64 3C04800E */ lui $a0, %hi(mapShapeName) +/* F168 80033D68 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* F16C 80033D6C 0C016B3A */ jal load_asset_by_name /* F170 80033D70 27A50010 */ addiu $a1, $sp, 0x10 /* F174 80033D74 0040802D */ daddu $s0, $v0, $zero @@ -145,8 +145,8 @@ glabel state_step_end_battle /* F1E4 80033DE4 0C05179C */ jal set_background_size /* F1E8 80033DE8 24070014 */ addiu $a3, $zero, 0x14 .L80033DEC: -/* F1EC 80033DEC 3C04800B */ lui $a0, %hi(D_800B0CF0) -/* F1F0 80033DF0 24840CF0 */ addiu $a0, $a0, %lo(D_800B0CF0) +/* F1EC 80033DEC 3C04800B */ lui $a0, %hi(mapTexName) +/* F1F0 80033DF0 24840CF0 */ addiu $a0, $a0, %lo(mapTexName) /* F1F4 80033DF4 0C016B74 */ jal get_asset_offset /* F1F8 80033DF8 27A50010 */ addiu $a1, $sp, 0x10 /* F1FC 80033DFC 8E440000 */ lw $a0, ($s2) diff --git a/ver/us/asm/nonmatchings/state_file_select/state_step_exit_language_select.s b/ver/us/asm/nonmatchings/state_file_select/state_step_exit_language_select.s index d27c9a9f7d..9e85299ad3 100644 --- a/ver/us/asm/nonmatchings/state_file_select/state_step_exit_language_select.s +++ b/ver/us/asm/nonmatchings/state_file_select/state_step_exit_language_select.s @@ -164,8 +164,8 @@ glabel L80035814_10C14 /* 10D44 80035944 00000000 */ nop /* 10D48 80035948 0C0515CA */ jal init_trigger_list /* 10D4C 8003594C 00000000 */ nop -/* 10D50 80035950 3C04800E */ lui $a0, %hi(D_800D9230) -/* 10D54 80035954 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* 10D50 80035950 3C04800E */ lui $a0, %hi(mapShapeName) +/* 10D54 80035954 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* 10D58 80035958 0C016B3A */ jal load_asset_by_name /* 10D5C 8003595C 27A50010 */ addiu $a1, $sp, 0x10 /* 10D60 80035960 0040802D */ daddu $s0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s index dd006afa10..0d465da003 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s @@ -13,15 +13,15 @@ glabel D_802402C0_A93420 glabel func_80240000_A93160 /* A93160 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A93164 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* A93168 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* A93164 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* A93168 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* A9316C 8024000C 3C058024 */ lui $a1, %hi(D_802402B0_A93410) /* A93170 80240010 24A502B0 */ addiu $a1, $a1, %lo(D_802402B0_A93410) /* A93174 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A93178 80240018 0C01953C */ jal sprintf /* A9317C 8024001C 00000000 */ nop -/* A93180 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) -/* A93184 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* A93180 80240020 3C04800E */ lui $a0, %hi(mapHitName) +/* A93184 80240024 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* A93188 80240028 3C058024 */ lui $a1, %hi(D_802402C0_A93420) /* A9318C 8024002C 0C01953C */ jal sprintf /* A93190 80240030 24A502C0 */ addiu $a1, $a1, %lo(D_802402C0_A93420) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s index 907526128d..b8cb618f18 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s @@ -13,15 +13,15 @@ glabel D_802402E0_A93720 glabel func_80240000_A93440 /* A93440 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A93444 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* A93448 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* A93444 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* A93448 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* A9344C 8024000C 3C058024 */ lui $a1, %hi(D_802402D0_A93710) /* A93450 80240010 24A502D0 */ addiu $a1, $a1, %lo(D_802402D0_A93710) /* A93454 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A93458 80240018 0C01953C */ jal sprintf /* A9345C 8024001C 00000000 */ nop -/* A93460 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) -/* A93464 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* A93460 80240020 3C04800E */ lui $a0, %hi(mapHitName) +/* A93464 80240024 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* A93468 80240028 3C058024 */ lui $a1, %hi(D_802402E0_A93720) /* A9346C 8024002C 0C01953C */ jal sprintf /* A93470 80240030 24A502E0 */ addiu $a1, $a1, %lo(D_802402E0_A93720) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s index bca79da242..3beccefc08 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s @@ -13,15 +13,15 @@ glabel D_802403A0_A9ED20 glabel func_80240000_A9E980 /* A9E980 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9E984 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* A9E988 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* A9E984 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* A9E988 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* A9E98C 8024000C 3C058024 */ lui $a1, %hi(D_80240390_A9ED10) /* A9E990 80240010 24A50390 */ addiu $a1, $a1, %lo(D_80240390_A9ED10) /* A9E994 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A9E998 80240018 0C01953C */ jal sprintf /* A9E99C 8024001C 00000000 */ nop -/* A9E9A0 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) -/* A9E9A4 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* A9E9A0 80240020 3C04800E */ lui $a0, %hi(mapHitName) +/* A9E9A4 80240024 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* A9E9A8 80240028 3C058024 */ lui $a1, %hi(D_802403A0_A9ED20) /* A9E9AC 8024002C 0C01953C */ jal sprintf /* A9E9B0 80240030 24A503A0 */ addiu $a1, $a1, %lo(D_802403A0_A9ED20) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A64090/func_80240000_A64090.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A64090/func_80240000_A64090.s index 10c20ecd89..cfb56c08d6 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A64090/func_80240000_A64090.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A64090/func_80240000_A64090.s @@ -13,15 +13,15 @@ glabel D_80242F30_A66FC0 glabel func_80240000_A64090 /* A64090 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A64094 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* A64098 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* A64094 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* A64098 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* A6409C 8024000C 3C058024 */ lui $a1, %hi(D_80242F20_A66FB0) /* A640A0 80240010 24A52F20 */ addiu $a1, $a1, %lo(D_80242F20_A66FB0) /* A640A4 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A640A8 80240018 0C01953C */ jal sprintf /* A640AC 8024001C 00000000 */ nop -/* A640B0 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) -/* A640B4 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* A640B0 80240020 3C04800E */ lui $a0, %hi(mapHitName) +/* A640B4 80240024 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* A640B8 80240028 3C058024 */ lui $a1, %hi(D_80242F30_A66FC0) /* A640BC 8024002C 0C01953C */ jal sprintf /* A640C0 80240030 24A52F30 */ addiu $a1, $a1, %lo(D_80242F30_A66FC0) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240000_A6ACA0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240000_A6ACA0.s index e96d8f6e7f..c3f8a16d55 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240000_A6ACA0.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240000_A6ACA0.s @@ -13,8 +13,8 @@ glabel D_80241E30_A6CAD0 glabel func_80240000_A6ACA0 /* A6ACA0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A6ACA4 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* A6ACA8 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* A6ACA4 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* A6ACA8 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* A6ACAC 8024000C 3C058024 */ lui $a1, %hi(D_80241E20_A6CAC0) /* A6ACB0 80240010 24A51E20 */ addiu $a1, $a1, %lo(D_80241E20_A6CAC0) /* A6ACB4 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -23,8 +23,8 @@ glabel func_80240000_A6ACA0 /* A6ACC0 80240020 AFBF0010 */ sw $ra, 0x10($sp) /* A6ACC4 80240024 0C01953C */ jal sprintf /* A6ACC8 80240028 A0620084 */ sb $v0, 0x84($v1) -/* A6ACCC 8024002C 3C04800E */ lui $a0, %hi(D_800D91E0) -/* A6ACD0 80240030 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* A6ACCC 8024002C 3C04800E */ lui $a0, %hi(mapHitName) +/* A6ACD0 80240030 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* A6ACD4 80240034 3C058024 */ lui $a1, %hi(D_80241E30_A6CAD0) /* A6ACD8 80240038 0C01953C */ jal sprintf /* A6ACDC 8024003C 24A51E30 */ addiu $a1, $a1, %lo(D_80241E30_A6CAD0) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A784C0/func_80240000_A784C0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A784C0/func_80240000_A784C0.s index 0d3ac67462..61edf4f375 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A784C0/func_80240000_A784C0.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A784C0/func_80240000_A784C0.s @@ -13,15 +13,15 @@ glabel D_80242010_A7A4D0 glabel func_80240000_A784C0 /* A784C0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A784C4 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* A784C8 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* A784C4 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* A784C8 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* A784CC 8024000C 3C058024 */ lui $a1, %hi(D_80242000_A7A4C0) /* A784D0 80240010 24A52000 */ addiu $a1, $a1, %lo(D_80242000_A7A4C0) /* A784D4 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A784D8 80240018 0C01953C */ jal sprintf /* A784DC 8024001C 00000000 */ nop -/* A784E0 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) -/* A784E4 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* A784E0 80240020 3C04800E */ lui $a0, %hi(mapHitName) +/* A784E4 80240024 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* A784E8 80240028 3C058024 */ lui $a1, %hi(D_80242010_A7A4D0) /* A784EC 8024002C 0C01953C */ jal sprintf /* A784F0 80240030 24A52010 */ addiu $a1, $a1, %lo(D_80242010_A7A4D0) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A500/func_80240000_A7A500.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A500/func_80240000_A7A500.s index 396a8641ae..22aa5ca92a 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A500/func_80240000_A7A500.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A500/func_80240000_A7A500.s @@ -13,15 +13,15 @@ glabel D_80248F70_A83470 glabel func_80240000_A7A500 /* A7A500 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A7A504 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* A7A508 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* A7A504 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* A7A508 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* A7A50C 8024000C 3C058025 */ lui $a1, %hi(D_80248F60_A83460) /* A7A510 80240010 24A58F60 */ addiu $a1, $a1, %lo(D_80248F60_A83460) /* A7A514 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A7A518 80240018 0C01953C */ jal sprintf /* A7A51C 8024001C 00000000 */ nop -/* A7A520 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) -/* A7A524 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* A7A520 80240020 3C04800E */ lui $a0, %hi(mapHitName) +/* A7A524 80240024 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* A7A528 80240028 3C058025 */ lui $a1, %hi(D_80248F70_A83470) /* A7A52C 8024002C 0C01953C */ jal sprintf /* A7A530 80240030 24A58F70 */ addiu $a1, $a1, %lo(D_80248F70_A83470) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s index eccdaba4fe..f5e5eb3eac 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s @@ -13,15 +13,15 @@ glabel D_80243300_A86790 glabel func_80240000_A83490 /* A83490 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A83494 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* A83498 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* A83494 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* A83498 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* A8349C 8024000C 3C058024 */ lui $a1, %hi(D_802432F0_A86780) /* A834A0 80240010 24A532F0 */ addiu $a1, $a1, %lo(D_802432F0_A86780) /* A834A4 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A834A8 80240018 0C01953C */ jal sprintf /* A834AC 8024001C 00000000 */ nop -/* A834B0 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) -/* A834B4 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* A834B0 80240020 3C04800E */ lui $a0, %hi(mapHitName) +/* A834B4 80240024 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* A834B8 80240028 3C058024 */ lui $a1, %hi(D_80243300_A86790) /* A834BC 8024002C 0C01953C */ jal sprintf /* A834C0 80240030 24A53300 */ addiu $a1, $a1, %lo(D_80243300_A86790) diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240000_AB92B0.s b/ver/us/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240000_AB92B0.s index d7235ff094..28468cf784 100644 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240000_AB92B0.s +++ b/ver/us/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240000_AB92B0.s @@ -13,8 +13,8 @@ glabel D_80241FC0_ABB270 glabel func_80240000_AB92B0 /* AB92B0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB92B4 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* AB92B8 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* AB92B4 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* AB92B8 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* AB92BC 8024000C 3C058024 */ lui $a1, %hi(D_80241FB0_ABB260) /* AB92C0 80240010 24A51FB0 */ addiu $a1, $a1, %lo(D_80241FB0_ABB260) /* AB92C4 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -23,8 +23,8 @@ glabel func_80240000_AB92B0 /* AB92D0 80240020 AFBF0010 */ sw $ra, 0x10($sp) /* AB92D4 80240024 0C01953C */ jal sprintf /* AB92D8 80240028 A0620084 */ sb $v0, 0x84($v1) -/* AB92DC 8024002C 3C04800E */ lui $a0, %hi(D_800D91E0) -/* AB92E0 80240030 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* AB92DC 8024002C 3C04800E */ lui $a0, %hi(mapHitName) +/* AB92E0 80240030 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* AB92E4 80240034 3C058024 */ lui $a1, %hi(D_80241FC0_ABB270) /* AB92E8 80240038 0C01953C */ jal sprintf /* AB92EC 8024003C 24A51FC0 */ addiu $a1, $a1, %lo(D_80241FC0_ABB270) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s b/ver/us/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s index df59ba44b1..6d728df9cc 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s @@ -13,8 +13,8 @@ glabel D_80241440_D58870 glabel func_80240000_D57430 /* D57430 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D57434 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* D57438 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* D57434 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* D57438 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* D5743C 8024000C 3C058024 */ lui $a1, %hi(D_80241430_D58860) /* D57440 80240010 24A51430 */ addiu $a1, $a1, %lo(D_80241430_D58860) /* D57444 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -23,8 +23,8 @@ glabel func_80240000_D57430 /* D57450 80240020 AFBF0010 */ sw $ra, 0x10($sp) /* D57454 80240024 0C01953C */ jal sprintf /* D57458 80240028 A0620084 */ sb $v0, 0x84($v1) -/* D5745C 8024002C 3C04800E */ lui $a0, %hi(D_800D91E0) -/* D57460 80240030 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* D5745C 8024002C 3C04800E */ lui $a0, %hi(mapHitName) +/* D57460 80240030 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* D57464 80240034 3C058024 */ lui $a1, %hi(D_80241440_D58870) /* D57468 80240038 0C01953C */ jal sprintf /* D5746C 8024003C 24A51440 */ addiu $a1, $a1, %lo(D_80241440_D58870) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240000_D62D10.s b/ver/us/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240000_D62D10.s index c315a5b9af..d0b7ef0500 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240000_D62D10.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240000_D62D10.s @@ -13,8 +13,8 @@ glabel D_802418B0_D645C0 glabel func_80240000_D62D10 /* D62D10 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D62D14 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* D62D18 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* D62D14 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* D62D18 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* D62D1C 8024000C 3C058024 */ lui $a1, %hi(D_802418A0_D645B0) /* D62D20 80240010 24A518A0 */ addiu $a1, $a1, %lo(D_802418A0_D645B0) /* D62D24 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -23,8 +23,8 @@ glabel func_80240000_D62D10 /* D62D30 80240020 AFBF0010 */ sw $ra, 0x10($sp) /* D62D34 80240024 0C01953C */ jal sprintf /* D62D38 80240028 A0620084 */ sb $v0, 0x84($v1) -/* D62D3C 8024002C 3C04800E */ lui $a0, %hi(D_800D91E0) -/* D62D40 80240030 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* D62D3C 8024002C 3C04800E */ lui $a0, %hi(mapHitName) +/* D62D40 80240030 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* D62D44 80240034 3C058024 */ lui $a1, %hi(D_802418B0_D645C0) /* D62D48 80240038 0C01953C */ jal sprintf /* D62D4C 8024003C 24A518B0 */ addiu $a1, $a1, %lo(D_802418B0_D645C0) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240000_D799F0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240000_D799F0.s index 2f9bd269c1..87d4567aa5 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240000_D799F0.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240000_D799F0.s @@ -13,8 +13,8 @@ glabel D_80241890_D7B280 glabel func_80240000_D799F0 /* D799F0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D799F4 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* D799F8 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* D799F4 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* D799F8 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* D799FC 8024000C 3C058024 */ lui $a1, %hi(D_80241880_D7B270) /* D79A00 80240010 24A51880 */ addiu $a1, $a1, %lo(D_80241880_D7B270) /* D79A04 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -23,8 +23,8 @@ glabel func_80240000_D799F0 /* D79A10 80240020 AFBF0010 */ sw $ra, 0x10($sp) /* D79A14 80240024 0C01953C */ jal sprintf /* D79A18 80240028 A0620084 */ sb $v0, 0x84($v1) -/* D79A1C 8024002C 3C04800E */ lui $a0, %hi(D_800D91E0) -/* D79A20 80240030 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* D79A1C 8024002C 3C04800E */ lui $a0, %hi(mapHitName) +/* D79A20 80240030 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* D79A24 80240034 3C058024 */ lui $a1, %hi(D_80241890_D7B280) /* D79A28 80240038 0C01953C */ jal sprintf /* D79A2C 8024003C 24A51890 */ addiu $a1, $a1, %lo(D_80241890_D7B280) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240000_D7B2A0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240000_D7B2A0.s index df5c460310..2256575dde 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240000_D7B2A0.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240000_D7B2A0.s @@ -13,8 +13,8 @@ glabel D_80241890_D7CB30 glabel func_80240000_D7B2A0 /* D7B2A0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7B2A4 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* D7B2A8 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* D7B2A4 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* D7B2A8 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* D7B2AC 8024000C 3C058024 */ lui $a1, %hi(D_80241880_D7CB20) /* D7B2B0 80240010 24A51880 */ addiu $a1, $a1, %lo(D_80241880_D7CB20) /* D7B2B4 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -23,8 +23,8 @@ glabel func_80240000_D7B2A0 /* D7B2C0 80240020 AFBF0010 */ sw $ra, 0x10($sp) /* D7B2C4 80240024 0C01953C */ jal sprintf /* D7B2C8 80240028 A0620084 */ sb $v0, 0x84($v1) -/* D7B2CC 8024002C 3C04800E */ lui $a0, %hi(D_800D91E0) -/* D7B2D0 80240030 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* D7B2CC 8024002C 3C04800E */ lui $a0, %hi(mapHitName) +/* D7B2D0 80240030 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* D7B2D4 80240034 3C058024 */ lui $a1, %hi(D_80241890_D7CB30) /* D7B2D8 80240038 0C01953C */ jal sprintf /* D7B2DC 8024003C 24A51890 */ addiu $a1, $a1, %lo(D_80241890_D7CB30) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240000_D91700.s b/ver/us/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240000_D91700.s index b7a1dea17d..2037c84266 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240000_D91700.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240000_D91700.s @@ -13,8 +13,8 @@ glabel D_80241820_D92F20 glabel func_80240000_D91700 /* D91700 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D91704 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* D91708 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* D91704 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* D91708 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* D9170C 8024000C 3C058024 */ lui $a1, %hi(D_80241810_D92F10) /* D91710 80240010 24A51810 */ addiu $a1, $a1, %lo(D_80241810_D92F10) /* D91714 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -23,8 +23,8 @@ glabel func_80240000_D91700 /* D91720 80240020 AFBF0010 */ sw $ra, 0x10($sp) /* D91724 80240024 0C01953C */ jal sprintf /* D91728 80240028 A0620084 */ sb $v0, 0x84($v1) -/* D9172C 8024002C 3C04800E */ lui $a0, %hi(D_800D91E0) -/* D91730 80240030 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* D9172C 8024002C 3C04800E */ lui $a0, %hi(mapHitName) +/* D91730 80240030 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* D91734 80240034 3C058024 */ lui $a1, %hi(D_80241820_D92F20) /* D91738 80240038 0C01953C */ jal sprintf /* D9173C 8024003C 24A51820 */ addiu $a1, $a1, %lo(D_80241820_D92F20) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s b/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s index 0e440bc358..544dc495af 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s @@ -13,8 +13,8 @@ glabel D_802424F0_D95430 glabel func_80240000_D92F40 /* D92F40 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D92F44 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* D92F48 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* D92F44 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* D92F48 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* D92F4C 8024000C 3C058024 */ lui $a1, %hi(D_802424E0_D95420) /* D92F50 80240010 24A524E0 */ addiu $a1, $a1, %lo(D_802424E0_D95420) /* D92F54 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -23,8 +23,8 @@ glabel func_80240000_D92F40 /* D92F60 80240020 AFBF0010 */ sw $ra, 0x10($sp) /* D92F64 80240024 0C01953C */ jal sprintf /* D92F68 80240028 A0620084 */ sb $v0, 0x84($v1) -/* D92F6C 8024002C 3C04800E */ lui $a0, %hi(D_800D91E0) -/* D92F70 80240030 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* D92F6C 8024002C 3C04800E */ lui $a0, %hi(mapHitName) +/* D92F70 80240030 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* D92F74 80240034 3C058024 */ lui $a1, %hi(D_802424F0_D95430) /* D92F78 80240038 0C01953C */ jal sprintf /* D92F7C 8024003C 24A524F0 */ addiu $a1, $a1, %lo(D_802424F0_D95430) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s index 7483403e2e..cc957bdab9 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s @@ -13,8 +13,8 @@ glabel D_80242230_D97820 glabel func_80240000_D955F0 /* D955F0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D955F4 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* D955F8 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* D955F4 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* D955F8 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* D955FC 8024000C 3C058024 */ lui $a1, %hi(D_80242220_D97810) /* D95600 80240010 24A52220 */ addiu $a1, $a1, %lo(D_80242220_D97810) /* D95604 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -23,8 +23,8 @@ glabel func_80240000_D955F0 /* D95610 80240020 AFBF0010 */ sw $ra, 0x10($sp) /* D95614 80240024 0C01953C */ jal sprintf /* D95618 80240028 A0620084 */ sb $v0, 0x84($v1) -/* D9561C 8024002C 3C04800E */ lui $a0, %hi(D_800D91E0) -/* D95620 80240030 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* D9561C 8024002C 3C04800E */ lui $a0, %hi(mapHitName) +/* D95620 80240030 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* D95624 80240034 3C058024 */ lui $a1, %hi(D_80242230_D97820) /* D95628 80240038 0C01953C */ jal sprintf /* D9562C 8024003C 24A52230 */ addiu $a1, $a1, %lo(D_80242230_D97820) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s b/ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s index c900fe39f5..8bb1aedd57 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s @@ -13,8 +13,8 @@ glabel D_802420B0_D99940 glabel func_80240000_D97890 /* D97890 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D97894 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* D97898 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* D97894 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* D97898 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* D9789C 8024000C 3C058024 */ lui $a1, %hi(D_802420A0_D99930) /* D978A0 80240010 24A520A0 */ addiu $a1, $a1, %lo(D_802420A0_D99930) /* D978A4 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) @@ -23,8 +23,8 @@ glabel func_80240000_D97890 /* D978B0 80240020 AFBF0010 */ sw $ra, 0x10($sp) /* D978B4 80240024 0C01953C */ jal sprintf /* D978B8 80240028 A0620084 */ sb $v0, 0x84($v1) -/* D978BC 8024002C 3C04800E */ lui $a0, %hi(D_800D91E0) -/* D978C0 80240030 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* D978BC 8024002C 3C04800E */ lui $a0, %hi(mapHitName) +/* D978C0 80240030 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* D978C4 80240034 3C058024 */ lui $a1, %hi(D_802420B0_D99940) /* D978C8 80240038 0C01953C */ jal sprintf /* D978CC 8024003C 24A520B0 */ addiu $a1, $a1, %lo(D_802420B0_D99940) diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5A80/func_80240000_8A5A80.s b/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5A80/func_80240000_8A5A80.s index 1d5c27a9ed..089cf4a74c 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5A80/func_80240000_8A5A80.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5A80/func_80240000_8A5A80.s @@ -13,15 +13,15 @@ glabel D_80242480_8A7F00 glabel func_80240000_8A5A80 /* 8A5A80 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A5A84 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* 8A5A88 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) +/* 8A5A84 80240004 3C04800E */ lui $a0, %hi(mapShapeName) +/* 8A5A88 80240008 24849230 */ addiu $a0, $a0, %lo(mapShapeName) /* 8A5A8C 8024000C 3C058024 */ lui $a1, %hi(D_80242470_8A7EF0) /* 8A5A90 80240010 24A52470 */ addiu $a1, $a1, %lo(D_80242470_8A7EF0) /* 8A5A94 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* 8A5A98 80240018 0C01953C */ jal sprintf /* 8A5A9C 8024001C 00000000 */ nop -/* 8A5AA0 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) -/* 8A5AA4 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) +/* 8A5AA0 80240020 3C04800E */ lui $a0, %hi(mapHitName) +/* 8A5AA4 80240024 248491E0 */ addiu $a0, $a0, %lo(mapHitName) /* 8A5AA8 80240028 3C058024 */ lui $a1, %hi(D_80242480_8A7F00) /* 8A5AAC 8024002C 0C01953C */ jal sprintf /* 8A5AB0 80240030 24A52480 */ addiu $a1, $a1, %lo(D_80242480_8A7F00) diff --git a/ver/us/main_bss_syms.txt b/ver/us/main_bss_syms.txt index 91d9821e9f..d902e81a6e 100644 --- a/ver/us/main_bss_syms.txt +++ b/ver/us/main_bss_syms.txt @@ -157,8 +157,8 @@ D_800A3FEE = 0x800A3FEE; D_800A3FF0 = 0x800A3FF0; D_800A4000 = 0x800A4000; D_800A41C0 = 0x800A41C0; -D_800A41E0 = 0x800A41E0; -D_800A41E8 = 0x800A41E8; +gMap = 0x800A41E0; +gMapConfig = 0x800A41E8; D_800A4230 = 0x800A4230; D_800A4234 = 0x800A4234; D_800A4238 = 0x800A4238; @@ -231,7 +231,7 @@ D_800B0C7C = 0x800B0C7C; D_800B0C80 = 0x800B0C80; D_800B0CE4 = 0x800B0CE4; D_800B0CE8 = 0x800B0CE8; -D_800B0CF0 = 0x800B0CF0; +mapTexName = 0x800B0CF0; D_800B0D08 = 0x800B0D08; D_800B0EB8 = 0x800B0EB8; D_800B0ED0 = 0x800B0ED0; @@ -286,9 +286,9 @@ D_800B91D0 = 0x800B91D0; D_800D91D0 = 0x800D91D0; D_800D91D4 = 0x800D91D4; D_800D91DC = 0x800D91DC; -D_800D91E0 = 0x800D91E0; +mapHitName = 0x800D91E0; D_800D91F8 = 0x800D91F8; -D_800D9230 = 0x800D9230; +mapShapeName = 0x800D9230; D_800D9248 = 0x800D9248; D_800D9278 = 0x800D9278; D_800D95E8 = 0x800D95E8; diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 2eef674854..0d3c098e3a 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -18177,8 +18177,8 @@ D_800A3FEE = 0x800A3FEE; // type:data D_800A3FF0 = 0x800A3FF0; // type:data D_800A4000 = 0x800A4000; // type:data D_800A41C0 = 0x800A41C0; // type:data -D_800A41E0 = 0x800A41E0; // type:data -D_800A41E8 = 0x800A41E8; // type:data +gMap = 0x800A41E0; // type:data +gMapConfig = 0x800A41E8; // type:data D_800A4230 = 0x800A4230; // type:data D_800A4234 = 0x800A4234; // type:data D_800A4238 = 0x800A4238; // type:data @@ -18251,7 +18251,7 @@ D_800B0C7C = 0x800B0C7C; // type:data D_800B0C80 = 0x800B0C80; // type:data D_800B0CE4 = 0x800B0CE4; // type:data D_800B0CE8 = 0x800B0CE8; // type:data -D_800B0CF0 = 0x800B0CF0; // type:data +mapTexName = 0x800B0CF0; // type:data D_800B0D08 = 0x800B0D08; // type:data D_800B0EB8 = 0x800B0EB8; // type:data D_800B0ED0 = 0x800B0ED0; // type:data @@ -18306,9 +18306,9 @@ D_800B91D0 = 0x800B91D0; // type:data D_800D91D0 = 0x800D91D0; // type:data D_800D91D4 = 0x800D91D4; // type:data D_800D91DC = 0x800D91DC; // type:data -D_800D91E0 = 0x800D91E0; // type:data +mapHitName = 0x800D91E0; // type:data D_800D91F8 = 0x800D91F8; // type:data -D_800D9230 = 0x800D9230; // type:data +mapShapeName = 0x800D9230; // type:data D_800D9248 = 0x800D9248; // type:data struct:ALHeap D_800D9278 = 0x800D9278; // type:data D_800D95E8 = 0x800D95E8; // type:data