From 3f182095cce6a97c6b95352b2efea455d06b5502 Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Wed, 26 May 2021 20:30:44 -0700 Subject: [PATCH 01/39] Added tool to find undeclared glabels. --- tools/python/find_glabels.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 tools/python/find_glabels.py diff --git a/tools/python/find_glabels.py b/tools/python/find_glabels.py new file mode 100644 index 00000000..ab307308 --- /dev/null +++ b/tools/python/find_glabels.py @@ -0,0 +1,32 @@ +import re + +from file_util import FileUtil + +LINE_START_REGEX = r'\n/\* ([0-9A-F]{6}) [0-9A-F]{8} [0-9A-F]{8} \*/\s+' +REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|k[0-1]|gp|sp|fp|ra))' +GLABEL_UPPER_REGEX = '(' + LINE_START_REGEX + r'lui\s+' + REG_REGEX + r',\s+(0x80[0-9a-f]{2}))' +GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'l[bhw]\s+\3,\s+(0x[0-9a-f]{4})\(' + REG_REGEX + '\))' +GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '((?!\n|jr|\sb\w*\s).)*(?=\n)){0,10}' + GLABEL_LOWER_REGEX + +def _find_glabels(asm): + glabels = [] + for file in FileUtil.get_filenames_from_directory_recursive('.', '.s'): + matches = re.findall(GLABEL_REGEX, FileUtil.get_text_from_file(file)) + for match in matches: + offsets = (match[1], match[8]) # ROM offsets of the lu and lw + glabel_upper = int(match[4], 16) # upper immediate of glabel + glabel_lower = int(match[10], 16) # lower immediate of the glabel + if glabel_lower & 0x8000: + glabel_upper -= 1 + glabel = 'D_%08X' % (glabel_upper << 16 | glabel_lower) + glabels.append((glabel, *offsets)) + return glabels + +def main(): + FileUtil.set_working_dir_to_project_base() + contents = FileUtil.get_text_from_file('asm/non_matchings/unknown_005740/func_80005254.s') + glabels = _find_glabels(contents) + print(len(glabels)) + +if __name__ == '__main__': + main() From 2a38afd7ef3a03c420cc8af4d0a630495e0848d6 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 24 May 2021 14:06:56 -0500 Subject: [PATCH 02/39] unknown_001050.c data section --- data/dkr.data.s | 94 +++++++++++++++++++------------------ src/unknown_001050.c | 45 +++++++++++------- tools/python/generate_ld.py | 1 + 3 files changed, 77 insertions(+), 63 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 8e548f83..2b038995 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -6,55 +6,57 @@ .balign 4 .endm -glabel gMusicPlayer -.word 0x00000000 +############## unknown_001050.c (.data) ############## -glabel gSndFxPlayer -.word 0x00000000 +# glabel gMusicPlayer +# .word 0x00000000 +# +# glabel gSndFxPlayer +# .word 0x00000000 +# +# glabel musicRelativeVolume +# .word 0x7F000000 +# +# glabel sfxRelativeVolume +# .word 0x7F000000 +# +# glabel D_800DC640 +# .word 0x01000000 +# +# glabel D_800DC644 +# .word 0x00000000 +# +# glabel D_800DC648 +# .word 0x00000000 +# +# glabel audioPrevCount +# .word 0x00000000 +# +# glabel D_800DC650 +# .word 0x3F800000 +# +# glabel musicVolumeSliderPercentage +# .word 0x00000100 +# +# glabel D_800DC658 +# .word 0x00000000 +# +# glabel D_800DC65C +# .word 0x00000000 +# +# glabel D_800DC660 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# glabel D_800DC66C +# .word 0x00000100 + +# glabel D_800DC670 +# .word 0x00000000 -glabel musicRelativeVolume -.word 0x7F000000 +# .word 0, 0, 0 # File Padding? -glabel sfxRelativeVolume -.word 0x7F000000 - -glabel D_800DC640 -.word 0x01000000 - -glabel D_800DC644 -.word 0x00000000 - -glabel D_800DC648 -.word 0x00000000 - -glabel audioPrevCount -.word 0x00000000 - -glabel D_800DC650 -.word 0x3F800000 - -glabel musicVolumeSliderPercentage -.word 0x00000100 - -glabel D_800DC658 -.word 0x00000000 - -glabel D_800DC65C -.word 0x00000000 - -glabel D_800DC660 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DC66C -.word 0x00000100 - -glabel D_800DC670 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +###################################################### glabel D_800DC680 .word 0x00000000 diff --git a/src/unknown_001050.c b/src/unknown_001050.c index 592c56d0..47223c40 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -14,27 +14,38 @@ typedef struct unk80115D48 { /* 0x04 */ s32 unk4; } unk80115D48; -extern ALCSPlayer* gMusicPlayer; -extern ALCSPlayer* gSndFxPlayer; +/************ .data ************/ -extern u8 musicRelativeVolume; -extern u8 sfxRelativeVolume; -extern u8 D_800DC640; -extern u8 D_800DC644; -extern s32 D_800DC648; -extern s32 audioPrevCount; -extern f32 D_800DC650; -extern s32 musicVolumeSliderPercentage; -extern s32 D_800DC658; -extern u8 D_800DC65C; -extern u8 D_800DC660; -extern s32 D_800DC66C; -extern u8 D_800DC670; +ALCSPlayer* gMusicPlayer = NULL; +ALCSPlayer* gSndFxPlayer = NULL; +u8 musicRelativeVolume = 0x7F; +u8 sfxRelativeVolume = 0x7F; +u8 D_800DC640 = 1; +u8 D_800DC644 = 0; +s32 D_800DC648 = 0; +s32 audioPrevCount = 0; +f32 D_800DC650 = 1.0; +s32 musicVolumeSliderPercentage = 0x100; +s32 D_800DC658 = 0; +u8 D_800DC65C = 0; +u8 D_800DC660 = 0; +s32 D_800DC664 = 0; // Currently unknown, might be a different type. +s32 D_800DC668 = 0; // Currently unknown, might be a different type. +s32 D_800DC66C = 0x100; +u8 D_800DC670 = 0; + +/*******************************/ + +/************ .rodata ************/ extern f32 D_800E49DC; extern f32 D_800E49EC; - extern u8 D_800EBF60; + +/*********************************/ + +/************ .bss ************/ + extern ALHeap gALHeap; /* Unknown size */ @@ -90,7 +101,7 @@ extern s32 D_80115F7C; extern u32 D_80115F84; extern u32 D_80115F88; - +/******************************/ typedef struct audioMgrConfig_s{ u32 unk00; diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index 4b681016..396a7e9b 100644 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -75,6 +75,7 @@ class GenerateLD: def gen_data_section(self): self.gen_line('.main_data 0x80000400 : AT(romPos) SUBALIGN(16)') self.gen_open_block() + self.gen_line(BUILD_DIR + '/src/unknown_001050.o(.data);') self.gen_line(BUILD_DIR + '/data/dkr.data.o(.data);') self.gen_close_block() self.gen_line('romPos += SIZEOF(.main_data);') From a2f2e6e2f29b761fea907a0973155658decbdd1b Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 24 May 2021 14:35:24 -0500 Subject: [PATCH 03/39] unknown_003260.c data section --- data/dkr.data.s | 104 +++++++++++++++++++----------------- src/unknown_003260.c | 35 +++++++++--- tools/python/generate_ld.py | 3 +- 3 files changed, 85 insertions(+), 57 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 2b038995..57c02c8f 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -50,63 +50,67 @@ # .word 0x00000000 # glabel D_800DC66C # .word 0x00000100 - +# # glabel D_800DC670 # .word 0x00000000 - -# .word 0, 0, 0 # File Padding? +# +# .word 0, 0, 0 # Padding ###################################################### -glabel D_800DC680 -.word 0x00000000 +############## unknown_003260.c (.data) ############## -glabel D_800DC684 -.word 0x00000000 +# glabel D_800DC680 +# .word 0x00000000 +# +# glabel D_800DC684 +# .word 0x00000000 +# +# glabel D_800DC688 +# .word 0x00000000 +# +# glabel D_800DC68C +# .word 0x00000000 +# +# glabel D_800DC690 +# .word 0x00035281 +# +# glabel D_800DC694 +# .word 0x00000FD0 +# +# glabel D_800DC698 +# .word 0x00000000 +# +# glabel D_800DC69C +# .word 0x00000000 +# +# glabel D_800DC6A0 +# .word 0x00000001 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DC6B0 +# .word 0x00000000 +# +# glabel D_800DC6B4 +# .word 0x00000000 +# +# glabel D_800DC6B8 +# .word 0x00000000 +# +# glabel gAlSndPlayer +# .word 0x80119BD0 +# +# glabel sfxVolumeSlider +# .word 0x00000100 +# +# glabel D_800DC6C4 +# .word 0x00000000 +# +# .word 0, 0 # Padding -glabel D_800DC688 -.word 0x00000000 - -glabel D_800DC68C -.word 0x00000000 - -glabel D_800DC690 -.word 0x00035281 - -glabel D_800DC694 -.word 0x00000FD0 - -glabel D_800DC698 -.word 0x00000000 - -glabel D_800DC69C -.word 0x00000000 - -glabel D_800DC6A0 -.word 0x00000001 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DC6B0 -.word 0x00000000 - -glabel D_800DC6B4 -.word 0x00000000 - -glabel D_800DC6B8 -.word 0x00000000 - -glabel gAlSndPlayer -.word 0x80119BD0 - -glabel sfxVolumeSlider -.word 0x00000100 - -glabel D_800DC6C4 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +###################################################### glabel D_800DC6D0 .word 0x01000000 diff --git a/src/unknown_003260.c b/src/unknown_003260.c index dc60353b..d5ca6b96 100644 --- a/src/unknown_003260.c +++ b/src/unknown_003260.c @@ -65,7 +65,6 @@ typedef struct unk80119240 } unk800DC6B0; */ - typedef struct audioMgrConfig_s{ u32 unk00; u32 unk04; @@ -74,13 +73,35 @@ typedef struct audioMgrConfig_s{ u16 unk10; } audioMgrConfig; +/************ .data ************/ +s32 D_800DC680 = 0; // Currently unknown, might be a different type. +s32 D_800DC684 = 0; // Currently unknown, might be a different type. +s32 D_800DC688 = 0; // Currently unknown, might be a different type. +s32 D_800DC68C = 0; // Currently unknown, might be a different type. +s32 D_800DC690 = 0x35281; // Currently unknown, might be a different type. +s32 D_800DC694 = 0xFD0; // Currently unknown, might be a different type. +s32 D_800DC698 = 0; // Currently unknown, might be a different type. +s32 D_800DC69C = 0; // Currently unknown, might be a different type. +s32 D_800DC6A0 = 1; // Currently unknown, might be a different type. +s32 D_800DC6A4 = 0; // Currently unknown, might be a different type. +s32 D_800DC6A8 = 0; // Currently unknown, might be a different type. +s32 D_800DC6AC = 0; // Currently unknown, might be a different type. + +s32 D_800DC6B0 = 0; // Currently unknown, might be a different type. +s32 D_800DC6B4 = 0; // Currently unknown, might be a different type. +unk800DC6BC_40* D_800DC6B8 = NULL; +unk800DC6BC* gAlSndPlayer = (unk800DC6BC*)0x80119BD0; // What variable is 0x80119BD0? + +s32 sfxVolumeSlider = 0x100; +s32 D_800DC6C4 = 0; // Currently unknown, might be a different type. + +/*******************************/ + +/*** No .rodata section ***/ + +/************ .bss ************/ -extern u32 D_800DC6A0; -//extern unk800DC6B0* D_800DC6B0; -extern unk800DC6BC_40* D_800DC6B8; -extern unk800DC6BC* gAlSndPlayer; -extern s32 sfxVolumeSlider; extern s32 D_80115F90; extern ALHeap* D_80115F94; extern OSThread audioThread; @@ -97,6 +118,8 @@ extern OSMesg D_80119B08; extern u16* D_80119C28; extern f32 D_80126170; +/******************************/ + void *alHeapDBAlloc(u8 *, s32, ALHeap *, s32, s32); #if 1 diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index 396a7e9b..1b63de4f 100644 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -75,7 +75,8 @@ class GenerateLD: def gen_data_section(self): self.gen_line('.main_data 0x80000400 : AT(romPos) SUBALIGN(16)') self.gen_open_block() - self.gen_line(BUILD_DIR + '/src/unknown_001050.o(.data);') + for file in self.files: + self.gen_line(file[0] + '(.data);') self.gen_line(BUILD_DIR + '/data/dkr.data.o(.data);') self.gen_close_block() self.gen_line('romPos += SIZEOF(.main_data);') From e5dd55c69e4c5aa47f4fe994ebcf95a046c8e024 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 24 May 2021 14:42:07 -0500 Subject: [PATCH 04/39] unknown_005740.c data section --- data/dkr.data.s | 30 ++++++++++++++++++------------ src/unknown_003260.c | 2 -- src/unknown_005740.c | 14 ++++++++++++++ 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 57c02c8f..a62acbe7 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -112,21 +112,27 @@ ###################################################### -glabel D_800DC6D0 -.word 0x01000000 +############## unknown_005740.c (.data) ############## -glabel D_800DC6D4 -.word 0x00000000 +# glabel D_800DC6D0 +# .word 0x01000000 +# +# glabel D_800DC6D4 +# .word 0x00000000 +# +# glabel D_800DC6D8 +# .word 0x00000001 +# .word 0x00000000 +# +# glabel D_800DC6E0 +# .word 0x00000000 +# +# .word 0, 0, 0 # Padding -glabel D_800DC6D8 -.word 0x00000001 -.word 0x00000000 +###################################################### -glabel D_800DC6E0 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 + +############## unknown_00BC20.c (.data) ############## glabel D_800DC6F0 .word 0x80000000 diff --git a/src/unknown_003260.c b/src/unknown_003260.c index d5ca6b96..3b6c1a54 100644 --- a/src/unknown_003260.c +++ b/src/unknown_003260.c @@ -98,8 +98,6 @@ s32 D_800DC6C4 = 0; // Currently unknown, might be a different type. /*******************************/ -/*** No .rodata section ***/ - /************ .bss ************/ extern s32 D_80115F90; diff --git a/src/unknown_005740.c b/src/unknown_005740.c index c220f990..94aecce3 100644 --- a/src/unknown_005740.c +++ b/src/unknown_005740.c @@ -4,8 +4,22 @@ #include "types.h" #include "macros.h" +/************ .data ************/ + +s8 D_800DC6D0 = 1; // Currently unknown, might be a u8. +s32 D_800DC6D4 = 0; // Currently unknown, might be a different type. +s32 D_800DC6D8 = 1; // Currently unknown, might be a different type. +s32 D_800DC6DC = 0; // Currently unknown, might be a different type. +s32 D_800DC6E0 = 0; // Currently unknown, might be a different type. + +/*******************************/ + +/************ .bss ************/ + extern s8 D_8011AC18; +/*******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_005740/func_80004B40.s") GLOBAL_ASM("asm/non_matchings/unknown_005740/func_800050D0.s") GLOBAL_ASM("asm/non_matchings/unknown_005740/func_80005254.s") From 9e36c3b5167508d679d04a576f858f71487165a6 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 24 May 2021 18:02:35 -0500 Subject: [PATCH 05/39] unknown_00BC20.c data section --- data/dkr.data.s | 289 ++++++++++++++++++++++--------------------- src/unknown_00BC20.c | 110 +++++++++++++--- 2 files changed, 242 insertions(+), 157 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index a62acbe7..abe2796d 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -134,153 +134,160 @@ ############## unknown_00BC20.c (.data) ############## -glabel D_800DC6F0 -.word 0x80000000 -.word 0x001E000F +# glabel D_800DC6F0 +# .word 0x80000000 +# .word 0x001E000F +# +# glabel D_800DC6F8 +# .word 0x03000000 +# .word 0x001E000F +# +# glabel D_800DC700 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DC708 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00010000 +# .word 0x00000000 +# +# glabel D_800DC718 +# .word 0x00000000 +# +# glabel D_800DC71C +# .word 0x00000000 +# +# glabel D_800DC720 +# .word 0x00000000 +# +# glabel D_800DC724 +# .word 0x2A300000 +# +# glabel D_800DC728 +# .word 0xFFFF0000 +# +# glabel D_800DC72C +# .word 0x00000000 +# +# glabel D_800DC730 +# .word 0x00000000 +# +# glabel D_800DC734 +# .word 0x00000000 +# +# glabel D_800DC738 +# .word 0x00000000 +# +# glabel D_800DC73C +# .word 0x00000000 +# +# glabel D_800DC740 +# .word 0x00000000 +# +# glabel D_800DC744 +# .word 0x00000000 +# +# glabel D_800DC748 +# .word 0x00000000 +# +# glabel D_800DC74C +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DC754 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DC75C +# .word 0x00000000 +# +# glabel D_800DC760 +# .word 0x00000009 +# +# glabel D_800DC764 +# .word 0x00000000 +# +# glabel D_800DC768 +# .word 0x00000000 -glabel D_800DC6F8 -.word 0x03000000 -.word 0x001E000F +# .word 0x3F800000 +# .word 0x3F350529 +# .word 0x3F350529 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x3F350529 +# .word 0xBF350529 +# .word 0x00000000 +# .word 0xBF800000 +# .word 0xBF350529 +# .word 0xBF350529 +# .word 0xBF800000 +# .word 0x00000000 +# .word 0xBF350529 +# .word 0x3F350529 +# .word 0x00010002 +# .word 0x00030004 +# .word 0x00510054 +# .word 0x00550056 +# .word 0x00ED00FF +# .word 0x00370038 +# .word 0x0039003A +# .word 0x00570058 +# .word 0x0059005A +# .word 0x00F300FD +# .word 0x00420043 +# .word 0x00440045 +# .word 0x005B005C +# .word 0x005D005E +# .word 0x00F40101 +# .word 0x00010002 +# .word 0x00030004 +# .word 0x00510054 +# .word 0x00550056 +# .word 0x00ED00FF +# .word 0x00010002 +# .word 0x00030004 +# .word 0x00510054 +# .word 0x00550056 +# .word 0x00ED00FF +# .word 0x00D900DF +# .word 0x00E00105 +# .word 0x008A00DA +# .word 0x00E80115 +# .word 0x01180000 +# .word 0x00050106 +# .word 0x02070005 +# .word 0x0106010B +# .word 0x010B0207 +# .word 0x000C020D +# .word 0x01010101 +# .word 0x01010101 +# .word 0x01010000 -glabel D_800DC700 -.word 0x00000000 -.word 0x00000000 +# .word 0x09010203 +# .word 0x04050700 -glabel D_800DC708 -.word 0x00000000 -.word 0x00000000 -.word 0x00010000 -.word 0x00000000 +# glabel D_800DC848 +# .word 0x00000000 +# .word 0xFF401000 +# .word 0x1040FF00 +# .word 0x10FF4000 +# +# glabel D_800DC858 +# .word 0x00000000 +# .word 0x0028FFFF +# +# glabel D_800DC860 +# .word 0x80000000 +# .word 0x00280000 +# +# .word 0, 0 # Padding -glabel D_800DC718 -.word 0x00000000 +###################################################### -glabel D_800DC71C -.word 0x00000000 +############## unknown_0255E0.c (.data) ############## -glabel D_800DC720 -.word 0x00000000 - -glabel D_800DC724 -.word 0x2A300000 - -glabel D_800DC728 -.word 0xFFFF0000 - -glabel D_800DC72C -.word 0x00000000 - -glabel D_800DC730 -.word 0x00000000 - -glabel D_800DC734 -.word 0x00000000 - -glabel D_800DC738 -.word 0x00000000 - -glabel D_800DC73C -.word 0x00000000 - -glabel D_800DC740 -.word 0x00000000 - -glabel D_800DC744 -.word 0x00000000 - -glabel D_800DC748 -.word 0x00000000 - -glabel D_800DC74C -.word 0x00000000 -.word 0x00000000 - -glabel D_800DC754 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DC75C -.word 0x00000000 - -glabel D_800DC760 -.word 0x00000009 - -glabel D_800DC764 -.word 0x00000000 - -glabel D_800DC768 -.word 0x00000000 -.word 0x3F800000 -.word 0x3F350529 -.word 0x3F350529 -.word 0x3F800000 -.word 0x00000000 -.word 0x3F350529 -.word 0xBF350529 -.word 0x00000000 -.word 0xBF800000 -.word 0xBF350529 -.word 0xBF350529 -.word 0xBF800000 -.word 0x00000000 -.word 0xBF350529 -.word 0x3F350529 -.word 0x00010002 -.word 0x00030004 -.word 0x00510054 -.word 0x00550056 -.word 0x00ED00FF -.word 0x00370038 -.word 0x0039003A -.word 0x00570058 -.word 0x0059005A -.word 0x00F300FD -.word 0x00420043 -.word 0x00440045 -.word 0x005B005C -.word 0x005D005E -.word 0x00F40101 -.word 0x00010002 -.word 0x00030004 -.word 0x00510054 -.word 0x00550056 -.word 0x00ED00FF -.word 0x00010002 -.word 0x00030004 -.word 0x00510054 -.word 0x00550056 -.word 0x00ED00FF -.word 0x00D900DF -.word 0x00E00105 -.word 0x008A00DA -.word 0x00E80115 -.word 0x01180000 -.word 0x00050106 -.word 0x02070005 -.word 0x0106010B -.word 0x010B0207 -.word 0x000C020D -.word 0x01010101 -.word 0x01010101 -.word 0x01010000 -.word 0x09010203 -.word 0x04050700 - -glabel D_800DC848 -.word 0x00000000 -.word 0xFF401000 -.word 0x1040FF00 -.word 0x10FF4000 - -glabel D_800DC858 -.word 0x00000000 -.word 0x0028FFFF - -glabel D_800DC860 -.word 0x80000000 -.word 0x00280000 -.word 0x00000000 -.word 0x00000000 .word 0x00000000 .word 0x80000000 .word 0x0028FFFF diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index 57639ede..aa57f7cd 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -7,24 +7,100 @@ #include "fast3d.h" -extern s32 D_800DC700; -extern s16 D_800DC708; -extern s32 D_800DC718; -extern s8 D_800DC71C; -extern s16 D_800DC724; -extern s16 D_800DC728; -extern s16 D_800DC72C; -extern u8 D_800DC730; -extern u8 D_800DC738; -extern s8 D_800DC73C; -extern s8 D_800DC740; -extern s8 D_800DC744; -extern s8 D_800DC748; -extern s32 D_800DC760; -extern s8 D_800DC848; +/************ .data ************/ + +/* Size: 0x8 bytes */ +typedef struct unknown800DC6F0 { + union { + s8 unk00; + s32 dummy_force_alignment; // Not sure of a better way to do this. + }; + u16 unk04; + u16 unk06; +} unknown800DC6F0; + +unknown800DC6F0 D_800DC6F0 = { -128, 0x1E, 0x0F }; +unknown800DC6F0 D_800DC6F8 = { 3, 0x1E, 0x0F }; + +s32 D_800DC700 = 0; +s32 D_800DC704 = 0; // Currently unknown, might be a different type. +s16 D_800DC708 = 0; +s32 D_800DC70C = 0; // Currently unknown, might be a different type. +s16 D_800DC710 = 1; +s32 D_800DC714 = 0; // Currently unknown, might be a different type. +s32 D_800DC718 = 0; +s8 D_800DC71C = 0; +s32 D_800DC720 = 0; // Currently unknown, might be a different type. +s16 D_800DC724 = 0x2A30; +s16 D_800DC728 = -1; +s16 D_800DC72C = 0; +u8 D_800DC730 = 0; +s32 D_800DC734 = 0; // Currently unknown, might be a different type. +u8 D_800DC738 = 0; +s8 D_800DC73C = 0; +s8 D_800DC740 = 0; +s8 D_800DC744 = 0; +s8 D_800DC748 = 0; +s32 D_800DC74C = 0; // Currently unknown, might be a different type. +s32 D_800DC750 = 0; // Currently unknown, might be a different type. +s32 D_800DC754 = 0; // Currently unknown, might be a different type. +s32 D_800DC758 = 0; // Currently unknown, might be a different type. +s32 D_800DC75C = 0; // Currently unknown, might be a different type. +s32 D_800DC760 = 9; // Currently unknown, might be a different type. +s32 D_800DC764 = 0; // Currently unknown, might be a different type. +s32 D_800DC768 = 0; // Currently unknown, might be a different type. + +f32 D_800DC76C[15] = { + 1.0f, 0.70711f, 0.70711f, 1.0f, + 0.0f, 0.70711f, -0.70711f, 0.0f, + -1.0f, -0.70711f, -0.70711f, -1.0f, + 0.0f, -0.70711f, 0.70711f +}; + +u16 D_800DC7A8[76] = { + 0x0001, 0x0002, 0x0003, 0x0004, + 0x0051, 0x0054, 0x0055, 0x0056, + 0x00ED, 0x00FF, 0x0037, 0x0038, + 0x0039, 0x003A, 0x0057, 0x0058, + 0x0059, 0x005A, 0x00F3, 0x00FD, + 0x0042, 0x0043, 0x0044, 0x0045, + 0x005B, 0x005C, 0x005D, 0x005E, + 0x00F4, 0x0101, 0x0001, 0x0002, + 0x0003, 0x0004, 0x0051, 0x0054, + 0x0055, 0x0056, 0x00ED, 0x00FF, + 0x0001, 0x0002, 0x0003, 0x0004, + 0x0051, 0x0054, 0x0055, 0x0056, + 0x00ED, 0x00FF, 0x00D9, 0x00DF, + 0x00E0, 0x0105, 0x008A, 0x00DA, + 0x00E8, 0x0115, 0x0118, 0x0000, + 0x0005, 0x0106, 0x0207, 0x0005, + 0x0106, 0x010B, 0x010B, 0x0207, + 0x000C, 0x020D, 0x0101, 0x0101, + 0x0101, 0x0101, 0x0101, 0x0000 +}; + +s8 D_800DC840[8] = { 9, 1, 2, 3, 4, 5, 7, 0 }; + +s8 D_800DC848 = 0; +s32 D_800DC84C = 0xFF401000; // Currently unknown, might be a different type. + +s32 D_800DC850 = 0x1040FF00; // Currently unknown, might be a different type. +s32 D_800DC854 = 0x10FF4000; // Currently unknown, might be a different type. +s32 D_800DC858 = 0; // Currently unknown, might be a different type. +s32 D_800DC85C = 0x0028FFFF; // Currently unknown, might be a different type. + +u8 D_800DC860 = 0x80; +u16 D_800DC864 = 0x0028; + +/************ .rodata ************/ + extern f32 D_800E514C; extern f32 D_800E5150; +/*********************************/ + +/************ .bss ************/ + extern s16 D_8011AC20[12]; extern s16 D_8011AD4E; extern s8 D_8011AD20[4]; @@ -74,7 +150,7 @@ extern s8 D_8011AE00; extern s8 D_8011AE01; extern s8 D_8011AE02; extern s8 D_8011AE03; -u32 *D_8011AE08[16]; +extern u32 *D_8011AE08[16]; extern s32 (*D_8011AE48)[8]; // Unknown number of entries. extern u8 (*D_8011AE4C)[8]; // Unknown number of entries. extern Player **objPtrList; // Not sure about the number of elements @@ -147,6 +223,8 @@ extern u32* D_8011B020[10]; extern s16 D_8011D5AC; +/******************************/ + extern s32 osTvType; void func_8000C460(void); From 9c4d6e1afcb6b87410af7061a1ed029572bd8e27 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 24 May 2021 18:29:02 -0500 Subject: [PATCH 06/39] unknown_0255E0.c data section --- data/dkr.data.s | 138 ++++++++++++++++++++++--------------------- src/unknown_00BC20.c | 2 + src/unknown_0255E0.c | 88 ++++++++++++++++++++------- 3 files changed, 142 insertions(+), 86 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index abe2796d..37cbebf2 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -288,76 +288,82 @@ ############## unknown_0255E0.c (.data) ############## -.word 0x00000000 -.word 0x80000000 -.word 0x0028FFFF +# .word 0x00000000 +# .word 0x80000000 +# .word 0x0028FFFF +# +# glabel D_800DC87C +# .word 0x83000000 +# .word 0x0046FFFF +# +# glabel D_800DC884 +# .word 0x00000000 +# .word 0x3E000000 +# .word 0x3E800000 -glabel D_800DC87C -.word 0x83000000 -.word 0x0046FFFF +# .word 0x3EC00000 +# .word 0x3F000000 +# .word 0x3F200000 +# .word 0x3F400000 +# .word 0x3F600000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DC8AC +# .word 0x42480000 -glabel D_800DC884 -.word 0x00000000 -.word 0x3E000000 -.word 0x3E800000 -.word 0x3EC00000 -.word 0x3F000000 -.word 0x3F200000 -.word 0x3F400000 -.word 0x3F600000 -.word 0x00000000 -.word 0x00000000 +# .word 0x00000000 +# .word 0x42000000 +# .word 0xC2480000 +# .word 0x00000000 +# .word 0x42000000 +# .word 0xC2480000 +# .word 0x42C80000 +# .word 0x42000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x42000000 +# .word 0x43020000 +# .word 0x42700000 +# .word 0xC2880000 +# .word 0x43020000 +# .word 0xC2700000 +# .word 0xC2880000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x42000000 +# .word 0xC3020000 +# .word 0xC2700000 +# .word 0xC2880000 +# .word 0xC3020000 +# .word 0x42700000 +# .word 0xC2880000 +# +# glabel D_800DC918 +# .word 0x00000000 +# +# glabel D_800DC91C +# .word 0x00000000 +# +# .word 0xFFFFFFFF +# +# glabel D_800DC924 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DC92C +# .word 0x00010401 +# .word 0x02040203 +# .word 0x04030004 +# .word 0x05060101 +# .word 0x00050302 +# .word 0x07070803 +# +# .word 0, 0, 0 # Padding -glabel D_800DC8AC -.word 0x42480000 -.word 0x00000000 -.word 0x42000000 -.word 0xC2480000 -.word 0x00000000 -.word 0x42000000 -.word 0xC2480000 -.word 0x42C80000 -.word 0x42000000 -.word 0x00000000 -.word 0x00000000 -.word 0x42000000 -.word 0x43020000 -.word 0x42700000 -.word 0xC2880000 -.word 0x43020000 -.word 0xC2700000 -.word 0xC2880000 -.word 0x00000000 -.word 0x00000000 -.word 0x42000000 -.word 0xC3020000 -.word 0xC2700000 -.word 0xC2880000 -.word 0xC3020000 -.word 0x42700000 -.word 0xC2880000 +###################################################### -glabel D_800DC918 -.word 0x00000000 - -glabel D_800DC91C -.word 0x00000000 -.word 0xFFFFFFFF - -glabel D_800DC924 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DC92C -.word 0x00010401 -.word 0x02040203 -.word 0x04030004 -.word 0x05060101 -.word 0x00050302 -.word 0x07070803 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +############## unknown_032760.c (.data) ############## glabel D_800DC950 .word 0x00000000 diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index aa57f7cd..126abca9 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -92,6 +92,8 @@ s32 D_800DC85C = 0x0028FFFF; // Currently unknown, might be a different type. u8 D_800DC860 = 0x80; u16 D_800DC864 = 0x0028; +/*******************************/ + /************ .rodata ************/ extern f32 D_800E514C; diff --git a/src/unknown_0255E0.c b/src/unknown_0255E0.c index d6d50b56..20efb5c5 100644 --- a/src/unknown_0255E0.c +++ b/src/unknown_0255E0.c @@ -29,29 +29,36 @@ typedef struct unk80120AC0 { u8 pad3C[8]; } unk80120AC0; -extern LevelHeader *D_800DC91C; -extern s32 D_800DC924; -extern s32 D_8011D37C; -extern s32 D_8011D474; +/************ .data ************/ -extern s32 D_8011B0A0; -extern s32 D_8011B0A4; -extern s32 D_8011B0A8; +/* Size: 0x8 bytes */ +typedef struct unknown800DC874 { + union { + s8 unk00; + s32 dummy_force_alignment; // Not sure of a better way to do this. + }; + u16 unk04; + s16 unk06; +} unknown800DC874; -typedef struct{ - Player * unk00; -} unk8011B0B8; +s32 D_800DC870 = 0; // Currently unknown, might be a different type. +unknown800DC874 D_800DC874 = { -128, 40, -1 }; +unknown800DC874 D_800DC87C = { -125, 70, -1 }; -extern unk8011B0B8 D_8011B0B8; +f32 D_800DC884[10] = { + 0.0f, 0.125f, 0.25f, 0.375f, + 0.5f, 0.625f, 0.75f, 0.875f +}; -extern s32 D_8011B0DC; -extern s32 D_8011B0F0; -extern s32 D_8011B0F4; -extern s32 D_8011B0FC; - -extern f32 D_8011B0E4; -extern f32 D_8011B0E8; -extern f32 D_8011B0EC; +f32 D_800DC8AC[27] = { + 50.0f, 0.0f, 32.0f, -50.0f, + 0.0f, 32.0f, -50.0f, 100.0f, + 32.0f, 0.0f, 0.0f, 32.0f, + 130.0f, 60.0f, -68.0f, 130.0f, + -60.0f, -68.0f, 0.0f, 0.0f, + 32.0f, -130.0f, -60.0f, -68.0f, + -130.0f, 60.0f, -68.0f +}; typedef struct{ u8 pad00[0x12]; @@ -101,7 +108,45 @@ typedef struct{ s16 count; } unk800DC918; -extern unk800DC918* D_800DC918; +unk800DC918* D_800DC918 = NULL; +LevelHeader *D_800DC91C = NULL; + +s32 D_800DC920 = -1; +s32 D_800DC924 = 0; +s32 D_800DC928 = 0; // Currently unknown, might be a different type. + +s8 D_800DC92C[24] = { + 0, 1, 4, 1, 2, 4, 2, 3, + 4, 3, 0, 4, 5, 6, 1, 1, + 0, 5, 3, 2, 7, 7, 8, 3 + // There may or may not be extra zeroes here. +}; + +/*******************************/ + +/************ .bss ************/ + +extern s32 D_8011D37C; +extern s32 D_8011D474; + +extern s32 D_8011B0A0; +extern s32 D_8011B0A4; +extern s32 D_8011B0A8; + +typedef struct{ + Player * unk00; +} unk8011B0B8; + +extern unk8011B0B8 D_8011B0B8; + +extern s32 D_8011B0DC; +extern s32 D_8011B0F0; +extern s32 D_8011B0F4; +extern s32 D_8011B0FC; + +extern f32 D_8011B0E4; +extern f32 D_8011B0E8; +extern f32 D_8011B0EC; typedef struct{ s16 unk00; @@ -118,6 +163,9 @@ typedef struct{ }unk8011D468; unk8011D468 D_8011D468; + +/******************************/ + extern void func_8006F64C(void*, f32, f32, f32, f32*, f32*, f32*); From 9893dfdb9fa8ba73f0e4dfbd37ab8091306f38ce Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 24 May 2021 19:02:23 -0500 Subject: [PATCH 07/39] unknown_032760.c data section --- data/dkr.data.s | 330 ++++++++++++++++++++++--------------------- src/unknown_032760.c | 104 +++++++++++++- 2 files changed, 265 insertions(+), 169 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 37cbebf2..474287e3 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -365,171 +365,175 @@ ############## unknown_032760.c (.data) ############## -glabel D_800DC950 -.word 0x00000000 +# glabel D_800DC950 +# .word 0x00000000 +# +# glabel D_800DC954 +# .word 0x00000000 +# +# glabel D_800DC958 +# .word 0x00000000 +# +# glabel D_800DC95C +# .word 0x00000000 +# +# glabel D_800DC960 +# .word 0x00000000 +# +# glabel D_800DC964 +# .word 0x00000000 +# +# glabel D_800DC968 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DC970 +# .word 0x40FFFFFF +# .word 0x00070003 +# +# glabel D_800DC978 +# .word 0x00000000 +# .word 0x001EFFFF +# +# glabel D_800DC980 +# .word 0xFF000100 +# .word 0x0000FFFF +# .word 0xFFFF0100 +# .word 0x01000000 +# .word 0xFFFFFFFF +# .word 0x0100FF00 +# .word 0x0000FFFF +# .word 0xFFFFFF00 +# .word 0xFF000000 +# .word 0xFFFFFFFF +# +# glabel D_800DC9A8 +# .word 0x00000040 +# .word 0xFFC00000 +# .word 0xFFC0FFC0 +# .word 0x00000040 +# .word 0x00200000 +# .word 0xFFC00020 +# .word 0x00000040 +# .word 0x00400000 +# .word 0xFFC00040 +# .word 0x00000000 +# +# glabel D_800DC9D0 +# .word 0x00000301 +# .word 0x00040000 +# .word 0x00010004 +# .word 0x00040004 +# .word 0x00000203 +# .word 0x00040000 +# .word 0x00010000 +# .word 0x00010004 +# .word 0x00020503 +# .word 0x00010000 +# .word 0x00000004 +# .word 0x00010004 +# .word 0x00020405 +# .word 0x00010000 +# .word 0x00000000 +# .word 0x00000004 +# .word 0x00000103 +# .word 0x00040000 +# .word 0x00040004 +# .word 0x00010004 +# .word 0x00000302 +# .word 0x00040000 +# .word 0x00010004 +# .word 0x00010000 +# .word 0x00020305 +# .word 0x00010000 +# .word 0x00010004 +# .word 0x00000004 +# .word 0x00020504 +# .word 0x00010000 +# .word 0x00000004 +# .word 0x00000000 +# +# glabel D_800DCA50 +# .word 0x02050603 +# .word 0x0A080709 +# .word 0x02050603 +# .word 0x0A080709 +# .word 0x0B000000 +# +# glabel D_800DCA64 +# .word 0x02050603 +# .word 0x0A080709 +# .word 0x0C000000 +# +# glabel D_800DCA70 +# .word 0x02050603 +# .word 0x0A080709 +# .word 0x0B0C0000 +# +# glabel D_800DCA7C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DCA88 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000101 +# .word 0x02000000 +# .word 0x00010102 +# .word 0x02000000 +# .word 0x00000000 +# +# glabel D_800DCAA8 +# .word 0x00000301 +# .word 0x00000000 +# .word 0xFFFFFFFF +# .word 0x0000FFFF +# .word 0x00000203 +# .word 0x00000000 +# .word 0xFFFF0000 +# .word 0xFFFFFFFF +# .word 0x00020503 +# .word 0xFFFF0000 +# .word 0x0000FFFF +# .word 0xFFFFFFFF +# .word 0x00020405 +# .word 0xFFFF0000 +# .word 0x00000000 +# .word 0x0000FFFF +# .word 0x00000103 +# .word 0x00000000 +# .word 0x0000FFFF +# .word 0xFFFFFFFF +# .word 0x00000302 +# .word 0x00000000 +# .word 0xFFFFFFFF +# .word 0xFFFF0000 +# .word 0x00020305 +# .word 0xFFFF0000 +# .word 0xFFFFFFFF +# .word 0x0000FFFF +# .word 0x00020504 +# .word 0xFFFF0000 +# .word 0x0000FFFF +# .word 0x00000000 +# +# glabel D_800DCB28 +# .word 0xFFC00000 +# .word 0x0020FFC0 +# .word 0x0000FFE0 +# .word 0x00000000 +# .word 0x00200000 +# .word 0x0000FFE0 +# .word 0x00400000 +# .word 0x00200040 +# .word 0x0000FFE0 +# .word 0x00000000 -glabel D_800DC954 -.word 0x00000000 +###################################################### -glabel D_800DC958 -.word 0x00000000 - -glabel D_800DC95C -.word 0x00000000 - -glabel D_800DC960 -.word 0x00000000 - -glabel D_800DC964 -.word 0x00000000 - -glabel D_800DC968 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DC970 -.word 0x40FFFFFF -.word 0x00070003 - -glabel D_800DC978 -.word 0x00000000 -.word 0x001EFFFF - -glabel D_800DC980 -.word 0xFF000100 -.word 0x0000FFFF -.word 0xFFFF0100 -.word 0x01000000 -.word 0xFFFFFFFF -.word 0x0100FF00 -.word 0x0000FFFF -.word 0xFFFFFF00 -.word 0xFF000000 -.word 0xFFFFFFFF - -glabel D_800DC9A8 -.word 0x00000040 -.word 0xFFC00000 -.word 0xFFC0FFC0 -.word 0x00000040 -.word 0x00200000 -.word 0xFFC00020 -.word 0x00000040 -.word 0x00400000 -.word 0xFFC00040 -.word 0x00000000 - -glabel D_800DC9D0 -.word 0x00000301 -.word 0x00040000 -.word 0x00010004 -.word 0x00040004 -.word 0x00000203 -.word 0x00040000 -.word 0x00010000 -.word 0x00010004 -.word 0x00020503 -.word 0x00010000 -.word 0x00000004 -.word 0x00010004 -.word 0x00020405 -.word 0x00010000 -.word 0x00000000 -.word 0x00000004 -.word 0x00000103 -.word 0x00040000 -.word 0x00040004 -.word 0x00010004 -.word 0x00000302 -.word 0x00040000 -.word 0x00010004 -.word 0x00010000 -.word 0x00020305 -.word 0x00010000 -.word 0x00010004 -.word 0x00000004 -.word 0x00020504 -.word 0x00010000 -.word 0x00000004 -.word 0x00000000 - -glabel D_800DCA50 -.word 0x02050603 -.word 0x0A080709 -.word 0x02050603 -.word 0x0A080709 -.word 0x0B000000 - -glabel D_800DCA64 -.word 0x02050603 -.word 0x0A080709 -.word 0x0C000000 - -glabel D_800DCA70 -.word 0x02050603 -.word 0x0A080709 -.word 0x0B0C0000 - -glabel D_800DCA7C -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DCA88 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000101 -.word 0x02000000 -.word 0x00010102 -.word 0x02000000 -.word 0x00000000 - -glabel D_800DCAA8 -.word 0x00000301 -.word 0x00000000 -.word 0xFFFFFFFF -.word 0x0000FFFF -.word 0x00000203 -.word 0x00000000 -.word 0xFFFF0000 -.word 0xFFFFFFFF -.word 0x00020503 -.word 0xFFFF0000 -.word 0x0000FFFF -.word 0xFFFFFFFF -.word 0x00020405 -.word 0xFFFF0000 -.word 0x00000000 -.word 0x0000FFFF -.word 0x00000103 -.word 0x00000000 -.word 0x0000FFFF -.word 0xFFFFFFFF -.word 0x00000302 -.word 0x00000000 -.word 0xFFFFFFFF -.word 0xFFFF0000 -.word 0x00020305 -.word 0xFFFF0000 -.word 0xFFFFFFFF -.word 0x0000FFFF -.word 0x00020504 -.word 0xFFFF0000 -.word 0x0000FFFF -.word 0x00000000 - -glabel D_800DCB28 -.word 0xFFC00000 -.word 0x0020FFC0 -.word 0x0000FFE0 -.word 0x00000000 -.word 0x00200000 -.word 0x0000FFE0 -.word 0x00400000 -.word 0x00200040 -.word 0x0000FFE0 -.word 0x00000000 +############## unknown_043920.c (.data) ############## glabel D_800DCB50 .word 0x00000310 diff --git a/src/unknown_032760.c b/src/unknown_032760.c index edac00c9..89ef0279 100644 --- a/src/unknown_032760.c +++ b/src/unknown_032760.c @@ -5,12 +5,102 @@ #include "macros.h" #include "structs.h" -extern s32 D_800DC950; -extern s32 D_800DC954; -extern s32 D_800DC958; -extern s32 D_800DC95C; -extern s32 D_800DC960; -extern s32 D_800DC964; +/************ .data ************/ + +s32 D_800DC950 = 0; +s32 D_800DC954 = 0; +s32 D_800DC958 = 0; +s32 D_800DC95C = 0; +s32 D_800DC960 = 0; +s32 D_800DC964 = 0; +s32 D_800DC968 = 0; // Currently unknown, might be a different type. +s32 D_800DC96C = 0; // Currently unknown, might be a different type. + +// Unsure about the signed/unsigned with these arrays. +u16 D_800DC970[4] = { + 0x40FF, 0xFFFF, 0x0007, 0x0003 +}; +u16 D_800DC978[4] = { + 0x0000, 0x0000, 0x001E, 0xFFFF +}; +u16 D_800DC980[20] = { + 0xFF00, 0x0100, 0x0000, 0xFFFF, + 0xFFFF, 0x0100, 0x0100, 0x0000, + 0xFFFF, 0xFFFF, 0x0100, 0xFF00, + 0x0000, 0xFFFF, 0xFFFF, 0xFF00, + 0xFF00, 0x0000, 0xFFFF, 0xFFFF +}; +u16 D_800DC9A8[20] = { + 0x0000, 0x0040, 0xFFC0, 0x0000, + 0xFFC0, 0xFFC0, 0x0000, 0x0040, + 0x0020, 0x0000, 0xFFC0, 0x0020, + 0x0000, 0x0040, 0x0040, 0x0000, + 0xFFC0, 0x0040, 0x0000, 0x0000 +}; +u16 D_800DC9D0[64] = { + 0x0000, 0x0301, 0x0004, 0x0000, + 0x0001, 0x0004, 0x0004, 0x0004, + 0x0000, 0x0203, 0x0004, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0004, + 0x0002, 0x0503, 0x0001, 0x0000, + 0x0000, 0x0004, 0x0001, 0x0004, + 0x0002, 0x0405, 0x0001, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0004, + 0x0000, 0x0103, 0x0004, 0x0000, + 0x0004, 0x0004, 0x0001, 0x0004, + 0x0000, 0x0302, 0x0004, 0x0000, + 0x0001, 0x0004, 0x0001, 0x0000, + 0x0002, 0x0305, 0x0001, 0x0000, + 0x0001, 0x0004, 0x0000, 0x0004, + 0x0002, 0x0504, 0x0001, 0x0000, + 0x0000, 0x0004, 0x0000, 0x0000 +}; +s8 D_800DCA50[17] = { + 2, 5, 6, 3, 10, 8, 7, 9, + 2, 5, 6, 3, 10, 8, 7, 9, 11 +}; +s8 D_800DCA64[9] = { + 2, 5, 6, 3, 10, 8, 7, 9, 12 +}; +s8 D_800DCA70[10] = { + 2, 5, 6, 3, 10, 8, 7, 9, 11, 12 +}; +s32 D_800DCA7C[3] = { // Not sure about typing + 0, 0, 0 +}; +s32 D_800DCA88[8] = { // Definitly not s32, but I'm not sure what this is yet. + 0, 0, 0, 0x00000101, + 0x02000000, 0x00010102, 0x02000000, 0x00000000 +}; +u16 D_800DCAA8[64] = { + 0x0000, 0x0301, 0x0000, 0x0000, + 0xFFFF, 0xFFFF, 0x0000, 0xFFFF, + 0x0000, 0x0203, 0x0000, 0x0000, + 0xFFFF, 0x0000, 0xFFFF, 0xFFFF, + 0x0002, 0x0503, 0xFFFF, 0x0000, + 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, + 0x0002, 0x0405, 0xFFFF, 0x0000, + 0x0000, 0x0000, 0x0000, 0xFFFF, + 0x0000, 0x0103, 0x0000, 0x0000, + 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, + 0x0000, 0x0302, 0x0000, 0x0000, + 0xFFFF, 0xFFFF, 0xFFFF, 0x0000, + 0x0002, 0x0305, 0xFFFF, 0x0000, + 0xFFFF, 0xFFFF, 0x0000, 0xFFFF, + 0x0002, 0x0504, 0xFFFF, 0x0000, + 0x0000, 0xFFFF, 0x0000, 0x0000 +}; +u16 D_800DCB28[20] = { + 0xFFC0, 0x0000, 0x0020, 0xFFC0, + 0x0000, 0xFFE0, 0x0000, 0x0000, + 0x0020, 0x0000, 0x0000, 0xFFE0, + 0x0040, 0x0000, 0x0020, 0x0040, + 0x0000, 0xFFE0, 0x0000, 0x0000 +}; + +/*******************************/ + +/************ .bss ************/ extern f32 D_8011D4D0; extern s32 D_8011D4D4; @@ -18,6 +108,8 @@ extern s32 D_8011D4D8; extern s32 D_8011D4DC; extern s16 D_8011D4E2; +/******************************/ + Settings* get_settings(); Player_64 *func_800BE654(s16, f32, f32); void func_80000FDC(s32, s32, f32); From cae8c62befae7f833a1c1c533522aa2d750592ec Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 24 May 2021 20:40:31 -0500 Subject: [PATCH 08/39] unknown_043920.c data section --- data/dkr.data.s | 363 ++++++++++++++++++++++--------------------- src/unknown_043920.c | 98 +++++++++++- 2 files changed, 282 insertions(+), 179 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 474287e3..a1ac12bb 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -535,183 +535,194 @@ ############## unknown_043920.c (.data) ############## -glabel D_800DCB50 -.word 0x00000310 +# glabel D_800DCB50 +# .word 0x00000310 +# +# glabel D_800DCB54 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 -glabel D_800DCB54 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0xC1200000 -.word 0x40A00000 -.word 0x00000000 -.word 0x00000000 -.word 0x41200000 -.word 0x40A00000 -.word 0x00000000 -.word 0x00000000 -.word 0xC1200000 -.word 0x41200000 -.word 0x00000000 -.word 0x00000000 -.word 0x41200000 -.word 0x41200000 +# .word 0xC1200000 +# .word 0x40A00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x41200000 +# .word 0x40A00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xC1200000 +# .word 0x41200000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x41200000 +# .word 0x41200000 +# +# glabel D_800DCB98 +# .word 0x00000000 +# +# glabel D_800DCB9C +# .word 0x3B83126F +# .word 0x3BE56042 +# .word 0x3C23D70A +# .word 0x3B83126F +# .word 0x3C23D70A +# .word 0x3C23D70A +# .word 0x3C23D70A +# .word 0x3C23D70A +# .word 0x3C23D70A +# .word 0x3C23D70A +# .word 0x3B83126F +# .word 0x3B83126F +# .word 0x3B83126F +# .word 0x3B83126F +# .word 0x3B83126F +# .word 0x3B83126F +# .word 0x3B83126F +# .word 0x3B83126F +# .word 0x3B83126F +# .word 0x3F4CCCCD +# .word 0x3F59999A +# .word 0x3F59999A +# .word 0x3F000000 +# .word 0x3F000000 +# .word 0x3F000000 +# .word 0x3F000000 +# .word 0x3F000000 +# .word 0x3F000000 +# .word 0x3F000000 +# .word 0x3F000000 +# .word 0x3F4CCCCD +# .word 0x3F4CCCCD +# .word 0x3F570A3D +# .word 0x3F4CCCCD +# .word 0x3F4CCCCD +# .word 0x3F4CCCCD +# .word 0x3F4CCCCD +# .word 0x3F4CCCCD +# +# .word 0x00000000 +# .word 0x00000001 +# .word 0x00000001 +# +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000001A +# .word 0x0000001B +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x010C010B +# .word 0x0009010C +# .word 0x010C010C +# .word 0x010C010C +# .word 0x010C010C +# .word 0x010C0005 +# .word 0x010C010C +# .word 0x010C010C +# .word 0x010C010C +# .word 0x010C0000 +# +# .word 0x00000001 +# .word 0x00000004 +# .word 0x00000010 +# .word 0x00000001 +# .word 0x00000001 +# .word 0x00000001 +# .word 0x00000001 +# .word 0x00000001 +# .word 0x00000001 +# .word 0x00000001 +# .word 0x00000001 +# .word 0x00000001 +# .word 0x00000001 +# .word 0x00000100 +# .word 0x00000001 +# .word 0x00000001 +# .word 0x00000001 +# .word 0x00000001 +# .word 0x00000001 +# .word 0x00000000 +# .word 0x00000004 +# .word 0x00000010 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000100 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DCD90 +# .word 0x01010202 +# .word 0x04030006 +# .word 0x04030202 +# .word 0x05050500 +# +# .word 0x00000001 +# .word 0x01020202 +# .word 0x01010102 +# .word 0x03020302 +# +# .word 0x02FE03FE +# .word 0x02FC02FB +# .word 0x02FB02FE +# .word 0x02FD02FE +# .word 0x03FD05FC +# .word 0x04FE02FE +# .word 0x02FA02FE +# .word 0x08F803FD +# +# glabel D_800DCDD0 +# .word 0x0000A597 +# +# glabel D_800DCDD4 +# .word 0x00000000 +# .word 0x0032FFFF +# .word 0x00000000 -glabel D_800DCB98 -.word 0x00000000 +###################################################### -glabel D_800DCB9C -.word 0x3B83126F -.word 0x3BE56042 -.word 0x3C23D70A -.word 0x3B83126F -.word 0x3C23D70A -.word 0x3C23D70A -.word 0x3C23D70A -.word 0x3C23D70A -.word 0x3C23D70A -.word 0x3C23D70A -.word 0x3B83126F -.word 0x3B83126F -.word 0x3B83126F -.word 0x3B83126F -.word 0x3B83126F -.word 0x3B83126F -.word 0x3B83126F -.word 0x3B83126F -.word 0x3B83126F -.word 0x3F4CCCCD -.word 0x3F59999A -.word 0x3F59999A -.word 0x3F000000 -.word 0x3F000000 -.word 0x3F000000 -.word 0x3F000000 -.word 0x3F000000 -.word 0x3F000000 -.word 0x3F000000 -.word 0x3F000000 -.word 0x3F4CCCCD -.word 0x3F4CCCCD -.word 0x3F570A3D -.word 0x3F4CCCCD -.word 0x3F4CCCCD -.word 0x3F4CCCCD -.word 0x3F4CCCCD -.word 0x3F4CCCCD -.word 0x00000000 -.word 0x00000001 -.word 0x00000001 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000001A -.word 0x0000001B -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x010C010B -.word 0x0009010C -.word 0x010C010C -.word 0x010C010C -.word 0x010C010C -.word 0x010C0005 -.word 0x010C010C -.word 0x010C010C -.word 0x010C010C -.word 0x010C0000 -.word 0x00000001 -.word 0x00000004 -.word 0x00000010 -.word 0x00000001 -.word 0x00000001 -.word 0x00000001 -.word 0x00000001 -.word 0x00000001 -.word 0x00000001 -.word 0x00000001 -.word 0x00000001 -.word 0x00000001 -.word 0x00000001 -.word 0x00000100 -.word 0x00000001 -.word 0x00000001 -.word 0x00000001 -.word 0x00000001 -.word 0x00000001 -.word 0x00000000 -.word 0x00000004 -.word 0x00000010 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000100 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DCD90 -.word 0x01010202 -.word 0x04030006 -.word 0x04030202 -.word 0x05050500 -.word 0x00000001 -.word 0x01020202 -.word 0x01010102 -.word 0x03020302 -.word 0x02FE03FE -.word 0x02FC02FB -.word 0x02FB02FE -.word 0x02FD02FE -.word 0x03FD05FC -.word 0x04FE02FE -.word 0x02FA02FE -.word 0x08F803FD - -glabel D_800DCDD0 -.word 0x0000A597 - -glabel D_800DCDD4 -.word 0x00000000 -.word 0x0032FFFF -.word 0x00000000 +############## unknown_05CEF0.c (.data) ############## glabel D_800DCDE0 .word 0x022B00A3 @@ -723,6 +734,10 @@ glabel D_800DCDE0 .word 0x002F0030 .word 0x00000000 +###################################################### + +############## unknown_05DCD0.c (.data) ############## + glabel D_800DCE00 .word 0x022D00A7 .word 0x00A800B7 diff --git a/src/unknown_043920.c b/src/unknown_043920.c index c7d6b2b0..0fa39fcc 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -5,15 +5,103 @@ #include "macros.h" #include "structs.h" -extern s32 D_800DCB50; -extern s16 D_800DCB54; -extern f32 D_800DCB9C; -extern s32 D_800DCDD0; + +/************ .data ************/ + +s32 D_800DCB50 = 0x310; +s16 D_800DCB54 = 0; +s32 D_800DCB58 = 0; // Currently unknown, might be a different type. +s32 D_800DCB5C = 0; // Currently unknown, might be a different type. + +// Not sure if D_800DCB58 & D_800DCB5C are actually a part of this array. +f32 D_800DCB60[14] = { + -10.0f, 5.0f, 0.0f, 0.0f, + 10.0f, 5.0f, 0.0f, 0.0f, + -10.0f, 10.0f, 0.0f, 0.0f, + 10.0f, 10.0f +}; + +s32 D_800DCB98 = 0; // Currently unknown, might be a different type. +f32 D_800DCB9C[38] = { + 0.004f, 0.007f, 0.0099999999f, 0.004f, + 0.0099999999f, 0.0099999999f, 0.0099999999f, 0.0099999999f, + 0.0099999999f, 0.0099999999f, 0.004f, 0.004f, + 0.004f, 0.004f, 0.004f, 0.004f, + 0.004f, 0.004f, 0.004f, 0.8f, + 0.85f, 0.85f, 0.5f, 0.5f, + 0.5f, 0.5f, 0.5f, 0.5f, + 0.5f, 0.5f, 0.8f, 0.8f, + 0.84f, 0.8f, 0.8f, 0.8f, + 0.8f, 0.8f +}; + +// Unused? Not sure if this is actually an array or just some random data. +s32 D_800DCC34[38] = { + 0, 1, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 26, 27, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0 +}; + +// Unused? +s16 D_800DCCB4[20] = { + 0x010C, 0x010B, 0x0009, 0x010C, + 0x010C, 0x010C, 0x010C, 0x010C, + 0x010C, 0x010C, 0x010C, 0x0005, + 0x010C, 0x010C, 0x010C, 0x010C, + 0x010C, 0x010C, 0x010C, 0x0000 +}; + +// Unused? Not sure if this is actually an array or just some random data. +s32 D_800DCCDC[39] = { + 1, 4, 16, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 0x100, 1, 1, + 1, 1, 1, 0, 4, 16, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0x100, 0, 0, 0, 0, 0, 0 +}; + +s8 D_800DCD90[15] = { + 1, 1, 2, 2, 4, 3, 0, 6, + 4, 3, 2, 2, 5, 5, 5 +}; + +// Unused? +s8 D_800DCDA0[16] = { + 0, 0, 0, 1, 1, 2, 2, 2, + 1, 1, 1, 2, 3, 2, 3, 2 +}; + +// Unused? +s16 D_800DCDB0[16] = { + 0x02FE, 0x03FE, 0x02FC, 0x02FB, + 0x02FB, 0x02FE, 0x02FD, 0x02FE, + 0x03FD, 0x05FC, 0x04FE, 0x02FE, + 0x02FA, 0x02FE, 0x08F8, 0x03FD +}; + +s32 D_800DCDD0 = 42391; + +s16 D_800DCDD4[4] = { + 0, 0, 0x32, -1 + // There might be one or two extra zeroes here. +}; + +/*******************************/ + +/************ .rodata ************/ + extern f64 D_800E6768; extern f64 D_800E6770; extern f64 D_800E6778; extern f64 D_800E6780; extern f32 D_800E6A00; + +/*********************************/ + +/************ .bss ************/ + extern s32 D_8011D528; extern s32 D_8011D55C; extern s8 D_8011D582; @@ -457,7 +545,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_043920/func_8005A6F0.s") GLOBAL_ASM("asm/non_matchings/unknown_043920/func_8005B818.s") void func_8005C25C(void) { - D_800DCB9C = D_800E6A00; + D_800DCB9C[0] = D_800E6A00; } /* Unknown Size */ From f64aed5c44eab003415804b7b112bb7c2e1b6eb9 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 24 May 2021 20:47:24 -0500 Subject: [PATCH 09/39] unknown_05CEF0.c data section --- data/dkr.data.s | 18 +++++++++--------- src/unknown_05CEF0.c | 11 +++++++++++ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index a1ac12bb..1211182b 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -724,15 +724,15 @@ ############## unknown_05CEF0.c (.data) ############## -glabel D_800DCDE0 -.word 0x022B00A3 -.word 0x00A400B3 -.word 0x00B400F0 -.word 0x00F100F6 -.word 0x00F70225 -.word 0x0226002E -.word 0x002F0030 -.word 0x00000000 +# glabel D_800DCDE0 +# .word 0x022B00A3 +# .word 0x00A400B3 +# .word 0x00B400F0 +# .word 0x00F100F6 +# .word 0x00F70225 +# .word 0x0226002E +# .word 0x002F0030 +# .word 0x00000000 ###################################################### diff --git a/src/unknown_05CEF0.c b/src/unknown_05CEF0.c index eb94431f..f8d3310e 100644 --- a/src/unknown_05CEF0.c +++ b/src/unknown_05CEF0.c @@ -4,6 +4,17 @@ #include "types.h" #include "macros.h" +/************ .data ************/ + +s16 D_800DCDE0[14] = { + 0x022B, 0x00A3, 0x00A4, 0x00B3, + 0x00B4, 0x00F0, 0x00F1, 0x00F6, + 0x00F7, 0x0225, 0x0226, 0x002E, + 0x002F, 0x0030 +}; + +/*******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005C2F0.s") GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005C364.s") GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005CA78.s") From 488f10e539f050adb4fb74cf1868ae8cdefa0a36 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 24 May 2021 20:56:30 -0500 Subject: [PATCH 10/39] unknown_05DCD0.c data section --- data/dkr.data.s | 40 ++++++++++++++++++++++------------------ src/unknown_05CEF0.c | 4 ++-- src/unknown_05DCD0.c | 18 ++++++++++++++++++ 3 files changed, 42 insertions(+), 20 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 1211182b..822bcc5e 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -738,25 +738,29 @@ ############## unknown_05DCD0.c (.data) ############## -glabel D_800DCE00 -.word 0x022D00A7 -.word 0x00A800B7 -.word 0x00B800F4 -.word 0x00F500FA -.word 0x00FB0229 -.word 0x022A002E -.word 0x002F0030 -.word 0x00000000 +# glabel D_800DCE00 +# .word 0x022D00A7 +# .word 0x00A800B7 +# .word 0x00B800F4 +# .word 0x00F500FA +# .word 0x00FB0229 +# .word 0x022A002E +# .word 0x002F0030 +# .word 0x00000000 +# +# glabel D_800DCE20 +# .word 0x022C00A5 +# .word 0x00A600B5 +# .word 0x00B600F2 +# .word 0x00F300F8 +# .word 0x00F90227 +# .word 0x0228002E +# .word 0x002F0030 +# .word 0x00000000 -glabel D_800DCE20 -.word 0x022C00A5 -.word 0x00A600B5 -.word 0x00B600F2 -.word 0x00F300F8 -.word 0x00F90227 -.word 0x0228002E -.word 0x002F0030 -.word 0x00000000 +###################################################### + +############## unknown_05F0C0.c (.data) ############## glabel D_800DCE40 .word 0x02440242 diff --git a/src/unknown_05CEF0.c b/src/unknown_05CEF0.c index f8d3310e..d9f998b9 100644 --- a/src/unknown_05CEF0.c +++ b/src/unknown_05CEF0.c @@ -6,11 +6,11 @@ /************ .data ************/ -s16 D_800DCDE0[14] = { +s16 D_800DCDE0[16] = { 0x022B, 0x00A3, 0x00A4, 0x00B3, 0x00B4, 0x00F0, 0x00F1, 0x00F6, 0x00F7, 0x0225, 0x0226, 0x002E, - 0x002F, 0x0030 + 0x002F, 0x0030, 0x0000, 0x0000 }; /*******************************/ diff --git a/src/unknown_05DCD0.c b/src/unknown_05DCD0.c index 46f8e22d..64c60118 100644 --- a/src/unknown_05DCD0.c +++ b/src/unknown_05DCD0.c @@ -4,6 +4,24 @@ #include "types.h" #include "macros.h" +/************ .data ************/ + +s16 D_800DCE00[16] = { + 0x022D, 0x00A7, 0x00A8, 0x00B7, + 0x00B8, 0x00F4, 0x00F5, 0x00FA, + 0x00FB, 0x0229, 0x022A, 0x002E, + 0x002F, 0x0030, 0x0000, 0x0000 +}; + +s16 D_800DCE20[16] = { + 0x022C, 0x00A5, 0x00A6, 0x00B5, + 0x00B6, 0x00F2, 0x00F3, 0x00F8, + 0x00F9, 0x0227, 0x0228, 0x002E, + 0x002F, 0x0030, 0x0000, 0x0000 +}; + +/*******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05DCD0/func_8005D0D0.s") GLOBAL_ASM("asm/non_matchings/unknown_05DCD0/func_8005D820.s") GLOBAL_ASM("asm/non_matchings/unknown_05DCD0/func_8005E204.s") From de26b50d10b9919e8e9919492351d5671eb7bf20 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 24 May 2021 21:01:01 -0500 Subject: [PATCH 11/39] unknown_05F0C0.c data section --- data/dkr.data.s | 26 +++++++++++++++++--------- src/unknown_05F0C0.c | 11 +++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 822bcc5e..8defe642 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -762,15 +762,19 @@ ############## unknown_05F0C0.c (.data) ############## -glabel D_800DCE40 -.word 0x02440242 -.word 0x02430245 -.word 0x02460247 -.word 0x024800F6 -.word 0x00F70225 -.word 0x0226002E -.word 0x002F0030 -.word 0x00000000 +# glabel D_800DCE40 +# .word 0x02440242 +# .word 0x02430245 +# .word 0x02460247 +# .word 0x024800F6 +# .word 0x00F70225 +# .word 0x0226002E +# .word 0x002F0030 +# .word 0x00000000 + +###################################################### + +############## unknown_05F690.c (.data) ############## glabel D_800DCE60 .word 0x022C00A5 @@ -800,6 +804,10 @@ glabel D_800DCEA4 .word 0x00000000 .word 0x00000000 +###################################################### + +############## unknown_064830.c (.data) ############## + glabel D_800DCEB0 .word 0x01000000 .word 0x00000010 diff --git a/src/unknown_05F0C0.c b/src/unknown_05F0C0.c index 3fbb6520..09ce122c 100644 --- a/src/unknown_05F0C0.c +++ b/src/unknown_05F0C0.c @@ -4,4 +4,15 @@ #include "types.h" #include "macros.h" +/************ .data ************/ + +s16 D_800DCE40[16] = { + 0x0244, 0x0242, 0x0243, 0x0245, + 0x0246, 0x0247, 0x0248, 0x00F6, + 0x00F7, 0x0225, 0x0226, 0x002E, + 0x002F, 0x0030, 0x0000, 0x0000 +}; + +/*******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05F0C0/func_8005E4C0.s") From 0b191306ecdcfb17b6e26aebffb11e9e79ede272 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 24 May 2021 21:06:08 -0500 Subject: [PATCH 12/39] unknown_05F690.c data section --- data/dkr.data.s | 54 ++++++++++++++++++++++---------------------- src/unknown_05F690.c | 22 ++++++++++++++++++ 2 files changed, 49 insertions(+), 27 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 8defe642..b8fd41ca 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -776,33 +776,33 @@ ############## unknown_05F690.c (.data) ############## -glabel D_800DCE60 -.word 0x022C00A5 -.word 0x00A60057 -.word 0x0051006D -.word 0x005200F8 -.word 0x00F90227 -.word 0x0228002E -.word 0x002F0030 -.word 0x00000000 - -glabel D_800DCE80 -.word 0x022C00A5 -.word 0x00A60057 -.word 0x0051006D -.word 0x005200F8 -.word 0x00F90227 -.word 0x0228002E -.word 0x002F0030 -.word 0x00000000 - -glabel D_800DCEA0 -.word 0x0001C65B - -glabel D_800DCEA4 -.word 0x000007BC -.word 0x00000000 -.word 0x00000000 +# glabel D_800DCE60 +# .word 0x022C00A5 +# .word 0x00A60057 +# .word 0x0051006D +# .word 0x005200F8 +# .word 0x00F90227 +# .word 0x0228002E +# .word 0x002F0030 +# .word 0x00000000 +# +# glabel D_800DCE80 +# .word 0x022C00A5 +# .word 0x00A60057 +# .word 0x0051006D +# .word 0x005200F8 +# .word 0x00F90227 +# .word 0x0228002E +# .word 0x002F0030 +# .word 0x00000000 +# +# glabel D_800DCEA0 +# .word 0x0001C65B +# +# glabel D_800DCEA4 +# .word 0x000007BC +# .word 0x00000000 +# .word 0x00000000 ###################################################### diff --git a/src/unknown_05F690.c b/src/unknown_05F690.c index 31674e10..5d67e307 100644 --- a/src/unknown_05F690.c +++ b/src/unknown_05F690.c @@ -4,6 +4,28 @@ #include "types.h" #include "macros.h" +/************ .data ************/ + +s16 D_800DCE60[16] = { + 0x022C, 0x00A5, 0x00A6, 0x0057, + 0x0051, 0x006D, 0x0052, 0x00F8, + 0x00F9, 0x0227, 0x0228, 0x002E, + 0x002F, 0x0030, 0x0000, 0x0000 +}; + + +s16 D_800DCE80[16] = { + 0x022C, 0x00A5, 0x00A6, 0x0057, + 0x0051, 0x006D, 0x0052, 0x00F8, + 0x00F9, 0x0227, 0x0228, 0x002E, + 0x002F, 0x0030, 0x0000, 0x0000 +}; + +s32 D_800DCEA0 = 116315; +s32 D_800DCEA4 = 1980; + +/*******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005EA90.s") GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005F310.s") GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005F850.s") From 0646e61d704003eccf3d3775e9c8fc068a82162f Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 24 May 2021 21:38:32 -0500 Subject: [PATCH 13/39] unknown_064830.c data section --- data/dkr.data.s | 234 ++++++++++++++++++++++--------------------- src/unknown_064830.c | 84 ++++++++++++++++ 2 files changed, 203 insertions(+), 115 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index b8fd41ca..ca5dc77f 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -808,123 +808,127 @@ ############## unknown_064830.c (.data) ############## -glabel D_800DCEB0 -.word 0x01000000 -.word 0x00000010 -.word 0x00000010 -.word 0x00000020 +# glabel D_800DCEB0 +# .word 0x01000000 +# .word 0x00000010 +# .word 0x00000010 +# .word 0x00000020 +# +# glabel D_800DCEC0 +# .word 0x00000003 +# .word 0x00000FA0 +# .word 0x00000000 +# .word 0x00000870 +# .word 0x00002666 +# .word 0xFFFFD99A +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x000002F8 +# .word 0x000005F0 +# .word 0x00000CCC +# .word 0xFFFFF334 +# .word 0x00003FFF +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000960 +# .word 0x00001388 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00005000 +# +# glabel D_800DCF28 +# .word 0x00000004 +# .word 0x00000FA0 +# .word 0x00000000 +# .word 0x00000A50 +# .word 0x00002666 +# .word 0xFFFFD99A +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000370 +# .word 0x00000870 +# .word 0x00000CCC +# .word 0xFFFFF334 +# .word 0x00003FFF +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000A50 +# .word 0x00000E38 +# .word 0x00000CCC +# .word 0xFFFFF334 +# .word 0x00003FFF +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000EB0 +# .word 0x00001F40 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00005000 +# +# glabel D_800DCFB0 +# .word 0x00000001 +# .word 0x00001F40 +# .word 0x00000000 +# .word 0x00001BF8 +# .word 0x00002EE0 +# .word 0x00000000 +# .word 0x00007FFF +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DCFD8 +# .word 0x00000001 +# .word 0x00000320 +# .word 0x00000000 +# .word 0x000000C8 +# .word 0x00004000 +# .word 0x00000000 +# .word 0x00007FFF +# .word 0x00001DB0 +# .word 0x000002BC +# .word 0x00000000 +# +# glabel D_800DD000 +# .word 0x00000001 +# .word 0x00000320 +# .word 0x00000000 +# .word 0x000000C8 +# .word 0x00000000 +# .word 0x00005FFF +# .word 0x00007FFF +# .word 0x0000017C +# .word 0x000001F4 +# .word 0x00000000 +# +# glabel D_800DD028 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 -glabel D_800DCEC0 -.word 0x00000003 -.word 0x00000FA0 -.word 0x00000000 -.word 0x00000870 -.word 0x00002666 -.word 0xFFFFD99A -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x000002F8 -.word 0x000005F0 -.word 0x00000CCC -.word 0xFFFFF334 -.word 0x00003FFF -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000960 -.word 0x00001388 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00005000 +###################################################### -glabel D_800DCF28 -.word 0x00000004 -.word 0x00000FA0 -.word 0x00000000 -.word 0x00000A50 -.word 0x00002666 -.word 0xFFFFD99A -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000370 -.word 0x00000870 -.word 0x00000CCC -.word 0xFFFFF334 -.word 0x00003FFF -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000A50 -.word 0x00000E38 -.word 0x00000CCC -.word 0xFFFFF334 -.word 0x00003FFF -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000EB0 -.word 0x00001F40 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00005000 - -glabel D_800DCFB0 -.word 0x00000001 -.word 0x00001F40 -.word 0x00000000 -.word 0x00001BF8 -.word 0x00002EE0 -.word 0x00000000 -.word 0x00007FFF -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DCFD8 -.word 0x00000001 -.word 0x00000320 -.word 0x00000000 -.word 0x000000C8 -.word 0x00004000 -.word 0x00000000 -.word 0x00007FFF -.word 0x00001DB0 -.word 0x000002BC -.word 0x00000000 - -glabel D_800DD000 -.word 0x00000001 -.word 0x00000320 -.word 0x00000000 -.word 0x000000C8 -.word 0x00000000 -.word 0x00005FFF -.word 0x00007FFF -.word 0x0000017C -.word 0x000001F4 -.word 0x00000000 - -glabel D_800DD028 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +############## unknown_0667D0.c (.data) ############## glabel D_800DD050 .word 0x00000000 diff --git a/src/unknown_064830.c b/src/unknown_064830.c index 0fce57db..fe1d2ab4 100644 --- a/src/unknown_064830.c +++ b/src/unknown_064830.c @@ -6,6 +6,90 @@ #include "libultra_internal.h" #include "audio_internal.h" +/************ .data ************/ + +s8 D_800DCEB0 = 1; +s32 D_800DCEB4 = 0x10; // Currently unknown, might be a different type. +s32 D_800DCEB8 = 0x10; // Currently unknown, might be a different type. +s32 D_800DCEBC = 0x20; // Currently unknown, might be a different type. + +// TODO: Figure out what this actually is. +s32 D_800DCEC0[26] = { + 0x00000003, 0x00000FA0, + 0x00000000, 0x00000870, + 0x00002666, 0xFFFFD99A, + 0x00000000, 0x00000000, + 0x00000000, 0x00000000, + 0x000002F8, 0x000005F0, + 0x00000CCC, 0xFFFFF334, + 0x00003FFF, 0x00000000, + 0x00000000, 0x00000000, + 0x00000000, 0x00000960, + 0x00001388, 0x00000000, + 0x00000000, 0x00000000, + 0x00000000, 0x00005000 +}; + +// TODO: Figure out what this actually is. +s32 D_800DCF28[34] = { + 0x00000004, 0x00000FA0, + 0x00000000, 0x00000A50, + 0x00002666, 0xFFFFD99A, + 0x00000000, 0x00000000, + 0x00000000, 0x00000000, + 0x00000370, 0x00000870, + 0x00000CCC, 0xFFFFF334, + 0x00003FFF, 0x00000000, + 0x00000000, 0x00000000, + 0x00000A50, 0x00000E38, + 0x00000CCC, 0xFFFFF334, + 0x00003FFF, 0x00000000, + 0x00000000, 0x00000000, + 0x00000000, 0x00000EB0, + 0x00001F40, 0x00000000, + 0x00000000, 0x00000000, + 0x00000000, 0x00005000 +}; + +// TODO: Figure out what this actually is. +s32 D_800DCFB0[10] = { + 0x00000001, 0x00001F40, + 0x00000000, 0x00001BF8, + 0x00002EE0, 0x00000000, + 0x00007FFF, 0x00000000, + 0x00000000, 0x00000000 +}; + +// TODO: Figure out what this actually is. +s32 D_800DCFD8[10] = { + 0x00000001, 0x00000320, + 0x00000000, 0x000000C8, + 0x00004000, 0x00000000, + 0x00007FFF, 0x00001DB0, + 0x000002BC, 0x00000000 +}; + +// TODO: Figure out what this actually is. +s32 D_800DD000[10] = { + 0x00000001, 0x00000320, + 0x00000000, 0x000000C8, + 0x00000000, 0x00005FFF, + 0x00007FFF, 0x0000017C, + 0x000001F4, 0x00000000 +}; + +// TODO: Figure out what this actually is. +s32 D_800DD028[10] = { + 0x00000000, 0x00000000, + 0x00000000, 0x00000000, + 0x00000000, 0x00000000, + 0x00000000, 0x00000000, + 0x00000000, 0x00000000 +}; + + +/*******************************/ + extern s32 alAuxBusPull; extern s32 alAuxBusParam; extern s32 alEnvMixerPull; From 85afd4e375bd76bb62d8aeaf2c864e2c04acdc86 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 24 May 2021 21:42:42 -0500 Subject: [PATCH 14/39] unknown_0667D0.c data section --- data/dkr.data.s | 14 +++++++++----- src/unknown_0667D0.c | 11 ++++++++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index ca5dc77f..a707bc2d 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -930,11 +930,15 @@ ############## unknown_0667D0.c (.data) ############## -glabel D_800DD050 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +# glabel D_800DD050 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 + +###################################################### + +############## unknown_066AA0.c (.data) ############## glabel D_800DD060 .word 0x00000000 diff --git a/src/unknown_0667D0.c b/src/unknown_0667D0.c index 7d8c591a..bc589714 100644 --- a/src/unknown_0667D0.c +++ b/src/unknown_0667D0.c @@ -4,14 +4,23 @@ #include "types.h" #include "macros.h" -extern s16 D_800DD050; +/************ .data ************/ + +s16 D_800DD050 = 0; + +/*******************************/ extern s32* D_80065D98; + +/************ .bss ************/ + extern s32* D_8011D750; extern s32* D_8011F758; extern s32* D_8011F760; extern s32* D_8011F910; +/******************************/ + void func_80065BD0(s32 arg0) { D_800DD050 = arg0; } From c927ab6454288d25bae96b8b010b8652ae94ea8c Mon Sep 17 00:00:00 2001 From: David Benepe Date: Tue, 25 May 2021 14:04:22 -0500 Subject: [PATCH 15/39] unknown_066AA0.c data section --- data/dkr.data.s | 661 ++++++++++++++++++++++--------------------- src/unknown_066AA0.c | 222 +++++++++++++-- 2 files changed, 530 insertions(+), 353 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index a707bc2d..2616d281 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -940,336 +940,345 @@ ############## unknown_066AA0.c (.data) ############## -glabel D_800DD060 -.word 0x00000000 +# glabel D_800DD060 +# .word 0x00000000 +# +# glabel D_800DD064 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000140 +# .word 0x000000F0 +# .word 0x000000A0 +# .word 0x00000078 +# .word 0x00000140 +# .word 0x000000F0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000013F +# .word 0x000000EF +# glabel D_800DD094 +# .word 0x00000000 +# +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000140 +# .word 0x000000F0 +# .word 0x000000A0 +# .word 0x00000078 +# .word 0x00000140 +# .word 0x000000F0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000013F +# .word 0x000000EF +# .word 0x00000000 +# +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000140 +# .word 0x000000F0 +# .word 0x000000A0 +# .word 0x00000078 +# .word 0x00000140 +# .word 0x000000F0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000013F +# .word 0x000000EF +# .word 0x00000000 +# +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000140 +# .word 0x000000F0 +# .word 0x000000A0 +# .word 0x00000078 +# .word 0x00000140 +# .word 0x000000F0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000013F +# .word 0x000000EF +# .word 0x00000000 +# +# glabel D_800DD134 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000FFFF +# .word 0xFFFF0000 +# .word 0x00000000 +# +# glabel D_800DD148 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x00000000 +# .word 0x01FF0000 +# +# glabel D_800DD288 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xC38C8000 +# +# glabel D_800DD2A0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DD2B8 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 -glabel D_800DD064 -.word 0x00000000 -.word 0x00000000 -.word 0x00000140 -.word 0x000000F0 -.word 0x000000A0 -.word 0x00000078 -.word 0x00000140 -.word 0x000000F0 -.word 0x00000000 -.word 0x00000000 -.word 0x0000013F -.word 0x000000EF +# glabel D_800DD2CC +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x43200000 +# +# glabel D_800DD2F8 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DD300 +# .word 0x00000000 +# +# glabel D_800DD304 +# .word 0xFFFF0000 +# .word 0, 0 # Padding +# -glabel D_800DD094 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000140 -.word 0x000000F0 -.word 0x000000A0 -.word 0x00000078 -.word 0x00000140 -.word 0x000000F0 -.word 0x00000000 -.word 0x00000000 -.word 0x0000013F -.word 0x000000EF -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000140 -.word 0x000000F0 -.word 0x000000A0 -.word 0x00000078 -.word 0x00000140 -.word 0x000000F0 -.word 0x00000000 -.word 0x00000000 -.word 0x0000013F -.word 0x000000EF -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000140 -.word 0x000000F0 -.word 0x000000A0 -.word 0x00000078 -.word 0x00000140 -.word 0x000000F0 -.word 0x00000000 -.word 0x00000000 -.word 0x0000013F -.word 0x000000EF -.word 0x00000000 +### File boundary! Need to split unknown_066AA0 here. ### -glabel D_800DD134 -.word 0x00000000 -.word 0x00000000 -.word 0x0000FFFF -.word 0xFFFF0000 -.word 0x00000000 +# glabel D_800DD310 +# .word 0x00000000 +# +# glabel D_800DD314 +# .word 0xFF000000 +# +# glabel D_800DD318 +# .word 0x00000000 +# +# glabel D_800DD31C +# .word 0x00000000 +# +# glabel D_800DD320 +# .word 0x0000585E +# +# glabel D_800DD324 +# .word 0x00000154 +# +# glabel D_800DD328 +# .word 0x00000000 +# +# glabel D_800DD32C +# .word 0x00000000 +# +# glabel D_800DD330 +# .word 0x00000000 +# +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x800E7110 +# .word 0x800E7118 +# .word 0x800E7128 +# +# # Version build string +# .aligned_text "Version 7.7 29/09/97 15.00 L.Schuneman" +# +# glabel D_800DD374 +# .word 0x00000000 +# .word 0x00000001 +# +# glabel D_800DD37C +# .word 0x00000000 +# +# glabel D_800DD380 +# .word 0x00000000 +# +# glabel D_800DD384 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DD38C +# .word 0x00000000 +# +# glabel D_800DD390 +# .word 0x00000000 +# +# glabel D_800DD394 +# .word 0x00000000 +# +# glabel D_800DD398 +# .word 0x00000000 +# +# glabel D_800DD39C +# .word 0x00000000 +# +# glabel D_800DD3A0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DD3B0 +# .word 0x00001194 +# .word 0x00001B58 +# .word 0x00002AF8 +# +# glabel D_800DD3BC +# .word 0x00002AF8 +# +# glabel D_800DD3C0 +# .word 0x0000012C +# .word 0x00000258 +# .word 0x00000352 +# +# glabel D_800DD3CC +# .word 0x00000384 +# +# glabel D_800DD3D0 +# .word 0x0000012C +# .word 0x00000190 +# .word 0x00000226 +# +# glabel D_800DD3DC +# .word 0x00000258 +# +# glabel D_800DD3E0 +# .word 0x00000014 +# .word 0x0000001E +# .word 0x00000028 +# +# glabel D_800DD3EC +# .word 0x00000032 +# +# glabel D_800DD3F0 +# .word 0x00000000 +# +# glabel D_800DD3F4 +# .word 0x80000000 +# .word 0x00140000 +# .word 0x00FFFFFF +# .word 0x0014FFFF +# +# glabel D_800DD404 +# .half 0x0000 +# .byte 0x00 +# +# glabel D_800DD407 +# .byte 0x0C +# +# glabel D_800DD408 +# .word 0x00FFFFFF +# .word 0x001EFFFF +# .word 0x800E713C +# .word 0x800E7140 +# .word 0x800E7144 +# +# glabel D_800DD41C +# .word 0x00000000 +# .word 0x001EFFFF +# +# glabel D_800DD424 +# .word 0x00000000 +# .word 0x0104FFFF +# .word 0 # Padding -glabel D_800DD148 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 -.word 0x00000000 -.word 0x01FF0000 +###################################################### -glabel D_800DD288 -.word 0x00000000 -.word 0x00000000 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0xC38C8000 - -glabel D_800DD2A0 -.word 0x00000000 -.word 0x00000000 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DD2B8 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DD2CC -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x43200000 - -glabel D_800DD2F8 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DD300 -.word 0x00000000 - -glabel D_800DD304 -.word 0xFFFF0000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DD310 -.word 0x00000000 - -glabel D_800DD314 -.word 0xFF000000 - -glabel D_800DD318 -.word 0x00000000 - -glabel D_800DD31C -.word 0x00000000 - -glabel D_800DD320 -.word 0x0000585E - -glabel D_800DD324 -.word 0x00000154 - -glabel D_800DD328 -.word 0x00000000 - -glabel D_800DD32C -.word 0x00000000 - -glabel D_800DD330 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x800E7110 -.word 0x800E7118 -.word 0x800E7128 - -# Version build string -.aligned_text "Version 7.7 29/09/97 15.00 L.Schuneman" - -glabel D_800DD374 -.word 0x00000000 -.word 0x00000001 - -glabel D_800DD37C -.word 0x00000000 - -glabel D_800DD380 -.word 0x00000000 - -glabel D_800DD384 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DD38C -.word 0x00000000 - -glabel D_800DD390 -.word 0x00000000 - -glabel D_800DD394 -.word 0x00000000 - -glabel D_800DD398 -.word 0x00000000 - -glabel D_800DD39C -.word 0x00000000 - -glabel D_800DD3A0 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DD3B0 -.word 0x00001194 -.word 0x00001B58 -.word 0x00002AF8 - -glabel D_800DD3BC -.word 0x00002AF8 - -glabel D_800DD3C0 -.word 0x0000012C -.word 0x00000258 -.word 0x00000352 - -glabel D_800DD3CC -.word 0x00000384 - -glabel D_800DD3D0 -.word 0x0000012C -.word 0x00000190 -.word 0x00000226 - -glabel D_800DD3DC -.word 0x00000258 - -glabel D_800DD3E0 -.word 0x00000014 -.word 0x0000001E -.word 0x00000028 - -glabel D_800DD3EC -.word 0x00000032 - -glabel D_800DD3F0 -.word 0x00000000 - -glabel D_800DD3F4 -.word 0x80000000 -.word 0x00140000 -.word 0x00FFFFFF -.word 0x0014FFFF - -glabel D_800DD404 -.half 0x0000 -.byte 0x00 - -glabel D_800DD407 -.byte 0x0C - -glabel D_800DD408 -.word 0x00FFFFFF -.word 0x001EFFFF -.word 0x800E713C -.word 0x800E7140 -.word 0x800E7144 - -glabel D_800DD41C -.word 0x00000000 -.word 0x001EFFFF - -glabel D_800DD424 -.word 0x00000000 -.word 0x0104FFFF -.word 0x00000000 +############## unknown_070110.c (.data) ############## glabel D_800DD430 .word 0x00000000 @@ -1798,6 +1807,8 @@ glabel D_800DD43C glabel D_800DDC3E .half 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070, 0x007A, 0x0084, 0x008F, 0x0099, 0x00A3, 0x00AD, 0x00B7, 0x00C2, 0x00CC, 0x00D6, 0x00E0, 0x00EA, 0x00F4, 0x00FF, 0x0109, 0x0113, 0x011D, 0x0127, 0x0131, 0x013C, 0x0146, 0x0150, 0x015A, 0x0164, 0x016F, 0x0179, 0x0183, 0x018D, 0x0197, 0x01A1, 0x01AC, 0x01B6, 0x01C0, 0x01CA, 0x01D4, 0x01DE, 0x01E9, 0x01F3, 0x01FD, 0x0207, 0x0211, 0x021B, 0x0226, 0x0230, 0x023A, 0x0244, 0x024E, 0x0258, 0x0262, 0x026D, 0x0277, 0x0281, 0x028B, 0x0295, 0x029F, 0x02A9, 0x02B4, 0x02BE, 0x02C8, 0x02D2, 0x02DC, 0x02E6, 0x02F0, 0x02FB, 0x0305, 0x030F, 0x0319, 0x0323, 0x032D, 0x0337, 0x0341, 0x034C, 0x0356, 0x0360, 0x036A, 0x0374, 0x037E, 0x0388, 0x0392, 0x039C, 0x03A7, 0x03B1, 0x03BB, 0x03C5, 0x03CF, 0x03D9, 0x03E3, 0x03ED, 0x03F7, 0x0401, 0x040C, 0x0416, 0x0420, 0x042A, 0x0434, 0x043E, 0x0448, 0x0452, 0x045C, 0x0466, 0x0470, 0x047A, 0x0484, 0x048E, 0x0499, 0x04A3, 0x04AD, 0x04B7, 0x04C1, 0x04CB, 0x04D5, 0x04DF, 0x04E9, 0x04F3, 0x04FD, 0x0507, 0x0511, 0x051B, 0x0525, 0x052F, 0x0539, 0x0543, 0x054D, 0x0557, 0x0561, 0x056B, 0x0575, 0x057F, 0x0589, 0x0593, 0x059D, 0x05A7, 0x05B1, 0x05BB, 0x05C5, 0x05CF, 0x05D9, 0x05E3, 0x05ED, 0x05F7, 0x0601, 0x060B, 0x0615, 0x061F, 0x0629, 0x0633, 0x063D, 0x0647, 0x0651, 0x065B, 0x0665, 0x066E, 0x0678, 0x0682, 0x068C, 0x0696, 0x06A0, 0x06AA, 0x06B4, 0x06BE, 0x06C8, 0x06D2, 0x06DC, 0x06E5, 0x06EF, 0x06F9, 0x0703, 0x070D, 0x0717, 0x0721, 0x072B, 0x0735, 0x073E, 0x0748, 0x0752, 0x075C, 0x0766, 0x0770, 0x077A, 0x0783, 0x078D, 0x0797, 0x07A1, 0x07AB, 0x07B5, 0x07BE, 0x07C8, 0x07D2, 0x07DC, 0x07E6, 0x07EF, 0x07F9, 0x0803, 0x080D, 0x0817, 0x0820, 0x082A, 0x0834, 0x083E, 0x0848, 0x0851, 0x085B, 0x0865, 0x086F, 0x0878, 0x0882, 0x088C, 0x0896, 0x089F, 0x08A9, 0x08B3, 0x08BD, 0x08C6, 0x08D0, 0x08DA, 0x08E3, 0x08ED, 0x08F7, 0x0901, 0x090A, 0x0914, 0x091E, 0x0927, 0x0931, 0x093B, 0x0944, 0x094E, 0x0958, 0x0961, 0x096B, 0x0975, 0x097E, 0x0988, 0x0992, 0x099B, 0x09A5, 0x09AE, 0x09B8, 0x09C2, 0x09CB, 0x09D5, 0x09DE, 0x09E8, 0x09F2, 0x09FB, 0x0A05, 0x0A0E, 0x0A18, 0x0A22, 0x0A2B, 0x0A35, 0x0A3E, 0x0A48, 0x0A51, 0x0A5B, 0x0A64, 0x0A6E, 0x0A77, 0x0A81, 0x0A8B, 0x0A94, 0x0A9E, 0x0AA7, 0x0AB1, 0x0ABA, 0x0AC4, 0x0ACD, 0x0AD7, 0x0AE0, 0x0AE9, 0x0AF3, 0x0AFC, 0x0B06, 0x0B0F, 0x0B19, 0x0B22, 0x0B2C, 0x0B35, 0x0B3F, 0x0B48, 0x0B51, 0x0B5B, 0x0B64, 0x0B6E, 0x0B77, 0x0B80, 0x0B8A, 0x0B93, 0x0B9D, 0x0BA6, 0x0BAF, 0x0BB9, 0x0BC2, 0x0BCB, 0x0BD5, 0x0BDE, 0x0BE7, 0x0BF1, 0x0BFA, 0x0C03, 0x0C0D, 0x0C16, 0x0C1F, 0x0C29, 0x0C32, 0x0C3B, 0x0C45, 0x0C4E, 0x0C57, 0x0C60, 0x0C6A, 0x0C73, 0x0C7C, 0x0C86, 0x0C8F, 0x0C98, 0x0CA1, 0x0CAB, 0x0CB4, 0x0CBD, 0x0CC6, 0x0CCF, 0x0CD9, 0x0CE2, 0x0CEB, 0x0CF4, 0x0CFD, 0x0D07, 0x0D10, 0x0D19, 0x0D22, 0x0D2B, 0x0D34, 0x0D3E, 0x0D47, 0x0D50, 0x0D59, 0x0D62, 0x0D6B, 0x0D74, 0x0D7D, 0x0D87, 0x0D90, 0x0D99, 0x0DA2, 0x0DAB, 0x0DB4, 0x0DBD, 0x0DC6, 0x0DCF, 0x0DD8, 0x0DE1, 0x0DEA, 0x0DF3, 0x0DFC, 0x0E05, 0x0E0F, 0x0E18, 0x0E21, 0x0E2A, 0x0E33, 0x0E3C, 0x0E45, 0x0E4E, 0x0E56, 0x0E5F, 0x0E68, 0x0E71, 0x0E7A, 0x0E83, 0x0E8C, 0x0E95, 0x0E9E, 0x0EA7, 0x0EB0, 0x0EB9, 0x0EC2, 0x0ECB, 0x0ED4, 0x0EDC, 0x0EE5, 0x0EEE, 0x0EF7, 0x0F00, 0x0F09, 0x0F12, 0x0F1B, 0x0F23, 0x0F2C, 0x0F35, 0x0F3E, 0x0F47, 0x0F50, 0x0F58, 0x0F61, 0x0F6A, 0x0F73, 0x0F7C, 0x0F84, 0x0F8D, 0x0F96, 0x0F9F, 0x0FA7, 0x0FB0, 0x0FB9, 0x0FC2, 0x0FCA, 0x0FD3, 0x0FDC, 0x0FE5, 0x0FED, 0x0FF6, 0x0FFF, 0x1007, 0x1010, 0x1019, 0x1021, 0x102A, 0x1033, 0x103B, 0x1044, 0x104D, 0x1055, 0x105E, 0x1067, 0x106F, 0x1078, 0x1080, 0x1089, 0x1092, 0x109A, 0x10A3, 0x10AB, 0x10B4, 0x10BC, 0x10C5, 0x10CE, 0x10D6, 0x10DF, 0x10E7, 0x10F0, 0x10F8, 0x1101, 0x1109, 0x1112, 0x111A, 0x1123, 0x112B, 0x1134, 0x113C, 0x1145, 0x114D, 0x1156, 0x115E, 0x1166, 0x116F, 0x1177, 0x1180, 0x1188, 0x1191, 0x1199, 0x11A1, 0x11AA, 0x11B2, 0x11BB, 0x11C3, 0x11CB, 0x11D4, 0x11DC, 0x11E4, 0x11ED, 0x11F5, 0x11FD, 0x1206, 0x120E, 0x1216, 0x121F, 0x1227, 0x122F, 0x1237, 0x1240, 0x1248, 0x1250, 0x1259, 0x1261, 0x1269, 0x1271, 0x127A, 0x1282, 0x128A, 0x1292, 0x129A, 0x12A3, 0x12AB, 0x12B3, 0x12BB, 0x12C3, 0x12CC, 0x12D4, 0x12DC, 0x12E4, 0x12EC, 0x12F4, 0x12FC, 0x1305, 0x130D, 0x1315, 0x131D, 0x1325, 0x132D, 0x1335, 0x133D, 0x1345, 0x134D, 0x1355, 0x135E, 0x1366, 0x136E, 0x1376, 0x137E, 0x1386, 0x138E, 0x1396, 0x139E, 0x13A6, 0x13AE, 0x13B6, 0x13BE, 0x13C6, 0x13CE, 0x13D6, 0x13DE, 0x13E6, 0x13ED, 0x13F5, 0x13FD, 0x1405, 0x140D, 0x1415, 0x141D, 0x1425, 0x142D, 0x1435, 0x143D, 0x1444, 0x144C, 0x1454, 0x145C, 0x1464, 0x146C, 0x1473, 0x147B, 0x1483, 0x148B, 0x1493, 0x149B, 0x14A2, 0x14AA, 0x14B2, 0x14BA, 0x14C1, 0x14C9, 0x14D1, 0x14D9, 0x14E0, 0x14E8, 0x14F0, 0x14F8, 0x14FF, 0x1507, 0x150F, 0x1516, 0x151E, 0x1526, 0x152D, 0x1535, 0x153D, 0x1544, 0x154C, 0x1554, 0x155B, 0x1563, 0x156B, 0x1572, 0x157A, 0x1581, 0x1589, 0x1591, 0x1598, 0x15A0, 0x15A7, 0x15AF, 0x15B7, 0x15BE, 0x15C6, 0x15CD, 0x15D5, 0x15DC, 0x15E4, 0x15EB, 0x15F3, 0x15FA, 0x1602, 0x1609, 0x1611, 0x1618, 0x1620, 0x1627, 0x162F, 0x1636, 0x163E, 0x1645, 0x164C, 0x1654, 0x165B, 0x1663, 0x166A, 0x1671, 0x1679, 0x1680, 0x1688, 0x168F, 0x1696, 0x169E, 0x16A5, 0x16AC, 0x16B4, 0x16BB, 0x16C2, 0x16CA, 0x16D1, 0x16D8, 0x16E0, 0x16E7, 0x16EE, 0x16F6, 0x16FD, 0x1704, 0x170B, 0x1713, 0x171A, 0x1721, 0x1728, 0x1730, 0x1737, 0x173E, 0x1745, 0x174C, 0x1754, 0x175B, 0x1762, 0x1769, 0x1770, 0x1778, 0x177F, 0x1786, 0x178D, 0x1794, 0x179B, 0x17A2, 0x17AA, 0x17B1, 0x17B8, 0x17BF, 0x17C6, 0x17CD, 0x17D4, 0x17DB, 0x17E2, 0x17E9, 0x17F0, 0x17F7, 0x17FE, 0x1806, 0x180D, 0x1814, 0x181B, 0x1822, 0x1829, 0x1830, 0x1837, 0x183E, 0x1845, 0x184C, 0x1853, 0x185A, 0x1860, 0x1867, 0x186E, 0x1875, 0x187C, 0x1883, 0x188A, 0x1891, 0x1898, 0x189F, 0x18A6, 0x18AD, 0x18B3, 0x18BA, 0x18C1, 0x18C8, 0x18CF, 0x18D6, 0x18DD, 0x18E3, 0x18EA, 0x18F1, 0x18F8, 0x18FF, 0x1906, 0x190C, 0x1913, 0x191A, 0x1921, 0x1928, 0x192E, 0x1935, 0x193C, 0x1943, 0x1949, 0x1950, 0x1957, 0x195D, 0x1964, 0x196B, 0x1972, 0x1978, 0x197F, 0x1986, 0x198C, 0x1993, 0x199A, 0x19A0, 0x19A7, 0x19AE, 0x19B4, 0x19BB, 0x19C2, 0x19C8, 0x19CF, 0x19D5, 0x19DC, 0x19E3, 0x19E9, 0x19F0, 0x19F6, 0x19FD, 0x1A04, 0x1A0A, 0x1A11, 0x1A17, 0x1A1E, 0x1A24, 0x1A2B, 0x1A31, 0x1A38, 0x1A3E, 0x1A45, 0x1A4B, 0x1A52, 0x1A58, 0x1A5F, 0x1A65, 0x1A6C, 0x1A72, 0x1A79, 0x1A7F, 0x1A86, 0x1A8C, 0x1A93, 0x1A99, 0x1A9F, 0x1AA6, 0x1AAC, 0x1AB3, 0x1AB9, 0x1AC0, 0x1AC6, 0x1ACC, 0x1AD3, 0x1AD9, 0x1ADF, 0x1AE6, 0x1AEC, 0x1AF2, 0x1AF9, 0x1AFF, 0x1B05, 0x1B0C, 0x1B12, 0x1B18, 0x1B1F, 0x1B25, 0x1B2B, 0x1B32, 0x1B38, 0x1B3E, 0x1B44, 0x1B4B, 0x1B51, 0x1B57, 0x1B5D, 0x1B64, 0x1B6A, 0x1B70, 0x1B76, 0x1B7D, 0x1B83, 0x1B89, 0x1B8F, 0x1B95, 0x1B9C, 0x1BA2, 0x1BA8, 0x1BAE, 0x1BB4, 0x1BBA, 0x1BC1, 0x1BC7, 0x1BCD, 0x1BD3, 0x1BD9, 0x1BDF, 0x1BE5, 0x1BEB, 0x1BF2, 0x1BF8, 0x1BFE, 0x1C04, 0x1C0A, 0x1C10, 0x1C16, 0x1C1C, 0x1C22, 0x1C28, 0x1C2E, 0x1C34, 0x1C3A, 0x1C40, 0x1C46, 0x1C4C, 0x1C52, 0x1C58, 0x1C5E, 0x1C64, 0x1C6A, 0x1C70, 0x1C76, 0x1C7C, 0x1C82, 0x1C88, 0x1C8E, 0x1C94, 0x1C9A, 0x1CA0, 0x1CA6, 0x1CAC, 0x1CB2, 0x1CB8, 0x1CBE, 0x1CC3, 0x1CC9, 0x1CCF, 0x1CD5, 0x1CDB, 0x1CE1, 0x1CE7, 0x1CED, 0x1CF3, 0x1CF8, 0x1CFE, 0x1D04, 0x1D0A, 0x1D10, 0x1D16, 0x1D1B, 0x1D21, 0x1D27, 0x1D2D, 0x1D33, 0x1D38, 0x1D3E, 0x1D44, 0x1D4A, 0x1D4F, 0x1D55, 0x1D5B, 0x1D61, 0x1D66, 0x1D6C, 0x1D72, 0x1D78, 0x1D7D, 0x1D83, 0x1D89, 0x1D8E, 0x1D94, 0x1D9A, 0x1DA0, 0x1DA5, 0x1DAB, 0x1DB1, 0x1DB6, 0x1DBC, 0x1DC2, 0x1DC7, 0x1DCD, 0x1DD3, 0x1DD8, 0x1DDE, 0x1DE3, 0x1DE9, 0x1DEF, 0x1DF4, 0x1DFA, 0x1DFF, 0x1E05, 0x1E0B, 0x1E10, 0x1E16, 0x1E1B, 0x1E21, 0x1E26, 0x1E2C, 0x1E32, 0x1E37, 0x1E3D, 0x1E42, 0x1E48, 0x1E4D, 0x1E53, 0x1E58, 0x1E5E, 0x1E63, 0x1E69, 0x1E6E, 0x1E74, 0x1E79, 0x1E7F, 0x1E84, 0x1E8A, 0x1E8F, 0x1E94, 0x1E9A, 0x1E9F, 0x1EA5, 0x1EAA, 0x1EB0, 0x1EB5, 0x1EBA, 0x1EC0, 0x1EC5, 0x1ECB, 0x1ED0, 0x1ED5, 0x1EDB, 0x1EE0, 0x1EE6, 0x1EEB, 0x1EF0, 0x1EF6, 0x1EFB, 0x1F00, 0x1F06, 0x1F0B, 0x1F10, 0x1F16, 0x1F1B, 0x1F20, 0x1F26, 0x1F2B, 0x1F30, 0x1F36, 0x1F3B, 0x1F40, 0x1F45, 0x1F4B, 0x1F50, 0x1F55, 0x1F5A, 0x1F60, 0x1F65, 0x1F6A, 0x1F6F, 0x1F75, 0x1F7A, 0x1F7F, 0x1F84, 0x1F8A, 0x1F8F, 0x1F94, 0x1F99, 0x1F9E, 0x1FA4, 0x1FA9, 0x1FAE, 0x1FB3, 0x1FB8, 0x1FBD, 0x1FC3, 0x1FC8, 0x1FCD, 0x1FD2, 0x1FD7, 0x1FDC, 0x1FE1, 0x1FE6, 0x1FEC, 0x1FF1, 0x1FF6, 0x1FFB, 0x2000 + + glabel D_800DE440 .word 0x00000000 diff --git a/src/unknown_066AA0.c b/src/unknown_066AA0.c index 63dc0673..b5de06be 100644 --- a/src/unknown_066AA0.c +++ b/src/unknown_066AA0.c @@ -8,8 +8,12 @@ extern u32 osTvType; -/* Size: 0x34 bytes. Might be an array? */ -typedef struct unk800DD094 { +/************ .data ************/ + +s32 D_800DD060 = 0; // Currently unknown, might be a different type. + +/* Size: 0x34 bytes. */ +typedef struct unk800DD064 { s32 unk0; s32 unk4; s32 unk8; @@ -23,32 +27,194 @@ typedef struct unk800DD094 { s32 unk28; s32 unk2C; s32 unk30; -} unk800DD094; -extern unk800DD094 D_800DD064[2]; // Unknown number of entries -extern unk800DD094 D_800DD094[2]; // Unknown number of entries +} unk800DD064; + +unk800DD064 D_800DD064[4] = { + { + 0x00, 0x00, 0x140, 0xF0, + 0xA0, 0x78, 0x140, 0xF0, + 0x00, 0x00, 0x13F, 0xEF, 0x00 + }, + { + 0x00, 0x00, 0x140, 0xF0, + 0xA0, 0x78, 0x140, 0xF0, + 0x00, 0x00, 0x13F, 0xEF, 0x00 + }, + { + 0x00, 0x00, 0x140, 0xF0, + 0xA0, 0x78, 0x140, 0xF0, + 0x00, 0x00, 0x13F, 0xEF, 0x00 + }, + { + 0x00, 0x00, 0x140, 0xF0, + 0xA0, 0x78, 0x140, 0xF0, + 0x00, 0x00, 0x13F, 0xEF, 0x00 + } +}; + +// Not sure about the typing here +s16 D_800DD134[10] = { + 0, 0, 0, 0, + 0, -1, -1, 0, + 0, 0 +}; + +// Not sure about the typing here +u16 D_800DD148[160] = { + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0 +}; + +f32 D_800DD288[6] = { + 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, -281.0f +}; + +f32 D_800DD2A0[6] = { + 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f +}; + +f32 D_800DD2B8[5] = { + 1.0f, 0.0f, 0.0f, 0.0f, 0.0f +}; + +f32 D_800DD2CC[11] = { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 160.0f +}; + +u8 D_800DD2F8[8] = { + 0, 0, 0, 0, 0, 0, 0, 0 +}; + +s32 D_800DD300 = 0; // Currently unknown, might be a different type. + +s16 D_800DD304 = -1; + +// Remove this when unknown_066AA0 is split. +s32 __FILE_BOUNDARY_PADDING[2] = {0, 0}; + +/** File boundary! The following variables belong to the next file when unknown_066AA0 is split **/ + +s8 D_800DD310 = 0; // Currently unknown, might be a different type. +s8 D_800DD314 = -1; +s8 D_800DD318 = 0; +s32 D_800DD31C = 0; +s32 D_800DD320 = 0x585E; +s32 D_800DD324 = 0x154; +s16 D_800DD328 = 0; +s16 D_800DD32C = 0; + +s8 D_800DD330 = 0; + +// Unused? Unsure on pointer type +s32 *D_800DD334[6] = { + NULL, NULL, NULL, // These also could just be regular zeroes and not pointers. + 0x800E7110, 0x800E7118, 0x800E7128 +}; + +// Unused? +char gBuildString[40] = "Version 7.7 29/09/97 15.00 L.Schuneman"; + +s8 D_800DD374 = 0; +s32 D_800DD378 = 1; +s32 D_800DD37C = 0; +s32 D_800DD380 = 0; // Currently unknown, might be a different type. +s32 D_800DD384 = 0; +s32 D_800DD388 = 0; // Currently unknown, might be a different type. +s8 D_800DD38C = 0; +u8 D_800DD390 = 0; +s16 D_800DD394 = 0; +u8 D_800DD398 = 0; +s32 D_800DD39C = 0; // Currently unknown, might be a different type. +s8 D_800DD3A0 = 0; +s32 D_800DD3A4 = 0; // Currently unknown, might be a different type. +s32 D_800DD3A8 = 0; // Currently unknown, might be a different type. +s32 D_800DD3AC = 0; // Currently unknown, might be a different type. +s32 D_800DD3B0 = 0x1194; +s32 D_800DD3B4 = 0x1B58; +s32 D_800DD3B8 = 0x2AF8; +s32 D_800DD3BC = 0x2AF8; +s32 D_800DD3C0 = 0x12C; +s32 D_800DD3C4 = 0x258; +s32 D_800DD3C8 = 0x352; +s32 D_800DD3CC = 0x384; +s32 D_800DD3D0 = 0x12C; +s32 D_800DD3D4 = 0x190; +s32 D_800DD3D8 = 0x226; +s32 D_800DD3DC = 0x258; +s32 D_800DD3E0 = 0x14; +s32 D_800DD3E4 = 0x1E; +s32 D_800DD3E8 = 0x28; +s32 D_800DD3EC = 0x32; + +s8 D_800DD3F0 = 0; +s16 D_800DD3F4[8] = { + -32768, 0, 20, 0, + 255, -1, 20, -1 +}; +s32 D_800DD404 = 12; +s32 D_800DD408 = 0x00FFFFFF; +s32 D_800DD40C = 0x001EFFFF; // Unused? + +// Unused? Unsure on pointer type +s32 *D_800DD410[3] = { + 0x800E713C, 0x800E7140, 0x800E7144 +}; + +// Not sure if this is an array or a struct. +s32 D_800DD41C[2] = { + 0, 0x001EFFFF +}; + +s32 D_800DD424[2] = { + 0, 0x0104FFFF +}; + +/*******************************/ -extern s32 D_800DD288; -extern s32 D_800DD2A0; -extern f32 D_800DD2CC; -extern u8 D_800DD2F8[8]; // Unknown number of entries -extern s16 D_800DD304; -extern s8 D_800DD318; -extern s32 D_800DD31C; -extern s16 D_800DD328; -extern s16 D_800DD32C; -extern s8 D_800DD330; -extern s32 D_800DD37C; -extern s32 D_800DD384; -extern s8 D_800DD38C; -extern u8 D_800DD390; -extern s16 D_800DD394; -extern u8 D_800DD398; -extern s8 D_800DD3F0; -extern s32 D_800DD3F4; -extern s32 D_800DD408; -extern s32 D_800DD41C; -extern s32 D_800DD424; extern s32 D_800DFD94; + +/*******************************/ + extern f32 D_800E70A0; extern f32 D_800E70A4; @@ -378,7 +544,7 @@ void func_80066894(s32 arg0, s32 arg1) { } s32 func_80066910(s32 arg0) { - return D_800DD094[arg0].unk0 & 0x1; + return D_800DD064[arg0].unk30 & 0x1; } GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80066940.s") @@ -705,7 +871,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80067A3C.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80067D3C.s") void func_80067F20(f32 arg0) { - D_800DD2CC = arg0; + D_800DD2CC[0] = arg0; } GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80067F2C.s") From 156ac67a7e756c1194a863d5f4497b0577dc8fd0 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Tue, 25 May 2021 14:26:24 -0500 Subject: [PATCH 16/39] unknown_070110.s data section --- asm/unknown_070110.s | 20 ++ data/dkr.data.s | 544 ++----------------------------------------- 2 files changed, 37 insertions(+), 527 deletions(-) diff --git a/asm/unknown_070110.s b/asm/unknown_070110.s index 713595e4..81043f7b 100644 --- a/asm/unknown_070110.s +++ b/asm/unknown_070110.s @@ -1,6 +1,8 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x80065F10 */ +.section .text + .include "globals.inc" .include "macros.inc" @@ -39,3 +41,21 @@ .include "asm/unknown_070110/func_80070890.s" .include "asm/unknown_070110/func_80070A2C.s" .include "asm/unknown_070110/func_80070B04.s" + +.section .data + +glabel D_800DD430 +.word 0x00000000 + +glabel D_800DD434 +.word 0x5141564D # Some magic number related to RNG? + +glabel D_800DD438 +.word 0x5141564D + +glabel D_800DD43C +.half 0x0000, 0x0032, 0x0065, 0x0097, 0x00C9, 0x00FB, 0x012E, 0x0160, 0x0192, 0x01C4, 0x01F7, 0x0229, 0x025B, 0x028D, 0x02C0, 0x02F2, 0x0324, 0x0356, 0x0389, 0x03BB, 0x03ED, 0x041F, 0x0452, 0x0484, 0x04B6, 0x04E8, 0x051B, 0x054D, 0x057F, 0x05B1, 0x05E3, 0x0616, 0x0648, 0x067A, 0x06AC, 0x06DE, 0x0711, 0x0743, 0x0775, 0x07A7, 0x07D9, 0x080C, 0x083E, 0x0870, 0x08A2, 0x08D4, 0x0906, 0x0938, 0x096B, 0x099D, 0x09CF, 0x0A01, 0x0A33, 0x0A65, 0x0A97, 0x0AC9, 0x0AFB, 0x0B2D, 0x0B60, 0x0B92, 0x0BC4, 0x0BF6, 0x0C28, 0x0C5A, 0x0C8C, 0x0CBE, 0x0CF0, 0x0D22, 0x0D54, 0x0D86, 0x0DB8, 0x0DEA, 0x0E1C, 0x0E4E, 0x0E80, 0x0EB2, 0x0EE4, 0x0F15, 0x0F47, 0x0F79, 0x0FAB, 0x0FDD, 0x100F, 0x1041, 0x1073, 0x10A4, 0x10D6, 0x1108, 0x113A, 0x116C, 0x119E, 0x11CF, 0x1201, 0x1233, 0x1265, 0x1296, 0x12C8, 0x12FA, 0x132B, 0x135D, 0x138F, 0x13C1, 0x13F2, 0x1424, 0x1455, 0x1487, 0x14B9, 0x14EA, 0x151C, 0x154D, 0x157F, 0x15B1, 0x15E2, 0x1614, 0x1645, 0x1677, 0x16A8, 0x16DA, 0x170B, 0x173C, 0x176E, 0x179F, 0x17D1, 0x1802, 0x1833, 0x1865, 0x1896, 0x18C7, 0x18F9, 0x192A, 0x195B, 0x198D, 0x19BE, 0x19EF, 0x1A20, 0x1A51, 0x1A83, 0x1AB4, 0x1AE5, 0x1B16, 0x1B47, 0x1B78, 0x1BA9, 0x1BDA, 0x1C0C, 0x1C3D, 0x1C6E, 0x1C9F, 0x1CD0, 0x1D01, 0x1D31, 0x1D62, 0x1D93, 0x1DC4, 0x1DF5, 0x1E26, 0x1E57, 0x1E88, 0x1EB8, 0x1EE9, 0x1F1A, 0x1F4B, 0x1F7B, 0x1FAC, 0x1FDD, 0x200E, 0x203E, 0x206F, 0x209F, 0x20D0, 0x2101, 0x2131, 0x2162, 0x2192, 0x21C3, 0x21F3, 0x2224, 0x2254, 0x2284, 0x22B5, 0x22E5, 0x2316, 0x2346, 0x2376, 0x23A7, 0x23D7, 0x2407, 0x2437, 0x2467, 0x2498, 0x24C8, 0x24F8, 0x2528, 0x2558, 0x2588, 0x25B8, 0x25E8, 0x2618, 0x2648, 0x2678, 0x26A8, 0x26D8, 0x2708, 0x2738, 0x2768, 0x2797, 0x27C7, 0x27F7, 0x2827, 0x2856, 0x2886, 0x28B6, 0x28E5, 0x2915, 0x2945, 0x2974, 0x29A4, 0x29D3, 0x2A03, 0x2A32, 0x2A62, 0x2A91, 0x2AC1, 0x2AF0, 0x2B1F, 0x2B4F, 0x2B7E, 0x2BAD, 0x2BDC, 0x2C0C, 0x2C3B, 0x2C6A, 0x2C99, 0x2CC8, 0x2CF7, 0x2D26, 0x2D55, 0x2D84, 0x2DB3, 0x2DE2, 0x2E11, 0x2E40, 0x2E6F, 0x2E9E, 0x2ECC, 0x2EFB, 0x2F2A, 0x2F59, 0x2F87, 0x2FB6, 0x2FE5, 0x3013, 0x3042, 0x3070, 0x309F, 0x30CD, 0x30FC, 0x312A, 0x3159, 0x3187, 0x31B5, 0x31E4, 0x3212, 0x3240, 0x326E, 0x329D, 0x32CB, 0x32F9, 0x3327, 0x3355, 0x3383, 0x33B1, 0x33DF, 0x340D, 0x343B, 0x3469, 0x3497, 0x34C4, 0x34F2, 0x3520, 0x354E, 0x357B, 0x35A9, 0x35D7, 0x3604, 0x3632, 0x365F, 0x368D, 0x36BA, 0x36E8, 0x3715, 0x3742, 0x3770, 0x379D, 0x37CA, 0x37F7, 0x3825, 0x3852, 0x387F, 0x38AC, 0x38D9, 0x3906, 0x3933, 0x3960, 0x398D, 0x39BA, 0x39E7, 0x3A13, 0x3A40, 0x3A6D, 0x3A9A, 0x3AC6, 0x3AF3, 0x3B20, 0x3B4C, 0x3B79, 0x3BA5, 0x3BD2, 0x3BFE, 0x3C2A, 0x3C57, 0x3C83, 0x3CAF, 0x3CDC, 0x3D08, 0x3D34, 0x3D60, 0x3D8C, 0x3DB8, 0x3DE4, 0x3E10, 0x3E3C, 0x3E68, 0x3E94, 0x3EC0, 0x3EEC, 0x3F17, 0x3F43, 0x3F6F, 0x3F9A, 0x3FC6, 0x3FF1, 0x401D, 0x4048, 0x4074, 0x409F, 0x40CB, 0x40F6, 0x4121, 0x414D, 0x4178, 0x41A3, 0x41CE, 0x41F9, 0x4224, 0x424F, 0x427A, 0x42A5, 0x42D0, 0x42FB, 0x4326, 0x4351, 0x437B, 0x43A6, 0x43D1, 0x43FB, 0x4426, 0x4450, 0x447B, 0x44A5, 0x44D0, 0x44FA, 0x4524, 0x454F, 0x4579, 0x45A3, 0x45CD, 0x45F7, 0x4621, 0x464B, 0x4675, 0x469F, 0x46C9, 0x46F3, 0x471D, 0x4747, 0x4770, 0x479A, 0x47C4, 0x47ED, 0x4817, 0x4840, 0x486A, 0x4893, 0x48BD, 0x48E6, 0x490F, 0x4939, 0x4962, 0x498B, 0x49B4, 0x49DD, 0x4A06, 0x4A2F, 0x4A58, 0x4A81, 0x4AAA, 0x4AD3, 0x4AFB, 0x4B24, 0x4B4D, 0x4B75, 0x4B9E, 0x4BC7, 0x4BEF, 0x4C17, 0x4C40, 0x4C68, 0x4C91, 0x4CB9, 0x4CE1, 0x4D09, 0x4D31, 0x4D59, 0x4D81, 0x4DA9, 0x4DD1, 0x4DF9, 0x4E21, 0x4E49, 0x4E71, 0x4E98, 0x4EC0, 0x4EE8, 0x4F0F, 0x4F37, 0x4F5E, 0x4F85, 0x4FAD, 0x4FD4, 0x4FFB, 0x5023, 0x504A, 0x5071, 0x5098, 0x50BF, 0x50E6, 0x510D, 0x5134, 0x515B, 0x5181, 0x51A8, 0x51CF, 0x51F5, 0x521C, 0x5243, 0x5269, 0x5290, 0x52B6, 0x52DC, 0x5303, 0x5329, 0x534F, 0x5375, 0x539B, 0x53C1, 0x53E7, 0x540D, 0x5433, 0x5459, 0x547F, 0x54A4, 0x54CA, 0x54F0, 0x5515, 0x553B, 0x5560, 0x5586, 0x55AB, 0x55D0, 0x55F6, 0x561B, 0x5640, 0x5665, 0x568A, 0x56AF, 0x56D4, 0x56F9, 0x571E, 0x5743, 0x5767, 0x578C, 0x57B1, 0x57D5, 0x57FA, 0x581E, 0x5843, 0x5867, 0x588C, 0x58B0, 0x58D4, 0x58F8, 0x591C, 0x5940, 0x5964, 0x5988, 0x59AC, 0x59D0, 0x59F4, 0x5A18, 0x5A3B, 0x5A5F, 0x5A82, 0x5AA6, 0x5AC9, 0x5AED, 0x5B10, 0x5B34, 0x5B57, 0x5B7A, 0x5B9D, 0x5BC0, 0x5BE3, 0x5C06, 0x5C29, 0x5C4C, 0x5C6F, 0x5C91, 0x5CB4, 0x5CD7, 0x5CF9, 0x5D1C, 0x5D3E, 0x5D61, 0x5D83, 0x5DA5, 0x5DC8, 0x5DEA, 0x5E0C, 0x5E2E, 0x5E50, 0x5E72, 0x5E94, 0x5EB6, 0x5ED7, 0x5EF9, 0x5F1B, 0x5F3C, 0x5F5E, 0x5F80, 0x5FA1, 0x5FC2, 0x5FE4, 0x6005, 0x6026, 0x6047, 0x6068, 0x6089, 0x60AA, 0x60CB, 0x60EC, 0x610D, 0x612E, 0x614E, 0x616F, 0x6190, 0x61B0, 0x61D1, 0x61F1, 0x6211, 0x6232, 0x6252, 0x6272, 0x6292, 0x62B2, 0x62D2, 0x62F2, 0x6312, 0x6332, 0x6351, 0x6371, 0x6391, 0x63B0, 0x63D0, 0x63EF, 0x640F, 0x642E, 0x644D, 0x646C, 0x648B, 0x64AB, 0x64CA, 0x64E9, 0x6507, 0x6526, 0x6545, 0x6564, 0x6582, 0x65A1, 0x65C0, 0x65DE, 0x65FC, 0x661B, 0x6639, 0x6657, 0x6675, 0x6693, 0x66B2, 0x66D0, 0x66ED, 0x670B, 0x6729, 0x6747, 0x6764, 0x6782, 0x67A0, 0x67BD, 0x67DA, 0x67F8, 0x6815, 0x6832, 0x6850, 0x686D, 0x688A, 0x68A7, 0x68C4, 0x68E0, 0x68FD, 0x691A, 0x6937, 0x6953, 0x6970, 0x698C, 0x69A9, 0x69C5, 0x69E1, 0x69FD, 0x6A1A, 0x6A36, 0x6A52, 0x6A6E, 0x6A89, 0x6AA5, 0x6AC1, 0x6ADD, 0x6AF8, 0x6B14, 0x6B30, 0x6B4B, 0x6B66, 0x6B82, 0x6B9D, 0x6BB8, 0x6BD3, 0x6BEE, 0x6C09, 0x6C24, 0x6C3F, 0x6C5A, 0x6C75, 0x6C8F, 0x6CAA, 0x6CC4, 0x6CDF, 0x6CF9, 0x6D14, 0x6D2E, 0x6D48, 0x6D62, 0x6D7C, 0x6D96, 0x6DB0, 0x6DCA, 0x6DE4, 0x6DFE, 0x6E17, 0x6E31, 0x6E4A, 0x6E64, 0x6E7D, 0x6E97, 0x6EB0, 0x6EC9, 0x6EE2, 0x6EFB, 0x6F14, 0x6F2D, 0x6F46, 0x6F5F, 0x6F78, 0x6F90, 0x6FA9, 0x6FC2, 0x6FDA, 0x6FF2, 0x700B, 0x7023, 0x703B, 0x7053, 0x706B, 0x7083, 0x709B, 0x70B3, 0x70CB, 0x70E3, 0x70FA, 0x7112, 0x712A, 0x7141, 0x7158, 0x7170, 0x7187, 0x719E, 0x71B5, 0x71CC, 0x71E3, 0x71FA, 0x7211, 0x7228, 0x723F, 0x7255, 0x726C, 0x7282, 0x7299, 0x72AF, 0x72C5, 0x72DC, 0x72F2, 0x7308, 0x731E, 0x7334, 0x734A, 0x735F, 0x7375, 0x738B, 0x73A0, 0x73B6, 0x73CB, 0x73E1, 0x73F6, 0x740B, 0x7421, 0x7436, 0x744B, 0x7460, 0x7475, 0x7489, 0x749E, 0x74B3, 0x74C7, 0x74DC, 0x74F0, 0x7505, 0x7519, 0x752D, 0x7542, 0x7556, 0x756A, 0x757E, 0x7592, 0x75A6, 0x75B9, 0x75CD, 0x75E1, 0x75F4, 0x7608, 0x761B, 0x762E, 0x7642, 0x7655, 0x7668, 0x767B, 0x768E, 0x76A1, 0x76B4, 0x76C7, 0x76D9, 0x76EC, 0x76FE, 0x7711, 0x7723, 0x7736, 0x7748, 0x775A, 0x776C, 0x777E, 0x7790, 0x77A2, 0x77B4, 0x77C6, 0x77D8, 0x77E9, 0x77FB, 0x780C, 0x781E, 0x782F, 0x7840, 0x7851, 0x7863, 0x7874, 0x7885, 0x7895, 0x78A6, 0x78B7, 0x78C8, 0x78D8, 0x78E9, 0x78F9, 0x790A, 0x791A, 0x792A, 0x793A, 0x794A, 0x795B, 0x796A, 0x797A, 0x798A, 0x799A, 0x79AA, 0x79B9, 0x79C9, 0x79D8, 0x79E7, 0x79F7, 0x7A06, 0x7A15, 0x7A24, 0x7A33, 0x7A42, 0x7A51, 0x7A60, 0x7A6E, 0x7A7D, 0x7A8C, 0x7A9A, 0x7AA8, 0x7AB7, 0x7AC5, 0x7AD3, 0x7AE1, 0x7AEF, 0x7AFD, 0x7B0B, 0x7B19, 0x7B27, 0x7B34, 0x7B42, 0x7B50, 0x7B5D, 0x7B6A, 0x7B78, 0x7B85, 0x7B92, 0x7B9F, 0x7BAC, 0x7BB9, 0x7BC6, 0x7BD3, 0x7BDF, 0x7BEC, 0x7BF9, 0x7C05, 0x7C11, 0x7C1E, 0x7C2A, 0x7C36, 0x7C42, 0x7C4E, 0x7C5A, 0x7C66, 0x7C72, 0x7C7E, 0x7C89, 0x7C95, 0x7CA0, 0x7CAC, 0x7CB7, 0x7CC2, 0x7CCE, 0x7CD9, 0x7CE4, 0x7CEF, 0x7CFA, 0x7D05, 0x7D0F, 0x7D1A, 0x7D25, 0x7D2F, 0x7D3A, 0x7D44, 0x7D4E, 0x7D58, 0x7D63, 0x7D6D, 0x7D77, 0x7D81, 0x7D8A, 0x7D94, 0x7D9E, 0x7DA7, 0x7DB1, 0x7DBA, 0x7DC4, 0x7DCD, 0x7DD6, 0x7DE0, 0x7DE9, 0x7DF2, 0x7DFB, 0x7E03, 0x7E0C, 0x7E15, 0x7E1E, 0x7E26, 0x7E2F, 0x7E37, 0x7E3F, 0x7E48, 0x7E50, 0x7E58, 0x7E60, 0x7E68, 0x7E70, 0x7E78, 0x7E7F, 0x7E87, 0x7E8E, 0x7E96, 0x7E9D, 0x7EA5, 0x7EAC, 0x7EB3, 0x7EBA, 0x7EC1, 0x7EC8, 0x7ECF, 0x7ED6, 0x7EDD, 0x7EE3, 0x7EEA, 0x7EF0, 0x7EF7, 0x7EFD, 0x7F03, 0x7F0A, 0x7F10, 0x7F16, 0x7F1C, 0x7F22, 0x7F27, 0x7F2D, 0x7F33, 0x7F38, 0x7F3E, 0x7F43, 0x7F49, 0x7F4E, 0x7F53, 0x7F58, 0x7F5D, 0x7F62, 0x7F67, 0x7F6C, 0x7F71, 0x7F75, 0x7F7A, 0x7F7E, 0x7F83, 0x7F87, 0x7F8B, 0x7F90, 0x7F94, 0x7F98, 0x7F9C, 0x7FA0, 0x7FA3, 0x7FA7, 0x7FAB, 0x7FAE, 0x7FB2, 0x7FB5, 0x7FB9, 0x7FBC, 0x7FBF, 0x7FC2, 0x7FC5, 0x7FC8, 0x7FCB, 0x7FCE, 0x7FD1, 0x7FD3, 0x7FD6, 0x7FD9, 0x7FDB, 0x7FDD, 0x7FE0, 0x7FE2, 0x7FE4, 0x7FE6, 0x7FE8, 0x7FEA, 0x7FEC, 0x7FED, 0x7FEF, 0x7FF1, 0x7FF2, 0x7FF4, 0x7FF5, 0x7FF6, 0x7FF7, 0x7FF8, 0x7FF9, 0x7FFA, 0x7FFB, 0x7FFC, 0x7FFD, 0x7FFE, 0x7FFE, 0x7FFF, 0x7FFF, 0x7FFF, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000 + +glabel D_800DDC3E +.half 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070, 0x007A, 0x0084, 0x008F, 0x0099, 0x00A3, 0x00AD, 0x00B7, 0x00C2, 0x00CC, 0x00D6, 0x00E0, 0x00EA, 0x00F4, 0x00FF, 0x0109, 0x0113, 0x011D, 0x0127, 0x0131, 0x013C, 0x0146, 0x0150, 0x015A, 0x0164, 0x016F, 0x0179, 0x0183, 0x018D, 0x0197, 0x01A1, 0x01AC, 0x01B6, 0x01C0, 0x01CA, 0x01D4, 0x01DE, 0x01E9, 0x01F3, 0x01FD, 0x0207, 0x0211, 0x021B, 0x0226, 0x0230, 0x023A, 0x0244, 0x024E, 0x0258, 0x0262, 0x026D, 0x0277, 0x0281, 0x028B, 0x0295, 0x029F, 0x02A9, 0x02B4, 0x02BE, 0x02C8, 0x02D2, 0x02DC, 0x02E6, 0x02F0, 0x02FB, 0x0305, 0x030F, 0x0319, 0x0323, 0x032D, 0x0337, 0x0341, 0x034C, 0x0356, 0x0360, 0x036A, 0x0374, 0x037E, 0x0388, 0x0392, 0x039C, 0x03A7, 0x03B1, 0x03BB, 0x03C5, 0x03CF, 0x03D9, 0x03E3, 0x03ED, 0x03F7, 0x0401, 0x040C, 0x0416, 0x0420, 0x042A, 0x0434, 0x043E, 0x0448, 0x0452, 0x045C, 0x0466, 0x0470, 0x047A, 0x0484, 0x048E, 0x0499, 0x04A3, 0x04AD, 0x04B7, 0x04C1, 0x04CB, 0x04D5, 0x04DF, 0x04E9, 0x04F3, 0x04FD, 0x0507, 0x0511, 0x051B, 0x0525, 0x052F, 0x0539, 0x0543, 0x054D, 0x0557, 0x0561, 0x056B, 0x0575, 0x057F, 0x0589, 0x0593, 0x059D, 0x05A7, 0x05B1, 0x05BB, 0x05C5, 0x05CF, 0x05D9, 0x05E3, 0x05ED, 0x05F7, 0x0601, 0x060B, 0x0615, 0x061F, 0x0629, 0x0633, 0x063D, 0x0647, 0x0651, 0x065B, 0x0665, 0x066E, 0x0678, 0x0682, 0x068C, 0x0696, 0x06A0, 0x06AA, 0x06B4, 0x06BE, 0x06C8, 0x06D2, 0x06DC, 0x06E5, 0x06EF, 0x06F9, 0x0703, 0x070D, 0x0717, 0x0721, 0x072B, 0x0735, 0x073E, 0x0748, 0x0752, 0x075C, 0x0766, 0x0770, 0x077A, 0x0783, 0x078D, 0x0797, 0x07A1, 0x07AB, 0x07B5, 0x07BE, 0x07C8, 0x07D2, 0x07DC, 0x07E6, 0x07EF, 0x07F9, 0x0803, 0x080D, 0x0817, 0x0820, 0x082A, 0x0834, 0x083E, 0x0848, 0x0851, 0x085B, 0x0865, 0x086F, 0x0878, 0x0882, 0x088C, 0x0896, 0x089F, 0x08A9, 0x08B3, 0x08BD, 0x08C6, 0x08D0, 0x08DA, 0x08E3, 0x08ED, 0x08F7, 0x0901, 0x090A, 0x0914, 0x091E, 0x0927, 0x0931, 0x093B, 0x0944, 0x094E, 0x0958, 0x0961, 0x096B, 0x0975, 0x097E, 0x0988, 0x0992, 0x099B, 0x09A5, 0x09AE, 0x09B8, 0x09C2, 0x09CB, 0x09D5, 0x09DE, 0x09E8, 0x09F2, 0x09FB, 0x0A05, 0x0A0E, 0x0A18, 0x0A22, 0x0A2B, 0x0A35, 0x0A3E, 0x0A48, 0x0A51, 0x0A5B, 0x0A64, 0x0A6E, 0x0A77, 0x0A81, 0x0A8B, 0x0A94, 0x0A9E, 0x0AA7, 0x0AB1, 0x0ABA, 0x0AC4, 0x0ACD, 0x0AD7, 0x0AE0, 0x0AE9, 0x0AF3, 0x0AFC, 0x0B06, 0x0B0F, 0x0B19, 0x0B22, 0x0B2C, 0x0B35, 0x0B3F, 0x0B48, 0x0B51, 0x0B5B, 0x0B64, 0x0B6E, 0x0B77, 0x0B80, 0x0B8A, 0x0B93, 0x0B9D, 0x0BA6, 0x0BAF, 0x0BB9, 0x0BC2, 0x0BCB, 0x0BD5, 0x0BDE, 0x0BE7, 0x0BF1, 0x0BFA, 0x0C03, 0x0C0D, 0x0C16, 0x0C1F, 0x0C29, 0x0C32, 0x0C3B, 0x0C45, 0x0C4E, 0x0C57, 0x0C60, 0x0C6A, 0x0C73, 0x0C7C, 0x0C86, 0x0C8F, 0x0C98, 0x0CA1, 0x0CAB, 0x0CB4, 0x0CBD, 0x0CC6, 0x0CCF, 0x0CD9, 0x0CE2, 0x0CEB, 0x0CF4, 0x0CFD, 0x0D07, 0x0D10, 0x0D19, 0x0D22, 0x0D2B, 0x0D34, 0x0D3E, 0x0D47, 0x0D50, 0x0D59, 0x0D62, 0x0D6B, 0x0D74, 0x0D7D, 0x0D87, 0x0D90, 0x0D99, 0x0DA2, 0x0DAB, 0x0DB4, 0x0DBD, 0x0DC6, 0x0DCF, 0x0DD8, 0x0DE1, 0x0DEA, 0x0DF3, 0x0DFC, 0x0E05, 0x0E0F, 0x0E18, 0x0E21, 0x0E2A, 0x0E33, 0x0E3C, 0x0E45, 0x0E4E, 0x0E56, 0x0E5F, 0x0E68, 0x0E71, 0x0E7A, 0x0E83, 0x0E8C, 0x0E95, 0x0E9E, 0x0EA7, 0x0EB0, 0x0EB9, 0x0EC2, 0x0ECB, 0x0ED4, 0x0EDC, 0x0EE5, 0x0EEE, 0x0EF7, 0x0F00, 0x0F09, 0x0F12, 0x0F1B, 0x0F23, 0x0F2C, 0x0F35, 0x0F3E, 0x0F47, 0x0F50, 0x0F58, 0x0F61, 0x0F6A, 0x0F73, 0x0F7C, 0x0F84, 0x0F8D, 0x0F96, 0x0F9F, 0x0FA7, 0x0FB0, 0x0FB9, 0x0FC2, 0x0FCA, 0x0FD3, 0x0FDC, 0x0FE5, 0x0FED, 0x0FF6, 0x0FFF, 0x1007, 0x1010, 0x1019, 0x1021, 0x102A, 0x1033, 0x103B, 0x1044, 0x104D, 0x1055, 0x105E, 0x1067, 0x106F, 0x1078, 0x1080, 0x1089, 0x1092, 0x109A, 0x10A3, 0x10AB, 0x10B4, 0x10BC, 0x10C5, 0x10CE, 0x10D6, 0x10DF, 0x10E7, 0x10F0, 0x10F8, 0x1101, 0x1109, 0x1112, 0x111A, 0x1123, 0x112B, 0x1134, 0x113C, 0x1145, 0x114D, 0x1156, 0x115E, 0x1166, 0x116F, 0x1177, 0x1180, 0x1188, 0x1191, 0x1199, 0x11A1, 0x11AA, 0x11B2, 0x11BB, 0x11C3, 0x11CB, 0x11D4, 0x11DC, 0x11E4, 0x11ED, 0x11F5, 0x11FD, 0x1206, 0x120E, 0x1216, 0x121F, 0x1227, 0x122F, 0x1237, 0x1240, 0x1248, 0x1250, 0x1259, 0x1261, 0x1269, 0x1271, 0x127A, 0x1282, 0x128A, 0x1292, 0x129A, 0x12A3, 0x12AB, 0x12B3, 0x12BB, 0x12C3, 0x12CC, 0x12D4, 0x12DC, 0x12E4, 0x12EC, 0x12F4, 0x12FC, 0x1305, 0x130D, 0x1315, 0x131D, 0x1325, 0x132D, 0x1335, 0x133D, 0x1345, 0x134D, 0x1355, 0x135E, 0x1366, 0x136E, 0x1376, 0x137E, 0x1386, 0x138E, 0x1396, 0x139E, 0x13A6, 0x13AE, 0x13B6, 0x13BE, 0x13C6, 0x13CE, 0x13D6, 0x13DE, 0x13E6, 0x13ED, 0x13F5, 0x13FD, 0x1405, 0x140D, 0x1415, 0x141D, 0x1425, 0x142D, 0x1435, 0x143D, 0x1444, 0x144C, 0x1454, 0x145C, 0x1464, 0x146C, 0x1473, 0x147B, 0x1483, 0x148B, 0x1493, 0x149B, 0x14A2, 0x14AA, 0x14B2, 0x14BA, 0x14C1, 0x14C9, 0x14D1, 0x14D9, 0x14E0, 0x14E8, 0x14F0, 0x14F8, 0x14FF, 0x1507, 0x150F, 0x1516, 0x151E, 0x1526, 0x152D, 0x1535, 0x153D, 0x1544, 0x154C, 0x1554, 0x155B, 0x1563, 0x156B, 0x1572, 0x157A, 0x1581, 0x1589, 0x1591, 0x1598, 0x15A0, 0x15A7, 0x15AF, 0x15B7, 0x15BE, 0x15C6, 0x15CD, 0x15D5, 0x15DC, 0x15E4, 0x15EB, 0x15F3, 0x15FA, 0x1602, 0x1609, 0x1611, 0x1618, 0x1620, 0x1627, 0x162F, 0x1636, 0x163E, 0x1645, 0x164C, 0x1654, 0x165B, 0x1663, 0x166A, 0x1671, 0x1679, 0x1680, 0x1688, 0x168F, 0x1696, 0x169E, 0x16A5, 0x16AC, 0x16B4, 0x16BB, 0x16C2, 0x16CA, 0x16D1, 0x16D8, 0x16E0, 0x16E7, 0x16EE, 0x16F6, 0x16FD, 0x1704, 0x170B, 0x1713, 0x171A, 0x1721, 0x1728, 0x1730, 0x1737, 0x173E, 0x1745, 0x174C, 0x1754, 0x175B, 0x1762, 0x1769, 0x1770, 0x1778, 0x177F, 0x1786, 0x178D, 0x1794, 0x179B, 0x17A2, 0x17AA, 0x17B1, 0x17B8, 0x17BF, 0x17C6, 0x17CD, 0x17D4, 0x17DB, 0x17E2, 0x17E9, 0x17F0, 0x17F7, 0x17FE, 0x1806, 0x180D, 0x1814, 0x181B, 0x1822, 0x1829, 0x1830, 0x1837, 0x183E, 0x1845, 0x184C, 0x1853, 0x185A, 0x1860, 0x1867, 0x186E, 0x1875, 0x187C, 0x1883, 0x188A, 0x1891, 0x1898, 0x189F, 0x18A6, 0x18AD, 0x18B3, 0x18BA, 0x18C1, 0x18C8, 0x18CF, 0x18D6, 0x18DD, 0x18E3, 0x18EA, 0x18F1, 0x18F8, 0x18FF, 0x1906, 0x190C, 0x1913, 0x191A, 0x1921, 0x1928, 0x192E, 0x1935, 0x193C, 0x1943, 0x1949, 0x1950, 0x1957, 0x195D, 0x1964, 0x196B, 0x1972, 0x1978, 0x197F, 0x1986, 0x198C, 0x1993, 0x199A, 0x19A0, 0x19A7, 0x19AE, 0x19B4, 0x19BB, 0x19C2, 0x19C8, 0x19CF, 0x19D5, 0x19DC, 0x19E3, 0x19E9, 0x19F0, 0x19F6, 0x19FD, 0x1A04, 0x1A0A, 0x1A11, 0x1A17, 0x1A1E, 0x1A24, 0x1A2B, 0x1A31, 0x1A38, 0x1A3E, 0x1A45, 0x1A4B, 0x1A52, 0x1A58, 0x1A5F, 0x1A65, 0x1A6C, 0x1A72, 0x1A79, 0x1A7F, 0x1A86, 0x1A8C, 0x1A93, 0x1A99, 0x1A9F, 0x1AA6, 0x1AAC, 0x1AB3, 0x1AB9, 0x1AC0, 0x1AC6, 0x1ACC, 0x1AD3, 0x1AD9, 0x1ADF, 0x1AE6, 0x1AEC, 0x1AF2, 0x1AF9, 0x1AFF, 0x1B05, 0x1B0C, 0x1B12, 0x1B18, 0x1B1F, 0x1B25, 0x1B2B, 0x1B32, 0x1B38, 0x1B3E, 0x1B44, 0x1B4B, 0x1B51, 0x1B57, 0x1B5D, 0x1B64, 0x1B6A, 0x1B70, 0x1B76, 0x1B7D, 0x1B83, 0x1B89, 0x1B8F, 0x1B95, 0x1B9C, 0x1BA2, 0x1BA8, 0x1BAE, 0x1BB4, 0x1BBA, 0x1BC1, 0x1BC7, 0x1BCD, 0x1BD3, 0x1BD9, 0x1BDF, 0x1BE5, 0x1BEB, 0x1BF2, 0x1BF8, 0x1BFE, 0x1C04, 0x1C0A, 0x1C10, 0x1C16, 0x1C1C, 0x1C22, 0x1C28, 0x1C2E, 0x1C34, 0x1C3A, 0x1C40, 0x1C46, 0x1C4C, 0x1C52, 0x1C58, 0x1C5E, 0x1C64, 0x1C6A, 0x1C70, 0x1C76, 0x1C7C, 0x1C82, 0x1C88, 0x1C8E, 0x1C94, 0x1C9A, 0x1CA0, 0x1CA6, 0x1CAC, 0x1CB2, 0x1CB8, 0x1CBE, 0x1CC3, 0x1CC9, 0x1CCF, 0x1CD5, 0x1CDB, 0x1CE1, 0x1CE7, 0x1CED, 0x1CF3, 0x1CF8, 0x1CFE, 0x1D04, 0x1D0A, 0x1D10, 0x1D16, 0x1D1B, 0x1D21, 0x1D27, 0x1D2D, 0x1D33, 0x1D38, 0x1D3E, 0x1D44, 0x1D4A, 0x1D4F, 0x1D55, 0x1D5B, 0x1D61, 0x1D66, 0x1D6C, 0x1D72, 0x1D78, 0x1D7D, 0x1D83, 0x1D89, 0x1D8E, 0x1D94, 0x1D9A, 0x1DA0, 0x1DA5, 0x1DAB, 0x1DB1, 0x1DB6, 0x1DBC, 0x1DC2, 0x1DC7, 0x1DCD, 0x1DD3, 0x1DD8, 0x1DDE, 0x1DE3, 0x1DE9, 0x1DEF, 0x1DF4, 0x1DFA, 0x1DFF, 0x1E05, 0x1E0B, 0x1E10, 0x1E16, 0x1E1B, 0x1E21, 0x1E26, 0x1E2C, 0x1E32, 0x1E37, 0x1E3D, 0x1E42, 0x1E48, 0x1E4D, 0x1E53, 0x1E58, 0x1E5E, 0x1E63, 0x1E69, 0x1E6E, 0x1E74, 0x1E79, 0x1E7F, 0x1E84, 0x1E8A, 0x1E8F, 0x1E94, 0x1E9A, 0x1E9F, 0x1EA5, 0x1EAA, 0x1EB0, 0x1EB5, 0x1EBA, 0x1EC0, 0x1EC5, 0x1ECB, 0x1ED0, 0x1ED5, 0x1EDB, 0x1EE0, 0x1EE6, 0x1EEB, 0x1EF0, 0x1EF6, 0x1EFB, 0x1F00, 0x1F06, 0x1F0B, 0x1F10, 0x1F16, 0x1F1B, 0x1F20, 0x1F26, 0x1F2B, 0x1F30, 0x1F36, 0x1F3B, 0x1F40, 0x1F45, 0x1F4B, 0x1F50, 0x1F55, 0x1F5A, 0x1F60, 0x1F65, 0x1F6A, 0x1F6F, 0x1F75, 0x1F7A, 0x1F7F, 0x1F84, 0x1F8A, 0x1F8F, 0x1F94, 0x1F99, 0x1F9E, 0x1FA4, 0x1FA9, 0x1FAE, 0x1FB3, 0x1FB8, 0x1FBD, 0x1FC3, 0x1FC8, 0x1FCD, 0x1FD2, 0x1FD7, 0x1FDC, 0x1FE1, 0x1FE6, 0x1FEC, 0x1FF1, 0x1FF6, 0x1FFB, 0x2000 + diff --git a/data/dkr.data.s b/data/dkr.data.s index 2616d281..9ec7e964 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -1278,536 +1278,26 @@ ###################################################### -############## unknown_070110.c (.data) ############## +############## unknown_070110.s (.data) ############## -glabel D_800DD430 -.word 0x00000000 - -glabel D_800DD434 -.word 0x5141564D - -glabel D_800DD438 -.word 0x5141564D - -glabel D_800DD43C -.word 0x00000032 -.word 0x00650097 -.word 0x00C900FB -.word 0x012E0160 -.word 0x019201C4 -.word 0x01F70229 -.word 0x025B028D -.word 0x02C002F2 -.word 0x03240356 -.word 0x038903BB -.word 0x03ED041F -.word 0x04520484 -.word 0x04B604E8 -.word 0x051B054D -.word 0x057F05B1 -.word 0x05E30616 -.word 0x0648067A -.word 0x06AC06DE -.word 0x07110743 -.word 0x077507A7 -.word 0x07D9080C -.word 0x083E0870 -.word 0x08A208D4 -.word 0x09060938 -.word 0x096B099D -.word 0x09CF0A01 -.word 0x0A330A65 -.word 0x0A970AC9 -.word 0x0AFB0B2D -.word 0x0B600B92 -.word 0x0BC40BF6 -.word 0x0C280C5A -.word 0x0C8C0CBE -.word 0x0CF00D22 -.word 0x0D540D86 -.word 0x0DB80DEA -.word 0x0E1C0E4E -.word 0x0E800EB2 -.word 0x0EE40F15 -.word 0x0F470F79 -.word 0x0FAB0FDD -.word 0x100F1041 -.word 0x107310A4 -.word 0x10D61108 -.word 0x113A116C -.word 0x119E11CF -.word 0x12011233 -.word 0x12651296 -.word 0x12C812FA -.word 0x132B135D -.word 0x138F13C1 -.word 0x13F21424 -.word 0x14551487 -.word 0x14B914EA -.word 0x151C154D -.word 0x157F15B1 -.word 0x15E21614 -.word 0x16451677 -.word 0x16A816DA -.word 0x170B173C -.word 0x176E179F -.word 0x17D11802 -.word 0x18331865 -.word 0x189618C7 -.word 0x18F9192A -.word 0x195B198D -.word 0x19BE19EF -.word 0x1A201A51 -.word 0x1A831AB4 -.word 0x1AE51B16 -.word 0x1B471B78 -.word 0x1BA91BDA -.word 0x1C0C1C3D -.word 0x1C6E1C9F -.word 0x1CD01D01 -.word 0x1D311D62 -.word 0x1D931DC4 -.word 0x1DF51E26 -.word 0x1E571E88 -.word 0x1EB81EE9 -.word 0x1F1A1F4B -.word 0x1F7B1FAC -.word 0x1FDD200E -.word 0x203E206F -.word 0x209F20D0 -.word 0x21012131 -.word 0x21622192 -.word 0x21C321F3 -.word 0x22242254 -.word 0x228422B5 -.word 0x22E52316 -.word 0x23462376 -.word 0x23A723D7 -.word 0x24072437 -.word 0x24672498 -.word 0x24C824F8 -.word 0x25282558 -.word 0x258825B8 -.word 0x25E82618 -.word 0x26482678 -.word 0x26A826D8 -.word 0x27082738 -.word 0x27682797 -.word 0x27C727F7 -.word 0x28272856 -.word 0x288628B6 -.word 0x28E52915 -.word 0x29452974 -.word 0x29A429D3 -.word 0x2A032A32 -.word 0x2A622A91 -.word 0x2AC12AF0 -.word 0x2B1F2B4F -.word 0x2B7E2BAD -.word 0x2BDC2C0C -.word 0x2C3B2C6A -.word 0x2C992CC8 -.word 0x2CF72D26 -.word 0x2D552D84 -.word 0x2DB32DE2 -.word 0x2E112E40 -.word 0x2E6F2E9E -.word 0x2ECC2EFB -.word 0x2F2A2F59 -.word 0x2F872FB6 -.word 0x2FE53013 -.word 0x30423070 -.word 0x309F30CD -.word 0x30FC312A -.word 0x31593187 -.word 0x31B531E4 -.word 0x32123240 -.word 0x326E329D -.word 0x32CB32F9 -.word 0x33273355 -.word 0x338333B1 -.word 0x33DF340D -.word 0x343B3469 -.word 0x349734C4 -.word 0x34F23520 -.word 0x354E357B -.word 0x35A935D7 -.word 0x36043632 -.word 0x365F368D -.word 0x36BA36E8 -.word 0x37153742 -.word 0x3770379D -.word 0x37CA37F7 -.word 0x38253852 -.word 0x387F38AC -.word 0x38D93906 -.word 0x39333960 -.word 0x398D39BA -.word 0x39E73A13 -.word 0x3A403A6D -.word 0x3A9A3AC6 -.word 0x3AF33B20 -.word 0x3B4C3B79 -.word 0x3BA53BD2 -.word 0x3BFE3C2A -.word 0x3C573C83 -.word 0x3CAF3CDC -.word 0x3D083D34 -.word 0x3D603D8C -.word 0x3DB83DE4 -.word 0x3E103E3C -.word 0x3E683E94 -.word 0x3EC03EEC -.word 0x3F173F43 -.word 0x3F6F3F9A -.word 0x3FC63FF1 -.word 0x401D4048 -.word 0x4074409F -.word 0x40CB40F6 -.word 0x4121414D -.word 0x417841A3 -.word 0x41CE41F9 -.word 0x4224424F -.word 0x427A42A5 -.word 0x42D042FB -.word 0x43264351 -.word 0x437B43A6 -.word 0x43D143FB -.word 0x44264450 -.word 0x447B44A5 -.word 0x44D044FA -.word 0x4524454F -.word 0x457945A3 -.word 0x45CD45F7 -.word 0x4621464B -.word 0x4675469F -.word 0x46C946F3 -.word 0x471D4747 -.word 0x4770479A -.word 0x47C447ED -.word 0x48174840 -.word 0x486A4893 -.word 0x48BD48E6 -.word 0x490F4939 -.word 0x4962498B -.word 0x49B449DD -.word 0x4A064A2F -.word 0x4A584A81 -.word 0x4AAA4AD3 -.word 0x4AFB4B24 -.word 0x4B4D4B75 -.word 0x4B9E4BC7 -.word 0x4BEF4C17 -.word 0x4C404C68 -.word 0x4C914CB9 -.word 0x4CE14D09 -.word 0x4D314D59 -.word 0x4D814DA9 -.word 0x4DD14DF9 -.word 0x4E214E49 -.word 0x4E714E98 -.word 0x4EC04EE8 -.word 0x4F0F4F37 -.word 0x4F5E4F85 -.word 0x4FAD4FD4 -.word 0x4FFB5023 -.word 0x504A5071 -.word 0x509850BF -.word 0x50E6510D -.word 0x5134515B -.word 0x518151A8 -.word 0x51CF51F5 -.word 0x521C5243 -.word 0x52695290 -.word 0x52B652DC -.word 0x53035329 -.word 0x534F5375 -.word 0x539B53C1 -.word 0x53E7540D -.word 0x54335459 -.word 0x547F54A4 -.word 0x54CA54F0 -.word 0x5515553B -.word 0x55605586 -.word 0x55AB55D0 -.word 0x55F6561B -.word 0x56405665 -.word 0x568A56AF -.word 0x56D456F9 -.word 0x571E5743 -.word 0x5767578C -.word 0x57B157D5 -.word 0x57FA581E -.word 0x58435867 -.word 0x588C58B0 -.word 0x58D458F8 -.word 0x591C5940 -.word 0x59645988 -.word 0x59AC59D0 -.word 0x59F45A18 -.word 0x5A3B5A5F -.word 0x5A825AA6 -.word 0x5AC95AED -.word 0x5B105B34 -.word 0x5B575B7A -.word 0x5B9D5BC0 -.word 0x5BE35C06 -.word 0x5C295C4C -.word 0x5C6F5C91 -.word 0x5CB45CD7 -.word 0x5CF95D1C -.word 0x5D3E5D61 -.word 0x5D835DA5 -.word 0x5DC85DEA -.word 0x5E0C5E2E -.word 0x5E505E72 -.word 0x5E945EB6 -.word 0x5ED75EF9 -.word 0x5F1B5F3C -.word 0x5F5E5F80 -.word 0x5FA15FC2 -.word 0x5FE46005 -.word 0x60266047 -.word 0x60686089 -.word 0x60AA60CB -.word 0x60EC610D -.word 0x612E614E -.word 0x616F6190 -.word 0x61B061D1 -.word 0x61F16211 -.word 0x62326252 -.word 0x62726292 -.word 0x62B262D2 -.word 0x62F26312 -.word 0x63326351 -.word 0x63716391 -.word 0x63B063D0 -.word 0x63EF640F -.word 0x642E644D -.word 0x646C648B -.word 0x64AB64CA -.word 0x64E96507 -.word 0x65266545 -.word 0x65646582 -.word 0x65A165C0 -.word 0x65DE65FC -.word 0x661B6639 -.word 0x66576675 -.word 0x669366B2 -.word 0x66D066ED -.word 0x670B6729 -.word 0x67476764 -.word 0x678267A0 -.word 0x67BD67DA -.word 0x67F86815 -.word 0x68326850 -.word 0x686D688A -.word 0x68A768C4 -.word 0x68E068FD -.word 0x691A6937 -.word 0x69536970 -.word 0x698C69A9 -.word 0x69C569E1 -.word 0x69FD6A1A -.word 0x6A366A52 -.word 0x6A6E6A89 -.word 0x6AA56AC1 -.word 0x6ADD6AF8 -.word 0x6B146B30 -.word 0x6B4B6B66 -.word 0x6B826B9D -.word 0x6BB86BD3 -.word 0x6BEE6C09 -.word 0x6C246C3F -.word 0x6C5A6C75 -.word 0x6C8F6CAA -.word 0x6CC46CDF -.word 0x6CF96D14 -.word 0x6D2E6D48 -.word 0x6D626D7C -.word 0x6D966DB0 -.word 0x6DCA6DE4 -.word 0x6DFE6E17 -.word 0x6E316E4A -.word 0x6E646E7D -.word 0x6E976EB0 -.word 0x6EC96EE2 -.word 0x6EFB6F14 -.word 0x6F2D6F46 -.word 0x6F5F6F78 -.word 0x6F906FA9 -.word 0x6FC26FDA -.word 0x6FF2700B -.word 0x7023703B -.word 0x7053706B -.word 0x7083709B -.word 0x70B370CB -.word 0x70E370FA -.word 0x7112712A -.word 0x71417158 -.word 0x71707187 -.word 0x719E71B5 -.word 0x71CC71E3 -.word 0x71FA7211 -.word 0x7228723F -.word 0x7255726C -.word 0x72827299 -.word 0x72AF72C5 -.word 0x72DC72F2 -.word 0x7308731E -.word 0x7334734A -.word 0x735F7375 -.word 0x738B73A0 -.word 0x73B673CB -.word 0x73E173F6 -.word 0x740B7421 -.word 0x7436744B -.word 0x74607475 -.word 0x7489749E -.word 0x74B374C7 -.word 0x74DC74F0 -.word 0x75057519 -.word 0x752D7542 -.word 0x7556756A -.word 0x757E7592 -.word 0x75A675B9 -.word 0x75CD75E1 -.word 0x75F47608 -.word 0x761B762E -.word 0x76427655 -.word 0x7668767B -.word 0x768E76A1 -.word 0x76B476C7 -.word 0x76D976EC -.word 0x76FE7711 -.word 0x77237736 -.word 0x7748775A -.word 0x776C777E -.word 0x779077A2 -.word 0x77B477C6 -.word 0x77D877E9 -.word 0x77FB780C -.word 0x781E782F -.word 0x78407851 -.word 0x78637874 -.word 0x78857895 -.word 0x78A678B7 -.word 0x78C878D8 -.word 0x78E978F9 -.word 0x790A791A -.word 0x792A793A -.word 0x794A795B -.word 0x796A797A -.word 0x798A799A -.word 0x79AA79B9 -.word 0x79C979D8 -.word 0x79E779F7 -.word 0x7A067A15 -.word 0x7A247A33 -.word 0x7A427A51 -.word 0x7A607A6E -.word 0x7A7D7A8C -.word 0x7A9A7AA8 -.word 0x7AB77AC5 -.word 0x7AD37AE1 -.word 0x7AEF7AFD -.word 0x7B0B7B19 -.word 0x7B277B34 -.word 0x7B427B50 -.word 0x7B5D7B6A -.word 0x7B787B85 -.word 0x7B927B9F -.word 0x7BAC7BB9 -.word 0x7BC67BD3 -.word 0x7BDF7BEC -.word 0x7BF97C05 -.word 0x7C117C1E -.word 0x7C2A7C36 -.word 0x7C427C4E -.word 0x7C5A7C66 -.word 0x7C727C7E -.word 0x7C897C95 -.word 0x7CA07CAC -.word 0x7CB77CC2 -.word 0x7CCE7CD9 -.word 0x7CE47CEF -.word 0x7CFA7D05 -.word 0x7D0F7D1A -.word 0x7D257D2F -.word 0x7D3A7D44 -.word 0x7D4E7D58 -.word 0x7D637D6D -.word 0x7D777D81 -.word 0x7D8A7D94 -.word 0x7D9E7DA7 -.word 0x7DB17DBA -.word 0x7DC47DCD -.word 0x7DD67DE0 -.word 0x7DE97DF2 -.word 0x7DFB7E03 -.word 0x7E0C7E15 -.word 0x7E1E7E26 -.word 0x7E2F7E37 -.word 0x7E3F7E48 -.word 0x7E507E58 -.word 0x7E607E68 -.word 0x7E707E78 -.word 0x7E7F7E87 -.word 0x7E8E7E96 -.word 0x7E9D7EA5 -.word 0x7EAC7EB3 -.word 0x7EBA7EC1 -.word 0x7EC87ECF -.word 0x7ED67EDD -.word 0x7EE37EEA -.word 0x7EF07EF7 -.word 0x7EFD7F03 -.word 0x7F0A7F10 -.word 0x7F167F1C -.word 0x7F227F27 -.word 0x7F2D7F33 -.word 0x7F387F3E -.word 0x7F437F49 -.word 0x7F4E7F53 -.word 0x7F587F5D -.word 0x7F627F67 -.word 0x7F6C7F71 -.word 0x7F757F7A -.word 0x7F7E7F83 -.word 0x7F877F8B -.word 0x7F907F94 -.word 0x7F987F9C -.word 0x7FA07FA3 -.word 0x7FA77FAB -.word 0x7FAE7FB2 -.word 0x7FB57FB9 -.word 0x7FBC7FBF -.word 0x7FC27FC5 -.word 0x7FC87FCB -.word 0x7FCE7FD1 -.word 0x7FD37FD6 -.word 0x7FD97FDB -.word 0x7FDD7FE0 -.word 0x7FE27FE4 -.word 0x7FE67FE8 -.word 0x7FEA7FEC -.word 0x7FED7FEF -.word 0x7FF17FF2 -.word 0x7FF47FF5 -.word 0x7FF67FF7 -.word 0x7FF87FF9 -.word 0x7FFA7FFB -.word 0x7FFC7FFD -.word 0x7FFE7FFE -.word 0x7FFF7FFF -.word 0x7FFF8000 -.word 0x80008000 -.word 0x80000000 - -glabel D_800DDC3E -.half 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070, 0x007A, 0x0084, 0x008F, 0x0099, 0x00A3, 0x00AD, 0x00B7, 0x00C2, 0x00CC, 0x00D6, 0x00E0, 0x00EA, 0x00F4, 0x00FF, 0x0109, 0x0113, 0x011D, 0x0127, 0x0131, 0x013C, 0x0146, 0x0150, 0x015A, 0x0164, 0x016F, 0x0179, 0x0183, 0x018D, 0x0197, 0x01A1, 0x01AC, 0x01B6, 0x01C0, 0x01CA, 0x01D4, 0x01DE, 0x01E9, 0x01F3, 0x01FD, 0x0207, 0x0211, 0x021B, 0x0226, 0x0230, 0x023A, 0x0244, 0x024E, 0x0258, 0x0262, 0x026D, 0x0277, 0x0281, 0x028B, 0x0295, 0x029F, 0x02A9, 0x02B4, 0x02BE, 0x02C8, 0x02D2, 0x02DC, 0x02E6, 0x02F0, 0x02FB, 0x0305, 0x030F, 0x0319, 0x0323, 0x032D, 0x0337, 0x0341, 0x034C, 0x0356, 0x0360, 0x036A, 0x0374, 0x037E, 0x0388, 0x0392, 0x039C, 0x03A7, 0x03B1, 0x03BB, 0x03C5, 0x03CF, 0x03D9, 0x03E3, 0x03ED, 0x03F7, 0x0401, 0x040C, 0x0416, 0x0420, 0x042A, 0x0434, 0x043E, 0x0448, 0x0452, 0x045C, 0x0466, 0x0470, 0x047A, 0x0484, 0x048E, 0x0499, 0x04A3, 0x04AD, 0x04B7, 0x04C1, 0x04CB, 0x04D5, 0x04DF, 0x04E9, 0x04F3, 0x04FD, 0x0507, 0x0511, 0x051B, 0x0525, 0x052F, 0x0539, 0x0543, 0x054D, 0x0557, 0x0561, 0x056B, 0x0575, 0x057F, 0x0589, 0x0593, 0x059D, 0x05A7, 0x05B1, 0x05BB, 0x05C5, 0x05CF, 0x05D9, 0x05E3, 0x05ED, 0x05F7, 0x0601, 0x060B, 0x0615, 0x061F, 0x0629, 0x0633, 0x063D, 0x0647, 0x0651, 0x065B, 0x0665, 0x066E, 0x0678, 0x0682, 0x068C, 0x0696, 0x06A0, 0x06AA, 0x06B4, 0x06BE, 0x06C8, 0x06D2, 0x06DC, 0x06E5, 0x06EF, 0x06F9, 0x0703, 0x070D, 0x0717, 0x0721, 0x072B, 0x0735, 0x073E, 0x0748, 0x0752, 0x075C, 0x0766, 0x0770, 0x077A, 0x0783, 0x078D, 0x0797, 0x07A1, 0x07AB, 0x07B5, 0x07BE, 0x07C8, 0x07D2, 0x07DC, 0x07E6, 0x07EF, 0x07F9, 0x0803, 0x080D, 0x0817, 0x0820, 0x082A, 0x0834, 0x083E, 0x0848, 0x0851, 0x085B, 0x0865, 0x086F, 0x0878, 0x0882, 0x088C, 0x0896, 0x089F, 0x08A9, 0x08B3, 0x08BD, 0x08C6, 0x08D0, 0x08DA, 0x08E3, 0x08ED, 0x08F7, 0x0901, 0x090A, 0x0914, 0x091E, 0x0927, 0x0931, 0x093B, 0x0944, 0x094E, 0x0958, 0x0961, 0x096B, 0x0975, 0x097E, 0x0988, 0x0992, 0x099B, 0x09A5, 0x09AE, 0x09B8, 0x09C2, 0x09CB, 0x09D5, 0x09DE, 0x09E8, 0x09F2, 0x09FB, 0x0A05, 0x0A0E, 0x0A18, 0x0A22, 0x0A2B, 0x0A35, 0x0A3E, 0x0A48, 0x0A51, 0x0A5B, 0x0A64, 0x0A6E, 0x0A77, 0x0A81, 0x0A8B, 0x0A94, 0x0A9E, 0x0AA7, 0x0AB1, 0x0ABA, 0x0AC4, 0x0ACD, 0x0AD7, 0x0AE0, 0x0AE9, 0x0AF3, 0x0AFC, 0x0B06, 0x0B0F, 0x0B19, 0x0B22, 0x0B2C, 0x0B35, 0x0B3F, 0x0B48, 0x0B51, 0x0B5B, 0x0B64, 0x0B6E, 0x0B77, 0x0B80, 0x0B8A, 0x0B93, 0x0B9D, 0x0BA6, 0x0BAF, 0x0BB9, 0x0BC2, 0x0BCB, 0x0BD5, 0x0BDE, 0x0BE7, 0x0BF1, 0x0BFA, 0x0C03, 0x0C0D, 0x0C16, 0x0C1F, 0x0C29, 0x0C32, 0x0C3B, 0x0C45, 0x0C4E, 0x0C57, 0x0C60, 0x0C6A, 0x0C73, 0x0C7C, 0x0C86, 0x0C8F, 0x0C98, 0x0CA1, 0x0CAB, 0x0CB4, 0x0CBD, 0x0CC6, 0x0CCF, 0x0CD9, 0x0CE2, 0x0CEB, 0x0CF4, 0x0CFD, 0x0D07, 0x0D10, 0x0D19, 0x0D22, 0x0D2B, 0x0D34, 0x0D3E, 0x0D47, 0x0D50, 0x0D59, 0x0D62, 0x0D6B, 0x0D74, 0x0D7D, 0x0D87, 0x0D90, 0x0D99, 0x0DA2, 0x0DAB, 0x0DB4, 0x0DBD, 0x0DC6, 0x0DCF, 0x0DD8, 0x0DE1, 0x0DEA, 0x0DF3, 0x0DFC, 0x0E05, 0x0E0F, 0x0E18, 0x0E21, 0x0E2A, 0x0E33, 0x0E3C, 0x0E45, 0x0E4E, 0x0E56, 0x0E5F, 0x0E68, 0x0E71, 0x0E7A, 0x0E83, 0x0E8C, 0x0E95, 0x0E9E, 0x0EA7, 0x0EB0, 0x0EB9, 0x0EC2, 0x0ECB, 0x0ED4, 0x0EDC, 0x0EE5, 0x0EEE, 0x0EF7, 0x0F00, 0x0F09, 0x0F12, 0x0F1B, 0x0F23, 0x0F2C, 0x0F35, 0x0F3E, 0x0F47, 0x0F50, 0x0F58, 0x0F61, 0x0F6A, 0x0F73, 0x0F7C, 0x0F84, 0x0F8D, 0x0F96, 0x0F9F, 0x0FA7, 0x0FB0, 0x0FB9, 0x0FC2, 0x0FCA, 0x0FD3, 0x0FDC, 0x0FE5, 0x0FED, 0x0FF6, 0x0FFF, 0x1007, 0x1010, 0x1019, 0x1021, 0x102A, 0x1033, 0x103B, 0x1044, 0x104D, 0x1055, 0x105E, 0x1067, 0x106F, 0x1078, 0x1080, 0x1089, 0x1092, 0x109A, 0x10A3, 0x10AB, 0x10B4, 0x10BC, 0x10C5, 0x10CE, 0x10D6, 0x10DF, 0x10E7, 0x10F0, 0x10F8, 0x1101, 0x1109, 0x1112, 0x111A, 0x1123, 0x112B, 0x1134, 0x113C, 0x1145, 0x114D, 0x1156, 0x115E, 0x1166, 0x116F, 0x1177, 0x1180, 0x1188, 0x1191, 0x1199, 0x11A1, 0x11AA, 0x11B2, 0x11BB, 0x11C3, 0x11CB, 0x11D4, 0x11DC, 0x11E4, 0x11ED, 0x11F5, 0x11FD, 0x1206, 0x120E, 0x1216, 0x121F, 0x1227, 0x122F, 0x1237, 0x1240, 0x1248, 0x1250, 0x1259, 0x1261, 0x1269, 0x1271, 0x127A, 0x1282, 0x128A, 0x1292, 0x129A, 0x12A3, 0x12AB, 0x12B3, 0x12BB, 0x12C3, 0x12CC, 0x12D4, 0x12DC, 0x12E4, 0x12EC, 0x12F4, 0x12FC, 0x1305, 0x130D, 0x1315, 0x131D, 0x1325, 0x132D, 0x1335, 0x133D, 0x1345, 0x134D, 0x1355, 0x135E, 0x1366, 0x136E, 0x1376, 0x137E, 0x1386, 0x138E, 0x1396, 0x139E, 0x13A6, 0x13AE, 0x13B6, 0x13BE, 0x13C6, 0x13CE, 0x13D6, 0x13DE, 0x13E6, 0x13ED, 0x13F5, 0x13FD, 0x1405, 0x140D, 0x1415, 0x141D, 0x1425, 0x142D, 0x1435, 0x143D, 0x1444, 0x144C, 0x1454, 0x145C, 0x1464, 0x146C, 0x1473, 0x147B, 0x1483, 0x148B, 0x1493, 0x149B, 0x14A2, 0x14AA, 0x14B2, 0x14BA, 0x14C1, 0x14C9, 0x14D1, 0x14D9, 0x14E0, 0x14E8, 0x14F0, 0x14F8, 0x14FF, 0x1507, 0x150F, 0x1516, 0x151E, 0x1526, 0x152D, 0x1535, 0x153D, 0x1544, 0x154C, 0x1554, 0x155B, 0x1563, 0x156B, 0x1572, 0x157A, 0x1581, 0x1589, 0x1591, 0x1598, 0x15A0, 0x15A7, 0x15AF, 0x15B7, 0x15BE, 0x15C6, 0x15CD, 0x15D5, 0x15DC, 0x15E4, 0x15EB, 0x15F3, 0x15FA, 0x1602, 0x1609, 0x1611, 0x1618, 0x1620, 0x1627, 0x162F, 0x1636, 0x163E, 0x1645, 0x164C, 0x1654, 0x165B, 0x1663, 0x166A, 0x1671, 0x1679, 0x1680, 0x1688, 0x168F, 0x1696, 0x169E, 0x16A5, 0x16AC, 0x16B4, 0x16BB, 0x16C2, 0x16CA, 0x16D1, 0x16D8, 0x16E0, 0x16E7, 0x16EE, 0x16F6, 0x16FD, 0x1704, 0x170B, 0x1713, 0x171A, 0x1721, 0x1728, 0x1730, 0x1737, 0x173E, 0x1745, 0x174C, 0x1754, 0x175B, 0x1762, 0x1769, 0x1770, 0x1778, 0x177F, 0x1786, 0x178D, 0x1794, 0x179B, 0x17A2, 0x17AA, 0x17B1, 0x17B8, 0x17BF, 0x17C6, 0x17CD, 0x17D4, 0x17DB, 0x17E2, 0x17E9, 0x17F0, 0x17F7, 0x17FE, 0x1806, 0x180D, 0x1814, 0x181B, 0x1822, 0x1829, 0x1830, 0x1837, 0x183E, 0x1845, 0x184C, 0x1853, 0x185A, 0x1860, 0x1867, 0x186E, 0x1875, 0x187C, 0x1883, 0x188A, 0x1891, 0x1898, 0x189F, 0x18A6, 0x18AD, 0x18B3, 0x18BA, 0x18C1, 0x18C8, 0x18CF, 0x18D6, 0x18DD, 0x18E3, 0x18EA, 0x18F1, 0x18F8, 0x18FF, 0x1906, 0x190C, 0x1913, 0x191A, 0x1921, 0x1928, 0x192E, 0x1935, 0x193C, 0x1943, 0x1949, 0x1950, 0x1957, 0x195D, 0x1964, 0x196B, 0x1972, 0x1978, 0x197F, 0x1986, 0x198C, 0x1993, 0x199A, 0x19A0, 0x19A7, 0x19AE, 0x19B4, 0x19BB, 0x19C2, 0x19C8, 0x19CF, 0x19D5, 0x19DC, 0x19E3, 0x19E9, 0x19F0, 0x19F6, 0x19FD, 0x1A04, 0x1A0A, 0x1A11, 0x1A17, 0x1A1E, 0x1A24, 0x1A2B, 0x1A31, 0x1A38, 0x1A3E, 0x1A45, 0x1A4B, 0x1A52, 0x1A58, 0x1A5F, 0x1A65, 0x1A6C, 0x1A72, 0x1A79, 0x1A7F, 0x1A86, 0x1A8C, 0x1A93, 0x1A99, 0x1A9F, 0x1AA6, 0x1AAC, 0x1AB3, 0x1AB9, 0x1AC0, 0x1AC6, 0x1ACC, 0x1AD3, 0x1AD9, 0x1ADF, 0x1AE6, 0x1AEC, 0x1AF2, 0x1AF9, 0x1AFF, 0x1B05, 0x1B0C, 0x1B12, 0x1B18, 0x1B1F, 0x1B25, 0x1B2B, 0x1B32, 0x1B38, 0x1B3E, 0x1B44, 0x1B4B, 0x1B51, 0x1B57, 0x1B5D, 0x1B64, 0x1B6A, 0x1B70, 0x1B76, 0x1B7D, 0x1B83, 0x1B89, 0x1B8F, 0x1B95, 0x1B9C, 0x1BA2, 0x1BA8, 0x1BAE, 0x1BB4, 0x1BBA, 0x1BC1, 0x1BC7, 0x1BCD, 0x1BD3, 0x1BD9, 0x1BDF, 0x1BE5, 0x1BEB, 0x1BF2, 0x1BF8, 0x1BFE, 0x1C04, 0x1C0A, 0x1C10, 0x1C16, 0x1C1C, 0x1C22, 0x1C28, 0x1C2E, 0x1C34, 0x1C3A, 0x1C40, 0x1C46, 0x1C4C, 0x1C52, 0x1C58, 0x1C5E, 0x1C64, 0x1C6A, 0x1C70, 0x1C76, 0x1C7C, 0x1C82, 0x1C88, 0x1C8E, 0x1C94, 0x1C9A, 0x1CA0, 0x1CA6, 0x1CAC, 0x1CB2, 0x1CB8, 0x1CBE, 0x1CC3, 0x1CC9, 0x1CCF, 0x1CD5, 0x1CDB, 0x1CE1, 0x1CE7, 0x1CED, 0x1CF3, 0x1CF8, 0x1CFE, 0x1D04, 0x1D0A, 0x1D10, 0x1D16, 0x1D1B, 0x1D21, 0x1D27, 0x1D2D, 0x1D33, 0x1D38, 0x1D3E, 0x1D44, 0x1D4A, 0x1D4F, 0x1D55, 0x1D5B, 0x1D61, 0x1D66, 0x1D6C, 0x1D72, 0x1D78, 0x1D7D, 0x1D83, 0x1D89, 0x1D8E, 0x1D94, 0x1D9A, 0x1DA0, 0x1DA5, 0x1DAB, 0x1DB1, 0x1DB6, 0x1DBC, 0x1DC2, 0x1DC7, 0x1DCD, 0x1DD3, 0x1DD8, 0x1DDE, 0x1DE3, 0x1DE9, 0x1DEF, 0x1DF4, 0x1DFA, 0x1DFF, 0x1E05, 0x1E0B, 0x1E10, 0x1E16, 0x1E1B, 0x1E21, 0x1E26, 0x1E2C, 0x1E32, 0x1E37, 0x1E3D, 0x1E42, 0x1E48, 0x1E4D, 0x1E53, 0x1E58, 0x1E5E, 0x1E63, 0x1E69, 0x1E6E, 0x1E74, 0x1E79, 0x1E7F, 0x1E84, 0x1E8A, 0x1E8F, 0x1E94, 0x1E9A, 0x1E9F, 0x1EA5, 0x1EAA, 0x1EB0, 0x1EB5, 0x1EBA, 0x1EC0, 0x1EC5, 0x1ECB, 0x1ED0, 0x1ED5, 0x1EDB, 0x1EE0, 0x1EE6, 0x1EEB, 0x1EF0, 0x1EF6, 0x1EFB, 0x1F00, 0x1F06, 0x1F0B, 0x1F10, 0x1F16, 0x1F1B, 0x1F20, 0x1F26, 0x1F2B, 0x1F30, 0x1F36, 0x1F3B, 0x1F40, 0x1F45, 0x1F4B, 0x1F50, 0x1F55, 0x1F5A, 0x1F60, 0x1F65, 0x1F6A, 0x1F6F, 0x1F75, 0x1F7A, 0x1F7F, 0x1F84, 0x1F8A, 0x1F8F, 0x1F94, 0x1F99, 0x1F9E, 0x1FA4, 0x1FA9, 0x1FAE, 0x1FB3, 0x1FB8, 0x1FBD, 0x1FC3, 0x1FC8, 0x1FCD, 0x1FD2, 0x1FD7, 0x1FDC, 0x1FE1, 0x1FE6, 0x1FEC, 0x1FF1, 0x1FF6, 0x1FFB, 0x2000 +# glabel D_800DD430 +# .word 0x00000000 +# +# glabel D_800DD434 +# .word 0x5141564D +# +# glabel D_800DD438 +# .word 0x5141564D +# +# glabel D_800DD43C +# .half 0x0000, 0x0032, 0x0065, 0x0097, 0x00C9, 0x00FB, 0x012E, 0x0160, 0x0192, 0x01C4, 0x01F7, 0x0229, 0x025B, 0x028D, 0x02C0, 0x02F2, 0x0324, 0x0356, 0x0389, 0x03BB, 0x03ED, 0x041F, 0x0452, 0x0484, 0x04B6, 0x04E8, 0x051B, 0x054D, 0x057F, 0x05B1, 0x05E3, 0x0616, 0x0648, 0x067A, 0x06AC, 0x06DE, 0x0711, 0x0743, 0x0775, 0x07A7, 0x07D9, 0x080C, 0x083E, 0x0870, 0x08A2, 0x08D4, 0x0906, 0x0938, 0x096B, 0x099D, 0x09CF, 0x0A01, 0x0A33, 0x0A65, 0x0A97, 0x0AC9, 0x0AFB, 0x0B2D, 0x0B60, 0x0B92, 0x0BC4, 0x0BF6, 0x0C28, 0x0C5A, 0x0C8C, 0x0CBE, 0x0CF0, 0x0D22, 0x0D54, 0x0D86, 0x0DB8, 0x0DEA, 0x0E1C, 0x0E4E, 0x0E80, 0x0EB2, 0x0EE4, 0x0F15, 0x0F47, 0x0F79, 0x0FAB, 0x0FDD, 0x100F, 0x1041, 0x1073, 0x10A4, 0x10D6, 0x1108, 0x113A, 0x116C, 0x119E, 0x11CF, 0x1201, 0x1233, 0x1265, 0x1296, 0x12C8, 0x12FA, 0x132B, 0x135D, 0x138F, 0x13C1, 0x13F2, 0x1424, 0x1455, 0x1487, 0x14B9, 0x14EA, 0x151C, 0x154D, 0x157F, 0x15B1, 0x15E2, 0x1614, 0x1645, 0x1677, 0x16A8, 0x16DA, 0x170B, 0x173C, 0x176E, 0x179F, 0x17D1, 0x1802, 0x1833, 0x1865, 0x1896, 0x18C7, 0x18F9, 0x192A, 0x195B, 0x198D, 0x19BE, 0x19EF, 0x1A20, 0x1A51, 0x1A83, 0x1AB4, 0x1AE5, 0x1B16, 0x1B47, 0x1B78, 0x1BA9, 0x1BDA, 0x1C0C, 0x1C3D, 0x1C6E, 0x1C9F, 0x1CD0, 0x1D01, 0x1D31, 0x1D62, 0x1D93, 0x1DC4, 0x1DF5, 0x1E26, 0x1E57, 0x1E88, 0x1EB8, 0x1EE9, 0x1F1A, 0x1F4B, 0x1F7B, 0x1FAC, 0x1FDD, 0x200E, 0x203E, 0x206F, 0x209F, 0x20D0, 0x2101, 0x2131, 0x2162, 0x2192, 0x21C3, 0x21F3, 0x2224, 0x2254, 0x2284, 0x22B5, 0x22E5, 0x2316, 0x2346, 0x2376, 0x23A7, 0x23D7, 0x2407, 0x2437, 0x2467, 0x2498, 0x24C8, 0x24F8, 0x2528, 0x2558, 0x2588, 0x25B8, 0x25E8, 0x2618, 0x2648, 0x2678, 0x26A8, 0x26D8, 0x2708, 0x2738, 0x2768, 0x2797, 0x27C7, 0x27F7, 0x2827, 0x2856, 0x2886, 0x28B6, 0x28E5, 0x2915, 0x2945, 0x2974, 0x29A4, 0x29D3, 0x2A03, 0x2A32, 0x2A62, 0x2A91, 0x2AC1, 0x2AF0, 0x2B1F, 0x2B4F, 0x2B7E, 0x2BAD, 0x2BDC, 0x2C0C, 0x2C3B, 0x2C6A, 0x2C99, 0x2CC8, 0x2CF7, 0x2D26, 0x2D55, 0x2D84, 0x2DB3, 0x2DE2, 0x2E11, 0x2E40, 0x2E6F, 0x2E9E, 0x2ECC, 0x2EFB, 0x2F2A, 0x2F59, 0x2F87, 0x2FB6, 0x2FE5, 0x3013, 0x3042, 0x3070, 0x309F, 0x30CD, 0x30FC, 0x312A, 0x3159, 0x3187, 0x31B5, 0x31E4, 0x3212, 0x3240, 0x326E, 0x329D, 0x32CB, 0x32F9, 0x3327, 0x3355, 0x3383, 0x33B1, 0x33DF, 0x340D, 0x343B, 0x3469, 0x3497, 0x34C4, 0x34F2, 0x3520, 0x354E, 0x357B, 0x35A9, 0x35D7, 0x3604, 0x3632, 0x365F, 0x368D, 0x36BA, 0x36E8, 0x3715, 0x3742, 0x3770, 0x379D, 0x37CA, 0x37F7, 0x3825, 0x3852, 0x387F, 0x38AC, 0x38D9, 0x3906, 0x3933, 0x3960, 0x398D, 0x39BA, 0x39E7, 0x3A13, 0x3A40, 0x3A6D, 0x3A9A, 0x3AC6, 0x3AF3, 0x3B20, 0x3B4C, 0x3B79, 0x3BA5, 0x3BD2, 0x3BFE, 0x3C2A, 0x3C57, 0x3C83, 0x3CAF, 0x3CDC, 0x3D08, 0x3D34, 0x3D60, 0x3D8C, 0x3DB8, 0x3DE4, 0x3E10, 0x3E3C, 0x3E68, 0x3E94, 0x3EC0, 0x3EEC, 0x3F17, 0x3F43, 0x3F6F, 0x3F9A, 0x3FC6, 0x3FF1, 0x401D, 0x4048, 0x4074, 0x409F, 0x40CB, 0x40F6, 0x4121, 0x414D, 0x4178, 0x41A3, 0x41CE, 0x41F9, 0x4224, 0x424F, 0x427A, 0x42A5, 0x42D0, 0x42FB, 0x4326, 0x4351, 0x437B, 0x43A6, 0x43D1, 0x43FB, 0x4426, 0x4450, 0x447B, 0x44A5, 0x44D0, 0x44FA, 0x4524, 0x454F, 0x4579, 0x45A3, 0x45CD, 0x45F7, 0x4621, 0x464B, 0x4675, 0x469F, 0x46C9, 0x46F3, 0x471D, 0x4747, 0x4770, 0x479A, 0x47C4, 0x47ED, 0x4817, 0x4840, 0x486A, 0x4893, 0x48BD, 0x48E6, 0x490F, 0x4939, 0x4962, 0x498B, 0x49B4, 0x49DD, 0x4A06, 0x4A2F, 0x4A58, 0x4A81, 0x4AAA, 0x4AD3, 0x4AFB, 0x4B24, 0x4B4D, 0x4B75, 0x4B9E, 0x4BC7, 0x4BEF, 0x4C17, 0x4C40, 0x4C68, 0x4C91, 0x4CB9, 0x4CE1, 0x4D09, 0x4D31, 0x4D59, 0x4D81, 0x4DA9, 0x4DD1, 0x4DF9, 0x4E21, 0x4E49, 0x4E71, 0x4E98, 0x4EC0, 0x4EE8, 0x4F0F, 0x4F37, 0x4F5E, 0x4F85, 0x4FAD, 0x4FD4, 0x4FFB, 0x5023, 0x504A, 0x5071, 0x5098, 0x50BF, 0x50E6, 0x510D, 0x5134, 0x515B, 0x5181, 0x51A8, 0x51CF, 0x51F5, 0x521C, 0x5243, 0x5269, 0x5290, 0x52B6, 0x52DC, 0x5303, 0x5329, 0x534F, 0x5375, 0x539B, 0x53C1, 0x53E7, 0x540D, 0x5433, 0x5459, 0x547F, 0x54A4, 0x54CA, 0x54F0, 0x5515, 0x553B, 0x5560, 0x5586, 0x55AB, 0x55D0, 0x55F6, 0x561B, 0x5640, 0x5665, 0x568A, 0x56AF, 0x56D4, 0x56F9, 0x571E, 0x5743, 0x5767, 0x578C, 0x57B1, 0x57D5, 0x57FA, 0x581E, 0x5843, 0x5867, 0x588C, 0x58B0, 0x58D4, 0x58F8, 0x591C, 0x5940, 0x5964, 0x5988, 0x59AC, 0x59D0, 0x59F4, 0x5A18, 0x5A3B, 0x5A5F, 0x5A82, 0x5AA6, 0x5AC9, 0x5AED, 0x5B10, 0x5B34, 0x5B57, 0x5B7A, 0x5B9D, 0x5BC0, 0x5BE3, 0x5C06, 0x5C29, 0x5C4C, 0x5C6F, 0x5C91, 0x5CB4, 0x5CD7, 0x5CF9, 0x5D1C, 0x5D3E, 0x5D61, 0x5D83, 0x5DA5, 0x5DC8, 0x5DEA, 0x5E0C, 0x5E2E, 0x5E50, 0x5E72, 0x5E94, 0x5EB6, 0x5ED7, 0x5EF9, 0x5F1B, 0x5F3C, 0x5F5E, 0x5F80, 0x5FA1, 0x5FC2, 0x5FE4, 0x6005, 0x6026, 0x6047, 0x6068, 0x6089, 0x60AA, 0x60CB, 0x60EC, 0x610D, 0x612E, 0x614E, 0x616F, 0x6190, 0x61B0, 0x61D1, 0x61F1, 0x6211, 0x6232, 0x6252, 0x6272, 0x6292, 0x62B2, 0x62D2, 0x62F2, 0x6312, 0x6332, 0x6351, 0x6371, 0x6391, 0x63B0, 0x63D0, 0x63EF, 0x640F, 0x642E, 0x644D, 0x646C, 0x648B, 0x64AB, 0x64CA, 0x64E9, 0x6507, 0x6526, 0x6545, 0x6564, 0x6582, 0x65A1, 0x65C0, 0x65DE, 0x65FC, 0x661B, 0x6639, 0x6657, 0x6675, 0x6693, 0x66B2, 0x66D0, 0x66ED, 0x670B, 0x6729, 0x6747, 0x6764, 0x6782, 0x67A0, 0x67BD, 0x67DA, 0x67F8, 0x6815, 0x6832, 0x6850, 0x686D, 0x688A, 0x68A7, 0x68C4, 0x68E0, 0x68FD, 0x691A, 0x6937, 0x6953, 0x6970, 0x698C, 0x69A9, 0x69C5, 0x69E1, 0x69FD, 0x6A1A, 0x6A36, 0x6A52, 0x6A6E, 0x6A89, 0x6AA5, 0x6AC1, 0x6ADD, 0x6AF8, 0x6B14, 0x6B30, 0x6B4B, 0x6B66, 0x6B82, 0x6B9D, 0x6BB8, 0x6BD3, 0x6BEE, 0x6C09, 0x6C24, 0x6C3F, 0x6C5A, 0x6C75, 0x6C8F, 0x6CAA, 0x6CC4, 0x6CDF, 0x6CF9, 0x6D14, 0x6D2E, 0x6D48, 0x6D62, 0x6D7C, 0x6D96, 0x6DB0, 0x6DCA, 0x6DE4, 0x6DFE, 0x6E17, 0x6E31, 0x6E4A, 0x6E64, 0x6E7D, 0x6E97, 0x6EB0, 0x6EC9, 0x6EE2, 0x6EFB, 0x6F14, 0x6F2D, 0x6F46, 0x6F5F, 0x6F78, 0x6F90, 0x6FA9, 0x6FC2, 0x6FDA, 0x6FF2, 0x700B, 0x7023, 0x703B, 0x7053, 0x706B, 0x7083, 0x709B, 0x70B3, 0x70CB, 0x70E3, 0x70FA, 0x7112, 0x712A, 0x7141, 0x7158, 0x7170, 0x7187, 0x719E, 0x71B5, 0x71CC, 0x71E3, 0x71FA, 0x7211, 0x7228, 0x723F, 0x7255, 0x726C, 0x7282, 0x7299, 0x72AF, 0x72C5, 0x72DC, 0x72F2, 0x7308, 0x731E, 0x7334, 0x734A, 0x735F, 0x7375, 0x738B, 0x73A0, 0x73B6, 0x73CB, 0x73E1, 0x73F6, 0x740B, 0x7421, 0x7436, 0x744B, 0x7460, 0x7475, 0x7489, 0x749E, 0x74B3, 0x74C7, 0x74DC, 0x74F0, 0x7505, 0x7519, 0x752D, 0x7542, 0x7556, 0x756A, 0x757E, 0x7592, 0x75A6, 0x75B9, 0x75CD, 0x75E1, 0x75F4, 0x7608, 0x761B, 0x762E, 0x7642, 0x7655, 0x7668, 0x767B, 0x768E, 0x76A1, 0x76B4, 0x76C7, 0x76D9, 0x76EC, 0x76FE, 0x7711, 0x7723, 0x7736, 0x7748, 0x775A, 0x776C, 0x777E, 0x7790, 0x77A2, 0x77B4, 0x77C6, 0x77D8, 0x77E9, 0x77FB, 0x780C, 0x781E, 0x782F, 0x7840, 0x7851, 0x7863, 0x7874, 0x7885, 0x7895, 0x78A6, 0x78B7, 0x78C8, 0x78D8, 0x78E9, 0x78F9, 0x790A, 0x791A, 0x792A, 0x793A, 0x794A, 0x795B, 0x796A, 0x797A, 0x798A, 0x799A, 0x79AA, 0x79B9, 0x79C9, 0x79D8, 0x79E7, 0x79F7, 0x7A06, 0x7A15, 0x7A24, 0x7A33, 0x7A42, 0x7A51, 0x7A60, 0x7A6E, 0x7A7D, 0x7A8C, 0x7A9A, 0x7AA8, 0x7AB7, 0x7AC5, 0x7AD3, 0x7AE1, 0x7AEF, 0x7AFD, 0x7B0B, 0x7B19, 0x7B27, 0x7B34, 0x7B42, 0x7B50, 0x7B5D, 0x7B6A, 0x7B78, 0x7B85, 0x7B92, 0x7B9F, 0x7BAC, 0x7BB9, 0x7BC6, 0x7BD3, 0x7BDF, 0x7BEC, 0x7BF9, 0x7C05, 0x7C11, 0x7C1E, 0x7C2A, 0x7C36, 0x7C42, 0x7C4E, 0x7C5A, 0x7C66, 0x7C72, 0x7C7E, 0x7C89, 0x7C95, 0x7CA0, 0x7CAC, 0x7CB7, 0x7CC2, 0x7CCE, 0x7CD9, 0x7CE4, 0x7CEF, 0x7CFA, 0x7D05, 0x7D0F, 0x7D1A, 0x7D25, 0x7D2F, 0x7D3A, 0x7D44, 0x7D4E, 0x7D58, 0x7D63, 0x7D6D, 0x7D77, 0x7D81, 0x7D8A, 0x7D94, 0x7D9E, 0x7DA7, 0x7DB1, 0x7DBA, 0x7DC4, 0x7DCD, 0x7DD6, 0x7DE0, 0x7DE9, 0x7DF2, 0x7DFB, 0x7E03, 0x7E0C, 0x7E15, 0x7E1E, 0x7E26, 0x7E2F, 0x7E37, 0x7E3F, 0x7E48, 0x7E50, 0x7E58, 0x7E60, 0x7E68, 0x7E70, 0x7E78, 0x7E7F, 0x7E87, 0x7E8E, 0x7E96, 0x7E9D, 0x7EA5, 0x7EAC, 0x7EB3, 0x7EBA, 0x7EC1, 0x7EC8, 0x7ECF, 0x7ED6, 0x7EDD, 0x7EE3, 0x7EEA, 0x7EF0, 0x7EF7, 0x7EFD, 0x7F03, 0x7F0A, 0x7F10, 0x7F16, 0x7F1C, 0x7F22, 0x7F27, 0x7F2D, 0x7F33, 0x7F38, 0x7F3E, 0x7F43, 0x7F49, 0x7F4E, 0x7F53, 0x7F58, 0x7F5D, 0x7F62, 0x7F67, 0x7F6C, 0x7F71, 0x7F75, 0x7F7A, 0x7F7E, 0x7F83, 0x7F87, 0x7F8B, 0x7F90, 0x7F94, 0x7F98, 0x7F9C, 0x7FA0, 0x7FA3, 0x7FA7, 0x7FAB, 0x7FAE, 0x7FB2, 0x7FB5, 0x7FB9, 0x7FBC, 0x7FBF, 0x7FC2, 0x7FC5, 0x7FC8, 0x7FCB, 0x7FCE, 0x7FD1, 0x7FD3, 0x7FD6, 0x7FD9, 0x7FDB, 0x7FDD, 0x7FE0, 0x7FE2, 0x7FE4, 0x7FE6, 0x7FE8, 0x7FEA, 0x7FEC, 0x7FED, 0x7FEF, 0x7FF1, 0x7FF2, 0x7FF4, 0x7FF5, 0x7FF6, 0x7FF7, 0x7FF8, 0x7FF9, 0x7FFA, 0x7FFB, 0x7FFC, 0x7FFD, 0x7FFE, 0x7FFE, 0x7FFF, 0x7FFF, 0x7FFF, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000 +# +# glabel D_800DDC3E +# .half 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070, 0x007A, 0x0084, 0x008F, 0x0099, 0x00A3, 0x00AD, 0x00B7, 0x00C2, 0x00CC, 0x00D6, 0x00E0, 0x00EA, 0x00F4, 0x00FF, 0x0109, 0x0113, 0x011D, 0x0127, 0x0131, 0x013C, 0x0146, 0x0150, 0x015A, 0x0164, 0x016F, 0x0179, 0x0183, 0x018D, 0x0197, 0x01A1, 0x01AC, 0x01B6, 0x01C0, 0x01CA, 0x01D4, 0x01DE, 0x01E9, 0x01F3, 0x01FD, 0x0207, 0x0211, 0x021B, 0x0226, 0x0230, 0x023A, 0x0244, 0x024E, 0x0258, 0x0262, 0x026D, 0x0277, 0x0281, 0x028B, 0x0295, 0x029F, 0x02A9, 0x02B4, 0x02BE, 0x02C8, 0x02D2, 0x02DC, 0x02E6, 0x02F0, 0x02FB, 0x0305, 0x030F, 0x0319, 0x0323, 0x032D, 0x0337, 0x0341, 0x034C, 0x0356, 0x0360, 0x036A, 0x0374, 0x037E, 0x0388, 0x0392, 0x039C, 0x03A7, 0x03B1, 0x03BB, 0x03C5, 0x03CF, 0x03D9, 0x03E3, 0x03ED, 0x03F7, 0x0401, 0x040C, 0x0416, 0x0420, 0x042A, 0x0434, 0x043E, 0x0448, 0x0452, 0x045C, 0x0466, 0x0470, 0x047A, 0x0484, 0x048E, 0x0499, 0x04A3, 0x04AD, 0x04B7, 0x04C1, 0x04CB, 0x04D5, 0x04DF, 0x04E9, 0x04F3, 0x04FD, 0x0507, 0x0511, 0x051B, 0x0525, 0x052F, 0x0539, 0x0543, 0x054D, 0x0557, 0x0561, 0x056B, 0x0575, 0x057F, 0x0589, 0x0593, 0x059D, 0x05A7, 0x05B1, 0x05BB, 0x05C5, 0x05CF, 0x05D9, 0x05E3, 0x05ED, 0x05F7, 0x0601, 0x060B, 0x0615, 0x061F, 0x0629, 0x0633, 0x063D, 0x0647, 0x0651, 0x065B, 0x0665, 0x066E, 0x0678, 0x0682, 0x068C, 0x0696, 0x06A0, 0x06AA, 0x06B4, 0x06BE, 0x06C8, 0x06D2, 0x06DC, 0x06E5, 0x06EF, 0x06F9, 0x0703, 0x070D, 0x0717, 0x0721, 0x072B, 0x0735, 0x073E, 0x0748, 0x0752, 0x075C, 0x0766, 0x0770, 0x077A, 0x0783, 0x078D, 0x0797, 0x07A1, 0x07AB, 0x07B5, 0x07BE, 0x07C8, 0x07D2, 0x07DC, 0x07E6, 0x07EF, 0x07F9, 0x0803, 0x080D, 0x0817, 0x0820, 0x082A, 0x0834, 0x083E, 0x0848, 0x0851, 0x085B, 0x0865, 0x086F, 0x0878, 0x0882, 0x088C, 0x0896, 0x089F, 0x08A9, 0x08B3, 0x08BD, 0x08C6, 0x08D0, 0x08DA, 0x08E3, 0x08ED, 0x08F7, 0x0901, 0x090A, 0x0914, 0x091E, 0x0927, 0x0931, 0x093B, 0x0944, 0x094E, 0x0958, 0x0961, 0x096B, 0x0975, 0x097E, 0x0988, 0x0992, 0x099B, 0x09A5, 0x09AE, 0x09B8, 0x09C2, 0x09CB, 0x09D5, 0x09DE, 0x09E8, 0x09F2, 0x09FB, 0x0A05, 0x0A0E, 0x0A18, 0x0A22, 0x0A2B, 0x0A35, 0x0A3E, 0x0A48, 0x0A51, 0x0A5B, 0x0A64, 0x0A6E, 0x0A77, 0x0A81, 0x0A8B, 0x0A94, 0x0A9E, 0x0AA7, 0x0AB1, 0x0ABA, 0x0AC4, 0x0ACD, 0x0AD7, 0x0AE0, 0x0AE9, 0x0AF3, 0x0AFC, 0x0B06, 0x0B0F, 0x0B19, 0x0B22, 0x0B2C, 0x0B35, 0x0B3F, 0x0B48, 0x0B51, 0x0B5B, 0x0B64, 0x0B6E, 0x0B77, 0x0B80, 0x0B8A, 0x0B93, 0x0B9D, 0x0BA6, 0x0BAF, 0x0BB9, 0x0BC2, 0x0BCB, 0x0BD5, 0x0BDE, 0x0BE7, 0x0BF1, 0x0BFA, 0x0C03, 0x0C0D, 0x0C16, 0x0C1F, 0x0C29, 0x0C32, 0x0C3B, 0x0C45, 0x0C4E, 0x0C57, 0x0C60, 0x0C6A, 0x0C73, 0x0C7C, 0x0C86, 0x0C8F, 0x0C98, 0x0CA1, 0x0CAB, 0x0CB4, 0x0CBD, 0x0CC6, 0x0CCF, 0x0CD9, 0x0CE2, 0x0CEB, 0x0CF4, 0x0CFD, 0x0D07, 0x0D10, 0x0D19, 0x0D22, 0x0D2B, 0x0D34, 0x0D3E, 0x0D47, 0x0D50, 0x0D59, 0x0D62, 0x0D6B, 0x0D74, 0x0D7D, 0x0D87, 0x0D90, 0x0D99, 0x0DA2, 0x0DAB, 0x0DB4, 0x0DBD, 0x0DC6, 0x0DCF, 0x0DD8, 0x0DE1, 0x0DEA, 0x0DF3, 0x0DFC, 0x0E05, 0x0E0F, 0x0E18, 0x0E21, 0x0E2A, 0x0E33, 0x0E3C, 0x0E45, 0x0E4E, 0x0E56, 0x0E5F, 0x0E68, 0x0E71, 0x0E7A, 0x0E83, 0x0E8C, 0x0E95, 0x0E9E, 0x0EA7, 0x0EB0, 0x0EB9, 0x0EC2, 0x0ECB, 0x0ED4, 0x0EDC, 0x0EE5, 0x0EEE, 0x0EF7, 0x0F00, 0x0F09, 0x0F12, 0x0F1B, 0x0F23, 0x0F2C, 0x0F35, 0x0F3E, 0x0F47, 0x0F50, 0x0F58, 0x0F61, 0x0F6A, 0x0F73, 0x0F7C, 0x0F84, 0x0F8D, 0x0F96, 0x0F9F, 0x0FA7, 0x0FB0, 0x0FB9, 0x0FC2, 0x0FCA, 0x0FD3, 0x0FDC, 0x0FE5, 0x0FED, 0x0FF6, 0x0FFF, 0x1007, 0x1010, 0x1019, 0x1021, 0x102A, 0x1033, 0x103B, 0x1044, 0x104D, 0x1055, 0x105E, 0x1067, 0x106F, 0x1078, 0x1080, 0x1089, 0x1092, 0x109A, 0x10A3, 0x10AB, 0x10B4, 0x10BC, 0x10C5, 0x10CE, 0x10D6, 0x10DF, 0x10E7, 0x10F0, 0x10F8, 0x1101, 0x1109, 0x1112, 0x111A, 0x1123, 0x112B, 0x1134, 0x113C, 0x1145, 0x114D, 0x1156, 0x115E, 0x1166, 0x116F, 0x1177, 0x1180, 0x1188, 0x1191, 0x1199, 0x11A1, 0x11AA, 0x11B2, 0x11BB, 0x11C3, 0x11CB, 0x11D4, 0x11DC, 0x11E4, 0x11ED, 0x11F5, 0x11FD, 0x1206, 0x120E, 0x1216, 0x121F, 0x1227, 0x122F, 0x1237, 0x1240, 0x1248, 0x1250, 0x1259, 0x1261, 0x1269, 0x1271, 0x127A, 0x1282, 0x128A, 0x1292, 0x129A, 0x12A3, 0x12AB, 0x12B3, 0x12BB, 0x12C3, 0x12CC, 0x12D4, 0x12DC, 0x12E4, 0x12EC, 0x12F4, 0x12FC, 0x1305, 0x130D, 0x1315, 0x131D, 0x1325, 0x132D, 0x1335, 0x133D, 0x1345, 0x134D, 0x1355, 0x135E, 0x1366, 0x136E, 0x1376, 0x137E, 0x1386, 0x138E, 0x1396, 0x139E, 0x13A6, 0x13AE, 0x13B6, 0x13BE, 0x13C6, 0x13CE, 0x13D6, 0x13DE, 0x13E6, 0x13ED, 0x13F5, 0x13FD, 0x1405, 0x140D, 0x1415, 0x141D, 0x1425, 0x142D, 0x1435, 0x143D, 0x1444, 0x144C, 0x1454, 0x145C, 0x1464, 0x146C, 0x1473, 0x147B, 0x1483, 0x148B, 0x1493, 0x149B, 0x14A2, 0x14AA, 0x14B2, 0x14BA, 0x14C1, 0x14C9, 0x14D1, 0x14D9, 0x14E0, 0x14E8, 0x14F0, 0x14F8, 0x14FF, 0x1507, 0x150F, 0x1516, 0x151E, 0x1526, 0x152D, 0x1535, 0x153D, 0x1544, 0x154C, 0x1554, 0x155B, 0x1563, 0x156B, 0x1572, 0x157A, 0x1581, 0x1589, 0x1591, 0x1598, 0x15A0, 0x15A7, 0x15AF, 0x15B7, 0x15BE, 0x15C6, 0x15CD, 0x15D5, 0x15DC, 0x15E4, 0x15EB, 0x15F3, 0x15FA, 0x1602, 0x1609, 0x1611, 0x1618, 0x1620, 0x1627, 0x162F, 0x1636, 0x163E, 0x1645, 0x164C, 0x1654, 0x165B, 0x1663, 0x166A, 0x1671, 0x1679, 0x1680, 0x1688, 0x168F, 0x1696, 0x169E, 0x16A5, 0x16AC, 0x16B4, 0x16BB, 0x16C2, 0x16CA, 0x16D1, 0x16D8, 0x16E0, 0x16E7, 0x16EE, 0x16F6, 0x16FD, 0x1704, 0x170B, 0x1713, 0x171A, 0x1721, 0x1728, 0x1730, 0x1737, 0x173E, 0x1745, 0x174C, 0x1754, 0x175B, 0x1762, 0x1769, 0x1770, 0x1778, 0x177F, 0x1786, 0x178D, 0x1794, 0x179B, 0x17A2, 0x17AA, 0x17B1, 0x17B8, 0x17BF, 0x17C6, 0x17CD, 0x17D4, 0x17DB, 0x17E2, 0x17E9, 0x17F0, 0x17F7, 0x17FE, 0x1806, 0x180D, 0x1814, 0x181B, 0x1822, 0x1829, 0x1830, 0x1837, 0x183E, 0x1845, 0x184C, 0x1853, 0x185A, 0x1860, 0x1867, 0x186E, 0x1875, 0x187C, 0x1883, 0x188A, 0x1891, 0x1898, 0x189F, 0x18A6, 0x18AD, 0x18B3, 0x18BA, 0x18C1, 0x18C8, 0x18CF, 0x18D6, 0x18DD, 0x18E3, 0x18EA, 0x18F1, 0x18F8, 0x18FF, 0x1906, 0x190C, 0x1913, 0x191A, 0x1921, 0x1928, 0x192E, 0x1935, 0x193C, 0x1943, 0x1949, 0x1950, 0x1957, 0x195D, 0x1964, 0x196B, 0x1972, 0x1978, 0x197F, 0x1986, 0x198C, 0x1993, 0x199A, 0x19A0, 0x19A7, 0x19AE, 0x19B4, 0x19BB, 0x19C2, 0x19C8, 0x19CF, 0x19D5, 0x19DC, 0x19E3, 0x19E9, 0x19F0, 0x19F6, 0x19FD, 0x1A04, 0x1A0A, 0x1A11, 0x1A17, 0x1A1E, 0x1A24, 0x1A2B, 0x1A31, 0x1A38, 0x1A3E, 0x1A45, 0x1A4B, 0x1A52, 0x1A58, 0x1A5F, 0x1A65, 0x1A6C, 0x1A72, 0x1A79, 0x1A7F, 0x1A86, 0x1A8C, 0x1A93, 0x1A99, 0x1A9F, 0x1AA6, 0x1AAC, 0x1AB3, 0x1AB9, 0x1AC0, 0x1AC6, 0x1ACC, 0x1AD3, 0x1AD9, 0x1ADF, 0x1AE6, 0x1AEC, 0x1AF2, 0x1AF9, 0x1AFF, 0x1B05, 0x1B0C, 0x1B12, 0x1B18, 0x1B1F, 0x1B25, 0x1B2B, 0x1B32, 0x1B38, 0x1B3E, 0x1B44, 0x1B4B, 0x1B51, 0x1B57, 0x1B5D, 0x1B64, 0x1B6A, 0x1B70, 0x1B76, 0x1B7D, 0x1B83, 0x1B89, 0x1B8F, 0x1B95, 0x1B9C, 0x1BA2, 0x1BA8, 0x1BAE, 0x1BB4, 0x1BBA, 0x1BC1, 0x1BC7, 0x1BCD, 0x1BD3, 0x1BD9, 0x1BDF, 0x1BE5, 0x1BEB, 0x1BF2, 0x1BF8, 0x1BFE, 0x1C04, 0x1C0A, 0x1C10, 0x1C16, 0x1C1C, 0x1C22, 0x1C28, 0x1C2E, 0x1C34, 0x1C3A, 0x1C40, 0x1C46, 0x1C4C, 0x1C52, 0x1C58, 0x1C5E, 0x1C64, 0x1C6A, 0x1C70, 0x1C76, 0x1C7C, 0x1C82, 0x1C88, 0x1C8E, 0x1C94, 0x1C9A, 0x1CA0, 0x1CA6, 0x1CAC, 0x1CB2, 0x1CB8, 0x1CBE, 0x1CC3, 0x1CC9, 0x1CCF, 0x1CD5, 0x1CDB, 0x1CE1, 0x1CE7, 0x1CED, 0x1CF3, 0x1CF8, 0x1CFE, 0x1D04, 0x1D0A, 0x1D10, 0x1D16, 0x1D1B, 0x1D21, 0x1D27, 0x1D2D, 0x1D33, 0x1D38, 0x1D3E, 0x1D44, 0x1D4A, 0x1D4F, 0x1D55, 0x1D5B, 0x1D61, 0x1D66, 0x1D6C, 0x1D72, 0x1D78, 0x1D7D, 0x1D83, 0x1D89, 0x1D8E, 0x1D94, 0x1D9A, 0x1DA0, 0x1DA5, 0x1DAB, 0x1DB1, 0x1DB6, 0x1DBC, 0x1DC2, 0x1DC7, 0x1DCD, 0x1DD3, 0x1DD8, 0x1DDE, 0x1DE3, 0x1DE9, 0x1DEF, 0x1DF4, 0x1DFA, 0x1DFF, 0x1E05, 0x1E0B, 0x1E10, 0x1E16, 0x1E1B, 0x1E21, 0x1E26, 0x1E2C, 0x1E32, 0x1E37, 0x1E3D, 0x1E42, 0x1E48, 0x1E4D, 0x1E53, 0x1E58, 0x1E5E, 0x1E63, 0x1E69, 0x1E6E, 0x1E74, 0x1E79, 0x1E7F, 0x1E84, 0x1E8A, 0x1E8F, 0x1E94, 0x1E9A, 0x1E9F, 0x1EA5, 0x1EAA, 0x1EB0, 0x1EB5, 0x1EBA, 0x1EC0, 0x1EC5, 0x1ECB, 0x1ED0, 0x1ED5, 0x1EDB, 0x1EE0, 0x1EE6, 0x1EEB, 0x1EF0, 0x1EF6, 0x1EFB, 0x1F00, 0x1F06, 0x1F0B, 0x1F10, 0x1F16, 0x1F1B, 0x1F20, 0x1F26, 0x1F2B, 0x1F30, 0x1F36, 0x1F3B, 0x1F40, 0x1F45, 0x1F4B, 0x1F50, 0x1F55, 0x1F5A, 0x1F60, 0x1F65, 0x1F6A, 0x1F6F, 0x1F75, 0x1F7A, 0x1F7F, 0x1F84, 0x1F8A, 0x1F8F, 0x1F94, 0x1F99, 0x1F9E, 0x1FA4, 0x1FA9, 0x1FAE, 0x1FB3, 0x1FB8, 0x1FBD, 0x1FC3, 0x1FC8, 0x1FCD, 0x1FD2, 0x1FD7, 0x1FDC, 0x1FE1, 0x1FE6, 0x1FEC, 0x1FF1, 0x1FF6, 0x1FFB, 0x2000 +###################################################### +############## unknown_072E50.c (.data) ############## glabel D_800DE440 .word 0x00000000 From 2af961e70c81bad4590663ea22da80fac418d7ba Mon Sep 17 00:00:00 2001 From: David Benepe Date: Tue, 25 May 2021 14:33:03 -0500 Subject: [PATCH 17/39] unknown_072E50.c data section --- data/dkr.data.s | 22 +++++++++++++--------- src/unknown_072E50.c | 15 +++++++++++++-- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 9ec7e964..3b8666ce 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -1299,17 +1299,21 @@ ############## unknown_072E50.c (.data) ############## -glabel D_800DE440 -.word 0x00000000 +# glabel D_800DE440 +# .word 0x00000000 +# +# glabel D_800DE444 +# .aligned_text "\0 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ!\"#'*+,-./:=?@" +# +# glabel D_800DE488 +# .word 0x00000000 +# +# glabel D_800DE48C +# .word 0x00000000 -glabel D_800DE444 -.aligned_text "\0 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ!\"#'*+,-./:=?@" +###################################################### -glabel D_800DE488 -.word 0x00000000 - -glabel D_800DE48C -.word 0x00000000 +############## unknown_078050.c (.data) ############## glabel D_800DE490 .word 0x00020000 diff --git a/src/unknown_072E50.c b/src/unknown_072E50.c index 662879aa..f6ad31ab 100644 --- a/src/unknown_072E50.c +++ b/src/unknown_072E50.c @@ -4,10 +4,21 @@ #include "types.h" #include "macros.h" -extern s32 D_800DE440; -extern s32 D_800DE48C; +/************ .data ************/ + +s32 D_800DE440 = 0; +char D_800DE444[68] = "\0 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ!\"#'*+,-./:=?@"; +s32 D_800DE488 = 0; // Currently unknown, might be a different type. +s32 D_800DE48C = 0; + +/*******************************/ + +/************ .bss ************/ + extern s32 D_80124010; +/*******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_072E50/func_80072250.s") GLOBAL_ASM("asm/non_matchings/unknown_072E50/func_80072298.s") GLOBAL_ASM("asm/non_matchings/unknown_072E50/func_80072348.s") From dbd8615973f0555e584439c5d904548d26460312 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Tue, 25 May 2021 15:02:19 -0500 Subject: [PATCH 18/39] unknown_078050.c data section --- data/dkr.data.s | 418 ++++++++++++++++++++++--------------------- src/unknown_078050.c | 139 +++++++++++++- 2 files changed, 341 insertions(+), 216 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 3b8666ce..c81cf010 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -1315,215 +1315,219 @@ ############## unknown_078050.c (.data) ############## -glabel D_800DE490 -.word 0x00020000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +# glabel D_800DE490 +# .word 0x00020000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DE4B0 +# .word 0x00000000 +# +# glabel D_800DE4B4 +# .word 0x00000000 +# +# glabel D_800DE4B8 +# .word 0x00000000 +# +# glabel D_800DE4BC +# .word 0x00010001 +# +# glabel D_800DE4C0 +# .word 0x00000040 +# +# glabel D_800DE4C4 +# .word 0x00000000 +# +# glabel D_800DE4C8 +# .word 0x00000000 +# +# glabel D_800DE4CC +# .word 0x00000000 +# +# glabel D_800DE4D0 +# .word 0x00000000 +# +# glabel D_800DE4D4 +# .word 0x00000000 +# +# glabel D_800DE4D8 +# .word 0x00000000 +# +# glabel D_800DE4DC +# .word 0x00000000 +# +# glabel D_800DE4E0 +# .word 0xB6000000 +# .word 0x001F3204 +# .word 0xBB000000 +# .word 0x00000000 +# .word 0xB7000000 +# .word 0x00000204 +# .word 0xBC000404 +# .word 0x00000002 +# .word 0xBC000C04 +# .word 0x00000002 +# .word 0xBC001404 +# .word 0x0000FFFE +# .word 0xBC001C04 +# .word 0x0000FFFE +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800DE520 +# .word 0xBA001402 +# .word 0x00000000 +# .word 0xBA001701 +# .word 0x00800000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xBA001102 +# .word 0x00000000 +# .word 0xBA001301 +# .word 0x00080000 +# .word 0xBA000C02 +# .word 0x00002000 +# .word 0xBA000903 +# .word 0x00000C00 +# .word 0xFCFFFFFF +# .word 0xFFFCF87C +# .word 0xBA000801 +# .word 0x00000000 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB900031D +# .word 0x0F0A4000 +# .word 0xBA000602 +# .word 0x00000000 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800DE598 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB6000000 +# .word 0x00010001 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xFCFFFFFF +# .word 0xFFFCF279 +# .word 0xEF000C0F +# .word 0x0F0A4000 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800DE5E0 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB6000000 +# .word 0x00010001 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xFCFFFFFF +# .word 0xFFFDF6FB +# .word 0xEF000C0F +# .word 0x0F0A4000 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800DE628 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB6000000 +# .word 0x00010001 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF000C0F +# .word 0x00504240 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800DE670 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB6000000 +# .word 0x00010001 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800DE6A8 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF002C0F +# .word 0x00552048 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF002C0F +# .word 0x0F0A4000 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF000C0F +# .word 0x00552048 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF000C0F +# .word 0x0F0A4000 +# +# glabel D_800DE6E8 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF002C0F +# .word 0x005041C8 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF002C0F +# .word 0x00504240 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF000C0F +# .word 0x005041C8 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF000C0F +# .word 0x00504240 +# +# .word 0, 0 # Padding -glabel D_800DE4B0 -.word 0x00000000 +###################################################### -glabel D_800DE4B4 -.word 0x00000000 - -glabel D_800DE4B8 -.word 0x00000000 - -glabel D_800DE4BC -.word 0x00010001 - -glabel D_800DE4C0 -.word 0x00000040 - -glabel D_800DE4C4 -.word 0x00000000 - -glabel D_800DE4C8 -.word 0x00000000 - -glabel D_800DE4CC -.word 0x00000000 - -glabel D_800DE4D0 -.word 0x00000000 - -glabel D_800DE4D4 -.word 0x00000000 - -glabel D_800DE4D8 -.word 0x00000000 - -glabel D_800DE4DC -.word 0x00000000 - -glabel D_800DE4E0 -.word 0xB6000000 -.word 0x001F3204 -.word 0xBB000000 -.word 0x00000000 -.word 0xB7000000 -.word 0x00000204 -.word 0xBC000404 -.word 0x00000002 -.word 0xBC000C04 -.word 0x00000002 -.word 0xBC001404 -.word 0x0000FFFE -.word 0xBC001C04 -.word 0x0000FFFE -.word 0xB8000000 -.word 0x00000000 - -glabel D_800DE520 -.word 0xBA001402 -.word 0x00000000 -.word 0xBA001701 -.word 0x00800000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xBA001102 -.word 0x00000000 -.word 0xBA001301 -.word 0x00080000 -.word 0xBA000C02 -.word 0x00002000 -.word 0xBA000903 -.word 0x00000C00 -.word 0xFCFFFFFF -.word 0xFFFCF87C -.word 0xBA000801 -.word 0x00000000 -.word 0xB9000002 -.word 0x00000000 -.word 0xB900031D -.word 0x0F0A4000 -.word 0xBA000602 -.word 0x00000000 -.word 0xE7000000 -.word 0x00000000 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800DE598 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xB9000002 -.word 0x00000000 -.word 0xB6000000 -.word 0x00010001 -.word 0xE7000000 -.word 0x00000000 -.word 0xFCFFFFFF -.word 0xFFFCF279 -.word 0xEF000C0F -.word 0x0F0A4000 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800DE5E0 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xB9000002 -.word 0x00000000 -.word 0xB6000000 -.word 0x00010001 -.word 0xE7000000 -.word 0x00000000 -.word 0xFCFFFFFF -.word 0xFFFDF6FB -.word 0xEF000C0F -.word 0x0F0A4000 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800DE628 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xB9000002 -.word 0x00000000 -.word 0xB6000000 -.word 0x00010001 -.word 0xE7000000 -.word 0x00000000 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF000C0F -.word 0x00504240 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800DE670 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xB9000002 -.word 0x00000000 -.word 0xB6000000 -.word 0x00010001 -.word 0xE7000000 -.word 0x00000000 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800DE6A8 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF002C0F -.word 0x00552048 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF002C0F -.word 0x0F0A4000 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF000C0F -.word 0x00552048 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF000C0F -.word 0x0F0A4000 - -glabel D_800DE6E8 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF002C0F -.word 0x005041C8 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF002C0F -.word 0x00504240 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF000C0F -.word 0x005041C8 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF000C0F -.word 0x00504240 -.word 0x00000000 -.word 0x00000000 +############## unknown_079F50.c (.data) ############## glabel D_800DE730 .word 0x00000000 diff --git a/src/unknown_078050.c b/src/unknown_078050.c index 9f97ae9f..7223f02f 100644 --- a/src/unknown_078050.c +++ b/src/unknown_078050.c @@ -5,17 +5,136 @@ #include "macros.h" #include "libultra_internal.h" -extern u8 D_800DE4B0; -extern u8 D_800DE4B4; -extern u8 D_800DE4B8; +/************ .data ************/ -extern u32 D_800DE4C0; -extern u32 D_800DE4C4; -extern u32 D_800DE4C8; +s16 D_800DE490[16] = { + 2, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0 +}; -extern u32 D_800DE4D0; +u8 D_800DE4B0 = 0; +u8 D_800DE4B4 = 0; +u8 D_800DE4B8 = 0; +s32 D_800DE4BC = 0x00010001; -extern u32 D_800DE4E0; +u32 D_800DE4C0 = 0x40; +u32 D_800DE4C4 = 0; +u32 D_800DE4C8 = 0; +s32 D_800DE4CC = 0; + +u32 D_800DE4D0 = 0; +s32 D_800DE4D4 = 0; +s32 D_800DE4D8 = 0; +s32 D_800DE4DC = 0; + +// Fast3D (F3DDKR) display list +u32 D_800DE4E0[] = { + 0xB6000000, 0x001F3204, + 0xBB000000, 0x00000000, + 0xB7000000, 0x00000204, + 0xBC000404, 0x00000002, + 0xBC000C04, 0x00000002, + 0xBC001404, 0x0000FFFE, + 0xBC001C04, 0x0000FFFE, + 0xB8000000, 0x00000000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE520[] = { + 0xBA001402, 0x00000000, + 0xBA001701, 0x00800000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xBA001102, 0x00000000, + 0xBA001301, 0x00080000, + 0xBA000C02, 0x00002000, + 0xBA000903, 0x00000C00, + 0xFCFFFFFF, 0xFFFCF87C, + 0xBA000801, 0x00000000, + 0xB9000002, 0x00000000, + 0xB900031D, 0x0F0A4000, + 0xBA000602, 0x00000000, + 0xE7000000, 0x00000000, + 0xB8000000, 0x00000000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE598[] = { + 0xE7000000, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xB9000002, 0x00000000, + 0xB6000000, 0x00010001, + 0xE7000000, 0x00000000, + 0xFCFFFFFF, 0xFFFCF279, + 0xEF000C0F, 0x0F0A4000, + 0xB8000000, 0x00000000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE5E0[] = { + 0xE7000000, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xB9000002, 0x00000000, + 0xB6000000, 0x00010001, + 0xE7000000, 0x00000000, + 0xFCFFFFFF, 0xFFFDF6FB, + 0xEF000C0F, 0x0F0A4000, + 0xB8000000, 0x00000000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE628[] = { + 0xE7000000, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xB9000002, 0x00000000, + 0xB6000000, 0x00010001, + 0xE7000000, 0x00000000, + 0xFC119623, 0xFF2FFFFF, + 0xEF000C0F, 0x00504240, + 0xB8000000, 0x00000000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE670[] = { + 0xE7000000, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xB9000002, 0x00000000, + 0xB6000000, 0x00010001, + 0xE7000000, 0x00000000, + 0xB8000000, 0x00000000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE6A8[] = { + 0xFC119623, 0xFF2FFFFF, + 0xEF002C0F, 0x00552048, + 0xFC119623, 0xFF2FFFFF, + 0xEF002C0F, 0x0F0A4000, + 0xFC119623, 0xFF2FFFFF, + 0xEF000C0F, 0x00552048, + 0xFC119623, 0xFF2FFFFF, + 0xEF000C0F, 0x0F0A4000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE6E8[] = { + 0xFC119623, 0xFF2FFFFF, + 0xEF002C0F, 0x005041C8, + 0xFC119623, 0xFF2FFFFF, + 0xEF002C0F, 0x00504240, + 0xFC119623, 0xFF2FFFFF, + 0xEF000C0F, 0x005041C8, + 0xFC119623, 0xFF2FFFFF, + 0xEF000C0F, 0x00504240 +}; + +/*******************************/ + +/************ .bss ************/ extern OSMesgQueue D_80125EA0; extern OSMesg D_80125EB8; @@ -26,6 +145,8 @@ extern OSMesg D_80125F10; extern u32 D_80126100; +/*******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_078050/setupOSTasks.s") GLOBAL_ASM("asm/non_matchings/unknown_078050/func_80077A54.s") @@ -50,7 +171,7 @@ typedef struct{ } struct_800780DC_a0; void func_800780DC(struct_800780DC_a0** arg0){ - u32* tmp2= &D_800DE4E0; + u32* tmp2= D_800DE4E0; struct_800780DC_a0* tmp = *arg0; From 0bf5ee718e54f4103c50f7a15a8676ed038ae136 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Tue, 25 May 2021 15:12:52 -0500 Subject: [PATCH 19/39] unknown_079F50.c data section --- data/dkr.data.s | 74 +++++++++++++++++++++++--------------------- src/unknown_079F50.c | 24 ++++++++++++-- 2 files changed, 61 insertions(+), 37 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index c81cf010..391d7293 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -1529,43 +1529,47 @@ ############## unknown_079F50.c (.data) ############## -glabel D_800DE730 -.word 0x00000000 -.word 0x00000000 +# glabel D_800DE730 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DE738 +# .word 0x00000000 +# .word 0x00000008 +# +# glabel D_800DE740 +# .word 0x00000000 +# +# glabel D_800DE744 +# .word 0x00000000 +# +# glabel D_800DE748 +# .word 0x00000000 +# +# glabel D_800DE74C +# .word 0x00000000 +# +# glabel D_800DE750 +# .word 0x00000000 +# +# glabel D_800DE754 +# .word 0x00000000 +# +# glabel D_800DE758 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DE760 +# .word 0x00000000 +# +# glabel D_800DE764 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 -glabel D_800DE738 -.word 0x00000000 -.word 0x00000008 +###################################################### -glabel D_800DE740 -.word 0x00000000 - -glabel D_800DE744 -.word 0x00000000 - -glabel D_800DE748 -.word 0x00000000 - -glabel D_800DE74C -.word 0x00000000 - -glabel D_800DE750 -.word 0x00000000 - -glabel D_800DE754 -.word 0x00000000 - -glabel D_800DE758 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DE760 -.word 0x00000000 - -glabel D_800DE764 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +############## unknown_07AF10.c (.data) ############## glabel D_800DE770 .word 0x00000000 diff --git a/src/unknown_079F50.c b/src/unknown_079F50.c index 9306726f..30663b6f 100644 --- a/src/unknown_079F50.c +++ b/src/unknown_079F50.c @@ -61,8 +61,28 @@ typedef struct{ u8 pad00[0x50]; }unk800E3900; -extern u32 D_800DE754; -extern u32 D_800DE758; + +/************ .data ************/ + +// Unsure about if this is an array or struct. +s32 D_800DE730[] = { 0, 0 }; +s32 D_800DE738[] = { 0, 8 }; + +s32 D_800DE740 = 0; // Currently unknown, might be a different type. +s32 D_800DE744 = 0; // Currently unknown, might be a different type. +s32 D_800DE748 = 0; // Currently unknown, might be a different type. +s32 D_800DE74C = 0; // Currently unknown, might be a different type. + +s32 D_800DE750 = 0; // Currently unknown, might be a different type. +u32 D_800DE754 = 0; +u32 D_800DE758 = 0; +s32 D_800DE75C = 0; // Currently unknown, might be a different type. + +s32 D_800DE760 = 0; // Currently unknown, might be a different type. +s32 D_800DE764 = 0; // Currently unknown, might be a different type. + +/*******************************/ + extern OSViMode D_800E3900[];//osViModeTable; extern s32 D_80126120; From 564b5c4db55ab9c65c5f83fcf820a18cfa0d1d39 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Tue, 25 May 2021 15:21:17 -0500 Subject: [PATCH 20/39] unknown_07AF10.c data section --- data/dkr.data.s | 50 ++++++++++++++++++++++++-------------------- src/unknown_07AF10.c | 22 ++++++++++++++++++- 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 391d7293..19626339 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -1571,31 +1571,35 @@ ############## unknown_07AF10.c (.data) ############## -glabel D_800DE770 -.word 0x00000000 -.word 0x00000000 -.word 0x02000000 +# glabel D_800DE770 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x02000000 +# +# glabel D_800DE77C +# .word 0x00000140 +# .word 0x000000F0 +# .word 0x00000140 +# .word 0x000000F0 +# .word 0x00000280 +# .word 0x000000F0 +# .word 0x00000280 +# .word 0x000000F0 +# .word 0x00000280 +# .word 0x000001E0 +# .word 0x00000280 +# .word 0x000001E0 +# .word 0x00000280 +# .word 0x000001E0 +# .word 0x00000280 +# .word 0x000001E0 +# +# glabel D_800DE7BC +# .word 0x00000000 -glabel D_800DE77C -.word 0x00000140 -.word 0x000000F0 -.word 0x00000140 -.word 0x000000F0 -.word 0x00000280 -.word 0x000000F0 -.word 0x00000280 -.word 0x000000F0 -.word 0x00000280 -.word 0x000001E0 -.word 0x00000280 -.word 0x000001E0 -.word 0x00000280 -.word 0x000001E0 -.word 0x00000280 -.word 0x000001E0 +###################################################### -glabel D_800DE7BC -.word 0x00000000 +############## unknown_07B870.c (.data) ############## glabel D_800DE7C0 .word 0xFF00FFFF diff --git a/src/unknown_07AF10.c b/src/unknown_07AF10.c index 67ffcfc9..bf69b37b 100644 --- a/src/unknown_07AF10.c +++ b/src/unknown_07AF10.c @@ -4,13 +4,33 @@ #include "types.h" #include "macros.h" +/************ .data ************/ + +s32 D_800DE770 = 0; +s32 D_800DE774 = 0; // Currently unknown, might be a different type. +s8 D_800DE778 = 2; + /* Size: 0x08 bytes */ typedef struct unk800DE77C { /* 0x00 */ s32 unk0; /* 0x04 */ s32 unk4; } unk800DE77C; -extern unk800DE77C D_800DE77C[8]; +extern unk800DE77C D_800DE77C[8] = { + { 0x140, 0xF0 }, + { 0x140, 0xF0 }, + { 0x280, 0xF0 }, + { 0x280, 0xF0 }, + { 0x280, 0x1E0 }, + { 0x280, 0x1E0 }, + { 0x280, 0x1E0 }, + { 0x280, 0x1E0 } +}; + +s32 D_800DE7BC = 0; // Currently unknown, might be a different type. + +/*******************************/ + extern s32 D_801262B0[2]; extern s32 D_801262B8[2]; extern s32 D_801262C8; From bf42b8a5f08ec03227527d0f5c605f6aabb13152 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Tue, 25 May 2021 15:59:01 -0500 Subject: [PATCH 21/39] unknown_07B870.c data section --- data/dkr.data.s | 1662 +++++++++++++++++++++--------------------- src/unknown_07B870.c | 467 +++++++++++- 2 files changed, 1299 insertions(+), 830 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 19626339..a8a0e75e 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -1601,837 +1601,841 @@ ############## unknown_07B870.c (.data) ############## -glabel D_800DE7C0 -.word 0xFF00FFFF +# glabel D_800DE7C0 +# .word 0xFF00FFFF +# +# glabel D_800DE7C4 +# .word 0x00000001 +# +# glabel D_800DE7C8 +# .word 0xFC1219FF +# .word 0xFF0FFE3F +# .word 0xEF182C0F +# .word 0x00104260 +# .word 0xFC1219FF +# .word 0xFF0FFE3F +# .word 0xEF182C0F +# .word 0x001041E8 +# .word 0xFC1219FF +# .word 0xFF0FFE3F +# .word 0xEF182C0F +# .word 0x00104A70 +# .word 0xFC1219FF +# .word 0xFF0FFE3F +# .word 0xEF182C0F +# .word 0x001049F8 +# .word 0xFC1218AC +# .word 0xF00FFE3F +# .word 0xEF182C0F +# .word 0x00104240 +# .word 0xFC1218AC +# .word 0xF00FFE3F +# .word 0xEF182C0F +# .word 0x001041C8 +# .word 0xFC1218AC +# .word 0xF00FFE3F +# .word 0xEF182C0F +# .word 0x00104A50 +# .word 0xFC1218AC +# .word 0xF00FFE3F +# .word 0xEF182C0F +# .word 0x001049D8 +# +# glabel D_800DE848 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF080C0F +# .word 0x00504340 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF080C0F +# .word 0x00504B50 +# +# glabel D_800DE868 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF080C0F +# .word 0x00504240 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF080C0F +# .word 0x005041C8 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF080C0F +# .word 0x00553078 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF080C0F +# .word 0x005045D8 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF080C0F +# .word 0x00504240 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF080C0F +# .word 0x005041C8 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF080C0F +# .word 0x00553078 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF080C0F +# .word 0x005045D8 +# +# glabel D_800DE8E8 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF082C0F +# .word 0x0F0A4000 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF082C0F +# .word 0x00552048 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF082C0F +# .word 0x00552230 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF082C0F +# .word 0x00552078 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF082C0F +# .word 0x00504240 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF082C0F +# .word 0x005041C8 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF082C0F +# .word 0x00504A50 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF082C0F +# .word 0x005049D8 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xCB024000 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC8112048 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC8112230 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC8112078 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC8104240 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC81041C8 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC8104A50 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC81049D8 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF082C0F +# .word 0x00504240 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF082C0F +# .word 0x005041C8 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF082C0F +# .word 0x00553078 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF082C0F +# .word 0x005045D8 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF082C0F +# .word 0x00504240 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF082C0F +# .word 0x005041C8 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF082C0F +# .word 0x00553078 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF082C0F +# .word 0x005045D8 +# .word 0xFC1196AC +# .word 0xF0FFFE38 +# .word 0xEF182C0F +# .word 0xC8104240 +# .word 0xFC1196AC +# .word 0xF0FFFE38 +# .word 0xEF182C0F +# .word 0xC81041C8 +# .word 0xFC1196AC +# .word 0xF0FFFE38 +# .word 0xEF182C0F +# .word 0xC8113078 +# .word 0xFC1196AC +# .word 0xF0FFFE38 +# .word 0xEF182C0F +# .word 0xC81045D8 +# .word 0xFC1196AC +# .word 0xF0FFFE38 +# .word 0xEF182C0F +# .word 0xC8104240 +# .word 0xFC1196AC +# .word 0xF0FFFE38 +# .word 0xEF182C0F +# .word 0xC81041C8 +# .word 0xFC1196AC +# .word 0xF0FFFE38 +# .word 0xEF182C0F +# .word 0xC81045F8 +# .word 0xFC1196AC +# .word 0xF0FFFE38 +# .word 0xEF182C0F +# .word 0xC81045D8 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x0F0A4000 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x00552048 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x00552230 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x00552078 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x00504240 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x005041C8 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x00504A50 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x005049D8 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xCB024000 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC8112048 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC8112230 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC8112078 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC8104240 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC81041C8 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC8104A50 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC81049D8 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x0F0A4000 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x00552048 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x00552230 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x00552078 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x00504240 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x005041C8 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x00553078 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x005045D8 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xCB024000 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC8112048 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC8112230 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC8112078 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC8104240 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC81041C8 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC8113078 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC81045D8 +# +# glabel D_800DECE8 +# .word 0xFC127E23 +# .word 0xFF2FF3FF +# .word 0xEF082C0F +# .word 0x00504240 +# .word 0xFC127E23 +# .word 0xFF2FF3FF +# .word 0xEF082C0F +# .word 0x005041C8 +# .word 0xFC127E23 +# .word 0xFF2FF3FF +# .word 0xEF082C0F +# .word 0x00553078 +# .word 0xFC127E23 +# .word 0xFF2FF3FF +# .word 0xEF082C0F +# .word 0x00505858 +# .word 0xFC127E23 +# .word 0xFF2FF3FF +# .word 0xEF082C0F +# .word 0x00504240 +# .word 0xFC127E23 +# .word 0xFF2FF3FF +# .word 0xEF082C0F +# .word 0x005041C8 +# .word 0xFC127E23 +# .word 0xFF2FF3FF +# .word 0xEF082C0F +# .word 0x00553078 +# .word 0xFC127E23 +# .word 0xFF2FF3FF +# .word 0xEF082C0F +# .word 0x00505858 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC8104240 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC81041C8 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC8113078 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC8105858 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC8104240 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC81041C8 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC8113078 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC8105858 +# +# glabel D_800DEDE8 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF082C0F +# .word 0x00552E10 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF082C0F +# .word 0x00552D58 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF082C0F +# .word 0x00504E50 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF082C0F +# .word 0x00504DD8 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC8112E10 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC8112D58 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC8104E50 +# .word 0xFC127EAC +# .word 0xF00FF23F +# .word 0xEF182C0F +# .word 0xC8104DD8 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x00552E10 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x00552D58 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x00504E50 +# .word 0xFC127E24 +# .word 0xFFFFF3F9 +# .word 0xEF08AC0F +# .word 0x00504DD8 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC8112E10 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC8112D58 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC8104E50 +# .word 0xFC127FFF +# .word 0xFFFFF238 +# .word 0xEF18AC0F +# .word 0xC8104DD8 +# +# glabel D_800DEEE8 +# .word 0xFC567E03 +# .word 0x4F0E79FF +# .word 0xEF180C0F +# .word 0x00104240 +# .word 0xFC567E03 +# .word 0x4F0E79FF +# .word 0xEF180C0F +# .word 0x001041C8 +# .word 0xFC567E03 +# .word 0x4F0E79FF +# .word 0xEF180C0F +# .word 0x00104A50 +# .word 0xFC567E03 +# .word 0x4F0E79FF +# .word 0xEF180C0F +# .word 0x001049D8 +# +# glabel D_800DEF28 +# .word 0xFC567EAC +# .word 0x44FE773B +# .word 0xEF080C0F +# .word 0x0F0A4000 +# .word 0xFC567EAC +# .word 0x44FE773B +# .word 0xEF080C0F +# .word 0x00552048 +# .word 0xFC567EAC +# .word 0x44FE773B +# .word 0xEF080C0F +# .word 0x00552230 +# .word 0xFC567EAC +# .word 0x44FE773B +# .word 0xEF080C0F +# .word 0x00552478 +# .word 0xFC567EAC +# .word 0x44FE773B +# .word 0xEF080C0F +# .word 0x00504240 +# .word 0xFC567EAC +# .word 0x44FE773B +# .word 0xEF080C0F +# .word 0x005041C8 +# .word 0xFC567EAC +# .word 0x44FE773B +# .word 0xEF080C0F +# .word 0x00504A50 +# .word 0xFC567EAC +# .word 0x44FE773B +# .word 0xEF080C0F +# .word 0x005049D8 +# .word 0xFC567E03 +# .word 0x4F0E77FF +# .word 0xEF180C0F +# .word 0xCB024000 +# .word 0xFC567E03 +# .word 0x4F0E77FF +# .word 0xEF180C0F +# .word 0xC8112048 +# .word 0xFC567E03 +# .word 0x4F0E77FF +# .word 0xEF180C0F +# .word 0xC8112230 +# .word 0xFC567E03 +# .word 0x4F0E77FF +# .word 0xEF180C0F +# .word 0xC8112078 +# .word 0xFC567E03 +# .word 0x4F0E77FF +# .word 0xEF180C0F +# .word 0xC8104240 +# .word 0xFC567E03 +# .word 0x4F0E77FF +# .word 0xEF180C0F +# .word 0xC81041C8 +# .word 0xFC567E03 +# .word 0x4F0E77FF +# .word 0xEF180C0F +# .word 0xC8104A50 +# .word 0xFC567E03 +# .word 0x4F0E77FF +# .word 0xEF180C0F +# .word 0xC81049D8 +# +# glabel D_800DF028 +# .word 0xFCFF97FF +# .word 0xFF2CFE7F +# .word 0xEF082C0F +# .word 0x00552E10 +# .word 0xFCFF97FF +# .word 0xFF2CFE7F +# .word 0xEF082C0F +# .word 0x00552D58 +# .word 0xFCFF97FF +# .word 0xFF2CFE7F +# .word 0xEF082C0F +# .word 0x00504E50 +# .word 0xFCFF97FF +# .word 0xFF2CFE7F +# .word 0xEF082C0F +# .word 0x00504DD8 +# .word 0xFCFF97FF +# .word 0xFF2CFE7F +# .word 0xEF08AC0F +# .word 0x00552E10 +# .word 0xFCFF97FF +# .word 0xFF2CFE7F +# .word 0xEF08AC0F +# .word 0x00552D58 +# .word 0xFCFF97FF +# .word 0xFF2CFE7F +# .word 0xEF08AC0F +# .word 0x00504E50 +# .word 0xFCFF97FF +# .word 0xFF2CFE7F +# .word 0xEF08AC0F +# .word 0x00504DD8 +# +# glabel D_800DF0A8 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF182C0F +# .word 0x03024000 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF182C0F +# .word 0x00112048 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF182C0F +# .word 0x00112230 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF182C0F +# .word 0x00112078 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF182C0F +# .word 0x00104240 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF182C0F +# .word 0x001041C8 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF182C0F +# .word 0x00104A50 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF182C0F +# .word 0x001049D8 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF18AC0F +# .word 0x03024000 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF18AC0F +# .word 0x00112048 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF18AC0F +# .word 0x00112230 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF18AC0F +# .word 0x00112078 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF18AC0F +# .word 0x00104240 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF18AC0F +# .word 0x001041C8 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF18AC0F +# .word 0x00113078 +# .word 0xFC1596A4 +# .word 0x30FDFE38 +# .word 0xEF18AC0F +# .word 0x001045D8 +# +# glabel D_800DF1A8 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x03024000 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x00112048 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x00112230 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x00112078 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x00104240 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x001041C8 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x00104A50 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x001049D8 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xCB024000 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xC8112048 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xC8112230 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xC8112078 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xC8104240 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xC81041C8 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xC8104A50 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xC81049D8 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x00104240 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x001041C8 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x00113078 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x00105858 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x00104240 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x001041C8 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x00113078 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0x00105858 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xC8104240 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xC81041C8 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xC8113078 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xC8105858 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xC8104240 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xC81041C8 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xC8113078 +# .word 0xFC21A604 +# .word 0x1FFC93F8 +# .word 0xEF182C0F +# .word 0xC8105858 +# +# glabel D_800DF3A8 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB6000000 +# .word 0x00010001 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800DF3D8 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB6000000 +# .word 0x00010000 +# .word 0xB7000000 +# .word 0x00000001 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800DF410 +# .word 0xFC309661 +# .word 0x552EFF7F +# .word 0xEF002C0F +# .word 0x00504B50 +# .word 0xFC309861 +# .word 0x5532FF7F +# .word 0xEF082C0F +# .word 0x00504B50 +# .word 0xFC3097FF +# .word 0x5FFEFE38 +# .word 0xEF182C0F +# .word 0x00504B50 -glabel D_800DE7C4 -.word 0x00000001 +###################################################### -glabel D_800DE7C8 -.word 0xFC1219FF -.word 0xFF0FFE3F -.word 0xEF182C0F -.word 0x00104260 -.word 0xFC1219FF -.word 0xFF0FFE3F -.word 0xEF182C0F -.word 0x001041E8 -.word 0xFC1219FF -.word 0xFF0FFE3F -.word 0xEF182C0F -.word 0x00104A70 -.word 0xFC1219FF -.word 0xFF0FFE3F -.word 0xEF182C0F -.word 0x001049F8 -.word 0xFC1218AC -.word 0xF00FFE3F -.word 0xEF182C0F -.word 0x00104240 -.word 0xFC1218AC -.word 0xF00FFE3F -.word 0xEF182C0F -.word 0x001041C8 -.word 0xFC1218AC -.word 0xF00FFE3F -.word 0xEF182C0F -.word 0x00104A50 -.word 0xFC1218AC -.word 0xF00FFE3F -.word 0xEF182C0F -.word 0x001049D8 - -glabel D_800DE848 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF080C0F -.word 0x00504340 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF080C0F -.word 0x00504B50 - -glabel D_800DE868 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF080C0F -.word 0x00504240 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF080C0F -.word 0x005041C8 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF080C0F -.word 0x00553078 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF080C0F -.word 0x005045D8 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF080C0F -.word 0x00504240 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF080C0F -.word 0x005041C8 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF080C0F -.word 0x00553078 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF080C0F -.word 0x005045D8 - -glabel D_800DE8E8 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF082C0F -.word 0x0F0A4000 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF082C0F -.word 0x00552048 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF082C0F -.word 0x00552230 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF082C0F -.word 0x00552078 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF082C0F -.word 0x00504240 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF082C0F -.word 0x005041C8 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF082C0F -.word 0x00504A50 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF082C0F -.word 0x005049D8 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xCB024000 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC8112048 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC8112230 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC8112078 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC8104240 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC81041C8 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC8104A50 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC81049D8 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF082C0F -.word 0x00504240 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF082C0F -.word 0x005041C8 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF082C0F -.word 0x00553078 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF082C0F -.word 0x005045D8 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF082C0F -.word 0x00504240 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF082C0F -.word 0x005041C8 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF082C0F -.word 0x00553078 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF082C0F -.word 0x005045D8 -.word 0xFC1196AC -.word 0xF0FFFE38 -.word 0xEF182C0F -.word 0xC8104240 -.word 0xFC1196AC -.word 0xF0FFFE38 -.word 0xEF182C0F -.word 0xC81041C8 -.word 0xFC1196AC -.word 0xF0FFFE38 -.word 0xEF182C0F -.word 0xC8113078 -.word 0xFC1196AC -.word 0xF0FFFE38 -.word 0xEF182C0F -.word 0xC81045D8 -.word 0xFC1196AC -.word 0xF0FFFE38 -.word 0xEF182C0F -.word 0xC8104240 -.word 0xFC1196AC -.word 0xF0FFFE38 -.word 0xEF182C0F -.word 0xC81041C8 -.word 0xFC1196AC -.word 0xF0FFFE38 -.word 0xEF182C0F -.word 0xC81045F8 -.word 0xFC1196AC -.word 0xF0FFFE38 -.word 0xEF182C0F -.word 0xC81045D8 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x0F0A4000 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x00552048 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x00552230 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x00552078 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x00504240 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x005041C8 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x00504A50 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x005049D8 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xCB024000 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC8112048 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC8112230 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC8112078 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC8104240 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC81041C8 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC8104A50 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC81049D8 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x0F0A4000 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x00552048 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x00552230 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x00552078 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x00504240 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x005041C8 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x00553078 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x005045D8 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xCB024000 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC8112048 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC8112230 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC8112078 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC8104240 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC81041C8 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC8113078 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC81045D8 - -glabel D_800DECE8 -.word 0xFC127E23 -.word 0xFF2FF3FF -.word 0xEF082C0F -.word 0x00504240 -.word 0xFC127E23 -.word 0xFF2FF3FF -.word 0xEF082C0F -.word 0x005041C8 -.word 0xFC127E23 -.word 0xFF2FF3FF -.word 0xEF082C0F -.word 0x00553078 -.word 0xFC127E23 -.word 0xFF2FF3FF -.word 0xEF082C0F -.word 0x00505858 -.word 0xFC127E23 -.word 0xFF2FF3FF -.word 0xEF082C0F -.word 0x00504240 -.word 0xFC127E23 -.word 0xFF2FF3FF -.word 0xEF082C0F -.word 0x005041C8 -.word 0xFC127E23 -.word 0xFF2FF3FF -.word 0xEF082C0F -.word 0x00553078 -.word 0xFC127E23 -.word 0xFF2FF3FF -.word 0xEF082C0F -.word 0x00505858 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC8104240 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC81041C8 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC8113078 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC8105858 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC8104240 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC81041C8 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC8113078 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC8105858 - -glabel D_800DEDE8 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF082C0F -.word 0x00552E10 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF082C0F -.word 0x00552D58 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF082C0F -.word 0x00504E50 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF082C0F -.word 0x00504DD8 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC8112E10 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC8112D58 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC8104E50 -.word 0xFC127EAC -.word 0xF00FF23F -.word 0xEF182C0F -.word 0xC8104DD8 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x00552E10 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x00552D58 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x00504E50 -.word 0xFC127E24 -.word 0xFFFFF3F9 -.word 0xEF08AC0F -.word 0x00504DD8 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC8112E10 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC8112D58 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC8104E50 -.word 0xFC127FFF -.word 0xFFFFF238 -.word 0xEF18AC0F -.word 0xC8104DD8 - -glabel D_800DEEE8 -.word 0xFC567E03 -.word 0x4F0E79FF -.word 0xEF180C0F -.word 0x00104240 -.word 0xFC567E03 -.word 0x4F0E79FF -.word 0xEF180C0F -.word 0x001041C8 -.word 0xFC567E03 -.word 0x4F0E79FF -.word 0xEF180C0F -.word 0x00104A50 -.word 0xFC567E03 -.word 0x4F0E79FF -.word 0xEF180C0F -.word 0x001049D8 - -glabel D_800DEF28 -.word 0xFC567EAC -.word 0x44FE773B -.word 0xEF080C0F -.word 0x0F0A4000 -.word 0xFC567EAC -.word 0x44FE773B -.word 0xEF080C0F -.word 0x00552048 -.word 0xFC567EAC -.word 0x44FE773B -.word 0xEF080C0F -.word 0x00552230 -.word 0xFC567EAC -.word 0x44FE773B -.word 0xEF080C0F -.word 0x00552478 -.word 0xFC567EAC -.word 0x44FE773B -.word 0xEF080C0F -.word 0x00504240 -.word 0xFC567EAC -.word 0x44FE773B -.word 0xEF080C0F -.word 0x005041C8 -.word 0xFC567EAC -.word 0x44FE773B -.word 0xEF080C0F -.word 0x00504A50 -.word 0xFC567EAC -.word 0x44FE773B -.word 0xEF080C0F -.word 0x005049D8 -.word 0xFC567E03 -.word 0x4F0E77FF -.word 0xEF180C0F -.word 0xCB024000 -.word 0xFC567E03 -.word 0x4F0E77FF -.word 0xEF180C0F -.word 0xC8112048 -.word 0xFC567E03 -.word 0x4F0E77FF -.word 0xEF180C0F -.word 0xC8112230 -.word 0xFC567E03 -.word 0x4F0E77FF -.word 0xEF180C0F -.word 0xC8112078 -.word 0xFC567E03 -.word 0x4F0E77FF -.word 0xEF180C0F -.word 0xC8104240 -.word 0xFC567E03 -.word 0x4F0E77FF -.word 0xEF180C0F -.word 0xC81041C8 -.word 0xFC567E03 -.word 0x4F0E77FF -.word 0xEF180C0F -.word 0xC8104A50 -.word 0xFC567E03 -.word 0x4F0E77FF -.word 0xEF180C0F -.word 0xC81049D8 - -glabel D_800DF028 -.word 0xFCFF97FF -.word 0xFF2CFE7F -.word 0xEF082C0F -.word 0x00552E10 -.word 0xFCFF97FF -.word 0xFF2CFE7F -.word 0xEF082C0F -.word 0x00552D58 -.word 0xFCFF97FF -.word 0xFF2CFE7F -.word 0xEF082C0F -.word 0x00504E50 -.word 0xFCFF97FF -.word 0xFF2CFE7F -.word 0xEF082C0F -.word 0x00504DD8 -.word 0xFCFF97FF -.word 0xFF2CFE7F -.word 0xEF08AC0F -.word 0x00552E10 -.word 0xFCFF97FF -.word 0xFF2CFE7F -.word 0xEF08AC0F -.word 0x00552D58 -.word 0xFCFF97FF -.word 0xFF2CFE7F -.word 0xEF08AC0F -.word 0x00504E50 -.word 0xFCFF97FF -.word 0xFF2CFE7F -.word 0xEF08AC0F -.word 0x00504DD8 - -glabel D_800DF0A8 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF182C0F -.word 0x03024000 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF182C0F -.word 0x00112048 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF182C0F -.word 0x00112230 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF182C0F -.word 0x00112078 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF182C0F -.word 0x00104240 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF182C0F -.word 0x001041C8 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF182C0F -.word 0x00104A50 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF182C0F -.word 0x001049D8 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF18AC0F -.word 0x03024000 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF18AC0F -.word 0x00112048 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF18AC0F -.word 0x00112230 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF18AC0F -.word 0x00112078 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF18AC0F -.word 0x00104240 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF18AC0F -.word 0x001041C8 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF18AC0F -.word 0x00113078 -.word 0xFC1596A4 -.word 0x30FDFE38 -.word 0xEF18AC0F -.word 0x001045D8 - -glabel D_800DF1A8 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x03024000 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x00112048 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x00112230 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x00112078 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x00104240 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x001041C8 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x00104A50 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x001049D8 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xCB024000 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xC8112048 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xC8112230 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xC8112078 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xC8104240 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xC81041C8 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xC8104A50 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xC81049D8 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x00104240 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x001041C8 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x00113078 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x00105858 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x00104240 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x001041C8 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x00113078 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0x00105858 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xC8104240 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xC81041C8 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xC8113078 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xC8105858 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xC8104240 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xC81041C8 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xC8113078 -.word 0xFC21A604 -.word 0x1FFC93F8 -.word 0xEF182C0F -.word 0xC8105858 - -glabel D_800DF3A8 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xB9000002 -.word 0x00000000 -.word 0xB6000000 -.word 0x00010001 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800DF3D8 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xB9000002 -.word 0x00000000 -.word 0xB6000000 -.word 0x00010000 -.word 0xB7000000 -.word 0x00000001 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800DF410 -.word 0xFC309661 -.word 0x552EFF7F -.word 0xEF002C0F -.word 0x00504B50 -.word 0xFC309861 -.word 0x5532FF7F -.word 0xEF082C0F -.word 0x00504B50 -.word 0xFC3097FF -.word 0x5FFEFE38 -.word 0xEF182C0F -.word 0x00504B50 +############## unknown_080240.c (.data) ############## glabel D_800DF440 .word 0xFC137E26 diff --git a/src/unknown_07B870.c b/src/unknown_07B870.c index 7787034e..1a9c1428 100644 --- a/src/unknown_07B870.c +++ b/src/unknown_07B870.c @@ -4,7 +4,470 @@ #include "types.h" #include "macros.h" -extern s32 D_800DE7C4; +/************ .data ************/ + +u32 D_800DE7C0 = 0xFF00FFFF; +s32 D_800DE7C4 = 1; + +// Fast3D (F3DDKR) display list +u32 D_800DE7C8[] = { + 0xFC1219FF, 0xFF0FFE3F, + 0xEF182C0F, 0x00104260, + 0xFC1219FF, 0xFF0FFE3F, + 0xEF182C0F, 0x001041E8, + 0xFC1219FF, 0xFF0FFE3F, + 0xEF182C0F, 0x00104A70, + 0xFC1219FF, 0xFF0FFE3F, + 0xEF182C0F, 0x001049F8, + 0xFC1218AC, 0xF00FFE3F, + 0xEF182C0F, 0x00104240, + 0xFC1218AC, 0xF00FFE3F, + 0xEF182C0F, 0x001041C8, + 0xFC1218AC, 0xF00FFE3F, + 0xEF182C0F, 0x00104A50, + 0xFC1218AC, 0xF00FFE3F, + 0xEF182C0F, 0x001049D8 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE848[] = { + 0xFC119623, 0xFF2FFFFF, + 0xEF080C0F, 0x00504340, + 0xFC119623, 0xFF2FFFFF, + 0xEF080C0F, 0x00504B50 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE868[] = { + 0xFC119623, 0xFF2FFFFF, + 0xEF080C0F, 0x00504240, + 0xFC119623, 0xFF2FFFFF, + 0xEF080C0F, 0x005041C8, + 0xFC119623, 0xFF2FFFFF, + 0xEF080C0F, 0x00553078, + 0xFC119623, 0xFF2FFFFF, + 0xEF080C0F, 0x005045D8, + 0xFC119623, 0xFF2FFFFF, + 0xEF080C0F, 0x00504240, + 0xFC119623, 0xFF2FFFFF, + 0xEF080C0F, 0x005041C8, + 0xFC119623, 0xFF2FFFFF, + 0xEF080C0F, 0x00553078, + 0xFC119623, 0xFF2FFFFF, + 0xEF080C0F, 0x005045D8 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE8E8[] = { + 0xFC127E24, 0xFFFFF3F9, + 0xEF082C0F, 0x0F0A4000, + 0xFC127E24, 0xFFFFF3F9, + 0xEF082C0F, 0x00552048, + 0xFC127E24, 0xFFFFF3F9, + 0xEF082C0F, 0x00552230, + 0xFC127E24, 0xFFFFF3F9, + 0xEF082C0F, 0x00552078, + 0xFC127E24, 0xFFFFF3F9, + 0xEF082C0F, 0x00504240, + 0xFC127E24, 0xFFFFF3F9, + 0xEF082C0F, 0x005041C8, + 0xFC127E24, 0xFFFFF3F9, + 0xEF082C0F, 0x00504A50, + 0xFC127E24, 0xFFFFF3F9, + 0xEF082C0F, 0x005049D8, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xCB024000, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC8112048, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC8112230, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC8112078, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC8104240, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC81041C8, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC8104A50, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC81049D8, + 0xFC119623, 0xFF2FFFFF, + 0xEF082C0F, 0x00504240, + 0xFC119623, 0xFF2FFFFF, + 0xEF082C0F, 0x005041C8, + 0xFC119623, 0xFF2FFFFF, + 0xEF082C0F, 0x00553078, + 0xFC119623, 0xFF2FFFFF, + 0xEF082C0F, 0x005045D8, + 0xFC119623, 0xFF2FFFFF, + 0xEF082C0F, 0x00504240, + 0xFC119623, 0xFF2FFFFF, + 0xEF082C0F, 0x005041C8, + 0xFC119623, 0xFF2FFFFF, + 0xEF082C0F, 0x00553078, + 0xFC119623, 0xFF2FFFFF, + 0xEF082C0F, 0x005045D8, + 0xFC1196AC, 0xF0FFFE38, + 0xEF182C0F, 0xC8104240, + 0xFC1196AC, 0xF0FFFE38, + 0xEF182C0F, 0xC81041C8, + 0xFC1196AC, 0xF0FFFE38, + 0xEF182C0F, 0xC8113078, + 0xFC1196AC, 0xF0FFFE38, + 0xEF182C0F, 0xC81045D8, + 0xFC1196AC, 0xF0FFFE38, + 0xEF182C0F, 0xC8104240, + 0xFC1196AC, 0xF0FFFE38, + 0xEF182C0F, 0xC81041C8, + 0xFC1196AC, 0xF0FFFE38, + 0xEF182C0F, 0xC81045F8, + 0xFC1196AC, 0xF0FFFE38, + 0xEF182C0F, 0xC81045D8, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x0F0A4000, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x00552048, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x00552230, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x00552078, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x00504240, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x005041C8, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x00504A50, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x005049D8, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xCB024000, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC8112048, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC8112230, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC8112078, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC8104240, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC81041C8, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC8104A50, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC81049D8, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x0F0A4000, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x00552048, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x00552230, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x00552078, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x00504240, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x005041C8, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x00553078, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x005045D8, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xCB024000, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC8112048, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC8112230, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC8112078, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC8104240, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC81041C8, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC8113078, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC81045D8 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DECE8[] = { + 0xFC127E23, 0xFF2FF3FF, + 0xEF082C0F, 0x00504240, + 0xFC127E23, 0xFF2FF3FF, + 0xEF082C0F, 0x005041C8, + 0xFC127E23, 0xFF2FF3FF, + 0xEF082C0F, 0x00553078, + 0xFC127E23, 0xFF2FF3FF, + 0xEF082C0F, 0x00505858, + 0xFC127E23, 0xFF2FF3FF, + 0xEF082C0F, 0x00504240, + 0xFC127E23, 0xFF2FF3FF, + 0xEF082C0F, 0x005041C8, + 0xFC127E23, 0xFF2FF3FF, + 0xEF082C0F, 0x00553078, + 0xFC127E23, 0xFF2FF3FF, + 0xEF082C0F, 0x00505858, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC8104240, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC81041C8, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC8113078, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC8105858, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC8104240, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC81041C8, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC8113078, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC8105858 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DEDE8[] = { + 0xFC127E24, 0xFFFFF3F9, + 0xEF082C0F, 0x00552E10, + 0xFC127E24, 0xFFFFF3F9, + 0xEF082C0F, 0x00552D58, + 0xFC127E24, 0xFFFFF3F9, + 0xEF082C0F, 0x00504E50, + 0xFC127E24, 0xFFFFF3F9, + 0xEF082C0F, 0x00504DD8, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC8112E10, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC8112D58, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC8104E50, + 0xFC127EAC, 0xF00FF23F, + 0xEF182C0F, 0xC8104DD8, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x00552E10, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x00552D58, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x00504E50, + 0xFC127E24, 0xFFFFF3F9, + 0xEF08AC0F, 0x00504DD8, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC8112E10, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC8112D58, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC8104E50, + 0xFC127FFF, 0xFFFFF238, + 0xEF18AC0F, 0xC8104DD8 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DEEE8[] = { + 0xFC567E03, 0x4F0E79FF, + 0xEF180C0F, 0x00104240, + 0xFC567E03, 0x4F0E79FF, + 0xEF180C0F, 0x001041C8, + 0xFC567E03, 0x4F0E79FF, + 0xEF180C0F, 0x00104A50, + 0xFC567E03, 0x4F0E79FF, + 0xEF180C0F, 0x001049D8 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DEF28[] = { + 0xFC567EAC, 0x44FE773B, + 0xEF080C0F, 0x0F0A4000, + 0xFC567EAC, 0x44FE773B, + 0xEF080C0F, 0x00552048, + 0xFC567EAC, 0x44FE773B, + 0xEF080C0F, 0x00552230, + 0xFC567EAC, 0x44FE773B, + 0xEF080C0F, 0x00552478, + 0xFC567EAC, 0x44FE773B, + 0xEF080C0F, 0x00504240, + 0xFC567EAC, 0x44FE773B, + 0xEF080C0F, 0x005041C8, + 0xFC567EAC, 0x44FE773B, + 0xEF080C0F, 0x00504A50, + 0xFC567EAC, 0x44FE773B, + 0xEF080C0F, 0x005049D8, + 0xFC567E03, 0x4F0E77FF, + 0xEF180C0F, 0xCB024000, + 0xFC567E03, 0x4F0E77FF, + 0xEF180C0F, 0xC8112048, + 0xFC567E03, 0x4F0E77FF, + 0xEF180C0F, 0xC8112230, + 0xFC567E03, 0x4F0E77FF, + 0xEF180C0F, 0xC8112078, + 0xFC567E03, 0x4F0E77FF, + 0xEF180C0F, 0xC8104240, + 0xFC567E03, 0x4F0E77FF, + 0xEF180C0F, 0xC81041C8, + 0xFC567E03, 0x4F0E77FF, + 0xEF180C0F, 0xC8104A50, + 0xFC567E03, 0x4F0E77FF, + 0xEF180C0F, 0xC81049D8 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DF028[] = { + 0xFCFF97FF, 0xFF2CFE7F, + 0xEF082C0F, 0x00552E10, + 0xFCFF97FF, 0xFF2CFE7F, + 0xEF082C0F, 0x00552D58, + 0xFCFF97FF, 0xFF2CFE7F, + 0xEF082C0F, 0x00504E50, + 0xFCFF97FF, 0xFF2CFE7F, + 0xEF082C0F, 0x00504DD8, + 0xFCFF97FF, 0xFF2CFE7F, + 0xEF08AC0F, 0x00552E10, + 0xFCFF97FF, 0xFF2CFE7F, + 0xEF08AC0F, 0x00552D58, + 0xFCFF97FF, 0xFF2CFE7F, + 0xEF08AC0F, 0x00504E50, + 0xFCFF97FF, 0xFF2CFE7F, + 0xEF08AC0F, 0x00504DD8 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DF0A8[] = { + 0xFC1596A4, 0x30FDFE38, + 0xEF182C0F, 0x03024000, + 0xFC1596A4, 0x30FDFE38, + 0xEF182C0F, 0x00112048, + 0xFC1596A4, 0x30FDFE38, + 0xEF182C0F, 0x00112230, + 0xFC1596A4, 0x30FDFE38, + 0xEF182C0F, 0x00112078, + 0xFC1596A4, 0x30FDFE38, + 0xEF182C0F, 0x00104240, + 0xFC1596A4, 0x30FDFE38, + 0xEF182C0F, 0x001041C8, + 0xFC1596A4, 0x30FDFE38, + 0xEF182C0F, 0x00104A50, + 0xFC1596A4, 0x30FDFE38, + 0xEF182C0F, 0x001049D8, + 0xFC1596A4, 0x30FDFE38, + 0xEF18AC0F, 0x03024000, + 0xFC1596A4, 0x30FDFE38, + 0xEF18AC0F, 0x00112048, + 0xFC1596A4, 0x30FDFE38, + 0xEF18AC0F, 0x00112230, + 0xFC1596A4, 0x30FDFE38, + 0xEF18AC0F, 0x00112078, + 0xFC1596A4, 0x30FDFE38, + 0xEF18AC0F, 0x00104240, + 0xFC1596A4, 0x30FDFE38, + 0xEF18AC0F, 0x001041C8, + 0xFC1596A4, 0x30FDFE38, + 0xEF18AC0F, 0x00113078, + 0xFC1596A4, 0x30FDFE38, + 0xEF18AC0F, 0x001045D8 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DF1A8[] = { + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x03024000, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x00112048, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x00112230, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x00112078, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x00104240, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x001041C8, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x00104A50, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x001049D8, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xCB024000, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xC8112048, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xC8112230, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xC8112078, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xC8104240, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xC81041C8, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xC8104A50, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xC81049D8, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x00104240, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x001041C8, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x00113078, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x00105858, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x00104240, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x001041C8, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x00113078, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0x00105858, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xC8104240, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xC81041C8, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xC8113078, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xC8105858, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xC8104240, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xC81041C8, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xC8113078, + 0xFC21A604, 0x1FFC93F8, + 0xEF182C0F, 0xC8105858 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DF3A8[] = { + 0xE7000000, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xB9000002, 0x00000000, + 0xB6000000, 0x00010001, + 0xB8000000, 0x00000000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DF3D8[] = { + 0xE7000000, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xB9000002, 0x00000000, + 0xB6000000, 0x00010000, + 0xB7000000, 0x00000001, + 0xB8000000, 0x00000000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DF410[] = { + 0xFC309661, 0x552EFF7F, + 0xEF002C0F, 0x00504B50, + 0xFC309861, 0x5532FF7F, + 0xEF082C0F, 0x00504B50, + 0xFC3097FF, 0x5FFEFE38, + 0xEF182C0F, 0x00504B50 +}; + +/*******************************/ + +/************ .bss ************/ + extern s32 D_80126338; extern s32 D_8012633C; extern s32 D_80126354; @@ -12,6 +475,8 @@ extern s32 D_80126378; extern s16 D_80126382; extern s16 D_80126384; +/*******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_07B870/func_8007AC70.s") void func_8007AE0C(s32 arg0) { From e1cd56fc7d25859feab600cec83ad868c3721a08 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Tue, 25 May 2021 16:03:01 -0500 Subject: [PATCH 22/39] unknown_080240.c data section --- data/dkr.data.s | 14 +++++++++----- src/unknown_080240.c | 12 ++++++++++-- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index a8a0e75e..1679e864 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -2437,11 +2437,15 @@ ############## unknown_080240.c (.data) ############## -glabel D_800DF440 -.word 0xFC137E26 -.word 0xFFFFF3F9 -.word 0xEF200CCF -.word 0x00000000 +# glabel D_800DF440 +# .word 0xFC137E26 +# .word 0xFFFFF3F9 +# .word 0xEF200CCF +# .word 0x00000000 + +###################################################### + +############## unknown_080500.c (.data) ############## glabel D_800DF450 .word 0x00000000 diff --git a/src/unknown_080240.c b/src/unknown_080240.c index 0667a159..c9262c71 100644 --- a/src/unknown_080240.c +++ b/src/unknown_080240.c @@ -5,6 +5,16 @@ #include "macros.h" #include "fast3d.h" +/************ .data ************/ + +// Fast3D (F3DDKR) display list +Gfx D_800DF440[] = { + 0xFC137E26, 0xFFFFF3F9, + 0xEF200CCF, 0x00000000 +}; + +/*******************************/ + extern s32 D_800E7C90; u32 func_8007F640(s32 arg0) { @@ -42,8 +52,6 @@ u32 func_8007F640(s32 arg0) { } } -extern Gfx D_800DF440; - void func_8007F714(Gfx **dlist, s32 arg1) { s32 y_pos; From 4284f37e5103e874d4df630ff44b1c01f572a306 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 26 May 2021 01:00:59 -0500 Subject: [PATCH 23/39] unknown_080500.c data section (first half, not done yet) --- data/dkr.data.s | 3425 +++++++++++++++++++++--------------------- src/unknown_080500.c | 805 ++++++++-- 2 files changed, 2386 insertions(+), 1844 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 1679e864..10c9d3d8 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -2447,1724 +2447,1707 @@ ############## unknown_080500.c (.data) ############## -glabel D_800DF450 -.word 0x00000000 - -glabel D_800DF454 -.word 0x3F800000 - -glabel D_800DF458 -.word 0x00000001 - -glabel D_800DF45C -.word 0x00000000 - -glabel D_800DF460 -.word 0x00000000 -.word 0x00000004 - -glabel D_800DF468 -.word 0x00000000 - -glabel D_800DF46C -.word 0x00000000 - -glabel D_800DF470 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DF478 -.word 0x00000000 - -glabel D_800DF47C -.word 0x00000000 - -glabel D_800DF480 -.word 0x00000000 - -glabel D_800DF484 -.word 0x00000000 - -glabel D_800DF488 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel gIsInAdventureTwo -.word 0x00000000 - -glabel D_800DF498 -.word 0x00000000 - -glabel D_800DF49C -.word 0x00000000 - -glabel D_800DF4A0 -.word 0x00000000 - -glabel D_800DF4A4 -.word 0xFF000000 - -glabel D_800DF4A8 -.word 0xFF000000 - -glabel D_800DF4AC -.word 0xFF000000 - -glabel D_800DF4B0 -.word 0x00000000 - -glabel D_800DF4B4 -.word 0x00000000 - -glabel D_800DF4B8 -.word 0x00000001 - -glabel D_800DF4BC -.word 0x00000001 - -glabel gIsInTwoPlayerAdventure -.word 0x00000000 - -glabel D_800DF4C4 -.word 0x00000000 - -glabel D_800DF4C8 -.word 0x00000000 - -glabel gSaveFileIndex -.word 0x00000000 -.word 0x00000000 - -glabel D_800DF4D4 -.word 0x00000000 - -glabel D_800DF4D8 -.word 0x01000000 - -glabel D_800DF4DC -.word 0x00000000 - -glabel D_800DF4E0 -.word 0x00000000 - -glabel D_800DF4E4 -.half 0x0000 - -.byte 0x00 - -glabel D_800DF4E7 -.byte 0x00 - -.word 0x00000000 - -glabel D_800DF4EC -.word 0x00000000 -.word 0x00004000 -.word 0x00008000 -.word 0x00001000 -.word 0x00002000 -.word 0x00008000 -.word 0x00000010 -.word 0x00000400 -.word 0x00000000 - -glabel D_800DF510 -.word 0x00000000 -.word 0x00000000 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0xC2000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000001 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0xC2000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000002 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0xC2000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000003 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0xC2000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000005 - -glabel D_800DF598 -.word 0x3E5C28F6 -.word 0x00000000 -.word 0x00000000 -.word 0xC3FA0000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000006 -.word 0x3E5C28F6 -.word 0x00000000 -.word 0x00000000 -.word 0xC3FA0000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000007 -.word 0x3E5C28F6 -.word 0x00000000 -.word 0x00000000 -.word 0xC3FA0000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000004 -.word 0x3E000000 -.word 0x00000000 -.word 0xC2200000 -.word 0xC3FA0000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000005B -.word 0x3F400000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000005C -.word 0x3F400000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000042 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000040 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000041 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000004C -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000004D -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000004E -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000004F -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000005D -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DF750 -.word 0x00000000 - -glabel D_800DF754 -.word 0x00000000 - -glabel D_800DF758 -.word 0x00000000 - -glabel D_800DF75C -.word 0x00000000 - -glabel D_800DF760 -.half 0x0000 -.byte 0x00 - -glabel D_800DF763 -.byte 0x7F - -glabel D_800DF764 -.word 0x000000FF -.word 0x00000001 - -glabel D_800DF76C -.word 0x00000000 -.word 0x000AFFFF - -glabel D_800DF774 -.word 0x00000000 -.word 0x0012FFFF - -glabel D_800DF77C -.word 0x80000000 -.word 0x00120000 -.word 0x00FFFFFF -.word 0x0012FFFF -.word 0x80FFFFFF -.word 0x00120000 - -glabel D_800DF794 -.word 0x00000004 - -glabel D_800DF798 -.word 0x00000000 - -glabel D_800DF79C -.word 0x00000000 - -glabel D_800DF7A0 -.word 0x00000000 - -glabel D_800DF7A4 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -# Build version text shown on the title screen? See: https://www.youtube.com/watch?v=OHSCLcA74ao -.aligned_text "VERSION XXXXXXXX" - -glabel D_800DF7C4 -.half 0x0050 - -glabel D_800DF7C6 -.half 0x0051 - -glabel D_800DF7C8 -.half 0x0052 - -glabel D_800DF7CA -.half 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A - -glabel D_800DF7DA -.half 0xFFFF - -glabel D_800DF7DC -.word 0x00000000 -.word 0xFFB5FFE0 - -glabel D_800DF7E4 -.word 0x00000000 -.word 0xFFC4FFE0 - -glabel D_800DF7EC -.word 0x00000000 -.word 0xFFD3FFE0 - -glabel D_800DF7F4 -.word 0x00000000 -.word 0xFFE2FFE0 -.word 0x00000000 -.word 0xFFF1FFE0 -.word 0x00000000 -.word 0x0000FFE0 -.word 0x00000000 -.word 0x000FFFE0 -.word 0x00000000 -.word 0x001EFFE0 -.word 0x00000000 -.word 0x002DFFE0 -.word 0x00000000 -.word 0x003CFFE0 -.word 0x00000000 -.word 0x004BFFE0 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DF83C -.word 0x800E7CB0 -.word 0x41600000 -.word 0x41680000 -.word 0x41840000 -.word 0x41880000 -.word 0xC2A00000 -.word 0x43500000 -.word 0x43200000 -.word 0x43500000 -.word 0x43C80000 -.word 0x43500000 -.word 0x800E7CB8 -.word 0x41980000 -.word 0x419C0000 -.word 0x41AC0000 -.word 0x41B00000 -.word 0xC2A00000 -.word 0x43500000 -.word 0x43200000 -.word 0x43500000 -.word 0x43C80000 -.word 0x43500000 -.word 0x800E7CC0 -.word 0x41C00000 -.word 0x41C40000 -.word 0x41D40000 -.word 0x41D80000 -.word 0xC2A00000 -.word 0x43500000 -.word 0x43200000 -.word 0x43500000 -.word 0x43C80000 -.word 0x43500000 -.word 0x800E7CC8 -.word 0x41E80000 -.word 0x41EC0000 -.word 0x41FC0000 -.word 0x42000000 -.word 0xC2A00000 -.word 0x43500000 -.word 0x43200000 -.word 0x43500000 -.word 0x43C80000 -.word 0x43500000 -.word 0x800E7CD0 -.word 0x420C0000 -.word 0x420E0000 -.word 0x42160000 -.word 0x42180000 -.word 0xC2A00000 -.word 0x43500000 -.word 0x43200000 -.word 0x43500000 -.word 0x43C80000 -.word 0x43500000 -.word 0x800E7CDC -.word 0x42200000 -.word 0x42220000 -.word 0x422A0000 -.word 0x422C0000 -.word 0xC2A00000 -.word 0x43500000 -.word 0x43200000 -.word 0x43500000 -.word 0x43C80000 -.word 0x43500000 -.word 0x800E7CE4 -.word 0x42340000 -.word 0x42360000 -.word 0x423E0000 -.word 0x42400000 -.word 0xC2A00000 -.word 0x43500000 -.word 0x43200000 -.word 0x43500000 -.word 0x43C80000 -.word 0x43500000 -.word 0x800E7CEC -.word 0x42480000 -.word 0x424A0000 -.word 0x42520000 -.word 0x42540000 -.word 0xC2A00000 -.word 0x43500000 -.word 0x43200000 -.word 0x43500000 -.word 0x43C80000 -.word 0x43500000 -.word 0x800E7CF4 -.word 0x42660000 -.word 0x42680000 -.word 0x42700000 -.word 0x42720000 -.word 0xC2A00000 -.word 0x43500000 -.word 0x43200000 -.word 0x43500000 -.word 0x43C80000 -.word 0x43500000 -.word 0x800E7CFC -.word 0x427E0000 -.word 0x42800000 -.word 0x42840000 -.word 0x42850000 -.word 0xC2A00000 -.word 0x43500000 -.word 0x43200000 -.word 0x43500000 -.word 0x43C80000 -.word 0x43500000 - -glabel D_800DF9F4 -.word 0x00000000 - -glabel D_800DF9F8 -.word 0xFFFF00FF -.word 0xCC00FF00 -.word 0xFF9900FF -.word 0xFFFF6600 -.word 0x00FFFF33 -.word 0x00000F78 - -glabel D_800DFA10 -.word 0x00000000 - -glabel D_800DFA14 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFA2C -.word 0x003D003C -.word 0x003F003E -.word 0x0044FFFF - -glabel D_800DFA38 -.word 0xFFFF0000 - -glabel D_800DFA3C -.word 0x00A00050 -.word 0xFFFFFF00 -.word 0xFF00000C - -glabel D_800DFA48 -.word 0x00000000 -.word 0x00A00068 -.word 0xFFFFFF00 -.word 0xFF00000C -.word 0x00000000 -.word 0x00A00090 -.word 0xFFFFFF00 -.word 0xFF00000C -.word 0x00000000 -.word 0x00A000C0 -.word 0xFFFFFF00 -.word 0xFF00000C -.word 0x00000000 -.word 0x00A10023 -.word 0x000000FF -.word 0x8002000C -.word 0x00000000 -.word 0x00A00020 -.word 0xFF80FF00 -.word 0xFF02000C -.word 0x00000000 -.word 0x00A000BC -.word 0xFFFFFF00 -.word 0xFF00000C -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFABC -.word 0x00000000 - -glabel D_800DFAC0 -.word 0x00000100 - -glabel D_800DFAC4 -.word 0x00000100 - -glabel D_800DFAC8 -.word 0x00000000 -.word 0x4040FFFF -.word 0xFF4040FF -.word 0xFFD040FF -.word 0x40FF40FF - -glabel D_800DFADC -.word 0x00000000 - -glabel D_800DFAE0 -.word 0x00000000 - -glabel D_800DFAE4 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFAFC -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFB14 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFB2C -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFB40 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFB5C -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFB74 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFB8C -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFBA4 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFBBC -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x800DFAE4 -.word 0x800DFAFC -.word 0x800DFB14 -.word 0x800DFB2C -.word 0x800DFB40 -.word 0x800DFB5C -.word 0x800DFB8C -.word 0x800DFBA4 -.word 0x800DFB74 -.word 0x800DFBBC -.word 0x00000000 -.word 0x0000FFFF - -glabel D_800DFC10 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFC20 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFC30 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFC40 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFC50 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFC60 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x40400404 -.word 0xFF000000 - -glabel D_800DFC78 -.word 0x00240025 -.word 0x00180019 -.word 0x001A001B -.word 0x001C001D -.word 0x003D003F -.word 0x003E003C -.word 0x00430044 -.word 0x00450046 -.word 0x00470048 -.word 0x0049004A -.word 0x004B0040 -.word 0x00410002 -.word 0xFFFF0000 - -glabel D_800DFCAC -.word 0x000B000C -.word 0x0002FFFF - -glabel D_800DFCB4 -.word 0x00A10020 -.word 0x00A10021 -.word 0x00A10020 -.word 0x000000FF -.word 0x80020C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A0001E -.word 0x00A0001E -.word 0x00A0001E -.word 0xFFFFFF00 -.word 0xFF020C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A00070 -.word 0x00A00070 -.word 0x00A00070 -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A00080 -.word 0x00A00080 -.word 0x00A00080 -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A000C0 -.word 0x00A000C0 -.word 0x00A000C0 -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A000D0 -.word 0x00A000D0 -.word 0x00A000D0 -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFD94 -.word 0x00000000 - -glabel gActiveMagicCodes -.word 0x00000000 - -glabel gUnlockedMagicCodes -.word 0x00000000 - -glabel D_800DFDA0 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DFDB4 -.word 0x0F640C07 -.word 0x09640A64 -.word 0x08640B64 -.word 0x0D640E64 -.word 0x05640464 - -glabel D_800DFDC8 -.word 0xFFFF0000 - -glabel D_800DFDCC -.word 0xFFFF0000 - -glabel D_800DFDD0 -.word 0xFFFF04FF -.word 0xFFFFFFFF -.word 0x010203FF -.word 0x0000FFFF -.word 0x05FF00FF -.word 0xFFFF0203 -.word 0xFFFF0009 -.word 0xFFFF06FF -.word 0x0100FFFF -.word 0x03FFFFFF -.word 0x0001FFFF -.word 0x07FF0201 -.word 0x00FFFFFF -.word 0xFFFF0005 -.word 0x00FFFFFF -.word 0xFFFFFFFF -.word 0x050607FF -.word 0x000301FF -.word 0xFFFF04FF -.word 0xFFFF0607 -.word 0xFFFF0002 -.word 0x02FFFFFF -.word 0x0504FFFF -.word 0x07FFFFFF -.word 0x000703FF -.word 0xFFFF0605 -.word 0x04FFFFFF -.word 0xFFFF0004 - -glabel D_800DFE40 -.word 0xFFFF04FF -.word 0xFFFFFFFF -.word 0x01080203 -.word 0x0000FFFF -.word 0x040500FF -.word 0xFFFF0802 -.word 0x03FF0009 -.word 0xFFFF0607 -.word 0x080100FF -.word 0x03FFFFFF -.word 0x0001FFFF -.word 0x07FF0208 -.word 0x0100FFFF -.word 0xFFFF0005 -.word 0x0001FFFF -.word 0xFFFFFFFF -.word 0x050607FF -.word 0x00030108 -.word 0xFFFF04FF -.word 0xFFFF0607 -.word 0xFFFF0002 -.word 0x0802FFFF -.word 0x0504FFFF -.word 0x07FFFFFF -.word 0x00070203 -.word 0xFFFF0605 -.word 0x04FFFFFF -.word 0xFFFF0004 -.word 0xFFFF0506 -.word 0x0100FFFF -.word 0x0203FFFF -.word 0x00060000 - -glabel D_800DFEC0 -.word 0xFFFF04FF -.word 0xFFFFFFFF -.word 0x010203FF -.word 0x0000FFFF -.word 0x050800FF -.word 0xFFFF0203 -.word 0xFFFF0009 -.word 0xFFFF0806 -.word 0x0100FFFF -.word 0x03FFFFFF -.word 0x0001FFFF -.word 0x06070201 -.word 0x00FFFFFF -.word 0xFFFF0005 -.word 0x00FFFFFF -.word 0xFFFFFFFF -.word 0x05080607 -.word 0x00030001 -.word 0xFFFF04FF -.word 0xFFFF0806 -.word 0x07FF0002 -.word 0x0203FFFF -.word 0x080504FF -.word 0x07FFFFFF -.word 0x000703FF -.word 0xFFFF0608 -.word 0x0504FFFF -.word 0xFFFF0004 -.word 0x0102FFFF -.word 0x0504FFFF -.word 0x0607FFFF -.word 0x00080000 - -glabel D_800DFF40 -.word 0xFFFF04FF -.word 0xFFFFFFFF -.word 0x01080203 -.word 0x0000FFFF -.word 0x05FF00FF -.word 0xFFFF0802 -.word 0x03FF0009 -.word 0xFFFF06FF -.word 0x080100FF -.word 0x03FFFFFF -.word 0x0001FFFF -.word 0x07FF0208 -.word 0x0100FFFF -.word 0xFFFF0005 -.word 0x00FFFFFF -.word 0xFFFFFFFF -.word 0x05090607 -.word 0x000301FF -.word 0xFFFF04FF -.word 0xFFFF0906 -.word 0x07FF0002 -.word 0x02FFFFFF -.word 0x090504FF -.word 0x07FFFFFF -.word 0x000703FF -.word 0xFFFF0609 -.word 0x0504FFFF -.word 0xFFFF0004 -.word 0xFFFF09FF -.word 0x0100FFFF -.word 0x0203FFFF -.word 0x000608FF -.word 0x05FF0504 -.word 0xFFFF0607 -.word 0xFFFF0008 -.word 0x00000000 - -glabel D_800DFFD0 -.word 0x00000000 - -glabel D_800DFFD4 -.word 0xFFFFFFFF - -glabel D_800DFFD8 -.word 0x00A10023 -.word 0x00A10023 -.word 0x00A10023 -.word 0x000000FF -.word 0x80020C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A00020 -.word 0x00A00020 - -glabel D_800E0000 -.byte 0x00 - -glabel D_800E0001 -.byte 0xA0 - -glabel D_800E0002 -.byte 0x00, 0x20 - -.word 0xFFFFFF00 -.word 0xFF020C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A00048 -.word 0x00A00044 -.word 0x00A00048 -.word 0xFFFFFF00 -.word 0xFF000C00 - -glabel D_800E002C -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0038 -.word 0x00A00056 -.word 0x00A00052 -.word 0x00A00056 -.word 0xFFFFFF00 -.word 0xFF000C00 - -glabel D_800E004C -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A00064 -.word 0x00A00060 -.word 0x00A00064 -.word 0xFFFFFF00 -.word 0xFF000C00 - -glabel D_800E006C -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A00072 -.word 0x00A0006E -.word 0x00A00072 -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A00080 -.word 0x00A0007C -.word 0x00A00080 -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A0008E -.word 0x00A0008A -.word 0x00A0008E -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A0009C -.word 0x00A00098 -.word 0x00A0009C -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A0009C -.word 0x00A000A6 -.word 0x00A0009C -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A000BA -.word 0x00A000B4 -.word 0x00A000BA -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0138 -.word 0x00A000C8 -.word 0x00A000C2 -.word 0x00A000C8 -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A000C8 -.word 0x00A000D0 -.word 0x00A000C8 -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0198 -.word 0x00A10023 -.word 0x00A10023 -.word 0x00A10023 -.word 0x000000FF -.word 0x80020C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A00020 -.word 0x00A00020 -.word 0x00A00020 -.word 0xFFFFFF00 -.word 0xFF020C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0xFFA00027 -.word 0xFFA00027 -.word 0xFFA00027 -.word 0xB0E0C0FF -.word 0xFF000007 -.word 0x00000000 -.word 0x00C0002C -.word 0x00040004 -.word 0x00A00068 -.word 0x00A00068 -.word 0x00A00068 -.word 0xFFFFFF00 -.word 0xFF020C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0xFFA0FFF7 -.word 0xFFA0FFF7 -.word 0xFFA0FFF7 -.word 0xB0E0C0FF -.word 0xFF000007 -.word 0x00000000 -.word 0x00C0002C - -glabel D_800E0234 -.byte 0x00 -glabel D_800E0235 -.byte 0x04 -glabel D_800E0236 -.byte 0x00 -glabel D_800E0237 -.byte 0x04 - -glabel D_800E0238 -.word 0x00A00098 -.word 0x00A00098 -.word 0x00A00098 -.word 0xFFFFFF00 -.word 0xFF020C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0278 -.word 0x00A10023 -.word 0x00A10023 -.word 0x00A10023 -.word 0x000000FF -.word 0x80020C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00A00020 -.word 0x00A00020 -.word 0x00A00020 -.word 0xFFFFFF00 -.word 0xFF020C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0xFF900037 -.word 0xFF900037 -.word 0xFF900037 -.word 0xB0E0C0FF -.word 0xFF000007 -.word 0x00000000 -.word 0x00E0002C -.word 0x00040004 -.word 0x00A00058 -.word 0x00A00058 -.word 0x00A00058 -.word 0xFFFFFF00 -.word 0xFF020C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0xFF900007 -.word 0xFF900007 -.word 0xFF900007 -.word 0xB0E0C0FF -.word 0xFF000007 -.word 0x00000000 -.word 0x00E0002C -.word 0x00040004 -.word 0x00A00088 -.word 0x00A00088 -.word 0x00A00088 -.word 0xFFFFFF00 -.word 0xFF020C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0xFF90FFD7 -.word 0xFF90FFD7 -.word 0xFF90FFD7 -.word 0xB0E0C0FF -.word 0xFF000007 -.word 0x00000000 -.word 0x00E0002C -.word 0x00040004 -.word 0x00A000B8 -.word 0x00A000B8 -.word 0x00A000B8 -.word 0xFFFFFF00 -.word 0xFF020C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0398 -.word 0x00000043 -.word 0x00400041 -.word 0x0042FFFF - -glabel D_800E03A4 -.word 0x0000000B -.word 0x000C000A -.word 0xFFFF0000 - -glabel D_800E03B0 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x004C0070 -.word 0x00F40070 -.word 0x004C00D0 -.word 0x00F400D0 - -glabel D_800E03CC -.word 0x00180051 -.word 0x00580040 -.word 0x00040004 -.word 0x4080FFC0 -.word 0x00740051 -.word 0x00580040 -.word 0x00040004 -.word 0x4080FFC0 -.word 0x00D00051 -.word 0x00580040 -.word 0x00040004 -.word 0x4080FFC0 - -glabel D_800E03FC -.word 0x002C0036 -.word 0x00150019 -.word 0x002C001B -.word 0x003F0019 -.word 0x002D0019 - -glabel D_800E0410 -.word 0x00000000 - -glabel D_800E0414 -.word 0x00000000 - -glabel D_800E0418 -.word 0x00000000 - -glabel D_800E041C -.word 0x00000000 -.word 0xFFF4FFF8 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E042C -.word 0x00000000 -.word 0xFFF8FFF4 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E043C -.word 0x00000000 -.word 0xFFF4FFF8 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E044C -.word 0x00000000 -.word 0xFFF8FFF4 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E045C -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000020 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0474 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000020 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E048C -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000020 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E04A4 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000020 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E04BC -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000020 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E04D4 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E04E4 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E04F4 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0504 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0514 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0524 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0534 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0544 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0554 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0564 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0574 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0584 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0594 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E05A4 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E05B4 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E05C4 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E05D4 -.word 0x00000000 -.word 0x0000FFD0 -.word 0x00000000 -.word 0x0000FFF0 -.word 0x00000000 -.word 0x00000010 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E05F4 -.word 0x00000000 -.word 0x0000FFD0 -.word 0x00000000 -.word 0x0000FFF0 -.word 0x00000000 -.word 0x00000010 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0614 -.word 0x00000000 -.word 0xFFF0FFF0 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0624 -.word 0x800E045C -.word 0x800E04D4 -.word 0x800E04E4 -.word 0x800E0474 -.word 0x800E04F4 -.word 0x800E0504 -.word 0x800E048C -.word 0x800E0514 -.word 0x800E0524 - -glabel D_800E0648 -.word 0x800E04BC -.word 0x800E0544 -.word 0x800E0564 -.word 0x800E04A4 -.word 0x800E0534 -.word 0x800E0554 - -glabel D_800E0660 -.word 0x800E0574 -.word 0x800E0584 -.word 0x800E0594 -.word 0x800E05A4 -.word 0x800E05B4 -.word 0x800E05C4 - -glabel D_800E0678 -.word 0x800E041C -.word 0x800E042C -.word 0x800E043C -.word 0x800E044C - -glabel D_800E0688 -.word 0x00440072 -.word 0x00440072 -.word 0x00CC0072 -.word 0x00210072 -.word 0x00880072 -.word 0x00EF0072 -.word 0x00210072 -.word 0x00660072 -.word 0x00AA0072 -.word 0x00EF0072 - -glabel D_800E06B0 -.word 0x00680021 -.word 0x00FB0027 -.word 0x008E00F5 -.word 0x0027006C -.word 0x00B000F5 - -glabel D_800E06C4 -.word 0x0000FFC2 -.word 0x00550000 -.word 0x0000003E -.word 0xFFAB0000 - -glabel D_800E06D4 -.word 0x0000FFB6 -.word 0x00550000 -.word 0x0000004A -.word 0xFFAB0000 - -glabel D_800E06E4 -.word 0x0050008C -.word 0x00A00040 -.word 0x00040004 -.word 0x00500014 -.word 0x003A0028 -.word 0x00500028 -.word 0x00660028 - -glabel D_800E0700 -.word 0x00500098 -.word 0x00A00028 -.word 0x00040004 -.word 0x0050000E - -glabel D_800E0710 -.word 0x000E000F -.word 0x00000010 -.word 0x00110020 -.word 0x00120013 -.word 0x00000014 -.word 0x00150020 -.word 0x00160017 -.half 0x0020 - -glabel D_800E072E -.half 0x0000 - -glabel D_800E0730 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0xFFFFFFFF -.word 0x0129011A -.word 0x01200115 -.word 0x0126011D -.word 0x01300121 -.word 0x01170154 -.word 0x01280119 -.word 0x012C0123 -.word 0xFFFF0122 -.word 0x011C0116 -.word 0x0127FFFF -.word 0xFFFFFFFF -.word 0x012D012E -.word 0x0153012B -.word 0x011B011F -.word 0x0124011E -.word 0x01180125 -.word 0x012F012A -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFF0000 - -glabel D_800E07C4 -.word 0x00050006 -.word 0x0007003D -.word 0x003C003F -.word 0x003E0008 -.word 0x0009000A -.word 0x000B000C -.word 0x000DFFFF - -glabel D_800E07E0 -.word 0x00040005 -.word 0x0006FFFF - -glabel D_800E07E8 -.word 0x00040000 -.word 0x00010002 -.word 0x00030018 -.word 0x0019001A -.word 0x001B001C -.word 0x001D0024 -.word 0x00250026 -.word 0x00270028 -.word 0x0029002A -.word 0x002B001E -.word 0x001F0020 -.word 0x00210022 -.word 0x0023002C -.word 0x002D002E -.word 0x002F0030 -.word 0x00310040 -.word 0x00410043 -.word 0x005EFFFF - -glabel D_800E0830 -.word 0x00070000 -.word 0x00010002 -.word 0x0003000B -.word 0x000CFFFF - -glabel D_800E0840 -.word 0x0000FFFF -.word 0x000101FF -.word 0xFF000200 -.word 0xFFFF0003 -.word 0x01FFFF00 -.word 0x0400FFFF -.word 0x000501FF -.word 0xFF000600 -.word 0xFFFF0006 -.word 0x02004000 -.word 0x0701FFFF -.word 0x00070340 -.word 0x80000800 -.word 0xFFFF0008 -.word 0x0280C020 -.word 0x0901FFFF -.word 0x000903C0 -.word 0xFF200A02 -.word 0xFFFF000B -.word 0x03FFFF00 -.word 0x0C02FFFF -.word 0x200D03FF -.word 0xFF200E02 -.word 0xFFFF000E -.word 0x04004000 -.word 0x0F03FFFF -.word 0x000F0540 -.word 0x80001002 -.word 0xFFFF2010 -.word 0x0480C000 -.word 0x1103FFFF -.word 0x201105C0 -.word 0xFF001204 -.word 0xFFFF0013 -.word 0x05FFFF00 -.word 0x1404FFFF -.word 0x001505FF -.word 0xFF001604 -.word 0xFFFF0016 -.word 0x06004000 -.word 0x1705FFFF -.word 0x00170740 -.word 0x80001804 -.word 0xFFFF0018 -.word 0x0680C020 -.word 0x1905FFFF -.word 0x001907C0 -.word 0xFF201A06 -.word 0xFFFF001B -.word 0x07FFFF00 -.word 0x1C06FFFF -.word 0x201D07FF -.word 0xFF201E06 -.word 0xFFFF001E -.word 0x08004000 -.word 0x1F07FFFF -.word 0x001F0940 -.word 0x80002006 -.word 0xFFFF2020 -.word 0x0880C020 -.word 0x2107FFFF -.word 0x202109C0 -.word 0xFF202208 -.word 0xFFFF0023 -.word 0x09FFFF00 -.word 0x2408FFFF -.word 0x202509FF -.word 0xFF202608 -.word 0xFFFF0027 -.word 0x09FFFF00 -.word 0x2808FFFF -.word 0x202909FF -.word 0xFF20FF00 -.word 0x00000000 - -glabel D_800E0968 -.word 0x00000000 - -glabel D_800E096C -.word 0x00000000 +# glabel D_800DF450 +# .word 0x00000000 +# +# glabel D_800DF454 +# .word 0x3F800000 +# +# glabel D_800DF458 +# .word 0x00000001 +# +# glabel D_800DF45C +# .word 0x00000000 +# +# glabel D_800DF460 +# .word 0x00000000 +# .word 0x00000004 +# +# glabel D_800DF468 +# .word 0x00000000 +# +# glabel D_800DF46C +# .word 0x00000000 +# +# glabel D_800DF470 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DF478 +# .word 0x00000000 +# +# glabel D_800DF47C +# .word 0x00000000 +# +# glabel D_800DF480 +# .word 0x00000000 +# +# glabel D_800DF484 +# .word 0x00000000 +# +# glabel D_800DF488 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel gIsInAdventureTwo +# .word 0x00000000 +# +# glabel D_800DF498 +# .word 0x00000000 +# +# glabel D_800DF49C +# .word 0x00000000 +# +# glabel D_800DF4A0 +# .word 0x00000000 +# +# glabel D_800DF4A4 +# .word 0xFF000000 +# +# glabel D_800DF4A8 +# .word 0xFF000000 +# +# glabel D_800DF4AC +# .word 0xFF000000 +# +# glabel D_800DF4B0 +# .word 0x00000000 +# +# glabel D_800DF4B4 +# .word 0x00000000 +# +# glabel D_800DF4B8 +# .word 0x00000001 +# +# glabel D_800DF4BC +# .word 0x00000001 +# +# glabel gIsInTwoPlayerAdventure +# .word 0x00000000 +# +# glabel D_800DF4C4 +# .word 0x00000000 +# +# glabel D_800DF4C8 +# .word 0x00000000 +# +# glabel gSaveFileIndex +# .word 0x00000000 +# +# .word 0x00000000 +# +# glabel D_800DF4D4 +# .word 0x00000000 +# +# glabel D_800DF4D8 +# .word 0x01000000 +# +# glabel D_800DF4DC +# .word 0x00000000 +# +# glabel D_800DF4E0 +# .word 0x00000000 +# +# glabel D_800DF4E4 +# .half 0x0000 +# +# .byte 0x00 +# +# glabel D_800DF4E7 +# .byte 0x00 +# +# .word 0x00000000 +# +# glabel D_800DF4EC +# .word 0x00000000 +# +# .word 0x00004000 +# .word 0x00008000 +# .word 0x00001000 +# .word 0x00002000 +# .word 0x00008000 +# .word 0x00000010 +# .word 0x00000400 +# .word 0x00000000 +# +# glabel D_800DF510 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xC2000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000001 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xC2000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000002 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xC2000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000003 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xC2000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000005 +# glabel D_800DF598 +# .word 0x3E5C28F6 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xC3FA0000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000006 +# .word 0x3E5C28F6 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xC3FA0000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000007 +# .word 0x3E5C28F6 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xC3FA0000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000004 +# .word 0x3E000000 +# .word 0x00000000 +# .word 0xC2200000 +# .word 0xC3FA0000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000005B +# .word 0x3F400000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000005C +# .word 0x3F400000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000042 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000040 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000041 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000004C +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000004D +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000004E +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000004F +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000005D +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DF750 +# .word 0x00000000 +# +# glabel D_800DF754 +# .word 0x00000000 +# +# glabel D_800DF758 +# .word 0x00000000 +# +# glabel D_800DF75C +# .word 0x00000000 +# +# glabel D_800DF760 +# .half 0x0000 +# .byte 0x00 +# +# glabel D_800DF763 +# .byte 0x7F +# +# glabel D_800DF764 +# .word 0x000000FF +# .word 0x00000001 +# +# glabel D_800DF76C +# .word 0x00000000 +# .word 0x000AFFFF +# +# glabel D_800DF774 +# .word 0x00000000 +# .word 0x0012FFFF +# +# glabel D_800DF77C +# .word 0x80000000 +# .word 0x00120000 +# .word 0x00FFFFFF +# .word 0x0012FFFF +# .word 0x80FFFFFF +# .word 0x00120000 +# +# glabel D_800DF794 +# .word 0x00000004 +# +# glabel D_800DF798 +# .word 0x00000000 +# +# glabel D_800DF79C +# .word 0x00000000 +# +# glabel D_800DF7A0 +# .word 0x00000000 +# +# glabel D_800DF7A4 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 + +# # Version text shown on the title screen? See 1:15 in https://www.youtube.com/watch?v=OHSCLcA74ao. +# .aligned_text "VERSION XXXXXXXX" + +# glabel D_800DF7C4 +# .half 0x0050 +# +# glabel D_800DF7C6 +# .half 0x0051 +# +# glabel D_800DF7C8 +# .half 0x0052 +# +# glabel D_800DF7CA +# .half 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A +# +# glabel D_800DF7DA +# .half 0xFFFF +# +# glabel D_800DF7DC +# .word 0x00000000 +# .word 0xFFB5FFE0 +# glabel D_800DF7E4 +# .word 0x00000000 +# .word 0xFFC4FFE0 +# glabel D_800DF7EC +# .word 0x00000000 +# .word 0xFFD3FFE0 +# glabel D_800DF7F4 +# .word 0x00000000 +# .word 0xFFE2FFE0 +# .word 0x00000000 +# .word 0xFFF1FFE0 +# .word 0x00000000 +# .word 0x0000FFE0 +# .word 0x00000000 +# .word 0x000FFFE0 +# .word 0x00000000 +# .word 0x001EFFE0 +# .word 0x00000000 +# .word 0x002DFFE0 +# .word 0x00000000 +# .word 0x003CFFE0 +# .word 0x00000000 +# .word 0x004BFFE0 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DF83C +# .word 0x800E7CB0 +# .word 0x41600000 +# .word 0x41680000 +# .word 0x41840000 +# .word 0x41880000 +# .word 0xC2A00000 +# .word 0x43500000 +# .word 0x43200000 +# .word 0x43500000 +# .word 0x43C80000 +# .word 0x43500000 +# .word 0x800E7CB8 +# .word 0x41980000 +# .word 0x419C0000 +# .word 0x41AC0000 +# .word 0x41B00000 +# .word 0xC2A00000 +# .word 0x43500000 +# .word 0x43200000 +# .word 0x43500000 +# .word 0x43C80000 +# .word 0x43500000 +# .word 0x800E7CC0 +# .word 0x41C00000 +# .word 0x41C40000 +# .word 0x41D40000 +# .word 0x41D80000 +# .word 0xC2A00000 +# .word 0x43500000 +# .word 0x43200000 +# .word 0x43500000 +# .word 0x43C80000 +# .word 0x43500000 +# .word 0x800E7CC8 +# .word 0x41E80000 +# .word 0x41EC0000 +# .word 0x41FC0000 +# .word 0x42000000 +# .word 0xC2A00000 +# .word 0x43500000 +# .word 0x43200000 +# .word 0x43500000 +# .word 0x43C80000 +# .word 0x43500000 +# .word 0x800E7CD0 +# .word 0x420C0000 +# .word 0x420E0000 +# .word 0x42160000 +# .word 0x42180000 +# .word 0xC2A00000 +# .word 0x43500000 +# .word 0x43200000 +# .word 0x43500000 +# .word 0x43C80000 +# .word 0x43500000 +# .word 0x800E7CDC +# .word 0x42200000 +# .word 0x42220000 +# .word 0x422A0000 +# .word 0x422C0000 +# .word 0xC2A00000 +# .word 0x43500000 +# .word 0x43200000 +# .word 0x43500000 +# .word 0x43C80000 +# .word 0x43500000 +# .word 0x800E7CE4 +# .word 0x42340000 +# .word 0x42360000 +# .word 0x423E0000 +# .word 0x42400000 +# .word 0xC2A00000 +# .word 0x43500000 +# .word 0x43200000 +# .word 0x43500000 +# .word 0x43C80000 +# .word 0x43500000 +# .word 0x800E7CEC +# .word 0x42480000 +# .word 0x424A0000 +# .word 0x42520000 +# .word 0x42540000 +# .word 0xC2A00000 +# .word 0x43500000 +# .word 0x43200000 +# .word 0x43500000 +# .word 0x43C80000 +# .word 0x43500000 +# .word 0x800E7CF4 +# .word 0x42660000 +# .word 0x42680000 +# .word 0x42700000 +# .word 0x42720000 +# .word 0xC2A00000 +# .word 0x43500000 +# .word 0x43200000 +# .word 0x43500000 +# .word 0x43C80000 +# .word 0x43500000 +# .word 0x800E7CFC +# .word 0x427E0000 +# .word 0x42800000 +# .word 0x42840000 +# .word 0x42850000 +# .word 0xC2A00000 +# .word 0x43500000 +# .word 0x43200000 +# .word 0x43500000 +# .word 0x43C80000 +# .word 0x43500000 +# +# glabel D_800DF9F4 +# .word 0x00000000 +# +# glabel D_800DF9F8 +# .word 0xFFFF00FF +# .word 0xCC00FF00 +# .word 0xFF9900FF +# .word 0xFFFF6600 +# .word 0x00FFFF33 +# .word 0x00000F78 +# +# glabel D_800DFA10 +# .word 0x00000000 +# +# glabel D_800DFA14 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFA2C +# .word 0x003D003C +# .word 0x003F003E +# .word 0x0044FFFF +# +# glabel D_800DFA38 +# .word 0xFFFF0000 + +# glabel D_800DFA3C +# .word 0x00A00050 +# .word 0xFFFFFF00 +# .word 0xFF00000C +# glabel D_800DFA48 +# .word 0x00000000 +# .word 0x00A00068 +# .word 0xFFFFFF00 +# .word 0xFF00000C +# .word 0x00000000 +# .word 0x00A00090 +# .word 0xFFFFFF00 +# .word 0xFF00000C +# .word 0x00000000 +# .word 0x00A000C0 +# .word 0xFFFFFF00 +# .word 0xFF00000C +# .word 0x00000000 +# .word 0x00A10023 +# .word 0x000000FF +# .word 0x8002000C +# .word 0x00000000 +# .word 0x00A00020 +# .word 0xFF80FF00 +# .word 0xFF02000C +# .word 0x00000000 +# .word 0x00A000BC +# .word 0xFFFFFF00 +# .word 0xFF00000C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 + +# glabel D_800DFABC +# .word 0x00000000 +# +# glabel D_800DFAC0 +# .word 0x00000100 +# +# glabel D_800DFAC4 +# .word 0x00000100 +# +# glabel D_800DFAC8 +# .word 0x00000000 +# .word 0x4040FFFF +# .word 0xFF4040FF +# .word 0xFFD040FF +# .word 0x40FF40FF +# +# glabel D_800DFADC +# .word 0x00000000 +# +# glabel D_800DFAE0 +# .word 0x00000000 +# +# glabel D_800DFAE4 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFAFC +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFB14 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFB2C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFB40 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFB5C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFB74 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFB8C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFBA4 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFBBC +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x800DFAE4 +# .word 0x800DFAFC +# .word 0x800DFB14 +# .word 0x800DFB2C +# .word 0x800DFB40 +# .word 0x800DFB5C +# .word 0x800DFB8C +# .word 0x800DFBA4 +# .word 0x800DFB74 +# .word 0x800DFBBC +# .word 0x00000000 +# .word 0x0000FFFF +# +# glabel D_800DFC10 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFC20 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFC30 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFC40 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFC50 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFC60 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x40400404 +# .word 0xFF000000 +# +# glabel D_800DFC78 +# .word 0x00240025 +# .word 0x00180019 +# .word 0x001A001B +# .word 0x001C001D +# .word 0x003D003F +# .word 0x003E003C +# .word 0x00430044 +# .word 0x00450046 +# .word 0x00470048 +# .word 0x0049004A +# .word 0x004B0040 +# .word 0x00410002 +# .word 0xFFFF0000 +# +# glabel D_800DFCAC +# .word 0x000B000C +# .word 0x0002FFFF +# +# glabel D_800DFCB4 +# .word 0x00A10020 +# .word 0x00A10021 +# .word 0x00A10020 +# .word 0x000000FF +# .word 0x80020C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A0001E +# .word 0x00A0001E +# .word 0x00A0001E +# .word 0xFFFFFF00 +# .word 0xFF020C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A00070 +# .word 0x00A00070 +# .word 0x00A00070 +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A00080 +# .word 0x00A00080 +# .word 0x00A00080 +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A000C0 +# .word 0x00A000C0 +# .word 0x00A000C0 +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A000D0 +# .word 0x00A000D0 +# .word 0x00A000D0 +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFD94 +# .word 0x00000000 +# +# glabel gActiveMagicCodes +# .word 0x00000000 +# +# glabel gUnlockedMagicCodes +# .word 0x00000000 +# +# glabel D_800DFDA0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DFDB4 +# .word 0x0F640C07 +# .word 0x09640A64 +# .word 0x08640B64 +# .word 0x0D640E64 +# .word 0x05640464 +# +# glabel D_800DFDC8 +# .word 0xFFFF0000 +# +# glabel D_800DFDCC +# .word 0xFFFF0000 +# +# glabel D_800DFDD0 +# .word 0xFFFF04FF +# .word 0xFFFFFFFF +# .word 0x010203FF +# .word 0x0000FFFF +# .word 0x05FF00FF +# .word 0xFFFF0203 +# .word 0xFFFF0009 +# .word 0xFFFF06FF +# .word 0x0100FFFF +# .word 0x03FFFFFF +# .word 0x0001FFFF +# .word 0x07FF0201 +# .word 0x00FFFFFF +# .word 0xFFFF0005 +# .word 0x00FFFFFF +# .word 0xFFFFFFFF +# .word 0x050607FF +# .word 0x000301FF +# .word 0xFFFF04FF +# .word 0xFFFF0607 +# .word 0xFFFF0002 +# .word 0x02FFFFFF +# .word 0x0504FFFF +# .word 0x07FFFFFF +# .word 0x000703FF +# .word 0xFFFF0605 +# .word 0x04FFFFFF +# .word 0xFFFF0004 +# +# glabel D_800DFE40 +# .word 0xFFFF04FF +# .word 0xFFFFFFFF +# .word 0x01080203 +# .word 0x0000FFFF +# .word 0x040500FF +# .word 0xFFFF0802 +# .word 0x03FF0009 +# .word 0xFFFF0607 +# .word 0x080100FF +# .word 0x03FFFFFF +# .word 0x0001FFFF +# .word 0x07FF0208 +# .word 0x0100FFFF +# .word 0xFFFF0005 +# .word 0x0001FFFF +# .word 0xFFFFFFFF +# .word 0x050607FF +# .word 0x00030108 +# .word 0xFFFF04FF +# .word 0xFFFF0607 +# .word 0xFFFF0002 +# .word 0x0802FFFF +# .word 0x0504FFFF +# .word 0x07FFFFFF +# .word 0x00070203 +# .word 0xFFFF0605 +# .word 0x04FFFFFF +# .word 0xFFFF0004 +# .word 0xFFFF0506 +# .word 0x0100FFFF +# .word 0x0203FFFF +# .word 0x00060000 +# +# glabel D_800DFEC0 +# .word 0xFFFF04FF +# .word 0xFFFFFFFF +# .word 0x010203FF +# .word 0x0000FFFF +# .word 0x050800FF +# .word 0xFFFF0203 +# .word 0xFFFF0009 +# .word 0xFFFF0806 +# .word 0x0100FFFF +# .word 0x03FFFFFF +# .word 0x0001FFFF +# .word 0x06070201 +# .word 0x00FFFFFF +# .word 0xFFFF0005 +# .word 0x00FFFFFF +# .word 0xFFFFFFFF +# .word 0x05080607 +# .word 0x00030001 +# .word 0xFFFF04FF +# .word 0xFFFF0806 +# .word 0x07FF0002 +# .word 0x0203FFFF +# .word 0x080504FF +# .word 0x07FFFFFF +# .word 0x000703FF +# .word 0xFFFF0608 +# .word 0x0504FFFF +# .word 0xFFFF0004 +# .word 0x0102FFFF +# .word 0x0504FFFF +# .word 0x0607FFFF +# .word 0x00080000 +# +# glabel D_800DFF40 +# .word 0xFFFF04FF +# .word 0xFFFFFFFF +# .word 0x01080203 +# .word 0x0000FFFF +# .word 0x05FF00FF +# .word 0xFFFF0802 +# .word 0x03FF0009 +# .word 0xFFFF06FF +# .word 0x080100FF +# .word 0x03FFFFFF +# .word 0x0001FFFF +# .word 0x07FF0208 +# .word 0x0100FFFF +# .word 0xFFFF0005 +# .word 0x00FFFFFF +# .word 0xFFFFFFFF +# .word 0x05090607 +# .word 0x000301FF +# .word 0xFFFF04FF +# .word 0xFFFF0906 +# .word 0x07FF0002 +# .word 0x02FFFFFF +# .word 0x090504FF +# .word 0x07FFFFFF +# .word 0x000703FF +# .word 0xFFFF0609 +# .word 0x0504FFFF +# .word 0xFFFF0004 +# .word 0xFFFF09FF +# .word 0x0100FFFF +# .word 0x0203FFFF +# .word 0x000608FF +# .word 0x05FF0504 +# .word 0xFFFF0607 +# .word 0xFFFF0008 +# .word 0x00000000 +# +# glabel D_800DFFD0 +# .word 0x00000000 +# +# glabel D_800DFFD4 +# .word 0xFFFFFFFF +# +# glabel D_800DFFD8 +# .word 0x00A10023 +# .word 0x00A10023 +# .word 0x00A10023 +# .word 0x000000FF +# .word 0x80020C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A00020 +# .word 0x00A00020 +# glabel D_800E0000 +# .byte 0x00 +# glabel D_800E0001 +# .byte 0xA0 +# glabel D_800E0002 +# .byte 0x00, 0x20 +# .word 0xFFFFFF00 +# .word 0xFF020C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A00048 +# .word 0x00A00044 +# .word 0x00A00048 +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# glabel D_800E002C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# glabel D_800E0038 +# .word 0x00A00056 +# .word 0x00A00052 +# .word 0x00A00056 +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# glabel D_800E004C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A00064 +# .word 0x00A00060 +# .word 0x00A00064 +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# glabel D_800E006C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A00072 +# .word 0x00A0006E +# .word 0x00A00072 +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A00080 +# .word 0x00A0007C +# .word 0x00A00080 +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A0008E +# .word 0x00A0008A +# .word 0x00A0008E +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A0009C +# .word 0x00A00098 +# .word 0x00A0009C +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A0009C +# .word 0x00A000A6 +# .word 0x00A0009C +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A000BA +# .word 0x00A000B4 +# .word 0x00A000BA +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# glabel D_800E0138 +# .word 0x00A000C8 +# .word 0x00A000C2 +# .word 0x00A000C8 +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A000C8 +# .word 0x00A000D0 +# .word 0x00A000C8 +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# glabel D_800E0198 +# .word 0x00A10023 +# .word 0x00A10023 +# .word 0x00A10023 +# .word 0x000000FF +# .word 0x80020C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A00020 +# .word 0x00A00020 +# .word 0x00A00020 +# .word 0xFFFFFF00 +# .word 0xFF020C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xFFA00027 +# .word 0xFFA00027 +# .word 0xFFA00027 +# .word 0xB0E0C0FF +# .word 0xFF000007 +# .word 0x00000000 +# .word 0x00C0002C +# .word 0x00040004 +# .word 0x00A00068 +# .word 0x00A00068 +# .word 0x00A00068 +# .word 0xFFFFFF00 +# .word 0xFF020C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xFFA0FFF7 +# .word 0xFFA0FFF7 +# .word 0xFFA0FFF7 +# .word 0xB0E0C0FF +# .word 0xFF000007 +# .word 0x00000000 +# .word 0x00C0002C +# glabel D_800E0234 +# .byte 0x00 +# glabel D_800E0235 +# .byte 0x04 +# glabel D_800E0236 +# .byte 0x00 +# glabel D_800E0237 +# .byte 0x04 +# glabel D_800E0238 +# .word 0x00A00098 +# .word 0x00A00098 +# .word 0x00A00098 +# .word 0xFFFFFF00 +# .word 0xFF020C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# glabel D_800E0278 +# .word 0x00A10023 +# .word 0x00A10023 +# .word 0x00A10023 +# .word 0x000000FF +# .word 0x80020C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00A00020 +# .word 0x00A00020 +# .word 0x00A00020 +# .word 0xFFFFFF00 +# .word 0xFF020C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xFF900037 +# .word 0xFF900037 +# .word 0xFF900037 +# .word 0xB0E0C0FF +# .word 0xFF000007 +# .word 0x00000000 +# .word 0x00E0002C +# .word 0x00040004 +# .word 0x00A00058 +# .word 0x00A00058 +# .word 0x00A00058 +# .word 0xFFFFFF00 +# .word 0xFF020C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xFF900007 +# .word 0xFF900007 +# .word 0xFF900007 +# .word 0xB0E0C0FF +# .word 0xFF000007 +# .word 0x00000000 +# .word 0x00E0002C +# .word 0x00040004 +# .word 0x00A00088 +# .word 0x00A00088 +# .word 0x00A00088 +# .word 0xFFFFFF00 +# .word 0xFF020C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xFF90FFD7 +# .word 0xFF90FFD7 +# .word 0xFF90FFD7 +# .word 0xB0E0C0FF +# .word 0xFF000007 +# .word 0x00000000 +# .word 0x00E0002C +# .word 0x00040004 +# .word 0x00A000B8 +# .word 0x00A000B8 +# .word 0x00A000B8 +# .word 0xFFFFFF00 +# .word 0xFF020C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0398 +# .word 0x00000043 +# .word 0x00400041 +# .word 0x0042FFFF +# +# glabel D_800E03A4 +# .word 0x0000000B +# .word 0x000C000A +# .word 0xFFFF0000 +# +# glabel D_800E03B0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x004C0070 +# .word 0x00F40070 +# .word 0x004C00D0 +# .word 0x00F400D0 +# +# glabel D_800E03CC +# .word 0x00180051 +# .word 0x00580040 +# .word 0x00040004 +# .word 0x4080FFC0 +# .word 0x00740051 +# .word 0x00580040 +# .word 0x00040004 +# .word 0x4080FFC0 +# .word 0x00D00051 +# .word 0x00580040 +# .word 0x00040004 +# .word 0x4080FFC0 +# +# glabel D_800E03FC +# .word 0x002C0036 +# .word 0x00150019 +# .word 0x002C001B +# .word 0x003F0019 +# .word 0x002D0019 +# +# glabel D_800E0410 +# .word 0x00000000 +# +# glabel D_800E0414 +# .word 0x00000000 +# +# glabel D_800E0418 +# .word 0x00000000 +# +# glabel D_800E041C +# .word 0x00000000 +# .word 0xFFF4FFF8 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E042C +# .word 0x00000000 +# .word 0xFFF8FFF4 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E043C +# .word 0x00000000 +# .word 0xFFF4FFF8 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E044C +# .word 0x00000000 +# .word 0xFFF8FFF4 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E045C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000020 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0474 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000020 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E048C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000020 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E04A4 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000020 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E04BC +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000020 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E04D4 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E04E4 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E04F4 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0504 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0514 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0524 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0534 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0544 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0554 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0564 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0574 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0584 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0594 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E05A4 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E05B4 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E05C4 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E05D4 +# .word 0x00000000 +# .word 0x0000FFD0 +# .word 0x00000000 +# .word 0x0000FFF0 +# .word 0x00000000 +# .word 0x00000010 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E05F4 +# .word 0x00000000 +# .word 0x0000FFD0 +# .word 0x00000000 +# .word 0x0000FFF0 +# .word 0x00000000 +# .word 0x00000010 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0614 +# .word 0x00000000 +# .word 0xFFF0FFF0 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0624 +# .word 0x800E045C +# .word 0x800E04D4 +# .word 0x800E04E4 +# .word 0x800E0474 +# .word 0x800E04F4 +# .word 0x800E0504 +# .word 0x800E048C +# .word 0x800E0514 +# .word 0x800E0524 +# +# glabel D_800E0648 +# .word 0x800E04BC +# .word 0x800E0544 +# .word 0x800E0564 +# .word 0x800E04A4 +# .word 0x800E0534 +# .word 0x800E0554 +# +# glabel D_800E0660 +# .word 0x800E0574 +# .word 0x800E0584 +# .word 0x800E0594 +# .word 0x800E05A4 +# .word 0x800E05B4 +# .word 0x800E05C4 +# +# glabel D_800E0678 +# .word 0x800E041C +# .word 0x800E042C +# .word 0x800E043C +# .word 0x800E044C +# +# glabel D_800E0688 +# .word 0x00440072 +# .word 0x00440072 +# .word 0x00CC0072 +# .word 0x00210072 +# .word 0x00880072 +# .word 0x00EF0072 +# .word 0x00210072 +# .word 0x00660072 +# .word 0x00AA0072 +# .word 0x00EF0072 +# +# glabel D_800E06B0 +# .word 0x00680021 +# .word 0x00FB0027 +# .word 0x008E00F5 +# .word 0x0027006C +# .word 0x00B000F5 +# +# glabel D_800E06C4 +# .word 0x0000FFC2 +# .word 0x00550000 +# .word 0x0000003E +# .word 0xFFAB0000 +# +# glabel D_800E06D4 +# .word 0x0000FFB6 +# .word 0x00550000 +# .word 0x0000004A +# .word 0xFFAB0000 +# +# glabel D_800E06E4 +# .word 0x0050008C +# .word 0x00A00040 +# .word 0x00040004 +# .word 0x00500014 +# .word 0x003A0028 +# .word 0x00500028 +# .word 0x00660028 +# +# glabel D_800E0700 +# .word 0x00500098 +# .word 0x00A00028 +# .word 0x00040004 +# .word 0x0050000E +# +# glabel D_800E0710 +# .word 0x000E000F +# .word 0x00000010 +# .word 0x00110020 +# .word 0x00120013 +# .word 0x00000014 +# .word 0x00150020 +# .word 0x00160017 +# .word 0x00200000 +# +# glabel D_800E0730 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xFFFFFFFF +# .word 0x0129011A +# .word 0x01200115 +# .word 0x0126011D +# .word 0x01300121 +# .word 0x01170154 +# .word 0x01280119 +# .word 0x012C0123 +# .word 0xFFFF0122 +# .word 0x011C0116 +# .word 0x0127FFFF +# .word 0xFFFFFFFF +# .word 0x012D012E +# .word 0x0153012B +# .word 0x011B011F +# .word 0x0124011E +# .word 0x01180125 +# .word 0x012F012A +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFF0000 +# +# glabel D_800E07C4 +# .word 0x00050006 +# .word 0x0007003D +# .word 0x003C003F +# .word 0x003E0008 +# .word 0x0009000A +# .word 0x000B000C +# .word 0x000DFFFF +# +# glabel D_800E07E0 +# .word 0x00040005 +# .word 0x0006FFFF +# +# glabel D_800E07E8 +# .word 0x00040000 +# .word 0x00010002 +# .word 0x00030018 +# .word 0x0019001A +# .word 0x001B001C +# .word 0x001D0024 +# .word 0x00250026 +# .word 0x00270028 +# .word 0x0029002A +# .word 0x002B001E +# .word 0x001F0020 +# .word 0x00210022 +# .word 0x0023002C +# .word 0x002D002E +# .word 0x002F0030 +# .word 0x00310040 +# .word 0x00410043 +# .word 0x005EFFFF +# +# glabel D_800E0830 +# .word 0x00070000 +# .word 0x00010002 +# .word 0x0003000B +# .word 0x000CFFFF +# +# glabel D_800E0840 +# .word 0x0000FFFF +# .word 0x000101FF +# .word 0xFF000200 +# .word 0xFFFF0003 +# .word 0x01FFFF00 +# .word 0x0400FFFF +# .word 0x000501FF +# .word 0xFF000600 +# .word 0xFFFF0006 +# .word 0x02004000 +# .word 0x0701FFFF +# .word 0x00070340 +# .word 0x80000800 +# .word 0xFFFF0008 +# .word 0x0280C020 +# .word 0x0901FFFF +# .word 0x000903C0 +# .word 0xFF200A02 +# .word 0xFFFF000B +# .word 0x03FFFF00 +# .word 0x0C02FFFF +# .word 0x200D03FF +# .word 0xFF200E02 +# .word 0xFFFF000E +# .word 0x04004000 +# .word 0x0F03FFFF +# .word 0x000F0540 +# .word 0x80001002 +# .word 0xFFFF2010 +# .word 0x0480C000 +# .word 0x1103FFFF +# .word 0x201105C0 +# .word 0xFF001204 +# .word 0xFFFF0013 +# .word 0x05FFFF00 +# .word 0x1404FFFF +# .word 0x001505FF +# .word 0xFF001604 +# .word 0xFFFF0016 +# .word 0x06004000 +# .word 0x1705FFFF +# .word 0x00170740 +# .word 0x80001804 +# .word 0xFFFF0018 +# .word 0x0680C020 +# .word 0x1905FFFF +# .word 0x001907C0 +# .word 0xFF201A06 +# .word 0xFFFF001B +# .word 0x07FFFF00 +# .word 0x1C06FFFF +# .word 0x201D07FF +# .word 0xFF201E06 +# .word 0xFFFF001E +# .word 0x08004000 +# .word 0x1F07FFFF +# .word 0x001F0940 +# .word 0x80002006 +# .word 0xFFFF2020 +# .word 0x0880C020 +# .word 0x2107FFFF +# .word 0x202109C0 +# .word 0xFF202208 +# .word 0xFFFF0023 +# .word 0x09FFFF00 +# .word 0x2408FFFF +# .word 0x202509FF +# .word 0xFF202608 +# .word 0xFFFF0027 +# .word 0x09FFFF00 +# .word 0x2808FFFF +# .word 0x202909FF +# .word 0xFF20FF00 +# .word 0x00000000 +# +# glabel D_800E0968 +# .word 0x00000000 +# +# glabel D_800E096C +# .word 0x00000000 glabel D_800E0970 .word 0x00000000 @@ -5723,6 +5706,10 @@ glabel D_800E1E40 .word 0x00000000 .word 0x00000000 +###################################################### + +############## unknown_09F8F0.c (.data) ############## + glabel D_800E1E64 .word 0x00000000 .word 0x00000000 @@ -8895,6 +8882,8 @@ glabel D_800E4934 .aligned_text "amSndPlayDirect: Somebody tried to play illegal sound %d\n" .aligned_text "Invalid midi sequence index\n" +############## unknown_001050.c (.rodata) ############## + glabel D_800E49DC .float 60000000.0 diff --git a/src/unknown_080500.c b/src/unknown_080500.c index 67ea00b7..4526d757 100644 --- a/src/unknown_080500.c +++ b/src/unknown_080500.c @@ -40,13 +40,28 @@ typedef enum MENU_ID { extern s32 osTvType; -extern s8 D_800DF450; -extern s32 D_800DF458; -extern s32 D_800DF460; -extern s32 D_800DF46C; -extern s32 gIsInAdventureTwo; -extern s32 gActiveMagicCodes; -extern s32 gUnlockedMagicCodes; +/************ .data ************/ + +s8 D_800DF450 = 0; +f32 D_800DF454 = 1.0f; +s32 D_800DF458 = 1; +s32 D_800DF45C = 0; // Currently unknown, might be a different type. +s32 D_800DF460 = 0; +s32 D_800DF464 = 4; // Currently unknown, might be a different type. +s32 D_800DF468 = 0; +s32 D_800DF46C = 0; +s32 D_800DF470 = 0; // Currently unknown, might be a different type. +s32 D_800DF474 = 0; // Currently unknown, might be a different type. +s32 D_800DF478 = 0; // Currently unknown, might be a different type. +s32 D_800DF47C = 0; // Currently unknown, might be a different type. +s32 D_800DF480 = 0; +s32 D_800DF484 = 0; // Currently unknown, might be a different type. +s32 D_800DF488 = 0; +s32 D_800DF48C = 0; // Currently unknown, might be a different type. +s32 D_800DF490 = 0; // Currently unknown, might be a different type. +s32 gIsInAdventureTwo = 0; +s32 D_800DF498 = 0; +s32 D_800DF49C = 0; // Currently unknown, might be a different type. typedef struct unk800DF4A0 { u8 pad0[0x5C]; @@ -72,28 +87,38 @@ typedef struct unk800DF4A0 { s32 unk2D8; s32 unk2DC; } unk800DF4A0; -extern unk800DF4A0* D_800DF4A0; -extern s32 D_800DF478; -extern s32 D_800DF47C; -extern s32 D_800DF480; -extern s32 D_800DF488; -extern s32 D_800DF498; -extern s32 D_800DF4B8; -extern s32 D_800DF4BC; // Number of active players? -extern s32 D_800DF4C8; -extern s32 D_800DF4D4; -extern s8 D_800DF4D8; -extern s8 D_800DF4DC; -extern s8 D_800DF4E0; -extern s8 D_800DF4E4[4]; -extern s8 D_800DF4EC; -extern s32 gIsInTwoPlayerAdventure; -extern s32 gSaveFileIndex; +unk800DF4A0* D_800DF4A0 = NULL; -extern u8 D_800DF4A4; -extern u8 D_800DF4A8; -extern u8 D_800DF4AC; +u8 D_800DF4A4 = 0xFF; +u8 D_800DF4A8 = 0xFF; +u8 D_800DF4AC = 0xFF; + +s32 D_800DF4B0 = 0; // Currently unknown, might be a different type. +s32 D_800DF4B4 = 0; // Currently unknown, might be a different type. +s32 D_800DF4B8 = 1; +s32 D_800DF4BC = 1; // Number of active players? +s32 gIsInTwoPlayerAdventure = 0; +s32 D_800DF4C4 = 0; // Currently unknown, might be a different type. +s32 D_800DF4C8 = 0; +s32 gSaveFileIndex = 0; + +s32 D_800DF4D0 = 0; // Currently unknown, might be a different type. +s32 D_800DF4D4 = 0; +s8 D_800DF4D8 = 1; +s8 D_800DF4DC = 0; +s8 D_800DF4E0 = 0; +s8 D_800DF4E4[4] = { + 0, 0, 0, 0 +}; +s32 D_800DF4E8 = 0; // Currently unknown, might be a different type. +s8 D_800DF4EC = 0; + +// Unused? +s32 D_800DF4F0[] = { + 0x4000, 0x8000, 0x1000, 0x2000, + 0x8000, 0x10, 0x400, 0x00 +}; /* Size: 0x20 bytes */ typedef struct unk800DF510 { @@ -113,74 +138,602 @@ typedef struct unk800DF510 { u8 pad1E[2]; } unk800DF510; -extern unk800DF510 D_800DF510[18]; -extern unk800DF510 *D_800DF75C; -extern s32 D_800DF764; +unk800DF510 D_800DF510[18] = { + { 0, 0, 0, 0x00, 1.0f, 0.0f, 0.0f, -32.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x01, 1.0f, 0.0f, 0.0f, -32.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x02, 1.0f, 0.0f, 0.0f, -32.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x03, 1.0f, 0.0f, 0.0f, -32.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x05, 0.215f, 0.0f, 0.0f, -500.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x06, 0.215f, 0.0f, 0.0f, -500.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x07, 0.215f, 0.0f, 0.0f, -500.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x04, 0.125f, 0.0f, -40.0f, -500.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x5B, 0.75f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x5C, 0.75f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x42, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x40, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x41, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x4C, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x4D, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x4E, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x4F, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0x5D, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0 } +}; -extern s16 *D_800DF750[32]; // unknown number of entries -extern s16 D_800DF754; -extern s16 D_800DF758; -extern s32 D_800DF760; -extern s16 D_800DF7C4[11]; -extern s32 D_800DF774; -extern s32 D_800DF77C; -extern s32 D_800DF794; -extern s32 D_800DF798; -extern s32 D_800DF79C; -extern s32 D_800DF7A0; -extern char *D_800DFA10[7]; -extern s32 D_800DFA2C; +s16 *D_800DF750[1] = { NULL }; // This is probably not correct. +s16 D_800DF754 = 0; +s16 D_800DF758 = 0; +unk800DF510 *D_800DF75C = NULL; + +s32 D_800DF760 = 0x7F; +s32 D_800DF764 = 0xFF; +s32 D_800DF768 = 1; + +// Not sure about typing with these arrays. +s16 D_800DF76C[4] = { + 0, 0, 10, -1 +}; +s16 D_800DF774[4] = { + 0, 0, 18, -1 +}; +u16 D_800DF77C[12] = { + 0x8000, 0x0000, 0x0012, 0x0000, + 0x00FF, 0xFFFF, 0x0012, 0xFFFF, + 0x80FF, 0xFFFF, 0x0012, 0x0000 +}; + +s32 D_800DF794 = 4; +s32 D_800DF798 = 0; +s32 D_800DF79C = 0; + +s32 D_800DF7A0 = 0; +s32 D_800DF7A4 = 0; +s32 D_800DF7A8 = 0; // Currently unknown, might be a different type. +s32 D_800DF7AC = 0; // Currently unknown, might be a different type. + +// Version text shown on the title screen? See 1:15 in https://www.youtube.com/watch?v=OHSCLcA74ao. +char gVersionDisplayText[20] = "VERSION XXXXXXXX"; + +// Probably not unqiue to the boot menu. +typedef struct MenuBootDrawTexture { + u32* texture; // Pointer to texture to draw. TODO: Make structure for texture header. + s16 xOffset; // Offset from the center of the screen. + s16 yOffset; // Offset from the center of the screen. +} MenuBootDrawTexture; + +s16 D_800DF7C4[12] = { + 0x50, 0x51, 0x52, 0x53, + 0x54, 0x55, 0x56, 0x57, + 0x58, 0x59, 0x5A, -1 +}; + +MenuBootDrawTexture D_800DF7DC[12] = { + { NULL, -75, -32 }, + { NULL, -60, -32 }, + { NULL, -45, -32 }, + { NULL, -30, -32 }, + { NULL, -15, -32 }, + { NULL, 0, -32 }, + { NULL, 15, -32 }, + { NULL, 30, -32 }, + { NULL, 45, -32 }, + { NULL, 60, -32 }, + { NULL, 75, -32 }, + { NULL, 0, 0 } +}; + +/* Size: 0x30 bytes */ +typedef struct unk800DF83C { + s32* unk0; // Pointer to something. + f32 unk4; + f32 unk8; + f32 unkC; + f32 unk10; + f32 unk14; + f32 unk18; + f32 unk1C; + f32 unk20; + f32 unk24; + f32 unk28; +} unk800DF83C; + +unk800DF83C D_800DF83C[10] = { + { (s32*)0x800E7CB0, 14.0f, 14.5f, 16.5f, 17.0f, -80.0f, 208.0f, 160.0f, 208.0f, 400.0f, 208.0f }, + { (s32*)0x800E7CB8, 19.0f, 19.5f, 21.5f, 22.0f, -80.0f, 208.0f, 160.0f, 208.0f, 400.0f, 208.0f }, + { (s32*)0x800E7CC0, 24.0f, 24.5f, 26.5f, 27.0f, -80.0f, 208.0f, 160.0f, 208.0f, 400.0f, 208.0f }, + { (s32*)0x800E7CC8, 29.0f, 29.5f, 31.5f, 32.0f, -80.0f, 208.0f, 160.0f, 208.0f, 400.0f, 208.0f }, + { (s32*)0x800E7CD0, 35.0f, 35.5f, 37.5f, 38.0f, -80.0f, 208.0f, 160.0f, 208.0f, 400.0f, 208.0f }, + { (s32*)0x800E7CDC, 40.0f, 40.5f, 42.5f, 43.0f, -80.0f, 208.0f, 160.0f, 208.0f, 400.0f, 208.0f }, + { (s32*)0x800E7CE4, 45.0f, 45.5f, 47.5f, 48.0f, -80.0f, 208.0f, 160.0f, 208.0f, 400.0f, 208.0f }, + { (s32*)0x800E7CEC, 50.0f, 50.5f, 52.5f, 53.0f, -80.0f, 208.0f, 160.0f, 208.0f, 400.0f, 208.0f }, + { (s32*)0x800E7CF4, 57.5f, 58.0f, 60.0f, 60.5f, -80.0f, 208.0f, 160.0f, 208.0f, 400.0f, 208.0f }, + { (s32*)0x800E7CFC, 63.5f, 64.0f, 66.0f, 66.5f, -80.0f, 208.0f, 160.0f, 208.0f, 400.0f, 208.0f } +}; + +s32 D_800DF9F4 = 0; + +u16 D_800DF9F8[12] = { + 0xFFFF, 0x00FF, 0xCC00, 0xFF00, + 0xFF99, 0x00FF, 0xFFFF, 0x6600, + 0x00FF, 0xFF33, 0x0000, 0x0F78 +}; + +char *D_800DFA10[7] = { + NULL, NULL, NULL, NULL, NULL, NULL, NULL +}; + +s16 D_800DFA2C[8] = { + 0x3D, 0x3C, 0x3F, 0x3E, 0x44, -1, -1, 0 +}; typedef struct unk800DFA3C { - u8 pad0[0x32]; - u16 unk32; - u8 pad34[0x38]; - u32* unk6C; + s16 unk0; + s16 unk2; + u8 unk4; + u8 unk5; + u8 unk6; + u8 unk7; + u8 unk8; + u8 unk9; + u8 unkA; + u8 unkB; + u32* unkC; } unk800DFA3C; -extern unk800DFA3C D_800DFA3C; +unk800DFA3C D_800DFA3C[8] = { + { 160, 80, 0xFF, 0xFF, 0xFF, 0, 0xFF, 0, 0, 12, NULL }, + { 160, 104, 0xFF, 0xFF, 0xFF, 0, 0xFF, 0, 0, 12, NULL }, + { 160, 144, 0xFF, 0xFF, 0xFF, 0, 0xFF, 0, 0, 12, NULL }, + { 160, 192, 0xFF, 0xFF, 0xFF, 0, 0xFF, 0, 0, 12, NULL }, + { 161, 35, 0, 0, 0, 0xFF, 0x80, 2, 0, 12, NULL }, + { 160, 32, 0xFF, 0x80, 0xFF, 0, 0xFF, 2, 0, 12, NULL }, + { 160, 188, 0xFF, 0xFF, 0xFF, 0, 0xFF, 0, 0, 12, NULL }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL } +}; -extern s32 D_800DFAC0; -extern s32 D_800DFAC4; -extern s16 D_800DFA38; -extern u32* D_800DFC10; -extern u32* D_800DFC20; -extern u32* D_800DFC30; -extern u32* D_800DFC40; -extern u32* D_800DFC50; -extern u32* D_800DFC60; -extern s16 D_800DFC78[24]; -extern u32* D_800DFCAC; -extern s32 D_800DFD94; -extern u8 D_800DFDB4[10][2]; -extern s32 D_800DFDC8; -extern s32 D_800DFFD0; -extern s32 D_800DFFD4; -extern s32 D_800E0398; -extern s32 D_800E03A4; -extern s32 D_800E0410; -extern s32 D_800E0414; -extern u32* D_800E041C; -extern u32* D_800E042C; -extern u32* D_800E043C; -extern u32* D_800E044C; +s32 D_800DFABC = 0; // Currently unknown, might be a different type. -/* Size: 0x18 Bytes */ -typedef struct unk800E045C { - u32* unk0; - s32 pad4; - u32* unk8; - s32 padC; - s32 pad10; - s32 pad14; -} unk800E045C; +s32 D_800DFAC0 = 0x100; +s32 D_800DFAC4 = 0x100; +s32 D_800DFAC8 = 0; -extern unk800E045C D_800E045C; +// Unsure about typing here. +u16 D_800DFACC[8] = { + 0x4040, 0xFFFF, 0xFF40, 0x40FF, + 0xFFD0, 0x40FF, 0x40FF, 0x40FF +}; + +s32 D_800DFADC = 0; // Currently unknown, might be a different type. +s32 D_800DFAE0 = 0; // Currently unknown, might be a different type. + + +// Unsure about typing with these arrays. +s32 D_800DFAE4[6] = { 0, 0, 0, 0, 0, 0 }; +s32 D_800DFAFC[6] = { 0, 0, 0, 0, 0, 0 }; +s32 D_800DFB14[6] = { 0, 0, 0, 0, 0, 0 }; +s32 D_800DFB2C[5] = { 0, 0, 0, 0, 0 }; +s32 D_800DFB40[7] = { 0, 0, 0, 0, 0, 0, 0 }; +s32 D_800DFB5C[6] = { 0, 0, 0, 0, 0, 0 }; +s32 D_800DFB74[6] = { 0, 0, 0, 0, 0, 0 }; +s32 D_800DFB8C[6] = { 0, 0, 0, 0, 0, 0 }; +s32 D_800DFBA4[6] = { 0, 0, 0, 0, 0, 0 }; +s32 D_800DFBBC[9] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + +// Unused? +s32* D_800DFBE0[10] = { + D_800DFAE4, D_800DFAFC, D_800DFB14, D_800DFB2C, + D_800DFB40, D_800DFB5C, D_800DFB8C, D_800DFBA4, + D_800DFB74, D_800DFBBC +}; + +s32 D_800DFC08 = 0; // Currently unknown, might be a different type. +s32 D_800DFC0C = 0xFFFF; // Currently unknown, might be a different type. + +typedef struct unk800DFC10 { + u32 *unk0; + s16 unk4; + s16 unk6; + u32 *unk8; + s32 unkC; +} unk800DFC10; + +unk800DFC10 D_800DFC10 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800DFC20 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800DFC30 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800DFC40 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800DFC50 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800DFC60 = { NULL, 0, 0, NULL, 0 }; + +// Unused? +u8 D_800DFC70[8] = { 0x40, 0x40, 0x04, 0x04, 0xFF, 0, 0, 0 }; + +s16 D_800DFC78[26] = { + 0x0024, 0x0025, 0x0018, 0x0019, + 0x001A, 0x001B, 0x001C, 0x001D, + 0x003D, 0x003F, 0x003E, 0x003C, + 0x0043, 0x0044, 0x0045, 0x0046, + 0x0047, 0x0048, 0x0049, 0x004A, + 0x004B, 0x0040, 0x0041, 0x0002, + 0xFFFF, 0x0000 +}; + +s16 D_800DFCAC[4] = { + 0x000B, 0x000C, 0x0002, 0xFFFF +}; + +u16 D_800DFCB4[112] = { + 0x00A1, 0x0020, 0x00A1, 0x0021, + 0x00A1, 0x0020, 0x0000, 0x00FF, + 0x8002, 0x0C00, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x00A0, 0x001E, 0x00A0, 0x001E, + 0x00A0, 0x001E, 0xFFFF, 0xFF00, + 0xFF02, 0x0C00, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x00A0, 0x0070, 0x00A0, 0x0070, + 0x00A0, 0x0070, 0xFFFF, 0xFF00, + 0xFF00, 0x0C00, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x00A0, 0x0080, 0x00A0, 0x0080, + 0x00A0, 0x0080, 0xFFFF, 0xFF00, + 0xFF00, 0x0C00, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x00A0, 0x00C0, 0x00A0, 0x00C0, + 0x00A0, 0x00C0, 0xFFFF, 0xFF00, + 0xFF00, 0x0C00, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x00A0, 0x00D0, 0x00A0, 0x00D0, + 0x00A0, 0x00D0, 0xFFFF, 0xFF00, + 0xFF00, 0x0C00, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000 +}; + +s32 D_800DFD94 = 0; + +s32 gActiveMagicCodes = 0; +s32 gUnlockedMagicCodes = 0; + +s32 D_800DFDA0[5] = { 0, 0, 0, 0, 0 }; + +u8 D_800DFDB4[10][2] = { + { 0x0F, 0x64 }, + { 0x0C, 0x07 }, + { 0x09, 0x64 }, + { 0x0A, 0x64 }, + { 0x08, 0x64 }, + { 0x0B, 0x64 }, + { 0x0D, 0x64 }, + { 0x0E, 0x64 }, + { 0x05, 0x64 }, + { 0x04, 0x64 } +}; + +s16 D_800DFDC8[2] = { -1, 0 }; +s16 D_800DFDCC[2] = { -1, 0 }; + +// Not sure what this is +s32 D_800DFDD0[28] = { + 0xFFFF04FF, 0xFFFFFFFF, 0x010203FF, 0x0000FFFF, + 0x05FF00FF, 0xFFFF0203, 0xFFFF0009, 0xFFFF06FF, + 0x0100FFFF, 0x03FFFFFF, 0x0001FFFF, 0x07FF0201, + 0x00FFFFFF, 0xFFFF0005, 0x00FFFFFF, 0xFFFFFFFF, + 0x050607FF, 0x000301FF, 0xFFFF04FF, 0xFFFF0607, + 0xFFFF0002, 0x02FFFFFF, 0x0504FFFF, 0x07FFFFFF, + 0x000703FF, 0xFFFF0605, 0x04FFFFFF, 0xFFFF0004 +}; + +// Not sure what this is +s32 D_800DFE40[32] = { + 0xFFFF04FF, 0xFFFFFFFF, 0x01080203, 0x0000FFFF, + 0x040500FF, 0xFFFF0802, 0x03FF0009, 0xFFFF0607, + 0x080100FF, 0x03FFFFFF, 0x0001FFFF, 0x07FF0208, + 0x0100FFFF, 0xFFFF0005, 0x0001FFFF, 0xFFFFFFFF, + 0x050607FF, 0x00030108, 0xFFFF04FF, 0xFFFF0607, + 0xFFFF0002, 0x0802FFFF, 0x0504FFFF, 0x07FFFFFF, + 0x00070203, 0xFFFF0605, 0x04FFFFFF, 0xFFFF0004, + 0xFFFF0506, 0x0100FFFF, 0x0203FFFF, 0x00060000 +}; + +// Not sure what this is +s32 D_800DFEC0[32] = { + 0xFFFF04FF, 0xFFFFFFFF, 0x010203FF, 0x0000FFFF, + 0x050800FF, 0xFFFF0203, 0xFFFF0009, 0xFFFF0806, + 0x0100FFFF, 0x03FFFFFF, 0x0001FFFF, 0x06070201, + 0x00FFFFFF, 0xFFFF0005, 0x00FFFFFF, 0xFFFFFFFF, + 0x05080607, 0x00030001, 0xFFFF04FF, 0xFFFF0806, + 0x07FF0002, 0x0203FFFF, 0x080504FF, 0x07FFFFFF, + 0x000703FF, 0xFFFF0608, 0x0504FFFF, 0xFFFF0004, + 0x0102FFFF, 0x0504FFFF, 0x0607FFFF, 0x00080000 +}; + +// Not sure what this is +s32 D_800DFF40[36] = { + 0xFFFF04FF, 0xFFFFFFFF, 0x01080203, 0x0000FFFF, + 0x05FF00FF, 0xFFFF0802, 0x03FF0009, 0xFFFF06FF, + 0x080100FF, 0x03FFFFFF, 0x0001FFFF, 0x07FF0208, + 0x0100FFFF, 0xFFFF0005, 0x00FFFFFF, 0xFFFFFFFF, + 0x05090607, 0x000301FF, 0xFFFF04FF, 0xFFFF0906, + 0x07FF0002, 0x02FFFFFF, 0x090504FF, 0x07FFFFFF, + 0x000703FF, 0xFFFF0609, 0x0504FFFF, 0xFFFF0004, + 0xFFFF09FF, 0x0100FFFF, 0x0203FFFF, 0x000608FF, + 0x05FF0504, 0xFFFF0607, 0xFFFF0008, 0x00000000 +}; + +s32 D_800DFFD0 = 0; +s32 D_800DFFD4 = -1; + +MenuElement D_800DFFD8[14] = { + { 161, 35, 161, 35, 161, 35, 0, 0, 0, 255, 128, 2, 12, 0, NULL, 0, 0, 0, 0 }, + { 160, 32, 160, 32, 160, 32, 255, 255, 255, 0, 255, 2, 12, 0, NULL, 0, 0, 0, 0 }, + { 160, 72, 160, 68, 160, 72, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 160, 86, 160, 82, 160, 86, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 160, 100, 160, 96, 160, 100, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 160, 114, 160, 110, 160, 114, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 160, 128, 160, 124, 160, 128, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 160, 142, 160, 138, 160, 142, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 160, 156, 160, 152, 160, 156, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 160, 156, 160, 166, 160, 156, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 160, 186, 160, 180, 160, 186, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 160, 200, 160, 194, 160, 200, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 160, 200, 160, 208, 160, 200, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0 } +}; + +MenuElement D_800E0198[7] = { + { 161, 35, 161, 35, 161, 35, 0, 0, 0, 255, 128, 2, 12, 0, NULL, 0, 0, 0, 0 }, + { 160, 32, 160, 32, 160, 32, 255, 255, 255, 0, 255, 2, 12, 0, NULL, 0, 0, 0, 0 }, + { -96, 39, -96, 39, -96, 39, 176, 224, 192, 255, 255, 0, 0, 7, NULL, 192, 44, 4, 4 }, + { 160, 104, 160, 104, 160, 104, 255, 255, 255, 0, 255, 2, 12, 0, NULL, 0, 0, 0, 0 }, + { -96, -9, -96, -9, -96, -9, 176, 224, 192, 255, 255, 0, 0, 7, NULL, 192, 44, 4, 4 }, + { 160, 152, 160, 152, 160, 152, 255, 255, 255, 0, 255, 2, 12, 0, NULL, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0 } +}; + +MenuElement D_800E0278[9] = { + { 161, 35, 161, 35, 161, 35, 0, 0, 0, 255, 128, 2, 12, 0, NULL, 0, 0, 0, 0 }, + { 160, 32, 160, 32, 160, 32, 255, 255, 255, 0, 255, 2, 12, 0, NULL, 0, 0, 0, 0 }, + { -112, 55, -112, 55, -112, 55, 176, 224, 192, 255, 255, 0, 0, 7, NULL, 224, 44, 4, 4 }, + { 160, 88, 160, 88, 160, 88, 255, 255, 255, 0, 255, 2, 12, 0, NULL, 0, 0, 0, 0 }, + { -112, 7, -112, 7, -112, 7, 176, 224, 192, 255, 255, 0, 0, 7, NULL, 224, 44, 4, 4 }, + { 160, 136, 160, 136, 160, 136, 255, 255, 255, 0, 255, 2, 12, 0, NULL, 0, 0, 0, 0 }, + { -112, -41, -112, -41, -112, -41, 176, 224, 192, 255, 255, 0, 0, 7, NULL, 224, 44, 4, 4 }, + { 160, 184, 160, 184, 160, 184, 255, 255, 255, 0, 255, 2, 12, 0, NULL, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0 } +}; + +s16 D_800E0398[6] = { + 0x00, 0x43, 0x40, 0x41, 0x42, -1 +}; + +s16 D_800E03A4[6] = { + 0x00, 0x0B, 0x0C, 0x0A, -1, 0 +}; + +u16 D_800E03B0[14] = { + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x004C, 0x0070, + 0x00F4, 0x0070, 0x004C, 0x00D0, + 0x00F4, 0x00D0 +}; + +u16 D_800E03CC[24] = { + 0x0018, 0x0051, 0x0058, 0x0040, + 0x0004, 0x0004, 0x4080, 0xFFC0, + 0x0074, 0x0051, 0x0058, 0x0040, + 0x0004, 0x0004, 0x4080, 0xFFC0, + 0x00D0, 0x0051, 0x0058, 0x0040, + 0x0004, 0x0004, 0x4080, 0xFFC0 +}; + +u16 D_800E03FC[10] = { + 0x002C, 0x0036, + 0x0015, 0x0019, + 0x002C, 0x001B, + 0x003F, 0x0019, + 0x002D, 0x0019 +}; + +s32 D_800E0410 = 0; +s32 D_800E0414 = 0; +s32 D_800E0418 = 0; + +unk800DFC10 D_800E041C = { NULL, -12, -8, 0, 0 }; +unk800DFC10 D_800E042C = { NULL, -8, -12, 0, 0 }; +unk800DFC10 D_800E043C = { NULL, -12, -8, 0, 0 }; +unk800DFC10 D_800E044C = { NULL, -8, -12, 0, 0 }; + +unk800DFC10 D_800E045C = { NULL, 0, 0, NULL, 0x20 }; +s32 D_800E046C[2] = {0, 0}; // Not sure what these are. +unk800DFC10 D_800E0474 = { NULL, 0, 0, NULL, 0x20 }; +s32 D_800E0484[2] = {0, 0}; // Not sure what these are. +unk800DFC10 D_800E048C = { NULL, 0, 0, NULL, 0x20 }; +s32 D_800E049C[2] = {0, 0}; // Not sure what these are. +unk800DFC10 D_800E04A4 = { NULL, 0, 0, NULL, 0x20 }; +s32 D_800E04B4[2] = {0, 0}; // Not sure what these are. +unk800DFC10 D_800E04BC = { NULL, 0, 0, NULL, 0x20 }; +s32 D_800E04CC[2] = {0, 0}; // Not sure what these are. +unk800DFC10 D_800E04D4 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E04E4 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E04F4 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0504 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0514 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0524 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0534 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0544 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0554 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0564 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0574 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0584 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0594 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E05A4 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E05B4 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E05C4 = { NULL, 0, 0, NULL, 0 }; + +// These are probably structs +s32 D_800E05D4[8] = { 0, 0xFFD0, 0, 0xFFF0, 0, 0x10, 0, 0 }; +s32 D_800E05F4[8] = { 0, 0xFFD0, 0, 0xFFF0, 0, 0x10, 0, 0 }; + +unk800DFC10 D_800E0614 = { NULL, -16, -16, 0, 0 }; + +unk800DFC10 *D_800E0624[9] = { + &D_800E045C, &D_800E04D4, &D_800E04E4, + &D_800E0474, &D_800E04F4, &D_800E0504, + &D_800E048C, &D_800E0514, &D_800E0524 +}; + +unk800DFC10 *D_800E0648[6] = { + &D_800E04BC, &D_800E0544, &D_800E0564, + &D_800E04A4, &D_800E0534, &D_800E0554 +}; + +unk800DFC10 *D_800E0660[6] = { + &D_800E0574, &D_800E0584, &D_800E0594, + &D_800E05A4, &D_800E05B4, &D_800E05C4 +}; + +unk800DFC10 *D_800E0678[4] = { + &D_800E041C, &D_800E042C, &D_800E043C, &D_800E044C +}; + +u16 D_800E0688[20] = { + 0x44, 0x72, 0x44, 0x72, + 0xCC, 0x72, 0x21, 0x72, + 0x88, 0x72, 0xEF, 0x72, + 0x21, 0x72, 0x66, 0x72, + 0xAA, 0x72, 0xEF, 0x72 +}; + +u16 D_800E06B0[10] = { + 0x68, 0x21, 0xFB, 0x27, + 0x8E, 0xF5, 0x27, 0x6C, + 0xB0, 0xF5 +}; + +s16 D_800E06C4[8] = { + 0x0000, 0xFFC2, 0x0055, 0x0000, + 0x0000, 0x003E, 0xFFAB, 0x0000 +}; + +s16 D_800E06D4[8] = { + 0x0000, 0xFFB6, 0x0055, 0x0000, + 0x0000, 0x004A, 0xFFAB, 0x0000 +}; + +u16 D_800E06E4[14] = { + 0x50, 0x8C, 0xA0, 0x40, + 0x04, 0x04, 0x50, 0x14, + 0x3A, 0x28, 0x50, 0x28, + 0x66, 0x28 +}; + +u16 D_800E0700[8] = { + 0x50, 0x98, 0xA0, 0x28, + 0x04, 0x04, 0x50, 0x0E +}; + +s16 D_800E0710[16] = { + 0x0E, 0x0F, 0x00, 0x10, + 0x11, 0x20, 0x12, 0x13, + 0x00, 0x14, 0x15, 0x20, + 0x16, 0x17, 0x20, 0x00 +}; + +s16 D_800E0730[74] = { + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0xFFFF, 0xFFFF, 0x0129, 0x011A, + 0x0120, 0x0115, 0x0126, 0x011D, + 0x0130, 0x0121, 0x0117, 0x0154, + 0x0128, 0x0119, 0x012C, 0x0123, + 0xFFFF, 0x0122, 0x011C, 0x0116, + 0x0127, 0xFFFF, 0xFFFF, 0xFFFF, + 0x012D, 0x012E, 0x0153, 0x012B, + 0x011B, 0x011F, 0x0124, 0x011E, + 0x0118, 0x0125, 0x012F, 0x012A, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0x0000 +}; + +s16 D_800E07C4[14] = { + 0x05, 0x06, 0x07, 0x3D, + 0x3C, 0x3F, 0x3E, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, + 0x0D, -1 +}; + +s16 D_800E07E0[4] = { + 0x04, 0x05, 0x06, -1 +}; + +s16 D_800E07E8[36] = { + 0x0004, 0x0000, 0x0001, 0x0002, + 0x0003, 0x0018, 0x0019, 0x001A, + 0x001B, 0x001C, 0x001D, 0x0024, + 0x0025, 0x0026, 0x0027, 0x0028, + 0x0029, 0x002A, 0x002B, 0x001E, + 0x001F, 0x0020, 0x0021, 0x0022, + 0x0023, 0x002C, 0x002D, 0x002E, + 0x002F, 0x0030, 0x0031, 0x0040, + 0x0041, 0x0043, 0x005E, 0xFFFF +}; + +s16 D_800E0830[8] = { + 0x07, 0x00, 0x01, 0x02, + 0x03, 0x0B, 0x0C, -1 +}; + +s16 D_800E0840[148] = { + 0x0000, 0xFFFF, 0x0001, 0x01FF, + 0xFF00, 0x0200, 0xFFFF, 0x0003, + 0x01FF, 0xFF00, 0x0400, 0xFFFF, + 0x0005, 0x01FF, 0xFF00, 0x0600, + 0xFFFF, 0x0006, 0x0200, 0x4000, + 0x0701, 0xFFFF, 0x0007, 0x0340, + 0x8000, 0x0800, 0xFFFF, 0x0008, + 0x0280, 0xC020, 0x0901, 0xFFFF, + 0x0009, 0x03C0, 0xFF20, 0x0A02, + 0xFFFF, 0x000B, 0x03FF, 0xFF00, + 0x0C02, 0xFFFF, 0x200D, 0x03FF, + 0xFF20, 0x0E02, 0xFFFF, 0x000E, + 0x0400, 0x4000, 0x0F03, 0xFFFF, + 0x000F, 0x0540, 0x8000, 0x1002, + 0xFFFF, 0x2010, 0x0480, 0xC000, + 0x1103, 0xFFFF, 0x2011, 0x05C0, + 0xFF00, 0x1204, 0xFFFF, 0x0013, + 0x05FF, 0xFF00, 0x1404, 0xFFFF, + 0x0015, 0x05FF, 0xFF00, 0x1604, + 0xFFFF, 0x0016, 0x0600, 0x4000, + 0x1705, 0xFFFF, 0x0017, 0x0740, + 0x8000, 0x1804, 0xFFFF, 0x0018, + 0x0680, 0xC020, 0x1905, 0xFFFF, + 0x0019, 0x07C0, 0xFF20, 0x1A06, + 0xFFFF, 0x001B, 0x07FF, 0xFF00, + 0x1C06, 0xFFFF, 0x201D, 0x07FF, + 0xFF20, 0x1E06, 0xFFFF, 0x001E, + 0x0800, 0x4000, 0x1F07, 0xFFFF, + 0x001F, 0x0940, 0x8000, 0x2006, + 0xFFFF, 0x2020, 0x0880, 0xC020, + 0x2107, 0xFFFF, 0x2021, 0x09C0, + 0xFF20, 0x2208, 0xFFFF, 0x0023, + 0x09FF, 0xFF00, 0x2408, 0xFFFF, + 0x2025, 0x09FF, 0xFF20, 0x2608, + 0xFFFF, 0x0027, 0x09FF, 0xFF00, + 0x2808, 0xFFFF, 0x2029, 0x09FF, + 0xFF20, 0xFF00, 0x0000, 0x0000 +}; + +s32 D_800E0968 = 0; +s32 D_800E096C = 0; -extern unk800E045C D_800E0474; -extern unk800E045C D_800E048C; -extern s16 D_800E0710[30]; -extern s16 D_800E07C4[30]; extern s32 D_800E0970; extern s32 D_800E0984; extern s32 D_800E0988; @@ -224,6 +777,9 @@ extern s32 D_800E1DB4; extern s32 D_800E1DB8; extern s32 D_800E1DBC; extern s8 D_800E1E28; + +/*******************************/ + extern s32 D_800E8230; extern f32 D_800E8414; @@ -563,7 +1119,7 @@ void func_80084118(void) { void menu_options_init(void) { D_801263BC = 0; D_800DF47C = 0; - func_800C01D8(&D_800DF77C); + func_800C01D8(D_800DF77C); func_800C4170(2); func_800C42EC(2); func_80000BE0(0x18); @@ -651,7 +1207,7 @@ s32 MenuOptionsLoop(s32 arg0) { // Leave the option menu func_80000C98(-0x80, D_800DF460, analogX); D_800DF47C = -1; - func_800C01D8(&D_800DF774); + func_800C01D8(D_800DF774); func_80001D04(0x241, 0); } else if ((buttonsPressed & 0x9000) && D_800DF460 >= 2) { // Go to a sub-menu @@ -741,21 +1297,21 @@ void MenuAudioOptionsInit(void) { D_800DF47C = 0; D_801269FC = 0; D_801263D8 = -1; - func_8009C674((s16*)&D_800DFA2C); - func_8009C8A4(&D_800DFA38); + func_8009C674(D_800DFA2C); + func_8009C8A4(&D_800DFA2C[6]); func_8008E4B0(); - func_800C01D8(&D_800DF77C); + func_800C01D8(D_800DF77C); func_8007FFEC(2); D_800DFAC4 = musicGetVolSliderPercentage(); D_800DFAC0 = sfxGetVolumeSlider(); if (gActiveMagicCodes & 0x40) { // Check if "JUKEBOX" cheat is active - D_800DFA3C.unk6C = D_801269E0; - D_800DFA3C.unk32 = 0xD4; + D_800DFA3C[6].unkC = D_801269E0; + D_800DFA3C[3].unk2 = 0xD4; func_80000BE0(0x20); D_801263E0 = 5; } else { - D_800DFA3C.unk6C = NULL; - D_800DFA3C.unk32 = 0xC0; + D_800DFA3C[6].unkC = NULL; + D_800DFA3C[3].unk2 = 0xC0; D_801263E0 = 4; } func_800C4170(2); @@ -821,7 +1377,7 @@ s32 MenuAudioOptionsLoop(s32 arg0) { if (((sp40 & 0x9000) && (D_801263E0 == D_80126C46 + 1)) || (sp40 & 0x4000)) { D_800DF47C = -1; - func_800C01D8(&D_800DF774); + func_800C01D8(D_800DF774); if (D_801263D8 >= 0) { func_80000C98(-0x80); } @@ -928,7 +1484,7 @@ void func_800851FC(void) { func_80000C98(0x100); func_80000B18(); } - func_8009C4A8((s16*)&D_800DFA2C); + func_8009C4A8(D_800DFA2C); func_800C422C(2); } @@ -951,19 +1507,19 @@ void menu_save_options_init(void) { D_80126A00 = 0; D_80126BE4 = 0; D_80126BEC = 0.0f; - func_8009C674((s16*)&D_800DFC78); - func_8009C8A4((s16*)&D_800DFCAC); + func_8009C674(D_800DFC78); + func_8009C8A4(D_800DFCAC); func_8007FFEC(0xA); func_800C4170(2); - D_800DFC10 = D_80126550[71]; - D_800DFC20 = D_80126550[72]; - D_800DFC30 = D_80126550[75]; - D_800DFC40 = D_80126550[74]; - D_800DFC50 = D_80126550[73]; - D_800DFC60 = D_80126550[70]; + D_800DFC10.unk0 = D_80126550[71]; + D_800DFC20.unk0 = D_80126550[72]; + D_800DFC30.unk0 = D_80126550[75]; + D_800DFC40.unk0 = D_80126550[74]; + D_800DFC50.unk0 = D_80126550[73]; + D_800DFC60.unk0 = D_80126550[70]; func_8008E4B0(); func_8006EBA8(); - func_800C01D8(&D_800DF77C); + func_800C01D8(D_800DF77C); } GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800853D0.s") @@ -1151,7 +1707,6 @@ s16 xOffset; // Offset from the center of the screen. s16 yOffset; // Offset from the center of the screen. } MenuBootDrawTexture; -extern s32 D_800DF77C; extern s16 D_800DF7C4[11]; static MenuBootDrawTexture D_800DF7DC[11]; extern u32* D_80126550[]; // texture lookup table? @@ -1162,7 +1717,7 @@ extern s32 D_80126C20; void menu_boot_init(void) { s32 i; - func_800C01D8(&D_800DF77C); + func_800C01D8(D_800DF77C); func_80077B34(0, 0, 0); func_8009C674(&D_800DF7C4); @@ -1244,7 +1799,7 @@ void menu_magic_codes_init(void) { D_800DF47C = 0; D_801263D8 = 0; D_801263E0 = 0; - func_800C01D8(&D_800DF77C); + func_800C01D8(D_800DF77C); func_800C4EDC(7, 0x32, 0x32, 0x10E, 0x84); func_800C4FBC(7, 0, 0, 0, 0x80); func_800C5494(7); @@ -1266,7 +1821,7 @@ void menu_magic_codes_list_init(void) { func_800C4170(2); func_8009C6D4(0x3F); func_8008E4B0(); - func_800C01D8(&D_800DF77C); + func_800C01D8(D_800DF77C); if (osTvType == 0) { D_80126C70 = 0xB; } else { @@ -1398,7 +1953,7 @@ s32 MenuMagicCodesListLoop(s32 arg0) { } if (sp48 != 0) { D_800DF47C = sp48; - func_800C01D8(&D_800DF774); + func_800C01D8(D_800DF774); func_80001D04(0x241, NULL); } if (D_800DF47C < -0x1E) { @@ -1615,12 +2170,10 @@ void menu_caution_init(void) { D_801263C4 = 0x3C; D_800DF47C = 0; func_800C4170(2); - func_800C01D8(&D_800DF77C); + func_800C01D8(D_800DF77C); D_800DF498 = 1; } -extern MenuElement D_800DFFD8[13]; - void func_8008C4E8(void); void DrawMenuText(s32, MenuElement*, f32); @@ -1633,7 +2186,7 @@ s32 menu_caution_loop(s32 arg0) { if (func_8006A554(0) & 0xD000) { func_80001D04(0xEF, NULL); D_800DF47C = 1; - func_800C01D8(&D_800DF774); + func_800C01D8(D_800DF774); } } } @@ -1675,7 +2228,7 @@ void MenuGameSelectInit(void) { D_801263BC = 0; D_800DF460 = 0; D_801263E0 = 2; - func_800C01D8(&D_800DF77C); + func_800C01D8(D_800DF77C); func_8006EBA8(); func_8001B790(); D_801263D8 = 1; @@ -1766,8 +2319,8 @@ void menu_file_select_init(void) { s32 sp34; func_8006B224(&sp38, &sp34); - func_8009C674((s16*)&D_800E0398); - func_8009C8A4((s16*)&D_800E03A4); + func_8009C674(D_800E0398); + func_8009C8A4(D_800E03A4); func_8007FFEC(6); func_8006EBA8(); D_801263D8 = 1; @@ -1778,7 +2331,7 @@ void menu_file_select_init(void) { D_80126484 = 0; D_80126488 = 0; D_80126CC0 = 0; - func_800C01D8(&D_800DF77C); + func_800C01D8(D_800DF77C); func_800C4170(2); func_80000B34(0x1A); for(i = 0; i < 10; i++) { @@ -1883,7 +2436,7 @@ void func_8008DC7C(s32 arg0) { GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuGameSelectLoop.s") void func_8008E428(void) { - func_8009C4A8((s16*)&D_800E0398); + func_8009C4A8(D_800E0398); func_8007FF88(); func_800C422C(2); } @@ -1898,10 +2451,10 @@ void func_8008E45C(void) { } void func_8008E4B0(void) { - D_800E041C = D_80126550[61]; - D_800E042C = D_80126550[60]; - D_800E043C = D_80126550[63]; - D_800E044C = D_80126550[62]; + D_800E041C.unk0 = D_80126550[61]; + D_800E042C.unk0 = D_80126550[60]; + D_800E043C.unk0 = D_80126550[63]; + D_800E044C.unk0 = D_80126550[62]; } GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008E4EC.s") @@ -2154,7 +2707,7 @@ block_7: D_800E0524 = (s32) D_80126550.unk88; D_800E05B4 = (s32) D_80126550.unkC0; D_800E0614 = (s32) D_80126550.unk178; - func_800C01D8(&D_800DF77C); + func_800C01D8(D_800DF77C); D_801263BC = 0; D_800DF47C = 0; D_800E0980 = 0x1E; @@ -2303,7 +2856,7 @@ void menu_11_init(void) { func_8009C8A4((s16*)&D_800E0A40); func_80094604(); func_800C4170(2); - func_800C01D8(&D_800DF77C); + func_800C01D8(D_800DF77C); func_80000BE0(0x18); func_80000B34(0x18); func_80000C98(0x80); From 35acbac8ce61fe7fabd2844e0eea6d57631c56cf Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 26 May 2021 18:56:43 -0500 Subject: [PATCH 24/39] unknown_080500.c data section (second half) --- data/dkr.data.s | 3130 ++++++++++++++++++----------------- include/structs.h | 3 +- src/unknown_080500.c | 674 +++++++- tools/python/generate_ld.py | 6 +- 4 files changed, 2189 insertions(+), 1624 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 10c9d3d8..9f8a519b 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -4148,1568 +4148,1584 @@ # # glabel D_800E096C # .word 0x00000000 - -glabel D_800E0970 -.word 0x00000000 - -glabel D_800E0974 -.word 0x00000000 - -glabel D_800E0978 -.word 0x800E7D04 - -glabel D_800E097C -.word 0x00000000 - -glabel D_800E0980 -.word 0x00000000 - -glabel D_800E0984 -.word 0x00000000 - -glabel D_800E0988 -.word 0x00000000 - -glabel D_800E098C -.word 0x00000000 - -glabel D_800E0990 -.word 0x4040FFA0 -.word 0xFF4040A0 -.word 0xD0C020B0 -.word 0x20C040B0 - -glabel D_800E09A0 -.word 0x00FF0080 -.word 0x00FF0060 -.word 0x0000FF60 -.word 0x0000FF80 - -glabel D_800E09B0 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E09C4 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E09D8 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E09EC -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E09F8 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0A04 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0A14 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0A24 -.word 0x0005003B -.word 0x00320033 -.word 0x00340035 -.word 0x00360039 -.word 0x00370038 -.word 0x003A0000 -.word 0x0001FFFF - -glabel D_800E0A40 -.word 0x00040000 -.word 0x0001FFFF -.word 0x03000000 -.word 0x0012FFFF - -glabel D_800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0A60 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0A70 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0A80 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0A90 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0AA0 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0AB0 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0AC0 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0AD0 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0AE0 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0AF0 -.word 0x800E0A50 -.word 0x800E0A60 -.word 0x800E0A70 -.word 0x800E0A80 -.word 0x800E0A90 -.word 0x800E0AA0 -.word 0x800E0AB0 -.word 0x800E0AC0 -.word 0x800E0AD0 -.word 0x800E0AE0 - -glabel D_800E0B18 -.word 0x0140017C -.word 0x01B801F4 -.word 0x0230026C -.word 0x02A802E4 -.word 0x01E00000 -.word 0x00180039 -.word 0x005A007B -.word 0x009C00BD -.word 0x00DE00FF -.word 0x00A00000 -.word 0x014001B8 -.word 0x023002A8 -.word 0x01E00000 -.word 0x00180065 -.word 0x00B30100 -.word 0x00A00000 -.word 0x014001F4 -.word 0x02A801E0 -.word 0x0028008C -.word 0x00F000A0 -.word 0x01E000C0 -.word 0x00A000C0 -.word 0xFF6000C0 -.word 0xFF80FFEC -.word 0xFFE4FFE6 -.word 0x0050FFF8 -.word 0xFFE4FFF4 -.word 0xFFE40006 -.word 0xFFE40018 -.word 0x00500008 -.word 0x00000078 -.word 0x0000003C -.word 0x0000001E -.word 0x00000384 -.word 0x0000001E -.word 0x0000001E -.word 0x00000384 - -.aligned_text "1ST" -.aligned_text "2ND" -.aligned_text "3RD" -.aligned_text "4TH" -.aligned_text "5TH" -.aligned_text "6TH" -.aligned_text "7TH" -.aligned_text "8TH" - -glabel D_800E0BCC -.word 0x800E0BAC -.word 0x800E0BB0 -.word 0x800E0BB4 -.word 0x800E0BB8 -.word 0x800E0BBC -.word 0x800E0BC0 -.word 0x800E0BC4 -.word 0x800E0BC8 - -glabel D_800E0BEC -.word 0x016000AC -.word 0x002000AC -.word 0xFEE000AC -.word 0xFFFFFF00 -.word 0xFF000003 - -glabel D_800E0C00 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x01C400A6 -.word 0x008400A6 -.word 0xFF4400A6 -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x023000B8 -.word 0x00F000B8 -.word 0xFFB000B8 -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x01C400B4 -.word 0x008400B4 -.word 0xFF4400B4 -.word 0xFFC0FF00 -.word 0xFF000001 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x01C400C6 -.word 0x008400C6 -.word 0xFF4400C6 -.word 0xFFC0FF00 -.word 0xFF000001 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x01C400D8 -.word 0x008400D8 -.word 0xFF4400D8 -.word 0xFFC0FF00 -.word 0xFF000001 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x023000C8 -.word 0x00F000C8 -.word 0xFFB000C8 -.word 0x80FFFF00 -.word 0xFF000001 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0CEC -.word 0x023F00AC -.word 0x00FF00AC -.word 0xFFBF00AC -.word 0xFFFFFF00 -.word 0xFF000003 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x021E00AC -.word 0x00DE00AC -.word 0xFF9E00AC -.word 0xFFFFFF00 -.word 0xFF000003 - -glabel D_800E0D20 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x01FD00AC -.word 0x00BD00AC -.word 0xFF7D00AC -.word 0xFFFFFF00 -.word 0xFF000003 - -glabel D_800E0D40 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x01DC00AC -.word 0x009C00AC -.word 0xFF5C00AC -.word 0xFFFFFF00 -.word 0xFF000003 - -glabel D_800E0D60 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x01BB00AC -.word 0x007B00AC -.word 0xFF3B00AC -.word 0xFFFFFF00 -.word 0xFF000003 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x019A00AC -.word 0x005A00AC -.word 0xFF1A00AC -.word 0xFFFFFF00 -.word 0xFF000003 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x017900AC -.word 0x003900AC -.word 0xFEF900AC -.word 0xFFFFFF00 -.word 0xFF000003 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0DCC -.word 0x015800AC -.word 0x001800AC -.word 0xFED800A6 -.word 0xFFFFFF00 -.word 0xFF000003 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x01E100A6 -.word 0x00A100A6 -.word 0xFF6100A6 -.word 0x000000FF -.word 0x80000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x01DF00A4 -.word 0x009F00A4 -.word 0xFF5F00A4 -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0E4C -.word 0x01E100AE -.word 0x00A100AE -.word 0xFF6100AE -.word 0x000000FF -.word 0x80000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x01DF00AC -.word 0x009F00AC -.word 0xFF5F00AC -.word 0xFFFFFF00 -.word 0xFF000C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x017000C0 -.word 0x003000C0 -.word 0xFEF000C0 -.word 0xFF404060 -.word 0xFF000800 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x01FA00BB -.word 0x00BA00BB -.word 0xFF7A00BB -.word 0xFFC0FF00 -.word 0xFF000001 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x024200C0 -.word 0x010200C0 -.word 0xFFC200C0 -.word 0xFF80FF60 -.word 0xFF000C00 -.word 0x80126390 -.word 0x00000000 -.word 0x00000000 -.word 0x017000D4 -.word 0x003000D4 -.word 0xFEF000D4 -.word 0xFF404060 -.word 0xFF000800 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x01FA00CF -.word 0x00BA00CF -.word 0xFF7A00CF -.word 0x80FFFF00 -.word 0xFF000001 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x024200D4 -.word 0x010200D4 -.word 0xFFC200D4 -.word 0xFF80FF60 -.word 0xFF000C00 -.word 0x80126394 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E0F6C -.ascii "ABCDEFGHIJKLMNOPQRSTUVWXYZ.? " -glabel D_800E0F8C # I'm assuming that this points to the null terminator of the above string -.word 0x00000000 - -glabel D_800E0F90 -.word 0x000000C0 - -glabel D_800E0F94 -.word 0x000000A0 - -glabel D_800E0F98 -.word 0x00000078 - -glabel D_800E0F9C -.word 0x00000002 - -glabel D_800E0FA0 -.word 0x00000000 - -glabel D_800E0FA4 -.word 0x00000000 - -glabel D_800E0FA8 -.aligned_text "DKR" - -glabel D_800E0FAC -.word 0x00000000 - -glabel D_800E0FB0 -.word 0x00000000 - -glabel D_800E0FB4 -.word 0x00040000 -.word 0x00010018 -.word 0x0019001A -.word 0x001B001C -.word 0x001D001E -.word 0x001F0020 -.word 0x00210022 -.word 0x00230030 -.word 0x005EFFFF - -glabel D_800E0FD8 -.word 0x00070000 -.word 0x00010002 -.word 0x0003FFFF - -glabel D_800E0FE4 -.word 0x00000008 - -glabel gTrophyRaceWorldId -.word 0x00000000 - -glabel D_800E0FEC -.word 0x00000000 - -glabel D_800E0FF0 -.word 0x00000000 -.word 0x01FFFFFF -.word 0x0012FFFF -.word 0x81FFFFFF -.word 0x00120000 - -glabel D_800E1004 -.word 0x00000009 -.word 0x00000007 -.word 0x00000005 -.word 0x00000003 -.word 0x00000001 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E1024 -.word 0x00320033 -.word 0x00340035 -.word 0x00360037 -.word 0x00380039 -.word 0x003A003B -.word 0x00000001 -.word 0xFFFF0000 - -glabel D_800E1040 -.word 0x00000001 -.word 0xFFFF0000 - -glabel D_800E1048 -.word 0x01E10023 -.word 0x00A10023 -.word 0xFF610023 -.word 0x000000FF -.word 0x80020C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x01E00020 -.word 0x00A00020 -.word 0xFF600020 -.word 0xFFFFFF00 -.word 0xFF020C00 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E1088 -.word 0x0040FF40 -.word 0x00400030 -.word 0x00400120 -.word 0xFFFFFF00 -.word 0xFF000003 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x0020FF40 -.word 0x00200030 -.word 0x00200120 -.word 0xFFFFFF00 -.word 0xFF000000 -.word 0x800E0BAC -.word 0x00000000 -.word 0x00000000 -.word 0x0082FF54 -.word 0x00820044 -.word 0x00820134 -.word 0xFFFFFF00 -.word 0xFF000402 -.word 0x800E1004 -.word 0x00000000 -.word 0x00000000 -.word 0x0040FF6A -.word 0x0040005A -.word 0x0040014A -.word 0xFFFFFF00 -.word 0xFF000003 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x0020FF6A -.word 0x0020005A -.word 0x0020014A -.word 0xFFFFFF00 -.word 0xFF000000 -.word 0x800E0BB0 -.word 0x00000000 -.word 0x00000000 -.word 0x0082FF7E -.word 0x0082006E -.word 0x0082015E -.word 0xFFC0FF00 -.word 0xFF000402 -.word 0x800E1008 -.word 0x00000000 -.word 0x00000000 -.word 0x0040FF94 -.word 0x00400084 -.word 0x00400174 -.word 0xFFFFFF00 -.word 0xFF000003 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x0020FF94 -.word 0x00200084 -.word 0x00200174 -.word 0xFFFFFF00 -.word 0xFF000000 -.word 0x800E0BB4 -.word 0x00000000 -.word 0x00000000 -.word 0x0082FFA8 -.word 0x00820098 -.word 0x00820188 -.word 0xFF80FF00 -.word 0xFF000402 -.word 0x800E100C -.word 0x00000000 -.word 0x00000000 -.word 0x0040FFBE -.word 0x004000AE -.word 0x0040019E -.word 0xFFFFFF00 -.word 0xFF000003 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x0020FFBE -.word 0x002000AE -.word 0x0020019E -.word 0xFFFFFF00 -.word 0xFF000000 -.word 0x800E0BB8 -.word 0x00000000 -.word 0x00000000 -.word 0x0082FFD2 -.word 0x008200C2 -.word 0x008201B2 -.word 0xFF40FF00 -.word 0xFF000402 -.word 0x800E1010 -.word 0x00000000 -.word 0x00000000 -.word 0x00DC0120 -.word 0x00DC0030 -.word 0x00DCFF40 -.word 0xFFFFFF00 -.word 0xFF000003 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x00BC0120 -.word 0x00BC0030 -.word 0x00BCFF40 -.word 0xFFFFFF00 -.word 0xFF000000 -.word 0x800E0BBC -.word 0x00000000 -.word 0x00000000 -.word 0x011E0134 -.word 0x011E0044 -.word 0x011EFF54 -.word 0xFFFFFF00 -.word 0xFF000402 -.word 0x800E1014 -.word 0x00000000 -.word 0x00000000 -.word 0x00DC014A -.word 0x00DC005A -.word 0x00DCFF60 -.word 0xFFFFFF00 -.word 0xFF000003 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x00BC014A -.word 0x00BC005A -.word 0x00BCFF6A -.word 0xFFFFFF00 -.word 0xFF000000 -.word 0x800E0BC0 -.word 0x00000000 -.word 0x00000000 -.word 0x011E015E -.word 0x011E006E -.word 0x011EFF7E -.word 0xFFC0FF00 -.word 0xFF000402 -.word 0x800E1018 -.word 0x00000000 -.word 0x00000000 -.word 0x00DC0174 -.word 0x00DC0084 -.word 0x00DCFF94 -.word 0xFFFFFF00 -.word 0xFF000003 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x00BC0174 -.word 0x00BC0084 -.word 0x00BCFF94 -.word 0xFFFFFF00 -.word 0xFF000000 -.word 0x800E0BC4 -.word 0x00000000 -.word 0x00000000 -.word 0x011E0188 -.word 0x011E0098 -.word 0x011EFFA8 -.word 0xFF80FF00 -.word 0xFF000402 -.word 0x800E101C -.word 0x00000000 -.word 0x00000000 -.word 0x00DC019E -.word 0x00DC00AE -.word 0x00DCFFBE -.word 0xFFFFFF00 -.word 0xFF000003 -.word 0x800E0A50 -.word 0x00000000 -.word 0x00000000 -.word 0x00BC019E -.word 0x00BC00AE -.word 0x00BCFFBE -.word 0xFFFFFF00 -.word 0xFF000000 -.word 0x800E0BC8 -.word 0x00000000 -.word 0x00000000 -.word 0x011E01B2 -.word 0x011E00C2 -.word 0x011EFFD2 -.word 0xFF40FF00 -.word 0xFF000402 -.word 0x800E1020 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00400020 -.word 0x00820040 -.word 0x00200082 -.word 0x00400020 -.word 0x00820040 -.word 0x00200082 -.word 0x00DC00BC -.word 0x011E00DC -.word 0x00BC011E -.word 0x00DC00BC -.word 0x011E00DC -.word 0x00BC011E -.word 0x00300030 -.word 0x0044005A -.word 0x005A006E -.word 0x00840084 -.word 0x009800AE -.word 0x00AE00C2 -.word 0x00300030 -.word 0x0044005A -.word 0x005A006E -.word 0x00840084 -.word 0x009800AE -.word 0x00AE00C2 -.word 0x00380038 -.word 0x0040006A -.word 0x006A0072 -.word 0x009C009C -.word 0x00A400CE -.word 0x00CE00D6 -.word 0x00380038 -.word 0x0040006A -.word 0x006A0072 -.word 0x009C009C -.word 0x00A400CE -.word 0x00CE00D6 -.word 0x00400020 -.word 0x00820040 -.word 0x00200082 -.word 0x00400020 -.word 0x008200DC -.word 0x00BC011E -.word 0x00DC00BC -.word 0x011E00DC -.word 0x00BC011E -.word 0x00340034 -.word 0x0048006F -.word 0x006F0083 -.word 0x00AA00AA -.word 0x00BE0034 -.word 0x00340048 -.word 0x006F006F -.word 0x008300AA -.word 0x00AA00BE -.word 0x004C004C -.word 0x0054007E -.word 0x007E0086 -.word 0x00B000B0 -.word 0x00B8004C -.word 0x004C0054 -.word 0x007E007E -.word 0x008600B0 -.word 0x00B000B8 -.word 0x008C006C -.word 0x00CE008C -.word 0x006C00CE -.word 0x008C006C -.word 0x00CE008C -.word 0x006C00CE - -glabel D_800E14BC -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x800E14A4 -.word 0x800E145C -.word 0x800E14A4 -.word 0x800E13D8 -.word 0x00000000 -.word 0x00000000 -.word 0x800E1438 -.word 0x800E145C -.word 0x00000000 -.word 0x00000000 -.word 0x800E13A8 -.word 0x800E13D8 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x800E14A4 -.word 0x800E1480 -.word 0x800E14A4 -.word 0x800E1408 -.word 0x00000000 -.word 0x00000000 -.word 0x800E1438 -.word 0x800E1480 -.word 0x00000000 -.word 0x00000000 -.word 0x800E13A8 -.word 0x800E1408 - -glabel D_800E153C -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00400000 -.word 0x00000000 -.word 0x00800000 -.word 0x00000000 -.word 0x00C00000 -.word 0x00000000 -.word 0x01000000 - -glabel D_800E1564 -.word 0x00000000 -.word 0x00000020 -.word 0x00000000 -.word 0x00400020 -.word 0x00000000 -.word 0x00800020 -.word 0x00000000 -.word 0x00C00020 -.word 0x00000000 -.word 0x01000020 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E1594 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00400000 -.word 0x00000000 -.word 0x00800000 -.word 0x00000000 -.word 0x00C00000 -.word 0x00000000 -.word 0x01000000 - -glabel D_800E15BC -.word 0x00000000 -.word 0x00000020 -.word 0x00000000 -.word 0x00400020 -.word 0x00000000 -.word 0x00800020 -.word 0x00000000 -.word 0x00C00020 -.word 0x00000000 -.word 0x01000020 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E15EC -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00400000 -.word 0x00000000 -.word 0x00800000 -.word 0x00000000 -.word 0x00C00000 -.word 0x00000000 -.word 0x01000000 - -glabel D_800E1614 -.word 0x00000000 -.word 0x00000020 -.word 0x00000000 -.word 0x00400020 -.word 0x00000000 -.word 0x00800020 -.word 0x00000000 -.word 0x00C00020 -.word 0x00000000 -.word 0x01000020 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E1644 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00400000 -.word 0x00000000 -.word 0x00800000 -.word 0x00000000 -.word 0x00C00000 -.word 0x00000000 -.word 0x01000000 - -glabel D_800E166C -.word 0x00000000 -.word 0x00000020 -.word 0x00000000 -.word 0x00400020 -.word 0x00000000 -.word 0x00800020 -.word 0x00000000 -.word 0x00C00020 -.word 0x00000000 -.word 0x01000020 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E169C -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00400000 -.word 0x00000000 -.word 0x00800000 -.word 0x00000000 -.word 0x00C00000 -.word 0x00000000 -.word 0x01000000 - -glabel D_800E16C4 -.word 0x00000000 -.word 0x00000020 -.word 0x00000000 -.word 0x00400020 -.word 0x00000000 -.word 0x00800020 -.word 0x00000000 -.word 0x00C00020 -.word 0x00000000 -.word 0x01000020 -.word 0x00000000 -.word 0x00000000 -.word 0x800E153C -.word 0x800E1594 -.word 0x800E15EC -.word 0x800E1644 -.word 0x800E169C - -glabel D_800E1708 -.word 0x000E000F -.word 0x00100011 -.word 0x00120013 -.word 0x00140015 -.word 0x00160017 -.word 0x00180019 -.word 0x001A001B -.word 0x001C001D -.word 0x00320033 -.word 0x00340036 -.word 0x00350037 -.word 0x00380039 -.word 0x003A003B -.word 0x00000001 -.word 0x0004003D -.word 0x003C003F -.word 0x003EFFFF - -glabel D_800E174C -.word 0x00000001 -.word 0x0007FFFF - -glabel D_800E1754 -.word 0x00780012 -.word 0x00080006 -.word 0x00C00006 -.word 0x00D4001A -.word 0x00780022 - -glabel D_800E1768 -.word 0x00320033 -.word 0x00340035 -.word 0x00360037 -.word 0x00380039 -.word 0x003A003B -.word 0xFFFF0000 - -glabel D_800E1780 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001402 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xBA001102 -.word 0x00000000 -.word 0xBA001301 -.word 0x00000000 -.word 0xBA000C02 -.word 0x00002000 -.word 0xBA000903 -.word 0x00000C00 -.word 0xB9000002 -.word 0x00000000 -.word 0xB900031D -.word 0x00504340 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800E17D8 -.word 0x00320033 -.word 0x00340035 -.word 0x00360037 -.word 0x00380039 -.word 0x003A003B -.word 0xFFFF0000 - -glabel D_800E17F0 -.word 0xFFFF0000 - -glabel D_800E17F4 -.word 0x20A50000 -.word 0x20A50001 -.word 0x000220A5 -.word 0x00030004 -.word 0x00050006 -.word 0x400020A5 -.word 0x00070008 -.word 0x20A50009 -.word 0x000A000B -.word 0x000C30A5 -.word 0x000D000E -.word 0x000F4000 -.word 0x20A50010 -.word 0x001120A5 -.word 0x00120013 -.word 0x20A50014 -.word 0x400020A5 -.word 0x00150016 -.word 0x20A50017 -.word 0x001820A5 -.word 0x0019001A -.word 0x400020A5 -.word 0x001B001C -.word 0x001D001E -.word 0x001F30A5 -.word 0x00200021 -.word 0x00220023 -.word 0x30A50024 -.word 0x00250026 -.word 0x400020A5 -.word 0x00270028 -.word 0x0029002A -.word 0x002B30A5 -.word 0x002C002D -.word 0x002E30A5 -.word 0x002F0030 -.word 0x00314000 -.word 0x20A50032 -.word 0x00330034 -.word 0x00350036 -.word 0x30A50037 -.word 0x00380039 -.word 0x003A30A5 -.word 0x003B003C -.word 0x003D003E -.word 0x400020A5 -.word 0x003F0040 -.word 0x004120A5 -.word 0x00420043 -.word 0x00440045 -.word 0x004620A5 -.word 0x00470048 -.word 0x00494000 -.word 0x20A5004A -.word 0x004B30A5 -.word 0x004C30A5 -.word 0x004D4000 -.word 0x20A5004E -.word 0x004F20A5 -.word 0x00500051 -.word 0x20A50052 -.word 0x00534000 -.word 0x20A50054 -.word 0x210E0055 -.word 0x00564000 - -glabel D_800E18F8 -.word 0x10000000 -.word 0x00010002 -.word 0x00034000 -.word 0x61F40004 -.word 0x00050006 -.word 0x00074000 -.word 0x61F40008 -.word 0x0009000A -.word 0x000B4000 -.word 0x61F4000C -.word 0x000D000E -.word 0x000F4000 -.word 0x61F40010 -.word 0x00110012 -.word 0x00134000 -.word 0x10000000 - -glabel D_800E1938 -.word 0x800E7D08 -.word 0x800E7D10 -.word 0x800E7D24 -.word 0x800E7D30 -.word 0x800E7D44 -.word 0x800E7D50 -.word 0x800E7D58 -.word 0x800E7D60 -.word 0x800E7D70 -.word 0x800E7D7C -.word 0x800E7D88 -.word 0x800E7D94 -.word 0x800E7DA0 -.word 0x800E7DA8 -.word 0x800E7DB8 -.word 0x800E7DC0 -.word 0x800E7DD0 -.word 0x800E7DD8 -.word 0x800E7DE0 -.word 0x800E7DF0 -.word 0x800E7DFC -.word 0x800E7E04 -.word 0x800E7E18 -.word 0x800E7E24 -.word 0x800E7E34 -.word 0x800E7E40 -.word 0x800E7E48 -.word 0x800E7E54 -.word 0x800E7E68 -.word 0x800E7E74 -.word 0x800E7E84 -.word 0x800E7E90 -.word 0x800E7E9C -.word 0x800E7EA4 -.word 0x800E7EB0 -.word 0x800E7EBC -.word 0x800E7EC4 -.word 0x800E7ED0 -.word 0x800E7EDC -.word 0x800E7EEC -.word 0x800E7F04 -.word 0x800E7F0C -.word 0x800E7F18 -.word 0x800E7F24 -.word 0x800E7F30 -.word 0x800E7F38 -.word 0x800E7F40 -.word 0x800E7F48 -.word 0x800E7F50 -.word 0x800E7F5C -.word 0x800E7F68 -.word 0x800E7F78 -.word 0x800E7F84 -.word 0x800E7F8C -.word 0x800E7F98 -.word 0x800E7FA4 -.word 0x800E7FB0 -.word 0x800E7FBC -.word 0x800E7FC8 -.word 0x800E7FD4 -.word 0x800E7FE0 -.word 0x800E7FEC -.word 0x800E7FFC -.word 0x800E8004 -.word 0x800E8014 -.word 0x800E8024 -.word 0x800E8034 -.word 0x800E8044 -.word 0x800E8050 -.word 0x800E8058 -.word 0x800E8064 -.word 0x800E8070 -.word 0x800E8080 -.word 0x800E8088 -.word 0x800E8094 -.word 0x800E80A8 -.word 0x800E80B4 -.word 0x800E80C0 -.word 0x800E80CC -.word 0x800E80DC -.word 0x800E80E8 -.word 0x800E80F4 -.word 0x800E8100 -.word 0x800E8114 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x800E8120 -.word 0x800E8128 -.word 0x800E8130 -.word 0x800E8138 -.word 0x800E8140 -.word 0x800E8148 -.word 0x800E8150 -.word 0x800E8158 -.word 0x800E8160 -.word 0x800E8168 -.word 0x800E8170 -.word 0x800E8178 -.word 0x800E8180 -.word 0x800E8188 -.word 0x800E8190 -.word 0x800E8198 -.word 0x800E81A0 -.word 0x800E81A8 -.word 0x800E81B0 -.word 0x800E81B8 - -glabel D_800E1AE4 -.word 0x800E81C0 -.word 0x800E81CC -.word 0x800E81E0 -.word 0x800E81E8 -.word 0x800E81F4 - -glabel D_800E1AF8 -.word 0x00000010 -.word 0x00000020 -.word 0x00000040 -.word 0x00000080 -.word 0x00000100 -.word 0x00000400 -.word 0x00000800 -.word 0x00001000 -.word 0x00002000 -.word 0x00004000 -.word 0x00008000 -.word 0x00010000 -.word 0x00020000 -.word 0x00040000 -.word 0x00080000 -.word 0x00100000 -.word 0x00200000 -.word 0x00400000 -.word 0x00800000 -.word 0x01000000 -.word 0x02000000 - -glabel D_800E1B4C -.word 0x00000000 - -glabel D_800E1B50 -.word 0x01E00068 -.word 0x00A00068 - -glabel D_800E1B58 -.word 0xFF600068 -.word 0xFF00FF30 -.word 0xFF000400 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x01E00084 -.word 0x00A00084 -.word 0xFF600084 -.word 0xFFFFFF00 -.word 0xFF020400 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x01E00068 -.word 0x00A00068 -.word 0xFF600068 -.word 0xFFFFFF00 -.word 0xFF020400 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x01E00084 -.word 0x00A00084 -.word 0xFF600084 -.word 0xFFFFFF00 -.word 0xFF020400 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x01E00068 -.word 0x00A00068 -.word 0xFF600068 -.word 0xFFFFFF00 -.word 0xFF020400 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x01E00084 -.word 0x00A00084 -.word 0xFF600084 -.word 0xFFFFFF00 -.word 0xFF020400 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x01E00068 -.word 0x00A00068 -.word 0xFF600068 -.word 0xFFFFFF00 -.word 0xFF020400 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x01E00084 -.word 0x00A00084 -.word 0xFF600084 -.word 0xFFFFFF00 -.word 0xFF020400 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E1C70 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xB9000002 -.word 0x00000000 -.word 0xB6000000 -.word 0x00010001 -.word 0xB8000000 -.word 0x00000000 -.word 0xFCFFFFFF -.word 0xFFFE793C -.word 0xEF000C0F -.word 0x00504240 -.word 0xFC121824 -.word 0xFF33FFFF -.word 0xEF082C0F -.word 0x00504240 -.word 0xFCFFFFFF -.word 0xFFFDF6FB -.word 0xEF000C0F -.word 0x00504240 - -glabel D_800E1CD0 -.word 0x00010200 -.word 0x02030405 -.word 0x06040607 -.word 0x08090A08 -.word 0x0A0B0C0D -.word 0x0E0C0E0F -.word 0x10111210 -.word 0x12130000 - -glabel D_800E1CF0 -.word 0x00000300 -.word 0x02010000 -.word 0x02010101 -.word 0x02010300 -.word 0x03030201 -.word 0x03030202 -.word 0x01020202 -.word 0x03030102 -.word 0x03030003 -.word 0x00000101 -.word 0x01020000 -.word 0x01020003 -.word 0x01010201 -.word 0x02020101 -.word 0x02020102 - -glabel D_800E1D2C -.word 0x00000000 -.word 0x01000000 -.word 0x01FF00FF -.word 0x000100FF -.word 0x01FF00FF -.word 0x01000000 -.word 0x0100FF00 -.word 0x01FFFF01 -.word 0x0001FF01 -.word 0x01FFFF01 -.word 0x0100FF00 -.word 0x0000FF00 -.word 0x00000000 -.word 0x000100FF -.word 0x0001FF01 -.word 0x0000FF00 -.word 0x000100FF -.word 0x01FF00FF -.word 0x01FFFF01 -.word 0x0001FF01 - -glabel D_800E1D7C -.word 0x00D800D8 -.word 0x00D80100 -.word 0x00B000B0 -.word 0x00B00100 -.word 0x00600060 -.word 0x00600100 -.word 0x00880088 -.word 0x00880100 -.word 0x01000100 -.word 0x01000100 - -glabel D_800E1DA4 -.word 0x00000000 - -glabel D_800E1DA8 -.word 0x00000000 - -glabel D_800E1DAC -.word 0x00000000 - -glabel D_800E1DB0 -.word 0x00000000 - -glabel D_800E1DB4 -.word 0x00000000 - -glabel D_800E1DB8 -.word 0x00000000 - -glabel D_800E1DBC -.word 0x00000000 - -glabel D_800E1DC0 -.word 0x00000020 - -glabel D_800E1DC4 -.word 0x00000020 - -glabel D_800E1DC8 -.word 0x00010001 -.word 0xFFFF0001 -.word 0xFFFF0001 -.word 0xFFFFFFFF -.word 0x0001FFFF -.word 0xFFFFFFFF -.word 0x00010001 -.word 0x0001FFFF - -glabel D_800E1DE8 -.word 0x00000000 -.word 0x0078FFFF - -glabel D_800E1DF0 -.aligned_text "(C) COPYRIGHT RARE 1997" - -glabel D_800E1E08 -.word 0x00000000 -.word 0x0034FFFF - -glabel D_800E1E10 -.word 0x800E8200 - -glabel D_800E1E14 -.word 0x00000000 - -glabel D_800E1E18 -.word 0x00000000 - -glabel D_800E1E1C -.word 0x00000000 - -glabel D_800E1E20 -.word 0x00FF0100 -.word 0x0001FF00 - -glabel D_800E1E28 -.word 0x00000000 - -glabel D_800E1E2C -.word 0x004C004D -.word 0x004E004F -.word 0x005B005C -.word 0x00000042 -.word 0xFFFF0000 - -glabel D_800E1E40 -.word 0x000D000E -.word 0x000F0010 -.word 0x00080009 -.word 0x0000000A -.word 0xFFFF0000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +# +# glabel D_800E0970 +# .word 0x00000000 +# +# glabel D_800E0974 +# .word 0x00000000 +# +# glabel D_800E0978 +# .word 0x800E7D04 +# +# glabel D_800E097C +# .word 0x00000000 +# +# glabel D_800E0980 +# .word 0x00000000 +# +# glabel D_800E0984 +# .word 0x00000000 +# +# glabel D_800E0988 +# .word 0x00000000 +# +# glabel D_800E098C +# .word 0x00000000 +# +# glabel D_800E0990 +# .word 0x4040FFA0 +# .word 0xFF4040A0 +# .word 0xD0C020B0 +# .word 0x20C040B0 +# +# glabel D_800E09A0 +# .word 0x00FF0080 +# .word 0x00FF0060 +# .word 0x0000FF60 +# .word 0x0000FF80 +# +# glabel D_800E09B0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E09C4 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E09D8 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E09EC +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E09F8 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0A04 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0A14 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0A24 +# .word 0x0005003B +# .word 0x00320033 +# .word 0x00340035 +# .word 0x00360039 +# .word 0x00370038 +# .word 0x003A0000 +# .word 0x0001FFFF +# +# glabel D_800E0A40 +# .word 0x00040000 +# .word 0x0001FFFF +# .word 0x03000000 +# .word 0x0012FFFF +# +# glabel D_800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0A60 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0A70 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0A80 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0A90 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0AA0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0AB0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0AC0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0AD0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0AE0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0AF0 +# .word 0x800E0A50 +# .word 0x800E0A60 +# .word 0x800E0A70 +# .word 0x800E0A80 +# .word 0x800E0A90 +# .word 0x800E0AA0 +# .word 0x800E0AB0 +# .word 0x800E0AC0 +# .word 0x800E0AD0 +# .word 0x800E0AE0 +# +# glabel D_800E0B18 +# .word 0x0140017C +# .word 0x01B801F4 +# .word 0x0230026C +# .word 0x02A802E4 +# .word 0x01E00000 +# .word 0x00180039 +# .word 0x005A007B +# .word 0x009C00BD +# .word 0x00DE00FF +# .word 0x00A00000 +# .word 0x014001B8 +# .word 0x023002A8 +# .word 0x01E00000 +# .word 0x00180065 +# .word 0x00B30100 +# .word 0x00A00000 +# .word 0x014001F4 +# .word 0x02A801E0 +# .word 0x0028008C +# .word 0x00F000A0 +# .word 0x01E000C0 +# .word 0x00A000C0 +# .word 0xFF6000C0 +# .word 0xFF80FFEC +# .word 0xFFE4FFE6 +# .word 0x0050FFF8 +# .word 0xFFE4FFF4 +# .word 0xFFE40006 +# .word 0xFFE40018 +# .word 0x00500008 +# .word 0x00000078 +# .word 0x0000003C +# .word 0x0000001E +# .word 0x00000384 +# .word 0x0000001E +# .word 0x0000001E +# .word 0x00000384 +# +# .aligned_text "1ST" +# .aligned_text "2ND" +# .aligned_text "3RD" +# .aligned_text "4TH" +# .aligned_text "5TH" +# .aligned_text "6TH" +# .aligned_text "7TH" +# .aligned_text "8TH" +# +# glabel D_800E0BCC +# .word 0x800E0BAC +# .word 0x800E0BB0 +# .word 0x800E0BB4 +# .word 0x800E0BB8 +# .word 0x800E0BBC +# .word 0x800E0BC0 +# .word 0x800E0BC4 +# .word 0x800E0BC8 +# +# glabel D_800E0BEC +# .word 0x016000AC +# .word 0x002000AC +# .word 0xFEE000AC +# .word 0xFFFFFF00 +# .word 0xFF000003 +# glabel D_800E0C00 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x01C400A6 +# .word 0x008400A6 +# .word 0xFF4400A6 +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x023000B8 +# .word 0x00F000B8 +# .word 0xFFB000B8 +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x01C400B4 +# .word 0x008400B4 +# .word 0xFF4400B4 +# .word 0xFFC0FF00 +# .word 0xFF000001 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x01C400C6 +# .word 0x008400C6 +# .word 0xFF4400C6 +# .word 0xFFC0FF00 +# .word 0xFF000001 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x01C400D8 +# .word 0x008400D8 +# .word 0xFF4400D8 +# .word 0xFFC0FF00 +# .word 0xFF000001 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x023000C8 +# .word 0x00F000C8 +# .word 0xFFB000C8 +# .word 0x80FFFF00 +# .word 0xFF000001 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 + +# glabel D_800E0CEC +# .word 0x023F00AC +# .word 0x00FF00AC +# .word 0xFFBF00AC +# .word 0xFFFFFF00 +# .word 0xFF000003 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x021E00AC +# .word 0x00DE00AC +# .word 0xFF9E00AC +# .word 0xFFFFFF00 +# .word 0xFF000003 +# glabel D_800E0D20 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x01FD00AC +# .word 0x00BD00AC +# .word 0xFF7D00AC +# .word 0xFFFFFF00 +# .word 0xFF000003 +# glabel D_800E0D40 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x01DC00AC +# .word 0x009C00AC +# .word 0xFF5C00AC +# .word 0xFFFFFF00 +# .word 0xFF000003 +# glabel D_800E0D60 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x01BB00AC +# .word 0x007B00AC +# .word 0xFF3B00AC +# .word 0xFFFFFF00 +# .word 0xFF000003 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x019A00AC +# .word 0x005A00AC +# .word 0xFF1A00AC +# .word 0xFFFFFF00 +# .word 0xFF000003 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x017900AC +# .word 0x003900AC +# .word 0xFEF900AC +# .word 0xFFFFFF00 +# .word 0xFF000003 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0DCC +# .word 0x015800AC +# .word 0x001800AC +# .word 0xFED800A6 +# .word 0xFFFFFF00 +# .word 0xFF000003 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x01E100A6 +# .word 0x00A100A6 +# .word 0xFF6100A6 +# .word 0x000000FF +# .word 0x80000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x01DF00A4 +# .word 0x009F00A4 +# .word 0xFF5F00A4 +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0E4C +# .word 0x01E100AE +# .word 0x00A100AE +# .word 0xFF6100AE +# .word 0x000000FF +# .word 0x80000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x01DF00AC +# .word 0x009F00AC +# .word 0xFF5F00AC +# .word 0xFFFFFF00 +# .word 0xFF000C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x017000C0 +# .word 0x003000C0 +# .word 0xFEF000C0 +# .word 0xFF404060 +# .word 0xFF000800 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x01FA00BB +# .word 0x00BA00BB +# .word 0xFF7A00BB +# .word 0xFFC0FF00 +# .word 0xFF000001 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x024200C0 +# .word 0x010200C0 +# .word 0xFFC200C0 +# .word 0xFF80FF60 +# .word 0xFF000C00 +# .word 0x80126390 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x017000D4 +# .word 0x003000D4 +# .word 0xFEF000D4 +# .word 0xFF404060 +# .word 0xFF000800 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x01FA00CF +# .word 0x00BA00CF +# .word 0xFF7A00CF +# .word 0x80FFFF00 +# .word 0xFF000001 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x024200D4 +# .word 0x010200D4 +# .word 0xFFC200D4 +# .word 0xFF80FF60 +# .word 0xFF000C00 +# .word 0x80126394 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E0F6C +# .ascii "ABCDEFGHIJKLMNOPQRSTUVWXYZ.? " +# glabel D_800E0F8C # I'm assuming that this points to the null terminator of the above string +# .word 0x00000000 +# +# glabel D_800E0F90 +# .word 0x000000C0 +# +# glabel D_800E0F94 +# .word 0x000000A0 +# +# glabel D_800E0F98 +# .word 0x00000078 +# +# glabel D_800E0F9C +# .word 0x00000002 +# +# glabel D_800E0FA0 +# .word 0x00000000 +# +# glabel D_800E0FA4 +# .word 0x00000000 +# +# glabel D_800E0FA8 +# .aligned_text "DKR" +# +# glabel D_800E0FAC +# .word 0x00000000 +# +# glabel D_800E0FB0 +# .word 0x00000000 +# +# glabel D_800E0FB4 +# .word 0x00040000 +# .word 0x00010018 +# .word 0x0019001A +# .word 0x001B001C +# .word 0x001D001E +# .word 0x001F0020 +# .word 0x00210022 +# .word 0x00230030 +# .word 0x005EFFFF +# +# glabel D_800E0FD8 +# .word 0x00070000 +# .word 0x00010002 +# .word 0x0003FFFF +# +# glabel D_800E0FE4 +# .word 0x00000008 +# +# glabel gTrophyRaceWorldId +# .word 0x00000000 +# +# glabel D_800E0FEC +# .word 0x00000000 +# +# glabel D_800E0FF0 +# .word 0x00000000 +# +# .word 0x01FFFFFF +# .word 0x0012FFFF +# .word 0x81FFFFFF +# .word 0x00120000 +# +# glabel D_800E1004 +# .word 0x00000009 +# .word 0x00000007 +# .word 0x00000005 +# .word 0x00000003 +# .word 0x00000001 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E1024 +# .word 0x00320033 +# .word 0x00340035 +# .word 0x00360037 +# .word 0x00380039 +# .word 0x003A003B +# .word 0x00000001 +# .word 0xFFFF0000 +# +# glabel D_800E1040 +# .word 0x00000001 +# .word 0xFFFF0000 + +# glabel D_800E1048 +# .word 0x01E10023 +# .word 0x00A10023 +# .word 0xFF610023 +# .word 0x000000FF +# .word 0x80020C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x01E00020 +# .word 0x00A00020 +# .word 0xFF600020 +# .word 0xFFFFFF00 +# .word 0xFF020C00 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# glabel D_800E1088 +# .word 0x0040FF40 +# .word 0x00400030 +# .word 0x00400120 +# .word 0xFFFFFF00 +# .word 0xFF000003 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0020FF40 +# .word 0x00200030 +# .word 0x00200120 +# .word 0xFFFFFF00 +# .word 0xFF000000 +# .word 0x800E0BAC +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0082FF54 +# .word 0x00820044 +# .word 0x00820134 +# .word 0xFFFFFF00 +# .word 0xFF000402 +# .word 0x800E1004 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0040FF6A +# .word 0x0040005A +# .word 0x0040014A +# .word 0xFFFFFF00 +# .word 0xFF000003 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0020FF6A +# .word 0x0020005A +# .word 0x0020014A +# .word 0xFFFFFF00 +# .word 0xFF000000 +# .word 0x800E0BB0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0082FF7E +# .word 0x0082006E +# .word 0x0082015E +# .word 0xFFC0FF00 +# .word 0xFF000402 +# .word 0x800E1008 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0040FF94 +# .word 0x00400084 +# .word 0x00400174 +# .word 0xFFFFFF00 +# .word 0xFF000003 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0020FF94 +# .word 0x00200084 +# .word 0x00200174 +# .word 0xFFFFFF00 +# .word 0xFF000000 +# .word 0x800E0BB4 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0082FFA8 +# .word 0x00820098 +# .word 0x00820188 +# .word 0xFF80FF00 +# .word 0xFF000402 +# .word 0x800E100C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0040FFBE +# .word 0x004000AE +# .word 0x0040019E +# .word 0xFFFFFF00 +# .word 0xFF000003 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0020FFBE +# .word 0x002000AE +# .word 0x0020019E +# .word 0xFFFFFF00 +# .word 0xFF000000 +# .word 0x800E0BB8 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0082FFD2 +# .word 0x008200C2 +# .word 0x008201B2 +# .word 0xFF40FF00 +# .word 0xFF000402 +# .word 0x800E1010 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00DC0120 +# .word 0x00DC0030 +# .word 0x00DCFF40 +# .word 0xFFFFFF00 +# .word 0xFF000003 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00BC0120 +# .word 0x00BC0030 +# .word 0x00BCFF40 +# .word 0xFFFFFF00 +# .word 0xFF000000 +# .word 0x800E0BBC +# .word 0x00000000 +# .word 0x00000000 +# .word 0x011E0134 +# .word 0x011E0044 +# .word 0x011EFF54 +# .word 0xFFFFFF00 +# .word 0xFF000402 +# .word 0x800E1014 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00DC014A +# .word 0x00DC005A +# .word 0x00DCFF60 +# .word 0xFFFFFF00 +# .word 0xFF000003 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00BC014A +# .word 0x00BC005A +# .word 0x00BCFF6A +# .word 0xFFFFFF00 +# .word 0xFF000000 +# .word 0x800E0BC0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x011E015E +# .word 0x011E006E +# .word 0x011EFF7E +# .word 0xFFC0FF00 +# .word 0xFF000402 +# .word 0x800E1018 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00DC0174 +# .word 0x00DC0084 +# .word 0x00DCFF94 +# .word 0xFFFFFF00 +# .word 0xFF000003 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00BC0174 +# .word 0x00BC0084 +# .word 0x00BCFF94 +# .word 0xFFFFFF00 +# .word 0xFF000000 +# .word 0x800E0BC4 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x011E0188 +# .word 0x011E0098 +# .word 0x011EFFA8 +# .word 0xFF80FF00 +# .word 0xFF000402 +# .word 0x800E101C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00DC019E +# .word 0x00DC00AE +# .word 0x00DCFFBE +# .word 0xFFFFFF00 +# .word 0xFF000003 +# .word 0x800E0A50 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00BC019E +# .word 0x00BC00AE +# .word 0x00BCFFBE +# .word 0xFFFFFF00 +# .word 0xFF000000 +# .word 0x800E0BC8 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x011E01B2 +# .word 0x011E00C2 +# .word 0x011EFFD2 +# .word 0xFF40FF00 +# .word 0xFF000402 +# .word 0x800E1020 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x00400020 +# .word 0x00820040 +# .word 0x00200082 +# .word 0x00400020 +# .word 0x00820040 +# .word 0x00200082 +# .word 0x00DC00BC +# .word 0x011E00DC +# .word 0x00BC011E +# .word 0x00DC00BC +# .word 0x011E00DC +# .word 0x00BC011E +# .word 0x00300030 +# .word 0x0044005A +# .word 0x005A006E +# .word 0x00840084 +# .word 0x009800AE +# .word 0x00AE00C2 +# .word 0x00300030 +# .word 0x0044005A +# .word 0x005A006E +# .word 0x00840084 +# .word 0x009800AE +# .word 0x00AE00C2 +# .word 0x00380038 +# .word 0x0040006A +# .word 0x006A0072 +# .word 0x009C009C +# .word 0x00A400CE +# .word 0x00CE00D6 +# .word 0x00380038 +# .word 0x0040006A +# .word 0x006A0072 +# .word 0x009C009C +# .word 0x00A400CE +# .word 0x00CE00D6 +# .word 0x00400020 +# .word 0x00820040 +# .word 0x00200082 +# .word 0x00400020 +# .word 0x008200DC +# .word 0x00BC011E +# .word 0x00DC00BC +# .word 0x011E00DC +# .word 0x00BC011E +# .word 0x00340034 +# .word 0x0048006F +# .word 0x006F0083 +# .word 0x00AA00AA +# .word 0x00BE0034 +# .word 0x00340048 +# .word 0x006F006F +# .word 0x008300AA +# .word 0x00AA00BE +# .word 0x004C004C +# .word 0x0054007E +# .word 0x007E0086 +# .word 0x00B000B0 +# .word 0x00B8004C +# .word 0x004C0054 +# .word 0x007E007E +# .word 0x008600B0 +# .word 0x00B000B8 +# .word 0x008C006C +# .word 0x00CE008C +# .word 0x006C00CE +# .word 0x008C006C +# .word 0x00CE008C +# .word 0x006C00CE +# +# glabel D_800E14BC +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x800E14A4 +# .word 0x800E145C +# .word 0x800E14A4 +# .word 0x800E13D8 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x800E1438 +# .word 0x800E145C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x800E13A8 +# .word 0x800E13D8 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x800E14A4 +# .word 0x800E1480 +# .word 0x800E14A4 +# .word 0x800E1408 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x800E1438 +# .word 0x800E1480 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x800E13A8 +# .word 0x800E1408 + +# glabel D_800E153C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00400000 +# .word 0x00000000 +# .word 0x00800000 +# .word 0x00000000 +# .word 0x00C00000 +# .word 0x00000000 +# .word 0x01000000 +# +# glabel D_800E1564 +# .word 0x00000000 +# .word 0x00000020 +# .word 0x00000000 +# .word 0x00400020 +# .word 0x00000000 +# .word 0x00800020 +# .word 0x00000000 +# .word 0x00C00020 +# .word 0x00000000 +# .word 0x01000020 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E1594 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00400000 +# .word 0x00000000 +# .word 0x00800000 +# .word 0x00000000 +# .word 0x00C00000 +# .word 0x00000000 +# .word 0x01000000 +# +# glabel D_800E15BC +# .word 0x00000000 +# .word 0x00000020 +# .word 0x00000000 +# .word 0x00400020 +# .word 0x00000000 +# .word 0x00800020 +# .word 0x00000000 +# .word 0x00C00020 +# .word 0x00000000 +# .word 0x01000020 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E15EC +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00400000 +# .word 0x00000000 +# .word 0x00800000 +# .word 0x00000000 +# .word 0x00C00000 +# .word 0x00000000 +# .word 0x01000000 +# +# glabel D_800E1614 +# .word 0x00000000 +# .word 0x00000020 +# .word 0x00000000 +# .word 0x00400020 +# .word 0x00000000 +# .word 0x00800020 +# .word 0x00000000 +# .word 0x00C00020 +# .word 0x00000000 +# .word 0x01000020 +# .word 0x00000000 +# .word 0x00000000 + +# glabel D_800E1644 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00400000 +# .word 0x00000000 +# .word 0x00800000 +# .word 0x00000000 +# .word 0x00C00000 +# .word 0x00000000 +# .word 0x01000000 +# +# glabel D_800E166C +# .word 0x00000000 +# .word 0x00000020 +# .word 0x00000000 +# .word 0x00400020 +# .word 0x00000000 +# .word 0x00800020 +# .word 0x00000000 +# .word 0x00C00020 +# .word 0x00000000 +# .word 0x01000020 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E169C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00400000 +# .word 0x00000000 +# .word 0x00800000 +# .word 0x00000000 +# .word 0x00C00000 +# .word 0x00000000 +# .word 0x01000000 +# +# glabel D_800E16C4 +# .word 0x00000000 +# .word 0x00000020 +# .word 0x00000000 +# .word 0x00400020 +# .word 0x00000000 +# .word 0x00800020 +# .word 0x00000000 +# .word 0x00C00020 +# .word 0x00000000 +# .word 0x01000020 +# .word 0x00000000 +# .word 0x00000000 +# +# .word 0x800E153C +# .word 0x800E1594 +# .word 0x800E15EC +# .word 0x800E1644 +# .word 0x800E169C +# +# glabel D_800E1708 +# .word 0x000E000F +# .word 0x00100011 +# .word 0x00120013 +# .word 0x00140015 +# .word 0x00160017 +# .word 0x00180019 +# .word 0x001A001B +# .word 0x001C001D +# .word 0x00320033 +# .word 0x00340036 +# .word 0x00350037 +# .word 0x00380039 +# .word 0x003A003B +# .word 0x00000001 +# .word 0x0004003D +# .word 0x003C003F +# .word 0x003EFFFF +# +# glabel D_800E174C +# .word 0x00000001 +# .word 0x0007FFFF +# +# glabel D_800E1754 +# .word 0x00780012 +# .word 0x00080006 +# .word 0x00C00006 +# .word 0x00D4001A +# .word 0x00780022 +# +# glabel D_800E1768 +# .word 0x00320033 +# .word 0x00340035 +# .word 0x00360037 +# .word 0x00380039 +# .word 0x003A003B +# .word 0xFFFF0000 +# +# glabel D_800E1780 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001402 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xBA001102 +# .word 0x00000000 +# .word 0xBA001301 +# .word 0x00000000 +# .word 0xBA000C02 +# .word 0x00002000 +# .word 0xBA000903 +# .word 0x00000C00 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB900031D +# .word 0x00504340 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800E17D8 +# .word 0x00320033 +# .word 0x00340035 +# .word 0x00360037 +# .word 0x00380039 +# .word 0x003A003B +# .word 0xFFFF0000 +# +# glabel D_800E17F0 +# .word 0xFFFF0000 +# +# glabel D_800E17F4 +# .word 0x20A50000 +# .word 0x20A50001 +# .word 0x000220A5 +# .word 0x00030004 +# .word 0x00050006 +# .word 0x400020A5 +# .word 0x00070008 +# .word 0x20A50009 +# .word 0x000A000B +# .word 0x000C30A5 +# .word 0x000D000E +# .word 0x000F4000 +# .word 0x20A50010 +# .word 0x001120A5 +# .word 0x00120013 +# .word 0x20A50014 +# .word 0x400020A5 +# .word 0x00150016 +# .word 0x20A50017 +# .word 0x001820A5 +# .word 0x0019001A +# .word 0x400020A5 +# .word 0x001B001C +# .word 0x001D001E +# .word 0x001F30A5 +# .word 0x00200021 +# .word 0x00220023 +# .word 0x30A50024 +# .word 0x00250026 +# .word 0x400020A5 +# .word 0x00270028 +# .word 0x0029002A +# .word 0x002B30A5 +# .word 0x002C002D +# .word 0x002E30A5 +# .word 0x002F0030 +# .word 0x00314000 +# .word 0x20A50032 +# .word 0x00330034 +# .word 0x00350036 +# .word 0x30A50037 +# .word 0x00380039 +# .word 0x003A30A5 +# .word 0x003B003C +# .word 0x003D003E +# .word 0x400020A5 +# .word 0x003F0040 +# .word 0x004120A5 +# .word 0x00420043 +# .word 0x00440045 +# .word 0x004620A5 +# .word 0x00470048 +# .word 0x00494000 +# .word 0x20A5004A +# .word 0x004B30A5 +# .word 0x004C30A5 +# .word 0x004D4000 +# .word 0x20A5004E +# .word 0x004F20A5 +# .word 0x00500051 +# .word 0x20A50052 +# .word 0x00534000 +# .word 0x20A50054 +# .word 0x210E0055 +# .word 0x00564000 +# +# glabel D_800E18F8 +# .word 0x10000000 +# .word 0x00010002 +# .word 0x00034000 +# .word 0x61F40004 +# .word 0x00050006 +# .word 0x00074000 +# .word 0x61F40008 +# .word 0x0009000A +# .word 0x000B4000 +# .word 0x61F4000C +# .word 0x000D000E +# .word 0x000F4000 +# .word 0x61F40010 +# .word 0x00110012 +# .word 0x00134000 +# .word 0x10000000 +# +# glabel D_800E1938 +# .word 0x800E7D08 +# .word 0x800E7D10 +# .word 0x800E7D24 +# .word 0x800E7D30 +# .word 0x800E7D44 +# .word 0x800E7D50 +# .word 0x800E7D58 +# .word 0x800E7D60 +# .word 0x800E7D70 +# .word 0x800E7D7C +# .word 0x800E7D88 +# .word 0x800E7D94 +# .word 0x800E7DA0 +# .word 0x800E7DA8 +# .word 0x800E7DB8 +# .word 0x800E7DC0 +# .word 0x800E7DD0 +# .word 0x800E7DD8 +# .word 0x800E7DE0 +# .word 0x800E7DF0 +# .word 0x800E7DFC +# .word 0x800E7E04 +# .word 0x800E7E18 +# .word 0x800E7E24 +# .word 0x800E7E34 +# .word 0x800E7E40 +# .word 0x800E7E48 +# .word 0x800E7E54 +# .word 0x800E7E68 +# .word 0x800E7E74 +# .word 0x800E7E84 +# .word 0x800E7E90 +# .word 0x800E7E9C +# .word 0x800E7EA4 +# .word 0x800E7EB0 +# .word 0x800E7EBC +# .word 0x800E7EC4 +# .word 0x800E7ED0 +# .word 0x800E7EDC +# .word 0x800E7EEC +# .word 0x800E7F04 +# .word 0x800E7F0C +# .word 0x800E7F18 +# .word 0x800E7F24 +# .word 0x800E7F30 +# .word 0x800E7F38 +# .word 0x800E7F40 +# .word 0x800E7F48 +# .word 0x800E7F50 +# .word 0x800E7F5C +# .word 0x800E7F68 +# .word 0x800E7F78 +# .word 0x800E7F84 +# .word 0x800E7F8C +# .word 0x800E7F98 +# .word 0x800E7FA4 +# .word 0x800E7FB0 +# .word 0x800E7FBC +# .word 0x800E7FC8 +# .word 0x800E7FD4 +# .word 0x800E7FE0 +# .word 0x800E7FEC +# .word 0x800E7FFC +# .word 0x800E8004 +# .word 0x800E8014 +# .word 0x800E8024 +# .word 0x800E8034 +# .word 0x800E8044 +# .word 0x800E8050 +# .word 0x800E8058 +# .word 0x800E8064 +# .word 0x800E8070 +# .word 0x800E8080 +# .word 0x800E8088 +# .word 0x800E8094 +# .word 0x800E80A8 +# .word 0x800E80B4 +# .word 0x800E80C0 +# .word 0x800E80CC +# .word 0x800E80DC +# .word 0x800E80E8 +# .word 0x800E80F4 +# .word 0x800E8100 +# .word 0x800E8114 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x800E8120 +# .word 0x800E8128 +# .word 0x800E8130 +# .word 0x800E8138 +# .word 0x800E8140 +# .word 0x800E8148 +# .word 0x800E8150 +# .word 0x800E8158 +# .word 0x800E8160 +# .word 0x800E8168 +# .word 0x800E8170 +# .word 0x800E8178 +# .word 0x800E8180 +# .word 0x800E8188 +# .word 0x800E8190 +# .word 0x800E8198 +# .word 0x800E81A0 +# .word 0x800E81A8 +# .word 0x800E81B0 +# .word 0x800E81B8 +# +# glabel D_800E1AE4 +# .word 0x800E81C0 +# .word 0x800E81CC +# .word 0x800E81E0 +# .word 0x800E81E8 +# .word 0x800E81F4 +# +# glabel D_800E1AF8 +# .word 0x00000010 +# .word 0x00000020 +# .word 0x00000040 +# .word 0x00000080 +# .word 0x00000100 +# .word 0x00000400 +# .word 0x00000800 +# .word 0x00001000 +# .word 0x00002000 +# .word 0x00004000 +# .word 0x00008000 +# .word 0x00010000 +# .word 0x00020000 +# .word 0x00040000 +# .word 0x00080000 +# .word 0x00100000 +# .word 0x00200000 +# .word 0x00400000 +# .word 0x00800000 +# .word 0x01000000 +# .word 0x02000000 +# +# glabel D_800E1B4C +# .word 0x00000000 + +# glabel D_800E1B50 +# .word 0x01E00068 +# .word 0x00A00068 +# glabel D_800E1B58 +# .word 0xFF600068 +# .word 0xFF00FF30 +# .word 0xFF000400 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x01E00084 +# .word 0x00A00084 +# .word 0xFF600084 +# .word 0xFFFFFF00 +# .word 0xFF020400 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x01E00068 +# .word 0x00A00068 +# .word 0xFF600068 +# .word 0xFFFFFF00 +# .word 0xFF020400 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x01E00084 +# .word 0x00A00084 +# .word 0xFF600084 +# .word 0xFFFFFF00 +# .word 0xFF020400 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x01E00068 +# .word 0x00A00068 +# .word 0xFF600068 +# .word 0xFFFFFF00 +# .word 0xFF020400 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x01E00084 +# .word 0x00A00084 +# .word 0xFF600084 +# .word 0xFFFFFF00 +# .word 0xFF020400 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x01E00068 +# .word 0x00A00068 +# .word 0xFF600068 +# .word 0xFFFFFF00 +# .word 0xFF020400 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x01E00084 +# .word 0x00A00084 +# .word 0xFF600084 +# .word 0xFFFFFF00 +# .word 0xFF020400 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E1C70 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB6000000 +# .word 0x00010001 +# .word 0xB8000000 +# .word 0x00000000 +# .word 0xFCFFFFFF +# .word 0xFFFE793C +# .word 0xEF000C0F +# .word 0x00504240 +# .word 0xFC121824 +# .word 0xFF33FFFF +# .word 0xEF082C0F +# .word 0x00504240 +# .word 0xFCFFFFFF +# .word 0xFFFDF6FB +# .word 0xEF000C0F +# .word 0x00504240 +# +#glabel D_800E1CD0 +#.word 0x00010200 +#.word 0x02030405 +#.word 0x06040607 +#.word 0x08090A08 +#.word 0x0A0B0C0D +#.word 0x0E0C0E0F +#.word 0x10111210 +#.word 0x12130000 +# +# glabel D_800E1CF0 +# .word 0x00000300 +# .word 0x02010000 +# .word 0x02010101 +# .word 0x02010300 +# .word 0x03030201 +# .word 0x03030202 +# .word 0x01020202 +# .word 0x03030102 +# .word 0x03030003 +# .word 0x00000101 +# .word 0x01020000 +# .word 0x01020003 +# .word 0x01010201 +# .word 0x02020101 +# .word 0x02020102 +# +# glabel D_800E1D2C +# .word 0x00000000 +# .word 0x01000000 +# .word 0x01FF00FF +# .word 0x000100FF +# .word 0x01FF00FF +# .word 0x01000000 +# .word 0x0100FF00 +# .word 0x01FFFF01 +# .word 0x0001FF01 +# .word 0x01FFFF01 +# .word 0x0100FF00 +# .word 0x0000FF00 +# .word 0x00000000 +# .word 0x000100FF +# .word 0x0001FF01 +# .word 0x0000FF00 +# .word 0x000100FF +# .word 0x01FF00FF +# .word 0x01FFFF01 +# .word 0x0001FF01 +# +# glabel D_800E1D7C +# .word 0x00D800D8 +# .word 0x00D80100 +# .word 0x00B000B0 +# .word 0x00B00100 +# .word 0x00600060 +# .word 0x00600100 +# .word 0x00880088 +# .word 0x00880100 +# .word 0x01000100 +# .word 0x01000100 +# +# glabel D_800E1DA4 +# .word 0x00000000 +# +# glabel D_800E1DA8 +# .word 0x00000000 +# +# glabel D_800E1DAC +# .word 0x00000000 +# +# glabel D_800E1DB0 +# .word 0x00000000 +# +# glabel D_800E1DB4 +# .word 0x00000000 +# +# glabel D_800E1DB8 +# .word 0x00000000 +# +# glabel D_800E1DBC +# .word 0x00000000 +# +# glabel D_800E1DC0 +# .word 0x00000020 +# +# glabel D_800E1DC4 +# .word 0x00000020 +# +# glabel D_800E1DC8 +# .word 0x00010001 +# .word 0xFFFF0001 +# .word 0xFFFF0001 +# .word 0xFFFFFFFF +# .word 0x0001FFFF +# .word 0xFFFFFFFF +# .word 0x00010001 +# .word 0x0001FFFF +# +# glabel D_800E1DE8 +# .word 0x00000000 +# .word 0x0078FFFF +# +# glabel D_800E1DF0 +# .aligned_text "(C) COPYRIGHT RARE 1997" +# +# glabel D_800E1E08 +# .word 0x00000000 +# .word 0x0034FFFF +# +# glabel D_800E1E10 +# .word 0x800E8200 +# +# glabel D_800E1E14 +# .word 0x00000000 +# +# glabel D_800E1E18 +# .word 0x00000000 +# +# glabel D_800E1E1C +# .word 0x00000000 +# +# glabel D_800E1E20 +# .word 0x00FF0100 +# .word 0x0001FF00 +# +# glabel D_800E1E28 +# .word 0x00000000 +# +# glabel D_800E1E2C +# .word 0x004C004D +# .word 0x004E004F +# .word 0x005B005C +# .word 0x00000042 +# .word 0xFFFF0000 +# +# glabel D_800E1E40 +# .word 0x000D000E +# .word 0x000F0010 +# .word 0x00080009 +# .word 0x0000000A +# .word 0xFFFF0000 +# +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 ###################################################### ############## unknown_09F8F0.c (.data) ############## +.word 0x00000000 + glabel D_800E1E64 .word 0x00000000 .word 0x00000000 diff --git a/include/structs.h b/include/structs.h index b76212c4..5cd71d69 100644 --- a/include/structs.h +++ b/include/structs.h @@ -20,10 +20,11 @@ typedef struct MenuElement { /* 0x10 */ u8 opacity; /* 0x11 */ u8 textType; /* 0x12 */ u8 textAlignFlags; - /* 0x13 */ u8 unk13; // Source type? 0 = ascii text, 7 = texture? + /* 0x13 */ u8 unk13; // Source type? 0 = ascii text, 2 = number, 7 = texture union { /* 0x14 */ char* asciiText; // Pointer to ascii text to be displayed on the screen. /* 0x14 */ u32* texture; // Pointer to texture to be displayed on the screen. + /* 0x14 */ s32* number; // Pointer to a number to be displayed on the screen. } source; /* 0x18 */ u16 backgroundRed; /* 0x1A */ u16 backgroundGreen; diff --git a/src/unknown_080500.c b/src/unknown_080500.c index 4526d757..a072dedd 100644 --- a/src/unknown_080500.c +++ b/src/unknown_080500.c @@ -733,63 +733,609 @@ s16 D_800E0840[148] = { s32 D_800E0968 = 0; s32 D_800E096C = 0; +s32 D_800E0970 = 0; +s32 D_800E0974 = 0; +u32* D_800E0978 = (u32*)0x800E7D04; +s32 D_800E097C = 0; +s32 D_800E0980 = 0; +s32 D_800E0984 = 0; +s32 D_800E0988 = 0; +s32 D_800E098C = 0; -extern s32 D_800E0970; -extern s32 D_800E0984; -extern s32 D_800E0988; -extern s32 D_800E0A24; -extern s32 D_800E0A40; -extern u32* D_800E0A50; -extern u32* D_800E0A60; -extern u32* D_800E0A70; -extern u32* D_800E0A90; -extern u32* D_800E0A80; -extern u32* D_800E0AA0; -extern u32* D_800E0AB0; -extern u32* D_800E0AC0; -extern u32* D_800E0AD0; -extern u32* D_800E0AE0; -extern u8 D_800E0F6C[0x20]; // "ABCDEFGHIJKLMNOPQRSTYVWXYZ.? " = Valid chars for name input. -extern s32 D_800E0F90; -extern s32 D_800E0F94; -extern s32 D_800E0F98; -extern s32 D_800E0F9C; -extern s32 D_800E0FA0; -extern s32 D_800E0FB4; -extern s32 D_800E0FE4; // Number of racers in trophy race? (1 to 8) -extern s32 D_800E0FEC; // Trophy race round? (0 to 3) -extern s32 gTrophyRaceWorldId; -extern s32 D_800E1024; -extern MenuElement D_800E1048; -extern MenuElement D_800E1088[8][3]; // 8 Racers with 3 MenuElement structs. -extern s32 D_800E1708; -extern s16 D_800E1768[10]; -extern s32 D_800E17D8; -extern s16 D_800E17F0[8]; // Unknown number of entries -extern u16 D_800E18F8; -extern char *D_800E1938[107]; // Credits text look-up table -extern char *D_800E1AE4[5]; // Credits text look-up table -extern s32 D_800E1AF8[28]; -extern s32 D_800E1B4C; // boolean, set to 1 if viewing credits from "WHODIDTHIS" cheat -extern s32 *D_800E1DA4[2]; -extern s32 *D_800E1DAC[2]; -extern s32 D_800E1DB4; -extern s32 D_800E1DB8; -extern s32 D_800E1DBC; -extern s8 D_800E1E28; +s16 D_800E0990[8] = { + 0x4040, 0xFFA0, 0xFF40, 0x40A0, + 0xD0C0, 0x20B0, 0x20C0, 0x40B0 +}; + +s16 D_800E09A0[8] = { + 0x00FF, 0x0080, 0x00FF, 0x0060, + 0x0000, 0xFF60, 0x0000, 0xFF80 +}; + +// Not sure about typing with these. +s32 D_800E09B0[5] = { 0, 0, 0, 0, 0 }; +s32 D_800E09C4[5] = { 0, 0, 0, 0, 0 }; +s32 D_800E09D8[5] = { 0, 0, 0, 0, 0 }; +s32 D_800E09EC[3] = { 0, 0, 0 }; +s32 D_800E09F8[3] = { 0, 0, 0 }; +s32 D_800E0A04[4] = { 0, 0, 0, 0 }; +s32 D_800E0A14[4] = { 0, 0, 0, 0 }; + +s16 D_800E0A24[14] = { + 0x0005, 0x003B, 0x0032, 0x0033, + 0x0034, 0x0035, 0x0036, 0x0039, + 0x0037, 0x0038, 0x003A, 0x0000, + 0x0001, 0xFFFF +}; + +s16 D_800E0A40[8] = { + 0x0004, 0x0000, 0x0001, 0xFFFF, + 0x0300, 0x0000, 0x0012, 0xFFFF +}; + +unk800DFC10 D_800E0A50 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0A60 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0A70 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0A90 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0A80 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0AA0 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0AB0 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0AC0 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0AD0 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0AE0 = { NULL, 0, 0, NULL, 0 }; + +unk800DFC10* D_800E0AF0[10] = { + &D_800E0A50, &D_800E0A60, &D_800E0A70, &D_800E0A80, + &D_800E0A90, &D_800E0AA0, &D_800E0AB0, &D_800E0AC0, + &D_800E0AD0, &D_800E0AE0 +}; + +s16 D_800E0B18[74] = { + 0x0140, 0x017C, 0x01B8, 0x01F4, + 0x0230, 0x026C, 0x02A8, 0x02E4, + 0x01E0, 0x0000, 0x0018, 0x0039, + 0x005A, 0x007B, 0x009C, 0x00BD, + 0x00DE, 0x00FF, 0x00A0, 0x0000, + 0x0140, 0x01B8, 0x0230, 0x02A8, + 0x01E0, 0x0000, 0x0018, 0x0065, + 0x00B3, 0x0100, 0x00A0, 0x0000, + 0x0140, 0x01F4, 0x02A8, 0x01E0, + 0x0028, 0x008C, 0x00F0, 0x00A0, + 0x01E0, 0x00C0, 0x00A0, 0x00C0, + 0xFF60, 0x00C0, 0xFF80, 0xFFEC, + 0xFFE4, 0xFFE6, 0x0050, 0xFFF8, + 0xFFE4, 0xFFF4, 0xFFE4, 0x0006, + 0xFFE4, 0x0018, 0x0050, 0x0008, + 0x0000, 0x0078, 0x0000, 0x003C, + 0x0000, 0x001E, 0x0000, 0x0384, + 0x0000, 0x001E, 0x0000, 0x001E, + 0x0000, 0x0384 +}; + +char gFirstPlace[4] = "1ST"; +char gSecondPlace[4] = "2ND"; +char gThirdPlace[4] = "3RD"; +char gFourthPlace[4] = "4TH"; +char gFifthPlace[4] = "5TH"; +char gSixthPlace[4] = "6TH"; +char gSeventhPlace[4] = "7TH"; +char gEighthPlace[4] = "8TH"; + +char *D_800E0BCC[8] = { + gFirstPlace, gSecondPlace, gThirdPlace, gFourthPlace, + gFifthPlace, gSixthPlace, gSeventhPlace, gEighthPlace +}; + +MenuElement D_800E0BEC[8] = { + { 352, 172, 32, 172, -288, 172, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 }, + { 452, 166, 132, 166, -188, 166, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 560, 184, 240, 184, -80, 184, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 452, 180, 132, 180, -188, 180, 255, 192, 255, 0, 255, 0, 0, 1, NULL, 0, 0, 0, 0 }, + { 452, 198, 132, 198, -188, 198, 255, 192, 255, 0, 255, 0, 0, 1, NULL, 0, 0, 0, 0 }, + { 452, 216, 132, 216, -188, 216, 255, 192, 255, 0, 255, 0, 0, 1, NULL, 0, 0, 0, 0 }, + { 560, 200, 240, 200, -80, 200, 128, 255, 255, 0, 255, 0, 0, 1, NULL, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0 }, +}; + +MenuElement D_800E0CEC[11] = { + { 575, 172, 255, 172, -65, 172, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 }, + { 542, 172, 222, 172, -98, 172, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 }, + { 509, 172, 189, 172, -131, 172, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 }, + { 476, 172, 156, 172, -164, 172, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 }, + { 443, 172, 123, 172, -197, 172, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 }, + { 410, 172, 90, 172, -230, 172, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 }, + { 377, 172, 57, 172, -263, 172, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 }, + { 344, 172, 24, 172, -296, 166, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 }, + { 481, 166, 161, 166, -159, 166, 0, 0, 0, 255, 128, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 479, 164, 159, 164, -161, 164, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0 }, + +}; + +MenuElement D_800E0E4C[9] = { + { 481, 174, 161, 174, -159, 174, 0, 0, 0, 255, 128, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 479, 172, 159, 172, -161, 172, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, + { 368, 192, 48, 192, -272, 192, 255, 64, 64, 96, 255, 0, 8, 0, NULL, 0, 0, 0, 0 }, + { 506, 187, 186, 187, -134, 187, 255, 192, 255, 0, 255, 0, 0, 1, NULL, 0, 0, 0, 0 }, + { 578, 192, 258, 192, -62, 192, 255, 128, 255, 96, 255, 0, 12, 0, (s32*)0x80126390, 0, 0, 0, 0 }, + { 368, 212, 48, 212, -272, 212, 255, 64, 64, 96, 255, 0, 8, 0, NULL, 0, 0, 0, 0 }, + { 506, 207, 186, 207, -134, 207, 128, 255, 255, 0, 255, 0, 0, 1, NULL, 0, 0, 0, 0 }, + { 578, 212, 258, 212, -62, 212, 255, 128, 255, 96, 255, 0, 12, 0, (s32*)0x80126394, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0 }, +}; + +// Valid characters for name input. Must be u8, not char. +u8 D_800E0F6C[32] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ.? "; + +s32 D_800E0F8C = 0; +s32 D_800E0F90 = 192; +s32 D_800E0F94 = 160; +s32 D_800E0F98 = 120; +s32 D_800E0F9C = 2; +s32 D_800E0FA0 = 0; +s32 D_800E0FA4 = 0; +char D_800E0FA8[4] = "DKR"; // Default file name? +s32 D_800E0FAC = 0; +s32 D_800E0FB0 = 0; + +s16 D_800E0FB4[18] = { + 0x0004, 0x0000, 0x0001, 0x0018, + 0x0019, 0x001A, 0x001B, 0x001C, + 0x001D, 0x001E, 0x001F, 0x0020, + 0x0021, 0x0022, 0x0023, 0x0030, + 0x005E, -1 +}; + +s16 D_800E0FD8[6] = { + 7, 0, 1, 2, 3, -1 +}; + +s32 D_800E0FE4 = 8; // Number of racers in trophy race? (1 to 8) +s32 gTrophyRaceWorldId = 0; +s32 D_800E0FEC = 0; // Trophy race round? (0 to 3) +s32 D_800E0FF0 = 0; + +// Unused? Not sure what this is. +u32 D_800E0FF4[4] = { + 0x01FFFFFF, 0x0012FFFF, 0x81FFFFFF, 0x00120000 +}; + +// Number of points to award in trophy race for each place? +s32 D_800E1004[8] = { + 9, 7, 5, 3, 1, 0, 0, 0 +}; + +s16 D_800E1024[14] = { + 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, + 0x39, 0x3A, 0x3B, 0x00, 0x01, -1, 0x00 +}; + +s32 D_800E1040 = 1; +s16 D_800E1044 = -1; + +MenuElement D_800E1048[9][3] = { + { + { 481, 35, 161, 35, -159, 35, 0, 0, 0, 255, 128, 2, 12, 0, NULL, 0, 0, 0, 0 }, + { 480, 32, 160, 32, -160, 32, 255, 255, 255, 0, 255, 2, 12, 0, NULL, 0, 0, 0, 0 }, + { 64, -192, 64, 48, 64, 288, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 } + }, + { + { 32, -192, 32, 48, 32, 288, 255, 255, 255, 0, 255, 0, 0, 0, gFirstPlace, 0, 0, 0, 0 }, + { 130, -172, 130, 68, 130, 308, 255, 255, 255, 0, 255, 0, 4, 2, &D_800E1004[0], 0, 0, 0, 0 }, + { 64, -150, 64, 90, 64, 330, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 } + }, + { + { 32, -150, 32, 90, 32, 330, 255, 255, 255, 0, 255, 0, 0, 0, gSecondPlace, 0, 0, 0, 0 }, + { 130, -130, 130, 110, 130, 350, 255, 192, 255, 0, 255, 0, 4, 2, &D_800E1004[1], 0, 0, 0, 0 }, + { 64, -108, 64, 132, 64, 372, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 } + }, + { + { 32, -108, 32, 132, 32, 372, 255, 255, 255, 0, 255, 0, 0, 0, gThirdPlace, 0, 0, 0, 0 }, + { 130, -88, 130, 152, 130, 392, 255, 128, 255, 0, 255, 0, 4, 2, &D_800E1004[2], 0, 0, 0, 0 }, + { 64, -66, 64, 174, 64, 414, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 } + }, + { + { 32, -66, 32, 174, 32, 414, 255, 255, 255, 0, 255, 0, 0, 0, gFourthPlace, 0, 0, 0, 0 }, + { 130, -46, 130, 194, 130, 434, 255, 64, 255, 0, 255, 0, 4, 2, &D_800E1004[3], 0, 0, 0, 0 }, + { 220, 288, 220, 48, 220, -192, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 } + }, + { + { 188, 288, 188, 48, 188, -192, 255, 255, 255, 0, 255, 0, 0, 0, gFifthPlace, 0, 0, 0, 0 }, + { 286, 308, 286, 68, 286, -172, 255, 255, 255, 0, 255, 0, 4, 2, &D_800E1004[4], 0, 0, 0, 0 }, + { 220, 330, 220, 90, 220, -160, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 } + }, + { + { 188, 330, 188, 90, 188, -150, 255, 255, 255, 0, 255, 0, 0, 0, gSixthPlace, 0, 0, 0, 0 }, + { 286, 350, 286, 110, 286, -130, 255, 192, 255, 0, 255, 0, 4, 2, &D_800E1004[5], 0, 0, 0, 0 }, + { 220, 372, 220, 132, 220, -108, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 } + }, + { + { 188, 372, 188, 132, 188, -108, 255, 255, 255, 0, 255, 0, 0, 0, gSeventhPlace, 0, 0, 0, 0 }, + { 286, 392, 286, 152, 286, -88, 255, 128, 255, 0, 255, 0, 4, 2, &D_800E1004[6], 0, 0, 0, 0 }, + { 220, 414, 220, 174, 220, -66, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 } + }, + { + { 188, 414, 188, 174, 188, -66, 255, 255, 255, 0, 255, 0, 0, 0, gEighthPlace, 0, 0, 0, 0 }, + { 286, 434, 286, 194, 286, -46, 255, 64, 255, 0, 255, 0, 4, 2, &D_800E1004[7], 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0 } + }, +}; + +s16 D_800E13A8[138] = { + 0x0040, 0x0020, 0x0082, 0x0040, 0x0020, 0x0082, 0x0040, 0x0020, + 0x0082, 0x0040, 0x0020, 0x0082, 0x00DC, 0x00BC, 0x011E, 0x00DC, + 0x00BC, 0x011E, 0x00DC, 0x00BC, 0x011E, 0x00DC, 0x00BC, 0x011E, + 0x0030, 0x0030, 0x0044, 0x005A, 0x005A, 0x006E, 0x0084, 0x0084, + 0x0098, 0x00AE, 0x00AE, 0x00C2, 0x0030, 0x0030, 0x0044, 0x005A, + 0x005A, 0x006E, 0x0084, 0x0084, 0x0098, 0x00AE, 0x00AE, 0x00C2, + 0x0038, 0x0038, 0x0040, 0x006A, 0x006A, 0x0072, 0x009C, 0x009C, + 0x00A4, 0x00CE, 0x00CE, 0x00D6, 0x0038, 0x0038, 0x0040, 0x006A, + 0x006A, 0x0072, 0x009C, 0x009C, 0x00A4, 0x00CE, 0x00CE, 0x00D6, + 0x0040, 0x0020, 0x0082, 0x0040, 0x0020, 0x0082, 0x0040, 0x0020, + 0x0082, 0x00DC, 0x00BC, 0x011E, 0x00DC, 0x00BC, 0x011E, 0x00DC, + 0x00BC, 0x011E, 0x0034, 0x0034, 0x0048, 0x006F, 0x006F, 0x0083, + 0x00AA, 0x00AA, 0x00BE, 0x0034, 0x0034, 0x0048, 0x006F, 0x006F, + 0x0083, 0x00AA, 0x00AA, 0x00BE, 0x004C, 0x004C, 0x0054, 0x007E, + 0x007E, 0x0086, 0x00B0, 0x00B0, 0x00B8, 0x004C, 0x004C, 0x0054, + 0x007E, 0x007E, 0x0086, 0x00B0, 0x00B0, 0x00B8, 0x008C, 0x006C, + 0x00CE, 0x008C, 0x006C, 0x00CE, 0x008C, 0x006C, 0x00CE, 0x008C, + 0x006C, 0x00CE +}; + +s16* D_800E14BC[32] = { + NULL, NULL, NULL, NULL, + &D_800E13A8[126], &D_800E13A8[90], &D_800E13A8[126], &D_800E13A8[24], + NULL, NULL , &D_800E13A8[72], &D_800E13A8[90], + NULL, NULL, &D_800E13A8[0], &D_800E13A8[24], + NULL, NULL, NULL, NULL, + &D_800E13A8[126], &D_800E13A8[108], &D_800E13A8[126], &D_800E13A8[48], + NULL, NULL, &D_800E13A8[72], &D_800E13A8[108], + NULL, NULL, &D_800E13A8[0], &D_800E13A8[48] +}; + +// Not sure what these arrays are supposed to be +s32 D_800E153C[10] = { + 0, 0x00000000, + 0, 0x00400000, + 0, 0x00800000, + 0, 0x00C00000, + 0, 0x01000000 +}; +s32 D_800E1564[12] = { + 0, 0x00000020, + 0, 0x00400020, + 0, 0x00800020, + 0, 0x00C00020, + 0, 0x01000020, + 0, 0x00000000 +}; +s32 D_800E1594[10] = { + 0, 0x00000000, + 0, 0x00400000, + 0, 0x00800000, + 0, 0x00C00000, + 0, 0x01000000 +}; +s32 D_800E15BC[12] = { + 0, 0x00000020, + 0, 0x00400020, + 0, 0x00800020, + 0, 0x00C00020, + 0, 0x01000020, + 0, 0x00000000 +}; +s32 D_800E15EC[10] = { + 0, 0x00000000, + 0, 0x00400000, + 0, 0x00800000, + 0, 0x00C00000, + 0, 0x01000000 +}; +s32 D_800E1614[12] = { + 0, 0x00000020, + 0, 0x00400020, + 0, 0x00800020, + 0, 0x00C00020, + 0, 0x01000020, + 0, 0x00000000 +}; +s32 D_800E1644[10] = { + 0, 0x00000000, + 0, 0x00400000, + 0, 0x00800000, + 0, 0x00C00000, + 0, 0x01000000 +}; +s32 D_800E166C[12] = { + 0, 0x00000020, + 0, 0x00400020, + 0, 0x00800020, + 0, 0x00C00020, + 0, 0x01000020, + 0, 0x00000000 +}; +s32 D_800E169C[10] = { + 0, 0x00000000, + 0, 0x00400000, + 0, 0x00800000, + 0, 0x00C00000, + 0, 0x01000000 +}; +s32 D_800E16C4[12] = { + 0, 0x00000020, + 0, 0x00400020, + 0, 0x00800020, + 0, 0x00C00020, + 0, 0x01000020, + 0, 0x00000000 +}; + +s32 *D_800E16F0[5] = { + D_800E153C, D_800E1594, D_800E15EC, D_800E1644, + D_800E169C +}; + +s16 D_800E1708[34] = { + 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, + 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, + 0x32, 0x33, 0x34, 0x36, 0x35, 0x37, 0x38, 0x39, + 0x3A, 0x3B, 0x00, 0x01, 0x04, 0x3D, 0x3C, 0x3F, + 0x3E, -1 +}; + +s16 D_800E174C[4] = { + 0, 1, 7, -1 +}; + +s16 D_800E1754[10] = { + 0x78, 0x12, 0x08, 0x06, 0xC0, 0x06, 0xD4, 0x1A, + 0x78, 0x22 +}; + +s16 D_800E1768[12] = { + 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, + 0x3A, 0x3B, -1, 0 +}; + +// Fast3D (F3DDKR) display list +u32 D_800E1780[22] = { + 0xE7000000, 0x00000000, + 0xBA001402, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xBA001102, 0x00000000, + 0xBA001301, 0x00000000, + 0xBA000C02, 0x00002000, + 0xBA000903, 0x00000C00, + 0xB9000002, 0x00000000, + 0xB900031D, 0x00504340, + 0xB8000000, 0x00000000 +}; + +s16 D_800E17D8[12] = { + 0x0032, 0x0033, 0x0034, 0x0035, + 0x0036, 0x0037, 0x0038, 0x0039, + 0x003A, 0x003B, -1, 0 +}; + +s16 D_800E17F0[2] = { + -1, 0 +}; + +s16 D_800E17F4[130] = { + 0x20A5, 0x0000, 0x20A5, 0x0001, 0x0002, 0x20A5, 0x0003, 0x0004, + 0x0005, 0x0006, 0x4000, 0x20A5, 0x0007, 0x0008, 0x20A5, 0x0009, + 0x000A, 0x000B, 0x000C, 0x30A5, 0x000D, 0x000E, 0x000F, 0x4000, + 0x20A5, 0x0010, 0x0011, 0x20A5, 0x0012, 0x0013, 0x20A5, 0x0014, + 0x4000, 0x20A5, 0x0015, 0x0016, 0x20A5, 0x0017, 0x0018, 0x20A5, + 0x0019, 0x001A, 0x4000, 0x20A5, 0x001B, 0x001C, 0x001D, 0x001E, + 0x001F, 0x30A5, 0x0020, 0x0021, 0x0022, 0x0023, 0x30A5, 0x0024, + 0x0025, 0x0026, 0x4000, 0x20A5, 0x0027, 0x0028, 0x0029, 0x002A, + 0x002B, 0x30A5, 0x002C, 0x002D, 0x002E, 0x30A5, 0x002F, 0x0030, + 0x0031, 0x4000, 0x20A5, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, + 0x30A5, 0x0037, 0x0038, 0x0039, 0x003A, 0x30A5, 0x003B, 0x003C, + 0x003D, 0x003E, 0x4000, 0x20A5, 0x003F, 0x0040, 0x0041, 0x20A5, + 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x20A5, 0x0047, 0x0048, + 0x0049, 0x4000, 0x20A5, 0x004A, 0x004B, 0x30A5, 0x004C, 0x30A5, + 0x004D, 0x4000, 0x20A5, 0x004E, 0x004F, 0x20A5, 0x0050, 0x0051, + 0x20A5, 0x0052, 0x0053, 0x4000, 0x20A5, 0x0054, 0x210E, 0x0055, + 0x0056, 0x4000 +}; + +u16 D_800E18F8 = 0x1000; + +// Unused? +u16 D_800E18FC[30] = { + 0x0001, 0x0002, 0x0003, 0x4000, + 0x61F4, 0x0004, 0x0005, 0x0006, + 0x0007, 0x4000, 0x61F4, 0x0008, + 0x0009, 0x000A, 0x000B, 0x4000, + 0x61F4, 0x000C, 0x000D, 0x000E, + 0x000F, 0x4000, 0x61F4, 0x0010, + 0x0011, 0x0012, 0x0013, 0x4000, + 0x1000, 0x0000 +}; + +// Credits text look-up table +char *D_800E1938[107] = { + (char*)0x800E7D08, (char*)0x800E7D10, (char*)0x800E7D24, (char*)0x800E7D30, + (char*)0x800E7D44, (char*)0x800E7D50, (char*)0x800E7D58, (char*)0x800E7D60, + (char*)0x800E7D70, (char*)0x800E7D7C, (char*)0x800E7D88, (char*)0x800E7D94, + (char*)0x800E7DA0, (char*)0x800E7DA8, (char*)0x800E7DB8, (char*)0x800E7DC0, + (char*)0x800E7DD0, (char*)0x800E7DD8, (char*)0x800E7DE0, (char*)0x800E7DF0, + (char*)0x800E7DFC, (char*)0x800E7E04, (char*)0x800E7E18, (char*)0x800E7E24, + (char*)0x800E7E34, (char*)0x800E7E40, (char*)0x800E7E48, (char*)0x800E7E54, + (char*)0x800E7E68, (char*)0x800E7E74, (char*)0x800E7E84, (char*)0x800E7E90, + (char*)0x800E7E9C, (char*)0x800E7EA4, (char*)0x800E7EB0, (char*)0x800E7EBC, + (char*)0x800E7EC4, (char*)0x800E7ED0, (char*)0x800E7EDC, (char*)0x800E7EEC, + (char*)0x800E7F04, (char*)0x800E7F0C, (char*)0x800E7F18, (char*)0x800E7F24, + (char*)0x800E7F30, (char*)0x800E7F38, (char*)0x800E7F40, (char*)0x800E7F48, + (char*)0x800E7F50, (char*)0x800E7F5C, (char*)0x800E7F68, (char*)0x800E7F78, + (char*)0x800E7F84, (char*)0x800E7F8C, (char*)0x800E7F98, (char*)0x800E7FA4, + (char*)0x800E7FB0, (char*)0x800E7FBC, (char*)0x800E7FC8, (char*)0x800E7FD4, + (char*)0x800E7FE0, (char*)0x800E7FEC, (char*)0x800E7FFC, (char*)0x800E8004, + (char*)0x800E8014, (char*)0x800E8024, (char*)0x800E8034, (char*)0x800E8044, + (char*)0x800E8050, (char*)0x800E8058, (char*)0x800E8064, (char*)0x800E8070, + (char*)0x800E8080, (char*)0x800E8088, (char*)0x800E8094, (char*)0x800E80A8, + (char*)0x800E80B4, (char*)0x800E80C0, (char*)0x800E80CC, (char*)0x800E80DC, + (char*)0x800E80E8, (char*)0x800E80F4, (char*)0x800E8100, (char*)0x800E8114, + (char*)0x00000000, (char*)0x00000000, (char*)0x00000000, (char*)0x800E8120, + (char*)0x800E8128, (char*)0x800E8130, (char*)0x800E8138, (char*)0x800E8140, + (char*)0x800E8148, (char*)0x800E8150, (char*)0x800E8158, (char*)0x800E8160, + (char*)0x800E8168, (char*)0x800E8170, (char*)0x800E8178, (char*)0x800E8180, + (char*)0x800E8188, (char*)0x800E8190, (char*)0x800E8198, (char*)0x800E81A0, + (char*)0x800E81A8, (char*)0x800E81B0, (char*)0x800E81B8 +}; + +// Another credits text look-up table +char *D_800E1AE4[5] = { + (char*)0x800E81C0, (char*)0x800E81CC, (char*)0x800E81E0, (char*)0x800E81E8, + (char*)0x800E81F4, +}; + +s32 D_800E1AF8[21] = { + 0x00000010, 0x00000020, 0x00000040, 0x00000080, + 0x00000100, 0x00000400, 0x00000800, 0x00001000, + 0x00002000, 0x00004000, 0x00008000, 0x00010000, + 0x00020000, 0x00040000, 0x00080000, 0x00100000, + 0x00200000, 0x00400000, 0x00800000, 0x01000000, + 0x02000000 +}; + +s32 D_800E1B4C = 0; // Set to 1 if viewing credits from "WHODIDTHIS" cheat + +MenuElement D_800E1B50[9] = { + { 480, 104, 160, 104, -160, 104, 255, 0, 255, 48, 255, 0, 4, 0, NULL, 0, 0, 0, 0 }, + { 480, 132, 160, 132, -160, 132, 255, 255, 255, 0, 255, 2, 4, 0, NULL, 0, 0, 0, 0 }, + { 480, 104, 160, 104, -160, 104, 255, 255, 255, 0, 255, 2, 4, 0, NULL, 0, 0, 0, 0 }, + { 480, 132, 160, 132, -160, 132, 255, 255, 255, 0, 255, 2, 4, 0, NULL, 0, 0, 0, 0 }, + { 480, 104, 160, 104, -160, 104, 255, 255, 255, 0, 255, 2, 4, 0, NULL, 0, 0, 0, 0 }, + { 480, 132, 160, 132, -160, 132, 255, 255, 255, 0, 255, 2, 4, 0, NULL, 0, 0, 0, 0 }, + { 480, 104, 160, 104, -160, 104, 255, 255, 255, 0, 255, 2, 4, 0, NULL, 0, 0, 0, 0 }, + { 480, 132, 160, 132, -160, 132, 255, 255, 255, 0, 255, 2, 4, 0, NULL, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0 } +}; + +// Fast3D (F3DDKR) display list +u32 D_800E1C70[24] = { + 0xE7000000, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xB9000002, 0x00000000, + 0xB6000000, 0x00010001, + 0xB8000000, 0x00000000, + 0xFCFFFFFF, 0xFFFE793C, + 0xEF000C0F, 0x00504240, + 0xFC121824, 0xFF33FFFF, + 0xEF082C0F, 0x00504240, + 0xFCFFFFFF, 0xFFFDF6FB, + 0xEF000C0F, 0x00504240 +}; + +s8 D_800E1CD0[32] = { + 0, 1, 2, 0, 2, 3, 4, 5, + 6, 4, 6, 7, 8, 9, 10, 8, + 10, 11, 12, 13, 14, 12, 14, 15, + 16, 17, 18, 16, 18, 19, 0, 0 +}; + +s8 D_800E1CF0[60] = { + 0, 0, 3, 0, 2, 1, 0, 0, + 2, 1, 1, 1, 2, 1, 3, 0, + 3, 3, 2, 1, 3, 3, 2, 2, + 1, 2, 2, 2, 3, 3, 1, 2, + 3, 3, 0, 3, 0, 0, 1, 1, + 1, 2, 0, 0, 1, 2, 0, 3, + 1, 1, 2, 1, 2, 2, 1, 1, + 2, 2, 1, 2 +}; + +u16 D_800E1D2C[40] = { + 0x0000, 0x0000, 0x0100, 0x0000, 0x01FF, 0x00FF, 0x0001, 0x00FF, + 0x01FF, 0x00FF, 0x0100, 0x0000, 0x0100, 0xFF00, 0x01FF, 0xFF01, + 0x0001, 0xFF01, 0x01FF, 0xFF01, 0x0100, 0xFF00, 0x0000, 0xFF00, + 0x0000, 0x0000, 0x0001, 0x00FF, 0x0001, 0xFF01, 0x0000, 0xFF00, + 0x0001, 0x00FF, 0x01FF, 0x00FF, 0x01FF, 0xFF01, 0x0001, 0xFF01 +}; + +s16 D_800E1D7C[20] = { + 0x00D8, 0x00D8, 0x00D8, 0x0100, + 0x00B0, 0x00B0, 0x00B0, 0x0100, + 0x0060, 0x0060, 0x0060, 0x0100, + 0x0088, 0x0088, 0x0088, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100 +}; + +s32 *D_800E1DA4[2] = { + NULL, NULL +}; + +s32 *D_800E1DAC[2] = { + NULL, NULL +}; + +s32 D_800E1DB4 = 0; +s32 D_800E1DB8 = 0; +s32 D_800E1DBC = 0; + +s32 D_800E1DC0 = 32; +s32 D_800E1DC4 = 32; + +s16 D_800E1DC8[16] = { + 1, 1, -1, 1, -1, 1, -1, -1, + 1, -1, -1, -1, 1, 1, 1, -1 +}; + +s16 D_800E1DE8[4] = { + 0, 0, 0x78, -1 +}; + +char D_800E1DF0[24] = "(C) COPYRIGHT RARE 1997"; + +s16 D_800E1E08[4] = { + 0, 0, 0x34, -1 +}; + +s32 *D_800E1E10 = (s32 *)0x800E8200; + +s32 D_800E1E14 = 0; +s32 D_800E1E18 = 0; +s32 D_800E1E1C = 0; + +s8 D_800E1E20[8] = { + 0, -1, 1, 0, 0, 1, -1, 0 +}; + +s8 D_800E1E28 = 0; + +s16 D_800E1E2C[10] = { + 0x4C, 0x4D, 0x4E, 0x4F, 0x5B, 0x5C, 0x00, 0x42, + -1, 0 +}; + +s16 D_800E1E40[10] = { + 0x0D, 0x0E, 0x0F, 0x10, 0x08, 0x09, 0x00, 0x0A, + -1, 0 +}; /*******************************/ +/************ .rodata ************/ + extern s32 D_800E8230; extern f32 D_800E8414; +/*********************************/ + +/************ .bss ************/ + extern Gfx *D_801263A0; extern s32 D_801263A8; extern s32 D_801263AC; extern s8 D_801263B4; extern s32 D_801263BC; extern s32 D_801263C4; -extern s8 D_801263D4[4]; // Array of bools +extern s8 D_801263D4[4]; extern s8 D_801263DC[4]; extern s32 D_801263D8; extern s32 D_801263E0; @@ -883,6 +1429,8 @@ extern s32 D_80126C74; extern s32 D_80126C78; extern s32 D_80126CC0; +/******************************/ + Settings *get_settings(void); void func_8009C4A8(s16 *arg0); void func_8009C674(s16 *arg0); @@ -2755,16 +3303,16 @@ void func_800945E4(void) { } void func_80094604(void) { - D_800E0A50 = D_80126550[50]; - D_800E0A60 = D_80126550[51]; - D_800E0A70 = D_80126550[52]; - D_800E0A90 = D_80126550[54]; - D_800E0A80 = D_80126550[53]; - D_800E0AA0 = D_80126550[55]; - D_800E0AB0 = D_80126550[56]; - D_800E0AC0 = D_80126550[57]; - D_800E0AD0 = D_80126550[58]; - D_800E0AE0 = D_80126550[59]; + D_800E0A50.unk0 = D_80126550[50]; + D_800E0A60.unk0 = D_80126550[51]; + D_800E0A70.unk0 = D_80126550[52]; + D_800E0A90.unk0 = D_80126550[54]; + D_800E0A80.unk0 = D_80126550[53]; + D_800E0AA0.unk0 = D_80126550[55]; + D_800E0AB0.unk0 = D_80126550[56]; + D_800E0AC0.unk0 = D_80126550[57]; + D_800E0AD0.unk0 = D_80126550[58]; + D_800E0AE0.unk0 = D_80126550[59]; } GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80094688.s") @@ -2807,7 +3355,7 @@ void func_80096790(void) { s8 *temp2; temp2 = (s8*)func_8006BDB0(); - func_8009C4A8((s16*)&D_800E0A24); + func_8009C4A8(D_800E0A24); temp = *temp2 - 1; // temp is $v1, when it should be $v0! if (D_80126BB8) { @@ -2852,8 +3400,8 @@ void menu_11_init(void) { D_80126A68 = 0; D_801263C4 = 1; D_800E0988 = 0; - func_8009C674((s16*)&D_800E0A24); - func_8009C8A4((s16*)&D_800E0A40); + func_8009C674(D_800E0A24); + func_8009C8A4(D_800E0A40); func_80094604(); func_800C4170(2); func_800C01D8(D_800DF77C); @@ -2866,7 +3414,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80096978.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/Menu11Loop.s") void func_800976CC(void) { - func_8009C4A8((s16*)&D_800E0A24); + func_8009C4A8(D_800E0A24); func_800C422C(2); } @@ -3101,7 +3649,7 @@ void func_80098EBC(s32 arg0) { GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsLoop.s") void func_80099600(void) { - func_8009C4A8((s16*)&D_800E1024); + func_8009C4A8(D_800E1024); func_800C422C(2); } @@ -3116,7 +3664,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80099E8C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuGhostDataLoop.s") void func_8009ABAC(void) { - func_8009C4A8((s16*)&D_800E1708); + func_8009C4A8(D_800E1708); func_800C422C(2); } @@ -3189,8 +3737,8 @@ void menu_credits_init(void) { } func_80066610(); func_80066818(0, 1); - func_8009C674((s16*)&D_800E17D8); - func_8009C8A4((s16*)&D_800E17F0); + func_8009C674(D_800E17D8); + func_8009C8A4(D_800E17F0); func_80094604(); func_800C4170(2); func_80000BE0(0x18); @@ -3236,7 +3784,7 @@ void func_8009BCF0(void) { func_800C0180(); func_80066894(0, 0); func_80066AA8(0, 0x8000, 0x8000, 0x8000, 0x8000); - func_8009C4A8((s16*)&D_800E17D8); + func_8009C4A8(D_800E17D8); func_800C422C(2); func_8006F564(0); } diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index 1b63de4f..5710b279 100644 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -65,7 +65,7 @@ class GenerateLD: self.gen_newline() def gen_ucode_text_section(self): - self.gen_line('.ucodeText 0 : AT(romPos)') + self.gen_line('.ucodeText . : AT(romPos)') self.gen_open_block() self.gen_line(BUILD_DIR + '/asm/assets/ucode_text.o(.text);') self.gen_close_block() @@ -73,7 +73,7 @@ class GenerateLD: self.gen_newline() def gen_data_section(self): - self.gen_line('.main_data 0x80000400 : AT(romPos) SUBALIGN(16)') + self.gen_line('.main_data . : AT(romPos) SUBALIGN(16)') self.gen_open_block() for file in self.files: self.gen_line(file[0] + '(.data);') @@ -83,7 +83,7 @@ class GenerateLD: self.gen_newline() def gen_ucode_data_section(self): - self.gen_line('.ucodeData 0 : AT(romPos)') + self.gen_line('.ucodeData . : AT(romPos)') self.gen_open_block() self.gen_line(BUILD_DIR + '/asm/assets/ucode_data.o(.text);') self.gen_close_block() From 29088584808d813f34a3c79eae85cb90773a8a8e Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 26 May 2021 21:30:19 -0500 Subject: [PATCH 25/39] unknown_09F8F0.c data section --- data/dkr.data.s | 2072 +++++++++++++++++++++--------------------- src/unknown_09F8F0.c | 373 +++++++- 2 files changed, 1392 insertions(+), 1053 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 9f8a519b..ba1612bd 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -5724,1043 +5724,1047 @@ ############## unknown_09F8F0.c (.data) ############## -.word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E1E64 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x3F800000 +# .word 0x42540000 +# .word 0x41800000 +# .word 0x00000000 +# .word 0x0000007F +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000003 +# .word 0x3F800000 +# .word 0x42580000 +# .word 0x41900000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000001 +# .word 0x3ECCCCCD +# .word 0xC2F00000 +# .word 0xC2880000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000006 +# .word 0x3F800000 +# .word 0x42D00000 +# .word 0x41800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000009 +# .word 0x3F800000 +# .word 0x42BA0000 +# .word 0x41F80000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000004 +# .word 0x3F800000 +# .word 0x42D00000 +# .word 0x42000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000009 +# .word 0x3F800000 +# .word 0x42E40000 +# .word 0x41F80000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000008 +# .word 0x3F000000 +# .word 0xC0400000 +# .word 0x42920000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000009 +# .word 0x3F800000 +# .word 0x43360000 +# .word 0x41B00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000009 +# .word 0x3F800000 +# .word 0x43400000 +# .word 0x41B00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000000D +# .word 0x3F800000 +# .word 0x436F0000 +# .word 0x41800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000009 +# .word 0x3F800000 +# .word 0x434E0000 +# .word 0x41F80000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000007 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x41F00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000016 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x41F00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000005 +# .word 0x3F800000 +# .word 0xC3480000 +# .word 0x41F00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000000E +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000010 +# .word 0x3F800000 +# .word 0xC2480000 +# .word 0x42AE0000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000011 +# .word 0x40000000 +# .word 0xC2480000 +# .word 0x42AE0000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000012 +# .word 0x3F800000 +# .word 0x43270000 +# .word 0x41B00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000013 +# .word 0x3F800000 +# .word 0xC2FE0000 +# .word 0x42B00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000012 +# .word 0x3F800000 +# .word 0x42500000 +# .word 0x41D80000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000009 +# .word 0x3F800000 +# .word 0x42860000 +# .word 0x41D80000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000009 +# .word 0x3F800000 +# .word 0x429A0000 +# .word 0x41D80000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000009 +# .word 0x3F800000 +# .word 0x435D0000 +# .word 0x42400000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000006 +# .word 0x3F800000 +# .word 0x433C0000 +# .word 0x42400000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000000A +# .word 0x3F800000 +# .word 0x434E0000 +# .word 0x42400000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000014 +# .word 0x3ECCCCCD +# .word 0xC2D20000 +# .word 0xC2C40000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000015 +# .word 0x3F000000 +# .word 0xC0400000 +# .word 0x42920000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000017 +# .word 0x3F800000 +# .word 0xC1000000 +# .word 0x42C20000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000018 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x41F00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000019 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x41F00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000001A +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x41F00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000002 +# .word 0x3F800000 +# .word 0x41C80000 +# .word 0x42400000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000020 +# .word 0x3F800000 +# .word 0xC2F00000 +# .word 0x41F00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000022 +# .word 0x3ECCCCCD +# .word 0xC2D20000 +# .word 0xC2C40000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000023 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x41F00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000024 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x41F00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000028 +# .word 0x3F800000 +# .word 0x42A00000 +# .word 0xC2700000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x6490002E +# .word 0x3F000000 +# .word 0x42F40000 +# .word 0xC28E0000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000002F +# .word 0x3F400000 +# .word 0x43770000 +# .word 0x43540000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000030 +# .word 0x3F800000 +# .word 0x436A0000 +# .word 0x43440000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000031 +# .word 0x3F800000 +# .word 0x43680000 +# .word 0x43310000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000032 +# .word 0x3F800000 +# .word 0x43700000 +# .word 0x431F0000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000033 +# .word 0x3F800000 +# .word 0x43800000 +# .word 0x43120000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000034 +# .word 0x3F800000 +# .word 0x43898000 +# .word 0x430F0000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000035 +# .word 0x3F800000 +# .word 0x43760000 +# .word 0x431C0000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000036 +# .word 0x3F3A29C7 +# .word 0x41D80000 +# .word 0x430E0000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x3F800000 +# .word 0xC3480000 +# .word 0x428C0000 +# .word 0x00000000 +# .word 0x00000081 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000003 +# .word 0x3F800000 +# .word 0xC32F0000 +# .word 0x42900000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000037 +# .word 0x3F800000 +# .word 0xC2C60000 +# .word 0xC2B20000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000038 +# .word 0x3F428F5C +# .word 0x422C0000 +# .word 0x41A00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000042 +# .word 0x3F800000 +# .word 0x42200000 +# .word 0x42580000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000008 +# .word 0x3EC00000 +# .word 0xC2EA0000 +# .word 0x42380000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000001C +# .word 0x3F800000 +# .word 0x424C0000 +# .word 0x42600000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000000A +# .word 0x3F800000 +# .word 0x42700000 +# .word 0x42640000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x0000000A +# .word 0x3F800000 +# .word 0x428A0000 +# .word 0x42640000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000043 +# .word 0x3F800000 +# .word 0xC3200000 +# .word 0x40A00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000038 +# .word 0x3F800000 +# .word 0x43820000 +# .word 0x41800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000044 +# .word 0x3F800000 +# .word 0x43200000 +# .word 0x40A00000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 -glabel D_800E1E64 -.word 0x00000000 -.word 0x00000000 -.word 0x3F800000 -.word 0x42540000 -.word 0x41800000 -.word 0x00000000 -.word 0x0000007F -.word 0x00000000 -.word 0x00000000 -.word 0x00000003 -.word 0x3F800000 -.word 0x42580000 -.word 0x41900000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000001 -.word 0x3ECCCCCD -.word 0xC2F00000 -.word 0xC2880000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000006 -.word 0x3F800000 -.word 0x42D00000 -.word 0x41800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000009 -.word 0x3F800000 -.word 0x42BA0000 -.word 0x41F80000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000004 -.word 0x3F800000 -.word 0x42D00000 -.word 0x42000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000009 -.word 0x3F800000 -.word 0x42E40000 -.word 0x41F80000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000008 -.word 0x3F000000 -.word 0xC0400000 -.word 0x42920000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000009 -.word 0x3F800000 -.word 0x43360000 -.word 0x41B00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000009 -.word 0x3F800000 -.word 0x43400000 -.word 0x41B00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000000D -.word 0x3F800000 -.word 0x436F0000 -.word 0x41800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000009 -.word 0x3F800000 -.word 0x434E0000 -.word 0x41F80000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000007 -.word 0x3F800000 -.word 0x00000000 -.word 0x41F00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000016 -.word 0x3F800000 -.word 0x00000000 -.word 0x41F00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000005 -.word 0x3F800000 -.word 0xC3480000 -.word 0x41F00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000000E -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000010 -.word 0x3F800000 -.word 0xC2480000 -.word 0x42AE0000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000011 -.word 0x40000000 -.word 0xC2480000 -.word 0x42AE0000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000012 -.word 0x3F800000 -.word 0x43270000 -.word 0x41B00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000013 -.word 0x3F800000 -.word 0xC2FE0000 -.word 0x42B00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000012 -.word 0x3F800000 -.word 0x42500000 -.word 0x41D80000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000009 -.word 0x3F800000 -.word 0x42860000 -.word 0x41D80000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000009 -.word 0x3F800000 -.word 0x429A0000 -.word 0x41D80000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000009 -.word 0x3F800000 -.word 0x435D0000 -.word 0x42400000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000006 -.word 0x3F800000 -.word 0x433C0000 -.word 0x42400000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000000A -.word 0x3F800000 -.word 0x434E0000 -.word 0x42400000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000014 -.word 0x3ECCCCCD -.word 0xC2D20000 -.word 0xC2C40000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000015 -.word 0x3F000000 -.word 0xC0400000 -.word 0x42920000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000017 -.word 0x3F800000 -.word 0xC1000000 -.word 0x42C20000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000018 -.word 0x3F800000 -.word 0x00000000 -.word 0x41F00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000019 -.word 0x3F800000 -.word 0x00000000 -.word 0x41F00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000001A -.word 0x3F800000 -.word 0x00000000 -.word 0x41F00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000002 -.word 0x3F800000 -.word 0x41C80000 -.word 0x42400000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000020 -.word 0x3F800000 -.word 0xC2F00000 -.word 0x41F00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000022 -.word 0x3ECCCCCD -.word 0xC2D20000 -.word 0xC2C40000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000023 -.word 0x3F800000 -.word 0x00000000 -.word 0x41F00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000024 -.word 0x3F800000 -.word 0x00000000 -.word 0x41F00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000028 -.word 0x3F800000 -.word 0x42A00000 -.word 0xC2700000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x6490002E -.word 0x3F000000 -.word 0x42F40000 -.word 0xC28E0000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000002F -.word 0x3F400000 -.word 0x43770000 -.word 0x43540000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000030 -.word 0x3F800000 -.word 0x436A0000 -.word 0x43440000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000031 -.word 0x3F800000 -.word 0x43680000 -.word 0x43310000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000032 -.word 0x3F800000 -.word 0x43700000 -.word 0x431F0000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000033 -.word 0x3F800000 -.word 0x43800000 -.word 0x43120000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000034 -.word 0x3F800000 -.word 0x43898000 -.word 0x430F0000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000035 -.word 0x3F800000 -.word 0x43760000 -.word 0x431C0000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000036 -.word 0x3F3A29C7 -.word 0x41D80000 -.word 0x430E0000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x3F800000 -.word 0xC3480000 -.word 0x428C0000 -.word 0x00000000 -.word 0x00000081 -.word 0x00000000 -.word 0x00000000 -.word 0x00000003 -.word 0x3F800000 -.word 0xC32F0000 -.word 0x42900000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000037 -.word 0x3F800000 -.word 0xC2C60000 -.word 0xC2B20000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000038 -.word 0x3F428F5C -.word 0x422C0000 -.word 0x41A00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000042 -.word 0x3F800000 -.word 0x42200000 -.word 0x42580000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000008 -.word 0x3EC00000 -.word 0xC2EA0000 -.word 0x42380000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000001C -.word 0x3F800000 -.word 0x424C0000 -.word 0x42600000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000000A -.word 0x3F800000 -.word 0x42700000 -.word 0x42640000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x0000000A -.word 0x3F800000 -.word 0x428A0000 -.word 0x42640000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000043 -.word 0x3F800000 -.word 0xC3200000 -.word 0x40A00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000038 -.word 0x3F800000 -.word 0x43820000 -.word 0x41800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000044 -.word 0x3F800000 -.word 0x43200000 -.word 0x40A00000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +# glabel D_800E25C4 +# .word 0x00000035 +# .word 0x00100001 +# .word 0x00360012 +# .word 0x000400CB +# .word 0x00130005 +# .word 0x00D30013 +# .word 0x000600DC +# .word 0x00130002 +# .word 0xFF88FFE1 +# .word 0x001B0021 +# .word 0x00160008 +# .word 0x00D30013 +# .word 0x000900DC +# .word 0x0013000B +# .word 0x00A70013 +# .word 0x000E0000 +# .word 0x000A0010 +# .word 0x003B0023 +# .word 0x0011003B +# .word 0x00230007 +# .word 0x00210016 +# .word 0x001C001E +# .word 0x002A0012 +# .word 0x00CA0013 +# .word 0x000D0000 +# .word 0x000A000C +# .word 0x0000000A +# .word 0x00230000 +# .word 0x000A0024 +# .word 0x0000000A +# .word 0x001E0000 +# .word 0x000A001F +# .word 0x0000000A +# .word 0x001D0000 +# .word 0x000A002F +# .word 0xFF380023 +# .word 0x0030FF51 +# .word 0x00250031 +# .word 0xFF96FFD3 +# .word 0x000300B4 +# .word 0x00130032 +# .word 0x01070011 +# .word 0x002000F7 +# .word 0x002D0033 +# .word 0x01030031 +# .word 0x002E0022 +# .word 0x0047FFFF +# .word 0xFFFFFFFF +# +# glabel D_800E2684 +# .word 0x0000002D +# .word 0x00100087 +# .word 0x0004005E +# .word 0x0013004E +# .word 0x00050066 +# .word 0x00130056 +# .word 0x0006006F +# .word 0x0013005F +# .word 0x0002FFD1 +# .word 0xFFDC0024 +# .word 0x001B0000 +# .word 0x0016FFE3 +# .word 0x00070000 +# .word 0x0016FFE3 +# .word 0x00080061 +# .word 0x00130044 +# .word 0x0009006A +# .word 0x0013004D +# .word 0x000B0037 +# .word 0x0013001A +# .word 0x000C0000 +# .word 0x000A0000 +# .word 0x000D0000 +# .word 0x000A0000 +# .word 0x000EFF60 +# .word 0x000AFF60 +# .word 0x00100066 +# .word 0x00130056 +# .word 0x00110066 +# .word 0x00130056 +# .word 0x00120058 +# .word 0x0013003B +# .word 0x001CFFFD +# .word 0x002AFFE0 +# .word 0x00200012 +# .word 0x002D0078 +# .word 0x001EFFEA +# .word 0x000AFFEA +# .word 0x001F000C +# .word 0x000A0010 +# .word 0x001D0000 +# .word 0x000AFFD9 +# .word 0x00230000 +# .word 0x000A0000 +# .word 0x00240000 +# .word 0x000A0000 +# .word 0x002FFF38 +# .word 0x0019FFD8 +# .word 0x0030FF51 +# .word 0x001BFFF1 +# .word 0x0031FFDF +# .word 0xFFCE0032 +# .word 0x00030047 +# .word 0x00130037 +# .word 0x0033003C +# .word 0x0014003C +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0x00000000 +# +# glabel D_800E2770 +# .half 0x00FD +# +# glabel D_800E2772 +# .half 0x0000 +# +# glabel D_800E2774 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00FF0000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E2790 +# .word 0x01000000 +# +# glabel D_800E2794 +# .word 0x01010101 +# .word 0x02020202 +# .word 0x02020202 +# .word 0x02020202 +# +# glabel D_800E27A4 +# .word 0x01010101 +# +# glabel D_800E27A8 +# .word 0x01000000 +# +# glabel D_800E27AC +# .word 0xFF2828FE +# .word 0x28FF28FE +# .word 0x2828FFFE +# +# glabel D_800E27B8 +# .word 0x00000000 +# +# glabel D_800E27BC +# .word 0xFFA000FF +# .word 0xFF000080 +# .word 0xFFFFFFFF +# .word 0x00AF0000 +# .word 0xFF80FF00 +# .word 0x00FF80BE +# .word 0x80808000 +# .word 0x00FF0000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00200000 +# .word 0x00000000 +# .word 0x00400000 +# .word 0x00000000 +# .word 0x00600000 +# .word 0x00000000 +# .word 0x00800000 +# .word 0x00000000 +# .word 0x00000040 +# .word 0x00000000 +# .word 0x00200040 +# .word 0x00000000 +# .word 0x00400040 +# .word 0x00000000 +# .word 0x00600040 +# .word 0x00000000 +# .word 0x00800040 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E2834 +# .word 0xFFFFFFFE +# +# glabel D_800E2838 +# .word 0x00000000 +# +# .word 0x06FFFFFF +# .word 0x000FFFFF +# .word 0x06000000 +# .word 0x0014FFFF +# .word 0x00000000 +# +# glabel D_800E2850 +# .word 0x00000000 +# .word 0x00000040 +# .word 0x00000000 +# .word 0xFE000000 +# .word 0xFE000000 +# .word 0xFE000000 +# .word 0x03FFFFFF +# .word 0x03FFFFFF +# .word 0x03FFFFFF +# .word 0x00040004 +# .word 0x00080008 +# .word 0x00000000 +# .word 0x00000100 +# .word 0x00000001 +# .word 0xFE000000 +# .word 0xFE000000 +# .word 0xFE000000 +# .word 0x03FFFFFF +# .word 0x03FFFFFF +# .word 0x03FFFFFF +# .word 0x00040004 +# .word 0x00080008 +# .word 0x00000000 +# .word 0x00000008 +# .word 0x00000002 +# .word 0xFE000000 +# .word 0xFE000000 +# .word 0xFE000000 +# .word 0x03FFFFFF +# .word 0x03FFFFFF +# .word 0x03FFFFFF +# .word 0x00040004 +# .word 0x00080008 +# +# glabel D_800E28D4 +# .word 0x00000000 +# +# glabel D_800E28D8 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E2904 +# .word 0x00000000 +# +# glabel D_800E2908 +# .word 0x00000000 +# +# glabel D_800E290C +# .word 0x00000000 +# +# glabel D_800E2910 +# .word 0x00000000 +# +# glabel D_800E2914 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E291C +# .word 0x00000000 +# +# glabel D_800E2920 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E2928 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001402 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xBA001102 +# .word 0x00000000 +# .word 0xBA001301 +# .word 0x00000000 +# .word 0xBA000C02 +# .word 0x00002000 +# .word 0xBA000903 +# .word 0x00000C00 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB900031D +# .word 0x00504340 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800E2980 +# .word 0x00000001 +# .word 0xFFFFC090 +# .word 0x40400000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E29A0 +# .word 0x00000003 +# .word 0xFFFF0090 +# .word 0x3F400000 +# .word 0xC2000000 +# .word 0x00000002 +# .word 0x0050FF60 +# .word 0x3F4CCCCD +# .word 0xC2C00000 +# .word 0x00000002 +# .word 0x00FF0090 +# .word 0x3F400000 +# .word 0xC3400000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E29E0 +# .word 0x00000003 +# .word 0xFF801490 +# .word 0x3F266666 +# .word 0xC2800000 +# .word 0x00000002 +# .word 0xFFFFFF90 +# .word 0x3F800000 +# .word 0xC3000000 +# .word 0x00000003 +# .word 0xFFFF8090 +# .word 0x3F000000 +# .word 0xC3300000 +# .word 0x00000003 +# .word 0xFF282890 +# .word 0x3F400000 +# .word 0xC3600000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E2A30 +# .word 0x00000003 +# .word 0xFF80FF80 +# .word 0x3F000000 +# .word 0xC2800000 +# .word 0x00000001 +# .word 0xFFFFC090 +# .word 0x3F400000 +# .word 0xC3000000 +# .word 0x00000002 +# .word 0xFF280080 +# .word 0x3F19999A +# .word 0xC3300000 +# .word 0x00000001 +# .word 0xFFC0FF90 +# .word 0x3F400000 +# .word 0xC3600000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E2A80 +# .word 0x00000000 +# +# glabel D_800E2A84 +# .word 0x00000001 +# +# glabel D_800E2A88 +# .word 0x00000000 +# +# glabel D_800E2A8C +# .word 0xC3480000 +# +# glabel D_800E2A90 +# .word 0x43480000 +# +# glabel D_800E2A94 +# .word 0x43480000 +# +# glabel D_800E2A98 +# .word 0x43480000 +# +# glabel D_800E2A9C +# .word 0x43480000 +# +# glabel D_800E2AA0 +# .word 0xC3480000 +# +# glabel D_800E2AA4 +# .word 0xC3480000 +# +# glabel D_800E2AA8 +# .word 0xC3480000 +# +# glabel D_800E2AAC +# .word 0x00000000 +# .word 0x0000FFFF +# .word 0xFFFF0000 +# .word 0x00000000 +# .word 0xFFFFFFFF +# .word 0x00000000 +# .word 0x0000FFFF +# .word 0xFFFF0000 +# .word 0x00000000 +# .word 0xFFFFFFFF +# .word 0x00000000 +# .word 0x0000FFFF +# .word 0xFFFF0000 +# .word 0x00000000 +# .word 0xFFFFFFFF +# .word 0x00000000 +# .word 0x0000FFFF +# .word 0xFFFF0000 +# .word 0x00000000 +# .word 0xFFFFFFFF +# .word 0x00000000 +# .word 0x0000FFFF +# .word 0xFFFF0000 +# .word 0x00000000 +# .word 0xFFFFFFFF +# .word 0x00000000 +# .word 0x0000FFFF +# .word 0xFFFF0000 +# .word 0x00000000 +# .word 0xFFFFFFFF +# .word 0x00000000 +# .word 0x0000FFFF +# .word 0xFFFF0000 +# .word 0x00000000 +# .word 0xFFFFFFFF +# .word 0x00000000 +# .word 0x0000FFFF +# .word 0xFFFF0000 +# .word 0x00000000 +# .word 0xFFFFFFFF +# +# glabel D_800E2B4C +# .word 0x00000000 +# .word 0x00000000 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x3F800000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E2C2C +# .word 0x00000000 +# .word 0x04000400 +# .word 0x000AFFC4 +# glabel D_800E2C38 +# .word 0x00000000 +# .word 0x80FFFF80 +# .word 0x80FF8000 +# +# .word 0x00000000 +# .word 0x06000600 +# .word 0x0020FF40 +# glabel D_800E2C50 +# .word 0x00000000 +# .word 0xFFFFFF00 +# .word 0x80FFFF00 +# +# glabel D_800E2C5C +# .word 0x00000000 +# +# glabel D_800E2C60 +# .word 0x00010000 +# +# glabel D_800E2C64 +# .word 0x00000000 +# +# glabel D_800E2C68 +# .word 0x00010000 +# +# glabel D_800E2C6C +# .word 0x00010000 +# +# glabel D_800E2C70 +# .word 0x00000000 +# +# glabel D_800E2C74 +# .word 0x00010000 +# +# glabel D_800E2C78 +# .word 0x00000000 +# +# glabel D_800E2C7C +# .word 0x00000000 +# +# glabel D_800E2C80 +# .word 0x00000000 +# +# glabel D_800E2C84 +# .word 0x00000000 +# +# glabel D_800E2C88 +# .word 0x00000000 +# +# glabel D_800E2C8C +# .word 0x00000000 +# +# glabel D_800E2C90 +# .word 0x00000000 +# +# glabel D_800E2C94 +# .word 0x00000000 +# +# glabel D_800E2C98 +# .word 0x40FFFFFF +# .word 0x00050002 -glabel D_800E25C4 -.word 0x00000035 -.word 0x00100001 -.word 0x00360012 -.word 0x000400CB -.word 0x00130005 -.word 0x00D30013 -.word 0x000600DC -.word 0x00130002 -.word 0xFF88FFE1 -.word 0x001B0021 -.word 0x00160008 -.word 0x00D30013 -.word 0x000900DC -.word 0x0013000B -.word 0x00A70013 -.word 0x000E0000 -.word 0x000A0010 -.word 0x003B0023 -.word 0x0011003B -.word 0x00230007 -.word 0x00210016 -.word 0x001C001E -.word 0x002A0012 -.word 0x00CA0013 -.word 0x000D0000 -.word 0x000A000C -.word 0x0000000A -.word 0x00230000 -.word 0x000A0024 -.word 0x0000000A -.word 0x001E0000 -.word 0x000A001F -.word 0x0000000A -.word 0x001D0000 -.word 0x000A002F -.word 0xFF380023 -.word 0x0030FF51 -.word 0x00250031 -.word 0xFF96FFD3 -.word 0x000300B4 -.word 0x00130032 -.word 0x01070011 -.word 0x002000F7 -.word 0x002D0033 -.word 0x01030031 -.word 0x002E0022 -.word 0x0047FFFF -.word 0xFFFFFFFF +###################################################### -glabel D_800E2684 -.word 0x0000002D -.word 0x00100087 -.word 0x0004005E -.word 0x0013004E -.word 0x00050066 -.word 0x00130056 -.word 0x0006006F -.word 0x0013005F -.word 0x0002FFD1 -.word 0xFFDC0024 -.word 0x001B0000 -.word 0x0016FFE3 -.word 0x00070000 -.word 0x0016FFE3 -.word 0x00080061 -.word 0x00130044 -.word 0x0009006A -.word 0x0013004D -.word 0x000B0037 -.word 0x0013001A -.word 0x000C0000 -.word 0x000A0000 -.word 0x000D0000 -.word 0x000A0000 -.word 0x000EFF60 -.word 0x000AFF60 -.word 0x00100066 -.word 0x00130056 -.word 0x00110066 -.word 0x00130056 -.word 0x00120058 -.word 0x0013003B -.word 0x001CFFFD -.word 0x002AFFE0 -.word 0x00200012 -.word 0x002D0078 -.word 0x001EFFEA -.word 0x000AFFEA -.word 0x001F000C -.word 0x000A0010 -.word 0x001D0000 -.word 0x000AFFD9 -.word 0x00230000 -.word 0x000A0000 -.word 0x00240000 -.word 0x000A0000 -.word 0x002FFF38 -.word 0x0019FFD8 -.word 0x0030FF51 -.word 0x001BFFF1 -.word 0x0031FFDF -.word 0xFFCE0032 -.word 0x00030047 -.word 0x00130037 -.word 0x0033003C -.word 0x0014003C -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0x00000000 - -glabel D_800E2770 -.half 0x00FD - -glabel D_800E2772 -.half 0x0000 - -glabel D_800E2774 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00FF0000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E2790 -.word 0x01000000 - -glabel D_800E2794 -.word 0x01010101 -.word 0x02020202 -.word 0x02020202 -.word 0x02020202 - -glabel D_800E27A4 -.word 0x01010101 - -glabel D_800E27A8 -.word 0x01000000 - -glabel D_800E27AC -.word 0xFF2828FE -.word 0x28FF28FE -.word 0x2828FFFE - -glabel D_800E27B8 -.word 0x00000000 - -glabel D_800E27BC -.word 0xFFA000FF -.word 0xFF000080 -.word 0xFFFFFFFF -.word 0x00AF0000 -.word 0xFF80FF00 -.word 0x00FF80BE -.word 0x80808000 -.word 0x00FF0000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00200000 -.word 0x00000000 -.word 0x00400000 -.word 0x00000000 -.word 0x00600000 -.word 0x00000000 -.word 0x00800000 -.word 0x00000000 -.word 0x00000040 -.word 0x00000000 -.word 0x00200040 -.word 0x00000000 -.word 0x00400040 -.word 0x00000000 -.word 0x00600040 -.word 0x00000000 -.word 0x00800040 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E2834 -.word 0xFFFFFFFE - -glabel D_800E2838 -.word 0x00000000 -.word 0x06FFFFFF -.word 0x000FFFFF -.word 0x06000000 -.word 0x0014FFFF -.word 0x00000000 - -glabel D_800E2850 -.word 0x00000000 -.word 0x00000040 -.word 0x00000000 -.word 0xFE000000 -.word 0xFE000000 -.word 0xFE000000 -.word 0x03FFFFFF -.word 0x03FFFFFF -.word 0x03FFFFFF -.word 0x00040004 -.word 0x00080008 -.word 0x00000000 -.word 0x00000100 -.word 0x00000001 -.word 0xFE000000 -.word 0xFE000000 -.word 0xFE000000 -.word 0x03FFFFFF -.word 0x03FFFFFF -.word 0x03FFFFFF -.word 0x00040004 -.word 0x00080008 -.word 0x00000000 -.word 0x00000008 -.word 0x00000002 -.word 0xFE000000 -.word 0xFE000000 -.word 0xFE000000 -.word 0x03FFFFFF -.word 0x03FFFFFF -.word 0x03FFFFFF -.word 0x00040004 -.word 0x00080008 - -glabel D_800E28D4 -.word 0x00000000 - -glabel D_800E28D8 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E2904 -.word 0x00000000 - -glabel D_800E2908 -.word 0x00000000 - -glabel D_800E290C -.word 0x00000000 - -glabel D_800E2910 -.word 0x00000000 - -glabel D_800E2914 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E291C -.word 0x00000000 - -glabel D_800E2920 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E2928 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001402 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xBA001102 -.word 0x00000000 -.word 0xBA001301 -.word 0x00000000 -.word 0xBA000C02 -.word 0x00002000 -.word 0xBA000903 -.word 0x00000C00 -.word 0xB9000002 -.word 0x00000000 -.word 0xB900031D -.word 0x00504340 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800E2980 -.word 0x00000001 -.word 0xFFFFC090 -.word 0x40400000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E29A0 -.word 0x00000003 -.word 0xFFFF0090 -.word 0x3F400000 -.word 0xC2000000 -.word 0x00000002 -.word 0x0050FF60 -.word 0x3F4CCCCD -.word 0xC2C00000 -.word 0x00000002 -.word 0x00FF0090 -.word 0x3F400000 -.word 0xC3400000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E29E0 -.word 0x00000003 -.word 0xFF801490 -.word 0x3F266666 -.word 0xC2800000 -.word 0x00000002 -.word 0xFFFFFF90 -.word 0x3F800000 -.word 0xC3000000 -.word 0x00000003 -.word 0xFFFF8090 -.word 0x3F000000 -.word 0xC3300000 -.word 0x00000003 -.word 0xFF282890 -.word 0x3F400000 -.word 0xC3600000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E2A30 -.word 0x00000003 -.word 0xFF80FF80 -.word 0x3F000000 -.word 0xC2800000 -.word 0x00000001 -.word 0xFFFFC090 -.word 0x3F400000 -.word 0xC3000000 -.word 0x00000002 -.word 0xFF280080 -.word 0x3F19999A -.word 0xC3300000 -.word 0x00000001 -.word 0xFFC0FF90 -.word 0x3F400000 -.word 0xC3600000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E2A80 -.word 0x00000000 - -glabel D_800E2A84 -.word 0x00000001 - -glabel D_800E2A88 -.word 0x00000000 - -glabel D_800E2A8C -.word 0xC3480000 - -glabel D_800E2A90 -.word 0x43480000 - -glabel D_800E2A94 -.word 0x43480000 - -glabel D_800E2A98 -.word 0x43480000 - -glabel D_800E2A9C -.word 0x43480000 - -glabel D_800E2AA0 -.word 0xC3480000 - -glabel D_800E2AA4 -.word 0xC3480000 - -glabel D_800E2AA8 -.word 0xC3480000 - -glabel D_800E2AAC -.word 0x00000000 -.word 0x0000FFFF -.word 0xFFFF0000 -.word 0x00000000 -.word 0xFFFFFFFF -.word 0x00000000 -.word 0x0000FFFF -.word 0xFFFF0000 -.word 0x00000000 -.word 0xFFFFFFFF -.word 0x00000000 -.word 0x0000FFFF -.word 0xFFFF0000 -.word 0x00000000 -.word 0xFFFFFFFF -.word 0x00000000 -.word 0x0000FFFF -.word 0xFFFF0000 -.word 0x00000000 -.word 0xFFFFFFFF -.word 0x00000000 -.word 0x0000FFFF -.word 0xFFFF0000 -.word 0x00000000 -.word 0xFFFFFFFF -.word 0x00000000 -.word 0x0000FFFF -.word 0xFFFF0000 -.word 0x00000000 -.word 0xFFFFFFFF -.word 0x00000000 -.word 0x0000FFFF -.word 0xFFFF0000 -.word 0x00000000 -.word 0xFFFFFFFF -.word 0x00000000 -.word 0x0000FFFF -.word 0xFFFF0000 -.word 0x00000000 -.word 0xFFFFFFFF - -glabel D_800E2B4C -.word 0x00000000 -.word 0x00000000 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x3F800000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E2C2C -.word 0x00000000 -.word 0x04000400 -.word 0x000AFFC4 - -glabel D_800E2C38 -.word 0x00000000 -.word 0x80FFFF80 -.word 0x80FF8000 -.word 0x00000000 -.word 0x06000600 -.word 0x0020FF40 - -glabel D_800E2C50 -.word 0x00000000 -.word 0xFFFFFF00 -.word 0x80FFFF00 - -glabel D_800E2C5C -.word 0x00000000 - -glabel D_800E2C60 -.word 0x00010000 - -glabel D_800E2C64 -.word 0x00000000 - -glabel D_800E2C68 -.word 0x00010000 - -glabel D_800E2C6C -.word 0x00010000 - -glabel D_800E2C70 -.word 0x00000000 - -glabel D_800E2C74 -.word 0x00010000 - -glabel D_800E2C78 -.word 0x00000000 - -glabel D_800E2C7C -.word 0x00000000 - -glabel D_800E2C80 -.word 0x00000000 - -glabel D_800E2C84 -.word 0x00000000 - -glabel D_800E2C88 -.word 0x00000000 - -glabel D_800E2C8C -.word 0x00000000 - -glabel D_800E2C90 -.word 0x00000000 - -glabel D_800E2C94 -.word 0x00000000 - -glabel D_800E2C98 -.word 0x40FFFFFF -.word 0x00050002 +############## unknown_0AEE70.c (.data) ############## glabel D_800E2CA0 .word 0x00000000 diff --git a/src/unknown_09F8F0.c b/src/unknown_09F8F0.c index 7d4a68dc..416ec7a0 100644 --- a/src/unknown_09F8F0.c +++ b/src/unknown_09F8F0.c @@ -21,21 +21,354 @@ typedef struct { } unk80127BF8; extern u32 osTvType; -extern s32 D_800E2A80; -extern s32 D_800E2A84; -extern s32 D_800E2C38; -extern s32 D_800E2C50; -extern s32 D_800E2C5C; -extern s32 D_800E2C60; -extern s32 D_800E2C64; -extern s32 D_800E2C68; -extern s32 D_800E2C6C; -extern s32 D_800E2C70; -extern s32 D_800E2C74; -extern s32 D_800E2C78; -extern s32 D_800E2C88; -extern s32 D_800E2C8C; -extern s32 D_800E2C94; + +/************ .data ************/ + +// Unused? +s32 D_800E1E60 = 0; + +typedef struct unk800E1E64 { + s32 unk0; + s32 unk4; + f32 unk8; + f32 unkC; + f32 unk10; + s32 unk14; + s32 unk18; + s32 unk1C; +} unk800E1E64; + +unk800E1E64 D_800E1E64[59] = { + { 0, 0, 1.0f, 53.0f, 16.0f, 0, 127, 0 }, + { 0, 3, 1.0f, 54.0f, 18.0f, 0, 0, 0 }, + { 0, 1, 0.4f, -120.0f, -68.0f, 0, 0, 0 }, + { 0, 6, 1.0f, 104.0f, 16.0f, 0, 0, 0 }, + { 0, 9, 1.0f, 93.0f, 31.0f, 0, 0, 0 }, + { 0, 4, 1.0f, 104.0f, 32.0f, 0, 0, 0 }, + { 0, 9, 1.0f, 114.0f, 31.0f, 0, 0, 0 }, + { 0, 8, 0.5f, -3.0f, 73.0f, 0, 0, 0 }, + { 0, 9, 1.0f, 182.0f, 22.0f, 0, 0, 0 }, + { 0, 9, 1.0f, 192.0f, 22.0f, 0, 0, 0 }, + { 0, 13, 1.0f, 239.0f, 16.0f, 0, 0, 0 }, + { 0, 9, 1.0f, 206.0f, 31.0f, 0, 0, 0 }, + { 0, 7, 1.0f, 0.0f, 30.0f, 0, 0, 0 }, + { 0, 22, 1.0f, 0.0f, 30.0f, 0, 0, 0 }, + { 0, 5, 1.0f, -200.0f, 30.0f, 0, 0, 0 }, + { 0, 14, 1.0f, 0.0f, 0.0f, 0, 0, 0 }, + { 0, 16, 1.0f, -50.0f, 87.0f, 0, 0, 0 }, + { 0, 17, 2.0f, -50.0f, 87.0f, 0, 0, 0 }, + { 0, 18, 1.0f, 167.0f, 22.0f, 0, 0, 0 }, + { 0, 19, 1.0f, -127.0f, 88.0f, 0, 0, 0 }, + { 0, 18, 1.0f, 52.0f, 27.0f, 0, 0, 0 }, + { 0, 9, 1.0f, 67.0f, 27.0f, 0, 0, 0 }, + { 0, 9, 1.0f, 77.0f, 27.0f, 0, 0, 0 }, + { 0, 9, 1.0f, 221.0f, 48.0f, 0, 0, 0 }, + { 0, 6, 1.0f, 188.0f, 48.0f, 0, 0, 0 }, + { 0, 10, 1.0f, 206.0f, 48.0f, 0, 0, 0 }, + { 0, 20, 0.4f, -105.0f, -98.0f, 0, 0, 0 }, + { 0, 21, 0.5f, -3.0f, 73.0f, 0, 0, 0 }, + { 0, 23, 1.0f, -8.0f, 97.0f, 0, 0, 0 }, + { 0, 24, 1.0f, 0.0f, 30.0f, 0, 0, 0 }, + { 0, 25, 1.0f, 0.0f, 30.0f, 0, 0, 0 }, + { 0, 26, 1.0f, 0.0f, 30.0f, 0, 0, 0 }, + { 0, 2, 1.0f, 25.0f, 48.0f, 0, 0, 0 }, + { 0, 32, 1.0f, -120.0f, 30.0f, 0, 0, 0 }, + { 0, 34, 0.4f, -105.0f, -98.0f, 0, 0, 0 }, + { 0, 35, 1.0f, 0.0f, 30.0f, 0, 0, 0 }, + { 0, 36, 1.0f, 0.0f, 30.0f, 0, 0, 0 }, + { 0, 40, 1.0f, 80.0f, -60.0f, 0, 0, 0 }, + { 0, 1687158830, 0.5f, 122.0f, -71.0f, 0, 0, 0 }, + { 0, 47, 0.75f, 247.0f, 212.0f, 0, 0, 0 }, + { 0, 48, 1.0f, 234.0f, 196.0f, 0, 0, 0 }, + { 0, 49, 1.0f, 232.0f, 177.0f, 0, 0, 0 }, + { 0, 50, 1.0f, 240.0f, 159.0f, 0, 0, 0 }, + { 0, 51, 1.0f, 256.0f, 146.0f, 0, 0, 0 }, + { 0, 52, 1.0f, 275.0f, 143.0f, 0, 0, 0 }, + { 0, 53, 1.0f, 246.0f, 156.0f, 0, 0, 0 }, + { 0, 54, 0.7272f, 27.0f, 142.0f, 0, 0, 0 }, + { 0, 0, 1.0f, -200.0f, 70.0f, 0, 129, 0 }, + { 0, 3, 1.0f, -175.0f, 72.0f, 0, 0, 0 }, + { 0, 55, 1.0f, -99.0f, -89.0f, 0, 0, 0 }, + { 0, 56, 0.76f, 43.0f, 20.0f, 0, 0, 0 }, + { 0, 66, 1.0f, 40.0f, 54.0f, 0, 0, 0 }, + { 0, 8, 0.375f, -117.0f, 46.0f, 0, 0, 0 }, + { 0, 28, 1.0f, 51.0f, 56.0f, 0, 0, 0 }, + { 0, 10, 1.0f, 60.0f, 57.0f, 0, 0, 0 }, + { 0, 10, 1.0f, 69.0f, 57.0f, 0, 0, 0 }, + { 0, 67, 1.0f, -160.0f, 5.0f, 0, 0, 0 }, + { 0, 56, 1.0f, 260.0f, 16.0f, 0, 0, 0 }, + { 0, 68, 1.0f, 160.0f, 5.0f, 0, 0, 0 }, +}; + +u16 D_800E25C4[96] = { + 0x0000, 0x0035, 0x0010, 0x0001, 0x0036, 0x0012, 0x0004, 0x00CB, + 0x0013, 0x0005, 0x00D3, 0x0013, 0x0006, 0x00DC, 0x0013, 0x0002, + 0xFF88, 0xFFE1, 0x001B, 0x0021, 0x0016, 0x0008, 0x00D3, 0x0013, + 0x0009, 0x00DC, 0x0013, 0x000B, 0x00A7, 0x0013, 0x000E, 0x0000, + 0x000A, 0x0010, 0x003B, 0x0023, 0x0011, 0x003B, 0x0023, 0x0007, + 0x0021, 0x0016, 0x001C, 0x001E, 0x002A, 0x0012, 0x00CA, 0x0013, + 0x000D, 0x0000, 0x000A, 0x000C, 0x0000, 0x000A, 0x0023, 0x0000, + 0x000A, 0x0024, 0x0000, 0x000A, 0x001E, 0x0000, 0x000A, 0x001F, + 0x0000, 0x000A, 0x001D, 0x0000, 0x000A, 0x002F, 0xFF38, 0x0023, + 0x0030, 0xFF51, 0x0025, 0x0031, 0xFF96, 0xFFD3, 0x0003, 0x00B4, + 0x0013, 0x0032, 0x0107, 0x0011, 0x0020, 0x00F7, 0x002D, 0x0033, + 0x0103, 0x0031, 0x002E, 0x0022, 0x0047, 0xFFFF, 0xFFFF, 0xFFFF +}; + +u16 D_800E2684[118] = { + 0x0000, 0x002D, 0x0010, 0x0087, 0x0004, 0x005E, 0x0013, 0x004E, + 0x0005, 0x0066, 0x0013, 0x0056, 0x0006, 0x006F, 0x0013, 0x005F, + 0x0002, 0xFFD1, 0xFFDC, 0x0024, 0x001B, 0x0000, 0x0016, 0xFFE3, + 0x0007, 0x0000, 0x0016, 0xFFE3, 0x0008, 0x0061, 0x0013, 0x0044, + 0x0009, 0x006A, 0x0013, 0x004D, 0x000B, 0x0037, 0x0013, 0x001A, + 0x000C, 0x0000, 0x000A, 0x0000, 0x000D, 0x0000, 0x000A, 0x0000, + 0x000E, 0xFF60, 0x000A, 0xFF60, 0x0010, 0x0066, 0x0013, 0x0056, + 0x0011, 0x0066, 0x0013, 0x0056, 0x0012, 0x0058, 0x0013, 0x003B, + 0x001C, 0xFFFD, 0x002A, 0xFFE0, 0x0020, 0x0012, 0x002D, 0x0078, + 0x001E, 0xFFEA, 0x000A, 0xFFEA, 0x001F, 0x000C, 0x000A, 0x0010, + 0x001D, 0x0000, 0x000A, 0xFFD9, 0x0023, 0x0000, 0x000A, 0x0000, + 0x0024, 0x0000, 0x000A, 0x0000, 0x002F, 0xFF38, 0x0019, 0xFFD8, + 0x0030, 0xFF51, 0x001B, 0xFFF1, 0x0031, 0xFFDF, 0xFFCE, 0x0032, + 0x0003, 0x0047, 0x0013, 0x0037, 0x0033, 0x003C, 0x0014, 0x003C, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0000, 0x0000 +}; + +// This is probably not right. +s32 D_800E2770[8] = { + 0x00FD0000, 0x00000000, 0x00000000, 0x00000000, + 0x00FF0000, 0x00000000, 0x00000000, 0x00000000 +}; + +s8 D_800E2790 = 1; + +s8 D_800E2794[16] = { + 1, 1, 1, 1, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2 +}; + +s8 D_800E27A4[4] = { + 1, 1, 1, 1 +}; + +s8 D_800E27A8 = 1; + +s8 D_800E27AC[12] = { + -1, 40, 40, -2, + 40, -1, 40, -2, + 40, 40, -1, -2 +}; + +s32 D_800E27B8 = 0; + +u8 D_800E27BC[120] = { + 0xFF, 0xA0, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x80, + 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xAF, 0x00, 0x00, + 0xFF, 0x80, 0xFF, 0x00, 0x00, 0xFF, 0x80, 0xBE, + 0x80, 0x80, 0x80, 0x00, 0x00, 0xFF, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x40, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x40, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x40, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x40, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + +s32 D_800E2834 = -2; + +f32 D_800E2838 = 0.0f; + +// Unused? +s32 D_800E283C[5] = { + 0x06FFFFFF, 0x000FFFFF, 0x06000000, 0x0014FFFF, + 0x00000000 +}; + +// D_800E28D8 is also unk800E2850 + +/* Size: 0x2C Bytes */ +typedef struct unk800E2850 { + s32 unk0; + s32 unk4; + s32 unk8; + s32 unkC; + s32 unk10; + s32 unk14; + s32 unk18; + s32 unk1C; + s32 unk20; + s16 unk24; + s16 unk26; + s16 unk28; + s16 unk2A; +} unk800E2850; + +unk800E2850 D_800E2850[3] = { + { 0, 0x40, 0, 0xFE000000, 0xFE000000, 0xFE000000, 0x03FFFFFF, 0x03FFFFFF, 0x03FFFFFF, 4, 4, 8, 8 }, + { 0, 0x100, 1, 0xFE000000, 0xFE000000, 0xFE000000, 0x03FFFFFF, 0x03FFFFFF, 0x03FFFFFF, 4, 4, 8, 8 }, + { 0, 0x08, 2, 0xFE000000, 0xFE000000, 0xFE000000, 0x03FFFFFF, 0x03FFFFFF, 0x03FFFFFF, 4, 4, 8, 8 } +}; + +s32 D_800E28D4 = 0; + +unk800E2850 D_800E28D8 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + +// Not sure about typing for the following. +s32 D_800E2904 = 0; +s32 D_800E2908 = 0; +s32 D_800E290C = 0; +s32 D_800E2910 = 0; +s32 D_800E2914[2] = { 0, 0 }; +s32 D_800E291C = 0; +s32 D_800E2920[2] = { 0, 0 }; + +// Fast3D (F3DDKR) display list +u32 D_800E2928[] = { + 0xE7000000, 0x00000000, + 0xBA001402, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xBA001102, 0x00000000, + 0xBA001301, 0x00000000, + 0xBA000C02, 0x00002000, + 0xBA000903, 0x00000C00, + 0xB9000002, 0x00000000, + 0xB900031D, 0x00504340, + 0xB8000000, 0x00000000 +}; + +/* Size: 0x10 Bytes */ +typedef struct unk800E2980 { + s32 unk0; + u16 unk4; + u16 unk6; + f32 unk8; + f32 unkC; +} unk800E2980; + +unk800E2980 D_800E2980[2] = { + { 1, 0xFFFF, 0xC090, 3.0f, 0.0f }, + { 0, 0, 0, 0.0f, 0.0f } +}; + +unk800E2980 D_800E29A0[4] = { + { 3, 0xFFFF, 0x0090, 0.75f, -32.0f }, + { 2, 0x0050, 0xFF60, 0.8f, -96.0f }, + { 2, 0x00FF, 0x0090, 0.75f, -192.0f }, + { 0, 0, 0, 0.0f, 0.0f } +}; + +unk800E2980 D_800E29E0[5] = { + { 3, 0xFF80, 0x1490, 0.65f, -64.0f }, + { 2, 0xFFFF, 0xFF90, 1.0f, -128.0f }, + { 3, 0xFFFF, 0x8090, 0.5f, -176.0f }, + { 3, 0xFF28, 0x2890, 0.75f, -224.0f }, + { 0, 0, 0, 0.0f, 0.0f } +}; + +unk800E2980 D_800E2A30[5] = { + { 3, 0xFF80, 0xFF80, 0.5f, -64.0f }, + { 1, 0xFFFF, 0xC090, 0.75f, -128.0f }, + { 2, 0xFF28, 0x0080, 0.6f, -176.0f }, + { 1, 0xFFC0, 0xFF90, 0.75f, -224.0f }, + { 0, 0, 0, 0.0f, 0.0f } +}; + +s32 D_800E2A80 = 0; +s32 D_800E2A84 = 1; +s32 D_800E2A88 = 0; +f32 D_800E2A8C = -200.0f; +f32 D_800E2A90 = 200.0f; +f32 D_800E2A94 = 200.0f; +f32 D_800E2A98 = 200.0f; +f32 D_800E2A9C = 200.0f; +f32 D_800E2AA0 = -200.0f; +f32 D_800E2AA4 = -200.0f; +f32 D_800E2AA8 = -200.0f; + +s16 D_800E2AAC[80] = { + 0, 0, 0, -1, -1, 0, 0, 0, + -1, -1, 0, 0, 0, -1, -1, 0, + 0, 0, -1, -1, 0, 0, 0, -1, + -1, 0, 0, 0, -1, -1, 0, 0, + 0, -1, -1, 0, 0, 0, -1, -1, + 0, 0, 0, -1, -1, 0, 0, 0, + -1, -1, 0, 0, 0, -1, -1, 0, + 0, 0, -1, -1, 0, 0, 0, -1, + -1, 0, 0, 0, -1, -1, 0, 0, + 0, -1, -1, 0, 0, 0, -1, -1 +}; + +/* Size: 0x1C Bytes */ +typedef struct unk800E2B4C { + s32 unk0; + s16 unk4; + s16 unk6; + f32 unk8; + f32 unkC; + f32 unk10; + f32 unk14; + s16 unk18; + s16 unk1A; +} unk800E2B4C; + +unk800E2B4C D_800E2B4C[8] = { + { 0, 0, 0, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0 }, + { 0, 0, 0, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0 }, + { 0, 0, 0, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0 }, + { 0, 0, 0, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0 }, + { 0, 0, 0, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0 }, + { 0, 0, 0, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0 }, + { 0, 0, 0, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0 }, + { 0, 0, 0, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0 } +}; + +/* Size: 0x18 Bytes */ +typedef struct unk800E2C2C { + s32 unk0; + s16 unk4; + s16 unk6; + s32 unk8; + s32 unkC; + s16 unk10; + s16 unk12; + s16 unk14; + s16 unk16; +} unk800E2C2C; + +unk800E2C2C D_800E2C2C[2] = { + { 0, 0x400, 0x400, 0x000AFFC4, 0, 0x80FF, 0xFF80, 0x80FF, 0x8000 }, + { 0, 0x600, 0x600, 0x0020FF40, 0, 0xFFFF, 0xFF00, 0x80FF, 0xFF00 } +}; + +s32 D_800E2C5C = 0; +s32 D_800E2C60 = 0x00010000; +s32 D_800E2C64 = 0; +s32 D_800E2C68 = 0x00010000; +s32 D_800E2C6C = 0x00010000; +s32 D_800E2C70 = 0; +s32 D_800E2C74 = 0x00010000; +s32 D_800E2C78 = 0; +s32 D_800E2C7C = 0; +s32 D_800E2C80 = 0; +s32 D_800E2C84 = 0; +s32 D_800E2C88 = 0; +s32 D_800E2C8C = 0; +s32 D_800E2C90 = 0; +s32 D_800E2C94 = 0; + +s16 D_800E2C98[4] = { + 0x40FF, 0xFFFF, 0x0005, 0x0002 +}; + +/*******************************/ + +/************ .bss ************/ + extern u8 D_80126CD0; extern u8 D_80126CD1; extern u8 D_80126CD2; @@ -52,6 +385,8 @@ extern u8 D_80127188; extern u8 D_8012718B; extern unk80127BF8 D_80127BF8; +/******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_8009ECF0.s") GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_8009F034.s") GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800A003C.s") @@ -258,13 +593,13 @@ GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AD030.s") GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AD144.s") void func_800AD220(void) { - if (D_800E2C38 != 0) { - func_8007B2BC(D_800E2C38); + if (D_800E2C2C[0].unkC != 0) { + func_8007B2BC(D_800E2C2C[0].unkC); D_800E2C88 = 0; } - if (D_800E2C50 != 0) { - func_8007B2BC(D_800E2C50); + if (D_800E2C2C[1].unkC != 0) { + func_8007B2BC(D_800E2C2C[1].unkC); D_800E2C88 = 0; } From 9d0e4d505b47ac68d208824b55116ad5d2e2075f Mon Sep 17 00:00:00 2001 From: David Benepe Date: Thu, 27 May 2021 13:41:32 -0500 Subject: [PATCH 26/39] unknown_0AEE70.c data section --- data/dkr.data.s | 662 ++++++++++++++++++++++--------------------- src/unknown_0AEE70.c | 179 +++++++++++- 2 files changed, 500 insertions(+), 341 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index ba1612bd..44d8c1b7 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -6766,335 +6766,339 @@ ############## unknown_0AEE70.c (.data) ############## -glabel D_800E2CA0 -.word 0x00000000 +# glabel D_800E2CA0 +# .word 0x00000000 +# +# glabel D_800E2CA4 +# .word 0x00000000 +# +# glabel D_800E2CA8 +# .word 0x00000000 +# +# glabel D_800E2CAC +# .word 0x00000000 +# +# glabel D_800E2CB0 +# .word 0x00000000 +# +# glabel D_800E2CB4 +# .word 0x00000000 +# +# glabel D_800E2CB8 +# .word 0x00000000 +# +# glabel D_800E2CBC +# .word 0x00000000 +# +# glabel D_800E2CC0 +# .word 0x00000000 +# +# glabel D_800E2CC4 +# .word 0x00000000 +# +# glabel D_800E2CC8 +# .word 0x00000000 +# +# glabel D_800E2CCC +# .word 0x00000000 +# +# glabel D_800E2CD0 +# .word 0x00000000 +# +# glabel D_800E2CD4 +# .word 0x00000000 +# +# glabel D_800E2CD8 +# .word 0x00000000 +# +# glabel D_800E2CDC +# .word 0x00000000 +# +# glabel D_800E2CE0 +# .word 0x00000000 +# +# glabel D_800E2CE4 +# .word 0x00000000 +# +# glabel D_800E2CE8 +# .word 0x00000000 +# +# glabel D_800E2CEC +# .word 0x00000000 +# +# glabel D_800E2CF0 +# .word 0x00000000 +# +# glabel D_800E2CF4 +# .word 0x00000000 +# +# glabel D_800E2CF8 +# .word 0x00000000 +# +# glabel D_800E2CFC +# .word 0x00000000 +# +# glabel D_800E2D00 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E2D08 +# .word 0x40000102 # struct 0x10 bytes with all s16? +# .word 0x01000000 +# .word 0x000001E0 +# .word 0x010001E0 +# .word 0x40000203 +# .word 0x01000000 +# .word 0x010001E0 +# .word 0x01E001E0 +# .word 0x40010204 +# .word 0x00000000 +# .word 0x01000000 +# .word 0x000001E0 +# .word 0x40020305 +# .word 0x01000000 +# .word 0x01E00000 +# .word 0x01E001E0 +# .word 0x40000103 +# .word 0x01000000 +# .word 0x000001E0 +# .word 0x01E001E0 +# +# glabel D_800E2D58 +# .word 0x000001FF +# .word 0x01FF0000 +# .word 0x01FF01FF +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x000001FF +# .word 0x000001FF +# .word 0x01FF0000 +# +# glabel D_800E2D78 +# .word 0x00000105 +# .word 0x00000000 +# .word 0x00800000 +# .word 0x008001FF +# .word 0x00000504 +# .word 0x00000000 +# .word 0x008001FF +# .word 0x000001FF +# .word 0x00010206 +# .word 0x00800000 +# .word 0x01000000 +# .word 0x010001FF +# .word 0x00010605 +# .word 0x00800000 +# .word 0x010001FF +# .word 0x008001FF +# .word 0x00020307 +# .word 0x01000000 +# .word 0x01800000 +# .word 0x018001FF +# .word 0x00020706 +# .word 0x01000000 +# .word 0x018001FF +# .word 0x010001FF +# .word 0x00030004 +# .word 0x01800000 +# .word 0x02000000 +# .word 0x020001FF +# .word 0x00030407 +# .word 0x01800000 +# .word 0x020001FF +# .word 0x018001FF +# +# glabel D_800E2DF8 +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x01FF01FF +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x01FF01FF +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x01FF01FF +# .word 0x00000000 +# .word 0x01FF0000 +# .word 0x01FF01FF +# +# glabel D_800E2E28 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x3DCCCCCD +# .word 0x3E4CCCCD +# .word 0x3E99999A +# .word 0x3EE66666 +# .word 0x3F066666 +# .word 0x3F19999A +# .word 0x3F4CCCCD +# +# glabel D_800E2E4C +# .word 0x00000000 +# +# glabel D_800E2E50 +# .word 0x00000000 +# +# glabel D_800E2E54 +# .word 0x00000000 +# +# glabel D_800E2E58 +# .word 0x00000000 +# +# glabel D_800E2E5C +# .word 0x00000000 +# +# glabel D_800E2E60 +# .word 0x00000000 +# +# glabel D_800E2E64 +# .word 0x00000000 +# +# glabel D_800E2E68 +# .word 0x00000008 +# .word 0x0007FFFC +# .word 0xFFF9FFFC +# +# glabel D_800E2E74 +# .word 0xFFFA0006 +# .word 0x00060006 +# .word 0x0006FFFA +# .word 0xFFFAFFFA +# +# glabel D_800E2E84 +# .word 0x00000000 +# .word 0xC00840FF +# .word 0xFF6008FF +# .word 0x404040FF +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x1070FFFF +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E2EC4 +# .word 0x404040FF +# .word 0x404040FF +# .word 0x002D00FF +# .word 0x002D00FF +# .word 0x403C0AFF +# .word 0x403C0AFF +# .word 0x4040FFFF +# .word 0x4040FFFF +# .word 0x404040FF +# .word 0x404040FF +# +# glabel D_800E2EEC +# .word 0x00000100 +# +# glabel D_800E2EF0 +# .word 0x00000000 +# +# glabel D_800E2EF4 +# .word 0x02040608 +# .word 0x0A0F1115 +# .word 0x171F2127 +# .word 0x292B2D2F +# .word 0x31333538 +# .word 0x3A3F4143 +# .word 0x45484A4B +# .word 0x4D505256 +# .word 0x585B5D62 +# .word 0x64686A6F +# .word 0x7176787D +# .word 0x7F84868B +# .word 0x8D929496 +# .word 0x989A9DA2 +# .word 0xA5A9ABB0 +# .word 0xB3B80001 +# .word 0x00090B11 +# .word 0x13191B21 +# .word 0x23292B31 +# .word 0x33383A41 +# .word 0x43494B4C +# .word 0x4E53555B +# .word 0x5D62646B +# .word 0x6D73757B +# .word 0x7D83858B +# .word 0x8D93959B +# .word 0x9DA3A5AA +# .word 0xACB2B4BC +# .word 0xBEC4C6CC +# .word 0xCED3D5D7 +# .word 0xD9DCDEE0 +# .word 0xE2E7E9EF +# .word 0x00010308 +# .word 0x090F1116 +# .word 0x181D1F24 +# .word 0x26282A2F +# .word 0x31363839 +# .word 0x3B3D3F43 +# .word 0x4546484F +# .word 0x5156585D +# .word 0x5F64666B +# .word 0x6C707277 +# .word 0x797C7E82 +# .word 0x84898B92 +# .word 0x94999BA0 +# .word 0xA2A6A8AB +# .word 0xADAEB0B3 +# .word 0xB5B9B5B9 +# .word 0x00000000 +# +# glabel D_800E2FB8 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001402 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xBA001102 +# .word 0x00000000 +# .word 0xBA001301 +# .word 0x00000000 +# .word 0xBA000C02 +# .word 0x00002000 +# .word 0xBA000903 +# .word 0x00000C00 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB900031D +# .word 0x00504240 +# .word 0xFB000000 +# .word 0xFFFFFFFF +# .word 0xFA000000 +# .word 0x00000000 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800E3020 +# .word 0xFFFFFFFF +# +# glabel D_800E3024 +# .word 0x00000000 +# +# glabel D_800E3028 +# .word 0x00000000 +# +# glabel D_800E302C +# .word 0x800E8F00 +# .word 0x800E8F08 +# .word 0x800E8F10 +# .word 0x00000000 +# .word 0x00000000 -glabel D_800E2CA4 -.word 0x00000000 +###################################################### -glabel D_800E2CA8 -.word 0x00000000 - -glabel D_800E2CAC -.word 0x00000000 - -glabel D_800E2CB0 -.word 0x00000000 - -glabel D_800E2CB4 -.word 0x00000000 - -glabel D_800E2CB8 -.word 0x00000000 - -glabel D_800E2CBC -.word 0x00000000 - -glabel D_800E2CC0 -.word 0x00000000 - -glabel D_800E2CC4 -.word 0x00000000 - -glabel D_800E2CC8 -.word 0x00000000 - -glabel D_800E2CCC -.word 0x00000000 - -glabel D_800E2CD0 -.word 0x00000000 - -glabel D_800E2CD4 -.word 0x00000000 - -glabel D_800E2CD8 -.word 0x00000000 - -glabel D_800E2CDC -.word 0x00000000 - -glabel D_800E2CE0 -.word 0x00000000 - -glabel D_800E2CE4 -.word 0x00000000 - -glabel D_800E2CE8 -.word 0x00000000 - -glabel D_800E2CEC -.word 0x00000000 - -glabel D_800E2CF0 -.word 0x00000000 - -glabel D_800E2CF4 -.word 0x00000000 - -glabel D_800E2CF8 -.word 0x00000000 - -glabel D_800E2CFC -.word 0x00000000 - -glabel D_800E2D00 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E2D08 -.word 0x40000102 -.word 0x01000000 -.word 0x000001E0 -.word 0x010001E0 -.word 0x40000203 -.word 0x01000000 -.word 0x010001E0 -.word 0x01E001E0 -.word 0x40010204 -.word 0x00000000 -.word 0x01000000 -.word 0x000001E0 -.word 0x40020305 -.word 0x01000000 -.word 0x01E00000 -.word 0x01E001E0 -.word 0x40000103 -.word 0x01000000 -.word 0x000001E0 -.word 0x01E001E0 - -glabel D_800E2D58 -.word 0x000001FF -.word 0x01FF0000 -.word 0x01FF01FF -.word 0x00000000 -.word 0x01FF0000 -.word 0x000001FF -.word 0x000001FF -.word 0x01FF0000 - -glabel D_800E2D78 -.word 0x00000105 -.word 0x00000000 -.word 0x00800000 -.word 0x008001FF -.word 0x00000504 -.word 0x00000000 -.word 0x008001FF -.word 0x000001FF -.word 0x00010206 -.word 0x00800000 -.word 0x01000000 -.word 0x010001FF -.word 0x00010605 -.word 0x00800000 -.word 0x010001FF -.word 0x008001FF -.word 0x00020307 -.word 0x01000000 -.word 0x01800000 -.word 0x018001FF -.word 0x00020706 -.word 0x01000000 -.word 0x018001FF -.word 0x010001FF -.word 0x00030004 -.word 0x01800000 -.word 0x02000000 -.word 0x020001FF -.word 0x00030407 -.word 0x01800000 -.word 0x020001FF -.word 0x018001FF - -glabel D_800E2DF8 -.word 0x00000000 -.word 0x01FF0000 -.word 0x01FF01FF -.word 0x00000000 -.word 0x01FF0000 -.word 0x01FF01FF -.word 0x00000000 -.word 0x01FF0000 -.word 0x01FF01FF -.word 0x00000000 -.word 0x01FF0000 -.word 0x01FF01FF - -glabel D_800E2E28 -.word 0x00000000 -.word 0x00000000 -.word 0x3DCCCCCD -.word 0x3E4CCCCD -.word 0x3E99999A -.word 0x3EE66666 -.word 0x3F066666 -.word 0x3F19999A -.word 0x3F4CCCCD - -glabel D_800E2E4C -.word 0x00000000 - -glabel D_800E2E50 -.word 0x00000000 - -glabel D_800E2E54 -.word 0x00000000 - -glabel D_800E2E58 -.word 0x00000000 - -glabel D_800E2E5C -.word 0x00000000 - -glabel D_800E2E60 -.word 0x00000000 - -glabel D_800E2E64 -.word 0x00000000 - -glabel D_800E2E68 -.word 0x00000008 -.word 0x0007FFFC -.word 0xFFF9FFFC - -glabel D_800E2E74 -.word 0xFFFA0006 -.word 0x00060006 -.word 0x0006FFFA -.word 0xFFFAFFFA - -glabel D_800E2E84 -.word 0x00000000 -.word 0xC00840FF -.word 0xFF6008FF -.word 0x404040FF -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x1070FFFF -.word 0x00000000 -.word 0x00000000 - -glabel D_800E2EC4 -.word 0x404040FF -.word 0x404040FF -.word 0x002D00FF -.word 0x002D00FF -.word 0x403C0AFF -.word 0x403C0AFF -.word 0x4040FFFF -.word 0x4040FFFF -.word 0x404040FF -.word 0x404040FF - -glabel D_800E2EEC -.word 0x00000100 - -glabel D_800E2EF0 -.word 0x00000000 - -glabel D_800E2EF4 -.word 0x02040608 -.word 0x0A0F1115 -.word 0x171F2127 -.word 0x292B2D2F -.word 0x31333538 -.word 0x3A3F4143 -.word 0x45484A4B -.word 0x4D505256 -.word 0x585B5D62 -.word 0x64686A6F -.word 0x7176787D -.word 0x7F84868B -.word 0x8D929496 -.word 0x989A9DA2 -.word 0xA5A9ABB0 -.word 0xB3B80001 -.word 0x00090B11 -.word 0x13191B21 -.word 0x23292B31 -.word 0x33383A41 -.word 0x43494B4C -.word 0x4E53555B -.word 0x5D62646B -.word 0x6D73757B -.word 0x7D83858B -.word 0x8D93959B -.word 0x9DA3A5AA -.word 0xACB2B4BC -.word 0xBEC4C6CC -.word 0xCED3D5D7 -.word 0xD9DCDEE0 -.word 0xE2E7E9EF -.word 0x00010308 -.word 0x090F1116 -.word 0x181D1F24 -.word 0x26282A2F -.word 0x31363839 -.word 0x3B3D3F43 -.word 0x4546484F -.word 0x5156585D -.word 0x5F64666B -.word 0x6C707277 -.word 0x797C7E82 -.word 0x84898B92 -.word 0x94999BA0 -.word 0xA2A6A8AB -.word 0xADAEB0B3 -.word 0xB5B9B5B9 -.word 0x00000000 - -glabel D_800E2FB8 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001402 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xBA001102 -.word 0x00000000 -.word 0xBA001301 -.word 0x00000000 -.word 0xBA000C02 -.word 0x00002000 -.word 0xBA000903 -.word 0x00000C00 -.word 0xB9000002 -.word 0x00000000 -.word 0xB900031D -.word 0x00504240 -.word 0xFB000000 -.word 0xFFFFFFFF -.word 0xFA000000 -.word 0x00000000 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800E3020 -.word 0xFFFFFFFF - -glabel D_800E3024 -.word 0x00000000 - -glabel D_800E3028 -.word 0x00000000 - -glabel D_800E302C -.word 0x800E8F00 -.word 0x800E8F08 -.word 0x800E8F10 -.word 0x00000000 -.word 0x00000000 +############## unknown_0B8920.c (.data) ############## glabel D_800E3040 .word 0x00000000 @@ -7704,6 +7708,10 @@ glabel gzip_inflate_input glabel gzip_inflate_output .word 0x00000000 +###################################################### + +############## unknown_0C7F50.c (.data) ############## + glabel D_800E3770 .word 0x00000000 diff --git a/src/unknown_0AEE70.c b/src/unknown_0AEE70.c index 1fa645fa..0a2b8784 100644 --- a/src/unknown_0AEE70.c +++ b/src/unknown_0AEE70.c @@ -4,21 +4,172 @@ #include "types.h" #include "macros.h" -// Not sure what kind of pointers these are. -extern s32* D_800E2CA8; -extern s32* D_800E2CB4; -extern s32* D_800E2CC0; -extern s32* D_800E2CCC; -extern s32* D_800E2CD8; -extern s32* D_800E2CE0; -extern s32* D_800E2CE4; -extern s32* D_800E2CEC; -extern s32* D_800E2CF0; -extern s32* D_800E2CF8; -extern s32* D_800E2CFC; +/************ .data ************/ -extern s32* D_800E2E60; -extern s32 D_800E2E64; +// I woundn't be suprised if most of these zeroes are really just null pointers. +s32 D_800E2CA0 = 0; +s32 D_800E2CA4 = 0; +s32 *D_800E2CA8 = NULL; +s32 D_800E2CAC = 0; +s32 D_800E2CB0 = 0; +s32 *D_800E2CB4 = NULL; +s32 D_800E2CB8 = 0; +s32 D_800E2CBC = 0; +s32 *D_800E2CC0 = NULL; +s32 D_800E2CC4 = 0; +s32 D_800E2CC8 = 0; +s32 *D_800E2CCC = NULL; +s32 D_800E2CD0 = 0; +s32 D_800E2CD4 = 0; +s32 *D_800E2CD8 = NULL; +s32 D_800E2CDC = 0; +s32 *D_800E2CE0 = NULL; +s32 *D_800E2CE4 = NULL; +s32 D_800E2CE8 = 0; +s32 *D_800E2CEC = NULL; +s32 *D_800E2CF0 = NULL; +s32 D_800E2CF4 = 0; +s32 *D_800E2CF8 = NULL; +s32 *D_800E2CFC = NULL; +s32 D_800E2D00[2] = { 0, 0 }; + +/* Size: 0x10 bytes, might just be an array? */ +typedef struct unk800E2D08 { + s16 unk0, unk2, unk4, unk6, unk8, unkA, unkC, unkE; +} unk800E2D08; + +unk800E2D08 D_800E2D08[5] = { + { 0x4000, 0x0102, 0x0100, 0x0000, 0x0000, 0x01E0, 0x0100, 0x01E0 }, + { 0x4000, 0x0203, 0x0100, 0x0000, 0x0100, 0x01E0, 0x01E0, 0x01E0 }, + { 0x4001, 0x0204, 0x0000, 0x0000, 0x0100, 0x0000, 0x0000, 0x01E0 }, + { 0x4002, 0x0305, 0x0100, 0x0000, 0x01E0, 0x0000, 0x01E0, 0x01E0 }, + { 0x4000, 0x0103, 0x0100, 0x0000, 0x0000, 0x01E0, 0x01E0, 0x01E0 } +}; + +// This might be a different struct/type +unk800E2D08 D_800E2D58[2] = { + { 0x0000, 0x01FF, 0x01FF, 0x0000, 0x01FF, 0x01FF, 0x0000, 0x0000 }, + { 0x01FF, 0x0000, 0x0000, 0x01FF, 0x0000, 0x01FF, 0x01FF, 0x0000 } +}; + +/* Size: 0x40 bytes, might just be an array? */ +typedef struct unk800E2D78 { + s16 unk0, unk2, unk4, unk6, unk8, unkA, unkC, unkE; + s16 unk10, unk12, unk14, unk16, unk18, unk1A, unk1C, unk1E; + s16 unk20, unk22, unk24, unk26, unk28, unk2A, unk2C, unk2E; + s16 unk30, unk32, unk34, unk36, unk38, unk3A, unk3C, unk3E; +} unk800E2D78; + +unk800E2D78 D_800E2D78[2] = { + { + 0x0000, 0x0105, 0x0000, 0x0000, 0x0080, 0x0000, 0x0080, 0x01FF, + 0x0000, 0x0504, 0x0000, 0x0000, 0x0080, 0x01FF, 0x0000, 0x01FF, + 0x0001, 0x0206, 0x0080, 0x0000, 0x0100, 0x0000, 0x0100, 0x01FF, + 0x0001, 0x0605, 0x0080, 0x0000, 0x0100, 0x01FF, 0x0080, 0x01FF + }, + { + 0x0002, 0x0307, 0x0100, 0x0000, 0x0180, 0x0000, 0x0180, 0x01FF, + 0x0002, 0x0706, 0x0100, 0x0000, 0x0180, 0x01FF, 0x0100, 0x01FF, + 0x0003, 0x0004, 0x0180, 0x0000, 0x0200, 0x0000, 0x0200, 0x01FF, + 0x0003, 0x0407, 0x0180, 0x0000, 0x0200, 0x01FF, 0x0180, 0x01FF + }, +}; + +/* Size: 0x18 bytes, might just be an array? */ +typedef struct unk800E2DF8 { + s16 unk0, unk2, unk4, unk6, unk8, unkA, unkC, unkE; + s16 unk10, unk12, unk14, unk16; +} unk800E2DF8; + +unk800E2DF8 D_800E2DF8[2] = { + { + 0x0000, 0x0000, 0x01FF, 0x0000, 0x01FF, 0x01FF, 0x0000, 0x0000, + 0x01FF, 0x0000, 0x01FF, 0x01FF + }, + { + 0x0000, 0x0000, 0x01FF, 0x0000, 0x01FF, 0x01FF, 0x0000, 0x0000, + 0x01FF, 0x0000, 0x01FF, 0x01FF + }, +}; + +f32 D_800E2E28[9] = { + 0.0f, 0.0f, 0.1, 0.2f, 0.3f, 0.45f, 0.525f, 0.6f, 0.8f +}; + +s32 D_800E2E4C = 0; +s32 D_800E2E50 = 0; +s32 D_800E2E54 = 0; +s32 D_800E2E58 = 0; +s32 D_800E2E5C = 0; +s32 *D_800E2E60 = NULL; +s32 D_800E2E64 = 0; + +s16 D_800E2E68[6] = { + 0, 8, 7, -4, -7, -4 +}; + +s16 D_800E2E74[8] = { + -6, 6, 6, 6, 6, -6, -6, -6 +}; + +s32 D_800E2E84[16] = { + 0x00000000, 0xC00840FF, 0xFF6008FF, 0x404040FF, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x1070FFFF, 0x00000000, 0x00000000 +}; + +s32 D_800E2EC4[10] = { + 0x404040FF, 0x404040FF, 0x002D00FF, 0x002D00FF, + 0x403C0AFF, 0x403C0AFF, 0x4040FFFF, 0x4040FFFF, + 0x404040FF, 0x404040FF +}; + +s32 D_800E2EEC = 0x100; +s32 D_800E2EF0 = 0; + +u8 D_800E2EF4[196] = { + 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0F, 0x11, 0x15, 0x17, 0x1F, 0x21, 0x27, 0x29, 0x2B, 0x2D, 0x2F, + 0x31, 0x33, 0x35, 0x38, 0x3A, 0x3F, 0x41, 0x43, 0x45, 0x48, 0x4A, 0x4B, 0x4D, 0x50, 0x52, 0x56, + 0x58, 0x5B, 0x5D, 0x62, 0x64, 0x68, 0x6A, 0x6F, 0x71, 0x76, 0x78, 0x7D, 0x7F, 0x84, 0x86, 0x8B, + 0x8D, 0x92, 0x94, 0x96, 0x98, 0x9A, 0x9D, 0xA2, 0xA5, 0xA9, 0xAB, 0xB0, 0xB3, 0xB8, 0x00, 0x01, + 0x00, 0x09, 0x0B, 0x11, 0x13, 0x19, 0x1B, 0x21, 0x23, 0x29, 0x2B, 0x31, 0x33, 0x38, 0x3A, 0x41, + 0x43, 0x49, 0x4B, 0x4C, 0x4E, 0x53, 0x55, 0x5B, 0x5D, 0x62, 0x64, 0x6B, 0x6D, 0x73, 0x75, 0x7B, + 0x7D, 0x83, 0x85, 0x8B, 0x8D, 0x93, 0x95, 0x9B, 0x9D, 0xA3, 0xA5, 0xAA, 0xAC, 0xB2, 0xB4, 0xBC, + 0xBE, 0xC4, 0xC6, 0xCC, 0xCE, 0xD3, 0xD5, 0xD7, 0xD9, 0xDC, 0xDE, 0xE0, 0xE2, 0xE7, 0xE9, 0xEF, + 0x00, 0x01, 0x03, 0x08, 0x09, 0x0F, 0x11, 0x16, 0x18, 0x1D, 0x1F, 0x24, 0x26, 0x28, 0x2A, 0x2F, + 0x31, 0x36, 0x38, 0x39, 0x3B, 0x3D, 0x3F, 0x43, 0x45, 0x46, 0x48, 0x4F, 0x51, 0x56, 0x58, 0x5D, + 0x5F, 0x64, 0x66, 0x6B, 0x6C, 0x70, 0x72, 0x77, 0x79, 0x7C, 0x7E, 0x82, 0x84, 0x89, 0x8B, 0x92, + 0x94, 0x99, 0x9B, 0xA0, 0xA2, 0xA6, 0xA8, 0xAB, 0xAD, 0xAE, 0xB0, 0xB3, 0xB5, 0xB9, 0xB5, 0xB9, + 0x00, 0x00, 0x00, 0x00 +}; + +// Fast3D (F3DDKR) display list +u32 D_800E2FB8[] = { + 0xE7000000, 0x00000000, + 0xBA001402, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xBA001102, 0x00000000, + 0xBA001301, 0x00000000, + 0xBA000C02, 0x00002000, + 0xBA000903, 0x00000C00, + 0xB9000002, 0x00000000, + 0xB900031D, 0x00504240, + 0xFB000000, 0xFFFFFFFF, + 0xFA000000, 0x00000000, + 0xB8000000, 0x00000000 +}; + +s32 D_800E3020 = -1; +s32 D_800E3024 = 0; +s32 D_800E3028 = 0; + +s32 *D_800E302C[3] = { + (s32*)0x800E8F00, (s32*)0x800E8F08, (s32*)0x800E8F10 +}; + +/*******************************/ void func_800AE2D8(void); void func_800AE374(void); From 1b3b2b3a6466a3916a90bb18e324c01b1df24c47 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Thu, 27 May 2021 15:01:35 -0500 Subject: [PATCH 27/39] unknown_0B8920.c data section --- data/dkr.data.s | 1212 +++++++++++++++++++++--------------------- src/unknown_0B8920.c | 332 ++++++++++-- 2 files changed, 901 insertions(+), 643 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 44d8c1b7..1fba5c65 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -7100,613 +7100,611 @@ ############## unknown_0B8920.c (.data) ############## -glabel D_800E3040 -.word 0x00000000 - -glabel D_800E3044 -.word 0x00000000 - -glabel D_800E3048 -.word 0x00000000 - -glabel D_800E304C -.word 0x00000000 - -glabel D_800E3050 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E3070 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E3078 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E3080 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E3090 -.word 0x40000201 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x40010203 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x40000201 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x40010203 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E30D0 -.word 0x00000000 - -glabel D_800E30D4 -.word 0x00000000 - -glabel D_800E30D8 -.word 0x00000000 - -glabel D_800E30DC -.word 0x00000000 - -glabel D_800E30E0 -.word 0x00000000 - -glabel D_800E30E4 -.word 0x00000000 - -glabel D_800E30E8 -.word 0x00010002 -.word 0x00030004 -.word 0x00050006 -.word 0x00070008 -.word 0x00090000 - -glabel D_800E30FC -.word 0x00000001 -.word 0x00020003 -.word 0x00040005 -.word 0x00060007 -.word 0x00080000 - -glabel D_800E3110 -.word 0x00010002 -.word 0x00030004 -.word 0x00050006 -.word 0x00070008 -.word 0x0009000A -.word 0x000B000C -.word 0x000D000E -.word 0x000F0010 -.word 0x00110012 -.word 0x00130014 -.word 0x00150016 -.word 0x00170018 -.word 0x00190000 - -glabel D_800E3144 -.word 0x00000001 -.word 0x00010001 -.word 0x00020003 -.word 0x00040004 -.word 0x00040005 -.word 0x00030004 -.word 0x00040004 -.word 0x00050003 -.word 0x00040004 -.word 0x00040005 -.word 0x00060007 -.word 0x00070007 -.word 0x00080000 - -glabel D_800E3178 -.word 0x00000000 - -glabel D_800E317C -.word 0x00000000 - -glabel D_800E3180 -.word 0x00000000 - -glabel D_800E3184 -.word 0x00000000 - -glabel D_800E3188 -.word 0x00000000 - -glabel D_800E318C -.word 0x00000000 - -glabel D_800E3190 -.word 0x00000000 - -glabel D_800E3194 -.word 0x00000000 - -glabel D_800E3198 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E31A0 -.word 0x00000000 - -glabel D_800E31A4 -.word 0x00000000 - -glabel D_800E31A8 -.word 0x00000000 - -glabel D_800E31AC -.word 0x00000000 - -glabel D_800E31B0 -.word 0x00000000 - -glabel D_800E31B4 -.word 0x00000000 - -glabel D_800E31B8 -.word 0x00000000 - -glabel D_800E31BC -.word 0x00000000 - -glabel D_800E31C0 -.word 0x00000000 - -glabel D_800E31C4 -.word 0x00000000 - -glabel D_800E31C8 -.word 0x00000000 - -glabel D_800E31CC -.word 0x00000000 - -glabel D_800E31D0 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E31D8 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001402 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xBA001102 -.word 0x00000000 -.word 0xBA001301 -.word 0x00000000 -.word 0xBA000C02 -.word 0x00002000 -.word 0xBA000903 -.word 0x00000C00 -.word 0xB9000002 -.word 0x00000000 -.word 0xB900031D -.word 0x00504340 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800E3230 -.word 0xFE200078 -.word 0xFEC00078 -.word 0xFF600078 -.word 0x00000078 -.word 0x00A00078 -.word 0x01400078 -.word 0x01E00078 -.word 0xFE20FF88 -.word 0xFEC0FF88 -.word 0xFF60FF88 -.word 0x0000FF88 -.word 0x00A0FF88 -.word 0x0140FF88 -.word 0x01E0FF88 - -glabel D_800E3268 -.word 0xFF600168 -.word 0xFF6000F0 -.word 0xFF600078 -.word 0xFF600000 -.word 0xFF60FF88 -.word 0xFF60FF10 -.word 0xFF60FF10 -.word 0x00A00168 -.word 0x00A000F0 -.word 0x00A00078 -.word 0x00A00000 -.word 0x00A0FF88 -.word 0x00A0FF10 -.word 0x00A0FF10 - -glabel D_800E32A0 -.word 0x0002040E -.word 0x1012080A -.word 0x0C16181A - -glabel D_800E32AC -.word 0x04060812 -.word 0x14160406 -.word 0x08121416 - -glabel D_800E32B8 -.word 0x00030101 -.word 0x03040104 -.word 0x02020405 -.word 0x06090707 -.word 0x090A070A -.word 0x08080A0B - -glabel D_800E32D0 -.word 0xFFFF00FF -.word 0xFF0000FF -.word 0xFF00FFFF - -glabel D_800E32DC -.word 0xFCE00078 -.word 0xFE200078 -.word 0xFF600078 -.word 0x00A00078 -.word 0x01E00078 -.word 0x03200078 -.word 0xFCE0FF88 -.word 0xFE20FF88 -.word 0xFF60FF88 -.word 0x00A0FF88 -.word 0x01E0FF88 -.word 0x0320FF88 - -glabel D_800E330C -.word 0x0002040C -.word 0x0E080A12 -.word 0x14160000 - -glabel D_800E3318 -.word 0x04060810 -.word 0x1204060E -.word 0x10120000 - -glabel D_800E3324 -.word 0x00010301 -.word 0x03040104 -.word 0x02050708 -.word 0x05080606 -.word 0x08090000 - -glabel D_800E3338 -.word 0xFFFF00FF -.word 0x0000FF00 -.word 0xFFFF0000 - -glabel D_800E3344 -.word 0xFF6000A0 -.word 0xFF7000A0 -.word 0xFF8000A0 -.word 0xFF9000A0 -.word 0xFFA000A0 -.word 0xFFB000A0 -.word 0xFFC000A0 -.word 0xFFD000A0 -.word 0xFFE000A0 -.word 0xFFF000A0 -.word 0x000000A0 -.word 0x001000A0 -.word 0x002000A0 -.word 0x003000A0 -.word 0x004000A0 -.word 0x005000A0 -.word 0x006000A0 -.word 0x007000A0 -.word 0x008000A0 -.word 0x009000A0 -.word 0x00A000A0 -.word 0xFF60FF38 -.word 0xFF70FF60 -.word 0xFF80FF74 -.word 0xFF90FF7E -.word 0xFFA0FF74 -.word 0xFFB0FF38 -.word 0xFFC0FF10 -.word 0xFFD0FEFC -.word 0xFFE0FEF2 -.word 0xFFF0FEFC -.word 0x0000FF24 -.word 0x0010FF2E -.word 0x0020FF38 -.word 0x0030FF2E -.word 0x0040FF24 -.word 0x0050FEFC -.word 0x0060FEF2 -.word 0x0070FEFC -.word 0x0080FF24 -.word 0x0090FF60 -.word 0x00A0FF74 -.word 0xFF60FEE8 -.word 0xFF70FEE8 -.word 0xFF80FEE8 -.word 0xFF90FEE8 -.word 0xFFA0FEE8 -.word 0xFFB0FEE8 -.word 0xFFC0FEE8 -.word 0xFFD0FEE8 -.word 0xFFE0FEE8 -.word 0xFFF0FEE8 -.word 0x0000FEE8 -.word 0x0010FEE8 -.word 0x0020FEE8 -.word 0x0030FEE8 -.word 0x0040FEE8 -.word 0x0050FEE8 -.word 0x0060FEE8 -.word 0x0070FEE8 -.word 0x0080FEE8 -.word 0x0090FEE8 -.word 0x00A0FEE8 - -glabel D_800E3440 -.word 0x00020406 -.word 0x080A0C0E -.word 0x00020406 -.word 0x080A0C0E -.word 0x0E101214 -.word 0x16181A0E -.word 0x10121416 -.word 0x181A1A1C -.word 0x1E202224 -.word 0x26281A1C -.word 0x1E202224 -.word 0x26280002 -.word 0x0406080A -.word 0x0C0E5456 -.word 0x585A5C5E -.word 0x60620E10 -.word 0x12141618 -.word 0x1A626466 -.word 0x686A6C6E -.word 0x1A1C1E20 -.word 0x22242628 -.word 0x6E707274 -.word 0x76787A7C - -glabel D_800E349C -.word 0x2A2C2E30 -.word 0x32343638 -.word 0x5456585A -.word 0x5C5E6062 -.word 0x383A3C3E -.word 0x40424462 -.word 0x6466686A -.word 0x6C6E4446 -.word 0x484A4C4E -.word 0x50526E70 -.word 0x72747678 -.word 0x7A7C5456 -.word 0x585A5C5E -.word 0x60625456 -.word 0x585A5C5E -.word 0x60626264 -.word 0x66686A6C -.word 0x6E626466 -.word 0x686A6C6E -.word 0x6E707274 -.word 0x76787A7C -.word 0x6E707274 -.word 0x76787A7C - -glabel D_800E34F8 -.word 0x00000000 -.word 0x00000000 -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0x00000000 -.word 0x000000FF -.word 0xFFFFFFFF -.word 0xFFFF0000 -.word 0x00000000 -.word 0x0000FFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF -.word 0xFFFFFFFF - -glabel D_800E3554 -.word 0x00080900 -.word 0x09010109 -.word 0x0A010A02 -.word 0x020A0B02 -.word 0x0B03030B -.word 0x0C030C04 -.word 0x040C0D04 -.word 0x0D05050D -.word 0x0E050E06 -.word 0x060E0F06 -.word 0x0F070007 -.word 0x08000801 -.word 0x01080901 -.word 0x09020209 -.word 0x0A020A03 -.word 0x030A0B03 -.word 0x0B04040B -.word 0x0C040C05 -.word 0x050C0D05 -.word 0x0D060008 -.word 0x09000901 -.word 0x01090A01 -.word 0x0A02020A -.word 0x0B020B03 -.word 0x030B0C03 -.word 0x0C04040C -.word 0x0D040D05 -.word 0x050D0E05 -.word 0x0E06060E -.word 0x0F060F07 -.word 0x00080900 -.word 0x09010109 -.word 0x0A010A02 -.word 0x020A0B02 -.word 0x0B03030B -.word 0x0C030C04 -.word 0x040C0D04 -.word 0x0D05050D -.word 0x0E050E06 -.word 0x060E0F06 -.word 0x0F070007 -.word 0x08000801 -.word 0x01080901 -.word 0x09020209 -.word 0x0A020A03 -.word 0x030A0B03 -.word 0x0B04040B -.word 0x0C040C05 -.word 0x050C0D05 -.word 0x0D060008 -.word 0x09000901 -.word 0x01090A01 -.word 0x0A02020A -.word 0x0B020B03 -.word 0x030B0C03 -.word 0x0C04040C -.word 0x0D040D05 -.word 0x050D0E05 -.word 0x0E06060E -.word 0x0F060F07 -.word 0x00000000 - -glabel D_800E3648 -.word 0xE7000000 -.word 0x00000000 -.word 0xB6000000 -.word 0x00010000 -.word 0xFCFFFFFF -.word 0xFFFE793C -.word 0xEF080C0F -.word 0x00504340 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800E3670 -.word 0x00000000 - -glabel D_800E3674 -.word 0x00000000 - -glabel D_800E3678 -.word 0x00000000 - -glabel D_800E367C -.word 0x00000000 - -glabel D_800E3680 -.word 0x00000001 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E3690 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xB9000002 -.word 0x00000000 -.word 0xB6000000 -.word 0x00010001 -.word 0xE7000000 -.word 0x00000000 -.word 0xB8000000 -.word 0x00000000 -.word 0xFC5616AC -.word 0x112CFE7F -.word 0xEF000C0F -.word 0x00504240 -.word 0xFCFFFFFF -.word 0xFFFEFB7D -.word 0xEF000C0F -.word 0x00504240 - -glabel D_800E36E8 -.word 0x00000000 - -glabel D_800E36EC -.word 0x3B9ACA00 -.word 0x05F5E100 -.word 0x00989680 -.word 0x000F4240 -.word 0x000186A0 -.word 0x00002710 -.word 0x000003E8 -.word 0x00000064 -.word 0x0000000A - -glabel D_800E3710 -.word 0x04000000 -.word 0x01020001 -.word 0x00020100 -.word 0x02000400 -.word 0x000401FC -.word 0x0101FC01 -.word 0xFE0201FE -.word 0x01FF0401 -.word 0xFF0100FF -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel __osPiDevMgr -.word 0x00000000 -.word 0x00000000 - -glabel D_800E3748 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E3760 -.word 0x00000000 - -glabel D_800E3764 -.word 0x00000000 - -glabel gzip_inflate_input -.word 0x00000000 - -glabel gzip_inflate_output -.word 0x00000000 +# glabel D_800E3040 +# .word 0x00000000 +# +# glabel D_800E3044 +# .word 0x00000000 +# +# glabel D_800E3048 +# .word 0x00000000 +# +# glabel D_800E304C +# .word 0x00000000 +# +# glabel D_800E3050 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E3070 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E3078 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E3080 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E3090 +# .word 0x40000201 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x40010203 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x40000201 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x40010203 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 + +# glabel D_800E30D0 +# .word 0x00000000 +# +# glabel D_800E30D4 +# .word 0x00000000 +# +# glabel D_800E30D8 +# .word 0x00000000 +# +# glabel D_800E30DC +# .word 0x00000000 +# +# glabel D_800E30E0 +# .word 0x00000000 +# +# glabel D_800E30E4 +# .word 0x00000000 +# +# glabel D_800E30E8 +# .word 0x00010002 +# .word 0x00030004 +# .word 0x00050006 +# .word 0x00070008 +# .word 0x00090000 +# +# glabel D_800E30FC +# .word 0x00000001 +# .word 0x00020003 +# .word 0x00040005 +# .word 0x00060007 +# .word 0x00080000 +# +# glabel D_800E3110 +# .word 0x00010002 +# .word 0x00030004 +# .word 0x00050006 +# .word 0x00070008 +# .word 0x0009000A +# .word 0x000B000C +# .word 0x000D000E +# .word 0x000F0010 +# .word 0x00110012 +# .word 0x00130014 +# .word 0x00150016 +# .word 0x00170018 +# .word 0x00190000 +# +# glabel D_800E3144 +# .word 0x00000001 +# .word 0x00010001 +# .word 0x00020003 +# .word 0x00040004 +# .word 0x00040005 +# .word 0x00030004 +# .word 0x00040004 +# .word 0x00050003 +# .word 0x00040004 +# .word 0x00040005 +# .word 0x00060007 +# .word 0x00070007 +# .word 0x00080000 +# +# glabel D_800E3178 +# .word 0x00000000 +# +# glabel D_800E317C +# .word 0x00000000 +# +# glabel D_800E3180 +# .word 0x00000000 +# +# glabel D_800E3184 +# .word 0x00000000 +# +# glabel D_800E3188 +# .word 0x00000000 +# +# glabel D_800E318C +# .word 0x00000000 +# +# glabel D_800E3190 +# .word 0x00000000 +# +# glabel D_800E3194 +# .word 0x00000000 +# +# glabel D_800E3198 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E31A0 +# .word 0x00000000 +# +# glabel D_800E31A4 +# .word 0x00000000 +# +# glabel D_800E31A8 +# .word 0x00000000 +# +# glabel D_800E31AC +# .word 0x00000000 +# +# glabel D_800E31B0 +# .word 0x00000000 +# +# glabel D_800E31B4 +# .word 0x00000000 +# +# glabel D_800E31B8 +# .word 0x00000000 +# +# glabel D_800E31BC +# .word 0x00000000 +# +# glabel D_800E31C0 +# .word 0x00000000 +# +# glabel D_800E31C4 +# .word 0x00000000 +# +# glabel D_800E31C8 +# .word 0x00000000 +# +# glabel D_800E31CC +# .word 0x00000000 +# +# glabel D_800E31D0 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E31D8 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001402 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xBA001102 +# .word 0x00000000 +# .word 0xBA001301 +# .word 0x00000000 +# .word 0xBA000C02 +# .word 0x00002000 +# .word 0xBA000903 +# .word 0x00000C00 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB900031D +# .word 0x00504340 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800E3230 +# .word 0xFE200078 +# .word 0xFEC00078 +# .word 0xFF600078 +# .word 0x00000078 +# .word 0x00A00078 +# .word 0x01400078 +# .word 0x01E00078 +# .word 0xFE20FF88 +# .word 0xFEC0FF88 +# .word 0xFF60FF88 +# .word 0x0000FF88 +# .word 0x00A0FF88 +# .word 0x0140FF88 +# .word 0x01E0FF88 +# +# glabel D_800E3268 +# .word 0xFF600168 +# .word 0xFF6000F0 +# .word 0xFF600078 +# .word 0xFF600000 +# .word 0xFF60FF88 +# .word 0xFF60FF10 +# .word 0xFF60FF10 +# .word 0x00A00168 +# .word 0x00A000F0 +# .word 0x00A00078 +# .word 0x00A00000 +# .word 0x00A0FF88 +# .word 0x00A0FF10 +# .word 0x00A0FF10 +# +# glabel D_800E32A0 +# .word 0x0002040E +# .word 0x1012080A +# .word 0x0C16181A +# +# glabel D_800E32AC +# .word 0x04060812 +# .word 0x14160406 +# .word 0x08121416 +# +# glabel D_800E32B8 +# .word 0x00030101 +# .word 0x03040104 +# .word 0x02020405 +# .word 0x06090707 +# .word 0x090A070A +# .word 0x08080A0B +# +# glabel D_800E32D0 +# .word 0xFFFF00FF +# .word 0xFF0000FF +# .word 0xFF00FFFF +# +# glabel D_800E32DC +# .word 0xFCE00078 +# .word 0xFE200078 +# .word 0xFF600078 +# .word 0x00A00078 +# .word 0x01E00078 +# .word 0x03200078 +# .word 0xFCE0FF88 +# .word 0xFE20FF88 +# .word 0xFF60FF88 +# .word 0x00A0FF88 +# .word 0x01E0FF88 +# .word 0x0320FF88 +# +# glabel D_800E330C +# .word 0x0002040C +# .word 0x0E080A12 +# .word 0x14160000 +# +# glabel D_800E3318 +# .word 0x04060810 +# .word 0x1204060E +# .word 0x10120000 +# +# glabel D_800E3324 +# .word 0x00010301 +# .word 0x03040104 +# .word 0x02050708 +# .word 0x05080606 +# .word 0x08090000 +# +# glabel D_800E3338 +# .word 0xFFFF00FF +# .word 0x0000FF00 +# .word 0xFFFF0000 +# +# glabel D_800E3344 +# .word 0xFF6000A0 +# .word 0xFF7000A0 +# .word 0xFF8000A0 +# .word 0xFF9000A0 +# .word 0xFFA000A0 +# .word 0xFFB000A0 +# .word 0xFFC000A0 +# .word 0xFFD000A0 +# .word 0xFFE000A0 +# .word 0xFFF000A0 +# .word 0x000000A0 +# .word 0x001000A0 +# .word 0x002000A0 +# .word 0x003000A0 +# .word 0x004000A0 +# .word 0x005000A0 +# .word 0x006000A0 +# .word 0x007000A0 +# .word 0x008000A0 +# .word 0x009000A0 +# .word 0x00A000A0 +# .word 0xFF60FF38 +# .word 0xFF70FF60 +# .word 0xFF80FF74 +# .word 0xFF90FF7E +# .word 0xFFA0FF74 +# .word 0xFFB0FF38 +# .word 0xFFC0FF10 +# .word 0xFFD0FEFC +# .word 0xFFE0FEF2 +# .word 0xFFF0FEFC +# .word 0x0000FF24 +# .word 0x0010FF2E +# .word 0x0020FF38 +# .word 0x0030FF2E +# .word 0x0040FF24 +# .word 0x0050FEFC +# .word 0x0060FEF2 +# .word 0x0070FEFC +# .word 0x0080FF24 +# .word 0x0090FF60 +# .word 0x00A0FF74 +# .word 0xFF60FEE8 +# .word 0xFF70FEE8 +# .word 0xFF80FEE8 +# .word 0xFF90FEE8 +# .word 0xFFA0FEE8 +# .word 0xFFB0FEE8 +# .word 0xFFC0FEE8 +# .word 0xFFD0FEE8 +# .word 0xFFE0FEE8 +# .word 0xFFF0FEE8 +# .word 0x0000FEE8 +# .word 0x0010FEE8 +# .word 0x0020FEE8 +# .word 0x0030FEE8 +# .word 0x0040FEE8 +# .word 0x0050FEE8 +# .word 0x0060FEE8 +# .word 0x0070FEE8 +# .word 0x0080FEE8 +# .word 0x0090FEE8 +# .word 0x00A0FEE8 + +# glabel D_800E3440 +# .word 0x00020406 +# .word 0x080A0C0E +# .word 0x00020406 +# .word 0x080A0C0E +# .word 0x0E101214 +# .word 0x16181A0E +# .word 0x10121416 +# .word 0x181A1A1C +# .word 0x1E202224 +# .word 0x26281A1C +# .word 0x1E202224 +# .word 0x26280002 +# .word 0x0406080A +# .word 0x0C0E5456 +# .word 0x585A5C5E +# .word 0x60620E10 +# .word 0x12141618 +# .word 0x1A626466 +# .word 0x686A6C6E +# .word 0x1A1C1E20 +# .word 0x22242628 +# .word 0x6E707274 +# .word 0x76787A7C +# +# glabel D_800E349C +# .word 0x2A2C2E30 +# .word 0x32343638 +# .word 0x5456585A +# .word 0x5C5E6062 +# .word 0x383A3C3E +# .word 0x40424462 +# .word 0x6466686A +# .word 0x6C6E4446 +# .word 0x484A4C4E +# .word 0x50526E70 +# .word 0x72747678 +# .word 0x7A7C5456 +# .word 0x585A5C5E +# .word 0x60625456 +# .word 0x585A5C5E +# .word 0x60626264 +# .word 0x66686A6C +# .word 0x6E626466 +# .word 0x686A6C6E +# .word 0x6E707274 +# .word 0x76787A7C +# .word 0x6E707274 +# .word 0x76787A7C +# +# glabel D_800E34F8 +# .word 0x00000000 +# .word 0x00000000 +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0x00000000 +# .word 0x000000FF +# .word 0xFFFFFFFF +# .word 0xFFFF0000 +# .word 0x00000000 +# .word 0x0000FFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# .word 0xFFFFFFFF +# +# glabel D_800E3554 +# .word 0x00080900 +# .word 0x09010109 +# .word 0x0A010A02 +# .word 0x020A0B02 +# .word 0x0B03030B +# .word 0x0C030C04 +# .word 0x040C0D04 +# .word 0x0D05050D +# .word 0x0E050E06 +# .word 0x060E0F06 +# .word 0x0F070007 +# .word 0x08000801 +# .word 0x01080901 +# .word 0x09020209 +# .word 0x0A020A03 +# .word 0x030A0B03 +# .word 0x0B04040B +# .word 0x0C040C05 +# .word 0x050C0D05 +# .word 0x0D060008 +# .word 0x09000901 +# .word 0x01090A01 +# .word 0x0A02020A +# .word 0x0B020B03 +# .word 0x030B0C03 +# .word 0x0C04040C +# .word 0x0D040D05 +# .word 0x050D0E05 +# .word 0x0E06060E +# .word 0x0F060F07 +# .word 0x00080900 +# .word 0x09010109 +# .word 0x0A010A02 +# .word 0x020A0B02 +# .word 0x0B03030B +# .word 0x0C030C04 +# .word 0x040C0D04 +# .word 0x0D05050D +# .word 0x0E050E06 +# .word 0x060E0F06 +# .word 0x0F070007 +# .word 0x08000801 +# .word 0x01080901 +# .word 0x09020209 +# .word 0x0A020A03 +# .word 0x030A0B03 +# .word 0x0B04040B +# .word 0x0C040C05 +# .word 0x050C0D05 +# .word 0x0D060008 +# .word 0x09000901 +# .word 0x01090A01 +# .word 0x0A02020A +# .word 0x0B020B03 +# .word 0x030B0C03 +# .word 0x0C04040C +# .word 0x0D040D05 +# .word 0x050D0E05 +# .word 0x0E06060E +# .word 0x0F060F07 +# .word 0x00000000 +# +# glabel D_800E3648 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xB6000000 +# .word 0x00010000 +# .word 0xFCFFFFFF +# .word 0xFFFE793C +# .word 0xEF080C0F +# .word 0x00504340 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800E3670 +# .word 0x00000000 +# +# glabel D_800E3674 +# .word 0x00000000 +# +# glabel D_800E3678 +# .word 0x00000000 +# +# glabel D_800E367C +# .word 0x00000000 +# +# glabel D_800E3680 +# .word 0x00000001 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E3690 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB6000000 +# .word 0x00010001 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xB8000000 +# .word 0x00000000 +# .word 0xFC5616AC +# .word 0x112CFE7F +# .word 0xEF000C0F +# .word 0x00504240 +# .word 0xFCFFFFFF +# .word 0xFFFEFB7D +# .word 0xEF000C0F +# .word 0x00504240 + +# glabel D_800E36E8 +# word 0x00000000 +# +# glabel D_800E36EC +# .word 0x3B9ACA00 +# .word 0x05F5E100 +# .word 0x00989680 +# .word 0x000F4240 +# .word 0x000186A0 +# .word 0x00002710 +# .word 0x000003E8 +# .word 0x00000064 +# .word 0x0000000A +# +# glabel D_800E3710 +# .word 0x04000000 +# .word 0x01020001 +# .word 0x00020100 +# .word 0x02000400 +# .word 0x000401FC +# .word 0x0101FC01 +# .word 0xFE0201FE +# .word 0x01FF0401 +# .word 0xFF0100FF +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel __osPiDevMgr +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E3760 +# .word 0x00000000 +# +# glabel D_800E3764 +# .word 0x00000000 +# +# glabel gzip_inflate_input +# .word 0x00000000 +# +# glabel gzip_inflate_output +# .word 0x00000000 ###################################################### diff --git a/src/unknown_0B8920.c b/src/unknown_0B8920.c index f5bc82e7..4f5131d5 100644 --- a/src/unknown_0B8920.c +++ b/src/unknown_0B8920.c @@ -16,14 +16,38 @@ extern OSMesg piEventBuf[1]; //piEventBuf extern OSMesgQueue piAccessQueue; //piAccessQueue void __osDevMgrMain(void); -extern s32* D_800E3040; -extern s32* D_800E3044; -extern s32* D_800E3048; -extern s32* D_800E304C; -extern s32* D_800E3070; -extern s32* D_800E3080; -extern s32* D_800E30D0; -extern s32* D_800E30D4; +/************ .data ************/ + +s32* D_800E3040 = NULL; +s32* D_800E3044 = NULL; +s32* D_800E3048 = NULL; +s32* D_800E304C = NULL; + +// Could be an array of pointers? +s32 D_800E3050[8] = { + 0, 0, 0, 0, 0, 0, 0, 0 +}; + +s32* D_800E3070[2] = { NULL, NULL }; +s32* D_800E3078[2] = { NULL, NULL }; + +// This could also be D_800E3080[2] + D_800E3088[2] +s32* D_800E3080[4] = { NULL, NULL, NULL, NULL }; + +/* Size: 0x10, might just be an array? */ +typedef struct unk800E3090 { + s16 unk0, unk2, unk4, unk6, unk8, unkA, unkC, unkE; +} unk800E3090; + +unk800E3090 D_800E3090[4] = { + { 0x4000, 0x0201, 0, 0, 0, 0, 0, 0, }, + { 0x4001, 0x0203, 0, 0, 0, 0, 0, 0, }, + { 0x4000, 0x0201, 0, 0, 0, 0, 0, 0, }, + { 0x4001, 0x0203, 0, 0, 0, 0, 0, 0, } +}; + +s32* D_800E30D0 = NULL; +s32* D_800E30D4 = NULL; typedef struct{ u8 unk00; @@ -52,23 +76,262 @@ typedef struct{ u8 pad10[0xC]; }unk800E30D8; -extern unk800E30D8 *D_800E30D8; -extern s32 D_800E30DC; -extern s32* D_800E3178; -extern s32* D_800E3184; -extern s32* D_800E3188; -extern s32* D_800E3190; -extern s32* D_800E3194; -extern s32 D_800E31A0; -extern s8 D_800E3670; -extern s16 D_800E3674; -extern s32 D_800E3678; -extern s32 D_800E3680; -extern s8 D_800E36E8; -extern u8* D_800E3760; -extern u8* D_800E3764; -extern u8* gzip_inflate_input; -extern u8* gzip_inflate_output; + +unk800E30D8 *D_800E30D8 = NULL; +s32 D_800E30DC = 0; +s32 D_800E30E0 = 0; +s32 D_800E30E4 = 0; + +s16 D_800E30E8[10] = { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 +}; + +s16 D_800E30FC[10] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 0 +}; + +s16 D_800E3110[26] = { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 0 +}; + +s16 D_800E3144[26] = { + 0, 1, 1, 1, 2, 3, 4, 4, 4, 5, + 3, 4, 4, 4, 5, 3, 4, 4, 4, 5, + 6, 7, 7, 7, 8, 0 +}; + +s32 *D_800E3178 = NULL; +s32 D_800E317C = 0; +s32 D_800E3180 = 0; +s32 *D_800E3184 = NULL; +s32 *D_800E3188 = NULL; +s32 D_800E318C = 0; +s32 *D_800E3190 = NULL; +s32 *D_800E3194 = NULL; +s32 D_800E3198 = 0; +s32 D_800E319C = 0; +s32 D_800E31A0 = 0; +s32 D_800E31A4 = 0; +s32 D_800E31A8 = 0; +s32 D_800E31AC = 0; +s32 D_800E31B0 = 0; +s32 D_800E31B4 = 0; +s32 D_800E31B8 = 0; +s32 D_800E31BC = 0; +s32 D_800E31C0 = 0; +s32 D_800E31C4 = 0; +s32 D_800E31C8 = 0; +s32 D_800E31CC = 0; +s32 D_800E31D0[2] = { 0, 0 }; + +// Fast3D (F3DDKR) display list +u32 D_800E31D8[] = { + 0xE7000000, 0x00000000, + 0xBA001402, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xBA001102, 0x00000000, + 0xBA001301, 0x00000000, + 0xBA000C02, 0x00002000, + 0xBA000903, 0x00000C00, + 0xB9000002, 0x00000000, + 0xB900031D, 0x00504340, + 0xB8000000, 0x00000000 +}; + +s16 D_800E3230[28] = { + 0xFE20, 0x0078, 0xFEC0, 0x0078, 0xFF60, 0x0078, 0x0000, 0x0078, + 0x00A0, 0x0078, 0x0140, 0x0078, 0x01E0, 0x0078, 0xFE20, 0xFF88, + 0xFEC0, 0xFF88, 0xFF60, 0xFF88, 0x0000, 0xFF88, 0x00A0, 0xFF88, + 0x0140, 0xFF88, 0x01E0, 0xFF88 +}; + +s16 D_800E3268[28] = { + 0xFF60, 0x0168, 0xFF60, 0x00F0, 0xFF60, 0x0078, 0xFF60, 0x0000, + 0xFF60, 0xFF88, 0xFF60, 0xFF10, 0xFF60, 0xFF10, 0x00A0, 0x0168, + 0x00A0, 0x00F0, 0x00A0, 0x0078, 0x00A0, 0x0000, 0x00A0, 0xFF88, + 0x00A0, 0xFF10, 0x00A0, 0xFF10 +}; + +s8 D_800E32A0[12] = { + 0x00, 0x02, 0x04, 0x0E, 0x10, 0x12, 0x08, 0x0A, + 0x0C, 0x16, 0x18, 0x1A +}; + +s8 D_800E32AC[12] = { + 0x04, 0x06, 0x08, 0x12, 0x14, 0x16, 0x04, 0x06, + 0x08, 0x12, 0x14, 0x16 +}; + +s8 D_800E32B8[24] = { + 0, 3, 1, 1, 3, 4, 1, 4, + 2, 2, 4, 5, 6, 9, 7, 7, + 9, 10, 7, 10, 8, 8, 10, 11 +}; + +s8 D_800E32D0[12] = { + -1, -1, 0, -1, -1, 0, 0, -1, -1, 0, -1, -1 +}; + +s16 D_800E32DC[24] = { + 0xFCE0, 0x0078, 0xFE20, 0x0078, 0xFF60, 0x0078, 0x00A0, 0x0078, + 0x01E0, 0x0078, 0x0320, 0x0078, 0xFCE0, 0xFF88, 0xFE20, 0xFF88, + 0xFF60, 0xFF88, 0x00A0, 0xFF88, 0x01E0, 0xFF88, 0x0320, 0xFF88 +}; + +s8 D_800E330C[12] = { + 0, 2, 4, 12, 14, 8, 10, 18, 20, 22, 0, 0 +}; + +s8 D_800E3318[12] = { + 4, 6, 8, 16, 18, 4, 6, 14, 16, 18, 0, 0 +}; + +s8 D_800E3324[20] = { + 0, 1, 3, 1, 3, 4, 1, 4, 2, 5, 7, 8, 5, 8, 6, 6, 8, 9, 0, 0 +}; + +s8 D_800E3338[12] = { + -1, -1, 0, -1, 0, 0, -1, 0, -1, -1, 0, 0 +}; + +s16 D_800E3344[126] = { + 0xFF60, 0x00A0, 0xFF70, 0x00A0, 0xFF80, 0x00A0, 0xFF90, 0x00A0, + 0xFFA0, 0x00A0, 0xFFB0, 0x00A0, 0xFFC0, 0x00A0, 0xFFD0, 0x00A0, + 0xFFE0, 0x00A0, 0xFFF0, 0x00A0, 0x0000, 0x00A0, 0x0010, 0x00A0, + 0x0020, 0x00A0, 0x0030, 0x00A0, 0x0040, 0x00A0, 0x0050, 0x00A0, + 0x0060, 0x00A0, 0x0070, 0x00A0, 0x0080, 0x00A0, 0x0090, 0x00A0, + 0x00A0, 0x00A0, 0xFF60, 0xFF38, 0xFF70, 0xFF60, 0xFF80, 0xFF74, + 0xFF90, 0xFF7E, 0xFFA0, 0xFF74, 0xFFB0, 0xFF38, 0xFFC0, 0xFF10, + 0xFFD0, 0xFEFC, 0xFFE0, 0xFEF2, 0xFFF0, 0xFEFC, 0x0000, 0xFF24, + 0x0010, 0xFF2E, 0x0020, 0xFF38, 0x0030, 0xFF2E, 0x0040, 0xFF24, + 0x0050, 0xFEFC, 0x0060, 0xFEF2, 0x0070, 0xFEFC, 0x0080, 0xFF24, + 0x0090, 0xFF60, 0x00A0, 0xFF74, 0xFF60, 0xFEE8, 0xFF70, 0xFEE8, + 0xFF80, 0xFEE8, 0xFF90, 0xFEE8, 0xFFA0, 0xFEE8, 0xFFB0, 0xFEE8, + 0xFFC0, 0xFEE8, 0xFFD0, 0xFEE8, 0xFFE0, 0xFEE8, 0xFFF0, 0xFEE8, + 0x0000, 0xFEE8, 0x0010, 0xFEE8, 0x0020, 0xFEE8, 0x0030, 0xFEE8, + 0x0040, 0xFEE8, 0x0050, 0xFEE8, 0x0060, 0xFEE8, 0x0070, 0xFEE8, + 0x0080, 0xFEE8, 0x0090, 0xFEE8, 0x00A0, 0xFEE8 +}; + +s8 D_800E3440[92] = { + 0x00, 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0C, 0x0E, + 0x00, 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0C, 0x0E, + 0x0E, 0x10, 0x12, 0x14, 0x16, 0x18, 0x1A, 0x0E, + 0x10, 0x12, 0x14, 0x16, 0x18, 0x1A, 0x1A, 0x1C, + 0x1E, 0x20, 0x22, 0x24, 0x26, 0x28, 0x1A, 0x1C, + 0x1E, 0x20, 0x22, 0x24, 0x26, 0x28, 0x00, 0x02, + 0x04, 0x06, 0x08, 0x0A, 0x0C, 0x0E, 0x54, 0x56, + 0x58, 0x5A, 0x5C, 0x5E, 0x60, 0x62, 0x0E, 0x10, + 0x12, 0x14, 0x16, 0x18, 0x1A, 0x62, 0x64, 0x66, + 0x68, 0x6A, 0x6C, 0x6E, 0x1A, 0x1C, 0x1E, 0x20, + 0x22, 0x24, 0x26, 0x28, 0x6E, 0x70, 0x72, 0x74, + 0x76, 0x78, 0x7A, 0x7C +}; + +s8 D_800E349C[92] = { + 0x2A, 0x2C, 0x2E, 0x30, 0x32, 0x34, 0x36, 0x38, + 0x54, 0x56, 0x58, 0x5A, 0x5C, 0x5E, 0x60, 0x62, + 0x38, 0x3A, 0x3C, 0x3E, 0x40, 0x42, 0x44, 0x62, + 0x64, 0x66, 0x68, 0x6A, 0x6C, 0x6E, 0x44, 0x46, + 0x48, 0x4A, 0x4C, 0x4E, 0x50, 0x52, 0x6E, 0x70, + 0x72, 0x74, 0x76, 0x78, 0x7A, 0x7C, 0x54, 0x56, + 0x58, 0x5A, 0x5C, 0x5E, 0x60, 0x62, 0x54, 0x56, + 0x58, 0x5A, 0x5C, 0x5E, 0x60, 0x62, 0x62, 0x64, + 0x66, 0x68, 0x6A, 0x6C, 0x6E, 0x62, 0x64, 0x66, + 0x68, 0x6A, 0x6C, 0x6E, 0x6E, 0x70, 0x72, 0x74, + 0x76, 0x78, 0x7A, 0x7C, 0x6E, 0x70, 0x72, 0x74, + 0x76, 0x78, 0x7A, 0x7C +}; + +s8 D_800E34F8[92] = { + 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1, -1, -1, + 0, 0, 0, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1, -1, 0, 0, + 0, 0, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 +}; + +s8 D_800E3554[244] = { + 0, 8, 9, 0, 9, 1, 1, 9, 10, 1, 10, 2, 2, 10, 11, 2, + 11, 3, 3, 11, 12, 3, 12, 4, 4, 12, 13, 4, 13, 5, 5, 13, + 14, 5, 14, 6, 6, 14, 15, 6, 15, 7, 0, 7, 8, 0, 8, 1, + 1, 8, 9, 1, 9, 2, 2, 9, 10, 2, 10, 3, 3, 10, 11, 3, + 11, 4, 4, 11, 12, 4, 12, 5, 5, 12, 13, 5, 13, 6, 0, 8, + 9, 0, 9, 1, 1, 9, 10, 1, 10, 2, 2, 10, 11, 2, 11, 3, + 3, 11, 12, 3, 12, 4, 4, 12, 13, 4, 13, 5, 5, 13, 14, 5, + 14, 6, 6, 14, 15, 6, 15, 7, 0, 8, 9, 0, 9, 1, 1, 9, + 10, 1, 10, 2, 2, 10, 11, 2, 11, 3, 3, 11, 12, 3, 12, 4, + 4, 12, 13, 4, 13, 5, 5, 13, 14, 5, 14, 6, 6, 14, 15, 6, + 15, 7, 0, 7, 8, 0, 8, 1, 1, 8, 9, 1, 9, 2, 2, 9, + 10, 2, 10, 3, 3, 10, 11, 3, 11, 4, 4, 11, 12, 4, 12, 5, + 5, 12, 13, 5, 13, 6, 0, 8, 9, 0, 9, 1, 1, 9, 10, 1, + 10, 2, 2, 10, 11, 2, 11, 3, 3, 11, 12, 3, 12, 4, 4, 12, + 13, 4, 13, 5, 5, 13, 14, 5, 14, 6, 6, 14, 15, 6, 15, 7, + 0, 0, 0, 0 +}; + +// Fast3D (F3DDKR) display list +u32 D_800E3648[] = { + 0xE7000000, 0x00000000, + 0xB6000000, 0x00010000, + 0xFCFFFFFF, 0xFFFE793C, + 0xEF080C0F, 0x00504340, + 0xB8000000, 0x00000000 +}; + +s8 D_800E3670 = 0; +s16 D_800E3674 = 0; +s32 D_800E3678 = 0; +s32 D_800E367C = 0; + +s32 D_800E3680 = 1; +s32 D_800E3684 = 0; // Unused? +s32 D_800E3688 = 0; // Unused? +s32 D_800E368C = 0; // Unused? + +// Fast3D (F3DDKR) display list +u32 D_800E3690[] = { + 0xE7000000, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xB9000002, 0x00000000, + 0xB6000000, 0x00010001, + 0xE7000000, 0x00000000, + 0xB8000000, 0x00000000, + 0xFC5616AC, 0x112CFE7F, + 0xEF000C0F, 0x00504240, + 0xFCFFFFFF, 0xFFFEFB7D, + 0xEF000C0F, 0x00504240 +}; + +s8 D_800E36E8 = 0; + +// Descending powers of 10 +s32 D_800E36EC[9] = { + 1000000000, 100000000, 10000000, 1000000, 100000, 10000, 1000, 100, 10 +}; + +s8 D_800E3710[48] = { + 4, 0, 0, 0, 1, 2, 0, 1, 0, 2, 1, 0, 2, 0, 4, 0, + 0, 4, 1, -4, 1, 1, -4, 1, -2, 2, 1, -2, 1, -1, 4, 1, + -1, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; + +OSDevMgr __osPiDevMgr = { 0, NULL, NULL, NULL, NULL, NULL, NULL }; + +u8* D_800E3760 = NULL; +u8* D_800E3764 = NULL; +u8* gzip_inflate_input = NULL; +u8* gzip_inflate_output = NULL; + +/*******************************/ + +/************ .bss ************/ + extern s32 D_8012A0D8; extern s32 D_8012A0DC; extern s8 D_8012A788; @@ -115,9 +378,6 @@ typedef struct unk8012A7E8 { unk8012A7E8_24 *unk24; } unk8012A7E8; - - - extern unk8012A7E8 (*D_8012A7E8)[1]; extern s32 D_8012A7F0; extern s8 D_8012A7F4; @@ -125,6 +385,8 @@ extern s32 D_8012AAD8; extern u32 gzip_num_bits; extern u32 gzip_bit_buffer; +/*****************************/ + u8* func_80070C9C(s32 arg0, s32 arg1); void func_80071140(s32* arg0); void func_8007B2BC(s32* arg0); @@ -148,13 +410,13 @@ void func_800B7D20(void) { func_80071140(D_800E304C); D_800E304C = NULL; } - if (D_800E3070 != NULL) { - func_80071140(D_800E3070); - D_800E3070 = NULL; + if (D_800E3070[0] != NULL) { + func_80071140(D_800E3070[0]); + D_800E3070[0] = NULL; } - if (D_800E3080 != NULL) { - func_80071140(D_800E3080); - D_800E3080 = NULL; + if (D_800E3080[0] != NULL) { + func_80071140(D_800E3080[0]); + D_800E3080[0] = NULL; } if (D_800E30D0 != NULL) { func_8007B2BC(D_800E30D0); @@ -601,8 +863,6 @@ void func_800C56FC(s32 arg0, s32 arg1, s32 arg2) { #if 1 GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800C580C.s") #else - -extern s32 D_800E36EC[9]; // Descending powers of 10; starting from 1000000. // sprintf like function, but only for decimal integers (%d). void func_800C580C(char** outString, s32 number) { From 02861089ad80555da7b3ed31efbe47a641ac7577 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Thu, 27 May 2021 19:38:28 -0500 Subject: [PATCH 28/39] Finished up the rest of the data sections --- data/dkr.data.s | 2372 ++++++++++++++++++----------------- lib/src/osTimer.c | 3 +- lib/src/osViMgr.c | 3 +- lib/src/unknown_0C91A0.c | 2 + lib/src/unknown_0C9970.c | 2 + lib/src/unknown_0C9A20.c | 27 + lib/src/unknown_0CCF90.c | 7 + lib/src/unknown_0CD820.c | 2 + lib/src/unknown_0CE200.c | 2 + lib/src/unknown_0D29F0.c | 9 +- lib/src/unknown_0D3020.c | 6 +- lib/src/unknown_0D43F0.c | 8 + lib/src/unknown_0D6C90.c | 14 +- lib/src/viint.h | 70 ++ lib/src/vitbl.c | 1602 +++++++++++++++++++++++ src/unknown_0C7F50.c | 16 +- tools/python/generate_ld.py | 11 +- 17 files changed, 2972 insertions(+), 1184 deletions(-) create mode 100644 lib/src/viint.h create mode 100644 lib/src/vitbl.c diff --git a/data/dkr.data.s b/data/dkr.data.s index 1fba5c65..443d5cc9 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -7710,1206 +7710,1236 @@ ############## unknown_0C7F50.c (.data) ############## -glabel D_800E3770 -.word 0x00000000 +# glabel D_800E3770 +# .word 0x00000000 +# +# glabel D_800E3774 +# .word 0xFFFFFFFF +# +# glabel D_800E3778 +# .word 0xFFFFFFFF +# +# glabel D_800E377C +# .word 0x00000000 -glabel D_800E3774 -.word 0xFFFFFFFF +###################################################### -glabel D_800E3778 -.word 0xFFFFFFFF +########## lib/src/unknown_0C91A0.c (.data) ########## -glabel D_800E377C -.word 0x00000000 +# glabel alGlobals +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 -glabel alGlobals -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +###################################################### -glabel D_800E3790 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x7FFF7FFC -.word 0x7FF57FE8 -.word 0x7FD77FC0 -.word 0x7FA57F84 -.word 0x7F5F7F34 -.word 0x7F057ED0 -.word 0x7E977E58 -.word 0x7E157DCD -.word 0x7D7F7D2D -.word 0x7CD67C7A -.word 0x7C1A7BB4 -.word 0x7B497ADA -.word 0x7A6679ED -.word 0x796F78ED -.word 0x786677DA -.word 0x774976B4 -.word 0x761A757B -.word 0x74D87430 -.word 0x738472D3 -.word 0x721E7164 -.word 0x70A66FE3 -.word 0x6F1C6E51 -.word 0x6D816CAD -.word 0x6BD56AF9 -.word 0x6A186933 -.word 0x684A675D -.word 0x666C6577 -.word 0x647E6381 -.word 0x6280617C -.word 0x60735F67 -.word 0x5E575D43 -.word 0x5C2C5B11 -.word 0x59F258D0 -.word 0x57AA5681 -.word 0x55555425 -.word 0x52F251BC -.word 0x50824F46 -.word 0x4E064CC3 -.word 0x4B7D4A35 -.word 0x48E9479B -.word 0x464944F5 -.word 0x439E4245 -.word 0x40E93F8A -.word 0x3E293CC6 -.word 0x3B6039F8 -.word 0x388D3721 -.word 0x35B23441 -.word 0x32CE3159 -.word 0x2FE22E69 -.word 0x2CEF2B72 -.word 0x29F42875 -.word 0x26F32570 -.word 0x23EC2266 -.word 0x20DF1F57 -.word 0x1DCE1C43 -.word 0x1AB7192A -.word 0x179C160E -.word 0x147E12ED -.word 0x115C0FCA -.word 0x0E380CA5 -.word 0x0B11097D -.word 0x07E90654 -.word 0x04C0032A -.word 0x01950000 +########## lib/src/unknown_0C9970.c (.data) ########## -glabel D_800E38A0 -.word 0x00000000 +# glabel D_800E3790 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 -glabel D_800E38A4 -.word 0x03B9ACA0 +###################################################### -glabel D_800E38A8 -.word 0x00000000 +########## lib/src/unknown_0C9A20.c (.data) ########## -glabel D_800E38AC -.word 0x003FFF01 +# .word 0x7FFF7FFC +# .word 0x7FF57FE8 +# .word 0x7FD77FC0 +# .word 0x7FA57F84 +# .word 0x7F5F7F34 +# .word 0x7F057ED0 +# .word 0x7E977E58 +# .word 0x7E157DCD +# .word 0x7D7F7D2D +# .word 0x7CD67C7A +# .word 0x7C1A7BB4 +# .word 0x7B497ADA +# .word 0x7A6679ED +# .word 0x796F78ED +# .word 0x786677DA +# .word 0x774976B4 +# .word 0x761A757B +# .word 0x74D87430 +# .word 0x738472D3 +# .word 0x721E7164 +# .word 0x70A66FE3 +# .word 0x6F1C6E51 +# .word 0x6D816CAD +# .word 0x6BD56AF9 +# .word 0x6A186933 +# .word 0x684A675D +# .word 0x666C6577 +# .word 0x647E6381 +# .word 0x6280617C +# .word 0x60735F67 +# .word 0x5E575D43 +# .word 0x5C2C5B11 +# .word 0x59F258D0 +# .word 0x57AA5681 +# .word 0x55555425 +# .word 0x52F251BC +# .word 0x50824F46 +# .word 0x4E064CC3 +# .word 0x4B7D4A35 +# .word 0x48E9479B +# .word 0x464944F5 +# .word 0x439E4245 +# .word 0x40E93F8A +# .word 0x3E293CC6 +# .word 0x3B6039F8 +# .word 0x388D3721 +# .word 0x35B23441 +# .word 0x32CE3159 +# .word 0x2FE22E69 +# .word 0x2CEF2B72 +# .word 0x29F42875 +# .word 0x26F32570 +# .word 0x23EC2266 +# .word 0x20DF1F57 +# .word 0x1DCE1C43 +# .word 0x1AB7192A +# .word 0x179C160E +# .word 0x147E12ED +# .word 0x115C0FCA +# .word 0x0E380CA5 +# .word 0x0B11097D +# .word 0x07E90654 +# .word 0x04C0032A +# .word 0x01950000 -glabel D_800E38B0 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +###################################################### -glabel D_800E38C0 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +########## lib/src/unknown_0CCF90.c (.data) ########## -glabel D_800E38D0 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +# glabel D_800E38A0 +# .word 0x00000000 +# +# glabel D_800E38A4 +# .word 0x03B9ACA0 +# +# glabel D_800E38A8 +# .word 0x00000000 +# +# glabel D_800E38AC +# .word 0x003FFF01 +# +# glabel D_800E38B0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 -glabel __osViDevMgr -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +###################################################### -glabel D_800E3900 -.word 0x00000000 -.word 0x0000320E -.word 0x00000140 -.word 0x03E52239 -.word 0x0000020D -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x01000000 -.word 0x0000324E -.word 0x00000140 -.word 0x03E52239 -.word 0x0000020C -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x01000400 -.word 0x002301FD -.word 0x000E0204 -.word 0x00000002 -.word 0x00000280 -.word 0x03000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x02000000 -.word 0x0000311E -.word 0x00000140 -.word 0x03E52239 -.word 0x0000020D -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x03000000 -.word 0x0000305E -.word 0x00000140 -.word 0x03E52239 -.word 0x0000020C -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x01000400 -.word 0x002301FD -.word 0x000E0204 -.word 0x00000002 -.word 0x00000280 -.word 0x03000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x04000000 -.word 0x0000330F -.word 0x00000140 -.word 0x03E52239 -.word 0x0000020D -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000500 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x00000500 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x05000000 -.word 0x0000324F -.word 0x00000140 -.word 0x03E52239 -.word 0x0000020C -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000500 -.word 0x01000400 -.word 0x002301FD -.word 0x000E0204 -.word 0x00000002 -.word 0x00000500 -.word 0x03000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x06000000 -.word 0x0000301F -.word 0x00000140 -.word 0x03E52239 -.word 0x0000020D -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000500 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x00000500 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x07000000 -.word 0x0000305F -.word 0x00000140 -.word 0x03E52239 -.word 0x0000020C -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000500 -.word 0x01000400 -.word 0x002301FD -.word 0x000E0204 -.word 0x00000002 -.word 0x00000500 -.word 0x03000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x08000000 -.word 0x0000324E -.word 0x00000500 -.word 0x03E52239 -.word 0x0000020C -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000400 -.word 0x00000000 -.word 0x00000500 -.word 0x00000400 -.word 0x002301FD -.word 0x000E0204 -.word 0x00000002 -.word 0x00000A00 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x09000000 -.word 0x0000324E -.word 0x00000280 -.word 0x03E52239 -.word 0x0000020C -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000400 -.word 0x00000000 -.word 0x00000500 -.word 0x02000800 -.word 0x002301FD -.word 0x000E0204 -.word 0x00000002 -.word 0x00000A00 -.word 0x02000800 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x0A000000 -.word 0x0000305E -.word 0x00000500 -.word 0x03E52239 -.word 0x0000020C -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000400 -.word 0x00000000 -.word 0x00000500 -.word 0x00000400 -.word 0x002301FD -.word 0x000E0204 -.word 0x00000002 -.word 0x00000A00 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x0B000000 -.word 0x0000305E -.word 0x00000280 -.word 0x03E52239 -.word 0x0000020C -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000400 -.word 0x00000000 -.word 0x00000500 -.word 0x02000800 -.word 0x002301FD -.word 0x000E0204 -.word 0x00000002 -.word 0x00000A00 -.word 0x02000800 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x0C000000 -.word 0x0000334F -.word 0x00000500 -.word 0x03E52239 -.word 0x0000020C -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000400 -.word 0x00000000 -.word 0x00000A00 -.word 0x00000400 -.word 0x002301FD -.word 0x000E0204 -.word 0x00000002 -.word 0x00001400 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x0D000000 -.word 0x0000324F -.word 0x00000280 -.word 0x03E52239 -.word 0x0000020C -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000400 -.word 0x00000000 -.word 0x00000A00 -.word 0x02000800 -.word 0x002301FD -.word 0x000E0204 -.word 0x00000002 -.word 0x00001400 -.word 0x02000800 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x0E000000 -.word 0x0000320E -.word 0x00000140 -.word 0x0404233A -.word 0x00000271 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x00000400 -.word 0x005F0239 -.word 0x0009026B -.word 0x00000002 -.word 0x00000280 -.word 0x00000400 -.word 0x005F0239 -.word 0x0009026B -.word 0x00000002 -.word 0x0F000000 -.word 0x0000324E -.word 0x00000140 -.word 0x0404233A -.word 0x00000270 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x01000400 -.word 0x005D0237 -.word 0x0009026B -.word 0x00000002 -.word 0x00000280 -.word 0x03000400 -.word 0x005F0239 -.word 0x000D0269 -.word 0x00000002 -.word 0x10000000 -.word 0x0000311E -.word 0x00000140 -.word 0x0404233A -.word 0x00000271 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x00000400 -.word 0x005F0239 -.word 0x0009026B -.word 0x00000002 -.word 0x00000280 -.word 0x00000400 -.word 0x005F0239 -.word 0x0009026B -.word 0x00000002 -.word 0x11000000 -.word 0x0000305E -.word 0x00000140 -.word 0x0404233A -.word 0x00000270 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x01000400 -.word 0x005D0237 -.word 0x0009026B -.word 0x00000002 -.word 0x00000280 -.word 0x03000400 -.word 0x005F0239 -.word 0x000D0269 -.word 0x00000002 -.word 0x12000000 -.word 0x0000330F -.word 0x00000140 -.word 0x0404233A -.word 0x00000271 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000200 -.word 0x00000000 -.word 0x00000500 -.word 0x00000400 -.word 0x005F0239 -.word 0x0009026B -.word 0x00000002 -.word 0x00000500 -.word 0x00000400 -.word 0x005F0239 -.word 0x0009026B -.word 0x00000002 -.word 0x13000000 -.word 0x0000324F -.word 0x00000140 -.word 0x0404233A -.word 0x00000270 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000200 -.word 0x00000000 -.word 0x00000500 -.word 0x01000400 -.word 0x005D0237 -.word 0x0009026B -.word 0x00000002 -.word 0x00000500 -.word 0x03000400 -.word 0x005F0239 -.word 0x000D0269 -.word 0x00000002 -.word 0x14000000 -.word 0x0000301F -.word 0x00000140 -.word 0x0404233A -.word 0x00000271 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000200 -.word 0x00000000 -.word 0x00000500 -.word 0x00000400 -.word 0x005F0239 -.word 0x0009026B -.word 0x00000002 -.word 0x00000500 -.word 0x00000400 -.word 0x005F0239 -.word 0x0009026B -.word 0x00000002 -.word 0x15000000 -.word 0x0000305F -.word 0x00000140 -.word 0x0404233A -.word 0x00000270 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000200 -.word 0x00000000 -.word 0x00000500 -.word 0x01000400 -.word 0x005D0237 -.word 0x0009026B -.word 0x00000002 -.word 0x00000500 -.word 0x03000400 -.word 0x005F0239 -.word 0x000D0269 -.word 0x00000002 -.word 0x16000000 -.word 0x0000324E -.word 0x00000500 -.word 0x0404233A -.word 0x00000270 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000400 -.word 0x00000000 -.word 0x00000500 -.word 0x00000400 -.word 0x005D0237 -.word 0x0009026B -.word 0x00000002 -.word 0x00000A00 -.word 0x00000400 -.word 0x005F0239 -.word 0x000D0269 -.word 0x00000002 -.word 0x17000000 -.word 0x0000324E -.word 0x00000280 -.word 0x0404233A -.word 0x00000270 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000400 -.word 0x00000000 -.word 0x00000500 -.word 0x02000800 -.word 0x005D0237 -.word 0x0009026B -.word 0x00000002 -.word 0x00000A00 -.word 0x02000800 -.word 0x005F0239 -.word 0x000D0269 -.word 0x00000002 -.word 0x18000000 -.word 0x0000305E -.word 0x00000500 -.word 0x0404233A -.word 0x00000270 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000400 -.word 0x00000000 -.word 0x00000500 -.word 0x00000400 -.word 0x005D0237 -.word 0x0009026B -.word 0x00000002 -.word 0x00000A00 -.word 0x00000400 -.word 0x005F0239 -.word 0x000D0269 -.word 0x00000002 -.word 0x19000000 -.word 0x0000305E -.word 0x00000280 -.word 0x0404233A -.word 0x00000270 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000400 -.word 0x00000000 -.word 0x00000500 -.word 0x02000800 -.word 0x005D0237 -.word 0x0009026B -.word 0x00000002 -.word 0x00000A00 -.word 0x02000800 -.word 0x005F0239 -.word 0x000D0269 -.word 0x00000002 -.word 0x1A000000 -.word 0x0000334F -.word 0x00000500 -.word 0x0404233A -.word 0x00000270 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000400 -.word 0x00000000 -.word 0x00000A00 -.word 0x00000400 -.word 0x005D0237 -.word 0x0009026B -.word 0x00000002 -.word 0x00001400 -.word 0x00000400 -.word 0x005F0239 -.word 0x000D0269 -.word 0x00000002 -.word 0x1B000000 -.word 0x0000324F -.word 0x00000280 -.word 0x0404233A -.word 0x00000270 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000400 -.word 0x00000000 -.word 0x00000A00 -.word 0x02000800 -.word 0x005D0237 -.word 0x0009026B -.word 0x00000002 -.word 0x00001400 -.word 0x02000800 -.word 0x005F0239 -.word 0x000D0269 -.word 0x00000002 -.word 0x1C000000 -.word 0x0000320E -.word 0x00000140 -.word 0x04651E39 -.word 0x0000020D -.word 0x00040C11 -.word 0x0C190C1A -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x1D000000 -.word 0x0000324E -.word 0x00000140 -.word 0x04651E39 -.word 0x0000020C -.word 0x00000C10 -.word 0x0C1C0C1C -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x01000400 -.word 0x002301FD -.word 0x000B0202 -.word 0x00000002 -.word 0x00000280 -.word 0x03000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x1E000000 -.word 0x0000311E -.word 0x00000140 -.word 0x04651E39 -.word 0x0000020D -.word 0x00040C11 -.word 0x0C190C1A -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x1F000000 -.word 0x0000305E -.word 0x00000140 -.word 0x04651E39 -.word 0x0000020C -.word 0x00000C10 -.word 0x0C1C0C1C -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x01000400 -.word 0x002301FD -.word 0x000B0202 -.word 0x00000002 -.word 0x00000280 -.word 0x03000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x20000000 -.word 0x0000330F -.word 0x00000140 -.word 0x04651E39 -.word 0x0000020D -.word 0x00040C11 -.word 0x0C190C1A -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000500 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x00000500 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x21000000 -.word 0x0000324F -.word 0x00000140 -.word 0x04651E39 -.word 0x0000020C -.word 0x00000C10 -.word 0x0C1C0C1C -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000500 -.word 0x01000400 -.word 0x002301FD -.word 0x000B0202 -.word 0x00000002 -.word 0x00000500 -.word 0x03000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x22000000 -.word 0x0000301F -.word 0x00000140 -.word 0x04651E39 -.word 0x0000020D -.word 0x00040C11 -.word 0x0C190C1A -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000500 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x00000500 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x23000000 -.word 0x0000305F -.word 0x00000140 -.word 0x04651E39 -.word 0x0000020C -.word 0x00000C10 -.word 0x0C1C0C1C -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000500 -.word 0x01000400 -.word 0x002301FD -.word 0x000B0202 -.word 0x00000002 -.word 0x00000500 -.word 0x03000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x24000000 -.word 0x0000324E -.word 0x00000500 -.word 0x04651E39 -.word 0x0000020C -.word 0x00000C10 -.word 0x0C1C0C1C -.word 0x006C02EC -.word 0x00000400 -.word 0x00000000 -.word 0x00000500 -.word 0x00000400 -.word 0x002301FD -.word 0x000B0202 -.word 0x00000002 -.word 0x00000A00 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x25000000 -.word 0x0000324E -.word 0x00000280 -.word 0x04651E39 -.word 0x0000020C -.word 0x00000C10 -.word 0x0C1C0C1C -.word 0x006C02EC -.word 0x00000400 -.word 0x00000000 -.word 0x00000500 -.word 0x02000800 -.word 0x002301FD -.word 0x000B0202 -.word 0x00000002 -.word 0x00000A00 -.word 0x02000800 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x26000000 -.word 0x0000305E -.word 0x00000500 -.word 0x04651E39 -.word 0x0000020C -.word 0x00000C10 -.word 0x0C1C0C1C -.word 0x006C02EC -.word 0x00000400 -.word 0x00000000 -.word 0x00000500 -.word 0x00000400 -.word 0x002301FD -.word 0x000B0202 -.word 0x00000002 -.word 0x00000A00 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x27000000 -.word 0x0000305E -.word 0x00000280 -.word 0x04651E39 -.word 0x0000020C -.word 0x00000C10 -.word 0x0C1C0C1C -.word 0x006C02EC -.word 0x00000400 -.word 0x00000000 -.word 0x00000500 -.word 0x02000800 -.word 0x002301FD -.word 0x000B0202 -.word 0x00000002 -.word 0x00000A00 -.word 0x02000800 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x28000000 -.word 0x0000334F -.word 0x00000500 -.word 0x04651E39 -.word 0x0000020C -.word 0x00000C10 -.word 0x0C1C0C1C -.word 0x006C02EC -.word 0x00000400 -.word 0x00000000 -.word 0x00000A00 -.word 0x00000400 -.word 0x002301FD -.word 0x000B0202 -.word 0x00000002 -.word 0x00001400 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x29000000 -.word 0x0000324F -.word 0x00000280 -.word 0x04651E39 -.word 0x0000020C -.word 0x00000C10 -.word 0x0C1C0C1C -.word 0x006C02EC -.word 0x00000400 -.word 0x00000000 -.word 0x00000A00 -.word 0x02000800 -.word 0x002301FD -.word 0x000B0202 -.word 0x00000002 -.word 0x00001400 -.word 0x02000800 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 +########## lib/src/unknown_0CD820.c (.data) ########## -glabel D_800E4620 -.word 0x00000000 -.word 0x0000320E -.word 0x00000140 -.word 0x03E52239 -.word 0x0000020D -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 +# glabel D_800E38C0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 -glabel D_800E4670 -.word 0x0E000000 -.word 0x0000320E -.word 0x00000140 -.word 0x0404233A -.word 0x00000271 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x00000400 -.word 0x005F0239 -.word 0x0009026B -.word 0x00000002 -.word 0x00000280 -.word 0x00000400 -.word 0x005F0239 -.word 0x0009026B -.word 0x00000002 +###################################################### -glabel D_800E46C0 -.word 0x1C000000 -.word 0x0000320E -.word 0x00000140 -.word 0x04651E39 -.word 0x0000020D -.word 0x00040C11 -.word 0x0C190C1A -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 +########## lib/src/unknown_0CE200.c (.data) ########## -glabel D_800E4710 -.word 0x02000000 -.word 0x0000311E -.word 0x00000140 -.word 0x03E52239 -.word 0x0000020D -.word 0x00000C15 -.word 0x0C150C15 -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 +# glabel D_800E38D0 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 -glabel D_800E4760 -.word 0x10000000 -.word 0x0000311E -.word 0x00000140 -.word 0x0404233A -.word 0x00000271 -.word 0x00150C69 -.word 0x0C6F0C6E -.word 0x00800300 -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x00000400 -.word 0x005F0239 -.word 0x0009026B -.word 0x00000002 -.word 0x00000280 -.word 0x00000400 -.word 0x005F0239 -.word 0x0009026B -.word 0x00000002 +###################################################### -glabel D_800E47B0 -.word 0x1E000000 -.word 0x0000311E -.word 0x00000140 -.word 0x04651E39 -.word 0x0000020D -.word 0x00040C11 -.word 0x0C190C1A -.word 0x006C02EC -.word 0x00000200 -.word 0x00000000 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 -.word 0x00000280 -.word 0x00000400 -.word 0x002501FF -.word 0x000E0204 -.word 0x00000002 +############# lib/src/osViMgr.c (.data) ############## -glabel __osPiAccessQueueEnabled -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +# glabel __osViDevMgr +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 -glabel D_800E4810 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +# glabel D_800E3900 # osViModeTable; +# .word 0x00000000 +# .word 0x0000320E +# .word 0x00000140 +# .word 0x03E52239 +# .word 0x0000020D +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x01000000 +# .word 0x0000324E +# .word 0x00000140 +# .word 0x03E52239 +# .word 0x0000020C +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x01000400 +# .word 0x002301FD +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000280 +# .word 0x03000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x02000000 +# .word 0x0000311E +# .word 0x00000140 +# .word 0x03E52239 +# .word 0x0000020D +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x03000000 +# .word 0x0000305E +# .word 0x00000140 +# .word 0x03E52239 +# .word 0x0000020C +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x01000400 +# .word 0x002301FD +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000280 +# .word 0x03000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x04000000 +# .word 0x0000330F +# .word 0x00000140 +# .word 0x03E52239 +# .word 0x0000020D +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x05000000 +# .word 0x0000324F +# .word 0x00000140 +# .word 0x03E52239 +# .word 0x0000020C +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x01000400 +# .word 0x002301FD +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000500 +# .word 0x03000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x06000000 +# .word 0x0000301F +# .word 0x00000140 +# .word 0x03E52239 +# .word 0x0000020D +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x07000000 +# .word 0x0000305F +# .word 0x00000140 +# .word 0x03E52239 +# .word 0x0000020C +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x01000400 +# .word 0x002301FD +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000500 +# .word 0x03000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x08000000 +# .word 0x0000324E +# .word 0x00000500 +# .word 0x03E52239 +# .word 0x0000020C +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x002301FD +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000A00 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x09000000 +# .word 0x0000324E +# .word 0x00000280 +# .word 0x03E52239 +# .word 0x0000020C +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x02000800 +# .word 0x002301FD +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000A00 +# .word 0x02000800 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x0A000000 +# .word 0x0000305E +# .word 0x00000500 +# .word 0x03E52239 +# .word 0x0000020C +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x002301FD +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000A00 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x0B000000 +# .word 0x0000305E +# .word 0x00000280 +# .word 0x03E52239 +# .word 0x0000020C +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x02000800 +# .word 0x002301FD +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000A00 +# .word 0x02000800 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x0C000000 +# .word 0x0000334F +# .word 0x00000500 +# .word 0x03E52239 +# .word 0x0000020C +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000A00 +# .word 0x00000400 +# .word 0x002301FD +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00001400 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x0D000000 +# .word 0x0000324F +# .word 0x00000280 +# .word 0x03E52239 +# .word 0x0000020C +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000A00 +# .word 0x02000800 +# .word 0x002301FD +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00001400 +# .word 0x02000800 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x0E000000 +# .word 0x0000320E +# .word 0x00000140 +# .word 0x0404233A +# .word 0x00000271 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x005F0239 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x005F0239 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x0F000000 +# .word 0x0000324E +# .word 0x00000140 +# .word 0x0404233A +# .word 0x00000270 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x01000400 +# .word 0x005D0237 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00000280 +# .word 0x03000400 +# .word 0x005F0239 +# .word 0x000D0269 +# .word 0x00000002 +# .word 0x10000000 +# .word 0x0000311E +# .word 0x00000140 +# .word 0x0404233A +# .word 0x00000271 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x005F0239 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x005F0239 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x11000000 +# .word 0x0000305E +# .word 0x00000140 +# .word 0x0404233A +# .word 0x00000270 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x01000400 +# .word 0x005D0237 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00000280 +# .word 0x03000400 +# .word 0x005F0239 +# .word 0x000D0269 +# .word 0x00000002 +# .word 0x12000000 +# .word 0x0000330F +# .word 0x00000140 +# .word 0x0404233A +# .word 0x00000271 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x005F0239 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x005F0239 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x13000000 +# .word 0x0000324F +# .word 0x00000140 +# .word 0x0404233A +# .word 0x00000270 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x01000400 +# .word 0x005D0237 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00000500 +# .word 0x03000400 +# .word 0x005F0239 +# .word 0x000D0269 +# .word 0x00000002 +# .word 0x14000000 +# .word 0x0000301F +# .word 0x00000140 +# .word 0x0404233A +# .word 0x00000271 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x005F0239 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x005F0239 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x15000000 +# .word 0x0000305F +# .word 0x00000140 +# .word 0x0404233A +# .word 0x00000270 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x01000400 +# .word 0x005D0237 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00000500 +# .word 0x03000400 +# .word 0x005F0239 +# .word 0x000D0269 +# .word 0x00000002 +# .word 0x16000000 +# .word 0x0000324E +# .word 0x00000500 +# .word 0x0404233A +# .word 0x00000270 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x005D0237 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00000A00 +# .word 0x00000400 +# .word 0x005F0239 +# .word 0x000D0269 +# .word 0x00000002 +# .word 0x17000000 +# .word 0x0000324E +# .word 0x00000280 +# .word 0x0404233A +# .word 0x00000270 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x02000800 +# .word 0x005D0237 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00000A00 +# .word 0x02000800 +# .word 0x005F0239 +# .word 0x000D0269 +# .word 0x00000002 +# .word 0x18000000 +# .word 0x0000305E +# .word 0x00000500 +# .word 0x0404233A +# .word 0x00000270 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x005D0237 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00000A00 +# .word 0x00000400 +# .word 0x005F0239 +# .word 0x000D0269 +# .word 0x00000002 +# .word 0x19000000 +# .word 0x0000305E +# .word 0x00000280 +# .word 0x0404233A +# .word 0x00000270 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x02000800 +# .word 0x005D0237 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00000A00 +# .word 0x02000800 +# .word 0x005F0239 +# .word 0x000D0269 +# .word 0x00000002 +# .word 0x1A000000 +# .word 0x0000334F +# .word 0x00000500 +# .word 0x0404233A +# .word 0x00000270 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000A00 +# .word 0x00000400 +# .word 0x005D0237 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00001400 +# .word 0x00000400 +# .word 0x005F0239 +# .word 0x000D0269 +# .word 0x00000002 +# .word 0x1B000000 +# .word 0x0000324F +# .word 0x00000280 +# .word 0x0404233A +# .word 0x00000270 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000A00 +# .word 0x02000800 +# .word 0x005D0237 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00001400 +# .word 0x02000800 +# .word 0x005F0239 +# .word 0x000D0269 +# .word 0x00000002 +# .word 0x1C000000 +# .word 0x0000320E +# .word 0x00000140 +# .word 0x04651E39 +# .word 0x0000020D +# .word 0x00040C11 +# .word 0x0C190C1A +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x1D000000 +# .word 0x0000324E +# .word 0x00000140 +# .word 0x04651E39 +# .word 0x0000020C +# .word 0x00000C10 +# .word 0x0C1C0C1C +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x01000400 +# .word 0x002301FD +# .word 0x000B0202 +# .word 0x00000002 +# .word 0x00000280 +# .word 0x03000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x1E000000 +# .word 0x0000311E +# .word 0x00000140 +# .word 0x04651E39 +# .word 0x0000020D +# .word 0x00040C11 +# .word 0x0C190C1A +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x1F000000 +# .word 0x0000305E +# .word 0x00000140 +# .word 0x04651E39 +# .word 0x0000020C +# .word 0x00000C10 +# .word 0x0C1C0C1C +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x01000400 +# .word 0x002301FD +# .word 0x000B0202 +# .word 0x00000002 +# .word 0x00000280 +# .word 0x03000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x20000000 +# .word 0x0000330F +# .word 0x00000140 +# .word 0x04651E39 +# .word 0x0000020D +# .word 0x00040C11 +# .word 0x0C190C1A +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x21000000 +# .word 0x0000324F +# .word 0x00000140 +# .word 0x04651E39 +# .word 0x0000020C +# .word 0x00000C10 +# .word 0x0C1C0C1C +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x01000400 +# .word 0x002301FD +# .word 0x000B0202 +# .word 0x00000002 +# .word 0x00000500 +# .word 0x03000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x22000000 +# .word 0x0000301F +# .word 0x00000140 +# .word 0x04651E39 +# .word 0x0000020D +# .word 0x00040C11 +# .word 0x0C190C1A +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x23000000 +# .word 0x0000305F +# .word 0x00000140 +# .word 0x04651E39 +# .word 0x0000020C +# .word 0x00000C10 +# .word 0x0C1C0C1C +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x01000400 +# .word 0x002301FD +# .word 0x000B0202 +# .word 0x00000002 +# .word 0x00000500 +# .word 0x03000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x24000000 +# .word 0x0000324E +# .word 0x00000500 +# .word 0x04651E39 +# .word 0x0000020C +# .word 0x00000C10 +# .word 0x0C1C0C1C +# .word 0x006C02EC +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x002301FD +# .word 0x000B0202 +# .word 0x00000002 +# .word 0x00000A00 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x25000000 +# .word 0x0000324E +# .word 0x00000280 +# .word 0x04651E39 +# .word 0x0000020C +# .word 0x00000C10 +# .word 0x0C1C0C1C +# .word 0x006C02EC +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x02000800 +# .word 0x002301FD +# .word 0x000B0202 +# .word 0x00000002 +# .word 0x00000A00 +# .word 0x02000800 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x26000000 +# .word 0x0000305E +# .word 0x00000500 +# .word 0x04651E39 +# .word 0x0000020C +# .word 0x00000C10 +# .word 0x0C1C0C1C +# .word 0x006C02EC +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x00000400 +# .word 0x002301FD +# .word 0x000B0202 +# .word 0x00000002 +# .word 0x00000A00 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x27000000 +# .word 0x0000305E +# .word 0x00000280 +# .word 0x04651E39 +# .word 0x0000020C +# .word 0x00000C10 +# .word 0x0C1C0C1C +# .word 0x006C02EC +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000500 +# .word 0x02000800 +# .word 0x002301FD +# .word 0x000B0202 +# .word 0x00000002 +# .word 0x00000A00 +# .word 0x02000800 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x28000000 +# .word 0x0000334F +# .word 0x00000500 +# .word 0x04651E39 +# .word 0x0000020C +# .word 0x00000C10 +# .word 0x0C1C0C1C +# .word 0x006C02EC +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000A00 +# .word 0x00000400 +# .word 0x002301FD +# .word 0x000B0202 +# .word 0x00000002 +# .word 0x00001400 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x29000000 +# .word 0x0000324F +# .word 0x00000280 +# .word 0x04651E39 +# .word 0x0000020C +# .word 0x00000C10 +# .word 0x0C1C0C1C +# .word 0x006C02EC +# .word 0x00000400 +# .word 0x00000000 +# .word 0x00000A00 +# .word 0x02000800 +# .word 0x002301FD +# .word 0x000B0202 +# .word 0x00000002 +# .word 0x00001400 +# .word 0x02000800 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# +# glabel D_800E4620 +# .word 0x00000000 +# .word 0x0000320E +# .word 0x00000140 +# .word 0x03E52239 +# .word 0x0000020D +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# +# glabel D_800E4670 +# .word 0x0E000000 +# .word 0x0000320E +# .word 0x00000140 +# .word 0x0404233A +# .word 0x00000271 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x005F0239 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x005F0239 +# .word 0x0009026B +# .word 0x00000002 +# +# glabel D_800E46C0 +# .word 0x1C000000 +# .word 0x0000320E +# .word 0x00000140 +# .word 0x04651E39 +# .word 0x0000020D +# .word 0x00040C11 +# .word 0x0C190C1A +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# +# glabel D_800E4710 +# .word 0x02000000 +# .word 0x0000311E +# .word 0x00000140 +# .word 0x03E52239 +# .word 0x0000020D +# .word 0x00000C15 +# .word 0x0C150C15 +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# +# glabel D_800E4760 +# .word 0x10000000 +# .word 0x0000311E +# .word 0x00000140 +# .word 0x0404233A +# .word 0x00000271 +# .word 0x00150C69 +# .word 0x0C6F0C6E +# .word 0x00800300 +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x005F0239 +# .word 0x0009026B +# .word 0x00000002 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x005F0239 +# .word 0x0009026B +# .word 0x00000002 +# +# glabel D_800E47B0 +# .word 0x1E000000 +# .word 0x0000311E +# .word 0x00000140 +# .word 0x04651E39 +# .word 0x0000020D +# .word 0x00040C11 +# .word 0x0C190C1A +# .word 0x006C02EC +# .word 0x00000200 +# .word 0x00000000 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 +# .word 0x00000280 +# .word 0x00000400 +# .word 0x002501FF +# .word 0x000E0204 +# .word 0x00000002 -glabel __osViCurr -.word 0x800E4810 +# glabel __osPiAccessQueueEnabled +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E4810 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel __osViCurr +# .word 0x800E4810 +# +# glabel __osViNext +# .word 0x800E4840 +# +# glabel D_800E4878 +# .word 0x02E6D354 +# .word 0x00000000 +# +# glabel __osThreadTail +# .word 0x00000000 +# .word 0xFFFFFFFF +# +# glabel __RunQueue +# .word 0x800E4880 +# +# glabel __osActiveQueue +# .word 0x800E4880 +# +# glabel __osRunningThread +# .word 0x00000000 +# +# glabel D_800E4894 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +#.word 0x00000000 +#.word 0x00000000 +#.word 0x00000000 +#.word 0x00000000 +#.word 0x00000000 +#.word 0x00000000 +#.word 0x00000000 +#.word 0x00000000 +# +# glabel D_800E48C0 +# .aligned_text " " +# +# glabel D_800E48E4 +# .aligned_text "00000000000000000000000000000000" +# +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E4910 +# .word 0x8012D200 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800E4920 +# .aligned_text "0123456789abcdef" # lowercase hex digits +# +# glabel D_800E4934 +# .aligned_text "0123456789ABCDEF" # uppercase hex digits +# +# .word 0x00000000 +# .word 0x00000000 -glabel __osViNext -.word 0x800E4840 - -glabel D_800E4878 -.word 0x02E6D354 -.word 0x00000000 - -glabel __osThreadTail -.word 0x00000000 -.word 0xFFFFFFFF - -glabel __RunQueue -.word 0x800E4880 - -glabel __osActiveQueue -.word 0x800E4880 - -glabel __osRunningThread -.word 0x00000000 - -glabel D_800E4894 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E48C0 -.aligned_text " " - -glabel D_800E48E4 -.aligned_text "00000000000000000000000000000000" - -.word 0x00000000 -.word 0x00000000 - -glabel D_800E4910 -.word 0x8012D200 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800E4920 -.aligned_text "0123456789abcdef" # lowercase hex digits - -glabel D_800E4934 -.aligned_text "0123456789ABCDEF" # uppercase hex digits - -.word 0x00000000 -.word 0x00000000 +############## unknown_001050.c (.rodata) ############## .aligned_text "amSndPlay: Illegal sound effects table index\n" .aligned_text "amSndPlayDirect: Somebody tried to play illegal sound %d\n" .aligned_text "Invalid midi sequence index\n" -############## unknown_001050.c (.rodata) ############## - glabel D_800E49DC .float 60000000.0 diff --git a/lib/src/osTimer.c b/lib/src/osTimer.c index 28d038e3..cdc87fee 100644 --- a/lib/src/osTimer.c +++ b/lib/src/osTimer.c @@ -4,7 +4,8 @@ #include "macros.h" #include "libultra_internal.h" -extern OSTimer *D_800E4910; +OSTimer *D_800E4910 = (OSTimer *)0x8012D200; + extern OSTime __osCurrentTime; extern u32 __osBaseCounter; extern u32 D_8012D22C; diff --git a/lib/src/osViMgr.c b/lib/src/osViMgr.c index 98689913..36b45803 100644 --- a/lib/src/osViMgr.c +++ b/lib/src/osViMgr.c @@ -5,15 +5,14 @@ #include "macros.h" #include "libultra_internal.h" - #define OS_VIM_STACKSIZE 4096 extern OSTime __osCurrentTime; extern u32 __osBaseCounter; extern u32 D_8012D22C; //__osViIntrCount +OSDevMgr __osViDevMgr = {0}; -extern OSDevMgr __osViDevMgr; extern u8 viThreadStack[OS_VIM_STACKSIZE]; extern OSThread viThread; extern OSMesgQueue viEventQueue; diff --git a/lib/src/unknown_0C91A0.c b/lib/src/unknown_0C91A0.c index 1c3dc5bb..da476fbf 100644 --- a/lib/src/unknown_0C91A0.c +++ b/lib/src/unknown_0C91A0.c @@ -5,6 +5,8 @@ #include "types.h" #include "macros.h" +ALGlobals *alGlobals = NULL; + GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alCSPPlay.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alCSPStop.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s") diff --git a/lib/src/unknown_0C9970.c b/lib/src/unknown_0C9970.c index 66f52bc3..2e1d5d6e 100644 --- a/lib/src/unknown_0C9970.c +++ b/lib/src/unknown_0C9970.c @@ -4,4 +4,6 @@ #include "types.h" #include "macros.h" +u8 D_800E3790 = 0; + GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9970/func_800C8D70.s") diff --git a/lib/src/unknown_0C9A20.c b/lib/src/unknown_0C9A20.c index 6d463f96..c63fb58a 100644 --- a/lib/src/unknown_0C9A20.c +++ b/lib/src/unknown_0C9A20.c @@ -4,4 +4,31 @@ #include "types.h" #include "macros.h" +// This probably does not belong here. Please move it to the appropriate place! +#define EQPOWER_LENGTH 128 +static s16 eqpower[ EQPOWER_LENGTH ] = { + 32767, 32764, 32757, 32744, 32727, 32704, + 32677, 32644, 32607, 32564, 32517, 32464, + 32407, 32344, 32277, 32205, 32127, 32045, + 31958, 31866, 31770, 31668, 31561, 31450, + 31334, 31213, 31087, 30957, 30822, 30682, + 30537, 30388, 30234, 30075, 29912, 29744, + 29572, 29395, 29214, 29028, 28838, 28643, + 28444, 28241, 28033, 27821, 27605, 27385, + 27160, 26931, 26698, 26461, 26220, 25975, + 25726, 25473, 25216, 24956, 24691, 24423, + 24151, 23875, 23596, 23313, 23026, 22736, + 22442, 22145, 21845, 21541, 21234, 20924, + 20610, 20294, 19974, 19651, 19325, 18997, + 18665, 18331, 17993, 17653, 17310, 16965, + 16617, 16266, 15913, 15558, 15200, 14840, + 14477, 14113, 13746, 13377, 13006, 12633, + 12258, 11881, 11503, 11122, 10740, 10357, + 9971, 9584, 9196, 8806, 8415, 8023, + 7630, 7235, 6839, 6442, 6044, 5646, + 5246, 4845, 4444, 4042, 3640, 3237, + 2833, 2429, 2025, 1620, 1216, 810, + 405, 0 +}; + GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9A20/func_800C8E20.s") diff --git a/lib/src/unknown_0CCF90.c b/lib/src/unknown_0CCF90.c index e35b6c53..3b42e9b6 100644 --- a/lib/src/unknown_0CCF90.c +++ b/lib/src/unknown_0CCF90.c @@ -8,6 +8,13 @@ GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/alMainBusParam.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/alMainBusPull.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/alSaveParam.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/alSavePull.s") + +s32 D_800E38A0 = 0; // Not sure what this is. +s32 D_800E38A4 = 62500000; // OSTime osClockRate = OS_CLOCK_RATE; +u32 D_800E38A8 = 0; // u32 __osShutdown = 0; +u32 D_800E38AC = 0x3FFF01; // u32 __OSGlobalIntMask = OS_IM_ALL; +s32 D_800E38B0 = 0; // Not sure what this is. + GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/osInitialize.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/osSetThreadPri.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/guPerspectiveF.s") diff --git a/lib/src/unknown_0CD820.c b/lib/src/unknown_0CD820.c index 0d2c9720..4adbd683 100644 --- a/lib/src/unknown_0CD820.c +++ b/lib/src/unknown_0CD820.c @@ -4,6 +4,8 @@ #include "types.h" #include "macros.h" +s32 D_800E38C0 = 0; + GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCC20.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCE18.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s") diff --git a/lib/src/unknown_0CE200.c b/lib/src/unknown_0CE200.c index d1633ac2..23bcf4eb 100644 --- a/lib/src/unknown_0CE200.c +++ b/lib/src/unknown_0CE200.c @@ -4,6 +4,8 @@ #include "types.h" #include "macros.h" +s32 D_800E38D0 = 0; + GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/__osSiCreateAccessQueue.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/__osSiGetAccess.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/__osSiRelAccess.s") diff --git a/lib/src/unknown_0D29F0.c b/lib/src/unknown_0D29F0.c index e9de3a33..e2f6d64c 100644 --- a/lib/src/unknown_0D29F0.c +++ b/lib/src/unknown_0D29F0.c @@ -25,8 +25,13 @@ typedef struct /* 0x24 */ __OSViScale y; } __OSViContext; -extern __OSViContext *__osViCurr; -extern __OSViContext *__osViNext; +static __OSViContext vi[2] = {0}; + +__OSViContext *__osViCurr = &vi[0]; +__OSViContext *__osViNext = &vi[1]; + +#define VI_NTSC_CLOCK 48681812 +s32 osViClock = VI_NTSC_CLOCK; GLOBAL_ASM("lib/asm/non_matchings/unknown_0D29F0/func_800D1DF0.s") diff --git a/lib/src/unknown_0D3020.c b/lib/src/unknown_0D3020.c index 6cc413d8..315d60cd 100644 --- a/lib/src/unknown_0D3020.c +++ b/lib/src/unknown_0D3020.c @@ -30,4 +30,8 @@ void __osPiGetAccess(void) void __osPiRelAccess(void) { osSendMesg(&piAccessQueue, NULL, OS_MESG_NOBLOCK); -} \ No newline at end of file +} + +// Used with _Litob.s. Please move this later! +char D_800E4920[20] = "0123456789abcdef"; // lowercase hex digits +char D_800E4934[20] = "0123456789ABCDEF"; // uppercase hex digits diff --git a/lib/src/unknown_0D43F0.c b/lib/src/unknown_0D43F0.c index 468ef72c..36b95882 100644 --- a/lib/src/unknown_0D43F0.c +++ b/lib/src/unknown_0D43F0.c @@ -4,6 +4,14 @@ #include "types.h" #include "macros.h" +// Unused? Probably unrelated to this file, but not sure what it could be. +s32 D_800E48A0[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; + GLOBAL_ASM("lib/asm/non_matchings/unknown_0D43F0/alCopy.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0D43F0/_Putfld.s") + +// Both of these are used in _Printf +char D_800E48C0[36] = " "; +char D_800E48E4[32] = "00000000000000000000000000000000"; + GLOBAL_ASM("lib/asm/non_matchings/unknown_0D43F0/_Printf.s") \ No newline at end of file diff --git a/lib/src/unknown_0D6C90.c b/lib/src/unknown_0D6C90.c index 5f57cdd4..0f3d8d2d 100644 --- a/lib/src/unknown_0D6C90.c +++ b/lib/src/unknown_0D6C90.c @@ -5,8 +5,18 @@ #include "libultra_internal.h" #include "viint.h" -extern OSThread* __osRunningThread; -extern OSThread* __RunQueue; +struct __osThreadTail +{ + OSThread *next; + OSPri priority; +} __osThreadTail; + +struct __osThreadTail __osThreadTail = {0, -1}; +OSThread *__osActiveQueue = &__osThreadTail.next; +OSThread *__RunQueue = &__osThreadTail.next; + +extern OSThread *__osRunningThread = NULL; +extern OSThread *D_800E4894 = NULL; // __osFaultedThread GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/__osViSwapContext.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D63F0.s") diff --git a/lib/src/viint.h b/lib/src/viint.h new file mode 100644 index 00000000..74cee418 --- /dev/null +++ b/lib/src/viint.h @@ -0,0 +1,70 @@ +#ifndef _VIINT_H +#define _VIINT_H +#include "libultra_internal.h" + +#define OS_TV_TYPE_PAL 0 +#define OS_TV_TYPE_NTSC 1 +#define OS_TV_TYPE_MPAL 2 + +//TODO: figure out what this is +#define VI_STATE_01 0x01 +#define VI_STATE_XSCALE_UPDATED 0x02 +#define VI_STATE_YSCALE_UPDATED 0x04 +#define VI_STATE_08 0x08 //related to control regs changing +#define VI_STATE_10 0x10 //swap buffer +#define VI_STATE_BLACK 0x20 //probably related to a black screen +#define VI_STATE_REPEATLINE 0x40 //repeat line? +#define VI_STATE_FADE 0x80 //fade + +#define VI_CTRL_ANTIALIAS_MODE_3 0x00300 /* Bit [9:8] anti-alias mode */ +#define VI_CTRL_ANTIALIAS_MODE_2 0x00200 /* Bit [9:8] anti-alias mode */ +#define VI_CTRL_ANTIALIAS_MODE_1 0x00100 /* Bit [9:8] anti-alias mode */ + +#define VI_SCALE_MASK 0xfff //see rcp scale_x/scale_y +#define VI_2_10_FPART_MASK 0x3ff +#define VI_SUBPIXEL_SH 0x10 + +#define BURST(hsync_width, color_width, vsync_width, color_start) \ + (hsync_width | (color_width << 8) | (vsync_width << 16) | (color_start << 20)) +#define WIDTH(v) v +#define VSYNC(v) v +#define HSYNC(duration, leap) (duration | (leap << 16)) +#define LEAP(upper, lower) ((upper << 16) | lower) +#define START(start, end) ((start << 16) | end) + +#define FTOFIX(val, i, f) ((u32)(val * (f32)(1 << f)) & ((1 << (i + f)) - 1)) + +#define F210(val) FTOFIX(val, 2, 10) +#define SCALE(scaleup, off) (F210((1.0f / (f32)scaleup)) | (F210((f32)off) << 16)) + +#define VCURRENT(v) v //seemingly unused +#define ORIGIN(v) v +#define VINTR(v) v +#define HSTART START + +typedef struct +{ + /* 0x0 */ f32 factor; + /* 0x4 */ u16 offset; + /* 0x8 */ u32 scale; +} __OSViScale; + +typedef struct +{ + /* 0x0 */ u16 state; + /* 0x2 */ u16 retraceCount; + /* 0x4 */ void *framep; + /* 0x8 */ OSViMode *modep; + /* 0xC */ u32 control; + /* 0x10 */ OSMesgQueue *msgq; + /* 0x14 */ OSMesg msg; + /* 0x18 */ __OSViScale x; + /* 0x24 */ __OSViScale y; +} __OSViContext; + +void __osViSwapContext(void); +extern __OSViContext *__osViCurr; +extern __OSViContext *__osViNext; +__OSViContext *__osViGetCurrentContext(void); +void __osViInit(void); +#endif diff --git a/lib/src/vitbl.c b/lib/src/vitbl.c new file mode 100644 index 00000000..cae312c5 --- /dev/null +++ b/lib/src/vitbl.c @@ -0,0 +1,1602 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800D1991 */ + +// The RAM_POS above is just a hack to put it after osViMgr.c + +#include "libultra_internal.h" +#include "viint.h" + +/* + * Video Interface (VI) mode type + */ +#define OS_VI_NTSC_LPN1 0 /* NTSC */ +#define OS_VI_NTSC_LPF1 1 +#define OS_VI_NTSC_LAN1 2 +#define OS_VI_NTSC_LAF1 3 +#define OS_VI_NTSC_LPN2 4 +#define OS_VI_NTSC_LPF2 5 +#define OS_VI_NTSC_LAN2 6 +#define OS_VI_NTSC_LAF2 7 +#define OS_VI_NTSC_HPN1 8 +#define OS_VI_NTSC_HPF1 9 +#define OS_VI_NTSC_HAN1 10 +#define OS_VI_NTSC_HAF1 11 +#define OS_VI_NTSC_HPN2 12 +#define OS_VI_NTSC_HPF2 13 + +#define OS_VI_PAL_LPN1 14 /* PAL */ +#define OS_VI_PAL_LPF1 15 +#define OS_VI_PAL_LAN1 16 +#define OS_VI_PAL_LAF1 17 +#define OS_VI_PAL_LPN2 18 +#define OS_VI_PAL_LPF2 19 +#define OS_VI_PAL_LAN2 20 +#define OS_VI_PAL_LAF2 21 +#define OS_VI_PAL_HPN1 22 +#define OS_VI_PAL_HPF1 23 +#define OS_VI_PAL_HAN1 24 +#define OS_VI_PAL_HAF1 25 +#define OS_VI_PAL_HPN2 26 +#define OS_VI_PAL_HPF2 27 + +#define OS_VI_MPAL_LPN1 28 /* MPAL - mainly Brazil */ +#define OS_VI_MPAL_LPF1 29 +#define OS_VI_MPAL_LAN1 30 +#define OS_VI_MPAL_LAF1 31 +#define OS_VI_MPAL_LPN2 32 +#define OS_VI_MPAL_LPF2 33 +#define OS_VI_MPAL_LAN2 34 +#define OS_VI_MPAL_LAF2 35 +#define OS_VI_MPAL_HPN1 36 +#define OS_VI_MPAL_HPF1 37 +#define OS_VI_MPAL_HAN1 38 +#define OS_VI_MPAL_HAF1 39 +#define OS_VI_MPAL_HPN2 40 +#define OS_VI_MPAL_HPF2 41 + +/* + * Video Interface (VI) special features + */ +#define OS_VI_GAMMA_ON 0x0001 +#define OS_VI_GAMMA_OFF 0x0002 +#define OS_VI_GAMMA_DITHER_ON 0x0004 +#define OS_VI_GAMMA_DITHER_OFF 0x0008 +#define OS_VI_DIVOT_ON 0x0010 +#define OS_VI_DIVOT_OFF 0x0020 +#define OS_VI_DITHER_FILTER_ON 0x0040 +#define OS_VI_DITHER_FILTER_OFF 0x0080 + +/* + * Video Interface (VI) mode attribute bit + */ +#define OS_VI_BIT_NONINTERLACE 0x0001 /* lo-res */ +#define OS_VI_BIT_INTERLACE 0x0002 /* lo-res */ +#define OS_VI_BIT_NORMALINTERLACE 0x0004 /* hi-res */ +#define OS_VI_BIT_DEFLICKINTERLACE 0x0008 /* hi-res */ +#define OS_VI_BIT_ANTIALIAS 0x0010 +#define OS_VI_BIT_POINTSAMPLE 0x0020 +#define OS_VI_BIT_16PIXEL 0x0040 +#define OS_VI_BIT_32PIXEL 0x0080 +#define OS_VI_BIT_LORES 0x0100 +#define OS_VI_BIT_HIRES 0x0200 +#define OS_VI_BIT_NTSC 0x0400 +#define OS_VI_BIT_PAL 0x0800 + +// osViModeTable +OSViMode D_800E3900[42] = { + {OS_VI_NTSC_LPN1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 34, 5, 62), //burst + VSYNC(525), //vSync + HSYNC(3093, 0), //hSync + LEAP(3093, 3093), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(640), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(640), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_NTSC_LPF1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 34, 5, 62), //burst + VSYNC(524), //vSync + HSYNC(3093, 0), //hSync + LEAP(3093, 3093), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(640), //origin + SCALE(1, 0.25), //yScale + HSTART(35, 509), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(640), //origin + SCALE(1, 0.75), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_NTSC_LAN1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + VI_CTRL_ANTIALIAS_MODE_1 | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 34, 5, 62), //burst + VSYNC(525), //vSync + HSYNC(3093, 0), //hSync + LEAP(3093, 3093), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(640), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(640), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_NTSC_LAF1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + VI_CTRL_SERRATE_ON | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 34, 5, 62), //burst + VSYNC(524), //vSync + HSYNC(3093, 0), //hSync + LEAP(3093, 3093), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(640), //origin + SCALE(1, 0.25), //yScale + HSTART(35, 509), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(640), //origin + SCALE(1, 0.75), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_NTSC_LPN2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_ANTIALIAS_MODE_3 | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 34, 5, 62), //burst + VSYNC(525), //vSync + HSYNC(3093, 0), //hSync + LEAP(3093, 3093), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_NTSC_LPF2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 34, 5, 62), //burst + VSYNC(524), //vSync + HSYNC(3093, 0), //hSync + LEAP(3093, 3093), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0.25), //yScale + HSTART(35, 509), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(1280), //origin + SCALE(1, 0.75), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_NTSC_LAN2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 34, 5, 62), //burst + VSYNC(525), //vSync + HSYNC(3093, 0), //hSync + LEAP(3093, 3093), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_NTSC_LAF2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + VI_CTRL_SERRATE_ON | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 34, 5, 62), //burst + VSYNC(524), //vSync + HSYNC(3093, 0), //hSync + LEAP(3093, 3093), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0.25), //yScale + HSTART(35, 509), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(1280), //origin + SCALE(1, 0.75), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_NTSC_HPN1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(1280), //width + BURST(57, 34, 5, 62), //burst + VSYNC(524), //vSync + HSYNC(3093, 0), //hSync + LEAP(3093, 3093), //leap + HSTART(108, 748), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(35, 509), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(2560), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_NTSC_HPF1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(640), //width + BURST(57, 34, 5, 62), //burst + VSYNC(524), //vSync + HSYNC(3093, 0), //hSync + LEAP(3093, 3093), //leap + HSTART(108, 748), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(0.5, 0.5), //yScale + HSTART(35, 509), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(2560), //origin + SCALE(0.5, 0.5), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_NTSC_HAN1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + VI_CTRL_SERRATE_ON | + 0x3000, //ctrl + WIDTH(1280), //width + BURST(57, 34, 5, 62), //burst + VSYNC(524), //vSync + HSYNC(3093, 0), //hSync + LEAP(3093, 3093), //leap + HSTART(108, 748), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(35, 509), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(2560), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_NTSC_HAF1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + VI_CTRL_SERRATE_ON | + 0x3000, //ctrl + WIDTH(640), //width + BURST(57, 34, 5, 62), //burst + VSYNC(524), //vSync + HSYNC(3093, 0), //hSync + LEAP(3093, 3093), //leap + HSTART(108, 748), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(0.5, 0.5), //yScale + HSTART(35, 509), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(2560), //origin + SCALE(0.5, 0.5), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_NTSC_HPN2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_3 | + 0x3000, //ctrl + WIDTH(1280), //width + BURST(57, 34, 5, 62), //burst + VSYNC(524), //vSync + HSYNC(3093, 0), //hSync + LEAP(3093, 3093), //leap + HSTART(108, 748), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(2560), //origin + SCALE(1, 0), //yScale + HSTART(35, 509), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(5120), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_NTSC_HPF2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(640), //width + BURST(57, 34, 5, 62), //burst + VSYNC(524), //vSync + HSYNC(3093, 0), //hSync + LEAP(3093, 3093), //leap + HSTART(108, 748), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(2560), //origin + SCALE(0.5, 0.5), //yScale + HSTART(35, 509), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(5120), //origin + SCALE(0.5, 0.5), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_PAL_LPN1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(320), //width + BURST(58, 35, 4, 64), //burst + VSYNC(625), //vSync + HSYNC(3177, 21), //hSync + LEAP(3183, 3182), //leap + HSTART(128, 768), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(640), //origin + SCALE(1, 0), //yScale + HSTART(95, 569), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(640), //origin + SCALE(1, 0), //yScale + HSTART(95, 569), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_PAL_LPF1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(320), //width + BURST(58, 35, 4, 64), //burst + VSYNC(624), //vSync + HSYNC(3177, 21), //hSync + LEAP(3183, 3182), //leap + HSTART(128, 768), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(640), //origin + SCALE(1, 0.25), //yScale + HSTART(93, 567), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(640), //origin + SCALE(1, 0.75), //yScale + HSTART(95, 569), //vStart + BURST(105, 2, 13, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_PAL_LAN1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + VI_CTRL_ANTIALIAS_MODE_1 | + 0x3000, //ctrl + WIDTH(320), //width + BURST(58, 35, 4, 64), //burst + VSYNC(625), //vSync + HSYNC(3177, 21), //hSync + LEAP(3183, 3182), //leap + HSTART(128, 768), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(640), //origin + SCALE(1, 0), //yScale + HSTART(95, 569), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(640), //origin + SCALE(1, 0), //yScale + HSTART(95, 569), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_PAL_LAF1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + VI_CTRL_SERRATE_ON | + 0x3000, //ctrl + WIDTH(320), //width + BURST(58, 35, 4, 64), //burst + VSYNC(624), //vSync + HSYNC(3177, 21), //hSync + LEAP(3183, 3182), //leap + HSTART(128, 768), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(640), //origin + SCALE(1, 0.25), //yScale + HSTART(93, 567), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(640), //origin + SCALE(1, 0.75), //yScale + HSTART(95, 569), //vStart + BURST(105, 2, 13, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_PAL_LPN2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_ANTIALIAS_MODE_3 | + 0x3000, //ctrl + WIDTH(320), //width + BURST(58, 35, 4, 64), //burst + VSYNC(625), //vSync + HSYNC(3177, 21), //hSync + LEAP(3183, 3182), //leap + HSTART(128, 768), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(95, 569), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(95, 569), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_PAL_LPF2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(320), //width + BURST(58, 35, 4, 64), //burst + VSYNC(624), //vSync + HSYNC(3177, 21), //hSync + LEAP(3183, 3182), //leap + HSTART(128, 768), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0.25), //yScale + HSTART(93, 567), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(1280), //origin + SCALE(1, 0.75), //yScale + HSTART(95, 569), //vStart + BURST(105, 2, 13, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_PAL_LAN2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + 0x3000, //ctrl + WIDTH(320), //width + BURST(58, 35, 4, 64), //burst + VSYNC(625), //vSync + HSYNC(3177, 21), //hSync + LEAP(3183, 3182), //leap + HSTART(128, 768), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(95, 569), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(95, 569), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_PAL_LAF2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + VI_CTRL_SERRATE_ON | + 0x3000, //ctrl + WIDTH(320), //width + BURST(58, 35, 4, 64), //burst + VSYNC(624), //vSync + HSYNC(3177, 21), //hSync + LEAP(3183, 3182), //leap + HSTART(128, 768), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0.25), //yScale + HSTART(93, 567), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(1280), //origin + SCALE(1, 0.75), //yScale + HSTART(95, 569), //vStart + BURST(105, 2, 13, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_PAL_HPN1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(1280), //width + BURST(58, 35, 4, 64), //burst + VSYNC(624), //vSync + HSYNC(3177, 21), //hSync + LEAP(3183, 3182), //leap + HSTART(128, 768), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(93, 567), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(2560), //origin + SCALE(1, 0), //yScale + HSTART(95, 569), //vStart + BURST(105, 2, 13, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_PAL_HPF1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(640), //width + BURST(58, 35, 4, 64), //burst + VSYNC(624), //vSync + HSYNC(3177, 21), //hSync + LEAP(3183, 3182), //leap + HSTART(128, 768), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(0.5, 0.5), //yScale + HSTART(93, 567), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(2560), //origin + SCALE(0.5, 0.5), //yScale + HSTART(95, 569), //vStart + BURST(105, 2, 13, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_PAL_HAN1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + VI_CTRL_SERRATE_ON | + 0x3000, //ctrl + WIDTH(1280), //width + BURST(58, 35, 4, 64), //burst + VSYNC(624), //vSync + HSYNC(3177, 21), //hSync + LEAP(3183, 3182), //leap + HSTART(128, 768), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(93, 567), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(2560), //origin + SCALE(1, 0), //yScale + HSTART(95, 569), //vStart + BURST(105, 2, 13, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_PAL_HAF1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + VI_CTRL_SERRATE_ON | + 0x3000, //ctrl + WIDTH(640), //width + BURST(58, 35, 4, 64), //burst + VSYNC(624), //vSync + HSYNC(3177, 21), //hSync + LEAP(3183, 3182), //leap + HSTART(128, 768), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(0.5, 0.5), //yScale + HSTART(93, 567), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(2560), //origin + SCALE(0.5, 0.5), //yScale + HSTART(95, 569), //vStart + BURST(105, 2, 13, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_PAL_HPN2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_3 | + 0x3000, //ctrl + WIDTH(1280), //width + BURST(58, 35, 4, 64), //burst + VSYNC(624), //vSync + HSYNC(3177, 21), //hSync + LEAP(3183, 3182), //leap + HSTART(128, 768), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(2560), //origin + SCALE(1, 0), //yScale + HSTART(93, 567), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(5120), //origin + SCALE(1, 0), //yScale + HSTART(95, 569), //vStart + BURST(105, 2, 13, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_PAL_HPF2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(640), //width + BURST(58, 35, 4, 64), //burst + VSYNC(624), //vSync + HSYNC(3177, 21), //hSync + LEAP(3183, 3182), //leap + HSTART(128, 768), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(2560), //origin + SCALE(0.5, 0.5), //yScale + HSTART(93, 567), //vStart + BURST(107, 2, 9, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(5120), //origin + SCALE(0.5, 0.5), //yScale + HSTART(95, 569), //vStart + BURST(105, 2, 13, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_MPAL_LPN1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 30, 5, 70), //burst + VSYNC(525), //vSync + HSYNC(3089, 4), //hSync + LEAP(3097, 3098), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(640), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(640), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_MPAL_LPF1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 30, 5, 70), //burst + VSYNC(524), //vSync + HSYNC(3088, 0), //hSync + LEAP(3100, 3100), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(640), //origin + SCALE(1, 0.25), //yScale + HSTART(35, 509), //vStart + BURST(2, 2, 11, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(640), //origin + SCALE(1, 0.75), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_MPAL_LAN1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + VI_CTRL_ANTIALIAS_MODE_1 | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 30, 5, 70), //burst + VSYNC(525), //vSync + HSYNC(3089, 4), //hSync + LEAP(3097, 3098), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(640), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(640), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_MPAL_LAF1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + VI_CTRL_SERRATE_ON | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 30, 5, 70), //burst + VSYNC(524), //vSync + HSYNC(3088, 0), //hSync + LEAP(3100, 3100), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(640), //origin + SCALE(1, 0.25), //yScale + HSTART(35, 509), //vStart + BURST(2, 2, 11, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(640), //origin + SCALE(1, 0.75), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_MPAL_LPN2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_ANTIALIAS_MODE_3 | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 30, 5, 70), //burst + VSYNC(525), //vSync + HSYNC(3089, 4), //hSync + LEAP(3097, 3098), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_MPAL_LPF2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 30, 5, 70), //burst + VSYNC(524), //vSync + HSYNC(3088, 0), //hSync + LEAP(3100, 3100), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0.25), //yScale + HSTART(35, 509), //vStart + BURST(2, 2, 11, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(1280), //origin + SCALE(1, 0.75), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_MPAL_LAN2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 30, 5, 70), //burst + VSYNC(525), //vSync + HSYNC(3089, 4), //hSync + LEAP(3097, 3098), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_MPAL_LAF2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + VI_CTRL_SERRATE_ON | + 0x3000, //ctrl + WIDTH(320), //width + BURST(57, 30, 5, 70), //burst + VSYNC(524), //vSync + HSYNC(3088, 0), //hSync + LEAP(3100, 3100), //leap + HSTART(108, 748), //hStart + SCALE(2, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0.25), //yScale + HSTART(35, 509), //vStart + BURST(2, 2, 11, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(1280), //origin + SCALE(1, 0.75), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_MPAL_HPN1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(1280), //width + BURST(57, 30, 5, 70), //burst + VSYNC(524), //vSync + HSYNC(3088, 0), //hSync + LEAP(3100, 3100), //leap + HSTART(108, 748), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(35, 509), //vStart + BURST(2, 2, 11, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(2560), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_MPAL_HPF1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(640), //width + BURST(57, 30, 5, 70), //burst + VSYNC(524), //vSync + HSYNC(3088, 0), //hSync + LEAP(3100, 3100), //leap + HSTART(108, 748), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(0.5, 0.5), //yScale + HSTART(35, 509), //vStart + BURST(2, 2, 11, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(2560), //origin + SCALE(0.5, 0.5), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_MPAL_HAN1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + VI_CTRL_SERRATE_ON | + 0x3000, //ctrl + WIDTH(1280), //width + BURST(57, 30, 5, 70), //burst + VSYNC(524), //vSync + HSYNC(3088, 0), //hSync + LEAP(3100, 3100), //leap + HSTART(108, 748), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(1, 0), //yScale + HSTART(35, 509), //vStart + BURST(2, 2, 11, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(2560), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_MPAL_HAF1, //type + { + //comRegs + VI_CTRL_TYPE_16 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_DIVOT_ON | + VI_CTRL_SERRATE_ON | + 0x3000, //ctrl + WIDTH(640), //width + BURST(57, 30, 5, 70), //burst + VSYNC(524), //vSync + HSYNC(3088, 0), //hSync + LEAP(3100, 3100), //leap + HSTART(108, 748), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(1280), //origin + SCALE(0.5, 0.5), //yScale + HSTART(35, 509), //vStart + BURST(2, 2, 11, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(2560), //origin + SCALE(0.5, 0.5), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_MPAL_HPN2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_3 | + 0x3000, //ctrl + WIDTH(1280), //width + BURST(57, 30, 5, 70), //burst + VSYNC(524), //vSync + HSYNC(3088, 0), //hSync + LEAP(3100, 3100), //leap + HSTART(108, 748), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(2560), //origin + SCALE(1, 0), //yScale + HSTART(35, 509), //vStart + BURST(2, 2, 11, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(5120), //origin + SCALE(1, 0), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, + {OS_VI_MPAL_HPF2, //type + { + //comRegs + VI_CTRL_TYPE_32 | + VI_CTRL_GAMMA_DITHER_ON | + VI_CTRL_GAMMA_ON | + VI_CTRL_SERRATE_ON | + VI_CTRL_ANTIALIAS_MODE_2 | + 0x3000, //ctrl + WIDTH(640), //width + BURST(57, 30, 5, 70), //burst + VSYNC(524), //vSync + HSYNC(3088, 0), //hSync + LEAP(3100, 3100), //leap + HSTART(108, 748), //hStart + SCALE(1, 0), //xScale + VCURRENT(0), //vCurrent + }, + {//fldRegs + { + //[0] + ORIGIN(2560), //origin + SCALE(0.5, 0.5), //yScale + HSTART(35, 509), //vStart + BURST(2, 2, 11, 0), //vBurst + VINTR(2), //vIntr + }, + { + //[1] + ORIGIN(5120), //origin + SCALE(0.5, 0.5), //yScale + HSTART(37, 511), //vStart + BURST(4, 2, 14, 0), //vBurst + VINTR(2), //vIntr + }}}, +}; + + +// TODO: Convert the following arrays into OSViMode structs. + +s32 D_800E4620[20] = { + 0x00000000, 0x0000320E, 0x00000140, 0x03E52239, + 0x0000020D, 0x00000C15, 0x0C150C15, 0x006C02EC, + 0x00000200, 0x00000000, 0x00000280, 0x00000400, + 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, + 0x00000400, 0x002501FF, 0x000E0204, 0x00000002 +}; + +s32 D_800E4670[20] = { + 0x0E000000, 0x0000320E, 0x00000140, 0x0404233A, + 0x00000271, 0x00150C69, 0x0C6F0C6E, 0x00800300, + 0x00000200, 0x00000000, 0x00000280, 0x00000400, + 0x005F0239, 0x0009026B, 0x00000002, 0x00000280, + 0x00000400, 0x005F0239, 0x0009026B, 0x00000002 +}; + +s32 D_800E46C0[20] = { + 0x1C000000, 0x0000320E, 0x00000140, 0x04651E39, + 0x0000020D, 0x00040C11, 0x0C190C1A, 0x006C02EC, + 0x00000200, 0x00000000, 0x00000280, 0x00000400, + 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, + 0x00000400, 0x002501FF, 0x000E0204, 0x00000002 +}; + +s32 D_800E4710[20] = { + 0x02000000, 0x0000311E, 0x00000140, 0x03E52239, + 0x0000020D, 0x00000C15, 0x0C150C15, 0x006C02EC, + 0x00000200, 0x00000000, 0x00000280, 0x00000400, + 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, + 0x00000400, 0x002501FF, 0x000E0204, 0x00000002 +}; + +s32 D_800E4760[20] = { + 0x10000000, 0x0000311E, 0x00000140, 0x0404233A, + 0x00000271, 0x00150C69, 0x0C6F0C6E, 0x00800300, + 0x00000200, 0x00000000, 0x00000280, 0x00000400, + 0x005F0239, 0x0009026B, 0x00000002, 0x00000280, + 0x00000400, 0x005F0239, 0x0009026B, 0x00000002 +}; + +s32 D_800E47B0[20] = { + 0x1E000000, 0x0000311E, 0x00000140, 0x04651E39, + 0x0000020D, 0x00040C11, 0x0C190C1A, 0x006C02EC, + 0x00000200, 0x00000000, 0x00000280, 0x00000400, + 0x002501FF, 0x000E0204, 0x00000002, 0x00000280, + 0x00000400, 0x002501FF, 0x000E0204, 0x00000002 +}; + +// This needs to be moved. +u32 __osPiAccessQueueEnabled = 0; diff --git a/src/unknown_0C7F50.c b/src/unknown_0C7F50.c index dc0f66d3..d0adc4bc 100644 --- a/src/unknown_0C7F50.c +++ b/src/unknown_0C7F50.c @@ -5,16 +5,24 @@ #include "macros.h" #include "libultra_internal.h" -extern s32 D_800E3770; // boolean -extern s32 D_800E3774; -extern s32 D_800E3778; -extern s32 D_800E377C; +/************ .data ************/ + +s32 D_800E3770 = 0; +s32 D_800E3774 = -1; +s32 D_800E3778 = -1; +s32 D_800E377C = 0; + +/*******************************/ + +/************ .bss ************/ extern OSMesgQueue D_8012ACA0; extern OSMesg D_8012ACB8; extern OSThread D_8012AAF0; extern void *D_8012CCC0; +/*****************************/ + void func_800C74A0(void *arg); void func_800C7350(void) { diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index 5710b279..6a76781f 100644 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -19,6 +19,12 @@ LIB_ASM_DIR = ROOT_DIR + '/lib/asm' LIB_SRC_DIR = ROOT_DIR + '/lib/src' BUILD_DIR = 'build/' + VERSION +LATE_DATA_FILES = [ + BUILD_DIR + '/lib/src/unknown_0D43F0.o', + BUILD_DIR + '/lib/src/osTimer.o', + BUILD_DIR + '/lib/src/unknown_0D3020.o' +] + class GenerateLD: def __init__(self, file): print('Generating linker file...') @@ -76,7 +82,10 @@ class GenerateLD: self.gen_line('.main_data . : AT(romPos) SUBALIGN(16)') self.gen_open_block() for file in self.files: - self.gen_line(file[0] + '(.data);') + if file[0] not in LATE_DATA_FILES: + self.gen_line(file[0] + '(.data);') + for file in LATE_DATA_FILES: + self.gen_line(file + '(.data);') self.gen_line(BUILD_DIR + '/data/dkr.data.o(.data);') self.gen_close_block() self.gen_line('romPos += SIZEOF(.main_data);') From 8a78a0eaf85573c60fada2428b4db1d5a983a04d Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Thu, 27 May 2021 21:27:48 -0700 Subject: [PATCH 29/39] Updated glabel finder --- tools/python/find_glabels.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/python/find_glabels.py b/tools/python/find_glabels.py index ab307308..1703d6d9 100644 --- a/tools/python/find_glabels.py +++ b/tools/python/find_glabels.py @@ -5,8 +5,8 @@ from file_util import FileUtil LINE_START_REGEX = r'\n/\* ([0-9A-F]{6}) [0-9A-F]{8} [0-9A-F]{8} \*/\s+' REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|k[0-1]|gp|sp|fp|ra))' GLABEL_UPPER_REGEX = '(' + LINE_START_REGEX + r'lui\s+' + REG_REGEX + r',\s+(0x80[0-9a-f]{2}))' -GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'l[bhw]\s+\3,\s+(0x[0-9a-f]{4})\(' + REG_REGEX + '\))' -GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '((?!\n|jr|\sb\w*\s).)*(?=\n)){0,10}' + GLABEL_LOWER_REGEX +GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'l[bhw]\s+' + REG_REGEX + r',\s+(0x[0-9a-f]{4})\(\3\))' +GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '[^\n]*(?=\n)){0,10}' + GLABEL_LOWER_REGEX def _find_glabels(asm): glabels = [] @@ -15,7 +15,7 @@ def _find_glabels(asm): for match in matches: offsets = (match[1], match[8]) # ROM offsets of the lu and lw glabel_upper = int(match[4], 16) # upper immediate of glabel - glabel_lower = int(match[10], 16) # lower immediate of the glabel + glabel_lower = int(match[11], 16) # lower immediate of the glabel if glabel_lower & 0x8000: glabel_upper -= 1 glabel = 'D_%08X' % (glabel_upper << 16 | glabel_lower) @@ -26,7 +26,9 @@ def main(): FileUtil.set_working_dir_to_project_base() contents = FileUtil.get_text_from_file('asm/non_matchings/unknown_005740/func_80005254.s') glabels = _find_glabels(contents) - print(len(glabels)) + print('%d undeclared labels found:' % len(glabels)) + for glabel in glabels: + print(glabel) if __name__ == '__main__': main() From e456e75fec23a20b7ce6e4afe5e7d4d3f200ba81 Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Thu, 27 May 2021 21:30:47 -0700 Subject: [PATCH 30/39] Added additional usage of existing globals --- .../unknown_066AA0/func_8006A6B0.s | 4 ++-- .../unknown_066AA0/func_8006C3E0.s | 4 ++-- .../unknown_066AA0/func_8006C60C.s | 24 +++++++++---------- .../unknown_066AA0/func_8006DCF8.s | 12 +++++----- .../unknown_066AA0/func_8006ECFC.s | 12 +++++----- .../unknown_071730/func_80071278.s | 4 ++-- .../unknown_071730/func_80071478.s | 4 ++-- .../unknown_071730/func_80071538.s | 4 ++-- .../unknown_071730/func_8007164C.s | 4 ++-- asm/non_matchings/unknown_080500/Menu11Loop.s | 8 +++---- .../unknown_080500/func_800853D0.s | 12 +++++----- .../unknown_080500/func_8008B758.s | 8 +++---- .../unknown_080500/func_80090918.s | 4 ++-- .../unknown_080500/func_80092188.s | 4 ++-- .../unknown_080500/func_80094170.s | 16 ++++++------- .../unknown_080500/func_80094688.s | 8 +++---- .../unknown_080500/func_80095728.s | 8 +++---- .../unknown_080500/func_8009CA60.s | 8 +++---- .../unknown_09F8F0/func_800A01A0.s | 4 ++-- .../unknown_09F8F0/func_800A3884.s | 4 ++-- .../unknown_09F8F0/func_800A8458.s | 4 ++-- .../unknown_09F8F0/func_800A8474.s | 16 ++++++------- 22 files changed, 88 insertions(+), 88 deletions(-) diff --git a/asm/non_matchings/unknown_066AA0/func_8006A6B0.s b/asm/non_matchings/unknown_066AA0/func_8006A6B0.s index df2cad99..50b17141 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006A6B0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006A6B0.s @@ -682,9 +682,9 @@ glabel func_8006A6B0 /* 06BC28 8006B028 29E10010 */ slti $at, $t7, 0x10 /* 06BC2C 8006B02C 10200006 */ beqz $at, .L8006B048 /* 06BC30 8006B030 000FC080 */ sll $t8, $t7, 2 -/* 06BC34 8006B034 3C028012 */ lui $v0, 0x8012 +/* 06BC34 8006B034 3C028012 */ lui $v0, %hi(D_80121180) # $v0, 0x8012 /* 06BC38 8006B038 00581021 */ addu $v0, $v0, $t8 -/* 06BC3C 8006B03C 8C421180 */ lw $v0, 0x1180($v0) +/* 06BC3C 8006B03C 8C421180 */ lw $v0, %lo(D_80121180)($v0) /* 06BC40 8006B040 03E00008 */ jr $ra /* 06BC44 8006B044 00000000 */ nop diff --git a/asm/non_matchings/unknown_066AA0/func_8006C3E0.s b/asm/non_matchings/unknown_066AA0/func_8006C3E0.s index 4fc0fab2..107837a1 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006C3E0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006C3E0.s @@ -118,10 +118,10 @@ glabel func_8006C3E0 /* 06D19C 8006C59C 250834E8 */ addiu $t0, %lo(D_801234E8) # addiu $t0, $t0, 0x34e8 /* 06D1A0 8006C5A0 AC203508 */ sw $zero, %lo(D_80123508)($at) /* 06D1A4 8006C5A4 00005880 */ sll $t3, $zero, 2 -/* 06D1A8 8006C5A8 3C0C8012 */ lui $t4, 0x8012 +/* 06D1A8 8006C5A8 3C0C8012 */ lui $t4, %hi(D_801211F0) # $t4, 0x8012 /* 06D1AC 8006C5AC AD000000 */ sw $zero, ($t0) /* 06D1B0 8006C5B0 018B6021 */ addu $t4, $t4, $t3 -/* 06D1B4 8006C5B4 8D8C11F0 */ lw $t4, 0x11f0($t4) +/* 06D1B4 8006C5B4 8D8C11F0 */ lw $t4, %lo(D_801211F0)($t4) /* 06D1B8 8006C5B8 3C038012 */ lui $v1, %hi(D_801211F8) # $v1, 0x8012 /* 06D1BC 8006C5BC 246311F8 */ addiu $v1, %lo(D_801211F8) # addiu $v1, $v1, 0x11f8 /* 06D1C0 8006C5C0 AC6C0000 */ sw $t4, ($v1) diff --git a/asm/non_matchings/unknown_066AA0/func_8006C60C.s b/asm/non_matchings/unknown_066AA0/func_8006C60C.s index 8f058a03..87bfa2d8 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006C60C.s +++ b/asm/non_matchings/unknown_066AA0/func_8006C60C.s @@ -10,10 +10,10 @@ glabel func_8006C60C /* 06D22C 8006C62C 15C1001F */ bne $t6, $at, .L8006C6AC /* 06D230 8006C630 3C0F8012 */ lui $t7, %hi(D_801234E8) # $t7, 0x8012 /* 06D234 8006C634 8DEF34E8 */ lw $t7, %lo(D_801234E8)($t7) -/* 06D238 8006C638 3C198012 */ lui $t9, 0x8012 +/* 06D238 8006C638 3C198012 */ lui $t9, %hi(D_801211F0) # $t9, 0x8012 /* 06D23C 8006C63C 000FC080 */ sll $t8, $t7, 2 /* 06D240 8006C640 0338C821 */ addu $t9, $t9, $t8 -/* 06D244 8006C644 8F3911F0 */ lw $t9, 0x11f0($t9) +/* 06D244 8006C644 8F3911F0 */ lw $t9, %lo(D_801211F0)($t9) /* 06D248 8006C648 3C048012 */ lui $a0, %hi(D_801211F8) # $a0, 0x8012 /* 06D24C 8006C64C 248411F8 */ addiu $a0, %lo(D_801211F8) # addiu $a0, $a0, 0x11f8 /* 06D250 8006C650 00002825 */ move $a1, $zero @@ -46,12 +46,12 @@ glabel func_8006C60C /* 06D2B8 8006C6B8 14600014 */ bnez $v1, .L8006C70C /* 06D2BC 8006C6BC 3C088012 */ lui $t0, %hi(D_801234E8) # $t0, 0x8012 /* 06D2C0 8006C6C0 8D0834E8 */ lw $t0, %lo(D_801234E8)($t0) -/* 06D2C4 8006C6C4 3C048012 */ lui $a0, 0x8012 +/* 06D2C4 8006C6C4 3C048012 */ lui $a0, %hi(D_801211F0) # $a0, 0x8012 /* 06D2C8 8006C6C8 00084880 */ sll $t1, $t0, 2 /* 06D2CC 8006C6CC 00892021 */ addu $a0, $a0, $t1 /* 06D2D0 8006C6D0 3C058012 */ lui $a1, %hi(D_801211F8) # $a1, 0x8012 /* 06D2D4 8006C6D4 8CA511F8 */ lw $a1, %lo(D_801211F8)($a1) -/* 06D2D8 8006C6D8 8C8411F0 */ lw $a0, 0x11f0($a0) +/* 06D2D8 8006C6D8 8C8411F0 */ lw $a0, %lo(D_801211F0)($a0) /* 06D2DC 8006C6DC 0C01DD14 */ jal setupOSTasks /* 06D2E0 8006C6E0 00003025 */ move $a2, $zero /* 06D2E4 8006C6E4 3C078012 */ lui $a3, %hi(D_801234E8) # $a3, 0x8012 @@ -73,25 +73,25 @@ glabel func_8006C60C /* 06D320 8006C720 A02ED3F0 */ sb $t6, %lo(D_800DD3F0)($at) .L8006C724: /* 06D324 8006C724 8CE20000 */ lw $v0, ($a3) -/* 06D328 8006C728 3C188012 */ lui $t8, 0x8012 +/* 06D328 8006C728 3C188012 */ lui $t8, %hi(D_801211F0) # $t8, 0x8012 /* 06D32C 8006C72C 00027880 */ sll $t7, $v0, 2 /* 06D330 8006C730 030FC021 */ addu $t8, $t8, $t7 -/* 06D334 8006C734 8F1811F0 */ lw $t8, 0x11f0($t8) +/* 06D334 8006C734 8F1811F0 */ lw $t8, %lo(D_801211F0)($t8) /* 06D338 8006C738 3C048012 */ lui $a0, %hi(D_801211F8) # $a0, 0x8012 /* 06D33C 8006C73C 248411F8 */ addiu $a0, %lo(D_801211F8) # addiu $a0, $a0, 0x11f8 -/* 06D340 8006C740 3C198012 */ lui $t9, 0x8012 +/* 06D340 8006C740 3C198012 */ lui $t9, %hi(D_80121200) # $t9, 0x8012 /* 06D344 8006C744 032FC821 */ addu $t9, $t9, $t7 /* 06D348 8006C748 AC980000 */ sw $t8, ($a0) -/* 06D34C 8006C74C 8F391200 */ lw $t9, 0x1200($t9) -/* 06D350 8006C750 3C088012 */ lui $t0, 0x8012 +/* 06D34C 8006C74C 8F391200 */ lw $t9, %lo(D_80121200)($t9) +/* 06D350 8006C750 3C088012 */ lui $t0, %hi(D_80121210) # $t0, 0x8012 /* 06D354 8006C754 3C018012 */ lui $at, %hi(D_80121208) # $at, 0x8012 /* 06D358 8006C758 010F4021 */ addu $t0, $t0, $t7 -/* 06D35C 8006C75C 8D081210 */ lw $t0, 0x1210($t0) -/* 06D360 8006C760 3C098012 */ lui $t1, 0x8012 +/* 06D35C 8006C75C 8D081210 */ lw $t0, %lo(D_80121210)($t0) +/* 06D360 8006C760 3C098012 */ lui $t1, %hi(D_80121220) # $t1, 0x8012 /* 06D364 8006C764 AC391208 */ sw $t9, %lo(D_80121208)($at) /* 06D368 8006C768 3C018012 */ lui $at, %hi(D_80121218) # $at, 0x8012 /* 06D36C 8006C76C 012F4821 */ addu $t1, $t1, $t7 -/* 06D370 8006C770 8D291220 */ lw $t1, 0x1220($t1) +/* 06D370 8006C770 8D291220 */ lw $t1, %lo(D_80121220)($t1) /* 06D374 8006C774 AC281218 */ sw $t0, %lo(D_80121218)($at) /* 06D378 8006C778 3C018012 */ lui $at, %hi(D_80121228) # $at, 0x8012 /* 06D37C 8006C77C 00002825 */ move $a1, $zero diff --git a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s index 8c0d1434..a9903794 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s +++ b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s @@ -50,10 +50,10 @@ glabel func_8006DCF8 /* 06E9AC 8006DDAC 00000000 */ nop /* 06E9B0 8006DDB0 3C0D8012 */ lui $t5, %hi(D_801234E8) # $t5, 0x8012 /* 06E9B4 8006DDB4 8DAD34E8 */ lw $t5, %lo(D_801234E8)($t5) -/* 06E9B8 8006DDB8 3C0F8012 */ lui $t7, 0x8012 +/* 06E9B8 8006DDB8 3C0F8012 */ lui $t7, %hi(D_801211F0) # $t7, 0x8012 /* 06E9BC 8006DDBC 000D7080 */ sll $t6, $t5, 2 /* 06E9C0 8006DDC0 01EE7821 */ addu $t7, $t7, $t6 -/* 06E9C4 8006DDC4 8DEF11F0 */ lw $t7, 0x11f0($t7) +/* 06E9C4 8006DDC4 8DEF11F0 */ lw $t7, %lo(D_801211F0)($t7) /* 06E9C8 8006DDC8 3C19E900 */ lui $t9, 0xe900 /* 06E9CC 8006DDCC AE0F0000 */ sw $t7, ($s0) /* 06E9D0 8006DDD0 25F80008 */ addiu $t8, $t7, 8 @@ -273,10 +273,10 @@ glabel func_8006DCF8 /* 06ED10 8006E110 00000000 */ nop /* 06ED14 8006E114 3C0D8012 */ lui $t5, %hi(D_801234E8) # $t5, 0x8012 /* 06ED18 8006E118 8DAD34E8 */ lw $t5, %lo(D_801234E8)($t5) -/* 06ED1C 8006E11C 3C0F8012 */ lui $t7, 0x8012 +/* 06ED1C 8006E11C 3C0F8012 */ lui $t7, %hi(D_801211F0) # $t7, 0x8012 /* 06ED20 8006E120 000D7080 */ sll $t6, $t5, 2 /* 06ED24 8006E124 01EE7821 */ addu $t7, $t7, $t6 -/* 06ED28 8006E128 8DEF11F0 */ lw $t7, 0x11f0($t7) +/* 06ED28 8006E128 8DEF11F0 */ lw $t7, %lo(D_801211F0)($t7) /* 06ED2C 8006E12C 8FAA002C */ lw $t2, 0x2c($sp) /* 06ED30 8006E130 AE0F0000 */ sw $t7, ($s0) /* 06ED34 8006E134 25F80008 */ addiu $t8, $t7, 8 @@ -344,10 +344,10 @@ glabel func_8006DCF8 /* 06EE28 8006E228 00000000 */ nop /* 06EE2C 8006E22C 3C198012 */ lui $t9, %hi(D_801234E8) # $t9, 0x8012 /* 06EE30 8006E230 8F3934E8 */ lw $t9, %lo(D_801234E8)($t9) -/* 06EE34 8006E234 3C0D8012 */ lui $t5, 0x8012 +/* 06EE34 8006E234 3C0D8012 */ lui $t5, %hi(D_801211F0) # $t5, 0x8012 /* 06EE38 8006E238 00196080 */ sll $t4, $t9, 2 /* 06EE3C 8006E23C 01AC6821 */ addu $t5, $t5, $t4 -/* 06EE40 8006E240 8DAD11F0 */ lw $t5, 0x11f0($t5) +/* 06EE40 8006E240 8DAD11F0 */ lw $t5, %lo(D_801211F0)($t5) /* 06EE44 8006E244 3C0FE900 */ lui $t7, 0xe900 /* 06EE48 8006E248 AE0D0000 */ sw $t5, ($s0) /* 06EE4C 8006E24C 25AE0008 */ addiu $t6, $t5, 8 diff --git a/asm/non_matchings/unknown_066AA0/func_8006ECFC.s b/asm/non_matchings/unknown_066AA0/func_8006ECFC.s index 0e9432f1..dbb02375 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006ECFC.s +++ b/asm/non_matchings/unknown_066AA0/func_8006ECFC.s @@ -146,19 +146,19 @@ glabel func_8006ECFC /* 06FB28 8006EF28 8F190000 */ lw $t9, ($t8) /* 06FB2C 8006EF2C 3C048012 */ lui $a0, %hi(D_801211F8) # $a0, 0x8012 /* 06FB30 8006EF30 248411F8 */ addiu $a0, %lo(D_801211F8) # addiu $a0, $a0, 0x11f8 -/* 06FB34 8006EF34 3C0D8012 */ lui $t5, 0x8012 +/* 06FB34 8006EF34 3C0D8012 */ lui $t5, %hi(D_80121200) # $t5, 0x8012 /* 06FB38 8006EF38 01AF6821 */ addu $t5, $t5, $t7 /* 06FB3C 8006EF3C AC990000 */ sw $t9, ($a0) -/* 06FB40 8006EF40 8DAD1200 */ lw $t5, 0x1200($t5) -/* 06FB44 8006EF44 3C0C8012 */ lui $t4, 0x8012 +/* 06FB40 8006EF40 8DAD1200 */ lw $t5, %lo(D_80121200)($t5) +/* 06FB44 8006EF44 3C0C8012 */ lui $t4, %hi(D_80121220) # $t4, 0x8012 /* 06FB48 8006EF48 3C018012 */ lui $at, %hi(D_80121208) # $at, 0x8012 /* 06FB4C 8006EF4C 018F6021 */ addu $t4, $t4, $t7 -/* 06FB50 8006EF50 8D8C1220 */ lw $t4, 0x1220($t4) -/* 06FB54 8006EF54 3C0E8012 */ lui $t6, 0x8012 +/* 06FB50 8006EF50 8D8C1220 */ lw $t4, %lo(D_80121220)($t4) +/* 06FB54 8006EF54 3C0E8012 */ lui $t6, %hi(D_80121210) # $t6, 0x8012 /* 06FB58 8006EF58 AC2D1208 */ sw $t5, %lo(D_80121208)($at) /* 06FB5C 8006EF5C 3C018012 */ lui $at, %hi(D_80121228) # $at, 0x8012 /* 06FB60 8006EF60 01CF7021 */ addu $t6, $t6, $t7 -/* 06FB64 8006EF64 8DCE1210 */ lw $t6, 0x1210($t6) +/* 06FB64 8006EF64 8DCE1210 */ lw $t6, %lo(D_80121210)($t6) /* 06FB68 8006EF68 AC2C1228 */ sw $t4, %lo(D_80121228)($at) /* 06FB6C 8006EF6C 3C018012 */ lui $at, %hi(D_80121218) # $at, 0x8012 /* 06FB70 8006EF70 AC2E1218 */ sw $t6, %lo(D_80121218)($at) diff --git a/asm/non_matchings/unknown_071730/func_80071278.s b/asm/non_matchings/unknown_071730/func_80071278.s index 958d07a4..8dd66386 100644 --- a/asm/non_matchings/unknown_071730/func_80071278.s +++ b/asm/non_matchings/unknown_071730/func_80071278.s @@ -4,10 +4,10 @@ glabel func_80071278 /* 071E80 80071280 0C01C57B */ jal func_800715EC /* 071E84 80071284 AFA40020 */ sw $a0, 0x20($sp) /* 071E88 80071288 00027100 */ sll $t6, $v0, 4 -/* 071E8C 8007128C 3C038012 */ lui $v1, 0x8012 +/* 071E8C 8007128C 3C038012 */ lui $v1, %hi(D_80123588) # $v1, 0x8012 /* 071E90 80071290 006E1821 */ addu $v1, $v1, $t6 /* 071E94 80071294 8FA40020 */ lw $a0, 0x20($sp) -/* 071E98 80071298 8C633588 */ lw $v1, 0x3588($v1) +/* 071E98 80071298 8C633588 */ lw $v1, %lo(D_80123588)($v1) /* 071E9C 8007129C AFA20018 */ sw $v0, 0x18($sp) /* 071EA0 800712A0 00002825 */ move $a1, $zero /* 071EA4 800712A4 2407FFFF */ li $a3, -1 diff --git a/asm/non_matchings/unknown_071730/func_80071478.s b/asm/non_matchings/unknown_071730/func_80071478.s index 047b88bc..2fd0193d 100644 --- a/asm/non_matchings/unknown_071730/func_80071478.s +++ b/asm/non_matchings/unknown_071730/func_80071478.s @@ -8,9 +8,9 @@ glabel func_80071478 /* 072090 80071490 0C01C57B */ jal func_800715EC /* 072094 80071494 02002025 */ move $a0, $s0 /* 072098 80071498 00027100 */ sll $t6, $v0, 4 -/* 07209C 8007149C 3C048012 */ lui $a0, 0x8012 +/* 07209C 8007149C 3C048012 */ lui $a0, %hi(D_80123588) # $a0, 0x8012 /* 0720A0 800714A0 008E2021 */ addu $a0, $a0, $t6 -/* 0720A4 800714A4 8C843588 */ lw $a0, 0x3588($a0) +/* 0720A4 800714A4 8C843588 */ lw $a0, %lo(D_80123588)($a0) /* 0720A8 800714A8 00001825 */ move $v1, $zero /* 0720AC 800714AC 2409FFFF */ li $t1, -1 /* 0720B0 800714B0 24080004 */ li $t0, 4 diff --git a/asm/non_matchings/unknown_071730/func_80071538.s b/asm/non_matchings/unknown_071730/func_80071538.s index b7e8329b..a5e2e0d1 100644 --- a/asm/non_matchings/unknown_071730/func_80071538.s +++ b/asm/non_matchings/unknown_071730/func_80071538.s @@ -7,10 +7,10 @@ glabel func_80071538 /* 07214C 8007154C 0C01C57B */ jal func_800715EC /* 072150 80071550 AFA20018 */ sw $v0, 0x18($sp) /* 072154 80071554 00027100 */ sll $t6, $v0, 4 -/* 072158 80071558 3C048012 */ lui $a0, 0x8012 +/* 072158 80071558 3C048012 */ lui $a0, %hi(D_80123588) # $a0, 0x8012 /* 07215C 8007155C 008E2021 */ addu $a0, $a0, $t6 /* 072160 80071560 8FA70028 */ lw $a3, 0x28($sp) -/* 072164 80071564 8C843588 */ lw $a0, 0x3588($a0) +/* 072164 80071564 8C843588 */ lw $a0, %lo(D_80123588)($a0) /* 072168 80071568 00001825 */ move $v1, $zero /* 07216C 8007156C 2406FFFF */ li $a2, -1 /* 072170 80071570 24050014 */ li $a1, 20 diff --git a/asm/non_matchings/unknown_071730/func_8007164C.s b/asm/non_matchings/unknown_071730/func_8007164C.s index 4c196dcb..e3b1ba33 100644 --- a/asm/non_matchings/unknown_071730/func_8007164C.s +++ b/asm/non_matchings/unknown_071730/func_8007164C.s @@ -79,9 +79,9 @@ glabel func_8007164C /* 072370 80071770 00000000 */ nop /* 072374 80071774 00047100 */ sll $t6, $a0, 4 -/* 072378 80071778 3C028012 */ lui $v0, 0x8012 +/* 072378 80071778 3C028012 */ lui $v0, %hi(D_80123588) # $v0, 0x8012 /* 07237C 8007177C 004E1021 */ addu $v0, $v0, $t6 -/* 072380 80071780 8C423588 */ lw $v0, 0x3588($v0) +/* 072380 80071780 8C423588 */ lw $v0, %lo(D_80123588)($v0) /* 072384 80071784 03E00008 */ jr $ra /* 072388 80071788 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/Menu11Loop.s b/asm/non_matchings/unknown_080500/Menu11Loop.s index 52311619..445a7aa8 100644 --- a/asm/non_matchings/unknown_080500/Menu11Loop.s +++ b/asm/non_matchings/unknown_080500/Menu11Loop.s @@ -165,11 +165,11 @@ glabel Menu11Loop /* 098108 80097508 8CCA0000 */ lw $t2, ($a2) /* 09810C 8009750C 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e /* 098110 80097510 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) -/* 098114 80097514 3C0C8012 */ lui $t4, 0x8012 +/* 098114 80097514 3C0C8012 */ lui $t4, %hi(D_80126BF0) # $t4, 0x8012 /* 098118 80097518 000A5880 */ sll $t3, $t2, 2 /* 09811C 8009751C AFA80020 */ sw $t0, 0x20($sp) /* 098120 80097520 018B6021 */ addu $t4, $t4, $t3 -/* 098124 80097524 8D8C6BF0 */ lw $t4, 0x6bf0($t4) +/* 098124 80097524 8D8C6BF0 */ lw $t4, %lo(D_80126BF0)($t4) /* 098128 80097528 8DAE0070 */ lw $t6, 0x70($t5) /* 09812C 8009752C 240F0002 */ li $t7, 2 /* 098130 80097530 158E0003 */ bne $t4, $t6, .L80097540 @@ -255,10 +255,10 @@ glabel Menu11Loop /* 09824C 8009764C 8CCB0000 */ lw $t3, ($a2) /* 098250 80097650 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e /* 098254 80097654 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) -/* 098258 80097658 3C028012 */ lui $v0, 0x8012 +/* 098258 80097658 3C028012 */ lui $v0, %hi(D_80126BF0) # $v0, 0x8012 /* 09825C 8009765C 000B6880 */ sll $t5, $t3, 2 /* 098260 80097660 004D1021 */ addu $v0, $v0, $t5 -/* 098264 80097664 8C426BF0 */ lw $v0, 0x6bf0($v0) +/* 098264 80097664 8C426BF0 */ lw $v0, %lo(D_80126BF0)($v0) /* 098268 80097668 8C6C005C */ lw $t4, 0x5c($v1) /* 09826C 8009766C 00000000 */ nop /* 098270 80097670 144C0003 */ bne $v0, $t4, .L80097680 diff --git a/asm/non_matchings/unknown_080500/func_800853D0.s b/asm/non_matchings/unknown_080500/func_800853D0.s index 69f1223a..376f1dc4 100644 --- a/asm/non_matchings/unknown_080500/func_800853D0.s +++ b/asm/non_matchings/unknown_080500/func_800853D0.s @@ -22,10 +22,10 @@ glabel func_800853D0 /* 086020 80085420 2739FC10 */ addiu $t9, %lo(D_800DFC10) # addiu $t9, $t9, -0x3f0 /* 086024 80085424 AFB90068 */ sw $t9, 0x68($sp) /* 086028 80085428 92030006 */ lbu $v1, 6($s0) -/* 08602C 8008542C 3C028012 */ lui $v0, 0x8012 +/* 08602C 8008542C 3C028012 */ lui $v0, %hi(D_80126530) # $v0, 0x8012 /* 086030 80085430 00035080 */ sll $t2, $v1, 2 /* 086034 80085434 004A1021 */ addu $v0, $v0, $t2 -/* 086038 80085438 8C426530 */ lw $v0, 0x6530($v0) +/* 086038 80085438 8C426530 */ lw $v0, %lo(D_80126530)($v0) /* 08603C 8008543C 3C088012 */ lui $t0, %hi(D_8012665C) # $t0, 0x8012 /* 086040 80085440 904B004B */ lbu $t3, 0x4b($v0) /* 086044 80085444 8D08665C */ lw $t0, %lo(D_8012665C)($t0) @@ -45,10 +45,10 @@ glabel func_800853D0 /* 08607C 8008547C 27AC0050 */ addiu $t4, $sp, 0x50 /* 086080 80085480 AFAC0064 */ sw $t4, 0x64($sp) /* 086084 80085484 920D0006 */ lbu $t5, 6($s0) -/* 086088 80085488 3C028012 */ lui $v0, 0x8012 +/* 086088 80085488 3C028012 */ lui $v0, %hi(D_80126530) # $v0, 0x8012 /* 08608C 8008548C 000D7080 */ sll $t6, $t5, 2 /* 086090 80085490 004E1021 */ addu $v0, $v0, $t6 -/* 086094 80085494 8C426530 */ lw $v0, 0x6530($v0) +/* 086094 80085494 8C426530 */ lw $v0, %lo(D_80126530)($v0) /* 086098 80085498 2404000A */ li $a0, 10 /* 08609C 8008549C 8C4F0000 */ lw $t7, ($v0) /* 0860A0 800854A0 8FA8004C */ lw $t0, 0x4c($sp) @@ -332,10 +332,10 @@ glabel func_800853D0 /* 0864C8 800858C8 14410050 */ bne $v0, $at, .L80085A0C /* 0864CC 800858CC 8FAA0068 */ lw $t2, 0x68($sp) /* 0864D0 800858D0 92180006 */ lbu $t8, 6($s0) -/* 0864D4 800858D4 3C198012 */ lui $t9, 0x8012 +/* 0864D4 800858D4 3C198012 */ lui $t9, %hi(D_80126530) # $t9, 0x8012 /* 0864D8 800858D8 00185080 */ sll $t2, $t8, 2 /* 0864DC 800858DC 032AC821 */ addu $t9, $t9, $t2 -/* 0864E0 800858E0 8F396530 */ lw $t9, 0x6530($t9) +/* 0864E0 800858E0 8F396530 */ lw $t9, %lo(D_80126530)($t9) /* 0864E4 800858E4 00000000 */ nop /* 0864E8 800858E8 932B004B */ lbu $t3, 0x4b($t9) /* 0864EC 800858EC 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_8008B758.s b/asm/non_matchings/unknown_080500/func_8008B758.s index 2669674e..bb501060 100644 --- a/asm/non_matchings/unknown_080500/func_8008B758.s +++ b/asm/non_matchings/unknown_080500/func_8008B758.s @@ -167,10 +167,10 @@ glabel func_8008B758 /* 08C5C4 8008B9C4 82580000 */ lb $t8, ($s2) /* 08C5C8 8008B9C8 00141840 */ sll $v1, $s4, 1 /* 08C5CC 8008B9CC 03130019 */ multu $t8, $s3 -/* 08C5D0 8008B9D0 3C048012 */ lui $a0, 0x8012 +/* 08C5D0 8008B9D0 3C048012 */ lui $a0, %hi(D_80126830) # $a0, 0x8012 /* 08C5D4 8008B9D4 00832021 */ addu $a0, $a0, $v1 /* 08C5D8 8008B9D8 8FC50000 */ lw $a1, ($fp) -/* 08C5DC 8008B9DC 84846830 */ lh $a0, 0x6830($a0) +/* 08C5DC 8008B9DC 84846830 */ lh $a0, %lo(D_80126830)($a0) /* 08C5E0 8008B9E0 24060002 */ li $a2, 2 /* 08C5E4 8008B9E4 240700EC */ li $a3, 236 /* 08C5E8 8008B9E8 2419015C */ li $t9, 348 @@ -204,9 +204,9 @@ glabel func_8008B758 /* 08C654 8008BA54 1000001F */ b .L8008BAD4 /* 08C658 8008BA58 000A1040 */ sll $v0, $t2, 1 .L8008BA5C: -/* 08C65C 8008BA5C 3C048012 */ lui $a0, 0x8012 +/* 08C65C 8008BA5C 3C048012 */ lui $a0, %hi(D_80126818) # $a0, 0x8012 /* 08C660 8008BA60 00832021 */ addu $a0, $a0, $v1 -/* 08C664 8008BA64 84846818 */ lh $a0, 0x6818($a0) +/* 08C664 8008BA64 84846818 */ lh $a0, %lo(D_80126818)($a0) /* 08C668 8008BA68 24060004 */ li $a2, 4 /* 08C66C 8008BA6C 0481000C */ bgez $a0, .L8008BAA0 /* 08C670 8008BA70 240700EC */ li $a3, 236 diff --git a/asm/non_matchings/unknown_080500/func_80090918.s b/asm/non_matchings/unknown_080500/func_80090918.s index af0fafd4..926a2103 100644 --- a/asm/non_matchings/unknown_080500/func_80090918.s +++ b/asm/non_matchings/unknown_080500/func_80090918.s @@ -369,11 +369,11 @@ glabel func_80090918 /* 091A64 80090E64 032D7821 */ addu $t7, $t9, $t5 /* 091A68 80090E68 3C0D8012 */ lui $t5, %hi(D_80126480) # $t5, 0x8012 /* 091A6C 80090E6C 8DAD6480 */ lw $t5, %lo(D_80126480)($t5) -/* 091A70 80090E70 3C0E8012 */ lui $t6, 0x8012 +/* 091A70 80090E70 3C0E8012 */ lui $t6, %hi(D_801268E8) # $t6, 0x8012 /* 091A74 80090E74 006D0019 */ multu $v1, $t5 /* 091A78 80090E78 01CF7021 */ addu $t6, $t6, $t7 /* 091A7C 80090E7C 0002C880 */ sll $t9, $v0, 2 -/* 091A80 80090E80 85CE68E8 */ lh $t6, 0x68e8($t6) +/* 091A80 80090E80 85CE68E8 */ lh $t6, %lo(D_801268E8)($t6) /* 091A84 80090E84 0322C821 */ addu $t9, $t9, $v0 /* 091A88 80090E88 3C01800E */ lui $at, %hi(D_800DF4C4) # $at, 0x800e /* 091A8C 80090E8C 0019C980 */ sll $t9, $t9, 6 diff --git a/asm/non_matchings/unknown_080500/func_80092188.s b/asm/non_matchings/unknown_080500/func_80092188.s index 8f8c7649..0c9ef3da 100644 --- a/asm/non_matchings/unknown_080500/func_80092188.s +++ b/asm/non_matchings/unknown_080500/func_80092188.s @@ -327,11 +327,11 @@ glabel func_80092188 /* 093244 80092644 13200027 */ beqz $t9, .L800926E4 /* 093248 80092648 271869C0 */ addiu $t8, %lo(p1_vehicle) # addiu $t8, $t8, 0x69c0 /* 09324C 8009264C 00057040 */ sll $t6, $a1, 1 -/* 093250 80092650 3C068012 */ lui $a2, 0x8012 +/* 093250 80092650 3C068012 */ lui $a2, %hi(D_80126830) # $a2, 0x8012 /* 093254 80092654 00B81821 */ addu $v1, $a1, $t8 /* 093258 80092658 00CE3021 */ addu $a2, $a2, $t6 /* 09325C 8009265C 80620000 */ lb $v0, ($v1) -/* 093260 80092660 84C66830 */ lh $a2, 0x6830($a2) +/* 093260 80092660 84C66830 */ lh $a2, %lo(D_80126830)($a2) /* 093264 80092664 00403825 */ move $a3, $v0 /* 093268 80092668 18C0000A */ blez $a2, .L80092694 /* 09326C 8009266C 244FFFFF */ addiu $t7, $v0, -1 diff --git a/asm/non_matchings/unknown_080500/func_80094170.s b/asm/non_matchings/unknown_080500/func_80094170.s index 4c620f30..a100edf4 100644 --- a/asm/non_matchings/unknown_080500/func_80094170.s +++ b/asm/non_matchings/unknown_080500/func_80094170.s @@ -73,9 +73,9 @@ glabel func_80094170 .L8009427C: /* 094E7C 8009427C 3C04800E */ lui $a0, %hi(D_800E098C) # $a0, 0x800e /* 094E80 80094280 8C84098C */ lw $a0, %lo(D_800E098C)($a0) -/* 094E84 80094284 3C0F8012 */ lui $t7, 0x8012 +/* 094E84 80094284 3C0F8012 */ lui $t7, %hi(D_80126464) # $t7, 0x8012 /* 094E88 80094288 01E47821 */ addu $t7, $t7, $a0 -/* 094E8C 8009428C 81EF6464 */ lb $t7, 0x6464($t7) +/* 094E8C 8009428C 81EF6464 */ lb $t7, %lo(D_80126464)($t7) /* 094E90 80094290 00057603 */ sra $t6, $a1, 0x18 /* 094E94 80094294 11E00005 */ beqz $t7, .L800942AC /* 094E98 80094298 01C02825 */ move $a1, $t6 @@ -101,10 +101,10 @@ glabel func_80094170 /* 094EE0 800942E0 8CEA0000 */ lw $t2, ($a3) /* 094EE4 800942E4 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e /* 094EE8 800942E8 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) -/* 094EEC 800942EC 3C028012 */ lui $v0, 0x8012 +/* 094EEC 800942EC 3C028012 */ lui $v0, %hi(D_80126A40) # $v0, 0x8012 /* 094EF0 800942F0 000A5880 */ sll $t3, $t2, 2 /* 094EF4 800942F4 004B1021 */ addu $v0, $v0, $t3 -/* 094EF8 800942F8 8C426A40 */ lw $v0, 0x6a40($v0) +/* 094EF8 800942F8 8C426A40 */ lw $v0, %lo(D_80126A40)($v0) /* 094EFC 800942FC 8C6C020C */ lw $t4, 0x20c($v1) /* 094F00 80094300 3C06800E */ lui $a2, %hi(D_800DF47C) # $a2, 0x800e /* 094F04 80094304 3C08800E */ lui $t0, %hi(D_800E0988) # $t0, 0x800e @@ -133,9 +133,9 @@ glabel func_80094170 /* 094F54 80094354 8C84098C */ lw $a0, %lo(D_800E098C)($a0) /* 094F58 80094358 24E76A68 */ addiu $a3, $a3, 0x6a68 /* 094F5C 8009435C 8CE20000 */ lw $v0, ($a3) -/* 094F60 80094360 3C038012 */ lui $v1, 0x8012 +/* 094F60 80094360 3C038012 */ lui $v1, %hi(D_80126464) # $v1, 0x8012 /* 094F64 80094364 00641821 */ addu $v1, $v1, $a0 -/* 094F68 80094368 80636464 */ lb $v1, 0x6464($v1) +/* 094F68 80094368 80636464 */ lb $v1, %lo(D_80126464)($v1) /* 094F6C 8009436C 00022E00 */ sll $a1, $v0, 0x18 /* 094F70 80094370 0005C603 */ sra $t8, $a1, 0x18 /* 094F74 80094374 04610004 */ bgez $v1, .L80094388 @@ -207,10 +207,10 @@ glabel func_80094170 /* 09505C 8009445C 8CE90000 */ lw $t1, ($a3) /* 095060 80094460 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e /* 095064 80094464 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) -/* 095068 80094468 3C028012 */ lui $v0, 0x8012 +/* 095068 80094468 3C028012 */ lui $v0, %hi(D_80126A40) # $v0, 0x8012 /* 09506C 8009446C 00095080 */ sll $t2, $t1, 2 /* 095070 80094470 004A1021 */ addu $v0, $v0, $t2 -/* 095074 80094474 8C426A40 */ lw $v0, 0x6a40($v0) +/* 095074 80094474 8C426A40 */ lw $v0, %lo(D_80126A40)($v0) /* 095078 80094478 8C6B0188 */ lw $t3, 0x188($v1) /* 09507C 8009447C 00000000 */ nop /* 095080 80094480 144B0005 */ bne $v0, $t3, .L80094498 diff --git a/asm/non_matchings/unknown_080500/func_80094688.s b/asm/non_matchings/unknown_080500/func_80094688.s index e0eb2b06..834887a8 100644 --- a/asm/non_matchings/unknown_080500/func_80094688.s +++ b/asm/non_matchings/unknown_080500/func_80094688.s @@ -197,12 +197,12 @@ glabel func_80094688 /* 095568 80094968 0C0271B5 */ jal func_8009C6D4 /* 09556C 8009496C AFA30024 */ sw $v1, 0x24($sp) /* 095570 80094970 8FA30024 */ lw $v1, 0x24($sp) -/* 095574 80094974 3C188012 */ lui $t8, 0x8012 +/* 095574 80094974 3C188012 */ lui $t8, %hi(D_80126550) # $t8, 0x8012 /* 095578 80094978 846D0000 */ lh $t5, ($v1) /* 09557C 8009497C 3C018012 */ lui $at, %hi(D_80126BB8) # $at, 0x8012 /* 095580 80094980 000D7880 */ sll $t7, $t5, 2 /* 095584 80094984 030FC021 */ addu $t8, $t8, $t7 -/* 095588 80094988 8F186550 */ lw $t8, 0x6550($t8) +/* 095588 80094988 8F186550 */ lw $t8, %lo(D_80126550)($t8) /* 09558C 8009498C 10000003 */ b .L8009499C /* 095590 80094990 AC386BB8 */ sw $t8, %lo(D_80126BB8)($at) .L80094994: @@ -216,12 +216,12 @@ glabel func_80094688 /* 0955AC 800949AC 0C0271B5 */ jal func_8009C6D4 /* 0955B0 800949B0 AFA30024 */ sw $v1, 0x24($sp) /* 0955B4 800949B4 8FA30024 */ lw $v1, 0x24($sp) -/* 0955B8 800949B8 3C098012 */ lui $t1, 0x8012 +/* 0955B8 800949B8 3C098012 */ lui $t1, %hi(D_80126550) # $t1, 0x8012 /* 0955BC 800949BC 84680002 */ lh $t0, 2($v1) /* 0955C0 800949C0 3C018012 */ lui $at, %hi(D_80126BBC) # $at, 0x8012 /* 0955C4 800949C4 0008C880 */ sll $t9, $t0, 2 /* 0955C8 800949C8 01394821 */ addu $t1, $t1, $t9 -/* 0955CC 800949CC 8D296550 */ lw $t1, 0x6550($t1) +/* 0955CC 800949CC 8D296550 */ lw $t1, %lo(D_80126550)($t1) /* 0955D0 800949D0 10000003 */ b .L800949E0 /* 0955D4 800949D4 AC296BBC */ sw $t1, %lo(D_80126BBC)($at) .L800949D8: diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index 97a5b9b1..e57f5a8f 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -753,11 +753,11 @@ glabel func_80095728 /* 096E1C 8009621C 3C02800E */ lui $v0, %hi(D_800DF4A0) # $v0, 0x800e /* 096E20 80096220 8C42F4A0 */ lw $v0, %lo(D_800DF4A0)($v0) /* 096E24 80096224 240C0001 */ li $t4, 1 -/* 096E28 80096228 3C038012 */ lui $v1, 0x8012 +/* 096E28 80096228 3C038012 */ lui $v1, %hi(D_80126BF0) # $v1, 0x8012 /* 096E2C 8009622C 000E7880 */ sll $t7, $t6, 2 /* 096E30 80096230 AFAC0050 */ sw $t4, 0x50($sp) /* 096E34 80096234 006F1821 */ addu $v1, $v1, $t7 -/* 096E38 80096238 8C636BF0 */ lw $v1, 0x6bf0($v1) +/* 096E38 80096238 8C636BF0 */ lw $v1, %lo(D_80126BF0)($v1) /* 096E3C 8009623C 8C58006C */ lw $t8, 0x6c($v0) /* 096E40 80096240 24070001 */ li $a3, 1 /* 096E44 80096244 14780003 */ bne $v1, $t8, .L80096254 @@ -1043,10 +1043,10 @@ glabel func_80095728 /* 097238 80096638 8CCD0000 */ lw $t5, ($a2) /* 09723C 8009663C 3C02800E */ lui $v0, %hi(D_800DF4A0) # $v0, 0x800e /* 097240 80096640 8C42F4A0 */ lw $v0, %lo(D_800DF4A0)($v0) -/* 097244 80096644 3C038012 */ lui $v1, 0x8012 +/* 097244 80096644 3C038012 */ lui $v1, %hi(D_80126BF0) # $v1, 0x8012 /* 097248 80096648 000DC880 */ sll $t9, $t5, 2 /* 09724C 8009664C 00791821 */ addu $v1, $v1, $t9 -/* 097250 80096650 8C636BF0 */ lw $v1, 0x6bf0($v1) +/* 097250 80096650 8C636BF0 */ lw $v1, %lo(D_80126BF0)($v1) /* 097254 80096654 8C4C005C */ lw $t4, 0x5c($v0) /* 097258 80096658 3C0E800E */ lui $t6, %hi(D_800DF4B8) # $t6, 0x800e /* 09725C 8009665C 146C001A */ bne $v1, $t4, .L800966C8 diff --git a/asm/non_matchings/unknown_080500/func_8009CA60.s b/asm/non_matchings/unknown_080500/func_8009CA60.s index 1fe02ee6..567ea1e0 100644 --- a/asm/non_matchings/unknown_080500/func_8009CA60.s +++ b/asm/non_matchings/unknown_080500/func_8009CA60.s @@ -9,10 +9,10 @@ glabel func_8009CA60 /* 09D67C 8009CA7C AFA40060 */ sw $a0, 0x60($sp) /* 09D680 8009CA80 00687821 */ addu $t7, $v1, $t0 /* 09D684 8009CA84 85E50006 */ lh $a1, 6($t7) -/* 09D688 8009CA88 3C0A8012 */ lui $t2, 0x8012 +/* 09D688 8009CA88 3C0A8012 */ lui $t2, %hi(D_80126550) # $t2, 0x8012 /* 09D68C 8009CA8C 0005C080 */ sll $t8, $a1, 2 /* 09D690 8009CA90 01585021 */ addu $t2, $t2, $t8 -/* 09D694 8009CA94 8D4A6550 */ lw $t2, 0x6550($t2) +/* 09D694 8009CA94 8D4A6550 */ lw $t2, %lo(D_80126550)($t2) /* 09D698 8009CA98 3C19800E */ lui $t9, %hi(D_800DF750) # $t9, 0x800e /* 09D69C 8009CA9C 114000B4 */ beqz $t2, .L8009CD70 /* 09D6A0 8009CAA0 8FBF0024 */ lw $ra, 0x24($sp) @@ -173,13 +173,13 @@ glabel func_8009CA60 /* 09D8F8 8009CCF8 256BF75C */ addiu $t3, %lo(D_800DF75C) # addiu $t3, $t3, -0x8a4 /* 09D8FC 8009CCFC 8FA8002C */ lw $t0, 0x2c($sp) /* 09D900 8009CD00 8D6E0000 */ lw $t6, ($t3) -/* 09D904 8009CD04 3C028012 */ lui $v0, 0x8012 +/* 09D904 8009CD04 3C028012 */ lui $v0, %hi(D_80126550) # $v0, 0x8012 /* 09D908 8009CD08 01C87821 */ addu $t7, $t6, $t0 /* 09D90C 8009CD0C 85EC0006 */ lh $t4, 6($t7) /* 09D910 8009CD10 00000000 */ nop /* 09D914 8009CD14 000CC880 */ sll $t9, $t4, 2 /* 09D918 8009CD18 00591021 */ addu $v0, $v0, $t9 -/* 09D91C 8009CD1C 8C426550 */ lw $v0, 0x6550($v0) +/* 09D91C 8009CD1C 8C426550 */ lw $v0, %lo(D_80126550)($v0) /* 09D920 8009CD20 00000000 */ nop /* 09D924 8009CD24 8C440000 */ lw $a0, ($v0) /* 09D928 8009CD28 0C02735F */ jal func_8009CD7C diff --git a/asm/non_matchings/unknown_09F8F0/func_800A01A0.s b/asm/non_matchings/unknown_09F8F0/func_800A01A0.s index 466b590c..d6e31d9e 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A01A0.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A01A0.s @@ -115,10 +115,10 @@ glabel func_800A01A0 /* 0A0F4C 800A034C AC2C6D10 */ sw $t4, %lo(D_80126D10)($at) .L800A0350: /* 0A0F50 800A0350 8DAD6D08 */ lw $t5, %lo(D_80126D08)($t5) -/* 0A0F54 800A0354 3C188012 */ lui $t8, 0x8012 +/* 0A0F54 800A0354 3C188012 */ lui $t8, %hi(D_80126CE0) # $t8, 0x8012 /* 0A0F58 800A0358 000D7080 */ sll $t6, $t5, 2 /* 0A0F5C 800A035C 030EC021 */ addu $t8, $t8, $t6 -/* 0A0F60 800A0360 8F186CE0 */ lw $t8, 0x6ce0($t8) +/* 0A0F60 800A0360 8F186CE0 */ lw $t8, %lo(D_80126CE0)($t8) /* 0A0F64 800A0364 3C018012 */ lui $at, %hi(D_80126CDC) # $at, 0x8012 /* 0A0F68 800A0368 AFA20028 */ sw $v0, 0x28($sp) /* 0A0F6C 800A036C 0C007910 */ jal func_8001E440 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A3884.s b/asm/non_matchings/unknown_09F8F0/func_800A3884.s index 3b9f4020..72417d27 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A3884.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A3884.s @@ -147,9 +147,9 @@ glabel func_800A3884 /* 0A46A8 800A3AA8 00000000 */ nop .L800A3AAC: /* 0A46AC 800A3AAC 8DAD6D0C */ lw $t5, %lo(D_80126D0C)($t5) -/* 0A46B0 800A3AB0 3C0E800E */ lui $t6, 0x800e +/* 0A46B0 800A3AB0 3C0E800E */ lui $t6, %hi(D_800E27A4) # $t6, 0x800e /* 0A46B4 800A3AB4 01CD7021 */ addu $t6, $t6, $t5 -/* 0A46B8 800A3AB8 81CE27A4 */ lb $t6, 0x27a4($t6) +/* 0A46B8 800A3AB8 81CE27A4 */ lb $t6, %lo(D_800E27A4)($t6) /* 0A46BC 800A3ABC 3C0F8012 */ lui $t7, %hi(D_80126CD3) # $t7, 0x8012 /* 0A46C0 800A3AC0 15C00084 */ bnez $t6, .L800A3CD4 /* 0A46C4 800A3AC4 3C048012 */ lui $a0, %hi(D_80126CFC) # $a0, 0x8012 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A8458.s b/asm/non_matchings/unknown_09F8F0/func_800A8458.s index a04bda95..445756b8 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A8458.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A8458.s @@ -1,9 +1,9 @@ glabel func_800A8458 /* 0A9058 800A8458 3C0E8012 */ lui $t6, %hi(D_80126D0C) # $t6, 0x8012 /* 0A905C 800A845C 8DCE6D0C */ lw $t6, %lo(D_80126D0C)($t6) -/* 0A9060 800A8460 3C02800E */ lui $v0, 0x800e +/* 0A9060 800A8460 3C02800E */ lui $v0, %hi(D_800E27A4) # $v0, 0x800e /* 0A9064 800A8464 004E1021 */ addu $v0, $v0, $t6 -/* 0A9068 800A8468 804227A4 */ lb $v0, 0x27a4($v0) +/* 0A9068 800A8468 804227A4 */ lb $v0, %lo(D_800E27A4)($v0) /* 0A906C 800A846C 03E00008 */ jr $ra /* 0A9070 800A8470 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A8474.s b/asm/non_matchings/unknown_09F8F0/func_800A8474.s index 591c69a8..c1646dd2 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A8474.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A8474.s @@ -194,9 +194,9 @@ glabel func_800A8474 /* 0A934C 800A874C 1461000E */ bne $v1, $at, .L800A8788 /* 0A9350 800A8750 3C0B8012 */ lui $t3, %hi(D_80126D0C) # $t3, 0x8012 /* 0A9354 800A8754 8D6B6D0C */ lw $t3, %lo(D_80126D0C)($t3) -/* 0A9358 800A8758 3C0C800E */ lui $t4, 0x800e +/* 0A9358 800A8758 3C0C800E */ lui $t4, %hi(D_800E27A4) # $t4, 0x800e /* 0A935C 800A875C 018B6021 */ addu $t4, $t4, $t3 -/* 0A9360 800A8760 818C27A4 */ lb $t4, 0x27a4($t4) +/* 0A9360 800A8760 818C27A4 */ lb $t4, %lo(D_800E27A4)($t4) /* 0A9364 800A8764 8FA5016C */ lw $a1, 0x16c($sp) /* 0A9368 800A8768 15800008 */ bnez $t4, .L800A878C /* 0A936C 800A876C 24010003 */ li $at, 3 @@ -421,9 +421,9 @@ glabel func_800A8474 /* 0A96A0 800A8AA0 1461001B */ bne $v1, $at, .L800A8B10 /* 0A96A4 800A8AA4 3C0A8012 */ lui $t2, %hi(D_80126D0C) # $t2, 0x8012 /* 0A96A8 800A8AA8 8D4A6D0C */ lw $t2, %lo(D_80126D0C)($t2) -/* 0A96AC 800A8AAC 3C0B800E */ lui $t3, 0x800e +/* 0A96AC 800A8AAC 3C0B800E */ lui $t3, %hi(D_800E27A4) # $t3, 0x800e /* 0A96B0 800A8AB0 016A5821 */ addu $t3, $t3, $t2 -/* 0A96B4 800A8AB4 816B27A4 */ lb $t3, 0x27a4($t3) +/* 0A96B4 800A8AB4 816B27A4 */ lb $t3, %lo(D_800E27A4)($t3) /* 0A96B8 800A8AB8 00000000 */ nop /* 0A96BC 800A8ABC 15600015 */ bnez $t3, .L800A8B14 /* 0A96C0 800A8AC0 24010003 */ li $at, 3 @@ -875,9 +875,9 @@ glabel func_800A8474 /* 0A9D68 800A9168 1461007C */ bne $v1, $at, .L800A935C /* 0A9D6C 800A916C 3C0D8012 */ lui $t5, %hi(D_80126D0C) # $t5, 0x8012 /* 0A9D70 800A9170 8DAD6D0C */ lw $t5, %lo(D_80126D0C)($t5) -/* 0A9D74 800A9174 3C0E800E */ lui $t6, 0x800e +/* 0A9D74 800A9174 3C0E800E */ lui $t6, %hi(D_800E27A4) # $t6, 0x800e /* 0A9D78 800A9178 01CD7021 */ addu $t6, $t6, $t5 -/* 0A9D7C 800A917C 81CE27A4 */ lb $t6, 0x27a4($t6) +/* 0A9D7C 800A917C 81CE27A4 */ lb $t6, %lo(D_800E27A4)($t6) /* 0A9D80 800A9180 3C128012 */ lui $s2, %hi(D_80126CDC) # $s2, 0x8012 /* 0A9D84 800A9184 15C00075 */ bnez $t6, .L800A935C /* 0A9D88 800A9188 26526CDC */ addiu $s2, %lo(D_80126CDC) # addiu $s2, $s2, 0x6cdc @@ -1397,9 +1397,9 @@ glabel func_800A8474 /* 0AA524 800A9924 148002A9 */ bnez $a0, .L800AA3CC /* 0AA528 800A9928 3C0A8012 */ lui $t2, %hi(D_80126D0C) # $t2, 0x8012 /* 0AA52C 800A992C 8D4A6D0C */ lw $t2, %lo(D_80126D0C)($t2) -/* 0AA530 800A9930 3C0B800E */ lui $t3, 0x800e +/* 0AA530 800A9930 3C0B800E */ lui $t3, %hi(D_800E27A4) # $t3, 0x800e /* 0AA534 800A9934 016A5821 */ addu $t3, $t3, $t2 -/* 0AA538 800A9938 816B27A4 */ lb $t3, 0x27a4($t3) +/* 0AA538 800A9938 816B27A4 */ lb $t3, %lo(D_800E27A4)($t3) /* 0AA53C 800A993C 24010001 */ li $at, 1 /* 0AA540 800A9940 11610003 */ beq $t3, $at, .L800A9950 /* 0AA544 800A9944 00000000 */ nop From ec8922ceba0c7f02de5d6c8af9095b8d1b8aa307 Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Thu, 27 May 2021 22:32:40 -0700 Subject: [PATCH 31/39] Added glabels for jump tables --- .../unknown_003260/_handleEvent.s | 4 +- .../unknown_00BC20/func_8000CC7C.s | 4 +- .../unknown_00BC20/func_8000E0B0.s | 4 +- .../unknown_00BC20/func_8000EA54.s | 4 +- .../unknown_00BC20/func_800101AC.s | 8 +- .../unknown_00BC20/func_80014B50.s | 4 +- .../unknown_00BC20/func_800235DC.s | 4 +- .../unknown_00BC20/func_800238BC.s | 4 +- .../unknown_00BC20/func_80023E30.s | 4 +- .../unknown_00BC20/func_80023F48.s | 4 +- .../unknown_0255E0/func_8002A900.s | 4 +- .../unknown_032760/func_80033A14.s | 4 +- .../unknown_032760/func_80039330.s | 8 +- .../unknown_032760/func_8003E630.s | 4 +- .../unknown_032760/func_80040C54.s | 4 +- .../unknown_032760/func_800422F0.s | 4 +- .../unknown_043920/func_8004447C.s | 8 +- .../unknown_043920/func_800452A0.s | 8 +- .../unknown_043920/func_80048C7C.s | 4 +- .../unknown_043920/func_8004DE38.s | 4 +- .../unknown_043920/func_8005250C.s | 4 +- .../unknown_043920/func_80053E9C.s | 4 +- .../unknown_043920/func_80055EC0.s | 8 +- .../unknown_043920/func_80057A40.s | 4 +- .../unknown_043920/func_8005A6F0.s | 4 +- .../unknown_05DCD0/func_8005D820.s | 4 +- .../unknown_05F690/func_8005EA90.s | 4 +- .../unknown_061D30/__CSPHandleMIDIMsg.s | 4 +- .../unknown_061D30/__CSPHandleNextSeqEvent.s | 4 +- .../unknown_061D30/__CSPVoiceHandler.s | 4 +- asm/non_matchings/unknown_064830/alFxNew.s | 4 +- .../unknown_064830/alFxParamHdl.s | 4 +- .../unknown_066AA0/func_8006CCF0.s | 12 +-- .../unknown_066AA0/func_8006DCF8.s | 4 +- .../unknown_079F50/__scSchedule.s | 4 +- .../unknown_07AF10/func_8007A550.s | 4 +- data/dkr.data.s | 80 +++++++++++++++++++ undefined_syms.txt | 43 ++++++++++ 38 files changed, 209 insertions(+), 86 deletions(-) diff --git a/asm/non_matchings/unknown_003260/_handleEvent.s b/asm/non_matchings/unknown_003260/_handleEvent.s index 8e5452e6..3995b4a2 100644 --- a/asm/non_matchings/unknown_003260/_handleEvent.s +++ b/asm/non_matchings/unknown_003260/_handleEvent.s @@ -84,9 +84,9 @@ glabel _handleEvent /* 0041A0 800035A0 2D210010 */ sltiu $at, $t1, 0x10 /* 0041A4 800035A4 102002BA */ beqz $at, .L80004090 /* 0041A8 800035A8 00094880 */ sll $t1, $t1, 2 -/* 0041AC 800035AC 3C01800E */ lui $at, 0x800e +/* 0041AC 800035AC 3C01800E */ lui $at, %hi(D_800E4BB0) # $at, 0x800e /* 0041B0 800035B0 00290821 */ addu $at, $at, $t1 -/* 0041B4 800035B4 8C294BB0 */ lw $t1, 0x4bb0($at) +/* 0041B4 800035B4 8C294BB0 */ lw $t1, %lo(D_800E4BB0)($at) /* 0041B8 800035B8 00000000 */ nop /* 0041BC 800035BC 01200008 */ jr $t1 /* 0041C0 800035C0 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index 69b3ced3..f73a9928 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -912,9 +912,9 @@ glabel func_8000CC7C /* 00E550 8000D950 2DE10009 */ sltiu $at, $t7, 9 /* 00E554 8000D954 1020000D */ beqz $at, .L8000D98C /* 00E558 8000D958 000F7880 */ sll $t7, $t7, 2 -/* 00E55C 8000D95C 3C01800E */ lui $at, 0x800e +/* 00E55C 8000D95C 3C01800E */ lui $at, %hi(D_800E5154) # $at, 0x800e /* 00E560 8000D960 002F0821 */ addu $at, $at, $t7 -/* 00E564 8000D964 8C2F5154 */ lw $t7, 0x5154($at) +/* 00E564 8000D964 8C2F5154 */ lw $t7, %lo(D_800E5154)($at) /* 00E568 8000D968 00000000 */ nop /* 00E56C 8000D96C 01E00008 */ jr $t7 /* 00E570 8000D970 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000E0B0.s b/asm/non_matchings/unknown_00BC20/func_8000E0B0.s index ca593536..2833f662 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E0B0.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E0B0.s @@ -6,9 +6,9 @@ glabel func_8000E0B0 /* 00ECC0 8000E0C0 10200014 */ beqz $at, .L8000E114 /* 00ECC4 8000E0C4 AFBF0014 */ sw $ra, 0x14($sp) /* 00ECC8 8000E0C8 000E7080 */ sll $t6, $t6, 2 -/* 00ECCC 8000E0CC 3C01800E */ lui $at, 0x800e +/* 00ECCC 8000E0CC 3C01800E */ lui $at, %hi(D_800E5188) # $at, 0x800e /* 00ECD0 8000E0D0 002E0821 */ addu $at, $at, $t6 -/* 00ECD4 8000E0D4 8C2E5188 */ lw $t6, 0x5188($at) +/* 00ECD4 8000E0D4 8C2E5188 */ lw $t6, %lo(D_800E5188)($at) /* 00ECD8 8000E0D8 00000000 */ nop /* 00ECDC 8000E0DC 01C00008 */ jr $t6 /* 00ECE0 8000E0E0 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000EA54.s b/asm/non_matchings/unknown_00BC20/func_8000EA54.s index 7b768a25..bf1bd880 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000EA54.s +++ b/asm/non_matchings/unknown_00BC20/func_8000EA54.s @@ -162,9 +162,9 @@ glabel func_8000EA54 /* 00F8B4 8000ECB4 2D410027 */ sltiu $at, $t2, 0x27 /* 00F8B8 8000ECB8 10200049 */ beqz $at, .L8000EDE0 /* 00F8BC 8000ECBC 000A5080 */ sll $t2, $t2, 2 -/* 00F8C0 8000ECC0 3C01800E */ lui $at, 0x800e +/* 00F8C0 8000ECC0 3C01800E */ lui $at, %hi(D_800E51B4) # $at, 0x800e /* 00F8C4 8000ECC4 002A0821 */ addu $at, $at, $t2 -/* 00F8C8 8000ECC8 8C2A51B4 */ lw $t2, 0x51b4($at) +/* 00F8C8 8000ECC8 8C2A51B4 */ lw $t2, %lo(D_800E51B4)($at) /* 00F8CC 8000ECCC 00000000 */ nop /* 00F8D0 8000ECD0 01400008 */ jr $t2 /* 00F8D4 8000ECD4 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_800101AC.s b/asm/non_matchings/unknown_00BC20/func_800101AC.s index 45c3e15d..72ab0216 100644 --- a/asm/non_matchings/unknown_00BC20/func_800101AC.s +++ b/asm/non_matchings/unknown_00BC20/func_800101AC.s @@ -117,9 +117,9 @@ glabel func_800101AC /* 010F50 80010350 2D810074 */ sltiu $at, $t4, 0x74 /* 010F54 80010354 102000A8 */ beqz $at, .L800105F8 /* 010F58 80010358 000C6080 */ sll $t4, $t4, 2 -/* 010F5C 8001035C 3C01800E */ lui $at, 0x800e +/* 010F5C 8001035C 3C01800E */ lui $at, %hi(D_800E5250) # $at, 0x800e /* 010F60 80010360 002C0821 */ addu $at, $at, $t4 -/* 010F64 80010364 8C2C5250 */ lw $t4, 0x5250($at) +/* 010F64 80010364 8C2C5250 */ lw $t4, %lo(D_800E5250)($at) /* 010F68 80010368 00000000 */ nop /* 010F6C 8001036C 01800008 */ jr $t4 /* 010F70 80010370 00000000 */ nop @@ -306,9 +306,9 @@ glabel func_800101AC /* 01120C 8001060C 2F210046 */ sltiu $at, $t9, 0x46 /* 011210 80010610 10200014 */ beqz $at, .L80010664 /* 011214 80010614 0019C880 */ sll $t9, $t9, 2 -/* 011218 80010618 3C01800E */ lui $at, 0x800e +/* 011218 80010618 3C01800E */ lui $at, %hi(D_800E5420) # $at, 0x800e /* 01121C 8001061C 00390821 */ addu $at, $at, $t9 -/* 011220 80010620 8C395420 */ lw $t9, 0x5420($at) +/* 011220 80010620 8C395420 */ lw $t9, %lo(D_800E5420)($at) /* 011224 80010624 00000000 */ nop /* 011228 80010628 03200008 */ jr $t9 /* 01122C 8001062C 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_80014B50.s b/asm/non_matchings/unknown_00BC20/func_80014B50.s index 13208040..6bebda90 100644 --- a/asm/non_matchings/unknown_00BC20/func_80014B50.s +++ b/asm/non_matchings/unknown_00BC20/func_80014B50.s @@ -5,9 +5,9 @@ glabel func_80014B50 /* 01575C 80014B5C 102001F8 */ beqz $at, .L80015340 /* 015760 80014B60 00A01825 */ move $v1, $a1 /* 015764 80014B64 00077080 */ sll $t6, $a3, 2 -/* 015768 80014B68 3C01800E */ lui $at, 0x800e +/* 015768 80014B68 3C01800E */ lui $at, %hi(D_800E5588) # $at, 0x800e /* 01576C 80014B6C 002E0821 */ addu $at, $at, $t6 -/* 015770 80014B70 8C2E5588 */ lw $t6, 0x5588($at) +/* 015770 80014B70 8C2E5588 */ lw $t6, %lo(D_800E5588)($at) /* 015774 80014B74 00000000 */ nop /* 015778 80014B78 01C00008 */ jr $t6 /* 01577C 80014B7C 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_800235DC.s b/asm/non_matchings/unknown_00BC20/func_800235DC.s index 979f9925..793525af 100644 --- a/asm/non_matchings/unknown_00BC20/func_800235DC.s +++ b/asm/non_matchings/unknown_00BC20/func_800235DC.s @@ -7,9 +7,9 @@ glabel func_800235DC /* 0241F0 800235F0 2F010077 */ sltiu $at, $t8, 0x77 /* 0241F4 800235F4 102000AC */ beqz $at, .L800238A8 /* 0241F8 800235F8 0018C080 */ sll $t8, $t8, 2 -/* 0241FC 800235FC 3C01800E */ lui $at, 0x800e +/* 0241FC 800235FC 3C01800E */ lui $at, %hi(D_800E5688) # $at, 0x800e /* 024200 80023600 00380821 */ addu $at, $at, $t8 -/* 024204 80023604 8C385688 */ lw $t8, 0x5688($at) +/* 024204 80023604 8C385688 */ lw $t8, %lo(D_800E5688)($at) /* 024208 80023608 00000000 */ nop /* 02420C 8002360C 03000008 */ jr $t8 /* 024210 80023610 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_800238BC.s b/asm/non_matchings/unknown_00BC20/func_800238BC.s index 9a0bed91..6d5dc28d 100644 --- a/asm/non_matchings/unknown_00BC20/func_800238BC.s +++ b/asm/non_matchings/unknown_00BC20/func_800238BC.s @@ -12,9 +12,9 @@ glabel func_800238BC /* 0244E4 800238E4 2F210076 */ sltiu $at, $t9, 0x76 /* 0244E8 800238E8 1020014D */ beqz $at, .L80023E20 /* 0244EC 800238EC 0019C880 */ sll $t9, $t9, 2 -/* 0244F0 800238F0 3C01800E */ lui $at, 0x800e +/* 0244F0 800238F0 3C01800E */ lui $at, %hi(D_800E5864) # $at, 0x800e /* 0244F4 800238F4 00390821 */ addu $at, $at, $t9 -/* 0244F8 800238F8 8C395864 */ lw $t9, 0x5864($at) +/* 0244F8 800238F8 8C395864 */ lw $t9, %lo(D_800E5864)($at) /* 0244FC 800238FC 00000000 */ nop /* 024500 80023900 03200008 */ jr $t9 /* 024504 80023904 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_80023E30.s b/asm/non_matchings/unknown_00BC20/func_80023E30.s index 0e454833..33ee5bdd 100644 --- a/asm/non_matchings/unknown_00BC20/func_80023E30.s +++ b/asm/non_matchings/unknown_00BC20/func_80023E30.s @@ -4,9 +4,9 @@ glabel func_80023E30 /* 024A38 80023E38 10200041 */ beqz $at, .L80023F40 /* 024A3C 80023E3C 00001825 */ move $v1, $zero /* 024A40 80023E40 000E7080 */ sll $t6, $t6, 2 -/* 024A44 80023E44 3C01800E */ lui $at, 0x800e +/* 024A44 80023E44 3C01800E */ lui $at, %hi(D_800E5A3C) # $at, 0x800e /* 024A48 80023E48 002E0821 */ addu $at, $at, $t6 -/* 024A4C 80023E4C 8C2E5A3C */ lw $t6, 0x5a3c($at) +/* 024A4C 80023E4C 8C2E5A3C */ lw $t6, %lo(D_800E5A3C)($at) /* 024A50 80023E50 00000000 */ nop /* 024A54 80023E54 01C00008 */ jr $t6 /* 024A58 80023E58 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_80023F48.s b/asm/non_matchings/unknown_00BC20/func_80023F48.s index b9dd7585..fe6cc235 100644 --- a/asm/non_matchings/unknown_00BC20/func_80023F48.s +++ b/asm/non_matchings/unknown_00BC20/func_80023F48.s @@ -16,9 +16,9 @@ glabel func_80023F48 /* 024B80 80023F80 2DE10076 */ sltiu $at, $t7, 0x76 /* 024B84 80023F84 1020017A */ beqz $at, .L80024570 /* 024B88 80023F88 000F7880 */ sll $t7, $t7, 2 -/* 024B8C 80023F8C 3C01800E */ lui $at, 0x800e +/* 024B8C 80023F8C 3C01800E */ lui $at, %hi(D_800E5C0C) # $at, 0x800e /* 024B90 80023F90 002F0821 */ addu $at, $at, $t7 -/* 024B94 80023F94 8C2F5C0C */ lw $t7, 0x5c0c($at) +/* 024B94 80023F94 8C2F5C0C */ lw $t7, %lo(D_800E5C0C)($at) /* 024B98 80023F98 00000000 */ nop /* 024B9C 80023F9C 01E00008 */ jr $t7 /* 024BA0 80023FA0 00000000 */ nop diff --git a/asm/non_matchings/unknown_0255E0/func_8002A900.s b/asm/non_matchings/unknown_0255E0/func_8002A900.s index 8047d8a2..7ce2076d 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002A900.s +++ b/asm/non_matchings/unknown_0255E0/func_8002A900.s @@ -123,9 +123,9 @@ glabel func_8002A900 /* 02B6D4 8002AAD4 2D610020 */ sltiu $at, $t3, 0x20 /* 02B6D8 8002AAD8 1020001E */ beqz $at, .L8002AB54 /* 02B6DC 8002AADC 000B5880 */ sll $t3, $t3, 2 -/* 02B6E0 8002AAE0 3C01800E */ lui $at, 0x800e +/* 02B6E0 8002AAE0 3C01800E */ lui $at, %hi(D_800E5EC0) # $at, 0x800e /* 02B6E4 8002AAE4 002B0821 */ addu $at, $at, $t3 -/* 02B6E8 8002AAE8 8C2B5EC0 */ lw $t3, 0x5ec0($at) +/* 02B6E8 8002AAE8 8C2B5EC0 */ lw $t3, %lo(D_800E5EC0)($at) /* 02B6EC 8002AAEC 00000000 */ nop /* 02B6F0 8002AAF0 01600008 */ jr $t3 /* 02B6F4 8002AAF4 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_80033A14.s b/asm/non_matchings/unknown_032760/func_80033A14.s index 56b03f2b..fd89e253 100644 --- a/asm/non_matchings/unknown_032760/func_80033A14.s +++ b/asm/non_matchings/unknown_032760/func_80033A14.s @@ -16,9 +16,9 @@ glabel func_80033A14 /* 03464C 80033A4C 10200067 */ beqz $at, .L80033BEC /* 034650 80033A50 46083503 */ div.s $f20, $f6, $f8 /* 034654 80033A54 0018C080 */ sll $t8, $t8, 2 -/* 034658 80033A58 3C01800E */ lui $at, 0x800e +/* 034658 80033A58 3C01800E */ lui $at, %hi(D_800E5F80) # $at, 0x800e /* 03465C 80033A5C 00380821 */ addu $at, $at, $t8 -/* 034660 80033A60 8C385F80 */ lw $t8, 0x5f80($at) +/* 034660 80033A60 8C385F80 */ lw $t8, %lo(D_800E5F80)($at) /* 034664 80033A64 00000000 */ nop /* 034668 80033A68 03000008 */ jr $t8 /* 03466C 80033A6C 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_80039330.s b/asm/non_matchings/unknown_032760/func_80039330.s index 1571fc68..db1f94c8 100644 --- a/asm/non_matchings/unknown_032760/func_80039330.s +++ b/asm/non_matchings/unknown_032760/func_80039330.s @@ -280,9 +280,9 @@ glabel func_80039330 /* 03A334 80039734 2DA10015 */ sltiu $at, $t5, 0x15 /* 03A338 80039738 1020000B */ beqz $at, .L80039768 /* 03A33C 8003973C 000D6880 */ sll $t5, $t5, 2 -/* 03A340 80039740 3C01800E */ lui $at, 0x800e +/* 03A340 80039740 3C01800E */ lui $at, %hi(D_800E6070) # $at, 0x800e /* 03A344 80039744 002D0821 */ addu $at, $at, $t5 -/* 03A348 80039748 8C2D6070 */ lw $t5, 0x6070($at) +/* 03A348 80039748 8C2D6070 */ lw $t5, %lo(D_800E6070)($at) /* 03A34C 8003974C 00000000 */ nop /* 03A350 80039750 01A00008 */ jr $t5 /* 03A354 80039754 00000000 */ nop @@ -307,9 +307,9 @@ glabel func_80039330 /* 03A398 80039798 10200384 */ beqz $at, .L8003A5AC /* 03A39C 8003979C 24030004 */ li $v1, 4 /* 03A3A0 800397A0 000F7880 */ sll $t7, $t7, 2 -/* 03A3A4 800397A4 3C01800E */ lui $at, 0x800e +/* 03A3A4 800397A4 3C01800E */ lui $at, %hi(D_800E60C4) # $at, 0x800e /* 03A3A8 800397A8 002F0821 */ addu $at, $at, $t7 -/* 03A3AC 800397AC 8C2F60C4 */ lw $t7, 0x60c4($at) +/* 03A3AC 800397AC 8C2F60C4 */ lw $t7, %lo(D_800E60C4)($at) /* 03A3B0 800397B0 00000000 */ nop /* 03A3B4 800397B4 01E00008 */ jr $t7 /* 03A3B8 800397B8 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_8003E630.s b/asm/non_matchings/unknown_032760/func_8003E630.s index a6cd11cc..a686c27c 100644 --- a/asm/non_matchings/unknown_032760/func_8003E630.s +++ b/asm/non_matchings/unknown_032760/func_8003E630.s @@ -8,9 +8,9 @@ glabel func_8003E630 /* 03F248 8003E648 2DC1000C */ sltiu $at, $t6, 0xc /* 03F24C 8003E64C 1020000D */ beqz $at, .L8003E684 /* 03F250 8003E650 000E7080 */ sll $t6, $t6, 2 -/* 03F254 8003E654 3C01800E */ lui $at, 0x800e +/* 03F254 8003E654 3C01800E */ lui $at, %hi(D_800E61C0) # $at, 0x800e /* 03F258 8003E658 002E0821 */ addu $at, $at, $t6 -/* 03F25C 8003E65C 8C2E61C0 */ lw $t6, 0x61c0($at) +/* 03F25C 8003E65C 8C2E61C0 */ lw $t6, %lo(D_800E61C0)($at) /* 03F260 8003E660 00000000 */ nop /* 03F264 8003E664 01C00008 */ jr $t6 /* 03F268 8003E668 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_80040C54.s b/asm/non_matchings/unknown_032760/func_80040C54.s index 4e64b555..121ccd18 100644 --- a/asm/non_matchings/unknown_032760/func_80040C54.s +++ b/asm/non_matchings/unknown_032760/func_80040C54.s @@ -51,9 +51,9 @@ glabel func_80040C54 /* 04190C 80040D0C 2C410005 */ sltiu $at, $v0, 5 /* 041910 80040D10 102002C9 */ beqz $at, .L80041838 /* 041914 80040D14 0002C880 */ sll $t9, $v0, 2 -/* 041918 80040D18 3C01800E */ lui $at, 0x800e +/* 041918 80040D18 3C01800E */ lui $at, %hi(D_800E6228) # $at, 0x800e /* 04191C 80040D1C 00390821 */ addu $at, $at, $t9 -/* 041920 80040D20 8C396228 */ lw $t9, 0x6228($at) +/* 041920 80040D20 8C396228 */ lw $t9, %lo(D_800E6228)($at) /* 041924 80040D24 00000000 */ nop /* 041928 80040D28 03200008 */ jr $t9 /* 04192C 80040D2C 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_800422F0.s b/asm/non_matchings/unknown_032760/func_800422F0.s index 1e46259c..deb0f56c 100644 --- a/asm/non_matchings/unknown_032760/func_800422F0.s +++ b/asm/non_matchings/unknown_032760/func_800422F0.s @@ -28,9 +28,9 @@ glabel func_800422F0 /* 042F54 80042354 2DE10005 */ sltiu $at, $t7, 5 /* 042F58 80042358 10200186 */ beqz $at, .L80042974 /* 042F5C 8004235C 000F7880 */ sll $t7, $t7, 2 -/* 042F60 80042360 3C01800E */ lui $at, 0x800e +/* 042F60 80042360 3C01800E */ lui $at, %hi(D_800E6258) # $at, 0x800e /* 042F64 80042364 002F0821 */ addu $at, $at, $t7 -/* 042F68 80042368 8C2F6258 */ lw $t7, 0x6258($at) +/* 042F68 80042368 8C2F6258 */ lw $t7, %lo(D_800E6258)($at) /* 042F6C 8004236C 00000000 */ nop /* 042F70 80042370 01E00008 */ jr $t7 /* 042F74 80042374 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_8004447C.s b/asm/non_matchings/unknown_043920/func_8004447C.s index a318f05a..1f888a4a 100644 --- a/asm/non_matchings/unknown_043920/func_8004447C.s +++ b/asm/non_matchings/unknown_043920/func_8004447C.s @@ -142,9 +142,9 @@ glabel func_8004447C /* 045288 80044688 10200245 */ beqz $at, .L80044FA0 /* 04528C 8004468C 24050001 */ li $a1, 1 /* 045290 80044690 000D6880 */ sll $t5, $t5, 2 -/* 045294 80044694 3C01800E */ lui $at, 0x800e +/* 045294 80044694 3C01800E */ lui $at, %hi(D_800E6318) # $at, 0x800e /* 045298 80044698 002D0821 */ addu $at, $at, $t5 -/* 04529C 8004469C 8C2D6318 */ lw $t5, 0x6318($at) +/* 04529C 8004469C 8C2D6318 */ lw $t5, %lo(D_800E6318)($at) /* 0452A0 800446A0 00000000 */ nop /* 0452A4 800446A4 01A00008 */ jr $t5 /* 0452A8 800446A8 00000000 */ nop @@ -382,9 +382,9 @@ glabel func_8004447C /* 045608 80044A08 2DA10006 */ sltiu $at, $t5, 6 /* 04560C 80044A0C 10200033 */ beqz $at, .L80044ADC /* 045610 80044A10 000D6880 */ sll $t5, $t5, 2 -/* 045614 80044A14 3C01800E */ lui $at, 0x800e +/* 045614 80044A14 3C01800E */ lui $at, %hi(D_800E6334) # $at, 0x800e /* 045618 80044A18 002D0821 */ addu $at, $at, $t5 -/* 04561C 80044A1C 8C2D6334 */ lw $t5, 0x6334($at) +/* 04561C 80044A1C 8C2D6334 */ lw $t5, %lo(D_800E6334)($at) /* 045620 80044A20 00000000 */ nop /* 045624 80044A24 01A00008 */ jr $t5 /* 045628 80044A28 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_800452A0.s b/asm/non_matchings/unknown_043920/func_800452A0.s index 5a79fb42..b4e4d33a 100644 --- a/asm/non_matchings/unknown_043920/func_800452A0.s +++ b/asm/non_matchings/unknown_043920/func_800452A0.s @@ -283,9 +283,9 @@ glabel func_800452A0 /* 04627C 8004567C 2F210008 */ sltiu $at, $t9, 8 /* 046280 80045680 10200018 */ beqz $at, .L800456E4 /* 046284 80045684 0019C880 */ sll $t9, $t9, 2 -/* 046288 80045688 3C01800E */ lui $at, 0x800e +/* 046288 80045688 3C01800E */ lui $at, %hi(D_800E6358) # $at, 0x800e /* 04628C 8004568C 00390821 */ addu $at, $at, $t9 -/* 046290 80045690 8C396358 */ lw $t9, 0x6358($at) +/* 046290 80045690 8C396358 */ lw $t9, %lo(D_800E6358)($at) /* 046294 80045694 00000000 */ nop /* 046298 80045698 03200008 */ jr $t9 /* 04629C 8004569C 00000000 */ nop @@ -579,9 +579,9 @@ glabel func_800452A0 /* 0466B8 80045AB8 2D810008 */ sltiu $at, $t4, 8 /* 0466BC 80045ABC 10200050 */ beqz $at, .L80045C00 /* 0466C0 80045AC0 000C6080 */ sll $t4, $t4, 2 -/* 0466C4 80045AC4 3C01800E */ lui $at, 0x800e +/* 0466C4 80045AC4 3C01800E */ lui $at, %hi(D_800E637C) # $at, 0x800e /* 0466C8 80045AC8 002C0821 */ addu $at, $at, $t4 -/* 0466CC 80045ACC 8C2C637C */ lw $t4, 0x637c($at) +/* 0466CC 80045ACC 8C2C637C */ lw $t4, %lo(D_800E637C)($at) /* 0466D0 80045AD0 00000000 */ nop /* 0466D4 80045AD4 01800008 */ jr $t4 /* 0466D8 80045AD8 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80048C7C.s b/asm/non_matchings/unknown_043920/func_80048C7C.s index 10898d31..23ff83bc 100644 --- a/asm/non_matchings/unknown_043920/func_80048C7C.s +++ b/asm/non_matchings/unknown_043920/func_80048C7C.s @@ -47,9 +47,9 @@ glabel func_80048C7C /* 04991C 80048D1C 2F210006 */ sltiu $at, $t9, 6 /* 049920 80048D20 1020004B */ beqz $at, .L80048E50 /* 049924 80048D24 0019C880 */ sll $t9, $t9, 2 -/* 049928 80048D28 3C01800E */ lui $at, 0x800e +/* 049928 80048D28 3C01800E */ lui $at, %hi(D_800E646C) # $at, 0x800e /* 04992C 80048D2C 00390821 */ addu $at, $at, $t9 -/* 049930 80048D30 8C39646C */ lw $t9, 0x646c($at) +/* 049930 80048D30 8C39646C */ lw $t9, %lo(D_800E646C)($at) /* 049934 80048D34 00000000 */ nop /* 049938 80048D38 03200008 */ jr $t9 /* 04993C 80048D3C 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_8004DE38.s b/asm/non_matchings/unknown_043920/func_8004DE38.s index ae35bd18..722bcafd 100644 --- a/asm/non_matchings/unknown_043920/func_8004DE38.s +++ b/asm/non_matchings/unknown_043920/func_8004DE38.s @@ -911,9 +911,9 @@ glabel func_8004DE38 /* 04F760 8004EB60 2D21000E */ sltiu $at, $t1, 0xe /* 04F764 8004EB64 10200088 */ beqz $at, .L8004ED88 /* 04F768 8004EB68 00094880 */ sll $t1, $t1, 2 -/* 04F76C 8004EB6C 3C01800E */ lui $at, 0x800e +/* 04F76C 8004EB6C 3C01800E */ lui $at, %hi(D_800E65B0) # $at, 0x800e /* 04F770 8004EB70 00290821 */ addu $at, $at, $t1 -/* 04F774 8004EB74 8C2965B0 */ lw $t1, 0x65b0($at) +/* 04F774 8004EB74 8C2965B0 */ lw $t1, %lo(D_800E65B0)($at) /* 04F778 8004EB78 00000000 */ nop /* 04F77C 8004EB7C 01200008 */ jr $t1 /* 04F780 8004EB80 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_8005250C.s b/asm/non_matchings/unknown_043920/func_8005250C.s index 0735218f..548a6596 100644 --- a/asm/non_matchings/unknown_043920/func_8005250C.s +++ b/asm/non_matchings/unknown_043920/func_8005250C.s @@ -92,9 +92,9 @@ glabel func_8005250C /* 053254 80052654 2D410008 */ sltiu $at, $t2, 8 /* 053258 80052658 102000C7 */ beqz $at, .L80052978 /* 05325C 8005265C 000A5080 */ sll $t2, $t2, 2 -/* 053260 80052660 3C01800E */ lui $at, 0x800e +/* 053260 80052660 3C01800E */ lui $at, %hi(D_800E66D0) # $at, 0x800e /* 053264 80052664 002A0821 */ addu $at, $at, $t2 -/* 053268 80052668 8C2A66D0 */ lw $t2, 0x66d0($at) +/* 053268 80052668 8C2A66D0 */ lw $t2, %lo(D_800E66D0)($at) /* 05326C 8005266C 00000000 */ nop /* 053270 80052670 01400008 */ jr $t2 /* 053274 80052674 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80053E9C.s b/asm/non_matchings/unknown_043920/func_80053E9C.s index 807c177b..d7571a2f 100644 --- a/asm/non_matchings/unknown_043920/func_80053E9C.s +++ b/asm/non_matchings/unknown_043920/func_80053E9C.s @@ -88,9 +88,9 @@ glabel func_80053E9C /* 054BCC 80053FCC 2DE10006 */ sltiu $at, $t7, 6 /* 054BD0 80053FD0 1020004A */ beqz $at, .L800540FC /* 054BD4 80053FD4 000F7880 */ sll $t7, $t7, 2 -/* 054BD8 80053FD8 3C01800E */ lui $at, 0x800e +/* 054BD8 80053FD8 3C01800E */ lui $at, %hi(D_800E67A4) # $at, 0x800e /* 054BDC 80053FDC 002F0821 */ addu $at, $at, $t7 -/* 054BE0 80053FE0 8C2F67A4 */ lw $t7, 0x67a4($at) +/* 054BE0 80053FE0 8C2F67A4 */ lw $t7, %lo(D_800E67A4)($at) /* 054BE4 80053FE4 00000000 */ nop /* 054BE8 80053FE8 01E00008 */ jr $t7 /* 054BEC 80053FEC 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80055EC0.s b/asm/non_matchings/unknown_043920/func_80055EC0.s index 8425dcdc..3c6d41f9 100644 --- a/asm/non_matchings/unknown_043920/func_80055EC0.s +++ b/asm/non_matchings/unknown_043920/func_80055EC0.s @@ -308,9 +308,9 @@ glabel func_80055EC0 /* 056F38 80056338 102000B9 */ beqz $at, .L80056620 /* 056F3C 8005633C 0100C825 */ move $t9, $t0 /* 056F40 80056340 0019C880 */ sll $t9, $t9, 2 -/* 056F44 80056344 3C01800E */ lui $at, 0x800e +/* 056F44 80056344 3C01800E */ lui $at, %hi(D_800E6854) # $at, 0x800e /* 056F48 80056348 00390821 */ addu $at, $at, $t9 -/* 056F4C 8005634C 8C396854 */ lw $t9, 0x6854($at) +/* 056F4C 8005634C 8C396854 */ lw $t9, %lo(D_800E6854)($at) /* 056F50 80056350 00000000 */ nop /* 056F54 80056354 03200008 */ jr $t9 /* 056F58 80056358 00000000 */ nop @@ -628,9 +628,9 @@ glabel func_80055EC0 /* 057404 80056804 1020001F */ beqz $at, .L80056884 /* 057408 80056808 E46A0010 */ swc1 $f10, 0x10($v1) /* 05740C 8005680C 000E7080 */ sll $t6, $t6, 2 -/* 057410 80056810 3C01800E */ lui $at, 0x800e +/* 057410 80056810 3C01800E */ lui $at, %hi(D_800E6894) # $at, 0x800e /* 057414 80056814 002E0821 */ addu $at, $at, $t6 -/* 057418 80056818 8C2E6894 */ lw $t6, 0x6894($at) +/* 057418 80056818 8C2E6894 */ lw $t6, %lo(D_800E6894)($at) /* 05741C 8005681C 00000000 */ nop /* 057420 80056820 01C00008 */ jr $t6 /* 057424 80056824 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80057A40.s b/asm/non_matchings/unknown_043920/func_80057A40.s index f79d15a7..e434abbd 100644 --- a/asm/non_matchings/unknown_043920/func_80057A40.s +++ b/asm/non_matchings/unknown_043920/func_80057A40.s @@ -97,9 +97,9 @@ glabel func_80057A40 /* 058798 80057B98 2F010008 */ sltiu $at, $t8, 8 /* 05879C 80057B9C 1020004C */ beqz $at, .L80057CD0 /* 0587A0 80057BA0 0018C080 */ sll $t8, $t8, 2 -/* 0587A4 80057BA4 3C01800E */ lui $at, 0x800e +/* 0587A4 80057BA4 3C01800E */ lui $at, %hi(D_800E68D0) # $at, 0x800e /* 0587A8 80057BA8 00380821 */ addu $at, $at, $t8 -/* 0587AC 80057BAC 8C3868D0 */ lw $t8, 0x68d0($at) +/* 0587AC 80057BAC 8C3868D0 */ lw $t8, %lo(D_800E68D0)($at) /* 0587B0 80057BB0 00000000 */ nop /* 0587B4 80057BB4 03000008 */ jr $t8 /* 0587B8 80057BB8 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_8005A6F0.s b/asm/non_matchings/unknown_043920/func_8005A6F0.s index a152a3db..47ebf5de 100644 --- a/asm/non_matchings/unknown_043920/func_8005A6F0.s +++ b/asm/non_matchings/unknown_043920/func_8005A6F0.s @@ -585,9 +585,9 @@ glabel func_8005A6F0 /* 05BB5C 8005AF5C 10200094 */ beqz $at, .L8005B1B0 /* 05BB60 8005AF60 2442D52C */ addiu $v0, %lo(D_8011D52C) # addiu $v0, $v0, -0x2ad4 /* 05BB64 8005AF64 0019C880 */ sll $t9, $t9, 2 -/* 05BB68 8005AF68 3C01800E */ lui $at, 0x800e +/* 05BB68 8005AF68 3C01800E */ lui $at, %hi(D_800E6968) # $at, 0x800e /* 05BB6C 8005AF6C 00390821 */ addu $at, $at, $t9 -/* 05BB70 8005AF70 8C396968 */ lw $t9, 0x6968($at) +/* 05BB70 8005AF70 8C396968 */ lw $t9, %lo(D_800E6968)($at) /* 05BB74 8005AF74 00000000 */ nop /* 05BB78 8005AF78 03200008 */ jr $t9 /* 05BB7C 8005AF7C 00000000 */ nop diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D820.s b/asm/non_matchings/unknown_05DCD0/func_8005D820.s index 4782b6a2..57b4e74f 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D820.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D820.s @@ -249,9 +249,9 @@ glabel func_8005D820 .L8005DBCC: /* 05E7CC 8005DBCC 1020004F */ beqz $at, .L8005DD0C /* 05E7D0 8005DBD0 00037880 */ sll $t7, $v1, 2 -/* 05E7D4 8005DBD4 3C01800E */ lui $at, 0x800e +/* 05E7D4 8005DBD4 3C01800E */ lui $at, %hi(D_800E6A70) # $at, 0x800e /* 05E7D8 8005DBD8 002F0821 */ addu $at, $at, $t7 -/* 05E7DC 8005DBDC 8C2F6A70 */ lw $t7, 0x6a70($at) +/* 05E7DC 8005DBDC 8C2F6A70 */ lw $t7, %lo(D_800E6A70)($at) /* 05E7E0 8005DBE0 00000000 */ nop /* 05E7E4 8005DBE4 01E00008 */ jr $t7 /* 05E7E8 8005DBE8 00000000 */ nop diff --git a/asm/non_matchings/unknown_05F690/func_8005EA90.s b/asm/non_matchings/unknown_05F690/func_8005EA90.s index f35bee2d..962ac2f9 100644 --- a/asm/non_matchings/unknown_05F690/func_8005EA90.s +++ b/asm/non_matchings/unknown_05F690/func_8005EA90.s @@ -264,9 +264,9 @@ glabel func_8005EA90 .L8005EE7C: /* 05FA7C 8005EE7C 1020004F */ beqz $at, .L8005EFBC /* 05FA80 8005EE80 00035880 */ sll $t3, $v1, 2 -/* 05FA84 8005EE84 3C01800E */ lui $at, 0x800e +/* 05FA84 8005EE84 3C01800E */ lui $at, %hi(D_800E6AD0) # $at, 0x800e /* 05FA88 8005EE88 002B0821 */ addu $at, $at, $t3 -/* 05FA8C 8005EE8C 8C2B6AD0 */ lw $t3, 0x6ad0($at) +/* 05FA8C 8005EE8C 8C2B6AD0 */ lw $t3, %lo(D_800E6AD0)($at) /* 05FA90 8005EE90 00000000 */ nop /* 05FA94 8005EE94 01600008 */ jr $t3 /* 05FA98 8005EE98 00000000 */ nop diff --git a/asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s b/asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s index b95db91a..274affe9 100644 --- a/asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s +++ b/asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s @@ -77,9 +77,9 @@ glabel __CSPHandleMIDIMsg /* 063814 80062C14 2DC10061 */ sltiu $at, $t6, 0x61 /* 063818 80062C18 102002EC */ beqz $at, .L800637CC /* 06381C 80062C1C 000E7080 */ sll $t6, $t6, 2 -/* 063820 80062C20 3C01800E */ lui $at, 0x800e +/* 063820 80062C20 3C01800E */ lui $at, %hi(D_800E6CE0) # $at, 0x800e /* 063824 80062C24 002E0821 */ addu $at, $at, $t6 -/* 063828 80062C28 8C2E6CE0 */ lw $t6, 0x6ce0($at) +/* 063828 80062C28 8C2E6CE0 */ lw $t6, %lo(D_800E6CE0)($at) /* 06382C 80062C2C 00000000 */ nop /* 063830 80062C30 01C00008 */ jr $t6 /* 063834 80062C34 00000000 */ nop diff --git a/asm/non_matchings/unknown_061D30/__CSPHandleNextSeqEvent.s b/asm/non_matchings/unknown_061D30/__CSPHandleNextSeqEvent.s index 6644f6ae..84b3e8cf 100644 --- a/asm/non_matchings/unknown_061D30/__CSPHandleNextSeqEvent.s +++ b/asm/non_matchings/unknown_061D30/__CSPHandleNextSeqEvent.s @@ -14,9 +14,9 @@ glabel __CSPHandleNextSeqEvent /* 06366C 80062A6C 2DE10014 */ sltiu $at, $t7, 0x14 /* 063670 80062A70 1020001F */ beqz $at, .L80062AF0 /* 063674 80062A74 000F7880 */ sll $t7, $t7, 2 -/* 063678 80062A78 3C01800E */ lui $at, 0x800e +/* 063678 80062A78 3C01800E */ lui $at, %hi(D_800E6C90) # $at, 0x800e /* 06367C 80062A7C 002F0821 */ addu $at, $at, $t7 -/* 063680 80062A80 8C2F6C90 */ lw $t7, 0x6c90($at) +/* 063680 80062A80 8C2F6C90 */ lw $t7, %lo(D_800E6C90)($at) /* 063684 80062A84 00000000 */ nop /* 063688 80062A88 01E00008 */ jr $t7 /* 06368C 80062A8C 00000000 */ nop diff --git a/asm/non_matchings/unknown_061D30/__CSPVoiceHandler.s b/asm/non_matchings/unknown_061D30/__CSPVoiceHandler.s index 152dcef5..c87b2c10 100644 --- a/asm/non_matchings/unknown_061D30/__CSPVoiceHandler.s +++ b/asm/non_matchings/unknown_061D30/__CSPVoiceHandler.s @@ -23,9 +23,9 @@ glabel __CSPVoiceHandler /* 063058 80062458 2DE10018 */ sltiu $at, $t7, 0x18 /* 06305C 8006245C 10200146 */ beqz $at, .L80062978 /* 063060 80062460 000F7880 */ sll $t7, $t7, 2 -/* 063064 80062464 3C01800E */ lui $at, 0x800e +/* 063064 80062464 3C01800E */ lui $at, %hi(D_800E6C30) # $at, 0x800e /* 063068 80062468 002F0821 */ addu $at, $at, $t7 -/* 06306C 8006246C 8C2F6C30 */ lw $t7, 0x6c30($at) +/* 06306C 8006246C 8C2F6C30 */ lw $t7, %lo(D_800E6C30)($at) /* 063070 80062470 00000000 */ nop /* 063074 80062474 01E00008 */ jr $t7 /* 063078 80062478 00000000 */ nop diff --git a/asm/non_matchings/unknown_064830/alFxNew.s b/asm/non_matchings/unknown_064830/alFxNew.s index e690b30d..5b9746e2 100644 --- a/asm/non_matchings/unknown_064830/alFxNew.s +++ b/asm/non_matchings/unknown_064830/alFxNew.s @@ -45,9 +45,9 @@ glabel alFxNew /* 0656B4 80064AB4 1020001C */ beqz $at, .L80064B28 /* 0656B8 80064AB8 2673D028 */ addiu $s3, %lo(D_800DD028) # addiu $s3, $s3, -0x2fd8 /* 0656BC 80064ABC 00094880 */ sll $t1, $t1, 2 -/* 0656C0 80064AC0 3C01800E */ lui $at, 0x800e +/* 0656C0 80064AC0 3C01800E */ lui $at, %hi(D_800E6EA0) # $at, 0x800e /* 0656C4 80064AC4 00290821 */ addu $at, $at, $t1 -/* 0656C8 80064AC8 8C296EA0 */ lw $t1, 0x6ea0($at) +/* 0656C8 80064AC8 8C296EA0 */ lw $t1, %lo(D_800E6EA0)($at) /* 0656CC 80064ACC 00000000 */ nop /* 0656D0 80064AD0 01200008 */ jr $t1 /* 0656D4 80064AD4 00000000 */ nop diff --git a/asm/non_matchings/unknown_064830/alFxParamHdl.s b/asm/non_matchings/unknown_064830/alFxParamHdl.s index 9519152d..00d6eec5 100644 --- a/asm/non_matchings/unknown_064830/alFxParamHdl.s +++ b/asm/non_matchings/unknown_064830/alFxParamHdl.s @@ -8,9 +8,9 @@ glabel alFxParamHdl /* 064BC4 80063FC4 10200093 */ beqz $at, .L80064214 /* 064BC8 80063FC8 00803825 */ move $a3, $a0 /* 064BCC 80063FCC 000E7080 */ sll $t6, $t6, 2 -/* 064BD0 80063FD0 3C01800E */ lui $at, 0x800e +/* 064BD0 80063FD0 3C01800E */ lui $at, %hi(D_800E6E70) # $at, 0x800e /* 064BD4 80063FD4 002E0821 */ addu $at, $at, $t6 -/* 064BD8 80063FD8 8C2E6E70 */ lw $t6, 0x6e70($at) +/* 064BD8 80063FD8 8C2E6E70 */ lw $t6, %lo(D_800E6E70)($at) /* 064BDC 80063FDC 00000000 */ nop /* 064BE0 80063FE0 01C00008 */ jr $t6 /* 064BE4 80063FE4 00000000 */ nop diff --git a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s index 62904546..80705520 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s @@ -158,9 +158,9 @@ glabel func_8006CCF0 /* 06DB38 8006CF38 1020003A */ beqz $at, .L8006D024 /* 06DB3C 8006CF3C AFA20044 */ sw $v0, 0x44($sp) /* 06DB40 8006CF40 000C6080 */ sll $t4, $t4, 2 -/* 06DB44 8006CF44 3C01800E */ lui $at, 0x800e +/* 06DB44 8006CF44 3C01800E */ lui $at, %hi(D_800E7154) # $at, 0x800e /* 06DB48 8006CF48 002C0821 */ addu $at, $at, $t4 -/* 06DB4C 8006CF4C 8C2C7154 */ lw $t4, 0x7154($at) +/* 06DB4C 8006CF4C 8C2C7154 */ lw $t4, %lo(D_800E7154)($at) /* 06DB50 8006CF50 00000000 */ nop /* 06DB54 8006CF54 01800008 */ jr $t4 /* 06DB58 8006CF58 00000000 */ nop @@ -249,9 +249,9 @@ glabel func_8006CCF0 /* 06DC94 8006D094 1020004A */ beqz $at, .L8006D1C0 /* 06DC98 8006D098 AFA20044 */ sw $v0, 0x44($sp) /* 06DC9C 8006D09C 000D6880 */ sll $t5, $t5, 2 -/* 06DCA0 8006D0A0 3C01800E */ lui $at, 0x800e +/* 06DCA0 8006D0A0 3C01800E */ lui $at, %hi(D_800E7188) # $at, 0x800e /* 06DCA4 8006D0A4 002D0821 */ addu $at, $at, $t5 -/* 06DCA8 8006D0A8 8C2D7188 */ lw $t5, 0x7188($at) +/* 06DCA8 8006D0A8 8C2D7188 */ lw $t5, %lo(D_800E7188)($at) /* 06DCAC 8006D0AC 00000000 */ nop /* 06DCB0 8006D0B0 01A00008 */ jr $t5 /* 06DCB4 8006D0B4 00000000 */ nop @@ -612,9 +612,9 @@ glabel func_8006CCF0 /* 06E1D8 8006D5D8 10200095 */ beqz $at, .L8006D830 /* 06E1DC 8006D5DC A2000000 */ sb $zero, ($s0) /* 06E1E0 8006D5E0 0019C880 */ sll $t9, $t9, 2 -/* 06E1E4 8006D5E4 3C01800E */ lui $at, 0x800e +/* 06E1E4 8006D5E4 3C01800E */ lui $at, %hi(D_800E71B8) # $at, 0x800e /* 06E1E8 8006D5E8 00390821 */ addu $at, $at, $t9 -/* 06E1EC 8006D5EC 8C3971B8 */ lw $t9, 0x71b8($at) +/* 06E1EC 8006D5EC 8C3971B8 */ lw $t9, %lo(D_800E71B8)($at) /* 06E1F0 8006D5F0 00000000 */ nop /* 06E1F4 8006D5F4 03200008 */ jr $t9 /* 06E1F8 8006D5F8 00000000 */ nop diff --git a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s index a9903794..5d7a9d0b 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s +++ b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s @@ -121,9 +121,9 @@ glabel func_8006DCF8 /* 06EAC4 8006DEC4 2DC1000E */ sltiu $at, $t6, 0xe /* 06EAC8 8006DEC8 10200085 */ beqz $at, .L8006E0E0 /* 06EACC 8006DECC 000E7080 */ sll $t6, $t6, 2 -/* 06EAD0 8006DED0 3C01800E */ lui $at, 0x800e +/* 06EAD0 8006DED0 3C01800E */ lui $at, %hi(D_800E71D8) # $at, 0x800e /* 06EAD4 8006DED4 002E0821 */ addu $at, $at, $t6 -/* 06EAD8 8006DED8 8C2E71D8 */ lw $t6, 0x71d8($at) +/* 06EAD8 8006DED8 8C2E71D8 */ lw $t6, %lo(D_800E71D8)($at) /* 06EADC 8006DEDC 00000000 */ nop /* 06EAE0 8006DEE0 01C00008 */ jr $t6 /* 06EAE4 8006DEE4 00000000 */ nop diff --git a/asm/non_matchings/unknown_079F50/__scSchedule.s b/asm/non_matchings/unknown_079F50/__scSchedule.s index d400f3b9..a494d917 100644 --- a/asm/non_matchings/unknown_079F50/__scSchedule.s +++ b/asm/non_matchings/unknown_079F50/__scSchedule.s @@ -55,9 +55,9 @@ glabel __scSchedule /* 07AD98 8007A198 2DE10007 */ sltiu $at, $t7, 7 /* 07AD9C 8007A19C 10200041 */ beqz $at, .L8007A2A4 /* 07ADA0 8007A1A0 000F7880 */ sll $t7, $t7, 2 -/* 07ADA4 8007A1A4 3C01800E */ lui $at, 0x800e +/* 07ADA4 8007A1A4 3C01800E */ lui $at, %hi(D_800E7970) # $at, 0x800e /* 07ADA8 8007A1A8 002F0821 */ addu $at, $at, $t7 -/* 07ADAC 8007A1AC 8C2F7970 */ lw $t7, 0x7970($at) +/* 07ADAC 8007A1AC 8C2F7970 */ lw $t7, %lo(D_800E7970)($at) /* 07ADB0 8007A1B0 00000000 */ nop /* 07ADB4 8007A1B4 01E00008 */ jr $t7 /* 07ADB8 8007A1B8 00000000 */ nop diff --git a/asm/non_matchings/unknown_07AF10/func_8007A550.s b/asm/non_matchings/unknown_07AF10/func_8007A550.s index 318983e8..9fd96b03 100644 --- a/asm/non_matchings/unknown_07AF10/func_8007A550.s +++ b/asm/non_matchings/unknown_07AF10/func_8007A550.s @@ -16,11 +16,11 @@ glabel func_8007A550 .L8007A584: /* 07B184 8007A584 3C0E8012 */ lui $t6, %hi(D_801262CC) # $t6, 0x8012 /* 07B188 8007A588 8DCE62CC */ lw $t6, %lo(D_801262CC)($t6) -/* 07B18C 8007A58C 3C01800E */ lui $at, 0x800e +/* 07B18C 8007A58C 3C01800E */ lui $at, %hi(D_800E7B0C) # $at, 0x800e /* 07B190 8007A590 31CF0007 */ andi $t7, $t6, 7 /* 07B194 8007A594 000F7880 */ sll $t7, $t7, 2 /* 07B198 8007A598 002F0821 */ addu $at, $at, $t7 -/* 07B19C 8007A59C 8C2F7B0C */ lw $t7, 0x7b0c($at) +/* 07B19C 8007A59C 8C2F7B0C */ lw $t7, %lo(D_800E7B0C)($at) /* 07B1A0 8007A5A0 00000000 */ nop /* 07B1A4 8007A5A4 01E00008 */ jr $t7 /* 07B1A8 8007A5A8 00000000 */ nop diff --git a/data/dkr.data.s b/data/dkr.data.s index 443d5cc9..a1bc8ad1 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -8969,6 +8969,7 @@ glabel D_800E49EC .aligned_text "Don't worry - game should cope OK\n" .aligned_text "WARNING: Attempt to stop NULL sound aborted\n" +glabel D_800E4BB0 .word 0x800035C4 .word 0x80003A0C .word 0x80004090 @@ -9256,6 +9257,8 @@ glabel D_800E514C glabel D_800E5150 .word 0x3EA8F5C3 + +glabel D_800E5154 .word 0x8000D974 .word 0x8000D974 .word 0x8000D974 @@ -9277,6 +9280,8 @@ glabel D_800E5180 glabel D_800E5184 .word 0x3F36C8B4 + +glabel D_800E5188 .word 0x8000E104 .word 0x8000E0E4 .word 0x8000E0F4 @@ -9292,6 +9297,8 @@ glabel D_800E51AC glabel D_800E51B0 .word 0x3F36C8B4 + +glabel D_800E51B4 .word 0x8000ECD8 .word 0x8000EDE0 .word 0x8000EDE0 @@ -9331,6 +9338,8 @@ glabel D_800E51B0 .word 0x8000EDE0 .word 0x8000EDE0 .word 0x8000ED54 + +glabel D_800E5250 .word 0x80010374 .word 0x800105F8 .word 0x800105F8 @@ -9447,6 +9456,8 @@ glabel D_800E51B0 .word 0x800105F8 .word 0x800105F8 .word 0x8001044C + +glabel D_800E5420 .word 0x8001063C .word 0x8001063C .word 0x80010664 @@ -9575,6 +9586,8 @@ glabel D_800E5580 glabel D_800E5584 .word 0x3F7AE148 + +glabel D_800E5588 .word 0x80014B80 .word 0x80014CCC .word 0x80014E18 @@ -9737,6 +9750,8 @@ glabel D_800E5680 glabel D_800E5684 .word 0x9999999A + +glabel D_800E5688 .word 0x80023614 .word 0x800238A8 .word 0x80023808 @@ -9856,6 +9871,8 @@ glabel D_800E5684 .word 0x800238A8 .word 0x800237CC .word 0x80023790 + +glabel D_800E5864 .word 0x80023908 .word 0x80023918 .word 0x80023928 @@ -9974,6 +9991,8 @@ glabel D_800E5684 .word 0x80023DE8 .word 0x80023E18 .word 0x80023CC8 + +glabel D_800E5A3C .word 0x80023E5C .word 0x80023E64 .word 0x80023F40 @@ -10090,6 +10109,8 @@ glabel D_800E5684 .word 0x80023F3C .word 0x80023EEC .word 0x80023F14 + +glabel D_800E5C0C .word 0x80023FA4 .word 0x80023FB8 .word 0x80023FCC @@ -10295,6 +10316,8 @@ glabel D_800E5EB8 glabel D_800E5EBC .word 0x00000000 + +glabel D_800E5EC0 .word 0x8002AB40 .word 0x8002AB40 .word 0x8002AB54 @@ -10369,6 +10392,8 @@ glabel D_800E5F70 .word 0x00000000 .word 0x00000000 .word 0x00000000 + +glabel D_800E5F80 .word 0x80033A70 .word 0x80033AA4 .word 0x80033AE4 @@ -10492,6 +10517,8 @@ glabel D_800E6068 glabel D_800E606C .word 0x00000000 + +glabel D_800E6070 .word 0x80039758 .word 0x80039758 .word 0x80039758 @@ -10513,6 +10540,8 @@ glabel D_800E606C .word 0x80039768 .word 0x80039758 .word 0x80039758 + +glabel D_800E60C4 .word 0x800397BC .word 0x80039978 .word 0x80039AE0 @@ -10633,6 +10662,7 @@ glabel D_800E61B8 glabel D_800E61BC .word 0x9999999A +glabel D_800E61C0; .word 0x8003E66C .word 0x8003E66C .word 0x8003E67C @@ -10687,6 +10717,8 @@ glabel D_800E6220 glabel D_800E6224 .word 0x3FCCCCCD + +glabel D_800E6228; .word 0x80040D30 .word 0x80040E54 .word 0x80040E54 @@ -10711,6 +10743,8 @@ glabel D_800E6250 glabel D_800E6254 .word 0x33333333 + +glabel D_800E6258 .word 0x80042378 .word 0x800426B8 .word 0x80042898 @@ -10818,6 +10852,8 @@ glabel D_800E6310 glabel D_800E6314 .word 0x33333333 + +glabel D_800E6318 .word 0x800446AC .word 0x80044A04 .word 0x80044A04 @@ -10825,6 +10861,8 @@ glabel D_800E6314 .word 0x80044A04 .word 0x80044F54 .word 0x80044A04 + +glabel D_800E6334 .word 0x80044A2C .word 0x80044A44 .word 0x80044A60 @@ -10838,6 +10876,8 @@ glabel D_800E6350 glabel D_800E6354 .word 0x00000000 + +glabel D_800E6358 .word 0x800456A0 .word 0x800456A8 .word 0x800456B0 @@ -10849,6 +10889,8 @@ glabel D_800E6354 glabel D_800E6378 .word 0x49742400 + +glabel D_800E637C .word 0x80045ADC .word 0x80045AF8 .word 0x80045B30 @@ -11005,6 +11047,8 @@ glabel D_800E6464 glabel D_800E6468 .word 0x3DE147AE + +glabel D_800E646C .word 0x80048D40 .word 0x80048D40 .word 0x80048E50 @@ -11226,6 +11270,8 @@ glabel D_800E65A8 glabel D_800E65AC .word 0xC61C4000 + +glabel D_800E65B0 .word 0x8004EB84 .word 0x8004EBBC .word 0x8004EBD8 @@ -11410,6 +11456,8 @@ glabel D_800E66C8 glabel D_800E66CC .word 0x9999999A + +glabel D_800E66D0 .word 0x80052678 .word 0x80052978 .word 0x80052978 @@ -11545,6 +11593,8 @@ glabel D_800E679C glabel D_800E67A0 .word 0x3DCCCCCD + +glabel D_800E67A4 .word 0x80053FF0 .word 0x8005406C .word 0x800540FC @@ -11661,6 +11711,8 @@ glabel D_800E684C glabel D_800E6850 .word 0x44BB8000 + +glabel D_800E6854 .word 0x8005635C .word 0x80056370 .word 0x80056380 @@ -11677,6 +11729,8 @@ glabel D_800E6850 .word 0x800565E0 .word 0x80056600 .word 0x800563EC + +glabel D_800E6894 .word 0x80056828 .word 0x80056834 .word 0x80056840 @@ -11698,6 +11752,8 @@ glabel D_800E68C8 glabel D_800E68CC .word 0x3CCCCCCD + +glabel D_800E68D0 .word 0x80057BBC .word 0x80057BE4 .word 0x80057CD0 @@ -11794,6 +11850,8 @@ glabel D_800E6960 glabel D_800E6964 .word 0x00000000 + +glabel D_800E6968 .word 0x8005AF80 .word 0x8005AFD8 .word 0x8005B004 @@ -11952,6 +12010,8 @@ glabel D_800E6A68 glabel D_800E6A6C .word 0xCCCCCCCD + +glabel D_800E6A70 .word 0x8005DBEC .word 0x8005DC10 .word 0x8005DC48 @@ -12012,6 +12072,8 @@ glabel D_800E6AC8 glabel D_800E6ACC .word 0xCCCCCCCD + +glabel D_800E6AD0 .word 0x8005EE9C .word 0x8005EEC0 .word 0x8005EEF8 @@ -12065,6 +12127,7 @@ glabel D_800E6B14 .aligned_text "CSP: oh oh \n" +glabel D_800E6C30 .word 0x8006247C .word 0x80062978 .word 0x800626F8 @@ -12089,6 +12152,8 @@ glabel D_800E6B14 .word 0x800626F8 .word 0x80062564 .word 0x80062668 + +glabel D_800E6C90 .word 0x80062A90 .word 0x80062AF0 .word 0x80062AA8 @@ -12109,6 +12174,8 @@ glabel D_800E6B14 .word 0x80062AE8 .word 0x80062AE8 .word 0x80062AE8 + +glabel D_800E6CE0 .word 0x80063068 .word 0x800637CC .word 0x800637CC @@ -12209,6 +12276,8 @@ glabel D_800E6B14 .word 0x00000000 .word 0x00000000 .word 0x00000000 + +glabel D_800E6E70 .word 0x80063FE8 .word 0x8006401C .word 0x8006407C @@ -12226,6 +12295,7 @@ glabel D_800E6E94 .word 0x00000000 .word 0x00000000 +glabel D_800E6EA0 .word 0x80064AD8 .word 0x80064AE4 .word 0x80064AFC @@ -12310,6 +12380,7 @@ glabel D_800E7134 .aligned_text "PLN" .aligned_text "Swapping\n" +glabel D_800E7154 .word 0x8006CF68 .word 0x8006CF5C .word 0x8006D024 @@ -12323,6 +12394,8 @@ glabel D_800E7134 .word 0x8006CFEC .word 0x8006D000 .word 0x8006D014 + +glabel D_800E7188 .word 0x8006D0B8 .word 0x8006D0C4 .word 0x8006D108 @@ -12335,6 +12408,8 @@ glabel D_800E7134 .word 0x8006D1C0 .word 0x8006D1C0 .word 0x8006D164 + +glabel D_800E71B8 .word 0x8006D5FC .word 0x8006D614 .word 0x8006D62C @@ -12347,6 +12422,8 @@ glabel D_800E7134 .word 0x8006E00C .word 0x8006E054 .word 0x8006E0E0 + +glabel D_800E71D8 .word 0x8006DEE8 .word 0x8006E0E0 .word 0x8006E0E0 @@ -12530,6 +12607,8 @@ glabel D_800E77F4 glabel D_800E796C .word 0x48E4E1C0 + +glabel D_800E7970 .word 0x8007A2A4 .word 0x8007A248 .word 0x8007A1BC @@ -12560,6 +12639,7 @@ glabel D_800E7B04 glabel D_800E7B08 .word 0x3FAAAAAB +glabel D_800E7B0C .word 0x8007A5AC .word 0x8007A5D0 .word 0x8007A658 diff --git a/undefined_syms.txt b/undefined_syms.txt index fc8c3371..9a51ae94 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -801,6 +801,7 @@ D_800E49E0 = 0x800E49E0; D_800E49E4 = 0x800E49E4; D_800E49E8 = 0x800E49E8; D_800E49EC = 0x800E49EC; +D_800E4BB0 = 0x800E4BB0; D_800E4BF0 = 0x800E4BF0; D_800E4BF8 = 0x800E4BF8; D_800E4BFC = 0x800E4BFC; @@ -878,12 +879,17 @@ D_800E5144 = 0x800E5144; D_800E5148 = 0x800E5148; D_800E514C = 0x800E514C; D_800E5150 = 0x800E5150; +D_800E5154 = 0x800E5154; D_800E5178 = 0x800E5178; D_800E517C = 0x800E517C; D_800E5180 = 0x800E5180; D_800E5184 = 0x800E5184; +D_800E5188 = 0x800E5188; D_800E51AC = 0x800E51AC; D_800E51B0 = 0x800E51B0; +D_800E51B4 = 0x800E51B4; +D_800E5250 = 0x800E5250; +D_800E5420 = 0x800E5420; D_800E5538 = 0x800E5538; D_800E553C = 0x800E553C; D_800E5540 = 0x800E5540; @@ -903,6 +909,7 @@ D_800E5578 = 0x800E5578; D_800E557C = 0x800E557C; D_800E5580 = 0x800E5580; D_800E5584 = 0x800E5584; +D_800E5588 = 0x800E5588; D_800E55B8 = 0x800E55B8; D_800E55BC = 0x800E55BC; D_800E55C0 = 0x800E55C0; @@ -952,6 +959,10 @@ D_800E5674 = 0x800E5674; D_800E5678 = 0x800E5678; D_800E5680 = 0x800E5680; D_800E5684 = 0x800E5684; +D_800E5688 = 0x800E5688; +D_800E5864 = 0x800E5864; +D_800E5A3C = 0x800E5A3C; +D_800E5C0C = 0x800E5C0C; D_800E5DF0 = 0x800E5DF0; D_800E5E38 = 0x800E5E38; D_800E5E60 = 0x800E5E60; @@ -978,6 +989,7 @@ D_800E5EB0 = 0x800E5EB0; D_800E5EB4 = 0x800E5EB4; D_800E5EB8 = 0x800E5EB8; D_800E5EBC = 0x800E5EBC; +D_800E5EC0 = 0x800E5EC0; D_800E5F40 = 0x800E5F40; D_800E5F44 = 0x800E5F44; D_800E5F48 = 0x800E5F48; @@ -991,6 +1003,7 @@ D_800E5F64 = 0x800E5F64; D_800E5F68 = 0x800E5F68; D_800E5F6C = 0x800E5F6C; D_800E5F70 = 0x800E5F70; +D_800E5F80 = 0x800E5F80; D_800E5FA0 = 0x800E5FA0; D_800E5FB4 = 0x800E5FB4; D_800E5FC8 = 0x800E5FC8; @@ -1028,6 +1041,8 @@ D_800E6060 = 0x800E6060; D_800E6064 = 0x800E6064; D_800E6068 = 0x800E6068; D_800E606C = 0x800E606C; +D_800E6070 = 0x800E6070; +D_800E60C4 = 0x800E60C4; D_800E6140 = 0x800E6140; D_800E6144 = 0x800E6144; D_800E6148 = 0x800E6148; @@ -1056,6 +1071,7 @@ D_800E61AC = 0x800E61AC; D_800E61B0 = 0x800E61B0; D_800E61B8 = 0x800E61B8; D_800E61BC = 0x800E61BC; +D_800E61C0 = 0x800E61C0; D_800E61F0 = 0x800E61F0; D_800E61F4 = 0x800E61F4; D_800E61F8 = 0x800E61F8; @@ -1070,12 +1086,14 @@ D_800E6218 = 0x800E6218; D_800E621C = 0x800E621C; D_800E6220 = 0x800E6220; D_800E6224 = 0x800E6224; +D_800E6228 = 0x800E6228; D_800E623C = 0x800E623C; D_800E6240 = 0x800E6240; D_800E6244 = 0x800E6244; D_800E6248 = 0x800E6248; D_800E6250 = 0x800E6250; D_800E6254 = 0x800E6254; +D_800E6258 = 0x800E6258; D_800E626C = 0x800E626C; D_800E6270 = 0x800E6270; D_800E6274 = 0x800E6274; @@ -1109,9 +1127,13 @@ D_800E6308 = 0x800E6308; D_800E630C = 0x800E630C; D_800E6310 = 0x800E6310; D_800E6314 = 0x800E6314; +D_800E6318 = 0x800E6318; +D_800E6334 = 0x800E6334; D_800E6350 = 0x800E6350; D_800E6354 = 0x800E6354; +D_800E6358 = 0x800E6358; D_800E6378 = 0x800E6378; +D_800E637C = 0x800E637C; D_800E63A0 = 0x800E63A0; D_800E63A4 = 0x800E63A4; D_800E63A8 = 0x800E63A8; @@ -1160,6 +1182,7 @@ D_800E645C = 0x800E645C; D_800E6460 = 0x800E6460; D_800E6464 = 0x800E6464; D_800E6468 = 0x800E6468; +D_800E646C = 0x800E646C; D_800E6488 = 0x800E6488; D_800E648C = 0x800E648C; D_800E6490 = 0x800E6490; @@ -1230,6 +1253,7 @@ D_800E65A0 = 0x800E65A0; D_800E65A4 = 0x800E65A4; D_800E65A8 = 0x800E65A8; D_800E65AC = 0x800E65AC; +D_800E65B0 = 0x800E65B0; D_800E65E8 = 0x800E65E8; D_800E65EC = 0x800E65EC; D_800E65F0 = 0x800E65F0; @@ -1286,6 +1310,7 @@ D_800E66BC = 0x800E66BC; D_800E66C0 = 0x800E66C0; D_800E66C8 = 0x800E66C8; D_800E66CC = 0x800E66CC; +D_800E66D0 = 0x800E66D0; D_800E66F0 = 0x800E66F0; D_800E66F4 = 0x800E66F4; D_800E66F8 = 0x800E66F8; @@ -1327,6 +1352,7 @@ D_800E6794 = 0x800E6794; D_800E6798 = 0x800E6798; D_800E679C = 0x800E679C; D_800E67A0 = 0x800E67A0; +D_800E67A4 = 0x800E67A4; D_800E67C0 = 0x800E67C0; D_800E67C4 = 0x800E67C4; D_800E67C8 = 0x800E67C8; @@ -1363,9 +1389,12 @@ D_800E6844 = 0x800E6844; D_800E6848 = 0x800E6848; D_800E684C = 0x800E684C; D_800E6850 = 0x800E6850; +D_800E6854 = 0x800E6854; +D_800E6894 = 0x800E6894; D_800E68C4 = 0x800E68C4; D_800E68C8 = 0x800E68C8; D_800E68CC = 0x800E68CC; +D_800E68D0 = 0x800E68D0; D_800E68F0 = 0x800E68F0; D_800E68F4 = 0x800E68F4; D_800E68F8 = 0x800E68F8; @@ -1395,6 +1424,7 @@ D_800E6954 = 0x800E6954; D_800E6958 = 0x800E6958; D_800E6960 = 0x800E6960; D_800E6964 = 0x800E6964; +D_800E6968 = 0x800E6968; D_800E69A0 = 0x800E69A0; D_800E69A4 = 0x800E69A4; D_800E69A8 = 0x800E69A8; @@ -1441,6 +1471,7 @@ D_800E6A60 = 0x800E6A60; D_800E6A64 = 0x800E6A64; D_800E6A68 = 0x800E6A68; D_800E6A6C = 0x800E6A6C; +D_800E6A70 = 0x800E6A70; D_800E6A88 = 0x800E6A88; D_800E6A8C = 0x800E6A8C; D_800E6A90 = 0x800E6A90; @@ -1459,6 +1490,7 @@ D_800E6AC0 = 0x800E6AC0; D_800E6AC4 = 0x800E6AC4; D_800E6AC8 = 0x800E6AC8; D_800E6ACC = 0x800E6ACC; +D_800E6AD0 = 0x800E6AD0; D_800E6AE8 = 0x800E6AE8; D_800E6AEC = 0x800E6AEC; D_800E6AF0 = 0x800E6AF0; @@ -1469,8 +1501,13 @@ D_800E6B08 = 0x800E6B08; D_800E6B0C = 0x800E6B0C; D_800E6B10 = 0x800E6B10; D_800E6B14 = 0x800E6B14; +D_800E6C30 = 0x800E6C30; +D_800E6C90 = 0x800E6C90; +D_800E6CE0 = 0x800E6CE0; +D_800E6E70 = 0x800E6E70; D_800E6E90 = 0x800E6E90; D_800E6E94 = 0x800E6E94; +D_800E6EA0 = 0x800E6EA0; D_800E6EB8 = 0x800E6EB8; D_800E6EBC = 0x800E6EBC; D_800E6EC0 = 0x800E6EC0; @@ -1487,6 +1524,10 @@ D_800E709C = 0x800E709C; D_800E70A0 = 0x800E70A0; D_800E70A4 = 0x800E70A4; D_800E7134 = 0x800E7134; +D_800E7154 = 0x800E7154; +D_800E7188 = 0x800E7188; +D_800E71B8 = 0x800E71B8; +D_800E71D8 = 0x800E71D8; D_800E7528 = 0x800E7528; D_800E7530 = 0x800E7530; D_800E753C = 0x800E753C; @@ -1524,10 +1565,12 @@ D_800E77EC = 0x800E77EC; D_800E77F0 = 0x800E77F0; D_800E77F4 = 0x800E77F4; D_800E796C = 0x800E796C; +D_800E7970 = 0x800E7970; D_800E7AFC = 0x800E7AFC; D_800E7B00 = 0x800E7B00; D_800E7B04 = 0x800E7B04; D_800E7B08 = 0x800E7B08; +D_800E7B0C = 0x800E7B0C; D_800E7C90 = 0x800E7C90; D_800E8208 = 0x800E8208; D_800E8210 = 0x800E8210; From 20c2f95d62e33a32964dd9ffdead22b7ec6b69e6 Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Fri, 28 May 2021 00:17:28 -0700 Subject: [PATCH 32/39] Added globals for new glabels --- .../unknown_080500/MenuCreditsLoop.s | 4 ++-- .../unknown_080500/func_80099E8C.s | 4 ++-- src/unknown_080500.c | 20 +++++++++++-------- undefined_syms.txt | 2 ++ 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s index 52706a0e..946a192f 100644 --- a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s @@ -293,7 +293,7 @@ glabel MenuCreditsLoop /* 09C360 8009B760 24150002 */ li $s5, 2 /* 09C364 8009B764 862D0000 */ lh $t5, ($s1) /* 09C368 8009B768 2643000E */ addiu $v1, $s2, 0xe -/* 09C36C 8009B76C 3C0F800E */ lui $t7, 0x800e +/* 09C36C 8009B76C 3C0F800E */ lui $t7, %hi(D_800E1A94) # $t7, 0x800e /* 09C370 8009B770 000D7080 */ sll $t6, $t5, 2 /* 09C374 8009B774 8EC50000 */ lw $a1, ($s6) /* 09C378 8009B778 AE020014 */ sw $v0, 0x14($s0) @@ -302,7 +302,7 @@ glabel MenuCreditsLoop /* 09C384 8009B784 A603002A */ sh $v1, 0x2a($s0) /* 09C388 8009B788 A2000031 */ sb $zero, 0x31($s0) /* 09C38C 8009B78C 01EE7821 */ addu $t7, $t7, $t6 -/* 09C390 8009B790 8DEF1A94 */ lw $t7, 0x1a94($t7) +/* 09C390 8009B790 8DEF1A94 */ lw $t7, %lo(D_800E1A94)($t7) /* 09C394 8009B794 3C19800E */ lui $t9, %hi(D_800E17F4) # $t9, 0x800e /* 09C398 8009B798 83A6005B */ lb $a2, 0x5b($sp) /* 09C39C 8009B79C 3C08800E */ lui $t0, %hi(D_800E1938) # $t0, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_80099E8C.s b/asm/non_matchings/unknown_080500/func_80099E8C.s index 7b09f6a7..9e7c907d 100644 --- a/asm/non_matchings/unknown_080500/func_80099E8C.s +++ b/asm/non_matchings/unknown_080500/func_80099E8C.s @@ -189,10 +189,10 @@ glabel func_80099E8C /* 09AD50 8009A150 44815000 */ mtc1 $at, $f10 /* 09AD54 8009A154 3C013F50 */ li $at, 0x3F500000 # 0.812500 /* 09AD58 8009A158 0008C880 */ sll $t9, $t0, 2 -/* 09AD5C 8009A15C 3C05800E */ lui $a1, 0x800e +/* 09AD5C 8009A15C 3C05800E */ lui $a1, %hi(D_800E16F4) # $a1, 0x800e /* 09AD60 8009A160 44818000 */ mtc1 $at, $f16 /* 09AD64 8009A164 00B92821 */ addu $a1, $a1, $t9 -/* 09AD68 8009A168 8CA516F4 */ lw $a1, 0x16f4($a1) +/* 09AD68 8009A168 8CA516F4 */ lw $a1, %lo(D_800E16F4)($a1) /* 09AD6C 8009A16C 44074000 */ mfc1 $a3, $f8 /* 09AD70 8009A170 8FA60068 */ lw $a2, 0x68($sp) /* 09AD74 8009A174 2409FFFF */ li $t1, -1 diff --git a/src/unknown_080500.c b/src/unknown_080500.c index a072dedd..f20bed30 100644 --- a/src/unknown_080500.c +++ b/src/unknown_080500.c @@ -1070,7 +1070,7 @@ s32 D_800E16C4[12] = { 0, 0x00000000 }; -s32 *D_800E16F0[5] = { +s32 *D_800E16F4[5] = { D_800E153C, D_800E1594, D_800E15EC, D_800E1644, D_800E169C }; @@ -1157,7 +1157,7 @@ u16 D_800E18FC[30] = { }; // Credits text look-up table -char *D_800E1938[107] = { +char *D_800E1938[87] = { (char*)0x800E7D08, (char*)0x800E7D10, (char*)0x800E7D24, (char*)0x800E7D30, (char*)0x800E7D44, (char*)0x800E7D50, (char*)0x800E7D58, (char*)0x800E7D60, (char*)0x800E7D70, (char*)0x800E7D7C, (char*)0x800E7D88, (char*)0x800E7D94, @@ -1179,12 +1179,16 @@ char *D_800E1938[107] = { (char*)0x800E8080, (char*)0x800E8088, (char*)0x800E8094, (char*)0x800E80A8, (char*)0x800E80B4, (char*)0x800E80C0, (char*)0x800E80CC, (char*)0x800E80DC, (char*)0x800E80E8, (char*)0x800E80F4, (char*)0x800E8100, (char*)0x800E8114, - (char*)0x00000000, (char*)0x00000000, (char*)0x00000000, (char*)0x800E8120, - (char*)0x800E8128, (char*)0x800E8130, (char*)0x800E8138, (char*)0x800E8140, - (char*)0x800E8148, (char*)0x800E8150, (char*)0x800E8158, (char*)0x800E8160, - (char*)0x800E8168, (char*)0x800E8170, (char*)0x800E8178, (char*)0x800E8180, - (char*)0x800E8188, (char*)0x800E8190, (char*)0x800E8198, (char*)0x800E81A0, - (char*)0x800E81A8, (char*)0x800E81B0, (char*)0x800E81B8 + (char*)0x00000000, (char*)0x00000000, (char*)0x00000000 +}; + +// Credits text look-up table (time trials time sheet) +char *D_800E1A94[20] = { + (char*)0x800E8120, (char*)0x800E8128, (char*)0x800E8130, (char*)0x800E8138, + (char*)0x800E8140, (char*)0x800E8148, (char*)0x800E8150, (char*)0x800E8158, + (char*)0x800E8160, (char*)0x800E8168, (char*)0x800E8170, (char*)0x800E8178, + (char*)0x800E8180, (char*)0x800E8188, (char*)0x800E8190, (char*)0x800E8198, + (char*)0x800E81A0, (char*)0x800E81A8, (char*)0x800E81B0, (char*)0x800E81B8 }; // Another credits text look-up table diff --git a/undefined_syms.txt b/undefined_syms.txt index 9a51ae94..e9560c95 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -535,6 +535,7 @@ D_800E1644 = 0x800E1644; D_800E166C = 0x800E166C; D_800E169C = 0x800E169C; D_800E16C4 = 0x800E16C4; +D_800E16F4 = 0x800E16F4; D_800E1708 = 0x800E1708; D_800E174C = 0x800E174C; D_800E1754 = 0x800E1754; @@ -545,6 +546,7 @@ D_800E17F0 = 0x800E17F0; D_800E17F4 = 0x800E17F4; D_800E18F8 = 0x800E18F8; D_800E1938 = 0x800E1938; +D_800E1A94 = 0x800E1A94; D_800E1AE4 = 0x800E1AE4; D_800E1AF8 = 0x800E1AF8; D_800E1B4C = 0x800E1B4C; From 24a2d6bfb49cd4f950facc199933b14e50a4f80d Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Fri, 28 May 2021 00:28:04 -0700 Subject: [PATCH 33/39] glabel cleanup final pass --- .../unknown_07B870/func_8007AE74.s | 8 ++++---- .../unknown_07B870/func_8007C57C.s | 4 ++-- .../unknown_080500/func_80088938.s | 8 ++++---- .../unknown_080500/func_8008B4C8.s | 4 ++-- .../unknown_09F8F0/func_800ABE68.s | 4 ++-- .../unknown_0B8920/func_800B92F4.s | 4 ++-- .../unknown_0B8920/func_800B97A8.s | 4 ++-- .../unknown_0B8920/func_800C13E4.s | 4 ++-- .../unknown_0B8920/func_800C14DC.s | 4 ++-- .../unknown_0B8920/func_800C2274.s | 8 ++++---- .../unknown_0B8920/func_800C23F8.s | 8 ++++---- .../unknown_0B8920/func_800C2548.s | 4 ++-- lib/asm/exception/__osException.s | 4 ++-- .../unknown_0CA9A0/alEnvMixerPull.s | 20 +++++++++++-------- .../unknown_0CA9A0/func_800CAC5C.s | 5 +++-- .../unknown_0D3020/func_800D2470.s | 4 ++-- lib/src/unknown_0D43F0.c | 1 - undefined_syms.txt | 1 + 18 files changed, 52 insertions(+), 47 deletions(-) diff --git a/asm/non_matchings/unknown_07B870/func_8007AE74.s b/asm/non_matchings/unknown_07B870/func_8007AE74.s index 1cc8f646..56d1502b 100644 --- a/asm/non_matchings/unknown_07B870/func_8007AE74.s +++ b/asm/non_matchings/unknown_07B870/func_8007AE74.s @@ -18,9 +18,9 @@ glabel func_8007AE74 /* 07BAB4 8007AEB4 24130002 */ li $s3, 2 .L8007AEB8: /* 07BAB8 8007AEB8 00024880 */ sll $t1, $v0, 2 -/* 07BABC 8007AEBC 3C188012 */ lui $t8, 0x8012 +/* 07BABC 8007AEBC 3C188012 */ lui $t8, %hi(D_80126338) # $t8, 0x8012 /* 07BAC0 8007AEC0 0309C021 */ addu $t8, $t8, $t1 -/* 07BAC4 8007AEC4 8F186338 */ lw $t8, 0x6338($t8) +/* 07BAC4 8007AEC4 8F186338 */ lw $t8, %lo(D_80126338)($t8) /* 07BAC8 8007AEC8 3C028012 */ lui $v0, %hi(D_80126330) # $v0, 0x8012 /* 07BACC 8007AECC 0118082A */ slt $at, $t0, $t8 /* 07BAD0 8007AED0 10200003 */ beqz $at, .L8007AEE0 @@ -54,9 +54,9 @@ glabel func_8007AE74 /* 07BB30 8007AF30 1420FFF3 */ bnez $at, .L8007AF00 /* 07BB34 8007AF34 001150C0 */ sll $t2, $s1, 3 .L8007AF38: -/* 07BB38 8007AF38 3C0E8012 */ lui $t6, 0x8012 +/* 07BB38 8007AF38 3C0E8012 */ lui $t6, %hi(D_80126320) # $t6, 0x8012 /* 07BB3C 8007AF3C 01C97021 */ addu $t6, $t6, $t1 -/* 07BB40 8007AF40 8DCE6320 */ lw $t6, 0x6320($t6) +/* 07BB40 8007AF40 8DCE6320 */ lw $t6, %lo(D_80126320)($t6) /* 07BB44 8007AF44 00087880 */ sll $t7, $t0, 2 /* 07BB48 8007AF48 01CF1021 */ addu $v0, $t6, $t7 /* 07BB4C 8007AF4C 8C520000 */ lw $s2, ($v0) diff --git a/asm/non_matchings/unknown_07B870/func_8007C57C.s b/asm/non_matchings/unknown_07B870/func_8007C57C.s index ffc1e09d..99f364f4 100644 --- a/asm/non_matchings/unknown_07B870/func_8007C57C.s +++ b/asm/non_matchings/unknown_07B870/func_8007C57C.s @@ -13,9 +13,9 @@ glabel func_8007C57C /* 07D1A8 8007C5A8 03202025 */ move $a0, $t9 .L8007C5AC: /* 07D1AC 8007C5AC 00021880 */ sll $v1, $v0, 2 -/* 07D1B0 8007C5B0 3C088012 */ lui $t0, 0x8012 +/* 07D1B0 8007C5B0 3C088012 */ lui $t0, %hi(D_80126338) # $t0, 0x8012 /* 07D1B4 8007C5B4 01034021 */ addu $t0, $t0, $v1 -/* 07D1B8 8007C5B8 8D086338 */ lw $t0, 0x6338($t0) +/* 07D1B8 8007C5B8 8D086338 */ lw $t0, %lo(D_80126338)($t0) /* 07D1BC 8007C5BC 00000000 */ nop /* 07D1C0 8007C5C0 0088082A */ slt $at, $a0, $t0 /* 07D1C4 8007C5C4 10200003 */ beqz $at, .L8007C5D4 diff --git a/asm/non_matchings/unknown_080500/func_80088938.s b/asm/non_matchings/unknown_080500/func_80088938.s index dfe91ba1..5f3aa3c6 100644 --- a/asm/non_matchings/unknown_080500/func_80088938.s +++ b/asm/non_matchings/unknown_080500/func_80088938.s @@ -248,14 +248,14 @@ glabel func_80088938 /* 0898F0 80088CF0 240700A0 */ li $a3, 160 /* 0898F4 80088CF4 3C0D8012 */ lui $t5, %hi(D_801263D8) # $t5, 0x8012 /* 0898F8 80088CF8 8DAD63D8 */ lw $t5, %lo(D_801263D8)($t5) -/* 0898FC 80088CFC 3C108012 */ lui $s0, 0x8012 +/* 0898FC 80088CFC 3C108012 */ lui $s0, %hi(D_80126AA0) # $s0, 0x8012 /* 089900 80088D00 01B11821 */ addu $v1, $t5, $s1 /* 089904 80088D04 00031080 */ sll $v0, $v1, 2 -/* 089908 80088D08 3C138012 */ lui $s3, 0x8012 +/* 089908 80088D08 3C138012 */ lui $s3, %hi(D_80126B70) # $s3, 0x8012 /* 08990C 80088D0C 02028021 */ addu $s0, $s0, $v0 /* 089910 80088D10 02629821 */ addu $s3, $s3, $v0 -/* 089914 80088D14 8E106AA0 */ lw $s0, 0x6aa0($s0) -/* 089918 80088D18 8E736B70 */ lw $s3, 0x6b70($s3) +/* 089914 80088D14 8E106AA0 */ lw $s0, %lo(D_80126AA0)($s0) +/* 089918 80088D18 8E736B70 */ lw $s3, %lo(D_80126B70)($s3) /* 08991C 80088D1C 00000000 */ nop .L80088D20: /* 089920 80088D20 246E0001 */ addiu $t6, $v1, 1 diff --git a/asm/non_matchings/unknown_080500/func_8008B4C8.s b/asm/non_matchings/unknown_080500/func_8008B4C8.s index becfd79e..94519940 100644 --- a/asm/non_matchings/unknown_080500/func_8008B4C8.s +++ b/asm/non_matchings/unknown_080500/func_8008B4C8.s @@ -68,9 +68,9 @@ glabel func_8008B4C8 /* 08C1C0 8008B5C0 0C001223 */ jal func_8000488C /* 08C1C4 8008B5C4 00000000 */ nop .L8008B5C8: -/* 08C1C8 8008B5C8 3C188012 */ lui $t8, 0x8012 +/* 08C1C8 8008B5C8 3C188012 */ lui $t8, %hi(players_character_array) # $t8, 0x8012 /* 08C1CC 8008B5CC 0311C021 */ addu $t8, $t8, $s1 -/* 08C1D0 8008B5D0 831863E8 */ lb $t8, 0x63e8($t8) +/* 08C1D0 8008B5D0 831863E8 */ lb $t8, %lo(players_character_array)($t8) /* 08C1D4 8008B5D4 3C1E8012 */ lui $fp, %hi(D_801263CC) # $fp, 0x8012 /* 08C1D8 8008B5D8 27DE63CC */ addiu $fp, %lo(D_801263CC) # addiu $fp, $fp, 0x63cc /* 08C1DC 8008B5DC 0018C8C0 */ sll $t9, $t8, 3 diff --git a/asm/non_matchings/unknown_09F8F0/func_800ABE68.s b/asm/non_matchings/unknown_09F8F0/func_800ABE68.s index 77b30067..f6b8bf3b 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800ABE68.s +++ b/asm/non_matchings/unknown_09F8F0/func_800ABE68.s @@ -117,12 +117,12 @@ glabel func_800ABE68 /* 0ACC28 800AC028 3C0B8012 */ lui $t3, %hi(D_80127C08) # $t3, 0x8012 /* 0ACC2C 800AC02C 012C082A */ slt $at, $t1, $t4 /* 0ACC30 800AC030 10200010 */ beqz $at, .L800AC074 -/* 0ACC34 800AC034 3C0D800E */ lui $t5, 0x800e +/* 0ACC34 800AC034 3C0D800E */ lui $t5, %hi(D_800E2914) # $t5, 0x800e /* 0ACC38 800AC038 8D6B7C08 */ lw $t3, %lo(D_80127C08)($t3) /* 0ACC3C 800AC03C 3C01800E */ lui $at, %hi(D_800E2904) # $at, 0x800e /* 0ACC40 800AC040 000B7080 */ sll $t6, $t3, 2 /* 0ACC44 800AC044 01AE6821 */ addu $t5, $t5, $t6 -/* 0ACC48 800AC048 8DAD2914 */ lw $t5, 0x2914($t5) +/* 0ACC48 800AC048 8DAD2914 */ lw $t5, %lo(D_800E2914)($t5) /* 0ACC4C 800AC04C 0C02B087 */ jal func_800AC21C /* 0ACC50 800AC050 AC2D2904 */ sw $t5, %lo(D_800E2904)($at) /* 0ACC54 800AC054 0C02B169 */ jal func_800AC5A4 diff --git a/asm/non_matchings/unknown_0B8920/func_800B92F4.s b/asm/non_matchings/unknown_0B8920/func_800B92F4.s index 1574e60f..17ef72a6 100644 --- a/asm/non_matchings/unknown_0B8920/func_800B92F4.s +++ b/asm/non_matchings/unknown_0B8920/func_800B92F4.s @@ -60,7 +60,7 @@ glabel func_800B92F4 /* 0B9FD8 800B93D8 00095080 */ sll $t2, $t1, 2 /* 0B9FDC 800B93DC 000B6080 */ sll $t4, $t3, 2 /* 0B9FE0 800B93E0 014C7021 */ addu $t6, $t2, $t4 -/* 0B9FE4 800B93E4 3C06800E */ lui $a2, 0x800e +/* 0B9FE4 800B93E4 3C06800E */ lui $a2, %hi(D_800E3070) # $a2, 0x800e /* 0B9FE8 800B93E8 000FC080 */ sll $t8, $t7, 2 /* 0B9FEC 800B93EC 8EA50028 */ lw $a1, 0x28($s5) /* 0B9FF0 800B93F0 00CE3021 */ addu $a2, $a2, $t6 @@ -68,7 +68,7 @@ glabel func_800B92F4 /* 0B9FF8 800B93F8 01B8C821 */ addu $t9, $t5, $t8 /* 0B9FFC 800B93FC 8F240000 */ lw $a0, ($t9) /* 0BA000 800B9400 8CE730E4 */ lw $a3, %lo(D_800E30E4)($a3) -/* 0BA004 800B9404 8CC63070 */ lw $a2, 0x3070($a2) +/* 0BA004 800B9404 8CC63070 */ lw $a2, %lo(D_800E3070)($a2) /* 0BA008 800B9408 AFA000AC */ sw $zero, 0xac($sp) /* 0BA00C 800B940C 10A00014 */ beqz $a1, .L800B9460 /* 0BA010 800B9410 0000B825 */ move $s7, $zero diff --git a/asm/non_matchings/unknown_0B8920/func_800B97A8.s b/asm/non_matchings/unknown_0B8920/func_800B97A8.s index fcd76108..a54ca7f2 100644 --- a/asm/non_matchings/unknown_0B8920/func_800B97A8.s +++ b/asm/non_matchings/unknown_0B8920/func_800B97A8.s @@ -83,7 +83,7 @@ glabel func_800B97A8 /* 0BA4E0 800B98E0 000A5880 */ sll $t3, $t2, 2 /* 0BA4E4 800B98E4 000C6880 */ sll $t5, $t4, 2 /* 0BA4E8 800B98E8 016D7821 */ addu $t7, $t3, $t5 -/* 0BA4EC 800B98EC 3C07800E */ lui $a3, 0x800e +/* 0BA4EC 800B98EC 3C07800E */ lui $a3, %hi(D_800E3070) # $a3, 0x800e /* 0BA4F0 800B98F0 0018C880 */ sll $t9, $t8, 2 /* 0BA4F4 800B98F4 8EA50028 */ lw $a1, 0x28($s5) /* 0BA4F8 800B98F8 00EF3821 */ addu $a3, $a3, $t7 @@ -91,7 +91,7 @@ glabel func_800B97A8 /* 0BA500 800B9900 01D94821 */ addu $t1, $t6, $t9 /* 0BA504 800B9904 8D240000 */ lw $a0, ($t1) /* 0BA508 800B9908 8D0830E4 */ lw $t0, %lo(D_800E30E4)($t0) -/* 0BA50C 800B990C 8CE73070 */ lw $a3, 0x3070($a3) +/* 0BA50C 800B990C 8CE73070 */ lw $a3, %lo(D_800E3070)($a3) /* 0BA510 800B9910 0000F025 */ move $fp, $zero /* 0BA514 800B9914 10A00014 */ beqz $a1, .L800B9968 /* 0BA518 800B9918 0000B025 */ move $s6, $zero diff --git a/asm/non_matchings/unknown_0B8920/func_800C13E4.s b/asm/non_matchings/unknown_0B8920/func_800C13E4.s index b2d037ef..782d294c 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C13E4.s +++ b/asm/non_matchings/unknown_0B8920/func_800C13E4.s @@ -44,7 +44,7 @@ glabel func_800C13E4 /* 0C208C 800C148C 0308C821 */ addu $t9, $t8, $t0 /* 0C2090 800C1490 AC590004 */ sw $t9, 4($v0) /* 0C2094 800C1494 8C820000 */ lw $v0, ($a0) -/* 0C2098 800C1498 3C0E800E */ lui $t6, 0x800e +/* 0C2098 800C1498 3C0E800E */ lui $t6, %hi(D_800E31C8) # $t6, 0x800e /* 0C209C 800C149C 244A0008 */ addiu $t2, $v0, 8 /* 0C20A0 800C14A0 AC8A0000 */ sw $t2, ($a0) /* 0C20A4 800C14A4 AC4B0000 */ sw $t3, ($v0) @@ -52,7 +52,7 @@ glabel func_800C13E4 /* 0C20AC 800C14AC 00000000 */ nop /* 0C20B0 800C14B0 000C6880 */ sll $t5, $t4, 2 /* 0C20B4 800C14B4 01CD7021 */ addu $t6, $t6, $t5 -/* 0C20B8 800C14B8 8DCE31C8 */ lw $t6, 0x31c8($t6) +/* 0C20B8 800C14B8 8DCE31C8 */ lw $t6, %lo(D_800E31C8)($t6) /* 0C20BC 800C14BC 00000000 */ nop /* 0C20C0 800C14C0 01C87821 */ addu $t7, $t6, $t0 /* 0C20C4 800C14C4 0C01ECF4 */ jal func_8007B3D0 diff --git a/asm/non_matchings/unknown_0B8920/func_800C14DC.s b/asm/non_matchings/unknown_0B8920/func_800C14DC.s index 230dd8b3..70895533 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C14DC.s +++ b/asm/non_matchings/unknown_0B8920/func_800C14DC.s @@ -44,7 +44,7 @@ glabel func_800C14DC /* 0C2184 800C1584 0308C821 */ addu $t9, $t8, $t0 /* 0C2188 800C1588 AC590004 */ sw $t9, 4($v0) /* 0C218C 800C158C 8C820000 */ lw $v0, ($a0) -/* 0C2190 800C1590 3C0E800E */ lui $t6, 0x800e +/* 0C2190 800C1590 3C0E800E */ lui $t6, %hi(D_800E31C8) # $t6, 0x800e /* 0C2194 800C1594 244A0008 */ addiu $t2, $v0, 8 /* 0C2198 800C1598 AC8A0000 */ sw $t2, ($a0) /* 0C219C 800C159C AC4B0000 */ sw $t3, ($v0) @@ -52,7 +52,7 @@ glabel func_800C14DC /* 0C21A4 800C15A4 00000000 */ nop /* 0C21A8 800C15A8 000C6880 */ sll $t5, $t4, 2 /* 0C21AC 800C15AC 01CD7021 */ addu $t6, $t6, $t5 -/* 0C21B0 800C15B0 8DCE31C8 */ lw $t6, 0x31c8($t6) +/* 0C21B0 800C15B0 8DCE31C8 */ lw $t6, %lo(D_800E31C8)($t6) /* 0C21B4 800C15B4 00000000 */ nop /* 0C21B8 800C15B8 01C87821 */ addu $t7, $t6, $t0 /* 0C21BC 800C15BC 0C01ECF4 */ jal func_8007B3D0 diff --git a/asm/non_matchings/unknown_0B8920/func_800C2274.s b/asm/non_matchings/unknown_0B8920/func_800C2274.s index 9f56d65c..855fdf6e 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C2274.s +++ b/asm/non_matchings/unknown_0B8920/func_800C2274.s @@ -8,14 +8,14 @@ glabel func_800C2274 /* 0C2E8C 800C228C 3C03800E */ lui $v1, %hi(D_800E31D0) # $v1, 0x800e /* 0C2E90 800C2290 8C6331D0 */ lw $v1, %lo(D_800E31D0)($v1) /* 0C2E94 800C2294 8FAE0018 */ lw $t6, 0x18($sp) -/* 0C2E98 800C2298 3C07800E */ lui $a3, 0x800e +/* 0C2E98 800C2298 3C07800E */ lui $a3, %hi(D_800E31C0) # $a3, 0x800e /* 0C2E9C 800C229C 00037880 */ sll $t7, $v1, 2 /* 0C2EA0 800C22A0 8DC20000 */ lw $v0, ($t6) /* 0C2EA4 800C22A4 00EF3821 */ addu $a3, $a3, $t7 -/* 0C2EA8 800C22A8 3C08800E */ lui $t0, 0x800e -/* 0C2EAC 800C22AC 8CE731C0 */ lw $a3, 0x31c0($a3) +/* 0C2EA8 800C22A8 3C08800E */ lui $t0, %hi(D_800E31C8) # $t0, 0x800e +/* 0C2EAC 800C22AC 8CE731C0 */ lw $a3, %lo(D_800E31C0)($a3) /* 0C2EB0 800C22B0 010F4021 */ addu $t0, $t0, $t7 -/* 0C2EB4 800C22B4 8D0831C8 */ lw $t0, 0x31c8($t0) +/* 0C2EB4 800C22B4 8D0831C8 */ lw $t0, %lo(D_800E31C8)($t0) /* 0C2EB8 800C22B8 3C19800E */ lui $t9, %hi(D_800E3648) # $t9, 0x800e /* 0C2EBC 800C22BC 00402025 */ move $a0, $v0 /* 0C2EC0 800C22C0 27393648 */ addiu $t9, %lo(D_800E3648) # addiu $t9, $t9, 0x3648 diff --git a/asm/non_matchings/unknown_0B8920/func_800C23F8.s b/asm/non_matchings/unknown_0B8920/func_800C23F8.s index 4e3aae70..0845831a 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C23F8.s +++ b/asm/non_matchings/unknown_0B8920/func_800C23F8.s @@ -11,13 +11,13 @@ glabel func_800C23F8 /* 0C301C 800C241C 8C6331D0 */ lw $v1, %lo(D_800E31D0)($v1) /* 0C3020 800C2420 8DC20000 */ lw $v0, ($t6) /* 0C3024 800C2424 00037880 */ sll $t7, $v1, 2 -/* 0C3028 800C2428 3C06800E */ lui $a2, 0x800e -/* 0C302C 800C242C 3C07800E */ lui $a3, 0x800e +/* 0C3028 800C2428 3C06800E */ lui $a2, %hi(D_800E31C0) # $a2, 0x800e +/* 0C302C 800C242C 3C07800E */ lui $a3, %hi(D_800E31C8) # $a3, 0x800e /* 0C3030 800C2430 00CF3021 */ addu $a2, $a2, $t7 /* 0C3034 800C2434 00EF3821 */ addu $a3, $a3, $t7 /* 0C3038 800C2438 00402025 */ move $a0, $v0 -/* 0C303C 800C243C 8CC631C0 */ lw $a2, 0x31c0($a2) -/* 0C3040 800C2440 8CE731C8 */ lw $a3, 0x31c8($a3) +/* 0C303C 800C243C 8CC631C0 */ lw $a2, %lo(D_800E31C0)($a2) +/* 0C3040 800C2440 8CE731C8 */ lw $a3, %lo(D_800E31C8)($a3) /* 0C3044 800C2444 3C19800E */ lui $t9, %hi(D_800E3648) # $t9, 0x800e /* 0C3048 800C2448 27393648 */ addiu $t9, %lo(D_800E3648) # addiu $t9, $t9, 0x3648 /* 0C304C 800C244C 3C180600 */ lui $t8, 0x600 diff --git a/asm/non_matchings/unknown_0B8920/func_800C2548.s b/asm/non_matchings/unknown_0B8920/func_800C2548.s index 01b20f40..48980d23 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C2548.s +++ b/asm/non_matchings/unknown_0B8920/func_800C2548.s @@ -44,7 +44,7 @@ glabel func_800C2548 /* 0C31F0 800C25F0 0308C821 */ addu $t9, $t8, $t0 /* 0C31F4 800C25F4 AC590004 */ sw $t9, 4($v0) /* 0C31F8 800C25F8 8C820000 */ lw $v0, ($a0) -/* 0C31FC 800C25FC 3C0E800E */ lui $t6, 0x800e +/* 0C31FC 800C25FC 3C0E800E */ lui $t6, %hi(D_800E31C8) # $t6, 0x800e /* 0C3200 800C2600 244A0008 */ addiu $t2, $v0, 8 /* 0C3204 800C2604 AC8A0000 */ sw $t2, ($a0) /* 0C3208 800C2608 AC4B0000 */ sw $t3, ($v0) @@ -52,7 +52,7 @@ glabel func_800C2548 /* 0C3210 800C2610 00000000 */ nop /* 0C3214 800C2614 000C6880 */ sll $t5, $t4, 2 /* 0C3218 800C2618 01CD7021 */ addu $t6, $t6, $t5 -/* 0C321C 800C261C 8DCE31C8 */ lw $t6, 0x31c8($t6) +/* 0C321C 800C261C 8DCE31C8 */ lw $t6, %lo(D_800E31C8)($t6) /* 0C3220 800C2620 00000000 */ nop /* 0C3224 800C2624 01C87821 */ addu $t7, $t6, $t0 /* 0C3228 800C2628 0C01ECF4 */ jal func_8007B3D0 diff --git a/lib/asm/exception/__osException.s b/lib/asm/exception/__osException.s index d3ead3e6..fab1c365 100644 --- a/lib/asm/exception/__osException.s +++ b/lib/asm/exception/__osException.s @@ -159,9 +159,9 @@ glabel __osException /* 0D3B20 800D2F20 2401F7FF */ li $at, -2049 /* 0D3B24 800D2F24 02018024 */ and $s0, $s0, $at /* 0D3B28 800D2F28 240A0004 */ li $t2, 4 -/* 0D3B2C 800D2F2C 3C01800E */ lui $at, 0x800e +/* 0D3B2C 800D2F2C 3C01800E */ lui $at, %hi(D_800E48A0) # $at, 0x800e /* 0D3B30 800D2F30 002A0821 */ addu $at, $at, $t2 -/* 0D3B34 800D2F34 8C2A48A0 */ lw $t2, 0x48a0($at) +/* 0D3B34 800D2F34 8C2A48A0 */ lw $t2, %lo(D_800E48A0)($at) /* 0D3B38 800D2F38 3C1D8013 */ lui $sp, %hi(D_8012AAE0) # $sp, 0x8013 /* 0D3B3C 800D2F3C 27BDAAE0 */ addiu $sp, %lo(D_8012AAE0) # addiu $sp, $sp, -0x5520 /* 0D3B40 800D2F40 24040010 */ li $a0, 16 diff --git a/lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s b/lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s index 58539f14..9d88bd8a 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s @@ -158,15 +158,16 @@ glabel alEnvMixerPull /* 0CAF20 800CA320 00000000 */ nop /* 0CAF24 800CA324 A70F0018 */ sh $t7, 0x18($t8) /* 0CAF28 800CA328 8FA80038 */ lw $t0, 0x38($sp) -/* 0CAF2C 800CA32C 3C0B800E */ lui $t3, 0x800e +/* 0CAF2C 800CA32C 3C0B800E */ lui $t3, %hi(eqpower) # $t3, 0x800e /* 0CAF30 800CA330 910A0013 */ lbu $t2, 0x13($t0) /* 0CAF34 800CA334 8FB90058 */ lw $t9, 0x58($sp) /* 0CAF38 800CA338 000A4840 */ sll $t1, $t2, 1 /* 0CAF3C 800CA33C 01695821 */ addu $t3, $t3, $t1 -/* 0CAF40 800CA340 856B37A0 */ lh $t3, 0x37a0($t3) +/* 0CAF40 800CA340 856B37A0 */ lh $t3, %lo(eqpower)($t3) /* 0CAF44 800CA344 00000000 */ nop /* 0CAF48 800CA348 A72B0020 */ sh $t3, 0x20($t9) /* 0CAF4C 800CA34C 8FAC0038 */ lw $t4, 0x38($sp) +# This is indexing into eqpower (0x800E37A0) from the end /* 0CAF50 800CA350 3C18800E */ lui $t8, 0x800e /* 0CAF54 800CA354 918D0013 */ lbu $t5, 0x13($t4) /* 0CAF58 800CA358 8FA80058 */ lw $t0, 0x58($sp) @@ -191,18 +192,19 @@ glabel alEnvMixerPull /* 0CAFA4 800CA3A4 A5AC001E */ sh $t4, 0x1e($t5) .L800CA3A8: /* 0CAFA8 800CA3A8 8FAE0058 */ lw $t6, 0x58($sp) -/* 0CAFAC 800CA3AC 3C08800E */ lui $t0, 0x800e +/* 0CAFAC 800CA3AC 3C08800E */ lui $t0, %hi(eqpower) # $t0, 0x800e /* 0CAFB0 800CA3B0 85CF0018 */ lh $t7, 0x18($t6) /* 0CAFB4 800CA3B4 85CA001A */ lh $t2, 0x1a($t6) /* 0CAFB8 800CA3B8 000FC040 */ sll $t8, $t7, 1 /* 0CAFBC 800CA3BC 01184021 */ addu $t0, $t0, $t8 -/* 0CAFC0 800CA3C0 850837A0 */ lh $t0, 0x37a0($t0) +/* 0CAFC0 800CA3C0 850837A0 */ lh $t0, %lo(eqpower)($t0) /* 0CAFC4 800CA3C4 00000000 */ nop /* 0CAFC8 800CA3C8 010A0019 */ multu $t0, $t2 /* 0CAFCC 800CA3CC 00004812 */ mflo $t1 /* 0CAFD0 800CA3D0 00095BC3 */ sra $t3, $t1, 0xf /* 0CAFD4 800CA3D4 A5CB001C */ sh $t3, 0x1c($t6) /* 0CAFD8 800CA3D8 8FB90058 */ lw $t9, 0x58($sp) +# This is indexing into eqpower (0x800E37A0) from the end /* 0CAFDC 800CA3DC 3C18800E */ lui $t8, 0x800e /* 0CAFE0 800CA3E0 872C0018 */ lh $t4, 0x18($t9) /* 0CAFE4 800CA3E4 8728001A */ lh $t0, 0x1a($t9) @@ -263,18 +265,19 @@ glabel alEnvMixerPull /* 0CB0B8 800CA4B8 14200029 */ bnez $at, .L800CA560 /* 0CB0BC 800CA4BC 00000000 */ nop /* 0CB0C0 800CA4C0 8FB90058 */ lw $t9, 0x58($sp) -/* 0CB0C4 800CA4C4 3C09800E */ lui $t1, 0x800e +/* 0CB0C4 800CA4C4 3C09800E */ lui $t1, %hi(eqpower) # $t1, 0x800e /* 0CB0C8 800CA4C8 87380018 */ lh $t8, 0x18($t9) /* 0CB0CC 800CA4CC 872B001A */ lh $t3, 0x1a($t9) /* 0CB0D0 800CA4D0 00184040 */ sll $t0, $t8, 1 /* 0CB0D4 800CA4D4 01284821 */ addu $t1, $t1, $t0 -/* 0CB0D8 800CA4D8 852937A0 */ lh $t1, 0x37a0($t1) +/* 0CB0D8 800CA4D8 852937A0 */ lh $t1, %lo(eqpower)($t1) /* 0CB0DC 800CA4DC 00000000 */ nop /* 0CB0E0 800CA4E0 012B0019 */ multu $t1, $t3 /* 0CB0E4 800CA4E4 00007012 */ mflo $t6 /* 0CB0E8 800CA4E8 000E53C3 */ sra $t2, $t6, 0xf /* 0CB0EC 800CA4EC A72A0028 */ sh $t2, 0x28($t9) /* 0CB0F0 800CA4F0 8FAC0058 */ lw $t4, 0x58($sp) +# This is indexing into eqpower (0x800E37A0) from the end /* 0CB0F4 800CA4F4 3C08800E */ lui $t0, 0x800e /* 0CB0F8 800CA4F8 858D0018 */ lh $t5, 0x18($t4) /* 0CB0FC 800CA4FC 8589001A */ lh $t1, 0x1a($t4) @@ -428,17 +431,18 @@ glabel alEnvMixerPull /* 0CB330 800CA730 15C10018 */ bne $t6, $at, .L800CA794 /* 0CB334 800CA734 00000000 */ nop /* 0CB338 800CA738 8FAC0058 */ lw $t4, 0x58($sp) -/* 0CB33C 800CA73C 3C0D800E */ lui $t5, 0x800e +/* 0CB33C 800CA73C 3C0D800E */ lui $t5, %hi(eqpower) # $t5, 0x800e /* 0CB340 800CA740 8D89003C */ lw $t1, 0x3c($t4) /* 0CB344 800CA744 00000000 */ nop /* 0CB348 800CA748 8D39000C */ lw $t9, 0xc($t1) /* 0CB34C 800CA74C 00000000 */ nop /* 0CB350 800CA750 00197840 */ sll $t7, $t9, 1 /* 0CB354 800CA754 01AF6821 */ addu $t5, $t5, $t7 -/* 0CB358 800CA758 85AD37A0 */ lh $t5, 0x37a0($t5) +/* 0CB358 800CA758 85AD37A0 */ lh $t5, %lo(eqpower)($t5) /* 0CB35C 800CA75C 00000000 */ nop /* 0CB360 800CA760 A58D0020 */ sh $t5, 0x20($t4) /* 0CB364 800CA764 8FA80058 */ lw $t0, 0x58($sp) +# This is indexing into eqpower (0x800E37A0) from the end /* 0CB368 800CA768 3C09800E */ lui $t1, 0x800e /* 0CB36C 800CA76C 8D0A003C */ lw $t2, 0x3c($t0) /* 0CB370 800CA770 00000000 */ nop diff --git a/lib/asm/non_matchings/unknown_0CA9A0/func_800CAC5C.s b/lib/asm/non_matchings/unknown_0CA9A0/func_800CAC5C.s index c34241b8..7dbcf758 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/func_800CAC5C.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/func_800CAC5C.s @@ -105,12 +105,12 @@ glabel func_800CAC5C /* 0CB9EC 800CADEC 00000000 */ nop /* 0CB9F0 800CADF0 AD600038 */ sw $zero, 0x38($t3) /* 0CB9F4 800CADF4 8FA90048 */ lw $t1, 0x48($sp) -/* 0CB9F8 800CADF8 3C0A800E */ lui $t2, 0x800e +/* 0CB9F8 800CADF8 3C0A800E */ lui $t2, %hi(eqpower) # $t2, 0x800e /* 0CB9FC 800CADFC 85390018 */ lh $t9, 0x18($t1) /* 0CBA00 800CAE00 852E001A */ lh $t6, 0x1a($t1) /* 0CBA04 800CAE04 00196040 */ sll $t4, $t9, 1 /* 0CBA08 800CAE08 014C5021 */ addu $t2, $t2, $t4 -/* 0CBA0C 800CAE0C 854A37A0 */ lh $t2, 0x37a0($t2) +/* 0CBA0C 800CAE0C 854A37A0 */ lh $t2, %lo(eqpower)($t2) /* 0CBA10 800CAE10 00000000 */ nop /* 0CBA14 800CAE14 014E0019 */ multu $t2, $t6 /* 0CBA18 800CAE18 00007812 */ mflo $t7 @@ -133,6 +133,7 @@ glabel func_800CAC5C /* 0CBA5C 800CAE5C 00000000 */ nop /* 0CBA60 800CAE60 A5420026 */ sh $v0, 0x26($t2) /* 0CBA64 800CAE64 8FAE0048 */ lw $t6, 0x48($sp) +# This is indexing into eqpower (0x800E37A0) from the end /* 0CBA68 800CAE68 3C08800E */ lui $t0, 0x800e /* 0CBA6C 800CAE6C 85CF0018 */ lh $t7, 0x18($t6) /* 0CBA70 800CAE70 85CB001A */ lh $t3, 0x1a($t6) diff --git a/lib/asm/non_matchings/unknown_0D3020/func_800D2470.s b/lib/asm/non_matchings/unknown_0D3020/func_800D2470.s index 470ded43..9d7193e6 100644 --- a/lib/asm/non_matchings/unknown_0D3020/func_800D2470.s +++ b/lib/asm/non_matchings/unknown_0D3020/func_800D2470.s @@ -1,6 +1,6 @@ glabel func_800D2470 -/* 0D3070 800D2470 3C02800E */ lui $v0, 0x800e +/* 0D3070 800D2470 3C02800E */ lui $v0, %hi(__osActiveQueue) # $v0, 0x800e /* 0D3074 800D2474 03E00008 */ jr $ra -/* 0D3078 800D2478 8C42488C */ lw $v0, 0x488c($v0) +/* 0D3078 800D2478 8C42488C */ lw $v0, %lo(__osActiveQueue)($v0) /* 0D307C 800D247C 00000000 */ nop diff --git a/lib/src/unknown_0D43F0.c b/lib/src/unknown_0D43F0.c index 36b95882..78c8dc8c 100644 --- a/lib/src/unknown_0D43F0.c +++ b/lib/src/unknown_0D43F0.c @@ -4,7 +4,6 @@ #include "types.h" #include "macros.h" -// Unused? Probably unrelated to this file, but not sure what it could be. s32 D_800E48A0[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; GLOBAL_ASM("lib/asm/non_matchings/unknown_0D43F0/alCopy.s") diff --git a/undefined_syms.txt b/undefined_syms.txt index e9560c95..677bec0a 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -768,6 +768,7 @@ D_800E3778 = 0x800E3778; D_800E377C = 0x800E377C; alGlobals = 0x800E3780; D_800E3790 = 0x800E3790; +eqpower = 0x800E37A0; D_800E38A0 = 0x800E38A0; D_800E38A4 = 0x800E38A4; D_800E38A8 = 0x800E38A8; From d2c9e706c8485cd9fdafd3174f30841eb06efcc1 Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Fri, 28 May 2021 11:46:11 -0700 Subject: [PATCH 34/39] Added glabels whose upper/lower usage has label definitions inbetween. --- asm/non_matchings/unknown_003260/func_80002C00.s | 4 ++-- asm/non_matchings/unknown_07B870/func_8007C57C.s | 4 ++-- asm/non_matchings/unknown_080500/func_80094D28.s | 4 ++-- asm/non_matchings/unknown_09F8F0/func_800A01A0.s | 6 +++--- asm/non_matchings/unknown_09F8F0/func_800ACA20.s | 4 ++-- tools/python/find_glabels.py | 12 ++++++------ 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/asm/non_matchings/unknown_003260/func_80002C00.s b/asm/non_matchings/unknown_003260/func_80002C00.s index 92e7924a..eb4e0731 100644 --- a/asm/non_matchings/unknown_003260/func_80002C00.s +++ b/asm/non_matchings/unknown_003260/func_80002C00.s @@ -46,7 +46,7 @@ glabel func_80002C00 /* 0038AC 80002CAC 3C0B800E */ lui $t3, %hi(D_800DC688) # $t3, 0x800e /* 0038B0 80002CB0 00E3082B */ sltu $at, $a3, $v1 /* 0038B4 80002CB4 10200004 */ beqz $at, .L80002CC8 -/* 0038B8 80002CB8 3C048011 */ lui $a0, 0x8011 +/* 0038B8 80002CB8 3C048011 */ lui $a0, %hi(D_80115F98) # $a0, 0x8011 /* 0038BC 80002CBC A6030004 */ sh $v1, 4($s0) /* 0038C0 80002CC0 86070004 */ lh $a3, 4($s0) /* 0038C4 80002CC4 00000000 */ nop @@ -55,7 +55,7 @@ glabel func_80002C00 /* 0038CC 80002CCC 3C058012 */ lui $a1, %hi(D_80119634) # $a1, 0x8012 /* 0038D0 80002CD0 000B6080 */ sll $t4, $t3, 2 /* 0038D4 80002CD4 008C2021 */ addu $a0, $a0, $t4 -/* 0038D8 80002CD8 8C845F98 */ lw $a0, 0x5f98($a0) +/* 0038D8 80002CD8 8C845F98 */ lw $a0, %lo(D_80115F98)($a0) /* 0038DC 80002CDC 8FA60024 */ lw $a2, 0x24($sp) /* 0038E0 80002CE0 0C019525 */ jal alAudioFrame /* 0038E4 80002CE4 24A59634 */ addiu $a1, %lo(D_80119634) # addiu $a1, $a1, -0x69cc diff --git a/asm/non_matchings/unknown_07B870/func_8007C57C.s b/asm/non_matchings/unknown_07B870/func_8007C57C.s index 99f364f4..a40f4aeb 100644 --- a/asm/non_matchings/unknown_07B870/func_8007C57C.s +++ b/asm/non_matchings/unknown_07B870/func_8007C57C.s @@ -21,13 +21,13 @@ glabel func_8007C57C /* 07D1C4 8007C5C4 10200003 */ beqz $at, .L8007C5D4 /* 07D1C8 8007C5C8 00000000 */ nop /* 07D1CC 8007C5CC 04810003 */ bgez $a0, .L8007C5DC -/* 07D1D0 8007C5D0 3C098012 */ lui $t1, 0x8012 +/* 07D1D0 8007C5D0 3C098012 */ lui $t1, %hi(D_80126320) # $t1, 0x8012 .L8007C5D4: /* 07D1D4 8007C5D4 1000001E */ b .L8007C650 /* 07D1D8 8007C5D8 00001025 */ move $v0, $zero .L8007C5DC: /* 07D1DC 8007C5DC 01234821 */ addu $t1, $t1, $v1 -/* 07D1E0 8007C5E0 8D296320 */ lw $t1, 0x6320($t1) +/* 07D1E0 8007C5E0 8D296320 */ lw $t1, %lo(D_80126320)($t1) /* 07D1E4 8007C5E4 00045080 */ sll $t2, $a0, 2 /* 07D1E8 8007C5E8 3C058012 */ lui $a1, %hi(D_8012636C) # $a1, 0x8012 /* 07D1EC 8007C5EC 8CA5636C */ lw $a1, %lo(D_8012636C)($a1) diff --git a/asm/non_matchings/unknown_080500/func_80094D28.s b/asm/non_matchings/unknown_080500/func_80094D28.s index 9d77d78c..ea0e7827 100644 --- a/asm/non_matchings/unknown_080500/func_80094D28.s +++ b/asm/non_matchings/unknown_080500/func_80094D28.s @@ -344,7 +344,7 @@ glabel func_80094D28 .L80095220: /* 095E20 80095220 3C0D8012 */ lui $t5, %hi(D_80126C1C) # $t5, 0x8012 /* 095E24 80095224 8DAD6C1C */ lw $t5, %lo(D_80126C1C)($t5) -/* 095E28 80095228 3C108012 */ lui $s0, 0x8012 +/* 095E28 80095228 3C108012 */ lui $s0, %hi(D_80126C14) # $s0, 0x8012 /* 095E2C 8009522C 11A00005 */ beqz $t5, .L80095244 /* 095E30 80095230 00000000 */ nop /* 095E34 80095234 3C108012 */ lui $s0, %hi(D_80126C24) # $s0, 0x8012 @@ -352,7 +352,7 @@ glabel func_80094D28 /* 095E3C 8009523C 10000004 */ b .L80095250 /* 095E40 80095240 2A010005 */ slti $at, $s0, 5 .L80095244: -/* 095E44 80095244 8E106C14 */ lw $s0, 0x6c14($s0) +/* 095E44 80095244 8E106C14 */ lw $s0, %lo(D_80126C14)($s0) /* 095E48 80095248 00000000 */ nop .L8009524C: /* 095E4C 8009524C 2A010005 */ slti $at, $s0, 5 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A01A0.s b/asm/non_matchings/unknown_09F8F0/func_800A01A0.s index d6e31d9e..b616f3cd 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A01A0.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A01A0.s @@ -127,7 +127,7 @@ glabel func_800A01A0 /* 0A0F78 800A0378 1041008B */ beq $v0, $at, .L800A05A8 /* 0A0F7C 800A037C 3C0F8012 */ lui $t7, %hi(D_80126D0C) # $t7, 0x8012 /* 0A0F80 800A0380 8DEF6D0C */ lw $t7, %lo(D_80126D0C)($t7) -/* 0A0F84 800A0384 3C048012 */ lui $a0, 0x8012 +/* 0A0F84 800A0384 3C048012 */ lui $a0, %hi(D_80126D10) # $a0, 0x8012 /* 0A0F88 800A0388 15E0002F */ bnez $t7, .L800A0448 /* 0A0F8C 800A038C 00000000 */ nop /* 0A0F90 800A0390 3C048012 */ lui $a0, %hi(D_80126D10) # $a0, 0x8012 @@ -171,7 +171,7 @@ glabel func_800A01A0 /* 0A1024 800A0424 904F0000 */ lbu $t7, ($v0) /* 0A1028 800A0428 24190078 */ li $t9, 120 /* 0A102C 800A042C 11E00004 */ beqz $t7, .L800A0440 -/* 0A1030 800A0430 3C01800E */ lui $at, 0x800e +/* 0A1030 800A0430 3C01800E */ lui $at, %hi(D_800E27B8) # $at, 0x800e /* 0A1034 800A0434 3C01800E */ lui $at, %hi(D_800E27B8) # $at, 0x800e /* 0A1038 800A0438 10000034 */ b .L800A050C /* 0A103C 800A043C A03927B8 */ sb $t9, %lo(D_800E27B8)($at) @@ -179,7 +179,7 @@ glabel func_800A01A0 /* 0A1040 800A0440 10000032 */ b .L800A050C /* 0A1044 800A0444 A02027B8 */ sb $zero, %lo(D_800E27B8)($at) .L800A0448: -/* 0A1048 800A0448 8C846D10 */ lw $a0, 0x6d10($a0) +/* 0A1048 800A0448 8C846D10 */ lw $a0, %lo(D_80126D10)($a0) /* 0A104C 800A044C 0C01A955 */ jal func_8006A554 /* 0A1050 800A0450 00000000 */ nop /* 0A1054 800A0454 30480004 */ andi $t0, $v0, 4 diff --git a/asm/non_matchings/unknown_09F8F0/func_800ACA20.s b/asm/non_matchings/unknown_09F8F0/func_800ACA20.s index 757ec4e7..6b27c6b1 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800ACA20.s +++ b/asm/non_matchings/unknown_09F8F0/func_800ACA20.s @@ -124,13 +124,13 @@ glabel func_800ACA20 /* 0AD804 800ACC04 00000000 */ nop .L800ACC08: /* 0AD808 800ACC08 16420005 */ bne $s2, $v0, .L800ACC20 -/* 0AD80C 800ACC0C 3C108012 */ lui $s0, 0x8012 +/* 0AD80C 800ACC0C 3C108012 */ lui $s0, %hi(D_80127C28) # $s0, 0x8012 /* 0AD810 800ACC10 3C108012 */ lui $s0, %hi(D_80127C24) # $s0, 0x8012 /* 0AD814 800ACC14 8E107C24 */ lw $s0, %lo(D_80127C24)($s0) /* 0AD818 800ACC18 10000003 */ b .L800ACC28 /* 0AD81C 800ACC1C 00000000 */ nop .L800ACC20: -/* 0AD820 800ACC20 8E107C28 */ lw $s0, 0x7c28($s0) +/* 0AD820 800ACC20 8E107C28 */ lw $s0, %lo(D_80127C28)($s0) /* 0AD824 800ACC24 00000000 */ nop .L800ACC28: /* 0AD828 800ACC28 12000058 */ beqz $s0, .L800ACD8C diff --git a/tools/python/find_glabels.py b/tools/python/find_glabels.py index 1703d6d9..df02dfc5 100644 --- a/tools/python/find_glabels.py +++ b/tools/python/find_glabels.py @@ -2,20 +2,20 @@ import re from file_util import FileUtil -LINE_START_REGEX = r'\n/\* ([0-9A-F]{6}) [0-9A-F]{8} [0-9A-F]{8} \*/\s+' +LINE_START_REGEX = r'\n(/\* ([0-9A-F]{6}) [0-9A-F]{8} [0-9A-F]{8} \*/\s+|\.L80[0-9A-F]{6}:)' REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|k[0-1]|gp|sp|fp|ra))' GLABEL_UPPER_REGEX = '(' + LINE_START_REGEX + r'lui\s+' + REG_REGEX + r',\s+(0x80[0-9a-f]{2}))' -GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'l[bhw]\s+' + REG_REGEX + r',\s+(0x[0-9a-f]{4})\(\3\))' -GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '[^\n]*(?=\n)){0,10}' + GLABEL_LOWER_REGEX +GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'l[bhw]\s+' + REG_REGEX + r',\s+(0x[0-9a-f]{4})\(\4\))' +GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '[^\n]*){0,10}' + GLABEL_LOWER_REGEX def _find_glabels(asm): glabels = [] for file in FileUtil.get_filenames_from_directory_recursive('.', '.s'): matches = re.findall(GLABEL_REGEX, FileUtil.get_text_from_file(file)) for match in matches: - offsets = (match[1], match[8]) # ROM offsets of the lu and lw - glabel_upper = int(match[4], 16) # upper immediate of glabel - glabel_lower = int(match[11], 16) # lower immediate of the glabel + offsets = (match[2], match[11]) # ROM offsets of the lu and lw + glabel_upper = int(match[5], 16) # upper immediate of glabel + glabel_lower = int(match[14], 16) # lower immediate of the glabel if glabel_lower & 0x8000: glabel_upper -= 1 glabel = 'D_%08X' % (glabel_upper << 16 | glabel_lower) From 2455eb42b829b04f342d233864cb8c5a03205e6a Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Fri, 28 May 2021 12:08:54 -0700 Subject: [PATCH 35/39] Added glabels that are written to. --- asm/non_matchings/unknown_066AA0/func_8006EFDC.s | 4 ++-- asm/non_matchings/unknown_07AF10/func_8007AB24.s | 4 ++-- asm/non_matchings/unknown_07AF10/func_8007AB9C.s | 4 ++-- .../unknown_080500/MenuMagicCodesLoop.s | 4 ++-- asm/non_matchings/unknown_080500/func_8007FFEC.s | 4 ++-- asm/non_matchings/unknown_080500/func_8008BB3C.s | 4 ++-- asm/non_matchings/unknown_080500/func_80095728.s | 4 ++-- asm/non_matchings/unknown_080500/func_800998E0.s | 4 ++-- asm/non_matchings/unknown_080500/func_8009C6D4.s | 16 ++++++++-------- asm/non_matchings/unknown_09F8F0/func_800AB1D4.s | 4 ++-- asm/non_matchings/unknown_09F8F0/func_800AC5A4.s | 4 ++-- asm/non_matchings/unknown_09F8F0/func_800ACF60.s | 4 ++-- asm/non_matchings/unknown_09F8F0/func_800AD40C.s | 4 ++-- asm/non_matchings/unknown_0AEE70/func_800B4A08.s | 4 ++-- asm/non_matchings/unknown_0AEE70/func_800B6E50.s | 4 ++-- asm/non_matchings/unknown_0AEE70/func_800B6EE0.s | 4 ++-- asm/non_matchings/unknown_0B8920/func_800C0780.s | 4 ++-- asm/non_matchings/unknown_0B8920/func_800C2640.s | 4 ++-- asm/non_matchings/unknown_0B8920/func_800C3158.s | 4 ++-- .../non_matchings/unknown_0D5390/func_800D47F0.s | 4 ++-- tools/python/find_glabels.py | 4 ++-- undefined_syms.txt | 1 + 22 files changed, 49 insertions(+), 48 deletions(-) diff --git a/asm/non_matchings/unknown_066AA0/func_8006EFDC.s b/asm/non_matchings/unknown_066AA0/func_8006EFDC.s index 004ba782..b76fb2bb 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006EFDC.s +++ b/asm/non_matchings/unknown_066AA0/func_8006EFDC.s @@ -84,8 +84,8 @@ glabel func_8006EFDC /* 06FD24 8006F124 3C018012 */ lui $at, %hi(D_80123530) # $at, 0x8012 /* 06FD28 8006F128 8FBF0014 */ lw $ra, 0x14($sp) /* 06FD2C 8006F12C AC2C3530 */ sw $t4, %lo(D_80123530)($at) -/* 06FD30 8006F130 3C018012 */ lui $at, 0x8012 +/* 06FD30 8006F130 3C018012 */ lui $at, %hi(D_80123534) # $at, 0x8012 /* 06FD34 8006F134 27BD0020 */ addiu $sp, $sp, 0x20 /* 06FD38 8006F138 03E00008 */ jr $ra -/* 06FD3C 8006F13C AC263534 */ sw $a2, 0x3534($at) +/* 06FD3C 8006F13C AC263534 */ sw $a2, %lo(D_80123534)($at) diff --git a/asm/non_matchings/unknown_07AF10/func_8007AB24.s b/asm/non_matchings/unknown_07AF10/func_8007AB24.s index a50f064b..958e9755 100644 --- a/asm/non_matchings/unknown_07AF10/func_8007AB24.s +++ b/asm/non_matchings/unknown_07AF10/func_8007AB24.s @@ -1,8 +1,8 @@ glabel func_8007AB24 -/* 07B724 8007AB24 3C018012 */ lui $at, 0x8012 +/* 07B724 8007AB24 3C018012 */ lui $at, %hi(D_801262E4) # $at, 0x8012 /* 07B728 8007AB28 AFA40000 */ sw $a0, ($sp) /* 07B72C 8007AB2C 03E00008 */ jr $ra -/* 07B730 8007AB30 A02462E4 */ sb $a0, 0x62e4($at) +/* 07B730 8007AB30 A02462E4 */ sb $a0, %lo(D_801262E4)($at) /* 07B734 8007AB34 3C0E8012 */ lui $t6, %hi(D_80126170) # $t6, 0x8012 /* 07B738 8007AB38 8DCE6170 */ lw $t6, %lo(D_80126170)($t6) diff --git a/asm/non_matchings/unknown_07AF10/func_8007AB9C.s b/asm/non_matchings/unknown_07AF10/func_8007AB9C.s index 653952e3..c3a8e562 100644 --- a/asm/non_matchings/unknown_07AF10/func_8007AB9C.s +++ b/asm/non_matchings/unknown_07AF10/func_8007AB9C.s @@ -20,7 +20,7 @@ glabel func_8007AB9C /* 07B7E4 8007ABE4 ACB90000 */ sw $t9, ($a1) /* 07B7E8 8007ABE8 3C018012 */ lui $at, %hi(D_801262D4) # $at, 0x8012 /* 07B7EC 8007ABEC AC2B62D4 */ sw $t3, %lo(D_801262D4)($at) -/* 07B7F0 8007ABF0 3C018012 */ lui $at, 0x8012 +/* 07B7F0 8007ABF0 3C018012 */ lui $at, %hi(D_801262DC) # $at, 0x8012 /* 07B7F4 8007ABF4 03E00008 */ jr $ra -/* 07B7F8 8007ABF8 AC2362DC */ sw $v1, 0x62dc($at) +/* 07B7F8 8007ABF8 AC2362DC */ sw $v1, %lo(D_801262DC)($at) diff --git a/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s b/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s index cf2ab64c..a7423760 100644 --- a/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s +++ b/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s @@ -207,11 +207,11 @@ glabel MenuMagicCodesLoop /* 08ABC8 80089FC8 0004C0C0 */ sll $t8, $a0, 3 /* 08ABCC 80089FCC 0304C023 */ subu $t8, $t8, $a0 /* 08ABD0 80089FD0 0303C821 */ addu $t9, $t8, $v1 -/* 08ABD4 80089FD4 3C018012 */ lui $at, 0x8012 +/* 08ABD4 80089FD4 3C018012 */ lui $at, %hi(D_80126C58) # $at, 0x8012 /* 08ABD8 80089FD8 AFAF0038 */ sw $t7, 0x38($sp) /* 08ABDC 80089FDC 00220821 */ addu $at, $at, $v0 /* 08ABE0 80089FE0 272E0041 */ addiu $t6, $t9, 0x41 -/* 08ABE4 80089FE4 A02E6C58 */ sb $t6, 0x6c58($at) +/* 08ABE4 80089FE4 A02E6C58 */ sb $t6, %lo(D_80126C58)($at) /* 08ABE8 80089FE8 244F0001 */ addiu $t7, $v0, 1 /* 08ABEC 80089FEC A4CF0000 */ sh $t7, ($a2) /* 08ABF0 80089FF0 84D80000 */ lh $t8, ($a2) diff --git a/asm/non_matchings/unknown_080500/func_8007FFEC.s b/asm/non_matchings/unknown_080500/func_8007FFEC.s index edae6e8b..1236f4d8 100644 --- a/asm/non_matchings/unknown_080500/func_8007FFEC.s +++ b/asm/non_matchings/unknown_080500/func_8007FFEC.s @@ -361,10 +361,10 @@ glabel func_8007FFEC /* 08115C 8008055C 37010003 */ ori $at, $t8, 3 /* 081160 80080560 38210002 */ xori $at, $at, 2 /* 081164 80080564 44C1F800 */ ctc1 $at, $31 -/* 081168 80080568 3C01800E */ lui $at, 0x800e +/* 081168 80080568 3C01800E */ lui $at, %hi(D_800E1DC4) # $at, 0x800e /* 08116C 8008056C 460042A4 */ cvt.w.s $f10, $f8 /* 081170 80080570 44195000 */ mfc1 $t9, $f10 /* 081174 80080574 44D8F800 */ ctc1 $t8, $31 /* 081178 80080578 03E00008 */ jr $ra -/* 08117C 8008057C AC391DC4 */ sw $t9, 0x1dc4($at) +/* 08117C 8008057C AC391DC4 */ sw $t9, %lo(D_800E1DC4)($at) diff --git a/asm/non_matchings/unknown_080500/func_8008BB3C.s b/asm/non_matchings/unknown_080500/func_8008BB3C.s index 86155ed8..07d178cc 100644 --- a/asm/non_matchings/unknown_080500/func_8008BB3C.s +++ b/asm/non_matchings/unknown_080500/func_8008BB3C.s @@ -44,9 +44,9 @@ glabel func_8008BB3C .L8008BBD4: /* 08C7D4 8008BBD4 16200005 */ bnez $s1, .L8008BBEC /* 08C7D8 8008BBD8 24030009 */ li $v1, 9 -/* 08C7DC 8008BBDC 3C018012 */ lui $at, 0x8012 +/* 08C7DC 8008BBDC 3C018012 */ lui $at, %hi(D_801263F0) # $at, 0x8012 /* 08C7E0 8008BBE0 00300821 */ addu $at, $at, $s0 -/* 08C7E4 8008BBE4 A02363F0 */ sb $v1, 0x63f0($at) +/* 08C7E4 8008BBE4 A02363F0 */ sb $v1, %lo(D_801263F0)($at) /* 08C7E8 8008BBE8 26100001 */ addiu $s0, $s0, 1 .L8008BBEC: /* 08C7EC 8008BBEC 2A010008 */ slti $at, $s0, 8 diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index e57f5a8f..0b343c60 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -565,10 +565,10 @@ glabel func_80095728 /* 096B88 80095F88 8F18F4A0 */ lw $t8, %lo(D_800DF4A0)($t8) /* 096B8C 80095F8C 8CCD0000 */ lw $t5, ($a2) /* 096B90 80095F90 8F190070 */ lw $t9, 0x70($t8) -/* 096B94 80095F94 3C018012 */ lui $at, 0x8012 +/* 096B94 80095F94 3C018012 */ lui $at, %hi(D_80126BF0) # $at, 0x8012 /* 096B98 80095F98 000D6080 */ sll $t4, $t5, 2 /* 096B9C 80095F9C 002C0821 */ addu $at, $at, $t4 -/* 096BA0 80095FA0 AC396BF0 */ sw $t9, 0x6bf0($at) +/* 096BA0 80095FA0 AC396BF0 */ sw $t9, %lo(D_80126BF0)($at) /* 096BA4 80095FA4 8D2E0000 */ lw $t6, ($t1) /* 096BA8 80095FA8 ACC00000 */ sw $zero, ($a2) /* 096BAC 80095FAC 25CFFFFF */ addiu $t7, $t6, -1 diff --git a/asm/non_matchings/unknown_080500/func_800998E0.s b/asm/non_matchings/unknown_080500/func_800998E0.s index 42706c1f..61bd59d5 100644 --- a/asm/non_matchings/unknown_080500/func_800998E0.s +++ b/asm/non_matchings/unknown_080500/func_800998E0.s @@ -27,10 +27,10 @@ glabel func_800998E0 /* 09A544 80099944 246364D4 */ addiu $v1, %lo(D_801264D4) # addiu $v1, $v1, 0x64d4 /* 09A548 80099948 1440003F */ bnez $v0, .L80099A48 /* 09A54C 8009994C 00405025 */ move $t2, $v0 -/* 09A550 80099950 3C018012 */ lui $at, 0x8012 +/* 09A550 80099950 3C018012 */ lui $at, %hi(D_801264DC) # $at, 0x8012 /* 09A554 80099954 00300821 */ addu $at, $at, $s0 /* 09A558 80099958 240F00FF */ li $t7, 255 -/* 09A55C 8009995C A02F64DC */ sb $t7, 0x64dc($at) +/* 09A55C 8009995C A02F64DC */ sb $t7, %lo(D_801264DC)($at) /* 09A560 80099960 8C780000 */ lw $t8, ($v1) /* 09A564 80099964 00C04025 */ move $t0, $a2 /* 09A568 80099968 2719FFFF */ addiu $t9, $t8, -1 diff --git a/asm/non_matchings/unknown_080500/func_8009C6D4.s b/asm/non_matchings/unknown_080500/func_8009C6D4.s index 72da2116..0dd55927 100644 --- a/asm/non_matchings/unknown_080500/func_8009C6D4.s +++ b/asm/non_matchings/unknown_080500/func_8009C6D4.s @@ -64,11 +64,11 @@ glabel func_8009C6D4 /* 09D3BC 8009C7BC 0C01EB9D */ jal func_8007AE74 /* 09D3C0 8009C7C0 AFA70038 */ sw $a3, 0x38($sp) /* 09D3C4 8009C7C4 8FA70038 */ lw $a3, 0x38($sp) -/* 09D3C8 8009C7C8 3C018012 */ lui $at, 0x8012 +/* 09D3C8 8009C7C8 3C018012 */ lui $at, %hi(D_80126550) # $at, 0x8012 /* 09D3CC 8009C7CC 00075880 */ sll $t3, $a3, 2 /* 09D3D0 8009C7D0 002B0821 */ addu $at, $at, $t3 /* 09D3D4 8009C7D4 10000027 */ b .L8009C874 -/* 09D3D8 8009C7D8 AC226550 */ sw $v0, 0x6550($at) +/* 09D3D8 8009C7D8 AC226550 */ sw $v0, %lo(D_80126550)($at) .L8009C7DC: /* 09D3DC 8009C7DC 1180000B */ beqz $t4, .L8009C80C /* 09D3E0 8009C7E0 304E4000 */ andi $t6, $v0, 0x4000 @@ -77,11 +77,11 @@ glabel func_8009C6D4 /* 09D3EC 8009C7EC 0C01F04B */ jal func_8007C12C /* 09D3F0 8009C7F0 AFA70038 */ sw $a3, 0x38($sp) /* 09D3F4 8009C7F4 8FA70038 */ lw $a3, 0x38($sp) -/* 09D3F8 8009C7F8 3C018012 */ lui $at, 0x8012 +/* 09D3F8 8009C7F8 3C018012 */ lui $at, %hi(D_80126550) # $at, 0x8012 /* 09D3FC 8009C7FC 00076880 */ sll $t5, $a3, 2 /* 09D400 8009C800 002D0821 */ addu $at, $at, $t5 /* 09D404 8009C804 1000001B */ b .L8009C874 -/* 09D408 8009C808 AC226550 */ sw $v0, 0x6550($at) +/* 09D408 8009C808 AC226550 */ sw $v0, %lo(D_80126550)($at) .L8009C80C: /* 09D40C 8009C80C 11C00011 */ beqz $t6, .L8009C854 /* 09D410 8009C810 30443FFF */ andi $a0, $v0, 0x3fff @@ -96,20 +96,20 @@ glabel func_8009C6D4 /* 09D434 8009C834 0C003A95 */ jal func_8000EA54 /* 09D438 8009C838 AFA70038 */ sw $a3, 0x38($sp) /* 09D43C 8009C83C 8FA70038 */ lw $a3, 0x38($sp) -/* 09D440 8009C840 3C018012 */ lui $at, 0x8012 +/* 09D440 8009C840 3C018012 */ lui $at, %hi(D_80126550) # $at, 0x8012 /* 09D444 8009C844 0007C880 */ sll $t9, $a3, 2 /* 09D448 8009C848 00390821 */ addu $at, $at, $t9 /* 09D44C 8009C84C 10000009 */ b .L8009C874 -/* 09D450 8009C850 AC226550 */ sw $v0, 0x6550($at) +/* 09D450 8009C850 AC226550 */ sw $v0, %lo(D_80126550)($at) .L8009C854: /* 09D454 8009C854 00002825 */ move $a1, $zero /* 09D458 8009C858 0C017E67 */ jal func_8005F99C /* 09D45C 8009C85C AFA70038 */ sw $a3, 0x38($sp) /* 09D460 8009C860 8FA70038 */ lw $a3, 0x38($sp) -/* 09D464 8009C864 3C018012 */ lui $at, 0x8012 +/* 09D464 8009C864 3C018012 */ lui $at, %hi(D_80126550) # $at, 0x8012 /* 09D468 8009C868 00074880 */ sll $t1, $a3, 2 /* 09D46C 8009C86C 00290821 */ addu $at, $at, $t1 -/* 09D470 8009C870 AC226550 */ sw $v0, 0x6550($at) +/* 09D470 8009C870 AC226550 */ sw $v0, %lo(D_80126550)($at) .L8009C874: /* 09D474 8009C874 8FAB0024 */ lw $t3, 0x24($sp) /* 09D478 8009C878 240A0001 */ li $t2, 1 diff --git a/asm/non_matchings/unknown_09F8F0/func_800AB1D4.s b/asm/non_matchings/unknown_09F8F0/func_800AB1D4.s index c6cfc01f..9c9d0471 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AB1D4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AB1D4.s @@ -1,9 +1,9 @@ glabel func_800AB1D4 /* 0ABDD4 800AB1D4 240F0001 */ li $t7, 1 /* 0ABDD8 800AB1D8 01E4C023 */ subu $t8, $t7, $a0 -/* 0ABDDC 800AB1DC 3C018012 */ lui $at, 0x8012 +/* 0ABDDC 800AB1DC 3C018012 */ lui $at, %hi(D_80126CD2) # $at, 0x8012 /* 0ABDE0 800AB1E0 AFA40000 */ sw $a0, ($sp) /* 0ABDE4 800AB1E4 03E00008 */ jr $ra -/* 0ABDE8 800AB1E8 A0386CD2 */ sb $t8, 0x6cd2($at) +/* 0ABDE8 800AB1E8 A0386CD2 */ sb $t8, %lo(D_80126CD2)($at) /* 0ABDEC 800AB1EC 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800AC5A4.s b/asm/non_matchings/unknown_09F8F0/func_800AC5A4.s index 511b622c..7672e89a 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AC5A4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AC5A4.s @@ -175,9 +175,9 @@ glabel func_800AC5A4 /* 0AD44C 800AC84C 27BD0038 */ addiu $sp, $sp, 0x38 /* 0AD450 800AC850 240E0001 */ li $t6, 1 -/* 0AD454 800AC854 3C01800E */ lui $at, 0x800e +/* 0AD454 800AC854 3C01800E */ lui $at, %hi(D_800E2A84) # $at, 0x800e /* 0AD458 800AC858 03E00008 */ jr $ra -/* 0AD45C 800AC85C AC2E2A84 */ sw $t6, 0x2a84($at) +/* 0AD45C 800AC85C AC2E2A84 */ sw $t6, %lo(D_800E2A84)($at) /* 0AD460 800AC860 3C0E800E */ lui $t6, %hi(D_800E2A80) # $t6, 0x800e /* 0AD464 800AC864 8DCE2A80 */ lw $t6, %lo(D_800E2A80)($t6) diff --git a/asm/non_matchings/unknown_09F8F0/func_800ACF60.s b/asm/non_matchings/unknown_09F8F0/func_800ACF60.s index 06fadc1d..6947b020 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800ACF60.s +++ b/asm/non_matchings/unknown_09F8F0/func_800ACF60.s @@ -6,9 +6,9 @@ glabel func_800ACF60 /* 0ADB70 800ACF70 28410010 */ slti $at, $v0, 0x10 /* 0ADB74 800ACF74 10200006 */ beqz $at, .L800ACF90 /* 0ADB78 800ACF78 00027080 */ sll $t6, $v0, 2 -/* 0ADB7C 800ACF7C 3C018012 */ lui $at, 0x8012 +/* 0ADB7C 800ACF7C 3C018012 */ lui $at, %hi(D_80127C40) # $at, 0x8012 /* 0ADB80 800ACF80 002E0821 */ addu $at, $at, $t6 -/* 0ADB84 800ACF84 AC247C40 */ sw $a0, 0x7c40($at) +/* 0ADB84 800ACF84 AC247C40 */ sw $a0, %lo(D_80127C40)($at) /* 0ADB88 800ACF88 244F0001 */ addiu $t7, $v0, 1 /* 0ADB8C 800ACF8C AC6F0000 */ sw $t7, ($v1) .L800ACF90: diff --git a/asm/non_matchings/unknown_09F8F0/func_800AD40C.s b/asm/non_matchings/unknown_09F8F0/func_800AD40C.s index b207f51f..52dbc821 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AD40C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AD40C.s @@ -41,7 +41,7 @@ glabel func_800AD40C /* 0AE0A4 800AD4A4 03E00008 */ jr $ra /* 0AE0A8 800AD4A8 00000000 */ nop -/* 0AE0AC 800AD4AC 3C01800E */ lui $at, 0x800e +/* 0AE0AC 800AD4AC 3C01800E */ lui $at, %hi(D_800E2C6C) # $at, 0x800e /* 0AE0B0 800AD4B0 03E00008 */ jr $ra -/* 0AE0B4 800AD4B4 AC242C6C */ sw $a0, 0x2c6c($at) +/* 0AE0B4 800AD4B4 AC242C6C */ sw $a0, %lo(D_800E2C6C)($at) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B4A08.s b/asm/non_matchings/unknown_0AEE70/func_800B4A08.s index 34c36496..271bdc26 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B4A08.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B4A08.s @@ -1,7 +1,7 @@ glabel func_800B4A08 -/* 0B5608 800B4A08 3C01800E */ lui $at, 0x800e +/* 0B5608 800B4A08 3C01800E */ lui $at, %hi(D_800E2EF0) # $at, 0x800e /* 0B560C 800B4A0C 03E00008 */ jr $ra -/* 0B5610 800B4A10 AC242EF0 */ sw $a0, 0x2ef0($at) +/* 0B5610 800B4A10 AC242EF0 */ sw $a0, %lo(D_800E2EF0)($at) /* 0B5614 800B4A14 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 0B5618 800B4A18 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B6E50.s b/asm/non_matchings/unknown_0AEE70/func_800B6E50.s index d860bfaf..5a61778b 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B6E50.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B6E50.s @@ -27,10 +27,10 @@ glabel func_800B6E50 /* 0B7AAC 800B6EAC 24080010 */ li $t0, 16 /* 0B7AB0 800B6EB0 3C018012 */ lui $at, %hi(D_80127CC4) # $at, 0x8012 /* 0B7AB4 800B6EB4 AC287CC4 */ sw $t0, %lo(D_80127CC4)($at) -/* 0B7AB8 800B6EB8 3C018012 */ lui $at, 0x8012 +/* 0B7AB8 800B6EB8 3C018012 */ lui $at, %hi(D_80127CC8) # $at, 0x8012 /* 0B7ABC 800B6EBC 2449FFF0 */ addiu $t1, $v0, -0x10 /* 0B7AC0 800B6EC0 03E00008 */ jr $ra -/* 0B7AC4 800B6EC4 AC297CC8 */ sw $t1, 0x7cc8($at) +/* 0B7AC4 800B6EC4 AC297CC8 */ sw $t1, %lo(D_80127CC8)($at) .L800B6EC8: /* 0B7AC8 800B6EC8 3C018012 */ lui $at, %hi(D_80127CC4) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_0AEE70/func_800B6EE0.s b/asm/non_matchings/unknown_0AEE70/func_800B6EE0.s index d2460745..bcd5da2b 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B6EE0.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B6EE0.s @@ -5,7 +5,7 @@ glabel func_800B6EE0 /* 0B7AEC 800B6EEC 3C0F8012 */ lui $t7, %hi(D_80127CC4) # $t7, 0x8012 /* 0B7AF0 800B6EF0 8DEF7CC4 */ lw $t7, %lo(D_80127CC4)($t7) /* 0B7AF4 800B6EF4 A42E7CAC */ sh $t6, %lo(D_80127CAC)($at) -/* 0B7AF8 800B6EF8 3C018012 */ lui $at, 0x8012 +/* 0B7AF8 800B6EF8 3C018012 */ lui $at, %hi(D_80127CAE) # $at, 0x8012 /* 0B7AFC 800B6EFC 03E00008 */ jr $ra -/* 0B7B00 800B6F00 A42F7CAE */ sh $t7, 0x7cae($at) +/* 0B7B00 800B6F00 A42F7CAE */ sh $t7, %lo(D_80127CAE)($at) diff --git a/asm/non_matchings/unknown_0B8920/func_800C0780.s b/asm/non_matchings/unknown_0B8920/func_800C0780.s index d6d32175..3bd86706 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C0780.s +++ b/asm/non_matchings/unknown_0B8920/func_800C0780.s @@ -45,7 +45,7 @@ glabel func_800C0780 /* 0C1420 800C0820 3C018013 */ lui $at, %hi(D_8012A754) # $at, 0x8013 /* 0C1424 800C0824 E432A754 */ swc1 $f18, %lo(D_8012A754)($at) .L800C0828: -/* 0C1428 800C0828 3C01800E */ lui $at, 0x800e +/* 0C1428 800C0828 3C01800E */ lui $at, %hi(D_800E31AC) # $at, 0x800e /* 0C142C 800C082C 03E00008 */ jr $ra -/* 0C1430 800C0830 AC2831AC */ sw $t0, 0x31ac($at) +/* 0C1430 800C0830 AC2831AC */ sw $t0, %lo(D_800E31AC)($at) diff --git a/asm/non_matchings/unknown_0B8920/func_800C2640.s b/asm/non_matchings/unknown_0B8920/func_800C2640.s index 8dbf6f0f..e650b736 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C2640.s +++ b/asm/non_matchings/unknown_0B8920/func_800C2640.s @@ -90,7 +90,7 @@ glabel func_800C2640 /* 0C3388 800C2788 3C018013 */ lui $at, %hi(D_8012A74C) # $at, 0x8013 /* 0C338C 800C278C 00007812 */ mflo $t7 /* 0C3390 800C2790 AC2FA74C */ sw $t7, %lo(D_8012A74C)($at) -/* 0C3394 800C2794 3C01800E */ lui $at, 0x800e +/* 0C3394 800C2794 3C01800E */ lui $at, %hi(D_800E31AC) # $at, 0x800e /* 0C3398 800C2798 03E00008 */ jr $ra -/* 0C339C 800C279C AC3831AC */ sw $t8, 0x31ac($at) +/* 0C339C 800C279C AC3831AC */ sw $t8, %lo(D_800E31AC)($at) diff --git a/asm/non_matchings/unknown_0B8920/func_800C3158.s b/asm/non_matchings/unknown_0B8920/func_800C3158.s index faabe106..79e32ac6 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C3158.s +++ b/asm/non_matchings/unknown_0B8920/func_800C3158.s @@ -35,7 +35,7 @@ glabel func_800C3158 /* 0C3DD8 800C31D8 E4263678 */ swc1 $f6, %lo(D_800E3678)($at) /* 0C3DDC 800C31DC 00000000 */ nop .L800C31E0: -/* 0C3DE0 800C31E0 3C01800E */ lui $at, 0x800e +/* 0C3DE0 800C31E0 3C01800E */ lui $at, %hi(D_800E367C) # $at, 0x800e /* 0C3DE4 800C31E4 03E00008 */ jr $ra -/* 0C3DE8 800C31E8 AC24367C */ sw $a0, 0x367c($at) +/* 0C3DE8 800C31E8 AC24367C */ sw $a0, %lo(D_800E367C)($at) diff --git a/lib/asm/non_matchings/unknown_0D5390/func_800D47F0.s b/lib/asm/non_matchings/unknown_0D5390/func_800D47F0.s index d145f233..84cbd10e 100644 --- a/lib/asm/non_matchings/unknown_0D5390/func_800D47F0.s +++ b/lib/asm/non_matchings/unknown_0D5390/func_800D47F0.s @@ -7,13 +7,13 @@ glabel func_800D47F0 /* 0D5404 800D4804 AFB00018 */ sw $s0, 0x18($sp) /* 0D5408 800D4808 8FAF0028 */ lw $t7, 0x28($sp) /* 0D540C 800D480C 8FAE002C */ lw $t6, 0x2c($sp) -/* 0D5410 800D4810 3C01800E */ lui $at, 0x800e +/* 0D5410 800D4810 3C01800E */ lui $at, %hi(D_800E48A0) # $at, 0x800e /* 0D5414 800D4814 000FC080 */ sll $t8, $t7, 2 /* 0D5418 800D4818 00408025 */ move $s0, $v0 /* 0D541C 800D481C 00380821 */ addu $at, $at, $t8 /* 0D5420 800D4820 02002025 */ move $a0, $s0 /* 0D5424 800D4824 0C034960 */ jal __osRestoreInt -/* 0D5428 800D4828 AC2E48A0 */ sw $t6, 0x48a0($at) +/* 0D5428 800D4828 AC2E48A0 */ sw $t6, %lo(D_800E48A0)($at) /* 0D542C 800D482C 8FBF001C */ lw $ra, 0x1c($sp) /* 0D5430 800D4830 8FB00018 */ lw $s0, 0x18($sp) /* 0D5434 800D4834 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/tools/python/find_glabels.py b/tools/python/find_glabels.py index df02dfc5..cb052e3b 100644 --- a/tools/python/find_glabels.py +++ b/tools/python/find_glabels.py @@ -5,7 +5,7 @@ from file_util import FileUtil LINE_START_REGEX = r'\n(/\* ([0-9A-F]{6}) [0-9A-F]{8} [0-9A-F]{8} \*/\s+|\.L80[0-9A-F]{6}:)' REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|k[0-1]|gp|sp|fp|ra))' GLABEL_UPPER_REGEX = '(' + LINE_START_REGEX + r'lui\s+' + REG_REGEX + r',\s+(0x80[0-9a-f]{2}))' -GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'l[bhw]\s+' + REG_REGEX + r',\s+(0x[0-9a-f]{4})\(\4\))' +GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'[sl][bhw]\s+' + REG_REGEX + r',\s+(0x[0-9a-f]{4})\(\4\))' GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '[^\n]*){0,10}' + GLABEL_LOWER_REGEX def _find_glabels(asm): @@ -13,7 +13,7 @@ def _find_glabels(asm): for file in FileUtil.get_filenames_from_directory_recursive('.', '.s'): matches = re.findall(GLABEL_REGEX, FileUtil.get_text_from_file(file)) for match in matches: - offsets = (match[2], match[11]) # ROM offsets of the lu and lw + offsets = (match[2], match[11]) # ROM offsets of the lui and [sl][bhw] glabel_upper = int(match[5], 16) # upper immediate of glabel glabel_lower = int(match[14], 16) # lower immediate of the glabel if glabel_lower & 0x8000: diff --git a/undefined_syms.txt b/undefined_syms.txt index 677bec0a..c26f892d 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -2329,6 +2329,7 @@ D_801262CC = 0x801262CC; D_801262D0 = 0x801262D0; D_801262D4 = 0x801262D4; D_801262D8 = 0x801262D8; +D_801262DC = 0x801262DC; D_801262E0 = 0x801262E0; D_801262E4 = 0x801262E4; D_80126308 = 0x80126308; From 57b20298190219adf9b7022f1dd824a51be80c4d Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Fri, 28 May 2021 13:22:40 -0700 Subject: [PATCH 36/39] Added glabels for unsigned types --- .../unknown_080500/func_80087F14.s | 8 +++---- .../unknown_080500/func_800890AC.s | 4 ++-- .../unknown_080500/func_8008DC7C.s | 1 + .../unknown_080500/func_800998E0.s | 4 ++-- .../unknown_09F8F0/func_800A4154.s | 4 ++-- .../unknown_09F8F0/func_800A4F50.s | 4 ++-- .../unknown_09F8F0/func_800A7B68.s | 4 ++-- tools/python/find_glabels.py | 24 ++++++++++++++++--- 8 files changed, 36 insertions(+), 17 deletions(-) diff --git a/asm/non_matchings/unknown_080500/func_80087F14.s b/asm/non_matchings/unknown_080500/func_80087F14.s index 757a65fe..1a9478bf 100644 --- a/asm/non_matchings/unknown_080500/func_80087F14.s +++ b/asm/non_matchings/unknown_080500/func_80087F14.s @@ -41,7 +41,7 @@ glabel func_80087F14 /* 088BAC 80087FAC 8FAE0074 */ lw $t6, 0x74($sp) /* 088BB0 80087FB0 A2150000 */ sb $s5, ($s0) /* 088BB4 80087FB4 11C00005 */ beqz $t6, .L80087FCC -/* 088BB8 80087FB8 3C188012 */ lui $t8, 0x8012 +/* 088BB8 80087FB8 3C188012 */ lui $t8, %hi(D_80126A60) #$t8, 0x8012 /* 088BBC 80087FBC 8FAF0070 */ lw $t7, 0x70($sp) /* 088BC0 80087FC0 00000000 */ nop /* 088BC4 80087FC4 15E00008 */ bnez $t7, .L80087FE8 @@ -49,7 +49,7 @@ glabel func_80087F14 .L80087FCC: /* 088BCC 80087FCC A2750000 */ sb $s5, ($s3) /* 088BD0 80087FD0 0311C021 */ addu $t8, $t8, $s1 -/* 088BD4 80087FD4 93186A60 */ lbu $t8, 0x6a60($t8) +/* 088BD4 80087FD4 93186A60 */ lbu $t8, %lo(D_80126A60)($t8) /* 088BD8 80087FD8 00000000 */ nop /* 088BDC 80087FDC 17000002 */ bnez $t8, .L80087FE8 /* 088BE0 80087FE0 00000000 */ nop @@ -121,9 +121,9 @@ glabel func_80087F14 /* 088CC4 800880C4 10000024 */ b .L80088158 /* 088CC8 800880C8 8FAF0090 */ lw $t7, 0x90($sp) .L800880CC: -/* 088CCC 800880CC 3C188012 */ lui $t8, 0x8012 +/* 088CCC 800880CC 3C188012 */ lui $t8, %hi(D_80126A30) #$t8, 0x8012 /* 088CD0 800880D0 0302C021 */ addu $t8, $t8, $v0 -/* 088CD4 800880D4 93186A30 */ lbu $t8, 0x6a30($t8) +/* 088CD4 800880D4 93186A30 */ lbu $t8, %lo(D_80126A30)($t8) /* 088CD8 800880D8 8FB90094 */ lw $t9, 0x94($sp) /* 088CDC 800880DC 13000002 */ beqz $t8, .L800880E8 /* 088CE0 800880E0 3C0E8012 */ lui $t6, %hi(D_80126A30) # $t6, 0x8012 diff --git a/asm/non_matchings/unknown_080500/func_800890AC.s b/asm/non_matchings/unknown_080500/func_800890AC.s index ae0c7854..c78525bd 100644 --- a/asm/non_matchings/unknown_080500/func_800890AC.s +++ b/asm/non_matchings/unknown_080500/func_800890AC.s @@ -236,9 +236,9 @@ glabel func_800890AC /* 08A010 80089410 AFB80034 */ sw $t8, 0x34($sp) .L80089414: /* 08A014 80089414 10400013 */ beqz $v0, .L80089464 -/* 08A018 80089418 3C028012 */ lui $v0, 0x8012 +/* 08A018 80089418 3C028012 */ lui $v0, %hi(D_80126B60) #$v0, 0x8012 /* 08A01C 8008941C 00431021 */ addu $v0, $v0, $v1 -/* 08A020 80089420 90426B60 */ lbu $v0, 0x6b60($v0) +/* 08A020 80089420 90426B60 */ lbu $v0, %lo(D_80126B60)($v0) /* 08A024 80089424 00000000 */ nop /* 08A028 80089428 28410003 */ slti $at, $v0, 3 /* 08A02C 8008942C 1420000A */ bnez $at, .L80089458 diff --git a/asm/non_matchings/unknown_080500/func_8008DC7C.s b/asm/non_matchings/unknown_080500/func_8008DC7C.s index ceedd274..91283e66 100644 --- a/asm/non_matchings/unknown_080500/func_8008DC7C.s +++ b/asm/non_matchings/unknown_080500/func_8008DC7C.s @@ -41,6 +41,7 @@ glabel func_8008DC7C /* 08E910 8008DD10 3C068012 */ lui $a2, %hi(D_8012648C) # $a2, 0x8012 /* 08E914 8008DD14 24C6648C */ addiu $a2, %lo(D_8012648C) # addiu $a2, $a2, 0x648c /* 08E918 8008DD18 8CC90000 */ lw $t1, ($a2) +# This is accessing unk801264A0->unk1 /* 08E91C 8008DD1C 3C0B8012 */ lui $t3, 0x8012 /* 08E920 8008DD20 00095080 */ sll $t2, $t1, 2 /* 08E924 8008DD24 01495023 */ subu $t2, $t2, $t1 diff --git a/asm/non_matchings/unknown_080500/func_800998E0.s b/asm/non_matchings/unknown_080500/func_800998E0.s index 61bd59d5..115d49e9 100644 --- a/asm/non_matchings/unknown_080500/func_800998E0.s +++ b/asm/non_matchings/unknown_080500/func_800998E0.s @@ -15,9 +15,9 @@ glabel func_800998E0 /* 09A514 80099914 0C000741 */ jal func_80001D04 /* 09A518 80099918 AFA60020 */ sw $a2, 0x20($sp) /* 09A51C 8009991C 8FA60020 */ lw $a2, 0x20($sp) -/* 09A520 80099920 3C108012 */ lui $s0, 0x8012 +/* 09A520 80099920 3C108012 */ lui $s0, %hi(D_80126540) #$s0, 0x8012 /* 09A524 80099924 02068021 */ addu $s0, $s0, $a2 -/* 09A528 80099928 92106540 */ lbu $s0, 0x6540($s0) +/* 09A528 80099928 92106540 */ lbu $s0, %lo(D_80126540)($s0) /* 09A52C 8009992C 3C048012 */ lui $a0, %hi(D_801264D0) # $a0, 0x8012 /* 09A530 80099930 8C8464D0 */ lw $a0, %lo(D_801264D0)($a0) /* 09A534 80099934 0C01D4F6 */ jal func_800753D8 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A4154.s b/asm/non_matchings/unknown_09F8F0/func_800A4154.s index 6bdb7caf..9767ed53 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A4154.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A4154.s @@ -9,12 +9,12 @@ glabel func_800A4154 /* 0A4D70 800A4170 1041002B */ beq $v0, $at, .L800A4220 /* 0A4D74 800A4174 3C038012 */ lui $v1, %hi(D_80126D0C) # $v1, 0x8012 /* 0A4D78 800A4178 8C636D0C */ lw $v1, %lo(D_80126D0C)($v1) -/* 0A4D7C 800A417C 3C19800E */ lui $t9, 0x800e +/* 0A4D7C 800A417C 3C19800E */ lui $t9, %hi(D_800E2794) #$t9, 0x800e /* 0A4D80 800A4180 1860000F */ blez $v1, .L800A41C0 /* 0A4D84 800A4184 00037880 */ sll $t7, $v1, 2 /* 0A4D88 800A4188 01E2C021 */ addu $t8, $t7, $v0 /* 0A4D8C 800A418C 0338C821 */ addu $t9, $t9, $t8 -/* 0A4D90 800A4190 93392794 */ lbu $t9, 0x2794($t9) +/* 0A4D90 800A4190 93392794 */ lbu $t9, %lo(D_800E2794)($t9) /* 0A4D94 800A4194 24010002 */ li $at, 2 /* 0A4D98 800A4198 13210009 */ beq $t9, $at, .L800A41C0 /* 0A4D9C 800A419C 3C0A8012 */ lui $t2, %hi(D_80126D60) # $t2, 0x8012 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A4F50.s b/asm/non_matchings/unknown_09F8F0/func_800A4F50.s index 9984f39c..e93a9ec8 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A4F50.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A4F50.s @@ -27,10 +27,10 @@ glabel func_800A4F50 /* 0A5BB0 800A4FB0 8FAD0018 */ lw $t5, 0x18($sp) /* 0A5BB4 800A4FB4 00026080 */ sll $t4, $v0, 2 /* 0A5BB8 800A4FB8 85AF0000 */ lh $t7, ($t5) -/* 0A5BBC 800A4FBC 3C18800E */ lui $t8, 0x800e +/* 0A5BBC 800A4FBC 3C18800E */ lui $t8, %hi(D_800E2794) #$t8, 0x800e /* 0A5BC0 800A4FC0 018F7021 */ addu $t6, $t4, $t7 /* 0A5BC4 800A4FC4 030EC021 */ addu $t8, $t8, $t6 -/* 0A5BC8 800A4FC8 93182794 */ lbu $t8, 0x2794($t8) +/* 0A5BC8 800A4FC8 93182794 */ lbu $t8, %lo(D_800E2794)($t8) /* 0A5BCC 800A4FCC 24010003 */ li $at, 3 /* 0A5BD0 800A4FD0 1701006F */ bne $t8, $at, .L800A5190 /* 0A5BD4 800A4FD4 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A7B68.s b/asm/non_matchings/unknown_09F8F0/func_800A7B68.s index 8af39425..5f3e27dd 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A7B68.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A7B68.s @@ -9,10 +9,10 @@ glabel func_800A7B68 /* 0A8784 800A7B84 00803025 */ move $a2, $a0 /* 0A8788 800A7B88 848F0000 */ lh $t7, ($a0) /* 0A878C 800A7B8C 00077080 */ sll $t6, $a3, 2 -/* 0A8790 800A7B90 3C19800E */ lui $t9, 0x800e +/* 0A8790 800A7B90 3C19800E */ lui $t9, %hi(D_800E2794) #$t9, 0x800e /* 0A8794 800A7B94 01CFC021 */ addu $t8, $t6, $t7 /* 0A8798 800A7B98 0338C821 */ addu $t9, $t9, $t8 -/* 0A879C 800A7B9C 93392794 */ lbu $t9, 0x2794($t9) +/* 0A879C 800A7B9C 93392794 */ lbu $t9, %lo(D_800E2794)($t9) /* 0A87A0 800A7BA0 24010001 */ li $at, 1 /* 0A87A4 800A7BA4 1321000D */ beq $t9, $at, .L800A7BDC /* 0A87A8 800A7BA8 00000000 */ nop diff --git a/tools/python/find_glabels.py b/tools/python/find_glabels.py index cb052e3b..d6a66ca9 100644 --- a/tools/python/find_glabels.py +++ b/tools/python/find_glabels.py @@ -5,21 +5,39 @@ from file_util import FileUtil LINE_START_REGEX = r'\n(/\* ([0-9A-F]{6}) [0-9A-F]{8} [0-9A-F]{8} \*/\s+|\.L80[0-9A-F]{6}:)' REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|k[0-1]|gp|sp|fp|ra))' GLABEL_UPPER_REGEX = '(' + LINE_START_REGEX + r'lui\s+' + REG_REGEX + r',\s+(0x80[0-9a-f]{2}))' -GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'[sl][bhw]\s+' + REG_REGEX + r',\s+(0x[0-9a-f]{4})\(\4\))' +GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'[sl][bhw]u?\s+' + REG_REGEX + r',\s+(0x[0-9a-f]{4})\(\4\))' GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '[^\n]*){0,10}' + GLABEL_LOWER_REGEX +UPPER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*lui\s+)([^\n]*)' +LOWER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*[ls][bhw]u?\s+' + REG_REGEX + r',\s+)0x[0-9a-f]{4}([^\n]*)' + +IGNORE_GLABELS = ['D_800E389E', 'D_801264A1'] + def _find_glabels(asm): glabels = [] for file in FileUtil.get_filenames_from_directory_recursive('.', '.s'): - matches = re.findall(GLABEL_REGEX, FileUtil.get_text_from_file(file)) + contents = FileUtil.get_text_from_file(file) + matches = re.findall(GLABEL_REGEX, contents) for match in matches: + reg = match[3] offsets = (match[2], match[11]) # ROM offsets of the lui and [sl][bhw] glabel_upper = int(match[5], 16) # upper immediate of glabel glabel_lower = int(match[14], 16) # lower immediate of the glabel if glabel_lower & 0x8000: glabel_upper -= 1 glabel = 'D_%08X' % (glabel_upper << 16 | glabel_lower) - glabels.append((glabel, *offsets)) + if glabel not in IGNORE_GLABELS: + glabels.append((glabel, *offsets)) + # replace upper instruction + contents = re.sub(UPPER_INSTR_REGEX_TMPL % offsets[0], + r'\1' + '%s, %%hi(%s) #' % (reg, glabel) + r'\2', + contents) + # replace lower instruction + contents = re.sub(LOWER_INSTR_REGEX_TMPL % offsets[1], + r'\1' + '%%lo(%s)' % (glabel) + r'\4', + contents) + if len(matches): + FileUtil.write_text_to_file(file, contents) return glabels def main(): From a002199f3bfbc5f7a6ccaa5c63aa5df333b74454 Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Fri, 28 May 2021 13:52:28 -0700 Subject: [PATCH 37/39] Added glabels for negative offsets --- asm/gzip/gzip_inflate_stored.s | 4 +- .../unknown_005740/func_80006FC8.s | 4 +- .../unknown_00BC20/func_8000B750.s | 12 +-- .../unknown_00BC20/func_8000C8F8.s | 4 +- .../unknown_00BC20/func_8000CC7C.s | 31 ++++---- .../unknown_00BC20/func_8000E2B4.s | 3 +- .../unknown_00BC20/func_8000E4E8.s | 8 +- .../unknown_00BC20/func_8000E79C.s | 4 +- .../unknown_00BC20/func_8000E898.s | 4 +- .../unknown_00BC20/func_800135B8.s | 12 +-- .../unknown_00BC20/func_80013DCC.s | 4 +- .../unknown_0255E0/func_8002581C.s | 8 +- .../unknown_0255E0/func_8002D384.s | 12 +-- .../unknown_0255E0/func_8002D670.s | 12 +-- .../unknown_0255E0/func_8002D8DC.s | 12 +-- .../unknown_032760/func_8003C2E4.s | 8 +- .../unknown_043920/func_80042D20.s | 12 +-- .../unknown_043920/func_8004447C.s | 12 +-- .../unknown_043920/func_80050A28.s | 32 ++++---- .../unknown_043920/func_80059BF0.s | 4 +- .../unknown_043920/func_80059E40.s | 8 +- .../unknown_05CEF0/func_8005CA78.s | 4 +- .../unknown_05F690/func_800619F4.s | 4 +- .../unknown_064830/func_8006492C.s | 4 +- .../unknown_066AA0/func_80068158.s | 4 +- .../unknown_066AA0/func_800682AC.s | 4 +- .../unknown_078050/func_80078190.s | 4 +- .../unknown_07B870/func_8007B374.s | 4 +- .../unknown_080500/DrawMenuText.s | 4 +- .../unknown_080500/MenuCreditsLoop.s | 4 +- asm/non_matchings/unknown_080500/MenuInit.s | 4 +- asm/non_matchings/unknown_080500/MenuLoop.s | 4 +- .../unknown_080500/MenuSaveOptionsLoop.s | 4 +- .../unknown_080500/func_800853D0.s | 4 +- .../unknown_080500/func_80085B9C.s | 4 +- .../unknown_080500/func_800867D4.s | 4 +- .../unknown_080500/func_80086AFC.s | 4 +- .../unknown_080500/func_80087734.s | 12 +-- .../unknown_080500/func_80087F14.s | 4 +- .../unknown_080500/func_800890AC.s | 2 +- .../unknown_080500/func_80092188.s | 4 +- .../unknown_080500/func_80094D28.s | 4 +- .../unknown_080500/func_80095624.s | 4 +- .../unknown_080500/func_80095728.s | 4 +- .../unknown_080500/func_800998E0.s | 2 +- .../unknown_080500/func_8009CFEC.s | 4 +- .../unknown_080500/func_8009D360.s | 4 +- .../unknown_080500/func_8009DB3C.s | 8 +- .../unknown_09F8F0/func_800A0EB4.s | 4 +- .../unknown_09F8F0/func_800A4154.s | 2 +- .../unknown_09F8F0/func_800A4F50.s | 2 +- .../unknown_09F8F0/func_800A6254.s | 4 +- .../unknown_09F8F0/func_800A6E30.s | 4 +- .../unknown_09F8F0/func_800A7B68.s | 2 +- .../unknown_0AEE70/func_800B2040.s | 4 +- .../unknown_0AEE70/func_800B4A40.s | 12 +-- .../unknown_0AEE70/func_800B653C.s | 4 +- .../unknown_0AEE70/func_800B76B8.s | 4 +- .../unknown_0AEE70/func_800B7810.s | 4 +- .../unknown_0B8920/func_800B8C04.s | 8 +- .../unknown_0B8920/func_800BCC70.s | 4 +- .../unknown_0B8920/func_800C01D8.s | 4 +- .../unknown_0B8920/func_800C0494.s | 4 +- .../unknown_0B8920/func_800C05C8.s | 4 +- .../unknown_0B8920/func_800C31EC.s | 16 ++-- .../unknown_0B8920/func_800C38B4.s | 4 +- .../unknown_0B8920/func_800C45A4.s | 4 +- asm/unknown_070110/func_8006F564.s | 8 +- data/dkr.data.s | 77 +++++++++++++++++++ lib/asm/exception/__osException.s | 8 +- .../osEepromRead_0CEE80/osEepromRead.s | 4 +- .../osEepromWrite_0CF180/osEepromWrite.s | 4 +- .../unknown_0CA530/osSetIntMask.s | 4 +- .../unknown_0CA9A0/alEnvMixerPull.s | 4 +- .../unknown_0CA9A0/alResampleParam.s | 4 +- .../unknown_0CD820/func_800CCFE0.s | 4 +- .../unknown_0CE370/__osContRamWrite.s | 4 +- .../unknown_0CE8A0/__osContRamRead.s | 4 +- .../unknown_0CF070/__osPackEepReadData.s | 4 +- .../unknown_0CF330/__osPackEepWriteData.s | 4 +- .../unknown_0D3160/__osDevMgrMain.s | 4 +- .../non_matchings/unknown_0D43F0/_Printf.s | 4 +- .../non_matchings/unknown_0D43F0/_Putfld.s | 4 +- src/unknown_00BC20.c | 21 +++-- src/unknown_032760.c | 12 ++- src/unknown_043920.c | 47 +++++++---- tools/python/find_glabels.py | 6 +- undefined_syms.txt | 59 ++++++++++++++ 88 files changed, 444 insertions(+), 266 deletions(-) diff --git a/asm/gzip/gzip_inflate_stored.s b/asm/gzip/gzip_inflate_stored.s index 66c96937..47aca107 100644 --- a/asm/gzip/gzip_inflate_stored.s +++ b/asm/gzip/gzip_inflate_stored.s @@ -70,7 +70,7 @@ glabel gzip_inflate_stored /* 0C7C28 800C7028 AC2E376C */ sw $t6, %lo(gzip_inflate_output)($at) /* 0C7C2C 800C702C 3C018013 */ lui $at, %hi(gzip_bit_buffer) # $at, 0x8013 /* 0C7C30 800C7030 AC2CAAD0 */ sw $t4, %lo(gzip_bit_buffer)($at) -/* 0C7C34 800C7034 3C018013 */ lui $at, 0x8013 +/* 0C7C34 800C7034 3C018013 */ lui $at, %hi(gzip_num_bits) # $at, 0x8013 /* 0C7C38 800C7038 03E00008 */ jr $ra -/* 0C7C3C 800C703C AC2DAAD4 */ sw $t5, -0x552c($at) +/* 0C7C3C 800C703C AC2DAAD4 */ sw $t5, %lo(gzip_num_bits)($at) diff --git a/asm/non_matchings/unknown_005740/func_80006FC8.s b/asm/non_matchings/unknown_005740/func_80006FC8.s index a92ab216..4e051b36 100644 --- a/asm/non_matchings/unknown_005740/func_80006FC8.s +++ b/asm/non_matchings/unknown_005740/func_80006FC8.s @@ -1085,9 +1085,9 @@ glabel func_80006FC8 /* 008B74 80007F74 27BD00C8 */ addiu $sp, $sp, 0xc8 /* 008B78 80007F78 240E0001 */ li $t6, 1 -/* 008B7C 80007F7C 3C01800E */ lui $at, 0x800e +/* 008B7C 80007F7C 3C01800E */ lui $at, %hi(D_800DC6D0) # $at, 0x800e /* 008B80 80007F80 03E00008 */ jr $ra -/* 008B84 80007F84 A02EC6D0 */ sb $t6, -0x3930($at) +/* 008B84 80007F84 A02EC6D0 */ sb $t6, %lo(D_800DC6D0)($at) /* 008B88 80007F88 3C01800E */ lui $at, 0x800e /* 008B8C 80007F8C 03E00008 */ jr $ra diff --git a/asm/non_matchings/unknown_00BC20/func_8000B750.s b/asm/non_matchings/unknown_00BC20/func_8000B750.s index 268c266a..2118aef7 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000B750.s +++ b/asm/non_matchings/unknown_00BC20/func_8000B750.s @@ -62,12 +62,12 @@ glabel func_8000B750 /* 00C42C 8000B82C 24620048 */ addiu $v0, $v1, 0x48 .L8000B830: /* 00C430 8000B830 104000A1 */ beqz $v0, .L8000BAB8 -/* 00C434 8000B834 3C018012 */ lui $at, 0x8012 +/* 00C434 8000B834 3C018012 */ lui $at, %hi(D_8011B048) # $at, 0x8012 /* 00C438 8000B838 00300821 */ addu $at, $at, $s0 -/* 00C43C 8000B83C A026B048 */ sb $a2, -0x4fb8($at) -/* 00C440 8000B840 3C018012 */ lui $at, 0x8012 +/* 00C43C 8000B83C A026B048 */ sb $a2, %lo(D_8011B048)($at) +/* 00C440 8000B840 3C018012 */ lui $at, %hi(D_8011B058) # $at, 0x8012 /* 00C444 8000B844 00300821 */ addu $at, $at, $s0 -/* 00C448 8000B848 A025B058 */ sb $a1, -0x4fa8($at) +/* 00C448 8000B848 A025B058 */ sb $a1, %lo(D_8011B058)($at) /* 00C44C 8000B84C 906F0070 */ lbu $t7, 0x70($v1) /* 00C450 8000B850 24010002 */ li $at, 2 /* 00C454 8000B854 15E10070 */ bne $t7, $at, .L8000BA18 @@ -130,13 +130,13 @@ glabel func_8000B750 /* 00C530 8000B930 E7AA0060 */ swc1 $f10, 0x60($sp) /* 00C534 8000B934 C4520008 */ lwc1 $f18, 8($v0) /* 00C538 8000B938 8D190000 */ lw $t9, ($t0) -/* 00C53C 8000B93C 3C18800E */ lui $t8, 0x800e +/* 00C53C 8000B93C 3C18800E */ lui $t8, %hi(D_800DC74C) # $t8, 0x800e /* 00C540 8000B940 00037880 */ sll $t7, $v1, 2 /* 00C544 8000B944 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 00C548 8000B948 030FC021 */ addu $t8, $t8, $t7 /* 00C54C 8000B94C 00196880 */ sll $t5, $t9, 2 /* 00C550 8000B950 44818000 */ mtc1 $at, $f16 -/* 00C554 8000B954 8F18C74C */ lw $t8, -0x38b4($t8) +/* 00C554 8000B954 8F18C74C */ lw $t8, %lo(D_800DC74C)($t8) /* 00C558 8000B958 01B96821 */ addu $t5, $t5, $t9 /* 00C55C 8000B95C A7AE0050 */ sh $t6, 0x50($sp) /* 00C560 8000B960 000D6840 */ sll $t5, $t5, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_8000C8F8.s b/asm/non_matchings/unknown_00BC20/func_8000C8F8.s index ae949dd5..78d7c101 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000C8F8.s +++ b/asm/non_matchings/unknown_00BC20/func_8000C8F8.s @@ -67,7 +67,7 @@ glabel func_8000C8F8 /* 00D5EC 8000C9EC 018D8821 */ addu $s1, $t4, $t5 /* 00D5F0 8000C9F0 244E0010 */ addiu $t6, $v0, 0x10 /* 00D5F4 8000C9F4 018F9021 */ addu $s2, $t4, $t7 -/* 00D5F8 8000C9F8 3C018012 */ lui $at, 0x8012 +/* 00D5F8 8000C9F8 3C018012 */ lui $at, %hi(D_8011AEA8) # $at, 0x8012 /* 00D5FC 8000C9FC ACA20000 */ sw $v0, ($a1) /* 00D600 8000CA00 AE2E0000 */ sw $t6, ($s1) /* 00D604 8000CA04 AE400000 */ sw $zero, ($s2) @@ -76,7 +76,7 @@ glabel func_8000C8F8 /* 00D610 8000CA10 AFA50028 */ sw $a1, 0x28($sp) /* 00D614 8000CA14 24040014 */ li $a0, 20 /* 00D618 8000CA18 0C01DB16 */ jal func_80076C58 -/* 00D61C 8000CA1C AC38AEA8 */ sw $t8, -0x5158($at) +/* 00D61C 8000CA1C AC38AEA8 */ sw $t8, %lo(D_8011AEA8)($at) /* 00D620 8000CA20 8C590000 */ lw $t9, ($v0) /* 00D624 8000CA24 2405FFFF */ li $a1, -1 /* 00D628 8000CA28 00403025 */ move $a2, $v0 diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index f73a9928..8ddce0fe 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -615,15 +615,17 @@ glabel func_8000CC7C /* 00E120 8000D520 3C188012 */ lui $t8, %hi(D_8011AD25) # $t8, 0x8012 /* 00E124 8000D524 3C0E8012 */ lui $t6, %hi(D_8011AD25) # $t6, 0x8012 /* 00E128 8000D528 81CEAD25 */ lb $t6, %lo(D_8011AD25)($t6) -/* 00E12C 8000D52C 3C1E800E */ lui $fp, 0x800e +# Indexing into D_800DC820 only reading the MSB? +/* 00E12C 8000D52C 3C1E800E */ lui $fp, %hi(D_800DC820) #$fp, 0x800e /* 00E130 8000D530 000E7840 */ sll $t7, $t6, 1 /* 00E134 8000D534 03CFF021 */ addu $fp, $fp, $t7 -/* 00E138 8000D538 83DEC820 */ lb $fp, -0x37e0($fp) +/* 00E138 8000D538 83DEC820 */ lb $fp, %lo(D_800DC820)($fp) /* 00E13C 8000D53C 10000028 */ b .L8000D5E0 /* 00E140 8000D540 00000000 */ nop .L8000D544: /* 00E144 8000D544 8318AD25 */ lb $t8, %lo(D_8011AD25)($t8) -/* 00E148 8000D548 3C1E800E */ lui $fp, 0x800e +# Indexing into D_800DC820 only reading the LSB? +/* 00E148 8000D548 3C1E800E */ lui $fp, %hi(D_800DC820) # $fp, 0x800e /* 00E14C 8000D54C 00186840 */ sll $t5, $t8, 1 /* 00E150 8000D550 03CDF021 */ addu $fp, $fp, $t5 /* 00E154 8000D554 83DEC821 */ lb $fp, -0x37df($fp) @@ -671,20 +673,20 @@ glabel func_8000CC7C /* 00E1E8 8000D5E8 86C3000E */ lh $v1, 0xe($s6) /* 00E1EC 8000D5EC 24010002 */ li $at, 2 /* 00E1F0 8000D5F0 17010010 */ bne $t8, $at, .L8000D634 -/* 00E1F4 8000D5F4 3C0D800E */ lui $t5, 0x800e +/* 00E1F4 8000D5F4 3C0D800E */ lui $t5, %hi(D_800DC840) # $t5, 0x800e /* 00E1F8 8000D5F8 01B06821 */ addu $t5, $t5, $s0 -/* 00E1FC 8000D5FC 81ADC840 */ lb $t5, -0x37c0($t5) +/* 00E1FC 8000D5FC 81ADC840 */ lb $t5, %lo(D_800DC840)($t5) /* 00E200 8000D600 001E7080 */ sll $t6, $fp, 2 /* 00E204 8000D604 01DE7021 */ addu $t6, $t6, $fp /* 00E208 8000D608 000DC840 */ sll $t9, $t5, 1 /* 00E20C 8000D60C 000E7880 */ sll $t7, $t6, 2 /* 00E210 8000D610 032FC021 */ addu $t8, $t9, $t7 /* 00E214 8000D614 00146880 */ sll $t5, $s4, 2 -/* 00E218 8000D618 3C02800E */ lui $v0, 0x800e +/* 00E218 8000D618 3C02800E */ lui $v0, %hi(D_800DC7A8) # $v0, 0x800e /* 00E21C 8000D61C 00581021 */ addu $v0, $v0, $t8 /* 00E220 8000D620 01B46823 */ subu $t5, $t5, $s4 /* 00E224 8000D624 000D68C0 */ sll $t5, $t5, 3 -/* 00E228 8000D628 8442C7A8 */ lh $v0, -0x3858($v0) +/* 00E228 8000D628 8442C7A8 */ lh $v0, %lo(D_800DC7A8)($v0) /* 00E22C 8000D62C 1000001A */ b .L8000D698 /* 00E230 8000D630 02ED3821 */ addu $a3, $s7, $t5 .L8000D634: @@ -695,7 +697,7 @@ glabel func_8000CC7C /* 00E244 8000D644 001EC080 */ sll $t8, $fp, 2 /* 00E248 8000D648 031EC021 */ addu $t8, $t8, $fp /* 00E24C 8000D64C 00186880 */ sll $t5, $t8, 2 -/* 00E250 8000D650 3C02800E */ lui $v0, 0x800e +/* 00E250 8000D650 3C02800E */ lui $v0, %hi(D_800DC7A8) # $v0, 0x800e /* 00E254 8000D654 00007012 */ mflo $t6 /* 00E258 8000D658 02EE3821 */ addu $a3, $s7, $t6 /* 00E25C 8000D65C 80F90059 */ lb $t9, 0x59($a3) @@ -703,11 +705,12 @@ glabel func_8000CC7C /* 00E264 8000D664 00197840 */ sll $t7, $t9, 1 /* 00E268 8000D668 01ED7021 */ addu $t6, $t7, $t5 /* 00E26C 8000D66C 004E1021 */ addu $v0, $v0, $t6 -/* 00E270 8000D670 8442C7A8 */ lh $v0, -0x3858($v0) +/* 00E270 8000D670 8442C7A8 */ lh $v0, %lo(D_800DC7A8)($v0) /* 00E274 8000D674 10000009 */ b .L8000D69C /* 00E278 8000D678 304F0100 */ andi $t7, $v0, 0x100 .L8000D67C: -/* 00E27C 8000D67C 3C02800E */ lui $v0, 0x800e +# Indexing into D_800DC7B8 starting at index 37? +/* 00E27C 8000D67C 3C02800E */ lui $v0, %hi(D_800DC7B8) # $v0, 0x800e /* 00E280 8000D680 0014C080 */ sll $t8, $s4, 2 /* 00E284 8000D684 0314C023 */ subu $t8, $t8, $s4 /* 00E288 8000D688 00591021 */ addu $v0, $v0, $t9 @@ -1046,9 +1049,9 @@ glabel func_8000CC7C /* 00E73C 8000DB3C 000D7080 */ sll $t6, $t5, 2 /* 00E740 8000DB40 0019C040 */ sll $t8, $t9, 1 /* 00E744 8000DB44 030EC821 */ addu $t9, $t8, $t6 -/* 00E748 8000DB48 3C02800E */ lui $v0, 0x800e +/* 00E748 8000DB48 3C02800E */ lui $v0, %hi(D_800DC7A8) # $v0, 0x800e /* 00E74C 8000DB4C 00591021 */ addu $v0, $v0, $t9 -/* 00E750 8000DB50 8442C7A8 */ lh $v0, -0x3858($v0) +/* 00E750 8000DB50 8442C7A8 */ lh $v0, %lo(D_800DC7A8)($v0) /* 00E754 8000DB54 02C02025 */ move $a0, $s6 /* 00E758 8000DB58 304F0100 */ andi $t7, $v0, 0x100 /* 00E75C 8000DB5C 000F6843 */ sra $t5, $t7, 1 @@ -1090,12 +1093,12 @@ glabel func_8000CC7C /* 00E7E8 8000DBE8 10400029 */ beqz $v0, .L8000DC90 /* 00E7EC 8000DBEC 3C188012 */ lui $t8, %hi(D_8011AE84) # $t8, 0x8012 /* 00E7F0 8000DBF0 8718AE84 */ lh $t8, %lo(D_8011AE84)($t8) -/* 00E7F4 8000DBF4 3C02800E */ lui $v0, 0x800e +/* 00E7F4 8000DBF4 3C02800E */ lui $v0, %hi(D_800DC7B8) # $v0, 0x800e /* 00E7F8 8000DBF8 00187080 */ sll $t6, $t8, 2 /* 00E7FC 8000DBFC 01D87021 */ addu $t6, $t6, $t8 /* 00E800 8000DC00 000EC880 */ sll $t9, $t6, 2 /* 00E804 8000DC04 00591021 */ addu $v0, $v0, $t9 -/* 00E808 8000DC08 8442C7B8 */ lh $v0, -0x3848($v0) +/* 00E808 8000DC08 8442C7B8 */ lh $v0, %lo(D_800DC7B8)($v0) /* 00E80C 8000DC0C 02C02025 */ move $a0, $s6 /* 00E810 8000DC10 304F0100 */ andi $t7, $v0, 0x100 /* 00E814 8000DC14 000F6843 */ sra $t5, $t7, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s index 00d8379f..e995fcb1 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s @@ -34,7 +34,8 @@ glabel func_8000E2B4 /* 00EF34 8000E334 00000000 */ nop .L8000E338: /* 00EF38 8000E338 00046040 */ sll $t4, $a0, 1 -/* 00EF3C 8000E33C 3C03800E */ lui $v1, 0x800e +# Indexing into D_800DC7B8 starting at index 37? +/* 00EF3C 8000E33C 3C03800E */ lui $v1, %hi(D_800DC7B8) # $v1, 0x800e /* 00EF40 8000E340 006C1821 */ addu $v1, $v1, $t4 /* 00EF44 8000E344 8463C802 */ lh $v1, -0x37fe($v1) /* 00EF48 8000E348 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000E4E8.s b/asm/non_matchings/unknown_00BC20/func_8000E4E8.s index 2a7123d6..27ad212e 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E4E8.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E4E8.s @@ -1,19 +1,19 @@ glabel func_8000E4E8 /* 00F0E8 8000E4E8 00041880 */ sll $v1, $a0, 2 -/* 00F0EC 8000E4EC 3C028012 */ lui $v0, 0x8012 +/* 00F0EC 8000E4EC 3C028012 */ lui $v0, %hi(D_8011AEB0) # $v0, 0x8012 /* 00F0F0 8000E4F0 3C0E8012 */ lui $t6, %hi(D_8011AEA0) # $t6, 0x8012 /* 00F0F4 8000E4F4 00431021 */ addu $v0, $v0, $v1 /* 00F0F8 8000E4F8 25CEAEA0 */ addiu $t6, %lo(D_8011AEA0) # addiu $t6, $t6, -0x5160 -/* 00F0FC 8000E4FC 8C42AEB0 */ lw $v0, -0x5150($v0) +/* 00F0FC 8000E4FC 8C42AEB0 */ lw $v0, %lo(D_8011AEB0)($v0) /* 00F100 8000E500 006E2821 */ addu $a1, $v1, $t6 /* 00F104 8000E504 8CAF0000 */ lw $t7, ($a1) -/* 00F108 8000E508 3C198012 */ lui $t9, 0x8012 +/* 00F108 8000E508 3C198012 */ lui $t9, %hi(D_8011AE98) # $t9, 0x8012 /* 00F10C 8000E50C AC40000C */ sw $zero, 0xc($v0) /* 00F110 8000E510 AC400008 */ sw $zero, 8($v0) /* 00F114 8000E514 AC400004 */ sw $zero, 4($v0) /* 00F118 8000E518 AC4F0000 */ sw $t7, ($v0) /* 00F11C 8000E51C 0323C821 */ addu $t9, $t9, $v1 -/* 00F120 8000E520 8F39AE98 */ lw $t9, -0x5168($t9) +/* 00F120 8000E520 8F39AE98 */ lw $t9, %lo(D_8011AE98)($t9) /* 00F124 8000E524 8CB80000 */ lw $t8, ($a1) /* 00F128 8000E528 24020010 */ li $v0, 16 /* 00F12C 8000E52C 00003825 */ move $a3, $zero diff --git a/asm/non_matchings/unknown_00BC20/func_8000E79C.s b/asm/non_matchings/unknown_00BC20/func_8000E79C.s index 01b254bb..05e6e641 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E79C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E79C.s @@ -4,13 +4,13 @@ glabel func_8000E79C /* 00F3A4 8000E7A4 3C188012 */ lui $t8, %hi(D_8011AEA0) # $t8, 0x8012 /* 00F3A8 8000E7A8 00064080 */ sll $t0, $a2, 2 /* 00F3AC 8000E7AC 2718AEA0 */ addiu $t8, %lo(D_8011AEA0) # addiu $t8, $t8, -0x5160 -/* 00F3B0 8000E7B0 3C0D8012 */ lui $t5, 0x8012 +/* 00F3B0 8000E7B0 3C0D8012 */ lui $t5, %hi(D_8011AEB0) # $t5, 0x8012 /* 00F3B4 8000E7B4 90820001 */ lbu $v0, 1($a0) /* 00F3B8 8000E7B8 90A30001 */ lbu $v1, 1($a1) /* 00F3BC 8000E7BC 01A86821 */ addu $t5, $t5, $t0 /* 00F3C0 8000E7C0 01184821 */ addu $t1, $t0, $t8 /* 00F3C4 8000E7C4 8D390000 */ lw $t9, ($t1) -/* 00F3C8 8000E7C8 8DADAEB0 */ lw $t5, -0x5150($t5) +/* 00F3C8 8000E7C8 8DADAEB0 */ lw $t5, %lo(D_8011AEB0)($t5) /* 00F3CC 8000E7CC 304E003F */ andi $t6, $v0, 0x3f /* 00F3D0 8000E7D0 306F003F */ andi $t7, $v1, 0x3f /* 00F3D4 8000E7D4 01EE082A */ slt $at, $t7, $t6 diff --git a/asm/non_matchings/unknown_00BC20/func_8000E898.s b/asm/non_matchings/unknown_00BC20/func_8000E898.s index c37a9ed5..55746447 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E898.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E898.s @@ -4,10 +4,10 @@ glabel func_8000E898 /* 00F4A0 8000E8A0 00053080 */ sll $a2, $a1, 2 /* 00F4A4 8000E8A4 90820001 */ lbu $v0, 1($a0) /* 00F4A8 8000E8A8 00CF3821 */ addu $a3, $a2, $t7 -/* 00F4AC 8000E8AC 3C188012 */ lui $t8, 0x8012 +/* 00F4AC 8000E8AC 3C188012 */ lui $t8, %hi(D_8011AE98) # $t8, 0x8012 /* 00F4B0 8000E8B0 8CE80000 */ lw $t0, ($a3) /* 00F4B4 8000E8B4 0306C021 */ addu $t8, $t8, $a2 -/* 00F4B8 8000E8B8 8F18AE98 */ lw $t8, -0x5168($t8) +/* 00F4B8 8000E8B8 8F18AE98 */ lw $t8, %lo(D_8011AE98)($t8) /* 00F4BC 8000E8BC 304E003F */ andi $t6, $v0, 0x3f /* 00F4C0 8000E8C0 010EC821 */ addu $t9, $t0, $t6 /* 00F4C4 8000E8C4 01C01025 */ move $v0, $t6 diff --git a/asm/non_matchings/unknown_00BC20/func_800135B8.s b/asm/non_matchings/unknown_00BC20/func_800135B8.s index 41061444..7a8e2b3e 100644 --- a/asm/non_matchings/unknown_00BC20/func_800135B8.s +++ b/asm/non_matchings/unknown_00BC20/func_800135B8.s @@ -4,11 +4,11 @@ glabel func_800135B8 /* 0141C0 800135C0 AFB10020 */ sw $s1, 0x20($sp) /* 0141C4 800135C4 AFB0001C */ sw $s0, 0x1c($sp) /* 0141C8 800135C8 8C90007C */ lw $s0, 0x7c($a0) -/* 0141CC 800135CC 3C028012 */ lui $v0, 0x8012 +/* 0141CC 800135CC 3C028012 */ lui $v0, %hi(D_8011B048) # $v0, 0x8012 /* 0141D0 800135D0 00107703 */ sra $t6, $s0, 0x1c /* 0141D4 800135D4 31D0000F */ andi $s0, $t6, 0xf /* 0141D8 800135D8 00501021 */ addu $v0, $v0, $s0 -/* 0141DC 800135DC 9042B048 */ lbu $v0, -0x4fb8($v0) +/* 0141DC 800135DC 9042B048 */ lbu $v0, %lo(D_8011B048)($v0) /* 0141E0 800135E0 8C910064 */ lw $s1, 0x64($a0) /* 0141E4 800135E4 10400006 */ beqz $v0, .L80013600 /* 0141E8 800135E8 00802825 */ move $a1, $a0 @@ -146,20 +146,20 @@ glabel func_800135B8 /* 0143E0 800137E0 8C84B008 */ lw $a0, %lo(D_8011B008)($a0) /* 0143E4 800137E4 00037B83 */ sra $t7, $v1, 0xe /* 0143E8 800137E8 31F83FFF */ andi $t8, $t7, 0x3fff -/* 0143EC 800137EC 3C0E800E */ lui $t6, 0x800e +/* 0143EC 800137EC 3C0E800E */ lui $t6, %hi(D_800DC74C) # $t6, 0x800e /* 0143F0 800137F0 00046080 */ sll $t4, $a0, 2 /* 0143F4 800137F4 01CC7021 */ addu $t6, $t6, $t4 /* 0143F8 800137F8 0018C880 */ sll $t9, $t8, 2 -/* 0143FC 800137FC 8DCEC74C */ lw $t6, -0x38b4($t6) +/* 0143FC 800137FC 8DCEC74C */ lw $t6, %lo(D_800DC74C)($t6) /* 014400 80013800 0338C821 */ addu $t9, $t9, $t8 /* 014404 80013804 0019C840 */ sll $t9, $t9, 1 /* 014408 80013808 01802025 */ move $a0, $t4 -/* 01440C 8001380C 3C0C800E */ lui $t4, 0x800e +/* 01440C 8001380C 3C0C800E */ lui $t4, %hi(D_800DC754) # $t4, 0x800e /* 014410 80013810 01D94021 */ addu $t0, $t6, $t9 /* 014414 80013814 01846021 */ addu $t4, $t4, $a0 /* 014418 80013818 010B3021 */ addu $a2, $t0, $t3 /* 01441C 8001381C 306D3FFF */ andi $t5, $v1, 0x3fff -/* 014420 80013820 8D8CC754 */ lw $t4, -0x38ac($t4) +/* 014420 80013820 8D8CC754 */ lw $t4, %lo(D_800DC754)($t4) /* 014424 80013824 8E020000 */ lw $v0, ($s0) /* 014428 80013828 000D7900 */ sll $t7, $t5, 4 /* 01442C 8001382C 30CE0006 */ andi $t6, $a2, 6 diff --git a/asm/non_matchings/unknown_00BC20/func_80013DCC.s b/asm/non_matchings/unknown_00BC20/func_80013DCC.s index e5bb4711..5831bdd9 100644 --- a/asm/non_matchings/unknown_00BC20/func_80013DCC.s +++ b/asm/non_matchings/unknown_00BC20/func_80013DCC.s @@ -8,12 +8,12 @@ glabel func_80013DCC /* 0149E4 80013DE4 AFA60060 */ sw $a2, 0x60($sp) /* 0149E8 80013DE8 AFA70064 */ sw $a3, 0x64($sp) /* 0149EC 80013DEC 8CEB0064 */ lw $t3, 0x64($a3) -/* 0149F0 80013DF0 3C188012 */ lui $t8, 0x8012 +/* 0149F0 80013DF0 3C188012 */ lui $t8, %hi(D_8011B07B) # $t8, 0x8012 /* 0149F4 80013DF4 81680002 */ lb $t0, 2($t3) /* 0149F8 80013DF8 3C10800E */ lui $s0, %hi(D_800DC764) # $s0, 0x800e /* 0149FC 80013DFC 00087880 */ sll $t7, $t0, 2 /* 014A00 80013E00 030FC021 */ addu $t8, $t8, $t7 -/* 014A04 80013E04 9318B07B */ lbu $t8, -0x4f85($t8) +/* 014A04 80013E04 9318B07B */ lbu $t8, %lo(D_8011B07B)($t8) /* 014A08 80013E08 2610C764 */ addiu $s0, %lo(D_800DC764) # addiu $s0, $s0, -0x389c /* 014A0C 80013E0C 1300009C */ beqz $t8, .L80014080 /* 014A10 80013E10 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_0255E0/func_8002581C.s b/asm/non_matchings/unknown_0255E0/func_8002581C.s index 7b01b41e..3a7450b4 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002581C.s +++ b/asm/non_matchings/unknown_0255E0/func_8002581C.s @@ -344,17 +344,17 @@ glabel func_8002581C /* 026938 80025D38 2484D4B4 */ addiu $a0, %lo(D_8011D4B4) # addiu $a0, $a0, -0x2b4c /* 02693C 80025D3C 80820000 */ lb $v0, ($a0) /* 026940 80025D40 8D0C0000 */ lw $t4, ($t0) -/* 026944 80025D44 3C188012 */ lui $t8, 0x8012 +/* 026944 80025D44 3C188012 */ lui $t8, %hi(D_8011D480) # $t8, 0x8012 /* 026948 80025D48 00021880 */ sll $v1, $v0, 2 /* 02694C 80025D4C 0303C021 */ addu $t8, $t8, $v1 -/* 026950 80025D50 8F18D480 */ lw $t8, -0x2b80($t8) +/* 026950 80025D50 8F18D480 */ lw $t8, %lo(D_8011D480)($t8) /* 026954 80025D54 85930000 */ lh $s3, ($t4) /* 026958 80025D58 3C0E8012 */ lui $t6, %hi(D_8011B0A8) # $t6, 0x8012 -/* 02695C 80025D5C 3C0A8012 */ lui $t2, 0x8012 +/* 02695C 80025D5C 3C0A8012 */ lui $t2, %hi(D_8011D490) # $t2, 0x8012 /* 026960 80025D60 8DCEB0A8 */ lw $t6, %lo(D_8011B0A8)($t6) /* 026964 80025D64 3C018012 */ lui $at, %hi(D_8011B0A8) # $at, 0x8012 /* 026968 80025D68 01435021 */ addu $t2, $t2, $v1 -/* 02696C 80025D6C 8D4AD490 */ lw $t2, -0x2b70($t2) +/* 02696C 80025D6C 8D4AD490 */ lw $t2, %lo(D_8011D490)($t2) /* 026970 80025D70 3C0F8012 */ lui $t7, %hi(D_8011B0AC) # $t7, 0x8012 /* 026974 80025D74 AC38B0A8 */ sw $t8, %lo(D_8011B0A8)($at) /* 026978 80025D78 8DEFB0AC */ lw $t7, %lo(D_8011B0AC)($t7) diff --git a/asm/non_matchings/unknown_0255E0/func_8002D384.s b/asm/non_matchings/unknown_0255E0/func_8002D384.s index 534a43a8..4199dd14 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002D384.s +++ b/asm/non_matchings/unknown_0255E0/func_8002D384.s @@ -37,20 +37,20 @@ glabel func_8002D384 /* 02E010 8002D410 AC990000 */ sw $t9, ($a0) .L8002D414: /* 02E014 8002D414 8C820000 */ lw $v0, ($a0) -/* 02E018 8002D418 3C0E8012 */ lui $t6, 0x8012 +/* 02E018 8002D418 3C0E8012 */ lui $t6, %hi(D_8011D350) # $t6, 0x8012 /* 02E01C 8002D41C 00026880 */ sll $t5, $v0, 2 /* 02E020 8002D420 01CD7021 */ addu $t6, $t6, $t5 -/* 02E024 8002D424 8DCED350 */ lw $t6, -0x2cb0($t6) +/* 02E024 8002D424 8DCED350 */ lw $t6, %lo(D_8011D350)($t6) /* 02E028 8002D428 84F30008 */ lh $s3, 8($a3) -/* 02E02C 8002D42C 3C0F8012 */ lui $t7, 0x8012 +/* 02E02C 8002D42C 3C0F8012 */ lui $t7, %hi(D_8011D320) # $t7, 0x8012 /* 02E030 8002D430 01ED7821 */ addu $t7, $t7, $t5 /* 02E034 8002D434 AE8E0000 */ sw $t6, ($s4) -/* 02E038 8002D438 8DEFD320 */ lw $t7, -0x2ce0($t7) +/* 02E038 8002D438 8DEFD320 */ lw $t7, %lo(D_8011D320)($t7) /* 02E03C 8002D43C 3C018012 */ lui $at, %hi(D_8011D330) # $at, 0x8012 -/* 02E040 8002D440 3C188012 */ lui $t8, 0x8012 +/* 02E040 8002D440 3C188012 */ lui $t8, %hi(D_8011D338) # $t8, 0x8012 /* 02E044 8002D444 030DC021 */ addu $t8, $t8, $t5 /* 02E048 8002D448 AC2FD330 */ sw $t7, %lo(D_8011D330)($at) -/* 02E04C 8002D44C 8F18D338 */ lw $t8, -0x2cc8($t8) +/* 02E04C 8002D44C 8F18D338 */ lw $t8, %lo(D_8011D338)($t8) /* 02E050 8002D450 8E990000 */ lw $t9, ($s4) /* 02E054 8002D454 3C178012 */ lui $s7, %hi(D_8011D348) # $s7, 0x8012 /* 02E058 8002D458 26F7D348 */ addiu $s7, %lo(D_8011D348) # addiu $s7, $s7, -0x2cb8 diff --git a/asm/non_matchings/unknown_0255E0/func_8002D670.s b/asm/non_matchings/unknown_0255E0/func_8002D670.s index 33dfe6cb..4619a57e 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002D670.s +++ b/asm/non_matchings/unknown_0255E0/func_8002D670.s @@ -51,22 +51,22 @@ glabel func_8002D670 /* 02E334 8002D734 00000000 */ nop .L8002D738: /* 02E338 8002D738 8E020000 */ lw $v0, ($s0) -/* 02E33C 8002D73C 3C198012 */ lui $t9, 0x8012 +/* 02E33C 8002D73C 3C198012 */ lui $t9, %hi(D_8011D350) # $t9, 0x8012 /* 02E340 8002D740 0002C080 */ sll $t8, $v0, 2 /* 02E344 8002D744 0338C821 */ addu $t9, $t9, $t8 -/* 02E348 8002D748 8F39D350 */ lw $t9, -0x2cb0($t9) +/* 02E348 8002D748 8F39D350 */ lw $t9, %lo(D_8011D350)($t9) /* 02E34C 8002D74C 3C138012 */ lui $s3, %hi(D_8011D360) # $s3, 0x8012 /* 02E350 8002D750 2673D360 */ addiu $s3, %lo(D_8011D360) # addiu $s3, $s3, -0x2ca0 -/* 02E354 8002D754 3C0D8012 */ lui $t5, 0x8012 +/* 02E354 8002D754 3C0D8012 */ lui $t5, %hi(D_8011D320) # $t5, 0x8012 /* 02E358 8002D758 01B86821 */ addu $t5, $t5, $t8 /* 02E35C 8002D75C AE790000 */ sw $t9, ($s3) -/* 02E360 8002D760 8DADD320 */ lw $t5, -0x2ce0($t5) +/* 02E360 8002D760 8DADD320 */ lw $t5, %lo(D_8011D320)($t5) /* 02E364 8002D764 3C158012 */ lui $s5, %hi(D_8011D330) # $s5, 0x8012 /* 02E368 8002D768 26B5D330 */ addiu $s5, %lo(D_8011D330) # addiu $s5, $s5, -0x2cd0 -/* 02E36C 8002D76C 3C0E8012 */ lui $t6, 0x8012 +/* 02E36C 8002D76C 3C0E8012 */ lui $t6, %hi(D_8011D338) # $t6, 0x8012 /* 02E370 8002D770 01D87021 */ addu $t6, $t6, $t8 /* 02E374 8002D774 AEAD0000 */ sw $t5, ($s5) -/* 02E378 8002D778 8DCED338 */ lw $t6, -0x2cc8($t6) +/* 02E378 8002D778 8DCED338 */ lw $t6, %lo(D_8011D338)($t6) /* 02E37C 8002D77C 3C168012 */ lui $s6, %hi(D_8011D348) # $s6, 0x8012 /* 02E380 8002D780 8FAF0044 */ lw $t7, 0x44($sp) /* 02E384 8002D784 26D6D348 */ addiu $s6, %lo(D_8011D348) # addiu $s6, $s6, -0x2cb8 diff --git a/asm/non_matchings/unknown_0255E0/func_8002D8DC.s b/asm/non_matchings/unknown_0255E0/func_8002D8DC.s index e1245e71..eec621d1 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002D8DC.s +++ b/asm/non_matchings/unknown_0255E0/func_8002D8DC.s @@ -30,19 +30,19 @@ glabel func_8002D8DC /* 02E54C 8002D94C AC780000 */ sw $t8, ($v1) .L8002D950: /* 02E550 8002D950 8C620000 */ lw $v0, ($v1) -/* 02E554 8002D954 3C088012 */ lui $t0, 0x8012 +/* 02E554 8002D954 3C088012 */ lui $t0, %hi(D_8011D320) # $t0, 0x8012 /* 02E558 8002D958 0002C880 */ sll $t9, $v0, 2 /* 02E55C 8002D95C 01194021 */ addu $t0, $t0, $t9 -/* 02E560 8002D960 8D08D320 */ lw $t0, -0x2ce0($t0) -/* 02E564 8002D964 3C098012 */ lui $t1, 0x8012 +/* 02E560 8002D960 8D08D320 */ lw $t0, %lo(D_8011D320)($t0) +/* 02E564 8002D964 3C098012 */ lui $t1, %hi(D_8011D338) # $t1, 0x8012 /* 02E568 8002D968 3C018012 */ lui $at, %hi(D_8011D330) # $at, 0x8012 /* 02E56C 8002D96C 01394821 */ addu $t1, $t1, $t9 -/* 02E570 8002D970 8D29D338 */ lw $t1, -0x2cc8($t1) -/* 02E574 8002D974 3C0A8012 */ lui $t2, 0x8012 +/* 02E570 8002D970 8D29D338 */ lw $t1, %lo(D_8011D338)($t1) +/* 02E574 8002D974 3C0A8012 */ lui $t2, %hi(D_8011D350) # $t2, 0x8012 /* 02E578 8002D978 AC28D330 */ sw $t0, %lo(D_8011D330)($at) /* 02E57C 8002D97C 3C018012 */ lui $at, %hi(D_8011D348) # $at, 0x8012 /* 02E580 8002D980 01595021 */ addu $t2, $t2, $t9 -/* 02E584 8002D984 8D4AD350 */ lw $t2, -0x2cb0($t2) +/* 02E584 8002D984 8D4AD350 */ lw $t2, %lo(D_8011D350)($t2) /* 02E588 8002D988 AC29D348 */ sw $t1, %lo(D_8011D348)($at) /* 02E58C 8002D98C 3C018012 */ lui $at, %hi(D_8011D360) # $at, 0x8012 /* 02E590 8002D990 AC2AD360 */ sw $t2, %lo(D_8011D360)($at) diff --git a/asm/non_matchings/unknown_032760/func_8003C2E4.s b/asm/non_matchings/unknown_032760/func_8003C2E4.s index 0d9275ca..524e488a 100644 --- a/asm/non_matchings/unknown_032760/func_8003C2E4.s +++ b/asm/non_matchings/unknown_032760/func_8003C2E4.s @@ -13,16 +13,16 @@ glabel func_8003C2E4 /* 03CF10 8003C310 15C00007 */ bnez $t6, .L8003C330 /* 03CF14 8003C314 00000000 */ nop /* 03CF18 8003C318 904F0016 */ lbu $t7, 0x16($v0) -/* 03CF1C 8003C31C 3C18800E */ lui $t8, 0x800e +/* 03CF1C 8003C31C 3C18800E */ lui $t8, %hi(D_800DCA94) # $t8, 0x800e /* 03CF20 8003C320 030FC021 */ addu $t8, $t8, $t7 -/* 03CF24 8003C324 8318CA94 */ lb $t8, -0x356c($t8) +/* 03CF24 8003C324 8318CA94 */ lb $t8, %lo(D_800DCA94)($t8) /* 03CF28 8003C328 10000007 */ b .L8003C348 /* 03CF2C 8003C32C A238003A */ sb $t8, 0x3a($s1) .L8003C330: /* 03CF30 8003C330 90590016 */ lbu $t9, 0x16($v0) -/* 03CF34 8003C334 3C08800E */ lui $t0, 0x800e +/* 03CF34 8003C334 3C08800E */ lui $t0, %hi(D_800DCA9C) # $t0, 0x800e /* 03CF38 8003C338 01194021 */ addu $t0, $t0, $t9 -/* 03CF3C 8003C33C 8108CA9C */ lb $t0, -0x3564($t0) +/* 03CF3C 8003C33C 8108CA9C */ lb $t0, %lo(D_800DCA9C)($t0) /* 03CF40 8003C340 00000000 */ nop /* 03CF44 8003C344 A228003A */ sb $t0, 0x3a($s1) .L8003C348: diff --git a/asm/non_matchings/unknown_043920/func_80042D20.s b/asm/non_matchings/unknown_043920/func_80042D20.s index c39052e8..e2fd4cda 100644 --- a/asm/non_matchings/unknown_043920/func_80042D20.s +++ b/asm/non_matchings/unknown_043920/func_80042D20.s @@ -380,9 +380,9 @@ glabel func_80042D20 /* 043EB0 800432B0 45010009 */ bc1t .L800432D8 /* 043EB4 800432B4 00000000 */ nop /* 043EB8 800432B8 860E01AE */ lh $t6, 0x1ae($s0) -/* 043EBC 800432BC 3C18800E */ lui $t8, 0x800e +/* 043EBC 800432BC 3C18800E */ lui $t8, %hi(D_800DCDA0) # $t8, 0x800e /* 043EC0 800432C0 030EC021 */ addu $t8, $t8, $t6 -/* 043EC4 800432C4 8318CDA0 */ lb $t8, -0x3260($t8) +/* 043EC4 800432C4 8318CDA0 */ lb $t8, %lo(D_800DCDA0)($t8) /* 043EC8 800432C8 3C018012 */ lui $at, %hi(D_8011D544) # $at, 0x8012 /* 043ECC 800432CC A21801CA */ sb $t8, 0x1ca($s0) /* 043ED0 800432D0 C420D544 */ lwc1 $f0, %lo(D_8011D544)($at) @@ -572,10 +572,10 @@ glabel func_80042D20 /* 04417C 8004357C A2000172 */ sb $zero, 0x172($s0) .L80043580: /* 044180 80043580 820F01D3 */ lb $t7, 0x1d3($s0) -/* 044184 80043584 3C19800E */ lui $t9, 0x800e +/* 044184 80043584 3C19800E */ lui $t9, %hi(D_800DCD90) # $t9, 0x800e /* 044188 80043588 15E00016 */ bnez $t7, .L800435E4 /* 04418C 8004358C 032AC821 */ addu $t9, $t9, $t2 -/* 044190 80043590 8339CD90 */ lb $t9, -0x3270($t9) +/* 044190 80043590 8339CD90 */ lb $t9, %lo(D_800DCD90)($t9) /* 044194 80043594 24010004 */ li $at, 4 /* 044198 80043598 17210012 */ bne $t9, $at, .L800435E4 /* 04419C 8004359C 00000000 */ nop @@ -826,12 +826,12 @@ glabel func_80042D20 /* 044538 80043938 3C018012 */ lui $at, %hi(D_8011D544) # $at, 0x8012 /* 04453C 8004393C C424D544 */ lwc1 $f4, %lo(D_8011D544)($at) /* 044540 80043940 44808000 */ mtc1 $zero, $f16 -/* 044544 80043944 3C0F800E */ lui $t7, 0x800e +/* 044544 80043944 3C0F800E */ lui $t7, %hi(D_800DCDA8) # $t7, 0x800e /* 044548 80043948 46048032 */ c.eq.s $f16, $f4 /* 04454C 8004394C 01ED7821 */ addu $t7, $t7, $t5 /* 044550 80043950 4500000F */ bc1f .L80043990 /* 044554 80043954 8FA30058 */ lw $v1, 0x58($sp) -/* 044558 80043958 81EFCDA8 */ lb $t7, -0x3258($t7) +/* 044558 80043958 81EFCDA8 */ lb $t7, %lo(D_800DCDA8)($t7) /* 04455C 8004395C 00000000 */ nop /* 044560 80043960 A20F01CA */ sb $t7, 0x1ca($s0) /* 044564 80043964 87A4003C */ lh $a0, 0x3c($sp) diff --git a/asm/non_matchings/unknown_043920/func_8004447C.s b/asm/non_matchings/unknown_043920/func_8004447C.s index 1f888a4a..7be83839 100644 --- a/asm/non_matchings/unknown_043920/func_8004447C.s +++ b/asm/non_matchings/unknown_043920/func_8004447C.s @@ -358,11 +358,11 @@ glabel func_8004447C /* 0455B0 800449B0 0500000C */ bltz $t0, .L800449E4 /* 0455B4 800449B4 240F0002 */ li $t7, 2 /* 0455B8 800449B8 82180002 */ lb $t8, 2($s0) -/* 0455BC 800449BC 3C018012 */ lui $at, 0x8012 +/* 0455BC 800449BC 3C018012 */ lui $at, %hi(D_8011D58C) # $at, 0x8012 /* 0455C0 800449C0 A20801CF */ sb $t0, 0x1cf($s0) /* 0455C4 800449C4 00280821 */ addu $at, $at, $t0 /* 0455C8 800449C8 270C0001 */ addiu $t4, $t8, 1 -/* 0455CC 800449CC A02CD58C */ sb $t4, -0x2a74($at) +/* 0455CC 800449CC A02CD58C */ sb $t4, %lo(D_8011D58C)($at) /* 0455D0 800449D0 240D0004 */ li $t5, 4 /* 0455D4 800449D4 240E04B0 */ li $t6, 1200 /* 0455D8 800449D8 A20D01CD */ sb $t5, 0x1cd($s0) @@ -416,9 +416,9 @@ glabel func_8004447C /* 04568C 80044A8C 10000013 */ b .L80044ADC /* 045690 80044A90 A020D58C */ sb $zero, -0x2a74($at) /* 045694 80044A94 820F0002 */ lb $t7, 2($s0) -/* 045698 80044A98 3C198012 */ lui $t9, 0x8012 +/* 045698 80044A98 3C198012 */ lui $t9, %hi(D_8011D58C) # $t9, 0x8012 /* 04569C 80044A9C 032FC821 */ addu $t9, $t9, $t7 -/* 0456A0 80044AA0 8339D58C */ lb $t9, -0x2a74($t9) +/* 0456A0 80044AA0 8339D58C */ lb $t9, %lo(D_8011D58C)($t9) /* 0456A4 80044AA4 00000000 */ nop /* 0456A8 80044AA8 13200005 */ beqz $t9, .L80044AC0 /* 0456AC 80044AAC 00000000 */ nop @@ -785,9 +785,9 @@ glabel func_8004447C /* 045BCC 80044FCC 11A10005 */ beq $t5, $at, .L80044FE4 /* 045BD0 80044FD0 00404025 */ move $t0, $v0 /* 045BD4 80044FD4 806E0212 */ lb $t6, 0x212($v1) -/* 045BD8 80044FD8 3C018012 */ lui $at, 0x8012 +/* 045BD8 80044FD8 3C018012 */ lui $at, %hi(D_8011D5B4) # $at, 0x8012 /* 045BDC 80044FDC 00250821 */ addu $at, $at, $a1 -/* 045BE0 80044FE0 A02ED5B4 */ sb $t6, -0x2a4c($at) +/* 045BE0 80044FE0 A02ED5B4 */ sb $t6, %lo(D_8011D5B4)($at) .L80044FE4: /* 045BE4 80044FE4 3C0F8012 */ lui $t7, %hi(D_8011D5B4) # $t7, 0x8012 /* 045BE8 80044FE8 82190002 */ lb $t9, 2($s0) diff --git a/asm/non_matchings/unknown_043920/func_80050A28.s b/asm/non_matchings/unknown_043920/func_80050A28.s index a413e6a6..aa2e06f4 100644 --- a/asm/non_matchings/unknown_043920/func_80050A28.s +++ b/asm/non_matchings/unknown_043920/func_80050A28.s @@ -27,10 +27,10 @@ glabel func_80050A28 /* 051688 80050A88 15C00041 */ bnez $t6, .L80050B90 /* 05168C 80050A8C 2508D528 */ addiu $t0, %lo(D_8011D528) # addiu $t0, $t0, -0x2ad8 /* 051690 80050A90 820F01E7 */ lb $t7, 0x1e7($s0) -/* 051694 80050A94 3C19800E */ lui $t9, 0x800e +/* 051694 80050A94 3C19800E */ lui $t9, %hi(D_800DCDB0) # $t9, 0x800e /* 051698 80050A98 31F8001F */ andi $t8, $t7, 0x1f /* 05169C 80050A9C 0338C821 */ addu $t9, $t9, $t8 -/* 0516A0 80050AA0 8339CDB0 */ lb $t9, -0x3250($t9) +/* 0516A0 80050AA0 8339CDB0 */ lb $t9, %lo(D_800DCDB0)($t9) /* 0516A4 80050AA4 3C01800E */ lui $at, %hi(D_800E663C) # $at, 0x800e /* 0516A8 80050AA8 44995000 */ mtc1 $t9, $f10 /* 0516AC 80050AAC C4276638 */ lwc1 $f7, %lo(D_800E6638)($at) @@ -748,11 +748,11 @@ glabel func_80050A28 /* 0520D8 800514D8 46087380 */ add.s $f14, $f14, $f8 .L800514DC: /* 0520DC 800514DC 3C01800E */ lui $at, 0x800e -/* 0520E0 800514E0 3C0D800E */ lui $t5, 0x800e +/* 0520E0 800514E0 3C0D800E */ lui $t5, %hi(D_800DCC34) # $t5, 0x800e /* 0520E4 800514E4 00230821 */ addu $at, $at, $v1 /* 0520E8 800514E8 01A36821 */ addu $t5, $t5, $v1 /* 0520EC 800514EC C426CBE8 */ lwc1 $f6, -0x3418($at) -/* 0520F0 800514F0 8DADCC34 */ lw $t5, -0x33cc($t5) +/* 0520F0 800514F0 8DADCC34 */ lw $t5, %lo(D_800DCC34)($t5) /* 0520F4 800514F4 8FAC0068 */ lw $t4, 0x68($sp) /* 0520F8 800514F8 0122082A */ slt $at, $t1, $v0 /* 0520FC 800514FC 018D7021 */ addu $t6, $t4, $t5 @@ -1119,9 +1119,9 @@ glabel func_80050A28 /* 052650 80051A50 284100FF */ slti $at, $v0, 0xff /* 052654 80051A54 10200008 */ beqz $at, .L80051A78 /* 052658 80051A58 00025080 */ sll $t2, $v0, 2 -/* 05265C 80051A5C 3C0B800E */ lui $t3, 0x800e +/* 05265C 80051A5C 3C0B800E */ lui $t3, %hi(D_800DCCF4) # $t3, 0x800e /* 052660 80051A60 016A5821 */ addu $t3, $t3, $t2 -/* 052664 80051A64 8D6BCCF4 */ lw $t3, -0x330c($t3) +/* 052664 80051A64 8D6BCCF4 */ lw $t3, %lo(D_800DCCF4)($t3) /* 052668 80051A68 8CD80074 */ lw $t8, 0x74($a2) /* 05266C 80051A6C 00000000 */ nop /* 052670 80051A70 030BC825 */ or $t9, $t8, $t3 @@ -1132,9 +1132,9 @@ glabel func_80050A28 /* 052680 80051A80 284100FF */ slti $at, $v0, 0xff /* 052684 80051A84 10200008 */ beqz $at, .L80051AA8 /* 052688 80051A88 00026880 */ sll $t5, $v0, 2 -/* 05268C 80051A8C 3C0E800E */ lui $t6, 0x800e +/* 05268C 80051A8C 3C0E800E */ lui $t6, %hi(D_800DCCF4) # $t6, 0x800e /* 052690 80051A90 01CD7021 */ addu $t6, $t6, $t5 -/* 052694 80051A94 8DCECCF4 */ lw $t6, -0x330c($t6) +/* 052694 80051A94 8DCECCF4 */ lw $t6, %lo(D_800DCCF4)($t6) /* 052698 80051A98 8CCC0074 */ lw $t4, 0x74($a2) /* 05269C 80051A9C 000E7840 */ sll $t7, $t6, 1 /* 0526A0 80051AA0 018F5025 */ or $t2, $t4, $t7 @@ -1150,24 +1150,24 @@ glabel func_80050A28 /* 0526C4 80051AC4 45000018 */ bc1f .L80051B28 /* 0526C8 80051AC8 0009C080 */ sll $t8, $t1, 2 /* 0526CC 80051ACC 920201DE */ lbu $v0, 0x1de($s0) -/* 0526D0 80051AD0 3C19800E */ lui $t9, 0x800e +/* 0526D0 80051AD0 3C19800E */ lui $t9, %hi(D_800DCD40) # $t9, 0x800e /* 0526D4 80051AD4 284100FF */ slti $at, $v0, 0xff /* 0526D8 80051AD8 10200007 */ beqz $at, .L80051AF8 /* 0526DC 80051ADC 00025880 */ sll $t3, $v0, 2 /* 0526E0 80051AE0 032BC821 */ addu $t9, $t9, $t3 -/* 0526E4 80051AE4 8F39CD40 */ lw $t9, -0x32c0($t9) +/* 0526E4 80051AE4 8F39CD40 */ lw $t9, %lo(D_800DCD40)($t9) /* 0526E8 80051AE8 8CD80074 */ lw $t8, 0x74($a2) /* 0526EC 80051AEC 00000000 */ nop /* 0526F0 80051AF0 03196825 */ or $t5, $t8, $t9 /* 0526F4 80051AF4 ACCD0074 */ sw $t5, 0x74($a2) .L80051AF8: /* 0526F8 80051AF8 920201DF */ lbu $v0, 0x1df($s0) -/* 0526FC 80051AFC 3C0F800E */ lui $t7, 0x800e +/* 0526FC 80051AFC 3C0F800E */ lui $t7, %hi(D_800DCD40) # $t7, 0x800e /* 052700 80051B00 284100FF */ slti $at, $v0, 0xff /* 052704 80051B04 10200007 */ beqz $at, .L80051B24 /* 052708 80051B08 00026080 */ sll $t4, $v0, 2 /* 05270C 80051B0C 01EC7821 */ addu $t7, $t7, $t4 -/* 052710 80051B10 8DEFCD40 */ lw $t7, -0x32c0($t7) +/* 052710 80051B10 8DEFCD40 */ lw $t7, %lo(D_800DCD40)($t7) /* 052714 80051B14 8CCE0074 */ lw $t6, 0x74($a2) /* 052718 80051B18 000F5040 */ sll $t2, $t7, 1 /* 05271C 80051B1C 01CA5825 */ or $t3, $t6, $t2 @@ -1175,11 +1175,11 @@ glabel func_80050A28 .L80051B24: /* 052724 80051B24 0009C080 */ sll $t8, $t1, 2 .L80051B28: -/* 052728 80051B28 3C09800E */ lui $t1, 0x800e +/* 052728 80051B28 3C09800E */ lui $t1, %hi(D_800DCC80) # $t1, 0x800e /* 05272C 80051B2C 8E020018 */ lw $v0, 0x18($s0) /* 052730 80051B30 01384821 */ addu $t1, $t1, $t8 /* 052734 80051B34 8FA60078 */ lw $a2, 0x78($sp) -/* 052738 80051B38 8D29CC80 */ lw $t1, -0x3380($t1) +/* 052738 80051B38 8D29CC80 */ lw $t1, %lo(D_800DCC80)($t1) /* 05273C 80051B3C 14400011 */ bnez $v0, .L80051B84 /* 052740 80051B40 00000000 */ nop /* 052744 80051B44 1120000F */ beqz $t1, .L80051B84 @@ -1593,9 +1593,9 @@ glabel func_80050A28 /* 052D48 80052148 240100FF */ li $at, 255 /* 052D4C 8005214C 1041000A */ beq $v0, $at, .L80052178 /* 052D50 80052150 0002C840 */ sll $t9, $v0, 1 -/* 052D54 80052154 3C0D800E */ lui $t5, 0x800e +/* 052D54 80052154 3C0D800E */ lui $t5, %hi(D_800DCCCC) # $t5, 0x800e /* 052D58 80052158 01B96821 */ addu $t5, $t5, $t9 -/* 052D5C 8005215C 95ADCCCC */ lhu $t5, -0x3334($t5) +/* 052D5C 8005215C 95ADCCCC */ lhu $t5, %lo(D_800DCCCC)($t5) /* 052D60 80052160 3C018012 */ lui $at, %hi(D_8011D550) # $at, 0x8012 /* 052D64 80052164 A42DD550 */ sh $t5, %lo(D_8011D550)($at) /* 052D68 80052168 820C01E0 */ lb $t4, 0x1e0($s0) diff --git a/asm/non_matchings/unknown_043920/func_80059BF0.s b/asm/non_matchings/unknown_043920/func_80059BF0.s index 43f369df..40904677 100644 --- a/asm/non_matchings/unknown_043920/func_80059BF0.s +++ b/asm/non_matchings/unknown_043920/func_80059BF0.s @@ -71,12 +71,12 @@ glabel func_80059BF0 /* 05A8FC 80059CFC 14400044 */ bnez $v0, .L80059E10 /* 05A900 80059D00 254AD59C */ addiu $t2, %lo(D_8011D59C) # addiu $t2, $t2, -0x2a64 /* 05A904 80059D04 81590000 */ lb $t9, ($t2) -/* 05A908 80059D08 3C018012 */ lui $at, 0x8012 +/* 05A908 80059D08 3C018012 */ lui $at, %hi(D_8011D5A8) # $at, 0x8012 /* 05A90C 80059D0C 00197040 */ sll $t6, $t9, 1 /* 05A910 80059D10 002E0821 */ addu $at, $at, $t6 /* 05A914 80059D14 24180001 */ li $t8, 1 /* 05A918 80059D18 1000003D */ b .L80059E10 -/* 05A91C 80059D1C A438D5A8 */ sh $t8, -0x2a58($at) +/* 05A91C 80059D1C A438D5A8 */ sh $t8, %lo(D_8011D5A8)($at) .L80059D20: /* 05A920 80059D20 00EB0019 */ multu $a3, $t3 /* 05A924 80059D24 0005C880 */ sll $t9, $a1, 2 diff --git a/asm/non_matchings/unknown_043920/func_80059E40.s b/asm/non_matchings/unknown_043920/func_80059E40.s index 4c9b9b7f..1b0be27a 100644 --- a/asm/non_matchings/unknown_043920/func_80059E40.s +++ b/asm/non_matchings/unknown_043920/func_80059E40.s @@ -38,13 +38,13 @@ glabel func_80059E40 /* 05AACC 80059ECC 462020A0 */ cvt.s.d $f2, $f4 .L80059ED0: /* 05AAD0 80059ED0 4459F800 */ cfc1 $t9, $31 -/* 05AAD4 80059ED4 3C0D8012 */ lui $t5, 0x8012 +/* 05AAD4 80059ED4 3C0D8012 */ lui $t5, %hi(D_8011D5A0) # $t5, 0x8012 /* 05AAD8 80059ED8 37210003 */ ori $at, $t9, 3 /* 05AADC 80059EDC 38210002 */ xori $at, $at, 2 /* 05AAE0 80059EE0 44C1F800 */ ctc1 $at, $31 /* 05AAE4 80059EE4 01AE6821 */ addu $t5, $t5, $t6 /* 05AAE8 80059EE8 460011A4 */ cvt.w.s $f6, $f2 -/* 05AAEC 80059EEC 85ADD5A0 */ lh $t5, -0x2a60($t5) +/* 05AAEC 80059EEC 85ADD5A0 */ lh $t5, %lo(D_8011D5A0)($t5) /* 05AAF0 80059EF0 44033000 */ mfc1 $v1, $f6 /* 05AAF4 80059EF4 25AFFFFE */ addiu $t7, $t5, -2 /* 05AAF8 80059EF8 44D9F800 */ ctc1 $t9, $31 @@ -75,10 +75,10 @@ glabel func_80059E40 /* 05AB58 80059F58 2469FFFF */ addiu $t1, $v1, -1 .L80059F5C: /* 05AB5C 80059F5C 0005C880 */ sll $t9, $a1, 2 -/* 05AB60 80059F60 3C1F8012 */ lui $ra, 0x8012 +/* 05AB60 80059F60 3C1F8012 */ lui $ra, %hi(D_8011D590) # $ra, 0x8012 /* 05AB64 80059F64 03F9F821 */ addu $ra, $ra, $t9 /* 05AB68 80059F68 00097080 */ sll $t6, $t1, 2 -/* 05AB6C 80059F6C 8FFFD590 */ lw $ra, -0x2a70($ra) +/* 05AB6C 80059F6C 8FFFD590 */ lw $ra, %lo(D_8011D590)($ra) /* 05AB70 80059F70 01C97023 */ subu $t6, $t6, $t1 /* 05AB74 80059F74 000E7080 */ sll $t6, $t6, 2 /* 05AB78 80059F78 27A70084 */ addiu $a3, $sp, 0x84 diff --git a/asm/non_matchings/unknown_05CEF0/func_8005CA78.s b/asm/non_matchings/unknown_05CEF0/func_8005CA78.s index fe8e25ea..47fc6f79 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005CA78.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005CA78.s @@ -1,5 +1,5 @@ glabel func_8005CA78 -/* 05D678 8005CA78 3C018012 */ lui $at, 0x8012 +/* 05D678 8005CA78 3C018012 */ lui $at, %hi(D_8011D5C8) # $at, 0x8012 /* 05D67C 8005CA7C 03E00008 */ jr $ra -/* 05D680 8005CA80 AC24D5C8 */ sw $a0, -0x2a38($at) +/* 05D680 8005CA80 AC24D5C8 */ sw $a0, %lo(D_8011D5C8)($at) diff --git a/asm/non_matchings/unknown_05F690/func_800619F4.s b/asm/non_matchings/unknown_05F690/func_800619F4.s index aa9d71f3..8b705f48 100644 --- a/asm/non_matchings/unknown_05F690/func_800619F4.s +++ b/asm/non_matchings/unknown_05F690/func_800619F4.s @@ -1,5 +1,5 @@ glabel func_800619F4 -/* 0625F4 800619F4 3C018012 */ lui $at, 0x8012 +/* 0625F4 800619F4 3C018012 */ lui $at, %hi(D_8011D640) # $at, 0x8012 /* 0625F8 800619F8 03E00008 */ jr $ra -/* 0625FC 800619FC AC24D640 */ sw $a0, -0x29c0($at) +/* 0625FC 800619FC AC24D640 */ sw $a0, %lo(D_8011D640)($at) diff --git a/asm/non_matchings/unknown_064830/func_8006492C.s b/asm/non_matchings/unknown_064830/func_8006492C.s index 15d1505d..e8c0a85a 100644 --- a/asm/non_matchings/unknown_064830/func_8006492C.s +++ b/asm/non_matchings/unknown_064830/func_8006492C.s @@ -1,8 +1,8 @@ glabel func_8006492C -/* 06552C 8006492C 3C01800E */ lui $at, 0x800e +/* 06552C 8006492C 3C01800E */ lui $at, %hi(D_800DCEB0) # $at, 0x800e /* 065530 80064930 AFA40000 */ sw $a0, ($sp) /* 065534 80064934 03E00008 */ jr $ra -/* 065538 80064938 A024CEB0 */ sb $a0, -0x3150($at) +/* 065538 80064938 A024CEB0 */ sb $a0, %lo(D_800DCEB0)($at) /* 06553C 8006493C 3C02800E */ lui $v0, %hi(D_800DCEB0) # $v0, 0x800e /* 065540 80064940 9042CEB0 */ lbu $v0, %lo(D_800DCEB0)($v0) diff --git a/asm/non_matchings/unknown_066AA0/func_80068158.s b/asm/non_matchings/unknown_066AA0/func_80068158.s index 500ddc23..504b091c 100644 --- a/asm/non_matchings/unknown_066AA0/func_80068158.s +++ b/asm/non_matchings/unknown_066AA0/func_80068158.s @@ -25,14 +25,14 @@ glabel func_80068158 /* 068DAC 800681AC 00053023 */ negu $a2, $a1 .L800681B0: /* 068DB0 800681B0 8CE50000 */ lw $a1, ($a3) -/* 068DB4 800681B4 3C19800E */ lui $t9, 0x800e +/* 068DB4 800681B4 3C19800E */ lui $t9, %hi(D_800DD094) # $t9, 0x800e /* 068DB8 800681B8 0005C080 */ sll $t8, $a1, 2 /* 068DBC 800681BC 0305C023 */ subu $t8, $t8, $a1 /* 068DC0 800681C0 0018C080 */ sll $t8, $t8, 2 /* 068DC4 800681C4 0305C021 */ addu $t8, $t8, $a1 /* 068DC8 800681C8 0018C080 */ sll $t8, $t8, 2 /* 068DCC 800681CC 0338C821 */ addu $t9, $t9, $t8 -/* 068DD0 800681D0 8F39D094 */ lw $t9, -0x2f6c($t9) +/* 068DD0 800681D0 8F39D094 */ lw $t9, %lo(D_800DD094)($t9) /* 068DD4 800681D4 3C0A800E */ lui $t2, %hi(D_800DD148) # $t2, 0x800e /* 068DD8 800681D8 332B0001 */ andi $t3, $t9, 1 /* 068DDC 800681DC 1560001A */ bnez $t3, .L80068248 diff --git a/asm/non_matchings/unknown_066AA0/func_800682AC.s b/asm/non_matchings/unknown_066AA0/func_800682AC.s index b95eebf0..40eb5197 100644 --- a/asm/non_matchings/unknown_066AA0/func_800682AC.s +++ b/asm/non_matchings/unknown_066AA0/func_800682AC.s @@ -8,14 +8,14 @@ glabel func_800682AC /* 068EC4 800682C4 AFA40020 */ sw $a0, 0x20($sp) /* 068EC8 800682C8 3C0F8012 */ lui $t7, %hi(D_80120CE4) # $t7, 0x8012 /* 068ECC 800682CC 8DEF0CE4 */ lw $t7, %lo(D_80120CE4)($t7) -/* 068ED0 800682D0 3C19800E */ lui $t9, 0x800e +/* 068ED0 800682D0 3C19800E */ lui $t9, %hi(D_800DD094) # $t9, 0x800e /* 068ED4 800682D4 000FC080 */ sll $t8, $t7, 2 /* 068ED8 800682D8 030FC023 */ subu $t8, $t8, $t7 /* 068EDC 800682DC 0018C080 */ sll $t8, $t8, 2 /* 068EE0 800682E0 030FC021 */ addu $t8, $t8, $t7 /* 068EE4 800682E4 0018C080 */ sll $t8, $t8, 2 /* 068EE8 800682E8 0338C821 */ addu $t9, $t9, $t8 -/* 068EEC 800682EC 8F39D094 */ lw $t9, -0x2f6c($t9) +/* 068EEC 800682EC 8F39D094 */ lw $t9, %lo(D_800DD094)($t9) /* 068EF0 800682F0 8FA40020 */ lw $a0, 0x20($sp) /* 068EF4 800682F4 332A0001 */ andi $t2, $t9, 1 /* 068EF8 800682F8 00024402 */ srl $t0, $v0, 0x10 diff --git a/asm/non_matchings/unknown_078050/func_80078190.s b/asm/non_matchings/unknown_078050/func_80078190.s index dd452cd3..73d4576c 100644 --- a/asm/non_matchings/unknown_078050/func_80078190.s +++ b/asm/non_matchings/unknown_078050/func_80078190.s @@ -423,10 +423,10 @@ glabel func_80078190 /* 0793D4 800787D4 AC265F38 */ sw $a2, %lo(D_80125F38)($at) /* 0793D8 800787D8 3C018012 */ lui $at, %hi(D_80125F3C) # $at, 0x8012 /* 0793DC 800787DC AC275F3C */ sw $a3, %lo(D_80125F3C)($at) -/* 0793E0 800787E0 3C01800E */ lui $at, 0x800e +/* 0793E0 800787E0 3C01800E */ lui $at, %hi(D_800DE4CC) # $at, 0x800e /* 0793E4 800787E4 24080001 */ li $t0, 1 /* 0793E8 800787E8 03E00008 */ jr $ra -/* 0793EC 800787EC AC28E4CC */ sw $t0, -0x1b34($at) +/* 0793EC 800787EC AC28E4CC */ sw $t0, %lo(D_800DE4CC)($at) /* 0793F0 800787F0 3C01800E */ lui $at, 0x800e /* 0793F4 800787F4 03E00008 */ jr $ra diff --git a/asm/non_matchings/unknown_07B870/func_8007B374.s b/asm/non_matchings/unknown_07B870/func_8007B374.s index e8c8f569..4fc5af7e 100644 --- a/asm/non_matchings/unknown_07B870/func_8007B374.s +++ b/asm/non_matchings/unknown_07B870/func_8007B374.s @@ -1,7 +1,7 @@ glabel func_8007B374 -/* 07BF74 8007B374 3C01800E */ lui $at, 0x800e +/* 07BF74 8007B374 3C01800E */ lui $at, %hi(D_800DE7C0) # $at, 0x800e /* 07BF78 8007B378 03E00008 */ jr $ra -/* 07BF7C 8007B37C AC24E7C0 */ sw $a0, -0x1840($at) +/* 07BF7C 8007B37C AC24E7C0 */ sw $a0, %lo(D_800DE7C0)($at) /* 07BF80 8007B380 04800006 */ bltz $a0, .L8007B39C /* 07BF84 8007B384 3C0E8012 */ lui $t6, %hi(D_80126330) # $t6, 0x8012 diff --git a/asm/non_matchings/unknown_080500/DrawMenuText.s b/asm/non_matchings/unknown_080500/DrawMenuText.s index 74568de2..e7cb83bf 100644 --- a/asm/non_matchings/unknown_080500/DrawMenuText.s +++ b/asm/non_matchings/unknown_080500/DrawMenuText.s @@ -125,9 +125,9 @@ glabel DrawMenuText /* 082FC4 800823C4 2D810008 */ sltiu $at, $t4, 8 /* 082FC8 800823C8 10200117 */ beqz $at, .L80082828 /* 082FCC 800823CC 000C6080 */ sll $t4, $t4, 2 -/* 082FD0 800823D0 3C01800F */ lui $at, 0x800f +/* 082FD0 800823D0 3C01800F */ lui $at, %hi(D_800E836C) # $at, 0x800f /* 082FD4 800823D4 002C0821 */ addu $at, $at, $t4 -/* 082FD8 800823D8 8C2C836C */ lw $t4, -0x7c94($at) +/* 082FD8 800823D8 8C2C836C */ lw $t4, %lo(D_800E836C)($at) /* 082FDC 800823DC 00000000 */ nop /* 082FE0 800823E0 01800008 */ jr $t4 /* 082FE4 800823E4 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s index 946a192f..3fcde973 100644 --- a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s @@ -508,9 +508,9 @@ glabel MenuCreditsLoop /* 09C674 8009BA74 2D410005 */ sltiu $at, $t2, 5 /* 09C678 8009BA78 10200062 */ beqz $at, .L8009BC04 /* 09C67C 8009BA7C 000A5080 */ sll $t2, $t2, 2 -/* 09C680 8009BA80 3C01800F */ lui $at, 0x800f +/* 09C680 8009BA80 3C01800F */ lui $at, %hi(D_800E8574) # $at, 0x800f /* 09C684 8009BA84 002A0821 */ addu $at, $at, $t2 -/* 09C688 8009BA88 8C2A8574 */ lw $t2, -0x7a8c($at) +/* 09C688 8009BA88 8C2A8574 */ lw $t2, %lo(D_800E8574)($at) /* 09C68C 8009BA8C 00000000 */ nop /* 09C690 8009BA90 01400008 */ jr $t2 /* 09C694 8009BA94 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/MenuInit.s b/asm/non_matchings/unknown_080500/MenuInit.s index f96f9859..87cffeae 100644 --- a/asm/non_matchings/unknown_080500/MenuInit.s +++ b/asm/non_matchings/unknown_080500/MenuInit.s @@ -26,9 +26,9 @@ glabel MenuInit /* 082030 80081430 2DE1001D */ sltiu $at, $t7, 0x1d /* 082034 80081434 10200055 */ beqz $at, .L8008158C /* 082038 80081438 000F7880 */ sll $t7, $t7, 2 -/* 08203C 8008143C 3C01800F */ lui $at, 0x800f +/* 08203C 8008143C 3C01800F */ lui $at, %hi(D_800E8284) # $at, 0x800f /* 082040 80081440 002F0821 */ addu $at, $at, $t7 -/* 082044 80081444 8C2F8284 */ lw $t7, -0x7d7c($at) +/* 082044 80081444 8C2F8284 */ lw $t7, %lo(D_800E8284)($at) /* 082048 80081448 00000000 */ nop /* 08204C 8008144C 01E00008 */ jr $t7 /* 082050 80081450 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/MenuLoop.s b/asm/non_matchings/unknown_080500/MenuLoop.s index dfdd45cd..e6f0b39c 100644 --- a/asm/non_matchings/unknown_080500/MenuLoop.s +++ b/asm/non_matchings/unknown_080500/MenuLoop.s @@ -24,9 +24,9 @@ glabel MenuLoop /* 0821FC 800815FC 2D81001D */ sltiu $at, $t4, 0x1d /* 082200 80081600 1020006A */ beqz $at, .L800817AC /* 082204 80081604 000C6080 */ sll $t4, $t4, 2 -/* 082208 80081608 3C01800F */ lui $at, 0x800f +/* 082208 80081608 3C01800F */ lui $at, %hi(D_800E82F8) # $at, 0x800f /* 08220C 8008160C 002C0821 */ addu $at, $at, $t4 -/* 082210 80081610 8C2C82F8 */ lw $t4, -0x7d08($at) +/* 082210 80081610 8C2C82F8 */ lw $t4, %lo(D_800E82F8)($at) /* 082214 80081614 00000000 */ nop /* 082218 80081618 01800008 */ jr $t4 /* 08221C 8008161C 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/MenuSaveOptionsLoop.s b/asm/non_matchings/unknown_080500/MenuSaveOptionsLoop.s index a456b56f..0c951e72 100644 --- a/asm/non_matchings/unknown_080500/MenuSaveOptionsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuSaveOptionsLoop.s @@ -113,9 +113,9 @@ glabel MenuSaveOptionsLoop .L80087CF8: /* 0888F8 80087CF8 1020005D */ beqz $at, .L80087E70 /* 0888FC 80087CFC 00027880 */ sll $t7, $v0, 2 -/* 088900 80087D00 3C01800F */ lui $at, 0x800f +/* 088900 80087D00 3C01800F */ lui $at, %hi(D_800E84B0) # $at, 0x800f /* 088904 80087D04 002F0821 */ addu $at, $at, $t7 -/* 088908 80087D08 8C2F84B0 */ lw $t7, -0x7b50($at) +/* 088908 80087D08 8C2F84B0 */ lw $t7, %lo(D_800E84B0)($at) /* 08890C 80087D0C 00000000 */ nop /* 088910 80087D10 01E00008 */ jr $t7 /* 088914 80087D14 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_800853D0.s b/asm/non_matchings/unknown_080500/func_800853D0.s index 376f1dc4..80180396 100644 --- a/asm/non_matchings/unknown_080500/func_800853D0.s +++ b/asm/non_matchings/unknown_080500/func_800853D0.s @@ -12,9 +12,9 @@ glabel func_800853D0 /* 085FF8 800853F8 2F01000A */ sltiu $at, $t8, 0xa /* 085FFC 800853FC 1020010A */ beqz $at, .L80085828 /* 086000 80085400 0018C080 */ sll $t8, $t8, 2 -/* 086004 80085404 3C01800F */ lui $at, 0x800f +/* 086004 80085404 3C01800F */ lui $at, %hi(D_800E83B8) # $at, 0x800f /* 086008 80085408 00380821 */ addu $at, $at, $t8 -/* 08600C 8008540C 8C3883B8 */ lw $t8, -0x7c48($at) +/* 08600C 8008540C 8C3883B8 */ lw $t8, %lo(D_800E83B8)($at) /* 086010 80085410 00000000 */ nop /* 086014 80085414 03000008 */ jr $t8 /* 086018 80085418 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80085B9C.s b/asm/non_matchings/unknown_080500/func_80085B9C.s index 30940882..f5d2ff6e 100644 --- a/asm/non_matchings/unknown_080500/func_80085B9C.s +++ b/asm/non_matchings/unknown_080500/func_80085B9C.s @@ -10,11 +10,11 @@ glabel func_80085B9C /* 0867BC 80085BBC AFA40068 */ sw $a0, 0x68($sp) /* 0867C0 80085BC0 3C038012 */ lui $v1, %hi(D_801263E0) # $v1, 0x8012 /* 0867C4 80085BC4 8C6363E0 */ lw $v1, %lo(D_801263E0)($v1) -/* 0867C8 80085BC8 3C01800F */ lui $at, 0x800f +/* 0867C8 80085BC8 3C01800F */ lui $at, %hi(D_800E83E0) # $at, 0x800f /* 0867CC 80085BCC 306E0007 */ andi $t6, $v1, 7 /* 0867D0 80085BD0 000E7080 */ sll $t6, $t6, 2 /* 0867D4 80085BD4 002E0821 */ addu $at, $at, $t6 -/* 0867D8 80085BD8 8C2E83E0 */ lw $t6, -0x7c20($at) +/* 0867D8 80085BD8 8C2E83E0 */ lw $t6, %lo(D_800E83E0)($at) /* 0867DC 80085BDC 3054FFFF */ andi $s4, $v0, 0xffff /* 0867E0 80085BE0 00009825 */ move $s3, $zero /* 0867E4 80085BE4 00003025 */ move $a2, $zero diff --git a/asm/non_matchings/unknown_080500/func_800867D4.s b/asm/non_matchings/unknown_080500/func_800867D4.s index cb42d7c6..a7548a7c 100644 --- a/asm/non_matchings/unknown_080500/func_800867D4.s +++ b/asm/non_matchings/unknown_080500/func_800867D4.s @@ -17,9 +17,9 @@ glabel func_800867D4 /* 087410 80086810 2D010005 */ sltiu $at, $t0, 5 /* 087414 80086814 1020007D */ beqz $at, .L80086A0C /* 087418 80086818 00084080 */ sll $t0, $t0, 2 -/* 08741C 8008681C 3C01800F */ lui $at, 0x800f +/* 08741C 8008681C 3C01800F */ lui $at, %hi(D_800E8400) # $at, 0x800f /* 087420 80086820 00280821 */ addu $at, $at, $t0 -/* 087424 80086824 8C288400 */ lw $t0, -0x7c00($at) +/* 087424 80086824 8C288400 */ lw $t0, %lo(D_800E8400)($at) /* 087428 80086828 00000000 */ nop /* 08742C 8008682C 01000008 */ jr $t0 /* 087430 80086830 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80086AFC.s b/asm/non_matchings/unknown_080500/func_80086AFC.s index 9d937664..98f72cee 100644 --- a/asm/non_matchings/unknown_080500/func_80086AFC.s +++ b/asm/non_matchings/unknown_080500/func_80086AFC.s @@ -15,9 +15,9 @@ glabel func_80086AFC /* 087730 80086B30 2D41000A */ sltiu $at, $t2, 0xa /* 087734 80086B34 102001A3 */ beqz $at, .L800871C4 /* 087738 80086B38 000A5080 */ sll $t2, $t2, 2 -/* 08773C 80086B3C 3C01800F */ lui $at, 0x800f +/* 08773C 80086B3C 3C01800F */ lui $at, %hi(D_800E8418) # $at, 0x800f /* 087740 80086B40 002A0821 */ addu $at, $at, $t2 -/* 087744 80086B44 8C2A8418 */ lw $t2, -0x7be8($at) +/* 087744 80086B44 8C2A8418 */ lw $t2, %lo(D_800E8418)($at) /* 087748 80086B48 00000000 */ nop /* 08774C 80086B4C 01400008 */ jr $t2 /* 087750 80086B50 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80087734.s b/asm/non_matchings/unknown_080500/func_80087734.s index e6fcb539..4b96be67 100644 --- a/asm/non_matchings/unknown_080500/func_80087734.s +++ b/asm/non_matchings/unknown_080500/func_80087734.s @@ -99,9 +99,9 @@ glabel func_80087734 /* 088498 80087898 2DE10009 */ sltiu $at, $t7, 9 /* 08849C 8008789C 10200014 */ beqz $at, .L800878F0 /* 0884A0 800878A0 000F7880 */ sll $t7, $t7, 2 -/* 0884A4 800878A4 3C01800F */ lui $at, 0x800f +/* 0884A4 800878A4 3C01800F */ lui $at, %hi(D_800E8440) # $at, 0x800f /* 0884A8 800878A8 002F0821 */ addu $at, $at, $t7 -/* 0884AC 800878AC 8C2F8440 */ lw $t7, -0x7bc0($at) +/* 0884AC 800878AC 8C2F8440 */ lw $t7, %lo(D_800E8440)($at) /* 0884B0 800878B0 00000000 */ nop /* 0884B4 800878B4 01E00008 */ jr $t7 /* 0884B8 800878B8 00000000 */ nop @@ -130,9 +130,9 @@ glabel func_80087734 /* 08850C 8008790C 2D810009 */ sltiu $at, $t4, 9 /* 088510 80087910 10200014 */ beqz $at, .L80087964 /* 088514 80087914 000C6080 */ sll $t4, $t4, 2 -/* 088518 80087918 3C01800F */ lui $at, 0x800f +/* 088518 80087918 3C01800F */ lui $at, %hi(D_800E8464) # $at, 0x800f /* 08851C 8008791C 002C0821 */ addu $at, $at, $t4 -/* 088520 80087920 8C2C8464 */ lw $t4, -0x7b9c($at) +/* 088520 80087920 8C2C8464 */ lw $t4, %lo(D_800E8464)($at) /* 088524 80087924 00000000 */ nop /* 088528 80087928 01800008 */ jr $t4 /* 08852C 8008792C 00000000 */ nop @@ -161,9 +161,9 @@ glabel func_80087734 /* 088580 80087980 2D61000A */ sltiu $at, $t3, 0xa /* 088584 80087984 10200072 */ beqz $at, .L80087B50 /* 088588 80087988 000B5880 */ sll $t3, $t3, 2 -/* 08858C 8008798C 3C01800F */ lui $at, 0x800f +/* 08858C 8008798C 3C01800F */ lui $at, %hi(D_800E8488) # $at, 0x800f /* 088590 80087990 002B0821 */ addu $at, $at, $t3 -/* 088594 80087994 8C2B8488 */ lw $t3, -0x7b78($at) +/* 088594 80087994 8C2B8488 */ lw $t3, %lo(D_800E8488)($at) /* 088598 80087998 00000000 */ nop /* 08859C 8008799C 01600008 */ jr $t3 /* 0885A0 800879A0 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80087F14.s b/asm/non_matchings/unknown_080500/func_80087F14.s index 1a9478bf..54685ed2 100644 --- a/asm/non_matchings/unknown_080500/func_80087F14.s +++ b/asm/non_matchings/unknown_080500/func_80087F14.s @@ -41,7 +41,7 @@ glabel func_80087F14 /* 088BAC 80087FAC 8FAE0074 */ lw $t6, 0x74($sp) /* 088BB0 80087FB0 A2150000 */ sb $s5, ($s0) /* 088BB4 80087FB4 11C00005 */ beqz $t6, .L80087FCC -/* 088BB8 80087FB8 3C188012 */ lui $t8, %hi(D_80126A60) #$t8, 0x8012 +/* 088BB8 80087FB8 3C188012 */ lui $t8, %hi(D_80126A60) # $t8, 0x8012 /* 088BBC 80087FBC 8FAF0070 */ lw $t7, 0x70($sp) /* 088BC0 80087FC0 00000000 */ nop /* 088BC4 80087FC4 15E00008 */ bnez $t7, .L80087FE8 @@ -121,7 +121,7 @@ glabel func_80087F14 /* 088CC4 800880C4 10000024 */ b .L80088158 /* 088CC8 800880C8 8FAF0090 */ lw $t7, 0x90($sp) .L800880CC: -/* 088CCC 800880CC 3C188012 */ lui $t8, %hi(D_80126A30) #$t8, 0x8012 +/* 088CCC 800880CC 3C188012 */ lui $t8, %hi(D_80126A30) # $t8, 0x8012 /* 088CD0 800880D0 0302C021 */ addu $t8, $t8, $v0 /* 088CD4 800880D4 93186A30 */ lbu $t8, %lo(D_80126A30)($t8) /* 088CD8 800880D8 8FB90094 */ lw $t9, 0x94($sp) diff --git a/asm/non_matchings/unknown_080500/func_800890AC.s b/asm/non_matchings/unknown_080500/func_800890AC.s index c78525bd..b84cb301 100644 --- a/asm/non_matchings/unknown_080500/func_800890AC.s +++ b/asm/non_matchings/unknown_080500/func_800890AC.s @@ -236,7 +236,7 @@ glabel func_800890AC /* 08A010 80089410 AFB80034 */ sw $t8, 0x34($sp) .L80089414: /* 08A014 80089414 10400013 */ beqz $v0, .L80089464 -/* 08A018 80089418 3C028012 */ lui $v0, %hi(D_80126B60) #$v0, 0x8012 +/* 08A018 80089418 3C028012 */ lui $v0, %hi(D_80126B60) # $v0, 0x8012 /* 08A01C 8008941C 00431021 */ addu $v0, $v0, $v1 /* 08A020 80089420 90426B60 */ lbu $v0, %lo(D_80126B60)($v0) /* 08A024 80089424 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80092188.s b/asm/non_matchings/unknown_080500/func_80092188.s index 0c9ef3da..7d309e49 100644 --- a/asm/non_matchings/unknown_080500/func_80092188.s +++ b/asm/non_matchings/unknown_080500/func_80092188.s @@ -189,9 +189,9 @@ glabel func_80092188 /* 093048 80092448 102001B3 */ beqz $at, .L80092B18 /* 09304C 8009244C AFA00034 */ sw $zero, 0x34($sp) /* 093050 80092450 000F7880 */ sll $t7, $t7, 2 -/* 093054 80092454 3C01800F */ lui $at, 0x800f +/* 093054 80092454 3C01800F */ lui $at, %hi(D_800E84F4) # $at, 0x800f /* 093058 80092458 002F0821 */ addu $at, $at, $t7 -/* 09305C 8009245C 8C2F84F4 */ lw $t7, -0x7b0c($at) +/* 09305C 8009245C 8C2F84F4 */ lw $t7, %lo(D_800E84F4)($at) /* 093060 80092460 00000000 */ nop /* 093064 80092464 01E00008 */ jr $t7 /* 093068 80092468 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80094D28.s b/asm/non_matchings/unknown_080500/func_80094D28.s index ea0e7827..0214dbf9 100644 --- a/asm/non_matchings/unknown_080500/func_80094D28.s +++ b/asm/non_matchings/unknown_080500/func_80094D28.s @@ -37,9 +37,9 @@ glabel func_80094D28 /* 0959AC 80094DAC 2D410006 */ sltiu $at, $t2, 6 /* 0959B0 80094DB0 102001F5 */ beqz $at, .L80095588 /* 0959B4 80094DB4 000A5080 */ sll $t2, $t2, 2 -/* 0959B8 80094DB8 3C01800F */ lui $at, 0x800f +/* 0959B8 80094DB8 3C01800F */ lui $at, %hi(D_800E8508) # $at, 0x800f /* 0959BC 80094DBC 002A0821 */ addu $at, $at, $t2 -/* 0959C0 80094DC0 8C2A8508 */ lw $t2, -0x7af8($at) +/* 0959C0 80094DC0 8C2A8508 */ lw $t2, %lo(D_800E8508)($at) /* 0959C4 80094DC4 00000000 */ nop /* 0959C8 80094DC8 01400008 */ jr $t2 /* 0959CC 80094DCC 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80095624.s b/asm/non_matchings/unknown_080500/func_80095624.s index b4cf6620..26fc935c 100644 --- a/asm/non_matchings/unknown_080500/func_80095624.s +++ b/asm/non_matchings/unknown_080500/func_80095624.s @@ -4,9 +4,9 @@ glabel func_80095624 /* 09622C 8009562C 2DE10009 */ sltiu $at, $t7, 9 /* 096230 80095630 10200025 */ beqz $at, .L800956C8 /* 096234 80095634 000F7880 */ sll $t7, $t7, 2 -/* 096238 80095638 3C01800F */ lui $at, 0x800f +/* 096238 80095638 3C01800F */ lui $at, %hi(D_800E8524) # $at, 0x800f /* 09623C 8009563C 002F0821 */ addu $at, $at, $t7 -/* 096240 80095640 8C2F8524 */ lw $t7, -0x7adc($at) +/* 096240 80095640 8C2F8524 */ lw $t7, %lo(D_800E8524)($at) /* 096244 80095644 00000000 */ nop /* 096248 80095648 01E00008 */ jr $t7 /* 09624C 8009564C 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index 0b343c60..54937b76 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -139,9 +139,9 @@ glabel func_80095728 /* 096524 80095924 2F010009 */ sltiu $at, $t8, 9 /* 096528 80095928 1020037A */ beqz $at, .L80096714 /* 09652C 8009592C 0018C080 */ sll $t8, $t8, 2 -/* 096530 80095930 3C01800F */ lui $at, 0x800f +/* 096530 80095930 3C01800F */ lui $at, %hi(D_800E8548) # $at, 0x800f /* 096534 80095934 00380821 */ addu $at, $at, $t8 -/* 096538 80095938 8C388548 */ lw $t8, -0x7ab8($at) +/* 096538 80095938 8C388548 */ lw $t8, %lo(D_800E8548)($at) /* 09653C 8009593C 00000000 */ nop /* 096540 80095940 03000008 */ jr $t8 /* 096544 80095944 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_800998E0.s b/asm/non_matchings/unknown_080500/func_800998E0.s index 115d49e9..42518e10 100644 --- a/asm/non_matchings/unknown_080500/func_800998E0.s +++ b/asm/non_matchings/unknown_080500/func_800998E0.s @@ -15,7 +15,7 @@ glabel func_800998E0 /* 09A514 80099914 0C000741 */ jal func_80001D04 /* 09A518 80099918 AFA60020 */ sw $a2, 0x20($sp) /* 09A51C 8009991C 8FA60020 */ lw $a2, 0x20($sp) -/* 09A520 80099920 3C108012 */ lui $s0, %hi(D_80126540) #$s0, 0x8012 +/* 09A520 80099920 3C108012 */ lui $s0, %hi(D_80126540) # $s0, 0x8012 /* 09A524 80099924 02068021 */ addu $s0, $s0, $a2 /* 09A528 80099928 92106540 */ lbu $s0, %lo(D_80126540)($s0) /* 09A52C 8009992C 3C048012 */ lui $a0, %hi(D_801264D0) # $a0, 0x8012 diff --git a/asm/non_matchings/unknown_080500/func_8009CFEC.s b/asm/non_matchings/unknown_080500/func_8009CFEC.s index c1dea90d..988bd1e0 100644 --- a/asm/non_matchings/unknown_080500/func_8009CFEC.s +++ b/asm/non_matchings/unknown_080500/func_8009CFEC.s @@ -47,9 +47,9 @@ glabel func_8009CFEC /* 09DC94 8009D094 2D210006 */ sltiu $at, $t1, 6 /* 09DC98 8009D098 1020001A */ beqz $at, .L8009D104 /* 09DC9C 8009D09C 00094880 */ sll $t1, $t1, 2 -/* 09DCA0 8009D0A0 3C01800F */ lui $at, 0x800f +/* 09DCA0 8009D0A0 3C01800F */ lui $at, %hi(D_800E8588) # $at, 0x800f /* 09DCA4 8009D0A4 00290821 */ addu $at, $at, $t1 -/* 09DCA8 8009D0A8 8C298588 */ lw $t1, -0x7a78($at) +/* 09DCA8 8009D0A8 8C298588 */ lw $t1, %lo(D_800E8588)($at) /* 09DCAC 8009D0AC 00000000 */ nop /* 09DCB0 8009D0B0 01200008 */ jr $t1 /* 09DCB4 8009D0B4 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_8009D360.s b/asm/non_matchings/unknown_080500/func_8009D360.s index f4b7a322..4cabb56b 100644 --- a/asm/non_matchings/unknown_080500/func_8009D360.s +++ b/asm/non_matchings/unknown_080500/func_8009D360.s @@ -176,9 +176,9 @@ glabel func_8009D360 /* 09E1F4 8009D5F4 2DA10010 */ sltiu $at, $t5, 0x10 /* 09E1F8 8009D5F8 102000FA */ beqz $at, .L8009D9E4 /* 09E1FC 8009D5FC 000D6880 */ sll $t5, $t5, 2 -/* 09E200 8009D600 3C01800F */ lui $at, 0x800f +/* 09E200 8009D600 3C01800F */ lui $at, %hi(D_800E85A0) # $at, 0x800f /* 09E204 8009D604 002D0821 */ addu $at, $at, $t5 -/* 09E208 8009D608 8C2D85A0 */ lw $t5, -0x7a60($at) +/* 09E208 8009D608 8C2D85A0 */ lw $t5, %lo(D_800E85A0)($at) /* 09E20C 8009D60C 00000000 */ nop /* 09E210 8009D610 01A00008 */ jr $t5 /* 09E214 8009D614 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_8009DB3C.s b/asm/non_matchings/unknown_080500/func_8009DB3C.s index 04ea63e8..71ca863e 100644 --- a/asm/non_matchings/unknown_080500/func_8009DB3C.s +++ b/asm/non_matchings/unknown_080500/func_8009DB3C.s @@ -71,9 +71,9 @@ glabel func_8009DB3C /* 09E83C 8009DC3C 102001CF */ beqz $at, .L8009E37C /* 09E840 8009DC40 AFA20040 */ sw $v0, 0x40($sp) /* 09E844 8009DC44 00037880 */ sll $t7, $v1, 2 -/* 09E848 8009DC48 3C01800F */ lui $at, 0x800f +/* 09E848 8009DC48 3C01800F */ lui $at, %hi(D_800E85E0) # $at, 0x800f /* 09E84C 8009DC4C 002F0821 */ addu $at, $at, $t7 -/* 09E850 8009DC50 8C2F85E0 */ lw $t7, -0x7a20($at) +/* 09E850 8009DC50 8C2F85E0 */ lw $t7, %lo(D_800E85E0)($at) /* 09E854 8009DC54 00000000 */ nop /* 09E858 8009DC58 01E00008 */ jr $t7 /* 09E85C 8009DC5C 00000000 */ nop @@ -510,9 +510,9 @@ glabel func_8009DB3C .L8009E2B0: /* 09EEB0 8009E2B0 10200028 */ beqz $at, .L8009E354 /* 09EEB4 8009E2B4 00035080 */ sll $t2, $v1, 2 -/* 09EEB8 8009E2B8 3C01800F */ lui $at, 0x800f +/* 09EEB8 8009E2B8 3C01800F */ lui $at, %hi(D_800E860C) # $at, 0x800f /* 09EEBC 8009E2BC 002A0821 */ addu $at, $at, $t2 -/* 09EEC0 8009E2C0 8C2A860C */ lw $t2, -0x79f4($at) +/* 09EEC0 8009E2C0 8C2A860C */ lw $t2, %lo(D_800E860C)($at) /* 09EEC4 8009E2C4 00000000 */ nop /* 09EEC8 8009E2C8 01400008 */ jr $t2 /* 09EECC 8009E2CC 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A0EB4.s b/asm/non_matchings/unknown_09F8F0/func_800A0EB4.s index 48c6fbe2..f1a250ab 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A0EB4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A0EB4.s @@ -22,9 +22,9 @@ glabel func_800A0EB4 /* 0A1B04 800A0F04 1020002D */ beqz $at, .L800A0FBC /* 0A1B08 800A0F08 26100420 */ addiu $s0, $s0, 0x420 /* 0A1B0C 800A0F0C 00094880 */ sll $t1, $t1, 2 -/* 0A1B10 800A0F10 3C01800F */ lui $at, 0x800f +/* 0A1B10 800A0F10 3C01800F */ lui $at, %hi(D_800E86F8) # $at, 0x800f /* 0A1B14 800A0F14 00290821 */ addu $at, $at, $t1 -/* 0A1B18 800A0F18 8C2986F8 */ lw $t1, -0x7908($at) +/* 0A1B18 800A0F18 8C2986F8 */ lw $t1, %lo(D_800E86F8)($at) /* 0A1B1C 800A0F1C 00000000 */ nop /* 0A1B20 800A0F20 01200008 */ jr $t1 /* 0A1B24 800A0F24 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A4154.s b/asm/non_matchings/unknown_09F8F0/func_800A4154.s index 9767ed53..f154caa7 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A4154.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A4154.s @@ -9,7 +9,7 @@ glabel func_800A4154 /* 0A4D70 800A4170 1041002B */ beq $v0, $at, .L800A4220 /* 0A4D74 800A4174 3C038012 */ lui $v1, %hi(D_80126D0C) # $v1, 0x8012 /* 0A4D78 800A4178 8C636D0C */ lw $v1, %lo(D_80126D0C)($v1) -/* 0A4D7C 800A417C 3C19800E */ lui $t9, %hi(D_800E2794) #$t9, 0x800e +/* 0A4D7C 800A417C 3C19800E */ lui $t9, %hi(D_800E2794) # $t9, 0x800e /* 0A4D80 800A4180 1860000F */ blez $v1, .L800A41C0 /* 0A4D84 800A4184 00037880 */ sll $t7, $v1, 2 /* 0A4D88 800A4188 01E2C021 */ addu $t8, $t7, $v0 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A4F50.s b/asm/non_matchings/unknown_09F8F0/func_800A4F50.s index e93a9ec8..11dbb9a0 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A4F50.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A4F50.s @@ -27,7 +27,7 @@ glabel func_800A4F50 /* 0A5BB0 800A4FB0 8FAD0018 */ lw $t5, 0x18($sp) /* 0A5BB4 800A4FB4 00026080 */ sll $t4, $v0, 2 /* 0A5BB8 800A4FB8 85AF0000 */ lh $t7, ($t5) -/* 0A5BBC 800A4FBC 3C18800E */ lui $t8, %hi(D_800E2794) #$t8, 0x800e +/* 0A5BBC 800A4FBC 3C18800E */ lui $t8, %hi(D_800E2794) # $t8, 0x800e /* 0A5BC0 800A4FC0 018F7021 */ addu $t6, $t4, $t7 /* 0A5BC4 800A4FC4 030EC021 */ addu $t8, $t8, $t6 /* 0A5BC8 800A4FC8 93182794 */ lbu $t8, %lo(D_800E2794)($t8) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A6254.s b/asm/non_matchings/unknown_09F8F0/func_800A6254.s index 0d6cf905..850b9374 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A6254.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A6254.s @@ -92,9 +92,9 @@ glabel func_800A6254 /* 0A6FB4 800A63B4 2F210005 */ sltiu $at, $t9, 5 /* 0A6FB8 800A63B8 10200278 */ beqz $at, .L800A6D9C /* 0A6FBC 800A63BC 0019C880 */ sll $t9, $t9, 2 -/* 0A6FC0 800A63C0 3C01800F */ lui $at, 0x800f +/* 0A6FC0 800A63C0 3C01800F */ lui $at, %hi(D_800E8744) # $at, 0x800f /* 0A6FC4 800A63C4 00390821 */ addu $at, $at, $t9 -/* 0A6FC8 800A63C8 8C398744 */ lw $t9, -0x78bc($at) +/* 0A6FC8 800A63C8 8C398744 */ lw $t9, %lo(D_800E8744)($at) /* 0A6FCC 800A63CC 00000000 */ nop /* 0A6FD0 800A63D0 03200008 */ jr $t9 /* 0A6FD4 800A63D4 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A6E30.s b/asm/non_matchings/unknown_09F8F0/func_800A6E30.s index 94c535e2..e6bab691 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A6E30.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A6E30.s @@ -9,9 +9,9 @@ glabel func_800A6E30 /* 0A7A4C 800A6E4C 2DC10005 */ sltiu $at, $t6, 5 /* 0A7A50 800A6E50 102000CA */ beqz $at, .L800A717C /* 0A7A54 800A6E54 000E7080 */ sll $t6, $t6, 2 -/* 0A7A58 800A6E58 3C01800F */ lui $at, 0x800f +/* 0A7A58 800A6E58 3C01800F */ lui $at, %hi(D_800E8768) # $at, 0x800f /* 0A7A5C 800A6E5C 002E0821 */ addu $at, $at, $t6 -/* 0A7A60 800A6E60 8C2E8768 */ lw $t6, -0x7898($at) +/* 0A7A60 800A6E60 8C2E8768 */ lw $t6, %lo(D_800E8768)($at) /* 0A7A64 800A6E64 00000000 */ nop /* 0A7A68 800A6E68 01C00008 */ jr $t6 /* 0A7A6C 800A6E6C 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A7B68.s b/asm/non_matchings/unknown_09F8F0/func_800A7B68.s index 5f3e27dd..be48514a 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A7B68.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A7B68.s @@ -9,7 +9,7 @@ glabel func_800A7B68 /* 0A8784 800A7B84 00803025 */ move $a2, $a0 /* 0A8788 800A7B88 848F0000 */ lh $t7, ($a0) /* 0A878C 800A7B8C 00077080 */ sll $t6, $a3, 2 -/* 0A8790 800A7B90 3C19800E */ lui $t9, %hi(D_800E2794) #$t9, 0x800e +/* 0A8790 800A7B90 3C19800E */ lui $t9, %hi(D_800E2794) # $t9, 0x800e /* 0A8794 800A7B94 01CFC021 */ addu $t8, $t6, $t7 /* 0A8798 800A7B98 0338C821 */ addu $t9, $t9, $t8 /* 0A879C 800A7B9C 93392794 */ lbu $t9, %lo(D_800E2794)($t9) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B2040.s b/asm/non_matchings/unknown_0AEE70/func_800B2040.s index cf36f45b..3a2ec19f 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B2040.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B2040.s @@ -14,9 +14,9 @@ glabel func_800B2040 /* 0B2C6C 800B206C 2C410005 */ sltiu $at, $v0, 5 /* 0B2C70 800B2070 10200077 */ beqz $at, .L800B2250 /* 0B2C74 800B2074 00027080 */ sll $t6, $v0, 2 -/* 0B2C78 800B2078 3C01800F */ lui $at, 0x800f +/* 0B2C78 800B2078 3C01800F */ lui $at, %hi(D_800E8BDC) # $at, 0x800f /* 0B2C7C 800B207C 002E0821 */ addu $at, $at, $t6 -/* 0B2C80 800B2080 8C2E8BDC */ lw $t6, -0x7424($at) +/* 0B2C80 800B2080 8C2E8BDC */ lw $t6, %lo(D_800E8BDC)($at) /* 0B2C84 800B2084 00000000 */ nop /* 0B2C88 800B2088 01C00008 */ jr $t6 /* 0B2C8C 800B208C 00000000 */ nop diff --git a/asm/non_matchings/unknown_0AEE70/func_800B4A40.s b/asm/non_matchings/unknown_0AEE70/func_800B4A40.s index abd868d2..9389eb08 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B4A40.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B4A40.s @@ -88,9 +88,9 @@ glabel func_800B4A40 /* 0B5780 800B4B80 10200011 */ beqz $at, .L800B4BC8 /* 0B5784 800B4B84 256B0001 */ addiu $t3, $t3, 1 /* 0B5788 800B4B88 0018C080 */ sll $t8, $t8, 2 -/* 0B578C 800B4B8C 3C01800F */ lui $at, 0x800f +/* 0B578C 800B4B8C 3C01800F */ lui $at, %hi(D_800E8CAC) # $at, 0x800f /* 0B5790 800B4B90 00380821 */ addu $at, $at, $t8 -/* 0B5794 800B4B94 8C388CAC */ lw $t8, -0x7354($at) +/* 0B5794 800B4B94 8C388CAC */ lw $t8, %lo(D_800E8CAC)($at) /* 0B5798 800B4B98 00000000 */ nop /* 0B579C 800B4B9C 03000008 */ jr $t8 /* 0B57A0 800B4BA0 00000000 */ nop @@ -225,9 +225,9 @@ glabel func_800B4A40 /* 0B596C 800B4D6C 10200015 */ beqz $at, .L800B4DC4 /* 0B5970 800B4D70 256B0001 */ addiu $t3, $t3, 1 /* 0B5974 800B4D74 0019C880 */ sll $t9, $t9, 2 -/* 0B5978 800B4D78 3C01800F */ lui $at, 0x800f +/* 0B5978 800B4D78 3C01800F */ lui $at, %hi(D_800E8CF0) # $at, 0x800f /* 0B597C 800B4D7C 00390821 */ addu $at, $at, $t9 -/* 0B5980 800B4D80 8C398CF0 */ lw $t9, -0x7310($at) +/* 0B5980 800B4D80 8C398CF0 */ lw $t9, %lo(D_800E8CF0)($at) /* 0B5984 800B4D84 00000000 */ nop /* 0B5988 800B4D88 03200008 */ jr $t9 /* 0B598C 800B4D8C 00000000 */ nop @@ -270,9 +270,9 @@ glabel func_800B4A40 /* 0B5A14 800B4E14 102003FD */ beqz $at, .L800B5E0C /* 0B5A18 800B4E18 A3B3019A */ sb $s3, 0x19a($sp) /* 0B5A1C 800B4E1C 000E7080 */ sll $t6, $t6, 2 -/* 0B5A20 800B4E20 3C01800F */ lui $at, 0x800f +/* 0B5A20 800B4E20 3C01800F */ lui $at, %hi(D_800E8D88) # $at, 0x800f /* 0B5A24 800B4E24 002E0821 */ addu $at, $at, $t6 -/* 0B5A28 800B4E28 8C2E8D88 */ lw $t6, -0x7278($at) +/* 0B5A28 800B4E28 8C2E8D88 */ lw $t6, %lo(D_800E8D88)($at) /* 0B5A2C 800B4E2C 00000000 */ nop /* 0B5A30 800B4E30 01C00008 */ jr $t6 /* 0B5A34 800B4E34 00000000 */ nop diff --git a/asm/non_matchings/unknown_0AEE70/func_800B653C.s b/asm/non_matchings/unknown_0AEE70/func_800B653C.s index 28ea44d0..f4f4dc0f 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B653C.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B653C.s @@ -35,9 +35,9 @@ glabel func_800B653C /* 0B71BC 800B65BC 2DC10005 */ sltiu $at, $t6, 5 /* 0B71C0 800B65C0 102000AE */ beqz $at, .L800B687C /* 0B71C4 800B65C4 000E7080 */ sll $t6, $t6, 2 -/* 0B71C8 800B65C8 3C01800F */ lui $at, 0x800f +/* 0B71C8 800B65C8 3C01800F */ lui $at, %hi(D_800E8E58) # $at, 0x800f /* 0B71CC 800B65CC 002E0821 */ addu $at, $at, $t6 -/* 0B71D0 800B65D0 8C2E8E58 */ lw $t6, -0x71a8($at) +/* 0B71D0 800B65D0 8C2E8E58 */ lw $t6, %lo(D_800E8E58)($at) /* 0B71D4 800B65D4 00000000 */ nop /* 0B71D8 800B65D8 01C00008 */ jr $t6 /* 0B71DC 800B65DC 00000000 */ nop diff --git a/asm/non_matchings/unknown_0AEE70/func_800B76B8.s b/asm/non_matchings/unknown_0AEE70/func_800B76B8.s index a0357d1f..63f50f37 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B76B8.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B76B8.s @@ -3,9 +3,9 @@ glabel func_800B76B8 /* 0B82BC 800B76BC 28810003 */ slti $at, $a0, 3 /* 0B82C0 800B76C0 10200004 */ beqz $at, .L800B76D4 /* 0B82C4 800B76C4 00047080 */ sll $t6, $a0, 2 -/* 0B82C8 800B76C8 3C018013 */ lui $at, 0x8013 +/* 0B82C8 800B76C8 3C018013 */ lui $at, %hi(D_80129FB0) # $at, 0x8013 /* 0B82CC 800B76CC 002E0821 */ addu $at, $at, $t6 -/* 0B82D0 800B76D0 AC259FB0 */ sw $a1, -0x6050($at) +/* 0B82D0 800B76D0 AC259FB0 */ sw $a1, %lo(D_80129FB0)($at) .L800B76D4: /* 0B82D4 800B76D4 03E00008 */ jr $ra /* 0B82D8 800B76D8 00000000 */ nop diff --git a/asm/non_matchings/unknown_0AEE70/func_800B7810.s b/asm/non_matchings/unknown_0AEE70/func_800B7810.s index 0ff3f5ea..bf6dc19e 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B7810.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B7810.s @@ -27,9 +27,9 @@ glabel func_800B7810 /* 0B8474 800B7874 2C410006 */ sltiu $at, $v0, 6 /* 0B8478 800B7878 1020011B */ beqz $at, .L800B7CE8 /* 0B847C 800B787C 00024880 */ sll $t1, $v0, 2 -/* 0B8480 800B7880 3C01800F */ lui $at, 0x800f +/* 0B8480 800B7880 3C01800F */ lui $at, %hi(D_800E913C) # $at, 0x800f /* 0B8484 800B7884 00290821 */ addu $at, $at, $t1 -/* 0B8488 800B7888 8C29913C */ lw $t1, -0x6ec4($at) +/* 0B8488 800B7888 8C29913C */ lw $t1, %lo(D_800E913C)($at) /* 0B848C 800B788C 00000000 */ nop /* 0B8490 800B7890 01200008 */ jr $t1 /* 0B8494 800B7894 00000000 */ nop diff --git a/asm/non_matchings/unknown_0B8920/func_800B8C04.s b/asm/non_matchings/unknown_0B8920/func_800B8C04.s index 00e122fb..84c1ece8 100644 --- a/asm/non_matchings/unknown_0B8920/func_800B8C04.s +++ b/asm/non_matchings/unknown_0B8920/func_800B8C04.s @@ -158,9 +158,9 @@ glabel func_800B8C04 /* 0B9A3C 800B8E3C 00177880 */ sll $t7, $s7, 2 /* 0B9A40 800B8E40 026E082A */ slt $at, $s3, $t6 /* 0B9A44 800B8E44 10200068 */ beqz $at, .L800B8FE8 -/* 0B9A48 800B8E48 3C188013 */ lui $t8, 0x8013 +/* 0B9A48 800B8E48 3C188013 */ lui $t8, %hi(D_8012A0E8) # $t8, 0x8013 /* 0B9A4C 800B8E4C 030FC021 */ addu $t8, $t8, $t7 -/* 0B9A50 800B8E50 8F18A0E8 */ lw $t8, -0x5f18($t8) +/* 0B9A50 800B8E50 8F18A0E8 */ lw $t8, %lo(D_8012A0E8)($t8) /* 0B9A54 800B8E54 24190001 */ li $t9, 1 /* 0B9A58 800B8E58 02797004 */ sllv $t6, $t9, $s3 /* 0B9A5C 800B8E5C 030E7824 */ and $t7, $t8, $t6 @@ -334,9 +334,9 @@ glabel func_800B8C04 /* 0B9CC8 800B90C8 00177880 */ sll $t7, $s7, 2 /* 0B9CCC 800B90CC 0278082A */ slt $at, $s3, $t8 /* 0B9CD0 800B90D0 1020003B */ beqz $at, .L800B91C0 -/* 0B9CD4 800B90D4 3C198013 */ lui $t9, 0x8013 +/* 0B9CD4 800B90D4 3C198013 */ lui $t9, %hi(D_8012A0E8) # $t9, 0x8013 /* 0B9CD8 800B90D8 032FC821 */ addu $t9, $t9, $t7 -/* 0B9CDC 800B90DC 8F39A0E8 */ lw $t9, -0x5f18($t9) +/* 0B9CDC 800B90DC 8F39A0E8 */ lw $t9, %lo(D_8012A0E8)($t9) /* 0B9CE0 800B90E0 240E0001 */ li $t6, 1 /* 0B9CE4 800B90E4 026EC004 */ sllv $t8, $t6, $s3 /* 0B9CE8 800B90E8 03387824 */ and $t7, $t9, $t8 diff --git a/asm/non_matchings/unknown_0B8920/func_800BCC70.s b/asm/non_matchings/unknown_0B8920/func_800BCC70.s index 462ae347..ad586d2c 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BCC70.s +++ b/asm/non_matchings/unknown_0B8920/func_800BCC70.s @@ -214,11 +214,11 @@ glabel func_800BCC70 /* 0BDB98 800BCF98 240F0001 */ li $t7, 1 /* 0BDB9C 800BCF9C 032E2821 */ addu $a1, $t9, $t6 /* 0BDBA0 800BCFA0 90A4000B */ lbu $a0, 0xb($a1) -/* 0BDBA4 800BCFA4 3C0E8013 */ lui $t6, 0x8013 +/* 0BDBA4 800BCFA4 3C0E8013 */ lui $t6, %hi(D_8012A0E8) # $t6, 0x8013 /* 0BDBA8 800BCFA8 0004C880 */ sll $t9, $a0, 2 /* 0BDBAC 800BCFAC 90A3000A */ lbu $v1, 0xa($a1) /* 0BDBB0 800BCFB0 01D97021 */ addu $t6, $t6, $t9 -/* 0BDBB4 800BCFB4 8DCEA0E8 */ lw $t6, -0x5f18($t6) +/* 0BDBB4 800BCFB4 8DCEA0E8 */ lw $t6, %lo(D_8012A0E8)($t6) /* 0BDBB8 800BCFB8 006FC004 */ sllv $t8, $t7, $v1 /* 0BDBBC 800BCFBC 030E7824 */ and $t7, $t8, $t6 /* 0BDBC0 800BCFC0 11E00091 */ beqz $t7, .L800BD208 diff --git a/asm/non_matchings/unknown_0B8920/func_800C01D8.s b/asm/non_matchings/unknown_0B8920/func_800C01D8.s index 15ce5615..9ac29611 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C01D8.s +++ b/asm/non_matchings/unknown_0B8920/func_800C01D8.s @@ -74,9 +74,9 @@ glabel func_800C01D8 /* 0C0EEC 800C02EC 10200062 */ beqz $at, .L800C0478 /* 0C0EF0 800C02F0 A0AD0000 */ sb $t5, ($a1) /* 0C0EF4 800C02F4 000E7080 */ sll $t6, $t6, 2 -/* 0C0EF8 800C02F8 3C01800F */ lui $at, 0x800f +/* 0C0EF8 800C02F8 3C01800F */ lui $at, %hi(D_800E92D0) # $at, 0x800f /* 0C0EFC 800C02FC 002E0821 */ addu $at, $at, $t6 -/* 0C0F00 800C0300 8C2E92D0 */ lw $t6, -0x6d30($at) +/* 0C0F00 800C0300 8C2E92D0 */ lw $t6, %lo(D_800E92D0)($at) /* 0C0F04 800C0304 00000000 */ nop /* 0C0F08 800C0308 01C00008 */ jr $t6 /* 0C0F0C 800C030C 00000000 */ nop diff --git a/asm/non_matchings/unknown_0B8920/func_800C0494.s b/asm/non_matchings/unknown_0B8920/func_800C0494.s index a5c8f083..0a06d3ac 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C0494.s +++ b/asm/non_matchings/unknown_0B8920/func_800C0494.s @@ -52,9 +52,9 @@ glabel func_800C0494 /* 0C1148 800C0548 2D610007 */ sltiu $at, $t3, 7 /* 0C114C 800C054C 1020001A */ beqz $at, .L800C05B8 /* 0C1150 800C0550 000B5880 */ sll $t3, $t3, 2 -/* 0C1154 800C0554 3C01800F */ lui $at, 0x800f +/* 0C1154 800C0554 3C01800F */ lui $at, %hi(D_800E92EC) # $at, 0x800f /* 0C1158 800C0558 002B0821 */ addu $at, $at, $t3 -/* 0C115C 800C055C 8C2B92EC */ lw $t3, -0x6d14($at) +/* 0C115C 800C055C 8C2B92EC */ lw $t3, %lo(D_800E92EC)($at) /* 0C1160 800C0560 00000000 */ nop /* 0C1164 800C0564 01600008 */ jr $t3 /* 0C1168 800C0568 00000000 */ nop diff --git a/asm/non_matchings/unknown_0B8920/func_800C05C8.s b/asm/non_matchings/unknown_0B8920/func_800C05C8.s index 200604a6..c83d1c74 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C05C8.s +++ b/asm/non_matchings/unknown_0B8920/func_800C05C8.s @@ -41,9 +41,9 @@ glabel func_800C05C8 /* 0C125C 800C065C 2F010007 */ sltiu $at, $t8, 7 /* 0C1260 800C0660 10200028 */ beqz $at, .L800C0704 /* 0C1264 800C0664 0018C080 */ sll $t8, $t8, 2 -/* 0C1268 800C0668 3C01800F */ lui $at, 0x800f +/* 0C1268 800C0668 3C01800F */ lui $at, %hi(D_800E9310) # $at, 0x800f /* 0C126C 800C066C 00380821 */ addu $at, $at, $t8 -/* 0C1270 800C0670 8C389310 */ lw $t8, -0x6cf0($at) +/* 0C1270 800C0670 8C389310 */ lw $t8, %lo(D_800E9310)($at) /* 0C1274 800C0674 00000000 */ nop /* 0C1278 800C0678 03000008 */ jr $t8 /* 0C127C 800C067C 00000000 */ nop diff --git a/asm/non_matchings/unknown_0B8920/func_800C31EC.s b/asm/non_matchings/unknown_0B8920/func_800C31EC.s index 98744ae1..cae54898 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C31EC.s +++ b/asm/non_matchings/unknown_0B8920/func_800C31EC.s @@ -61,18 +61,18 @@ glabel func_800C31EC /* 0C3EC4 800C32C4 3C108013 */ lui $s0, %hi(D_8012A7D4) # $s0, 0x8013 /* 0C3EC8 800C32C8 2610A7D4 */ addiu $s0, %lo(D_8012A7D4) # addiu $s0, $s0, -0x582c /* 0C3ECC 800C32CC 8E0E0000 */ lw $t6, ($s0) -/* 0C3ED0 800C32D0 3C058013 */ lui $a1, 0x8013 +/* 0C3ED0 800C32D0 3C058013 */ lui $a1, %hi(D_8012A7C8) # $a1, 0x8013 /* 0C3ED4 800C32D4 000E7880 */ sll $t7, $t6, 2 /* 0C3ED8 800C32D8 00AF2821 */ addu $a1, $a1, $t7 -/* 0C3EDC 800C32DC 8CA5A7C8 */ lw $a1, -0x5838($a1) +/* 0C3EDC 800C32DC 8CA5A7C8 */ lw $a1, %lo(D_8012A7C8)($a1) /* 0C3EE0 800C32E0 24040006 */ li $a0, 6 /* 0C3EE4 800C32E4 0C01DB9A */ jal func_80076E68 /* 0C3EE8 800C32E8 01093026 */ xor $a2, $t0, $t1 /* 0C3EEC 800C32EC 8E180000 */ lw $t8, ($s0) -/* 0C3EF0 800C32F0 3C0A8013 */ lui $t2, 0x8013 +/* 0C3EF0 800C32F0 3C0A8013 */ lui $t2, %hi(D_8012A7C8) # $t2, 0x8013 /* 0C3EF4 800C32F4 0018C880 */ sll $t9, $t8, 2 /* 0C3EF8 800C32F8 01595021 */ addu $t2, $t2, $t9 -/* 0C3EFC 800C32FC 8D4AA7C8 */ lw $t2, -0x5838($t2) +/* 0C3EFC 800C32FC 8D4AA7C8 */ lw $t2, %lo(D_8012A7C8)($t2) /* 0C3F00 800C3300 3C018013 */ lui $at, %hi(D_8012A7D0) # $at, 0x8013 /* 0C3F04 800C3304 0C030B5B */ jal func_800C2D6C /* 0C3F08 800C3308 AC2AA7D0 */ sw $t2, %lo(D_8012A7D0)($at) @@ -86,19 +86,19 @@ glabel func_800C31EC /* 0C3F24 800C3324 3C108013 */ lui $s0, %hi(D_8012A7A4) # $s0, 0x8013 /* 0C3F28 800C3328 2610A7A4 */ addiu $s0, %lo(D_8012A7A4) # addiu $s0, $s0, -0x585c /* 0C3F2C 800C332C 8E0E0000 */ lw $t6, ($s0) -/* 0C3F30 800C3330 3C058013 */ lui $a1, 0x8013 +/* 0C3F30 800C3330 3C058013 */ lui $a1, %hi(D_8012A798) # $a1, 0x8013 /* 0C3F34 800C3334 000E7880 */ sll $t7, $t6, 2 /* 0C3F38 800C3338 00AF2821 */ addu $a1, $a1, $t7 -/* 0C3F3C 800C333C 8CA5A798 */ lw $a1, -0x5868($a1) +/* 0C3F3C 800C333C 8CA5A798 */ lw $a1, %lo(D_8012A798)($a1) /* 0C3F40 800C3340 24040006 */ li $a0, 6 /* 0C3F44 800C3344 01093026 */ xor $a2, $t0, $t1 /* 0C3F48 800C3348 0C01DB9A */ jal func_80076E68 /* 0C3F4C 800C334C AFA70024 */ sw $a3, 0x24($sp) /* 0C3F50 800C3350 8E030000 */ lw $v1, ($s0) -/* 0C3F54 800C3354 3C198013 */ lui $t9, 0x8013 +/* 0C3F54 800C3354 3C198013 */ lui $t9, %hi(D_8012A798) # $t9, 0x8013 /* 0C3F58 800C3358 0003C080 */ sll $t8, $v1, 2 /* 0C3F5C 800C335C 0338C821 */ addu $t9, $t9, $t8 -/* 0C3F60 800C3360 8F39A798 */ lw $t9, -0x5868($t9) +/* 0C3F60 800C3360 8F39A798 */ lw $t9, %lo(D_8012A798)($t9) /* 0C3F64 800C3364 3C048013 */ lui $a0, %hi(D_8012A7A0) # $a0, 0x8013 /* 0C3F68 800C3368 246A0001 */ addiu $t2, $v1, 1 /* 0C3F6C 800C336C 2484A7A0 */ addiu $a0, %lo(D_8012A7A0) # addiu $a0, $a0, -0x5860 diff --git a/asm/non_matchings/unknown_0B8920/func_800C38B4.s b/asm/non_matchings/unknown_0B8920/func_800C38B4.s index 5d500bd3..841ded4e 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C38B4.s +++ b/asm/non_matchings/unknown_0B8920/func_800C38B4.s @@ -35,9 +35,9 @@ glabel func_800C38B4 /* 0C4534 800C3934 2DE1000A */ sltiu $at, $t7, 0xa /* 0C4538 800C3938 1020009E */ beqz $at, .L800C3BB4 /* 0C453C 800C393C 000F7880 */ sll $t7, $t7, 2 -/* 0C4540 800C3940 3C01800F */ lui $at, 0x800f +/* 0C4540 800C3940 3C01800F */ lui $at, %hi(D_800E9330) # $at, 0x800f /* 0C4544 800C3944 002F0821 */ addu $at, $at, $t7 -/* 0C4548 800C3948 8C2F9330 */ lw $t7, -0x6cd0($at) +/* 0C4548 800C3948 8C2F9330 */ lw $t7, %lo(D_800E9330)($at) /* 0C454C 800C394C 00000000 */ nop /* 0C4550 800C3950 01E00008 */ jr $t7 /* 0C4554 800C3954 00000000 */ nop diff --git a/asm/non_matchings/unknown_0B8920/func_800C45A4.s b/asm/non_matchings/unknown_0B8920/func_800C45A4.s index 8503ae88..02e0c6d5 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C45A4.s +++ b/asm/non_matchings/unknown_0B8920/func_800C45A4.s @@ -308,9 +308,9 @@ glabel func_800C45A4 /* 0C5648 800C4A48 2DE10018 */ sltiu $at, $t7, 0x18 /* 0C564C 800C4A4C 10200026 */ beqz $at, .L800C4AE8 /* 0C5650 800C4A50 000F7880 */ sll $t7, $t7, 2 -/* 0C5654 800C4A54 3C01800F */ lui $at, 0x800f +/* 0C5654 800C4A54 3C01800F */ lui $at, %hi(D_800E9360) # $at, 0x800f /* 0C5658 800C4A58 002F0821 */ addu $at, $at, $t7 -/* 0C565C 800C4A5C 8C2F9360 */ lw $t7, -0x6ca0($at) +/* 0C565C 800C4A5C 8C2F9360 */ lw $t7, %lo(D_800E9360)($at) /* 0C5660 800C4A60 00000000 */ nop /* 0C5664 800C4A64 01E00008 */ jr $t7 /* 0C5668 800C4A68 00000000 */ nop diff --git a/asm/unknown_070110/func_8006F564.s b/asm/unknown_070110/func_8006F564.s index ecc23e66..6020b039 100644 --- a/asm/unknown_070110/func_8006F564.s +++ b/asm/unknown_070110/func_8006F564.s @@ -1,11 +1,11 @@ glabel func_8006F564 -/* 070164 8006F564 3C01800E */ lui $at, 0x800e +/* 070164 8006F564 3C01800E */ lui $at, %hi(D_800DD430) # $at, 0x800e /* 070168 8006F568 03E00008 */ jr $ra -/* 07016C 8006F56C A024D430 */ sb $a0, -0x2bd0($at) +/* 07016C 8006F56C A024D430 */ sb $a0, %lo(D_800DD430)($at) -/* 070170 8006F570 3C02800E */ lui $v0, 0x800e +/* 070170 8006F570 3C02800E */ lui $v0, %hi(D_800DD430) # $v0, 0x800e /* 070174 8006F574 03E00008 */ jr $ra -/* 070178 8006F578 9042D430 */ lbu $v0, -0x2bd0($v0) +/* 070178 8006F578 9042D430 */ lbu $v0, %lo(D_800DD430)($v0) /* 07017C 8006F57C 34080004 */ ori $t0, $zero, 4 /* 070180 8006F580 3C0FFFFF */ lui $t7, 0xffff diff --git a/data/dkr.data.s b/data/dkr.data.s index a1bc8ad1..2d942215 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -12863,6 +12863,7 @@ glabel D_800E824C .aligned_text "loadFrontEndItem() - Item no %d out of range 0-%d\n" +glabel D_800E8284 .word 0x80081464 .word 0x80081454 .word 0x8008158C @@ -12892,6 +12893,8 @@ glabel D_800E824C .word 0x80081574 .word 0x8008158C .word 0x80081584 + +glabel D_800E82F8 .word 0x80081634 .word 0x80081620 .word 0x800817AC @@ -12921,6 +12924,8 @@ glabel D_800E824C .word 0x80081788 .word 0x800817AC .word 0x8008179C + +glabel D_800E836C .word 0x800823E8 .word 0x80082454 .word 0x800824B8 @@ -12958,6 +12963,8 @@ glabel D_800E83AC glabel D_800E83B0 .word 0x3F2B851F .word 0x40351EB8 + +glabel D_800E83B8 .word 0x8008541C .word 0x8008553C .word 0x80085574 @@ -12968,6 +12975,8 @@ glabel D_800E83B0 .word 0x80085774 .word 0x800857C0 .word 0x800857F0 + +glabel D_800E83E0 .word 0x80085C30 .word 0x80085BF8 .word 0x80085BF8 @@ -12976,6 +12985,8 @@ glabel D_800E83B0 .word 0x80085C08 .word 0x80085C14 .word 0x80085C24 + +glabel D_800E8400 .word 0x80086834 .word 0x80086888 .word 0x800868C0 @@ -12984,6 +12995,8 @@ glabel D_800E83B0 glabel D_800E8414 .word 0x3DCCCCCD + +glabel D_800E8418 .word 0x80086B54 .word 0x80086CDC .word 0x80086D54 @@ -12994,6 +13007,8 @@ glabel D_800E8414 .word 0x800871C4 .word 0x800871C4 .word 0x80087158 + +glabel D_800E8440 .word 0x800878D4 .word 0x800878D4 .word 0x800878D4 @@ -13003,6 +13018,8 @@ glabel D_800E8414 .word 0x800878E0 .word 0x800878F0 .word 0x800878D4 + +glabel D_800E8464 .word 0x80087930 .word 0x80087948 .word 0x80087948 @@ -13012,6 +13029,8 @@ glabel D_800E8414 .word 0x80087954 .word 0x80087964 .word 0x80087948 + +glabel D_800E8488 .word 0x800879A4 .word 0x800879A4 .word 0x800879A4 @@ -13022,6 +13041,8 @@ glabel D_800E8414 .word 0x80087B50 .word 0x800879BC .word 0x800879BC + +glabel D_800E84B0 .word 0x80087D18 .word 0x80087D28 .word 0x80087D54 @@ -13055,11 +13076,15 @@ glabel D_800E84EC glabel D_800E84F0 .word 0x3F99999A + +glabel D_800E84F4 .word 0x8009246C .word 0x8009251C .word 0x80092740 .word 0x8009287C .word 0x8009287C + +glabel D_800E8508 .word 0x80094DD0 .word 0x80094FB0 .word 0x80095084 @@ -13069,6 +13094,8 @@ glabel D_800E84F0 glabel D_800E8520 .word 0x3F99999A + +glabel D_800E8524 .word 0x80095650 .word 0x800956C8 .word 0x800956C8 @@ -13078,6 +13105,8 @@ glabel D_800E8520 .word 0x80095680 .word 0x80095698 .word 0x800956B0 + +glabel D_800E8548 .word 0x80095948 .word 0x80095964 .word 0x80095B34 @@ -13093,17 +13122,23 @@ glabel D_800E856C glabel D_800E8570 .word 0x3D99999A + +glabel D_800E8574 .word 0x8009BA98 .word 0x8009BAD8 .word 0x8009BB08 .word 0x8009BB48 .word 0x8009BB9C + +glabel D_800E8588 .word 0x8009D0B8 .word 0x8009D104 .word 0x8009D0C8 .word 0x8009D0D8 .word 0x8009D0E8 .word 0x8009D0F8 + +glabel D_800E85A0 .word 0x8009D944 .word 0x8009D944 .word 0x8009D944 @@ -13120,6 +13155,8 @@ glabel D_800E8570 .word 0x8009D998 .word 0x8009D9B0 .word 0x8009D9B0 + +glabel D_800E85E0 .word 0x8009DC60 .word 0x8009DEF0 .word 0x8009E37C @@ -13131,6 +13168,8 @@ glabel D_800E8570 .word 0x8009E23C .word 0x8009E37C .word 0x8009DC60 + +glabel D_800E860C .word 0x8009E2D0 .word 0x8009E2F4 .word 0x8009E354 @@ -13220,6 +13259,8 @@ glabel D_800E86F0 glabel D_800E86F4 .word 0x33333333 + +glabel D_800E86F8 .word 0x800A0F28 .word 0x800A0F38 .word 0x800A0F48 @@ -13259,6 +13300,8 @@ glabel D_800E873C glabel D_800E8740 .word 0x46C92000 + +glabel D_800E8744 .word 0x800A63D8 .word 0x800A691C .word 0x800A6BCC @@ -13276,6 +13319,8 @@ glabel D_800E8760 glabel D_800E8764 .word 0x9999999A + +glabel D_800E8768 .word 0x800A6E70 .word 0x800A6F3C .word 0x800A7014 @@ -13432,6 +13477,7 @@ glabel D_800E8BD4 glabel D_800E8BD8 .word 0x3DCCCCCD +glabel D_800E8BDC .word 0x800B2250 .word 0x800B20E0 .word 0x800B2138 @@ -13463,6 +13509,7 @@ glabel D_800E8C5C .aligned_text "*** diPrintf Error *** ---> Out of string space. (Print less text!)\n" +glabel D_800E8CAC .word 0x800B4BA4 .word 0x800B4BC8 .word 0x800B4BC8 @@ -13480,6 +13527,8 @@ glabel D_800E8C5C .word 0x800B4BC8 .word 0x800B4BC8 .word 0x800B4BC4 + +glabel D_800E8CF0 .word 0x800B4DB0 .word 0x800B4DC4 .word 0x800B4DC4 @@ -13518,6 +13567,8 @@ glabel D_800E8C5C .word 0x800B4DC4 .word 0x800B4DC4 .word 0x800B4DC0 + +glabel D_800E8D88 .word 0x800B52C4 .word 0x800B5E0C .word 0x800B5794 @@ -13570,6 +13621,8 @@ glabel D_800E8C5C .word 0x800B5E0C .word 0x800B5E0C .word 0x800B4FA4 + +glabel D_800E8E58 .word 0x800B6658 .word 0x800B6740 .word 0x800B6614 @@ -13690,6 +13743,7 @@ glabel D_800E9138 ### End of EPC lockup strings ### +glabel D_800E913C .word 0x800B7898 .word 0x800B7C18 .word 0x800B7C18 @@ -13730,6 +13784,8 @@ glabel D_800E92BC .word 0x47AE147B .word 0x00000000 .word 0x00000000 + +glabel D_800E92D0 .word 0x800C0310 .word 0x800C0320 .word 0x800C0370 @@ -13737,6 +13793,8 @@ glabel D_800E92BC .word 0x800C03D0 .word 0x800C0420 .word 0x800C0470 + +glabel D_800E92EC .word 0x800C056C .word 0x800C0580 .word 0x800C0580 @@ -13750,6 +13808,8 @@ glabel D_800E9308 glabel D_800E930C .word 0x3F99999A + +glabel D_800E9310 .word 0x800C0680 .word 0x800C0694 .word 0x800C06A8 @@ -13760,6 +13820,8 @@ glabel D_800E930C glabel D_800E932C .word 0x3F99999A + +glabel D_800E9330 .word 0x800C3958 .word 0x800C3984 .word 0x800C3A30 @@ -13772,6 +13834,8 @@ glabel D_800E932C .word 0x800C3BA0 .word 0x00000000 .word 0x00000000 + +glabel D_800E9360 .word 0x800C4A88 .word 0x800C4A78 .word 0x800C4AD0 @@ -13892,6 +13956,7 @@ glabel D_800E95A0 glabel D_800E95A8 .aligned_text "env.c" +glabel D_800E95B0 .word 0x800CA870 .word 0x800CA8C4 .word 0x800CA8C4 @@ -13917,6 +13982,8 @@ glabel D_800E95F8 glabel D_800E95FC .word 0x00000000 + +glabel D_800E9600 .word 0x800CC0C0 .word 0x800CC150 .word 0x800CC150 @@ -13937,6 +14004,8 @@ glabel D_800E95FC .word 0x9D353918 .word 0x00000000 .word 0x00000000 + +glabel D_800E9650 .word 0x800D2A70 .word 0x800D2964 .word 0x800D29A4 @@ -13945,6 +14014,8 @@ glabel D_800E95FC .word 0x800D29E0 .word 0x800D2A28 .word 0x00000000 + +glabel D_800E9670 .word 0x00141818 .word 0x1C1C1C1C .word 0x20202020 @@ -13953,6 +14024,8 @@ glabel D_800E95FC .word 0x0C0C0C0C .word 0x10101010 .word 0x10101010 + +glabel D_800E9690 .word 0x800D3168 .word 0x800D3130 .word 0x800D3110 @@ -13972,12 +14045,16 @@ glabel D_800E96C0 glabel D_800E96C4 .word 0x202B2D23 .word 0x30000000 + +glabel D_800E96CC .word 0x00000001 .word 0x00000002 .word 0x00000004 .word 0x00000008 .word 0x00000010 .word 0x00000000 + +glabel D_800E96E4 .word 0x800D3C08 .word 0x800D3EE8 .word 0x800D3C08 diff --git a/lib/asm/exception/__osException.s b/lib/asm/exception/__osException.s index fab1c365..b49a8d69 100644 --- a/lib/asm/exception/__osException.s +++ b/lib/asm/exception/__osException.s @@ -134,12 +134,12 @@ glabel __osException /* 0D3AC0 800D2EC0 00095202 */ srl $t2, $t1, 8 /* 0D3AC4 800D2EC4 214A0010 */ addi $t2, $t2, 0x10 .L800D2EC8: -/* 0D3AC8 800D2EC8 3C01800F */ lui $at, 0x800f +/* 0D3AC8 800D2EC8 3C01800F */ lui $at, %hi(D_800E9670) # $at, 0x800f /* 0D3ACC 800D2ECC 002A0821 */ addu $at, $at, $t2 -/* 0D3AD0 800D2ED0 902A9670 */ lbu $t2, -0x6990($at) -/* 0D3AD4 800D2ED4 3C01800F */ lui $at, 0x800f +/* 0D3AD0 800D2ED0 902A9670 */ lbu $t2, %lo(D_800E9670)($at) +/* 0D3AD4 800D2ED4 3C01800F */ lui $at, %hi(D_800E9690) # $at, 0x800f /* 0D3AD8 800D2ED8 002A0821 */ addu $at, $at, $t2 -/* 0D3ADC 800D2EDC 8C2A9690 */ lw $t2, -0x6970($at) +/* 0D3ADC 800D2EDC 8C2A9690 */ lw $t2, %lo(D_800E9690)($at) /* 0D3AE0 800D2EE0 01400008 */ jr $t2 /* 0D3AE4 800D2EE4 00000000 */ nop /* 0D3AE8 800D2EE8 2401DFFF */ li $at, -8193 diff --git a/lib/asm/non_matchings/osEepromRead_0CEE80/osEepromRead.s b/lib/asm/non_matchings/osEepromRead_0CEE80/osEepromRead.s index 93922e31..5b4a7c16 100644 --- a/lib/asm/non_matchings/osEepromRead_0CEE80/osEepromRead.s +++ b/lib/asm/non_matchings/osEepromRead_0CEE80/osEepromRead.s @@ -60,11 +60,11 @@ glabel osEepromRead .L800CE354: /* 0CEF54 800CE354 8FAD0030 */ lw $t5, 0x30($sp) /* 0CEF58 800CE358 8FAF0030 */ lw $t7, 0x30($sp) -/* 0CEF5C 800CE35C 3C018013 */ lui $at, 0x8013 +/* 0CEF5C 800CE35C 3C018013 */ lui $at, %hi(D_8012CE40) # $at, 0x8013 /* 0CEF60 800CE360 000D7080 */ sll $t6, $t5, 2 /* 0CEF64 800CE364 002E0821 */ addu $at, $at, $t6 /* 0CEF68 800CE368 240C00FF */ li $t4, 255 -/* 0CEF6C 800CE36C AC2CCE40 */ sw $t4, -0x31c0($at) +/* 0CEF6C 800CE36C AC2CCE40 */ sw $t4, %lo(D_8012CE40)($at) /* 0CEF70 800CE370 25F80001 */ addiu $t8, $t7, 1 /* 0CEF74 800CE374 2B010010 */ slti $at, $t8, 0x10 /* 0CEF78 800CE378 1420FFF6 */ bnez $at, .L800CE354 diff --git a/lib/asm/non_matchings/osEepromWrite_0CF180/osEepromWrite.s b/lib/asm/non_matchings/osEepromWrite_0CF180/osEepromWrite.s index 81abd45b..05ef776b 100644 --- a/lib/asm/non_matchings/osEepromWrite_0CF180/osEepromWrite.s +++ b/lib/asm/non_matchings/osEepromWrite_0CF180/osEepromWrite.s @@ -60,11 +60,11 @@ glabel osEepromWrite .L800CE654: /* 0CF254 800CE654 8FAD0030 */ lw $t5, 0x30($sp) /* 0CF258 800CE658 8FAF0030 */ lw $t7, 0x30($sp) -/* 0CF25C 800CE65C 3C018013 */ lui $at, 0x8013 +/* 0CF25C 800CE65C 3C018013 */ lui $at, %hi(D_8012CE40) # $at, 0x8013 /* 0CF260 800CE660 000D7080 */ sll $t6, $t5, 2 /* 0CF264 800CE664 002E0821 */ addu $at, $at, $t6 /* 0CF268 800CE668 240C00FF */ li $t4, 255 -/* 0CF26C 800CE66C AC2CCE40 */ sw $t4, -0x31c0($at) +/* 0CF26C 800CE66C AC2CCE40 */ sw $t4, %lo(D_8012CE40)($at) /* 0CF270 800CE670 25F80001 */ addiu $t8, $t7, 1 /* 0CF274 800CE674 2B010010 */ slti $at, $t8, 0x10 /* 0CF278 800CE678 1420FFF6 */ bnez $at, .L800CE654 diff --git a/lib/asm/non_matchings/unknown_0CA530/osSetIntMask.s b/lib/asm/non_matchings/unknown_0CA530/osSetIntMask.s index e4909cd2..a5216acb 100644 --- a/lib/asm/non_matchings/unknown_0CA530/osSetIntMask.s +++ b/lib/asm/non_matchings/unknown_0CA530/osSetIntMask.s @@ -23,9 +23,9 @@ glabel osSetIntMask /* 0CA680 800C9A80 00814024 */ and $t0, $a0, $at /* 0CA684 800C9A84 010B4024 */ and $t0, $t0, $t3 /* 0CA688 800C9A88 000843C2 */ srl $t0, $t0, 0xf -/* 0CA68C 800C9A8C 3C0A800F */ lui $t2, 0x800f +/* 0CA68C 800C9A8C 3C0A800F */ lui $t2, %hi(D_800E94D0) # $t2, 0x800f /* 0CA690 800C9A90 01485021 */ addu $t2, $t2, $t0 -/* 0CA694 800C9A94 954A94D0 */ lhu $t2, -0x6b30($t2) +/* 0CA694 800C9A94 954A94D0 */ lhu $t2, %lo(D_800E94D0)($t2) /* 0CA698 800C9A98 3C01A430 */ lui $at, %hi(D_A430000C) # $at, 0xa430 /* 0CA69C 800C9A9C AC2A000C */ sw $t2, %lo(D_A430000C)($at) /* 0CA6A0 800C9AA0 3088FF01 */ andi $t0, $a0, 0xff01 diff --git a/lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s b/lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s index 9d88bd8a..0223ecb5 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s @@ -86,9 +86,9 @@ glabel alEnvMixerPull /* 0CAE08 800CA208 102001AE */ beqz $at, .L800CA8C4 /* 0CAE0C 800CA20C 00000000 */ nop /* 0CAE10 800CA210 000C6080 */ sll $t4, $t4, 2 -/* 0CAE14 800CA214 3C01800F */ lui $at, 0x800f +/* 0CAE14 800CA214 3C01800F */ lui $at, %hi(D_800E95B0) # $at, 0x800f /* 0CAE18 800CA218 002C0821 */ addu $at, $at, $t4 -/* 0CAE1C 800CA21C 8C2C95B0 */ lw $t4, -0x6a50($at) +/* 0CAE1C 800CA21C 8C2C95B0 */ lw $t4, %lo(D_800E95B0)($at) /* 0CAE20 800CA220 00000000 */ nop /* 0CAE24 800CA224 01800008 */ jr $t4 /* 0CAE28 800CA228 00000000 */ nop diff --git a/lib/asm/non_matchings/unknown_0CA9A0/alResampleParam.s b/lib/asm/non_matchings/unknown_0CA9A0/alResampleParam.s index dd4bc702..a587bdec 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/alResampleParam.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alResampleParam.s @@ -6,9 +6,9 @@ glabel alResampleParam /* 0CCCA0 800CC0A0 1020002B */ beqz $at, .L800CC150 /* 0CCCA4 800CC0A4 00803825 */ move $a3, $a0 /* 0CCCA8 800CC0A8 000E7080 */ sll $t6, $t6, 2 -/* 0CCCAC 800CC0AC 3C01800F */ lui $at, 0x800f +/* 0CCCAC 800CC0AC 3C01800F */ lui $at, %hi(D_800E9600) # $at, 0x800f /* 0CCCB0 800CC0B0 002E0821 */ addu $at, $at, $t6 -/* 0CCCB4 800CC0B4 8C2E9600 */ lw $t6, -0x6a00($at) +/* 0CCCB4 800CC0B4 8C2E9600 */ lw $t6, %lo(D_800E9600)($at) /* 0CCCB8 800CC0B8 01C00008 */ jr $t6 /* 0CCCBC 800CC0BC 00000000 */ nop /* 0CCCC0 800CC0C0 10000029 */ b .L800CC168 diff --git a/lib/asm/non_matchings/unknown_0CD820/func_800CCFE0.s b/lib/asm/non_matchings/unknown_0CD820/func_800CCFE0.s index 2fabf639..bb5da71e 100644 --- a/lib/asm/non_matchings/unknown_0CD820/func_800CCFE0.s +++ b/lib/asm/non_matchings/unknown_0CD820/func_800CCFE0.s @@ -25,11 +25,11 @@ glabel func_800CCFE0 .L800CD038: /* 0CDC38 800CD038 8FB80018 */ lw $t8, 0x18($sp) /* 0CDC3C 800CD03C 8FA80018 */ lw $t0, 0x18($sp) -/* 0CDC40 800CD040 3C018013 */ lui $at, 0x8013 +/* 0CDC40 800CD040 3C018013 */ lui $at, %hi(D_8012CD50) # $at, 0x8013 /* 0CDC44 800CD044 0018C880 */ sll $t9, $t8, 2 /* 0CDC48 800CD048 00390821 */ addu $at, $at, $t9 /* 0CDC4C 800CD04C 240F00FF */ li $t7, 255 -/* 0CDC50 800CD050 AC2FCD50 */ sw $t7, -0x32b0($at) +/* 0CDC50 800CD050 AC2FCD50 */ sw $t7, %lo(D_8012CD50)($at) /* 0CDC54 800CD054 25090001 */ addiu $t1, $t0, 1 /* 0CDC58 800CD058 29210010 */ slti $at, $t1, 0x10 /* 0CDC5C 800CD05C 1420FFF6 */ bnez $at, .L800CD038 diff --git a/lib/asm/non_matchings/unknown_0CE370/__osContRamWrite.s b/lib/asm/non_matchings/unknown_0CE370/__osContRamWrite.s index ca36ff5e..70747e5f 100644 --- a/lib/asm/non_matchings/unknown_0CE370/__osContRamWrite.s +++ b/lib/asm/non_matchings/unknown_0CE370/__osContRamWrite.s @@ -47,11 +47,11 @@ glabel __osContRamWrite .L800CD99C: /* 0CE59C 800CD99C 8FAA0058 */ lw $t2, 0x58($sp) /* 0CE5A0 800CD9A0 8FAC0058 */ lw $t4, 0x58($sp) -/* 0CE5A4 800CD9A4 3C018013 */ lui $at, 0x8013 +/* 0CE5A4 800CD9A4 3C018013 */ lui $at, %hi(__osPfsPifRam) # $at, 0x8013 /* 0CE5A8 800CD9A8 000A5880 */ sll $t3, $t2, 2 /* 0CE5AC 800CD9AC 002B0821 */ addu $at, $at, $t3 /* 0CE5B0 800CD9B0 240900FF */ li $t1, 255 -/* 0CE5B4 800CD9B4 AC29CDE0 */ sw $t1, -0x3220($at) +/* 0CE5B4 800CD9B4 AC29CDE0 */ sw $t1, %lo(__osPfsPifRam)($at) /* 0CE5B8 800CD9B8 258D0001 */ addiu $t5, $t4, 1 /* 0CE5BC 800CD9BC 29A10010 */ slti $at, $t5, 0x10 /* 0CE5C0 800CD9C0 1420FFF6 */ bnez $at, .L800CD99C diff --git a/lib/asm/non_matchings/unknown_0CE8A0/__osContRamRead.s b/lib/asm/non_matchings/unknown_0CE8A0/__osContRamRead.s index ec84f74e..334703a2 100644 --- a/lib/asm/non_matchings/unknown_0CE8A0/__osContRamRead.s +++ b/lib/asm/non_matchings/unknown_0CE8A0/__osContRamRead.s @@ -33,11 +33,11 @@ glabel __osContRamRead .L800CDD18: /* 0CE918 800CDD18 8FA80058 */ lw $t0, 0x58($sp) /* 0CE91C 800CDD1C 8FAA0058 */ lw $t2, 0x58($sp) -/* 0CE920 800CDD20 3C018013 */ lui $at, 0x8013 +/* 0CE920 800CDD20 3C018013 */ lui $at, %hi(__osPfsPifRam) # $at, 0x8013 /* 0CE924 800CDD24 00084880 */ sll $t1, $t0, 2 /* 0CE928 800CDD28 00290821 */ addu $at, $at, $t1 /* 0CE92C 800CDD2C 241900FF */ li $t9, 255 -/* 0CE930 800CDD30 AC39CDE0 */ sw $t9, -0x3220($at) +/* 0CE930 800CDD30 AC39CDE0 */ sw $t9, %lo(__osPfsPifRam)($at) /* 0CE934 800CDD34 254B0001 */ addiu $t3, $t2, 1 /* 0CE938 800CDD38 29610010 */ slti $at, $t3, 0x10 /* 0CE93C 800CDD3C 1420FFF6 */ bnez $at, .L800CDD18 diff --git a/lib/asm/non_matchings/unknown_0CF070/__osPackEepReadData.s b/lib/asm/non_matchings/unknown_0CF070/__osPackEepReadData.s index 1cc3132e..37b43d7f 100644 --- a/lib/asm/non_matchings/unknown_0CF070/__osPackEepReadData.s +++ b/lib/asm/non_matchings/unknown_0CF070/__osPackEepReadData.s @@ -8,11 +8,11 @@ glabel __osPackEepReadData .L800CE488: /* 0CF088 800CE488 8FB80004 */ lw $t8, 4($sp) /* 0CF08C 800CE48C 8FA80004 */ lw $t0, 4($sp) -/* 0CF090 800CE490 3C018013 */ lui $at, 0x8013 +/* 0CF090 800CE490 3C018013 */ lui $at, %hi(D_8012CE40) # $at, 0x8013 /* 0CF094 800CE494 0018C880 */ sll $t9, $t8, 2 /* 0CF098 800CE498 00390821 */ addu $at, $at, $t9 /* 0CF09C 800CE49C 240F00FF */ li $t7, 255 -/* 0CF0A0 800CE4A0 AC2FCE40 */ sw $t7, -0x31c0($at) +/* 0CF0A0 800CE4A0 AC2FCE40 */ sw $t7, %lo(D_8012CE40)($at) /* 0CF0A4 800CE4A4 25090001 */ addiu $t1, $t0, 1 /* 0CF0A8 800CE4A8 29210010 */ slti $at, $t1, 0x10 /* 0CF0AC 800CE4AC 1420FFF6 */ bnez $at, .L800CE488 diff --git a/lib/asm/non_matchings/unknown_0CF330/__osPackEepWriteData.s b/lib/asm/non_matchings/unknown_0CF330/__osPackEepWriteData.s index e2a276a3..bca8a948 100644 --- a/lib/asm/non_matchings/unknown_0CF330/__osPackEepWriteData.s +++ b/lib/asm/non_matchings/unknown_0CF330/__osPackEepWriteData.s @@ -8,11 +8,11 @@ glabel __osPackEepWriteData .L800CE748: /* 0CF348 800CE748 8FB80004 */ lw $t8, 4($sp) /* 0CF34C 800CE74C 8FA80004 */ lw $t0, 4($sp) -/* 0CF350 800CE750 3C018013 */ lui $at, 0x8013 +/* 0CF350 800CE750 3C018013 */ lui $at, %hi(D_8012CE40) # $at, 0x8013 /* 0CF354 800CE754 0018C880 */ sll $t9, $t8, 2 /* 0CF358 800CE758 00390821 */ addu $at, $at, $t9 /* 0CF35C 800CE75C 240F00FF */ li $t7, 255 -/* 0CF360 800CE760 AC2FCE40 */ sw $t7, -0x31c0($at) +/* 0CF360 800CE760 AC2FCE40 */ sw $t7, %lo(D_8012CE40)($at) /* 0CF364 800CE764 25090001 */ addiu $t1, $t0, 1 /* 0CF368 800CE768 29210010 */ slti $at, $t1, 0x10 /* 0CF36C 800CE76C 1420FFF6 */ bnez $at, .L800CE748 diff --git a/lib/asm/non_matchings/unknown_0D3160/__osDevMgrMain.s b/lib/asm/non_matchings/unknown_0D3160/__osDevMgrMain.s index 8e6cc44f..90b4a7d3 100644 --- a/lib/asm/non_matchings/unknown_0D3160/__osDevMgrMain.s +++ b/lib/asm/non_matchings/unknown_0D3160/__osDevMgrMain.s @@ -131,9 +131,9 @@ glabel __osDevMgrMain /* 0D3544 800D2944 10200052 */ beqz $at, .L800D2A90 /* 0D3548 800D2948 00000000 */ nop /* 0D354C 800D294C 00084080 */ sll $t0, $t0, 2 -/* 0D3550 800D2950 3C01800F */ lui $at, 0x800f +/* 0D3550 800D2950 3C01800F */ lui $at, %hi(D_800E9650) # $at, 0x800f /* 0D3554 800D2954 00280821 */ addu $at, $at, $t0 -/* 0D3558 800D2958 8C289650 */ lw $t0, -0x69b0($at) +/* 0D3558 800D2958 8C289650 */ lw $t0, %lo(D_800E9650)($at) /* 0D355C 800D295C 01000008 */ jr $t0 /* 0D3560 800D2960 00000000 */ nop /* 0D3564 800D2964 8FAC002C */ lw $t4, 0x2c($sp) diff --git a/lib/asm/non_matchings/unknown_0D43F0/_Printf.s b/lib/asm/non_matchings/unknown_0D43F0/_Printf.s index 3665ed34..54a3b70e 100644 --- a/lib/asm/non_matchings/unknown_0D43F0/_Printf.s +++ b/lib/asm/non_matchings/unknown_0D43F0/_Printf.s @@ -70,9 +70,9 @@ glabel _Printf .L800D4004: /* 0D4C04 800D4004 0216C823 */ subu $t9, $s0, $s6 /* 0D4C08 800D4008 00197080 */ sll $t6, $t9, 2 -/* 0D4C0C 800D400C 3C0F800F */ lui $t7, 0x800f +/* 0D4C0C 800D400C 3C0F800F */ lui $t7, %hi(D_800E96CC) # $t7, 0x800f /* 0D4C10 800D4010 01EE7821 */ addu $t7, $t7, $t6 -/* 0D4C14 800D4014 8DEF96CC */ lw $t7, -0x6934($t7) +/* 0D4C14 800D4014 8DEF96CC */ lw $t7, %lo(D_800E96CC)($t7) /* 0D4C18 800D4018 8FB800D8 */ lw $t8, 0xd8($sp) /* 0D4C1C 800D401C 26520001 */ addiu $s2, $s2, 1 /* 0D4C20 800D4020 02C02025 */ move $a0, $s6 diff --git a/lib/asm/non_matchings/unknown_0D43F0/_Putfld.s b/lib/asm/non_matchings/unknown_0D43F0/_Putfld.s index c2b6b07b..f2aa5b98 100644 --- a/lib/asm/non_matchings/unknown_0D43F0/_Putfld.s +++ b/lib/asm/non_matchings/unknown_0D43F0/_Putfld.s @@ -17,9 +17,9 @@ glabel _Putfld /* 0D44DC 800D38DC 2DE10034 */ sltiu $at, $t7, 0x34 /* 0D44E0 800D38E0 10200181 */ beqz $at, .L800D3EE8 /* 0D44E4 800D38E4 000F7880 */ sll $t7, $t7, 2 -/* 0D44E8 800D38E8 3C01800F */ lui $at, 0x800f +/* 0D44E8 800D38E8 3C01800F */ lui $at, %hi(D_800E96E4) # $at, 0x800f /* 0D44EC 800D38EC 002F0821 */ addu $at, $at, $t7 -/* 0D44F0 800D38F0 8C2F96E4 */ lw $t7, -0x691c($at) +/* 0D44F0 800D38F0 8C2F96E4 */ lw $t7, %lo(D_800E96E4)($at) /* 0D44F4 800D38F4 01E00008 */ jr $t7 /* 0D44F8 800D38F8 00000000 */ nop .L800D38FC: diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index 126abca9..b75e3837 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -57,9 +57,12 @@ f32 D_800DC76C[15] = { 0.0f, -0.70711f, 0.70711f }; -u16 D_800DC7A8[76] = { +u16 D_800DC7A8[8] = { 0x0001, 0x0002, 0x0003, 0x0004, - 0x0051, 0x0054, 0x0055, 0x0056, + 0x0051, 0x0054, 0x0055, 0x0056 +}; + +s16 D_800DC7B8[52] = { 0x00ED, 0x00FF, 0x0037, 0x0038, 0x0039, 0x003A, 0x0057, 0x0058, 0x0059, 0x005A, 0x00F3, 0x00FD, @@ -69,10 +72,16 @@ u16 D_800DC7A8[76] = { 0x0003, 0x0004, 0x0051, 0x0054, 0x0055, 0x0056, 0x00ED, 0x00FF, 0x0001, 0x0002, 0x0003, 0x0004, - 0x0051, 0x0054, 0x0055, 0x0056, - 0x00ED, 0x00FF, 0x00D9, 0x00DF, - 0x00E0, 0x0105, 0x008A, 0x00DA, - 0x00E8, 0x0115, 0x0118, 0x0000, + 0x0051, + +//s16 D_800DC802[15] = { 37 + 0x0054, 0x0055, 0x0056, 0x00ED, + 0x00FF, 0x00D9, 0x00DF, 0x00E0, + 0x0105, 0x008A, 0x00DA, 0x00E8, + 0x0115, 0x0118, 0x0000 +}; + +s16 D_800DC820[16] = { 0x0005, 0x0106, 0x0207, 0x0005, 0x0106, 0x010B, 0x010B, 0x0207, 0x000C, 0x020D, 0x0101, 0x0101, diff --git a/src/unknown_032760.c b/src/unknown_032760.c index 89ef0279..1a5bbb45 100644 --- a/src/unknown_032760.c +++ b/src/unknown_032760.c @@ -68,9 +68,15 @@ s8 D_800DCA70[10] = { s32 D_800DCA7C[3] = { // Not sure about typing 0, 0, 0 }; -s32 D_800DCA88[8] = { // Definitly not s32, but I'm not sure what this is yet. - 0, 0, 0, 0x00000101, - 0x02000000, 0x00010102, 0x02000000, 0x00000000 +s32 D_800DCA88[3] = { // Not sure about typing + 0, 0, 0 +}; +s8 D_800DCA94[16] = { + 0x00, 0x00, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00 +}; +s8 D_800DCA9C[4] = { + 0x00, 0x00, 0x00, 0x00 }; u16 D_800DCAA8[64] = { 0x0000, 0x0301, 0x0000, 0x0000, diff --git a/src/unknown_043920.c b/src/unknown_043920.c index 0fa39fcc..54c512b4 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -36,30 +36,48 @@ f32 D_800DCB9C[38] = { }; // Unused? Not sure if this is actually an array or just some random data. -s32 D_800DCC34[38] = { +s32 D_800DCC34[19] = { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 26, 27, 0, + 0, 0, 0 +}; + +s32 D_800DCC80[19] = { + 0, 26, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0 }; // Unused? -s16 D_800DCCB4[20] = { +s16 D_800DCCB4[6] = { 0x010C, 0x010B, 0x0009, 0x010C, + 0x010C, 0x010C +}; + +u16 D_800DCCCC[14] = { 0x010C, 0x010C, 0x010C, 0x010C, - 0x010C, 0x010C, 0x010C, 0x0005, + 0x010C, 0x0005, 0x010C, 0x010C, 0x010C, 0x010C, 0x010C, 0x010C, - 0x010C, 0x010C, 0x010C, 0x0000 + 0x010C, 0x0000 }; // Unused? Not sure if this is actually an array or just some random data. -s32 D_800DCCDC[39] = { - 1, 4, 16, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 0x100, 1, 1, - 1, 1, 1, 0, 4, 16, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0x100, 0, 0, 0, 0, 0, 0 +s32 D_800DCCDC[2] = { + 1, 4 +}; + +// Used for some sort of bit mask +s32 D_800DCCF4[19] = { + 16, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 0x100, 1, 1, 1, 1, + 1, 0, 4 +}; + +// Used for some sort of bit mask +s32 D_800DCD40[18] = { + 16, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0x100, 0, 0, 0, 0, + 0, 0 }; s8 D_800DCD90[15] = { @@ -68,8 +86,11 @@ s8 D_800DCD90[15] = { }; // Unused? -s8 D_800DCDA0[16] = { +s8 D_800DCDA0[8] = { 0, 0, 0, 1, 1, 2, 2, 2, +}; + +s8 D_800DCDA8[8] = { 1, 1, 1, 2, 3, 2, 3, 2 }; diff --git a/tools/python/find_glabels.py b/tools/python/find_glabels.py index d6a66ca9..94fe4ea1 100644 --- a/tools/python/find_glabels.py +++ b/tools/python/find_glabels.py @@ -5,11 +5,11 @@ from file_util import FileUtil LINE_START_REGEX = r'\n(/\* ([0-9A-F]{6}) [0-9A-F]{8} [0-9A-F]{8} \*/\s+|\.L80[0-9A-F]{6}:)' REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|k[0-1]|gp|sp|fp|ra))' GLABEL_UPPER_REGEX = '(' + LINE_START_REGEX + r'lui\s+' + REG_REGEX + r',\s+(0x80[0-9a-f]{2}))' -GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'[sl][bhw]u?\s+' + REG_REGEX + r',\s+(0x[0-9a-f]{4})\(\4\))' +GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'[sl][bhw]u?\s+' + REG_REGEX + r',\s+(-?0x[0-9a-f]{4})\(\4\))' GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '[^\n]*){0,10}' + GLABEL_LOWER_REGEX UPPER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*lui\s+)([^\n]*)' -LOWER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*[ls][bhw]u?\s+' + REG_REGEX + r',\s+)0x[0-9a-f]{4}([^\n]*)' +LOWER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*[ls][bhw]u?\s+' + REG_REGEX + r',\s+)-?0x[0-9a-f]{4}([^\n]*)' IGNORE_GLABELS = ['D_800E389E', 'D_801264A1'] @@ -23,6 +23,8 @@ def _find_glabels(asm): offsets = (match[2], match[11]) # ROM offsets of the lui and [sl][bhw] glabel_upper = int(match[5], 16) # upper immediate of glabel glabel_lower = int(match[14], 16) # lower immediate of the glabel + if glabel_lower < 0: + glabel_lower = (-glabel_lower ^ 0xFFFF) + 1 if glabel_lower & 0x8000: glabel_upper -= 1 glabel = 'D_%08X' % (glabel_upper << 16 | glabel_lower) diff --git a/undefined_syms.txt b/undefined_syms.txt index c26f892d..28c6dac2 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -128,6 +128,10 @@ D_800DC75C = 0x800DC75C; D_800DC760 = 0x800DC760; D_800DC764 = 0x800DC764; D_800DC768 = 0x800DC768; +D_800DC7A8 = 0x800DC7A8; +D_800DC7B8 = 0x800DC7B8; +D_800DC820 = 0x800DC820; +D_800DC840 = 0x800DC840; D_800DC848 = 0x800DC848; D_800DC858 = 0x800DC858; D_800DC860 = 0x800DC860; @@ -156,13 +160,23 @@ D_800DCA64 = 0x800DCA64; D_800DCA70 = 0x800DCA70; D_800DCA7C = 0x800DCA7C; D_800DCA88 = 0x800DCA88; +D_800DCA94 = 0x800DCA94; +D_800DCA9C = 0x800DCA9C; D_800DCAA8 = 0x800DCAA8; D_800DCB28 = 0x800DCB28; D_800DCB50 = 0x800DCB50; D_800DCB54 = 0x800DCB54; D_800DCB98 = 0x800DCB98; D_800DCB9C = 0x800DCB9C; +D_800DCC34 = 0x800DCC34; +D_800DCC80 = 0x800DCC80; +D_800DCCCC = 0x800DCCCC; +D_800DCCF4 = 0x800DCCF4; +D_800DCD40 = 0x800DCD40; D_800DCD90 = 0x800DCD90; +D_800DCDA0 = 0x800DCDA0; +D_800DCDA8 = 0x800DCDA8; +D_800DCDB0 = 0x800DCDB0; D_800DCDD0 = 0x800DCDD0; D_800DCDD4 = 0x800DCDD4; D_800DCDE0 = 0x800DCDE0; @@ -1587,6 +1601,9 @@ D_800E8240 = 0x800E8240; D_800E8244 = 0x800E8244; D_800E8248 = 0x800E8248; D_800E824C = 0x800E824C; +D_800E8284 = 0x800E8284; +D_800E82F8 = 0x800E82F8; +D_800E836C = 0x800E836C; D_800E838C = 0x800E838C; D_800E8390 = 0x800E8390; D_800E8398 = 0x800E8398; @@ -1596,7 +1613,16 @@ D_800E83A4 = 0x800E83A4; D_800E83A8 = 0x800E83A8; D_800E83AC = 0x800E83AC; D_800E83B0 = 0x800E83B0; +D_800E83B8 = 0x800E83B8; +D_800E83E0 = 0x800E83E0; +D_800E8400 = 0x800E8400; D_800E8414 = 0x800E8414; +D_800E8418 = 0x800E8418; +D_800E8440 = 0x800E8440; +D_800E8464 = 0x800E8464; + +D_800E8488 = 0x800E8488; +D_800E84B0 = 0x800E84B0; D_800E84D0 = 0x800E84D0; D_800E84D4 = 0x800E84D4; D_800E84D8 = 0x800E84D8; @@ -1605,9 +1631,18 @@ D_800E84E4 = 0x800E84E4; D_800E84E8 = 0x800E84E8; D_800E84EC = 0x800E84EC; D_800E84F0 = 0x800E84F0; +D_800E84F4 = 0x800E84F4; +D_800E8508 = 0x800E8508; D_800E8520 = 0x800E8520; +D_800E8524 = 0x800E8524; +D_800E8548 = 0x800E8548; D_800E856C = 0x800E856C; D_800E8570 = 0x800E8570; +D_800E8574 = 0x800E8574; +D_800E8588 = 0x800E8588; +D_800E85A0 = 0x800E85A0; +D_800E85E0 = 0x800E85E0; +D_800E860C = 0x800E860C; D_800E8640 = 0x800E8640; D_800E8648 = 0x800E8648; D_800E8650 = 0x800E8650; @@ -1629,6 +1664,7 @@ D_800E86E8 = 0x800E86E8; D_800E86EC = 0x800E86EC; D_800E86F0 = 0x800E86F0; D_800E86F4 = 0x800E86F4; +D_800E86F8 = 0x800E86F8; D_800E8718 = 0x800E8718; D_800E8720 = 0x800E8720; D_800E8724 = 0x800E8724; @@ -1639,10 +1675,12 @@ D_800E8734 = 0x800E8734; D_800E8738 = 0x800E8738; D_800E873C = 0x800E873C; D_800E8740 = 0x800E8740; +D_800E8744 = 0x800E8744; D_800E8758 = 0x800E8758; D_800E875C = 0x800E875C; D_800E8760 = 0x800E8760; D_800E8764 = 0x800E8764; +D_800E8768 = 0x800E8768; D_800E8780 = 0x800E8780; D_800E8784 = 0x800E8784; D_800E8788 = 0x800E8788; @@ -1682,6 +1720,7 @@ D_800E8BCC = 0x800E8BCC; D_800E8BD0 = 0x800E8BD0; D_800E8BD4 = 0x800E8BD4; D_800E8BD8 = 0x800E8BD8; +D_800E8BDC = 0x800E8BDC; D_800E8BF0 = 0x800E8BF0; D_800E8BF4 = 0x800E8BF4; D_800E8C00 = 0x800E8C00; @@ -1689,6 +1728,10 @@ D_800E8C28 = 0x800E8C28; D_800E8C50 = 0x800E8C50; D_800E8C54 = 0x800E8C54; D_800E8C5C = 0x800E8C5C; +D_800E8CAC = 0x800E8CAC; +D_800E8CF0 = 0x800E8CF0; +D_800E8D88 = 0x800E8D88; +D_800E8E58 = 0x800E8E58; D_800E8EDC = 0x800E8EDC; D_800E8EE4 = 0x800E8EE4; D_800E8EE8 = 0x800E8EE8; @@ -1723,15 +1766,21 @@ D_800E9118 = 0x800E9118; D_800E912C = 0x800E912C; D_800E9130 = 0x800E9130; D_800E9138 = 0x800E9138; +D_800E913C = 0x800E913C; D_800E92A0 = 0x800E92A0; D_800E92A4 = 0x800E92A4; D_800E92A8 = 0x800E92A8; D_800E92AC = 0x800E92AC; D_800E92B8 = 0x800E92B8; D_800E92BC = 0x800E92BC; +D_800E92D0 = 0x800E92D0; +D_800E92EC = 0x800E92EC; D_800E9308 = 0x800E9308; D_800E930C = 0x800E930C; +D_800E9310 = 0x800E9310; D_800E932C = 0x800E932C; +D_800E9330 = 0x800E9330; +D_800E9360 = 0x800E9360; gzip_border = 0x800E93C0; gzip_cplens = 0x800E93D4; gzip_cplext = 0x800E9412; @@ -1749,10 +1798,17 @@ D_800E9578 = 0x800E9578; D_800E9598 = 0x800E9598; D_800E95A0 = 0x800E95A0; D_800E95A8 = 0x800E95A8; +D_800E95B0 = 0x800E95B0; D_800E95F8 = 0x800E95F8; D_800E95FC = 0x800E95FC; +D_800E9600 = 0x800E9600; +D_800E9650 = 0x800E9650; +D_800E9670 = 0x800E9670; +D_800E9690 = 0x800E9690; D_800E96C0 = 0x800E96C0; D_800E96C4 = 0x800E96C4; +D_800E96CC = 0x800E96CC; +D_800E96E4 = 0x800E96E4; D_800E97C0 = 0x800E97C0; D_800E9810 = 0x800E9810; D_800E9860 = 0x800E9860; @@ -1917,6 +1973,7 @@ D_8011AE94 = 0x8011AE94; D_8011AE98 = 0x8011AE98; D_8011AEA0 = 0x8011AEA0; D_8011AEA4 = 0x8011AEA4; +D_8011AEA8 = 0x8011AEA8; D_8011AEB0 = 0x8011AEB0; D_8011AEB8 = 0x8011AEB8; D_8011AEBC = 0x8011AEBC; @@ -1958,9 +2015,11 @@ D_8011B004 = 0x8011B004; D_8011B008 = 0x8011B008; D_8011B010 = 0x8011B010; D_8011B020 = 0x8011B020; +D_8011B048 = 0x8011B048; D_8011B058 = 0x8011B058; D_8011B068 = 0x8011B068; D_8011B078 = 0x8011B078; +D_8011B07B = 0x8011B07B; D_8011B0A0 = 0x8011B0A0; D_8011B0A4 = 0x8011B0A4; D_8011B0A8 = 0x8011B0A8; From 7948983a6fcbb06f8379edb05f2c71322fc205fd Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Fri, 28 May 2021 18:55:49 -0700 Subject: [PATCH 38/39] added glabels using --- asm/non_matchings/unknown_005740/func_80006FC8.s | 4 ++-- asm/non_matchings/unknown_00BC20/func_8000B750.s | 4 ++-- asm/non_matchings/unknown_00BC20/func_8000E2B4.s | 4 ++-- asm/non_matchings/unknown_00BC20/func_80010994.s | 4 ++-- asm/non_matchings/unknown_00BC20/func_8001E4C4.s | 4 ++-- asm/non_matchings/unknown_043920/func_8004447C.s | 4 ++-- asm/non_matchings/unknown_066AA0/func_8006A6A0.s | 4 ++-- asm/non_matchings/unknown_078050/func_80078190.s | 4 ++-- asm/non_matchings/unknown_080500/MenuCreditsLoop.s | 1 + asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s | 8 ++++---- asm/non_matchings/unknown_080500/func_8008B758.s | 4 ++-- asm/non_matchings/unknown_0AEE70/func_800AF714.s | 4 ++-- lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s | 4 ++-- lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s | 4 ++-- lib/asm/non_matchings/unknown_0CDE90/__osPfsRequestData.s | 4 ++-- .../non_matchings/unknown_0CE370/__osPackRamWriteData.s | 4 ++-- .../non_matchings/unknown_0CE8A0/__osPackRamReadData.s | 4 ++-- lib/asm/non_matchings/unknown_0CF330/__osEepStatus.s | 4 ++-- tools/python/find_glabels.py | 4 ++-- 19 files changed, 39 insertions(+), 38 deletions(-) diff --git a/asm/non_matchings/unknown_005740/func_80006FC8.s b/asm/non_matchings/unknown_005740/func_80006FC8.s index 4e051b36..4d87566f 100644 --- a/asm/non_matchings/unknown_005740/func_80006FC8.s +++ b/asm/non_matchings/unknown_005740/func_80006FC8.s @@ -1089,9 +1089,9 @@ glabel func_80006FC8 /* 008B80 80007F80 03E00008 */ jr $ra /* 008B84 80007F84 A02EC6D0 */ sb $t6, %lo(D_800DC6D0)($at) -/* 008B88 80007F88 3C01800E */ lui $at, 0x800e +/* 008B88 80007F88 3C01800E */ lui $at, %hi(D_800DC6D0) #$at, 0x800e /* 008B8C 80007F8C 03E00008 */ jr $ra -/* 008B90 80007F90 A020C6D0 */ sb $zero, -0x3930($at) +/* 008B90 80007F90 A020C6D0 */ sb $zero, %lo(D_800DC6D0)($at) /* 008B94 80007F94 3C02800E */ lui $v0, %hi(D_800DC6D0) # $v0, 0x800e /* 008B98 80007F98 9042C6D0 */ lbu $v0, %lo(D_800DC6D0)($v0) diff --git a/asm/non_matchings/unknown_00BC20/func_8000B750.s b/asm/non_matchings/unknown_00BC20/func_8000B750.s index 2118aef7..7a418d32 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000B750.s +++ b/asm/non_matchings/unknown_00BC20/func_8000B750.s @@ -228,10 +228,10 @@ glabel func_8000B750 /* 00C6B4 8000BAB4 00000000 */ nop .L8000BAB8: /* 00C6B8 8000BAB8 8FAF0090 */ lw $t7, 0x90($sp) -/* 00C6BC 8000BABC 3C018012 */ lui $at, 0x8012 +/* 00C6BC 8000BABC 3C018012 */ lui $at, %hi(D_8011B068) #$at, 0x8012 /* 00C6C0 8000BAC0 11E00002 */ beqz $t7, .L8000BACC /* 00C6C4 8000BAC4 00300821 */ addu $at, $at, $s0 -/* 00C6C8 8000BAC8 A020B068 */ sb $zero, -0x4f98($at) +/* 00C6C8 8000BAC8 A020B068 */ sb $zero, %lo(D_8011B068)($at) .L8000BACC: /* 00C6CC 8000BACC 8FBF002C */ lw $ra, 0x2c($sp) .L8000BAD0: diff --git a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s index e995fcb1..7a4a780f 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s @@ -27,9 +27,9 @@ glabel func_8000E2B4 /* 00EF18 8000E318 00095080 */ sll $t2, $t1, 2 /* 00EF1C 8000E31C 00194040 */ sll $t0, $t9, 1 /* 00EF20 8000E320 010A5821 */ addu $t3, $t0, $t2 -/* 00EF24 8000E324 3C03800E */ lui $v1, 0x800e +/* 00EF24 8000E324 3C03800E */ lui $v1, %hi(D_800DC7A8) #$v1, 0x800e /* 00EF28 8000E328 006B1821 */ addu $v1, $v1, $t3 -/* 00EF2C 8000E32C 8463C7A8 */ lh $v1, -0x3858($v1) +/* 00EF2C 8000E32C 8463C7A8 */ lh $v1, %lo(D_800DC7A8)($v1) /* 00EF30 8000E330 10000006 */ b .L8000E34C /* 00EF34 8000E334 00000000 */ nop .L8000E338: diff --git a/asm/non_matchings/unknown_00BC20/func_80010994.s b/asm/non_matchings/unknown_00BC20/func_80010994.s index 4bbf635c..e80d1e36 100644 --- a/asm/non_matchings/unknown_00BC20/func_80010994.s +++ b/asm/non_matchings/unknown_00BC20/func_80010994.s @@ -52,10 +52,10 @@ glabel func_80010994 /* 011650 80010A50 01285023 */ subu $t2, $t1, $t0 /* 011654 80010A54 A04A0000 */ sb $t2, ($v0) /* 011658 80010A58 804B0000 */ lb $t3, ($v0) -/* 01165C 80010A5C 3C018012 */ lui $at, 0x8012 +/* 01165C 80010A5C 3C018012 */ lui $at, %hi(D_8011AD22) #$at, 0x8012 /* 011660 80010A60 002B0821 */ addu $at, $at, $t3 /* 011664 80010A64 2484AEF0 */ addiu $a0, %lo(playerCount) # addiu $a0, $a0, -0x5110 -/* 011668 80010A68 A020AD22 */ sb $zero, -0x52de($at) +/* 011668 80010A68 A020AD22 */ sb $zero, %lo(D_8011AD22)($at) /* 01166C 80010A6C 8C8C0000 */ lw $t4, ($a0) /* 011670 80010A70 00009825 */ move $s3, $zero /* 011674 80010A74 19800021 */ blez $t4, .L80010AFC diff --git a/asm/non_matchings/unknown_00BC20/func_8001E4C4.s b/asm/non_matchings/unknown_00BC20/func_8001E4C4.s index 6c7aa0c9..35e70019 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001E4C4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001E4C4.s @@ -151,7 +151,7 @@ glabel func_8001E4C4 .L8001E6D8: /* 01F2D8 8001E6D8 3C018012 */ lui $at, %hi(D_8011AE60) # $at, 0x8012 /* 01F2DC 8001E6DC AC22AE60 */ sw $v0, %lo(D_8011AE60)($at) -/* 01F2E0 8001E6E0 3C018012 */ lui $at, 0x8012 +/* 01F2E0 8001E6E0 3C018012 */ lui $at, %hi(D_8011AE7C) #$at, 0x8012 /* 01F2E4 8001E6E4 03E00008 */ jr $ra -/* 01F2E8 8001E6E8 A420AE7C */ sh $zero, -0x5184($at) +/* 01F2E8 8001E6E8 A420AE7C */ sh $zero, %lo(D_8011AE7C)($at) diff --git a/asm/non_matchings/unknown_043920/func_8004447C.s b/asm/non_matchings/unknown_043920/func_8004447C.s index 7be83839..7b9ebcee 100644 --- a/asm/non_matchings/unknown_043920/func_8004447C.s +++ b/asm/non_matchings/unknown_043920/func_8004447C.s @@ -476,9 +476,9 @@ glabel func_8004447C /* 045764 80044B64 15A10005 */ bne $t5, $at, .L80044B7C /* 045768 80044B68 00000000 */ nop /* 04576C 80044B6C 820E01CF */ lb $t6, 0x1cf($s0) -/* 045770 80044B70 3C018012 */ lui $at, 0x8012 +/* 045770 80044B70 3C018012 */ lui $at, %hi(D_8011D58C) #$at, 0x8012 /* 045774 80044B74 002E0821 */ addu $at, $at, $t6 -/* 045778 80044B78 A020D58C */ sb $zero, -0x2a74($at) +/* 045778 80044B78 A020D58C */ sb $zero, %lo(D_8011D58C)($at) .L80044B7C: /* 04577C 80044B7C A20F01CD */ sb $t7, 0x1cd($s0) .L80044B80: diff --git a/asm/non_matchings/unknown_066AA0/func_8006A6A0.s b/asm/non_matchings/unknown_066AA0/func_8006A6A0.s index 4603d6d4..c4e67141 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006A6A0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006A6A0.s @@ -1,6 +1,6 @@ glabel func_8006A6A0 -/* 06B2A0 8006A6A0 3C01800E */ lui $at, 0x800e +/* 06B2A0 8006A6A0 3C01800E */ lui $at, %hi(D_800DD304) #$at, 0x800e /* 06B2A4 8006A6A4 03E00008 */ jr $ra -/* 06B2A8 8006A6A8 A420D304 */ sh $zero, -0x2cfc($at) +/* 06B2A8 8006A6A8 A420D304 */ sh $zero, %lo(D_800DD304)($at) /* 06B2AC 8006A6AC 00000000 */ nop diff --git a/asm/non_matchings/unknown_078050/func_80078190.s b/asm/non_matchings/unknown_078050/func_80078190.s index 73d4576c..3fddb3e4 100644 --- a/asm/non_matchings/unknown_078050/func_80078190.s +++ b/asm/non_matchings/unknown_078050/func_80078190.s @@ -428,7 +428,7 @@ glabel func_80078190 /* 0793E8 800787E8 03E00008 */ jr $ra /* 0793EC 800787EC AC28E4CC */ sw $t0, %lo(D_800DE4CC)($at) -/* 0793F0 800787F0 3C01800E */ lui $at, 0x800e +/* 0793F0 800787F0 3C01800E */ lui $at, %hi(D_800DE4CC) #$at, 0x800e /* 0793F4 800787F4 03E00008 */ jr $ra -/* 0793F8 800787F8 AC20E4CC */ sw $zero, -0x1b34($at) +/* 0793F8 800787F8 AC20E4CC */ sw $zero, %lo(D_800DE4CC)($at) diff --git a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s index 3fcde973..6c274152 100644 --- a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s @@ -438,6 +438,7 @@ glabel MenuCreditsLoop /* 09C578 8009B978 000FC823 */ negu $t9, $t7 /* 09C57C 8009B97C 0014C140 */ sll $t8, $s4, 5 /* 09C580 8009B980 03194821 */ addu $t1, $t8, $t9 +# Setting D_800E1B50[1].source? Not sure why adding $t1 then /* 09C584 8009B984 3C01800E */ lui $at, 0x800e /* 09C588 8009B988 448A8000 */ mtc1 $t2, $f16 /* 09C58C 8009B98C 00290821 */ addu $at, $at, $t1 diff --git a/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s b/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s index a7423760..c8ff0060 100644 --- a/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s +++ b/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s @@ -215,9 +215,9 @@ glabel MenuMagicCodesLoop /* 08ABE8 80089FE8 244F0001 */ addiu $t7, $v0, 1 /* 08ABEC 80089FEC A4CF0000 */ sh $t7, ($a2) /* 08ABF0 80089FF0 84D80000 */ lh $t8, ($a2) -/* 08ABF4 80089FF4 3C018012 */ lui $at, 0x8012 +/* 08ABF4 80089FF4 3C018012 */ lui $at, %hi(D_80126C58) #$at, 0x8012 /* 08ABF8 80089FF8 00380821 */ addu $at, $at, $t8 -/* 08ABFC 80089FFC A0206C58 */ sb $zero, 0x6c58($at) +/* 08ABFC 80089FFC A0206C58 */ sb $zero, %lo(D_80126C58)($at) .L8008A000: /* 08AC00 8008A000 3C068012 */ lui $a2, %hi(D_80126C44) # $a2, 0x8012 /* 08AC04 8008A004 31594000 */ andi $t9, $t2, 0x4000 @@ -253,9 +253,9 @@ glabel MenuMagicCodesLoop /* 08AC70 8008A070 244FFFFF */ addiu $t7, $v0, -1 /* 08AC74 8008A074 A4CF0000 */ sh $t7, ($a2) /* 08AC78 8008A078 84D80000 */ lh $t8, ($a2) -/* 08AC7C 8008A07C 3C018012 */ lui $at, 0x8012 +/* 08AC7C 8008A07C 3C018012 */ lui $at, %hi(D_80126C58) #$at, 0x8012 /* 08AC80 8008A080 00380821 */ addu $at, $at, $t8 -/* 08AC84 8008A084 A0206C58 */ sb $zero, 0x6c58($at) +/* 08AC84 8008A084 A0206C58 */ sb $zero, %lo(D_80126C58)($at) .L8008A088: /* 08AC88 8008A088 8FB90048 */ lw $t9, 0x48($sp) .L8008A08C: diff --git a/asm/non_matchings/unknown_080500/func_8008B758.s b/asm/non_matchings/unknown_080500/func_8008B758.s index bb501060..b0a9a3c6 100644 --- a/asm/non_matchings/unknown_080500/func_8008B758.s +++ b/asm/non_matchings/unknown_080500/func_8008B758.s @@ -78,10 +78,10 @@ glabel func_8008B758 /* 08C47C 8008B87C AC2AF4BC */ sw $t2, %lo(D_800DF4BC)($at) /* 08C480 8008B880 3C06800E */ lui $a2, %hi(D_800DF4BC) # $a2, 0x800e /* 08C484 8008B884 8CC6F4BC */ lw $a2, %lo(D_800DF4BC)($a2) -/* 08C488 8008B888 3C018012 */ lui $at, 0x8012 +/* 08C488 8008B888 3C018012 */ lui $at, %hi(D_801263D4) #$at, 0x8012 /* 08C48C 8008B88C 00340821 */ addu $at, $at, $s4 /* 08C490 8008B890 18C00026 */ blez $a2, .L8008B92C -/* 08C494 8008B894 A02063D4 */ sb $zero, 0x63d4($at) +/* 08C494 8008B894 A02063D4 */ sb $zero, %lo(D_801263D4)($at) /* 08C498 8008B898 824C0000 */ lb $t4, ($s2) /* 08C49C 8008B89C 8FC50000 */ lw $a1, ($fp) /* 08C4A0 8008B8A0 01930019 */ multu $t4, $s3 diff --git a/asm/non_matchings/unknown_0AEE70/func_800AF714.s b/asm/non_matchings/unknown_0AEE70/func_800AF714.s index 2775b4bb..b640349e 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800AF714.s +++ b/asm/non_matchings/unknown_0AEE70/func_800AF714.s @@ -328,11 +328,11 @@ glabel func_800AF714 /* 0B07BC 800AFBBC 00000000 */ nop .L800AFBC0: /* 0B07C0 800AFBC0 82790002 */ lb $t9, 2($s3) -/* 0B07C4 800AFBC4 3C018012 */ lui $at, 0x8012 +/* 0B07C4 800AFBC4 3C018012 */ lui $at, %hi(D_80127C88) #$at, 0x8012 /* 0B07C8 800AFBC8 33380007 */ andi $t8, $t9, 7 /* 0B07CC 800AFBCC 00186040 */ sll $t4, $t8, 1 /* 0B07D0 800AFBD0 002C0821 */ addu $at, $at, $t4 -/* 0B07D4 800AFBD4 A4207C88 */ sh $zero, 0x7c88($at) +/* 0B07D4 800AFBD4 A4207C88 */ sh $zero, %lo(D_80127C88)($at) .L800AFBD8: /* 0B07D8 800AFBD8 AE200000 */ sw $zero, ($s1) .L800AFBDC: diff --git a/lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s b/lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s index 8a4048c0..77fd000b 100644 --- a/lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s +++ b/lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s @@ -5,10 +5,10 @@ glabel func_800CCEE8 .L800CCEF4: /* 0CDAF4 800CCEF4 8FAE0000 */ lw $t6, ($sp) /* 0CDAF8 800CCEF8 8FB80000 */ lw $t8, ($sp) -/* 0CDAFC 800CCEFC 3C018013 */ lui $at, 0x8013 +/* 0CDAFC 800CCEFC 3C018013 */ lui $at, %hi(D_8012CD50) #$at, 0x8013 /* 0CDB00 800CCF00 000E7880 */ sll $t7, $t6, 2 /* 0CDB04 800CCF04 002F0821 */ addu $at, $at, $t7 -/* 0CDB08 800CCF08 AC20CD50 */ sw $zero, -0x32b0($at) +/* 0CDB08 800CCF08 AC20CD50 */ sw $zero, %lo(D_8012CD50)($at) /* 0CDB0C 800CCF0C 27190001 */ addiu $t9, $t8, 1 /* 0CDB10 800CCF10 2B210010 */ slti $at, $t9, 0x10 /* 0CDB14 800CCF14 1420FFF7 */ bnez $at, .L800CCEF4 diff --git a/lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s b/lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s index 0fc3849d..4f845836 100644 --- a/lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s +++ b/lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s @@ -7,10 +7,10 @@ glabel func_800CD14C .L800CD160: /* 0CDD60 800CD160 8FAF0000 */ lw $t7, ($sp) /* 0CDD64 800CD164 8FB90000 */ lw $t9, ($sp) -/* 0CDD68 800CD168 3C018013 */ lui $at, 0x8013 +/* 0CDD68 800CD168 3C018013 */ lui $at, %hi(D_8012CD50) #$at, 0x8013 /* 0CDD6C 800CD16C 000FC080 */ sll $t8, $t7, 2 /* 0CDD70 800CD170 00380821 */ addu $at, $at, $t8 -/* 0CDD74 800CD174 AC20CD50 */ sw $zero, -0x32b0($at) +/* 0CDD74 800CD174 AC20CD50 */ sw $zero, %lo(D_8012CD50)($at) /* 0CDD78 800CD178 27280001 */ addiu $t0, $t9, 1 /* 0CDD7C 800CD17C 29010010 */ slti $at, $t0, 0x10 /* 0CDD80 800CD180 1420FFF7 */ bnez $at, .L800CD160 diff --git a/lib/asm/non_matchings/unknown_0CDE90/__osPfsRequestData.s b/lib/asm/non_matchings/unknown_0CDE90/__osPfsRequestData.s index c5950158..a9b3465c 100644 --- a/lib/asm/non_matchings/unknown_0CDE90/__osPfsRequestData.s +++ b/lib/asm/non_matchings/unknown_0CDE90/__osPfsRequestData.s @@ -7,10 +7,10 @@ glabel __osPfsRequestData .L800CD444: /* 0CE044 800CD444 8FAE0000 */ lw $t6, ($sp) /* 0CE048 800CD448 8FB80000 */ lw $t8, ($sp) -/* 0CE04C 800CD44C 3C018013 */ lui $at, 0x8013 +/* 0CE04C 800CD44C 3C018013 */ lui $at, %hi(__osPfsPifRam) #$at, 0x8013 /* 0CE050 800CD450 000E7880 */ sll $t7, $t6, 2 /* 0CE054 800CD454 002F0821 */ addu $at, $at, $t7 -/* 0CE058 800CD458 AC20CDE0 */ sw $zero, -0x3220($at) +/* 0CE058 800CD458 AC20CDE0 */ sw $zero, %lo(__osPfsPifRam)($at) /* 0CE05C 800CD45C 27190001 */ addiu $t9, $t8, 1 /* 0CE060 800CD460 2B210010 */ slti $at, $t9, 0x10 /* 0CE064 800CD464 1420FFF7 */ bnez $at, .L800CD444 diff --git a/lib/asm/non_matchings/unknown_0CE370/__osPackRamWriteData.s b/lib/asm/non_matchings/unknown_0CE370/__osPackRamWriteData.s index dc820aaa..7afed174 100644 --- a/lib/asm/non_matchings/unknown_0CE370/__osPackRamWriteData.s +++ b/lib/asm/non_matchings/unknown_0CE370/__osPackRamWriteData.s @@ -11,10 +11,10 @@ glabel __osPackRamWriteData .L800CDB44: /* 0CE744 800CDB44 8FAF0018 */ lw $t7, 0x18($sp) /* 0CE748 800CDB48 8FB90018 */ lw $t9, 0x18($sp) -/* 0CE74C 800CDB4C 3C018013 */ lui $at, 0x8013 +/* 0CE74C 800CDB4C 3C018013 */ lui $at, %hi(__osPfsPifRam) #$at, 0x8013 /* 0CE750 800CDB50 000FC080 */ sll $t8, $t7, 2 /* 0CE754 800CDB54 00380821 */ addu $at, $at, $t8 -/* 0CE758 800CDB58 AC20CDE0 */ sw $zero, -0x3220($at) +/* 0CE758 800CDB58 AC20CDE0 */ sw $zero, %lo(__osPfsPifRam)($at) /* 0CE75C 800CDB5C 27280001 */ addiu $t0, $t9, 1 /* 0CE760 800CDB60 29010010 */ slti $at, $t0, 0x10 /* 0CE764 800CDB64 1420FFF7 */ bnez $at, .L800CDB44 diff --git a/lib/asm/non_matchings/unknown_0CE8A0/__osPackRamReadData.s b/lib/asm/non_matchings/unknown_0CE8A0/__osPackRamReadData.s index 9031c88c..16e48aca 100644 --- a/lib/asm/non_matchings/unknown_0CE8A0/__osPackRamReadData.s +++ b/lib/asm/non_matchings/unknown_0CE8A0/__osPackRamReadData.s @@ -10,10 +10,10 @@ glabel __osPackRamReadData .L800CDF04: /* 0CEB04 800CDF04 8FAF0018 */ lw $t7, 0x18($sp) /* 0CEB08 800CDF08 8FB90018 */ lw $t9, 0x18($sp) -/* 0CEB0C 800CDF0C 3C018013 */ lui $at, 0x8013 +/* 0CEB0C 800CDF0C 3C018013 */ lui $at, %hi(__osPfsPifRam) #$at, 0x8013 /* 0CEB10 800CDF10 000FC080 */ sll $t8, $t7, 2 /* 0CEB14 800CDF14 00380821 */ addu $at, $at, $t8 -/* 0CEB18 800CDF18 AC20CDE0 */ sw $zero, -0x3220($at) +/* 0CEB18 800CDF18 AC20CDE0 */ sw $zero, %lo(__osPfsPifRam)($at) /* 0CEB1C 800CDF1C 27280001 */ addiu $t0, $t9, 1 /* 0CEB20 800CDF20 29010010 */ slti $at, $t0, 0x10 /* 0CEB24 800CDF24 1420FFF7 */ bnez $at, .L800CDF04 diff --git a/lib/asm/non_matchings/unknown_0CF330/__osEepStatus.s b/lib/asm/non_matchings/unknown_0CF330/__osEepStatus.s index 054dd6b0..9464c0f8 100644 --- a/lib/asm/non_matchings/unknown_0CF330/__osEepStatus.s +++ b/lib/asm/non_matchings/unknown_0CF330/__osEepStatus.s @@ -11,10 +11,10 @@ glabel __osEepStatus .L800CE860: /* 0CF460 800CE860 8FAF0028 */ lw $t7, 0x28($sp) /* 0CF464 800CE864 8FB90028 */ lw $t9, 0x28($sp) -/* 0CF468 800CE868 3C018013 */ lui $at, 0x8013 +/* 0CF468 800CE868 3C018013 */ lui $at, %hi(D_8012CE40) #$at, 0x8013 /* 0CF46C 800CE86C 000FC080 */ sll $t8, $t7, 2 /* 0CF470 800CE870 00380821 */ addu $at, $at, $t8 -/* 0CF474 800CE874 AC20CE40 */ sw $zero, -0x31c0($at) +/* 0CF474 800CE874 AC20CE40 */ sw $zero, %lo(D_8012CE40)($at) /* 0CF478 800CE878 27280001 */ addiu $t0, $t9, 1 /* 0CF47C 800CE87C 29010010 */ slti $at, $t0, 0x10 /* 0CF480 800CE880 1420FFF7 */ bnez $at, .L800CE860 diff --git a/tools/python/find_glabels.py b/tools/python/find_glabels.py index 94fe4ea1..c5f7dc14 100644 --- a/tools/python/find_glabels.py +++ b/tools/python/find_glabels.py @@ -3,7 +3,7 @@ import re from file_util import FileUtil LINE_START_REGEX = r'\n(/\* ([0-9A-F]{6}) [0-9A-F]{8} [0-9A-F]{8} \*/\s+|\.L80[0-9A-F]{6}:)' -REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|k[0-1]|gp|sp|fp|ra))' +REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|k[0-1]|gp|sp|fp|ra|zero))' GLABEL_UPPER_REGEX = '(' + LINE_START_REGEX + r'lui\s+' + REG_REGEX + r',\s+(0x80[0-9a-f]{2}))' GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'[sl][bhw]u?\s+' + REG_REGEX + r',\s+(-?0x[0-9a-f]{4})\(\4\))' GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '[^\n]*){0,10}' + GLABEL_LOWER_REGEX @@ -11,7 +11,7 @@ GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '[^\n]*){0,10}' + G UPPER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*lui\s+)([^\n]*)' LOWER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*[ls][bhw]u?\s+' + REG_REGEX + r',\s+)-?0x[0-9a-f]{4}([^\n]*)' -IGNORE_GLABELS = ['D_800E389E', 'D_801264A1'] +IGNORE_GLABELS = ['D_800E389E', 'D_801264A1', 'D_800E1B84'] def _find_glabels(asm): glabels = [] From 24fc3242db3d7b7bb7acbc223bc785dbd164d2f9 Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Fri, 28 May 2021 19:25:10 -0700 Subject: [PATCH 39/39] Added glabels read/written directly to FPRs. --- .../unknown_0255E0/func_8002DE30.s | 4 ++-- .../unknown_043920/func_80050A28.s | 4 ++-- .../unknown_043920/func_8005492C.s | 4 ++-- .../unknown_0AEE70/func_800B0698.s | 4 ++-- .../unknown_0AEE70/func_800B1130.s | 4 ++-- data/dkr.data.s | 2 ++ lib/asm/non_matchings/unknown_0D3020/cosf.s | 4 ++-- lib/asm/non_matchings/unknown_0D3020/sinf.s | 4 ++-- src/unknown_043920.c | 17 ++++++++++------- src/unknown_0AEE70.c | 6 ++++-- tools/python/find_glabels.py | 10 +++++----- undefined_syms.txt | 3 +++ 12 files changed, 38 insertions(+), 28 deletions(-) diff --git a/asm/non_matchings/unknown_0255E0/func_8002DE30.s b/asm/non_matchings/unknown_0255E0/func_8002DE30.s index 1360c30e..22c0e340 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002DE30.s +++ b/asm/non_matchings/unknown_0255E0/func_8002DE30.s @@ -210,9 +210,9 @@ glabel func_8002DE30 /* 02ED5C 8002E15C 8FAB0088 */ lw $t3, 0x88($sp) /* 02ED60 8002E160 1040000F */ beqz $v0, .L8002E1A0 /* 02ED64 8002E164 001EC880 */ sll $t9, $fp, 2 -/* 02ED68 8002E168 3C01800E */ lui $at, 0x800e +/* 02ED68 8002E168 3C01800E */ lui $at, %hi(D_800DC884) #$at, 0x800e /* 02ED6C 8002E16C 00390821 */ addu $at, $at, $t9 -/* 02ED70 8002E170 C42AC884 */ lwc1 $f10, -0x377c($at) +/* 02ED70 8002E170 C42AC884 */ lwc1 $f10, %lo(D_800DC884)($at) /* 02ED74 8002E174 8EC20054 */ lw $v0, 0x54($s6) /* 02ED78 8002E178 460AB401 */ sub.s $f16, $f22, $f10 /* 02ED7C 8002E17C C4400000 */ lwc1 $f0, ($v0) diff --git a/asm/non_matchings/unknown_043920/func_80050A28.s b/asm/non_matchings/unknown_043920/func_80050A28.s index aa2e06f4..f7ef4218 100644 --- a/asm/non_matchings/unknown_043920/func_80050A28.s +++ b/asm/non_matchings/unknown_043920/func_80050A28.s @@ -747,11 +747,11 @@ glabel func_80050A28 /* 0520D4 800514D4 00000000 */ nop /* 0520D8 800514D8 46087380 */ add.s $f14, $f14, $f8 .L800514DC: -/* 0520DC 800514DC 3C01800E */ lui $at, 0x800e +/* 0520DC 800514DC 3C01800E */ lui $at, %hi(D_800DCBE8) #$at, 0x800e /* 0520E0 800514E0 3C0D800E */ lui $t5, %hi(D_800DCC34) # $t5, 0x800e /* 0520E4 800514E4 00230821 */ addu $at, $at, $v1 /* 0520E8 800514E8 01A36821 */ addu $t5, $t5, $v1 -/* 0520EC 800514EC C426CBE8 */ lwc1 $f6, -0x3418($at) +/* 0520EC 800514EC C426CBE8 */ lwc1 $f6, %lo(D_800DCBE8)($at) /* 0520F0 800514F0 8DADCC34 */ lw $t5, %lo(D_800DCC34)($t5) /* 0520F4 800514F4 8FAC0068 */ lw $t4, 0x68($sp) /* 0520F8 800514F8 0122082A */ slt $at, $t1, $v0 diff --git a/asm/non_matchings/unknown_043920/func_8005492C.s b/asm/non_matchings/unknown_043920/func_8005492C.s index 5f54f16e..2ef2f02a 100644 --- a/asm/non_matchings/unknown_043920/func_8005492C.s +++ b/asm/non_matchings/unknown_043920/func_8005492C.s @@ -120,9 +120,9 @@ glabel func_8005492C /* 0556E8 80054AE8 10810008 */ beq $a0, $at, .L80054B0C /* 0556EC 80054AEC 46009006 */ mov.s $f0, $f18 /* 0556F0 80054AF0 00047080 */ sll $t6, $a0, 2 -/* 0556F4 80054AF4 3C01800E */ lui $at, 0x800e +/* 0556F4 80054AF4 3C01800E */ lui $at, %hi(D_800DCB9C) #$at, 0x800e /* 0556F8 80054AF8 002E0821 */ addu $at, $at, $t6 -/* 0556FC 80054AFC C426CB9C */ lwc1 $f6, -0x3464($at) +/* 0556FC 80054AFC C426CB9C */ lwc1 $f6, %lo(D_800DCB9C)($at) /* 055700 80054B00 18800002 */ blez $a0, .L80054B0C /* 055704 80054B04 46069000 */ add.s $f0, $f18, $f6 /* 055708 80054B08 00801825 */ move $v1, $a0 diff --git a/asm/non_matchings/unknown_0AEE70/func_800B0698.s b/asm/non_matchings/unknown_0AEE70/func_800B0698.s index 6e102e5c..58da9dfc 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B0698.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B0698.s @@ -218,12 +218,12 @@ glabel func_800B0698 /* 0B15C0 800B09C0 0C02C004 */ jal func_800B0010 /* 0B15C4 800B09C4 AFA3002C */ sw $v1, 0x2c($sp) /* 0B15C8 800B09C8 8E0D0040 */ lw $t5, 0x40($s0) -/* 0B15CC 800B09CC 3C01800E */ lui $at, 0x800e +/* 0B15CC 800B09CC 3C01800E */ lui $at, %hi(D_800E2E2C) #$at, 0x800e /* 0B15D0 800B09D0 000D7903 */ sra $t7, $t5, 4 /* 0B15D4 800B09D4 31EE0007 */ andi $t6, $t7, 7 /* 0B15D8 800B09D8 000EC080 */ sll $t8, $t6, 2 /* 0B15DC 800B09DC 00380821 */ addu $at, $at, $t8 -/* 0B15E0 800B09E0 C4322E2C */ lwc1 $f18, 0x2e2c($at) +/* 0B15E0 800B09E0 C4322E2C */ lwc1 $f18, %lo(D_800E2E2C)($at) /* 0B15E4 800B09E4 92190039 */ lbu $t9, 0x39($s0) /* 0B15E8 800B09E8 8FA3002C */ lw $v1, 0x2c($sp) /* 0B15EC 800B09EC 8FA60034 */ lw $a2, 0x34($sp) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B1130.s b/asm/non_matchings/unknown_0AEE70/func_800B1130.s index 1a7151e9..422f24af 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B1130.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B1130.s @@ -687,12 +687,12 @@ glabel func_800B1130 /* 0B2724 800B1B24 0C02C004 */ jal func_800B0010 /* 0B2728 800B1B28 02203825 */ move $a3, $s1 /* 0B272C 800B1B2C 8E0C0040 */ lw $t4, 0x40($s0) -/* 0B2730 800B1B30 3C01800E */ lui $at, 0x800e +/* 0B2730 800B1B30 3C01800E */ lui $at, %hi(D_800E2E2C) #$at, 0x800e /* 0B2734 800B1B34 000C6903 */ sra $t5, $t4, 4 /* 0B2738 800B1B38 31AF0007 */ andi $t7, $t5, 7 /* 0B273C 800B1B3C 000F7080 */ sll $t6, $t7, 2 /* 0B2740 800B1B40 002E0821 */ addu $at, $at, $t6 -/* 0B2744 800B1B44 C4242E2C */ lwc1 $f4, 0x2e2c($at) +/* 0B2744 800B1B44 C4242E2C */ lwc1 $f4, %lo(D_800E2E2C)($at) /* 0B2748 800B1B48 92180039 */ lbu $t8, 0x39($s0) /* 0B274C 800B1B4C 8FA60044 */ lw $a2, 0x44($sp) /* 0B2750 800B1B50 24010005 */ li $at, 5 diff --git a/data/dkr.data.s b/data/dkr.data.s index 2d942215..facf2d7b 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -14187,6 +14187,8 @@ glabel D_800E98B0 .word 0x00000000 .word 0x4197D784 .word 0x00000000 + +glabel D_800E98C0 .word 0x7F810000 .word 0x00000000 .word 0x00000000 diff --git a/lib/asm/non_matchings/unknown_0D3020/cosf.s b/lib/asm/non_matchings/unknown_0D3020/cosf.s index 964b2c59..f2f95704 100644 --- a/lib/asm/non_matchings/unknown_0D3020/cosf.s +++ b/lib/asm/non_matchings/unknown_0D3020/cosf.s @@ -87,12 +87,12 @@ glabel cosf /* 0D57F0 800D4BF0 460A5032 */ c.eq.s $f10, $f10 .L800D4BF4: -/* 0D57F4 800D4BF4 3C01800F */ lui $at, 0x800f +/* 0D57F4 800D4BF4 3C01800F */ lui $at, %hi(D_800E98C0) #$at, 0x800f /* 0D57F8 800D4BF8 45010004 */ bc1t .L800D4C0C /* 0D57FC 800D4BFC 00000000 */ nop /* 0D5800 800D4C00 3C01800F */ lui $at, 0x800f /* 0D5804 800D4C04 03E00008 */ jr $ra -/* 0D5808 800D4C08 C42098C0 */ lwc1 $f0, -0x6740($at) +/* 0D5808 800D4C08 C42098C0 */ lwc1 $f0, %lo(D_800E98C0)($at) .L800D4C0C: /* 0D580C 800D4C0C C4209800 */ lwc1 $f0, -0x6800($at) diff --git a/lib/asm/non_matchings/unknown_0D3020/sinf.s b/lib/asm/non_matchings/unknown_0D3020/sinf.s index 4a758449..2278aa9b 100644 --- a/lib/asm/non_matchings/unknown_0D3020/sinf.s +++ b/lib/asm/non_matchings/unknown_0D3020/sinf.s @@ -112,12 +112,12 @@ glabel sinf .L800D4DB8: /* 0D59B8 800D4DB8 46042032 */ c.eq.s $f4, $f4 -/* 0D59BC 800D4DBC 3C01800F */ lui $at, 0x800f +/* 0D59BC 800D4DBC 3C01800F */ lui $at, %hi(D_800E98C0) #$at, 0x800f /* 0D59C0 800D4DC0 45010004 */ bc1t .L800D4DD4 /* 0D59C4 800D4DC4 00000000 */ nop /* 0D59C8 800D4DC8 3C01800F */ lui $at, 0x800f /* 0D59CC 800D4DCC 03E00008 */ jr $ra -/* 0D59D0 800D4DD0 C42098C0 */ lwc1 $f0, -0x6740($at) +/* 0D59D0 800D4DD0 C42098C0 */ lwc1 $f0, %lo(D_800E98C0)($at) .L800D4DD4: /* 0D59D4 800D4DD4 C4209850 */ lwc1 $f0, -0x67b0($at) diff --git a/src/unknown_043920.c b/src/unknown_043920.c index 54c512b4..38febf2c 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -22,17 +22,20 @@ f32 D_800DCB60[14] = { }; s32 D_800DCB98 = 0; // Currently unknown, might be a different type. -f32 D_800DCB9C[38] = { +f32 D_800DCB9C[19] = { 0.004f, 0.007f, 0.0099999999f, 0.004f, 0.0099999999f, 0.0099999999f, 0.0099999999f, 0.0099999999f, 0.0099999999f, 0.0099999999f, 0.004f, 0.004f, 0.004f, 0.004f, 0.004f, 0.004f, - 0.004f, 0.004f, 0.004f, 0.8f, - 0.85f, 0.85f, 0.5f, 0.5f, - 0.5f, 0.5f, 0.5f, 0.5f, - 0.5f, 0.5f, 0.8f, 0.8f, - 0.84f, 0.8f, 0.8f, 0.8f, - 0.8f, 0.8f + 0.004f, 0.004f, 0.004f +}; + +f32 D_800DCBE8[19] = { + 0.8f, 0.85f, 0.85f, 0.5f, + 0.5f, 0.5f, 0.5f, 0.5f, + 0.5f, 0.5f, 0.5f, 0.8f, + 0.8f, 0.84f, 0.8f, 0.8f, + 0.8f, 0.8f, 0.8f }; // Unused? Not sure if this is actually an array or just some random data. diff --git a/src/unknown_0AEE70.c b/src/unknown_0AEE70.c index 0a2b8784..4af88825 100644 --- a/src/unknown_0AEE70.c +++ b/src/unknown_0AEE70.c @@ -92,8 +92,10 @@ unk800E2DF8 D_800E2DF8[2] = { }, }; -f32 D_800E2E28[9] = { - 0.0f, 0.0f, 0.1, 0.2f, 0.3f, 0.45f, 0.525f, 0.6f, 0.8f +f32 D_800E2E28 = 0.0f; + +f32 D_800E2E2C[8] = { + 0.0f, 0.1, 0.2f, 0.3f, 0.45f, 0.525f, 0.6f, 0.8f }; s32 D_800E2E4C = 0; diff --git a/tools/python/find_glabels.py b/tools/python/find_glabels.py index c5f7dc14..b0b1bf07 100644 --- a/tools/python/find_glabels.py +++ b/tools/python/find_glabels.py @@ -3,13 +3,13 @@ import re from file_util import FileUtil LINE_START_REGEX = r'\n(/\* ([0-9A-F]{6}) [0-9A-F]{8} [0-9A-F]{8} \*/\s+|\.L80[0-9A-F]{6}:)' -REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|k[0-1]|gp|sp|fp|ra|zero))' +REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|f[0-9]{1,2}|k[0-1]|gp|sp|fp|ra|zero))' GLABEL_UPPER_REGEX = '(' + LINE_START_REGEX + r'lui\s+' + REG_REGEX + r',\s+(0x80[0-9a-f]{2}))' -GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'[sl][bhw]u?\s+' + REG_REGEX + r',\s+(-?0x[0-9a-f]{4})\(\4\))' +GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'[sl][bhw](u|c1)?\s+' + REG_REGEX + r',\s+(-?0x[0-9a-f]{4})\(\4\))' GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '[^\n]*){0,10}' + GLABEL_LOWER_REGEX UPPER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*lui\s+)([^\n]*)' -LOWER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*[ls][bhw]u?\s+' + REG_REGEX + r',\s+)-?0x[0-9a-f]{4}([^\n]*)' +LOWER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*[ls][bhw](u|c1)?\s+' + REG_REGEX + r',\s+)-?0x[0-9a-f]{4}([^\n]*)' IGNORE_GLABELS = ['D_800E389E', 'D_801264A1', 'D_800E1B84'] @@ -22,7 +22,7 @@ def _find_glabels(asm): reg = match[3] offsets = (match[2], match[11]) # ROM offsets of the lui and [sl][bhw] glabel_upper = int(match[5], 16) # upper immediate of glabel - glabel_lower = int(match[14], 16) # lower immediate of the glabel + glabel_lower = int(match[15], 16) # lower immediate of the glabel if glabel_lower < 0: glabel_lower = (-glabel_lower ^ 0xFFFF) + 1 if glabel_lower & 0x8000: @@ -36,7 +36,7 @@ def _find_glabels(asm): contents) # replace lower instruction contents = re.sub(LOWER_INSTR_REGEX_TMPL % offsets[1], - r'\1' + '%%lo(%s)' % (glabel) + r'\4', + r'\1' + '%%lo(%s)' % (glabel) + r'\5', contents) if len(matches): FileUtil.write_text_to_file(file, contents) diff --git a/undefined_syms.txt b/undefined_syms.txt index 28c6dac2..b54de153 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -168,6 +168,7 @@ D_800DCB50 = 0x800DCB50; D_800DCB54 = 0x800DCB54; D_800DCB98 = 0x800DCB98; D_800DCB9C = 0x800DCB9C; +D_800DCBE8 = 0x800DCBE8; D_800DCC34 = 0x800DCC34; D_800DCC80 = 0x800DCC80; D_800DCCCC = 0x800DCCCC; @@ -683,6 +684,7 @@ D_800E2D58 = 0x800E2D58; D_800E2D78 = 0x800E2D78; D_800E2DF8 = 0x800E2DF8; D_800E2E28 = 0x800E2E28; +D_800E2E2C = 0x800E2E2C; D_800E2E4C = 0x800E2E4C; D_800E2E50 = 0x800E2E50; D_800E2E54 = 0x800E2E54; @@ -1815,6 +1817,7 @@ D_800E9860 = 0x800E9860; D_800E98A8 = 0x800E98A8; D_800E98AC = 0x800E98AC; D_800E98B0 = 0x800E98B0; +D_800E98C0 = 0x800E98C0; D_800E98D0 = 0x800E98D0; D_800EA3A0 = 0x800EA3A0; D_800EABA0 = 0x800EABA0;