Updated segment offsets to match real jp ones (#250)

This commit is contained in:
Lywx 2024-05-15 19:26:19 -06:00 committed by GitHub
parent 1a5569bef5
commit 8019fb0fe2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
50 changed files with 280 additions and 391 deletions

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x07, 0xA0E340]
- [0x07, 0x9DE6E0]
header:
code:
- '#include "assets/ast_7_ti_1.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x07, 0x9DD390]
- [0x07, 0x9AD730]
header:
code:
- '#include "assets/ast_7_ti_2.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x08, 0x9EB5E0]
- [0x08, 0x9BB980]
header:
code:
- '#include "assets/ast_8_ti.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x09, 0x9F4880]
- [0x09, 0x9C4C20]
header:
code:
- '#include "assets/ast_9_ti.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x0A, 0xA049A0]
- [0x0A, 0x9D4D40]
header:
code:
- '#include "assets/ast_A_ti.h"'
@ -58,4 +58,3 @@ D_TI_A002170:
D_TI_A009990:
{type: SF64:ANIM, offset: 0xA009990, symbol: D_TI_A009990}

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x0D, 0x955270]
- [0x0D, 0x9257A0]
header:
code:
- '#include "assets/ast_allies.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x0C, 0xCE9E70]
- [0x0C, 0xCAEA30]
header:
code:
- '#include "assets/ast_andross.h"'
@ -267,6 +267,3 @@ D_ANDROSS_C039290:
D_ANDROSS_C03A290:
{type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0xC03A290, symbol: D_ANDROSS_C03A290}

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x06, 0xA58F60]
- [0x06, 0xA28E60]
header:
code:
- '#include "assets/ast_aquas.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x06, 0xA8B470]
- [0x06, 0xA5B8F0]
header:
code:
- '#include "assets/ast_area_6.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x3, 0x8BFC00]
- [0x3, 0x88F730]
header:
code:
- '#include "assets/ast_arwing.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x02, 0x8AE0A0]
- [0x02, 0x87DBD0]
header:
code:
- '#include "assets/ast_bg_planet.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x02, 0x8A68C0]
- [0x02, 0x8763F0]
header:
code:
- '#include "assets/ast_bg_space.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x03, 0x8E1F80]
- [0x03, 0x8B1AB0]
header:
code:
- '#include "assets/ast_blue_marine.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x06, 0xB0AA00]
- [0x06, 0xAD8050]
header:
code:
- '#include "assets/ast_bolse.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x1, 0x873CB0]
- [0x1, 0x844660]
header:
code:
- '#include "assets/ast_common.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x06, 0x961CE0]
- [0x06, 0x932200]
header:
code:
- '#include "assets/ast_corneria.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x07, 0xD27600]
- [0x07, 0xCEB3C0]
header:
code:
- '#include "assets/ast_ending.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x08, 0xD68480]
- [0x08, 0xD2C240]
header:
code:
- '#include "assets/ast_ending_award_back.h"'
@ -10,4 +10,3 @@
ending_award_back:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 316, height: 270, offset: 0x8000000, symbol: gEndingAwardBack }

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x08, 0xD43400]
- [0x08, 0xD071C0]
header:
code:
- '#include "assets/ast_ending_award_front.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x08, 0xD91F10]
- [0x08, 0xD55CD0]
header:
code:
- '#include "assets/ast_ending_expert.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x04, 0x918430]
- [0x04, 0x8E8AE0]
header:
code:
- '#include "assets/ast_enmy_planet.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x04, 0x922730]
- [0x04, 0x8F2DE0]
header:
code:
- '#include "assets/ast_enmy_space.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x09, 0xCDDCA0]
- [0x09, 0xCA2860]
header:
code:
- '#include "assets/ast_font_3d.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x6, 0xB1CA50]
- [0x6, 0xAE9DC0]
header:
code:
- '#include "assets/ast_fortuna.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0xE, 0x92EC40]
- [0xE, 0x8FF2F0]
header:
code:
- '#include "assets/ast_great_fox.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x6, 0xBB11D0]
- [0x6, 0xB7E0B0]
header:
code:
- '#include "assets/ast_katina.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x3, 0x8D99F0]
- [0x3, 0x8A9520]
header:
code:
- '#include "assets/ast_landmaster.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x0F, 0xD25100]
- [0x0F, 0xCE8EC0]
header:
code:
- '#include "assets/ast_logo.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x06, 0xBC23D0]
- [0x06, 0xB8F2B0]
header:
code:
- '#include "assets/ast_macbeth.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x06, 0xC48F40]
- [0x06, 0xC12690]
header:
code:
- '#include "assets/ast_map.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x06, 0x9A1460]
- [0x06, 0x971980]
header:
code:
- '#include "assets/ast_meteo.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x08, 0xCA9DE0]
- [0x08, 0xC6FA00]
header:
code:
- '#include "assets/ast_option.h"'

View File

@ -1,101 +0,0 @@
:config:
segments:
- [0x8, 0xDE5D50]
tables:
gTextCharTextures:
range: [0x0, 0x958]
mode: APPEND
header:
code:
- '#include "sf64mesg.h"'
- ''
- '// clang-format off'
- 'typedef enum {'
- ' END, NWL, NP2, NP3, NP4, NP5, NP6, NP7,'
- ' PRI0, PRI1, PRI2, PRI3, SPC, HSP, QSP, NXT,'
- ' CLF, CUP, CRT, CDN, AUP, ALF, ADN, ART,'
- ' _A, _B, _C, _D, _E, _F, _G, _H,'
- ' _I, _J, _K, _L, _M, _N, _O, _P,'
- ' _Q, _R, _S, _T, _U, _V, _W, _X,'
- ' _Y, _Z, _a, _b, _c, _d, _e, _f,'
- ' _g, _h, _i, _j, _k, _l, _m, _n,'
- ' _o, _p, _q, _r, _s, _t, _u, _v,'
- ' _w, _x, _y, _z, EXM, QST, DSH, CMA,'
- ' PRD, _0, _1, _2, _3, _4, _5, _6,'
- ' _7, _8, _9, APS, LPR, RPR, CLN, PIP,'
- '} CharCode;'
text_char_special_0:
{ type: TEXTURE, offset: 0x0, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharSpecial0 }
text_char_special_4:
{ type: TEXTURE, offset: 0x68, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharSpecial4 }
text_char_special_8:
{ type: TEXTURE, offset: 0xD0, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharSpecial8 }
text_char_special_12:
{ type: TEXTURE, offset: 0x138, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharSpecial12 }
text_char_cdir:
{ type: TEXTURE, offset: 0x1A0, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharCDIR }
text_char_adir:
{ type: TEXTURE, offset: 0x208, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharADIR }
text_char_abcd_upper:
{ type: TEXTURE, offset: 0x270, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharABCD }
text_char_efgh_upper:
{ type: TEXTURE, offset: 0x2D8, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharEFGH }
text_char_ijkl_upper:
{ type: TEXTURE, offset: 0x340, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharIJKL }
text_char_mnop_upper:
{ type: TEXTURE, offset: 0x3A8, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharMNOP }
text_char_qrst_upper:
{ type: TEXTURE, offset: 0x410, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharQRST }
text_char_uvwx_upper:
{ type: TEXTURE, offset: 0x478, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharUVWX }
text_char_yzab_both:
{ type: TEXTURE, offset: 0x4E0, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharYZABBoth }
text_char_cdef_lower:
{ type: TEXTURE, offset: 0x548, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharCDEFLower }
text_char_ghij_lower:
{ type: TEXTURE, offset: 0x5B0, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharGHIJLower }
text_char_klmn_lower:
{ type: TEXTURE, offset: 0x618, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharKLMNLower }
text_char_opqr_lower:
{ type: TEXTURE, offset: 0x680, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharOPQRLower }
text_char_stuv_lower:
{ type: TEXTURE, offset: 0x6E8, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharSTUVLower }
text_char_wxyz_lower:
{ type: TEXTURE, offset: 0x750, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharWXYZLower }
text_char_pidc:
{ type: TEXTURE, offset: 0x7B8, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharPIDC }
text_char_p012:
{ type: TEXTURE, offset: 0x820, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharP012 }
text_char_3456:
{ type: TEXTURE, offset: 0x888, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextChar3456 }
text_char_789a:
{ type: TEXTURE, offset: 0x8F0, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextChar789A }
text_char_ppdp:
{ type: TEXTURE, offset: 0x958, width: 16, height: 13, format: CI4, ctype: u8, symbol: gTextCharPPDP }
message_table:
{ type: SF64:MSG_TABLE, offset: 0xCCAC, vram: 0x80179010, ctype: u8, symbol: gMsgLookup }

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x06, 0xA1D0F0]
- [0x06, 0x9ED490]
header:
code:
- '#include "assets/ast_sector_x.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x06, 0xB2CA50]
- [0x06, 0xAF9DC0]
header:
code:
- '#include "assets/ast_sector_y.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x06, 0xA4FBB0]
- [0x06, 0xA1FCD0]
header:
code:
- '#include "assets/ast_sector_z.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x06, 0xB612E0]
- [0x06, 0xB2E3F0]
header:
code:
- '#include "assets/ast_solar.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x0F, 0x940AD0]
- [0x0F, 0x911000]
header:
code:
- '#include "assets/ast_star_wolf.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x05, 0xCD2410]
- [0x05, 0xC98590]
header:
code:
- '#include "assets/ast_text.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x06, 0x9D2FD0]
- [0x06, 0x9A3370]
header:
code:
- '#include "assets/ast_titania.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x06, 0xBFC510]
- [0x06, 0xBC9230]
header:
code:
- '#include "assets/ast_title.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x6, 0xDDC010]
- [0x6, 0xD9FDD0]
header:
code:
- '#include "assets/ast_training.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x09, 0xAE60A0]
- [0x09, 0xAB36F0]
header:
code:
- '#include "assets/ast_ve1_boss.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x6, 0xAB4000]
- [0x6, 0xA84390]
header:
code:
- '#include "assets/ast_venom_1.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x6, 0xACF960]
- [0x6, 0xA9E570]
header:
code:
- '#include "assets/ast_venom_2.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x03, 0x8E92D0]
- [0x03, 0x8B8E00]
header:
code:
- '#include "assets/ast_versus.h"'
@ -760,4 +760,3 @@ D_versus_302EB3C:
D_versus_302EC20:
{type: VEC3F, count: 25, offset: 0x302EC20, symbol: D_versus_302EC20}

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x07, 0xCBFE70]
- [0x07, 0xC83960]
header:
code:
- '#include "assets/ast_vs_menu.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x07, 0xBFA740]
- [0x07, 0xBC7460]
header:
code:
- '#include "assets/ast_warp_zone.h"'

View File

@ -1,6 +1,6 @@
:config:
segments:
- [0x06, 0xB84560]
- [0x06, 0xB51670]
header:
code:
- '#include "assets/ast_zoness.h"'
@ -561,6 +561,3 @@ D_ZO_602C2CC:
D_ZO_602CACC:
{type: SF64:TRIANGLE, count: 30, offset: 0x602CACC, symbol: D_ZO_602CACC, mesh_symbol: D_ZO_OFFSET}

View File

@ -26,7 +26,6 @@ d064229a32cc05ab85e2381ce07744eb3ffaf530:
config:
gbi: F3DEX
sort: OFFSET
logging: ERROR
output:
binary: starship.otr
code: src/assets