Update asm processor and migrate/improve rodata for a few files (#209)

* Update asm processor * Migrate or improve rodata for a few files
2025-08-08 07:20:16 +00:00 · 2020-06-15 01:24:09 +02:00 · 2020-06-15 01:24:09 +02:00 · 229e0c8629
commit 229e0c8629
parent 1c98ac27eb
37 changed files with 964 additions and 870 deletions
--- a/asm/non_matchings/code/z_kankyo/func_8006F140.s
+++ b/asm/non_matchings/code/z_kankyo/func_8006F140.s
@ -1,3 +1,18 @@
+.rdata
+glabel D_8013C240
+    .asciz "\x1b[43;30m\n\nフィールド常駐以外、太陽設定！よって強制解除！\n\x1b[m"
+    # EUC-JP: フィールド常駐以外、太陽設定！よって強制解除！ | "Sun setting except field resident! So forced release!"?
+    .balign 4
+
+.late_rodata
+glabel jtbl_8013C790
+    .word L8006F4A8
+    .word L8006F4CC
+    .word L8006F4CC
+    .word L8006F4CC
+    .word L8006F4F0
+
+.text
 glabel func_8006F140
 /* AE62E0 8006F140 3C088016 */  lui   $t0, %hi(gSaveContext) # $t0, 0x8016
 /* AE62E4 8006F144 2508E660 */  addiu $t0, %lo(gSaveContext) # addiu $t0, $t0, -0x19a0
--- a/asm/non_matchings/code/z_kankyo/func_8006F9BC.s
+++ b/asm/non_matchings/code/z_kankyo/func_8006F9BC.s
@ -1,3 +1,14 @@
+.rdata
+glabel D_8013C280
+    .asciz "\x1b[41;37m\nend_frameとstart_frameのフレーム関係がおかしい!!!\x1b[m"
+    # EUC-JP: とstart_frameのフレーム関係がおかしい!!! | The frame relation between end_frame and start_frame is wrong
+    .balign 4
+
+glabel D_8013C2C0
+    .asciz "\x1b[41;37m\nby get_parcent_forAccelBrake!!!!!!!!!\x1b[m"
+    .balign 4
+
+.text
 glabel func_8006F9BC
 /* AE6B5C 8006F9BC 27BDFFC0 */  addiu $sp, $sp, -0x40
 /* AE6B60 8006F9C0 30A3FFFF */  andi  $v1, $a1, 0xffff
--- a/asm/non_matchings/code/z_kankyo/func_8006FC88.s
+++ b/asm/non_matchings/code/z_kankyo/func_8006FC88.s
@ -1,3 +1,34 @@
+.rdata
+glabel D_8013C2F4
+    .asciz "\x1b[41;37m\n環境ＶＲデータ取得失敗！ ささきまでご報告を！\x1b[m"
+    # EUC-JP: 環境ＶＲデータ取得失敗！ ささきまでご報告を！ | Environment VR data acquisition failed! Report to Sasaki!
+    .balign 4
+
+glabel D_8013C330
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C340
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C350
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C360
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C370
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C380
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+.text
 glabel func_8006FC88
 /* AE6E28 8006FC88 27BDFFA0 */  addiu $sp, $sp, -0x60
 /* AE6E2C 8006FC8C AFB00030 */  sw    $s0, 0x30($sp)
--- a/asm/non_matchings/code/z_kankyo/func_80070600.s
+++ b/asm/non_matchings/code/z_kankyo/func_80070600.s
@ -1,3 +1,10 @@
+.rdata
+glabel D_8013C390
+    .asciz "\x1b[43;30m\n水ポリゴンデータに水中カラーが設定されておりません!\x1b[m"
+    # EUC-JP: 水ポリゴンデータに水中カラーが設定されておりません | Underwater color is not set in the water poly data
+    .balign 4
+
+.text
 glabel func_80070600
 /* AE77A0 80070600 27BDFFE8 */  addiu $sp, $sp, -0x18
 /* AE77A4 80070604 2401001F */  li    $at, 31
--- a/asm/non_matchings/code/z_kankyo/func_80070718.s
+++ b/asm/non_matchings/code/z_kankyo/func_80070718.s
@ -1,3 +1,93 @@
+.rdata
+glabel D_8013C3D0
+    .asciz "T%03d "
+    .balign 4
+
+glabel D_8013C3D8
+    .asciz "E%03d"
+    .balign 4
+
+glabel D_8013C3E0
+    .asciz "%s"
+    .balign 4
+
+glabel D_8013C3E4
+    .asciz "ZELDATIME "
+    .balign 4
+
+glabel D_8013C3F0
+    .asciz "%02d"
+    .balign 4
+
+glabel D_8013C3F8
+    .asciz "%s"
+    .balign 4
+
+glabel D_8013C3FC
+    .asciz ":"
+    .balign 4
+
+glabel D_8013C400
+    .asciz "%s"
+    .balign 4
+
+glabel D_8013C404
+    .asciz " "
+    .balign 4
+
+glabel D_8013C408
+    .asciz "%02d"
+    .balign 4
+
+glabel D_8013C410
+    .asciz "%s"
+    .balign 4
+
+glabel D_8013C414
+    .asciz "VRBOXTIME "
+    .balign 4
+
+glabel D_8013C420
+    .asciz "%02d"
+    .balign 4
+
+glabel D_8013C428
+    .asciz "%s"
+    .balign 4
+
+glabel D_8013C42C
+    .asciz ":"
+    .balign 4
+
+glabel D_8013C430
+    .asciz "%s"
+    .balign 4
+
+glabel D_8013C434
+    .asciz " "
+    .balign 4
+
+glabel D_8013C438
+    .asciz "%02d"
+    .balign 4
+
+glabel D_8013C440
+    .asciz "%s"
+    .balign 4
+
+glabel D_8013C444
+    .asciz "YORU"
+    .balign 4
+
+glabel D_8013C44C
+    .asciz "%s"
+    .balign 4
+
+glabel D_8013C450
+    .asciz "HIRU"
+    .balign 4
+
+.text
 glabel func_80070718
 /* AE78B8 80070718 27BDFF98 */  addiu $sp, $sp, -0x68
 /* AE78BC 8007071C AFB00020 */  sw    $s0, 0x20($sp)
--- a/asm/non_matchings/code/z_kankyo/func_80070C24.s
+++ b/asm/non_matchings/code/z_kankyo/func_80070C24.s
@ -1,3 +1,44 @@
+.rdata
+glabel D_8013C458
+    .asciz "\nnext_zelda_time=[%x]"
+    .balign 4
+
+glabel D_8013C470
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C480
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C490
+    .asciz "\x1b[41;37m\nカラーパレットの設定がおかしいようです！\x1b[m"
+    # EUC-JP: カラーパレットの設定がおかしいようです！ | The color palette settings seem to be wrong!
+    .balign 4
+
+glabel D_8013C4C8
+    .asciz "\x1b[41;37m\n設定パレット＝[%d] 最後パレット番号＝[%d]\n\x1b[m"
+    # EUC-JP: 設定パレット＝[%d] 最後パレット番号＝ | Set pallet = [% d] Last pallet number =
+    .balign 4
+
+glabel D_8013C500
+    .asciz "\n\x1b[31mカラーパレットがおかしいようです！"
+    # EUC-JP: カラーパレットがおかしいようです！ | The color palette seems strange!
+    .balign 4
+
+glabel D_8013C52C
+    .asciz "\n\x1b[33m設定パレット＝[%d] パレット数＝[%d]\n\x1b[m"
+    # EUC-JP: 設定パレット＝[%d] パレット数＝[%d] | Set pallet = [% d] Number of pallets = [% d]
+    .balign 4
+
+.late_rodata
+glabel D_8013C7A4
+    .float 0.001
+
+glabel D_8013C7A8
+    .float 0.005
+
+.text
 glabel func_80070C24
 /* AE7DC4 80070C24 27BDFF70 */  addiu $sp, $sp, -0x90
 /* AE7DC8 80070C28 3C0D8016 */  lui   $t5, %hi(gSaveContext) # $t5, 0x8016
--- a/asm/non_matchings/code/z_kankyo/func_800730DC.s
+++ b/asm/non_matchings/code/z_kankyo/func_800730DC.s
@ -1,3 +1,31 @@
+.rdata
+glabel D_8013C55C
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C56C
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C57C
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C58C
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+.late_rodata
+glabel D_8013C7AC
+    .float 0.8
+
+glabel D_8013C7B0
+    .float 0.8
+
+glabel D_8013C7B4
+    .float 0.8
+
+.text
 glabel func_800730DC
 /* AEA27C 800730DC 27BDFF78 */  addiu $sp, $sp, -0x88
 /* AEA280 800730E0 AFBF0024 */  sw    $ra, 0x24($sp)
--- a/asm/non_matchings/code/z_kankyo/func_80073A5C.s
+++ b/asm/non_matchings/code/z_kankyo/func_80073A5C.s
@ -1,3 +1,40 @@
+.rdata
+glabel D_8013C59C
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C5AC
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C5BC
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+.late_rodata
+glabel D_8013C7B8
+    .float 630
+
+    .word 0 # forced padding
+glabel D_8013C7C0
+    .double 0.001
+
+glabel D_8013C7C8
+    .float 1.0E-4
+
+glabel D_8013C7CC
+    .float 0.001
+
+glabel D_8013C7D0
+    .float 0.001
+
+glabel D_8013C7D4
+    .float 0.1
+
+glabel D_8013C7D8
+    .float 0.1
+
+.text
 glabel func_80073A5C
 /* AEABFC 80073A5C 27BDFE50 */  addiu $sp, $sp, -0x1b0
 /* AEAC00 80073A60 3C0B8012 */  lui   $t3, %hi(D_8011FE00) # $t3, 0x8012
--- a/asm/non_matchings/code/z_kankyo/func_80074704.s
+++ b/asm/non_matchings/code/z_kankyo/func_80074704.s
@ -1,3 +1,40 @@
+.rdata
+glabel D_8013C5CC
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C5DC
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C5EC
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C5FC
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+.late_rodata
+glabel D_8013C7DC
+    .float 0.4
+
+glabel D_8013C7E0
+    .float 0.7
+
+glabel D_8013C7E4
+    .float 1.5707964 # M_PI / 2
+
+glabel D_8013C7E8
+    .float 1.2
+
+glabel D_8013C7EC
+    .float 0.1
+
+glabel D_8013C7F0
+    .float 0.02
+
+.text
 glabel func_80074704
 /* AEB8A4 80074704 27BDFED8 */  addiu $sp, $sp, -0x128
 /* AEB8A8 80074708 3C0F8012 */  lui   $t7, %hi(D_8011FE70) # $t7, 0x8012
--- a/asm/non_matchings/code/z_kankyo/func_80074D6C.s
+++ b/asm/non_matchings/code/z_kankyo/func_80074D6C.s
@ -1,3 +1,25 @@
+.rdata
+glabel D_8013C60C
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C61C
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C62C
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C63C
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+.late_rodata
+glabel D_8013C7F4
+    .float 0.02
+
+.text
 glabel func_80074D6C
 /* AEBF0C 80074D6C 27BDFF98 */  addiu $sp, $sp, -0x68
 /* AEBF10 80074D70 3C010001 */  lui   $at, 1
--- a/asm/non_matchings/code/z_kankyo/func_80074FF4.s
+++ b/asm/non_matchings/code/z_kankyo/func_80074FF4.s
@ -1,3 +1,13 @@
+.rdata
+glabel D_8013C64C
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C65C
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+.text
 glabel func_80074FF4
 /* AEC194 80074FF4 27BDFFC8 */  addiu $sp, $sp, -0x38
 /* AEC198 80074FF8 AFBF0014 */  sw    $ra, 0x14($sp)
--- a/asm/non_matchings/code/z_kankyo/func_800750C0.s
+++ b/asm/non_matchings/code/z_kankyo/func_800750C0.s
@ -1,3 +1,11 @@
+.late_rodata
+glabel D_8013C7F8
+    .float 0.1
+
+glabel D_8013C7FC
+    .float 2.9
+
+.text
 glabel func_800750C0
 /* AEC260 800750C0 27BDFFE0 */  addiu $sp, $sp, -0x20
 /* AEC264 800750C4 3C010001 */  lui   $at, 1
--- a/asm/non_matchings/code/z_kankyo/func_8007542C.s
+++ b/asm/non_matchings/code/z_kankyo/func_8007542C.s
@ -1,3 +1,27 @@
+.rdata
+glabel D_8013C66C
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C67C
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C68C
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+.late_rodata
+glabel D_8013C800
+    .float 5000
+
+glabel D_8013C804
+    .float 9500
+
+glabel D_8013C808
+    .float 0.017453292
+
+.text
 glabel func_8007542C
 /* AEC5CC 8007542C 27BDFF20 */  addiu $sp, $sp, -0xe0
 /* AEC5D0 80075430 3C0F8012 */  lui   $t7, %hi(D_8011FE88) # $t7, 0x8012
--- a/asm/non_matchings/code/z_kankyo/func_800758AC.s
+++ b/asm/non_matchings/code/z_kankyo/func_800758AC.s
@ -1,3 +1,33 @@
+.rdata
+glabel D_8013C69C
+    .asciz "\n\n\nBGM設定game_play->sound_info.BGM=[%d] old_bgm=[%d]\n\n"
+    # EUC-JP: 設定 | Configuration
+    .balign 4
+
+glabel D_8013C6D4
+    .asciz "\n-----------------\n"
+    .balign 4
+
+glabel D_8013C6E8
+    .asciz "\n 強制ＢＧＭ=[%d]"
+    # EUC-JP: 強制ＢＧＭ | Forced BGM
+    .balign 4
+
+glabel D_8013C6FC
+    .asciz "\n     ＢＧＭ=[%d]"
+    # EUC-JP: ＢＧＭ
+    .balign 4
+
+glabel D_8013C710
+    .asciz "\n     エンブ=[%d]"
+    # EUC-JP: エンブ | Emblem?
+    .balign 4
+
+glabel D_8013C724
+    .asciz "\n     status=[%d]"
+    .balign 4
+
+.text
 glabel func_800758AC
 /* AECA4C 800758AC 27BDFFE0 */  addiu $sp, $sp, -0x20
 /* AECA50 800758B0 3C010001 */  lui   $at, 1
--- a/asm/non_matchings/code/z_kankyo/func_80075B44.s
+++ b/asm/non_matchings/code/z_kankyo/func_80075B44.s
@ -1,3 +1,21 @@
+.rdata
+glabel D_8013C738
+    .asciz "\n\n\nNa_StartMorinigBgm\n\n"
+    .balign 4
+
+.late_rodata
+glabel jtbl_8013C80C
+   .word L80075B84
+   .word L80075BD8
+   .word L80075C30
+   .word L80075C6C
+   .word L80075CB4
+   .word L80075CE0
+   .word L80075D30
+   .word L80075DE4
+   .word L80075E34
+
+.text
 glabel func_80075B44
 /* AECCE4 80075B44 27BDFFE0 */  addiu $sp, $sp, -0x20
 /* AECCE8 80075B48 AFB00014 */  sw    $s0, 0x14($sp)
--- a/asm/non_matchings/code/z_kankyo/func_8007672C.s
+++ b/asm/non_matchings/code/z_kankyo/func_8007672C.s
@ -1,3 +1,13 @@
+.rdata
+glabel D_8013C750
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C760
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+.text
 glabel func_8007672C
 /* AED8CC 8007672C 27BDFFA0 */  addiu $sp, $sp, -0x60
 /* AED8D0 80076730 93AE0073 */  lbu   $t6, 0x73($sp)
--- a/asm/non_matchings/code/z_kankyo/func_80076934.s
+++ b/asm/non_matchings/code/z_kankyo/func_80076934.s
@ -1,3 +1,20 @@
+.rdata
+glabel D_8013C770
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+glabel D_8013C780
+    .asciz "../z_kankyo.c"
+    .balign 4
+
+.late_rodata
+glabel D_8013C830
+    .float 0.16666667
+
+glabel D_8013C834
+    .float 1.8333334
+
+.text
 glabel func_80076934
 /* AEDAD4 80076934 27BDFF48 */  addiu $sp, $sp, -0xb8
 /* AEDAD8 80076938 3C010001 */  lui   $at, 1