diff options
| author | Roman971 <32455037+Roman971@users.noreply.github.com> | 2021-11-24 03:07:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-23 21:07:48 -0500 |
| commit | 0f58b15b2788a1fe5c299000c69ab8d3d71fc4c9 (patch) | |
| tree | ac1b1b830614cfd6c74d49a75608e498b1bc5bfd /data | |
| parent | 8d4828a3bee11e7de27cd3dfe96c5c9970a78edd (diff) | |
Minor data/ cleanups (#1025)
* Moved code_800D2E30's data to C
* Moved some audio data from asm to C
* Made separate data files for unknown pointer arrays
* Fixed a few missing balign directives
Diffstat (limited to 'data')
| -rw-r--r-- | data/__libm_qnan_f.rodata.s | 4 | ||||
| -rw-r--r-- | data/audio_effects.data.s | 21 | ||||
| -rw-r--r-- | data/code_800D2E30.data.s | 13 | ||||
| -rw-r--r-- | data/rsp_boot.text.s | 12 | ||||
| -rw-r--r-- | data/unk_80009410.data.s | 21 | ||||
| -rw-r--r-- | data/unk_8012ABC0.data.s | 25 | ||||
| -rw-r--r-- | data/z_text.data.s | 15 |
7 files changed, 51 insertions, 60 deletions
diff --git a/data/__libm_qnan_f.rodata.s b/data/__libm_qnan_f.rodata.s index 8edfc0bfc..3c3686576 100644 --- a/data/__libm_qnan_f.rodata.s +++ b/data/__libm_qnan_f.rodata.s @@ -7,5 +7,7 @@ .section .rodata +.balign 16 + glabel __libm_qnan_f - .word 0x7F810000 + .word 0x7F810000 diff --git a/data/audio_effects.data.s b/data/audio_effects.data.s deleted file mode 100644 index 96720abfd..000000000 --- a/data/audio_effects.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_80130510 - .word 0 - -glabel D_80130514 - .word 0 - -.word 0, 0 # file boundary - -glabel D_80130520 - .incbin "baserom.z64", 0xBA76C0, 0x50 diff --git a/data/code_800D2E30.data.s b/data/code_800D2E30.data.s deleted file mode 100644 index bf01aed6d..000000000 --- a/data/code_800D2E30.data.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_8012DBB0 - .incbin "baserom.z64", 0xBA4D50, 0x10 diff --git a/data/rsp_boot.text.s b/data/rsp_boot.text.s index f9495dcac..9ca646e4a 100644 --- a/data/rsp_boot.text.s +++ b/data/rsp_boot.text.s @@ -7,18 +7,10 @@ .section .text +.balign 16 + glabel D_80009320 .incbin "baserom.z64", 0x9F20, 0xD0 glabel D_800093F0 .incbin "baserom.z64", 0x9FF0, 0x20 - -glabel D_80009410 - .word osStopThread - .word __osSetHWIntrRoutine - .word __osSetFpcCsr - .word __osGetFpcCsr - .word __osGetHWIntrRoutine - .word __osSetHWIntrRoutine - .word osViGetNextFramebuffer - .word bcmp diff --git a/data/unk_80009410.data.s b/data/unk_80009410.data.s new file mode 100644 index 000000000..d2bded6c3 --- /dev/null +++ b/data/unk_80009410.data.s @@ -0,0 +1,21 @@ +.include "macro.inc" + +# assembler directives +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches +.set gp=64 # allow use of 64-bit general purpose registers + +.section .data + +.balign 16 + +# Unused +glabel D_80009410 + .word osStopThread + .word __osSetHWIntrRoutine + .word __osSetFpcCsr + .word __osGetFpcCsr + .word __osGetHWIntrRoutine + .word __osSetHWIntrRoutine + .word osViGetNextFramebuffer + .word bcmp diff --git a/data/unk_8012ABC0.data.s b/data/unk_8012ABC0.data.s new file mode 100644 index 000000000..d4781c3b8 --- /dev/null +++ b/data/unk_8012ABC0.data.s @@ -0,0 +1,25 @@ +.include "macro.inc" + +# assembler directives +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches +.set gp=64 # allow use of 64-bit general purpose registers + +.section .data + +.balign 16 + +# Unused +glabel D_8012ABC0 + .word func_801067F0 # fmodf? + .word guScale + .word guRotate + .word guTranslate + .word GfxPrint_SetPos + .word GfxPrint_SetColor + .word GfxPrint_Printf + .word GfxPrint_SetPosPx + .word GfxPrint_Init + .word GfxPrint_Open + .word GfxPrint_Close + .word GfxPrint_Destroy diff --git a/data/z_text.data.s b/data/z_text.data.s index c20dd6cca..a9cda47f0 100644 --- a/data/z_text.data.s +++ b/data/z_text.data.s @@ -16,18 +16,3 @@ glabel gMojiFontTLUTs glabel gMojiFontTex .incbin "baserom.z64", 0xBA1960, 0x400 - -# Unused -glabel D_8012ABC0 - .word func_801067F0 # fmodf? - .word guScale - .word guRotate - .word guTranslate - .word GfxPrint_SetPos - .word GfxPrint_SetColor - .word GfxPrint_Printf - .word GfxPrint_SetPosPx - .word GfxPrint_Init - .word GfxPrint_Open - .word GfxPrint_Close - .word GfxPrint_Destroy |
