summaryrefslogtreecommitdiff
path: root/data/pokedex.s
diff options
context:
space:
mode:
Diffstat (limited to 'data/pokedex.s')
-rw-r--r--data/pokedex.s219
1 files changed, 149 insertions, 70 deletions
diff --git a/data/pokedex.s b/data/pokedex.s
index 3ba94dbc5..3b783be34 100644
--- a/data/pokedex.s
+++ b/data/pokedex.s
@@ -1,62 +1,26 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
- .align 2, 0
-
-gUnknown_0855C6A4:: @ 855C6A4
- .incbin "baserom.gba", 0x55c6a4, 0x336
-
-gUnknown_0855C9DA:: @ 855C9DA
- .incbin "baserom.gba", 0x55c9da, 0x304
-
-gUnknown_0855CCDE:: @ 855CCDE
- .incbin "baserom.gba", 0x55ccde, 0x4b6
-
-gUnknown_0855D194:: @ 855D194
- .incbin "baserom.gba", 0x55d194, 0x18
-
-gUnknown_0855D1AC:: @ 855D1AC
- .incbin "baserom.gba", 0x55d1ac, 0x18
-
-gUnknown_0855D1C4:: @ 855D1C4
- .incbin "baserom.gba", 0x55d1c4, 0x18
-
-gUnknown_0855D1DC:: @ 855D1DC
- .incbin "baserom.gba", 0x55d1dc, 0x18
-
-gUnknown_0855D1F4:: @ 855D1F4
- .incbin "baserom.gba", 0x55d1f4, 0x18
-
-gUnknown_0855D20C:: @ 855D20C
- .incbin "baserom.gba", 0x55d20c, 0x18
-
-gUnknown_0855D224:: @ 855D224
- .incbin "baserom.gba", 0x55d224, 0x18
-
-gUnknown_0855D23C:: @ 855D23C
- .incbin "baserom.gba", 0x55d23c, 0x18
-
-gUnknown_0855D254:: @ 855D254
- .incbin "baserom.gba", 0x55d254, 0x18
-
-gUnknown_0855D26C:: @ 855D26C
- .incbin "baserom.gba", 0x55d26c, 0x10
-
-gUnknown_0855D27C:: @ 855D27C
- .incbin "baserom.gba", 0x55d27c, 0x10
-
-gUnknown_0855D28C:: @ 855D28C
- .incbin "baserom.gba", 0x55d28c, 0x5
-
-gUnknown_0855D291:: @ 855D291
- .incbin "baserom.gba", 0x55d291, 0x7
-
-gUnknown_0855D298:: @ 855D298
- .incbin "baserom.gba", 0x55d298, 0x10
-
-gUnknown_0855D2A8:: @ 855D2A8
- .incbin "baserom.gba", 0x55d2a8, 0x10
+ .include "asm/macros.inc"
+ .include "constants/constants.inc"
+
+ .section .rodata
+ .align 2, 0
+
+.macro unk_dex_struct texts, a2, a3, a4
+ .4byte \texts
+ .byte \a2, \a3, \a4
+ .byte 0 @padding
+.endm
+
+.macro unk_dex_struct_2 text, a2, a3, a4, a5, a6, a7
+ .4byte \text
+ .byte \a2, \a3, \a4, \a5, \a6, \a7
+ .2byte 0 @padding
+.endm
+
+.macro unk_dex_struct_3 text, a2, a3, a4
+ .4byte \text
+ .byte \a2, \a3, \a4
+ .byte 0 @padding
+.endm
gUnknown_0855D2B8:: @ 855D2B8
.incbin "baserom.gba", 0x55d2b8, 0x6
@@ -64,8 +28,10 @@ gUnknown_0855D2B8:: @ 855D2B8
gUnknown_0855D2BE:: @ 855D2BE
.incbin "baserom.gba", 0x55d2be, 0x40
-gUnknown_0855D2FE:: @ 855D2FE
- .incbin "baserom.gba", 0x55d2fe, 0xe
+sText_TenDashes:: @ 855D2FE
+ .string "----------$"
+
+.align 2
gUnknown_0855D30C:: @ 855D30C
.string "$"
@@ -101,10 +67,18 @@ gUnknown_0856ED08:: @ 856ED08
.incbin "baserom.gba", 0x56ed08, 0x28
gUnknown_0856ED30:: @ 856ED30
- .incbin "baserom.gba", 0x56ed30, 0x18
+ unk_dex_struct_3 gUnknown_085E87A5, 0, 0, 5
+ unk_dex_struct_3 gUnknown_085E87D6, 6, 0, 5
+ unk_dex_struct_3 gUnknown_085E87EF, 12, 0, 5
gUnknown_0856ED48:: @ 856ED48
- .incbin "baserom.gba", 0x56ed48, 0x54
+ unk_dex_struct_2 gUnknown_085E8840, 0, 2, 5, 5, 2, 12
+ unk_dex_struct_2 gUnknown_085E887C, 0, 4, 5, 5, 4, 12
+ unk_dex_struct_2 gUnknown_085E88A6, 0, 6, 5, 5, 6, 6
+ unk_dex_struct_2 gUnknown_085E88A6, 0, 6, 5, 11, 6, 6
+ unk_dex_struct_2 gUnknown_085E881F, 0, 8, 5, 5, 8, 12
+ unk_dex_struct_2 gUnknown_085E8806, 0, 10, 5, 5, 10, 12
+ unk_dex_struct_2 gUnknown_085E88C8, 0, 12, 5, 0, 0, 0
gUnknown_0856ED9C:: @ 856ED9C
.incbin "baserom.gba", 0x56ed9c, 0x1c
@@ -119,19 +93,119 @@ gUnknown_0856EDF0:: @ 856EDF0
.incbin "baserom.gba", 0x56edf0, 0x1c
gUnknown_0856EE0C:: @ 856EE0C
- .incbin "baserom.gba", 0x56ee0c, 0x18
+ .4byte gUnknown_085E89A4
+ .4byte gUnknown_085E88DF
+ .4byte gUnknown_085E89BB
+ .4byte gUnknown_085E88E9
+ .4byte NULL
+ .4byte NULL
gUnknown_0856EE24:: @ 856EE24
- .incbin "baserom.gba", 0x56ee24, 0x38
+ .4byte gUnknown_085E89D4
+ .4byte gUnknown_085E88F6
+ .4byte gUnknown_085E8A02
+ .4byte gUnknown_085E8905
+ .4byte gUnknown_085E8A37
+ .4byte gUnknown_085E8911
+ .4byte gUnknown_085E8A73
+ .4byte gUnknown_085E891F
+ .4byte gUnknown_085E8AAF
+ .4byte gUnknown_085E892D
+ .4byte gUnknown_085E8AEA
+ .4byte gUnknown_085E893A
+ .4byte 0
+ .4byte 0
gUnknown_0856EE5C:: @ 856EE5C
- .incbin "baserom.gba", 0x56ee5c, 0x58
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8B26
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8948
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E894C
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8950
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8954
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8958
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E895C
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8960
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8964
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8968
+ .4byte 0
+ .4byte 0
gUnknown_0856EEB4:: @ 856EEB4
- .incbin "baserom.gba", 0x56eeb4, 0x60
-
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8B26
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E896B
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E896F
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8974
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E897B
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8981
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8987
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E898D
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8994
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8999
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E899F
+ .4byte 0
+ .4byte 0
+
+@ read from type table for each type except ???, entry is 7 byte of length
gUnknown_0856EF14:: @ 856EF14
- .incbin "baserom.gba", 0x56ef14, 0x98
+ .4byte gUnknown_085E8B25
+ .4byte gUnknown_085E8B35
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 0
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 7
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 14
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 21
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 28
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 35
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 42
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 49
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 56
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 70
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 77
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 84
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 91
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 98
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 105
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 112
+ .4byte gUnknown_085E8B25
+ .4byte gTypeNames + 119
+ .4byte 0
+ .4byte 0
gUnknown_0856EFAC:: @ 856EFAC
.incbin "baserom.gba", 0x56efac, 0x2
@@ -143,7 +217,12 @@ gUnknown_0856EFB4:: @ 856EFB4
.incbin "baserom.gba", 0x56efb4, 0x14
gUnknown_0856EFC8:: @ 856EFC8
- .incbin "baserom.gba", 0x56efc8, 0x30
+ unk_dex_struct gUnknown_0856EE5C, 6, 7, 10
+ unk_dex_struct gUnknown_0856EEB4, 8, 9, 11
+ unk_dex_struct gUnknown_0856EF14, 10,11, 18
+ unk_dex_struct gUnknown_0856EF14, 12, 13, 18
+ unk_dex_struct gUnknown_0856EE24, 4, 5, 6
+ unk_dex_struct gUnknown_0856EE0C, 2, 3, 2
gUnknown_0856EFF8:: @ 856EFF8
.incbin "baserom.gba", 0x56eff8, 0x10