mirror of
https://github.com/zeldaret/oot.git
synced 2024-09-22 05:14:47 +00:00
045a92d7c3
* Started doing cleanup * did more work * did more migration * migrated more rodata and worked on some structs * did more work * Removal of ROOM field from initvars, some rodata migration, some string decompilation * General update * Decompiled vt strings * Tool work * Tool improvements * 270 overlay rodata files remaining * better float handling * floats * Many more floats * migrated boss_mo * assorted fixes * Migrated 10 * tool improvements * migrated 10 * 10 more * 1 more * did a few more * fixes * 10 more * more floats * Did some more, updated migrate-rodata.py to 'modify' the C file after processing in order to make to compiler process it as if it was changed. * removed changes made to script by accident * migrated largest rodata - ovl_fishing * Did some more * 114 remaining * 99 left ! * almost done migrating rodata * did some more, done for tonight * almost done, tried add support to the script for z_player * All possible rodata migrated in actor overlays * update * removed static from all overlays, ran format.sh * Removed unknown actor structs * converted a few floats * Added new lines to header files that were missing them. Removed unused asm files * Removed unused asm files * Formatting newlines Further formatting spacing .float spacing More space formatting More spacing formatting Removing .balign 4 after floats Co-authored-by: Ethan Roseman <ethteck@gmail.com>
129 lines
2.3 KiB
ArmAsm
129 lines
2.3 KiB
ArmAsm
.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_80B9CAF0
|
|
.asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n"
|
|
.balign 4
|
|
|
|
.balign 4
|
|
|
|
glabel D_80B9CB30
|
|
.asciz "../z_obj_oshihiki.c"
|
|
.balign 4
|
|
|
|
glabel D_80B9CB44
|
|
.asciz "Error : タイプが判別できない(%s %d)(arg_data 0x%04x)\n"
|
|
.balign 4
|
|
|
|
glabel D_80B9CB7C
|
|
.asciz "../z_obj_oshihiki.c"
|
|
.balign 4
|
|
|
|
glabel D_80B9CB90
|
|
.asciz "Error : scene_data_ID が判別できない。(%s %d)\n"
|
|
.balign 4
|
|
|
|
glabel D_80B9CBC0
|
|
.asciz "../z_obj_oshihiki.c"
|
|
.balign 4
|
|
|
|
glabel D_80B9CBD4
|
|
.asciz "(dungeon keep 押し引きブロック)(arg_data 0x%04x)\n"
|
|
.balign 4
|
|
|
|
glabel D_80B9CC08
|
|
.asciz "Warning : 押し引きブロック落ちすぎた(%s %d)(arg_data 0x%04x)\n"
|
|
.balign 4
|
|
|
|
glabel D_80B9CC48
|
|
.asciz "../z_obj_oshihiki.c"
|
|
.balign 4
|
|
|
|
glabel D_80B9CC5C
|
|
.asciz "../z_obj_oshihiki.c"
|
|
.balign 4
|
|
|
|
glabel D_80B9CC70
|
|
.asciz "../z_obj_oshihiki.c"
|
|
.balign 4
|
|
|
|
glabel D_80B9CC84
|
|
.asciz "../z_obj_oshihiki.c"
|
|
.balign 4
|
|
|
|
glabel jtbl_80B9CC98
|
|
.word L80B9B2AC
|
|
.word L80B9B2AC
|
|
.word L80B9B2B4
|
|
.word L80B9B2BC
|
|
.word L80B9B2AC
|
|
.word L80B9B2AC
|
|
.word L80B9B2B4
|
|
.word L80B9B2BC
|
|
glabel D_80B9CCB8
|
|
.float 0.001
|
|
.balign 4
|
|
|
|
glabel jtbl_80B9CCBC
|
|
.word L80B9B5B8
|
|
.word L80B9B5B8
|
|
.word L80B9B5B8
|
|
.word L80B9B5B8
|
|
.word L80B9B5B8
|
|
.word L80B9B5B8
|
|
.word L80B9B5B8
|
|
.word L80B9B5B8
|
|
glabel jtbl_80B9CCDC
|
|
.word L80B9B658
|
|
.word L80B9B658
|
|
.word func_80B9B668
|
|
.word func_80B9B678
|
|
.word L80B9B658
|
|
.word L80B9B658
|
|
.word func_80B9B668
|
|
.word func_80B9B678
|
|
glabel D_80B9CCFC
|
|
.word 0xBA83126F
|
|
glabel D_80B9CD00
|
|
.word 0xBA83126F
|
|
glabel D_80B9CD04
|
|
.word 0xBA83126F
|
|
glabel D_80B9CD08
|
|
.word 0xC6F9EC00
|
|
glabel D_80B9CD0C
|
|
.word 0xBA83126F
|
|
glabel D_80B9CD10
|
|
.float 0.001
|
|
.balign 4
|
|
|
|
glabel D_80B9CD14
|
|
.float 0.001
|
|
.balign 4
|
|
|
|
glabel D_80B9CD18
|
|
.float 0.001
|
|
.balign 4
|
|
|
|
glabel jtbl_80B9CD1C
|
|
.word L80B9C8B8
|
|
.word L80B9C8B8
|
|
.word L80B9C8F8
|
|
.word L80B9C8B8
|
|
.word L80B9C8B8
|
|
.word L80B9C8B8
|
|
.word L80B9C8B8
|
|
.word L80B9C8B8
|
|
.word L80B9C8F8
|
|
.word L80B9C8F8
|
|
.word L80B9C8F8
|
|
.word L80B9C8B8
|
|
.word 0x00000000
|
|
|
|
|