diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 19:15:51 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 19:15:51 +0100 |
| commit | b2eadfa16c60b962c3b4706da951a85246c6306c (patch) | |
| tree | e6588b5300f7c9b9b17ffece53e216ac9469af12 | |
| parent | ee4185865df1e0b567064b4b2572a1d01455b86b (diff) | |
spaces to tabs
| -rw-r--r-- | data/graphics.s | 182 | ||||
| -rw-r--r-- | data/party_menu.s | 86 | ||||
| -rw-r--r-- | data/pokedex.s | 8 | ||||
| -rw-r--r-- | data/pokedex_entries.inc | 460 | ||||
| -rw-r--r-- | data/pokemon_storage_system.s | 8 | ||||
| -rw-r--r-- | data/pokenav.s | 820 | ||||
| -rw-r--r-- | data/record_mixing.s | 2 | ||||
| -rw-r--r-- | data/reset_rtc_screen.s | 8 | ||||
| -rw-r--r-- | data/rom_8486FEC.s | 8 | ||||
| -rw-r--r-- | data/rom_8525F58.s | 18 | ||||
| -rw-r--r-- | data/save.s | 28 | ||||
| -rw-r--r-- | data/script_menu.s | 2 | ||||
| -rw-r--r-- | data/script_pokemon_util_80F87D8.s | 2 | ||||
| -rw-r--r-- | data/specials.inc | 6 | ||||
| -rw-r--r-- | data/strings.s | 12 | ||||
| -rw-r--r-- | data/text_window.s | 168 | ||||
| -rw-r--r-- | data/trade.s | 8 | ||||
| -rw-r--r-- | data/trainer_card.s | 134 | ||||
| -rw-r--r-- | data/trainer_money.inc | 112 | ||||
| -rw-r--r-- | data/type_effectiveness.inc | 192 | ||||
| -rw-r--r-- | data/unk_sprite_file.s | 24 | ||||
| -rw-r--r-- | data/use_pokeblock.s | 2 | ||||
| -rw-r--r-- | data/wild_encounter.s | 8 |
23 files changed, 1149 insertions, 1149 deletions
diff --git a/data/graphics.s b/data/graphics.s index b2e4e6b34..7fffaba3f 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -126,23 +126,23 @@ gUnknown_08C0237C:: @ 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 @@ -253,28 +253,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 @@ -821,31 +821,31 @@ gUnknown_08D96AB4:: @ 8D96AB4 .incbin "baserom.gba", 0xd96ab4, 0xec gUnknown_08D96BA0:: @ 8D96BA0 - .incbin "baserom.gba", 0xd96ba0, 0x138 + .incbin "baserom.gba", 0xd96ba0, 0x138 gUnknown_08D96CD8:: @ 8D96CD8 - .incbin "baserom.gba", 0xd96cd8, 0x294 + .incbin "baserom.gba", 0xd96cd8, 0x294 gUnknown_08D96F6C:: @ 8D96F6C - .incbin "baserom.gba", 0xd96f6c, 0x24 + .incbin "baserom.gba", 0xd96f6c, 0x24 gUnknown_08D96F90:: @ 8D96F90 - .incbin "baserom.gba", 0xd96f90, 0x1F8 + .incbin "baserom.gba", 0xd96f90, 0x1F8 gUnknown_08D97188:: @ 8D97188 - .incbin "baserom.gba", 0xd97188, 0x28 + .incbin "baserom.gba", 0xd97188, 0x28 gUnknown_08D971B0:: @ 8D971B0 - .incbin "baserom.gba", 0xd971b0, 0x9D4 + .incbin "baserom.gba", 0xd971b0, 0x9D4 gUnknown_08D97B84:: @ 8D97B84 - .incbin "baserom.gba", 0xd97b84, 0x68 + .incbin "baserom.gba", 0xd97b84, 0x68 gUnknown_08D97BEC:: @ 8D97BEC - .incbin "baserom.gba", 0xd97bec, 0x108 + .incbin "baserom.gba", 0xd97bec, 0x108 gUnknown_08D97CF4:: @ 8D97CF4 - .incbin "baserom.gba", 0xd97cf4, 0x18 + .incbin "baserom.gba", 0xd97cf4, 0x18 gUnknown_08D97D0C:: @ 8D97D0C .incbin "baserom.gba", 0xd97d0c, 0x830 @@ -897,9 +897,9 @@ 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 @@ -1154,7 +1154,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 @@ -1301,25 +1301,25 @@ gUnknown_08DC0754:: @ 8DC0754 .incbin "baserom.gba", 0xdc0754, 0x440 gUnknown_08DC0B94:: @ 8DC0B94 - .incbin "baserom.gba", 0xdc0b94, 0x800 + .incbin "baserom.gba", 0xdc0b94, 0x800 gUnknown_08DC1394:: @ 8DC1394 - .incbin "baserom.gba", 0xdc1394, 0x2E0 + .incbin "baserom.gba", 0xdc1394, 0x2E0 gUnknown_08DC1674:: @ 8DC1674 - .incbin "baserom.gba", 0xdc1674, 0x20 + .incbin "baserom.gba", 0xdc1674, 0x20 gUnknown_08DC1694:: @ 8DC1694 - .incbin "baserom.gba", 0xdc1694, 0x20 + .incbin "baserom.gba", 0xdc1694, 0x20 gUnknown_08DC16B4:: @ 8DC16B4 - .incbin "baserom.gba", 0xdc16b4, 0x20 + .incbin "baserom.gba", 0xdc16b4, 0x20 gUnknown_08DC16D4:: @ 8DC16D4 - .incbin "baserom.gba", 0xdc16d4, 0x20 + .incbin "baserom.gba", 0xdc16d4, 0x20 gUnknown_08DC16F4:: @ 8DC16F4 - .incbin "baserom.gba", 0xdc16f4, 0x62 + .incbin "baserom.gba", 0xdc16f4, 0x62 gUnknown_08DC1756:: @ 8DC1756 .incbin "baserom.gba", 0xdc1756, 0x60 @@ -1467,43 +1467,43 @@ gUnknown_08DC7D84:: @ 8DC7D84 .incbin "baserom.gba", 0xdc7d84, 0x17c gUnknown_08DC7F00:: @ 8DC7F00 - .incbin "baserom.gba", 0xdc7f00, 0xA0 + .incbin "baserom.gba", 0xdc7f00, 0xA0 gUnknown_08DC7FA0:: @ 8DC7FA0 - .incbin "baserom.gba", 0xdc7fa0, 0x13C + .incbin "baserom.gba", 0xdc7fa0, 0x13C gUnknown_08DC80DC:: @ 8DC80DC - .incbin "baserom.gba", 0xdc80dc, 0x12C + .incbin "baserom.gba", 0xdc80dc, 0x12C gUnknown_08DC8208:: @ 8DC8208 - .incbin "baserom.gba", 0xdc8208, 0x184 + .incbin "baserom.gba", 0xdc8208, 0x184 gUnknown_08DC838C:: @ 8DC838C - .incbin "baserom.gba", 0xdc838c, 0x120 + .incbin "baserom.gba", 0xdc838c, 0x120 gUnknown_08DC84AC:: @ 8DC84AC - .incbin "baserom.gba", 0xdc84ac, 0x1A0 + .incbin "baserom.gba", 0xdc84ac, 0x1A0 gUnknown_08DC864C:: @ 8DC864C - .incbin "baserom.gba", 0xdc864c, 0x1AC + .incbin "baserom.gba", 0xdc864c, 0x1AC gUnknown_08DC87F8:: @ 8DC87F8 - .incbin "baserom.gba", 0xdc87f8, 0x2AC + .incbin "baserom.gba", 0xdc87f8, 0x2AC gUnknown_08DC8AA4:: @ 8DC8AA4 - .incbin "baserom.gba", 0xdc8aa4, 0x170 + .incbin "baserom.gba", 0xdc8aa4, 0x170 gUnknown_08DC8C14:: @ 8DC8C14 - .incbin "baserom.gba", 0xdc8c14, 0x13C + .incbin "baserom.gba", 0xdc8c14, 0x13C gUnknown_08DC8D50:: @ 8DC8D50 - .incbin "baserom.gba", 0xdc8d50, 0x114 + .incbin "baserom.gba", 0xdc8d50, 0x114 gUnknown_08DC8E64:: @ 8DC8E64 - .incbin "baserom.gba", 0xdc8e64, 0x100 + .incbin "baserom.gba", 0xdc8e64, 0x100 gUnknown_08DC8F64:: @ 8DC8F64 - .incbin "baserom.gba", 0xdc8f64, 0x15C + .incbin "baserom.gba", 0xdc8f64, 0x15C gUnknown_08DC90C0:: @ 8DC90C0 .incbin "baserom.gba", 0xdc90c0, 0x20 @@ -1515,53 +1515,53 @@ gUnknown_08DC9130:: @ 8DC9130 .incbin "baserom.gba", 0xdc9130, 0xb8 gUnknown_08DC91E8:: @ 8DC91E8 - .incbin "baserom.gba", 0xdc91e8, 0x20 + .incbin "baserom.gba", 0xdc91e8, 0x20 gUnknown_08DC9208:: @ 8DC9208 - .incbin "baserom.gba", 0xdc9208, 0x400 + .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 @@ -1584,19 +1584,19 @@ gUnknown_08DCC648:: @ 8DCC648 .incbin "baserom.gba", 0xdcc648, 0x2c0 gUnknown_08DCC908:: @ 8DCC908 - .incbin "baserom.gba", 0xdcc908, 0x290 + .incbin "baserom.gba", 0xdcc908, 0x290 gUnknown_08DCCB98:: @ 8DCCB98 - .incbin "baserom.gba", 0xdccb98, 0x20 + .incbin "baserom.gba", 0xdccb98, 0x20 gUnknown_08DCCBB8:: @ 8DCCBB8 - .incbin "baserom.gba", 0xdccbb8, 0x184 + .incbin "baserom.gba", 0xdccbb8, 0x184 gUnknown_08DCCD3C:: @ 8DCCD3C - .incbin "baserom.gba", 0xdccd3c, 0x20 + .incbin "baserom.gba", 0xdccd3c, 0x20 gUnknown_08DCCD5C:: @ 8DCCD5C - .incbin "baserom.gba", 0xdccd5c, 0x200 + .incbin "baserom.gba", 0xdccd5c, 0x200 gUnknown_08DCCF5C:: @ 8DCCF5C .incbin "baserom.gba", 0xdccf5c, 0x20 @@ -1623,28 +1623,28 @@ gUnknown_08DCEC70:: @ 8DCEC70 .incbin "baserom.gba", 0xdcec70, 0x13e0 gUnknown_08DD0050:: @ 8DD0050 - .incbin "baserom.gba", 0xdd0050, 0x1A08 + .incbin "baserom.gba", 0xdd0050, 0x1A08 gUnknown_08DD1A58:: @ 8DD1A58 - .incbin "baserom.gba", 0xdd1a58, 0x60 + .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, 0x180 + .incbin "baserom.gba", 0xdd228c, 0x180 gUnknown_08DD240C:: @ 8DD240C - .incbin "baserom.gba", 0xdd240c, 0x60 + .incbin "baserom.gba", 0xdd240c, 0x60 gUnknown_08DD246C:: @ 8DD246C .incbin "baserom.gba", 0xdd246c, 0x674 @@ -1709,7 +1709,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" @@ -1743,61 +1743,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/party_menu.s b/data/party_menu.s index a21b985c1..95d9bb78e 100644 --- a/data/party_menu.s +++ b/data/party_menu.s @@ -167,50 +167,50 @@ gUnknown_08615AF1:: @ 8615AF1 gUnknown_08615AF4:: @ 8615AF4 .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 + .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 - .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 + .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 + .incbin "baserom.gba", 0x615b94, 0x74 gUnknown_08615C08:: @ 8615C08 .incbin "baserom.gba", 0x615c08, 0x130 @@ -228,13 +228,13 @@ gUnknown_08615D9C:: @ 8615D9C .incbin "baserom.gba", 0x615d9c, 0x70 gUnknown_08615E0C:: @ 8615E0C - .incbin "baserom.gba", 0x615e0c, 0x24 + .incbin "baserom.gba", 0x615e0c, 0x24 gUnknown_08615E30:: @ 8615E30 - .incbin "baserom.gba", 0x615e30, 0x40 + .incbin "baserom.gba", 0x615e30, 0x40 gUnknown_08615E70:: @ 8615E70 - .incbin "baserom.gba", 0x615e70, 0x40 + .incbin "baserom.gba", 0x615e70, 0x40 gUnknown_08615EB0:: @ 8615EB0 obj_tiles gUnknown_08615E30, 0x40, 55120 diff --git a/data/pokedex.s b/data/pokedex.s index d0c286ab6..004f4484d 100644 --- a/data/pokedex.s +++ b/data/pokedex.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 .macro unk_dex_struct texts, a2, a3, a4 .4byte \texts 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_storage_system.s b/data/pokemon_storage_system.s index 4c630c923..22b065e63 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.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_0857173C:: @ 857173C .incbin "baserom.gba", 0x57173c, 0x20 diff --git a/data/pokenav.s b/data/pokenav.s index ab6d4f0d2..54cad1707 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -174,14 +174,14 @@ gUnknown_0861FAD4:: @ 861FAD4 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 + 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 @@ -283,20 +283,20 @@ gUnknown_086202CC:: @ 86202CC .incbin "baserom.gba", 0x6202cc, 0x8 gUnknown_086202D4:: @ 86202D4 - .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 + .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 @@ -311,943 +311,943 @@ gUnknown_0862036C:: @ 862036C .incbin "baserom.gba", 0x62036c, 0x18 gUnknown_08620384:: @ 8620384 - .incbin "baserom.gba", 0x620384, 0xC + .incbin "baserom.gba", 0x620384, 0xC gUnknown_08620390:: @ 8620390 - .string "Becalm fighting emotions.$" + .string "Becalm fighting emotions.$" gUnknown_086203AA:: @ 86203AA - .string "Fragrant GRASS POKéMON.$" + .string "Fragrant GRASS POKéMON.$" gUnknown_086203C2:: @ 86203C2 - .string "Soothing aromas make the$" + .string "Soothing aromas make the$" gUnknown_086203DB:: @ 86203DB - .string "body and mind healthy.$" + .string "body and mind healthy.$" gUnknown_086203F2:: @ 86203F2 - .string "I’m not very good at this.$" + .string "I’m not very good at this.$" gUnknown_0862040D:: @ 862040D - .string "Ruin-exploration partners.$" + .string "Ruin-exploration partners.$" gUnknown_08620428:: @ 8620428 - .string "I am searching for undersea$" + .string "I am searching for undersea$" gUnknown_08620444:: @ 8620444 - .string "ruins and relics.$" + .string "ruins and relics.$" gUnknown_08620456:: @ 8620456 - .string "Overwhelm with power!$" + .string "Overwhelm with power!$" gUnknown_0862046C:: @ 862046C - .string "Craggy ROCK POKéMON.$" + .string "Craggy ROCK POKéMON.$" gUnknown_08620481:: @ 8620481 - .string "In search of ancient lore,$" + .string "In search of ancient lore,$" gUnknown_0862049C:: @ 862049C - .string "I travel the world.$" + .string "I travel the world.$" gUnknown_086204B0:: @ 86204B0 - .string "I’m going to try hard!$" + .string "I’m going to try hard!$" gUnknown_086204C7:: @ 86204C7 - .string "Good swimmer POKéMON.$" + .string "Good swimmer POKéMON.$" gUnknown_086204DD:: @ 86204DD - .string "I wish I could swim without$" + .string "I wish I could swim without$" gUnknown_086204F9:: @ 86204F9 - .string "using an inner tube.$" + .string "using an inner tube.$" gUnknown_0862050E:: @ 862050E - .string "I don’t know. I’ll try hard.$" + .string "I don’t know. I’ll try hard.$" gUnknown_0862052B:: @ 862052B - .string "WATER POKéMON are buddies.$" + .string "WATER POKéMON are buddies.$" gUnknown_08620546:: @ 8620546 - .string "It’s not like I can’t swim.$" + .string "It’s not like I can’t swim.$" gUnknown_08620562:: @ 8620562 - .string "I just like my inner tube.$" + .string "I just like my inner tube.$" gUnknown_0862057D:: @ 862057D - .string "We split our duties.$" + .string "We split our duties.$" gUnknown_08620592:: @ 8620592 - .string "We like friendly POKéMON.$" + .string "We like friendly POKéMON.$" gUnknown_086205AC:: @ 86205AC - .string "We enjoy POKéMON together$" + .string "We enjoy POKéMON together$" gUnknown_086205C6:: @ 86205C6 - .string "as sister and brother.$" + .string "as sister and brother.$" gUnknown_086205DD:: @ 86205DD - .string "I finish with power moves!$" + .string "I finish with power moves!$" gUnknown_086205F8:: @ 86205F8 - .string "A mix of different types.$" + .string "A mix of different types.$" gUnknown_08620612:: @ 8620612 - .string "I aim to become the ultimate$" + .string "I aim to become the ultimate$" gUnknown_0862062F:: @ 862062F - .string "TRAINER!$" + .string "TRAINER!$" gUnknown_08620638:: @ 8620638 - .string "Exploit the foe’s weakness.$" + .string "Exploit the foe’s weakness.$" gUnknown_08620654:: @ 8620654 - .string "Balance is crucial.$" + .string "Balance is crucial.$" gUnknown_08620668:: @ 8620668 - .string "My goal is to become the$" + .string "My goal is to become the$" gUnknown_08620681:: @ 8620681 - .string "POKéMON CHAMPION.$" + .string "POKéMON CHAMPION.$" gUnknown_08620693:: @ 8620693 - .string "Upset the opponent.$" + .string "Upset the opponent.$" gUnknown_086206A7:: @ 86206A7 - .string "Type doesn’t matter.$" + .string "Type doesn’t matter.$" gUnknown_086206BC:: @ 86206BC - .string "I’m a top student at the$" + .string "I’m a top student at the$" gUnknown_086206D5:: @ 86206D5 - .string "TRAINER’S SCHOOL.$" + .string "TRAINER’S SCHOOL.$" gUnknown_086206E7:: @ 86206E7 - .string "Slow, steady suffering.$" + .string "Slow, steady suffering.$" gUnknown_086206FF:: @ 86206FF - .string "Scary to meet at night.$" + .string "Scary to meet at night.$" gUnknown_08620717:: @ 8620717 - .string "I see things that others$" + .string "I see things that others$" gUnknown_08620730:: @ 8620730 - .string "can’t see...$" + .string "can’t see...$" gUnknown_0862073D:: @ 862073D - .string "Anything to win.$" + .string "Anything to win.$" gUnknown_0862074E:: @ 862074E - .string "Gorgeous type!$" + .string "Gorgeous type!$" gUnknown_0862075D:: @ 862075D - .string "I have a pool specially for$" + .string "I have a pool specially for$" gUnknown_08620779:: @ 8620779 - .string "my POKéMON at home.$" + .string "my POKéMON at home.$" gUnknown_0862078D:: @ 862078D - .string "You’ll fall under my spell!$" + .string "You’ll fall under my spell!$" gUnknown_086207A9:: @ 86207A9 - .string "Mature WATER type.$" + .string "Mature WATER type.$" gUnknown_086207BC:: @ 86207BC - .string "I dream of cruising around$" + .string "I dream of cruising around$" gUnknown_086207D7:: @ 86207D7 - .string "the world on a luxury liner.$" + .string "the world on a luxury liner.$" gUnknown_086207F4:: @ 86207F4 - .string "I’ll lead you astray.$" + .string "I’ll lead you astray.$" gUnknown_0862080A:: @ 862080A - .string "Cute, of course.$" + .string "Cute, of course.$" gUnknown_0862081B:: @ 862081B - .string "I love the SAFARI ZONE.$" + .string "I love the SAFARI ZONE.$" gUnknown_08620833:: @ 8620833 - .string "I seem to end up there.$" + .string "I seem to end up there.$" gUnknown_0862084B:: @ 862084B - .string "Strategy? Who needs it?$" + .string "Strategy? Who needs it?$" gUnknown_08620863:: @ 8620863 - .string "I spent big money on it!$" + .string "I spent big money on it!$" gUnknown_0862087C:: @ 862087C - .string "I, being rich, sleep in a$" + .string "I, being rich, sleep in a$" gUnknown_08620896:: @ 8620896 - .string "custom POKéMON bed.$" + .string "custom POKéMON bed.$" gUnknown_086208AA:: @ 86208AA - .string "Wrestle down with power.$" + .string "Wrestle down with power.$" gUnknown_086208C3:: @ 86208C3 - .string "Took all night to catch.$" + .string "Took all night to catch.$" gUnknown_086208DC:: @ 86208DC - .string "Big, burly, and buff$" + .string "Big, burly, and buff$" gUnknown_086208F1:: @ 86208F1 - .string "POKéMON are the best...$" + .string "POKéMON are the best...$" gUnknown_08620909:: @ 8620909 - .string "Ram at full speed!$" + .string "Ram at full speed!$" gUnknown_0862091C:: @ 862091C - .string "Funky WATER type!$" + .string "Funky WATER type!$" gUnknown_0862092E:: @ 862092E - .string "If I can’t be out swimming,$" + .string "If I can’t be out swimming,$" gUnknown_0862094A:: @ 862094A - .string "I’ll be pumping weights.$" + .string "I’ll be pumping weights.$" gUnknown_08620963:: @ 8620963 - .string "Grand slam pummeling!$" + .string "Grand slam pummeling!$" gUnknown_08620979:: @ 8620979 - .string "FIGHTING type.$" + .string "FIGHTING type.$" gUnknown_08620988:: @ 8620988 - .string "Not to brag, but I can bust$" + .string "Not to brag, but I can bust$" gUnknown_086209A4:: @ 86209A4 - .string "ten roof tiles!$" + .string "ten roof tiles!$" gUnknown_086209B4:: @ 86209B4 - .string "Witness karate power!$" + .string "Witness karate power!$" gUnknown_086209CA:: @ 86209CA - .string "My partners in training!$" + .string "My partners in training!$" gUnknown_086209E3:: @ 86209E3 - .string "Let us discuss matters of$" + .string "Let us discuss matters of$" gUnknown_086209FD:: @ 86209FD - .string "the world with bare fists!$" + .string "the world with bare fists!$" gUnknown_08620A18:: @ 8620A18 - .string "Rock to stunning sounds!$" + .string "Rock to stunning sounds!$" gUnknown_08620A31:: @ 8620A31 - .string "Electric-and-sound combo!$" + .string "Electric-and-sound combo!$" gUnknown_08620A4B:: @ 8620A4B - .string "My compositions will shock$" + .string "My compositions will shock$" gUnknown_08620A66:: @ 8620A66 - .string "you and stun you!$" + .string "you and stun you!$" gUnknown_08620A78:: @ 8620A78 - .string "I’ll electrify you!$" + .string "I’ll electrify you!$" gUnknown_08620A8C:: @ 8620A8C - .string "They’re ELECTRIC!$" + .string "They’re ELECTRIC!$" gUnknown_08620A9E:: @ 8620A9E - .string "I want to make people cry$" + .string "I want to make people cry$" gUnknown_08620AB8:: @ 8620AB8 - .string "with songs from my heart.$" + .string "with songs from my heart.$" gUnknown_08620AD2:: @ 8620AD2 - .string "Burn it all down!$" + .string "Burn it all down!$" gUnknown_08620AE4:: @ 8620AE4 - .string "Burn-inducing POKéMON.$" + .string "Burn-inducing POKéMON.$" gUnknown_08620AFB:: @ 8620AFB - .string "When you light a campfire,$" + .string "When you light a campfire,$" gUnknown_08620B16:: @ 8620B16 - .string "be sure there’s some water.$" + .string "be sure there’s some water.$" gUnknown_08620B32:: @ 8620B32 - .string "Hang in and be tenacious!$" + .string "Hang in and be tenacious!$" gUnknown_08620B4C:: @ 8620B4C - .string "I’ll raise any POKéMON.$" + .string "I’ll raise any POKéMON.$" gUnknown_08620B64:: @ 8620B64 - .string "POKéMON raised in the wild$" + .string "POKéMON raised in the wild$" gUnknown_08620B7F:: @ 8620B7F - .string "grow strong!$" + .string "grow strong!$" gUnknown_08620B8C:: @ 8620B8C - .string "Our love lets us prevail.$" + .string "Our love lets us prevail.$" gUnknown_08620BA6:: @ 8620BA6 - .string "We’ve had them for years.$" + .string "We’ve had them for years.$" gUnknown_08620BC0:: @ 8620BC0 - .string "Married 50 years, we’ve$" + .string "Married 50 years, we’ve$" gUnknown_08620BD8:: @ 8620BD8 - .string "devotedly raised POKéMON.$" + .string "devotedly raised POKéMON.$" gUnknown_08620BF2:: @ 8620BF2 - .string "Attack in waves!$" + .string "Attack in waves!$" gUnknown_08620C03:: @ 8620C03 - .string "BUG POKéMON are cool.$" + .string "BUG POKéMON are cool.$" gUnknown_08620C19:: @ 8620C19 - .string "I go into the forest every$" + .string "I go into the forest every$" gUnknown_08620C34:: @ 8620C34 - .string "day to catch BUG POKéMON.$" + .string "day to catch BUG POKéMON.$" gUnknown_08620C4E:: @ 8620C4E - .string "Daze and confuse!$" + .string "Daze and confuse!$" gUnknown_08620C60:: @ 8620C60 - .string "Ones with weird powers.$" + .string "Ones with weird powers.$" gUnknown_08620C78:: @ 8620C78 - .string "I can see through exactly$" + .string "I can see through exactly$" gUnknown_08620C92:: @ 8620C92 - .string "what you’re thinking!$" + .string "what you’re thinking!$" gUnknown_08620CA8:: @ 8620CA8 - .string "Battle at full power.$" + .string "Battle at full power.$" gUnknown_08620CBE:: @ 8620CBE - .string "POKéMON of many mysteries.$" + .string "POKéMON of many mysteries.$" gUnknown_08620CD9:: @ 8620CD9 - .string "When we spoke, I was really$" + .string "When we spoke, I was really$" gUnknown_08620CF5:: @ 8620CF5 - .string "using telepathy.$" + .string "using telepathy.$" gUnknown_08620D06:: @ 8620D06 - .string "Calm and collected.$" + .string "Calm and collected.$" gUnknown_08620D1A:: @ 8620D1A - .string "POKéMON of distinction.$" + .string "POKéMON of distinction.$" gUnknown_08620D32:: @ 8620D32 - .string "We enjoy a spot of tea$" + .string "We enjoy a spot of tea$" gUnknown_08620D49:: @ 8620D49 - .string "every day. It’s imported.$" + .string "every day. It’s imported.$" gUnknown_08620D63:: @ 8620D63 - .string "I use my head to battle.$" + .string "I use my head to battle.$" gUnknown_08620D7C:: @ 8620D7C - .string "I love any kind of POKéMON!$" + .string "I love any kind of POKéMON!$" gUnknown_08620D98:: @ 8620D98 - .string "My daddy gives me spending$" + .string "My daddy gives me spending$" gUnknown_08620DB3:: @ 8620DB3 - .string "money if I ace a test.$" + .string "money if I ace a test.$" gUnknown_08620DCA:: @ 8620DCA - .string "My knowledge rules!$" + .string "My knowledge rules!$" gUnknown_08620DDE:: @ 8620DDE - .string "Any smart POKéMON!$" + .string "Any smart POKéMON!$" gUnknown_08620DF1:: @ 8620DF1 - .string "I want to be a POKéMON$" + .string "I want to be a POKéMON$" gUnknown_08620E08:: @ 8620E08 - .string "researcher in the future.$" + .string "researcher in the future.$" gUnknown_08620E22:: @ 8620E22 - .string "We talk it over first.$" + .string "We talk it over first.$" gUnknown_08620E39:: @ 8620E39 - .string "POKéMON that we both like.$" + .string "POKéMON that we both like.$" gUnknown_08620E54:: @ 8620E54 - .string "We’re senior and junior$" + .string "We’re senior and junior$" gUnknown_08620E6C:: @ 8620E6C - .string "students into POKéMON!$" + .string "students into POKéMON!$" gUnknown_08620E83:: @ 8620E83 - .string "Go for it, my dears!$" + .string "Go for it, my dears!$" gUnknown_08620E98:: @ 8620E98 - .string "I have no likes or dislikes.$" + .string "I have no likes or dislikes.$" gUnknown_08620EB5:: @ 8620EB5 - .string "While out shopping for$" + .string "While out shopping for$" gUnknown_08620ECC:: @ 8620ECC - .string "supper, I battle too.$" + .string "supper, I battle too.$" gUnknown_08620EE2:: @ 8620EE2 - .string "I battle with love!$" + .string "I battle with love!$" gUnknown_08620EF6:: @ 8620EF6 - .string "A POKéMON raised with love!$" + .string "A POKéMON raised with love!$" gUnknown_08620F12:: @ 8620F12 - .string "It’s important to build$" + .string "It’s important to build$" gUnknown_08620F2A:: @ 8620F2A - .string "trust with your POKéMON.$" + .string "trust with your POKéMON.$" gUnknown_08620F43:: @ 8620F43 - .string "I see through your moves!$" + .string "I see through your moves!$" gUnknown_08620F5D:: @ 8620F5D - .string "The essence of FIGHTING.$" + .string "The essence of FIGHTING.$" gUnknown_08620F76:: @ 8620F76 - .string "I’m not ready to give way$" + .string "I’m not ready to give way$" gUnknown_08620F90:: @ 8620F90 - .string "to the young yet!$" + .string "to the young yet!$" gUnknown_08620FA2:: @ 8620FA2 - .string "Attack while defending.$" + .string "Attack while defending.$" gUnknown_08620FBA:: @ 8620FBA - .string "The FIGHTING type.$" + .string "The FIGHTING type.$" gUnknown_08620FCD:: @ 8620FCD - .string "Being old, I have my own$" + .string "Being old, I have my own$" gUnknown_08620FE6:: @ 8620FE6 - .string "style of battling.$" + .string "style of battling.$" gUnknown_08620FF9:: @ 8620FF9 - .string "I do what I can.$" + .string "I do what I can.$" gUnknown_0862100A:: @ 862100A - .string "I use different types.$" + .string "I use different types.$" gUnknown_08621021:: @ 8621021 - .string "I’m going to keep working$" + .string "I’m going to keep working$" gUnknown_0862103B:: @ 862103B - .string "until I beat a GYM LEADER.$" + .string "until I beat a GYM LEADER.$" gUnknown_08621056:: @ 8621056 - .string "I battle patiently.$" + .string "I battle patiently.$" gUnknown_0862106A:: @ 862106A - .string "WATER POKéMON to battle!$" + .string "WATER POKéMON to battle!$" gUnknown_08621083:: @ 8621083 - .string "I’m the world’s only guy to$" + .string "I’m the world’s only guy to$" gUnknown_0862109F:: @ 862109F - .string "catch a huge POKéMON!$" + .string "catch a huge POKéMON!$" gUnknown_086210B5:: @ 86210B5 - .string "Exploit the environment!$" + .string "Exploit the environment!$" gUnknown_086210CE:: @ 86210CE - .string "All hail the WATER type!$" + .string "All hail the WATER type!$" gUnknown_086210E7:: @ 86210E7 - .string "I won’t be beaten by some$" + .string "I won’t be beaten by some$" gUnknown_08621101:: @ 8621101 - .string "beach bum SWIMMER!$" + .string "beach bum SWIMMER!$" gUnknown_08621114:: @ 8621114 - .string "Speed above all!$" + .string "Speed above all!$" gUnknown_08621125:: @ 8621125 - .string "I use a speedy POKéMON.$" + .string "I use a speedy POKéMON.$" gUnknown_0862113D:: @ 862113D - .string "A marathon is a challenge$" + .string "A marathon is a challenge$" gUnknown_08621157:: @ 8621157 - .string "against your own self.$" + .string "against your own self.$" gUnknown_0862116E:: @ 862116E - .string "Defense is crucial.$" + .string "Defense is crucial.$" gUnknown_08621182:: @ 8621182 - .string "My POKéMON is solid.$" + .string "My POKéMON is solid.$" gUnknown_08621197:: @ 8621197 - .string "I started this for dieting,$" + .string "I started this for dieting,$" gUnknown_086211B3:: @ 86211B3 - .string "but I got right into it.$" + .string "but I got right into it.$" gUnknown_086211CC:: @ 86211CC - .string "Strike before stricken!$" + .string "Strike before stricken!$" gUnknown_086211E4:: @ 86211E4 - .string "A fast-running POKéMON!$" + .string "A fast-running POKéMON!$" gUnknown_086211FC:: @ 86211FC - .string "If you ran and ran, you’d$" + .string "If you ran and ran, you’d$" gUnknown_08621216:: @ 8621216 - .string "become one with the wind.$" + .string "become one with the wind.$" gUnknown_08621230:: @ 8621230 - .string "All-out offensive!$" + .string "All-out offensive!$" gUnknown_08621243:: @ 8621243 - .string "WATER POKéMON rule!$" + .string "WATER POKéMON rule!$" gUnknown_08621257:: @ 8621257 - .string "I must swim over 6 miles$" + .string "I must swim over 6 miles$" gUnknown_08621270:: @ 8621270 - .string "every day.$" + .string "every day.$" gUnknown_0862127B:: @ 862127B - .string "Push and push again!$" + .string "Push and push again!$" gUnknown_08621290:: @ 8621290 - .string "The strength of STEEL.$" + .string "The strength of STEEL.$" gUnknown_086212A7:: @ 86212A7 - .string "If you’re sweating, get$" + .string "If you’re sweating, get$" gUnknown_086212BF:: @ 86212BF - .string "fluids into you regularly.$" + .string "fluids into you regularly.$" gUnknown_086212DA:: @ 86212DA - .string "Draw the power of WATER.$" + .string "Draw the power of WATER.$" gUnknown_086212F3:: @ 86212F3 - .string "Toughened WATER POKéMON.$" + .string "Toughened WATER POKéMON.$" gUnknown_0862130C:: @ 862130C - .string "Training POKéMON is good,$" + .string "Training POKéMON is good,$" gUnknown_08621326:: @ 8621326 - .string "but don’t neglect yourself.$" + .string "but don’t neglect yourself.$" gUnknown_08621342:: @ 8621342 - .string "It’s about POKéMON power!$" + .string "It’s about POKéMON power!$" gUnknown_0862135C:: @ 862135C - .string "See the power of DRAGONS!$" + .string "See the power of DRAGONS!$" gUnknown_08621376:: @ 8621376 - .string "I’ll become legendary as the$" + .string "I’ll become legendary as the$" gUnknown_08621393:: @ 8621393 - .string "strongest one day!$" + .string "strongest one day!$" gUnknown_086213A6:: @ 86213A6 - .string "I’ll show you my technique!$" + .string "I’ll show you my technique!$" gUnknown_086213C2:: @ 86213C2 - .string "Elegantly wheeling BIRDS.$" + .string "Elegantly wheeling BIRDS.$" gUnknown_086213DC:: @ 86213DC - .string "My BIRD POKéMON, deliver my$" + .string "My BIRD POKéMON, deliver my$" gUnknown_086213F8:: @ 86213F8 - .string "love to that girl!$" + .string "love to that girl!$" gUnknown_0862140B:: @ 862140B - .string "You’ll suffer from poison!$" + .string "You’ll suffer from poison!$" gUnknown_08621426:: @ 8621426 - .string "Poisonous POKéMON.$" + .string "Poisonous POKéMON.$" gUnknown_08621439:: @ 8621439 - .string "I undertake training so$" + .string "I undertake training so$" gUnknown_08621451:: @ 8621451 - .string "that I may become a ninja.$" + .string "that I may become a ninja.$" gUnknown_0862146C:: @ 862146C - .string "The first strike wins!$" + .string "The first strike wins!$" gUnknown_08621483:: @ 8621483 - .string "Speedy FIGHTING type.$" + .string "Speedy FIGHTING type.$" gUnknown_08621499:: @ 8621499 - .string "If my POKéMON lose,$" + .string "If my POKéMON lose,$" gUnknown_086214AD:: @ 86214AD - .string "I’ll carry on the fight!$" + .string "I’ll carry on the fight!$" gUnknown_086214C6:: @ 86214C6 - .string "Go, go, my POKéMON!$" + .string "Go, go, my POKéMON!$" gUnknown_086214DA:: @ 86214DA - .string "I’ll raise anything.$" + .string "I’ll raise anything.$" gUnknown_086214EF:: @ 86214EF - .string "UV rays are your skin’s$" + .string "UV rays are your skin’s$" gUnknown_08621507:: @ 8621507 - .string "enemy. Get protected.$" + .string "enemy. Get protected.$" gUnknown_0862151D:: @ 862151D - .string "No mercy!$" + .string "No mercy!$" gUnknown_08621527:: @ 8621527 - .string "Cute WATER POKéMON.$" + .string "Cute WATER POKéMON.$" gUnknown_0862153B:: @ 862153B - .string "I have too many fans.$" + .string "I have too many fans.$" gUnknown_08621551:: @ 8621551 - .string "I was interviewed on TV.$" + .string "I was interviewed on TV.$" gUnknown_0862156A:: @ 862156A - .string "I think about this & that.$" + .string "I think about this & that.$" gUnknown_08621585:: @ 8621585 - .string "I like all POKéMON.$" + .string "I like all POKéMON.$" gUnknown_08621599:: @ 8621599 - .string "What lies beyond that$" + .string "What lies beyond that$" gUnknown_086215AF:: @ 86215AF - .string "yonder hill?$" + .string "yonder hill?$" gUnknown_086215BC:: @ 86215BC - .string "We battle together!$" + .string "We battle together!$" gUnknown_086215D0:: @ 86215D0 - .string "We train together!$" + .string "We train together!$" gUnknown_086215E3:: @ 86215E3 - .string "We like the same POKéMON,$" + .string "We like the same POKéMON,$" gUnknown_086215FD:: @ 86215FD - .string "but different desserts.$" + .string "but different desserts.$" gUnknown_08621615:: @ 8621615 - .string "I force things with power!$" + .string "I force things with power!$" gUnknown_08621630:: @ 8621630 - .string "WATER and FIGHTING types.$" + .string "WATER and FIGHTING types.$" gUnknown_0862164A:: @ 862164A - .string "Seamen are rough spirits!$" + .string "Seamen are rough spirits!$" gUnknown_08621664:: @ 8621664 - .string "Any complaints?$" + .string "Any complaints?$" gUnknown_08621674:: @ 8621674 - .string "Up for a fight anytime!$" + .string "Up for a fight anytime!$" gUnknown_0862168C:: @ 862168C - .string "WATER POKéMON are my faves!$" + .string "WATER POKéMON are my faves!$" gUnknown_086216A8:: @ 86216A8 - .string "If you want to shout loud,$" + .string "If you want to shout loud,$" gUnknown_086216C3:: @ 86216C3 - .string "suck in air with your belly!$" + .string "suck in air with your belly!$" gUnknown_086216E0:: @ 86216E0 - .string "Protect POKéMON from harm.$" + .string "Protect POKéMON from harm.$" gUnknown_086216FB:: @ 86216FB - .string "I love rare POKéMON.$" + .string "I love rare POKéMON.$" gUnknown_08621710:: @ 8621710 - .string "I want to collect all the$" + .string "I want to collect all the$" gUnknown_0862172A:: @ 862172A - .string "world’s rare POKéMON.$" + .string "world’s rare POKéMON.$" gUnknown_08621740:: @ 8621740 - .string "I count on power.$" + .string "I count on power.$" gUnknown_08621752:: @ 8621752 - .string "POKéMON are my children.$" + .string "POKéMON are my children.$" gUnknown_0862176B:: @ 862176B - .string "It takes knowledge and$" + .string "It takes knowledge and$" gUnknown_08621782:: @ 8621782 - .string "love to raise POKéMON.$" + .string "love to raise POKéMON.$" gUnknown_08621799:: @ 8621799 - .string "Full-on attack!$" + .string "Full-on attack!$" gUnknown_086217A9:: @ 86217A9 - .string "Anything. I’ll raise it.$" + .string "Anything. I’ll raise it.$" gUnknown_086217C2:: @ 86217C2 - .string "I give them {POKEBLOCK}S for$" + .string "I give them {POKEBLOCK}S for$" gUnknown_086217D9:: @ 86217D9 - .string "going after CONTEST titles.$" + .string "going after CONTEST titles.$" gUnknown_086217F5:: @ 86217F5 - .string "I raise POKéMON with care.$" + .string "I raise POKéMON with care.$" gUnknown_08621810:: @ 8621810 - .string "Fun-to-raise POKéMON.$" + .string "Fun-to-raise POKéMON.$" gUnknown_08621826:: @ 8621826 - .string "Treat every POKéMON you$" + .string "Treat every POKéMON you$" gUnknown_0862183E:: @ 862183E - .string "meet with respect.$" + .string "meet with respect.$" gUnknown_08621851:: @ 8621851 - .string "I believe in my POKéMON.$" + .string "I believe in my POKéMON.$" gUnknown_0862186A:: @ 862186A - .string "I like strong POKéMON.$" + .string "I like strong POKéMON.$" gUnknown_08621881:: @ 8621881 - .string "I’m training for rescue$" + .string "I’m training for rescue$" gUnknown_08621899:: @ 8621899 - .string "work with my POKéMON.$" + .string "work with my POKéMON.$" gUnknown_086218AF:: @ 86218AF - .string "Attack in waves!$" + .string "Attack in waves!$" gUnknown_086218C0:: @ 86218C0 - .string "I use different types.$" + .string "I use different types.$" gUnknown_086218D7:: @ 86218D7 - .string "Those who destroy nature$" + .string "Those who destroy nature$" gUnknown_086218F0:: @ 86218F0 - .string "must never be forgiven!$" + .string "must never be forgiven!$" gUnknown_08621908:: @ 8621908 - .string "I’ll show you some guts!$" + .string "I’ll show you some guts!$" gUnknown_08621921:: @ 8621921 - .string "Cute POKéMON are my faves!$" + .string "Cute POKéMON are my faves!$" gUnknown_0862193C:: @ 862193C - .string "After a battle, I always$" + .string "After a battle, I always$" gUnknown_08621955:: @ 8621955 - .string "bathe with my POKéMON.$" + .string "bathe with my POKéMON.$" gUnknown_0862196C:: @ 862196C - .string "Lightning-fast attack!$" + .string "Lightning-fast attack!$" gUnknown_08621983:: @ 8621983 - .string "BUG POKéMON are number 1!$" + .string "BUG POKéMON are number 1!$" gUnknown_0862199D:: @ 862199D - .string "If you want to catch BUG$" + .string "If you want to catch BUG$" gUnknown_086219B6:: @ 86219B6 - .string "POKéMON, wake up early.$" + .string "POKéMON, wake up early.$" gUnknown_086219CE:: @ 86219CE - .string "I battle with power.$" + .string "I battle with power.$" gUnknown_086219E3:: @ 86219E3 - .string "Hard-bodied POKéMON.$" + .string "Hard-bodied POKéMON.$" gUnknown_086219F8:: @ 86219F8 - .string "I’ve been planning a month$" + .string "I’ve been planning a month$" gUnknown_08621A13:: @ 8621A13 - .string "for today’s hike.$" + .string "for today’s hike.$" gUnknown_08621A25:: @ 8621A25 - .string "I like it hot!$" + .string "I like it hot!$" gUnknown_08621A34:: @ 8621A34 - .string "Hot POKéMON!$" + .string "Hot POKéMON!$" gUnknown_08621A41:: @ 8621A41 - .string "As much as I love POKéMON,$" + .string "As much as I love POKéMON,$" gUnknown_08621A5C:: @ 8621A5C - .string "I surely like hiking!$" + .string "I surely like hiking!$" gUnknown_08621A72:: @ 8621A72 - .string "Lovey-dovey strategy!$" + .string "Lovey-dovey strategy!$" gUnknown_08621A88:: @ 8621A88 - .string "Lovey-dovey POKéMON!$" + .string "Lovey-dovey POKéMON!$" gUnknown_08621A9D:: @ 8621A9D - .string "We’re lovey-dovey!$" + .string "We’re lovey-dovey!$" gUnknown_08621AB0:: @ 8621AB0 - .string "Forever lovey-dovey!$" + .string "Forever lovey-dovey!$" gUnknown_08621AC5:: @ 8621AC5 - .string "We let it all hang out.$" + .string "We let it all hang out.$" gUnknown_08621ADD:: @ 8621ADD - .string "The 1st POKéMON I caught.$" + .string "The 1st POKéMON I caught.$" gUnknown_08621AF7:: @ 8621AF7 - .string "POKéMON and I have grown$" + .string "POKéMON and I have grown$" gUnknown_08621B10:: @ 8621B10 - .string "stronger together.$" + .string "stronger together.$" gUnknown_08621B23:: @ 8621B23 - .string "ROCK-type power attack.$" + .string "ROCK-type power attack.$" gUnknown_08621B3B:: @ 8621B3B - .string "I prefer rock-hard POKéMON.$" + .string "I prefer rock-hard POKéMON.$" gUnknown_08621B57:: @ 8621B57 - .string "A LEADER of a big GYM bears$" + .string "A LEADER of a big GYM bears$" gUnknown_08621B73:: @ 8621B73 - .string "a lot of responsibility.$" + .string "a lot of responsibility.$" gUnknown_08621B8C:: @ 8621B8C - .string "Direct physical action!$" + .string "Direct physical action!$" gUnknown_08621BA4:: @ 8621BA4 - .string "FIGHTING POKéMON rule!$" + .string "FIGHTING POKéMON rule!$" gUnknown_08621BBB:: @ 8621BBB - .string "The world awaits me as the$" + .string "The world awaits me as the$" gUnknown_08621BD6:: @ 8621BD6 - .string "next big wave!$" + .string "next big wave!$" gUnknown_08621BE5:: @ 8621BE5 - .string "I choose to electrify.$" + .string "I choose to electrify.$" gUnknown_08621BFC:: @ 8621BFC - .string "Get shocked by electricity!$" + .string "Get shocked by electricity!$" gUnknown_08621C18:: @ 8621C18 - .string "One must never throw a$" + .string "One must never throw a$" gUnknown_08621C2F:: @ 8621C2F - .string "match. Even I must not.$" + .string "match. Even I must not.$" gUnknown_08621C47:: @ 8621C47 - .string "Battle aggressively.$" + .string "Battle aggressively.$" gUnknown_08621C5C:: @ 8621C5C - .string "Burn with passion!$" + .string "Burn with passion!$" gUnknown_08621C6F:: @ 8621C6F - .string "Completely wash away daily$" + .string "Completely wash away daily$" gUnknown_08621C8A:: @ 8621C8A - .string "fatigue in hot springs!$" + .string "fatigue in hot springs!$" gUnknown_08621CA2:: @ 8621CA2 - .string "I flexibly adapt my style.$" + .string "I flexibly adapt my style.$" gUnknown_08621CBD:: @ 8621CBD - .string "Grown in a balanced manner.$" + .string "Grown in a balanced manner.$" gUnknown_08621CD9:: @ 8621CD9 - .string "I walk the 30 minutes from$" + .string "I walk the 30 minutes from$" gUnknown_08621CF4:: @ 8621CF4 - .string "home to here every day.$" + .string "home to here every day.$" gUnknown_08621D0C:: @ 8621D0C - .string "I take advantage of speed.$" + .string "I take advantage of speed.$" gUnknown_08621D27:: @ 8621D27 - .string "Graceful sky dancers.$" + .string "Graceful sky dancers.$" gUnknown_08621D3D:: @ 8621D3D - .string "The ultimate would be to$" + .string "The ultimate would be to$" gUnknown_08621D56:: @ 8621D56 - .string "live as one with nature.$" + .string "live as one with nature.$" gUnknown_08621D6F:: @ 8621D6F - .string "We battle in cooperation.$" + .string "We battle in cooperation.$" gUnknown_08621D89:: @ 8621D89 - .string "Always friendly POKéMON.$" + .string "Always friendly POKéMON.$" gUnknown_08621DA2:: @ 8621DA2 - .string "Papa has trouble telling$" + .string "Papa has trouble telling$" gUnknown_08621DBB:: @ 8621DBB - .string "the two of us apart!$" + .string "the two of us apart!$" gUnknown_08621DD0:: @ 8621DD0 - .string "I use splendid waterpower.$" + .string "I use splendid waterpower.$" gUnknown_08621DEB:: @ 8621DEB - .string "POKéMON of elegance!$" + .string "POKéMON of elegance!$" gUnknown_08621E00:: @ 8621E00 - .string "The adulation of beautiful$" + .string "The adulation of beautiful$" gUnknown_08621E1B:: @ 8621E1B - .string "ladies fills me with energy!$" + .string "ladies fills me with energy!$" gUnknown_08621E38:: @ 8621E38 - .string "Offense over defense!$" + .string "Offense over defense!$" gUnknown_08621E4E:: @ 8621E4E - .string "The DARK side’s beauties.$" + .string "The DARK side’s beauties.$" gUnknown_08621E68:: @ 8621E68 - .string "They said I was a punk, but$" + .string "They said I was a punk, but$" gUnknown_08621E84:: @ 8621E84 - .string "I’m one of the ELITE FOUR!$" + .string "I’m one of the ELITE FOUR!$" gUnknown_08621E9F:: @ 8621E9F - .string "Confuse and confound.$" + .string "Confuse and confound.$" gUnknown_08621EB5:: @ 8621EB5 - .string "There’s nothing definite.$" + .string "There’s nothing definite.$" gUnknown_08621ECF:: @ 8621ECF - .string "I wonder how my grandma at$" + .string "I wonder how my grandma at$" gUnknown_08621EEA:: @ 8621EEA - .string "MT. PYRE is doing?$" + .string "MT. PYRE is doing?$" gUnknown_08621EFD:: @ 8621EFD - .string "I use items for help.$" + .string "I use items for help.$" gUnknown_08621F13:: @ 8621F13 - .string "Flaming passion in icy cold!$" + .string "Flaming passion in icy cold!$" gUnknown_08621F30:: @ 8621F30 - .string "The ICE type can be better$" + .string "The ICE type can be better$" gUnknown_08621F4B:: @ 8621F4B - .string "trained in this hot land.$" + .string "trained in this hot land.$" gUnknown_08621F65:: @ 8621F65 - .string "Harness strong abilities.$" + .string "Harness strong abilities.$" gUnknown_08621F7F:: @ 8621F7F - .string "The raw power of DRAGONS!$" + .string "The raw power of DRAGONS!$" gUnknown_08621F99:: @ 8621F99 - .string "I dedicate myself to the$" + .string "I dedicate myself to the$" gUnknown_08621FB2:: @ 8621FB2 - .string "POKéMON that saved me.$" + .string "POKéMON that saved me.$" gUnknown_08621FC9:: @ 8621FC9 - .string "Dignity and respect.$" + .string "Dignity and respect.$" gUnknown_08621FDE:: @ 8621FDE - .string "I prefer POKéMON of grace.$" + .string "I prefer POKéMON of grace.$" gUnknown_08621FF9:: @ 8621FF9 - .string "I represent beauty as$" + .string "I represent beauty as$" gUnknown_0862200F:: @ 862200F - .string "well as intelligence.$" + .string "well as intelligence.$" .align 2 @@ -1345,10 +1345,10 @@ gUnknown_08622530:: @ 8622530 .incbin "baserom.gba", 0x622530, 0xa4 gUnknown_086225D4:: @ 86225D4 - .incbin "baserom.gba", 0x6225d4, 0xC4 + .incbin "baserom.gba", 0x6225d4, 0xC4 gUnknown_08622698:: @ 8622698 - .incbin "baserom.gba", 0x622698, 0x48 + .incbin "baserom.gba", 0x622698, 0x48 gUnknown_086226E0:: @ 86226E0 .incbin "baserom.gba", 0x6226e0, 0x20 @@ -1432,73 +1432,73 @@ gUnknown_08622868:: @ 8622868 .incbin "baserom.gba", 0x622868, 0x20 gUnknown_08622888:: @ 8622888 - .incbin "baserom.gba", 0x622888, 0x1F4 + .incbin "baserom.gba", 0x622888, 0x1F4 gUnknown_08622A7C:: @ 8622A7C - .incbin "baserom.gba", 0x622a7c, 0x44 + .incbin "baserom.gba", 0x622a7c, 0x44 gUnknown_08622AC0:: @ 8622AC0 - .incbin "baserom.gba", 0x622ac0, 0x48 + .incbin "baserom.gba", 0x622ac0, 0x48 gUnknown_08622B08:: @ 8622B08 - .incbin "baserom.gba", 0x622b08, 0x50 + .incbin "baserom.gba", 0x622b08, 0x50 gUnknown_08622B58:: @ 8622B58 - .incbin "baserom.gba", 0x622b58, 0x60 + .incbin "baserom.gba", 0x622b58, 0x60 gUnknown_08622BB8:: @ 8622BB8 - .incbin "baserom.gba", 0x622bb8, 0x4C + .incbin "baserom.gba", 0x622bb8, 0x4C gUnknown_08622C04:: @ 8622C04 - .incbin "baserom.gba", 0x622c04, 0x54 + .incbin "baserom.gba", 0x622c04, 0x54 gUnknown_08622C58:: @ 8622C58 - .incbin "baserom.gba", 0x622c58, 0x54 + .incbin "baserom.gba", 0x622c58, 0x54 gUnknown_08622CAC:: @ 8622CAC - .incbin "baserom.gba", 0x622cac, 0x40 + .incbin "baserom.gba", 0x622cac, 0x40 gUnknown_08622CEC:: @ 8622CEC - .incbin "baserom.gba", 0x622cec, 0x58 + .incbin "baserom.gba", 0x622cec, 0x58 gUnknown_08622D44:: @ 8622D44 - .incbin "baserom.gba", 0x622d44, 0x54 + .incbin "baserom.gba", 0x622d44, 0x54 gUnknown_08622D98:: @ 8622D98 - .incbin "baserom.gba", 0x622d98, 0x30 + .incbin "baserom.gba", 0x622d98, 0x30 gUnknown_08622DC8:: @ 8622DC8 - .incbin "baserom.gba", 0x622dc8, 0x4C + .incbin "baserom.gba", 0x622dc8, 0x4C gUnknown_08622E14:: @ 8622E14 - .incbin "baserom.gba", 0x622e14, 0x58 + .incbin "baserom.gba", 0x622e14, 0x58 gUnknown_08622E6C:: @ 8622E6C - .incbin "baserom.gba", 0x622e6c, 0x30 + .incbin "baserom.gba", 0x622e6c, 0x30 gUnknown_08622E9C:: @ 8622E9C - .incbin "baserom.gba", 0x622e9c, 0x38 + .incbin "baserom.gba", 0x622e9c, 0x38 gUnknown_08622ED4:: @ 8622ED4 - .incbin "baserom.gba", 0x622ed4, 0x40 + .incbin "baserom.gba", 0x622ed4, 0x40 gUnknown_08622F14:: @ 8622F14 - .incbin "baserom.gba", 0x622f14, 0x48 + .incbin "baserom.gba", 0x622f14, 0x48 gUnknown_08622F5C:: @ 8622F5C - .incbin "baserom.gba", 0x622f5c, 0x44 + .incbin "baserom.gba", 0x622f5c, 0x44 gUnknown_08622FA0:: @ 8622FA0 - .incbin "baserom.gba", 0x622fa0, 0x38 + .incbin "baserom.gba", 0x622fa0, 0x38 gUnknown_08622FD8:: @ 8622FD8 - .incbin "baserom.gba", 0x622fd8, 0x48 + .incbin "baserom.gba", 0x622fd8, 0x48 gUnknown_08623020:: @ 8623020 - .incbin "baserom.gba", 0x623020, 0x5C + .incbin "baserom.gba", 0x623020, 0x5C gUnknown_0862307C:: @ 862307C - .incbin "baserom.gba", 0x62307c, 0x5C + .incbin "baserom.gba", 0x62307c, 0x5C gUnknown_086230D8:: @ 86230D8 .incbin "baserom.gba", 0x6230d8, 0xc @@ -1694,28 +1694,28 @@ gUnknown_086237F8:: @ 86237F8 .include "data/text/gift_ribbon_descriptions.inc" gUnknown_08623FF8:: @ 8623FF8 - .incbin "baserom.gba", 0x623ff8, 0x20 + .incbin "baserom.gba", 0x623ff8, 0x20 gUnknown_08624018:: @ 8624018 - .incbin "baserom.gba", 0x624018, 0x20 + .incbin "baserom.gba", 0x624018, 0x20 gUnknown_08624038:: @ 8624038 - .incbin "baserom.gba", 0x624038, 0x20 + .incbin "baserom.gba", 0x624038, 0x20 gUnknown_08624058:: @ 8624058 - .incbin "baserom.gba", 0x624058, 0x20 + .incbin "baserom.gba", 0x624058, 0x20 gUnknown_08624078:: @ 8624078 - .incbin "baserom.gba", 0x624078, 0x20 + .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, 0x1C8 + .incbin "baserom.gba", 0x6240b8, 0x1C8 gUnknown_08624280:: @ 8624280 - .incbin "baserom.gba", 0x624280, 0x918 + .incbin "baserom.gba", 0x624280, 0x918 gUnknown_08624B98:: @ 8624B98 .incbin "baserom.gba", 0x624b98, 0x8 @@ -1767,93 +1767,93 @@ gUnknown_08624CB0:: @ 8624CB0 .incbin "baserom.gba", 0x624cb0, 0x54 gUnknown_08624D04:: @ 8624D04 - .incbin "baserom.gba", 0x624d04, 0x78 + .incbin "baserom.gba", 0x624d04, 0x78 gUnknown_08624D7C:: @ 8624D7C - .incbin "baserom.gba", 0x624d7c, 0x60 + .incbin "baserom.gba", 0x624d7c, 0x60 gUnknown_08624DDC:: @ 8624DDC - .incbin "baserom.gba", 0x624ddc, 0x14 + .incbin "baserom.gba", 0x624ddc, 0x14 gUnknown_08624DF0:: @ 8624DF0 - .incbin "baserom.gba", 0x624df0, 0x2C + .incbin "baserom.gba", 0x624df0, 0x2C gUnknown_08624E1C:: @ 8624E1C - .incbin "baserom.gba", 0x624e1c, 0x50 + .incbin "baserom.gba", 0x624e1c, 0x50 gUnknown_08624E6C:: @ 8624E6C - .incbin "baserom.gba", 0x624e6c, 0x90 + .incbin "baserom.gba", 0x624e6c, 0x90 gUnknown_08624EFC:: @ 8624EFC - .incbin "baserom.gba", 0x624efc, 0x90 + .incbin "baserom.gba", 0x624efc, 0x90 gUnknown_08624F8C:: @ 8624F8C - .incbin "baserom.gba", 0x624f8c, 0x60 + .incbin "baserom.gba", 0x624f8c, 0x60 gUnknown_08624FEC:: @ 8624FEC - .incbin "baserom.gba", 0x624fec, 0x54 + .incbin "baserom.gba", 0x624fec, 0x54 gUnknown_08625040:: @ 8625040 - .incbin "baserom.gba", 0x625040, 0x38 + .incbin "baserom.gba", 0x625040, 0x38 gUnknown_08625078:: @ 8625078 - .incbin "baserom.gba", 0x625078, 0x3C + .incbin "baserom.gba", 0x625078, 0x3C gUnknown_086250B4:: @ 86250B4 - .incbin "baserom.gba", 0x6250b4, 0x3C + .incbin "baserom.gba", 0x6250b4, 0x3C gUnknown_086250F0:: @ 86250F0 - .incbin "baserom.gba", 0x6250f0, 0x3C + .incbin "baserom.gba", 0x6250f0, 0x3C gUnknown_0862512C:: @ 862512C - .incbin "baserom.gba", 0x62512c, 0x3C + .incbin "baserom.gba", 0x62512c, 0x3C gUnknown_08625168:: @ 8625168 - .incbin "baserom.gba", 0x625168, 0x3C + .incbin "baserom.gba", 0x625168, 0x3C gUnknown_086251A4:: @ 86251A4 - .incbin "baserom.gba", 0x6251a4, 0x3C + .incbin "baserom.gba", 0x6251a4, 0x3C gUnknown_086251E0:: @ 86251E0 - .incbin "baserom.gba", 0x6251e0, 0x24 + .incbin "baserom.gba", 0x6251e0, 0x24 gUnknown_08625204:: @ 8625204 - .incbin "baserom.gba", 0x625204, 0x24 + .incbin "baserom.gba", 0x625204, 0x24 gUnknown_08625228:: @ 8625228 - .incbin "baserom.gba", 0x625228, 0x24 + .incbin "baserom.gba", 0x625228, 0x24 gUnknown_0862524C:: @ 862524C - .incbin "baserom.gba", 0x62524c, 0x24 + .incbin "baserom.gba", 0x62524c, 0x24 gUnknown_08625270:: @ 8625270 - .incbin "baserom.gba", 0x625270, 0x24 + .incbin "baserom.gba", 0x625270, 0x24 gUnknown_08625294:: @ 8625294 - .incbin "baserom.gba", 0x625294, 0x14 + .incbin "baserom.gba", 0x625294, 0x14 gUnknown_086252A8:: @ 86252A8 .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 + .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 .4byte sub_81D1628 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 cf4a5df01..33c185d39 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 360a6f50a..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 .byte 3, 4, 5, 14 diff --git a/data/specials.inc b/data/specials.inc index abc0a6e6c..15aa2b7a6 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 diff --git a/data/strings.s b/data/strings.s index 1d6444cd8..5eb2b13ee 100644 --- a/data/strings.s +++ b/data/strings.s @@ -304,13 +304,13 @@ gText_UnkWeight:: @ 85E86D0 .string "????.? lbs.$" gUnknown_085E86DC:: @ 85E86DC - .string " POKéMON$" + .string " POKéMON$" gUnknown_085E86FB:: @ 85E86FB - .string "{CLEAR_TO 0x0C} ’ ”$" + .string "{CLEAR_TO 0x0C} ’ ”$" gUnknown_085E8709:: @ 85E8709 - .string " . lbs.$" + .string " . lbs.$" gUnknown_085E871A:: @ 85E871A .string "$" @@ -1923,7 +1923,7 @@ gUnknown_085EAFE8:: @ 85EAFE8 .string "MUDKIP DOLL 1,000 COINS$" gUnknown_085EB002:: @ 85EB002 - .string " 50 COINS ¥1,000$" + .string " 50 COINS ¥1,000$" gUnknown_085EB017:: @ 85EB017 .string "500 COINS ¥10,000$" @@ -2121,7 +2121,7 @@ gText_MenuOptionExit:: @ 85EB285 .string "EXIT$" gUnknown_085EB28A:: @ 85EB28A - .string " " + .string " " gUnknown_085EB28C:: @ 85EB28C .string "5BP$" @@ -4800,7 +4800,7 @@ gText_AcceptThisPkmn:: @ 85EECF0 .string "Accept this POKéMON?$" gUnknown_085EED05:: @ 85EED05 - .string " $" + .string " $" gText_SamePkmnInPartyAlready:: @ 85EED0A .string "Same {PKMN} in party already.$" diff --git a/data/text_window.s b/data/text_window.s index 26c231f90..716425100 100644 --- a/data/text_window.s +++ b/data/text_window.s @@ -1,170 +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, 0x120 + .incbin "baserom.gba", 0x50e87c, 0x120 gUnknown_0850E99C:: @ 850E99C - .incbin "baserom.gba", 0x50e99c, 0x120 + .incbin "baserom.gba", 0x50e99c, 0x120 gUnknown_0850EABC:: @ 850EABC - .incbin "baserom.gba", 0x50eabc, 0x120 + .incbin "baserom.gba", 0x50eabc, 0x120 gUnknown_0850EBDC:: @ 850EBDC - .incbin "baserom.gba", 0x50ebdc, 0x120 + .incbin "baserom.gba", 0x50ebdc, 0x120 gUnknown_0850ECFC:: @ 850ECFC - .incbin "baserom.gba", 0x50ecfc, 0x120 + .incbin "baserom.gba", 0x50ecfc, 0x120 gUnknown_0850EE1C:: @ 850EE1C - .incbin "baserom.gba", 0x50ee1c, 0x120 + .incbin "baserom.gba", 0x50ee1c, 0x120 gUnknown_0850EF3C:: @ 850EF3C - .incbin "baserom.gba", 0x50ef3c, 0x120 + .incbin "baserom.gba", 0x50ef3c, 0x120 gUnknown_0850F05C:: @ 850F05C - .incbin "baserom.gba", 0x50f05c, 0x120 + .incbin "baserom.gba", 0x50f05c, 0x120 gUnknown_0850F17C:: @ 850F17C - .incbin "baserom.gba", 0x50f17c, 0x120 + .incbin "baserom.gba", 0x50f17c, 0x120 gUnknown_0850F29C:: @ 850F29C - .incbin "baserom.gba", 0x50f29c, 0x120 + .incbin "baserom.gba", 0x50f29c, 0x120 gUnknown_0850F3BC:: @ 850F3BC - .incbin "baserom.gba", 0x50f3bc, 0x120 + .incbin "baserom.gba", 0x50f3bc, 0x120 gUnknown_0850F4DC:: @ 850F4DC - .incbin "baserom.gba", 0x50f4dc, 0x120 + .incbin "baserom.gba", 0x50f4dc, 0x120 gUnknown_0850F5FC:: @ 850F5FC - .incbin "baserom.gba", 0x50f5fc, 0x120 + .incbin "baserom.gba", 0x50f5fc, 0x120 gUnknown_0850F71C:: @ 850F71C - .incbin "baserom.gba", 0x50f71c, 0x120 + .incbin "baserom.gba", 0x50f71c, 0x120 gUnknown_0850F83C:: @ 850F83C - .incbin "baserom.gba", 0x50f83c, 0x120 + .incbin "baserom.gba", 0x50f83c, 0x120 gUnknown_0850F95C:: @ 850F95C - .incbin "baserom.gba", 0x50f95c, 0x120 + .incbin "baserom.gba", 0x50f95c, 0x120 gUnknown_0850FA7C:: @ 850FA7C - .incbin "baserom.gba", 0x50fa7c, 0x120 + .incbin "baserom.gba", 0x50fa7c, 0x120 gUnknown_0850FB9C:: @ 850FB9C - .incbin "baserom.gba", 0x50fb9c, 0x120 + .incbin "baserom.gba", 0x50fb9c, 0x120 gUnknown_0850FCBC:: @ 850FCBC - .incbin "baserom.gba", 0x50fcbc, 0x120 + .incbin "baserom.gba", 0x50fcbc, 0x120 gUnknown_0850FDDC:: @ 850FDDC - .incbin "baserom.gba", 0x50fddc, 0x120 + .incbin "baserom.gba", 0x50fddc, 0x120 gUnknown_0850FEFC:: @ 850FEFC - .incbin "baserom.gba", 0x50fefc, 0x20 + .incbin "baserom.gba", 0x50fefc, 0x20 gUnknown_0850FF1C:: @ 850FF1C - .incbin "baserom.gba", 0x50ff1c, 0x20 + .incbin "baserom.gba", 0x50ff1c, 0x20 gUnknown_0850FF3C:: @ 850FF3C - .incbin "baserom.gba", 0x50ff3c, 0x20 + .incbin "baserom.gba", 0x50ff3c, 0x20 gUnknown_0850FF5C:: @ 850FF5C - .incbin "baserom.gba", 0x50ff5c, 0x20 + .incbin "baserom.gba", 0x50ff5c, 0x20 gUnknown_0850FF7C:: @ 850FF7C - .incbin "baserom.gba", 0x50ff7c, 0x20 + .incbin "baserom.gba", 0x50ff7c, 0x20 gUnknown_0850FF9C:: @ 850FF9C - .incbin "baserom.gba", 0x50ff9c, 0x20 + .incbin "baserom.gba", 0x50ff9c, 0x20 gUnknown_0850FFBC:: @ 850FFBC - .incbin "baserom.gba", 0x50ffbc, 0x20 + .incbin "baserom.gba", 0x50ffbc, 0x20 gUnknown_0850FFDC:: @ 850FFDC - .incbin "baserom.gba", 0x50ffdc, 0x20 + .incbin "baserom.gba", 0x50ffdc, 0x20 gUnknown_0850FFFC:: @ 850FFFC - .incbin "baserom.gba", 0x50fffc, 0x20 + .incbin "baserom.gba", 0x50fffc, 0x20 gUnknown_0851001C:: @ 851001C - .incbin "baserom.gba", 0x51001c, 0x20 + .incbin "baserom.gba", 0x51001c, 0x20 gUnknown_0851003C:: @ 851003C - .incbin "baserom.gba", 0x51003c, 0x20 + .incbin "baserom.gba", 0x51003c, 0x20 gUnknown_0851005C:: @ 851005C - .incbin "baserom.gba", 0x51005c, 0x20 + .incbin "baserom.gba", 0x51005c, 0x20 gUnknown_0851007C:: @ 851007C - .incbin "baserom.gba", 0x51007c, 0x20 + .incbin "baserom.gba", 0x51007c, 0x20 gUnknown_0851009C:: @ 851009C - .incbin "baserom.gba", 0x51009c, 0x20 + .incbin "baserom.gba", 0x51009c, 0x20 gUnknown_085100BC:: @ 85100BC - .incbin "baserom.gba", 0x5100bc, 0x20 + .incbin "baserom.gba", 0x5100bc, 0x20 gUnknown_085100DC:: @ 85100DC - .incbin "baserom.gba", 0x5100dc, 0x20 + .incbin "baserom.gba", 0x5100dc, 0x20 gUnknown_085100FC:: @ 85100FC - .incbin "baserom.gba", 0x5100fc, 0x20 + .incbin "baserom.gba", 0x5100fc, 0x20 gUnknown_0851011C:: @ 851011C - .incbin "baserom.gba", 0x51011c, 0x20 + .incbin "baserom.gba", 0x51011c, 0x20 gUnknown_0851013C:: @ 851013C - .incbin "baserom.gba", 0x51013c, 0x20 + .incbin "baserom.gba", 0x51013c, 0x20 gUnknown_0851015C:: @ 851015C - .incbin "baserom.gba", 0x51015c, 0x20 + .incbin "baserom.gba", 0x51015c, 0x20 gUnknown_0851017C:: @ 851017C - .incbin "baserom.gba", 0x51017c, 0xA0 + .incbin "baserom.gba", 0x51017c, 0xA0 gUnknown_0851021C:: @ 851021C .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 + .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..8c6d1cb8a 100644 --- a/data/trade.s +++ b/data/trade.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_0832C6A8:: @ 832C6A8 .incbin "baserom.gba", 0x32C6A8, 0x18 diff --git a/data/trainer_card.s b/data/trainer_card.s index f81bfcad1..46895d9b1 100644 --- a/data/trainer_card.s +++ b/data/trainer_card.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 .macro unk_trainer_card_struct text1, text2, short1, short2, short3, short4 .4byte \text1 @@ -14,31 +14,31 @@ .endm gUnknown_0856F018:: @ 856F018 - .incbin "baserom.gba", 0x56f018, 0x194 + .incbin "baserom.gba", 0x56f018, 0x194 gUnknown_0856F1AC:: @ 856F1AC - .incbin "baserom.gba", 0x56f1ac, 0x60 + .incbin "baserom.gba", 0x56f1ac, 0x60 gUnknown_0856F20C:: @ 856F20C - .incbin "baserom.gba", 0x56f20c, 0x60 + .incbin "baserom.gba", 0x56f20c, 0x60 gUnknown_0856F26C:: @ 856F26C - .incbin "baserom.gba", 0x56f26c, 0x60 + .incbin "baserom.gba", 0x56f26c, 0x60 gUnknown_0856F2CC:: @ 856F2CC - .incbin "baserom.gba", 0x56f2cc, 0x60 + .incbin "baserom.gba", 0x56f2cc, 0x60 gUnknown_0856F32C:: @ 856F32C - .incbin "baserom.gba", 0x56f32c, 0x60 + .incbin "baserom.gba", 0x56f32c, 0x60 gUnknown_0856F38C:: @ 856F38C - .incbin "baserom.gba", 0x56f38c, 0x60 + .incbin "baserom.gba", 0x56f38c, 0x60 gUnknown_0856F3EC:: @ 856F3EC - .incbin "baserom.gba", 0x56f3ec, 0x60 + .incbin "baserom.gba", 0x56f3ec, 0x60 gUnknown_0856F44C:: @ 856F44C - .incbin "baserom.gba", 0x56f44c, 0x60 + .incbin "baserom.gba", 0x56f44c, 0x60 gUnknown_0856F4AC:: @ 856F4AC .incbin "baserom.gba", 0x56f4ac, 0x20 @@ -81,26 +81,26 @@ gUnknown_0856FAC4:: @ 856FAC4 gUnknown_0856FAE4:: @ 856FAE4 .4byte gUnknown_08DD1A58 - .4byte gUnknown_0856F1AC - .4byte gUnknown_0856F26C - .4byte gUnknown_0856F32C - .4byte gUnknown_0856F3EC + .4byte gUnknown_0856F1AC + .4byte gUnknown_0856F26C + .4byte gUnknown_0856F32C + .4byte gUnknown_0856F3EC gUnknown_0856FAF8:: @ 856FAF8 .4byte gUnknown_08DD240C - .4byte gUnknown_0856F20C - .4byte gUnknown_0856F2CC - .4byte gUnknown_0856F38C - .4byte gUnknown_0856F44C + .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, 0x3 + .incbin "baserom.gba", 0x56fb0f, 0x3 gUnknown_0856FB12:: @ 856FB12 - .incbin "baserom.gba", 0x56fb12, 0x6 + .incbin "baserom.gba", 0x56fb12, 0x6 gUnknown_0856FB18:: @ 856FB18 .incbin "baserom.gba", 0x56fb18, 0x8 @@ -150,25 +150,25 @@ gUnknown_0856FB74:: @ 856FB74 .incbin "baserom.gba", 0x56fb74, 0x4 gUnknown_0856FB78:: @ 856FB78 - .incbin "baserom.gba", 0x56fb78, 0x4 + .incbin "baserom.gba", 0x56fb78, 0x4 gUnknown_0856FB7C:: @ 856FB7C - .incbin "baserom.gba", 0x56fb7c, 0x20 + .incbin "baserom.gba", 0x56fb7c, 0x20 gUnknown_0856FB9C:: @ 856FB9C - .incbin "baserom.gba", 0x56fb9c, 0x20 + .incbin "baserom.gba", 0x56fb9c, 0x20 gUnknown_0856FBBC:: @ 856FBBC - .incbin "baserom.gba", 0x56fbbc, 0xFEC + .incbin "baserom.gba", 0x56fbbc, 0xFEC gUnknown_08570BA8:: @ 8570BA8 - .incbin "baserom.gba", 0x570ba8, 0x9C + .incbin "baserom.gba", 0x570ba8, 0x9C gUnknown_08570C44:: @ 8570C44 - .incbin "baserom.gba", 0x570c44, 0xBC + .incbin "baserom.gba", 0x570c44, 0xBC gUnknown_08570D00:: @ 8570D00 - .incbin "baserom.gba", 0x570d00, 0x100 + .incbin "baserom.gba", 0x570d00, 0x100 gUnknown_08570E00:: @ 8570E00 .incbin "baserom.gba", 0x570e00, 0x260 @@ -219,45 +219,45 @@ gUnknown_085714D4:: @ 85714D4 obj_tiles NULL, 0, 0 gUnknown_085714E4:: @ 85714E4 - 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 + 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 + .incbin "baserom.gba", 0x571524, 0x8 gUnknown_0857152C:: @ 857152C - .incbin "baserom.gba", 0x57152c, 0x8 + .incbin "baserom.gba", 0x57152c, 0x8 gUnknown_08571534:: @ 8571534 - .incbin "baserom.gba", 0x571534, 0x8 + .incbin "baserom.gba", 0x571534, 0x8 gUnknown_0857153C:: @ 857153C - .incbin "baserom.gba", 0x57153c, 0x8 + .incbin "baserom.gba", 0x57153c, 0x8 gUnknown_08571544:: @ 8571544 - .incbin "baserom.gba", 0x571544, 0x8 + .incbin "baserom.gba", 0x571544, 0x8 gUnknown_0857154C:: @ 857154C - .incbin "baserom.gba", 0x57154c, 0x8 + .incbin "baserom.gba", 0x57154c, 0x8 gUnknown_08571554:: @ 8571554 - .incbin "baserom.gba", 0x571554, 0x8 + .incbin "baserom.gba", 0x571554, 0x8 gUnknown_0857155C:: @ 857155C - .incbin "baserom.gba", 0x57155c, 0xC + .incbin "baserom.gba", 0x57155c, 0xC gUnknown_08571568:: @ 8571568 - .incbin "baserom.gba", 0x571568, 0xC + .incbin "baserom.gba", 0x571568, 0xC gUnknown_08571574:: @ 8571574 - .4byte gUnknown_08571524 - .4byte gUnknown_0857152C + .4byte gUnknown_08571524 + .4byte gUnknown_0857152C gUnknown_0857157C:: @ 857157C .4byte gUnknown_08571524 @@ -269,14 +269,14 @@ gUnknown_0857157C:: @ 857157C .4byte gUnknown_08571554 gUnknown_08571598:: @ 8571598 - .4byte gUnknown_0857155C - .4byte gUnknown_08571568 + .4byte gUnknown_0857155C + .4byte gUnknown_08571568 gUnknown_085715A0:: @ 85715A0 - .incbin "baserom.gba", 0x5715a0, 0x10 + .incbin "baserom.gba", 0x5715a0, 0x10 gUnknown_085715B0:: @ 85715B0 - .4byte gUnknown_085715A0 + .4byte gUnknown_085715A0 gUnknown_085715B4:: @ 85715B4 spr_template 0, 0, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy @@ -290,20 +290,20 @@ gUnknown_085715FC:: @ 85715FC gUnknown_08571614:: @ 8571614 .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 + .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 unk_trainer_card_struct gUnknown_085EDAB1, gUnknown_085EDB0F, 0x59, 0x28, 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 d4e53df1e..2d5c9c12a 100644 --- a/data/unk_sprite_file.s +++ b/data/unk_sprite_file.s @@ -7,36 +7,36 @@ gUnknown_0862AD54:: @ 862AD54 .incbin "baserom.gba", 0x62ad54, 0x1dc gUnknown_0862AF30:: @ 862AF30 - .incbin "baserom.gba", 0x62af30, 0x1AC + .incbin "baserom.gba", 0x62af30, 0x1AC gUnknown_0862B0DC:: @ 862B0DC - .incbin "baserom.gba", 0x62b0dc, 0x460 + .incbin "baserom.gba", 0x62b0dc, 0x460 gUnknown_0862B53C:: @ 862B53C - .incbin "baserom.gba", 0x62b53c, 0x1E0 + .incbin "baserom.gba", 0x62b53c, 0x1E0 gUnknown_0862B71C:: @ 862B71C - .incbin "baserom.gba", 0x62b71c, 0x8 + .incbin "baserom.gba", 0x62b71c, 0x8 gUnknown_0862B724:: @ 862B724 - obj_tiles gUnknown_0862B0DC, 0x1800, 11920 + obj_tiles gUnknown_0862B0DC, 0x1800, 11920 gUnknown_0862B72C:: @ 862B72C - obj_pal gUnknown_0862B53C, 11920 + obj_pal gUnknown_0862B53C, 11920 gUnknown_0862B734:: @ 862B734 - .incbin "baserom.gba", 0x62b734, 0x8 + .incbin "baserom.gba", 0x62b734, 0x8 gUnknown_0862B73C:: @ 862B73C - .incbin "baserom.gba", 0x62b73c, 0x8 + .incbin "baserom.gba", 0x62b73c, 0x8 gUnknown_0862B744:: @ 862B744 - .incbin "baserom.gba", 0x62b744, 0x8 + .incbin "baserom.gba", 0x62b744, 0x8 gUnknown_0862B74C:: @ 862B74C - .4byte gUnknown_0862B734 - .4byte gUnknown_0862B73C - .4byte gUnknown_0862B744 + .4byte gUnknown_0862B734 + .4byte gUnknown_0862B73C + .4byte gUnknown_0862B744 gUnknown_0862B758:: @ 862B758 spr_template 11920, 11920, gUnknown_0862B71C, gUnknown_0862B74C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s index ed9a6c29a..2afc4a309 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 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" |