start dumping pokedex

This commit is contained in:
DizzyEggg 2017-12-21 22:56:20 +01:00
parent 4307292f55
commit 19c25a8f2b
5 changed files with 1504 additions and 14 deletions

View File

@ -2609,7 +2609,7 @@ _080BCACC:
movs r7, 0x1 movs r7, 0x1
mov r9, r7 mov r9, r7
_080BCADA: _080BCADA:
ldr r1, =gUnknown_0855C6A4 ldr r1, =gPokedexOrder_Alphabetical
lsls r4, 16 lsls r4, 16
asrs r0, r4, 15 asrs r0, r4, 15
adds r0, r1 adds r0, r1
@ -2687,7 +2687,7 @@ _080BCB78:
ldr r7, =gUnknown_02039B4C ldr r7, =gUnknown_02039B4C
ldr r6, =0x0000060c ldr r6, =0x0000060c
_080BCB82: _080BCB82:
ldr r1, =gUnknown_0855C9DA ldr r1, =gPokedexOrder_Weight
asrs r0, 15 asrs r0, 15
adds r0, r1 adds r0, r1
ldrh r0, [r0] ldrh r0, [r0]
@ -2752,7 +2752,7 @@ _080BCC08:
ldr r0, =0x00000181 ldr r0, =0x00000181
mov r9, r0 mov r9, r0
_080BCC16: _080BCC16:
ldr r1, =gUnknown_0855C9DA ldr r1, =gPokedexOrder_Weight
lsls r4, 16 lsls r4, 16
asrs r0, r4, 15 asrs r0, r4, 15
adds r0, r1 adds r0, r1
@ -2819,7 +2819,7 @@ _080BCCA0:
ldr r7, =gUnknown_02039B4C ldr r7, =gUnknown_02039B4C
ldr r6, =0x0000060c ldr r6, =0x0000060c
_080BCCAA: _080BCCAA:
ldr r1, =gUnknown_0855CCDE ldr r1, =gPokedexOrder_Height
asrs r0, 15 asrs r0, 15
adds r0, r1 adds r0, r1
ldrh r0, [r0] ldrh r0, [r0]
@ -2884,7 +2884,7 @@ _080BCD30:
ldr r0, =0x00000181 ldr r0, =0x00000181
mov r9, r0 mov r9, r0
_080BCD3E: _080BCD3E:
ldr r1, =gUnknown_0855CCDE ldr r1, =gPokedexOrder_Height
lsls r4, 16 lsls r4, 16
asrs r0, r4, 15 asrs r0, r4, 15
adds r0, r1 adds r0, r1

View File

@ -3,15 +3,9 @@
.section .rodata .section .rodata
.align 2, 0 .align 2, 0
gUnknown_0855C6A4:: @ 855C6A4 gUnknown_0855D114:: @ 855D114
.incbin "baserom.gba", 0x55c6a4, 0x336 .incbin "baserom.gba", 0x55D114, 0x80
gUnknown_0855C9DA:: @ 855C9DA
.incbin "baserom.gba", 0x55c9da, 0x304
gUnknown_0855CCDE:: @ 855CCDE
.incbin "baserom.gba", 0x55ccde, 0x4b6
gUnknown_0855D194:: @ 855D194 gUnknown_0855D194:: @ 855D194
.incbin "baserom.gba", 0x55d194, 0x18 .incbin "baserom.gba", 0x55d194, 0x18

File diff suppressed because it is too large Load Diff

View File

@ -127,6 +127,7 @@ SECTIONS {
asm/field_effect.o(.text); asm/field_effect.o(.text);
asm/unknown_task.o(.text); asm/unknown_task.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);
src/pokemon_storage_system.o(.text); src/pokemon_storage_system.o(.text);
@ -383,6 +384,7 @@ SECTIONS {
data/wild_encounter.o(.rodata); data/wild_encounter.o(.rodata);
data/field_effect.o(.rodata); data/field_effect.o(.rodata);
data/option_menu.o(.rodata); data/option_menu.o(.rodata);
src/pokedex.o(.rodata);
data/pokedex.o(.rodata); data/pokedex.o(.rodata);
data/trainer_card.o(.rodata); data/trainer_card.o(.rodata);
data/pokemon_storage_system.o(.rodata); data/pokemon_storage_system.o(.rodata);

295
src/pokedex.c Normal file
View File

@ -0,0 +1,295 @@
#include "global.h"
#include "gba/m4a_internal.h"
#include "pokedex.h"
#include "data/pokedex_orders.h"
static const struct OamData gOamData_83A0404 =
{
.y = 160,
.affineMode = 0,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.x = 0,
.matrixNum = 0,
.size = 0,
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
.affineParam = 0,
};
static const struct OamData gOamData_83A040C =
{
.y = 160,
.affineMode = 0,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 1,
.x = 0,
.matrixNum = 0,
.size = 0,
.tileNum = 0,
.priority = 0,
.paletteNum = 0,
.affineParam = 0,
};
static const struct OamData gOamData_83A0414 =
{
.y = 160,
.affineMode = 0,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 1,
.x = 0,
.matrixNum = 0,
.size = 2,
.tileNum = 0,
.priority = 0,
.paletteNum = 0,
.affineParam = 0,
};
static const struct OamData gOamData_83A041C =
{
.y = 160,
.affineMode = 0,
.objMode = 2,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.x = 0,
.matrixNum = 0,
.size = 2,
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
.affineParam = 0,
};
static const struct OamData gOamData_83A0424 =
{
.y = 160,
.affineMode = 0,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 1,
.x = 0,
.matrixNum = 0,
.size = 3,
.tileNum = 0,
.priority = 0,
.paletteNum = 0,
.affineParam = 0,
};
static const struct OamData gOamData_83A042C =
{
.y = 160,
.affineMode = 0,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 2,
.x = 0,
.matrixNum = 0,
.size = 0,
.tileNum = 0,
.priority = 0,
.paletteNum = 0,
.affineParam = 0,
};
static const union AnimCmd sSpriteAnim_855D014[] =
{
ANIMCMD_FRAME(3, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D01C[] =
{
ANIMCMD_FRAME(1, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D024[] =
{
ANIMCMD_FRAME(16, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D02C[] =
{
ANIMCMD_FRAME(48, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D034[] =
{
ANIMCMD_FRAME(40, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D03C[] =
{
ANIMCMD_FRAME(32, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D044[] =
{
ANIMCMD_FRAME(56, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D04C[] =
{
ANIMCMD_FRAME(64, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D054[] =
{
ANIMCMD_FRAME(96, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D05C[] =
{
ANIMCMD_FRAME(160, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D064[] =
{
ANIMCMD_FRAME(168, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D06C[] =
{
ANIMCMD_FRAME(128, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D074[] =
{
ANIMCMD_FRAME(130, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D07C[] =
{
ANIMCMD_FRAME(132, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D084[] =
{
ANIMCMD_FRAME(134, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D08C[] =
{
ANIMCMD_FRAME(136, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D094[] =
{
ANIMCMD_FRAME(138, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D09C[] =
{
ANIMCMD_FRAME(140, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0A4[] =
{
ANIMCMD_FRAME(142, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0AC[] =
{
ANIMCMD_FRAME(144, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0B4[] =
{
ANIMCMD_FRAME(146, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0BC[] =
{
ANIMCMD_FRAME(176, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0C4[] =
{
ANIMCMD_FRAME(178, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0CC[] =
{
ANIMCMD_FRAME(180, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0D4[] =
{
ANIMCMD_FRAME(182, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0DC[] =
{
ANIMCMD_FRAME(184, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0E4[] =
{
ANIMCMD_FRAME(186, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0EC[] =
{
ANIMCMD_FRAME(188, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0F4[] =
{
ANIMCMD_FRAME(190, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0FC[] =
{
ANIMCMD_FRAME(192, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D104[] =
{
ANIMCMD_FRAME(194, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D10C[] =
{
ANIMCMD_FRAME(4, 30),
ANIMCMD_END
};