diff options
Diffstat (limited to 'data')
32 files changed, 2945 insertions, 1902 deletions
diff --git a/data/bike.s b/data/bike.s deleted file mode 100644 index ffb33e52b..000000000 --- a/data/bike.s +++ /dev/null @@ -1,58 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_0859744C:: @ 859744C - .4byte sub_8119224 - .4byte sub_8119238 - .4byte sub_8119280 - .4byte sub_8119344 - - .align 2 -gUnknown_0859745C:: @ 859745C - .4byte PlayerGoSpeed0 - .4byte PlayerGoSpeed1 - .4byte PlayerGoSpeed3 - - .align 2 -gUnknown_08597468:: @ 8597468 - .4byte sub_81197E4 - .4byte sub_81197F4 - .4byte sub_8119830 - .4byte sub_81198C0 - .4byte sub_81198FC - .4byte sub_8119938 - .4byte sub_8119974 - .4byte sub_81199B0 - .4byte sub_8119A24 - .4byte sub_8119A94 - .4byte sub_8119AA4 - .4byte sub_8119B34 - .4byte sub_8119BC4 - - .align 2 -gUnknown_0859749C:: @ 859749C - .4byte CheckMovementInputAcroBikeNormal - .4byte CheckMovementInputAcroBikeChangingDirection - .4byte CheckMovementInputAcroBikeStandingWheelie - .4byte CheckMovementInputAcroBikeBunnyHop - .4byte CheckMovementInputAcroBikeMovingWheelie - .4byte CheckMovementInputAcroBikeUnknownMode5 - .4byte CheckMovementInputAcroBikeUnknownMode6 - - .align 2 -gUnknown_085974B8:: @ 85974B8 - .2byte 0x0001, 0x0002, 0x0004 - - .align 1 -gUnknown_085974BE:: @ 85974BE - .2byte 0x0004 - - .align 2 -gUnknown_085974C0:: @ 85974C0 - .4byte 0x00000001, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000001 - .4byte 0x00000002, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000002 - .4byte 0x00000003, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000003 - .4byte 0x00000004, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000004 diff --git a/data/graphics.s b/data/graphics.s index e135a63e3..ff1034587 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -20,7 +20,7 @@ gUnknown_08C01644:: @ 8C01644 gUnknown_08C01724:: @ 8C01724 .incbin "baserom.gba", 0xc01724, 0x18 - + .align 2 gInterfaceGfx_PokeBall:: .incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC @@ -126,23 +126,23 @@ gBlankGfxCompressed:: @ 8C0237C gUnknown_08C093F0:: @ 8C093F0 .incbin "baserom.gba", 0xc093f0, 0x87ac - .align 2 + .align 2 gBattleInterface_BallStatusBarPal:: @ 8C11B9C .incbin "graphics/battle_interface/ball_status_bar.gbapal" - .align 2 + .align 2 gBattleInterface_BallDisplayPal:: @ 8C11BBC .incbin "graphics/battle_interface/ball_display.gbapal" - .align 2 + .align 2 gHealthboxElementsGfxTable:: @ 8C11BDC .incbin "baserom.gba", 0xc11bdc, 0x840 - .align 2 + .align 2 gBattleInterface_BallDisplayGfx:: @ 8C1241C .incbin "graphics/battle_interface/ball_display.4bpp" - .align 2 + .align 2 gUnknown_08C1249C:: @ 8C1249C .incbin "baserom.gba", 0xc1249c, 0x49f4 @@ -268,28 +268,28 @@ gSubstituteDollGfx:: @ 8C2CEE0 gSubstituteDollTilemap:: @ 8C2D120 .incbin "baserom.gba", 0xc2d120, 552 - + gUnknown_08C2D348:: @ 8C2D348 .incbin "baserom.gba", 0xC2D348, 196 - + gUnknown_08C2D40C:: @ 8C2D40C .incbin "baserom.gba", 0xC2D40C, 28 - + gContestConfetti_Gfx:: @ 8C2D428 .incbin "baserom.gba", 0xC2D428, 288 - + gContestConfetti_Pal:: @ 8C2D548 .incbin "baserom.gba", 0xC2D548, 40 - + gUnknown_08C2D570:: @ 8C2D570 .incbin "baserom.gba", 0xC2D570, 316 - + gUnknown_08C2D6AC:: @ 8C2D6AC .incbin "baserom.gba", 0xC2D6AC, 36 - + gUnknown_08C2D6D0:: @ 8C2D6D0 .incbin "baserom.gba", 0xC2D6D0, 40 - + gUnknown_08C2D6F8:: @ 8C2D6F8 .incbin "baserom.gba", 0xC2D6F8, 40 @@ -851,10 +851,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 @@ -906,25 +927,25 @@ gMenuMoneyPal:: @ 8D9B0C8 gBuyMenuFrame_Tilemap:: @ 8D9B0F0 .incbin "baserom.gba", 0xd9b0f0, 0x140 - + gMenuMoneyGfx:: @ 8D9B230 - .incbin "baserom.gba", 0xd9b230, 0x84 + .incbin "baserom.gba", 0xd9b230, 0x84 gMenuPokeblock_Gfx:: @ 8D9B2B4 .incbin "baserom.gba", 0xd9b2b4, 0x1bc gMenuPokeblock_Pal:: @ 8D9B470 .incbin "baserom.gba", 0xd9b470, 0x70 - + gMenuPokeblockDevice_Gfx:: @ 8D9B4E0 .incbin "baserom.gba", 0xd9b4e0, 0x2c0 - + gMenuPokeblockDevice_Pal:: @ 8D9B7A0 .incbin "baserom.gba", 0xd9b7a0, 0x28 gMenuPokeblock_Tilemap:: @ 8D9B7C8 .incbin "baserom.gba", 0xd9b7c8, 0x148 - + .align 2 gPokeblock_Gfx:: .incbin "graphics/pokeblock/pokeblock.4bpp.lz" @@ -1003,8 +1024,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 @@ -1019,7 +1061,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 @@ -1034,7 +1082,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 @@ -1073,7 +1127,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 @@ -1100,7 +1184,7 @@ gUnknown_08DAAFEC:: @ 8DAAFEC .include "data/graphics/decorations/decoration_graphics.inc" @ 8DBA14C - .incbin "baserom.gba", 0xdba14c, 0x3cc + .incbin "baserom.gba", 0xdba14c, 0x3cc gUnknown_08DBA518:: @ 8DBA518 .incbin "baserom.gba", 0xdba518, 0x80 @@ -1268,10 +1352,25 @@ gUnknown_08DC0754:: @ 8DC0754 .incbin "baserom.gba", 0xdc0754, 0x440 gUnknown_08DC0B94:: @ 8DC0B94 - .incbin "baserom.gba", 0xdc0b94, 0xb62 + .incbin "baserom.gba", 0xdc0b94, 0x800 + +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_08DC16F6:: @ 8DC16F6 - .incbin "baserom.gba", 0xdc16f6, 0x60 +gUnknown_08DC16F4:: @ 8DC16F4 + .incbin "baserom.gba", 0xdc16f4, 0x62 gUnknown_08DC1756:: @ 8DC1756 .incbin "baserom.gba", 0xdc1756, 0x60 @@ -1283,7 +1382,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 @@ -1416,7 +1518,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 @@ -1428,50 +1566,53 @@ 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 gUnknown_08DC9628:: @ 8DC9628 .incbin "baserom.gba", 0xdc9628, 0x320 - + gBerryBlenderMiscPalette:: @ 8DCAB88 .incbin "graphics/berry_blender/misc.gbapal" - + gBerryBlenderArrowPalette:: @ 8DC9948 .incbin "graphics/berry_blender/arrow.gbapal" gUnknown_8DC9988:: @ 8DC9988 - .incbin "baserom.gba", 0xdc9988, 0x200 - + .incbin "baserom.gba", 0xdc9988, 0x200 + .align 2 gBerryBlenderMarubatsuTiles:: @ 8DC9B88 .incbin "graphics/berry_blender/marubatsu.4bpp" - + .align 2 gBerryBlenderParticlesTiles:: @ 8E90818 .incbin "graphics/berry_blender/particles.4bpp" - + .space 0x120 .align 2 gBerryBlenderCountdownNumbersTiles:: @ 8DC9F88 .incbin "graphics/berry_blender/countdown_numbers.4bpp" - + .align 2 gBerryBlenderStartTiles:: @ 8DCA588 .incbin "graphics/berry_blender/start.4bpp" - - .space 0x200 - + + .space 0x200 + .align 2 gBerryBlenderArrowTiles:: @ 8DCAB88 .incbin "graphics/berry_blender/arrow.4bpp" gUnknown_08DCB388:: @ 8DCB388 .incbin "baserom.gba", 0xdcb388, 0xA28 - + gUnknown_08DCBDB0:: @ 8DCBDB0 .incbin "baserom.gba", 0xdcbdb0, 0x20 @@ -1494,10 +1635,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 @@ -1524,22 +1674,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 + .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 @@ -1582,7 +1738,7 @@ gUnknown_08DD46E0:: @ 8DD46E0 gUnknown_08DD47A0:: @ 8DD47A0 .incbin "baserom.gba", 0xdd47a0, 0xc0 - + gUnknown_08DD4860:: @ 8DD4860 .incbin "baserom.gba", 0xdd4860, 0x20 @@ -1604,7 +1760,7 @@ gUnknown_08DD4BF0:: @ 8DD4BF0 gUnknown_08DD4C4C:: @ 8DD4C4C .incbin "baserom.gba", 0xdd4c4c, 0xac - .align 2 + .align 2 gUnknown_08DD4CF8:: @ 8DD4CF8 .incbin "graphics/interface/unk_change_case.4bpp.lz" @@ -1638,61 +1794,61 @@ gUnknown_08DD7300:: @ 8DD7300 .incbin "baserom.gba", 0xdd7300, 0x60 gUnknown_08DD7360:: @ 8DD7360 - .incbin "baserom.gba", 0xdd7360, 0x1420 + .incbin "baserom.gba", 0xdd7360, 0x1420 gUnknown_08DD8780:: @ 8DD8780 - .incbin "baserom.gba", 0xdd8780, 0x40 + .incbin "baserom.gba", 0xdd8780, 0x40 gUnknown_08DD87C0:: @ 8DD87C0 - .incbin "baserom.gba", 0xdd87c0, 0x720 + .incbin "baserom.gba", 0xdd87c0, 0x720 gUnknown_08DD8EE0:: @ 8DD8EE0 - .incbin "baserom.gba", 0xdd8ee0, 0x1a0 + .incbin "baserom.gba", 0xdd8ee0, 0x1a0 gUnknown_08DD9080:: @ 8DD9080 - .incbin "baserom.gba", 0xdd9080, 0x60 + .incbin "baserom.gba", 0xdd9080, 0x60 gUnknown_08DD90E0:: @ 8DD90E0 - .incbin "baserom.gba", 0xdd90e0, 0x638 + .incbin "baserom.gba", 0xdd90e0, 0x638 gUnknown_08DD9718:: @ 8DD9718 - .incbin "baserom.gba", 0xdd9718, 0x15c + .incbin "baserom.gba", 0xdd9718, 0x15c gUnknown_08DD9874:: @ 8DD9874 - .incbin "baserom.gba", 0xdd9874, 0x40 + .incbin "baserom.gba", 0xdd9874, 0x40 gUnknown_08DD98B4:: @ 8DD98B4 - .incbin "baserom.gba", 0xdd98b4, 0x5a4 + .incbin "baserom.gba", 0xdd98b4, 0x5a4 gUnknown_08DD9E58:: @ 8DD9E58 - .incbin "baserom.gba", 0xdd9e58, 0x194 + .incbin "baserom.gba", 0xdd9e58, 0x194 gUnknown_08DD9FEC:: @ 8DD9FEC - .incbin "baserom.gba", 0xdd9fec, 0x40 + .incbin "baserom.gba", 0xdd9fec, 0x40 gUnknown_08DDA02C:: @ 8DDA02C - .incbin "baserom.gba", 0xdda02c, 0x610 + .incbin "baserom.gba", 0xdda02c, 0x610 gUnknown_08DDA63C:: @ 8DDA63C - .incbin "baserom.gba", 0xdda63c, 0x1c4 + .incbin "baserom.gba", 0xdda63c, 0x1c4 gUnknown_08DDA800:: @ 8DDA800 - .incbin "baserom.gba", 0xdda800, 0x40 + .incbin "baserom.gba", 0xdda800, 0x40 gUnknown_08DDA840:: @ 8DDA840 - .incbin "baserom.gba", 0xdda840, 0x600 + .incbin "baserom.gba", 0xdda840, 0x600 gUnknown_08DDAE40:: @ 8DDAE40 - .incbin "baserom.gba", 0xddae40, 0x1a0 + .incbin "baserom.gba", 0xddae40, 0x1a0 gUnknown_08DDAFE0:: @ 8DDAFE0 - .incbin "baserom.gba", 0xddafe0, 0x40 + .incbin "baserom.gba", 0xddafe0, 0x40 gUnknown_08DDB020:: @ 8DDB020 - .incbin "baserom.gba", 0xddb020, 0x2a4 + .incbin "baserom.gba", 0xddb020, 0x2a4 gUnknown_08DDB2C4:: @ 8DDB2C4 - .incbin "baserom.gba", 0xddb2c4, 0x120 + .incbin "baserom.gba", 0xddb2c4, 0x120 gUnknown_08DDB3E4:: @ 8DDB3E4 .incbin "baserom.gba", 0xddb3e4, 0x80 diff --git a/data/graphics/pokemon/icon_palette_indices.inc b/data/graphics/pokemon/icon_palette_indices.inc deleted file mode 100644 index f1d57466c..000000000 --- a/data/graphics/pokemon/icon_palette_indices.inc +++ /dev/null @@ -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 diff --git a/data/graphics/pokemon/icon_palette_table.inc b/data/graphics/pokemon/icon_palette_table.inc deleted file mode 100644 index eb7919423..000000000 --- a/data/graphics/pokemon/icon_palette_table.inc +++ /dev/null @@ -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 diff --git a/data/graphics/pokemon/icon_table.inc b/data/graphics/pokemon/icon_table.inc deleted file mode 100644 index 06a86de43..000000000 --- a/data/graphics/pokemon/icon_table.inc +++ /dev/null @@ -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 diff --git a/data/party_menu.s b/data/party_menu.s index 36ee4f960..95d9bb78e 100644 --- a/data/party_menu.s +++ b/data/party_menu.s @@ -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 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 diff --git a/data/pokedex_entries.inc b/data/pokedex_entries.inc index 76eedf023..ce98a7b26 100644 --- a/data/pokedex_entries.inc +++ b/data/pokedex_entries.inc @@ -1,11 +1,11 @@ .align 2 gPokedexEntries:: @ 856B5B0 .string "UNKNOWN$", 12 - pokedex_entry 0, 0, gDummyPokedexText, 256, 0, 256, 0 + pokedex_entry 0, 0, gDummyPokedexText, 256, 0, 256, 0 .string "SEED$", 12 pokedex_entry 7, 69, gBulbasaurPokedexText, 356, 17, 256, 0 .string "SEED$", 12 - pokedex_entry 10, 130, gIvysaurPokedexText, 335, 13, 256, 0 + pokedex_entry 10, 130, gIvysaurPokedexText, 335, 13, 256, 0 .string "SEED$", 12 pokedex_entry 20, 1000, gVenusaurPokedexText, 256, 0, 388, 6 .string "LIZARD$", 12 @@ -23,37 +23,37 @@ gPokedexEntries:: @ 856B5B0 .string "WORM$", 12 pokedex_entry 3, 29, gCaterpiePokedexText, 549, 22, 256, 0 .string "COCOON$", 12 - pokedex_entry 7, 99, gMetapodPokedexText, 350, 18, 256, 0 + pokedex_entry 7, 99, gMetapodPokedexText, 350, 18, 256, 0 .string "BUTTERFLY$", 12 pokedex_entry 11, 320, gButterfreePokedexText, 312, 2, 256, 0 .string "HAIRY BUG$", 12 - pokedex_entry 3, 32, gWeedlePokedexText, 455, 22, 256, 0 + pokedex_entry 3, 32, gWeedlePokedexText, 455, 22, 256, 0 .string "COCOON$", 12 - pokedex_entry 6, 100, gKakunaPokedexText, 424, 17, 256, 0 + pokedex_entry 6, 100, gKakunaPokedexText, 424, 17, 256, 0 .string "POISON BEE$", 12 pokedex_entry 10, 295, gBeedrillPokedexText, 366, 2, 256, 0 .string "TINY BIRD$", 12 - pokedex_entry 3, 18, gPidgeyPokedexText, 508, -3, 256, 0 + pokedex_entry 3, 18, gPidgeyPokedexText, 508, -3, 256, 0 .string "BIRD$", 12 pokedex_entry 11, 300, gPidgeottoPokedexText, 331, 10, 256, 0 .string "BIRD$", 12 - pokedex_entry 15, 395, gPidgeotPokedexText, 269, 0, 256, 0 + pokedex_entry 15, 395, gPidgeotPokedexText, 269, 0, 256, 0 .string "MOUSE$", 12 - pokedex_entry 3, 35, gRattataPokedexText, 481, 21, 256, 0 + pokedex_entry 3, 35, gRattataPokedexText, 481, 21, 256, 0 .string "MOUSE$", 12 pokedex_entry 7, 185, gRaticatePokedexText, 459, 18, 256, 0 .string "TINY BIRD$", 12 - pokedex_entry 3, 20, gSpearowPokedexText, 571, 22, 256, 0 + pokedex_entry 3, 20, gSpearowPokedexText, 571, 22, 256, 0 .string "BEAK$", 12 - pokedex_entry 12, 380, gFearowPokedexText, 278, 1, 256, 0 + pokedex_entry 12, 380, gFearowPokedexText, 278, 1, 256, 0 .string "SNAKE$", 12 - pokedex_entry 20, 69, gEkansPokedexText, 298, 12, 256, 0 + pokedex_entry 20, 69, gEkansPokedexText, 298, 12, 256, 0 .string "COBRA$", 12 - pokedex_entry 35, 650, gArbokPokedexText, 256, 0, 296, 2 + pokedex_entry 35, 650, gArbokPokedexText, 256, 0, 296, 2 .string "MOUSE$", 12 - pokedex_entry 4, 60, gPikachuPokedexText, 479, 19, 256, 0 + pokedex_entry 4, 60, gPikachuPokedexText, 479, 19, 256, 0 .string "MOUSE$", 12 - pokedex_entry 8, 300, gRaichuPokedexText, 426, 13, 256, 0 + pokedex_entry 8, 300, gRaichuPokedexText, 426, 13, 256, 0 .string "MOUSE$", 12 pokedex_entry 6, 120, gSandshrewPokedexText, 365, 18, 256, 0 .string "MOUSE$", 12 @@ -75,7 +75,7 @@ gPokedexEntries:: @ 856B5B0 .string "FAIRY$", 12 pokedex_entry 13, 400, gClefablePokedexText, 256, 5, 256, 0 .string "FOX$", 12 - pokedex_entry 6, 99, gVulpixPokedexText, 542, 19, 256, 0 + pokedex_entry 6, 99, gVulpixPokedexText, 542, 19, 256, 0 .string "FOX$", 12 pokedex_entry 11, 199, gNinetalesPokedexText, 339, 10, 256, 0 .string "BALLOON$", 12 @@ -83,37 +83,37 @@ gPokedexEntries:: @ 856B5B0 .string "BALLOON$", 12 pokedex_entry 10, 120, gWigglytuffPokedexText, 328, 11, 256, 0 .string "BAT$", 12 - pokedex_entry 8, 75, gZubatPokedexText, 362, -5, 256, 0 + pokedex_entry 8, 75, gZubatPokedexText, 362, -5, 256, 0 .string "BAT$", 12 - pokedex_entry 16, 550, gGolbatPokedexText, 256, 1, 256, 0 + pokedex_entry 16, 550, gGolbatPokedexText, 256, 1, 256, 0 .string "WEED$", 12 - pokedex_entry 5, 54, gOddishPokedexText, 423, 19, 256, 0 + pokedex_entry 5, 54, gOddishPokedexText, 423, 19, 256, 0 .string "WEED$", 12 - pokedex_entry 8, 86, gGloomPokedexText, 329, 13, 256, 0 + pokedex_entry 8, 86, gGloomPokedexText, 329, 13, 256, 0 .string "FLOWER$", 12 pokedex_entry 12, 186, gVileplumePokedexText, 256, 4, 256, 0 .string "MUSHROOM$", 12 - pokedex_entry 3, 54, gParasPokedexText, 593, 22, 256, 0 + pokedex_entry 3, 54, gParasPokedexText, 593, 22, 256, 0 .string "MUSHROOM$", 12 pokedex_entry 10, 295, gParasectPokedexText, 307, 8, 256, 0 .string "INSECT$", 12 - pokedex_entry 10, 300, gVenonatPokedexText, 360, 0, 256, -1 + pokedex_entry 10, 300, gVenonatPokedexText, 360, 0, 256, -1 .string "POISON MOTH$", 12 pokedex_entry 15, 125, gVenomothPokedexText, 285, 2, 256, 1 .string "MOLE$", 12 - pokedex_entry 2, 8, gDiglettPokedexText, 833, 25, 256, 0 + pokedex_entry 2, 8, gDiglettPokedexText, 833, 25, 256, 0 .string "MOLE$", 12 - pokedex_entry 7, 333, gDugtrioPokedexText, 406, 18, 256, 0 + pokedex_entry 7, 333, gDugtrioPokedexText, 406, 18, 256, 0 .string "SCRATCH CAT$", 12 - pokedex_entry 4, 42, gMeowthPokedexText, 480, 19, 256, 0 + pokedex_entry 4, 42, gMeowthPokedexText, 480, 19, 256, 0 .string "CLASSY CAT$", 12 - pokedex_entry 10, 320, gPersianPokedexText, 320, 10, 256, 0 + pokedex_entry 10, 320, gPersianPokedexText, 320, 10, 256, 0 .string "DUCK$", 12 - pokedex_entry 8, 196, gPsyduckPokedexText, 369, 15, 256, 0 + pokedex_entry 8, 196, gPsyduckPokedexText, 369, 15, 256, 0 .string "DUCK$", 12 - pokedex_entry 17, 766, gGolduckPokedexText, 256, 1, 273, 1 + pokedex_entry 17, 766, gGolduckPokedexText, 256, 1, 273, 1 .string "PIG MONKEY$", 12 - pokedex_entry 5, 280, gMankeyPokedexText, 404, 19, 256, 0 + pokedex_entry 5, 280, gMankeyPokedexText, 404, 19, 256, 0 .string "PIG MONKEY$", 12 pokedex_entry 10, 320, gPrimeapePokedexText, 326, 10, 256, 0 .string "PUPPY$", 12 @@ -121,23 +121,23 @@ gPokedexEntries:: @ 856B5B0 .string "LEGENDARY$", 12 pokedex_entry 19, 1550, gArcaninePokedexText, 256, 1, 312, 4 .string "TADPOLE$", 12 - pokedex_entry 6, 124, gPoliwagPokedexText, 369, 20, 256, 0 + pokedex_entry 6, 124, gPoliwagPokedexText, 369, 20, 256, 0 .string "TADPOLE$", 12 pokedex_entry 10, 200, gPoliwhirlPokedexText, 288, 11, 256, 0 .string "TADPOLE$", 12 pokedex_entry 13, 540, gPoliwrathPokedexText, 256, 6, 256, 0 .string "PSI$", 12 - pokedex_entry 9, 195, gAbraPokedexText, 363, 14, 256, 0 + pokedex_entry 9, 195, gAbraPokedexText, 363, 14, 256, 0 .string "PSI$", 12 - pokedex_entry 13, 565, gKadabraPokedexText, 256, 3, 256, 0 + pokedex_entry 13, 565, gKadabraPokedexText, 256, 3, 256, 0 .string "PSI$", 12 pokedex_entry 15, 480, gAlakazamPokedexText, 256, 3, 256, 0 .string "SUPERPOWER$", 12 - pokedex_entry 8, 195, gMachopPokedexText, 342, 14, 256, 0 + pokedex_entry 8, 195, gMachopPokedexText, 342, 14, 256, 0 .string "SUPERPOWER$", 12 - pokedex_entry 15, 705, gMachokePokedexText, 323, 9, 257, 0 + pokedex_entry 15, 705, gMachokePokedexText, 323, 9, 257, 0 .string "SUPERPOWER$", 12 - pokedex_entry 16, 1300, gMachampPokedexText, 280, 1, 269, -1 + pokedex_entry 16, 1300, gMachampPokedexText, 280, 1, 269, -1 .string "FLOWER$", 12 pokedex_entry 7, 40, gBellsproutPokedexText, 354, 16, 256, 0 .string "FLYCATCHER$", 12 @@ -149,19 +149,19 @@ gPokedexEntries:: @ 856B5B0 .string "JELLYFISH$", 12 pokedex_entry 16, 550, gTentacruelPokedexText, 256, 0, 312, 1 .string "ROCK$", 12 - pokedex_entry 4, 200, gGeodudePokedexText, 347, 18, 256, 0 + pokedex_entry 4, 200, gGeodudePokedexText, 347, 18, 256, 0 .string "ROCK$", 12 pokedex_entry 10, 1050, gGravelerPokedexText, 256, 2, 256, 0 .string "MEGATON$", 12 - pokedex_entry 14, 3000, gGolemPokedexText, 256, 3, 296, 2 + pokedex_entry 14, 3000, gGolemPokedexText, 256, 3, 296, 2 .string "FIRE HORSE$", 12 - pokedex_entry 10, 300, gPonytaPokedexText, 283, 8, 256, 0 + pokedex_entry 10, 300, gPonytaPokedexText, 283, 8, 256, 0 .string "FIRE HORSE$", 12 pokedex_entry 17, 950, gRapidashPokedexText, 256, 0, 289, 1 .string "DOPEY$", 12 pokedex_entry 12, 360, gSlowpokePokedexText, 256, 10, 256, 0 .string "HERMIT CRAB$", 12 - pokedex_entry 16, 785, gSlowbroPokedexText, 256, 6, 296, 2 + pokedex_entry 16, 785, gSlowbroPokedexText, 256, 6, 296, 2 .string "MAGNET$", 12 pokedex_entry 3, 60, gMagnemitePokedexText, 288, -9, 256, 0 .string "MAGNET$", 12 @@ -169,39 +169,39 @@ gPokedexEntries:: @ 856B5B0 .string "WILD DUCK$", 12 pokedex_entry 8, 150, gFarfetchdPokedexText, 330, 2, 293, 2 .string "TWIN BIRD$", 12 - pokedex_entry 14, 392, gDoduoPokedexText, 256, 3, 257, -1 + pokedex_entry 14, 392, gDoduoPokedexText, 256, 3, 257, -1 .string "TRIPLE BIRD$", 12 - pokedex_entry 18, 852, gDodrioPokedexText, 256, 0, 268, 0 + pokedex_entry 18, 852, gDodrioPokedexText, 256, 0, 268, 0 .string "SEA LION$", 12 - pokedex_entry 11, 900, gSeelPokedexText, 297, 8, 256, 0 + pokedex_entry 11, 900, gSeelPokedexText, 297, 8, 256, 0 .string "SEA LION$", 12 - pokedex_entry 17, 1200, gDewgongPokedexText, 256, 0, 275, 0 + pokedex_entry 17, 1200, gDewgongPokedexText, 256, 0, 275, 0 .string "SLUDGE$", 12 - pokedex_entry 9, 300, gGrimerPokedexText, 258, 10, 256, 0 + pokedex_entry 9, 300, gGrimerPokedexText, 258, 10, 256, 0 .string "SLUDGE$", 12 - pokedex_entry 12, 300, gMukPokedexText, 256, 2, 256, 0 + pokedex_entry 12, 300, gMukPokedexText, 256, 2, 256, 0 .string "BIVALVE$", 12 pokedex_entry 3, 40, gShellderPokedexText, 675, 24, 256, 0 .string "BIVALVE$", 12 pokedex_entry 15, 1325, gCloysterPokedexText, 256, 0, 269, 1 .string "GAS$", 12 - pokedex_entry 13, 1, gGastlyPokedexText, 256, 0, 256, 0 + pokedex_entry 13, 1, gGastlyPokedexText, 256, 0, 256, 0 .string "GAS$", 12 - pokedex_entry 16, 1, gHaunterPokedexText, 256, 2, 293, 2 + pokedex_entry 16, 1, gHaunterPokedexText, 256, 2, 293, 2 .string "SHADOW$", 12 - pokedex_entry 15, 405, gGengarPokedexText, 256, 2, 302, 2 + pokedex_entry 15, 405, gGengarPokedexText, 256, 2, 302, 2 .string "ROCK SNAKE$", 12 - pokedex_entry 88, 2100, gOnixPokedexText, 256, 1, 515, 14 + pokedex_entry 88, 2100, gOnixPokedexText, 256, 1, 515, 14 .string "HYPNOSIS$", 12 - pokedex_entry 10, 324, gDrowzeePokedexText, 274, 6, 256, 0 + pokedex_entry 10, 324, gDrowzeePokedexText, 274, 6, 256, 0 .string "HYPNOSIS$", 12 - pokedex_entry 16, 756, gHypnoPokedexText, 256, 3, 257, 0 + pokedex_entry 16, 756, gHypnoPokedexText, 256, 3, 257, 0 .string "RIVER CRAB$", 12 - pokedex_entry 4, 65, gKrabbyPokedexText, 469, 20, 256, 0 + pokedex_entry 4, 65, gKrabbyPokedexText, 469, 20, 256, 0 .string "PINCER$", 12 - pokedex_entry 13, 600, gKinglerPokedexText, 256, 2, 256, 0 + pokedex_entry 13, 600, gKinglerPokedexText, 256, 2, 256, 0 .string "BALL$", 12 - pokedex_entry 5, 104, gVoltorbPokedexText, 364, -8, 256, 0 + pokedex_entry 5, 104, gVoltorbPokedexText, 364, -8, 256, 0 .string "BALL$", 12 pokedex_entry 12, 666, gElectrodePokedexText, 256, 0, 256, 0 .string "EGG$", 12 @@ -209,9 +209,9 @@ gPokedexEntries:: @ 856B5B0 .string "COCONUT$", 12 pokedex_entry 20, 1200, gExeggutorPokedexText, 256, 0, 309, 5 .string "LONELY$", 12 - pokedex_entry 4, 65, gCubonePokedexText, 545, 21, 256, 0 + pokedex_entry 4, 65, gCubonePokedexText, 545, 21, 256, 0 .string "BONE KEEPER$", 12 - pokedex_entry 10, 450, gMarowakPokedexText, 293, 12, 256, 0 + pokedex_entry 10, 450, gMarowakPokedexText, 293, 12, 256, 0 .string "KICKING$", 12 pokedex_entry 15, 498, gHitmonleePokedexText, 256, 3, 259, 1 .string "PUNCHING$", 12 @@ -219,101 +219,101 @@ gPokedexEntries:: @ 856B5B0 .string "LICKING$", 12 pokedex_entry 12, 655, gLickitungPokedexText, 256, 4, 256, 0 .string "POISON GAS$", 12 - pokedex_entry 6, 10, gKoffingPokedexText, 369, -1, 256, 0 + pokedex_entry 6, 10, gKoffingPokedexText, 369, -1, 256, 0 .string "POISON GAS$", 12 - pokedex_entry 12, 95, gWeezingPokedexText, 305, 3, 256, 0 + pokedex_entry 12, 95, gWeezingPokedexText, 305, 3, 256, 0 .string "SPIKES$", 12 - pokedex_entry 10, 1150, gRhyhornPokedexText, 267, 6, 256, 0 + pokedex_entry 10, 1150, gRhyhornPokedexText, 267, 6, 256, 0 .string "DRILL$", 12 - pokedex_entry 19, 1200, gRhydonPokedexText, 256, 1, 299, 2 + pokedex_entry 19, 1200, gRhydonPokedexText, 256, 1, 299, 2 .string "EGG$", 12 - pokedex_entry 11, 346, gChanseyPokedexText, 257, 7, 256, 0 + pokedex_entry 11, 346, gChanseyPokedexText, 257, 7, 256, 0 .string "VINE$", 12 - pokedex_entry 10, 350, gTangelaPokedexText, 304, 1, 256, 0 + pokedex_entry 10, 350, gTangelaPokedexText, 304, 1, 256, 0 .string "PARENT$", 12 pokedex_entry 22, 800, gKangaskhanPokedexText, 256, 0, 387, 8 .string "DRAGON$", 12 - pokedex_entry 4, 80, gHorseaPokedexText, 399, -1, 256, 0 + pokedex_entry 4, 80, gHorseaPokedexText, 399, -1, 256, 0 .string "DRAGON$", 12 - pokedex_entry 12, 250, gSeadraPokedexText, 299, 3, 256, 0 + pokedex_entry 12, 250, gSeadraPokedexText, 299, 3, 256, 0 .string "GOLDFISH$", 12 - pokedex_entry 6, 150, gGoldeenPokedexText, 379, 4, 256, 0 + pokedex_entry 6, 150, gGoldeenPokedexText, 379, 4, 256, 0 .string "GOLDFISH$", 12 - pokedex_entry 13, 390, gSeakingPokedexText, 256, 3, 256, 0 + pokedex_entry 13, 390, gSeakingPokedexText, 256, 3, 256, 0 .string "STAR SHAPE$", 12 - pokedex_entry 8, 345, gStaryuPokedexText, 326, 1, 256, 0 + pokedex_entry 8, 345, gStaryuPokedexText, 326, 1, 256, 0 .string "MYSTERIOUS$", 12 - pokedex_entry 11, 800, gStarmiePokedexText, 301, 3, 256, 0 + pokedex_entry 11, 800, gStarmiePokedexText, 301, 3, 256, 0 .string "BARRIER$", 12 - pokedex_entry 13, 545, gMrmimePokedexText, 258, 6, 256, 0 + pokedex_entry 13, 545, gMrmimePokedexText, 258, 6, 256, 0 .string "MANTIS$", 12 - pokedex_entry 15, 560, gScytherPokedexText, 256, 1, 293, 2 + pokedex_entry 15, 560, gScytherPokedexText, 256, 1, 293, 2 .string "HUMAN SHAPE$", 12 - pokedex_entry 14, 406, gJynxPokedexText, 256, 3, 300, 1 + pokedex_entry 14, 406, gJynxPokedexText, 256, 3, 300, 1 .string "ELECTRIC$", 12 pokedex_entry 11, 300, gElectabuzzPokedexText, 351, 8, 256, 0 .string "SPITFIRE$", 12 - pokedex_entry 13, 445, gMagmarPokedexText, 277, 5, 256, 0 + pokedex_entry 13, 445, gMagmarPokedexText, 277, 5, 256, 0 .string "STAG BEETLE$", 12 - pokedex_entry 15, 550, gPinsirPokedexText, 256, 2, 257, 0 + pokedex_entry 15, 550, gPinsirPokedexText, 256, 2, 257, 0 .string "WILD BULL$", 12 - pokedex_entry 14, 884, gTaurosPokedexText, 256, 0, 256, 0 + pokedex_entry 14, 884, gTaurosPokedexText, 256, 0, 256, 0 .string "FISH$", 12 pokedex_entry 9, 100, gMagikarpPokedexText, 310, 4, 256, 0 .string "ATROCIOUS$", 12 pokedex_entry 65, 2350, gGyaradosPokedexText, 256, 6, 481, 13 .string "TRANSPORT$", 12 - pokedex_entry 25, 2200, gLaprasPokedexText, 257, 10, 423, 8 + pokedex_entry 25, 2200, gLaprasPokedexText, 257, 10, 423, 8 .string "TRANSFORM$", 12 - pokedex_entry 3, 40, gDittoPokedexText, 633, 23, 256, 0 + pokedex_entry 3, 40, gDittoPokedexText, 633, 23, 256, 0 .string "EVOLUTION$", 12 - pokedex_entry 3, 65, gEeveePokedexText, 476, 18, 256, 0 + pokedex_entry 3, 65, gEeveePokedexText, 476, 18, 256, 0 .string "BUBBLE JET$", 12 pokedex_entry 10, 290, gVaporeonPokedexText, 316, 8, 256, 0 .string "LIGHTNING$", 12 - pokedex_entry 8, 245, gJolteonPokedexText, 283, 8, 256, 0 + pokedex_entry 8, 245, gJolteonPokedexText, 283, 8, 256, 0 .string "FLAME$", 12 - pokedex_entry 9, 250, gFlareonPokedexText, 306, 12, 256, 0 + pokedex_entry 9, 250, gFlareonPokedexText, 306, 12, 256, 0 .string "VIRTUAL$", 12 - pokedex_entry 8, 365, gPorygonPokedexText, 328, 15, 256, 0 + pokedex_entry 8, 365, gPorygonPokedexText, 328, 15, 256, 0 .string "SPIRAL$", 12 - pokedex_entry 4, 75, gOmanytePokedexText, 521, 22, 256, 0 + pokedex_entry 4, 75, gOmanytePokedexText, 521, 22, 256, 0 .string "SPIRAL$", 12 - pokedex_entry 10, 350, gOmastarPokedexText, 307, 7, 256, 0 + pokedex_entry 10, 350, gOmastarPokedexText, 307, 7, 256, 0 .string "SHELLFISH$", 12 - pokedex_entry 5, 115, gKabutoPokedexText, 454, 21, 256, 0 + pokedex_entry 5, 115, gKabutoPokedexText, 454, 21, 256, 0 .string "SHELLFISH$", 12 pokedex_entry 13, 405, gKabutopsPokedexText, 271, 3, 256, 0 .string "FOSSIL$", 12 pokedex_entry 18, 590, gAerodactylPokedexText, 256, 0, 302, 4 .string "SLEEPING$", 12 - pokedex_entry 21, 4600, gSnorlaxPokedexText, 256, 4, 423, 11 + pokedex_entry 21, 4600, gSnorlaxPokedexText, 256, 4, 423, 11 .string "FREEZE$", 12 pokedex_entry 17, 554, gArticunoPokedexText, 256, 0, 309, 2 .string "ELECTRIC$", 12 - pokedex_entry 16, 526, gZapdosPokedexText, 256, 0, 318, 3 + pokedex_entry 16, 526, gZapdosPokedexText, 256, 0, 318, 3 .string "FLAME$", 12 - pokedex_entry 20, 600, gMoltresPokedexText, 270, 0, 387, 8 + pokedex_entry 20, 600, gMoltresPokedexText, 270, 0, 387, 8 .string "DRAGON$", 12 - pokedex_entry 18, 33, gDratiniPokedexText, 256, 8, 386, 6 + pokedex_entry 18, 33, gDratiniPokedexText, 256, 8, 386, 6 .string "DRAGON$", 12 pokedex_entry 40, 165, gDragonairPokedexText, 256, 0, 411, 5 .string "DRAGON$", 12 pokedex_entry 22, 2100, gDragonitePokedexText, 256, 0, 309, 4 .string "GENETIC$", 12 - pokedex_entry 20, 1220, gMewtwoPokedexText, 256, 0, 309, 4 + pokedex_entry 20, 1220, gMewtwoPokedexText, 256, 0, 309, 4 .string "NEW SPECIES$", 12 - pokedex_entry 4, 40, gMewPokedexText, 457, -2, 256, 0 + pokedex_entry 4, 40, gMewPokedexText, 457, -2, 256, 0 .string "LEAF$", 12 pokedex_entry 9, 64, gChikoritaPokedexText, 512, 20, 256, 0 .string "LEAF$", 12 - pokedex_entry 12, 158, gBayleefPokedexText, 296, 4, 256, 0 + pokedex_entry 12, 158, gBayleefPokedexText, 296, 4, 256, 0 .string "HERB$", 12 pokedex_entry 18, 1005, gMeganiumPokedexText, 256, 0, 277, 1 .string "FIRE MOUSE$", 12 pokedex_entry 5, 79, gCyndaquilPokedexText, 539, 21, 256, 0 .string "VOLCANO$", 12 - pokedex_entry 9, 190, gQuilavaPokedexText, 329, 11, 256, 0 + pokedex_entry 9, 190, gQuilavaPokedexText, 329, 11, 256, 0 .string "VOLCANO$", 12 pokedex_entry 17, 795, gTyphlosionPokedexText, 256, 0, 268, 1 .string "BIG JAW$", 12 @@ -323,51 +323,51 @@ gPokedexEntries:: @ 856B5B0 .string "BIG JAW$", 12 pokedex_entry 23, 888, gFeraligatrPokedexText, 256, 0, 342, 7 .string "SCOUT$", 12 - pokedex_entry 8, 60, gSentretPokedexText, 439, 12, 256, 0 + pokedex_entry 8, 60, gSentretPokedexText, 439, 12, 256, 0 .string "LONG BODY$", 12 - pokedex_entry 18, 325, gFurretPokedexText, 346, 11, 256, 0 + pokedex_entry 18, 325, gFurretPokedexText, 346, 11, 256, 0 .string "OWL$", 12 pokedex_entry 7, 212, gHoothootPokedexText, 380, -2, 256, 0 .string "OWL$", 12 - pokedex_entry 16, 408, gNoctowlPokedexText, 278, 3, 256, 0 + pokedex_entry 16, 408, gNoctowlPokedexText, 278, 3, 256, 0 .string "FIVE STAR$", 12 - pokedex_entry 10, 108, gLedybaPokedexText, 256, 4, 256, 0 + pokedex_entry 10, 108, gLedybaPokedexText, 256, 4, 256, 0 .string "FIVE STAR$", 12 - pokedex_entry 14, 356, gLedianPokedexText, 256, 2, 256, 0 + pokedex_entry 14, 356, gLedianPokedexText, 256, 2, 256, 0 .string "STRING SPIT$", 12 pokedex_entry 5, 85, gSpinarakPokedexText, 414, 21, 256, 0 .string "LONG LEG$", 12 - pokedex_entry 11, 335, gAriadosPokedexText, 316, 8, 256, 0 + pokedex_entry 11, 335, gAriadosPokedexText, 316, 8, 256, 0 .string "BAT$", 12 - pokedex_entry 18, 750, gCrobatPokedexText, 256, 0, 281, 1 + pokedex_entry 18, 750, gCrobatPokedexText, 256, 0, 281, 1 .string "ANGLER$", 12 pokedex_entry 5, 120, gChinchouPokedexText, 424, -2, 256, 0 .string "LIGHT$", 12 - pokedex_entry 12, 225, gLanturnPokedexText, 269, 6, 256, 0 + pokedex_entry 12, 225, gLanturnPokedexText, 269, 6, 256, 0 .string "TINY MOUSE$", 12 - pokedex_entry 3, 20, gPichuPokedexText, 508, 20, 256, 0 + pokedex_entry 3, 20, gPichuPokedexText, 508, 20, 256, 0 .string "STAR SHAPE$", 12 - pokedex_entry 3, 30, gCleffaPokedexText, 462, 23, 256, 0 + pokedex_entry 3, 30, gCleffaPokedexText, 462, 23, 256, 0 .string "BALLOON$", 12 pokedex_entry 3, 10, gIgglybuffPokedexText, 457, -1, 256, 0 .string "SPIKE BALL$", 12 - pokedex_entry 3, 15, gTogepiPokedexText, 507, 23, 256, 0 + pokedex_entry 3, 15, gTogepiPokedexText, 507, 23, 256, 0 .string "HAPPINESS$", 12 - pokedex_entry 6, 32, gTogeticPokedexText, 424, 17, 256, 0 + pokedex_entry 6, 32, gTogeticPokedexText, 424, 17, 256, 0 .string "TINY BIRD$", 12 - pokedex_entry 2, 20, gNatuPokedexText, 610, 25, 256, 0 + pokedex_entry 2, 20, gNatuPokedexText, 610, 25, 256, 0 .string "MYSTIC$", 12 - pokedex_entry 15, 150, gXatuPokedexText, 256, 6, 318, 4 + pokedex_entry 15, 150, gXatuPokedexText, 256, 6, 318, 4 .string "WOOL$", 12 - pokedex_entry 6, 78, gMareepPokedexText, 379, 18, 256, 0 + pokedex_entry 6, 78, gMareepPokedexText, 379, 18, 256, 0 .string "WOOL$", 12 - pokedex_entry 8, 133, gFlaaffyPokedexText, 372, 15, 256, 0 + pokedex_entry 8, 133, gFlaaffyPokedexText, 372, 15, 256, 0 .string "LIGHT$", 12 pokedex_entry 14, 615, gAmpharosPokedexText, 256, 4, 256, 0 .string "FLOWER$", 12 pokedex_entry 4, 58, gBellossomPokedexText, 472, 21, 256, 0 .string "AQUA MOUSE$", 12 - pokedex_entry 4, 85, gMarillPokedexText, 476, 20, 256, 0 + pokedex_entry 4, 85, gMarillPokedexText, 476, 20, 256, 0 .string "AQUA RABBIT$", 12 pokedex_entry 8, 285, gAzumarillPokedexText, 448, 16, 256, 0 .string "IMITATION$", 12 @@ -375,49 +375,49 @@ gPokedexEntries:: @ 856B5B0 .string "FROG$", 12 pokedex_entry 11, 339, gPolitoedPokedexText, 289, 6, 256, 0 .string "COTTONWEED$", 12 - pokedex_entry 4, 5, gHoppipPokedexText, 562, -7, 256, 0 + pokedex_entry 4, 5, gHoppipPokedexText, 562, -7, 256, 0 .string "COTTONWEED$", 12 pokedex_entry 6, 10, gSkiploomPokedexText, 387, 0, 256, 0 .string "COTTONWEED$", 12 pokedex_entry 8, 30, gJumpluffPokedexText, 418, -4, 256, 0 .string "LONG TAIL$", 12 - pokedex_entry 8, 115, gAipomPokedexText, 363, 6, 256, 0 + pokedex_entry 8, 115, gAipomPokedexText, 363, 6, 256, 0 .string "SEED$", 12 - pokedex_entry 3, 18, gSunkernPokedexText, 541, 0, 256, 0 + pokedex_entry 3, 18, gSunkernPokedexText, 541, 0, 256, 0 .string "SUN$", 12 pokedex_entry 8, 85, gSunfloraPokedexText, 444, 15, 256, 0 .string "CLEAR WING$", 12 - pokedex_entry 12, 380, gYanmaPokedexText, 274, -1, 256, 0 + pokedex_entry 12, 380, gYanmaPokedexText, 274, -1, 256, 0 .string "WATER FISH$", 12 - pokedex_entry 4, 85, gWooperPokedexText, 479, 21, 256, 0 + pokedex_entry 4, 85, gWooperPokedexText, 479, 21, 256, 0 .string "WATER FISH$", 12 pokedex_entry 14, 750, gQuagsirePokedexText, 256, 4, 256, 0 .string "SUN$", 12 - pokedex_entry 9, 265, gEspeonPokedexText, 363, 14, 256, 0 + pokedex_entry 9, 265, gEspeonPokedexText, 363, 14, 256, 0 .string "MOONLIGHT$", 12 - pokedex_entry 10, 270, gUmbreonPokedexText, 317, 11, 256, 0 + pokedex_entry 10, 270, gUmbreonPokedexText, 317, 11, 256, 0 .string "DARKNESS$", 12 - pokedex_entry 5, 21, gMurkrowPokedexText, 401, -8, 256, 1 + pokedex_entry 5, 21, gMurkrowPokedexText, 401, -8, 256, 1 .string "ROYAL$", 12 pokedex_entry 20, 795, gSlowkingPokedexText, 256, 0, 309, 5 .string "SCREECH$", 12 pokedex_entry 7, 10, gMisdreavusPokedexText, 407, -8, 256, 0 .string "SYMBOL$", 12 - pokedex_entry 5, 50, gUnownPokedexText, 411, 2, 256, 0 + pokedex_entry 5, 50, gUnownPokedexText, 411, 2, 256, 0 .string "PATIENT$", 12 pokedex_entry 13, 285, gWobbuffetPokedexText, 274, 4, 256, 0 .string "LONG NECK$", 12 pokedex_entry 15, 415, gGirafarigPokedexText, 281, 1, 256, 0 .string "BAGWORM$", 12 - pokedex_entry 6, 72, gPinecoPokedexText, 445, 2, 256, 0 + pokedex_entry 6, 72, gPinecoPokedexText, 445, 2, 256, 0 .string "BAGWORM$", 12 pokedex_entry 12, 1258, gForretressPokedexText, 293, 5, 256, 0 .string "LAND SNAKE$", 12 pokedex_entry 15, 140, gDunsparcePokedexText, 316, 17, 256, 0 .string "FLYSCORPION$", 12 - pokedex_entry 11, 648, gGligarPokedexText, 350, -1, 256, 0 + pokedex_entry 11, 648, gGligarPokedexText, 350, -1, 256, 0 .string "IRON SNAKE$", 12 - pokedex_entry 92, 4000, gSteelixPokedexText, 256, 0, 516, 13 + pokedex_entry 92, 4000, gSteelixPokedexText, 256, 0, 516, 13 .string "FAIRY$", 12 pokedex_entry 6, 78, gSnubbullPokedexText, 465, 19, 256, 0 .string "FAIRY$", 12 @@ -425,27 +425,27 @@ gPokedexEntries:: @ 856B5B0 .string "BALLOON$", 12 pokedex_entry 5, 39, gQwilfishPokedexText, 430, 0, 256, 0 .string "PINCER$", 12 - pokedex_entry 18, 1180, gScizorPokedexText, 278, 1, 256, 0 + pokedex_entry 18, 1180, gScizorPokedexText, 278, 1, 256, 0 .string "MOLD$", 12 - pokedex_entry 6, 205, gShucklePokedexText, 485, 18, 256, 0 + pokedex_entry 6, 205, gShucklePokedexText, 485, 18, 256, 0 .string "SINGLE HORN$", 12 pokedex_entry 15, 540, gHeracrossPokedexText, 256, 0, 256, 0 .string "SHARP CLAW$", 12 - pokedex_entry 9, 280, gSneaselPokedexText, 413, -3, 256, 0 + pokedex_entry 9, 280, gSneaselPokedexText, 413, -3, 256, 0 .string "LITTLE BEAR$", 12 pokedex_entry 6, 88, gTeddiursaPokedexText, 455, 19, 256, 0 .string "HIBERNATOR$", 12 pokedex_entry 18, 1258, gUrsaringPokedexText, 256, 0, 256, 0 .string "LAVA$", 12 - pokedex_entry 7, 350, gSlugmaPokedexText, 329, 15, 256, 0 + pokedex_entry 7, 350, gSlugmaPokedexText, 329, 15, 256, 0 .string "LAVA$", 12 pokedex_entry 8, 550, gMagcargoPokedexText, 332, 15, 256, 0 .string "PIG$", 12 - pokedex_entry 4, 65, gSwinubPokedexText, 324, 20, 256, 0 + pokedex_entry 4, 65, gSwinubPokedexText, 324, 20, 256, 0 .string "SWINE$", 12 pokedex_entry 11, 558, gPiloswinePokedexText, 306, 10, 256, 0 .string "CORAL$", 12 - pokedex_entry 6, 50, gCorsolaPokedexText, 410, 15, 256, 0 + pokedex_entry 6, 50, gCorsolaPokedexText, 410, 15, 256, 0 .string "JET$", 12 pokedex_entry 6, 120, gRemoraidPokedexText, 316, 4, 256, 0 .string "JET$", 12 @@ -453,7 +453,7 @@ gPokedexEntries:: @ 856B5B0 .string "DELIVERY$", 12 pokedex_entry 9, 160, gDelibirdPokedexText, 293, 11, 256, 0 .string "KITE$", 12 - pokedex_entry 21, 2200, gMantinePokedexText, 256, 0, 342, 7 + pokedex_entry 21, 2200, gMantinePokedexText, 256, 0, 342, 7 .string "ARMOR BIRD$", 12 pokedex_entry 17, 505, gSkarmoryPokedexText, 256, 0, 271, 1 .string "DARK$", 12 @@ -461,11 +461,11 @@ gPokedexEntries:: @ 856B5B0 .string "DARK$", 12 pokedex_entry 14, 350, gHoundoomPokedexText, 256, 4, 256, 0 .string "DRAGON$", 12 - pokedex_entry 18, 1520, gKingdraPokedexText, 256, 0, 287, 0 + pokedex_entry 18, 1520, gKingdraPokedexText, 256, 0, 287, 0 .string "LONG NOSE$", 12 - pokedex_entry 5, 335, gPhanpyPokedexText, 465, 21, 256, 0 + pokedex_entry 5, 335, gPhanpyPokedexText, 465, 21, 256, 0 .string "ARMOR$", 12 - pokedex_entry 11, 1200, gDonphanPokedexText, 313, 9, 256, 0 + pokedex_entry 11, 1200, gDonphanPokedexText, 313, 9, 256, 0 .string "VIRTUAL$", 12 pokedex_entry 6, 325, gPorygon2PokedexText, 320, 17, 256, 0 .string "BIG HORN$", 12 @@ -473,51 +473,51 @@ gPokedexEntries:: @ 856B5B0 .string "PAINTER$", 12 pokedex_entry 12, 580, gSmearglePokedexText, 287, 5, 256, 0 .string "SCUFFLE$", 12 - pokedex_entry 7, 210, gTyroguePokedexText, 292, 9, 256, 0 + pokedex_entry 7, 210, gTyroguePokedexText, 292, 9, 256, 0 .string "HANDSTAND$", 12 pokedex_entry 14, 480, gHitmontopPokedexText, 256, 2, 257, 0 .string "KISS$", 12 pokedex_entry 4, 60, gSmoochumPokedexText, 440, 20, 256, 0 .string "ELECTRIC$", 12 - pokedex_entry 6, 235, gElekidPokedexText, 363, 14, 256, 0 + pokedex_entry 6, 235, gElekidPokedexText, 363, 14, 256, 0 .string "LIVE COAL$", 12 - pokedex_entry 7, 214, gMagbyPokedexText, 284, 13, 256, 0 + pokedex_entry 7, 214, gMagbyPokedexText, 284, 13, 256, 0 .string "MILK COW$", 12 - pokedex_entry 12, 755, gMiltankPokedexText, 280, 5, 256, 0 + pokedex_entry 12, 755, gMiltankPokedexText, 280, 5, 256, 0 .string "HAPPINESS$", 12 - pokedex_entry 15, 468, gBlisseyPokedexText, 256, 4, 310, 3 + pokedex_entry 15, 468, gBlisseyPokedexText, 256, 4, 310, 3 .string "THUNDER$", 12 - pokedex_entry 19, 1780, gRaikouPokedexText, 256, 0, 345, 7 + pokedex_entry 19, 1780, gRaikouPokedexText, 256, 0, 345, 7 .string "VOLCANO$", 12 - pokedex_entry 21, 1980, gEnteiPokedexText, 259, 0, 345, 7 + pokedex_entry 21, 1980, gEnteiPokedexText, 259, 0, 345, 7 .string "AURORA$", 12 - pokedex_entry 20, 1870, gSuicunePokedexText, 269, 0, 345, 7 + pokedex_entry 20, 1870, gSuicunePokedexText, 269, 0, 345, 7 .string "ROCK SKIN$", 12 pokedex_entry 6, 720, gLarvitarPokedexText, 472, 18, 256, 0 .string "HARD SHELL$", 12 - pokedex_entry 12, 1520, gPupitarPokedexText, 292, 8, 256, 0 + pokedex_entry 12, 1520, gPupitarPokedexText, 292, 8, 256, 0 .string "ARMOR$", 12 pokedex_entry 20, 2020, gTyranitarPokedexText, 256, 0, 345, 7 .string "DIVING$", 12 - pokedex_entry 52, 2160, gLugiaPokedexText, 256, 0, 721, 19 + pokedex_entry 52, 2160, gLugiaPokedexText, 256, 0, 721, 19 .string "RAINBOW$", 12 - pokedex_entry 38, 1990, gHoOhPokedexText, 256, 0, 610, 17 + pokedex_entry 38, 1990, gHoOhPokedexText, 256, 0, 610, 17 .string "TIME TRAVEL$", 12 - pokedex_entry 6, 50, gCelebiPokedexText, 393, -10, 256, 0 + pokedex_entry 6, 50, gCelebiPokedexText, 393, -10, 256, 0 .string "WOOD GECKO$", 12 - pokedex_entry 5, 50, gTreeckoPokedexText, 541, 19, 256, 0 + pokedex_entry 5, 50, gTreeckoPokedexText, 541, 19, 256, 0 .string "WOOD GECKO$", 12 - pokedex_entry 9, 216, gGrovylePokedexText, 360, 5, 256, 0 + pokedex_entry 9, 216, gGrovylePokedexText, 360, 5, 256, 0 .string "FOREST$", 12 pokedex_entry 17, 522, gSceptilePokedexText, 256, -1, 275, 2 .string "CHICK$", 12 - pokedex_entry 4, 25, gTorchicPokedexText, 566, 19, 256, 0 + pokedex_entry 4, 25, gTorchicPokedexText, 566, 19, 256, 0 .string "YOUNG FOWL$", 12 pokedex_entry 9, 195, gCombuskenPokedexText, 343, 5, 256, 0 .string "BLAZE$", 12 pokedex_entry 19, 520, gBlazikenPokedexText, 256, 0, 301, 4 .string "MUD FISH$", 12 - pokedex_entry 4, 76, gMudkipPokedexText, 535, 20, 256, 0 + pokedex_entry 4, 76, gMudkipPokedexText, 535, 20, 256, 0 .string "MUD FISH$", 12 pokedex_entry 7, 280, gMarshtompPokedexText, 340, 7, 256, 0 .string "MUD FISH$", 12 @@ -529,91 +529,91 @@ gPokedexEntries:: @ 856B5B0 .string "TINYRACCOON$", 12 pokedex_entry 4, 175, gZigzagoonPokedexText, 560, 22, 256, 0 .string "RUSHING$", 12 - pokedex_entry 5, 325, gLinoonePokedexText, 321, 7, 256, 0 + pokedex_entry 5, 325, gLinoonePokedexText, 321, 7, 256, 0 .string "WORM$", 12 - pokedex_entry 3, 36, gWurmplePokedexText, 711, 24, 256, 0 + pokedex_entry 3, 36, gWurmplePokedexText, 711, 24, 256, 0 .string "COCOON$", 12 - pokedex_entry 6, 100, gSilcoonPokedexText, 431, 19, 256, 0 + pokedex_entry 6, 100, gSilcoonPokedexText, 431, 19, 256, 0 .string "BUTTERFLY$", 12 pokedex_entry 10, 284, gBeautiflyPokedexText, 298, -1, 256, 0 .string "COCOON$", 12 - pokedex_entry 7, 115, gCascoonPokedexText, 391, 20, 256, 0 + pokedex_entry 7, 115, gCascoonPokedexText, 391, 20, 256, 0 .string "POISON MOTH$", 12 - pokedex_entry 12, 316, gDustoxPokedexText, 269, 1, 256, 0 + pokedex_entry 12, 316, gDustoxPokedexText, 269, 1, 256, 0 .string "WATER WEED$", 12 - pokedex_entry 5, 26, gLotadPokedexText, 406, 19, 256, 0 + pokedex_entry 5, 26, gLotadPokedexText, 406, 19, 256, 0 .string "JOLLY$", 12 - pokedex_entry 12, 325, gLombrePokedexText, 277, 9, 256, 0 + pokedex_entry 12, 325, gLombrePokedexText, 277, 9, 256, 0 .string "CAREFREE$", 12 pokedex_entry 15, 550, gLudicoloPokedexText, 256, 0, 268, -1 .string "ACORN$", 12 - pokedex_entry 5, 40, gSeedotPokedexText, 472, 20, 256, 0 + pokedex_entry 5, 40, gSeedotPokedexText, 472, 20, 256, 0 .string "WILY$", 12 - pokedex_entry 10, 280, gNuzleafPokedexText, 299, 10, 256, 0 + pokedex_entry 10, 280, gNuzleafPokedexText, 299, 10, 256, 0 .string "WICKED$", 12 - pokedex_entry 13, 596, gShiftryPokedexText, 290, 4, 256, 0 + pokedex_entry 13, 596, gShiftryPokedexText, 290, 4, 256, 0 .string "TINYSWALLOW$", 12 - pokedex_entry 3, 23, gTaillowPokedexText, 465, 21, 256, 0 + pokedex_entry 3, 23, gTaillowPokedexText, 465, 21, 256, 0 .string "SWALLOW$", 12 - pokedex_entry 7, 198, gSwellowPokedexText, 428, 15, 256, 0 + pokedex_entry 7, 198, gSwellowPokedexText, 428, 15, 256, 0 .string "SEAGULL$", 12 - pokedex_entry 6, 95, gWingullPokedexText, 295, -2, 256, 0 + pokedex_entry 6, 95, gWingullPokedexText, 295, -2, 256, 0 .string "WATER BIRD$", 12 pokedex_entry 12, 280, gPelipperPokedexText, 288, 1, 256, 0 .string "FEELING$", 12 - pokedex_entry 4, 66, gRaltsPokedexText, 457, -3, 256, 0 + pokedex_entry 4, 66, gRaltsPokedexText, 457, -3, 256, 0 .string "EMOTION$", 12 - pokedex_entry 8, 202, gKirliaPokedexText, 354, 0, 256, 0 + pokedex_entry 8, 202, gKirliaPokedexText, 354, 0, 256, 0 .string "EMBRACE$", 12 pokedex_entry 16, 484, gGardevoirPokedexText, 256, 0, 256, 0 .string "POND SKATER$", 12 - pokedex_entry 5, 17, gSurskitPokedexText, 375, 17, 256, 0 + pokedex_entry 5, 17, gSurskitPokedexText, 375, 17, 256, 0 .string "EYEBALL$", 12 pokedex_entry 8, 36, gMasquerainPokedexText, 378, 8, 256, 0 .string "MUSHROOM$", 12 pokedex_entry 4, 45, gShroomishPokedexText, 513, 22, 256, 0 .string "MUSHROOM$", 12 - pokedex_entry 12, 392, gBreloomPokedexText, 324, 6, 256, 0 + pokedex_entry 12, 392, gBreloomPokedexText, 324, 6, 256, 0 .string "SLACKER$", 12 - pokedex_entry 8, 240, gSlakothPokedexText, 291, 16, 256, 0 + pokedex_entry 8, 240, gSlakothPokedexText, 291, 16, 256, 0 .string "WILD MONKEY$", 12 pokedex_entry 14, 465, gVigorothPokedexText, 301, 2, 256, 0 .string "LAZY$", 12 - pokedex_entry 20, 1305, gSlakingPokedexText, 256, 2, 300, 1 + pokedex_entry 20, 1305, gSlakingPokedexText, 256, 2, 300, 1 .string "TRAINEE$", 12 - pokedex_entry 5, 55, gNincadaPokedexText, 405, 21, 256, 0 + pokedex_entry 5, 55, gNincadaPokedexText, 405, 21, 256, 0 .string "NINJA$", 12 - pokedex_entry 8, 120, gNinjaskPokedexText, 383, -9, 256, 0 + pokedex_entry 8, 120, gNinjaskPokedexText, 383, -9, 256, 0 .string "SHED$", 12 pokedex_entry 8, 12, gShedinjaPokedexText, 372, -8, 256, 0 .string "WHISPER$", 12 - pokedex_entry 6, 163, gWhismurPokedexText, 373, 17, 256, 0 + pokedex_entry 6, 163, gWhismurPokedexText, 373, 17, 256, 0 .string "BIG VOICE$", 12 - pokedex_entry 10, 405, gLoudredPokedexText, 356, 10, 256, 0 + pokedex_entry 10, 405, gLoudredPokedexText, 356, 10, 256, 0 .string "LOUD NOISE$", 12 - pokedex_entry 15, 840, gExploudPokedexText, 284, 1, 256, 0 + pokedex_entry 15, 840, gExploudPokedexText, 284, 1, 256, 0 .string "GUTS$", 12 pokedex_entry 10, 864, gMakuhitaPokedexText, 256, 10, 256, 0 .string "ARM THRUST$", 12 pokedex_entry 23, 2538, gHariyamaPokedexText, 256, 0, 343, 7 .string "POLKA DOT$", 12 - pokedex_entry 2, 20, gAzurillPokedexText, 603, 23, 256, 0 + pokedex_entry 2, 20, gAzurillPokedexText, 603, 23, 256, 0 .string "COMPASS$", 12 pokedex_entry 10, 970, gNosepassPokedexText, 256, 9, 289, 3 .string "KITTEN$", 12 - pokedex_entry 6, 110, gSkittyPokedexText, 492, 19, 256, 0 + pokedex_entry 6, 110, gSkittyPokedexText, 492, 19, 256, 0 .string "PRIM$", 12 pokedex_entry 11, 326, gDelcattyPokedexText, 322, 10, 256, 0 .string "DARKNESS$", 12 - pokedex_entry 5, 110, gSableyePokedexText, 451, 17, 256, 0 + pokedex_entry 5, 110, gSableyePokedexText, 451, 17, 256, 0 .string "DECEIVER$", 12 - pokedex_entry 6, 115, gMawilePokedexText, 466, 17, 256, 0 + pokedex_entry 6, 115, gMawilePokedexText, 466, 17, 256, 0 .string "IRON ARMOR$", 12 - pokedex_entry 4, 600, gAronPokedexText, 419, 23, 256, 0 + pokedex_entry 4, 600, gAronPokedexText, 419, 23, 256, 0 .string "IRON ARMOR$", 12 - pokedex_entry 9, 1200, gLaironPokedexText, 275, 12, 256, 0 + pokedex_entry 9, 1200, gLaironPokedexText, 275, 12, 256, 0 .string "IRON ARMOR$", 12 - pokedex_entry 21, 3600, gAggronPokedexText, 256, -1, 350, 6 + pokedex_entry 21, 3600, gAggronPokedexText, 256, -1, 350, 6 .string "MEDITATE$", 12 pokedex_entry 6, 112, gMedititePokedexText, 465, 17, 256, 0 .string "MEDITATE$", 12 @@ -623,61 +623,61 @@ gPokedexEntries:: @ 856B5B0 .string "DISCHARGE$", 12 pokedex_entry 15, 402, gManectricPokedexText, 256, 3, 257, 0 .string "CHEERING$", 12 - pokedex_entry 4, 42, gPluslePokedexText, 515, -9, 256, 0 + pokedex_entry 4, 42, gPluslePokedexText, 515, -9, 256, 0 .string "CHEERING$", 12 - pokedex_entry 4, 42, gMinunPokedexText, 512, -7, 256, 0 + pokedex_entry 4, 42, gMinunPokedexText, 512, -7, 256, 0 .string "FIREFLY$", 12 - pokedex_entry 7, 177, gVolbeatPokedexText, 442, 16, 256, 0 + pokedex_entry 7, 177, gVolbeatPokedexText, 442, 16, 256, 0 .string "FIREFLY$", 12 pokedex_entry 6, 177, gIllumisePokedexText, 572, 19, 256, 0 .string "THORN$", 12 - pokedex_entry 3, 20, gRoseliaPokedexText, 677, 20, 256, 0 + pokedex_entry 3, 20, gRoseliaPokedexText, 677, 20, 256, 0 .string "STOMACH$", 12 - pokedex_entry 4, 103, gGulpinPokedexText, 593, 23, 256, 0 + pokedex_entry 4, 103, gGulpinPokedexText, 593, 23, 256, 0 .string "POISON BAG$", 12 - pokedex_entry 17, 800, gSwalotPokedexText, 256, 6, 345, 3 + pokedex_entry 17, 800, gSwalotPokedexText, 256, 6, 345, 3 .string "SAVAGE$", 12 pokedex_entry 8, 208, gCarvanhaPokedexText, 362, 0, 256, 0 .string "BRUTAL$", 12 pokedex_entry 18, 888, gSharpedoPokedexText, 256, 0, 317, 3 .string "BALL WHALE$", 12 - pokedex_entry 20, 1300, gWailmerPokedexText, 256, 2, 493, 0 + pokedex_entry 20, 1300, gWailmerPokedexText, 256, 2, 493, 0 .string "FLOAT WHALE$", 12 - pokedex_entry 145, 3980, gWailordPokedexText, 256, 0, 1352, 18 + pokedex_entry 145, 3980, gWailordPokedexText, 256, 0, 1352, 18 .string "NUMB$", 12 - pokedex_entry 7, 240, gNumelPokedexText, 342, 17, 256, 0 + pokedex_entry 7, 240, gNumelPokedexText, 342, 17, 256, 0 .string "ERUPTION$", 12 pokedex_entry 19, 2200, gCameruptPokedexText, 256, 7, 345, 6 .string "COAL$", 12 - pokedex_entry 5, 804, gTorkoalPokedexText, 390, 9, 256, 0 + pokedex_entry 5, 804, gTorkoalPokedexText, 390, 9, 256, 0 .string "BOUNCE$", 12 - pokedex_entry 7, 306, gSpoinkPokedexText, 423, 17, 256, 0 + pokedex_entry 7, 306, gSpoinkPokedexText, 423, 17, 256, 0 .string "MANIPULATE$", 12 - pokedex_entry 9, 715, gGrumpigPokedexText, 358, 10, 256, 0 + pokedex_entry 9, 715, gGrumpigPokedexText, 358, 10, 256, 0 .string "SPOT PANDA$", 12 - pokedex_entry 11, 50, gSpindaPokedexText, 321, 4, 256, 0 + pokedex_entry 11, 50, gSpindaPokedexText, 321, 4, 256, 0 .string "ANT PIT$", 12 pokedex_entry 7, 150, gTrapinchPokedexText, 298, 17, 256, 0 .string "VIBRATION$", 12 - pokedex_entry 11, 153, gVibravaPokedexText, 370, 11, 256, 0 + pokedex_entry 11, 153, gVibravaPokedexText, 370, 11, 256, 0 .string "MYSTIC$", 12 - pokedex_entry 20, 820, gFlygonPokedexText, 256, 0, 268, 1 + pokedex_entry 20, 820, gFlygonPokedexText, 256, 0, 268, 1 .string "CACTUS$", 12 - pokedex_entry 4, 513, gCacneaPokedexText, 455, 20, 256, 0 + pokedex_entry 4, 513, gCacneaPokedexText, 455, 20, 256, 0 .string "SCARECROW$", 12 pokedex_entry 13, 774, gCacturnePokedexText, 327, 5, 256, 0 .string "COTTON BIRD$", 12 - pokedex_entry 4, 12, gSwabluPokedexText, 422, -8, 256, 0 + pokedex_entry 4, 12, gSwabluPokedexText, 422, -8, 256, 0 .string "HUMMING$", 12 - pokedex_entry 11, 206, gAltariaPokedexText, 327, 0, 256, 0 + pokedex_entry 11, 206, gAltariaPokedexText, 327, 0, 256, 0 .string "CAT FERRET$", 12 pokedex_entry 13, 403, gZangoosePokedexText, 256, 3, 256, 0 .string "FANG SNAKE$", 12 - pokedex_entry 27, 525, gSeviperPokedexText, 275, 7, 256, 0 + pokedex_entry 27, 525, gSeviperPokedexText, 275, 7, 256, 0 .string "METEORITE$", 12 pokedex_entry 10, 1680, gLunatonePokedexText, 300, 3, 256, 0 .string "METEORITE$", 12 - pokedex_entry 12, 1540, gSolrockPokedexText, 328, 0, 256, 0 + pokedex_entry 12, 1540, gSolrockPokedexText, 328, 0, 256, 0 .string "WHISKERS$", 12 pokedex_entry 4, 19, gBarboachPokedexText, 581, -3, 256, 0 .string "WHISKERS$", 12 @@ -687,90 +687,90 @@ gPokedexEntries:: @ 856B5B0 .string "ROGUE$", 12 pokedex_entry 11, 328, gCrawdauntPokedexText, 365, 9, 256, 0 .string "CLAY DOLL$", 12 - pokedex_entry 5, 215, gBaltoyPokedexText, 457, 21, 256, 0 + pokedex_entry 5, 215, gBaltoyPokedexText, 457, 21, 256, 0 .string "CLAY DOLL$", 12 - pokedex_entry 15, 1080, gClaydolPokedexText, 256, 3, 280, 1 + pokedex_entry 15, 1080, gClaydolPokedexText, 256, 3, 280, 1 .string "SEA LILY$", 12 - pokedex_entry 10, 238, gLileepPokedexText, 305, 8, 256, 0 + pokedex_entry 10, 238, gLileepPokedexText, 305, 8, 256, 0 .string "BARNACLE$", 12 - pokedex_entry 15, 604, gCradilyPokedexText, 267, 0, 256, 0 + pokedex_entry 15, 604, gCradilyPokedexText, 267, 0, 256, 0 .string "OLD SHRIMP$", 12 - pokedex_entry 7, 125, gAnorithPokedexText, 296, 4, 256, 0 + pokedex_entry 7, 125, gAnorithPokedexText, 296, 4, 256, 0 .string "PLATE$", 12 - pokedex_entry 15, 682, gArmaldoPokedexText, 312, 3, 271, 0 + pokedex_entry 15, 682, gArmaldoPokedexText, 312, 3, 271, 0 .string "FISH$", 12 - pokedex_entry 6, 74, gFeebasPokedexText, 423, -4, 256, 0 + pokedex_entry 6, 74, gFeebasPokedexText, 423, -4, 256, 0 .string "TENDER$", 12 - pokedex_entry 62, 1620, gMiloticPokedexText, 256, 0, 360, 7 + pokedex_entry 62, 1620, gMiloticPokedexText, 256, 0, 360, 7 .string "WEATHER$", 12 - pokedex_entry 3, 8, gCastformPokedexText, 435, -5, 256, 0 + pokedex_entry 3, 8, gCastformPokedexText, 435, -5, 256, 0 .string "COLOR SWAP$", 12 - pokedex_entry 10, 220, gKecleonPokedexText, 316, 10, 256, 0 + pokedex_entry 10, 220, gKecleonPokedexText, 316, 10, 256, 0 .string "PUPPET$", 12 - pokedex_entry 6, 23, gShuppetPokedexText, 440, 20, 256, 0 + pokedex_entry 6, 23, gShuppetPokedexText, 440, 20, 256, 0 .string "MARIONETTE$", 12 - pokedex_entry 11, 125, gBanettePokedexText, 262, 9, 256, 0 + pokedex_entry 11, 125, gBanettePokedexText, 262, 9, 256, 0 .string "REQUIEM$", 12 - pokedex_entry 8, 150, gDuskullPokedexText, 406, -4, 256, 0 + pokedex_entry 8, 150, gDuskullPokedexText, 406, -4, 256, 0 .string "BECKON$", 12 pokedex_entry 16, 306, gDusclopsPokedexText, 256, 3, 299, 1 .string "FRUIT$", 12 - pokedex_entry 20, 1000, gTropiusPokedexText, 256, 0, 344, 7 + pokedex_entry 20, 1000, gTropiusPokedexText, 256, 0, 344, 7 .string "WIND CHIME$", 12 pokedex_entry 6, 10, gChimechoPokedexText, 505, 0, 256, 0 .string "DISASTER$", 12 - pokedex_entry 12, 470, gAbsolPokedexText, 301, 3, 256, 0 + pokedex_entry 12, 470, gAbsolPokedexText, 301, 3, 256, 0 .string "BRIGHT$", 12 - pokedex_entry 6, 140, gWynautPokedexText, 484, 19, 256, 0 + pokedex_entry 6, 140, gWynautPokedexText, 484, 19, 256, 0 .string "SNOW HAT$", 12 - pokedex_entry 7, 168, gSnoruntPokedexText, 380, 15, 256, 0 + pokedex_entry 7, 168, gSnoruntPokedexText, 380, 15, 256, 0 .string "FACE$", 12 - pokedex_entry 15, 2565, gGlaliePokedexText, 256, 3, 344, 0 + pokedex_entry 15, 2565, gGlaliePokedexText, 256, 3, 344, 0 .string "CLAP$", 12 - pokedex_entry 8, 395, gSphealPokedexText, 315, 16, 256, 0 + pokedex_entry 8, 395, gSphealPokedexText, 315, 16, 256, 0 .string "BALL ROLL$", 12 - pokedex_entry 11, 876, gSealeoPokedexText, 338, 13, 256, 0 + pokedex_entry 11, 876, gSealeoPokedexText, 338, 13, 256, 0 .string "ICE BREAK$", 12 - pokedex_entry 14, 1506, gWalreinPokedexText, 316, 4, 256, 0 + pokedex_entry 14, 1506, gWalreinPokedexText, 316, 4, 256, 0 .string "BIVALVE$", 12 pokedex_entry 4, 525, gClamperlPokedexText, 691, 22, 256, 0 .string "DEEP SEA$", 12 - pokedex_entry 17, 270, gHuntailPokedexText, 307, 1, 256, 0 + pokedex_entry 17, 270, gHuntailPokedexText, 307, 1, 256, 0 .string "SOUTH SEA$", 12 pokedex_entry 18, 226, gGorebyssPokedexText, 278, 5, 256, 0 .string "LONGEVITY$", 12 pokedex_entry 10, 234, gRelicanthPokedexText, 316, 7, 256, 0 .string "RENDEZVOUS$", 12 - pokedex_entry 6, 87, gLuvdiscPokedexText, 371, 2, 256, 0 + pokedex_entry 6, 87, gLuvdiscPokedexText, 371, 2, 256, 0 .string "ROCK HEAD$", 12 - pokedex_entry 6, 421, gBagonPokedexText, 448, 18, 256, 0 + pokedex_entry 6, 421, gBagonPokedexText, 448, 18, 256, 0 .string "ENDURANCE$", 12 - pokedex_entry 11, 1105, gShelgonPokedexText, 311, 12, 256, 0 + pokedex_entry 11, 1105, gShelgonPokedexText, 311, 12, 256, 0 .string "DRAGON$", 12 pokedex_entry 15, 1026, gSalamencePokedexText, 256, 0, 256, 0 .string "IRON BALL$", 12 - pokedex_entry 6, 952, gBeldumPokedexText, 414, -1, 256, 0 + pokedex_entry 6, 952, gBeldumPokedexText, 414, -1, 256, 0 .string "IRON CLAW$", 12 - pokedex_entry 12, 2025, gMetangPokedexText, 256, 6, 256, 0 + pokedex_entry 12, 2025, gMetangPokedexText, 256, 6, 256, 0 .string "IRON LEG$", 12 pokedex_entry 16, 5500, gMetagrossPokedexText, 256, 4, 447, 9 .string "ROCK PEAK$", 12 pokedex_entry 17, 2300, gRegirockPokedexText, 256, 2, 309, 1 .string "ICEBERG$", 12 - pokedex_entry 18, 1750, gRegicePokedexText, 256, 0, 301, 2 + pokedex_entry 18, 1750, gRegicePokedexText, 256, 0, 301, 2 .string "IRON$", 12 pokedex_entry 19, 2050, gRegisteelPokedexText, 256, 0, 359, 6 .string "EON$", 12 - pokedex_entry 14, 400, gLatiasPokedexText, 304, 3, 256, 0 + pokedex_entry 14, 400, gLatiasPokedexText, 304, 3, 256, 0 .string "EON$", 12 - pokedex_entry 20, 600, gLatiosPokedexText, 256, 0, 294, 3 + pokedex_entry 20, 600, gLatiosPokedexText, 256, 0, 294, 3 .string "SEA BASIN$", 12 - pokedex_entry 45, 3520, gKyogrePokedexText, 256, 0, 614, 13 + pokedex_entry 45, 3520, gKyogrePokedexText, 256, 0, 614, 13 .string "CONTINENT$", 12 - pokedex_entry 35, 9500, gGroudonPokedexText, 256, 0, 515, 14 + pokedex_entry 35, 9500, gGroudonPokedexText, 256, 0, 515, 14 .string "SKY HIGH$", 12 pokedex_entry 70, 2065, gRayquazaPokedexText, 256, 0, 448, 12 .string "WISH$", 12 - pokedex_entry 3, 11, gJirachiPokedexText, 608, -8, 256, 0 + pokedex_entry 3, 11, gJirachiPokedexText, 608, -8, 256, 0 .string "DNA$", 12 - pokedex_entry 17, 608, gDeoxysPokedexText, 256, 0, 290, 2 + pokedex_entry 17, 608, gDeoxysPokedexText, 256, 0, 290, 2 diff --git a/data/pokemon_icon.s b/data/pokemon_icon.s deleted file mode 100644 index 9d6c7ac2e..000000000 --- a/data/pokemon_icon.s +++ /dev/null @@ -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 diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 4f2815713..e419db55a 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -1,23 +1,8 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .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 + .section .rodata + .align 2, 0 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 - -gUnknown_0857291C:: @ 857291C - .incbin "baserom.gba", 0x57291c, 0x4c58 + spr_template 0x12, 0xDAC0, gOamData_85728EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .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 diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index fc1c79096..d3cb51fca 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -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 diff --git a/data/pokenav.s b/data/pokenav.s index 8e8e24b65..89ec3c3a6 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -4,7 +4,117 @@ .section .rodata gUnknown_0861F3EC:: @ 861F3EC - .incbin "baserom.gba", 0x61f3ec, 0x618 + .4byte sub_81C9298 + .4byte sub_81C941C + .4byte sub_81C9924 + .4byte sub_81C9990 + .4byte sub_81C99C0 + .4byte sub_81C9430 + .4byte sub_81C99D4 + .4byte sub_81C9298 + .4byte sub_81C941C + .4byte sub_81C9940 + .4byte sub_81C9990 + .4byte sub_81C99C0 + .4byte sub_81C9430 + .4byte sub_81C99D4 + .4byte sub_81C9338 + .4byte sub_81C941C + .4byte sub_81C9940 + .4byte sub_81C9990 + .4byte sub_81C99C0 + .4byte sub_81C9430 + .4byte sub_81C99D4 + .4byte sub_81C9368 + .4byte sub_81C941C + .4byte sub_81C9940 + .4byte sub_81C9990 + .4byte sub_81C99C0 + .4byte sub_81C9430 + .4byte sub_81C99D4 + .4byte sub_81C92CC + .4byte sub_81C941C + .4byte sub_81C9940 + .4byte sub_81C9990 + .4byte sub_81C99C0 + .4byte sub_81C9430 + .4byte sub_81C99D4 + .4byte sub_81C9304 + .4byte sub_81C941C + .4byte sub_81C9940 + .4byte sub_81C9990 + .4byte sub_81C99C0 + .4byte sub_81C9430 + .4byte sub_81C99D4 + .4byte sub_81CC4D4 + .4byte sub_81CC554 + .4byte sub_81CC5F4 + .4byte sub_81CC62C + .4byte sub_81CC65C + .4byte sub_81CC524 + .4byte sub_81CC670 + .4byte sub_81CCFD8 + .4byte sub_81CD070 + .4byte sub_81CDDD4 + .4byte sub_81CDE2C + .4byte sub_81CDE64 + .4byte sub_81CD1C0 + .4byte sub_81CECA0 + .4byte sub_81CEF3C + .4byte sub_81CEFDC + .4byte sub_81CF330 + .4byte sub_81CF3A0 + .4byte sub_81CF3D0 + .4byte sub_81CEFF0 + .4byte sub_81CF3F8 + .4byte sub_81CD024 + .4byte sub_81CD070 + .4byte sub_81CDDD4 + .4byte sub_81CDE2C + .4byte sub_81CDE64 + .4byte sub_81CD1C0 + .4byte sub_81CECA0 + .4byte sub_81CEF98 + .4byte sub_81CEFDC + .4byte sub_81CF368 + .4byte sub_81CF3A0 + .4byte sub_81CF3D0 + .4byte sub_81CEFF0 + .4byte sub_81CF3F8 + .4byte sub_81CAAE8 + .4byte sub_81CAB24 + .4byte sub_81CB260 + .4byte sub_81CB29C + .4byte sub_81CB2CC + .4byte sub_81CAB38 + .4byte sub_81CB2E0 + .4byte sub_81CF9BC + .4byte sub_81CFA34 + .4byte sub_81CFDD0 + .4byte sub_81CFE40 + .4byte sub_81CFE70 + .4byte sub_81CFA48 + .4byte sub_81CFE98 + .4byte sub_81D0450 + .4byte sub_81D04A0 + .4byte sub_81D0978 + .4byte sub_81D09B0 + .4byte sub_81D09E0 + .4byte sub_81D04B8 + .4byte sub_81D09F4 + .4byte sub_81CFA04 + .4byte sub_81CFA34 + .4byte sub_81CFE08 + .4byte sub_81CFE40 + .4byte sub_81CFE70 + .4byte sub_81CFA48 + .4byte sub_81CFE98 + +gUnknown_0861F590:: @ 861F590 + .incbin "baserom.gba", 0x61F590, 0x20 + +gUnknown_0861F5B0:: @ 861F5B0 + .incbin "baserom.gba", 0x61f5b0, 0x454 gUnknown_0861FA04:: @ 861FA04 .incbin "baserom.gba", 0x61fa04, 0x4 @@ -13,31 +123,86 @@ gUnknown_0861FA08:: @ 861FA08 .incbin "baserom.gba", 0x61fa08, 0x10 gUnknown_0861FA18:: @ 861FA18 - .incbin "baserom.gba", 0x61fa18, 0x30 + .4byte gUnknown_085EBED5 + .4byte gUnknown_085EBED9 + .4byte gUnknown_085EBEE9 + .4byte gUnknown_085EBEF9 + .4byte gUnknown_085EBF0E + .4byte gUnknown_085EBF22 + .4byte gUnknown_085EBF39 + .4byte gUnknown_085EBF49 + .4byte gUnknown_085EBF57 + .4byte gUnknown_085EBF60 + .4byte gUnknown_085EBF73 + .4byte gUnknown_085EBF84 gUnknown_0861FA48:: @ 861FA48 .incbin "baserom.gba", 0x61fa48, 0x4 gUnknown_0861FA4C:: @ 861FA4C - .incbin "baserom.gba", 0x61fa4c, 0x8 + obj_tiles gUnknown_0861F5B0, 0x1000, 0 gUnknown_0861FA54:: @ 861FA54 - .incbin "baserom.gba", 0x61fa54, 0x10 + obj_pal gUnknown_0861F590, 0 + obj_pal NULL, 0 gUnknown_0861FA64:: @ 861FA64 - .incbin "baserom.gba", 0x61fa64, 0x8 + obj_tiles gUnknown_08DC87F8, 0xC00, 2 gUnknown_0861FA6C:: @ 861FA6C - .incbin "baserom.gba", 0x61fa6c, 0x30 + obj_tiles gUnknown_08DC864C, 0x20, 3 + obj_tiles gUnknown_08DC8208, 0x20, 1 + obj_tiles gUnknown_08DC8AA4, 0x20, 2 + obj_tiles gUnknown_08DC84AC, 0x20, 4 + obj_tiles gUnknown_08DC87F8, 0x20, 0 + obj_tiles gUnknown_08DC87F8, 0x40, 0 gUnknown_0861FA9C:: @ 861FA9C - .incbin "baserom.gba", 0x61fa9c, 0x68 + .4byte gUnknown_08DC8F64, 1 + .4byte gUnknown_08DC8C14, 1 + .4byte gUnknown_08DC8E64, 4 + .4byte gUnknown_08DC7FA0, 1 + .4byte gUnknown_08DC838C, 2 + .4byte gUnknown_08DC80DC, 0 + .4byte gUnknown_08DC8D50, 0 + +gUnknown_0861FAD4:: @ 861FAD4 + .2byte 0x0 + .2byte 0x8000 + .2byte 0x0 + .2byte 0x0 + +gUnknown_0861FADC:: + obj_image_anim_frame 0, 8 + obj_image_anim_frame 16, 8 + obj_image_anim_frame 32, 8 + obj_image_anim_frame 48, 8 + obj_image_anim_frame 64, 8 + obj_image_anim_frame 80, 8 + obj_image_anim_frame 96, 8 + obj_image_anim_frame 112, 8 + obj_image_anim_jump 0 + +gUnknown_0861FB00:: + .4byte gUnknown_0861FADC gUnknown_0861FB04:: @ 861FB04 - .incbin "baserom.gba", 0x61fb04, 0x28 + spr_template 0, 0, gUnknown_0861FAD4, gUnknown_0861FB00, NULL, gDummySpriteAffineAnimTable, sub_81C7CB4 + +gUnknown_0861FB1C:: + .2byte 0x4000 + .2byte 0xC000 + .2byte 0x400 + .2byte 0x0 + +gUnknown_0861FB24:: + .2byte 0x4000 + .2byte 0x8000 + .2byte 0x400 + .2byte 0x0 gUnknown_0861FB2C:: @ 861FB2C - .incbin "baserom.gba", 0x61fb2c, 0x18 + spr_template 2, 1, gUnknown_0861FB1C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_0861FB44:: @ 861FB44 .incbin "baserom.gba", 0x61fb44, 0xa0 @@ -118,7 +283,20 @@ gUnknown_086202CC:: @ 86202CC .incbin "baserom.gba", 0x6202cc, 0x8 gUnknown_086202D4:: @ 86202D4 - .incbin "baserom.gba", 0x6202d4, 0x38 + .4byte gUnknown_085EBCC5 + .4byte gUnknown_085EBCE8 + .4byte gUnknown_085EBD01 + .4byte gUnknown_085EBD1C + .4byte gUnknown_085EBD34 + .4byte gUnknown_085EBD83 + .4byte gUnknown_085EBDA2 + .4byte gUnknown_085EBDBF + .4byte gUnknown_085EBDDB + .4byte gUnknown_085EBDEE + .4byte gUnknown_085EBE06 + .4byte gUnknown_085EBE19 + .4byte gUnknown_085EBE2D + .4byte gUnknown_085EBE41 gUnknown_0862030C:: @ 862030C .incbin "baserom.gba", 0x62030c, 0x3 @@ -133,10 +311,1026 @@ gUnknown_0862036C:: @ 862036C .incbin "baserom.gba", 0x62036c, 0x18 gUnknown_08620384:: @ 8620384 - .incbin "baserom.gba", 0x620384, 0x1ca4 + .incbin "baserom.gba", 0x620384, 0xC + +gUnknown_08620390:: @ 8620390 + .string "Becalm fighting emotions.$" + +gUnknown_086203AA:: @ 86203AA + .string "Fragrant GRASS POKéMON.$" + +gUnknown_086203C2:: @ 86203C2 + .string "Soothing aromas make the$" + +gUnknown_086203DB:: @ 86203DB + .string "body and mind healthy.$" + +gUnknown_086203F2:: @ 86203F2 + .string "I’m not very good at this.$" + +gUnknown_0862040D:: @ 862040D + .string "Ruin-exploration partners.$" + +gUnknown_08620428:: @ 8620428 + .string "I am searching for undersea$" + +gUnknown_08620444:: @ 8620444 + .string "ruins and relics.$" + +gUnknown_08620456:: @ 8620456 + .string "Overwhelm with power!$" + +gUnknown_0862046C:: @ 862046C + .string "Craggy ROCK POKéMON.$" + +gUnknown_08620481:: @ 8620481 + .string "In search of ancient lore,$" + +gUnknown_0862049C:: @ 862049C + .string "I travel the world.$" + +gUnknown_086204B0:: @ 86204B0 + .string "I’m going to try hard!$" + +gUnknown_086204C7:: @ 86204C7 + .string "Good swimmer POKéMON.$" + +gUnknown_086204DD:: @ 86204DD + .string "I wish I could swim without$" + +gUnknown_086204F9:: @ 86204F9 + .string "using an inner tube.$" + +gUnknown_0862050E:: @ 862050E + .string "I don’t know. I’ll try hard.$" + +gUnknown_0862052B:: @ 862052B + .string "WATER POKéMON are buddies.$" + +gUnknown_08620546:: @ 8620546 + .string "It’s not like I can’t swim.$" + +gUnknown_08620562:: @ 8620562 + .string "I just like my inner tube.$" + +gUnknown_0862057D:: @ 862057D + .string "We split our duties.$" + +gUnknown_08620592:: @ 8620592 + .string "We like friendly POKéMON.$" + +gUnknown_086205AC:: @ 86205AC + .string "We enjoy POKéMON together$" + +gUnknown_086205C6:: @ 86205C6 + .string "as sister and brother.$" + +gUnknown_086205DD:: @ 86205DD + .string "I finish with power moves!$" + +gUnknown_086205F8:: @ 86205F8 + .string "A mix of different types.$" + +gUnknown_08620612:: @ 8620612 + .string "I aim to become the ultimate$" + +gUnknown_0862062F:: @ 862062F + .string "TRAINER!$" + +gUnknown_08620638:: @ 8620638 + .string "Exploit the foe’s weakness.$" + +gUnknown_08620654:: @ 8620654 + .string "Balance is crucial.$" + +gUnknown_08620668:: @ 8620668 + .string "My goal is to become the$" + +gUnknown_08620681:: @ 8620681 + .string "POKéMON CHAMPION.$" + +gUnknown_08620693:: @ 8620693 + .string "Upset the opponent.$" + +gUnknown_086206A7:: @ 86206A7 + .string "Type doesn’t matter.$" + +gUnknown_086206BC:: @ 86206BC + .string "I’m a top student at the$" + +gUnknown_086206D5:: @ 86206D5 + .string "TRAINER’S SCHOOL.$" + +gUnknown_086206E7:: @ 86206E7 + .string "Slow, steady suffering.$" + +gUnknown_086206FF:: @ 86206FF + .string "Scary to meet at night.$" + +gUnknown_08620717:: @ 8620717 + .string "I see things that others$" + +gUnknown_08620730:: @ 8620730 + .string "can’t see...$" + +gUnknown_0862073D:: @ 862073D + .string "Anything to win.$" + +gUnknown_0862074E:: @ 862074E + .string "Gorgeous type!$" + +gUnknown_0862075D:: @ 862075D + .string "I have a pool specially for$" + +gUnknown_08620779:: @ 8620779 + .string "my POKéMON at home.$" + +gUnknown_0862078D:: @ 862078D + .string "You’ll fall under my spell!$" + +gUnknown_086207A9:: @ 86207A9 + .string "Mature WATER type.$" + +gUnknown_086207BC:: @ 86207BC + .string "I dream of cruising around$" + +gUnknown_086207D7:: @ 86207D7 + .string "the world on a luxury liner.$" + +gUnknown_086207F4:: @ 86207F4 + .string "I’ll lead you astray.$" + +gUnknown_0862080A:: @ 862080A + .string "Cute, of course.$" + +gUnknown_0862081B:: @ 862081B + .string "I love the SAFARI ZONE.$" + +gUnknown_08620833:: @ 8620833 + .string "I seem to end up there.$" + +gUnknown_0862084B:: @ 862084B + .string "Strategy? Who needs it?$" + +gUnknown_08620863:: @ 8620863 + .string "I spent big money on it!$" + +gUnknown_0862087C:: @ 862087C + .string "I, being rich, sleep in a$" + +gUnknown_08620896:: @ 8620896 + .string "custom POKéMON bed.$" + +gUnknown_086208AA:: @ 86208AA + .string "Wrestle down with power.$" + +gUnknown_086208C3:: @ 86208C3 + .string "Took all night to catch.$" + +gUnknown_086208DC:: @ 86208DC + .string "Big, burly, and buff$" + +gUnknown_086208F1:: @ 86208F1 + .string "POKéMON are the best...$" + +gUnknown_08620909:: @ 8620909 + .string "Ram at full speed!$" + +gUnknown_0862091C:: @ 862091C + .string "Funky WATER type!$" + +gUnknown_0862092E:: @ 862092E + .string "If I can’t be out swimming,$" + +gUnknown_0862094A:: @ 862094A + .string "I’ll be pumping weights.$" + +gUnknown_08620963:: @ 8620963 + .string "Grand slam pummeling!$" + +gUnknown_08620979:: @ 8620979 + .string "FIGHTING type.$" + +gUnknown_08620988:: @ 8620988 + .string "Not to brag, but I can bust$" + +gUnknown_086209A4:: @ 86209A4 + .string "ten roof tiles!$" + +gUnknown_086209B4:: @ 86209B4 + .string "Witness karate power!$" + +gUnknown_086209CA:: @ 86209CA + .string "My partners in training!$" + +gUnknown_086209E3:: @ 86209E3 + .string "Let us discuss matters of$" + +gUnknown_086209FD:: @ 86209FD + .string "the world with bare fists!$" + +gUnknown_08620A18:: @ 8620A18 + .string "Rock to stunning sounds!$" + +gUnknown_08620A31:: @ 8620A31 + .string "Electric-and-sound combo!$" + +gUnknown_08620A4B:: @ 8620A4B + .string "My compositions will shock$" + +gUnknown_08620A66:: @ 8620A66 + .string "you and stun you!$" + +gUnknown_08620A78:: @ 8620A78 + .string "I’ll electrify you!$" + +gUnknown_08620A8C:: @ 8620A8C + .string "They’re ELECTRIC!$" + +gUnknown_08620A9E:: @ 8620A9E + .string "I want to make people cry$" + +gUnknown_08620AB8:: @ 8620AB8 + .string "with songs from my heart.$" + +gUnknown_08620AD2:: @ 8620AD2 + .string "Burn it all down!$" + +gUnknown_08620AE4:: @ 8620AE4 + .string "Burn-inducing POKéMON.$" + +gUnknown_08620AFB:: @ 8620AFB + .string "When you light a campfire,$" + +gUnknown_08620B16:: @ 8620B16 + .string "be sure there’s some water.$" + +gUnknown_08620B32:: @ 8620B32 + .string "Hang in and be tenacious!$" + +gUnknown_08620B4C:: @ 8620B4C + .string "I’ll raise any POKéMON.$" + +gUnknown_08620B64:: @ 8620B64 + .string "POKéMON raised in the wild$" + +gUnknown_08620B7F:: @ 8620B7F + .string "grow strong!$" + +gUnknown_08620B8C:: @ 8620B8C + .string "Our love lets us prevail.$" + +gUnknown_08620BA6:: @ 8620BA6 + .string "We’ve had them for years.$" + +gUnknown_08620BC0:: @ 8620BC0 + .string "Married 50 years, we’ve$" + +gUnknown_08620BD8:: @ 8620BD8 + .string "devotedly raised POKéMON.$" + +gUnknown_08620BF2:: @ 8620BF2 + .string "Attack in waves!$" + +gUnknown_08620C03:: @ 8620C03 + .string "BUG POKéMON are cool.$" + +gUnknown_08620C19:: @ 8620C19 + .string "I go into the forest every$" + +gUnknown_08620C34:: @ 8620C34 + .string "day to catch BUG POKéMON.$" + +gUnknown_08620C4E:: @ 8620C4E + .string "Daze and confuse!$" + +gUnknown_08620C60:: @ 8620C60 + .string "Ones with weird powers.$" + +gUnknown_08620C78:: @ 8620C78 + .string "I can see through exactly$" + +gUnknown_08620C92:: @ 8620C92 + .string "what you’re thinking!$" + +gUnknown_08620CA8:: @ 8620CA8 + .string "Battle at full power.$" + +gUnknown_08620CBE:: @ 8620CBE + .string "POKéMON of many mysteries.$" + +gUnknown_08620CD9:: @ 8620CD9 + .string "When we spoke, I was really$" + +gUnknown_08620CF5:: @ 8620CF5 + .string "using telepathy.$" + +gUnknown_08620D06:: @ 8620D06 + .string "Calm and collected.$" + +gUnknown_08620D1A:: @ 8620D1A + .string "POKéMON of distinction.$" + +gUnknown_08620D32:: @ 8620D32 + .string "We enjoy a spot of tea$" + +gUnknown_08620D49:: @ 8620D49 + .string "every day. It’s imported.$" + +gUnknown_08620D63:: @ 8620D63 + .string "I use my head to battle.$" + +gUnknown_08620D7C:: @ 8620D7C + .string "I love any kind of POKéMON!$" + +gUnknown_08620D98:: @ 8620D98 + .string "My daddy gives me spending$" + +gUnknown_08620DB3:: @ 8620DB3 + .string "money if I ace a test.$" + +gUnknown_08620DCA:: @ 8620DCA + .string "My knowledge rules!$" + +gUnknown_08620DDE:: @ 8620DDE + .string "Any smart POKéMON!$" + +gUnknown_08620DF1:: @ 8620DF1 + .string "I want to be a POKéMON$" + +gUnknown_08620E08:: @ 8620E08 + .string "researcher in the future.$" + +gUnknown_08620E22:: @ 8620E22 + .string "We talk it over first.$" + +gUnknown_08620E39:: @ 8620E39 + .string "POKéMON that we both like.$" + +gUnknown_08620E54:: @ 8620E54 + .string "We’re senior and junior$" + +gUnknown_08620E6C:: @ 8620E6C + .string "students into POKéMON!$" + +gUnknown_08620E83:: @ 8620E83 + .string "Go for it, my dears!$" + +gUnknown_08620E98:: @ 8620E98 + .string "I have no likes or dislikes.$" + +gUnknown_08620EB5:: @ 8620EB5 + .string "While out shopping for$" + +gUnknown_08620ECC:: @ 8620ECC + .string "supper, I battle too.$" + +gUnknown_08620EE2:: @ 8620EE2 + .string "I battle with love!$" + +gUnknown_08620EF6:: @ 8620EF6 + .string "A POKéMON raised with love!$" + +gUnknown_08620F12:: @ 8620F12 + .string "It’s important to build$" + +gUnknown_08620F2A:: @ 8620F2A + .string "trust with your POKéMON.$" + +gUnknown_08620F43:: @ 8620F43 + .string "I see through your moves!$" + +gUnknown_08620F5D:: @ 8620F5D + .string "The essence of FIGHTING.$" + +gUnknown_08620F76:: @ 8620F76 + .string "I’m not ready to give way$" + +gUnknown_08620F90:: @ 8620F90 + .string "to the young yet!$" + +gUnknown_08620FA2:: @ 8620FA2 + .string "Attack while defending.$" + +gUnknown_08620FBA:: @ 8620FBA + .string "The FIGHTING type.$" + +gUnknown_08620FCD:: @ 8620FCD + .string "Being old, I have my own$" + +gUnknown_08620FE6:: @ 8620FE6 + .string "style of battling.$" + +gUnknown_08620FF9:: @ 8620FF9 + .string "I do what I can.$" + +gUnknown_0862100A:: @ 862100A + .string "I use different types.$" + +gUnknown_08621021:: @ 8621021 + .string "I’m going to keep working$" + +gUnknown_0862103B:: @ 862103B + .string "until I beat a GYM LEADER.$" + +gUnknown_08621056:: @ 8621056 + .string "I battle patiently.$" + +gUnknown_0862106A:: @ 862106A + .string "WATER POKéMON to battle!$" + +gUnknown_08621083:: @ 8621083 + .string "I’m the world’s only guy to$" + +gUnknown_0862109F:: @ 862109F + .string "catch a huge POKéMON!$" + +gUnknown_086210B5:: @ 86210B5 + .string "Exploit the environment!$" + +gUnknown_086210CE:: @ 86210CE + .string "All hail the WATER type!$" + +gUnknown_086210E7:: @ 86210E7 + .string "I won’t be beaten by some$" + +gUnknown_08621101:: @ 8621101 + .string "beach bum SWIMMER!$" + +gUnknown_08621114:: @ 8621114 + .string "Speed above all!$" + +gUnknown_08621125:: @ 8621125 + .string "I use a speedy POKéMON.$" + +gUnknown_0862113D:: @ 862113D + .string "A marathon is a challenge$" + +gUnknown_08621157:: @ 8621157 + .string "against your own self.$" + +gUnknown_0862116E:: @ 862116E + .string "Defense is crucial.$" + +gUnknown_08621182:: @ 8621182 + .string "My POKéMON is solid.$" + +gUnknown_08621197:: @ 8621197 + .string "I started this for dieting,$" + +gUnknown_086211B3:: @ 86211B3 + .string "but I got right into it.$" + +gUnknown_086211CC:: @ 86211CC + .string "Strike before stricken!$" + +gUnknown_086211E4:: @ 86211E4 + .string "A fast-running POKéMON!$" + +gUnknown_086211FC:: @ 86211FC + .string "If you ran and ran, you’d$" + +gUnknown_08621216:: @ 8621216 + .string "become one with the wind.$" + +gUnknown_08621230:: @ 8621230 + .string "All-out offensive!$" + +gUnknown_08621243:: @ 8621243 + .string "WATER POKéMON rule!$" + +gUnknown_08621257:: @ 8621257 + .string "I must swim over 6 miles$" + +gUnknown_08621270:: @ 8621270 + .string "every day.$" + +gUnknown_0862127B:: @ 862127B + .string "Push and push again!$" + +gUnknown_08621290:: @ 8621290 + .string "The strength of STEEL.$" + +gUnknown_086212A7:: @ 86212A7 + .string "If you’re sweating, get$" + +gUnknown_086212BF:: @ 86212BF + .string "fluids into you regularly.$" + +gUnknown_086212DA:: @ 86212DA + .string "Draw the power of WATER.$" + +gUnknown_086212F3:: @ 86212F3 + .string "Toughened WATER POKéMON.$" + +gUnknown_0862130C:: @ 862130C + .string "Training POKéMON is good,$" + +gUnknown_08621326:: @ 8621326 + .string "but don’t neglect yourself.$" + +gUnknown_08621342:: @ 8621342 + .string "It’s about POKéMON power!$" + +gUnknown_0862135C:: @ 862135C + .string "See the power of DRAGONS!$" + +gUnknown_08621376:: @ 8621376 + .string "I’ll become legendary as the$" + +gUnknown_08621393:: @ 8621393 + .string "strongest one day!$" + +gUnknown_086213A6:: @ 86213A6 + .string "I’ll show you my technique!$" + +gUnknown_086213C2:: @ 86213C2 + .string "Elegantly wheeling BIRDS.$" + +gUnknown_086213DC:: @ 86213DC + .string "My BIRD POKéMON, deliver my$" + +gUnknown_086213F8:: @ 86213F8 + .string "love to that girl!$" + +gUnknown_0862140B:: @ 862140B + .string "You’ll suffer from poison!$" + +gUnknown_08621426:: @ 8621426 + .string "Poisonous POKéMON.$" +gUnknown_08621439:: @ 8621439 + .string "I undertake training so$" + +gUnknown_08621451:: @ 8621451 + .string "that I may become a ninja.$" + +gUnknown_0862146C:: @ 862146C + .string "The first strike wins!$" + +gUnknown_08621483:: @ 8621483 + .string "Speedy FIGHTING type.$" + +gUnknown_08621499:: @ 8621499 + .string "If my POKéMON lose,$" + +gUnknown_086214AD:: @ 86214AD + .string "I’ll carry on the fight!$" + +gUnknown_086214C6:: @ 86214C6 + .string "Go, go, my POKéMON!$" + +gUnknown_086214DA:: @ 86214DA + .string "I’ll raise anything.$" + +gUnknown_086214EF:: @ 86214EF + .string "UV rays are your skin’s$" + +gUnknown_08621507:: @ 8621507 + .string "enemy. Get protected.$" + +gUnknown_0862151D:: @ 862151D + .string "No mercy!$" + +gUnknown_08621527:: @ 8621527 + .string "Cute WATER POKéMON.$" + +gUnknown_0862153B:: @ 862153B + .string "I have too many fans.$" + +gUnknown_08621551:: @ 8621551 + .string "I was interviewed on TV.$" + +gUnknown_0862156A:: @ 862156A + .string "I think about this & that.$" + +gUnknown_08621585:: @ 8621585 + .string "I like all POKéMON.$" + +gUnknown_08621599:: @ 8621599 + .string "What lies beyond that$" + +gUnknown_086215AF:: @ 86215AF + .string "yonder hill?$" + +gUnknown_086215BC:: @ 86215BC + .string "We battle together!$" + +gUnknown_086215D0:: @ 86215D0 + .string "We train together!$" + +gUnknown_086215E3:: @ 86215E3 + .string "We like the same POKéMON,$" + +gUnknown_086215FD:: @ 86215FD + .string "but different desserts.$" + +gUnknown_08621615:: @ 8621615 + .string "I force things with power!$" + +gUnknown_08621630:: @ 8621630 + .string "WATER and FIGHTING types.$" + +gUnknown_0862164A:: @ 862164A + .string "Seamen are rough spirits!$" + +gUnknown_08621664:: @ 8621664 + .string "Any complaints?$" + +gUnknown_08621674:: @ 8621674 + .string "Up for a fight anytime!$" + +gUnknown_0862168C:: @ 862168C + .string "WATER POKéMON are my faves!$" + +gUnknown_086216A8:: @ 86216A8 + .string "If you want to shout loud,$" + +gUnknown_086216C3:: @ 86216C3 + .string "suck in air with your belly!$" + +gUnknown_086216E0:: @ 86216E0 + .string "Protect POKéMON from harm.$" + +gUnknown_086216FB:: @ 86216FB + .string "I love rare POKéMON.$" + +gUnknown_08621710:: @ 8621710 + .string "I want to collect all the$" + +gUnknown_0862172A:: @ 862172A + .string "world’s rare POKéMON.$" + +gUnknown_08621740:: @ 8621740 + .string "I count on power.$" + +gUnknown_08621752:: @ 8621752 + .string "POKéMON are my children.$" + +gUnknown_0862176B:: @ 862176B + .string "It takes knowledge and$" + +gUnknown_08621782:: @ 8621782 + .string "love to raise POKéMON.$" + +gUnknown_08621799:: @ 8621799 + .string "Full-on attack!$" + +gUnknown_086217A9:: @ 86217A9 + .string "Anything. I’ll raise it.$" + +gUnknown_086217C2:: @ 86217C2 + .string "I give them {POKEBLOCK}S for$" + +gUnknown_086217D9:: @ 86217D9 + .string "going after CONTEST titles.$" + +gUnknown_086217F5:: @ 86217F5 + .string "I raise POKéMON with care.$" + +gUnknown_08621810:: @ 8621810 + .string "Fun-to-raise POKéMON.$" + +gUnknown_08621826:: @ 8621826 + .string "Treat every POKéMON you$" + +gUnknown_0862183E:: @ 862183E + .string "meet with respect.$" + +gUnknown_08621851:: @ 8621851 + .string "I believe in my POKéMON.$" + +gUnknown_0862186A:: @ 862186A + .string "I like strong POKéMON.$" + +gUnknown_08621881:: @ 8621881 + .string "I’m training for rescue$" + +gUnknown_08621899:: @ 8621899 + .string "work with my POKéMON.$" + +gUnknown_086218AF:: @ 86218AF + .string "Attack in waves!$" + +gUnknown_086218C0:: @ 86218C0 + .string "I use different types.$" + +gUnknown_086218D7:: @ 86218D7 + .string "Those who destroy nature$" + +gUnknown_086218F0:: @ 86218F0 + .string "must never be forgiven!$" + +gUnknown_08621908:: @ 8621908 + .string "I’ll show you some guts!$" + +gUnknown_08621921:: @ 8621921 + .string "Cute POKéMON are my faves!$" + +gUnknown_0862193C:: @ 862193C + .string "After a battle, I always$" + +gUnknown_08621955:: @ 8621955 + .string "bathe with my POKéMON.$" + +gUnknown_0862196C:: @ 862196C + .string "Lightning-fast attack!$" + +gUnknown_08621983:: @ 8621983 + .string "BUG POKéMON are number 1!$" + +gUnknown_0862199D:: @ 862199D + .string "If you want to catch BUG$" + +gUnknown_086219B6:: @ 86219B6 + .string "POKéMON, wake up early.$" + +gUnknown_086219CE:: @ 86219CE + .string "I battle with power.$" + +gUnknown_086219E3:: @ 86219E3 + .string "Hard-bodied POKéMON.$" + +gUnknown_086219F8:: @ 86219F8 + .string "I’ve been planning a month$" + +gUnknown_08621A13:: @ 8621A13 + .string "for today’s hike.$" + +gUnknown_08621A25:: @ 8621A25 + .string "I like it hot!$" + +gUnknown_08621A34:: @ 8621A34 + .string "Hot POKéMON!$" + +gUnknown_08621A41:: @ 8621A41 + .string "As much as I love POKéMON,$" + +gUnknown_08621A5C:: @ 8621A5C + .string "I surely like hiking!$" + +gUnknown_08621A72:: @ 8621A72 + .string "Lovey-dovey strategy!$" + +gUnknown_08621A88:: @ 8621A88 + .string "Lovey-dovey POKéMON!$" + +gUnknown_08621A9D:: @ 8621A9D + .string "We’re lovey-dovey!$" + +gUnknown_08621AB0:: @ 8621AB0 + .string "Forever lovey-dovey!$" + +gUnknown_08621AC5:: @ 8621AC5 + .string "We let it all hang out.$" + +gUnknown_08621ADD:: @ 8621ADD + .string "The 1st POKéMON I caught.$" + +gUnknown_08621AF7:: @ 8621AF7 + .string "POKéMON and I have grown$" + +gUnknown_08621B10:: @ 8621B10 + .string "stronger together.$" + +gUnknown_08621B23:: @ 8621B23 + .string "ROCK-type power attack.$" + +gUnknown_08621B3B:: @ 8621B3B + .string "I prefer rock-hard POKéMON.$" + +gUnknown_08621B57:: @ 8621B57 + .string "A LEADER of a big GYM bears$" + +gUnknown_08621B73:: @ 8621B73 + .string "a lot of responsibility.$" + +gUnknown_08621B8C:: @ 8621B8C + .string "Direct physical action!$" + +gUnknown_08621BA4:: @ 8621BA4 + .string "FIGHTING POKéMON rule!$" + +gUnknown_08621BBB:: @ 8621BBB + .string "The world awaits me as the$" + +gUnknown_08621BD6:: @ 8621BD6 + .string "next big wave!$" + +gUnknown_08621BE5:: @ 8621BE5 + .string "I choose to electrify.$" + +gUnknown_08621BFC:: @ 8621BFC + .string "Get shocked by electricity!$" + +gUnknown_08621C18:: @ 8621C18 + .string "One must never throw a$" + +gUnknown_08621C2F:: @ 8621C2F + .string "match. Even I must not.$" + +gUnknown_08621C47:: @ 8621C47 + .string "Battle aggressively.$" + +gUnknown_08621C5C:: @ 8621C5C + .string "Burn with passion!$" + +gUnknown_08621C6F:: @ 8621C6F + .string "Completely wash away daily$" + +gUnknown_08621C8A:: @ 8621C8A + .string "fatigue in hot springs!$" + +gUnknown_08621CA2:: @ 8621CA2 + .string "I flexibly adapt my style.$" + +gUnknown_08621CBD:: @ 8621CBD + .string "Grown in a balanced manner.$" + +gUnknown_08621CD9:: @ 8621CD9 + .string "I walk the 30 minutes from$" + +gUnknown_08621CF4:: @ 8621CF4 + .string "home to here every day.$" + +gUnknown_08621D0C:: @ 8621D0C + .string "I take advantage of speed.$" + +gUnknown_08621D27:: @ 8621D27 + .string "Graceful sky dancers.$" + +gUnknown_08621D3D:: @ 8621D3D + .string "The ultimate would be to$" + +gUnknown_08621D56:: @ 8621D56 + .string "live as one with nature.$" + +gUnknown_08621D6F:: @ 8621D6F + .string "We battle in cooperation.$" + +gUnknown_08621D89:: @ 8621D89 + .string "Always friendly POKéMON.$" + +gUnknown_08621DA2:: @ 8621DA2 + .string "Papa has trouble telling$" + +gUnknown_08621DBB:: @ 8621DBB + .string "the two of us apart!$" + +gUnknown_08621DD0:: @ 8621DD0 + .string "I use splendid waterpower.$" + +gUnknown_08621DEB:: @ 8621DEB + .string "POKéMON of elegance!$" + +gUnknown_08621E00:: @ 8621E00 + .string "The adulation of beautiful$" + +gUnknown_08621E1B:: @ 8621E1B + .string "ladies fills me with energy!$" + +gUnknown_08621E38:: @ 8621E38 + .string "Offense over defense!$" + +gUnknown_08621E4E:: @ 8621E4E + .string "The DARK side’s beauties.$" + +gUnknown_08621E68:: @ 8621E68 + .string "They said I was a punk, but$" + +gUnknown_08621E84:: @ 8621E84 + .string "I’m one of the ELITE FOUR!$" + +gUnknown_08621E9F:: @ 8621E9F + .string "Confuse and confound.$" + +gUnknown_08621EB5:: @ 8621EB5 + .string "There’s nothing definite.$" + +gUnknown_08621ECF:: @ 8621ECF + .string "I wonder how my grandma at$" + +gUnknown_08621EEA:: @ 8621EEA + .string "MT. PYRE is doing?$" + +gUnknown_08621EFD:: @ 8621EFD + .string "I use items for help.$" + +gUnknown_08621F13:: @ 8621F13 + .string "Flaming passion in icy cold!$" + +gUnknown_08621F30:: @ 8621F30 + .string "The ICE type can be better$" + +gUnknown_08621F4B:: @ 8621F4B + .string "trained in this hot land.$" + +gUnknown_08621F65:: @ 8621F65 + .string "Harness strong abilities.$" + +gUnknown_08621F7F:: @ 8621F7F + .string "The raw power of DRAGONS!$" + +gUnknown_08621F99:: @ 8621F99 + .string "I dedicate myself to the$" + +gUnknown_08621FB2:: @ 8621FB2 + .string "POKéMON that saved me.$" + +gUnknown_08621FC9:: @ 8621FC9 + .string "Dignity and respect.$" + +gUnknown_08621FDE:: @ 8621FDE + .string "I prefer POKéMON of grace.$" + +gUnknown_08621FF9:: @ 8621FF9 + .string "I represent beauty as$" + +gUnknown_0862200F:: @ 862200F + .string "well as intelligence.$" + +.align 2 + +@ strategy, mon text, introduction1, introduction2 gUnknown_08622028:: @ 8622028 - .incbin "baserom.gba", 0x622028, 0x4e0 + .4byte gUnknown_08620390, gUnknown_086203AA, gUnknown_086203C2, gUnknown_086203DB + .4byte gUnknown_086203F2, gUnknown_0862040D, gUnknown_08620428, gUnknown_08620444 + .4byte gUnknown_08620456, gUnknown_0862046C, gUnknown_08620481, gUnknown_0862049C + .4byte gUnknown_086204B0, gUnknown_086204C7, gUnknown_086204DD, gUnknown_086204F9 + .4byte gUnknown_0862050E, gUnknown_0862052B, gUnknown_08620546, gUnknown_08620562 + .4byte gUnknown_0862057D, gUnknown_08620592, gUnknown_086205AC, gUnknown_086205C6 + .4byte gUnknown_086205DD, gUnknown_086205F8, gUnknown_08620612, gUnknown_0862062F + .4byte gUnknown_08620638, gUnknown_08620654, gUnknown_08620668, gUnknown_08620681 + .4byte gUnknown_08620693, gUnknown_086206A7, gUnknown_086206BC, gUnknown_086206D5 + .4byte gUnknown_086206E7, gUnknown_086206FF, gUnknown_08620717, gUnknown_08620730 + .4byte gUnknown_0862073D, gUnknown_0862074E, gUnknown_0862075D, gUnknown_08620779 + .4byte gUnknown_0862078D, gUnknown_086207A9, gUnknown_086207BC, gUnknown_086207D7 + .4byte gUnknown_086207F4, gUnknown_0862080A, gUnknown_0862081B, gUnknown_08620833 + .4byte gUnknown_0862084B, gUnknown_08620863, gUnknown_0862087C, gUnknown_08620896 + .4byte gUnknown_086208AA, gUnknown_086208C3, gUnknown_086208DC, gUnknown_086208F1 + .4byte gUnknown_08620909, gUnknown_0862091C, gUnknown_0862092E, gUnknown_0862094A + .4byte gUnknown_08620963, gUnknown_08620979, gUnknown_08620988, gUnknown_086209A4 + .4byte gUnknown_086209B4, gUnknown_086209CA, gUnknown_086209E3, gUnknown_086209FD + .4byte gUnknown_08620A18, gUnknown_08620A31, gUnknown_08620A4B, gUnknown_08620A66 + .4byte gUnknown_08620A78, gUnknown_08620A8C, gUnknown_08620A9E, gUnknown_08620AB8 + .4byte gUnknown_08620AD2, gUnknown_08620AE4, gUnknown_08620AFB, gUnknown_08620B16 + .4byte gUnknown_08620B32, gUnknown_08620B4C, gUnknown_08620B64, gUnknown_08620B7F + .4byte gUnknown_08620B8C, gUnknown_08620BA6, gUnknown_08620BC0, gUnknown_08620BD8 + .4byte gUnknown_08620BF2, gUnknown_08620C03, gUnknown_08620C19, gUnknown_08620C34 + .4byte gUnknown_08620C4E, gUnknown_08620C60, gUnknown_08620C78, gUnknown_08620C92 + .4byte gUnknown_08620CA8, gUnknown_08620CBE, gUnknown_08620CD9, gUnknown_08620CF5 + .4byte gUnknown_08620D06, gUnknown_08620D1A, gUnknown_08620D32, gUnknown_08620D49 + .4byte gUnknown_08620D63, gUnknown_08620D7C, gUnknown_08620D98, gUnknown_08620DB3 + .4byte gUnknown_08620DCA, gUnknown_08620DDE, gUnknown_08620DF1, gUnknown_08620E08 + .4byte gUnknown_08620E22, gUnknown_08620E39, gUnknown_08620E54, gUnknown_08620E6C + .4byte gUnknown_08620E83, gUnknown_08620E98, gUnknown_08620EB5, gUnknown_08620ECC + .4byte gUnknown_08620EE2, gUnknown_08620EF6, gUnknown_08620F12, gUnknown_08620F2A + .4byte gUnknown_08620F43, gUnknown_08620F5D, gUnknown_08620F76, gUnknown_08620F90 + .4byte gUnknown_08620FA2, gUnknown_08620FBA, gUnknown_08620FCD, gUnknown_08620FE6 + .4byte gUnknown_08620FF9, gUnknown_0862100A, gUnknown_08621021, gUnknown_0862103B + .4byte gUnknown_08621056, gUnknown_0862106A, gUnknown_08621083, gUnknown_0862109F + .4byte gUnknown_086210B5, gUnknown_086210CE, gUnknown_086210E7, gUnknown_08621101 + .4byte gUnknown_08621114, gUnknown_08621125, gUnknown_0862113D, gUnknown_08621157 + .4byte gUnknown_0862116E, gUnknown_08621182, gUnknown_08621197, gUnknown_086211B3 + .4byte gUnknown_086211CC, gUnknown_086211E4, gUnknown_086211FC, gUnknown_08621216 + .4byte gUnknown_08621230, gUnknown_08621243, gUnknown_08621257, gUnknown_08621270 + .4byte gUnknown_0862127B, gUnknown_08621290, gUnknown_086212A7, gUnknown_086212BF + .4byte gUnknown_086212DA, gUnknown_086212F3, gUnknown_0862130C, gUnknown_08621326 + .4byte gUnknown_08621342, gUnknown_0862135C, gUnknown_08621376, gUnknown_08621393 + .4byte gUnknown_086213A6, gUnknown_086213C2, gUnknown_086213DC, gUnknown_086213F8 + .4byte gUnknown_0862140B, gUnknown_08621426, gUnknown_08621439, gUnknown_08621451 + .4byte gUnknown_0862146C, gUnknown_08621483, gUnknown_08621499, gUnknown_086214AD + .4byte gUnknown_086214C6, gUnknown_086214DA, gUnknown_086214EF, gUnknown_08621507 + .4byte gUnknown_0862151D, gUnknown_08621527, gUnknown_0862153B, gUnknown_08621551 + .4byte gUnknown_0862156A, gUnknown_08621585, gUnknown_08621599, gUnknown_086215AF + .4byte gUnknown_086215BC, gUnknown_086215D0, gUnknown_086215E3, gUnknown_086215FD + .4byte gUnknown_08621615, gUnknown_08621630, gUnknown_0862164A, gUnknown_08621664 + .4byte gUnknown_08621674, gUnknown_0862168C, gUnknown_086216A8, gUnknown_086216C3 + .4byte gUnknown_086216E0, gUnknown_086216FB, gUnknown_08621710, gUnknown_0862172A + .4byte gUnknown_08621740, gUnknown_08621752, gUnknown_0862176B, gUnknown_08621782 + .4byte gUnknown_08621799, gUnknown_086217A9, gUnknown_086217C2, gUnknown_086217D9 + .4byte gUnknown_086217F5, gUnknown_08621810, gUnknown_08621826, gUnknown_0862183E + .4byte gUnknown_08621851, gUnknown_0862186A, gUnknown_08621881, gUnknown_08621899 + .4byte gUnknown_086218AF, gUnknown_086218C0, gUnknown_086218D7, gUnknown_086218F0 + .4byte gUnknown_08621908, gUnknown_08621921, gUnknown_0862193C, gUnknown_08621955 + .4byte gUnknown_0862196C, gUnknown_08621983, gUnknown_0862199D, gUnknown_086219B6 + .4byte gUnknown_086219CE, gUnknown_086219E3, gUnknown_086219F8, gUnknown_08621A13 + .4byte gUnknown_08621A25, gUnknown_08621A34, gUnknown_08621A41, gUnknown_08621A5C + .4byte gUnknown_08621A72, gUnknown_08621A88, gUnknown_08621A9D, gUnknown_08621AB0 + .4byte gUnknown_08621AC5, gUnknown_08621ADD, gUnknown_08621AF7, gUnknown_08621B10 + .4byte gUnknown_08621B23, gUnknown_08621B3B, gUnknown_08621B57, gUnknown_08621B73 + .4byte gUnknown_08621B8C, gUnknown_08621BA4, gUnknown_08621BBB, gUnknown_08621BD6 + .4byte gUnknown_08621BE5, gUnknown_08621BFC, gUnknown_08621C18, gUnknown_08621C2F + .4byte gUnknown_08621C47, gUnknown_08621C5C, gUnknown_08621C6F, gUnknown_08621C8A + .4byte gUnknown_08621CA2, gUnknown_08621CBD, gUnknown_08621CD9, gUnknown_08621CF4 + .4byte gUnknown_08621D0C, gUnknown_08621D27, gUnknown_08621D3D, gUnknown_08621D56 + .4byte gUnknown_08621D6F, gUnknown_08621D89, gUnknown_08621DA2, gUnknown_08621DBB + .4byte gUnknown_08621DD0, gUnknown_08621DEB, gUnknown_08621E00, gUnknown_08621E1B + .4byte gUnknown_08621E38, gUnknown_08621E4E, gUnknown_08621E68, gUnknown_08621E84 + .4byte gUnknown_08621E9F, gUnknown_08621EB5, gUnknown_08621ECF, gUnknown_08621EEA + .4byte gUnknown_08621EFD, gUnknown_08621F13, gUnknown_08621F30, gUnknown_08621F4B + .4byte gUnknown_08621F65, gUnknown_08621F7F, gUnknown_08621F99, gUnknown_08621FB2 + .4byte gUnknown_08621FC9, gUnknown_08621FDE, gUnknown_08621FF9, gUnknown_0862200F gUnknown_08622508:: @ 8622508 .incbin "baserom.gba", 0x622508, 0x2 @@ -151,7 +1345,10 @@ gUnknown_08622530:: @ 8622530 .incbin "baserom.gba", 0x622530, 0xa4 gUnknown_086225D4:: @ 86225D4 - .incbin "baserom.gba", 0x6225d4, 0x10c + .incbin "baserom.gba", 0x6225d4, 0xC4 + +gUnknown_08622698:: @ 8622698 + .incbin "baserom.gba", 0x622698, 0x48 gUnknown_086226E0:: @ 86226E0 .incbin "baserom.gba", 0x6226e0, 0x20 @@ -172,7 +1369,22 @@ gUnknown_08622794:: @ 8622794 .incbin "baserom.gba", 0x622794, 0x4 gUnknown_08622798:: @ 8622798 - .incbin "baserom.gba", 0x622798, 0x40 + .4byte NULL + .4byte sub_81CB510 + .4byte sub_81CB588 + .4byte sub_81CB600 + .4byte sub_81CB678 + .4byte sub_81CB6F0 + .4byte sub_81CB734 + .4byte sub_81CB75C + .4byte sub_81CB7A0 + .4byte sub_81CB824 + .4byte sub_81CB888 + .4byte sub_81CB93C + .4byte sub_81CBAD4 + .4byte sub_81CB9C8 + .4byte sub_81CBA68 + .4byte sub_81CBB74 gUnknown_086227D8:: @ 86227D8 .incbin "baserom.gba", 0x6227d8, 0x8 @@ -181,7 +1393,9 @@ gUnknown_086227E0:: @ 86227E0 .incbin "baserom.gba", 0x6227e0, 0x8 gUnknown_086227E8:: @ 86227E8 - .incbin "baserom.gba", 0x6227e8, 0xc + .4byte gUnknown_085EC017 + .4byte gUnknown_085EC01C + .4byte gUnknown_085EC022 gUnknown_086227F4:: @ 86227F4 .incbin "baserom.gba", 0x6227f4, 0x14 @@ -193,40 +1407,151 @@ gUnknown_08622810:: @ 8622810 .incbin "baserom.gba", 0x622810, 0x8 gUnknown_08622818:: @ 8622818 - .incbin "baserom.gba", 0x622818, 0x18 + obj_pal gUnknown_08622698, 12 + obj_pal NULL, 0 + +gUnknown_08622828:: @ 8622828 + .2byte 0x8000 + .2byte 0x0 + .2byte 0x400 + .2byte 0x0 gUnknown_08622830:: @ 8622830 - .incbin "baserom.gba", 0x622830, 0x20 + spr_template 7, 12, gUnknown_08622828, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81CC34C + +gUnknown_08622848:: @ 8622848 + .2byte 0x0 + .2byte 0xC000 + .2byte 0x400 + .2byte 0x0 gUnknown_08622850:: @ 8622850 - .incbin "baserom.gba", 0x622850, 0x18 + spr_template 8, 13, gUnknown_08622848, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_08622868:: @ 8622868 .incbin "baserom.gba", 0x622868, 0x20 gUnknown_08622888:: @ 8622888 - .incbin "baserom.gba", 0x622888, 0x850 + .incbin "baserom.gba", 0x622888, 0x1F4 + +gUnknown_08622A7C:: @ 8622A7C + .incbin "baserom.gba", 0x622a7c, 0x44 + +gUnknown_08622AC0:: @ 8622AC0 + .incbin "baserom.gba", 0x622ac0, 0x48 + +gUnknown_08622B08:: @ 8622B08 + .incbin "baserom.gba", 0x622b08, 0x50 + +gUnknown_08622B58:: @ 8622B58 + .incbin "baserom.gba", 0x622b58, 0x60 + +gUnknown_08622BB8:: @ 8622BB8 + .incbin "baserom.gba", 0x622bb8, 0x4C + +gUnknown_08622C04:: @ 8622C04 + .incbin "baserom.gba", 0x622c04, 0x54 + +gUnknown_08622C58:: @ 8622C58 + .incbin "baserom.gba", 0x622c58, 0x54 + +gUnknown_08622CAC:: @ 8622CAC + .incbin "baserom.gba", 0x622cac, 0x40 + +gUnknown_08622CEC:: @ 8622CEC + .incbin "baserom.gba", 0x622cec, 0x58 + +gUnknown_08622D44:: @ 8622D44 + .incbin "baserom.gba", 0x622d44, 0x54 + +gUnknown_08622D98:: @ 8622D98 + .incbin "baserom.gba", 0x622d98, 0x30 + +gUnknown_08622DC8:: @ 8622DC8 + .incbin "baserom.gba", 0x622dc8, 0x4C + +gUnknown_08622E14:: @ 8622E14 + .incbin "baserom.gba", 0x622e14, 0x58 + +gUnknown_08622E6C:: @ 8622E6C + .incbin "baserom.gba", 0x622e6c, 0x30 + +gUnknown_08622E9C:: @ 8622E9C + .incbin "baserom.gba", 0x622e9c, 0x38 + +gUnknown_08622ED4:: @ 8622ED4 + .incbin "baserom.gba", 0x622ed4, 0x40 + +gUnknown_08622F14:: @ 8622F14 + .incbin "baserom.gba", 0x622f14, 0x48 + +gUnknown_08622F5C:: @ 8622F5C + .incbin "baserom.gba", 0x622f5c, 0x44 + +gUnknown_08622FA0:: @ 8622FA0 + .incbin "baserom.gba", 0x622fa0, 0x38 + +gUnknown_08622FD8:: @ 8622FD8 + .incbin "baserom.gba", 0x622fd8, 0x48 + +gUnknown_08623020:: @ 8623020 + .incbin "baserom.gba", 0x623020, 0x5C + +gUnknown_0862307C:: @ 862307C + .incbin "baserom.gba", 0x62307c, 0x5C gUnknown_086230D8:: @ 86230D8 .incbin "baserom.gba", 0x6230d8, 0xc gUnknown_086230E4:: @ 86230E4 - .incbin "baserom.gba", 0x6230e4, 0x14 + .4byte NULL + .4byte sub_81CC848 + .4byte sub_81CC878 + .4byte sub_81CC8D8 + .4byte sub_81CC95C gUnknown_086230F8:: @ 86230F8 - .incbin "baserom.gba", 0x6230f8, 0x8 + obj_tiles gUnknown_08DC9208, 0x800, 6 gUnknown_08623100:: @ 8623100 - .incbin "baserom.gba", 0x623100, 0x10 + obj_pal gUnknown_08DC91E8, 11 + obj_pal NULL, 0 gUnknown_08623110:: @ 8623110 .incbin "baserom.gba", 0x623110, 0x8 gUnknown_08623118:: @ 8623118 - .incbin "baserom.gba", 0x623118, 0xb8 + .4byte 0, gUnknown_08622E6C + .4byte 1, gUnknown_08622D98 + .4byte 2, gUnknown_08622E9C + .4byte 3, gUnknown_08622A7C + .4byte 4, gUnknown_08622AC0 + .4byte 5, gUnknown_08622FA0 + .4byte 6, gUnknown_08622CAC + .4byte 7, gUnknown_0862307C + .4byte 8, gUnknown_08622B58 + .4byte 0x10008, gUnknown_08622BB8 + .4byte 9, gUnknown_08622D44 + .4byte 0x10009, gUnknown_08622CEC + .4byte 0xA, gUnknown_08622C04 + .4byte 0x1000A, gUnknown_08622C58 + .4byte 0xB, gUnknown_08622B08 + .4byte 0xC, gUnknown_08622E14 + .4byte 0x1000C, gUnknown_08622DC8 + .4byte 0xD, gUnknown_08623020 + .4byte 0x1000D, gUnknown_08622FD8 + .4byte 0xE, gUnknown_08622ED4 + .4byte 0xF, gUnknown_08622F14 + .4byte 0x1000F, gUnknown_08622F5C + +gUnknown_086231C8:: @ 86231C8 + .2byte 0x4000 + .2byte 0x4000 + .2byte 0x400 + .2byte 0x0 gUnknown_086231D0:: @ 86231D0 - .incbin "baserom.gba", 0x6231d0, 0x18 + spr_template 6, 11, gUnknown_086231C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81CCEF4 gUnknown_086231E8:: @ 86231E8 .incbin "baserom.gba", 0x6231e8, 0x20 @@ -259,13 +1584,22 @@ gUnknown_0862337C:: @ 862337C .incbin "baserom.gba", 0x62337c, 0x8 gUnknown_08623384:: @ 8623384 - .incbin "baserom.gba", 0x623384, 0x1c + .4byte NULL + .4byte sub_81CE37C + .4byte sub_81CE2D0 + .4byte sub_81CE4D8 + .4byte sub_81CE5E4 + .4byte sub_81CE6BC + .4byte sub_81CE700 gUnknown_086233A0:: @ 86233A0 .incbin "baserom.gba", 0x6233a0, 0x14 gUnknown_086233B4:: @ 86233B4 - .incbin "baserom.gba", 0x6233b4, 0x10 + .4byte sub_81CF134 + .4byte sub_81CF1C4 + .4byte sub_81CF1D8 + .4byte sub_81CF278 gUnknown_086233C4:: @ 86233C4 .incbin "baserom.gba", 0x6233c4, 0x20 @@ -286,7 +1620,13 @@ gUnknown_08623594:: @ 8623594 .incbin "baserom.gba", 0x623594, 0x4 gUnknown_08623598:: @ 8623598 - .incbin "baserom.gba", 0x623598, 0x1c + .4byte NULL + .4byte sub_81CF578 + .4byte sub_81CF5F0 + .4byte sub_81CF668 + .4byte sub_81CF6E0 + .4byte sub_81CF758 + .4byte sub_81CF798 gUnknown_086235B4:: @ 86235B4 .incbin "baserom.gba", 0x6235b4, 0x8 @@ -301,7 +1641,9 @@ gUnknown_086235D4:: @ 86235D4 .incbin "baserom.gba", 0x6235d4, 0x4 gUnknown_086235D8:: @ 86235D8 - .incbin "baserom.gba", 0x6235d8, 0xc + .4byte sub_81CFB8C + .4byte sub_81CFC2C + .4byte sub_81CFC40 gUnknown_086235E4:: @ 86235E4 .incbin "baserom.gba", 0x6235e4, 0x20 @@ -322,7 +1664,13 @@ gUnknown_086237B4:: @ 86237B4 .incbin "baserom.gba", 0x6237b4, 0x4 gUnknown_086237B8:: @ 86237B8 - .incbin "baserom.gba", 0x6237b8, 0x1c + .4byte NULL + .4byte sub_81CFFFC + .4byte sub_81D0074 + .4byte sub_81D00EC + .4byte sub_81D0164 + .4byte sub_81D01DC + .4byte sub_81D021C gUnknown_086237D4:: @ 86237D4 .incbin "baserom.gba", 0x6237d4, 0x8 @@ -346,19 +1694,39 @@ gUnknown_086237F8:: @ 86237F8 .include "data/text/gift_ribbon_descriptions.inc" gUnknown_08623FF8:: @ 8623FF8 - .incbin "baserom.gba", 0x623ff8, 0xa0 + .incbin "baserom.gba", 0x623ff8, 0x20 + +gUnknown_08624018:: @ 8624018 + .incbin "baserom.gba", 0x624018, 0x20 + +gUnknown_08624038:: @ 8624038 + .incbin "baserom.gba", 0x624038, 0x20 + +gUnknown_08624058:: @ 8624058 + .incbin "baserom.gba", 0x624058, 0x20 + +gUnknown_08624078:: @ 8624078 + .incbin "baserom.gba", 0x624078, 0x20 gUnknown_08624098:: @ 8624098 - .incbin "baserom.gba", 0x624098, 0x20 + .incbin "baserom.gba", 0x624098, 0x20 gUnknown_086240B8:: @ 86240B8 - .incbin "baserom.gba", 0x6240b8, 0xae0 + .incbin "baserom.gba", 0x6240b8, 0x1C8 + +gUnknown_08624280:: @ 8624280 + .incbin "baserom.gba", 0x624280, 0x918 gUnknown_08624B98:: @ 8624B98 .incbin "baserom.gba", 0x624b98, 0x8 gUnknown_08624BA0:: @ 8624BA0 - .incbin "baserom.gba", 0x624ba0, 0x18 + .4byte NULL + .4byte sub_81D0C84 + .4byte sub_81D0D2C + .4byte sub_81D0D8C + .4byte sub_81D0E00 + .4byte sub_81D0C54 gUnknown_08624BB8:: @ 8624BB8 .incbin "baserom.gba", 0x624bb8, 0x8 @@ -385,37 +1753,156 @@ gUnknown_08624BF8:: @ 8624BF8 .incbin "baserom.gba", 0x624bf8, 0x80 gUnknown_08624C78:: @ 8624C78 - .incbin "baserom.gba", 0x624c78, 0x8 + obj_tiles gUnknown_08624280, 0x1800, 9 gUnknown_08624C80:: @ 8624C80 - .incbin "baserom.gba", 0x624c80, 0x84 + obj_pal gUnknown_08623FF8, 15 + obj_pal gUnknown_08624018, 16 + obj_pal gUnknown_08624038, 17 + obj_pal gUnknown_08624058, 18 + obj_pal gUnknown_08624078, 19 + obj_pal NULL, 0 + +gUnknown_08624CB0:: @ 8624CB0 + .incbin "baserom.gba", 0x624cb0, 0x54 gUnknown_08624D04:: @ 8624D04 - .incbin "baserom.gba", 0x624d04, 0x5a4 + .incbin "baserom.gba", 0x624d04, 0x78 + +gUnknown_08624D7C:: @ 8624D7C + .incbin "baserom.gba", 0x624d7c, 0x60 + +gUnknown_08624DDC:: @ 8624DDC + .incbin "baserom.gba", 0x624ddc, 0x14 + +gUnknown_08624DF0:: @ 8624DF0 + .incbin "baserom.gba", 0x624df0, 0x2C + +gUnknown_08624E1C:: @ 8624E1C + .incbin "baserom.gba", 0x624e1c, 0x50 + +gUnknown_08624E6C:: @ 8624E6C + .incbin "baserom.gba", 0x624e6c, 0x90 + +gUnknown_08624EFC:: @ 8624EFC + .incbin "baserom.gba", 0x624efc, 0x90 + +gUnknown_08624F8C:: @ 8624F8C + .incbin "baserom.gba", 0x624f8c, 0x60 + +gUnknown_08624FEC:: @ 8624FEC + .incbin "baserom.gba", 0x624fec, 0x54 + +gUnknown_08625040:: @ 8625040 + .incbin "baserom.gba", 0x625040, 0x38 + +gUnknown_08625078:: @ 8625078 + .incbin "baserom.gba", 0x625078, 0x3C + +gUnknown_086250B4:: @ 86250B4 + .incbin "baserom.gba", 0x6250b4, 0x3C + +gUnknown_086250F0:: @ 86250F0 + .incbin "baserom.gba", 0x6250f0, 0x3C + +gUnknown_0862512C:: @ 862512C + .incbin "baserom.gba", 0x62512c, 0x3C + +gUnknown_08625168:: @ 8625168 + .incbin "baserom.gba", 0x625168, 0x3C + +gUnknown_086251A4:: @ 86251A4 + .incbin "baserom.gba", 0x6251a4, 0x3C + +gUnknown_086251E0:: @ 86251E0 + .incbin "baserom.gba", 0x6251e0, 0x24 + +gUnknown_08625204:: @ 8625204 + .incbin "baserom.gba", 0x625204, 0x24 + +gUnknown_08625228:: @ 8625228 + .incbin "baserom.gba", 0x625228, 0x24 + +gUnknown_0862524C:: @ 862524C + .incbin "baserom.gba", 0x62524c, 0x24 + +gUnknown_08625270:: @ 8625270 + .incbin "baserom.gba", 0x625270, 0x24 + +gUnknown_08625294:: @ 8625294 + .incbin "baserom.gba", 0x625294, 0x14 gUnknown_086252A8:: @ 86252A8 - .incbin "baserom.gba", 0x6252a8, 0x54 + .4byte gUnknown_08624D7C + .4byte gUnknown_08624DF0 + .4byte gUnknown_08624F8C + .4byte gUnknown_08624EFC + .4byte gUnknown_08624FEC + .4byte gUnknown_08624DDC + .4byte gUnknown_08624E1C + .4byte gUnknown_08624E6C + .4byte gUnknown_08625040 + .4byte gUnknown_08625078 + .4byte gUnknown_086250B4 + .4byte gUnknown_086250F0 + .4byte gUnknown_0862512C + .4byte gUnknown_08625168 + .4byte gUnknown_086251A4 + .4byte gUnknown_086251E0 + .4byte gUnknown_08625204 + .4byte gUnknown_08625228 + .4byte gUnknown_0862524C + .4byte gUnknown_08625270 + .4byte gUnknown_08625294 gUnknown_086252FC:: @ 86252FC - .incbin "baserom.gba", 0x6252fc, 0x14 + .4byte sub_81D1628 + .4byte sub_81D164C + .4byte sub_81D1670 + .4byte sub_81D1694 + .4byte sub_81D16CC gUnknown_08625310:: @ 8625310 - .incbin "baserom.gba", 0x625310, 0x14 + .4byte sub_81D1714 + .4byte sub_81D1718 + .4byte sub_81D171C + .4byte sub_81D1750 + .4byte sub_81D1754 gUnknown_08625324:: @ 8625324 - .incbin "baserom.gba", 0x625324, 0x14 + .4byte sub_81D178C + .4byte sub_81D1790 + .4byte sub_81D17C0 + .4byte sub_81D17E0 + .4byte sub_81D17E4 gUnknown_08625338:: @ 8625338 - .incbin "baserom.gba", 0x625338, 0x14 + .4byte sub_81D1840 + .4byte sub_81D1844 + .4byte sub_81D1848 + .4byte sub_81D184C + .4byte sub_81D1850 gUnknown_0862534C:: @ 862534C - .incbin "baserom.gba", 0x62534c, 0x14 + .4byte sub_81D1888 + .4byte sub_81D188C + .4byte sub_81D1890 + .4byte sub_81D1894 + .4byte sub_81D1898 gUnknown_08625360:: @ 8625360 - .incbin "baserom.gba", 0x625360, 0x14 + .4byte sub_81D18D0 + .4byte sub_81D18DC + .4byte sub_81D18FC + .4byte sub_81D1908 + .4byte sub_81D1914 gUnknown_08625374:: @ 8625374 - .incbin "baserom.gba", 0x625374, 0x14 + .4byte sub_81D1AB0 + .4byte sub_81D1ABC + .4byte sub_81D1ADC + .4byte sub_81D1AF4 + .4byte sub_81D1B00 gUnknown_08625388:: @ 8625388 .incbin "baserom.gba", 0x625388, 0x60 @@ -475,7 +1962,12 @@ gUnknown_08625B2C:: @ 8625B2C .incbin "baserom.gba", 0x625b2c, 0x28 gUnknown_08625B54:: @ 8625B54 - .incbin "baserom.gba", 0x625b54, 0x18 + .4byte gUnknown_085EEA46 + .4byte gUnknown_085EEA4E + .4byte gUnknown_085EEA55 + .4byte gUnknown_085EEA63 + .4byte gUnknown_085EEA6B + .4byte gUnknown_085EEA5D gUnknown_08625B6C:: @ 8625B6C .incbin "baserom.gba", 0x625b6c, 0x520 @@ -502,10 +1994,30 @@ gUnknown_0862A5F8:: @ 862A5F8 .incbin "baserom.gba", 0x62a5f8, 0x20 gUnknown_0862A618:: @ 862A618 - .incbin "baserom.gba", 0x62a618, 0x48 + .4byte sub_81D581C + .4byte sub_81D58D8 + .4byte sub_81D5924 + .4byte sub_81D59D0 + .4byte sub_81D5A70 + .4byte sub_81D5AB4 + .4byte sub_81D5AD0 + .4byte sub_81D5B2C + .4byte sub_81D5BBC + .4byte sub_81D5C00 + .4byte sub_81D5C5C + .4byte sub_81D62B4 + .4byte sub_81D64AC + .4byte sub_81D64DC + .4byte sub_81D64FC + .4byte sub_81D6518 + .4byte sub_81D6568 + .4byte sub_81D65A0 gUnknown_0862A660:: @ 862A660 - .incbin "baserom.gba", 0x62a660, 0x10 + .4byte gUnknown_085EB32D + .4byte gUnknown_085EB33E + .4byte gUnknown_085EB350 + .4byte gUnknown_085EB361 gUnknown_0862A670:: @ 862A670 .incbin "baserom.gba", 0x62a670, 0x18 diff --git a/data/rayquaza_scene.s b/data/rayquaza_scene.s deleted file mode 100644 index 51a285285..000000000 --- a/data/rayquaza_scene.s +++ /dev/null @@ -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 diff --git a/data/record_mixing.s b/data/record_mixing.s index 6531633a5..0ef0a776a 100644 --- a/data/record_mixing.s +++ b/data/record_mixing.s @@ -2,7 +2,7 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 + .align 2, 0 gUnknown_0858CF8C:: @ 858CF8C .incbin "baserom.gba", 0x58cf8c, 0x2 diff --git a/data/reset_rtc_screen.s b/data/reset_rtc_screen.s index f680a87bc..37c532497 100644 --- a/data/reset_rtc_screen.s +++ b/data/reset_rtc_screen.s @@ -1,8 +1,8 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata - .align 2, 0 + .section .rodata + .align 2, 0 gUnknown_08510404:: @ 8510404 struct BgTemplate .4byte 0x000001f0 diff --git a/data/rom_8486FEC.s b/data/rom_8486FEC.s index 9b7834a32..850ae5032 100644 --- a/data/rom_8486FEC.s +++ b/data/rom_8486FEC.s @@ -1,8 +1,8 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata - .align 2, 0 + .section .rodata + .align 2, 0 gUnknown_8486FEC:: @ 8486FEC .incbin "baserom.gba", 0x486fec, 0xFFA0 diff --git a/data/rom_8525F58.s b/data/rom_8525F58.s index 808300deb..d95af7e20 100644 --- a/data/rom_8525F58.s +++ b/data/rom_8525F58.s @@ -1,34 +1,34 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata + .section .rodata - .align 2 + .align 2 gUnknown_08525F58:: @ 8525F58 .byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00 .byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00 .byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00 .byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00 - .align 2 + .align 2 gCastformFrontSpriteCoords:: @ 8525F78 .byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00 .byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00 - .align 2 + .align 2 gUnknown_08525F88:: @ 8525F88 .byte 0x0d, 0x0e, 0x0d, 0x0d - .align 2 + .align 2 gUnknown_08525F8C:: @ 8525F8C .byte 0x00, 0x00, 0x00, 0x00 - .align 2 + .align 2 gUnknown_08525F90:: @ 8525F90 spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - .align 2 + .align 2 gUnknown_08525FC0:: @ 8525FC0 obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755 obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756 diff --git a/data/save.s b/data/save.s index 15e201baa..23a8d3928 100644 --- a/data/save.s +++ b/data/save.s @@ -4,17 +4,17 @@ .section .rodata gSaveSectionOffsets:: @ 85CDC00 - .2byte 0, 0xF2C - .2byte 0, 0xF80 - .2byte 0xF80, 0xF80 - .2byte 0x1F00, 0xF80 - .2byte 0x2E80, 0xF08 - .2byte 0, 0xF80 - .2byte 0xF80, 0xF80 - .2byte 0x1F00, 0xF80 - .2byte 0x2E80, 0xF80 - .2byte 0x3E00, 0xF80 - .2byte 0x4D80, 0xF80 - .2byte 0x5D00, 0xF80 - .2byte 0x6C80, 0xF80 - .2byte 0x7C00, 0x7D0 + .2byte 0, 0xF2C + .2byte 0, 0xF80 + .2byte 0xF80, 0xF80 + .2byte 0x1F00, 0xF80 + .2byte 0x2E80, 0xF08 + .2byte 0, 0xF80 + .2byte 0xF80, 0xF80 + .2byte 0x1F00, 0xF80 + .2byte 0x2E80, 0xF80 + .2byte 0x3E00, 0xF80 + .2byte 0x4D80, 0xF80 + .2byte 0x5D00, 0xF80 + .2byte 0x6C80, 0xF80 + .2byte 0x7C00, 0x7D0 diff --git a/data/script_menu.s b/data/script_menu.s index 8dd58262c..6cd7bf381 100644 --- a/data/script_menu.s +++ b/data/script_menu.s @@ -728,7 +728,7 @@ gUnknown_0858BAF0:: @ 858BAF0 gUnknown_0858BB68:: @ 858BB68 .byte 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F - .align 2 + .align 2 gUnknown_0858BB70:: @ 858BB70 .4byte gText_SomeonesPC .4byte gText_LanettesPC diff --git a/data/script_pokemon_util_80F87D8.s b/data/script_pokemon_util_80F87D8.s index beda525c8..dcf9edeea 100644 --- a/data/script_pokemon_util_80F87D8.s +++ b/data/script_pokemon_util_80F87D8.s @@ -2,6 +2,6 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 + .align 2, 0 gUnknown_0858D8EC:: @ 858D8EC - .incbin "baserom.gba", 0x58d8ec, 0x4 + .byte 3, 4, 5, 14 diff --git a/data/specials.inc b/data/specials.inc index 578668fce..f0c1fa114 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -1,11 +1,11 @@ .macro def_special ptr .set SPECIAL_\ptr, __special__ .set __special__, __special__ + 1 - .4byte \ptr - .endm + .4byte \ptr + .endm .set __special__, 0 - .align 2 + .align 2 gSpecials:: @ 81DBA64 def_special HealPlayerParty def_special sub_809D2BC @@ -163,7 +163,7 @@ gSpecials:: @ 81DBA64 def_special SetFlagInVar def_special CableCarWarp def_special sub_814FC9C - def_special sub_8085784 + def_special Overworld_PlaySpecialMapMusic def_special StartWallClock def_special Special_ViewWallClock def_special ChooseStarter diff --git a/data/start_menu.s b/data/start_menu.s deleted file mode 100644 index 07e428d0d..000000000 --- a/data/start_menu.s +++ /dev/null @@ -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 diff --git a/data/starter_choose.s b/data/starter_choose.s index 06bb8a356..160046d4c 100644 --- a/data/starter_choose.s +++ b/data/starter_choose.s @@ -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 @@ -36,8 +35,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 diff --git a/data/strings.s b/data/strings.s index a0661f13d..9e45b2e04 100644 --- a/data/strings.s +++ b/data/strings.s @@ -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$" - diff --git a/data/text_window.s b/data/text_window.s index a7389572b..716425100 100644 --- a/data/text_window.s +++ b/data/text_window.s @@ -1,17 +1,170 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata - .align 2, 0 + .section .rodata + .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 diff --git a/data/trade.s b/data/trade.s index b392fbc24..7308b92a3 100644 --- a/data/trade.s +++ b/data/trade.s @@ -1,9 +1,9 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2, 0 - .section .rodata - .align 2, 0 - gUnknown_0832C6A8:: @ 832C6A8 .incbin "baserom.gba", 0x32C6A8, 0x18 diff --git a/data/trainer_card.s b/data/trainer_card.s index 0d48cd0b6..8e49b040f 100644 --- a/data/trainer_card.s +++ b/data/trainer_card.s @@ -1,11 +1,44 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata - .align 2, 0 + .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 diff --git a/data/trainer_money.inc b/data/trainer_money.inc index 1e06668bd..00aaa6cfb 100644 --- a/data/trainer_money.inc +++ b/data/trainer_money.inc @@ -1,59 +1,59 @@ @ This is a factor in how much money you get for beating a trainer. .align 2 gTrainerMoneyTable:: @ 831AEB8 - .byte TRAINER_CLASS_NAME_TEAM_AQUA, 5, 0, 0 - .byte TRAINER_CLASS_NAME_AQUA_ADMIN, 10, 0, 0 - .byte TRAINER_CLASS_NAME_AQUA_LEADER, 20, 0, 0 - .byte TRAINER_CLASS_NAME_AROMA_LADY, 10, 0, 0 - .byte TRAINER_CLASS_NAME_RUIN_MANIAC, 15, 0, 0 - .byte TRAINER_CLASS_NAME_INTERVIEWER, 12, 0, 0 - .byte TRAINER_CLASS_NAME_TUBER_1, 1, 0, 0 - .byte TRAINER_CLASS_NAME_TUBER_2, 1, 0, 0 - .byte TRAINER_CLASS_NAME_SIS_AND_BRO, 3, 0, 0 - .byte TRAINER_CLASS_NAME_COOLTRAINER_1, 12, 0, 0 - .byte TRAINER_CLASS_NAME_HEX_MANIAC, 6, 0, 0 - .byte TRAINER_CLASS_NAME_LADY, 50, 0, 0 - .byte TRAINER_CLASS_NAME_BEAUTY, 20, 0, 0 - .byte TRAINER_CLASS_NAME_RICH_BOY, 50, 0, 0 - .byte TRAINER_CLASS_NAME_POKEMANIAC, 15, 0, 0 - .byte TRAINER_CLASS_NAME_SWIMMER_M, 2, 0, 0 - .byte TRAINER_CLASS_NAME_BLACK_BELT, 8, 0, 0 - .byte TRAINER_CLASS_NAME_GUITARIST, 8, 0, 0 - .byte TRAINER_CLASS_NAME_KINDLER, 8, 0, 0 - .byte TRAINER_CLASS_NAME_CAMPER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_OLD_COUPLE, 10, 0, 0 - .byte TRAINER_CLASS_NAME_BUG_MANIAC, 15, 0, 0 - .byte TRAINER_CLASS_NAME_PSYCHIC, 6, 0, 0 - .byte TRAINER_CLASS_NAME_GENTLEMAN, 20, 0, 0 - .byte TRAINER_CLASS_NAME_ELITE_FOUR, 25, 0, 0 - .byte TRAINER_CLASS_NAME_LEADER, 25, 0, 0 - .byte TRAINER_CLASS_NAME_SCHOOL_KID, 5, 0, 0 - .byte TRAINER_CLASS_NAME_SR_AND_JR, 4, 0, 0 - .byte TRAINER_CLASS_NAME_POKEFAN, 20, 0, 0 - .byte TRAINER_CLASS_NAME_EXPERT, 10, 0, 0 - .byte TRAINER_CLASS_NAME_YOUNGSTER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_CHAMPION, 50, 0, 0 - .byte TRAINER_CLASS_NAME_FISHERMAN, 10, 0, 0 - .byte TRAINER_CLASS_NAME_TRIATHLETE, 10, 0, 0 - .byte TRAINER_CLASS_NAME_DRAGON_TAMER, 12, 0, 0 - .byte TRAINER_CLASS_NAME_BIRD_KEEPER, 8, 0, 0 - .byte TRAINER_CLASS_NAME_NINJA_BOY, 3, 0, 0 - .byte TRAINER_CLASS_NAME_BATTLE_GIRL, 6, 0, 0 - .byte TRAINER_CLASS_NAME_PARASOL_LADY, 10, 0, 0 - .byte TRAINER_CLASS_NAME_SWIMMER_F, 2, 0, 0 - .byte TRAINER_CLASS_NAME_PICNICKER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_TWINS, 3, 0, 0 - .byte TRAINER_CLASS_NAME_SAILOR, 8, 0, 0 - .byte TRAINER_CLASS_NAME_COLLECTOR, 15, 0, 0 - .byte TRAINER_CLASS_NAME_PKMN_TRAINER_3, 15, 0, 0 - .byte TRAINER_CLASS_NAME_PKMN_BREEDER, 10, 0, 0 - .byte TRAINER_CLASS_NAME_PKMN_RANGER, 12, 0, 0 - .byte TRAINER_CLASS_NAME_TEAM_MAGMA, 5, 0, 0 - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN, 10, 0, 0 - .byte TRAINER_CLASS_NAME_MAGMA_LEADER, 20, 0, 0 - .byte TRAINER_CLASS_NAME_LASS, 4, 0, 0 - .byte TRAINER_CLASS_NAME_BUG_CATCHER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_HIKER, 10, 0, 0 - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE, 8, 0, 0 - .byte TRAINER_CLASS_LEADER_1, 10, 0, 0 - .byte -1, 5, 0, 0 + .byte TRAINER_CLASS_NAME_TEAM_AQUA, 5, 0, 0 + .byte TRAINER_CLASS_NAME_AQUA_ADMIN, 10, 0, 0 + .byte TRAINER_CLASS_NAME_AQUA_LEADER, 20, 0, 0 + .byte TRAINER_CLASS_NAME_AROMA_LADY, 10, 0, 0 + .byte TRAINER_CLASS_NAME_RUIN_MANIAC, 15, 0, 0 + .byte TRAINER_CLASS_NAME_INTERVIEWER, 12, 0, 0 + .byte TRAINER_CLASS_NAME_TUBER_1, 1, 0, 0 + .byte TRAINER_CLASS_NAME_TUBER_2, 1, 0, 0 + .byte TRAINER_CLASS_NAME_SIS_AND_BRO, 3, 0, 0 + .byte TRAINER_CLASS_NAME_COOLTRAINER_1, 12, 0, 0 + .byte TRAINER_CLASS_NAME_HEX_MANIAC, 6, 0, 0 + .byte TRAINER_CLASS_NAME_LADY, 50, 0, 0 + .byte TRAINER_CLASS_NAME_BEAUTY, 20, 0, 0 + .byte TRAINER_CLASS_NAME_RICH_BOY, 50, 0, 0 + .byte TRAINER_CLASS_NAME_POKEMANIAC, 15, 0, 0 + .byte TRAINER_CLASS_NAME_SWIMMER_M, 2, 0, 0 + .byte TRAINER_CLASS_NAME_BLACK_BELT, 8, 0, 0 + .byte TRAINER_CLASS_NAME_GUITARIST, 8, 0, 0 + .byte TRAINER_CLASS_NAME_KINDLER, 8, 0, 0 + .byte TRAINER_CLASS_NAME_CAMPER, 4, 0, 0 + .byte TRAINER_CLASS_NAME_OLD_COUPLE, 10, 0, 0 + .byte TRAINER_CLASS_NAME_BUG_MANIAC, 15, 0, 0 + .byte TRAINER_CLASS_NAME_PSYCHIC, 6, 0, 0 + .byte TRAINER_CLASS_NAME_GENTLEMAN, 20, 0, 0 + .byte TRAINER_CLASS_NAME_ELITE_FOUR, 25, 0, 0 + .byte TRAINER_CLASS_NAME_LEADER, 25, 0, 0 + .byte TRAINER_CLASS_NAME_SCHOOL_KID, 5, 0, 0 + .byte TRAINER_CLASS_NAME_SR_AND_JR, 4, 0, 0 + .byte TRAINER_CLASS_NAME_POKEFAN, 20, 0, 0 + .byte TRAINER_CLASS_NAME_EXPERT, 10, 0, 0 + .byte TRAINER_CLASS_NAME_YOUNGSTER, 4, 0, 0 + .byte TRAINER_CLASS_NAME_CHAMPION, 50, 0, 0 + .byte TRAINER_CLASS_NAME_FISHERMAN, 10, 0, 0 + .byte TRAINER_CLASS_NAME_TRIATHLETE, 10, 0, 0 + .byte TRAINER_CLASS_NAME_DRAGON_TAMER, 12, 0, 0 + .byte TRAINER_CLASS_NAME_BIRD_KEEPER, 8, 0, 0 + .byte TRAINER_CLASS_NAME_NINJA_BOY, 3, 0, 0 + .byte TRAINER_CLASS_NAME_BATTLE_GIRL, 6, 0, 0 + .byte TRAINER_CLASS_NAME_PARASOL_LADY, 10, 0, 0 + .byte TRAINER_CLASS_NAME_SWIMMER_F, 2, 0, 0 + .byte TRAINER_CLASS_NAME_PICNICKER, 4, 0, 0 + .byte TRAINER_CLASS_NAME_TWINS, 3, 0, 0 + .byte TRAINER_CLASS_NAME_SAILOR, 8, 0, 0 + .byte TRAINER_CLASS_NAME_COLLECTOR, 15, 0, 0 + .byte TRAINER_CLASS_NAME_PKMN_TRAINER_3, 15, 0, 0 + .byte TRAINER_CLASS_NAME_PKMN_BREEDER, 10, 0, 0 + .byte TRAINER_CLASS_NAME_PKMN_RANGER, 12, 0, 0 + .byte TRAINER_CLASS_NAME_TEAM_MAGMA, 5, 0, 0 + .byte TRAINER_CLASS_NAME_MAGMA_ADMIN, 10, 0, 0 + .byte TRAINER_CLASS_NAME_MAGMA_LEADER, 20, 0, 0 + .byte TRAINER_CLASS_NAME_LASS, 4, 0, 0 + .byte TRAINER_CLASS_NAME_BUG_CATCHER, 4, 0, 0 + .byte TRAINER_CLASS_NAME_HIKER, 10, 0, 0 + .byte TRAINER_CLASS_NAME_YOUNG_COUPLE, 8, 0, 0 + .byte TRAINER_CLASS_LEADER_1, 10, 0, 0 + .byte -1, 5, 0, 0 diff --git a/data/type_effectiveness.inc b/data/type_effectiveness.inc index a24615592..0739199c2 100644 --- a/data/type_effectiveness.inc +++ b/data/type_effectiveness.inc @@ -1,119 +1,119 @@ @ format: attacking type, defending type, damage multiplier @ the multiplier is a (decimal) fixed-point number: -@ 20 is ×2.0 -@ 05 is ×0.5 -@ 00 is ×0 +@ 20 is ×2.0 +@ 05 is ×0.5 +@ 00 is ×0 gTypeEffectiveness:: @ 831ACE8 - .byte TYPE_NORMAL, TYPE_ROCK, 5 - .byte TYPE_NORMAL, TYPE_STEEL, 5 - .byte TYPE_FIRE, TYPE_FIRE, 5 - .byte TYPE_FIRE, TYPE_WATER, 5 - .byte TYPE_FIRE, TYPE_GRASS, 20 - .byte TYPE_FIRE, TYPE_ICE, 20 - .byte TYPE_FIRE, TYPE_BUG, 20 - .byte TYPE_FIRE, TYPE_ROCK, 5 - .byte TYPE_FIRE, TYPE_DRAGON, 5 - .byte TYPE_FIRE, TYPE_STEEL, 20 - .byte TYPE_WATER, TYPE_FIRE, 20 - .byte TYPE_WATER, TYPE_WATER, 5 - .byte TYPE_WATER, TYPE_GRASS, 5 - .byte TYPE_WATER, TYPE_GROUND, 20 - .byte TYPE_WATER, TYPE_ROCK, 20 - .byte TYPE_WATER, TYPE_DRAGON, 5 - .byte TYPE_ELECTRIC, TYPE_WATER, 20 + .byte TYPE_NORMAL, TYPE_ROCK, 5 + .byte TYPE_NORMAL, TYPE_STEEL, 5 + .byte TYPE_FIRE, TYPE_FIRE, 5 + .byte TYPE_FIRE, TYPE_WATER, 5 + .byte TYPE_FIRE, TYPE_GRASS, 20 + .byte TYPE_FIRE, TYPE_ICE, 20 + .byte TYPE_FIRE, TYPE_BUG, 20 + .byte TYPE_FIRE, TYPE_ROCK, 5 + .byte TYPE_FIRE, TYPE_DRAGON, 5 + .byte TYPE_FIRE, TYPE_STEEL, 20 + .byte TYPE_WATER, TYPE_FIRE, 20 + .byte TYPE_WATER, TYPE_WATER, 5 + .byte TYPE_WATER, TYPE_GRASS, 5 + .byte TYPE_WATER, TYPE_GROUND, 20 + .byte TYPE_WATER, TYPE_ROCK, 20 + .byte TYPE_WATER, TYPE_DRAGON, 5 + .byte TYPE_ELECTRIC, TYPE_WATER, 20 .byte TYPE_ELECTRIC, TYPE_ELECTRIC, 5 - .byte TYPE_ELECTRIC, TYPE_GRASS, 5 + .byte TYPE_ELECTRIC, TYPE_GRASS, 5 .byte TYPE_ELECTRIC, TYPE_GROUND, 0 .byte TYPE_ELECTRIC, TYPE_FLYING, 20 .byte TYPE_ELECTRIC, TYPE_DRAGON, 5 - .byte TYPE_GRASS, TYPE_FIRE, 5 - .byte TYPE_GRASS, TYPE_WATER, 20 - .byte TYPE_GRASS, TYPE_GRASS, 5 - .byte TYPE_GRASS, TYPE_POISON, 5 - .byte TYPE_GRASS, TYPE_GROUND, 20 - .byte TYPE_GRASS, TYPE_FLYING, 5 - .byte TYPE_GRASS, TYPE_BUG, 5 - .byte TYPE_GRASS, TYPE_ROCK, 20 - .byte TYPE_GRASS, TYPE_DRAGON, 5 - .byte TYPE_GRASS, TYPE_STEEL, 5 - .byte TYPE_ICE, TYPE_WATER, 5 - .byte TYPE_ICE, TYPE_GRASS, 20 - .byte TYPE_ICE, TYPE_ICE, 5 - .byte TYPE_ICE, TYPE_GROUND, 20 - .byte TYPE_ICE, TYPE_FLYING, 20 - .byte TYPE_ICE, TYPE_DRAGON, 20 - .byte TYPE_ICE, TYPE_STEEL, 5 - .byte TYPE_ICE, TYPE_FIRE, 5 + .byte TYPE_GRASS, TYPE_FIRE, 5 + .byte TYPE_GRASS, TYPE_WATER, 20 + .byte TYPE_GRASS, TYPE_GRASS, 5 + .byte TYPE_GRASS, TYPE_POISON, 5 + .byte TYPE_GRASS, TYPE_GROUND, 20 + .byte TYPE_GRASS, TYPE_FLYING, 5 + .byte TYPE_GRASS, TYPE_BUG, 5 + .byte TYPE_GRASS, TYPE_ROCK, 20 + .byte TYPE_GRASS, TYPE_DRAGON, 5 + .byte TYPE_GRASS, TYPE_STEEL, 5 + .byte TYPE_ICE, TYPE_WATER, 5 + .byte TYPE_ICE, TYPE_GRASS, 20 + .byte TYPE_ICE, TYPE_ICE, 5 + .byte TYPE_ICE, TYPE_GROUND, 20 + .byte TYPE_ICE, TYPE_FLYING, 20 + .byte TYPE_ICE, TYPE_DRAGON, 20 + .byte TYPE_ICE, TYPE_STEEL, 5 + .byte TYPE_ICE, TYPE_FIRE, 5 .byte TYPE_FIGHTING, TYPE_NORMAL, 20 - .byte TYPE_FIGHTING, TYPE_ICE, 20 + .byte TYPE_FIGHTING, TYPE_ICE, 20 .byte TYPE_FIGHTING, TYPE_POISON, 5 .byte TYPE_FIGHTING, TYPE_FLYING, 5 .byte TYPE_FIGHTING, TYPE_PSYCHIC, 5 - .byte TYPE_FIGHTING, TYPE_BUG, 5 - .byte TYPE_FIGHTING, TYPE_ROCK, 20 - .byte TYPE_FIGHTING, TYPE_DARK, 20 - .byte TYPE_FIGHTING, TYPE_STEEL, 20 - .byte TYPE_POISON, TYPE_GRASS, 20 + .byte TYPE_FIGHTING, TYPE_BUG, 5 + .byte TYPE_FIGHTING, TYPE_ROCK, 20 + .byte TYPE_FIGHTING, TYPE_DARK, 20 + .byte TYPE_FIGHTING, TYPE_STEEL, 20 + .byte TYPE_POISON, TYPE_GRASS, 20 .byte TYPE_POISON, TYPE_POISON, 5 .byte TYPE_POISON, TYPE_GROUND, 5 - .byte TYPE_POISON, TYPE_ROCK, 5 - .byte TYPE_POISON, TYPE_GHOST, 5 - .byte TYPE_POISON, TYPE_STEEL, 0 - .byte TYPE_GROUND, TYPE_FIRE, 20 + .byte TYPE_POISON, TYPE_ROCK, 5 + .byte TYPE_POISON, TYPE_GHOST, 5 + .byte TYPE_POISON, TYPE_STEEL, 0 + .byte TYPE_GROUND, TYPE_FIRE, 20 .byte TYPE_GROUND, TYPE_ELECTRIC, 20 - .byte TYPE_GROUND, TYPE_GRASS, 5 + .byte TYPE_GROUND, TYPE_GRASS, 5 .byte TYPE_GROUND, TYPE_POISON, 20 .byte TYPE_GROUND, TYPE_FLYING, 0 - .byte TYPE_GROUND, TYPE_BUG, 5 - .byte TYPE_GROUND, TYPE_ROCK, 20 - .byte TYPE_GROUND, TYPE_STEEL, 20 + .byte TYPE_GROUND, TYPE_BUG, 5 + .byte TYPE_GROUND, TYPE_ROCK, 20 + .byte TYPE_GROUND, TYPE_STEEL, 20 .byte TYPE_FLYING, TYPE_ELECTRIC, 5 - .byte TYPE_FLYING, TYPE_GRASS, 20 + .byte TYPE_FLYING, TYPE_GRASS, 20 .byte TYPE_FLYING, TYPE_FIGHTING, 20 - .byte TYPE_FLYING, TYPE_BUG, 20 - .byte TYPE_FLYING, TYPE_ROCK, 5 - .byte TYPE_FLYING, TYPE_STEEL, 5 + .byte TYPE_FLYING, TYPE_BUG, 20 + .byte TYPE_FLYING, TYPE_ROCK, 5 + .byte TYPE_FLYING, TYPE_STEEL, 5 .byte TYPE_PSYCHIC, TYPE_FIGHTING, 20 .byte TYPE_PSYCHIC, TYPE_POISON, 20 .byte TYPE_PSYCHIC, TYPE_PSYCHIC, 5 - .byte TYPE_PSYCHIC, TYPE_DARK, 0 - .byte TYPE_PSYCHIC, TYPE_STEEL, 5 - .byte TYPE_BUG, TYPE_FIRE, 5 - .byte TYPE_BUG, TYPE_GRASS, 20 - .byte TYPE_BUG, TYPE_FIGHTING, 5 - .byte TYPE_BUG, TYPE_POISON, 5 - .byte TYPE_BUG, TYPE_FLYING, 5 - .byte TYPE_BUG, TYPE_PSYCHIC, 20 - .byte TYPE_BUG, TYPE_GHOST, 5 - .byte TYPE_BUG, TYPE_DARK, 20 - .byte TYPE_BUG, TYPE_STEEL, 5 - .byte TYPE_ROCK, TYPE_FIRE, 20 - .byte TYPE_ROCK, TYPE_ICE, 20 - .byte TYPE_ROCK, TYPE_FIGHTING, 5 - .byte TYPE_ROCK, TYPE_GROUND, 5 - .byte TYPE_ROCK, TYPE_FLYING, 20 - .byte TYPE_ROCK, TYPE_BUG, 20 - .byte TYPE_ROCK, TYPE_STEEL, 5 - .byte TYPE_GHOST, TYPE_NORMAL, 0 - .byte TYPE_GHOST, TYPE_PSYCHIC, 20 - .byte TYPE_GHOST, TYPE_DARK, 5 - .byte TYPE_GHOST, TYPE_STEEL, 5 - .byte TYPE_GHOST, TYPE_GHOST, 20 + .byte TYPE_PSYCHIC, TYPE_DARK, 0 + .byte TYPE_PSYCHIC, TYPE_STEEL, 5 + .byte TYPE_BUG, TYPE_FIRE, 5 + .byte TYPE_BUG, TYPE_GRASS, 20 + .byte TYPE_BUG, TYPE_FIGHTING, 5 + .byte TYPE_BUG, TYPE_POISON, 5 + .byte TYPE_BUG, TYPE_FLYING, 5 + .byte TYPE_BUG, TYPE_PSYCHIC, 20 + .byte TYPE_BUG, TYPE_GHOST, 5 + .byte TYPE_BUG, TYPE_DARK, 20 + .byte TYPE_BUG, TYPE_STEEL, 5 + .byte TYPE_ROCK, TYPE_FIRE, 20 + .byte TYPE_ROCK, TYPE_ICE, 20 + .byte TYPE_ROCK, TYPE_FIGHTING, 5 + .byte TYPE_ROCK, TYPE_GROUND, 5 + .byte TYPE_ROCK, TYPE_FLYING, 20 + .byte TYPE_ROCK, TYPE_BUG, 20 + .byte TYPE_ROCK, TYPE_STEEL, 5 + .byte TYPE_GHOST, TYPE_NORMAL, 0 + .byte TYPE_GHOST, TYPE_PSYCHIC, 20 + .byte TYPE_GHOST, TYPE_DARK, 5 + .byte TYPE_GHOST, TYPE_STEEL, 5 + .byte TYPE_GHOST, TYPE_GHOST, 20 .byte TYPE_DRAGON, TYPE_DRAGON, 20 - .byte TYPE_DRAGON, TYPE_STEEL, 5 - .byte TYPE_DARK, TYPE_FIGHTING, 5 - .byte TYPE_DARK, TYPE_PSYCHIC, 20 - .byte TYPE_DARK, TYPE_GHOST, 20 - .byte TYPE_DARK, TYPE_DARK, 5 - .byte TYPE_DARK, TYPE_STEEL, 5 - .byte TYPE_STEEL, TYPE_FIRE, 5 - .byte TYPE_STEEL, TYPE_WATER, 5 - .byte TYPE_STEEL, TYPE_ELECTRIC, 5 - .byte TYPE_STEEL, TYPE_ICE, 20 - .byte TYPE_STEEL, TYPE_ROCK, 20 - .byte TYPE_STEEL, TYPE_STEEL, 5 - .byte 0xFE, 0xFE, 0 - .byte TYPE_NORMAL, TYPE_GHOST, 0 - .byte TYPE_FIGHTING, TYPE_GHOST, 0 - .byte 0xFF, 0xFF, 0 + .byte TYPE_DRAGON, TYPE_STEEL, 5 + .byte TYPE_DARK, TYPE_FIGHTING, 5 + .byte TYPE_DARK, TYPE_PSYCHIC, 20 + .byte TYPE_DARK, TYPE_GHOST, 20 + .byte TYPE_DARK, TYPE_DARK, 5 + .byte TYPE_DARK, TYPE_STEEL, 5 + .byte TYPE_STEEL, TYPE_FIRE, 5 + .byte TYPE_STEEL, TYPE_WATER, 5 + .byte TYPE_STEEL, TYPE_ELECTRIC, 5 + .byte TYPE_STEEL, TYPE_ICE, 20 + .byte TYPE_STEEL, TYPE_ROCK, 20 + .byte TYPE_STEEL, TYPE_STEEL, 5 + .byte 0xFE, 0xFE, 0 + .byte TYPE_NORMAL, TYPE_GHOST, 0 + .byte TYPE_FIGHTING, TYPE_GHOST, 0 + .byte 0xFF, 0xFF, 0 diff --git a/data/unk_sprite_file.s b/data/unk_sprite_file.s index 837e87c3f..2d5c9c12a 100644 --- a/data/unk_sprite_file.s +++ b/data/unk_sprite_file.s @@ -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 diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s index a45ea27e1..7a2f26233 100644 --- a/data/use_pokeblock.s +++ b/data/use_pokeblock.s @@ -2,7 +2,7 @@ .include "constants/constants.inc" .section .rodata - + gUnknown_085DFA60:: @ 85DFA60 .incbin "baserom.gba", 0x5dfa60, 0x20 @@ -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 diff --git a/data/wild_encounter.s b/data/wild_encounter.s index 0b46e3d35..914471769 100644 --- a/data/wild_encounter.s +++ b/data/wild_encounter.s @@ -1,9 +1,9 @@ #include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata - .align 2, 0 + .section .rodata + .align 2, 0 @ 85507E4 .include "data/wild_mons.inc" |