Skip to content

Commit

Permalink
name 3CB130 backgrounds
Browse files Browse the repository at this point in the history
  • Loading branch information
RevoSucks committed Sep 23, 2024
1 parent 9e0dd9b commit eb3f83d
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions include/sections.h
Original file line number Diff line number Diff line change
Expand Up @@ -438,8 +438,8 @@ extern u8 n64_logo_texture_ROM_START[]; // 3B96B0
extern u8 n64_logo_texture_ROM_END[]; // 3B96B0
extern u8 fonts_ROM_START[]; // 3BA190
extern u8 fonts_ROM_END[]; // 3BA190
extern u8 _3CB130_ROM_START[];
extern u8 _3CB130_ROM_END[];
extern u8 backgrounds_ROM_START[]; // 3CB130
extern u8 backgrounds_ROM_END[]; // 3CB130
extern u8 _45B580_ROM_START[];
extern u8 _45B580_ROM_END[];
extern u8 _4A21C0_ROM_START[];
Expand Down
2 changes: 1 addition & 1 deletion linker_scripts/us/symbol_addrs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ fragment76_ROM_START = 0x3B9590; // defined:true
fragment77_ROM_START = 0x3B9620; // defined:true
n64_logo_texture_ROM_START = 0x3B96B0; // defined:true
fonts_ROM_START = 0x3BA190; // defined:true
_3CB130_ROM_START = 0x3CB130; // defined:true
backgrounds_ROM_START = 0x3CB130; // defined:true
_45B580_ROM_START = 0x45B580; // defined:true
_4A21C0_ROM_START = 0x4A21C0; // defined:true
_4BD6B0_ROM_START = 0x4BD6B0; // defined:true
Expand Down
2 changes: 1 addition & 1 deletion src/fragments/36/fragment36.c
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ void func_82100B98(void) {
D_82100EB8 = main_pool_alloc(0x4510, 0);
D_82100EBC = main_pool_alloc(0x100000, 0);

D_82100EB0 = ASSET_LOAD2(_3CB130, _3CB130, 1, 1);
D_82100EB0 = ASSET_LOAD2(backgrounds, backgrounds, 1, 1);

if (D_82100EA8.unk_00 == 0x1F8) {
D_82100EB4 = func_8000484C(D_82100EB0, 0x11);
Expand Down
2 changes: 1 addition & 1 deletion src/fragments/37/fragment37.c
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ void func_82202B60(void) {
}

void func_82202CB8(void) {
D_822030F4 = ASSET_LOAD2(_3CB130, _3CB130, 1, 1);
D_822030F4 = ASSET_LOAD2(backgrounds, backgrounds, 1, 1);

if (D_822031E8.unk_00 == 2) {
if (D_800AE540.unk_11F2 == 0) {
Expand Down
2 changes: 1 addition & 1 deletion yamls/us/rom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2429,7 +2429,7 @@
# assets
- [0x3B96B0, bin, n64_logo_texture]
- [0x3BA190, bin, fonts]
- [0x3CB130, bin]
- [0x3CB130, bin, backgrounds]
- [0x45B580, bin]
- [0x4A21C0, bin]
- [0x4BD6B0, bin] # like a common assets bin?
Expand Down

0 comments on commit eb3f83d

Please sign in to comment.