mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-09 00:00:44 +00:00
Code Issues Projects Releases Wiki Activity

[ntsc-1.2] Organize n64dd declarations and convert to 1.0 addresses (#2127)

Browse source 
* Reorganize n64dd declarations

* Fix bss

* Really fix bss
This commit is contained in:
cadmic 2024-09-04 11:56:24 -07:00 • committed by GitHub
parent aa1c7f3155
commit 8153c952f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
31 changed files with 156 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/disasm/ntsc-1.2/files_boot.csv
View file

@ -84,9 +84,9 @@ FD0,80001430,src/boot/z_locale
60C0,80006520,src/libultra/os/sethwintrroutine
6130,80006590,src/libultra/os/gethwintrroutine
6160,800065C0,data/rsp_boot.text
62E0,80006740,data/cic6105.text
offset,vram,.data
62E0,80006740,data/unk_80009410.data
6310,80006770,src/boot/idle
6330,80006790,src/boot/viconfig
6340,800067A0,src/boot/z_std_dma

1 offset vram .text
84 60C0 80006520 src/libultra/os/sethwintrroutine
85 6130 80006590 src/libultra/os/gethwintrroutine
86 6160 800065C0 data/rsp_boot.text
87 62E0 80006740 data/cic6105.text
88 offset vram .data
89 62E0 6310 80006740 80006770 data/unk_80009410.data src/boot/idle
6310 80006770 src/boot/idle
90 6330 80006790 src/boot/viconfig
91 6340 800067A0 src/boot/z_std_dma
92 6350 800067B0 src/boot/z_locale

18
tools/disasm/ntsc-1.2/functions.txt
View file

@ -2305,13 +2305,13 @@ IrqMgr_HandlePreNMI500 = 0x800AD808; // type:func
IrqMgr_HandleRetrace = 0x800AD82C; // type:func
IrqMgr_ThreadEntry = 0x800AD8E4; // type:func
IrqMgr_Init = 0x800AD9B8; // type:func
func_800ADA80 = 0x800ADA80; // type:func
func_800ADAF8 = 0x800ADAF8; // type:func
func_800ADB30 = 0x800ADB30; // type:func
func_800ADB8C = 0x800ADB8C; // type:func
func_800ADBD0 = 0x800ADBD0; // type:func
func_800ADC00 = 0x800ADC00; // type:func
func_800ADC08 = 0x800ADC08; // type:func
func_800AD410 = 0x800ADA80; // type:func
func_800AD488 = 0x800ADAF8; // type:func
func_800AD4C0 = 0x800ADB30; // type:func
func_800AD51C = 0x800ADB8C; // type:func
func_800AD560 = 0x800ADBD0; // type:func
func_800AD590 = 0x800ADC00; // type:func
func_800AD598 = 0x800ADC08; // type:func
Fault_SleepImpl = 0x800ADC20; // type:func
Fault_WaitForInputImpl = 0x800ADC5C; // type:func
Fault_WaitForInput = 0x800ADCD8; // type:func
@ -3098,8 +3098,8 @@ Message_Init = 0x800E2660; // type:func
Regs_InitDataImpl = 0x800E2704; // type:func
Regs_InitData = 0x800E35D0; // type:func
njpgdspMainTextStart = 0x800E7200; // type:func
func_801C7740_unknown = 0x801C7740; // type:func
func_801C8510_unknown = 0x801C8510; // type:func
func_801C6E80 = 0x801C7740; // type:func
func_801C7C1C = 0x801C8510; // type:func
n64dd_SetDiskVersion = 0x801C8808; // type:func
ConsoleLogo_Calc = 0x80800000; // type:func
ConsoleLogo_SetupView = 0x8080009C; // type:func

12
tools/disasm/ntsc-1.2/variables.txt
View file

@ -12,16 +12,16 @@ gSaveContext = 0x8011AC80; // size:0x1428 type:SaveContext
gRegEditor = 0x8011C0B0; // size:0x4 type:RegEditor*
gSegments = 0x80121508; // size:0x40
_string_n64dd_c = 0x801D9680; // size:0x1 type:char
B_80121AF0 = 0x80121AF0; // size:0x4 type:n64ddStruct_80121AF0*
B_80121AE0 = 0x80121AE0; // size:0x1 type:u8
B_80121AE1 = 0x80121AE1; // size:0x1 type:s8
B_80121AE2 = 0x80121AE2; // size:0x1 type:u8
B_80121220 = 0x80121AF0; // size:0x4 type:n64ddStruct_80121220*
D_80121210 = 0x80121AE0; // size:0x1 type:u8
D_80121211 = 0x80121AE1; // size:0x1 type:s8
D_80121212 = 0x80121AE2; // size:0x1 type:u8
_n64ddSegmentStart = 0x801C7740;
_n64ddSegmentRomStart = 0x00B8ADA0;
_n64ddSegmentRomEnd = 0x00B9DA70;
D_801DA410 = 0x801DA410;
D_801E8090 = 0x801E8090;
D_800FF4B0 = 0x800FF4B0; // size:0xB0 type:n64ddStruct_800FF4B0_pointers
D_800FEE70 = 0x800FF4B0; // size:0xB0 type:n64ddStruct_800FEE70_pointers
gPadMgr = 0x8011DBD0; // size:0x468 type:PadMgr
gFaultMgr = 0x80121B60; // size:0x5D8 type:FaultMgr_v1
sFaultInputs = 0x80121B00; // size:0x60 type:Input[4]
@ -57,6 +57,6 @@ sGraphStack = 0x8011E468;
sGraphThread = 0x8011E2B8;
rspbootTextStart = 0x800065C0;
rspbootTextEnd = 0x80006720;
cic6105ucodeTextStart = 0x80006720;
cic6105TextStart = 0x80006720;
gBuildTeam = 0x80006D30;
gBuildDate = 0x80006D3C;