Skip to content

Commit 4eeaab4

Browse files
committed
finish first pass of asset bin labeling
1 parent 8b69bff commit 4eeaab4

File tree

4 files changed

+33
-29
lines changed

4 files changed

+33
-29
lines changed

include/sections.h

+4
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,10 @@ extern u8 battle_ui_ROM_START[];
514514
extern u8 battle_ui_ROM_END[];
515515
extern u8 transfer_pak_error_ui_ROM_START[];
516516
extern u8 transfer_pak_error_ui_ROM_END[];
517+
extern u8 badge_ui_ROM_START[];
518+
extern u8 badge_ui_ROM_END[];
519+
extern u8 gym_leader_castle_ui_ROM_START[];
520+
extern u8 gym_leader_castle_ui_ROM_END[];
517521

518522
extern u8 D_124570[];
519523

linker_scripts/us/symbol_addrs.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -221,15 +221,15 @@ battle_ui_ROM_START = 0x6E2FC0; // defined:true
221221
transfer_pak_error_ui_ROM_START = 0x6E8910; // defined:true
222222
_6EB340_ROM_START = 0x6EB340; // defined:true
223223
_6EC4D0_ROM_START = 0x6EC4D0; // defined:true
224-
_6ECE80_ROM_START = 0x6ECE80; // defined:true
225-
_701E50_ROM_START = 0x701E50; // defined:true
224+
badge_ui_ROM_START = 0x6ECE80; // defined:true
225+
gym_leader_castle_ui_ROM_START = 0x701E50; // defined:true
226226
_70D3A0_ROM_START = 0x70D3A0; // defined:true
227227
_7820E0_ROM_START = 0x7820E0; // defined:true
228228
textdata_ROM_START = 0x783760; // defined:true
229229
_798CD0_ROM_START = 0x798CD0; // defined:true
230-
_7994B0_ROM_START = 0x7994B0; // defined:true
231-
_79AFB0_ROM_START = 0x79AFB0; // defined:true
232-
_79AFB0_ROM_END = 0x79B8F0; // defined:true
230+
snap_mode_ui_ROM_START = 0x7994B0; // defined:true
231+
copyright_ROM_START = 0x79AFB0; // defined:true
232+
copyright_ROM_END = 0x79B8F0; // defined:true
233233
D_86002B84 = 0x86002B84; // size:3
234234
D_86002B88 = 0x86002B88; // size:3
235235
_binary_assets_us_F3DEX2_bin_start = 0x80066090; // defined:true

src/2FEA0.c

+16-16
Original file line numberDiff line numberDiff line change
@@ -31,67 +31,67 @@ void func_8002F2A0(void) {
3131
FRAGMENT_LOAD(fragment34);
3232

3333
switch (sp60) {
34-
case 1:
34+
case 1: // magikarp minigame
3535
FRAGMENT_LOAD(fragment4);
3636
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment6, 0, 0);
3737
break;
38-
case 2:
38+
case 2: // clefairy minigame
3939
FRAGMENT_LOAD(fragment4);
4040
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment7, 0, 0);
4141
break;
42-
case 3:
42+
case 3: // rattata minigame
4343
FRAGMENT_LOAD(fragment4);
4444
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment8, 0, 0);
4545
break;
46-
case 4:
46+
case 4: // unfinished jigglypuff minigame
4747
FRAGMENT_LOAD(fragment4);
4848
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment9, 0, 0);
4949
break;
50-
case 5:
50+
case 5: // drowzee minigame
5151
FRAGMENT_LOAD(fragment5);
5252
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment10, 0, 0);
5353
break;
54-
case 6:
54+
case 6: // pikachu minigame
5555
FRAGMENT_LOAD(fragment5);
5656
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment11, 0, 0);
5757
break;
58-
case 7:
58+
case 7: // "minigame 7 sample" model viewer. debug placeholder?
5959
FRAGMENT_LOAD(fragment5);
6060
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment12, 0, 0);
6161
break;
62-
case 8:
62+
case 8: // "minigame 8 sample" model viewer. debug placeholder?
6363
FRAGMENT_LOAD(fragment5);
6464
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment13, 0, 0);
6565
break;
66-
case 9:
66+
case 9: // sushi go round
6767
FRAGMENT_LOAD(fragment3);
6868
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment14, 0, 0);
6969
break;
70-
case 10:
70+
case 10: // doesnt seem to load... crashes the game
7171
FRAGMENT_LOAD(fragment3);
7272
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment15, 0, 0);
7373
break;
74-
case 11:
74+
case 11: // credits? why from the kids club?
7575
FRAGMENT_LOAD(fragment5);
7676
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment16, 0, 0);
7777
break;
78-
case 12:
78+
case 12: // also crashes.
7979
FRAGMENT_LOAD(fragment3);
8080
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment17, 0, 0);
8181
break;
82-
case 13:
82+
case 13: // ekans minigame
8383
FRAGMENT_LOAD(fragment3);
8484
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment18, 0, 0);
8585
break;
86-
case 14:
86+
case 14: // crashes...
8787
FRAGMENT_LOAD(fragment3);
8888
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment19, 0, 0);
8989
break;
90-
case 15:
90+
case 15: //
9191
FRAGMENT_LOAD(fragment3);
9292
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment20, 0, 0);
9393
break;
94-
case 16:
94+
case 16: // sandshrew minigame
9595
FRAGMENT_LOAD(fragment3);
9696
var_s0 = FRAGMENT_LOAD_AND_CALL(fragment21, 0, 0);
9797
break;

yamls/us/rom.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@
840840
subsegments:
841841
- [0x142200, rodatabin, fragments/11/fragment11_reloc]
842842

843-
# transfer pak error code
843+
# debug model viewer/minigame sample
844844
- name: fragment12
845845
type: code
846846
bss_size: 0x180
@@ -2472,15 +2472,15 @@
24722472
- [0x6E2FC0, bin, battle_ui]
24732473
- [0x6E8910, bin, transfer_pak_error_ui]
24742474
- [0x6EB340, bin] # pokedex area flags?
2475-
- [0x6EC4D0, bin]
2476-
- [0x6ECE80, bin]
2477-
- [0x701E50, bin]
2478-
- [0x70D3A0, bin]
2479-
- [0x7820E0, bin]
2475+
- [0x6EC4D0, bin] # another UI bin related to GB paks as its loaded whenever there is GB pak elements, however it doesnt seem(?) to be used.
2476+
- [0x6ECE80, bin, badge_ui]
2477+
- [0x701E50, bin, gym_leader_castle_ui]
2478+
- [0x70D3A0, bin] # maybe model animation related?
2479+
- [0x7820E0, bin]
24802480
- [0x783760, bin, textdata]
24812481
- [0x798CD0, bin]
2482-
- [0x7994B0, bin]
2483-
- [0x79AFB0, bin]
2482+
- [0x7994B0, bin, snap_mode_ui]
2483+
- [0x79AFB0, bin, copyright]
24842484
- [0x79B8F0]
24852485

24862486

0 commit comments

Comments
 (0)