mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-13 11:24:40 +00:00
Code Issues Projects Releases Wiki Activity

[ntsc-1.2] Match __osMalloc.c and code_800FC620.c (new/delete) (#2106)

Browse source 
* Match __osMalloc

* Match src/code/code_800FC620.c (new/delete)

* Wrap versions-specific files in ifdefs to fix compilation

* Fix bss

* Remove {FAULT,RAND,OSMALLOC}_VERSION in favor of PLATFORM_N64

* Fix __osMalloc data splits, add unused strings

* __osMalloc.h -> osMalloc.h

* Fix merge
This commit is contained in:
cadmic 2024-09-04 02:10:14 -07:00 • committed by GitHub
parent af24970d89
commit c6d7cc7697
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 682 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tools/disasm/ntsc-1.2/files_code.csv
View file

@ -132,7 +132,7 @@ BC670,800CDD50,src/code/fp_math
BCA20,800CE100,src/code/fp
BCB80,800CE260,src/code/system_malloc
BCDF0,800CE4D0,src/code/rand
BCEF0,800CE5D0,src/code/__osMalloc
BCEF0,800CE5D0,src/code/__osMalloc_n64
BD8A0,800CEF80,src/boot/sprintf
BD970,800CF050,src/code/printutils
BD9D0,800CF0B0,src/code/jpegutils
@ -292,7 +292,8 @@ F3AD0,801051B0,src/code/gfxprint
F4380,80105A60,src/code/loadfragment2_n64
F4390,80105A70,src/code/code_800FC620
F43A0,80105A80,src/code/rand
F43B0,80105A90,src/code/__osMalloc
F43B0,80105A90,src/code/__osMalloc_n64
F43C0,80105AA0,src/boot/sprintf
F4400,80105AE0,src/libultra/gu/sins
F4C00,801062E0,src/libultra/io/siacs
F4C10,801062F0,src/libultra/io/controller
@ -379,6 +380,7 @@ F9190,8010A870,src/code/gfxprint
F91D0,8010A8B0,src/code/rcp_utils
F9320,8010AA00,src/code/loadfragment2_n64
F94C0,8010ABA0,src/code/fp_math
F94E0,8010ABC0,src/code/__osMalloc_n64
F9690,8010AD70,src/libultra/gu/sinf
F96E0,8010ADC0,src/libultra/gu/perspective
F96F0,8010ADD0,src/libultra/gu/lookathil

1 offset vram .text
132 BCA20 800CE100 src/code/fp
133 BCB80 800CE260 src/code/system_malloc
134 BCDF0 800CE4D0 src/code/rand
135 BCEF0 800CE5D0 src/code/__osMalloc src/code/__osMalloc_n64
136 BD8A0 800CEF80 src/boot/sprintf
137 BD970 800CF050 src/code/printutils
138 BD9D0 800CF0B0 src/code/jpegutils
292 F4390 80105A70 src/code/code_800FC620
293 F43A0 80105A80 src/code/rand
294 F43B0 80105A90 src/code/__osMalloc src/code/__osMalloc_n64
295 F4400 F43C0 80105AE0 80105AA0 src/libultra/gu/sins src/boot/sprintf
296 F4400 80105AE0 src/libultra/gu/sins
297 F4C00 801062E0 src/libultra/io/siacs
298 F4C10 801062F0 src/libultra/io/controller
299 F4C20 80106300 src/libultra/libc/xprintf
380 F94C0 8010ABA0 src/code/fp_math
381 F9690 F94E0 8010AD70 8010ABC0 src/libultra/gu/sinf src/code/__osMalloc_n64
382 F96E0 F9690 8010ADC0 8010AD70 src/libultra/gu/perspective src/libultra/gu/sinf
383 F96E0 8010ADC0 src/libultra/gu/perspective
384 F96F0 8010ADD0 src/libultra/gu/lookathil
385 F9700 8010ADE0 src/libultra/libc/xprintf
386 F9800 8010AEE0 src/libultra/gu/position

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

@ -2931,7 +2931,7 @@ __osRealloc = 0x800CED54; // type:func
__osReallocDebug = 0x800CEEA8; // type:func
ArenaImpl_GetSizes = 0x800CEEC8; // type:func
__osCheckArena = 0x800CEF3C; // type:func
func_800FF334 = 0x800CEF78; // type:func
ArenaImpl_GetAllocFailures = 0x800CEF78; // type:func
proutSprintf = 0x800CEF80; // type:func
vsprintf = 0x800CEFA4; // type:func
sprintf = 0x800CEFF4; // type:func