dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #147 from DizzyEggg/dump_pointers

Browse Source 
Get rid of pointer baseroms
This commit is contained in:
Cameron Hall
2017-12-24 12:51:53 -06:00
committed by GitHub
parent f209cbd7a0 47ab4efef0
commit 87958f2f87
45 changed files with 9512 additions and 1892 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/pokedex.s
+14 -14
View File
@@ -2028,7 +2028,7 @@ _080BC56E:
bl SetGpuReg
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0855D298
ldr r1, =gBgTemplates_0855D298
movs r0, 0
movs r2, 0x4
bl InitBgsFromTemplates
@@ -2119,7 +2119,7 @@ _080BC682:
lsls r0, 31
lsrs r0, 31
bl sub_80BC844
ldr r0, =gUnknown_0855D2A8
ldr r0, =sWindowTemplates_0855D2A8
bl InitWindows
bl DeactivateAllTextPrinters
movs r0, 0
@@ -2141,9 +2141,9 @@ _080BC6CC:
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x8
strb r0, [r1]
ldr r0, =gUnknown_0855D26C
ldr r0, =gSpriteSheets_0855D26C
bl LoadCompressedObjectPic
ldr r0, =gUnknown_0855D27C
ldr r0, =gSpritePalettes_0855D26C
bl LoadSpritePalettes
adds r0, r5, 0
bl sub_80BDB7C
@@ -2298,7 +2298,7 @@ _080BC858:
bl IsNationalPokedexEnabled
cmp r0, 0
bne _080BC870
ldr r0, =gUnknown_08DC16F6
ldr r0, =gUnknown_08DC16F4 + 2
_080BC862:
movs r1, 0x1
movs r2, 0xBE
@@ -2609,7 +2609,7 @@ _080BCACC:
movs r7, 0x1
mov r9, r7
_080BCADA:
ldr r1, =gUnknown_0855C6A4
ldr r1, =gPokedexOrder_Alphabetical
lsls r4, 16
asrs r0, r4, 15
adds r0, r1
@@ -2687,7 +2687,7 @@ _080BCB78:
ldr r7, =gUnknown_02039B4C
ldr r6, =0x0000060c
_080BCB82:
ldr r1, =gUnknown_0855C9DA
ldr r1, =gPokedexOrder_Weight
asrs r0, 15
adds r0, r1
ldrh r0, [r0]
@@ -2752,7 +2752,7 @@ _080BCC08:
ldr r0, =0x00000181
mov r9, r0
_080BCC16:
ldr r1, =gUnknown_0855C9DA
ldr r1, =gPokedexOrder_Weight
lsls r4, 16
asrs r0, r4, 15
adds r0, r1
@@ -2819,7 +2819,7 @@ _080BCCA0:
ldr r7, =gUnknown_02039B4C
ldr r6, =0x0000060c
_080BCCAA:
ldr r1, =gUnknown_0855CCDE
ldr r1, =gPokedexOrder_Height
asrs r0, 15
adds r0, r1
ldrh r0, [r0]
@@ -2884,7 +2884,7 @@ _080BCD30:
ldr r0, =0x00000181
mov r9, r0
_080BCD3E:
ldr r1, =gUnknown_0855CCDE
ldr r1, =gPokedexOrder_Height
lsls r4, 16
asrs r0, r4, 15
adds r0, r1
@@ -3517,7 +3517,7 @@ sub_80BD23C: @ 80BD23C
b _080BD266
.pool
_080BD264:
ldr r4, =gUnknown_0855D2FE
ldr r4, =sText_TenDashes
_080BD266:
str r5, [sp]
movs r0, 0
@@ -8751,7 +8751,7 @@ _080C00E8:
ands r1, r0
cmp r1, 0
beq _080C0114
ldr r0, =gUnknown_08DC16F6
ldr r0, =gUnknown_08DC16F4 + 2
movs r1, 0x31
movs r2, 0xE
bl LoadPalette
@@ -11172,9 +11172,9 @@ _080C13F0:
b _080C1516
.pool
_080C1414:
ldr r0, =gUnknown_0855D26C
ldr r0, =gSpriteSheets_0855D26C
bl LoadCompressedObjectPic
ldr r0, =gUnknown_0855D27C
ldr r0, =gSpritePalettes_0855D26C
bl LoadSpritePalettes
adds r0, r4, 0
bl sub_80C2594
asm/pokemon_icon.s
+9 -9
View File
@@ -28,15 +28,15 @@ sub_80D2CC4: @ 80D2CC4
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldr r0, =gUnknown_0857C570
ldr r0, =sMonIconOamData
str r0, [sp, 0x18]
adds r0, r4, 0
adds r2, r5, 0
bl GetMonIconPtr
str r0, [sp, 0x1C]
ldr r0, =gUnknown_0857C5B4
ldr r0, =sMonIconAnims
str r0, [sp, 0x20]
ldr r0, =gUnknown_0857C5E8
ldr r0, =sMonIconAffineAnims
str r0, [sp, 0x24]
str r6, [sp, 0x28]
ldr r0, =gMonIconPaletteIndices
@@ -102,13 +102,13 @@ sub_80D2D78: @ 80D2D78
lsls r6, 24
lsrs r6, 24
mov r3, sp
ldr r2, =gUnknown_0857C570
ldr r2, =sMonIconOamData
str r2, [sp]
movs r2, 0
str r2, [sp, 0x4]
ldr r2, =gUnknown_0857C5B4
ldr r2, =sMonIconAnims
str r2, [sp, 0x8]
ldr r2, =gUnknown_0857C5E8
ldr r2, =sMonIconAffineAnims
str r2, [sp, 0xC]
str r1, [sp, 0x10]
ldr r2, =gMonIconPaletteIndices
@@ -601,7 +601,7 @@ _080D3126:
strb r7, [r5]
b _080D31A4
_080D312A:
ldr r2, =gUnknown_0857C5F0
ldr r2, =sSpriteImageSizes
ldrb r1, [r4, 0x3]
lsrs r1, 6
lsls r1, 1
@@ -689,7 +689,7 @@ sub_80D31B4: @ 80D31B4
mov r8, r0
movs r0, 0
str r0, [sp, 0x30]
ldr r2, =gUnknown_0857C5F0
ldr r2, =sSpriteImageSizes
mov r0, r9
ldr r6, [r0]
ldrb r1, [r6, 0x3]
@@ -776,7 +776,7 @@ sub_80D328C: @ 80D328C
sub sp, 0x8
movs r1, 0
str r1, [sp]
ldr r3, =gUnknown_0857C5F0
ldr r3, =sSpriteImageSizes
ldrb r2, [r0, 0x3]
lsrs r2, 6
lsls r2, 1
asm/pokemon_storage_system.s
+2 -2
View File
@@ -1106,7 +1106,7 @@ sub_80C7958: @ 80C7958
ldrh r0, [r3]
adds r0, 0x1
strh r0, [r1]
ldr r0, =gUnknown_08571710
ldr r0, =sSpriteAnimTable_8571710
str r0, [sp, 0xC]
movs r4, 0
_080C7A10:
@@ -9124,7 +9124,7 @@ _080CBF80:
adds r1, r3
ldr r0, [r1]
ldr r2, [r0]
ldr r0, =gUnknown_0857291C
ldr r0, =gSpriteAffineAnimTable_857291C
str r0, [r2, 0x10]
ldr r0, [r1]
ldr r0, [r0]
asm/rayquaza_scene.s
+3 -3
View File
@@ -1172,8 +1172,8 @@ _081D7082:
.pool
thumb_func_end sub_81D706C
thumb_func_start task_add_00_WIN0V_open_close_above_and_more
task_add_00_WIN0V_open_close_above_and_more: @ 81D7134
thumb_func_start sub_81D7134
sub_81D7134: @ 81D7134
push {r4-r7,lr}
sub sp, 0x8
lsls r0, 24
@@ -1264,7 +1264,7 @@ _081D71EE:
pop {r0}
bx r0
.pool
thumb_func_end task_add_00_WIN0V_open_close_above_and_more
thumb_func_end sub_81D7134
thumb_func_start sub_81D7228
sub_81D7228: @ 81D7228
data/graphics.s
+176 -20
View File
@@ -821,10 +821,31 @@ gUnknown_08D96AB4:: @ 8D96AB4
.incbin "baserom.gba", 0xd96ab4, 0xec
gUnknown_08D96BA0:: @ 8D96BA0
.incbin "baserom.gba", 0xd96ba0, 0xfe4
.incbin "baserom.gba", 0xd96ba0, 0x138
gUnknown_08D96CD8:: @ 8D96CD8
.incbin "baserom.gba", 0xd96cd8, 0x294
gUnknown_08D96F6C:: @ 8D96F6C
.incbin "baserom.gba", 0xd96f6c, 0x24
gUnknown_08D96F90:: @ 8D96F90
.incbin "baserom.gba", 0xd96f90, 0x1F8
gUnknown_08D97188:: @ 8D97188
.incbin "baserom.gba", 0xd97188, 0x28
gUnknown_08D971B0:: @ 8D971B0
.incbin "baserom.gba", 0xd971b0, 0x9D4
gUnknown_08D97B84:: @ 8D97B84
.incbin "baserom.gba", 0xd97b84, 0x188
.incbin "baserom.gba", 0xd97b84, 0x68
gUnknown_08D97BEC:: @ 8D97BEC
.incbin "baserom.gba", 0xd97bec, 0x108
gUnknown_08D97CF4:: @ 8D97CF4
.incbin "baserom.gba", 0xd97cf4, 0x18
gUnknown_08D97D0C:: @ 8D97D0C
.incbin "baserom.gba", 0xd97d0c, 0x830
@@ -973,8 +994,29 @@ gUnknown_08D9C13C:: @ 8D9C13C
@ 8D9C3A8
.include "data/graphics/berries/berry_graphics.inc"
@ 8DA1E78
.incbin "baserom.gba", 0xda1e78, 0x1548
gUnknown_08DA1E78:: @ 8DA1E78
.incbin "baserom.gba", 0xda1e78, 0xBE4
gUnknown_08DA2A5C:: @ 8DA2A5C
.incbin "baserom.gba", 0xDA2A5C, 0xCC
gUnknown_08DA2B28:: @ 8DA2B28
.incbin "baserom.gba", 0xDA2B28, 0x1F4
gUnknown_08DA2D1C:: @ 8DA2D1C
.incbin "baserom.gba", 0xDA2D1C, 0x534
gUnknown_08DA3250:: @ 8DA3250
.incbin "baserom.gba", 0xDA3250, 0x54
gUnknown_08DA32A4:: @ 8DA32A4
.incbin "baserom.gba", 0xDA32A4, 0xCC
gUnknown_08DA3370:: @ 8DA3370
.incbin "baserom.gba", 0xDA3370, 0x28
gUnknown_08DA3398:: @ 8DA3398
.incbin "baserom.gba", 0xDA3398, 0x28
gUnknown_08DA33C0:: @ 8DA33C0
.incbin "baserom.gba", 0xda33c0, 0x428
@@ -989,7 +1031,13 @@ gUnknown_08DA3988:: @ 8DA3988
.incbin "baserom.gba", 0xda3988, 0x100
gUnknown_08DA3A88:: @ 8DA3A88
.incbin "baserom.gba", 0xda3a88, 0x20c
.incbin "baserom.gba", 0xda3a88, 0x138
gUnknown_08DA3BC0:: @ 8DA3BC0
.incbin "baserom.gba", 0xDA3BC0, 0xBC
gUnknown_08DA3C7C:: @ 8DA3C7C
.incbin "baserom.gba", 0xDA3C7C, 0x18
gUnknown_08DA3C94:: @ 8DA3C94
.incbin "baserom.gba", 0xda3c94, 0x1114
@@ -1004,7 +1052,13 @@ gUnknown_08DA4F70:: @ 8DA4F70
.incbin "baserom.gba", 0xda4f70, 0x1148
gUnknown_08DA60B8:: @ 8DA60B8
.incbin "baserom.gba", 0xda60b8, 0x904
.incbin "baserom.gba", 0xda60b8, 0x388
gUnknown_08DA6440:: @ 8DA6440
.incbin "baserom.gba", 0xDA6440, 0x46C
gUnknown_08DA68AC:: @ 8DA68AC
.incbin "baserom.gba", 0xDA68AC, 0x110
gUnknown_08DA69BC:: @ 8DA69BC
.incbin "baserom.gba", 0xda69bc, 0xb6c
@@ -1043,7 +1097,37 @@ gUnknown_08DA8D6C:: @ 8DA8D6C
.incbin "baserom.gba", 0xda8d6c, 0x118
gUnknown_08DA8E84:: @ 8DA8E84
.incbin "baserom.gba", 0xda8e84, 0x1a30
.incbin "baserom.gba", 0xda8e84, 0x54
gUnknown_08DA8ED8:: @ 8DA8ED8
.incbin "baserom.gba", 0xDA8ED8, 0x798
gUnknown_08DA9670:: @ 8DA9670
.incbin "baserom.gba", 0xDA9670, 0x44
gUnknown_08DA96B4:: @ 8DA96B4
.incbin "baserom.gba", 0xDA96B4, 0x248
gUnknown_08DA98FC:: @ 8DA98FC
.incbin "baserom.gba", 0xDA98FC, 0xCA8
gUnknown_08DAA5A4:: @ 8DAA5A4
.incbin "baserom.gba", 0xDAA5A4, 0x1F0
gUnknown_08DAA794:: @ 8DAA794
.incbin "baserom.gba", 0xDAA794, 0x98
gUnknown_08DAA82C:: @ 8DAA82C
.incbin "baserom.gba", 0xDAA82C, 0x28
gUnknown_08DAA854:: @ 8DAA854
.incbin "baserom.gba", 0xDAA854, 0x28
gUnknown_08DAA87C:: @ 8DAA87C
.incbin "baserom.gba", 0xDAA87C, 0x28
gUnknown_08DAA8A4:: @ 8DAA8A4
.incbin "baserom.gba", 0xDAA8A4, 0x10
gUnknown_08DAA8B4:: @ 8DAA8B4
.incbin "baserom.gba", 0xdaa8b4, 0x270
@@ -1217,10 +1301,25 @@ gUnknown_08DC0754:: @ 8DC0754
.incbin "baserom.gba", 0xdc0754, 0x440
gUnknown_08DC0B94:: @ 8DC0B94
.incbin "baserom.gba", 0xdc0b94, 0xb62
.incbin "baserom.gba", 0xdc0b94, 0x800
gUnknown_08DC16F6:: @ 8DC16F6
.incbin "baserom.gba", 0xdc16f6, 0x60
gUnknown_08DC1394:: @ 8DC1394
.incbin "baserom.gba", 0xdc1394, 0x2E0
gUnknown_08DC1674:: @ 8DC1674
.incbin "baserom.gba", 0xdc1674, 0x20
gUnknown_08DC1694:: @ 8DC1694
.incbin "baserom.gba", 0xdc1694, 0x20
gUnknown_08DC16B4:: @ 8DC16B4
.incbin "baserom.gba", 0xdc16b4, 0x20
gUnknown_08DC16D4:: @ 8DC16D4
.incbin "baserom.gba", 0xdc16d4, 0x20
gUnknown_08DC16F4:: @ 8DC16F4
.incbin "baserom.gba", 0xdc16f4, 0x62
gUnknown_08DC1756:: @ 8DC1756
.incbin "baserom.gba", 0xdc1756, 0x60
@@ -1232,7 +1331,10 @@ gUnknown_08DC1876:: @ 8DC1876
.incbin "baserom.gba", 0xdc1876, 0xbe
gUnknown_08DC1934:: @ 8DC1934
.incbin "baserom.gba", 0xdc1934, 0x10d4
.incbin "baserom.gba", 0xdc1934, 0xA18
gUnknown_08DC234C:: @ 8DC234C
.incbin "baserom.gba", 0xDC234C, 0x6BC
gUnknown_08DC2A08:: @ 8DC2A08
.incbin "baserom.gba", 0xdc2a08, 0x114
@@ -1365,7 +1467,43 @@ gUnknown_08DC7D84:: @ 8DC7D84
.incbin "baserom.gba", 0xdc7d84, 0x17c
gUnknown_08DC7F00:: @ 8DC7F00
.incbin "baserom.gba", 0xdc7f00, 0x11c0
.incbin "baserom.gba", 0xdc7f00, 0xA0
gUnknown_08DC7FA0:: @ 8DC7FA0
.incbin "baserom.gba", 0xdc7fa0, 0x13C
gUnknown_08DC80DC:: @ 8DC80DC
.incbin "baserom.gba", 0xdc80dc, 0x12C
gUnknown_08DC8208:: @ 8DC8208
.incbin "baserom.gba", 0xdc8208, 0x184
gUnknown_08DC838C:: @ 8DC838C
.incbin "baserom.gba", 0xdc838c, 0x120
gUnknown_08DC84AC:: @ 8DC84AC
.incbin "baserom.gba", 0xdc84ac, 0x1A0
gUnknown_08DC864C:: @ 8DC864C
.incbin "baserom.gba", 0xdc864c, 0x1AC
gUnknown_08DC87F8:: @ 8DC87F8
.incbin "baserom.gba", 0xdc87f8, 0x2AC
gUnknown_08DC8AA4:: @ 8DC8AA4
.incbin "baserom.gba", 0xdc8aa4, 0x170
gUnknown_08DC8C14:: @ 8DC8C14
.incbin "baserom.gba", 0xdc8c14, 0x13C
gUnknown_08DC8D50:: @ 8DC8D50
.incbin "baserom.gba", 0xdc8d50, 0x114
gUnknown_08DC8E64:: @ 8DC8E64
.incbin "baserom.gba", 0xdc8e64, 0x100
gUnknown_08DC8F64:: @ 8DC8F64
.incbin "baserom.gba", 0xdc8f64, 0x15C
gUnknown_08DC90C0:: @ 8DC90C0
.incbin "baserom.gba", 0xdc90c0, 0x20
@@ -1377,7 +1515,10 @@ gUnknown_08DC9130:: @ 8DC9130
.incbin "baserom.gba", 0xdc9130, 0xb8
gUnknown_08DC91E8:: @ 8DC91E8
.incbin "baserom.gba", 0xdc91e8, 0x420
.incbin "baserom.gba", 0xdc91e8, 0x20
gUnknown_08DC9208:: @ 8DC9208
.incbin "baserom.gba", 0xdc9208, 0x400
gUnknown_08DC9608:: @ 8DC9608
.incbin "baserom.gba", 0xdc9608, 0x20
@@ -1443,10 +1584,19 @@ gUnknown_08DCC648:: @ 8DCC648
.incbin "baserom.gba", 0xdcc648, 0x2c0
gUnknown_08DCC908:: @ 8DCC908
.incbin "baserom.gba", 0xdcc908, 0x2b0
.incbin "baserom.gba", 0xdcc908, 0x290
gUnknown_08DCCB98:: @ 8DCCB98
.incbin "baserom.gba", 0xdccb98, 0x20
gUnknown_08DCCBB8:: @ 8DCCBB8
.incbin "baserom.gba", 0xdccbb8, 0x3a4
.incbin "baserom.gba", 0xdccbb8, 0x184
gUnknown_08DCCD3C:: @ 8DCCD3C
.incbin "baserom.gba", 0xdccd3c, 0x20
gUnknown_08DCCD5C:: @ 8DCCD5C
.incbin "baserom.gba", 0xdccd5c, 0x200
gUnknown_08DCCF5C:: @ 8DCCF5C
.incbin "baserom.gba", 0xdccf5c, 0x20
@@ -1473,22 +1623,28 @@ gUnknown_08DCEC70:: @ 8DCEC70
.incbin "baserom.gba", 0xdcec70, 0x13e0
gUnknown_08DD0050:: @ 8DD0050
.incbin "baserom.gba", 0xdd0050, 0x1a68
.incbin "baserom.gba", 0xdd0050, 0x1A08
gUnknown_08DD1A58:: @ 8DD1A58
.incbin "baserom.gba", 0xdd1a58, 0x60
gUnknown_08DD1AB8:: @ 8DD1AB8
.incbin "baserom.gba", 0xdd1ab8, 0x4c0
.incbin "baserom.gba", 0xdd1ab8, 0x4C0
gUnknown_08DD1F78:: @ 8DD1F78
.incbin "baserom.gba", 0xdd1f78, 0x98
gUnknown_08DD2010:: @ 8DD2010
.incbin "baserom.gba", 0xdd2010, 0x1a0
.incbin "baserom.gba", 0xdd2010, 0x1A0
gUnknown_08DD21B0:: @ 8DD21B0
.incbin "baserom.gba", 0xdd21b0, 0xdc
.incbin "baserom.gba", 0xdd21b0, 0xDC
gUnknown_08DD228C:: @ 8DD228C
.incbin "baserom.gba", 0xdd228c, 0x1e0
.incbin "baserom.gba", 0xdd228c, 0x180
gUnknown_08DD240C:: @ 8DD240C
.incbin "baserom.gba", 0xdd240c, 0x60
gUnknown_08DD246C:: @ 8DD246C
.incbin "baserom.gba", 0xdd246c, 0x674
data/graphics/pokemon/icon_palette_indices.inc
-442
View File
@@ -1,442 +0,0 @@
.align 2
gMonIconPaletteIndices:: @ 857C388
.byte 0 @ ??????????
.byte 1 @ Bulbasaur
.byte 1 @ Ivysaur
.byte 1 @ Venusaur
.byte 0 @ Charmander
.byte 0 @ Charmeleon
.byte 0 @ Charizard
.byte 0 @ Squirtle
.byte 2 @ Wartortle
.byte 2 @ Blastoise
.byte 1 @ Caterpie
.byte 1 @ Metapod
.byte 0 @ Butterfree
.byte 1 @ Weedle
.byte 2 @ Kakuna
.byte 2 @ Beedrill
.byte 0 @ Pidgey
.byte 0 @ Pidgeotto
.byte 0 @ Pidgeot
.byte 2 @ Rattata
.byte 1 @ Raticate
.byte 0 @ Spearow
.byte 0 @ Fearow
.byte 2 @ Ekans
.byte 2 @ Arbok
.byte 2 @ Pikachu
.byte 0 @ Raichu
.byte 2 @ Sandshrew
.byte 2 @ Sandslash
.byte 2 @ Nidoran♀
.byte 2 @ Nidorina
.byte 2 @ Nidoqueen
.byte 2 @ Nidoran♂
.byte 2 @ Nidorino
.byte 2 @ Nidoking
.byte 0 @ Clefairy
.byte 0 @ Clefable
.byte 2 @ Vulpix
.byte 1 @ Ninetales
.byte 0 @ Jigglypuff
.byte 0 @ Wigglytuff
.byte 2 @ Zubat
.byte 2 @ Golbat
.byte 1 @ Oddish
.byte 0 @ Gloom
.byte 0 @ Vileplume
.byte 0 @ Paras
.byte 0 @ Parasect
.byte 0 @ Venonat
.byte 2 @ Venomoth
.byte 2 @ Diglett
.byte 2 @ Dugtrio
.byte 1 @ Meowth
.byte 1 @ Persian
.byte 1 @ Psyduck
.byte 2 @ Golduck
.byte 1 @ Mankey
.byte 2 @ Primeape
.byte 0 @ Growlithe
.byte 0 @ Arcanine
.byte 0 @ Poliwag
.byte 0 @ Poliwhirl
.byte 0 @ Poliwrath
.byte 2 @ Abra
.byte 2 @ Kadabra
.byte 2 @ Alakazam
.byte 0 @ Machop
.byte 2 @ Machoke
.byte 0 @ Machamp
.byte 1 @ Bellsprout
.byte 1 @ Weepinbell
.byte 1 @ Victreebel
.byte 2 @ Tentacool
.byte 2 @ Tentacruel
.byte 1 @ Geodude
.byte 1 @ Graveler
.byte 1 @ Golem
.byte 0 @ Ponyta
.byte 0 @ Rapidash
.byte 0 @ Slowpoke
.byte 0 @ Slowbro
.byte 0 @ Magnemite
.byte 0 @ Magneton
.byte 1 @ Farfetch'd
.byte 2 @ Doduo
.byte 2 @ Dodrio
.byte 2 @ Seel
.byte 2 @ Dewgong
.byte 2 @ Grimer
.byte 2 @ Muk
.byte 2 @ Shellder
.byte 2 @ Cloyster
.byte 2 @ Gastly
.byte 2 @ Haunter
.byte 2 @ Gengar
.byte 2 @ Onix
.byte 2 @ Drowzee
.byte 1 @ Hypno
.byte 2 @ Krabby
.byte 2 @ Kingler
.byte 0 @ Voltorb
.byte 0 @ Electrode
.byte 0 @ Exeggcute
.byte 1 @ Exeggutor
.byte 1 @ Cubone
.byte 1 @ Marowak
.byte 2 @ Hitmonlee
.byte 2 @ Hitmonchan
.byte 1 @ Lickitung
.byte 2 @ Koffing
.byte 2 @ Weezing
.byte 1 @ Rhyhorn
.byte 1 @ Rhydon
.byte 0 @ Chansey
.byte 0 @ Tangela
.byte 1 @ Kangaskhan
.byte 0 @ Horsea
.byte 0 @ Seadra
.byte 0 @ Goldeen
.byte 0 @ Seaking
.byte 2 @ Staryu
.byte 2 @ Starmie
.byte 0 @ Mr. mime
.byte 1 @ Scyther
.byte 2 @ Jynx
.byte 1 @ Electabuzz
.byte 0 @ Magmar
.byte 2 @ Pinsir
.byte 2 @ Tauros
.byte 0 @ Magikarp
.byte 0 @ Gyarados
.byte 2 @ Lapras
.byte 2 @ Ditto
.byte 2 @ Eevee
.byte 0 @ Vaporeon
.byte 0 @ Jolteon
.byte 0 @ Flareon
.byte 0 @ Porygon
.byte 0 @ Omanyte
.byte 0 @ Omastar
.byte 2 @ Kabuto
.byte 2 @ Kabutops
.byte 0 @ Aerodactyl
.byte 1 @ Snorlax
.byte 0 @ Articuno
.byte 0 @ Zapdos
.byte 0 @ Moltres
.byte 0 @ Dratini
.byte 0 @ Dragonair
.byte 2 @ Dragonite
.byte 2 @ Mewtwo
.byte 0 @ Mew
.byte 1 @ Chikorita
.byte 1 @ Bayleef
.byte 1 @ Meganium
.byte 1 @ Cyndaquil
.byte 1 @ Quilava
.byte 1 @ Typhlosion
.byte 2 @ Totodile
.byte 2 @ Croconaw
.byte 2 @ Feraligatr
.byte 2 @ Sentret
.byte 2 @ Furret
.byte 2 @ Hoothoot
.byte 2 @ Noctowl
.byte 0 @ Ledyba
.byte 0 @ Ledian
.byte 1 @ Spinarak
.byte 0 @ Ariados
.byte 2 @ Crobat
.byte 2 @ Chinchou
.byte 0 @ Lanturn
.byte 0 @ Pichu
.byte 0 @ Cleffa
.byte 1 @ Igglybuff
.byte 2 @ Togepi
.byte 2 @ Togetic
.byte 0 @ Natu
.byte 0 @ Xatu
.byte 2 @ Mareep
.byte 0 @ Flaaffy
.byte 0 @ Ampharos
.byte 1 @ Bellossom
.byte 2 @ Marill
.byte 2 @ Azumarill
.byte 1 @ Sudowoodo
.byte 1 @ Politoed
.byte 1 @ Hoppip
.byte 1 @ Skiploom
.byte 2 @ Jumpluff
.byte 2 @ Aipom
.byte 1 @ Sunkern
.byte 1 @ Sunflora
.byte 1 @ Yanma
.byte 0 @ Wooper
.byte 0 @ Quagsire
.byte 2 @ Espeon
.byte 2 @ Umbreon
.byte 2 @ Murkrow
.byte 0 @ Slowking
.byte 0 @ Misdreavus
.byte 0 @ Unown A
.byte 0 @ Wobbuffet
.byte 1 @ Girafarig
.byte 0 @ Pineco
.byte 2 @ Forretress
.byte 2 @ Dunsparce
.byte 2 @ Gligar
.byte 0 @ Steelix
.byte 0 @ Snubbull
.byte 2 @ Granbull
.byte 0 @ Qwilfish
.byte 0 @ Scizor
.byte 1 @ Shuckle
.byte 2 @ Heracross
.byte 0 @ Sneasel
.byte 0 @ Teddiursa
.byte 2 @ Ursaring
.byte 0 @ Slugma
.byte 0 @ Magcargo
.byte 2 @ Swinub
.byte 2 @ Piloswine
.byte 0 @ Corsola
.byte 0 @ Remoraid
.byte 0 @ Octillery
.byte 0 @ Delibird
.byte 2 @ Mantine
.byte 0 @ Skarmory
.byte 0 @ Houndour
.byte 0 @ Houndoom
.byte 0 @ Kingdra
.byte 0 @ Phanpy
.byte 0 @ Donphan
.byte 0 @ Porygon2
.byte 2 @ Stantler
.byte 1 @ Smeargle
.byte 2 @ Tyrogue
.byte 2 @ Hitmontop
.byte 1 @ Smoochum
.byte 1 @ Elekid
.byte 1 @ Magby
.byte 1 @ Miltank
.byte 1 @ Blissey
.byte 0 @ Raikou
.byte 2 @ Entei
.byte 0 @ Suicune
.byte 1 @ Larvitar
.byte 0 @ Pupitar
.byte 1 @ Tyranitar
.byte 0 @ Lugia
.byte 1 @ Ho-Oh
.byte 1 @ Celebi
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 1 @ Treecko
.byte 0 @ Grovyle
.byte 1 @ Sceptile
.byte 0 @ Torchic
.byte 0 @ Combusken
.byte 0 @ Blaziken
.byte 0 @ Mudkip
.byte 0 @ Marshtomp
.byte 0 @ Swampert
.byte 2 @ Poochyena
.byte 2 @ Mightyena
.byte 2 @ Zigzagoon
.byte 2 @ Linoone
.byte 0 @ Wurmple
.byte 2 @ Silcoon
.byte 0 @ Beautifly
.byte 2 @ Cascoon
.byte 1 @ Dustox
.byte 1 @ Lotad
.byte 1 @ Lombre
.byte 1 @ Ludicolo
.byte 1 @ Seedot
.byte 1 @ Nuzleaf
.byte 0 @ Shiftry
.byte 1 @ Nincada
.byte 1 @ Ninjask
.byte 1 @ Shedinja
.byte 2 @ Taillow
.byte 2 @ Swellow
.byte 1 @ Shroomish
.byte 1 @ Breloom
.byte 1 @ Spinda
.byte 0 @ Wingull
.byte 0 @ Pelipper
.byte 2 @ Surskit
.byte 0 @ Masquerain
.byte 2 @ Wailmer
.byte 0 @ Wailord
.byte 0 @ Skitty
.byte 2 @ Delcatty
.byte 1 @ Kecleon
.byte 1 @ Baltoy
.byte 0 @ Claydol
.byte 0 @ Nosepass
.byte 1 @ Torkoal
.byte 2 @ Sableye
.byte 0 @ Barboach
.byte 0 @ Whiscash
.byte 0 @ Luvdisc
.byte 0 @ Corphish
.byte 0 @ Crawdaunt
.byte 2 @ Feebas
.byte 0 @ Milotic
.byte 0 @ Carvanha
.byte 0 @ Sharpedo
.byte 1 @ Trapinch
.byte 1 @ Vibrava
.byte 1 @ Flygon
.byte 2 @ Makuhita
.byte 1 @ Hariyama
.byte 1 @ Electrike
.byte 0 @ Manectric
.byte 1 @ Numel
.byte 0 @ Camerupt
.byte 2 @ Spheal
.byte 2 @ Sealeo
.byte 0 @ Walrein
.byte 1 @ Cacnea
.byte 1 @ Cacturne
.byte 2 @ Snorunt
.byte 0 @ Glalie
.byte 1 @ Lunatone
.byte 0 @ Solrock
.byte 2 @ Azurill
.byte 0 @ Spoink
.byte 2 @ Grumpig
.byte 0 @ Plusle
.byte 0 @ Minun
.byte 2 @ Mawile
.byte 0 @ Meditite
.byte 0 @ Medicham
.byte 0 @ Swablu
.byte 0 @ Altaria
.byte 0 @ Wynaut
.byte 0 @ Duskull
.byte 0 @ Dusclops
.byte 0 @ Roselia
.byte 2 @ Slakoth
.byte 2 @ Vigoroth
.byte 1 @ Slaking
.byte 1 @ Gulpin
.byte 2 @ Swalot
.byte 1 @ Tropius
.byte 0 @ Whismur
.byte 2 @ Loudred
.byte 2 @ Exploud
.byte 0 @ Clamperl
.byte 0 @ Huntail
.byte 0 @ Gorebyss
.byte 0 @ Absol
.byte 0 @ Shuppet
.byte 0 @ Banette
.byte 2 @ Seviper
.byte 0 @ Zangoose
.byte 1 @ Relicanth
.byte 2 @ Aron
.byte 2 @ Lairon
.byte 2 @ Aggron
.byte 0 @ Castform
.byte 0 @ Volbeat
.byte 2 @ Illumise
.byte 2 @ Lileep
.byte 0 @ Cradily
.byte 0 @ Anorith
.byte 0 @ Armaldo
.byte 1 @ Ralts
.byte 1 @ Kirlia
.byte 1 @ Gardevoir
.byte 2 @ Bagon
.byte 2 @ Shelgon
.byte 0 @ Salamence
.byte 0 @ Beldum
.byte 0 @ Metang
.byte 0 @ Metagross
.byte 2 @ Regirock
.byte 2 @ Regice
.byte 2 @ Registeel
.byte 2 @ Kyogre
.byte 0 @ Groudon
.byte 1 @ Rayquaza
.byte 0 @ Latias
.byte 2 @ Latios
.byte 0 @ Jirachi
.byte 0 @ Deoxys
.byte 0 @ Chimecho
.byte 1 @ Egg
.byte 0 @ Unown B
.byte 0 @ Unown C
.byte 0 @ Unown D
.byte 0 @ Unown E
.byte 0 @ Unown F
.byte 0 @ Unown G
.byte 0 @ Unown H
.byte 0 @ Unown I
.byte 0 @ Unown J
.byte 0 @ Unown K
.byte 0 @ Unown L
.byte 0 @ Unown M
.byte 0 @ Unown N
.byte 0 @ Unown O
.byte 0 @ Unown P
.byte 0 @ Unown Q
.byte 0 @ Unown R
.byte 0 @ Unown S
.byte 0 @ Unown T
.byte 0 @ Unown U
.byte 0 @ Unown V
.byte 0 @ Unown W
.byte 0 @ Unown X
.byte 0 @ Unown Y
.byte 0 @ Unown Z
.byte 0 @ Unown Exclamation Mark
.byte 0 @ Unown Question Mark
data/graphics/pokemon/icon_palette_table.inc
-11
View File
@@ -1,11 +0,0 @@
.align 2
gMonIconPaletteTable:: @ 857C540
obj_pal gMonIconPalettes + 0 * 32, 56000
obj_pal gMonIconPalettes + 1 * 32, 56001
obj_pal gMonIconPalettes + 2 * 32, 56002
@ These palettes are actually part of the title screen BG palette and are not
@ used for Pokémon icons.
obj_pal gMonIconPalettes + 3 * 32, 56003
obj_pal gMonIconPalettes + 4 * 32, 56004
obj_pal gMonIconPalettes + 5 * 32, 56005
data/graphics/pokemon/icon_table.inc
-442
View File
@@ -1,442 +0,0 @@
.align 2
gMonIconTable:: @ 857BCA8
.4byte gMonIcon_Bulbasaur
.4byte gMonIcon_Bulbasaur
.4byte gMonIcon_Ivysaur
.4byte gMonIcon_Venusaur
.4byte gMonIcon_Charmander
.4byte gMonIcon_Charmeleon
.4byte gMonIcon_Charizard
.4byte gMonIcon_Squirtle
.4byte gMonIcon_Wartortle
.4byte gMonIcon_Blastoise
.4byte gMonIcon_Caterpie
.4byte gMonIcon_Metapod
.4byte gMonIcon_Butterfree
.4byte gMonIcon_Weedle
.4byte gMonIcon_Kakuna
.4byte gMonIcon_Beedrill
.4byte gMonIcon_Pidgey
.4byte gMonIcon_Pidgeotto
.4byte gMonIcon_Pidgeot
.4byte gMonIcon_Rattata
.4byte gMonIcon_Raticate
.4byte gMonIcon_Spearow
.4byte gMonIcon_Fearow
.4byte gMonIcon_Ekans
.4byte gMonIcon_Arbok
.4byte gMonIcon_Pikachu
.4byte gMonIcon_Raichu
.4byte gMonIcon_Sandshrew
.4byte gMonIcon_Sandslash
.4byte gMonIcon_NidoranF
.4byte gMonIcon_Nidorina
.4byte gMonIcon_Nidoqueen
.4byte gMonIcon_NidoranM
.4byte gMonIcon_Nidorino
.4byte gMonIcon_Nidoking
.4byte gMonIcon_Clefairy
.4byte gMonIcon_Clefable
.4byte gMonIcon_Vulpix
.4byte gMonIcon_Ninetales
.4byte gMonIcon_Jigglypuff
.4byte gMonIcon_Wigglytuff
.4byte gMonIcon_Zubat
.4byte gMonIcon_Golbat
.4byte gMonIcon_Oddish
.4byte gMonIcon_Gloom
.4byte gMonIcon_Vileplume
.4byte gMonIcon_Paras
.4byte gMonIcon_Parasect
.4byte gMonIcon_Venonat
.4byte gMonIcon_Venomoth
.4byte gMonIcon_Diglett
.4byte gMonIcon_Dugtrio
.4byte gMonIcon_Meowth
.4byte gMonIcon_Persian
.4byte gMonIcon_Psyduck
.4byte gMonIcon_Golduck
.4byte gMonIcon_Mankey
.4byte gMonIcon_Primeape
.4byte gMonIcon_Growlithe
.4byte gMonIcon_Arcanine
.4byte gMonIcon_Poliwag
.4byte gMonIcon_Poliwhirl
.4byte gMonIcon_Poliwrath
.4byte gMonIcon_Abra
.4byte gMonIcon_Kadabra
.4byte gMonIcon_Alakazam
.4byte gMonIcon_Machop
.4byte gMonIcon_Machoke
.4byte gMonIcon_Machamp
.4byte gMonIcon_Bellsprout
.4byte gMonIcon_Weepinbell
.4byte gMonIcon_Victreebel
.4byte gMonIcon_Tentacool
.4byte gMonIcon_Tentacruel
.4byte gMonIcon_Geodude
.4byte gMonIcon_Graveler
.4byte gMonIcon_Golem
.4byte gMonIcon_Ponyta
.4byte gMonIcon_Rapidash
.4byte gMonIcon_Slowpoke
.4byte gMonIcon_Slowbro
.4byte gMonIcon_Magnemite
.4byte gMonIcon_Magneton
.4byte gMonIcon_Farfetchd
.4byte gMonIcon_Doduo
.4byte gMonIcon_Dodrio
.4byte gMonIcon_Seel
.4byte gMonIcon_Dewgong
.4byte gMonIcon_Grimer
.4byte gMonIcon_Muk
.4byte gMonIcon_Shellder
.4byte gMonIcon_Cloyster
.4byte gMonIcon_Gastly
.4byte gMonIcon_Haunter
.4byte gMonIcon_Gengar
.4byte gMonIcon_Onix
.4byte gMonIcon_Drowzee
.4byte gMonIcon_Hypno
.4byte gMonIcon_Krabby
.4byte gMonIcon_Kingler
.4byte gMonIcon_Voltorb
.4byte gMonIcon_Electrode
.4byte gMonIcon_Exeggcute
.4byte gMonIcon_Exeggutor
.4byte gMonIcon_Cubone
.4byte gMonIcon_Marowak
.4byte gMonIcon_Hitmonlee
.4byte gMonIcon_Hitmonchan
.4byte gMonIcon_Lickitung
.4byte gMonIcon_Koffing
.4byte gMonIcon_Weezing
.4byte gMonIcon_Rhyhorn
.4byte gMonIcon_Rhydon
.4byte gMonIcon_Chansey
.4byte gMonIcon_Tangela
.4byte gMonIcon_Kangaskhan
.4byte gMonIcon_Horsea
.4byte gMonIcon_Seadra
.4byte gMonIcon_Goldeen
.4byte gMonIcon_Seaking
.4byte gMonIcon_Staryu
.4byte gMonIcon_Starmie
.4byte gMonIcon_Mrmime
.4byte gMonIcon_Scyther
.4byte gMonIcon_Jynx
.4byte gMonIcon_Electabuzz
.4byte gMonIcon_Magmar
.4byte gMonIcon_Pinsir
.4byte gMonIcon_Tauros
.4byte gMonIcon_Magikarp
.4byte gMonIcon_Gyarados
.4byte gMonIcon_Lapras
.4byte gMonIcon_Ditto
.4byte gMonIcon_Eevee
.4byte gMonIcon_Vaporeon
.4byte gMonIcon_Jolteon
.4byte gMonIcon_Flareon
.4byte gMonIcon_Porygon
.4byte gMonIcon_Omanyte
.4byte gMonIcon_Omastar
.4byte gMonIcon_Kabuto
.4byte gMonIcon_Kabutops
.4byte gMonIcon_Aerodactyl
.4byte gMonIcon_Snorlax
.4byte gMonIcon_Articuno
.4byte gMonIcon_Zapdos
.4byte gMonIcon_Moltres
.4byte gMonIcon_Dratini
.4byte gMonIcon_Dragonair
.4byte gMonIcon_Dragonite
.4byte gMonIcon_Mewtwo
.4byte gMonIcon_Mew
.4byte gMonIcon_Chikorita
.4byte gMonIcon_Bayleef
.4byte gMonIcon_Meganium
.4byte gMonIcon_Cyndaquil
.4byte gMonIcon_Quilava
.4byte gMonIcon_Typhlosion
.4byte gMonIcon_Totodile
.4byte gMonIcon_Croconaw
.4byte gMonIcon_Feraligatr
.4byte gMonIcon_Sentret
.4byte gMonIcon_Furret
.4byte gMonIcon_Hoothoot
.4byte gMonIcon_Noctowl
.4byte gMonIcon_Ledyba
.4byte gMonIcon_Ledian
.4byte gMonIcon_Spinarak
.4byte gMonIcon_Ariados
.4byte gMonIcon_Crobat
.4byte gMonIcon_Chinchou
.4byte gMonIcon_Lanturn
.4byte gMonIcon_Pichu
.4byte gMonIcon_Cleffa
.4byte gMonIcon_Igglybuff
.4byte gMonIcon_Togepi
.4byte gMonIcon_Togetic
.4byte gMonIcon_Natu
.4byte gMonIcon_Xatu
.4byte gMonIcon_Mareep
.4byte gMonIcon_Flaaffy
.4byte gMonIcon_Ampharos
.4byte gMonIcon_Bellossom
.4byte gMonIcon_Marill
.4byte gMonIcon_Azumarill
.4byte gMonIcon_Sudowoodo
.4byte gMonIcon_Politoed
.4byte gMonIcon_Hoppip
.4byte gMonIcon_Skiploom
.4byte gMonIcon_Jumpluff
.4byte gMonIcon_Aipom
.4byte gMonIcon_Sunkern
.4byte gMonIcon_Sunflora
.4byte gMonIcon_Yanma
.4byte gMonIcon_Wooper
.4byte gMonIcon_Quagsire
.4byte gMonIcon_Espeon
.4byte gMonIcon_Umbreon
.4byte gMonIcon_Murkrow
.4byte gMonIcon_Slowking
.4byte gMonIcon_Misdreavus
.4byte gMonIcon_UnownA
.4byte gMonIcon_Wobbuffet
.4byte gMonIcon_Girafarig
.4byte gMonIcon_Pineco
.4byte gMonIcon_Forretress
.4byte gMonIcon_Dunsparce
.4byte gMonIcon_Gligar
.4byte gMonIcon_Steelix
.4byte gMonIcon_Snubbull
.4byte gMonIcon_Granbull
.4byte gMonIcon_Qwilfish
.4byte gMonIcon_Scizor
.4byte gMonIcon_Shuckle
.4byte gMonIcon_Heracross
.4byte gMonIcon_Sneasel
.4byte gMonIcon_Teddiursa
.4byte gMonIcon_Ursaring
.4byte gMonIcon_Slugma
.4byte gMonIcon_Magcargo
.4byte gMonIcon_Swinub
.4byte gMonIcon_Piloswine
.4byte gMonIcon_Corsola
.4byte gMonIcon_Remoraid
.4byte gMonIcon_Octillery
.4byte gMonIcon_Delibird
.4byte gMonIcon_Mantine
.4byte gMonIcon_Skarmory
.4byte gMonIcon_Houndour
.4byte gMonIcon_Houndoom
.4byte gMonIcon_Kingdra
.4byte gMonIcon_Phanpy
.4byte gMonIcon_Donphan
.4byte gMonIcon_Porygon2
.4byte gMonIcon_Stantler
.4byte gMonIcon_Smeargle
.4byte gMonIcon_Tyrogue
.4byte gMonIcon_Hitmontop
.4byte gMonIcon_Smoochum
.4byte gMonIcon_Elekid
.4byte gMonIcon_Magby
.4byte gMonIcon_Miltank
.4byte gMonIcon_Blissey
.4byte gMonIcon_Raikou
.4byte gMonIcon_Entei
.4byte gMonIcon_Suicune
.4byte gMonIcon_Larvitar
.4byte gMonIcon_Pupitar
.4byte gMonIcon_Tyranitar
.4byte gMonIcon_Lugia
.4byte gMonIcon_HoOh
.4byte gMonIcon_Celebi
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_Treecko
.4byte gMonIcon_Grovyle
.4byte gMonIcon_Sceptile
.4byte gMonIcon_Torchic
.4byte gMonIcon_Combusken
.4byte gMonIcon_Blaziken
.4byte gMonIcon_Mudkip
.4byte gMonIcon_Marshtomp
.4byte gMonIcon_Swampert
.4byte gMonIcon_Poochyena
.4byte gMonIcon_Mightyena
.4byte gMonIcon_Zigzagoon
.4byte gMonIcon_Linoone
.4byte gMonIcon_Wurmple
.4byte gMonIcon_Silcoon
.4byte gMonIcon_Beautifly
.4byte gMonIcon_Cascoon
.4byte gMonIcon_Dustox
.4byte gMonIcon_Lotad
.4byte gMonIcon_Lombre
.4byte gMonIcon_Ludicolo
.4byte gMonIcon_Seedot
.4byte gMonIcon_Nuzleaf
.4byte gMonIcon_Shiftry
.4byte gMonIcon_Nincada
.4byte gMonIcon_Ninjask
.4byte gMonIcon_Shedinja
.4byte gMonIcon_Taillow
.4byte gMonIcon_Swellow
.4byte gMonIcon_Shroomish
.4byte gMonIcon_Breloom
.4byte gMonIcon_Spinda
.4byte gMonIcon_Wingull
.4byte gMonIcon_Pelipper
.4byte gMonIcon_Surskit
.4byte gMonIcon_Masquerain
.4byte gMonIcon_Wailmer
.4byte gMonIcon_Wailord
.4byte gMonIcon_Skitty
.4byte gMonIcon_Delcatty
.4byte gMonIcon_Kecleon
.4byte gMonIcon_Baltoy
.4byte gMonIcon_Claydol
.4byte gMonIcon_Nosepass
.4byte gMonIcon_Torkoal
.4byte gMonIcon_Sableye
.4byte gMonIcon_Barboach
.4byte gMonIcon_Whiscash
.4byte gMonIcon_Luvdisc
.4byte gMonIcon_Corphish
.4byte gMonIcon_Crawdaunt
.4byte gMonIcon_Feebas
.4byte gMonIcon_Milotic
.4byte gMonIcon_Carvanha
.4byte gMonIcon_Sharpedo
.4byte gMonIcon_Trapinch
.4byte gMonIcon_Vibrava
.4byte gMonIcon_Flygon
.4byte gMonIcon_Makuhita
.4byte gMonIcon_Hariyama
.4byte gMonIcon_Electrike
.4byte gMonIcon_Manectric
.4byte gMonIcon_Numel
.4byte gMonIcon_Camerupt
.4byte gMonIcon_Spheal
.4byte gMonIcon_Sealeo
.4byte gMonIcon_Walrein
.4byte gMonIcon_Cacnea
.4byte gMonIcon_Cacturne
.4byte gMonIcon_Snorunt
.4byte gMonIcon_Glalie
.4byte gMonIcon_Lunatone
.4byte gMonIcon_Solrock
.4byte gMonIcon_Azurill
.4byte gMonIcon_Spoink
.4byte gMonIcon_Grumpig
.4byte gMonIcon_Plusle
.4byte gMonIcon_Minun
.4byte gMonIcon_Mawile
.4byte gMonIcon_Meditite
.4byte gMonIcon_Medicham
.4byte gMonIcon_Swablu
.4byte gMonIcon_Altaria
.4byte gMonIcon_Wynaut
.4byte gMonIcon_Duskull
.4byte gMonIcon_Dusclops
.4byte gMonIcon_Roselia
.4byte gMonIcon_Slakoth
.4byte gMonIcon_Vigoroth
.4byte gMonIcon_Slaking
.4byte gMonIcon_Gulpin
.4byte gMonIcon_Swalot
.4byte gMonIcon_Tropius
.4byte gMonIcon_Whismur
.4byte gMonIcon_Loudred
.4byte gMonIcon_Exploud
.4byte gMonIcon_Clamperl
.4byte gMonIcon_Huntail
.4byte gMonIcon_Gorebyss
.4byte gMonIcon_Absol
.4byte gMonIcon_Shuppet
.4byte gMonIcon_Banette
.4byte gMonIcon_Seviper
.4byte gMonIcon_Zangoose
.4byte gMonIcon_Relicanth
.4byte gMonIcon_Aron
.4byte gMonIcon_Lairon
.4byte gMonIcon_Aggron
.4byte gMonIcon_Castform
.4byte gMonIcon_Volbeat
.4byte gMonIcon_Illumise
.4byte gMonIcon_Lileep
.4byte gMonIcon_Cradily
.4byte gMonIcon_Anorith
.4byte gMonIcon_Armaldo
.4byte gMonIcon_Ralts
.4byte gMonIcon_Kirlia
.4byte gMonIcon_Gardevoir
.4byte gMonIcon_Bagon
.4byte gMonIcon_Shelgon
.4byte gMonIcon_Salamence
.4byte gMonIcon_Beldum
.4byte gMonIcon_Metang
.4byte gMonIcon_Metagross
.4byte gMonIcon_Regirock
.4byte gMonIcon_Regice
.4byte gMonIcon_Registeel
.4byte gMonIcon_Kyogre
.4byte gMonIcon_Groudon
.4byte gMonIcon_Rayquaza
.4byte gMonIcon_Latias
.4byte gMonIcon_Latios
.4byte gMonIcon_Jirachi
.4byte gMonIcon_Deoxys
.4byte gMonIcon_Chimecho
.4byte gMonIcon_Egg
.4byte gMonIcon_UnownB
.4byte gMonIcon_UnownC
.4byte gMonIcon_UnownD
.4byte gMonIcon_UnownE
.4byte gMonIcon_UnownF
.4byte gMonIcon_UnownG
.4byte gMonIcon_UnownH
.4byte gMonIcon_UnownI
.4byte gMonIcon_UnownJ
.4byte gMonIcon_UnownK
.4byte gMonIcon_UnownL
.4byte gMonIcon_UnownM
.4byte gMonIcon_UnownN
.4byte gMonIcon_UnownO
.4byte gMonIcon_UnownP
.4byte gMonIcon_UnownQ
.4byte gMonIcon_UnownR
.4byte gMonIcon_UnownS
.4byte gMonIcon_UnownT
.4byte gMonIcon_UnownU
.4byte gMonIcon_UnownV
.4byte gMonIcon_UnownW
.4byte gMonIcon_UnownX
.4byte gMonIcon_UnownY
.4byte gMonIcon_UnownZ
.4byte gMonIcon_UnownExclamationMark
.4byte gMonIcon_UnownQuestionMark
data/party_menu.s
+56 -9
View File
@@ -166,10 +166,51 @@ gUnknown_08615AF1:: @ 8615AF1
.incbin "baserom.gba", 0x615af1, 0x3
gUnknown_08615AF4:: @ 8615AF4
.incbin "baserom.gba", 0x615af4, 0x6c
.4byte gUnknown_085E9E43
.4byte gUnknown_085EA010
.4byte gUnknown_085EA02A
.4byte gUnknown_085E9E55
.4byte gUnknown_085E9E64
.4byte gUnknown_085E9E79
.4byte gUnknown_085E9E8F
.4byte gUnknown_085E9EBC
.4byte gUnknown_085E9ED4
.4byte gUnknown_085E9EE9
.4byte gUnknown_085E9FDB
.4byte gUnknown_085EA046
.4byte gUnknown_085EA05B
.4byte gUnknown_085E9F01
.4byte gUnknown_085E9F58
.4byte gUnknown_085E9F6F
.4byte gUnknown_085E9F81
.4byte gUnknown_085E9F90
.4byte gUnknown_085E9FA7
.4byte gUnknown_085E9FC2
.4byte gText_EmptyString2
.4byte gUnknown_085E9EA6
.4byte gUnknown_085E9F16
.4byte gUnknown_085E9F2A
.4byte gUnknown_085E9F42
.4byte gUnknown_085E9FF9
.4byte gUnknown_085EA073
gUnknown_08615B60:: @ 8615B60
.incbin "baserom.gba", 0x615b60, 0xa8
.4byte gUnknown_085EA091
.4byte gUnknown_085EA099
.4byte gUnknown_085EA09E
.4byte gUnknown_085EA0A4
.4byte gUnknown_085EA0AB
.4byte gUnknown_085EA0E7
.4byte gUnknown_085EA0B1
.4byte gUnknown_085EA0B6
.4byte gUnknown_085EA0BF
.4byte gUnknown_085EA0C5
.4byte gUnknown_085EA0CF
.4byte gUnknown_085EA0D7
.4byte gUnknown_085EA0DC
gUnknown_08615B94:: @ 8615B94
.incbin "baserom.gba", 0x615b94, 0x74
gUnknown_08615C08:: @ 8615C08
.incbin "baserom.gba", 0x615c08, 0x130
@@ -187,22 +228,28 @@ gUnknown_08615D9C:: @ 8615D9C
.incbin "baserom.gba", 0x615d9c, 0x70
gUnknown_08615E0C:: @ 8615E0C
.incbin "baserom.gba", 0x615e0c, 0xa4
.incbin "baserom.gba", 0x615e0c, 0x24
gUnknown_08615E30:: @ 8615E30
.incbin "baserom.gba", 0x615e30, 0x40
gUnknown_08615E70:: @ 8615E70
.incbin "baserom.gba", 0x615e70, 0x40
gUnknown_08615EB0:: @ 8615EB0
.incbin "baserom.gba", 0x615eb0, 0x8
obj_tiles gUnknown_08615E30, 0x40, 55120
gUnknown_08615EB8:: @ 8615EB8
.incbin "baserom.gba", 0x615eb8, 0x8
obj_pal gUnknown_08615E70, 55120
gUnknown_08615EC0:: @ 8615EC0
.incbin "baserom.gba", 0x615ec0, 0x38
gUnknown_08615EF8:: @ 8615EF8
.incbin "baserom.gba", 0x615ef8, 0x8
obj_tiles gUnknown_08D96CD8, 0x400, 1200
gUnknown_08615F00:: @ 8615F00
.incbin "baserom.gba", 0x615f00, 0x8
obj_pal gUnknown_08D96F6C, 1200
gUnknown_08615F08:: @ 8615F08
.incbin "baserom.gba", 0x615f08, 0x68
@@ -214,10 +261,10 @@ gUnknown_08615F78:: @ 8615F78
.incbin "baserom.gba", 0x615f78, 0x80
gUnknown_08615FF8:: @ 8615FF8
.incbin "baserom.gba", 0x615ff8, 0x8
obj_tiles gUnknown_08D96F90, 0x400, 1202
gUnknown_08616000:: @ 8616000
.incbin "baserom.gba", 0x616000, 0x8
obj_pal gUnknown_08D97188, 1202
gUnknown_08616008:: @ 8616008
.incbin "baserom.gba", 0x616008, 0x18
data/pokedex.s
+140 -61
View File
@@ -4,59 +4,23 @@
.section .rodata
.align 2, 0
gUnknown_0855C6A4:: @ 855C6A4
.incbin "baserom.gba", 0x55c6a4, 0x336
.macro unk_dex_struct texts, a2, a3, a4
.4byte \texts
.byte \a2, \a3, \a4
.byte 0 @padding
.endm
gUnknown_0855C9DA:: @ 855C9DA
.incbin "baserom.gba", 0x55c9da, 0x304
.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
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
.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
data/pokemon_icon.s
-27
View File
@@ -1,27 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
@ 857BCA8
.include "data/graphics/pokemon/icon_table.inc"
@ 857C388
.include "data/graphics/pokemon/icon_palette_indices.inc"
@ 857C540
.include "data/graphics/pokemon/icon_palette_table.inc"
gUnknown_0857C570:: @ 857C570
.incbin "baserom.gba", 0x57c570, 0x44
gUnknown_0857C5B4:: @ 857C5B4
.incbin "baserom.gba", 0x57c5b4, 0x14
.incbin "baserom.gba", 0x57c5c8, 0x20
gUnknown_0857C5E8:: @ 857C5E8
.incbin "baserom.gba", 0x57c5e8, 0x8
gUnknown_0857C5F0:: @ 857C5F0
.incbin "baserom.gba", 0x57c5f0, 0x18
data/pokemon_storage_system.s
+114 -25
View File
@@ -4,21 +4,6 @@
.section .rodata
.align 2, 0
gUnknown_085716C0:: @ 85716C0
.incbin "baserom.gba", 0x5716c0, 0x28
gUnknown_085716E8:: @ 85716E8
.incbin "baserom.gba", 0x5716e8, 0x28
gUnknown_08571710:: @ 8571710
.incbin "baserom.gba", 0x571710, 0x24
gUnknown_08571734:: @ 8571734
.incbin "baserom.gba", 0x571734, 0x3
gUnknown_08571737:: @ 8571737
.incbin "baserom.gba", 0x571737, 0x5
gUnknown_0857173C:: @ 857173C
.incbin "baserom.gba", 0x57173c, 0x20
@@ -59,7 +44,13 @@ gUnknown_085724A4:: @ 85724A4
.incbin "baserom.gba", 0x5724a4, 0x18
gUnknown_085724BC:: @ 85724BC
.incbin "baserom.gba", 0x5724bc, 0x238
.incbin "baserom.gba", 0x5724bc, 0x18
gUnknown_085724D4:: @ 85724D4
.incbin "baserom.gba", 0x5724d4, 0x20
gUnknown_085724F4:: @ 85724F4
.incbin "baserom.gba", 0x5724f4, 0x200
gUnknown_085726F4:: @ 85726F4
.incbin "baserom.gba", 0x5726f4, 0x20
@@ -71,28 +62,126 @@ gUnknown_08572734:: @ 8572734
.incbin "baserom.gba", 0x572734, 0x10
gUnknown_08572744:: @ 8572744
.incbin "baserom.gba", 0x572744, 0x8
obj_pal gUnknown_085724D4, 0xDACA
gUnknown_0857274C:: @ 857274C
.incbin "baserom.gba", 0x57274c, 0x8
obj_tiles gUnknown_085724F4, 0x1C0, 5
gUnknown_08572754:: @ 8572754
.incbin "baserom.gba", 0x572754, 0x18
spr_template 2, 0xDAC6, gOamData_857286C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_0857276C:: @ 857276C
.incbin "baserom.gba", 0x57276c, 0xf8
.4byte gUnknown_085EB7EF, 0
.4byte gUnknown_085EB802, 0
.4byte gUnknown_085EB81A, 0
.4byte gUnknown_085EB82F, 0
.4byte gUnknown_085EB843, 1
.4byte gUnknown_085EB853, 0
.4byte gUnknown_085EB866, 0
.4byte gUnknown_085EB87C, 1
.4byte gUnknown_085EB88E, 0
.4byte gUnknown_085EB89F, 0
.4byte gUnknown_085EB8B5, 4
.4byte gUnknown_085EB8C6, 6
.4byte gUnknown_085EB8D3, 0
.4byte gUnknown_085EB8E6, 0
.4byte gUnknown_085EB900, 0
.4byte gUnknown_085EB913, 0
.4byte gUnknown_085EB92D, 0
.4byte gUnknown_085EB946, 0
.4byte gUnknown_085EB960, 0
.4byte gUnknown_085EB979, 1
.4byte gUnknown_085EB987, 0
.4byte gUnknown_085EB9A1, 0
.4byte gUnknown_085EB9AB, 0
.4byte gUnknown_085EB843, 7
.4byte gUnknown_085EB9C3, 0
.4byte gUnknown_085EB9D6, 7
.4byte gUnknown_085EB9EE, 0
.4byte gUnknown_085EB9FF, 0
.4byte gUnknown_085EBA19, 7
.4byte gUnknown_085EBA29, 7
.4byte gUnknown_085EBA38, 0
.align 2
gUnknown_08572864:: @ 8572864
.incbin "baserom.gba", 0x572864, 0x58
window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x5C
.align 2
gOamData_857286C:: @ 857286C
.2byte 0x0000
.2byte 0xC000
.2byte 0x0000
.align 2
gOamData_8572874:: @ 8572874
.2byte 0x4000
.2byte 0x0000
.2byte 0x0000
.align 2
gSpriteAnim_857287C:: @ 857287C
obj_image_anim_frame 0, 5
obj_image_anim_end
.align 2
gSpriteAnim_8572884:: @ 8572884
obj_image_anim_frame 2, 8
obj_image_anim_frame 4, 8
obj_image_anim_frame 6, 8
obj_image_anim_jump 0
.align 2
gSpriteAnim_8572894:: @ 8572894
obj_image_anim_frame 8, 5
obj_image_anim_end
.align 2
gSpriteAnim_857289C:: @ 857289C
obj_image_anim_frame 10, 8
obj_image_anim_frame 4, 8
obj_image_anim_frame 12, 8
obj_image_anim_jump 0
.align 2
gSpriteAnimTable_85728AC:: @ 85728AC
.4byte gSpriteAnim_857287C
.4byte gSpriteAnim_8572884
.4byte gSpriteAnim_8572894
.4byte gSpriteAnim_857289C
gUnknown_085728BC:: @ 85728BC
.incbin "baserom.gba", 0x5728bc, 0x18
spr_template 5, 0xDACA, gOamData_8572874, gSpriteAnimTable_85728AC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_085728D4:: @ 85728D4
.incbin "baserom.gba", 0x5728d4, 0x48
spr_template 0x12, 0xDAC0, gOamData_85728EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_0857291C:: @ 857291C
.incbin "baserom.gba", 0x57291c, 0x4c58
.align 2
gOamData_85728EC:: @ 85728EC
.2byte 0x0000
.2byte 0x8000
.2byte 0x0000
.align 2
gSpriteAffineAnim_85728F4:: @ 85728F4
obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 120
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8572904:: @ 8572904
obj_rot_scal_anim_frame 0x10, 0x10, 0, 0
obj_rot_scal_anim_frame 0x10, 0x10, 0, 15
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_857291C:: @ 857291C
.4byte gSpriteAffineAnim_85728F4
.4byte gSpriteAffineAnim_8572904
gUnknown_08572924:: @ 8572924
.incbin "baserom.gba", 0x572924, 0x4c50
gUnknown_08577574:: @ 8577574
.incbin "baserom.gba", 0x577574, 0x44
data/pokemon_summary_screen.s
+8 -2
View File
@@ -121,7 +121,12 @@ gUnknown_0861F2C0:: @ 861F2C0
.incbin "baserom.gba", 0x61f2c0, 0x18
gUnknown_0861F2D8:: @ 861F2D8
.incbin "baserom.gba", 0x61f2d8, 0x30
.4byte gMenuText_Use, sub_81C61E0
.4byte gMenuText_Toss, sub_81C62C4
.4byte gMenuText_Give, sub_81C6648
.4byte gText_Cancel2, sub_81C6258
.4byte gMenuText_Use, sub_81C679C
.4byte gText_EmptyString2, NULL
gUnknown_0861F308:: @ 861F308
.incbin "baserom.gba", 0x61f308, 0x4
@@ -136,7 +141,8 @@ gUnknown_0861F310:: @ 861F310
.incbin "baserom.gba", 0x61f310, 0x4
gUnknown_0861F314:: @ 861F314
.incbin "baserom.gba", 0x61f314, 0x8
.4byte sub_81C654C
.4byte sub_81C63D0
gUnknown_0861F31C:: @ 861F31C
.incbin "baserom.gba", 0x61f31c, 0xc
data/pokenav.s
+1558 -46
View File
File diff suppressed because it is too large Load Diff
data/rayquaza_scene.s
-160
View File
@@ -1,160 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_0862A6A0:: @ 862A6A0
.incbin "baserom.gba", 0x62a6a0, 0x8c
gUnknown_0862A72C:: @ 862A72C
.incbin "baserom.gba", 0x62a72c, 0x24
gUnknown_0862A750:: @ 862A750
.incbin "baserom.gba", 0x62a750, 0x24
gUnknown_0862A774:: @ 862A774
.incbin "baserom.gba", 0x62a774, 0xa8
gUnknown_0862A81C:: @ 862A81C
.incbin "baserom.gba", 0x62a81c, 0x30
gUnknown_0862A84C:: @ 862A84C
.incbin "baserom.gba", 0x62a84c, 0x18
gUnknown_0862A864:: @ 862A864
.incbin "baserom.gba", 0x62a864, 0x18
gUnknown_0862A87C:: @ 862A87C
.incbin "baserom.gba", 0x62a87c, 0xc
gUnknown_0862A888:: @ 862A888
.incbin "baserom.gba", 0x62a888, 0x3c
gUnknown_0862A8C4:: @ 862A8C4
.incbin "baserom.gba", 0x62a8c4, 0x8
gUnknown_0862A8CC:: @ 862A8CC
.incbin "baserom.gba", 0x62a8cc, 0x8
gUnknown_0862A8D4:: @ 862A8D4
.incbin "baserom.gba", 0x62a8d4, 0x24
gUnknown_0862A8F8:: @ 862A8F8
.incbin "baserom.gba", 0x62a8f8, 0x8
gUnknown_0862A900:: @ 862A900
.incbin "baserom.gba", 0x62a900, 0x24
gUnknown_0862A924:: @ 862A924
.incbin "baserom.gba", 0x62a924, 0x8
gUnknown_0862A92C:: @ 862A92C
.incbin "baserom.gba", 0x62a92c, 0xa8
gUnknown_0862A9D4:: @ 862A9D4
.incbin "baserom.gba", 0x62a9d4, 0x8
gUnknown_0862A9DC:: @ 862A9DC
.incbin "baserom.gba", 0x62a9dc, 0x8
gUnknown_0862A9E4:: @ 862A9E4
.incbin "baserom.gba", 0x62a9e4, 0x30
gUnknown_0862AA14:: @ 862AA14
.incbin "baserom.gba", 0x62aa14, 0x8
gUnknown_0862AA1C:: @ 862AA1C
.incbin "baserom.gba", 0x62aa1c, 0x18
gUnknown_0862AA34:: @ 862AA34
.incbin "baserom.gba", 0x62aa34, 0x8
gUnknown_0862AA3C:: @ 862AA3C
.incbin "baserom.gba", 0x62aa3c, 0x18
gUnknown_0862AA54:: @ 862AA54
.incbin "baserom.gba", 0x62aa54, 0x3c
gUnknown_0862AA90:: @ 862AA90
.incbin "baserom.gba", 0x62aa90, 0x8
gUnknown_0862AA98:: @ 862AA98
.incbin "baserom.gba", 0x62aa98, 0x8
gUnknown_0862AAA0:: @ 862AAA0
.incbin "baserom.gba", 0x62aaa0, 0x18
gUnknown_0862AAB8:: @ 862AAB8
.incbin "baserom.gba", 0x62aab8, 0x14
gUnknown_0862AACC:: @ 862AACC
.incbin "baserom.gba", 0x62aacc, 0x30
gUnknown_0862AAFC:: @ 862AAFC
.incbin "baserom.gba", 0x62aafc, 0x8
gUnknown_0862AB04:: @ 862AB04
.incbin "baserom.gba", 0x62ab04, 0x8
gUnknown_0862AB0C:: @ 862AB0C
.incbin "baserom.gba", 0x62ab0c, 0x8
gUnknown_0862AB14:: @ 862AB14
.incbin "baserom.gba", 0x62ab14, 0x18
gUnknown_0862AB2C:: @ 862AB2C
.incbin "baserom.gba", 0x62ab2c, 0x18
gUnknown_0862AB44:: @ 862AB44
.incbin "baserom.gba", 0x62ab44, 0xe4
gUnknown_0862AC28:: @ 862AC28
.incbin "baserom.gba", 0x62ac28, 0x8
gUnknown_0862AC30:: @ 862AC30
.incbin "baserom.gba", 0x62ac30, 0x8
gUnknown_0862AC38:: @ 862AC38
.incbin "baserom.gba", 0x62ac38, 0x8
gUnknown_0862AC40:: @ 862AC40
.incbin "baserom.gba", 0x62ac40, 0x8
gUnknown_0862AC48:: @ 862AC48
.incbin "baserom.gba", 0x62ac48, 0x8
gUnknown_0862AC50:: @ 862AC50
.incbin "baserom.gba", 0x62ac50, 0x8
gUnknown_0862AC58:: @ 862AC58
.incbin "baserom.gba", 0x62ac58, 0x8
gUnknown_0862AC60:: @ 862AC60
.incbin "baserom.gba", 0x62ac60, 0x8
gUnknown_0862AC68:: @ 862AC68
.incbin "baserom.gba", 0x62ac68, 0x8
gUnknown_0862AC70:: @ 862AC70
.incbin "baserom.gba", 0x62ac70, 0x8
gUnknown_0862AC78:: @ 862AC78
.incbin "baserom.gba", 0x62ac78, 0x18
gUnknown_0862AC90:: @ 862AC90
.incbin "baserom.gba", 0x62ac90, 0x18
gUnknown_0862ACA8:: @ 862ACA8
.incbin "baserom.gba", 0x62aca8, 0x18
gUnknown_0862ACC0:: @ 862ACC0
.incbin "baserom.gba", 0x62acc0, 0x18
gUnknown_0862ACD8:: @ 862ACD8
.incbin "baserom.gba", 0x62acd8, 0x18
gUnknown_0862ACF0:: @ 862ACF0
.incbin "baserom.gba", 0x62acf0, 0x18
gUnknown_0862AD08:: @ 862AD08
.incbin "baserom.gba", 0x62ad08, 0xc
data/script_pokemon_util_80F87D8.s
+1 -1
View File
@@ -4,4 +4,4 @@
.section .rodata
.align 2, 0
gUnknown_0858D8EC:: @ 858D8EC
.incbin "baserom.gba", 0x58d8ec, 0x4
.byte 3, 4, 5, 14
data/start_menu.s
-29
View File
@@ -1,29 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gSafariBallsWindowTemplate:: @ 8510508
.incbin "baserom.gba", 0x510508, 0x8
gUnknown_08510510:: @ 8510510
.incbin "baserom.gba", 0x510510, 0x20
gPyramidFloorWindowTemplate_2:: @ 8510530
.incbin "baserom.gba", 0x510530, 0x8
gPyramidFloorWindowTemplate_1:: @ 8510538
.incbin "baserom.gba", 0x510538, 0x8
sStartMenuItems:: @ 8510540
.incbin "baserom.gba", 0x510540, 0x68
gUnknown_085105A8:: @ 85105A8
.incbin "baserom.gba", 0x5105a8, 0x4
gUnknown_085105AC:: @ 85105AC
.incbin "baserom.gba", 0x5105ac, 0x10
gUnknown_085105BC:: @ 85105BC
.incbin "baserom.gba", 0x5105bc, 0x8
data/starter_choose.s
+5 -3
View File
@@ -1,7 +1,6 @@
@ the fourth big chunk of data
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "include/constants/species.h"
.section .rodata
@@ -33,8 +32,11 @@ gStarterChoose_LabelCoords:: @ 85B1DF2
.incbin "baserom.gba", 0x5b1df2, 0x6
sStarterMon:: @ 85B1DF8
.incbin "baserom.gba", 0x5b1df8, 0x8
.2byte SPECIES_TREECKO
.2byte SPECIES_TORCHIC
.2byte SPECIES_MUDKIP
.align 2
gUnknown_085B1E00:: @ 85B1E00
.incbin "baserom.gba", 0x5b1e00, 0xc
data/strings.s
+30 -31
View File
@@ -2705,34 +2705,34 @@ gUnknown_085EBB4F:: @ 85EBB4F
gUnknown_085EBB56:: @ 85EBB56
.string "What would you like to do?$"
gUnknown_085EBB71:: @ 85EBB71
gText_WithdrawPokemon:: @ 85EBB71
.string "WITHDRAW POKéMON$"
gUnknown_085EBB82:: @ 85EBB82
gText_DepositPokemon:: @ 85EBB82
.string "DEPOSIT POKéMON$"
gUnknown_085EBB92:: @ 85EBB92
gText_MovePokemon:: @ 85EBB92
.string "MOVE POKéMON$"
gUnknown_085EBB9F:: @ 85EBB9F
gText_MoveItems:: @ 85EBB9F
.string "MOVE ITEMS$"
gUnknown_085EBBAA:: @ 85EBBAA
gText_SeeYa:: @ 85EBBAA
.string "SEE YA!$"
gUnknown_085EBBB2:: @ 85EBBB2
gText_WithdrawMonDescription:: @ 85EBBB2
.string "Move POKéMON stored in BOXES to\nyour party.$"
gUnknown_085EBBDE:: @ 85EBBDE
gText_DepositMonDescription:: @ 85EBBDE
.string "Store POKéMON in your party in BOXES.$"
gUnknown_085EBC04:: @ 85EBC04
gText_MoveMonDescription:: @ 85EBC04
.string "Organize the POKéMON in BOXES and\nin your party.$"
gUnknown_085EBC35:: @ 85EBC35
gText_MoveItemsDescription:: @ 85EBC35
.string "Move items held by any POKéMON\nin a BOX or your party.$"
gUnknown_085EBC6C:: @ 85EBC6C
gText_SeeYaDescription:: @ 85EBC6C
.string "Return to the previous menu.$"
gText_JustOnePkmn:: @ 85EBC89
@@ -3521,10 +3521,10 @@ gText_Var1sTrainerCard:: @ 85ECFA6
gText_HallOfFameDebut:: @ 85ECFB8
.string "HALL OF FAME DEBUT $"
gUnknown_085ECFCD:: @ 85ECFCD
gText_LinkBattles:: @ 85ECFCD
.string "LINK BATTLES$"
gUnknown_085ECFDA:: @ 85ECFDA
gText_LinkCableBattles:: @ 85ECFDA
.string "LINK CABLE BATTLES$"
gText_WinsLosses:: @ 85ECFED
@@ -4488,34 +4488,34 @@ gUnknown_085EE6AD:: @ 85EE6AD
gUnknown_085EE6B6:: @ 85EE6B6
.string "Updated time$"
gUnknown_085EE6C3:: @ 85EE6C3
gText_MenuPokedex:: @ 85EE6C3
.string "POKéDEX$"
gUnknown_085EE6CB:: @ 85EE6CB
gText_MenuPokemon:: @ 85EE6CB
.string "POKéMON$"
gUnknown_085EE6D3:: @ 85EE6D3
gText_MenuBag:: @ 85EE6D3
.string "BAG$"
gUnknown_085EE6D7:: @ 85EE6D7
gText_MenuPokenav:: @ 85EE6D7
.string "POKéNAV$"
gUnknown_085EE6DF:: @ 85EE6DF
gText_MenuPlayer:: @ 85EE6DF
.string "{PLAYER}$"
gUnknown_085EE6E2:: @ 85EE6E2
gText_MenuSave:: @ 85EE6E2
.string "SAVE$"
gUnknown_085EE6E7:: @ 85EE6E7
gText_MenuOption:: @ 85EE6E7
.string "OPTION$"
gUnknown_085EE6EE:: @ 85EE6EE
gText_MenuExit:: @ 85EE6EE
.string "EXIT$"
gUnknown_085EE6F3:: @ 85EE6F3
gText_MenuRetire:: @ 85EE6F3
.string "RETIRE$"
gUnknown_085EE6FA:: @ 85EE6FA
gText_MenuRest:: @ 85EE6FA
.string "REST$"
gText_SafariBallStock:: @ 85EE6FF
@@ -4524,28 +4524,28 @@ gText_SafariBallStock:: @ 85EE6FF
gText_BattlePyramidFloor:: @ 85EE716
.string "Battle Pyramid\n{STR_VAR_1}$"
gUnknown_085EE728:: @ 85EE728
gText_Floor1:: @ 85EE728
.string "Floor 1$"
gUnknown_085EE730:: @ 85EE730
gText_Floor2:: @ 85EE730
.string "Floor 2$"
gUnknown_085EE738:: @ 85EE738
gText_Floor3:: @ 85EE738
.string "Floor 3$"
gUnknown_085EE740:: @ 85EE740
gText_Floor4:: @ 85EE740
.string "Floor 4$"
gUnknown_085EE748:: @ 85EE748
gText_Floor5:: @ 85EE748
.string "Floor 5$"
gUnknown_085EE750:: @ 85EE750
gText_Floor6:: @ 85EE750
.string "Floor 6$"
gUnknown_085EE758:: @ 85EE758
gText_Floor7:: @ 85EE758
.string "Floor 7$"
gUnknown_085EE760:: @ 85EE760
gText_Peak:: @ 85EE760
.string "Peak$"
gText_LinkStandby2:: @ 85EE765
@@ -5393,4 +5393,3 @@ gText_Berry:: @ 85EFCDF
gText_Berries:: @ 85EFCE5
.string "BERRIES$"
data/text_window.s
+157 -4
View File
@@ -5,13 +5,166 @@
.align 2, 0
gUnknown_0850E87C:: @ 850E87C
.incbin "baserom.gba", 0x50e87c, 0x1680
.incbin "baserom.gba", 0x50e87c, 0x120
gUnknown_0850E99C:: @ 850E99C
.incbin "baserom.gba", 0x50e99c, 0x120
gUnknown_0850EABC:: @ 850EABC
.incbin "baserom.gba", 0x50eabc, 0x120
gUnknown_0850EBDC:: @ 850EBDC
.incbin "baserom.gba", 0x50ebdc, 0x120
gUnknown_0850ECFC:: @ 850ECFC
.incbin "baserom.gba", 0x50ecfc, 0x120
gUnknown_0850EE1C:: @ 850EE1C
.incbin "baserom.gba", 0x50ee1c, 0x120
gUnknown_0850EF3C:: @ 850EF3C
.incbin "baserom.gba", 0x50ef3c, 0x120
gUnknown_0850F05C:: @ 850F05C
.incbin "baserom.gba", 0x50f05c, 0x120
gUnknown_0850F17C:: @ 850F17C
.incbin "baserom.gba", 0x50f17c, 0x120
gUnknown_0850F29C:: @ 850F29C
.incbin "baserom.gba", 0x50f29c, 0x120
gUnknown_0850F3BC:: @ 850F3BC
.incbin "baserom.gba", 0x50f3bc, 0x120
gUnknown_0850F4DC:: @ 850F4DC
.incbin "baserom.gba", 0x50f4dc, 0x120
gUnknown_0850F5FC:: @ 850F5FC
.incbin "baserom.gba", 0x50f5fc, 0x120
gUnknown_0850F71C:: @ 850F71C
.incbin "baserom.gba", 0x50f71c, 0x120
gUnknown_0850F83C:: @ 850F83C
.incbin "baserom.gba", 0x50f83c, 0x120
gUnknown_0850F95C:: @ 850F95C
.incbin "baserom.gba", 0x50f95c, 0x120
gUnknown_0850FA7C:: @ 850FA7C
.incbin "baserom.gba", 0x50fa7c, 0x120
gUnknown_0850FB9C:: @ 850FB9C
.incbin "baserom.gba", 0x50fb9c, 0x120
gUnknown_0850FCBC:: @ 850FCBC
.incbin "baserom.gba", 0x50fcbc, 0x120
gUnknown_0850FDDC:: @ 850FDDC
.incbin "baserom.gba", 0x50fddc, 0x120
gUnknown_0850FEFC:: @ 850FEFC
.incbin "baserom.gba", 0x50fefc, 0x280
.incbin "baserom.gba", 0x50fefc, 0x20
gUnknown_0850FF1C:: @ 850FF1C
.incbin "baserom.gba", 0x50ff1c, 0x20
gUnknown_0850FF3C:: @ 850FF3C
.incbin "baserom.gba", 0x50ff3c, 0x20
gUnknown_0850FF5C:: @ 850FF5C
.incbin "baserom.gba", 0x50ff5c, 0x20
gUnknown_0850FF7C:: @ 850FF7C
.incbin "baserom.gba", 0x50ff7c, 0x20
gUnknown_0850FF9C:: @ 850FF9C
.incbin "baserom.gba", 0x50ff9c, 0x20
gUnknown_0850FFBC:: @ 850FFBC
.incbin "baserom.gba", 0x50ffbc, 0x20
gUnknown_0850FFDC:: @ 850FFDC
.incbin "baserom.gba", 0x50ffdc, 0x20
gUnknown_0850FFFC:: @ 850FFFC
.incbin "baserom.gba", 0x50fffc, 0x20
gUnknown_0851001C:: @ 851001C
.incbin "baserom.gba", 0x51001c, 0x20
gUnknown_0851003C:: @ 851003C
.incbin "baserom.gba", 0x51003c, 0x20
gUnknown_0851005C:: @ 851005C
.incbin "baserom.gba", 0x51005c, 0x20
gUnknown_0851007C:: @ 851007C
.incbin "baserom.gba", 0x51007c, 0x20
gUnknown_0851009C:: @ 851009C
.incbin "baserom.gba", 0x51009c, 0x20
gUnknown_085100BC:: @ 85100BC
.incbin "baserom.gba", 0x5100bc, 0x20
gUnknown_085100DC:: @ 85100DC
.incbin "baserom.gba", 0x5100dc, 0x20
gUnknown_085100FC:: @ 85100FC
.incbin "baserom.gba", 0x5100fc, 0x20
gUnknown_0851011C:: @ 851011C
.incbin "baserom.gba", 0x51011c, 0x20
gUnknown_0851013C:: @ 851013C
.incbin "baserom.gba", 0x51013c, 0x20
gUnknown_0851015C:: @ 851015C
.incbin "baserom.gba", 0x51015c, 0x20
gUnknown_0851017C:: @ 851017C
.incbin "baserom.gba", 0x51017c, 0xa0
.incbin "baserom.gba", 0x51017c, 0xA0
gUnknown_0851021C:: @ 851021C
.incbin "baserom.gba", 0x51021c, 0xa0
.4byte gUnknown_0850E87C
.4byte gUnknown_0850FEFC
.4byte gUnknown_0850E99C
.4byte gUnknown_0850FF1C
.4byte gUnknown_0850EABC
.4byte gUnknown_0850FF3C
.4byte gUnknown_0850EBDC
.4byte gUnknown_0850FF5C
.4byte gUnknown_0850ECFC
.4byte gUnknown_0850FF7C
.4byte gUnknown_0850EE1C
.4byte gUnknown_0850FF9C
.4byte gUnknown_0850EF3C
.4byte gUnknown_0850FFBC
.4byte gUnknown_0850F05C
.4byte gUnknown_0850FFDC
.4byte gUnknown_0850F17C
.4byte gUnknown_0850FFFC
.4byte gUnknown_0850F29C
.4byte gUnknown_0851001C
.4byte gUnknown_0850F3BC
.4byte gUnknown_0851003C
.4byte gUnknown_0850F4DC
.4byte gUnknown_0851005C
.4byte gUnknown_0850F5FC
.4byte gUnknown_0851007C
.4byte gUnknown_0850F71C
.4byte gUnknown_0851009C
.4byte gUnknown_0850F83C
.4byte gUnknown_085100BC
.4byte gUnknown_0850F95C
.4byte gUnknown_085100DC
.4byte gUnknown_0850FA7C
.4byte gUnknown_085100FC
.4byte gUnknown_0850FB9C
.4byte gUnknown_0851011C
.4byte gUnknown_0850FCBC
.4byte gUnknown_0851013C
.4byte gUnknown_0850FDDC
.4byte gUnknown_0851015C
data/trainer_card.s
+165 -17
View File
@@ -4,8 +4,41 @@
.section .rodata
.align 2, 0
.macro unk_trainer_card_struct text1, text2, short1, short2, short3, short4
.4byte \text1
.4byte \text2
.2byte \short1
.2byte \short2
.2byte \short3
.2byte \short4
.endm
gUnknown_0856F018:: @ 856F018
.incbin "baserom.gba", 0x56f018, 0x494
.incbin "baserom.gba", 0x56f018, 0x194
gUnknown_0856F1AC:: @ 856F1AC
.incbin "baserom.gba", 0x56f1ac, 0x60
gUnknown_0856F20C:: @ 856F20C
.incbin "baserom.gba", 0x56f20c, 0x60
gUnknown_0856F26C:: @ 856F26C
.incbin "baserom.gba", 0x56f26c, 0x60
gUnknown_0856F2CC:: @ 856F2CC
.incbin "baserom.gba", 0x56f2cc, 0x60
gUnknown_0856F32C:: @ 856F32C
.incbin "baserom.gba", 0x56f32c, 0x60
gUnknown_0856F38C:: @ 856F38C
.incbin "baserom.gba", 0x56f38c, 0x60
gUnknown_0856F3EC:: @ 856F3EC
.incbin "baserom.gba", 0x56f3ec, 0x60
gUnknown_0856F44C:: @ 856F44C
.incbin "baserom.gba", 0x56f44c, 0x60
gUnknown_0856F4AC:: @ 856F4AC
.incbin "baserom.gba", 0x56f4ac, 0x20
@@ -47,16 +80,27 @@ gUnknown_0856FAC4:: @ 856FAC4
.incbin "baserom.gba", 0x56fac4, 0x20
gUnknown_0856FAE4:: @ 856FAE4
.incbin "baserom.gba", 0x56fae4, 0x14
.4byte gUnknown_08DD1A58
.4byte gUnknown_0856F1AC
.4byte gUnknown_0856F26C
.4byte gUnknown_0856F32C
.4byte gUnknown_0856F3EC
gUnknown_0856FAF8:: @ 856FAF8
.incbin "baserom.gba", 0x56faf8, 0x14
.4byte gUnknown_08DD240C
.4byte gUnknown_0856F20C
.4byte gUnknown_0856F2CC
.4byte gUnknown_0856F38C
.4byte gUnknown_0856F44C
gUnknown_0856FB0C:: @ 856FB0C
.incbin "baserom.gba", 0x56fb0c, 0x3
gUnknown_0856FB0F:: @ 856FB0F
.incbin "baserom.gba", 0x56fb0f, 0x9
.incbin "baserom.gba", 0x56fb0f, 0x3
gUnknown_0856FB12:: @ 856FB12
.incbin "baserom.gba", 0x56fb12, 0x6
gUnknown_0856FB18:: @ 856FB18
.incbin "baserom.gba", 0x56fb18, 0x8
@@ -65,10 +109,16 @@ gUnknown_0856FB20:: @ 856FB20
.incbin "baserom.gba", 0x56fb20, 0x8
gUnknown_0856FB28:: @ 856FB28
.incbin "baserom.gba", 0x56fb28, 0x18
.4byte sub_80C4998
.4byte sub_80C49D8
.4byte sub_80C4B08
.4byte sub_80C4C1C
.4byte sub_80C4C84
.4byte sub_80C4DB0
gUnknown_0856FB40:: @ 856FB40
.incbin "baserom.gba", 0x56fb40, 0x8
.4byte gUnknown_0856FB0C
.4byte gUnknown_0856FB12
gUnknown_0856FB48:: @ 856FB48
.incbin "baserom.gba", 0x56fb48, 0x2
@@ -86,7 +136,9 @@ gUnknown_0856FB57:: @ 856FB57
.incbin "baserom.gba", 0x56fb57, 0x5
gUnknown_0856FB5C:: @ 856FB5C
.incbin "baserom.gba", 0x56fb5c, 0xc
.4byte gText_LinkBattles
.4byte gText_LinkCableBattles
.4byte gText_LinkBattles
gUnknown_0856FB68:: @ 856FB68
.incbin "baserom.gba", 0x56fb68, 0x6
@@ -98,10 +150,25 @@ gUnknown_0856FB74:: @ 856FB74
.incbin "baserom.gba", 0x56fb74, 0x4
gUnknown_0856FB78:: @ 856FB78
.incbin "baserom.gba", 0x56fb78, 0x44
.incbin "baserom.gba", 0x56fb78, 0x4
gUnknown_0856FB7C:: @ 856FB7C
.incbin "baserom.gba", 0x56fb7c, 0x20
gUnknown_0856FB9C:: @ 856FB9C
.incbin "baserom.gba", 0x56fb9c, 0x20
gUnknown_0856FBBC:: @ 856FBBC
.incbin "baserom.gba", 0x56fbbc, 0x1244
.incbin "baserom.gba", 0x56fbbc, 0xFEC
gUnknown_08570BA8:: @ 8570BA8
.incbin "baserom.gba", 0x570ba8, 0x9C
gUnknown_08570C44:: @ 8570C44
.incbin "baserom.gba", 0x570c44, 0xBC
gUnknown_08570D00:: @ 8570D00
.incbin "baserom.gba", 0x570d00, 0x100
gUnknown_08570E00:: @ 8570E00
.incbin "baserom.gba", 0x570e00, 0x260
@@ -143,25 +210,106 @@ gUnknown_08571454:: @ 8571454
.incbin "baserom.gba", 0x571454, 0x68
gUnknown_085714BC:: @ 85714BC
.incbin "baserom.gba", 0x5714bc, 0x18
obj_tiles gUnknown_08570BA8, 0x100, 0
obj_tiles gUnknown_08570D00, 0x400, 1
obj_tiles gUnknown_08DC1394, 0x380, 2
gUnknown_085714D4:: @ 85714D4
.incbin "baserom.gba", 0x5714d4, 0x10
obj_tiles gUnknown_08570C44, 0x100, 4
obj_tiles NULL, 0, 0
gUnknown_085714E4:: @ 85714E4
.incbin "baserom.gba", 0x5714e4, 0xd0
obj_pal gUnknown_08DC1674, 0
obj_pal gUnknown_08DC1694, 1
obj_pal gUnknown_08DC16B4, 2
obj_pal gUnknown_08DC16D4, 3
obj_pal gUnknown_0856FB7C, 4
obj_pal gUnknown_0856FB9C, 5
obj_pal NULL, 0
obj_pal NULL, 0xFFFF
gUnknown_08571524:: @ 8571524
.incbin "baserom.gba", 0x571524, 0x8
gUnknown_0857152C:: @ 857152C
.incbin "baserom.gba", 0x57152c, 0x8
gUnknown_08571534:: @ 8571534
.incbin "baserom.gba", 0x571534, 0x8
gUnknown_0857153C:: @ 857153C
.incbin "baserom.gba", 0x57153c, 0x8
gUnknown_08571544:: @ 8571544
.incbin "baserom.gba", 0x571544, 0x8
gUnknown_0857154C:: @ 857154C
.incbin "baserom.gba", 0x57154c, 0x8
gUnknown_08571554:: @ 8571554
.incbin "baserom.gba", 0x571554, 0x8
gUnknown_0857155C:: @ 857155C
.incbin "baserom.gba", 0x57155c, 0xC
gUnknown_08571568:: @ 8571568
.incbin "baserom.gba", 0x571568, 0xC
gUnknown_08571574:: @ 8571574
.4byte gUnknown_08571524
.4byte gUnknown_0857152C
gUnknown_0857157C:: @ 857157C
.4byte gUnknown_08571524
.4byte gUnknown_0857152C
.4byte gUnknown_08571534
.4byte gUnknown_0857153C
.4byte gUnknown_08571544
.4byte gUnknown_0857154C
.4byte gUnknown_08571554
gUnknown_08571598:: @ 8571598
.4byte gUnknown_0857155C
.4byte gUnknown_08571568
gUnknown_085715A0:: @ 85715A0
.incbin "baserom.gba", 0x5715a0, 0x10
gUnknown_085715B0:: @ 85715B0
.4byte gUnknown_085715A0
gUnknown_085715B4:: @ 85715B4
.incbin "baserom.gba", 0x5715b4, 0x30
spr_template 0, 0, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 1, 1, gUnknown_08524934, gUnknown_08571598, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085715E4:: @ 85715E4
.incbin "baserom.gba", 0x5715e4, 0x18
spr_template 2, 2, gUnknown_0852490C, gUnknown_0857157C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085715FC:: @ 85715FC
.incbin "baserom.gba", 0x5715fc, 0x18
spr_template 4, 4, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, nullsub_39
gUnknown_08571614:: @ 8571614
.incbin "baserom.gba", 0x571614, 0x3c
.4byte gUnknown_085EDA96
.4byte gUnknown_085ED932
.4byte gUnknown_085ED94D
.4byte gUnknown_085ED961
.4byte gUnknown_085ED977
.4byte gUnknown_085ED993
.4byte gUnknown_085ED9AF
.4byte gUnknown_085ED9C7
.4byte gUnknown_085ED9E5
.4byte gUnknown_085EDA02
.4byte gUnknown_085EDA21
.4byte gUnknown_085EDA3C
.4byte gUnknown_085EDA5E
.4byte gUnknown_085EDA78
.4byte gUnknown_085ED931
gUnknown_08571650:: @ 8571650
.incbin "baserom.gba", 0x571650, 0x70
unk_trainer_card_struct gUnknown_085EDAB1, gUnknown_085EDB0F, 0x59, 0x28, 1, 0
unk_trainer_card_struct gUnknown_085EDABE, gUnknown_085EDB4E, 0x21, 0x2A, 1, 0
unk_trainer_card_struct gUnknown_085EDACA, gUnknown_085EDB8B, 0x78, 0x56, 0, 0
unk_trainer_card_struct gUnknown_085EDAD8, gUnknown_085EDBC2, 0x72, 0x3B, 0, 0
unk_trainer_card_struct gUnknown_085EDAE5, gUnknown_085EDC00, 0x19, 0x43, 0, 0
unk_trainer_card_struct gUnknown_085EDAF4, gUnknown_085EDC45, 0x39, 0x39, 1, 0
unk_trainer_card_struct gUnknown_085EDB00, gUnknown_085EDC84, 0x86, 0x29, 1, 0
data/unk_sprite_file.s
+25 -5
View File
@@ -7,16 +7,36 @@ gUnknown_0862AD54:: @ 862AD54
.incbin "baserom.gba", 0x62ad54, 0x1dc
gUnknown_0862AF30:: @ 862AF30
.incbin "baserom.gba", 0x62af30, 0x60c
.incbin "baserom.gba", 0x62af30, 0x1AC
gUnknown_0862B0DC:: @ 862B0DC
.incbin "baserom.gba", 0x62b0dc, 0x460
gUnknown_0862B53C:: @ 862B53C
.incbin "baserom.gba", 0x62b53c, 0x1e8
.incbin "baserom.gba", 0x62b53c, 0x1E0
gUnknown_0862B71C:: @ 862B71C
.incbin "baserom.gba", 0x62b71c, 0x8
gUnknown_0862B724:: @ 862B724
.incbin "baserom.gba", 0x62b724, 0x8
obj_tiles gUnknown_0862B0DC, 0x1800, 11920
gUnknown_0862B72C:: @ 862B72C
.incbin "baserom.gba", 0x62b72c, 0x2c
obj_pal gUnknown_0862B53C, 11920
gUnknown_0862B734:: @ 862B734
.incbin "baserom.gba", 0x62b734, 0x8
gUnknown_0862B73C:: @ 862B73C
.incbin "baserom.gba", 0x62b73c, 0x8
gUnknown_0862B744:: @ 862B744
.incbin "baserom.gba", 0x62b744, 0x8
gUnknown_0862B74C:: @ 862B74C
.4byte gUnknown_0862B734
.4byte gUnknown_0862B73C
.4byte gUnknown_0862B744
gUnknown_0862B758:: @ 862B758
.incbin "baserom.gba", 0x62b758, 0x18
spr_template 11920, 11920, gUnknown_0862B71C, gUnknown_0862B74C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
data/use_pokeblock.s
+4 -3
View File
@@ -47,10 +47,10 @@ sContestStatNames:: @ 85DFD04
.4byte gText_Beauty3
gUnknown_085DFD18:: @ 85DFD18
.incbin "baserom.gba", 0x5dfd18, 0x8
obj_tiles gUnknown_08DCCD5C, 0x200, 0
gUnknown_085DFD20:: @ 85DFD20
.incbin "baserom.gba", 0x5dfd20, 0x8
obj_pal gUnknown_08DCCD3C, 0
gUnknown_085DFD28:: @ 85DFD28
.incbin "baserom.gba", 0x5dfd28, 0x34
@@ -62,4 +62,5 @@ gUnknown_085DFDA0:: @ 85DFDA0
.incbin "baserom.gba", 0x5dfda0, 0x18
gUnknown_085DFDB8:: @ 85DFDB8
.incbin "baserom.gba", 0x5dfdb8, 0x8
.4byte gUnknown_08DCCB98
.4byte 1
include/data/pokedex_orders.h
+1199
View File
File diff suppressed because it is too large Load Diff
include/graphics.h
+2437
View File
File diff suppressed because it is too large Load Diff
include/sprite.h
-4
View File
@@ -120,10 +120,6 @@ union AffineAnimCmd
{.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}}
#define AFFINEANIMCMD_END \
{.type = AFFINEANIMCMDTYPE_END}
#define AFFINEANIMCMD_LOOP(_count) \
{.loop = {.type = AFFINEANIMCMDTYPE_LOOP, .count = _count}}
#define AFFINEANIMCMD_JUMP(_target) \
{.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}}
struct AffineAnimState
{
include/strings.h
+33
View File
@@ -137,4 +137,37 @@ extern const u8 gMenuText_Give2[];
extern const u8 gText_Cancel2[];
extern const u8 gText_WithdrawPokemon[];
extern const u8 gText_WithdrawMonDescription[];
extern const u8 gText_DepositPokemon[];
extern const u8 gText_DepositMonDescription[];
extern const u8 gText_MovePokemon[];
extern const u8 gText_MoveMonDescription[];
extern const u8 gText_MoveItems[];
extern const u8 gText_MoveItemsDescription[];
extern const u8 gText_SeeYa[];
extern const u8 gText_SeeYaDescription[];
// menu texts
extern const u8 gText_MenuPokedex[];
extern const u8 gText_MenuPokemon[];
extern const u8 gText_MenuBag[];
extern const u8 gText_MenuPokenav[];
extern const u8 gText_MenuPlayer[];
extern const u8 gText_MenuSave[];
extern const u8 gText_MenuOption[];
extern const u8 gText_MenuExit[];
extern const u8 gText_MenuRetire[];
extern const u8 gText_MenuRest[];
extern const u8 gText_Floor1[];
extern const u8 gText_Floor2[];
extern const u8 gText_Floor3[];
extern const u8 gText_Floor4[];
extern const u8 gText_Floor5[];
extern const u8 gText_Floor6[];
extern const u8 gText_Floor7[];
extern const u8 gText_Peak[];
extern const u8 gText_SafariBallStock[];
extern const u8 gText_BattlePyramidFloor[];
#endif //GUARD_STRINGS_H
ld_script.txt
+8 -3
View File
@@ -127,10 +127,12 @@ SECTIONS {
asm/field_effect.o(.text);
asm/unknown_task.o(.text);
asm/option_menu.o(.text);
src/pokedex.o(.text);
asm/pokedex.o(.text);
asm/trainer_card.o(.text);
src/pokemon_storage_system.o(.text);
asm/pokemon_storage_system.o(.text);
src/pokemon_icon.o(.text);
asm/pokemon_icon.o(.text);
asm/script_movement.o(.text);
asm/fldeff_cut.o(.text);
@@ -260,6 +262,7 @@ SECTIONS {
src/pokemon_summary_screen.o(.text);
asm/pokemon_summary_screen.o(.text);
asm/pokenav.o(.text);
src/rayquaza_scene.o(.text);
asm/rayquaza_scene.o(.text);
src/walda_phrase.o(.text);
asm/contest_link_81D9DE4.o(.text);
@@ -369,7 +372,7 @@ SECTIONS {
data/coord_event_weather.o(.rodata);
data/field_tasks.o(.rodata);
data/reset_rtc_screen.o(.rodata);
data/start_menu.o(.rodata);
src/start_menu.o(.rodata);
src/tileset_anims.o(.rodata);
src/palette.o(.rodata);
data/fanfares.o(.rodata);
@@ -386,10 +389,12 @@ SECTIONS {
data/wild_encounter.o(.rodata);
data/field_effect.o(.rodata);
data/option_menu.o(.rodata);
src/pokedex.o(.rodata);
data/pokedex.o(.rodata);
data/trainer_card.o(.rodata);
src/pokemon_storage_system.o(.rodata);
data/pokemon_storage_system.o(.rodata);
data/pokemon_icon.o(.rodata);
src/pokemon_icon.o(.rodata);
data/fldeff_cut.o(.rodata);
data/map_name_popup.o(.rodata);
data/item_menu_icons.o(.rodata);
@@ -482,7 +487,7 @@ SECTIONS {
src/berry_fix_program.o(.rodata);
data/pokemon_summary_screen.o(.rodata);
data/pokenav.o(.rodata);
data/rayquaza_scene.o(.rodata);
src/rayquaza_scene.o(.rodata);
src/walda_phrase.o(.rodata);
data/trainer_rematch.o(.rodata);
data/unk_sprite_file.o(.rodata);
src/pokedex.c
+542
View File
@@ -0,0 +1,542 @@
#include "global.h"
#include "gba/m4a_internal.h"
#include "pokedex.h"
#include "sprite.h"
#include "graphics.h"
#include "decompress.h"
#include "bg.h"
#include "window.h"
// this file's functions
void sub_80BE604(struct Sprite *sprite);
void sub_80BE658(struct Sprite *sprite);
void sub_80BE758(struct Sprite *sprite);
void sub_80BE780(struct Sprite *sprite);
void sub_80BE44C(struct Sprite *sprite);
void sub_80BE834(struct Sprite *sprite);
// const rom data
#include "data/pokedex_orders.h"
static const struct OamData sOamData_855CFE4 =
{
.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 sOamData_855CFEC =
{
.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 sOamData_855CFF4 =
{
.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 sOamData_855CFFC =
{
.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 sOamData_855D004 =
{
.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 sOamData_855D00C =
{
.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
};
static const union AnimCmd *const sSpriteAnimTable_855D114[] =
{
sSpriteAnim_855D014
};
static const union AnimCmd *const sSpriteAnimTable_855D118[] =
{
sSpriteAnim_855D01C
};
static const union AnimCmd *const sSpriteAnimTable_855D11C[] =
{
sSpriteAnim_855D024
};
static const union AnimCmd *const sSpriteAnimTable_855D120[] =
{
sSpriteAnim_855D02C,
sSpriteAnim_855D034,
sSpriteAnim_855D03C,
sSpriteAnim_855D044
};
static const union AnimCmd *const sSpriteAnimTable_855D130[] =
{
sSpriteAnim_855D04C,
sSpriteAnim_855D054
};
static const union AnimCmd *const sSpriteAnimTable_855D138[] =
{
sSpriteAnim_855D05C,
sSpriteAnim_855D064
};
static const union AnimCmd *const sSpriteAnimTable_855D140[] =
{
sSpriteAnim_855D06C,
sSpriteAnim_855D074,
sSpriteAnim_855D07C,
sSpriteAnim_855D084,
sSpriteAnim_855D08C,
sSpriteAnim_855D094,
sSpriteAnim_855D09C,
sSpriteAnim_855D0A4,
sSpriteAnim_855D0AC,
sSpriteAnim_855D0B4
};
static const union AnimCmd *const sSpriteAnimTable_855D168[] =
{
sSpriteAnim_855D0BC,
sSpriteAnim_855D0C4,
sSpriteAnim_855D0CC,
sSpriteAnim_855D0D4,
sSpriteAnim_855D0DC,
sSpriteAnim_855D0E4,
sSpriteAnim_855D0EC,
sSpriteAnim_855D0F4,
sSpriteAnim_855D0FC,
sSpriteAnim_855D104
};
static const union AnimCmd *const sSpriteAnimTable_855D190[] =
{
sSpriteAnim_855D10C
};
const struct SpriteTemplate gUnknown_0855D194 =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855CFE4,
.anims = sSpriteAnimTable_855D114,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE604,
};
const struct SpriteTemplate gUnknown_0855D1AC =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855CFEC,
.anims = sSpriteAnimTable_855D118,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE658,
};
const struct SpriteTemplate gUnknown_0855D1C4 =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855CFF4,
.anims = sSpriteAnimTable_855D120,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE758,
};
const struct SpriteTemplate gUnknown_0855D1DC =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855CFFC,
.anims = sSpriteAnimTable_855D11C,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE780,
};
const struct SpriteTemplate gUnknown_0855D1F4 =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855D004,
.anims = sSpriteAnimTable_855D130,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE44C,
};
const struct SpriteTemplate gUnknown_0855D20C =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855CFF4,
.anims = sSpriteAnimTable_855D138,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE44C,
};
const struct SpriteTemplate gUnknown_0855D224 =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855D00C,
.anims = sSpriteAnimTable_855D140,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE44C,
};
const struct SpriteTemplate gUnknown_0855D23C =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855D00C,
.anims = sSpriteAnimTable_855D168,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE44C,
};
const struct SpriteTemplate gUnknown_0855D254 =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855D00C,
.anims = sSpriteAnimTable_855D190,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE834,
};
const struct CompressedSpriteSheet gSpriteSheets_0855D26C[] =
{
{gUnknown_08DC234C, 0x2000, 4096},
{0}
};
const struct CompressedSpritePalette gSpritePalettes_0855D26C[] =
{
{gUnknown_08DC16F4, 4096},
{0}
};
const u8 gUnknown_0855D28C[] = {0x4, 0x8, 0x10, 0x20, 0x20};
const u8 gUnknown_0855D291[] = {0x8, 0x4, 0x2, 0x1, 0x1};
const struct BgTemplate gBgTemplates_0855D298[] =
{
{
.bg = 0,
.charBaseIndex = 0,
.mapBaseIndex = 12,
.screenSize = 0,
.paletteMode = 0,
.priority = 0,
.baseTile = 0
},
{
.bg = 1,
.charBaseIndex = 0,
.mapBaseIndex = 13,
.screenSize = 0,
.paletteMode = 0,
.priority = 1,
.baseTile = 0
},
{
.bg = 2,
.charBaseIndex = 2,
.mapBaseIndex = 14,
.screenSize = 0,
.paletteMode = 0,
.priority = 2,
.baseTile = 0
},
{
.bg = 3,
.charBaseIndex = 0,
.mapBaseIndex = 15,
.screenSize = 0,
.paletteMode = 0,
.priority = 3,
.baseTile = 0
}
};
const struct WindowTemplate sWindowTemplates_0855D2A8[] =
{
{2, 0, 0, 0x20, 0x20, 0, 1},
DUMMY_WIN_TEMPLATE
};
src/pokemon_icon.c
+1014
View File
File diff suppressed because it is too large Load Diff
src/pokemon_storage_system.c
+67
View File
@@ -5,9 +5,76 @@
#include "event_data.h"
#include "string_util.h"
#include "text.h"
#include "strings.h"
#include "window.h"
IWRAM_DATA u8 gUnknown_03000F78[0x188];
struct OptionAndDescription
{
const u8 *optionTxt;
const u8 *descriptionTxt;
};
// const rom data
const struct OptionAndDescription gUnknown_085716C0[] =
{
{gText_WithdrawPokemon, gText_WithdrawMonDescription},
{gText_DepositPokemon, gText_DepositMonDescription},
{gText_MovePokemon, gText_MoveMonDescription},
{gText_MoveItems, gText_MoveItemsDescription},
{gText_SeeYa, gText_SeeYaDescription}
};
const struct WindowTemplate gUnknown_085716E8 = {0, 1, 1, 0x11, 0xA, 0xF, 1};
static const union AnimCmd sSpriteAnim_85716F0[] =
{
ANIMCMD_FRAME(0, 5),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_85716F8[] =
{
ANIMCMD_FRAME(4, 5),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8571700[] =
{
ANIMCMD_FRAME(6, 5),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8571708[] =
{
ANIMCMD_FRAME(10, 5),
ANIMCMD_END
};
const union AnimCmd *const sSpriteAnimTable_8571710[] =
{
sSpriteAnim_85716F0,
sSpriteAnim_85716F8,
sSpriteAnim_8571700,
sSpriteAnim_8571708
};
static const union AffineAnimCmd sSpriteAffineAnim_8571720[] =
{
AFFINEANIMCMD_FRAME(0xE0, 0xE0, 0, 0),
AFFINEANIMCMD_END
};
static const union AffineAnimCmd *const sSpriteAffineAnimTable_8571730[] =
{
sSpriteAffineAnim_8571720
};
const struct TextColor gUnknown_08571734[] = {4, 0xF, 0xE};
const u8 gUnknown_08571737[] = _("/30");
// code
u8 CountMonsInBox(u8 boxId)
{
u16 i, count;
src/rayquaza_scene.c
+1164
View File
File diff suppressed because it is too large Load Diff
src/start_menu.c
+82 -20
View File
@@ -6,6 +6,8 @@
#include "window.h"
#include "string_util.h"
#include "text.h"
#include "strings.h"
#include "bg.h"
// Menu actions
enum
@@ -25,15 +27,6 @@ enum
MENU_ACTION_PYRAMID_BAG
};
static void BuildStartMenuActions_LinkMode(void);
static void BuildStartMenuActions_UnionRoom(void);
static void BuildStartMenuActions_SafariZone(void);
static void BuildStartMenuActions_BattlePike(void);
static void BuildStartMenuActions_BattlePyramid(void);
static void BuildStartMenuActions_MultiBattleRoom(void);
static void BuildStartMenuActions_Normal(void);
u8 StartMenu_PlayerName(void);
extern bool32 is_c1_link_related_active(void);
extern bool32 InUnionRoom(void);
extern bool8 InBattlePike(void);
@@ -42,12 +35,91 @@ extern bool8 InMultiBattleRoom(void);
extern void sub_81973FC(u8 windowId, u8 a1);
extern void sub_8198070(u8 windowId, u8 a1);
// this file's functions
static void BuildStartMenuActions_LinkMode(void);
static void BuildStartMenuActions_UnionRoom(void);
static void BuildStartMenuActions_SafariZone(void);
static void BuildStartMenuActions_BattlePike(void);
static void BuildStartMenuActions_BattlePyramid(void);
static void BuildStartMenuActions_MultiBattleRoom(void);
static void BuildStartMenuActions_Normal(void);
bool8 StartMenu_Pokedex(void);
bool8 StartMenu_Pokemon(void);
bool8 StartMenu_Bag(void);
bool8 StartMenu_PokeNav(void);
bool8 StartMenu_PlayerName(void);
bool8 StartMenu_Save(void);
bool8 StartMenu_Option(void);
bool8 StartMenu_Exit(void);
bool8 StartMenu_SafariZoneRetire(void);
bool8 StartMenu_LinkModePlayerName(void);
bool8 StartMenu_BattlePyramidRetire(void);
bool8 StartMenu_BattlePyramidBag(void);
// EWRAM vars
EWRAM_DATA u8 sSafariBallsWindowId = 0;
EWRAM_DATA u8 sBattlePyramidFloorWindowId = 0;
EWRAM_DATA u8 sStartMenuCursorPos = 0;
EWRAM_DATA u8 sNumStartMenuActions = 0;
EWRAM_DATA u8 sCurrentStartMenuActions[9] = {0};
// const rom data
static const struct WindowTemplate gSafariBallsWindowTemplate = {0, 1, 1, 9, 4, 0xF, 8};
static const u8* const sPyramindFloorNames[] =
{
gText_Floor1,
gText_Floor2,
gText_Floor3,
gText_Floor4,
gText_Floor5,
gText_Floor6,
gText_Floor7,
gText_Peak
};
static const struct WindowTemplate gPyramidFloorWindowTemplate_2 = {0, 1, 1, 0xA, 4, 0xF, 8};
static const struct WindowTemplate gPyramidFloorWindowTemplate_1 = {0, 1, 1, 0xC, 4, 0xF, 8};
const struct MenuAction sStartMenuItems[] =
{
{gText_MenuPokedex, {.u8_void = StartMenu_Pokedex}},
{gText_MenuPokemon, {.u8_void = StartMenu_Pokemon}},
{gText_MenuBag, {.u8_void = StartMenu_Bag}},
{gText_MenuPokenav, {.u8_void = StartMenu_PokeNav}},
{gText_MenuPlayer, {.u8_void = StartMenu_PlayerName}},
{gText_MenuSave, {.u8_void = StartMenu_Save}},
{gText_MenuOption, {.u8_void = StartMenu_Option}},
{gText_MenuExit, {.u8_void = StartMenu_Exit}},
{gText_MenuRetire, {.u8_void = StartMenu_SafariZoneRetire}},
{gText_MenuPlayer, {.u8_void = StartMenu_LinkModePlayerName}},
{gText_MenuRest, {.u8_void = StartMenu_Save}},
{gText_MenuRetire, {.u8_void = StartMenu_BattlePyramidRetire}},
{gText_MenuBag, {.u8_void = StartMenu_BattlePyramidBag}}
};
const struct BgTemplate gUnknown_085105A8[] =
{
{
.bg = 0,
.charBaseIndex = 2,
.mapBaseIndex = 31,
.screenSize = 0,
.paletteMode = 0,
.priority = 0,
.baseTile = 0
}
};
const struct WindowTemplate gUnknown_085105AC[] =
{
{0, 2, 0xF, 0x1A, 4, 0xF, 0x194},
DUMMY_WIN_TEMPLATE
};
const struct WindowTemplate gUnknown_085105BC = {0, 1, 1, 0xE, 0xA, 0xF, 8};
// code
void BuildStartMenuActions(void)
{
sNumStartMenuActions = 0;
@@ -148,11 +220,6 @@ static void BuildStartMenuActions_MultiBattleRoom(void)
AddStartMenuAction(MENU_ACTION_EXIT);
}
extern const struct WindowTemplate gSafariBallsWindowTemplate;
extern const struct WindowTemplate gPyramidFloorWindowTemplate_1;
extern const struct WindowTemplate gPyramidFloorWindowTemplate_2;
extern const u8 gText_SafariBallStock[];
void DisplaySafariBallsWindow(void)
{
sSafariBallsWindowId = AddWindow(&gSafariBallsWindowTemplate);
@@ -164,9 +231,6 @@ void DisplaySafariBallsWindow(void)
CopyWindowToVram(sSafariBallsWindowId, 2);
}
extern const u8* const gUnknown_08510510[];
extern const u8 gText_BattlePyramidFloor[];
void DisplayPyramidFloorWindow(void)
{
// TODO: fix location
@@ -176,7 +240,7 @@ void DisplayPyramidFloorWindow(void)
sBattlePyramidFloorWindowId = AddWindow(&gPyramidFloorWindowTemplate_2);
PutWindowTilemap(sBattlePyramidFloorWindowId);
sub_81973FC(sBattlePyramidFloorWindowId, 0);
StringCopy(gStringVar1, gUnknown_08510510[gSaveBlock2Ptr->field_CAA[4]]);
StringCopy(gStringVar1, sPyramindFloorNames[gSaveBlock2Ptr->field_CAA[4]]);
StringExpandPlaceholders(gStringVar4, gText_BattlePyramidFloor);
PrintTextOnWindow(sBattlePyramidFloorWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL);
CopyWindowToVram(sBattlePyramidFloorWindowId, 2);
@@ -197,8 +261,6 @@ void RemoveExtraStartMenuWindows(void)
}
}
extern const struct MenuAction sStartMenuItems[];
/*
// Prints n menu items starting at *index
static bool32 PrintStartMenuItemsMultistep(s16 *index, u32 n)