diff options
| author | mzxrules <mzxrules@gmail.com> | 2021-01-08 06:12:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-08 06:12:58 -0500 |
| commit | 3cef03f5ff9c0341544afec9636bd0581f87d0cc (patch) | |
| tree | 91ff5c72cadc5c647b52c285f9432f9f40e327dd /data | |
| parent | 209f0d21b87fa01c033a943fd8c862cb46b31315 (diff) | |
z_bgcheck.c, 800430A0.c, 80043480.c (#256)
* beginning of migrating changes
* got matching
* changed order a bit
* clean up bgcheck
* fix conflict
* fix conflict again
* first stab at identifying types, some oks
* Clean up most bad structs/pointer math, move relevant structs to z64bgcheck.h, get some OKs
* more OKs, z_bgcheck.bss migration, update some sys_math3d.c args
* couple more OKs
* pushing some OKs
* fix compilation issues
* code_800430A0.c OK, more files decomp'd
* 8003A3E0 big OK :)
* Decomp most of func_8003C614, decomp helper funcs
* Decomp SurfaceType, CamData, and WaterBox property related functions
* more OKs, big OK in 8003C078
* more OKs, more progress, move a function definition in z_collision_check to functions.h
* more clean-ups, more OKs, dyn_vtx is now defined as u8*
* 8003A5B8, 8003A7D8, 8003C614, 8003DD6C OK, document function args better
* data migrated, more OKs
* 80041240 OK, func_8003B3C8 and func_8003BB18 disassembled
* func_80040284, 800409A8 non_matching, add IS_ZERO macro
* All asm files have C representations, some big OKs, lots of minor tweaks
* More OKs, non-matching code cleanup
* 8003FBF4 and 80040BE4 OK, improve codegen for most functions
* format z_bgcheck.c
* fix warnings, compile errors on NON_MATCHING
* func_8003EE80 is now NON_MATCHING
* begin documenting some functions
* formatting
* more documentation, func_8003A95C OK
* fix PHYSICAL_TO_VIRTUAL changes
* fix var rename
* More documentation, functions 80040E40, 80041648 OK, change types to not be compatible with ZAP
* func_8004239C ok, more NON_MATCHING improvements, more documentation
* Implement most suggested changes
* Convert comments to slower comments
* /**
* Implement ZAP2 changes
* my anti-virus ate my format.sh results
* Rename a couple hundred functions, fix minor stuff
* rename var so that clang formats correctly
* run format.sh
* implement Petrie's matches/suggestions
* format
* matches
* and the asm
* slight error
* Add SSList
* two more matches
* stuff
* implement code changes
* clean up Petrie's matchings
Co-authored-by: Arthur <arthurtilly413@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Diffstat (limited to 'data')
| -rw-r--r-- | data/z_bgcheck.bss.s | 94 | ||||
| -rw-r--r-- | data/z_bgcheck.data.s | 49 | ||||
| -rw-r--r-- | data/z_bgcheck.rodata.s | 484 |
3 files changed, 0 insertions, 627 deletions
diff --git a/data/z_bgcheck.bss.s b/data/z_bgcheck.bss.s deleted file mode 100644 index ad6470d13..000000000 --- a/data/z_bgcheck.bss.s +++ /dev/null @@ -1,94 +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 .bss - -.balign 16 - -glabel D_8015BC30 - .space 0xC - -glabel D_8015BC3C - .space 0xC - -glabel D_8015BC48 - .space 0x10 - -glabel D_8015BC58 - .space 0xC - -glabel D_8015BC64 - .space 0xC - -glabel D_8015BC70 - .space 0x10 - -glabel D_8015BC80 - .space 0xC - -glabel D_8015BC8C - .space 0xC - -glabel D_8015BC98 - .space 0x10 - -glabel D_8015BCA8 - .space 0xC - -glabel D_8015BCB4 - .space 0xC - -glabel D_8015BCC0 - .space 0x10 - -glabel D_8015BCD0 - .space 0xC - -glabel D_8015BCDC - .space 0xC - -glabel D_8015BCE8 - .space 0x10 - -glabel D_8015BCF8 - .space 0x4 - -glabel D_8015BCFC - .space 0x4 - -glabel D_8015BD00 - .space 0x4 - -glabel D_8015BD04 - .space 0x4 - -glabel D_8015BD08 - .space 0x2 - -glabel D_8015BD0A - .space 0x2 - -glabel D_8015BD0C - .space 0x2 - -glabel D_8015BD0E - .space 0x2 - -glabel D_8015BD10 - .space 0x24 - -glabel D_8015BD34 - .space 0x4 - -glabel D_8015BD38 - .space 0x4 - -glabel D_8015BD3C - .space 0x4 - -glabel D_8015BD40 - .space 0x10 diff --git a/data/z_bgcheck.data.s b/data/z_bgcheck.data.s deleted file mode 100644 index 9ada1a902..000000000 --- a/data/z_bgcheck.data.s +++ /dev/null @@ -1,49 +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 .data - -.balign 16 - -glabel D_80119D90 - .incbin "baserom.z64", 0xB90F30, 0x80 - -glabel D_80119E10 - .incbin "baserom.z64", 0xB90FB0, 0x1C - -glabel D_80119E2C - .incbin "baserom.z64", 0xB90FCC, 0x26 - -glabel D_80119E52 - .incbin "baserom.z64", 0xB90FF2, 0x2 - -glabel D_80119E54 - .incbin "baserom.z64", 0xB90FF4, 0x40 - -glabel D_80119E94 - .incbin "baserom.z64", 0xB91034, 0x18 - -glabel D_80119EAC - .incbin "baserom.z64", 0xB9104C, 0x10 - -glabel D_80119EBC - .incbin "baserom.z64", 0xB9105C, 0x4 - -glabel D_80119EC0 - .incbin "baserom.z64", 0xB91060, 0x4 - -glabel D_80119EC4 - .incbin "baserom.z64", 0xB91064, 0x4 - -glabel D_80119EC8 - .incbin "baserom.z64", 0xB91068, 0x4 - -glabel D_80119ECC - .incbin "baserom.z64", 0xB9106C, 0x4 - -glabel D_80119ED0 - .incbin "baserom.z64", 0xB91070, 0x10 diff --git a/data/z_bgcheck.rodata.s b/data/z_bgcheck.rodata.s deleted file mode 100644 index 5ee0e8fe1..000000000 --- a/data/z_bgcheck.rodata.s +++ /dev/null @@ -1,484 +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_80138670 - .asciz "\x1b[31m" - .balign 4 - -glabel D_80138678 - .asciz "T_BGCheck_PosErrorCheck():位置が妥当ではありません。pos (%f,%f,%f) file:%s line:%d\n" - # EUC-JP: T_BGCheck_PosErrorCheck():位置が妥当ではありません。pos (%f,%f,%f) file:%s line:%d | Position is not valid - .balign 4 - -glabel D_801386CC - .asciz "\x1b[m" - .balign 4 - -glabel D_801386D0 - .asciz "new_node != SS_NULL" - .balign 4 - -glabel D_801386E4 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_801386F4 - .asciz "psst->tbl != NULL" - .balign 4 - -glabel D_80138708 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138718 - .asciz "\x1b[41;37m" - .balign 4 - -glabel D_80138724 - .asciz "T_Polygon_GetVertex_bg_ai(): Error %d %d %d 引数が適切ではありません。処理を終了します。\n" - # EUC-JP: 引数が適切ではありません。処理を終了します。 | Invalid argument. Process terminated - .balign 4 - -glabel D_80138780 - .asciz "\x1b[m" - .balign 4 - -glabel D_80138784 - .asciz "!IS_ZERO(ac_size)" - .balign 4 - -glabel D_80138798 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_801387A8 - .asciz "!IS_ZERO(ac_size)" - .balign 4 - -glabel D_801387BC - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_801387CC - .asciz "/*---------------- BGCheck バッファーメモリサイズ -------------*/\n" - # EUC-JP: バッファーメモリサイズ | Buffer memory size - .balign 4 - -glabel D_80138810 - .asciz "/* BGCheck LonLonサイズ %dbyte */\n" - # EUC-JP: サイズ | Size - .balign 4 - -glabel D_80138834 - .asciz "/* BGCheck ミニサイズ %dbyte */\n" - # EUC-JP: ミニサイズ | Mini size - .balign 4 - -glabel D_80138858 - .asciz "/* BGCheck Spot用サイズ %dbyte */\n" - # EUC-JP: 用サイズ | For size? - .balign 4 - -glabel D_8013887C - .asciz "/* BGCheck ノーマルサイズ %dbyte */\n" - # EUC-JP: ノーマルサイズ | Normal size - .balign 4 - -glabel D_801388A4 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_801388B4 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_801388C4 - .asciz "\x1b[32m" - .balign 4 - -glabel D_801388CC - .asciz "/*---結局 BG使用サイズ %dbyte---*/\n" - # EUC-JP: 結局 BG使用サイズ | After, use BG size - .balign 4 - -glabel D_801388F0 - .asciz "\x1b[m" - .balign 4 - -glabel D_801388F4 - .asciz "\x1b[43;30m" - .balign 4 - -glabel D_80138900 - .incbin "baserom.z64", 0xBAFAA0, 0x4C - # .asciz "T_BGCheck_getBGDataInfo():そのbg_actor_indexは使われておりません。index=%d\n" - # EUC-JP: そのbg_actor_indexは使われておりません。| The bg_actor_index is not used. - -glabel D_8013894C - .asciz "\x1b[m" - .balign 4 - -glabel D_80138950 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138960 - .asciz "こいつ,pself_actor->name %d\n" - # EUC-JP: こいつ | This? - .balign 4 - -glabel D_80138980 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138990 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_801389A0 - .asciz "こいつ,pself_actor->name %d\n" - # EUC-JP: こいつ | This? - .balign 4 - -glabel D_801389C0 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_801389D0 - .asciz "こいつ,pself_actor->name %d\n" - # EUC-JP: こいつ | This? - .balign 4 - -glabel D_801389F0 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138A00 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138A10 - .asciz "こいつ,pself_actor->name %d\n" - # EUC-JP: こいつ | This? - .balign 4 - -glabel D_80138A30 - .asciz "pself_actor == NULLで犯人不明\n" - # EUC-JP: で犯人不明 | Unknown - .balign 4 - -glabel D_80138A50 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138A60 - .asciz "こいつ,pself_actor->name %d\n" - # EUC-JP: こいつ | This? - .balign 4 - -glabel D_80138A80 - .asciz "this->short_slist_node_tbl != NULL" - .balign 4 - -glabel D_80138AA4 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138AB4 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138AC4 - .asciz "this->polygon_check != NULL" - .balign 4 - -glabel D_80138AE0 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138AF0 - .asciz "this->short_slist_node_last_index < this->short_slist_node_size" - .balign 4 - -glabel D_80138B30 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138B40 - .incbin "baserom.z64", 0xBAFCE0, 0x28 - -glabel D_80138B68 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138B78 - .incbin "baserom.z64", 0xBAFD18, 0x14 - -glabel D_80138B8C - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138B9C - .incbin "baserom.z64", 0xBAFD3C, 0x14 - -glabel D_80138BB0 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138BC0 - .asciz "\x1b[31m" - .balign 4 - -glabel D_80138BC8 - .asciz "DynaPolyInfo_setActor():ダイナミックポリゴン 空きインデックスはありません\n" - # EUC-JP: Dynamic Polygon No Index Available - .balign 4 - -glabel D_80138C14 - .asciz "\x1b[m" - .balign 4 - -glabel D_80138C18 - .asciz "\x1b[32m" - .balign 4 - -glabel D_80138C20 - .asciz "DynaPolyInfo_setActor():index %d\n" - .balign 4 - -glabel D_80138C44 - .asciz "\x1b[m" - .balign 4 - -glabel D_80138C48 - .asciz "\x1b[32m" - .balign 4 - -glabel D_80138C50 - .asciz "DynaPolyInfo_delReserve():index %d\n" - .balign 4 - -glabel D_80138C74 - .asciz "\x1b[m" - .balign 4 - -glabel D_80138C78 - .asciz "\x1b[32m" - .balign 4 - -glabel D_80138C80 - .asciz "DynaPolyInfo_delReserve():削除されているはずの(?)\nインデックス(== -1)のため,処理を中止します。\n" - # EUC-JP: 削除されているはずの(?) インデックス(== -1)のため,処理を中止します。 | Processing aborted because the index should be deleted. - .balign 4 - -glabel D_80138CE0 - .asciz "\x1b[m" - .balign 4 - -glabel D_80138CE4 - .asciz "\x1b[31m" - .balign 4 - -glabel D_80138CEC - .asciz "DynaPolyInfo_delReserve():確保していない/出来なかったインデックスの解放のため、処理を中止します。index == %d\n" - # EUC-JP: 確保していない/出来なかったインデックスの解放のため、処理を中止します | Cancel process to release unallocated indexes. - .balign 4 - -glabel D_80138D5C - .asciz "\x1b[m" - .balign 4 - -glabel D_80138D60 - .asciz "\x1b[31m" - .balign 4 - -glabel D_80138D68 - .asciz "DynaPolyInfo_expandSRT():polygon over %dが%dを越えるとダメ\n" - # EUC-JP: が%dを越えるとダメ | Exceeds? - .balign 4 - -glabel D_80138DA4 - .asciz "\x1b[31m" - .balign 4 - -glabel D_80138DAC - .asciz "DynaPolyInfo_expandSRT():vertex over %dが%dを越えるとダメ\n" - # EUC-JP: を越えるとダメ | No more than? - .balign 4 - -glabel D_80138DE8 - .asciz "pdyna_poly_info->poly_num >= *pstart_poly_index + pbgdata->poly_num" - .balign 4 - -glabel D_80138E2C - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138E3C - .asciz "pdyna_poly_info->vert_num >= *pstart_vert_index + pbgdata->vtx_num" - .balign 4 - -glabel D_80138E80 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138E90 - .asciz "\x1b[32m" - .balign 4 - -glabel D_80138E98 - .asciz "DynaPolyInfo_setup():削除 index=%d\n" - # EUC-JP: 削除 | Delete - .balign 4 - -glabel D_80138EBC - .asciz "\x1b[m" - .balign 4 - -glabel D_80138EC0 - .asciz "\x1b[32m" - .balign 4 - -glabel D_80138EC8 - .asciz "DynaPolyInfo_setup():削除 index=%d\n" - # EUC-JP: 削除 | Delete - .balign 4 - -glabel D_80138EEC - .asciz "\x1b[m" - .balign 4 - -glabel D_80138EF0 - .asciz "!IS_ZERO(ac_size)" - .balign 4 - -glabel D_80138F04 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138F14 - .asciz "!IS_ZERO(ac_size)" - .balign 4 - -glabel D_80138F28 - .asciz "../z_bgcheck.c" - .balign 4 - -glabel D_80138F38 - .float 32760 - -glabel D_80138F3C - .float -32760 - -glabel D_80138F40 - .float 3.051851E-05 - -glabel D_80138F44 - .float 0.008 - -glabel D_80138F48 - .float 3.051851E-05 - -glabel D_80138F4C - .float 3.051851E-05 - -glabel D_80138F50 - .float 3.051851E-05 - -glabel D_80138F54 - .float 3.051851E-05 - -glabel D_80138F58 - .float 0.008 - -glabel D_80138F5C - .float 3.051851E-05 - -glabel D_80138F60 - .float 0.008 - -glabel D_80138F64 - .float 0.4 - -glabel D_80138F68 - .float 3.051851E-05 - -glabel D_80138F6C - .float 0.008 - -glabel D_80138F70 - .float 0.4 - -glabel D_80138F74 - .float 3.051851E-05 - -glabel D_80138F78 - .float 3.051851E-05 - -glabel D_80138F7C - .float 3.051851E-05 - -glabel D_80138F80 - .float 3.051851E-05 - -glabel D_80138F84 - .float 3.051851E-05 - -glabel D_80138F88 - .float 3.051851E-05 - -glabel D_80138F8C - .float 0.008 - -glabel D_80138F90 - .float 3.051851E-05 - -glabel D_80138F94 - .float 0.008 - -glabel D_80138F98 - .float 1E+38 - -glabel D_80138F9C - .float 1.1 - -glabel D_80138FA0 - .float 32767 - -glabel D_80138FA4 - .float 0.008 - -glabel D_80138FA8 - .float -0.8 - -glabel D_80138FAC - .float 3.051851E-05 - -glabel D_80138FB0 - .float 0.008 - -glabel D_80138FB4 - .float 0.008 - -glabel D_80138FB8 - .float 0.4 - -glabel D_80138FBC - .float 0.008 - -glabel D_80138FC0 - .float 0.4 - -glabel D_80138FC4 - .float 3.051851E-05 - -glabel D_80138FC8 - .float 3.051851E-05 |
