1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 14:34:32 +00:00

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

* Update asm processor

* Migrate or improve rodata for a few files
This commit is contained in:
Roman971 2020-06-15 01:24:09 +02:00 committed by GitHub
parent 1c98ac27eb
commit 229e0c8629
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 964 additions and 870 deletions

View file

@ -8,6 +8,7 @@
.section .data
.balign 16
glabel D_8012CED0
.incbin "baserom.z64", 0xBA4070, 0x4
@ -23,7 +24,6 @@ glabel D_8012CEE0
glabel D_8012CEE4
.word D_80143184
glabel D_8012CEE8
.word D_80143194

View file

@ -78,13 +78,11 @@ glabel D_80143254
.balign 4
glabel D_80143264
.byte 0x8C
.asciz "E-\x8D ソ"
.asciz "\x8C\E-\x8D ソ"
.balign 4
glabel D_80143278
.byte 0x8C
.asciz "E-\x8D"
.asciz "\x8C\E-\x8D"
.balign 4
glabel D_80143290
@ -239,8 +237,7 @@ glabel D_801434B4
.balign 4
glabel D_801434C4
.byte 0x8C
.asciz "E-\x8D "
.asciz "\x8C\E-\x8D "
.balign 4
glabel D_801434D8
@ -549,7 +546,6 @@ glabel D_80143C40
glabel D_80143C54
.float 0.15
.balign 4
glabel D_80143C58
.float 0.2

View file

@ -1,74 +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
glabel __osRcpImTable
.hword 0x0555
.hword 0x0556
.hword 0x0559
.hword 0x055A
.hword 0x0565
.hword 0x0566
.hword 0x0569
.hword 0x056A
.hword 0x0595
.hword 0x0596
.hword 0x0599
.hword 0x059A
.hword 0x05A5
.hword 0x05A6
.hword 0x05A9
.hword 0x05AA
.hword 0x0655
.hword 0x0656
.hword 0x0659
.hword 0x065A
.hword 0x0665
.hword 0x0666
.hword 0x0669
.hword 0x066A
.hword 0x0695
.hword 0x0696
.hword 0x0699
.hword 0x069A
.hword 0x06A5
.hword 0x06A6
.hword 0x06A9
.hword 0x06AA
.hword 0x0955
.hword 0x0956
.hword 0x0959
.hword 0x095A
.hword 0x0965
.hword 0x0966
.hword 0x0969
.hword 0x096A
.hword 0x0995
.hword 0x0996
.hword 0x0999
.hword 0x099A
.hword 0x09A5
.hword 0x09A6
.hword 0x09A9
.hword 0x09AA
.hword 0x0A55
.hword 0x0A56
.hword 0x0A59
.hword 0x0A5A
.hword 0x0A65
.hword 0x0A66
.hword 0x0A69
.hword 0x0A6A
.hword 0x0A95
.hword 0x0A96
.hword 0x0A99
.hword 0x0A9A
.hword 0x0AA5
.hword 0x0AA6
.hword 0x0AA9
.hword 0x0AAA

View file

@ -1,403 +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 D_8013C240
.asciz "\x1b[43;30m\n\nフィールド常駐以外、太陽設定よって強制解除\n\x1b[m"
# EUC-JP: | "Sun setting except field resident! So forced release!"?
.balign 4
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
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
glabel D_8013C390
.asciz "\x1b[43;30m\n水ポリゴンデータに水中カラーが設定されておりません!\x1b[m"
# EUC-JP: | Underwater color is not set in the water poly data
.balign 4
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
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
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
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
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
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
glabel D_8013C64C
.asciz "../z_kankyo.c"
.balign 4
glabel D_8013C65C
.asciz "../z_kankyo.c"
.balign 4
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
glabel D_8013C69C
.asciz "\n\n\nBGMgame_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
glabel D_8013C738
.asciz "\n\n\nNa_StartMorinigBgm\n\n"
.balign 4
glabel D_8013C750
.asciz "../z_kankyo.c"
.balign 4
glabel D_8013C760
.asciz "../z_kankyo.c"
.balign 4
glabel D_8013C770
.asciz "../z_kankyo.c"
.balign 4
glabel D_8013C780
.asciz "../z_kankyo.c"
.balign 4
glabel jtbl_8013C790
.word L8006F4A8
.word L8006F4CC
.word L8006F4CC
.word L8006F4CC
.word L8006F4F0
glabel D_8013C7A4
.float 0.001
glabel D_8013C7A8
.float 0.005
glabel D_8013C7AC
.float 0.8
glabel D_8013C7B0
.float 0.8
glabel D_8013C7B4
.float 0.8
glabel D_8013C7B8
.float 630
.balign 8
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
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
glabel D_8013C7F4
.float 0.02
glabel D_8013C7F8
.float 0.1
glabel D_8013C7FC
.float 2.9
glabel D_8013C800
.float 5000
glabel D_8013C804
.float 9500
glabel D_8013C808
.float 0.017453292
glabel jtbl_8013C80C
.word L80075B84
.word L80075BD8
.word L80075C30
.word L80075C6C
.word L80075CB4
.word L80075CE0
.word L80075D30
.word L80075DE4
.word L80075E34
glabel D_8013C830
.float 0.16666667
glabel D_8013C834
.float 1.8333334

View file

@ -86,28 +86,28 @@ glabel D_8015394C
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80153958
.hword 0x0000
.half 0x0000
glabel D_8015395A
.hword 0x0000
.half 0x0000
glabel D_8015395C
.hword 0x0000
.half 0x0000
glabel D_8015395E
.hword 0x0000
.half 0x0000
glabel D_80153960
.hword 0x0000
.half 0x0000
glabel D_80153962
.hword 0x0000
.half 0x0000
glabel D_80153964
.hword 0x0000
.half 0x0000
glabel D_80153966
.hword 0x0000
.half 0x0000
glabel D_80153968
.word 0x00000000
@ -164,16 +164,16 @@ glabel D_80153C48
.word 0x00480048, 0x00480000
glabel D_80153C50
.hword 0x0000
.half 0x0000
glabel D_80153C52
.hword 0x0001
.half 0x0001
glabel D_80153C54
.hword 0x0003
.half 0x0003
glabel D_80153C56
.hword 0x0002
.half 0x0002
glabel D_80153C58
.word 0x00010002, 0x00040008, 0x00100020, 0x01000080
@ -234,8 +234,9 @@ glabel D_80153D74
glabel D_80153D78
.word 0x00000000
.balign 16
glabel D_80153D7C
.word 0x00000000
glabel D_80153D80
.word 0x00000000
.balign 16

View file

@ -1,332 +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 D_80140850
.asciz "\n"
# EUC-JP: | Create personal file
.balign 4
glabel D_80140864
.asciz "%x(%d)\n"
# EUC-JP: | Point=
.balign 4
glabel D_80140878
.asciz "\x1b[33m"
.balign 4
glabel D_80140880
.asciz "SCENE_DATA_ID = %d SceneNo = %d\n"
.balign 4
glabel D_801408A4
.asciz "scene_no = %d\n"
.balign 4
glabel D_801408B4
.asciz "\x1b[m"
.balign 4
glabel D_801408B8
.asciz "\x1b[34m"
.balign 4
glabel D_801408C0
.asciz "\n====================================================================\n"
.balign 4
glabel D_80140908
.asciz "%d, "
.balign 4
glabel D_80140910
.asciz "\n====================================================================\n"
.balign 4
glabel D_80140958
.asciz "\x1b[m"
.balign 4
glabel D_8014095C
.asciz "\x1b[32m"
.balign 4
glabel D_80140964
.asciz "\n====================================================================\n"
.balign 4
glabel D_801409AC
.asciz "%d, "
.balign 4
glabel D_801409B4
.asciz "\n====================================================================\n"
.balign 4
glabel D_801409FC
.asciz "\x1b[m"
.balign 4
glabel D_80140A00
.asciz " \n"
# EUC-JP:
.balign 4
glabel D_80140A20
.asciz "%x(%d) SAVE_MAX=%d\n"
# EUC-JP: | Point=
.balign 4
glabel D_80140A44
.asciz "\n %d \n"
# EUC-JP: %d
.balign 4
glabel D_80140A88
.asciz "\n j=%x mmm=%x "
# EUC-JP: | SAVE checksum calculation
.balign 4
glabel D_80140AB4
.asciz " %x(%d)\n"
# EUC-JP:
.balign 4
glabel D_80140AD0
.asciz "================= ========================\n"
# EUC-JP:
.balign 4
glabel D_80140B0C
.asciz "\n j=%x mmm=%x "
# EUC-JP: | (B) SAVE checksum calculation
.balign 4
glabel D_80140B3C
.asciz " %x(%d+3)\n"
#EUR-JP:
.balign 4
glabel D_80140B5C
.asciz "newf=%x,%x,%x,%x,%x,%x\n"
.balign 4
glabel D_80140B74
.asciz "\n--------------------------------------------------------------\n"
.balign 4
glabel D_80140BB8
.asciz "%x "
.balign 4
glabel D_80140BBC
.asciz "\n"
.balign 4
glabel D_80140BC0
.asciz "\nCheck_Sum=%x(%x)\n"
.balign 4
glabel D_80140BD4
.asciz "????#%x,%x,%x,%x,%x,%x\n"
.balign 4
glabel D_80140BEC
.asciz "\n%x(%d+3) check_sum=%x(%x)\n"
# EUC-JP: | Point =
.balign 4
glabel D_80140C14
.asciz "%x(%d) check_sum=%x(%x)\n"
.balign 4
glabel D_80140C38
.asciz "\n \n"
# EUC-JP: | SAVE data OK! ! ! !
.balign 4
glabel D_80140C58
.asciz "SAVECT=%x, NAME=%x, LIFE=%x, ITEM=%x, 64DD=%x, HEART=%x\n"
.balign 4
glabel D_80140C94
.asciz "f_64dd=%d, %d, %d\n"
.balign 4
glabel D_80140CA8
.asciz "heart_status=%d, %d, %d\n"
.balign 4
glabel D_80140CC4
.asciz "now_life=%d, %d, %d\n"
.balign 4
glabel D_80140CDC
.asciz "=%d\n"
# EUC-JP: | 64DD flag
.balign 4
glabel D_80140CF0
.asciz "newf=%x,%x,%x,%x,%x,%x\n"
.balign 4
glabel D_80140D08
.asciz "\n$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n"
.balign 4
glabel D_80140D58
.asciz "%x "
.balign 4
glabel D_80140D5C
.asciz "\n"
.balign 4
glabel D_80140D60
.asciz "\n%x\n"
# EUC-JP: %x | Checksum
.balign 4
glabel D_80140D74
.asciz "I=%x no=%d\n"
.balign 4
glabel D_80140D80
.asciz "I=%x no=%d\n"
.balign 4
glabel D_80140D8C
.asciz "\n"
# EUC-JP: | SAVE end
.balign 4
glabel D_80140D9C
.asciz "z_common_data.file_no = %d\n"
.balign
glabel D_80140DB8
.asciz "SAVECT=%x, NAME=%x, LIFE=%x, ITEM=%x, SAVE_64DD=%x\n"
.balign 4
glabel D_80140DF0
.asciz "f_64dd[%d]=%d\n"
.balign 4
glabel D_80140E00
.asciz "heart_status[%d]=%d\n"
.balign 4
glabel D_80140E18
.asciz "now_life[%d]=%d\n"
.balign 4
glabel D_80140E2C
.asciz "\n"
# EUC-JP: | Clear End
.balign 4
glabel D_80140E3C
.asciz "=%d(%x) =%d(%x)\n"
# EUC-JP: =%d(%x) =%d
.balign 4
glabel D_80140E60
.asciz "f_64dd[%d]=%d\n"
.balign 4
glabel D_80140E70
.asciz "heart_status[%d]=%d\n"
.balign 4
glabel D_80140E88
.asciz "\n"
# EUC-JP: | Copy end
.balign 4
glabel D_80140E98
.asciz "sram_initialize( Game *game, Sram *sram )\n"
.balign 4
glabel D_80140EC4
.asciz "\n"
# EUC-JP: | SRAM destruction! ! ! ! ! !
.balign 4
glabel D_80140EE0
.asciz "\n"
# EUC-JP: | SRAM destruction! ! ! ! ! !
.balign 4
glabel D_80140EFC
.asciz " %d + %d %d\n"
# EUC-JP: %d + %d %d | GOOD! GOOD! Size =% d +% d =% d
.balign 4
glabel D_80140F28
.asciz "\x1b[34m"
.balign 4
glabel D_80140F30
.asciz "Na_SetSoundOutputMode = %d\n"
.balign 4
glabel D_80140F4C
.asciz "Na_SetSoundOutputMode = %d\n"
.balign 4
glabel D_80140F68
.asciz "Na_SetSoundOutputMode = %d\n"
.balign 4
glabel D_80140F84
.asciz "\x1b[m"
.balign 4
glabel D_80140F88
.asciz "../z_sram.c"
.balign 4
glabel D_80140F94
.asciz "sram->read_buff != NULL"
.balign 4
glabel D_80140FAC
.asciz "../z_sram.c"
.balign 4
glabel jtbl_80140FB8
.word L800A854C
.word L800A854C
.word L800A854C
.word L800A854C
.word L800A854C
.word L800A854C
.word L800A854C
.word L800A854C
.word L800A854C
.word L800A854C
.word L800A854C
.word L800A854C
.word L800A854C
.word L800A854C
.word L800A85C0
.word L800A85C0
.word L800A85CC
.word L800A8564
.word L800A856C
.word L800A8578
.word L800A8584
.word L800A8590
.word L800A859C
.word L800A85A8
.word L800A85B4
.word L800A85C0
.word L800A85C0