Some OOT transfers, some renaming, etc (#75)

* Progress on various files

* gfxprint stuff

* split some rodata, add iconv for rodata string parsing

* z_std_dma rodata

* 2 nonmatchings in gfxprint

* mtxuty-cvt ok

* more

* match a function in idle.c

* progress

* Cleanup

* Rename BgPolygon to CollisionPoly

* progress

* some effect stuff

* more effect progress

* updates

* made suggested changes

* z_effect_soft_sprite_old_init mostly ok

Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>

1 files changed, 23 insertions, 23 deletions

diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt
index 969ede166..12896c916 100644
--- a/linker_scripts/code_script.txt
+++ b/linker_scripts/code_script.txt
@@ -26,14 +26,14 @@ SECTIONS
         build/src/boot_O2/loadfragment2.o(.text)
         build/src/boot_O2/padutils.o(.text)
         build/src/boot_O2/stackcheck.o(.text)
-        build/asm/boot/boot_0x80085570.o(.text)
-        build/asm/boot/mtxuty-cvt.o(.text)
-        build/asm/boot/boot_0x80086280.o(.text)
-        build/asm/boot/boot_0x800862E0.o(.text)
+        build/src/boot_O2/gfxprint.o(.text)
+        build/src/boot_O2/mtxuty-cvt.o(.text)
+        build/src/boot_O2/boot_0x80086280.o(.text)
+        build/src/boot_O2/boot_0x800862E0.o(.text)
         build/asm/boot/boot_0x80086760.o(.text)
         build/asm/boot/boot_0x80086DD0.o(.text)
-        build/asm/boot/boot_0x80086FA0.o(.text)
-        build/asm/boot/__osMalloc.o(.text)
+        build/src/boot_O2/boot_0x80086FA0.o(.text)
+        build/src/boot_O2/__osMalloc.o(.text)
         build/src/libultra/rmon/sprintf.o(.text)
         build/asm/boot/boot_0x80087900.o(.text)
         build/asm/boot/setcause.o(.text)
@@ -44,8 +44,8 @@ SECTIONS
         build/src/libultra/os/recvmesg.o(.text)
         build/asm/boot/setintmask.o(.text)
         build/asm/boot/getintmask.o(.text)
-        build/asm/boot/boot_0x80088110.o(.text)
-        build/asm/boot/boot_0x800882A0.o(.text)
+        build/src/libultra/voice/voicesetword.o(.text)
+        build/asm/boot/scale.o(.text)
         build/src/libultra/gu/sinf.o(.text)
         build/src/libultra/gu/sins.o(.text)
         build/src/libultra/io/sptask.o(.text)
@@ -53,7 +53,7 @@ SECTIONS
         build/asm/boot/exceptasm.o(.text)
         build/src/libultra/os/thread.o(.text)
         build/src/libultra/os/destroythread.o(.text)
-        build/asm/boot/boot_0x80089580.o(.text)
+        build/src/libultra/voice/voicecheckresult.o(.text)
         build/asm/boot/bzero.o(.text)
         build/asm/boot/boot_0x800896D0.o(.text)
         build/src/libultra/io/siacs.o(.text)
@@ -81,7 +81,7 @@ SECTIONS
         build/src/libultra/io/visetmode.o(.text)
         build/asm/boot/getconfig.o(.text)
         build/asm/boot/setconfig.o(.text)
-        build/asm/boot/lookat.o(.text)
+        build/src/libultra/gu/lookat.o(.text)
         build/asm/boot/boot_0x8008B9F0.o(.text)
         build/src/libultra/os/stoptimer.o(.text)
         build/asm/boot/probetlb.o(.text)
@@ -95,12 +95,12 @@ SECTIONS
         build/asm/boot/getcount.o(.text)
         build/asm/boot/boot_0x8008D2E0.o(.text)
         build/src/libultra/os/getmemsize.o(.text)
-        build/asm/boot/boot_0x8008D470.o(.text)
+        build/asm/boot/pfssearchfile.o(.text)
         build/src/libultra/os/seteventmesg.o(.text)
         build/asm/boot/sqrtf.o(.text)
-        build/asm/boot/boot_0x8008D710.o(.text)
+        build/asm/boot/afterprenmi.o(.text)
         build/src/libultra/io/contquery.o(.text)
-        build/asm/boot/lookathil.o(.text)
+        build/src/libultra/gu/lookathil.o(.text)
         build/src/libultra/rmon/xprintf.o(.text)
         build/asm/boot/boot_0x8008ED30.o(.text)
         build/asm/boot/unmaptlball.o(.text)
@@ -157,7 +157,7 @@ SECTIONS
         build/asm/boot/boot_0x800922C0.o(.text)
         build/src/libultra/gu/visetevent.o(.text)
         build/asm/boot/pfsisplug.o(.text)
-        build/asm/boot/boot_0x80092730.o(.text)
+        build/src/libultra/voice/voicegetstatus.o(.text)
         build/asm/boot/cartrominit.o(.text)
         build/asm/boot/boot_0x80092A80.o(.text)
         build/asm/boot/boot_0x80092C00.o(.text)
@@ -175,7 +175,7 @@ SECTIONS
         build/asm/boot/boot_0x80093CC0.o(.text)
         build/asm/boot/getcause.o(.text)
         build/asm/boot/contramwrite.o(.text)
-        build/asm/boot/boot_0x80093FF0.o(.text)
+        build/src/libultra/io/epirawwrite.o(.text)
         build/src/libultra/os/settimer.o(.text)
         build/asm/boot/xldtob.o(.text)
         build/src/libultra/libc/ldiv.o(.text)
@@ -184,7 +184,7 @@ SECTIONS
         build/src/libultra/io/spgetstat.o(.text)
         build/src/libultra/io/spsetstat.o(.text)
         . += 0x10;
-        build/asm/boot/vimgr.o(.text)
+        build/src/libultra/io/vimgr.o(.text)
         build/src/libultra/io/vigetcurrcontext.o(.text)
         build/asm/boot/writebackdcacheall.o(.text)
         build/src/libultra/os/getcurrfaultthread.o(.text)
@@ -200,7 +200,7 @@ SECTIONS
         build/asm/boot/boot_0x800964D0.o(.text)
         build/asm/boot/spsetpc.o(.text)
         build/asm/boot/boot_0x80096540.o(.text)
-        build/asm/boot/boot_0x80096770.o(.text)
+        build/src/boot_O1/gethwintrroutine.o(.text)
         build/asm/boot/boot_0x800967A0.o(.text)
         build/asm/boot/boot_0x80096810.o(.text)
         build/asm/boot/boot_0x80096820.o(.text)
@@ -251,14 +251,14 @@ SECTIONS
         boot_rodata_start = .;
         build/src/boot_O2_g3/boot_main.o(.rodata)
         build/src/boot_O2_g3/idle.o(.rodata)
-        build/asm/boot/boot_rodata_z_std_dma.o(.rodata)
+        build/src/boot_O2_g3/z_std_dma.o(.rodata)
         build/src/boot_O2_g3/yaz0.o(.rodata)
         build/src/boot_O2_g3/irqmgr.o(.rodata)
         build/src/boot_O2_g3/CIC6105.o(.rodata)
         build/asm/boot/boot_rodata_fault.o(.rodata)
         build/asm/boot/boot_rodata_fault_drawer.o(.rodata)
         build/asm/boot/boot_rodata_0x80085570.o(.rodata)
-        build/asm/boot/boot_rodata_0x80086280.o(.rodata)
+        build/src/boot_O2/boot_0x80086280.o(.rodata)
         build/asm/boot/boot_rodata_0x80086760.o(.rodata)
         build/asm/boot/boot_rodata___osMalloc.o(.rodata)
         build/asm/boot/boot_rodata_setintmask.o(.rodata)
@@ -320,14 +320,14 @@ SECTIONS
         code_text_start = .;
         build/src/code/code_0x800A5AC0.o(.text)
         build/asm/code/z_en_item00.o(.text)
-        build/asm/code/z_eff_blure.o(.text)
+        build/src/code/z_eff_blure.o(.text)
         build/asm/code/z_eff_shield_particle.o(.text)
         build/asm/code/z_eff_spark.o(.text)
         build/asm/code/z_eff_ss_dead.o(.text)
         build/asm/code/z_eff_tire_mark.o(.text)
         build/src/code/code_0x800AF710.o(.text)
         build/src/code/z_effect_soft_sprite.o(.text)
-        build/asm/code/z_effect_soft_sprite_old_init.o(.text)
+        build/src/code/z_effect_soft_sprite_old_init.o(.text)
         build/asm/code/flg_set.o(.text)
         build/asm/code/z_DLF.o(.text)
         build/src/code/z_actor.o(.text)
@@ -433,8 +433,8 @@ SECTIONS
         build/asm/code/sys_initial_check.o(.text)
         build/asm/code/code_0x80179300.o(.text)
         build/asm/code/code_0x801795F0.o(.text)
-        build/asm/code/code_0x8017FEB0.o(.text)
-        build/asm/code/sys_matrix.o(.text)
+        build/src/code/code_0x8017FEB0.o(.text)
+        build/src/code/sys_matrix.o(.text)
         build/asm/code/code_0x80182CE0.o(.text)
         build/src/code/code_0x80183070.o(.text)
         build/asm/code/code_0x801830A0.o(.text)