mirror of
https://github.com/ACreTeam/ac-decomp
synced 2026-09-13 03:45:05 -04:00
Merge branch 'master' of https://github.com/Prakxo/ac-decomp
This commit is contained in:
@@ -145,3 +145,186 @@ config/rel.yml:
|
||||
type: vtx
|
||||
g_wipe1_txt:
|
||||
addrs: [0x80652C60, 0x80653460]
|
||||
mFM_beach_pal_0:
|
||||
addrs: [0x80C59CA8, 0x80C59CC8]
|
||||
type: pal16
|
||||
mFM_beach_pal_1:
|
||||
addrs: [0x80C59CC8, 0x80C59CE8]
|
||||
type: pal16
|
||||
mFM_beach_pal_2:
|
||||
addrs: [0x80C59CE8, 0x80C59D08]
|
||||
type: pal16
|
||||
mFM_beach_pal_3:
|
||||
addrs: [0x80C59D08, 0x80C59D28]
|
||||
type: pal16
|
||||
mFM_beach_pal_4:
|
||||
addrs: [0x80C59D28, 0x80C59D48]
|
||||
type: pal16
|
||||
mFM_beach_pal_5:
|
||||
addrs: [0x80C59D48, 0x80C59D68]
|
||||
type: pal16
|
||||
mFM_beach_pal_6:
|
||||
addrs: [0x80C59D68, 0x80C59D88]
|
||||
type: pal16
|
||||
mFM_beach_pal_7:
|
||||
addrs: [0x80C59D88, 0x80C59DA8]
|
||||
type: pal16
|
||||
mFM_beach_pal_8:
|
||||
addrs: [0x80C59DA8, 0x80C59DC8]
|
||||
type: pal16
|
||||
mFM_beach_pal_9:
|
||||
addrs: [0x80C59DC8, 0x80C59DE8]
|
||||
type: pal16
|
||||
mFM_beach_pal_10:
|
||||
addrs: [0x80C59DE8, 0x80C59E08]
|
||||
type: pal16
|
||||
mFM_beach_pal_11:
|
||||
addrs: [0x80C59E08, 0x80C59E28]
|
||||
type: pal16
|
||||
mFM_bush_pal_0:
|
||||
addrs: [0x80C78680, 0x80C786A0]
|
||||
type: pal16
|
||||
mFM_bush_pal_1:
|
||||
addrs: [0x80C786A0, 0x80C786C0]
|
||||
type: pal16
|
||||
mFM_bush_pal_2:
|
||||
addrs: [0x80C786C0, 0x80C786E0]
|
||||
type: pal16
|
||||
mFM_bush_pal_3:
|
||||
addrs: [0x80C786E0, 0x80C78700]
|
||||
type: pal16
|
||||
mFM_bush_pal_4:
|
||||
addrs: [0x80C78700, 0x80C78720]
|
||||
type: pal16
|
||||
mFM_bush_pal_5:
|
||||
addrs: [0x80C78720, 0x80C78740]
|
||||
type: pal16
|
||||
mFM_bush_pal_6:
|
||||
addrs: [0x80C78740, 0x80C78760]
|
||||
type: pal16
|
||||
mFM_bush_pal_7:
|
||||
addrs: [0x80C78760, 0x80C78780]
|
||||
type: pal16
|
||||
mFM_bush_pal_8:
|
||||
addrs: [0x80C78780, 0x80C787A0]
|
||||
type: pal16
|
||||
mFM_bush_pal_9:
|
||||
addrs: [0x80C787A0, 0x80C787C0]
|
||||
type: pal16
|
||||
mFM_bush_pal_10:
|
||||
addrs: [0x80C787C0, 0x80C787E0]
|
||||
type: pal16
|
||||
mFM_bush_pal_11:
|
||||
addrs: [0x80C787E0, 0x80C78800]
|
||||
type: pal16
|
||||
mFM_cliff_pal_0:
|
||||
addrs: [0x80C78988, 0x80C789A8]
|
||||
type: pal16
|
||||
mFM_cliff_pal_1:
|
||||
addrs: [0x80C789A8, 0x80C789C8]
|
||||
type: pal16
|
||||
mFM_cliff_pal_2:
|
||||
addrs: [0x80C789C8, 0x80C789E8]
|
||||
type: pal16
|
||||
mFM_cliff_pal_3:
|
||||
addrs: [0x80C789E8, 0x80C78A08]
|
||||
type: pal16
|
||||
mFM_cliff_pal_4:
|
||||
addrs: [0x80C78A08, 0x80C78A28]
|
||||
type: pal16
|
||||
mFM_cliff_pal_5:
|
||||
addrs: [0x80C78A28, 0x80C78A48]
|
||||
type: pal16
|
||||
mFM_cliff_pal_6:
|
||||
addrs: [0x80C78A48, 0x80C78A68]
|
||||
type: pal16
|
||||
mFM_cliff_pal_7:
|
||||
addrs: [0x80C78A68, 0x80C78A88]
|
||||
type: pal16
|
||||
mFM_cliff_pal_8:
|
||||
addrs: [0x80C78A88, 0x80C78AA8]
|
||||
type: pal16
|
||||
mFM_cliff_pal_9:
|
||||
addrs: [0x80C78AA8, 0x80C78AC8]
|
||||
type: pal16
|
||||
mFM_cliff_pal_10:
|
||||
addrs: [0x80C78AC8, 0x80C78AE8]
|
||||
type: pal16
|
||||
mFM_cliff_pal_11:
|
||||
addrs: [0x80C78AE8, 0x80C78B08]
|
||||
type: pal16
|
||||
mFM_earth_pal_0:
|
||||
addrs: [0x80C90100, 0x80C90120]
|
||||
type: pal16
|
||||
mFM_earth_pal_1:
|
||||
addrs: [0x80C90120, 0x80C90140]
|
||||
type: pal16
|
||||
mFM_earth_pal_2:
|
||||
addrs: [0x80C90140, 0x80C90160]
|
||||
type: pal16
|
||||
mFM_earth_pal_3:
|
||||
addrs: [0x80C90160, 0x80C90180]
|
||||
type: pal16
|
||||
mFM_earth_pal_4:
|
||||
addrs: [0x80C90180, 0x80C901A0]
|
||||
type: pal16
|
||||
mFM_earth_pal_5:
|
||||
addrs: [0x80C901A0, 0x80C901C0]
|
||||
type: pal16
|
||||
mFM_earth_pal_6:
|
||||
addrs: [0x80C901C0, 0x80C901E0]
|
||||
type: pal16
|
||||
mFM_earth_pal_7:
|
||||
addrs: [0x80C901E0, 0x80C90200]
|
||||
type: pal16
|
||||
mFM_earth_pal_8:
|
||||
addrs: [0x80C90200, 0x80C90220]
|
||||
type: pal16
|
||||
mFM_earth_pal_9:
|
||||
addrs: [0x80C90220, 0x80C90240]
|
||||
type: pal16
|
||||
mFM_earth_pal_10:
|
||||
addrs: [0x80C90240, 0x80C90260]
|
||||
type: pal16
|
||||
mFM_earth_pal_11:
|
||||
addrs: [0x80C90260, 0x80C90280]
|
||||
type: pal16
|
||||
mFM_rail_pal_0:
|
||||
addrs: [0x80F8C2C8, 0x80F8C2E8]
|
||||
type: pal16
|
||||
mFM_rail_pal_1:
|
||||
addrs: [0x80F8C2E8, 0x80F8C308]
|
||||
type: pal16
|
||||
mFM_rail_pal_2:
|
||||
addrs: [0x80F8C308, 0x80F8C328]
|
||||
type: pal16
|
||||
mFM_rail_pal_3:
|
||||
addrs: [0x80F8C328, 0x80F8C348]
|
||||
type: pal16
|
||||
mFM_rail_pal_4:
|
||||
addrs: [0x80F8C348, 0x80F8C368]
|
||||
type: pal16
|
||||
mFM_rail_pal_5:
|
||||
addrs: [0x80F8C368, 0x80F8C388]
|
||||
type: pal16
|
||||
mFM_rail_pal_6:
|
||||
addrs: [0x80F8C388, 0x80F8C3A8]
|
||||
type: pal16
|
||||
mFM_rail_pal_7:
|
||||
addrs: [0x80F8C3A8, 0x80F8C3C8]
|
||||
type: pal16
|
||||
mFM_rail_pal_8:
|
||||
addrs: [0x80F8C3C8, 0x80F8C3E8]
|
||||
type: pal16
|
||||
mFM_rail_pal_9:
|
||||
addrs: [0x80F8C3E8, 0x80F8C408]
|
||||
type: pal16
|
||||
mFM_rail_pal_10:
|
||||
addrs: [0x80F8C408, 0x80F8C428]
|
||||
type: pal16
|
||||
mFM_rail_pal_11:
|
||||
addrs: [0x80F8C428, 0x80F8C448]
|
||||
type: pal16
|
||||
mFM_rail_pal_12:
|
||||
addrs: [0x80F8C448, 0x80F8C468]
|
||||
type: pal16
|
||||
|
||||
@@ -7,3 +7,5 @@ symbol_aligns:
|
||||
0x81361820 : 0x20 # S_back_title_timer
|
||||
0x806D4D40: 32 # align fFTR_myhome_off_pal_table to 32 bytes
|
||||
0x8064F860: 32 # data right after m_camera2 TU
|
||||
0x80C78B20: 32 # mFM_grd_s_cliff_tex
|
||||
0x80F8C460: 32 # mFM_grd_s_rail_tex
|
||||
@@ -34,6 +34,8 @@ m_banti.c:
|
||||
.rodata: [0x80641388, 0x806413E0]
|
||||
.data: [0x8064F548, 0x8064F658]
|
||||
.bss: [0x8125A830, 0x8125AC80]
|
||||
m_bg_tex.c:
|
||||
.bss: [0x8125AC80, 0x81263080]
|
||||
m_bg_item.c:
|
||||
.text: [0x80378858, 0x803789F8]
|
||||
.rodata: [0x806413E0, 0x806413F0]
|
||||
@@ -78,6 +80,11 @@ m_fbdemo_fade.c:
|
||||
.text: [0x803A12F8, 0x803A1508]
|
||||
.rodata: [0x80641FC0, 0x80641FD8]
|
||||
.data: [0x80653558, 0x806535A0]
|
||||
m_field_make.c:
|
||||
.text: [0x803A22C4, 0x803A4D68]
|
||||
.rodata: [0x80641FE0, 0x80642008]
|
||||
.data: [0x80653620, 0x80653E28]
|
||||
.bss: [0x812957A0, 0x81295A88]
|
||||
m_fishrecord.c:
|
||||
.text: [0x803AB698, 0x803AC5C8]
|
||||
.rodata: [0x80642068, 0x80642080]
|
||||
@@ -449,3 +456,13 @@ data/titledemo/pact3.c:
|
||||
.data: [0x80C43D18, 0x80C44B98]
|
||||
data/titledemo/pact4.c:
|
||||
.data: [0x80C44B98, 0x80C45A08]
|
||||
data/field/bg/beach_pal.c:
|
||||
.data: [0x80C59CA8, 0x80C59E28]
|
||||
data/field/bg/bush_pal.c:
|
||||
.data: [0x80C78680, 0x80C78800]
|
||||
data/field/bg/cliff_pal.c:
|
||||
.data: [0x80C78988, 0x80C78B20]
|
||||
data/field/bg/earth_pal.c:
|
||||
.data: [0x80C90100, 0x80C90280]
|
||||
data/field/bg/rail_pal.c:
|
||||
.data: [0x80F8C2C8, 0x80F8C460]
|
||||
Reference in New Issue
Block a user