Skip to content

Commit de70e9d

Browse files
MokhaLeeeMokhaLeee
committed
debugmenu review
1 parent 2caed9d commit de70e9d

File tree

6 files changed

+277
-46
lines changed

6 files changed

+277
-46
lines changed

‎data/data_banim_085CCC40.s‎

Lines changed: 74 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,88 @@
11
.include "animscr.inc"
2+
.include "gba_sprites.inc"
23
.section .data
34

45
.incbin "fe6-base.gba", 0x5CBE9C, (0x5CCC40 - 0x5CBE9C)
56

67
.global gUnk_085CCC40
78
gUnk_085CCC40: @ 085CCC40
8-
.incbin "fe6-base.gba", 0x5CCC40, (0x5CCDAC - 0x5CCC40) @ length: 016C
9+
.incbin "fe6-base.gba", 0x5CCC40, (0x5CCD28 - 0x5CCC40) @ length: 016C
910

10-
.global AnimScr_EkrTerrainfx_R_Far
11-
AnimScr_EkrTerrainfx_R_Far: @ 085CCDAC
12-
.incbin "fe6-base.gba", 0x5CCDAC, (0x5CCE38 - 0x5CCDAC) @ length: 008C
11+
.global AnimSprite_EkrTerrainfx_R_Far
12+
AnimSprite_EkrTerrainfx_R_Far: @ 0x5CCD28
13+
ANIM_SPRITE ATTR0_WIDE, ATTR1_SIZE_32, 0x0000, -48, 8
14+
ANIM_SPRITE ATTR0_WIDE, ATTR1_SIZE_32, 0x0004, -16, 8
15+
ANIM_SPRITE ATTR0_WIDE, ATTR1_SIZE_32, 0x0008, 16, 8
16+
ANIM_SPRITE ATTR0_TALL, ATTR1_SIZE_8, 0x000C, 48, 8
17+
ANIM_SPRITE ATTR0_WIDE, ATTR1_SIZE_32, 0x000D, -48, -8
18+
ANIM_SPRITE ATTR0_WIDE, ATTR1_SIZE_32, 0x0011, -16, -8
19+
ANIM_SPRITE ATTR0_WIDE, ATTR1_SIZE_32, 0x0015, 16, -8
20+
ANIM_SPRITE ATTR0_WIDE, ATTR1_SIZE_16, 0x0019, -48, -16
21+
ANIM_SPRITE ATTR0_WIDE, ATTR1_SIZE_8, 0x001D, -16, -16
22+
ANIM_SPRITE ATTR0_WIDE, ATTR1_SIZE_16, 0x0039, 0, -16
23+
ANIM_SPRITE_END
1324

14-
.global AnimScr_EkrTerrainfx_L_Far
15-
AnimScr_EkrTerrainfx_L_Far: @ 085CCE38
16-
.incbin "fe6-base.gba", 0x5CCE38, (0x5CCEB8 - 0x5CCE38) @ length: 0080
25+
.global AnimScr_EkrTerrainfx_R_Far
26+
AnimScr_EkrTerrainfx_R_Far: @ 0x5CCDAC
27+
ANIMSCR_FORCE_SPRITE AnimSprite_EkrTerrainfx_R_Far, 4
28+
ANIMSCR_BLOCKED
1729

18-
.global AnimScr_EkrTerrainfx_R_Close
19-
AnimScr_EkrTerrainfx_R_Close: @ 085CCEB8
20-
.incbin "fe6-base.gba", 0x5CCEB8, (0x5CCF38 - 0x5CCEB8) @ length: 0080
30+
.global AnimSprite_EkrTerrainfx_L_Far
31+
AnimSprite_EkrTerrainfx_L_Far: @ 0x5CCDB4
32+
ANIM_SPRITE_XFLIP ATTR0_WIDE, ATTR1_SIZE_32, 0x0000, 16, 8
33+
ANIM_SPRITE_XFLIP ATTR0_WIDE, ATTR1_SIZE_32, 0x0004, -16, 8
34+
ANIM_SPRITE_XFLIP ATTR0_WIDE, ATTR1_SIZE_32, 0x0008, -48, 8
35+
ANIM_SPRITE_XFLIP ATTR0_TALL, ATTR1_SIZE_8, 0x000C, -56, 8
36+
ANIM_SPRITE_XFLIP ATTR0_WIDE, ATTR1_SIZE_32, 0x000D, 16, -8
37+
ANIM_SPRITE_XFLIP ATTR0_WIDE, ATTR1_SIZE_32, 0x0011, -16, -8
38+
ANIM_SPRITE_XFLIP ATTR0_WIDE, ATTR1_SIZE_32, 0x0015, -48, -8
39+
ANIM_SPRITE_XFLIP ATTR0_WIDE, ATTR1_SIZE_16, 0x0019, 16, -16
40+
ANIM_SPRITE_XFLIP ATTR0_WIDE, ATTR1_SIZE_8, 0x001D, 0, -16
41+
ANIM_SPRITE_XFLIP ATTR0_WIDE, ATTR1_SIZE_16, 0x0039, -32, -16
42+
ANIM_SPRITE_END
2143

22-
.global AnimScr_EkrTerrainfx_L_Close
23-
AnimScr_EkrTerrainfx_L_Close: @ 085CCF38
24-
.incbin "fe6-base.gba", 0x5CCF38, (0x5CDCA4 - 0x5CCF38) @ length: 0D6C
44+
.global AnimScr_EkrTerrainfx_L_Far
45+
AnimScr_EkrTerrainfx_L_Far: @ 0x5CCE38
46+
ANIMSCR_FORCE_SPRITE AnimSprite_EkrTerrainfx_L_Far, 4
47+
ANIMSCR_BLOCKED
48+
49+
.global AnimSprite_EkrTerrainfx_R_Close
50+
AnimSprite_EkrTerrainfx_R_Close: @ 0x5CCE40
51+
ANIM_SPRITE ATTR0_WIDE, ATTR1_SIZE_32, 0x0000, -48, 8
52+
ANIM_SPRITE ATTR0_WIDE, ATTR1_SIZE_32, 0x0004, -16, 8
53+
ANIM_SPRITE ATTR0_SQUARE, ATTR1_SIZE_16, 0x0008, 16, 8
54+
ANIM_SPRITE ATTR0_TALL, ATTR1_SIZE_8, 0x000A, 32, 8
55+
ANIM_SPRITE ATTR0_WIDE, ATTR1_SIZE_32, 0x000B, -48, -8
56+
ANIM_SPRITE ATTR0_WIDE, ATTR1_SIZE_32, 0x000F, -16, -8
57+
ANIM_SPRITE ATTR0_SQUARE, ATTR1_SIZE_16, 0x0013, 16, -8
58+
ANIM_SPRITE ATTR0_WIDE, ATTR1_SIZE_16, 0x0015, -48, -16
59+
ANIM_SPRITE ATTR0_WIDE, ATTR1_SIZE_16, 0x0019, -16, -16
60+
ANIM_SPRITE_END
61+
62+
.global AnimScr_EkrTerrainfx_R_Close
63+
AnimScr_EkrTerrainfx_R_Close: @ 0x5CCEB8
64+
ANIMSCR_FORCE_SPRITE AnimSprite_EkrTerrainfx_R_Close, 4
65+
ANIMSCR_BLOCKED
66+
67+
.global AnimSprite_EkrTerrainfx_L_Close
68+
AnimSprite_EkrTerrainfx_L_Close: @ 0x5CCEC0
69+
ANIM_SPRITE_XFLIP ATTR0_WIDE, ATTR1_SIZE_32, 0x0000, 16, 8
70+
ANIM_SPRITE_XFLIP ATTR0_WIDE, ATTR1_SIZE_32, 0x0004, -16, 8
71+
ANIM_SPRITE_XFLIP ATTR0_SQUARE, ATTR1_SIZE_16, 0x0008, -32, 8
72+
ANIM_SPRITE_XFLIP ATTR0_TALL, ATTR1_SIZE_8, 0x000A, -40, 8
73+
ANIM_SPRITE_XFLIP ATTR0_WIDE, ATTR1_SIZE_32, 0x000B, 16, -8
74+
ANIM_SPRITE_XFLIP ATTR0_WIDE, ATTR1_SIZE_32, 0x000F, -16, -8
75+
ANIM_SPRITE_XFLIP ATTR0_SQUARE, ATTR1_SIZE_16, 0x0013, -32, -8
76+
ANIM_SPRITE_XFLIP ATTR0_WIDE, ATTR1_SIZE_16, 0x0015, 16, -16
77+
ANIM_SPRITE_XFLIP ATTR0_WIDE, ATTR1_SIZE_16, 0x0019, -16, -16
78+
ANIM_SPRITE_END
79+
80+
.global AnimScr_EkrTerrainfx_L_Close
81+
AnimScr_EkrTerrainfx_L_Close: @ 0x5CCF38
82+
ANIMSCR_FORCE_SPRITE AnimSprite_EkrTerrainfx_L_Close, 4
83+
ANIMSCR_BLOCKED
84+
85+
.incbin "fe6-base.gba", 0x5CCF40, (0x5CDCA4 - 0x5CCF40) @ length: 0D6C
2586

2687
.global AnimScr_NoDamage
2788
AnimScr_NoDamage: @ 085CDCA4

‎data/data_textglyphs.s‎

Lines changed: 173 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,183 @@
1-
21
.data
32

43
.global TextGlyphs_System
54
TextGlyphs_System: @ 0859027C
6-
.incbin "fe6-base.gba", 0x59027C, (0x5A8204 - 0x59027C)
5+
.incbin "fe6-base.gba", 0x59027C, (0x59327C - 0x59027C)
6+
7+
TextGlyph_Special_0859327C: @ 0x59327C
8+
.incbin "fe6-base.gba", 0x59327C, 0x5932C4 - 0x59327C
9+
10+
TextGlyph_Special_085932C4: @ 0x5932C4
11+
.incbin "fe6-base.gba", 0x5932C4, 0x59330C - 0x5932C4
12+
13+
TextGlyph_Special_0859330C: @ 0x59330C
14+
.incbin "fe6-base.gba", 0x59330C, 0x593354 - 0x59330C
15+
16+
TextGlyph_Special_08593354: @ 0x593354
17+
.incbin "fe6-base.gba", 0x593354, 0x59339C - 0x593354
18+
19+
TextGlyph_Special_0859339C: @ 0x59339C
20+
.incbin "fe6-base.gba", 0x59339C, 0x5933E4 - 0x59339C
21+
22+
TextGlyph_Special_085933E4: @ 0x5933E4
23+
.incbin "fe6-base.gba", 0x5933E4, 0x59342C - 0x5933E4
24+
25+
TextGlyph_Special_0859342C: @ 0x59342C
26+
.incbin "fe6-base.gba", 0x59342C, 0x593474 - 0x59342C
27+
28+
TextGlyph_Special_08593474: @ 0x593474
29+
.incbin "fe6-base.gba", 0x593474, 0x5934BC - 0x593474
30+
31+
TextGlyph_Special_085934BC: @ 0x5934BC
32+
.incbin "fe6-base.gba", 0x5934BC, 0x593504 - 0x5934BC
33+
34+
TextGlyph_Special_08593504: @ 0x593504
35+
.incbin "fe6-base.gba", 0x593504, 0x59354C - 0x593504
36+
37+
TextGlyph_Special_0859354C: @ 0x59354C
38+
.incbin "fe6-base.gba", 0x59354C, 0x59381C - 0x59354C
39+
40+
TextGlyph_Special_0859381C: @ 0x59381C
41+
.incbin "fe6-base.gba", 0x59381C, 0x593864 - 0x59381C
42+
43+
TextGlyph_Special_08593864: @ 0x593864
44+
.incbin "fe6-base.gba", 0x593864, 0x593FFC - 0x593864
45+
46+
TextGlyph_Special_08593FFC: @ 0x593FFC
47+
.incbin "fe6-base.gba", 0x593FFC, 0x594044 - 0x593FFC
48+
49+
TextGlyph_Special_08594044: @ 0x594044
50+
.incbin "fe6-base.gba", 0x594044, 0x59408C - 0x594044
51+
52+
TextGlyph_Special_0859408C: @ 0x59408C
53+
.incbin "fe6-base.gba", 0x59408C, 0x5940D4 - 0x59408C
54+
55+
TextGlyph_Special_085940D4: @ 0x5940D4
56+
.incbin "fe6-base.gba", 0x5940D4, 0x59411C - 0x5940D4
57+
58+
TextGlyph_Special_0859411C: @ 0x59411C
59+
.incbin "fe6-base.gba", 0x59411C, 0x594164 - 0x59411C
60+
61+
TextGlyph_Special_08594164: @ 0x594164
62+
.incbin "fe6-base.gba", 0x594164, 0x5941AC - 0x594164
63+
64+
TextGlyph_Special_085941AC: @ 0x5941AC
65+
.incbin "fe6-base.gba", 0x5941AC, 0x5941F4 - 0x5941AC
66+
67+
TextGlyph_Special_085941F4: @ 0x5941F4
68+
.incbin "fe6-base.gba", 0x5941F4, 0x59423C - 0x5941F4
69+
70+
TextGlyph_Special_0859423C: @ 0x59423C
71+
.incbin "fe6-base.gba", 0x59423C, 0x594284 - 0x59423C
72+
73+
TextGlyph_Special_08594284: @ 0x594284
74+
.incbin "fe6-base.gba", 0x594284, 0x5942CC - 0x594284
75+
76+
TextGlyph_Special_085942CC: @ 0x5942CC
77+
.incbin "fe6-base.gba", 0x5942CC, 0x59435C - 0x5942CC
78+
79+
TextGlyph_Special_0859435C: @ 0x59435C
80+
.incbin "fe6-base.gba", 0x59435C, 0x5943A4 - 0x59435C
81+
82+
TextGlyph_Special_085943A4: @ 0x5943A4
83+
.incbin "fe6-base.gba", 0x5943A4, 0x5943EC - 0x5943A4
84+
85+
TextGlyph_Special_085943EC: @ 0x5943EC
86+
.incbin "fe6-base.gba", 0x5943EC, 0x594434 - 0x5943EC
87+
88+
TextGlyph_Special_08594434: @ 0x594434
89+
.incbin "fe6-base.gba", 0x594434, 0x59447C - 0x594434
90+
91+
TextGlyph_Special_0859447C: @ 0x59447C
92+
.incbin "fe6-base.gba", 0x59447C, 0x59450C - 0x59447C
93+
94+
TextGlyph_Special_0859450C: @ 0x59450C
95+
.incbin "fe6-base.gba", 0x59450C, 0x594554 - 0x59450C
96+
97+
TextGlyph_Special_08594554: @ 0x594554
98+
.incbin "fe6-base.gba", 0x594554, 0x594674 - 0x594554
99+
100+
TextGlyph_Special_08594674: @ 0x594674
101+
.incbin "fe6-base.gba", 0x594674, 0x594794 - 0x594674
102+
103+
TextGlyph_Special_08594794: @ 0x594794
104+
.incbin "fe6-base.gba", 0x594794, 0x59486C - 0x594794
105+
106+
TextGlyph_Special_0859486C: @ 0x59486C
107+
.incbin "fe6-base.gba", 0x59486C, 0x594944 - 0x59486C
108+
109+
TextGlyph_Special_08594944: @ 0x594944
110+
.incbin "fe6-base.gba", 0x594944, 0x594AAC - 0x594944
111+
112+
TextGlyph_Special_08594AAC: @ 0x594AAC
113+
.incbin "fe6-base.gba", 0x594AAC, 0x594BCC - 0x594AAC
114+
115+
TextGlyph_Special_08594BCC: @ 0x594BCC
116+
.incbin "fe6-base.gba", 0x594BCC, 0x594C14 - 0x594BCC
117+
118+
TextGlyph_Special_08594C14: @ 0x594C14
119+
.incbin "fe6-base.gba", 0x594C14, 0x594CA4 - 0x594C14
120+
121+
TextGlyph_Special_08594CA4: @ 0x594CA4
122+
.incbin "fe6-base.gba", 0x594CA4, 0x594CEC - 0x594CA4
123+
124+
TextGlyph_Special_08594CEC: @ 0x594CEC
125+
.incbin "fe6-base.gba", 0x594CEC, 0x5A7BD4 - 0x594CEC
126+
127+
TextGlyph_Special_085A7BD4: @ 0x5A7BD4
128+
.incbin "fe6-base.gba", 0x5A7BD4, 0x5A7C1C - 0x5A7BD4
129+
130+
TextGlyph_Special_085A7C1C: @ 0x5A7C1C
131+
.incbin "fe6-base.gba", 0x5A7C1C, 0x5A7CAC - 0x5A7C1C
132+
133+
TextGlyph_Special_085A7CAC: @ 0x5A7CAC
134+
.incbin "fe6-base.gba", 0x5A7CAC, 0x5A8204 - 0x5A7CAC
7135

8136
.global TextGlyphs_Special
9137
TextGlyphs_Special: @ 085A8204
10-
.incbin "fe6-base.gba", 0x5A8204, (0x5A82B0 - 0x5A8204)
138+
.4byte TextGlyph_Special_08594044
139+
.4byte TextGlyph_Special_0859408C
140+
.4byte TextGlyph_Special_085940D4
141+
.4byte TextGlyph_Special_0859411C
142+
.4byte TextGlyph_Special_08594164
143+
.4byte TextGlyph_Special_085941AC
144+
.4byte TextGlyph_Special_085941F4
145+
.4byte TextGlyph_Special_0859423C
146+
.4byte TextGlyph_Special_08594284
147+
.4byte TextGlyph_Special_085942CC
148+
.4byte TextGlyph_Special_085932C4
149+
.4byte TextGlyph_Special_0859330C
150+
.4byte TextGlyph_Special_08593354
151+
.4byte TextGlyph_Special_0859339C
152+
.4byte TextGlyph_Special_085933E4
153+
.4byte TextGlyph_Special_0859342C
154+
.4byte TextGlyph_Special_08593474
155+
.4byte TextGlyph_Special_085934BC
156+
.4byte TextGlyph_Special_08593504
157+
.4byte TextGlyph_Special_0859354C
158+
.4byte TextGlyph_Special_0859327C
159+
.4byte TextGlyph_Special_08594C14
160+
.4byte TextGlyph_Special_08593864
161+
.4byte TextGlyph_Special_0859381C
162+
.4byte TextGlyph_Special_0859486C
163+
.4byte TextGlyph_Special_0859435C
164+
.4byte TextGlyph_Special_085943A4
165+
.4byte TextGlyph_Special_085943EC
166+
.4byte TextGlyph_Special_08594434
167+
.4byte TextGlyph_Special_0859447C
168+
.4byte TextGlyph_Special_0859450C
169+
.4byte TextGlyph_Special_08594AAC
170+
.4byte TextGlyph_Special_08594CA4
171+
.4byte TextGlyph_Special_08593FFC
172+
.4byte TextGlyph_Special_08594554
173+
.4byte TextGlyph_Special_08594794
174+
.4byte TextGlyph_Special_08594674
175+
.4byte TextGlyph_Special_08594944
176+
.4byte TextGlyph_Special_08594CEC
177+
.4byte TextGlyph_Special_08594BCC
178+
.4byte TextGlyph_Special_085A7BD4
179+
.4byte TextGlyph_Special_085A7C1C
180+
.4byte TextGlyph_Special_085A7CAC
11181

12182
.global TextGlyphs_Talk
13183
TextGlyphs_Talk: @ 085A82B0

‎include/debugmenu.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@ fu8 func_fe6_0801AA70(struct MenuProc * menu, struct MenuEntProc * ent);
2222
fu8 func_fe6_0801AA74(struct MenuProc * menu, struct MenuEntProc * ent);
2323
fu8 func_fe6_0801AA8C(struct MenuProc * menu, struct MenuEntProc * ent);
2424
fu8 func_fe6_0801AABC(struct MenuProc * menu);
25-
void func_fe6_0801AAE0(void);
26-
fu8 func_fe6_0801AB64(struct MenuProc * menu);
27-
fu8 func_fe6_0801ABE8(struct MenuProc * menu);
25+
void StartDebugMenu_LoadGame(void);
26+
fu8 DebugMenu_OnInit_LoadGame(struct MenuProc * menu);
27+
fu8 DebugMenu_OnEnd_LoadGame(struct MenuProc * menu);
2828
fu8 func_fe6_0801AC2C(struct MenuProc * menu, struct MenuEntProc * ent);
2929
fu8 func_fe6_0801ACD8(struct MenuProc * menu, struct MenuEntProc * ent);
3030
fu8 func_fe6_0801AD14(struct MenuProc * menu, struct MenuEntProc * ent);
3131
fu8 func_fe6_0801AD28(struct MenuProc * menu, struct MenuEntProc * ent);
3232
fu8 func_fe6_0801AD3C(struct MenuProc * menu, struct MenuEntProc * ent);
3333
fu8 func_fe6_0801AD4C(struct MenuEntInfo const * info, int id);
3434
fu8 func_fe6_0801AD50(struct MenuProc * menu, struct MenuEntProc * ent);
35-
fu8 func_fe6_0801AD6C(struct MenuEntInfo const * info, int id);
36-
fu8 func_fe6_0801AD84(struct MenuProc * menu, struct MenuEntProc * ent);
37-
fu8 func_fe6_0801ADB4(struct MenuEntInfo const * info, int id);
38-
fu8 func_fe6_0801ADCC(struct MenuProc * menu, struct MenuEntProc * ent);
35+
fu8 DebugMenu_Avaliable_LoadAltSuspend(struct MenuEntInfo const * info, int id);
36+
fu8 DebugMenu_OnSelect_LoadAltSuspend(struct MenuProc * menu, struct MenuEntProc * ent);
37+
fu8 DebugMenu_Avaliable_LoadMainSuspend(struct MenuEntInfo const * info, int id);
38+
fu8 DebugMenu_OnSelect_LoadMainSuspend(struct MenuProc * menu, struct MenuEntProc * ent);
3939
u32 func_fe6_0801ADEC(struct MenuProc * menu, struct MenuEntProc * ent);
4040
fu8 func_fe6_0801AE60(struct MenuProc * menu, struct MenuEntProc * ent);
4141
fu8 func_fe6_0801AEB8(struct MenuProc * menu, struct MenuEntProc * ent);
42-
fu8 func_fe6_0801AEBC(struct MenuProc * menu, struct MenuEntProc * ent);
42+
fu8 DebugMenu_OnSelect_ReleaseEntry(struct MenuProc * menu, struct MenuEntProc * ent);
4343
fu8 func_fe6_0801AEC8(struct MenuProc * menu, struct MenuEntProc * ent);
4444
u32 DebugCpControlMenu_Entry_Display(struct MenuProc * menu, struct MenuEntProc * ent);
4545
fu8 DebugCpControlMenu_Entry_Idle(struct MenuProc * menu, struct MenuEntProc * ent);

‎include/menuinfo.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
extern struct MenuInfo CONST_DATA MenuInfo_Debug_085C7474;
88
extern struct MenuInfo CONST_DATA MenuInfo_Debug_085C73E4;
9-
extern struct MenuInfo CONST_DATA MenuInfo_Debug_085C742C;
9+
extern struct MenuInfo CONST_DATA MenuInfo_Debug_LoadGame;
1010
extern struct MenuInfo CONST_DATA MenuInfo_Debug_085C7450;
1111
extern struct MenuInfo CONST_DATA MenuInfo_DebugCpControl;
1212
extern struct MenuInfo CONST_DATA MenuInfo_Map;

0 commit comments

Comments
 (0)