Dump and convert Pokedex Entries and Text to C.
This commit is contained in:
+6
-6
@@ -13,11 +13,11 @@ sub_8088E20: @ 8088E20
|
|||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
lsls r0, 2
|
lsls r0, 2
|
||||||
ldr r1, _08088E34 @ =gUnknown_844E850
|
ldr r1, _08088E34 @ =gPokedexEntries
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
bx lr
|
bx lr
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_08088E34: .4byte gUnknown_844E850
|
_08088E34: .4byte gPokedexEntries
|
||||||
thumb_func_end sub_8088E20
|
thumb_func_end sub_8088E20
|
||||||
|
|
||||||
thumb_func_start sub_8088E38
|
thumb_func_start sub_8088E38
|
||||||
@@ -34,7 +34,7 @@ sub_8088E38: @ 8088E38
|
|||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
b _08088E6C
|
b _08088E6C
|
||||||
_08088E4E:
|
_08088E4E:
|
||||||
ldr r0, _08088E5C @ =gUnknown_844E850
|
ldr r0, _08088E5C @ =gPokedexEntries
|
||||||
lsls r1, r2, 3
|
lsls r1, r2, 3
|
||||||
adds r1, r2
|
adds r1, r2
|
||||||
lsls r1, 2
|
lsls r1, 2
|
||||||
@@ -42,9 +42,9 @@ _08088E4E:
|
|||||||
ldrh r0, [r1, 0xC]
|
ldrh r0, [r1, 0xC]
|
||||||
b _08088E6C
|
b _08088E6C
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_08088E5C: .4byte gUnknown_844E850
|
_08088E5C: .4byte gPokedexEntries
|
||||||
_08088E60:
|
_08088E60:
|
||||||
ldr r0, _08088E70 @ =gUnknown_844E850
|
ldr r0, _08088E70 @ =gPokedexEntries
|
||||||
lsls r1, r2, 3
|
lsls r1, r2, 3
|
||||||
adds r1, r2
|
adds r1, r2
|
||||||
lsls r1, 2
|
lsls r1, 2
|
||||||
@@ -54,7 +54,7 @@ _08088E6C:
|
|||||||
pop {r1}
|
pop {r1}
|
||||||
bx r1
|
bx r1
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_08088E70: .4byte gUnknown_844E850
|
_08088E70: .4byte gPokedexEntries
|
||||||
thumb_func_end sub_8088E38
|
thumb_func_end sub_8088E38
|
||||||
|
|
||||||
thumb_func_start GetSetPokedexFlag
|
thumb_func_start GetSetPokedexFlag
|
||||||
|
|||||||
+10
-10
@@ -6230,7 +6230,7 @@ sub_8105800: @ 8105800
|
|||||||
lsls r1, r0, 3
|
lsls r1, r0, 3
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
lsls r1, 2
|
lsls r1, 2
|
||||||
ldr r2, _08105860 @ =gUnknown_844E850
|
ldr r2, _08105860 @ =gPokedexEntries
|
||||||
adds r5, r1, r2
|
adds r5, r1, r2
|
||||||
movs r4, 0
|
movs r4, 0
|
||||||
movs r1, 0x1
|
movs r1, 0x1
|
||||||
@@ -6260,7 +6260,7 @@ _08105840:
|
|||||||
bls _08105840
|
bls _08105840
|
||||||
b _08105878
|
b _08105878
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_08105860: .4byte gUnknown_844E850
|
_08105860: .4byte gPokedexEntries
|
||||||
_08105864:
|
_08105864:
|
||||||
movs r1, 0xAC
|
movs r1, 0xAC
|
||||||
_08105866:
|
_08105866:
|
||||||
@@ -6331,7 +6331,7 @@ sub_81058C4: @ 81058C4
|
|||||||
mov r8, r3
|
mov r8, r3
|
||||||
adds r0, r1, 0
|
adds r0, r1, 0
|
||||||
bl SpeciesToNationalPokedexNum
|
bl SpeciesToNationalPokedexNum
|
||||||
ldr r2, _08105974 @ =gUnknown_844E850
|
ldr r2, _08105974 @ =gPokedexEntries
|
||||||
lsls r1, r0, 3
|
lsls r1, r0, 3
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
lsls r1, 2
|
lsls r1, 2
|
||||||
@@ -6395,7 +6395,7 @@ _0810593A:
|
|||||||
strb r0, [r1]
|
strb r0, [r1]
|
||||||
b _08105998
|
b _08105998
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_08105974: .4byte gUnknown_844E850
|
_08105974: .4byte gPokedexEntries
|
||||||
_08105978: .4byte gUnknown_8415F98
|
_08105978: .4byte gUnknown_8415F98
|
||||||
_0810597C: .4byte 0x00002710
|
_0810597C: .4byte 0x00002710
|
||||||
_08105980:
|
_08105980:
|
||||||
@@ -6514,7 +6514,7 @@ sub_8105A3C: @ 8105A3C
|
|||||||
mov r9, r3
|
mov r9, r3
|
||||||
adds r0, r1, 0
|
adds r0, r1, 0
|
||||||
bl SpeciesToNationalPokedexNum
|
bl SpeciesToNationalPokedexNum
|
||||||
ldr r2, _08105ACC @ =gUnknown_844E850
|
ldr r2, _08105ACC @ =gPokedexEntries
|
||||||
lsls r1, r0, 3
|
lsls r1, r0, 3
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
lsls r1, 2
|
lsls r1, 2
|
||||||
@@ -6565,7 +6565,7 @@ _08105AAC:
|
|||||||
strb r5, [r4]
|
strb r5, [r4]
|
||||||
b _08105ADC
|
b _08105ADC
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_08105ACC: .4byte gUnknown_844E850
|
_08105ACC: .4byte gPokedexEntries
|
||||||
_08105AD0: .4byte 0x000186a0
|
_08105AD0: .4byte 0x000186a0
|
||||||
_08105AD4: .4byte 0x000011b8
|
_08105AD4: .4byte 0x000011b8
|
||||||
_08105AD8:
|
_08105AD8:
|
||||||
@@ -6825,7 +6825,7 @@ sub_8105CB0: @ 8105CB0
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _08105D5C
|
beq _08105D5C
|
||||||
ldr r1, _08105D44 @ =gUnknown_844E850
|
ldr r1, _08105D44 @ =gPokedexEntries
|
||||||
lsls r0, r4, 3
|
lsls r0, r4, 3
|
||||||
adds r0, r4
|
adds r0, r4
|
||||||
lsls r0, 2
|
lsls r0, 2
|
||||||
@@ -6876,7 +6876,7 @@ sub_8105CB0: @ 8105CB0
|
|||||||
lsrs r5, r0, 24
|
lsrs r5, r0, 24
|
||||||
b _08105D4A
|
b _08105D4A
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_08105D44: .4byte gUnknown_844E850
|
_08105D44: .4byte gPokedexEntries
|
||||||
_08105D48:
|
_08105D48:
|
||||||
movs r5, 0
|
movs r5, 0
|
||||||
_08105D4A:
|
_08105D4A:
|
||||||
@@ -7874,7 +7874,7 @@ _08106534:
|
|||||||
adds r0, r1
|
adds r0, r1
|
||||||
lsls r0, 2
|
lsls r0, 2
|
||||||
add r0, r10
|
add r0, r10
|
||||||
ldr r1, _081066C8 @ =gUnknown_844E850
|
ldr r1, _081066C8 @ =gPokedexEntries
|
||||||
ldr r2, [sp, 0x18]
|
ldr r2, [sp, 0x18]
|
||||||
lsls r4, r2, 3
|
lsls r4, r2, 3
|
||||||
adds r4, r2
|
adds r4, r2
|
||||||
@@ -7979,7 +7979,7 @@ _081066B8: .4byte gUnknown_203ACF0
|
|||||||
_081066BC: .4byte gUnknown_8452368
|
_081066BC: .4byte gUnknown_8452368
|
||||||
_081066C0: .4byte 0x0000ffff
|
_081066C0: .4byte 0x0000ffff
|
||||||
_081066C4: .4byte gSprites
|
_081066C4: .4byte gSprites
|
||||||
_081066C8: .4byte gUnknown_844E850
|
_081066C8: .4byte gPokedexEntries
|
||||||
_081066CC: .4byte gSaveBlock2Ptr
|
_081066CC: .4byte gSaveBlock2Ptr
|
||||||
_081066D0:
|
_081066D0:
|
||||||
ldr r0, [r7]
|
ldr r0, [r7]
|
||||||
|
|||||||
+2
-3
@@ -631,10 +631,9 @@ gUnknown_84445FA:: @ 84445FA
|
|||||||
.incbin "baserom.gba", 0x4445FA, 0x304
|
.incbin "baserom.gba", 0x4445FA, 0x304
|
||||||
|
|
||||||
gUnknown_84448FE:: @ 84448FE
|
gUnknown_84448FE:: @ 84448FE
|
||||||
.incbin "baserom.gba", 0x4448FE, 0x9F52
|
.incbin "baserom.gba", 0x4448FE, 0x336
|
||||||
|
|
||||||
gUnknown_844E850:: @ 844E850
|
.section .rodata.8451EBC
|
||||||
.incbin "baserom.gba", 0x44E850, 0x366C
|
|
||||||
|
|
||||||
gUnknown_8451EBC:: @ 8451EBC
|
gUnknown_8451EBC:: @ 8451EBC
|
||||||
.incbin "baserom.gba", 0x451EBC, 0x10
|
.incbin "baserom.gba", 0x451EBC, 0x10
|
||||||
|
|||||||
+28
-8
@@ -1,15 +1,14 @@
|
|||||||
#ifndef GUARD_POKEDEX_H
|
#ifndef GUARD_POKEDEX_H
|
||||||
#define GUARD_POKEDEX_H
|
#define GUARD_POKEDEX_H
|
||||||
|
|
||||||
#include "global.h"
|
#define KANTO_DEX_COUNT 151
|
||||||
|
#define NATIONAL_DEX_COUNT 386
|
||||||
|
|
||||||
void ResetPokedex(void);
|
enum
|
||||||
void CopyMonCategoryText(u16 species, u8 *dst);
|
{
|
||||||
u16 GetPokedexHeightWeight(u16 dexNum, u8 data);
|
DEX_MODE_HOENN,
|
||||||
u16 GetNationalPokedexCount(u8);
|
DEX_MODE_NATIONAL
|
||||||
u16 GetKantoPokedexCount(u8);
|
};
|
||||||
bool16 HasAllKantoMons(void);
|
|
||||||
u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality);
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
@@ -19,6 +18,27 @@ enum
|
|||||||
FLAG_SET_CAUGHT
|
FLAG_SET_CAUGHT
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct PokedexEntry
|
||||||
|
{
|
||||||
|
/*0x00*/ u8 categoryName[12];
|
||||||
|
/*0x0C*/ u16 height; //in decimeters
|
||||||
|
/*0x0E*/ u16 weight; //in hectograms
|
||||||
|
/*0x10*/ const u8 *description;
|
||||||
|
/*0x14*/ const u8 *unusedDescription;
|
||||||
|
/*0x18*/ u16 unused;
|
||||||
|
/*0x1A*/ u16 pokemonScale;
|
||||||
|
/*0x1C*/ u16 pokemonOffset;
|
||||||
|
/*0x1E*/ u16 trainerScale;
|
||||||
|
/*0x20*/ u16 trainerOffset;
|
||||||
|
}; /*size = 0x24*/
|
||||||
|
|
||||||
|
void ResetPokedex(void);
|
||||||
|
void CopyMonCategoryText(u16 species, u8 *dst);
|
||||||
|
u16 GetPokedexHeightWeight(u16 dexNum, u8 data);
|
||||||
|
u16 GetNationalPokedexCount(u8);
|
||||||
|
u16 GetKantoPokedexCount(u8);
|
||||||
|
bool16 HasAllKantoMons(void);
|
||||||
|
u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality);
|
||||||
s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId);
|
s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId);
|
||||||
u16 pokedex_count(u8);
|
u16 pokedex_count(u8);
|
||||||
u16 sub_80C0844(u8);
|
u16 sub_80C0844(u8);
|
||||||
|
|||||||
@@ -128,6 +128,7 @@ SECTIONS {
|
|||||||
asm/field_effect.o(.text);
|
asm/field_effect.o(.text);
|
||||||
src/scanline_effect.o(.text);
|
src/scanline_effect.o(.text);
|
||||||
asm/option_menu.o(.text);
|
asm/option_menu.o(.text);
|
||||||
|
src/pokedex.o(.text);
|
||||||
asm/pokedex.o(.text);
|
asm/pokedex.o(.text);
|
||||||
asm/trainer_card.o(.text);
|
asm/trainer_card.o(.text);
|
||||||
asm/pokemon_storage_system.o(.text);
|
asm/pokemon_storage_system.o(.text);
|
||||||
@@ -427,6 +428,8 @@ SECTIONS {
|
|||||||
data/data_83FECCC.o(.rodata.841EE44);
|
data/data_83FECCC.o(.rodata.841EE44);
|
||||||
src/new_menu_helpers.o(.rodata);
|
src/new_menu_helpers.o(.rodata);
|
||||||
data/data_83FECCC.o(.rodata.841F4B4);
|
data/data_83FECCC.o(.rodata.841F4B4);
|
||||||
|
src/pokedex.o(.rodata);
|
||||||
|
data/data_83FECCC.o(.rodata.8451EBC);
|
||||||
src/list_menu.o(.rodata);
|
src/list_menu.o(.rodata);
|
||||||
data/data_83FECCC.o(.rodata.8452CF4);
|
data/data_83FECCC.o(.rodata.8452CF4);
|
||||||
src/save_location.o(.rodata);
|
src/save_location.o(.rodata);
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,8 @@
|
|||||||
|
#include "global.h"
|
||||||
|
#include "pokedex.h"
|
||||||
|
#include "constants/species.h"
|
||||||
|
|
||||||
|
ALIGNED(4) static const u8 gExpandedPlaceholder_PokedexDescription[] = _("");
|
||||||
|
|
||||||
|
#include "data/pokemon/pokedex_text.h"
|
||||||
|
#include "data/pokemon/pokedex_entries.h"
|
||||||
Reference in New Issue
Block a user