pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-16 14:32:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Split jp map_data (#313)

Browse Source 
* split jp mapfs

* fix us pm_map_data

* jp title_data

* oops

* avoid placing build files in assets/

* match load_hit_asset

* match load_stage_collision

* name gMapConfig and gMap
This commit is contained in:
alex 2021-07-16 12:08:22 +01:00 committed by GitHub
parent 7cf8bf0b88
commit fcf84633a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 1291 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -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

3
include/map.h
View File

@ -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;

6
include/variables.h
View File

@ -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?

47
src/362a0_len_2f70.c
View File

@ -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);

2
src/state_pause.c
View File

@ -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();

6
src/world/area_dgb/dgb_00/BFA0A0.c
View File

@ -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;
}

46
src/world/world.c
View File

@ -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;

33
tools/build/configure.py
View File

@ -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

15
tools/build/mapfs/combine.py
View File

@ -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)

23
tools/build/mapfs/pack_title_data.py
View File

@ -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"))

43
tools/splat_ext/pm_map_data.py
View File

@ -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]

1041
ver/jp/splat.yaml
View File

File diff suppressed because it is too large Load Diff

42
ver/us/asm/nonmatchings/362a0_len_2f70/load_hit_asset.s
View File

@ -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

45
ver/us/asm/nonmatchings/362a0_len_2f70/load_stage_collision.s
View File

@ -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

8
ver/us/asm/nonmatchings/state_battle/state_step_end_battle.s
View File

@ -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)

4
ver/us/asm/nonmatchings/state_file_select/state_step_exit_language_select.s
View File

@ -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

8
ver/us/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A64090/func_80240000_A64090.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240000_A6ACA0.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A784C0/func_80240000_A784C0.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A500/func_80240000_A7A500.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240000_AB92B0.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240000_D62D10.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240000_D799F0.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240000_D7B2A0.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240000_D91700.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s
View File

@ -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)

8
ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5A80/func_80240000_8A5A80.s
View File

@ -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)

10
ver/us/main_bss_syms.txt
View File

@ -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;

10
ver/us/symbol_addrs.txt
View File

@ -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