diff --git a/asm/non_matchings/unknown_071730/func_80071A24.s b/asm/non_matchings/unknown_071730/func_80071A24.s index 18f8e610..a7042aa7 100644 --- a/asm/non_matchings/unknown_071730/func_80071A24.s +++ b/asm/non_matchings/unknown_071730/func_80071A24.s @@ -1,3 +1,30 @@ +.rdata +glabel D_800E7528 +.asciz "RED %d\n" +glabel D_800E7530 +.asciz "GREEN %d\n" +.ascii "\0\0" # padding +glabel D_800E753C +.asciz "BLUE %d\n" +.ascii "\0\0\0" # padding +glabel D_800E7548 +.asciz "YELLOW %d\n" +.ascii "\0" # padding +glabel D_800E7554 +.asciz "MAGENTA %d\n" +glabel D_800E7560 +.asciz "CYAN %d\n" +.ascii "\0\0\0" # padding +glabel D_800E756C +.asciz "WHITE %d\n" +.ascii "\0\0" # padding +glabel D_800E7578 +.asciz "GREY %d\n" +.ascii "\0\0\0" # padding +glabel D_800E7584 +.asciz "ORANGE %d\n\n" + +.text glabel func_80071A24 /* 072624 80071A24 3C028012 */ lui $v0, %hi(D_80123588) # $v0, 0x8012 /* 072628 80071A28 8C423588 */ lw $v0, %lo(D_80123588)($v0) diff --git a/src/unknown_071730.c b/src/unknown_071730.c index 4c194240..f09575b6 100644 --- a/src/unknown_071730.c +++ b/src/unknown_071730.c @@ -29,15 +29,6 @@ const char D_800E74F8[] = "CYAN %d\n"; const char D_800E7504[] = "WHITE %d\n"; const char D_800E7510[] = "GREY %d\n"; const char D_800E751C[] = "ORANGE %d\n\n"; -const char D_800E7528[] = "RED %d\n"; -const char D_800E7530[] = "GREEN %d\n"; -const char D_800E753C[] = "BLUE %d\n"; -const char D_800E7548[] = "YELLOW %d\n"; -const char D_800E7554[] = "MAGENTA %d\n"; -const char D_800E7560[] = "CYAN %d\n"; -const char D_800E756C[] = "WHITE %d\n"; -const char D_800E7578[] = "GREY %d\n"; -const char D_800E7584[] = "ORANGE %d\n\n"; /*********************************/ diff --git a/tools/python/rodata_move.py b/tools/python/rodata_move.py index 7d1a1178..7a98fb2e 100755 --- a/tools/python/rodata_move.py +++ b/tools/python/rodata_move.py @@ -65,6 +65,9 @@ def adjustAsmFile(asmFilepath, refs): if ref[0] == 'asciz': rodata += 'glabel ' + ref[1] + '\n' rodata += '.' + ref[0] + ' ' + ref[2] + '\n' + strEnd = int(ref[1][-1:], 16) + len(ref[2].replace('\\', '')) - 2 + 1 + if strEnd % 4 != 0: + rodata += '.ascii "' + ('\\0' * (4 - (strEnd % 4))) + '" # padding\n' elif ref[0] == 'double' or ref[0] == 'float': lateRodata += 'glabel ' + ref[1] + '\n' lateRodata += '.' + ref[0] + ' ' + ref[2] + '\n'