From 9b6c6bf77a7b8d9abc5774376e9ed1ac2f317800 Mon Sep 17 00:00:00 2001 From: rozlette Date: Mon, 18 Mar 2019 20:36:09 -0500 Subject: [PATCH] name a couple more files --- codescript.txt | 45 ++++++++++--------- objects.py | 32 +++++++++++-- .../{boot_0x80081820.c => CIC6105.c} | 0 src/boot_O2_g3/boot_0x80080060.c | 6 --- 4 files changed, 53 insertions(+), 30 deletions(-) rename src/boot_O2_g3/{boot_0x80081820.c => CIC6105.c} (100%) diff --git a/codescript.txt b/codescript.txt index 9195a11396..87d1692bc4 100644 --- a/codescript.txt +++ b/codescript.txt @@ -3,23 +3,25 @@ SECTIONS boot 0x80080060: { build/src/boot_O2_g3/boot_0x80080060.o(.text) - build/asm/boot_0x80080180.o(.text) + build/asm/idle.o(.text) build/src/boot_O2_g3/boot_0x800805E0.o(.text) build/src/boot_O2_g3/boot_0x80080790.o(.text) build/asm/boot_0x80080E30.o(.text) - build/src/boot_O2_g3/boot_0x80081820.o(.text) + build/asm/boot_0x80081250.o(.text) + build/src/boot_O2_g3/CIC6105.o(.text) build/asm/boot_0x80081920.o(.text) build/asm/boot_0x80081980.o(.text) build/asm/boot_0x80083EB0.o(.text) - build/asm/boot_0x80084940.o(.text) + build/asm/loadfragment.o(.text) + build/asm/loadfragment2.o(.text) build/asm/boot_0x80085130.o(.text) build/asm/boot_0x80085320.o(.text) build/asm/boot_0x80085570.o(.text) - build/asm/boot_0x80086110.o(.text) + build/asm/mtxuty-cvt.o(.text) build/asm/boot_0x80086280.o(.text) build/asm/boot_0x800862E0.o(.text) build/asm/boot_0x80086760.o(.text) - build/asm/boot_0x80087160.o(.text) + build/asm/__osMalloc.o(.text) build/asm/boot_0x80087830.o(.text) build/asm/boot_0x80087900.o(.text) build/asm/setcause.o(.text) @@ -57,14 +59,14 @@ SECTIONS build/src/libultra/io/sprawdma.o(.text) build/asm/sirawdma.o(.text) build/asm/boot_0x8008AE20.o(.text) - build/asm/boot_0x8008AE70.o(.text) + build/asm/virepeatline.o(.text) build/asm/sirawread.o(.text) build/src/libultra/os/getthreadid.o(.text) build/asm/sptaskyield.o(.text) build/asm/boot_0x8008AF70.o(.text) build/asm/boot_0x8008B3C0.o(.text) build/asm/boot_0x8008B600.o(.text) - build/asm/boot_0x8008B650.o(.text) + build/asm/visetmode.o(.text) build/asm/getconfig.o(.text) build/asm/setconfig.o(.text) build/asm/boot_0x8008B6D0.o(.text) @@ -83,7 +85,7 @@ SECTIONS build/asm/sqrtf.o(.text) build/asm/boot_0x8008D710.o(.text) build/src/libultra/io/contquery.o(.text) - build/asm/boot_0x8008D7D0.o(.text) + build/asm/lookathil.o(.text) build/asm/xprintf.o(.text) build/asm/boot_0x8008ED30.o(.text) build/asm/unmaptlball.o(.text) @@ -103,7 +105,7 @@ SECTIONS build/src/libultra/os/setthreadpri.o(.text) build/src/libultra/os/getthreadpri.o(.text) build/asm/boot_0x8008FD00.o(.text) - build/asm/boot_0x8008FE60.o(.text) + build/asm/viswapbuf.o(.text) build/asm/boot_0x8008FEB0.o(.text) build/asm/boot_0x800900C0.o(.text) build/asm/sptaskyielded.o(.text) @@ -134,10 +136,11 @@ SECTIONS build/asm/pigetcmdq.o(.text) build/asm/cosf.o(.text) build/asm/boot_0x800920B0.o(.text) - build/asm/boot_0x80092100.o(.text) + build/asm/visetspecial.o(.text) build/asm/coss.o(.text) build/asm/settime.o(.text) build/asm/boot_0x800922C0.o(.text) + build/asm/visetevent.o(.text) build/asm/boot_0x80092440.o(.text) build/asm/boot_0x80092730.o(.text) build/asm/boot_0x80092920.o(.text) @@ -195,12 +198,14 @@ SECTIONS { build/src/code/code_0x800A5AC0.o(.text) build/asm/z_en_item00.o(.text) - build/asm/code_0x800A81F0.o(.text) - build/asm/code_0x800ACBF0.o(.text) + build/asm/z_eff_blure.o(.text) + build/asm/z_eff_shield_particle.o(.text) + build/asm/z_eff_spark.o(.text) + build/asm/code_0x800AE2A0.o(.text) build/asm/code_0x800B32D0.o(.text) build/asm/code_0x800B3AD0.o(.text) build/asm/code_0x800BF9A0.o(.text) - build/asm/code_0x800BFB80.o(.text) + build/asm/z_bgcheck.o(.text) build/asm/code_0x800CAAD0.o(.text) build/asm/code_0x800CAE10.o(.text) build/src/code/code_0x800E03A0.o(.text) @@ -233,7 +238,7 @@ SECTIONS build/asm/code_0x80122660.o(.text) build/asm/code_0x801226E0.o(.text) build/asm/code_0x8012BC50.o(.text) - build/asm/code_0x8012D510.o(.text) + build/asm/z_room.o(.text) build/asm/code_0x8012EC80.o(.text) build/asm/code_0x8012F2E0.o(.text) build/asm/code_0x801307C0.o(.text) @@ -246,7 +251,7 @@ SECTIONS build/asm/code_0x8013A7C0.o(.text) build/asm/code_0x8013EC10.o(.text) build/asm/code_0x8013EE60.o(.text) - build/asm/code_0x80140260.o(.text) + build/asm/z_vimode.o(.text) build/asm/code_0x80140E80.o(.text) build/asm/code_0x801418B0.o(.text) build/asm/code_0x801420C0.o(.text) @@ -261,19 +266,19 @@ SECTIONS build/asm/code_0x80163DC0.o(.text) build/asm/code_0x801647D0.o(.text) build/asm/code_0x80164AF0.o(.text) - build/asm/code_0x801651B0.o(.text) + build/asm/z_play.o(.text) build/asm/code_0x8016AC10.o(.text) build/asm/code_0x801727F0.o(.text) build/asm/code_0x80172A00.o(.text) build/asm/code_0x80172BC0.o(.text) build/asm/code_0x80172C30.o(.text) - build/asm/code_0x80173130.o(.text) + build/asm/game.o(.text) build/asm/code_0x80173BF0.o(.text) - build/asm/code_0x80173D30.o(.text) + build/asm/graph.o(.text) build/asm/code_0x80174A40.o(.text) build/asm/code_0x80174AA0.o(.text) build/asm/code_0x80174BF0.o(.text) - build/asm/code_0x80174F10.o(.text) + build/asm/padmgr.o(.text) build/asm/code_0x80176280.o(.text) build/asm/code_0x80177390.o(.text) build/asm/code_0x80178750.o(.text) @@ -282,7 +287,7 @@ SECTIONS build/asm/code_0x80180160.o(.text) build/asm/code_0x80182CE0.o(.text) build/src/code/code_0x80183070.o(.text) - build/asm/code_0x801830A0.o(.text) + build/asm/sys_flashrom.o(.text) build/asm/code_0x80185F90.o(.text) build/asm/code_0x801877D0.o(.text) build/asm/code_0x8018B0F0.o(.text) diff --git a/objects.py b/objects.py index 55b06e4aab..876292df3c 100644 --- a/objects.py +++ b/objects.py @@ -1,5 +1,12 @@ known_objects = { - 0x80080180:"", + 0x80080150:"idle", + 0x80080790:"z_std_dma", + 0x80081250:"", + 0x80081820:"CIC6105", + 0x80084940:"loadfragment", + 0x80084DB0:"loadfragment2", + 0x80086110:"mtxuty-cvt", + 0x80087160:"__osMalloc", 0x80087B00:"setcause", 0x80087B10:"sendmesg", 0x80087E10:"stopthread", @@ -27,10 +34,12 @@ known_objects = { 0x8008AA50:"perspective", 0x8008AD70:"sirawdma", 0x8008ACE0:"sprawdma", + 0x8008AE70:"virepeatline", 0x8008AEE0:"sirawread", 0x8008AF30:"getthreadid", 0x8008AF50:"sptaskyield", 0x8008AF70:"", + 0x8008B650:"visetmode", 0x8008B6B0:"getconfig", 0x8008B6C0:"setconfig", 0x8008BE70:"stoptimer", @@ -41,7 +50,7 @@ known_objects = { 0x8008D640:"seteventmesg", 0x8008D700:"sqrtf", 0x8008D730:"contquery", - 0x8008D7D0:"", + 0x8008D7D0:"lookathil", 0x8008E050:"xprintf", 0x8008EDE0:"unmaptlball", 0x8008EE30:"pidma", @@ -51,9 +60,10 @@ known_objects = { 0x8008F2F0:"invaldcache", 0x8008F3A0:"timerintr", 0x8008FA30:"si", - 0x8008fab0:"jammesg", + 0x8008fAB0:"jammesg", 0x8008fc00:"setthreadpri", 0x8008fce0:"getthreadpri", + 0x8008fe60:"viswapbuf", 0x800902A0:"sptaskyielded", 0x80090300:"memcmp", 0x80090420:"gettime", @@ -70,8 +80,10 @@ known_objects = { 0x80091C10:"viswapcontext", 0x80091F10:"pigetcmdq", 0x80091f40:"cosf", + 0x80092100:"visetspecial", 0x80092260:"coss", 0x80092290:"settime", + 0x800923e0:"visetevent", 0x80092C80:"contsetch", 0x80092ce0:"setfpccsr", 0x80092cf0:"getfpccsr", @@ -95,5 +107,17 @@ known_objects = { 0x80095950:"visetxscale", 0x80095a60:"llcvt", 0x80096510:"spsetpc", - 0x800A5D00:"z_en_item00" + 0x800A5D00:"z_en_item00", + 0x800A81F0:"z_eff_blure", + 0x800AB5D0:"z_eff_shield_particle", + 0x800ACBF0:"z_eff_spark", + 0x800AE2A0:"", + 0x800BFB80:"z_bgcheck", + 0x8012D510:"z_room", + 0x80140260:"z_vimode", + 0x801651B0:"z_play", + 0x80173130:"game", + 0x80173D30:"graph", + 0x80174F10:"padmgr", + 0x801830A0:"sys_flashrom" } diff --git a/src/boot_O2_g3/boot_0x80081820.c b/src/boot_O2_g3/CIC6105.c similarity index 100% rename from src/boot_O2_g3/boot_0x80081820.c rename to src/boot_O2_g3/CIC6105.c diff --git a/src/boot_O2_g3/boot_0x80080060.c b/src/boot_O2_g3/boot_0x80080060.c index 651584f8d7..51f9150cf5 100644 --- a/src/boot_O2_g3/boot_0x80080060.c +++ b/src/boot_O2_g3/boot_0x80080060.c @@ -12,9 +12,3 @@ UNK_RET func_80080060(void) { osCreateThread(&D_80099520, 1, (void(*)(void*))func_80080514, 0, &D_80099AD0, 12); osStartThread(&D_80099520); } - -void func_80080150(UNK_PTR a0, UNK_PTR a1) { - if (a0 < a1) { - _blkclr(a0, (u32)a1 - (u32)a0); - } -}