Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-09-09 01:45:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #181 from PikalaxALT/pokedex_screen

Browse Source 
Pokedex screen
This commit is contained in:
PikalaxALT
2019-12-14 22:14:50 -05:00
committed by GitHub
parent f12824e3b1 3301c8ff1d
commit d064611e62
61 changed files with 6429 additions and 6021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5903
asm/pokedex_screen.s
View File

File diff suppressed because it is too large Load Diff

BIN
baserom.ips
View File

Binary file not shown.

3600
data/pokedex_screen.s
View File

File diff suppressed because it is too large Load Diff

BIN
graphics/pokedex/unk_8440124.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8440274.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 306 B

BIN
graphics/pokedex/unk_84403AC.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 274 B

259
graphics/pokedex/unk_84404C8.pal Normal file
View File

@@ -0,0 +1,259 @@
JASC-PAL
0100
256
156 156 189
0 0 0
197 180 139
230 222 197
246 246 238
255 255 255
123 98 57
164 148 98
213 197 164
255 246 238
238 238 230
213 213 213
156 156 156
255 255 0
205 65 57
255 139 57
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
156 156 189
0 0 0
197 180 139
230 222 197
246 246 238
255 255 255
123 98 57
164 148 98
213 197 164
0 0 0
0 0 0
0 0 0
0 0 0
255 255 0
205 65 57
255 139 57
156 156 189
0 0 0
197 180 139
230 222 197
246 246 238
255 255 255
123 98 57
164 148 98
213 197 164
0 0 0
0 0 0
0 0 0
0 0 0
255 255 0
205 65 57
255 139 57
156 156 189
0 0 0
197 180 139
230 222 197
246 246 238
255 255 255
123 98 57
164 148 98
213 197 164
0 0 0
0 0 0
0 0 0
0 0 0
255 255 0
205 65 57
255 139 57
156 156 189
0 0 0
197 180 139
230 222 197
246 246 238
255 255 255
123 98 57
164 148 98
213 197 164
0 0 0
0 0 0
0 0 0
0 0 0
255 255 0
205 65 57
255 139 57
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
156 156 189
0 0 0
197 180 139
230 222 197
246 246 238
255 255 255
123 98 57
164 148 98
213 197 164
255 246 238
238 238 230
213 213 213
156 156 156
255 255 0
205 65 57
255 139 57
255 255 255
255 255 255
98 98 98
213 213 205
230 8 8
255 189 115
32 156 8
148 246 148
49 82 205
164 197 246
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
197 180 139

259
graphics/pokedex/unk_84406E0.pal Normal file
View File

@@ -0,0 +1,259 @@
JASC-PAL
0100
256
156 156 189
0 0 0
197 180 139
230 222 197
238 246 246
255 255 255
123 98 57
164 148 98
213 197 164
255 246 238
238 238 230
213 213 213
156 156 156
255 255 0
205 65 57
255 139 57
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
156 156 189
0 0 0
197 180 139
230 222 197
238 246 246
255 255 255
123 98 57
164 148 98
213 197 164
0 0 0
0 0 0
0 0 0
0 0 0
255 255 0
205 65 57
255 139 57
156 156 189
0 0 0
197 180 139
230 222 197
238 246 246
255 255 255
123 98 57
164 148 98
213 197 164
0 0 0
0 0 0
0 0 0
0 0 0
255 255 0
205 65 57
255 139 57
156 156 189
0 0 0
197 180 139
230 222 197
238 246 246
255 255 255
123 98 57
164 148 98
213 197 164
0 0 0
0 0 0
0 0 0
0 0 0
255 255 0
205 65 57
255 139 57
156 156 189
0 0 0
197 180 139
230 222 197
238 246 246
255 255 255
123 98 57
164 148 98
213 197 164
0 0 0
0 0 0
0 0 0
0 0 0
255 255 0
205 65 57
255 139 57
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
156 156 189
0 0 0
197 180 139
230 222 197
238 246 246
255 255 255
123 98 57
164 148 98
213 197 164
255 246 238
238 238 230
213 213 213
156 156 156
255 255 0
205 65 57
255 139 57
255 255 255
255 255 255
98 98 98
213 213 205
230 8 8
255 189 115
32 156 8
148 246 148
49 82 205
164 197 246
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
172 197 24

BIN
graphics/pokedex/unk_84408E0.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8440BD8.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8440EF0.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_844112C.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_84414BC.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8441808.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8441A40.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8441D54.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8442004.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_844223C.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_84424E4.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8442838.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8442BC0.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8442EF8.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_844318C.bin Normal file
View File

Binary file not shown.

19
graphics/pokedex/unk_8443420.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 238 255
255 255 255
213 238 255
197 230 255
189 189 255
213 197 131
189 172 115
164 139 98
131 115 57
213 222 131
255 0 255
98 106 82
156 164 106
189 197 131
255 0 255
49 49 65

19
graphics/pokedex/unk_8443440.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 238 255
255 255 255
213 238 255
197 230 255
164 213 255
205 57 0
131 0 0
164 32 0
0 0 0
222 213 222
180 172 197
139 131 156
148 197 74
106 148 41
255 0 255
49 49 65

19
graphics/pokedex/unk_8443460.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 238 255
255 255 255
213 238 255
197 230 255
189 189 255
230 230 230
197 197 197
213 213 213
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 255 255
180 189 189

19
graphics/pokedex/unk_8443480.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 238 255
255 255 255
213 238 255
197 230 255
189 189 255
189 230 189
139 205 189
106 172 156
74 148 123
156 205 131
230 222 246
205 197 213
222 205 131
180 164 106
131 180 98
255 0 255

19
graphics/pokedex/unk_84434A0.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 238 255
255 255 255
213 238 255
197 230 255
189 189 255
106 189 90
82 164 0
106 180 32
139 205 65
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
164 213 255

19
graphics/pokedex/unk_84434C0.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 238 255
255 255 255
213 238 255
197 230 255
189 189 255
213 230 238
189 189 255
197 205 246
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 255 255
180 189 189

19
graphics/pokedex/unk_84434E0.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 238 255
255 255 255
213 238 255
197 230 255
189 189 255
189 197 164
205 213 189
172 180 148
156 164 115
230 255 255
213 205 222
255 0 255
255 0 255
255 0 255
255 0 255
172 222 255

19
graphics/pokedex/unk_8443500.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 238 255
255 255 255
213 238 255
197 230 255
189 189 255
205 123 255
230 156 90
230 156 90
213 123 74
205 213 255
255 0 255
255 0 255
255 0 255
255 255 156
172 90 222
49 49 65

19
graphics/pokedex/unk_8443520.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 238 255
255 255 255
213 238 255
197 230 255
189 189 255
148 164 246
123 148 238
106 139 238
82 123 230
65 115 230
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
164 213 255

19
graphics/pokedex/unk_8443540.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 238 255
255 255 255
213 238 255
197 230 255
189 189 255
139 222 156
172 246 180
197 255 255
213 255 255
230 255 255
255 255 255
255 0 255
255 0 255
255 0 255
156 230 164
255 0 255

19
graphics/pokedex/unk_8443560.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 238 255
255 255 255
213 238 255
197 230 255
189 189 255
246 246 238
205 230 106
180 189 65
238 246 238
246 238 180
230 222 164
213 205 148
238 246 205
238 238 197
197 213 90
164 213 255

19
graphics/pokedex/unk_8443580.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 238 255
255 255 255
213 238 255
197 230 255
255 0 255
172 222 255
156 222 238
230 213 131
180 230 156
98 205 148
197 246 172
148 205 123
82 180 131
205 180 98
164 213 139
90 197 238

19
graphics/pokedex/unk_84435A0.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 238 255
255 255 255
213 238 255
197 230 255
189 189 255
164 205 255
197 230 246
255 255 255
172 222 230
222 255 255
222 246 255
238 255 255
205 238 246
255 0 255
255 0 255
230 172 82

19
graphics/pokedex/unk_84435C0.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 238 255
255 255 255
213 238 255
197 230 255
189 189 255
189 148 255
222 189 255
255 255 255
255 222 172
238 238 238
255 238 197
222 197 246
230 213 255
164 131 238
255 255 172
230 172 82

19
graphics/pokedex/unk_84435E0.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 238 255
255 255 255
213 238 255
197 230 255
189 189 255
246 230 90
255 246 164
255 255 238
148 205 246
238 230 197
197 230 255
255 213 82
230 213 255
246 189 82
255 255 172
0 0 0

BIN
graphics/pokedex/unk_8443600.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 105 B

BIN
graphics/pokedex/unk_8443620.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8443910.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8443988.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_84439FC.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8443A78.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8443AF8.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8443BB0.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8443C54.bin Normal file
View File

Binary file not shown.

BIN
graphics/pokedex/unk_8443D00.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 201 B

BIN
graphics/pokedex/unk_845228C.bin Normal file
View File

Binary file not shown.

19
graphics/pokedex/unk_8452368.pal Normal file
View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
82 82 82
82 82 82
82 82 82
82 82 82
82 82 82
82 82 82
82 82 82
82 82 82
82 82 82
82 82 82
82 82 82
82 82 82
82 82 82
82 82 82
82 82 82

5
include/global.h
View File

@@ -765,9 +765,8 @@ struct SaveBlock1
/*0x3120*/ struct MEventBuffers mysteryEventBuffers;
/*0x348C*/ u8 filler_348C[400];
/*0x361C*/ struct RamScript ramScript;
/*0x3A08*/ u8 filler3A08[12];
/*0x3A14*/ u8 seen2[DEX_FLAGS_NO];
/*0x3A48*/ u8 filler_3a48[4];
/*0x3A08*/ u8 filler3A08[16];
/*0x3A18*/ u8 seen2[DEX_FLAGS_NO];
/*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH];
/*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS];
/*0x3A94*/ u8 filler3A94[0x204];

4
include/list_menu.h
View File

@@ -73,8 +73,8 @@ struct ListMenuWindowRect
extern struct ListMenuTemplate gMultiuseListMenuTemplate;
s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum);
u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 cursorPos, u16 itemsAbove);
u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenuWindowRect *rect, u16 cursorPos, u16 itemsAbove);
u8 ListMenuInit(const struct ListMenuTemplate *listMenuTemplate, u16 cursorPos, u16 itemsAbove);
u8 ListMenuInitInRect(const struct ListMenuTemplate *listMenuTemplate, const struct ListMenuWindowRect *rect, u16 cursorPos, u16 itemsAbove);
s32 ListMenu_ProcessInput(u8 listTaskId);
void DestroyListMenuTask(u8 listTaskId, u16 *cursorPos, u16 *itemsAbove);
void RedrawListMenu(u8 listTaskId);

4
include/menu_indicators.h
View File

@@ -32,8 +32,8 @@ struct CursorStruct
u8 AddScrollIndicatorArrowPairParameterized(u32 arrowType, s32 commonPos, s32 firstPos, s32 secondPos, s32 fullyDownThreshold, s32 tileTag, s32 palTag, u16 *scrollOffset);
u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate * template, u16 * a1);
void RemoveScrollIndicatorArrowPair(u8);
u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorKind);
u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor);
u8 ListMenuAddCursorObjectInternal(const struct CursorStruct *cursor, u32 cursorKind);
u8 ListMenuAddRedOutlineCursorObject(const struct CursorStruct *cursor);
void ListMenuUpdateRedOutlineCursorObject(u8 taskId, u16 x, u16 y);
void ListMenuRemoveRedOutlineCursorObject(u8 taskId);
void ListMenuRemoveCursorObject(u8 taskId, u32 cursorKind);

1
include/pokedex_screen.h
View File

@@ -2,5 +2,6 @@
#define GUARD_POKEDEX_SCREEN_H
void CB2_OpenPokedexFromStartMenu(void);
s8 sub_8104AB0(u16 nationalDexNo, u8 caseId, bool8 indexIsSpecies);
#endif //GUARD_POKEDEX_SCREEN_H

2
include/sound.h
View File

@@ -46,5 +46,7 @@ void SE12PanpotControl(s8 pan);
bool8 IsSEPlaying(void);
bool8 IsBGMPlaying(void);
bool8 IsSpecialSEPlaying(void);
void sub_8072474(u16 volume);
void sub_807249C(void);
#endif // GUARD_SOUND_H

14
include/strings.h
View File

@@ -965,6 +965,20 @@ extern const u8 gText_Var1AndYouWantedVar2[];
extern const u8 gText_HereYouGoThankYou[];
extern const u8 gText_NoMoreRoomForThis[];
// pokedex_screen
extern const u8 gUnknown_8415D9C[];
extern const u8 gUnknown_8415DB8[];
extern const u8 gUnknown_8415DC4[];
extern const u8 gUnknown_8415DCA[];
extern const u8 gUnknown_8415DD1[];
extern const u8 gUnknown_8415DD7[];
extern const u8 gUnknown_8415F3D[];
extern const u8 gUnknown_8415F4A[];
extern const u8 gUnknown_8415F66[];
extern const u8 gUnknown_8415F6C[];
extern const u8 gUnknown_8415FFF[];
extern const u8 gUnknown_8416002[];
// trainer card
extern const u8 gText_WaitingTrainerFinishReading[];
extern const u8 gText_TrainerCardName[];

1
ld_script.txt
View File

@@ -227,6 +227,7 @@ SECTIONS {
src/map_preview_screen.o(.text);
asm/link_rfu_2.o(.text);
asm/link_rfu.o(.text);
src/pokedex_screen.o(.text);
asm/pokedex_screen.o(.text);
src/list_menu.o(.text);
asm/item_menu.o(.text);

8
src/list_menu.c
View File

@@ -70,7 +70,7 @@ static EWRAM_DATA struct MysteryGiftLinkMenuStruct sMysteryGiftLinkMenu = {0};
struct ListMenuOverride gListMenuOverride;
struct ListMenuTemplate gMultiuseListMenuTemplate;
static u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 cursorPos, u16 itemsAbove);
static u8 ListMenuInitInternal(const struct ListMenuTemplate *listMenuTemplate, u16 cursorPos, u16 itemsAbove);
static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown);
static void ListMenuPrintEntries(struct ListMenu *list, u16 startIndex, u16 yOffset, u16 count);
static void ListMenuDrawCursor(struct ListMenu *list);
@@ -172,7 +172,7 @@ s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const str
return LIST_NOTHING_CHOSEN;
}
u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 cursorPos, u16 itemsAbove)
u8 ListMenuInit(const struct ListMenuTemplate *listMenuTemplate, u16 cursorPos, u16 itemsAbove)
{
u8 taskId = ListMenuInitInternal(listMenuTemplate, cursorPos, itemsAbove);
PutWindowTilemap(listMenuTemplate->windowId);
@@ -180,7 +180,7 @@ u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 cursorPos, u16 it
return taskId;
}
u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenuWindowRect *rect, u16 cursorPos, u16 itemsAbove)
u8 ListMenuInitInRect(const struct ListMenuTemplate *listMenuTemplate, const struct ListMenuWindowRect *rect, u16 cursorPos, u16 itemsAbove)
{
s32 i;
u8 taskId = ListMenuInitInternal(listMenuTemplate, cursorPos, itemsAbove);
@@ -338,7 +338,7 @@ u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId)
return list->itemsAbove * yMultiplier + list->template.upText_Y;
}
static u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 cursorPos, u16 itemsAbove)
static u8 ListMenuInitInternal(const struct ListMenuTemplate *listMenuTemplate, u16 cursorPos, u16 itemsAbove)
{
u8 listTaskId = CreateTask(ListMenuDummyTask, 0);
struct ListMenu *list = (struct ListMenu *)gTasks[listTaskId].data;

8
src/menu_indicators.c
View File

@@ -50,7 +50,7 @@ static EWRAM_DATA struct ScrollArrowsTemplate sTempScrollArrowTemplate = {0};
static void SpriteCallback_ScrollIndicatorArrow(struct Sprite *sprite);
static void SpriteCallback_RedArrowCursor(struct Sprite *sprite);
static void Task_ScrollIndicatorArrowPair(u8 taskId);
static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor);
static u8 ListMenuAddRedArrowCursorObject(const struct CursorStruct *cursor);
static void ListMenuUpdateRedArrowCursorObject(u8 taskId, u16 x, u16 y);
static void ListMenuRemoveRedArrowCursorObject(u8 taskId);
@@ -422,7 +422,7 @@ void RemoveScrollIndicatorArrowPair(u8 taskId)
DestroyTask(taskId);
}
u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorKind)
u8 ListMenuAddCursorObjectInternal(const struct CursorStruct *cursor, u32 cursorKind)
{
switch (cursorKind)
{
@@ -528,7 +528,7 @@ void ListMenuSetUpRedOutlineCursorSpriteOamTable(u16 rowWidth, u16 rowHeight, st
}
}
u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor)
u8 ListMenuAddRedOutlineCursorObject(const struct CursorStruct *cursor)
{
struct CompressedSpriteSheet spriteSheet;
struct SpritePalette spritePal;
@@ -601,7 +601,7 @@ static void Task_RedArrowCursor(u8 taskId)
{
}
static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor)
static u8 ListMenuAddRedArrowCursorObject(const struct CursorStruct *cursor)
{
struct CompressedSpriteSheet spriteSheet;
struct SpritePalette spritePal;

3
src/pokedex.c
View File

@@ -1,9 +1,8 @@
#include "global.h"
#include "pokedex.h"
#include "pokedex_screen.h"
#include "constants/species.h"
extern s8 sub_8104AB0(u16 nationalDexNo, u8 caseID, u8 unk);
ALIGNED(4) static const u8 gExpandedPlaceholder_PokedexDescription[] = _("");
#include "data/pokemon/pokedex_text.h"

2075
src/pokedex_screen.c Normal file
View File

File diff suppressed because it is too large Load Diff