diff options
| author | cadmic <cadmic24@gmail.com> | 2024-09-07 11:37:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-08 03:37:15 +0900 |
| commit | e52d135e15be227326b58d75d6779fbb1db6f232 (patch) | |
| tree | ce30d6c22b9e6f213ff5047c7174e4ba674dda4f /tools | |
| parent | c27b83ac29a7c143ab8193682355cfab44f86f63 (diff) | |
[ntsc-1.2] Import n64dd code from Decompollaborate/n64dd (#2136)
* Import n64dd code from Decompollaborate/n64dd
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
* Don't stub out missing textures
* Remove @brief
* Add low-effort file comments
* Match OoT if style
* Fix n64dd matching due to int vs long
* Fix English n64dd error textures
* Compress n64dd segment
* Align n64dd to 0x40
---------
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/disasm/ntsc-1.2/variables.txt | 2 | ||||
| -rwxr-xr-x | tools/fix_bss.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/disasm/ntsc-1.2/variables.txt b/tools/disasm/ntsc-1.2/variables.txt index ce115492f..d657081eb 100644 --- a/tools/disasm/ntsc-1.2/variables.txt +++ b/tools/disasm/ntsc-1.2/variables.txt @@ -19,8 +19,6 @@ D_80121212 = 0x80121AE2; // size:0x1 type:u8 _n64ddSegmentStart = 0x801C7740; _n64ddSegmentRomStart = 0x00B8ADA0; _n64ddSegmentRomEnd = 0x00B9DA70; -D_801DA410 = 0x801DA410; -D_801E8090 = 0x801E8090; D_800FEE70 = 0x800FF4B0; // size:0xB0 type:n64ddStruct_800FEE70_pointers gPadMgr = 0x8011DBD0; // size:0x468 type:PadMgr gFaultMgr = 0x80121B60; // size:0x5D8 type:FaultMgr_v1 diff --git a/tools/fix_bss.py b/tools/fix_bss.py index 8f5f16436..6217e822f 100755 --- a/tools/fix_bss.py +++ b/tools/fix_bss.py @@ -189,6 +189,7 @@ def compare_pointers(version: str) -> dict[Path, BssSection]: if not ( mapfile_segment.name.startswith("..boot") or mapfile_segment.name.startswith("..code") + or mapfile_segment.name.startswith("..n64dd") or mapfile_segment.name.startswith("..ovl_") ): continue |