From 05a6cee5f5c631620343e0aa4ac9d4aa8dbc285b Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 21 Mar 2020 19:31:43 -0400 Subject: [PATCH] Migrated rodata --- .../overlays/actors/ovl_En_Ru2/EnRu2_Draw.s | 8 +++ .../overlays/actors/ovl_En_Ru2/EnRu2_Update.s | 8 +++ .../actors/ovl_En_Ru2/func_80AF2978.s | 7 +++ .../actors/ovl_En_Ru2/func_80AF2994.s | 7 +++ .../actors/ovl_En_Ru2/func_80AF321C.s | 12 +++++ .../actors/ovl_En_Ru2/func_80AF3564.s | 8 +++ .../actors/ovl_En_Ru2/func_80AF39DC.s | 9 ++++ .../actors/ovl_En_Ru2/func_80AF3F20.s | 12 +++++ data/overlays/actors/z_en_ru2.rodata.s | 51 ------------------- spec | 1 - 10 files changed, 71 insertions(+), 52 deletions(-) delete mode 100644 data/overlays/actors/z_en_ru2.rodata.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s index f613af3182..661f6538fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s @@ -1,3 +1,11 @@ +.rdata + +glabel D_80AF5244 + .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text + glabel EnRu2_Draw /* 01B34 80AF4084 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01B38 80AF4088 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s index 7a961cce3d..ecacef7611 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s @@ -1,3 +1,11 @@ +.rdata + +glabel D_80AF51E8 + .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" + .balign 4 + +.text + glabel EnRu2_Update /* 01870 80AF3DC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01874 80AF3DC4 AFBF0014 */ sw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s index 11cb83a6a3..ebafc849c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s @@ -1,3 +1,10 @@ +.late_rodata + +glabel D_80AF527C + .word 0x42A6AAAB + +.text + glabel func_80AF2978 /* 00428 80AF2978 AFA50004 */ sw $a1, 0x0004($sp) /* 0042C 80AF297C 3C0180AF */ lui $at, %hi(D_80AF527C) ## $at = 80AF0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s index d786125b6a..f76d7773dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s @@ -1,3 +1,10 @@ +.late_rodata + +glabel D_80AF5280 + .word 0xC61C4000, 0x00000000, 0x00000000, 0x00000000 + +.text + glabel func_80AF2994 /* 00444 80AF2994 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 00448 80AF2998 AFA50024 */ sw $a1, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s index f91d4c693c..760871cc59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s @@ -1,3 +1,15 @@ +.rdata + +glabel D_80AF5140 + .asciz "../z_en_ru2_inKenjyanomaDemo02.c" + .balign 4 + +glabel D_80AF5164 + .asciz "../z_en_ru2_inKenjyanomaDemo02.c" + .balign 4 + +.text + glabel func_80AF321C /* 00CCC 80AF321C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 00CD0 80AF3220 AFBF002C */ sw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3564.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3564.s index f8cf36a43c..8c6efbbf2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3564.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3564.s @@ -1,3 +1,11 @@ +.rdata + +glabel D_80AF5188 + .asciz "En_Ru2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" + .balign 4 + +.text + glabel func_80AF3564 /* 01014 80AF3564 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 01018 80AF3568 AFA40020 */ sw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF39DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF39DC.s index d28577a1db..5ad1b9a9cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF39DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF39DC.s @@ -1,3 +1,12 @@ +.rdata + +glabel D_80AF51C4 + .word 0xA4AAA4EC, 0xA4ACBEAE, 0xBEBEA4C0, 0xA1AA200A, 0x00000000 +glabel D_80AF51D8 + .word 0xA4A6A4AA, 0xA4EAA4E3, 0xA1BCA1AA, 0x200A0000 + +.text + glabel func_80AF39DC /* 0148C 80AF39DC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 01490 80AF39E0 AFB10018 */ sw $s1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s index 7ca19dd01f..1bec9ade8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s @@ -1,3 +1,15 @@ +.rdata + +glabel D_80AF5224 + .asciz "../z_en_ru2.c" + .balign 4 + +glabel D_80AF5234 + .asciz "../z_en_ru2.c" + .balign 4 + +.text + glabel func_80AF3F20 /* 019D0 80AF3F20 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 019D4 80AF3F24 AFBF0024 */ sw $ra, 0x0024($sp) diff --git a/data/overlays/actors/z_en_ru2.rodata.s b/data/overlays/actors/z_en_ru2.rodata.s deleted file mode 100644 index 867fc783bc..0000000000 --- a/data/overlays/actors/z_en_ru2.rodata.s +++ /dev/null @@ -1,51 +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 purposee registers - -.section .rodata - -glabel D_80AF5140 - .asciz "../z_en_ru2_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80AF5164 - .asciz "../z_en_ru2_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80AF5188 - .asciz "En_Ru2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.balign 4 - -glabel D_80AF51C4 - .word 0xA4AAA4EC, 0xA4ACBEAE, 0xBEBEA4C0, 0xA1AA200A, 0x00000000 -glabel D_80AF51D8 - .word 0xA4A6A4AA, 0xA4EAA4E3, 0xA1BCA1AA, 0x200A0000 -glabel D_80AF51E8 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.balign 4 - -glabel D_80AF5224 - .asciz "../z_en_ru2.c" - .balign 4 - -glabel D_80AF5234 - .asciz "../z_en_ru2.c" - .balign 4 - -glabel D_80AF5244 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80AF527C - .word 0x42A6AAAB -glabel D_80AF5280 - .word 0xC61C4000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/spec b/spec index 8c6f404508..56033309eb 100644 --- a/spec +++ b/spec @@ -3496,7 +3496,6 @@ beginseg name "ovl_En_Ru2" include "build/src/overlays/actors/ovl_En_Ru2/z_en_ru2.o" include "build/data/overlays/actors/z_en_ru2.data.o" - include "build/data/overlays/actors/z_en_ru2.rodata.o" include "build/data/overlays/actors/z_en_ru2.reloc.o" endseg