diff --git a/asm/non_matchings/code/code_80110450/func_801104C8.s b/asm/non_matchings/code/code_80110450/func_801104C8.s index dcbbd29d6b..85f0530234 100644 --- a/asm/non_matchings/code/code_80110450/func_801104C8.s +++ b/asm/non_matchings/code/code_80110450/func_801104C8.s @@ -1,3 +1,31 @@ +.late_rodata +glabel jtbl_80154CF0 + .word L80110520 + .word L80110960 + .word L80110748 + .word L80110960 + .word L80110960 + .word L80110960 + .word L80110960 + .word L80110960 + .word L80110960 + .word L80110960 + .word L80110960 + .word L80110960 + .word L80110960 + .word L80110960 + .word L80110960 + .word L80110960 + .word L80110960 + .word L80110960 + .word L80110960 + .word L8011079C + .word L801107D8 + .word L801108A4 + .word L801108E8 + .word L8011092C + +.text glabel func_801104C8 /* B87668 801104C8 27BDFFC8 */ addiu $sp, $sp, -0x38 /* B8766C 801104CC 3C0E0001 */ lui $t6, 1 diff --git a/asm/non_matchings/code/z_message_PAL/func_80107448.s b/asm/non_matchings/code/z_message_PAL/func_80107448.s index 11cfbe0b1f..2b614a2ff4 100644 --- a/asm/non_matchings/code/z_message_PAL/func_80107448.s +++ b/asm/non_matchings/code/z_message_PAL/func_80107448.s @@ -1,3 +1,20 @@ +.rdata +glabel D_80153D90 + # Message found!!! = %x (data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x) + .asciz " メッセージが,見つかった!!! = %x (data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n" + .balign 4 + +glabel D_80153DEC + # Message found!!! = %x (data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x) + .asciz " メッセージが,見つかった!!! = %x (data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n" + .balign 4 + +glabel D_80153E48 + # Message not found!!! = %x + .asciz " メッセージが,見つからなかった!!! = %x\n" + .balign 4 + +.text glabel func_80107448 /* B7E5E8 80107448 3C028016 */ lui $v0, %hi(gSaveContext+0x1409) # $v0, 0x8016 /* B7E5EC 8010744C 9042FA69 */ lbu $v0, %lo(gSaveContext+0x1409)($v0) diff --git a/asm/non_matchings/code/z_message_PAL/func_80107628.s b/asm/non_matchings/code/z_message_PAL/func_80107628.s index 7bec91934b..bf5ca2ddf4 100644 --- a/asm/non_matchings/code/z_message_PAL/func_80107628.s +++ b/asm/non_matchings/code/z_message_PAL/func_80107628.s @@ -1,3 +1,10 @@ +.rdata +glabel D_80153E74 + # Message found!!! = %x (data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x) + .asciz " メッセージが,見つかった!!! = %x (data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n" + .balign 4 + +.text glabel func_80107628 /* B7E7C8 80107628 27BDFFD8 */ addiu $sp, $sp, -0x28 /* B7E7CC 8010762C 3C028015 */ lui $v0, %hi(D_801538FC) # $v0, 0x8015 diff --git a/asm/non_matchings/code/z_message_PAL/func_801076CC.s b/asm/non_matchings/code/z_message_PAL/func_801076CC.s index a02a829383..3a60bb9b33 100644 --- a/asm/non_matchings/code/z_message_PAL/func_801076CC.s +++ b/asm/non_matchings/code/z_message_PAL/func_801076CC.s @@ -1,3 +1,15 @@ +.late_rodata +glabel jtbl_80154B28 + .word L80107934 + .word L801076F4 + .word L8010773C + .word L801077B4 + .word L80107804 + .word L8010787C + .word L801078CC + .word L80107918 + +.text glabel func_801076CC /* B7E86C 801076CC AFA50004 */ sw $a1, 4($sp) /* B7E870 801076D0 30A5FFFF */ andi $a1, $a1, 0xffff diff --git a/asm/non_matchings/code/z_message_PAL/func_801083F8.s b/asm/non_matchings/code/z_message_PAL/func_801083F8.s index ad1a594299..aea6870de0 100644 --- a/asm/non_matchings/code/z_message_PAL/func_801083F8.s +++ b/asm/non_matchings/code/z_message_PAL/func_801083F8.s @@ -1,3 +1,56 @@ +.rdata +glabel D_80153ED0 + # Recording Start / Recording Start / Recording Start / Recording Start -> + .asciz "録音開始 録音開始 録音開始 録音開始 -> " + .balign 4 + +glabel D_80153EFC + # Recording Playback / Recording Playback / Recording Playback / Recording Playback -> + .asciz "録音再生 録音再生 録音再生 録音再生 -> " + .balign 4 + +glabel D_80153F28 + # 8 Note Recording Start / 8 Note Recording Start / 8 Note Recording Start -> + .asciz "8音録音開始 8音録音開始 8音録音開始 -> " + .balign 4 + +glabel D_80153F54 + # 8 Note Playback / 8 Note Playback / 8 Note Playback -> + .asciz "8音再生 8音再生 8音再生 -> " + .balign 4 + +glabel D_80153F74 + # Musical Round Start / Musical Round Start / Musical Round Start / Musical Round Start -> + .asciz "輪唱開始 輪唱開始 輪唱開始 輪唱開始 -> " + .balign 4 + +glabel D_80153FA0 + # Frog Chorus / Frog Chorus -> + .asciz "カエルの合唱 カエルの合唱 -> " + .balign 4 + +glabel D_80153FC0 + # Ocarina(%d) + .asciz "オカリナ(%d) " + .balign 4 + +glabel D_80153FD0 + .asciz "000000000000 -> " + .balign 4 + +glabel D_80153FE4 + .asciz "111111111111 -> " + .balign 4 + +glabel D_80153FF8 + .asciz "222222222222 -> " + .balign 4 + +glabel D_8015400C + .asciz "msg_mode=%d\n" + .balign 4 + +.text glabel func_801083F8 /* B7F598 801083F8 27BDFFD0 */ addiu $sp, $sp, -0x30 /* B7F59C 801083FC 3C0E0001 */ lui $t6, 1 diff --git a/asm/non_matchings/code/z_message_PAL/func_801086B0.s b/asm/non_matchings/code/z_message_PAL/func_801086B0.s index 7230684c24..72173012c7 100644 --- a/asm/non_matchings/code/z_message_PAL/func_801086B0.s +++ b/asm/non_matchings/code/z_message_PAL/func_801086B0.s @@ -1,3 +1,55 @@ +.rdata +glabel D_8015401C + # Timer (%x) (%x) + .asciz "タイマー (%x) (%x)" + .balign 4 + +glabel D_80154030 + # Total wct=%x(%d) + .asciz "合計wct=%x(%d)\n" + .balign 4 + +glabel D_80154040 + # Sound (SFX) + .asciz "サウンド(SE)\n" + .balign 4 + +.late_rodata +glabel jtbl_80154B48 + .word L801087EC + .word L801095F0 + .word L801097E4 + .word L801088E8 + .word L8010887C + .word L80108984 + .word L801089B8 + .word L80108A2C + .word L80108AD4 + .word L80109724 + .word L8010977C + .word L80108B34 + .word L80108AE0 + .word L801096B4 + .word L801097E4 + .word L80109680 + .word L80108B70 + .word L80108C0C + .word L80108CB8 + .word L801094E4 + .word L80108D00 + .word L801097E4 + .word L801097E4 + .word L801097E4 + .word L801097E4 + .word L80109510 + .word L80109528 + .word L8010958C + .word L801097E4 + .word L801097E4 + .word L801097E4 + .word L801088CC + +.text glabel func_801086B0 /* B7F850 801086B0 27BDFEC8 */ addiu $sp, $sp, -0x138 /* B7F854 801086B4 AFB7003C */ sw $s7, 0x3c($sp) diff --git a/asm/non_matchings/code/z_message_PAL/func_80109968.s b/asm/non_matchings/code/z_message_PAL/func_80109968.s index 8badcc2c9a..4d07f47fab 100644 --- a/asm/non_matchings/code/z_message_PAL/func_80109968.s +++ b/asm/non_matchings/code/z_message_PAL/func_80109968.s @@ -1,3 +1,23 @@ +.rdata +glabel D_80154054 + .asciz "../z_message_PAL.c" + .balign 4 + +glabel D_80154068 + # Item 32-0 + .asciz "アイテム32-0\n" + .balign 4 + +glabel D_80154078 + .asciz "../z_message_PAL.c" + .balign 4 + +glabel D_8015408C + # Item 24=%d (%d) {%d} + .asciz "アイテム24=%d (%d) {%d}\n" + .balign 4 + +.text glabel func_80109968 /* B80B08 80109968 27BDFFD0 */ addiu $sp, $sp, -0x30 /* B80B0C 8010996C AFB00020 */ sw $s0, 0x20($sp) diff --git a/asm/non_matchings/code/z_message_PAL/func_80109B3C.s b/asm/non_matchings/code/z_message_PAL/func_80109B3C.s index eeb25c3c11..1fc8797295 100644 --- a/asm/non_matchings/code/z_message_PAL/func_80109B3C.s +++ b/asm/non_matchings/code/z_message_PAL/func_80109B3C.s @@ -1,3 +1,101 @@ +.rdata +glabel D_801540A8 + .asciz "JJ=%d\n" + .balign 4 + +glabel D_801540B4 + .asciz "NZ_NEXTMSG=%x, %x, %x\n" + .balign 4 + +glabel D_801540CC + # Name = + .asciz "\n名前 = " + .balign 4 + +glabel D_801540D8 + .asciz "%x " + .balign 4 + +glabel D_801540DC + # EVENT TIMER = + .asciz "\nEVENTタイマー = " + .balign 4 + +glabel D_801540F4 + # Horseback Archery Score = %d + .asciz "\n流鏑馬スコア = %d\n" + .balign 4 + +glabel D_8015410C + # Total Gold Skulltula Tokens = %d + .asciz "\n金スタ合計数 = %d" + .balign 4 + +glabel D_80154120 + .asciz "%x(%x) " + .balign 4 + +glabel D_80154128 + # Fishing Pond Fish Size = + .asciz "\n釣り堀魚サイズ = " + .balign 4 + +glabel D_8015413C + .asciz "%x(%x) " + .balign 4 + +glabel D_80154144 + # Ranking=%d + .asciz "ランキング=%d\n" + .balign 4 + +glabel D_80154154 + .asciz "HI_SCORE( kanfont->mbuff.nes_mes_buf[message->rdp] & 0xff000000 ) = %x\n" + .balign 4 + +glabel D_8015419C + .asciz "score=%d\n" + .balign 4 + +glabel D_801541A8 + # Zelda Time = + .asciz "\nゼルダ時間 = " + .balign 4 + +glabel D_801541B8 + .asciz "ITEM_NO=(%d) (%d)\n" + .balign 4 + +glabel D_801541CC + .asciz "../z_message_PAL.c" + .balign 4 + +glabel D_801541E0 + .asciz "../z_message_PAL.c" + .balign 4 + +glabel D_801541F4 + .asciz "NZ_TIMER_END (key_off_flag=%d)\n" + .balign 4 + +glabel D_80154214 + .asciz "NZ_BGM (key_off_flag=%d)\n" + .balign 4 + +.late_rodata +glabel D_80154BC8 + .float 0.00359999993816 + +glabel jtbl_80154BCC + .word L8010A6FC + .word L8010A6FC + .word L8010A6FC + .word L8010A850 + .word L8010A850 + .word L8010B06C + .word L8010A850 + +.text glabel func_80109B3C /* B80CDC 80109B3C 27BDFF68 */ addiu $sp, $sp, -0x98 /* B80CE0 80109B40 3C010001 */ lui $at, 1 diff --git a/asm/non_matchings/code/z_message_PAL/func_8010B0C0.s b/asm/non_matchings/code/z_message_PAL/func_8010B0C0.s index acba4fac51..2305efffc3 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010B0C0.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010B0C0.s @@ -1,3 +1,42 @@ +.rdata +glabel D_80154230 + .asciz "\x1b[33m" + .balign 4 + +glabel D_80154238 + .asciz "???????????????? z_message.c ??????????????????\n" + .balign 4 + +glabel D_80154290 + .asciz "\x1b[m" + .balign 4 + +glabel D_80154294 + .asciz "../z_message_PAL.c" + .balign 4 + +glabel D_801542A8 + .asciz "../z_message_PAL.c" + .balign 4 + +glabel D_801542BC + .asciz "../z_message_PAL.c" + .balign 4 + +glabel D_801542D0 + .asciz "../z_message_PAL.c" + .balign 4 + +glabel D_801542E4 + # Text Box Type=%d + .asciz "吹き出し種類=%d\n" + .balign 4 + +glabel D_801542F8 + .asciz "../z_message_PAL.c" + .balign 4 + +.text glabel func_8010B0C0 /* B82260 8010B0C0 27BDFFB8 */ addiu $sp, $sp, -0x48 /* B82264 8010B0C4 3C0F0001 */ lui $t7, 1 diff --git a/asm/non_matchings/code/z_message_PAL/func_8010B680.s b/asm/non_matchings/code/z_message_PAL/func_8010B680.s index 1432eb0c40..5662249cf7 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010B680.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010B680.s @@ -1,3 +1,18 @@ +.rdata +glabel D_8015430C + .asciz "\x1b[34m" + .balign 4 + +glabel D_80154314 + # Message=%x(%d) + .asciz "めっせーじ=%x(%d)\n" + .balign 4 + +glabel D_80154328 + .asciz "\x1b[m" + .balign 4 + +.text glabel func_8010B680 /* B82820 8010B680 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B82824 8010B684 AFA40020 */ sw $a0, 0x20($sp) diff --git a/asm/non_matchings/code/z_message_PAL/func_8010B720.s b/asm/non_matchings/code/z_message_PAL/func_8010B720.s index a34976fb74..50b85274a4 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010B720.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010B720.s @@ -1,3 +1,18 @@ +.rdata +glabel D_8015432C + .asciz "\x1b[32m" + .balign 4 + +glabel D_80154334 + # Message=%x message->msg_data + .asciz "めっせーじ=%x message->msg_data\n" + .balign 4 + +glabel D_80154358 + .asciz "\x1b[m" + .balign 4 + +.text glabel func_8010B720 /* B828C0 8010B720 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B828C4 8010B724 AFA40020 */ sw $a0, 0x20($sp) diff --git a/asm/non_matchings/code/z_message_PAL/func_8010B820.s b/asm/non_matchings/code/z_message_PAL/func_8010B820.s index a89b50224e..3c4f03dd7d 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010B820.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010B820.s @@ -1,3 +1,53 @@ +.rdata +glabel D_8015435C + .asciz "\x1b[32m" + .balign 4 + +glabel D_80154364 + .asciz "ocarina_check_bit[%d]=%x\n" + .balign 4 + +glabel D_80154380 + .asciz "ocarina_bit = %x\n" + .balign 4 + +glabel D_80154394 + .asciz "\x1b[m" + .balign 4 + +glabel D_80154398 + # [31m☆☆☆☆☆ Ocarina Number=%d(%d) ☆☆☆☆☆ + .asciz "\x1b[31m☆☆☆☆☆ オカリナ番号=%d(%d) ☆☆☆☆☆\n\x1b[m" + .balign 4 + +glabel D_801543CC + .asciz "ocarina_set 000000000000000000 = %d\n" + .balign 4 + +glabel D_801543F4 + .asciz "222222222\n" + .balign 4 + +glabel D_80154400 + .asciz "333333333\n" + .balign 4 + +glabel D_8015440C + # Ocarina Mode = %d (%x) + .asciz "オカリナモード = %d (%x)\n" + .balign 4 + +glabel D_80154428 + # Music Performance Start + .asciz "演奏開始\n" + .balign 4 + +glabel D_80154434 + # ?????Recording Playback / Recording Playback / Recording Playback / Recording Playback -> + .asciz "?????録音再生 録音再生 録音再生 録音再生 -> " + .balign 4 + +.text glabel func_8010B820 /* B829C0 8010B820 27BDFFA8 */ addiu $sp, $sp, -0x58 /* B829C4 8010B824 AFA40058 */ sw $a0, 0x58($sp) diff --git a/asm/non_matchings/code/z_message_PAL/func_8010C39C.s b/asm/non_matchings/code/z_message_PAL/func_8010C39C.s index cc5e886066..6e0277d1b1 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010C39C.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010C39C.s @@ -1,3 +1,297 @@ +.rdata +glabel D_80154464 + # On Stage Performance + .asciz "台上演奏\n" + .balign 4 + +glabel D_80154470 + .asciz "Na_StartOcarinaSinglePlayCheck2( message->ocarina_no );\n" + .balign 4 + +glabel D_801544AC + # Performance Check=%d + .asciz "演奏チェック=%d\n" + .balign 4 + +glabel D_801544C0 + # locate=%d note_pt=%d + .asciz "locate=%d onpu_pt=%d\n" + .balign 4 + +glabel D_801544D8 + # Ocarina_Frog Correct Example Performance=%x + .asciz "Ocarina_Flog 正解模範演奏=%x\n" + .balign 4 + +glabel D_801544F8 + # Ocarina_Frog Correct Example Performance=%x + .asciz "Ocarina_Flog 正解模範演奏=%x\n" + .balign 4 + +glabel D_80154518 + # Ocarina_Free Correct Example Performance=%x + .asciz "Ocarina_Free 正解模範演奏=%x\n" + .balign 4 + +glabel D_80154538 + # Correct Example Performance=%x + .asciz "正解模範演奏=%x\n" + .balign 4 + +glabel D_8015454C + # kokokokokoko + .asciz "ここここここ\n" + .balign 4 + +glabel D_8015455C + # Cancel + .asciz "キャンセル\n" + .balign 4 + +glabel D_80154568 + .asciz "\x1b[32m" + .balign 4 + +glabel D_80154570 + .asciz "Na_StopOcarinaMode();\n" + .balign 4 + +glabel D_80154588 + .asciz "Na_StopOcarinaMode();\n" + .balign 4 + +glabel D_801545A0 + .asciz "Na_StopOcarinaMode();\n" + .balign 4 + +glabel D_801545B8 + .asciz "\x1b[m" + .balign 4 + +glabel D_801545BC + # ocarina_no=%d Song Chosen=%d + .asciz "ocarina_no=%d 選曲=%d\n" + .balign 4 + +glabel D_801545D4 + # Example Performance=%x + .asciz "模範演奏=%x\n" + .balign 4 + +glabel D_801545E4 + .asciz "\x1b[33m" + .balign 4 + +glabel D_801545EC + .asciz "☆☆☆ocarina=%d message->ocarina_no=%d " + .balign 4 + +glabel D_80154618 + .asciz "\x1b[33m" + .balign 4 + +glabel D_80154620 + .asciz "Ocarina_PC_Wind=%d(%d) ☆☆☆ " + .balign 4 + +glabel D_80154644 + .asciz "\x1b[32m" + .balign 4 + +glabel D_8015464C + .asciz "Ocarina_C_Wind=%d(%d) ☆☆☆ " + .balign 4 + +glabel D_8015466C + .asciz "\x1b[m" + .balign 4 + +glabel D_80154670 + .asciz "→ OCARINA_MODE=%d\n" + .balign 4 + +glabel D_80154688 + # note_buff[%d]=%x + .asciz "onpu_buff[%d]=%x\n" + .balign 4 + +glabel D_8015469C + .asciz "M_OCARINA20 : ocarina_no=%x status=%x\n" + .balign 4 + +glabel D_801546C8 + .asciz "\x1b[33m" + .balign 4 + +glabel D_801546D0 + # z_message.c Melody Acquired=%d + .asciz "z_message.c 取得メロディ=%d\n" + .balign 4 + +glabel D_801546F0 + .asciz "\x1b[m" + .balign 4 + +glabel D_801546F4 + # Scarecrow Recording Initialization + .asciz "案山子録音 初期化\n" + .balign 4 + +glabel D_80154708 + # note_pt=%d, locate=%d + .asciz "\nonpu_pt=%d, locate=%d" + .balign 4 + +glabel D_80154720 + # Button Entered【%d】=%d + .asciz " 入力ボタン【%d】=%d" + .balign 4 + +glabel D_80154738 + # Recording complete!!!!!!!!! message->info->status=%d + .asciz "録音終了!!!!!!!!! message->info->status=%d \n" + .balign 4 + +glabel D_80154770 + .asciz "aaaaaaaaaaaaaa\n" + .balign 4 + +glabel D_80154780 + # Recording complete!!!!!!!!!Recording Complete + .asciz "録音終了!!!!!!!!!録音終了\n" + .balign 4 + +glabel D_801547A4 + .asciz "\x1b[33m" + .balign 4 + +glabel D_801547AC + .asciz "\n====================================================================\n" + .balign 4 + +glabel D_801547F4 + .asciz "%d, " + .balign 4 + +glabel D_801547FC + .asciz "\x1b[m" + .balign 4 + +glabel D_80154800 + .asciz "\n====================================================================\n" + .balign 4 + +glabel D_80154848 + .asciz "status=%d (%d)\n" + .balign 4 + +glabel D_80154858 + .asciz "bbbbbbbbbbb\n" + .balign 4 + +glabel D_80154868 + # 8 Note Recording OK! + .asciz "8音録音OK!\n" + .balign 4 + +glabel D_80154878 + .asciz "\x1b[33m" + .balign 4 + +glabel D_80154880 + .asciz "\n====================================================================\n" + .balign 4 + +glabel D_801548C8 + .asciz "%d, " + .balign 4 + +glabel D_801548D0 + .asciz "\x1b[m" + .balign 4 + +glabel D_801548D4 + .asciz "\n====================================================================\n" + .balign 4 + +glabel D_8015491C + # Played an existing song!!! + .asciz "すでに存在する曲吹いた!!! \n" + .balign 4 + +glabel D_8015493C + .asciz "cccccccccccc\n" + .balign 4 + +glabel D_8015494C + # Musical round failed!!!!!!!!! + .asciz "輪唱失敗!!!!!!!!!\n" + .balign 4 + +glabel D_80154968 + # Musical round succeeded!!!!!!!!! + .asciz "輪唱成功!!!!!!!!!\n" + .balign 4 + +.late_rodata +glabel jtbl_80154BE8 + .word L8010C4F4 + .word L8010C4F4 + .word L8010C4F4 + .word L8010C4F4 + .word L8010C4FC + .word L8010C564 + .word L8010C578 + .word L8010C564 + .word L8010C5AC + .word L8010C5AC + .word L8010C5AC + .word L8010C750 + .word L8010CBFC + .word L8010D500 + .word L8010D50C + .word L8010D594 + .word L8010D65C + .word L8010D768 + .word L8010DC10 + .word L8010D924 + .word L8010D968 + .word L8010D9A0 + .word L8010D9D8 + .word L8010D824 + .word L8010DC10 + .word L8010DD08 + .word L8010DD1C + .word L8010CBFC + .word L8010D500 + .word L8010D594 + .word L8010DEAC + .word L8010EC60 + .word L8010DED8 + .word L8010DF4C + .word L8010E1D8 + .word L8010E334 + .word L8010E364 + .word L8010E544 + .word L8010CBFC + .word L8010E1D8 + .word L8010E580 + .word L8010E5F0 + .word L8010E730 + .word L8010E5F0 + .word L8010E730 + .word L8010E79C + .word L8010E904 + .word L8010EA20 + .word L8010EA70 + .word L8010EAE0 + .word L8010EB44 + .word L8010C578 + .word L8010EB4C + .word L8010EC58 + .word L8010EC58 + +.text glabel func_8010C39C /* B8353C 8010C39C 27BDFEA8 */ addiu $sp, $sp, -0x158 /* B83540 8010C3A0 AFBF003C */ sw $ra, 0x3c($sp) diff --git a/asm/non_matchings/code/z_message_PAL/func_8010F2CC.s b/asm/non_matchings/code/z_message_PAL/func_8010F2CC.s index cf8d0f9767..55e1d656c9 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010F2CC.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010F2CC.s @@ -1,3 +1,13 @@ +.rdata +glabel D_80154984 + .asciz "../z_message_PAL.c" + .balign 4 + +glabel D_80154998 + .asciz "../z_message_PAL.c" + .balign 4 + +.text glabel func_8010F2CC /* B8646C 8010F2CC 27BDFF98 */ addiu $sp, $sp, -0x68 /* B86470 8010F2D0 AFBF0014 */ sw $ra, 0x14($sp) @@ -20,13 +30,13 @@ glabel func_8010F2CC /* B864B4 8010F314 3C018015 */ lui $at, %hi(D_80153CFC) # $at, 0x8015 /* B864B8 8010F318 A4233CFC */ sh $v1, %lo(D_80153CFC)($at) .L8010F31C: -/* B864BC 8010F31C 3C038015 */ lui $v1, %hi(D_8014FFFF) # $v1, 0x8015 +/* B864BC 8010F31C 3C038015 */ lui $v1, %hi(D_80153CFC) # $v1, 0x8015 /* B864C0 8010F320 84633CFC */ lh $v1, %lo(D_80153CFC)($v1) /* B864C4 8010F324 3C018015 */ lui $at, %hi(D_80153CFC) # $at, 0x8015 /* B864C8 8010F328 3C04E700 */ lui $a0, 0xe700 /* B864CC 8010F32C 10600050 */ beqz $v1, .L8010F470 /* B864D0 8010F330 3C06E300 */ lui $a2, (0xE3000A01 >> 16) # lui $a2, 0xe300 -/* B864D4 8010F334 2463FFFF */ addiu $v1, %lo(D_8014FFFF) # addiu $v1, $v1, -1 +/* B864D4 8010F334 2463FFFF */ addiu $v1, $v1, -1 /* B864D8 8010F338 00031C00 */ sll $v1, $v1, 0x10 /* B864DC 8010F33C 00031C03 */ sra $v1, $v1, 0x10 /* B864E0 8010F340 A4233CFC */ sh $v1, %lo(D_80153CFC)($at) diff --git a/asm/non_matchings/code/z_message_PAL/func_8010F494.s b/asm/non_matchings/code/z_message_PAL/func_8010F494.s index d1c45f3220..df978ac969 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010F494.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010F494.s @@ -1,3 +1,25 @@ +.rdata +glabel D_801549AC + .asciz "%s" + .balign 4 + +glabel D_801549B0 + .asciz "MESSAGE" + .balign 4 + +glabel D_801549B8 + .asciz "%s" + .balign 4 + +glabel D_801549BC + .asciz "=" + .balign 4 + +glabel D_801549C0 + .asciz "%x" + .balign 4 + +.text glabel func_8010F494 /* B86634 8010F494 27BDFFA0 */ addiu $sp, $sp, -0x60 /* B86638 8010F498 AFB00020 */ sw $s0, 0x20($sp) diff --git a/asm/non_matchings/code/z_message_PAL/func_8010F58C.s b/asm/non_matchings/code/z_message_PAL/func_8010F58C.s index 314036e7d5..cb5f7188d7 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010F58C.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010F58C.s @@ -1,3 +1,13 @@ +.rdata +glabel D_801549C4 + .asciz "../z_message_PAL.c" + .balign 4 + +glabel D_801549D8 + .asciz "../z_message_PAL.c" + .balign 4 + +.text glabel func_8010F58C /* B8672C 8010F58C 27BDFFA8 */ addiu $sp, $sp, -0x58 /* B86730 8010F590 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code/z_message_PAL/func_8010F6F0.s b/asm/non_matchings/code/z_message_PAL/func_8010F6F0.s index 50a0cb1395..cc546caae3 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010F6F0.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010F6F0.s @@ -1,3 +1,69 @@ +.rdata +glabel D_801549EC + .asciz "msgno=%d\n" + .balign 4 + +glabel D_801549F8 + # Message found!!! = %x + .asciz " メッセージが,見つかった!!! = %x\n" + .balign 4 + +glabel D_80154A20 + .asciz "dxpos=%d dypos=%d dypos1 dypos2=%d\n" + .balign 4 + +glabel D_80154A48 + .asciz "message->msg_disp_type=%x\n" + .balign 4 + +glabel D_80154A64 + .asciz "OCARINA_MODE=%d -> " + .balign 4 + +glabel D_80154A78 + .asciz "InRaceSeq=%d(%d) OCARINA_MODE=%d --> " + .balign 4 + +glabel D_80154AA0 + .asciz "OCARINA_MODE=%d\n" + .balign 4 + +glabel D_80154AB4 + .asciz "select=%d\n" + .balign 4 + +glabel D_80154AC0 + .asciz "\x1b[32m" + .balign 4 + +glabel D_80154AC8 + .asciz "day_time=%x active_camera=%d " + .balign 4 + +glabel D_80154AE8 + .asciz "=== day_time=%x " + .balign 4 + +glabel D_80154AFC + .asciz "\x1b[m" + .balign 4 + +glabel D_80154B00 + .asciz "OCARINA_MODE=%d chk_ocarina_no=%d\n" + .balign 4 + +.late_rodata +glabel jtbl_80154CC4 + .word L8010F8F8 + .word L8010FCE0 + .word L8010FCF0 + .word L8010FD24 + .word L8010FD80 + .word L8010FDB0 + .word L8010FE10 + .word L8010FE58 + +.text glabel func_8010F6F0 /* B86890 8010F6F0 27BDFFA8 */ addiu $sp, $sp, -0x58 /* B86894 8010F6F4 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/data/code_80110450.rodata.s b/data/code_80110450.rodata.s deleted file mode 100644 index 53aecbf2ff..0000000000 --- a/data/code_80110450.rodata.s +++ /dev/null @@ -1,36 +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 .rodata - -.balign 16 - -glabel jtbl_80154CF0 - .word L80110520 - .word L80110960 - .word L80110748 - .word L80110960 - .word L80110960 - .word L80110960 - .word L80110960 - .word L80110960 - .word L80110960 - .word L80110960 - .word L80110960 - .word L80110960 - .word L80110960 - .word L80110960 - .word L80110960 - .word L80110960 - .word L80110960 - .word L80110960 - .word L80110960 - .word L8011079C - .word L801107D8 - .word L801108A4 - .word L801108E8 - .word L8011092C diff --git a/data/z_message_PAL.rodata.s b/data/z_message_PAL.rodata.s index 5e5740e9ac..e03e561999 100644 --- a/data/z_message_PAL.rodata.s +++ b/data/z_message_PAL.rodata.s @@ -3,788 +3,239 @@ # 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 +.set gp=64 # allow use of 64-bit general purposee registers .section .rodata .balign 16 glabel D_8014B2F0 - .incbin "baserom.z64", 0xBC2490, 0x4 + .word 0x00000000 glabel D_8014B2F4 - .incbin "baserom.z64", 0xBC2494, 0x4 + .word 0x00000000 glabel D_8014B2F8 - .incbin "baserom.z64", 0xBC2498, 0x4 + .word 0x00000000 glabel D_8014B2FC - .incbin "baserom.z64", 0xBC249C, 0x4 + .word 0x00000000 glabel D_8014B300 - .incbin "baserom.z64", 0xBC24A0, 0x4 + .word 0x00000000 glabel D_8014B304 - .incbin "baserom.z64", 0xBC24A4, 0x4 + .word 0x00000000 glabel D_8014B308 - .incbin "baserom.z64", 0xBC24A8, 0x8 + .word 0x00000000, 0x00000000 glabel D_8014B310 - .incbin "baserom.z64", 0xBC24B0, 0x4 + .word 0x00FF0000 glabel D_8014B314 - .incbin "baserom.z64", 0xBC24B4, 0x4 + .word 0x00000000 glabel D_8014B318 - .incbin "baserom.z64", 0xBC24B8, 0x4 + .word 0x00000000 glabel D_8014B31C - .incbin "baserom.z64", 0xBC24BC, 0x4 + .word 0x00000000 +# english message entry table glabel D_8014B320 .incbin "baserom.z64", 0xBC24C0, 0x4228 +# german message entry table glabel D_8014F548 - .incbin "baserom.z64", 0xBC66E8, 0xAB7 - -glabel D_8014FFFF - .incbin "baserom.z64", 0xBC719F, 0x1659 + .incbin "baserom.z64", 0xBC66E8, 0x2110 +# french message entry table glabel D_80151658 - .incbin "baserom.z64", 0xBC87F8, 0x1D7C - -glabel D_801533D4 - .incbin "baserom.z64", 0xBCA574, 0x394 + .incbin "baserom.z64", 0xBC87F8, 0x2110 +# credits (staff) message entry table glabel D_80153768 .incbin "baserom.z64", 0xBCA908, 0x188 glabel D_801538F0 - .incbin "baserom.z64", 0xBCAA90, 0x4 + .word D_8014B320 glabel D_801538F4 - .incbin "baserom.z64", 0xBCAA94, 0x4 + .word D_8014F548 glabel D_801538F8 - .incbin "baserom.z64", 0xBCAA98, 0x4 + .word D_80151658 glabel D_801538FC - .incbin "baserom.z64", 0xBCAA9C, 0x4 + .word D_80153768 glabel D_80153900 - .incbin "baserom.z64", 0xBCAAA0, 0x30 + .word 0x00FF00FF, 0x00FF0032, 0x00140000, 0x00FF003C, 0x000000FF, 0x00FF00FF, 0x00FF00FF, 0x00FF00FF, 0x00FF00FF, 0x00FF00FF, 0x00FF00FF, 0x00FF00FF glabel D_80153930 - .incbin "baserom.z64", 0xBCAAD0, 0x18 + .word 0x00000000, 0x000000DC, 0x00960000, 0x00000000, 0x00000000, 0x00000000 glabel D_80153948 - .incbin "baserom.z64", 0xBCAAE8, 0x3 + .byte 0x00, 0x01, 0x00 glabel D_8015394B - .incbin "baserom.z64", 0xBCAAEB, 0x1 + .byte 0x02 glabel D_8015394C - .incbin "baserom.z64", 0xBCAAEC, 0xC + .word 0x00000000, 0x00000000, 0x00000000 glabel D_80153958 - .incbin "baserom.z64", 0xBCAAF8, 0x2 + .hword 0x0000 glabel D_8015395A - .incbin "baserom.z64", 0xBCAAFA, 0x2 + .hword 0x0000 glabel D_8015395C - .incbin "baserom.z64", 0xBCAAFC, 0x2 + .hword 0x0000 glabel D_8015395E - .incbin "baserom.z64", 0xBCAAFE, 0x2 + .hword 0x0000 glabel D_80153960 - .incbin "baserom.z64", 0xBCAB00, 0x2 + .hword 0x0000 glabel D_80153962 - .incbin "baserom.z64", 0xBCAB02, 0x2 + .hword 0x0000 glabel D_80153964 - .incbin "baserom.z64", 0xBCAB04, 0x2 + .hword 0x0000 glabel D_80153966 - .incbin "baserom.z64", 0xBCAB06, 0x2 + .hword 0x0000 glabel D_80153968 - .incbin "baserom.z64", 0xBCAB08, 0x4 + .word 0x00000000 glabel D_8015396C - .incbin "baserom.z64", 0xBCAB0C, 0x14 + .word 0x00000001, 0x00020003, 0x00040005, 0x00080007, 0x00060009 glabel D_80153980 - .incbin "baserom.z64", 0xBCAB20, 0x4 + .word 0x000A000B glabel D_80153984 - .incbin "baserom.z64", 0xBCAB24, 0x4 + .word 0x00000000 glabel D_80153988 - .incbin "baserom.z64", 0xBCAB28, 0x20 + .word 0x3F99999A, 0x3FC00000, 0x3FE66666, 0x40000000, 0x40066666, 0x400CCCCD, 0x40066666, 0x40000000 glabel D_801539A8 - .incbin "baserom.z64", 0xBCAB48, 0x20 + .word 0x3F19999A, 0x3F400000, 0x3F666666, 0x3F800000, 0x3F866666, 0x3F8CCCCD, 0x3F866666, 0x3F800000 glabel D_801539C8 - .incbin "baserom.z64", 0xBCAB68, 0xC + .word 0x000000C8, 0x00500032, 0x00FF0082 glabel D_801539D4 - .incbin "baserom.z64", 0xBCAB74, 0xC + .word 0x00000000, 0x00000000, 0x00FF0082 glabel D_801539E0 - .incbin "baserom.z64", 0xBCAB80, 0x4 + .word 0x00000000 glabel D_801539E4 - .incbin "baserom.z64", 0xBCAB84, 0x4 + .word 0x00C80000 glabel D_801539E8 - .incbin "baserom.z64", 0xBCAB88, 0x4 + .word 0x00500000 glabel D_801539EC - .incbin "baserom.z64", 0xBCAB8C, 0x4 + .word 0x000C0000 glabel D_801539F0 - .incbin "baserom.z64", 0xBCAB90, 0x4 + .word 0x00000000 glabel D_801539F4 - .incbin "baserom.z64", 0xBCAB94, 0x4 + .word 0x00000000 glabel D_801539F8 - .incbin "baserom.z64", 0xBCAB98, 0x4 + .word 0x00000000 glabel D_801539FC .incbin "baserom.z64", 0xBCAB9C, 0x244 glabel D_80153C40 - .incbin "baserom.z64", 0xBCADE0, 0x8 + .word 0x004A004A, 0x004A0000 glabel D_80153C48 - .incbin "baserom.z64", 0xBCADE8, 0x8 + .word 0x00480048, 0x00480000 glabel D_80153C50 - .incbin "baserom.z64", 0xBCADF0, 0x2 + .hword 0x0000 glabel D_80153C52 - .incbin "baserom.z64", 0xBCADF2, 0x2 + .hword 0x0001 glabel D_80153C54 - .incbin "baserom.z64", 0xBCADF4, 0x2 + .hword 0x0003 glabel D_80153C56 - .incbin "baserom.z64", 0xBCADF6, 0x2 + .hword 0x0002 glabel D_80153C58 - .incbin "baserom.z64", 0xBCADF8, 0x10 + .word 0x00010002, 0x00040008, 0x00100020, 0x01000080 glabel D_80153C68 - .incbin "baserom.z64", 0xBCAE08, 0x10 + .word 0x00400200, 0x04000800, 0x10000000, 0x01990198 glabel D_80153C78 - .incbin "baserom.z64", 0xBCAE18, 0x1C + .word 0x018A017E, 0x018A018B, 0x01CB0000, 0x00000000, 0x00000000, 0x00010000, 0x00000000 glabel D_80153C94 - .incbin "baserom.z64", 0xBCAE34, 0x14 + .word 0x02002940, 0x02002A40, 0x02002B40, 0x02002C40, 0x02002D40 glabel D_80153CA8 - .incbin "baserom.z64", 0xBCAE48, 0xC + .word 0x005000FF, 0x00960064, 0x00FF00C8 glabel D_80153CB4 - .incbin "baserom.z64", 0xBCAE54, 0xC + .word 0x000A000A, 0x000A0032, 0x00FF0032 glabel D_80153CC0 - .incbin "baserom.z64", 0xBCAE60, 0xC + .word 0x00FF00FF, 0x003200FF, 0x00FF00B4 glabel D_80153CCC - .incbin "baserom.z64", 0xBCAE6C, 0xC + .word 0x000A000A, 0x000A006E, 0x006E0032 glabel D_80153CD8 - .incbin "baserom.z64", 0xBCAE78, 0x4 + .word 0x000C0000 glabel D_80153CDC - .incbin "baserom.z64", 0xBCAE7C, 0x4 + .word 0x00010000 glabel D_80153CE0 - .incbin "baserom.z64", 0xBCAE80, 0x18 + .word 0x00340033, 0x00350036, 0x00370025, 0x00440045, 0x00460047, 0x00480049 glabel D_80153CF8 - .incbin "baserom.z64", 0xBCAE98, 0x4 + .word 0x00000000 glabel D_80153CFC - .incbin "baserom.z64", 0xBCAE9C, 0x4 + .word 0x00000000 glabel D_80153D00 - .incbin "baserom.z64", 0xBCAEA0, 0xC + .word 0x00220022, 0x00220022, 0x00220022 glabel D_80153D0C - .incbin "baserom.z64", 0xBCAEAC, 0xC + .word 0x008E008E, 0x008E008E, 0x00AE008E glabel D_80153D18 - .incbin "baserom.z64", 0xBCAEB8, 0xC + .word 0x00260026, 0x00260026, 0x00AE0026 glabel D_80153D24 - .incbin "baserom.z64", 0xBCAEC4, 0xC + .word 0x005A005A, 0x005A005A, 0x00AE005A glabel D_80153D30 - .incbin "baserom.z64", 0xBCAED0, 0x44 + .word 0x003B003B, 0x003B003B, 0x0022003B, 0x04000400, 0x02000000, 0x10380008, 0x200A088B, 0x00070009, 0x000A107E, 0x20082007, 0x00150016, 0x00170003, 0x0000270B, 0x00C8012C, 0x012DFFDA, 0x00140016, 0x00140016 glabel D_80153D74 - .incbin "baserom.z64", 0xBCAF14, 0x4 + .word 0x00000000 glabel D_80153D78 - .incbin "baserom.z64", 0xBCAF18, 0x8 + .word 0x00000000 + .balign 16 glabel D_80153D80 - .incbin "baserom.z64", 0xBCAF20, 0x10 - -glabel D_80153D90 - .incbin "baserom.z64", 0xBCAF30, 0x5C - -glabel D_80153DEC - .incbin "baserom.z64", 0xBCAF8C, 0x5C - -glabel D_80153E48 - .incbin "baserom.z64", 0xBCAFE8, 0x2C - -glabel D_80153E74 - .incbin "baserom.z64", 0xBCB014, 0x5C - -glabel D_80153ED0 - .incbin "baserom.z64", 0xBCB070, 0x2C - -glabel D_80153EFC - .incbin "baserom.z64", 0xBCB09C, 0x2C - -glabel D_80153F28 - .incbin "baserom.z64", 0xBCB0C8, 0x2C - -glabel D_80153F54 - .incbin "baserom.z64", 0xBCB0F4, 0x20 - -glabel D_80153F74 - .incbin "baserom.z64", 0xBCB114, 0x2C - -glabel D_80153FA0 - .incbin "baserom.z64", 0xBCB140, 0x20 - -glabel D_80153FC0 - .incbin "baserom.z64", 0xBCB160, 0x10 - -glabel D_80153FD0 - .incbin "baserom.z64", 0xBCB170, 0x14 - -glabel D_80153FE4 - .incbin "baserom.z64", 0xBCB184, 0x14 - -glabel D_80153FF8 - .incbin "baserom.z64", 0xBCB198, 0x14 - -glabel D_8015400C - .incbin "baserom.z64", 0xBCB1AC, 0x10 - -glabel D_8015401C - .incbin "baserom.z64", 0xBCB1BC, 0x14 - -glabel D_80154030 - .incbin "baserom.z64", 0xBCB1D0, 0x10 - -glabel D_80154040 - .incbin "baserom.z64", 0xBCB1E0, 0x14 - -glabel D_80154054 - .incbin "baserom.z64", 0xBCB1F4, 0x14 - -glabel D_80154068 - .incbin "baserom.z64", 0xBCB208, 0x10 - -glabel D_80154078 - .incbin "baserom.z64", 0xBCB218, 0x14 - -glabel D_8015408C - .incbin "baserom.z64", 0xBCB22C, 0x1C - -glabel D_801540A8 - .incbin "baserom.z64", 0xBCB248, 0xC - -glabel D_801540B4 - .incbin "baserom.z64", 0xBCB254, 0x18 - -glabel D_801540CC - .incbin "baserom.z64", 0xBCB26C, 0xC - -glabel D_801540D8 - .incbin "baserom.z64", 0xBCB278, 0x4 - -glabel D_801540DC - .incbin "baserom.z64", 0xBCB27C, 0x18 - -glabel D_801540F4 - .incbin "baserom.z64", 0xBCB294, 0x18 - -glabel D_8015410C - .incbin "baserom.z64", 0xBCB2AC, 0x14 - -glabel D_80154120 - .incbin "baserom.z64", 0xBCB2C0, 0x8 - -glabel D_80154128 - .incbin "baserom.z64", 0xBCB2C8, 0x14 - -glabel D_8015413C - .incbin "baserom.z64", 0xBCB2DC, 0x8 - -glabel D_80154144 - .incbin "baserom.z64", 0xBCB2E4, 0x10 - -glabel D_80154154 - .incbin "baserom.z64", 0xBCB2F4, 0x48 - -glabel D_8015419C - .incbin "baserom.z64", 0xBCB33C, 0xC - -glabel D_801541A8 - .incbin "baserom.z64", 0xBCB348, 0x10 - -glabel D_801541B8 - .incbin "baserom.z64", 0xBCB358, 0x14 - -glabel D_801541CC - .incbin "baserom.z64", 0xBCB36C, 0x14 - -glabel D_801541E0 - .incbin "baserom.z64", 0xBCB380, 0x14 - -glabel D_801541F4 - .incbin "baserom.z64", 0xBCB394, 0x20 - -glabel D_80154214 - .incbin "baserom.z64", 0xBCB3B4, 0x1C - -glabel D_80154230 - .incbin "baserom.z64", 0xBCB3D0, 0x8 - -glabel D_80154238 - .incbin "baserom.z64", 0xBCB3D8, 0x58 - -glabel D_80154290 - .incbin "baserom.z64", 0xBCB430, 0x4 - -glabel D_80154294 - .incbin "baserom.z64", 0xBCB434, 0x14 - -glabel D_801542A8 - .incbin "baserom.z64", 0xBCB448, 0x14 - -glabel D_801542BC - .incbin "baserom.z64", 0xBCB45C, 0x14 - -glabel D_801542D0 - .incbin "baserom.z64", 0xBCB470, 0x14 - -glabel D_801542E4 - .incbin "baserom.z64", 0xBCB484, 0x14 - -glabel D_801542F8 - .incbin "baserom.z64", 0xBCB498, 0x14 - -glabel D_8015430C - .incbin "baserom.z64", 0xBCB4AC, 0x8 - -glabel D_80154314 - .incbin "baserom.z64", 0xBCB4B4, 0x14 - -glabel D_80154328 - .incbin "baserom.z64", 0xBCB4C8, 0x4 - -glabel D_8015432C - .incbin "baserom.z64", 0xBCB4CC, 0x8 - -glabel D_80154334 - .incbin "baserom.z64", 0xBCB4D4, 0x24 - -glabel D_80154358 - .incbin "baserom.z64", 0xBCB4F8, 0x4 - -glabel D_8015435C - .incbin "baserom.z64", 0xBCB4FC, 0x8 - -glabel D_80154364 - .incbin "baserom.z64", 0xBCB504, 0x1C - -glabel D_80154380 - .incbin "baserom.z64", 0xBCB520, 0x14 - -glabel D_80154394 - .incbin "baserom.z64", 0xBCB534, 0x4 - -glabel D_80154398 - .incbin "baserom.z64", 0xBCB538, 0x34 - -glabel D_801543CC - .incbin "baserom.z64", 0xBCB56C, 0x28 - -glabel D_801543F4 - .incbin "baserom.z64", 0xBCB594, 0xC - -glabel D_80154400 - .incbin "baserom.z64", 0xBCB5A0, 0xC - -glabel D_8015440C - .incbin "baserom.z64", 0xBCB5AC, 0x1C - -glabel D_80154428 - .incbin "baserom.z64", 0xBCB5C8, 0xC - -glabel D_80154434 - .incbin "baserom.z64", 0xBCB5D4, 0x30 - -glabel D_80154464 - .incbin "baserom.z64", 0xBCB604, 0xC - -glabel D_80154470 - .incbin "baserom.z64", 0xBCB610, 0x3C - -glabel D_801544AC - .incbin "baserom.z64", 0xBCB64C, 0x14 - -glabel D_801544C0 - .incbin "baserom.z64", 0xBCB660, 0x18 - -glabel D_801544D8 - .incbin "baserom.z64", 0xBCB678, 0x20 - -glabel D_801544F8 - .incbin "baserom.z64", 0xBCB698, 0x20 - -glabel D_80154518 - .incbin "baserom.z64", 0xBCB6B8, 0x20 - -glabel D_80154538 - .incbin "baserom.z64", 0xBCB6D8, 0x14 - -glabel D_8015454C - .incbin "baserom.z64", 0xBCB6EC, 0x10 - -glabel D_8015455C - .incbin "baserom.z64", 0xBCB6FC, 0xC - -glabel D_80154568 - .incbin "baserom.z64", 0xBCB708, 0x8 - -glabel D_80154570 - .incbin "baserom.z64", 0xBCB710, 0x18 - -glabel D_80154588 - .incbin "baserom.z64", 0xBCB728, 0x18 - -glabel D_801545A0 - .incbin "baserom.z64", 0xBCB740, 0x18 - -glabel D_801545B8 - .incbin "baserom.z64", 0xBCB758, 0x4 - -glabel D_801545BC - .incbin "baserom.z64", 0xBCB75C, 0x18 - -glabel D_801545D4 - .incbin "baserom.z64", 0xBCB774, 0x10 - -glabel D_801545E4 - .incbin "baserom.z64", 0xBCB784, 0x8 - -glabel D_801545EC - .incbin "baserom.z64", 0xBCB78C, 0x2C - -glabel D_80154618 - .incbin "baserom.z64", 0xBCB7B8, 0x8 - -glabel D_80154620 - .incbin "baserom.z64", 0xBCB7C0, 0x24 - -glabel D_80154644 - .incbin "baserom.z64", 0xBCB7E4, 0x8 - -glabel D_8015464C - .incbin "baserom.z64", 0xBCB7EC, 0x20 - -glabel D_8015466C - .incbin "baserom.z64", 0xBCB80C, 0x4 - -glabel D_80154670 - .incbin "baserom.z64", 0xBCB810, 0x18 - -glabel D_80154688 - .incbin "baserom.z64", 0xBCB828, 0x14 - -glabel D_8015469C - .incbin "baserom.z64", 0xBCB83C, 0x2C - -glabel D_801546C8 - .incbin "baserom.z64", 0xBCB868, 0x8 - -glabel D_801546D0 - .incbin "baserom.z64", 0xBCB870, 0x20 - -glabel D_801546F0 - .incbin "baserom.z64", 0xBCB890, 0x4 - -glabel D_801546F4 - .incbin "baserom.z64", 0xBCB894, 0x14 - -glabel D_80154708 - .incbin "baserom.z64", 0xBCB8A8, 0x18 - -glabel D_80154720 - .incbin "baserom.z64", 0xBCB8C0, 0x18 - -glabel D_80154738 - .incbin "baserom.z64", 0xBCB8D8, 0x38 - -glabel D_80154770 - .incbin "baserom.z64", 0xBCB910, 0x10 - -glabel D_80154780 - .incbin "baserom.z64", 0xBCB920, 0x24 - -glabel D_801547A4 - .incbin "baserom.z64", 0xBCB944, 0x8 - -glabel D_801547AC - .incbin "baserom.z64", 0xBCB94C, 0x48 - -glabel D_801547F4 - .incbin "baserom.z64", 0xBCB994, 0x8 - -glabel D_801547FC - .incbin "baserom.z64", 0xBCB99C, 0x4 - -glabel D_80154800 - .incbin "baserom.z64", 0xBCB9A0, 0x48 - -glabel D_80154848 - .incbin "baserom.z64", 0xBCB9E8, 0x10 - -glabel D_80154858 - .incbin "baserom.z64", 0xBCB9F8, 0x10 - -glabel D_80154868 - .incbin "baserom.z64", 0xBCBA08, 0x10 - -glabel D_80154878 - .incbin "baserom.z64", 0xBCBA18, 0x8 - -glabel D_80154880 - .incbin "baserom.z64", 0xBCBA20, 0x48 - -glabel D_801548C8 - .incbin "baserom.z64", 0xBCBA68, 0x8 - -glabel D_801548D0 - .incbin "baserom.z64", 0xBCBA70, 0x4 - -glabel D_801548D4 - .incbin "baserom.z64", 0xBCBA74, 0x48 - -glabel D_8015491C - .incbin "baserom.z64", 0xBCBABC, 0x20 - -glabel D_8015493C - .incbin "baserom.z64", 0xBCBADC, 0x10 - -glabel D_8015494C - .incbin "baserom.z64", 0xBCBAEC, 0x1C - -glabel D_80154968 - .incbin "baserom.z64", 0xBCBB08, 0x1C - -glabel D_80154984 - .incbin "baserom.z64", 0xBCBB24, 0x14 - -glabel D_80154998 - .incbin "baserom.z64", 0xBCBB38, 0x14 - -glabel D_801549AC - .incbin "baserom.z64", 0xBCBB4C, 0x4 - -glabel D_801549B0 - .incbin "baserom.z64", 0xBCBB50, 0x8 - -glabel D_801549B8 - .incbin "baserom.z64", 0xBCBB58, 0x4 - -glabel D_801549BC - .incbin "baserom.z64", 0xBCBB5C, 0x4 - -glabel D_801549C0 - .incbin "baserom.z64", 0xBCBB60, 0x4 - -glabel D_801549C4 - .incbin "baserom.z64", 0xBCBB64, 0x14 - -glabel D_801549D8 - .incbin "baserom.z64", 0xBCBB78, 0x14 - -glabel D_801549EC - .incbin "baserom.z64", 0xBCBB8C, 0xC - -glabel D_801549F8 - .incbin "baserom.z64", 0xBCBB98, 0x28 - -glabel D_80154A20 - .incbin "baserom.z64", 0xBCBBC0, 0x28 - -glabel D_80154A48 - .incbin "baserom.z64", 0xBCBBE8, 0x1C - -glabel D_80154A64 - .incbin "baserom.z64", 0xBCBC04, 0x14 - -glabel D_80154A78 - .incbin "baserom.z64", 0xBCBC18, 0x28 - -glabel D_80154AA0 - .incbin "baserom.z64", 0xBCBC40, 0x14 - -glabel D_80154AB4 - .incbin "baserom.z64", 0xBCBC54, 0xC - -glabel D_80154AC0 - .incbin "baserom.z64", 0xBCBC60, 0x8 - -glabel D_80154AC8 - .incbin "baserom.z64", 0xBCBC68, 0x20 - -glabel D_80154AE8 - .incbin "baserom.z64", 0xBCBC88, 0x14 - -glabel D_80154AFC - .incbin "baserom.z64", 0xBCBC9C, 0x4 - -glabel D_80154B00 - .incbin "baserom.z64", 0xBCBCA0, 0x28 - -glabel jtbl_80154B28 - .word L80107934 - .word L801076F4 - .word L8010773C - .word L801077B4 - .word L80107804 - .word L8010787C - .word L801078CC - .word L80107918 - -glabel jtbl_80154B48 - .word L801087EC - .word L801095F0 - .word L801097E4 - .word L801088E8 - .word L8010887C - .word L80108984 - .word L801089B8 - .word L80108A2C - .word L80108AD4 - .word L80109724 - .word L8010977C - .word L80108B34 - .word L80108AE0 - .word L801096B4 - .word L801097E4 - .word L80109680 - .word L80108B70 - .word L80108C0C - .word L80108CB8 - .word L801094E4 - .word L80108D00 - .word L801097E4 - .word L801097E4 - .word L801097E4 - .word L801097E4 - .word L80109510 - .word L80109528 - .word L8010958C - .word L801097E4 - .word L801097E4 - .word L801097E4 - .word L801088CC - -glabel D_80154BC8 - .incbin "baserom.z64", 0xBCBD68, 0x4 - -glabel jtbl_80154BCC - .word L8010A6FC - .word L8010A6FC - .word L8010A6FC - .word L8010A850 - .word L8010A850 - .word L8010B06C - .word L8010A850 - -glabel jtbl_80154BE8 - .word L8010C4F4 - .word L8010C4F4 - .word L8010C4F4 - .word L8010C4F4 - .word L8010C4FC - .word L8010C564 - .word L8010C578 - .word L8010C564 - .word L8010C5AC - .word L8010C5AC - .word L8010C5AC - .word L8010C750 - .word L8010CBFC - .word L8010D500 - .word L8010D50C - .word L8010D594 - .word L8010D65C - .word L8010D768 - .word L8010DC10 - .word L8010D924 - .word L8010D968 - .word L8010D9A0 - .word L8010D9D8 - .word L8010D824 - .word L8010DC10 - .word L8010DD08 - .word L8010DD1C - .word L8010CBFC - .word L8010D500 - .word L8010D594 - .word L8010DEAC - .word L8010EC60 - .word L8010DED8 - .word L8010DF4C - .word L8010E1D8 - .word L8010E334 - .word L8010E364 - .word L8010E544 - .word L8010CBFC - .word L8010E1D8 - .word L8010E580 - .word L8010E5F0 - .word L8010E730 - .word L8010E5F0 - .word L8010E730 - .word L8010E79C - .word L8010E904 - .word L8010EA20 - .word L8010EA70 - .word L8010EAE0 - .word L8010EB44 - .word L8010C578 - .word L8010EB4C - .word L8010EC58 - .word L8010EC58 - -glabel jtbl_80154CC4 - .word L8010F8F8 - .word L8010FCE0 - .word L8010FCF0 - .word L8010FD24 - .word L8010FD80 - .word L8010FDB0 - .word L8010FE10 - .word L8010FE58 + .word 0x00000000 + .balign 16 diff --git a/spec b/spec index ba4b020dfc..c801873baf 100644 --- a/spec +++ b/spec @@ -544,11 +544,10 @@ beginseg include "build/src/code/code_801067F0.o" include "build/src/code/code_80106860.o" include "build/src/code/code_801068B0.o" - include "build/src/code/z_message_PAL.o" include "build/data/z_message_PAL.rodata.o" + include "build/src/code/z_message_PAL.o" include "build/data/z_message_PAL.bss.o" include "build/src/code/code_80110450.o" - include "build/data/code_80110450.rodata.o" include "build/src/code/z_construct.o" include "build/data/rsp.text.o" include "build/data/rsp.rodata.o"