diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | battle/bg_effects.asm | 16 | ||||
| -rw-r--r-- | battle/core.asm | 121 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 20 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 4 | ||||
| -rw-r--r-- | constants/pokemon_data_constants.asm | 5 | ||||
| -rw-r--r-- | contents.asm | 6 | ||||
| -rw-r--r-- | data/base_stats.asm (renamed from stats/base_stats.asm) | 502 | ||||
| -rw-r--r-- | data/battle_tower.asm (renamed from stats/battle_tower.asm) | 0 | ||||
| -rw-r--r-- | data/egg_move_pointers.asm (renamed from stats/egg_move_pointers.asm) | 0 | ||||
| -rw-r--r-- | data/egg_moves.asm (renamed from stats/egg_moves.asm) | 2 | ||||
| -rw-r--r-- | data/egg_moves_crystal.asm | 3 | ||||
| -rw-r--r-- | data/evos_attacks.asm (renamed from stats/evos_attacks.asm) | 2 | ||||
| -rw-r--r-- | data/evos_attacks_crystal.asm | 3 | ||||
| -rw-r--r-- | data/evos_attacks_pointers.asm (renamed from stats/evos_attacks_pointers.asm) | 0 | ||||
| -rw-r--r-- | data/odd_eggs.asm (renamed from stats/odd_eggs.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries.asm (renamed from stats/pokedex/entries.asm) | 8 | ||||
| -rw-r--r-- | data/pokedex/entries/001.asm (renamed from stats/pokedex/entries/001.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/002.asm (renamed from stats/pokedex/entries/002.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/003.asm (renamed from stats/pokedex/entries/003.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/004.asm (renamed from stats/pokedex/entries/004.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/005.asm (renamed from stats/pokedex/entries/005.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/006.asm (renamed from stats/pokedex/entries/006.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/007.asm (renamed from stats/pokedex/entries/007.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/008.asm (renamed from stats/pokedex/entries/008.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/009.asm (renamed from stats/pokedex/entries/009.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/010.asm (renamed from stats/pokedex/entries/010.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/011.asm (renamed from stats/pokedex/entries/011.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/012.asm (renamed from stats/pokedex/entries/012.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/013.asm (renamed from stats/pokedex/entries/013.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/014.asm (renamed from stats/pokedex/entries/014.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/015.asm (renamed from stats/pokedex/entries/015.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/016.asm (renamed from stats/pokedex/entries/016.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/017.asm (renamed from stats/pokedex/entries/017.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/018.asm (renamed from stats/pokedex/entries/018.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/019.asm (renamed from stats/pokedex/entries/019.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/020.asm (renamed from stats/pokedex/entries/020.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/021.asm (renamed from stats/pokedex/entries/021.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/022.asm (renamed from stats/pokedex/entries/022.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/023.asm (renamed from stats/pokedex/entries/023.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/024.asm (renamed from stats/pokedex/entries/024.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/025.asm (renamed from stats/pokedex/entries/025.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/026.asm (renamed from stats/pokedex/entries/026.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/027.asm (renamed from stats/pokedex/entries/027.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/028.asm (renamed from stats/pokedex/entries/028.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/029.asm (renamed from stats/pokedex/entries/029.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/030.asm (renamed from stats/pokedex/entries/030.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/031.asm (renamed from stats/pokedex/entries/031.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/032.asm (renamed from stats/pokedex/entries/032.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/033.asm (renamed from stats/pokedex/entries/033.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/034.asm (renamed from stats/pokedex/entries/034.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/035.asm (renamed from stats/pokedex/entries/035.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/036.asm (renamed from stats/pokedex/entries/036.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/037.asm (renamed from stats/pokedex/entries/037.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/038.asm (renamed from stats/pokedex/entries/038.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/039.asm (renamed from stats/pokedex/entries/039.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/040.asm (renamed from stats/pokedex/entries/040.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/041.asm (renamed from stats/pokedex/entries/041.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/042.asm (renamed from stats/pokedex/entries/042.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/043.asm (renamed from stats/pokedex/entries/043.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/044.asm (renamed from stats/pokedex/entries/044.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/045.asm (renamed from stats/pokedex/entries/045.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/046.asm (renamed from stats/pokedex/entries/046.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/047.asm (renamed from stats/pokedex/entries/047.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/048.asm (renamed from stats/pokedex/entries/048.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/049.asm (renamed from stats/pokedex/entries/049.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/050.asm (renamed from stats/pokedex/entries/050.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/051.asm (renamed from stats/pokedex/entries/051.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/052.asm (renamed from stats/pokedex/entries/052.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/053.asm (renamed from stats/pokedex/entries/053.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/054.asm (renamed from stats/pokedex/entries/054.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/055.asm (renamed from stats/pokedex/entries/055.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/056.asm (renamed from stats/pokedex/entries/056.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/057.asm (renamed from stats/pokedex/entries/057.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/058.asm (renamed from stats/pokedex/entries/058.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/059.asm (renamed from stats/pokedex/entries/059.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/060.asm (renamed from stats/pokedex/entries/060.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/061.asm (renamed from stats/pokedex/entries/061.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/062.asm (renamed from stats/pokedex/entries/062.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/063.asm (renamed from stats/pokedex/entries/063.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/064.asm (renamed from stats/pokedex/entries/064.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/065.asm (renamed from stats/pokedex/entries/065.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/066.asm (renamed from stats/pokedex/entries/066.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/067.asm (renamed from stats/pokedex/entries/067.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/068.asm (renamed from stats/pokedex/entries/068.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/069.asm (renamed from stats/pokedex/entries/069.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/070.asm (renamed from stats/pokedex/entries/070.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/071.asm (renamed from stats/pokedex/entries/071.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/072.asm (renamed from stats/pokedex/entries/072.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/073.asm (renamed from stats/pokedex/entries/073.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/074.asm (renamed from stats/pokedex/entries/074.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/075.asm (renamed from stats/pokedex/entries/075.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/076.asm (renamed from stats/pokedex/entries/076.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/077.asm (renamed from stats/pokedex/entries/077.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/078.asm (renamed from stats/pokedex/entries/078.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/079.asm (renamed from stats/pokedex/entries/079.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/080.asm (renamed from stats/pokedex/entries/080.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/081.asm (renamed from stats/pokedex/entries/081.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/082.asm (renamed from stats/pokedex/entries/082.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/083.asm (renamed from stats/pokedex/entries/083.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/084.asm (renamed from stats/pokedex/entries/084.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/085.asm (renamed from stats/pokedex/entries/085.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/086.asm (renamed from stats/pokedex/entries/086.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/087.asm (renamed from stats/pokedex/entries/087.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/088.asm (renamed from stats/pokedex/entries/088.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/089.asm (renamed from stats/pokedex/entries/089.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/090.asm (renamed from stats/pokedex/entries/090.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/091.asm (renamed from stats/pokedex/entries/091.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/092.asm (renamed from stats/pokedex/entries/092.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/093.asm (renamed from stats/pokedex/entries/093.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/094.asm (renamed from stats/pokedex/entries/094.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/095.asm (renamed from stats/pokedex/entries/095.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/096.asm (renamed from stats/pokedex/entries/096.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/097.asm (renamed from stats/pokedex/entries/097.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/098.asm (renamed from stats/pokedex/entries/098.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/099.asm (renamed from stats/pokedex/entries/099.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/100.asm (renamed from stats/pokedex/entries/100.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/101.asm (renamed from stats/pokedex/entries/101.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/102.asm (renamed from stats/pokedex/entries/102.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/103.asm (renamed from stats/pokedex/entries/103.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/104.asm (renamed from stats/pokedex/entries/104.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/105.asm (renamed from stats/pokedex/entries/105.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/106.asm (renamed from stats/pokedex/entries/106.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/107.asm (renamed from stats/pokedex/entries/107.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/108.asm (renamed from stats/pokedex/entries/108.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/109.asm (renamed from stats/pokedex/entries/109.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/110.asm (renamed from stats/pokedex/entries/110.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/111.asm (renamed from stats/pokedex/entries/111.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/112.asm (renamed from stats/pokedex/entries/112.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/113.asm (renamed from stats/pokedex/entries/113.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/114.asm (renamed from stats/pokedex/entries/114.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/115.asm (renamed from stats/pokedex/entries/115.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/116.asm (renamed from stats/pokedex/entries/116.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/117.asm (renamed from stats/pokedex/entries/117.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/118.asm (renamed from stats/pokedex/entries/118.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/119.asm (renamed from stats/pokedex/entries/119.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/120.asm (renamed from stats/pokedex/entries/120.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/121.asm (renamed from stats/pokedex/entries/121.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/122.asm (renamed from stats/pokedex/entries/122.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/123.asm (renamed from stats/pokedex/entries/123.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/124.asm (renamed from stats/pokedex/entries/124.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/125.asm (renamed from stats/pokedex/entries/125.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/126.asm (renamed from stats/pokedex/entries/126.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/127.asm (renamed from stats/pokedex/entries/127.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/128.asm (renamed from stats/pokedex/entries/128.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/129.asm (renamed from stats/pokedex/entries/129.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/130.asm (renamed from stats/pokedex/entries/130.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/131.asm (renamed from stats/pokedex/entries/131.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/132.asm (renamed from stats/pokedex/entries/132.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/133.asm (renamed from stats/pokedex/entries/133.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/134.asm (renamed from stats/pokedex/entries/134.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/135.asm (renamed from stats/pokedex/entries/135.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/136.asm (renamed from stats/pokedex/entries/136.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/137.asm (renamed from stats/pokedex/entries/137.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/138.asm (renamed from stats/pokedex/entries/138.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/139.asm (renamed from stats/pokedex/entries/139.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/140.asm (renamed from stats/pokedex/entries/140.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/141.asm (renamed from stats/pokedex/entries/141.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/142.asm (renamed from stats/pokedex/entries/142.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/143.asm (renamed from stats/pokedex/entries/143.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/144.asm (renamed from stats/pokedex/entries/144.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/145.asm (renamed from stats/pokedex/entries/145.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/146.asm (renamed from stats/pokedex/entries/146.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/147.asm (renamed from stats/pokedex/entries/147.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/148.asm (renamed from stats/pokedex/entries/148.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/149.asm (renamed from stats/pokedex/entries/149.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/150.asm (renamed from stats/pokedex/entries/150.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/151.asm (renamed from stats/pokedex/entries/151.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/152.asm (renamed from stats/pokedex/entries/152.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/153.asm (renamed from stats/pokedex/entries/153.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/154.asm (renamed from stats/pokedex/entries/154.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/155.asm (renamed from stats/pokedex/entries/155.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/156.asm (renamed from stats/pokedex/entries/156.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/157.asm (renamed from stats/pokedex/entries/157.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/158.asm (renamed from stats/pokedex/entries/158.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/159.asm (renamed from stats/pokedex/entries/159.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/160.asm (renamed from stats/pokedex/entries/160.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/161.asm (renamed from stats/pokedex/entries/161.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/162.asm (renamed from stats/pokedex/entries/162.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/163.asm (renamed from stats/pokedex/entries/163.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/164.asm (renamed from stats/pokedex/entries/164.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/165.asm (renamed from stats/pokedex/entries/165.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/166.asm (renamed from stats/pokedex/entries/166.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/167.asm (renamed from stats/pokedex/entries/167.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/168.asm (renamed from stats/pokedex/entries/168.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/169.asm (renamed from stats/pokedex/entries/169.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/170.asm (renamed from stats/pokedex/entries/170.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/171.asm (renamed from stats/pokedex/entries/171.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/172.asm (renamed from stats/pokedex/entries/172.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/173.asm (renamed from stats/pokedex/entries/173.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/174.asm (renamed from stats/pokedex/entries/174.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/175.asm (renamed from stats/pokedex/entries/175.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/176.asm (renamed from stats/pokedex/entries/176.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/177.asm (renamed from stats/pokedex/entries/177.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/178.asm (renamed from stats/pokedex/entries/178.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/179.asm (renamed from stats/pokedex/entries/179.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/180.asm (renamed from stats/pokedex/entries/180.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/181.asm (renamed from stats/pokedex/entries/181.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/182.asm (renamed from stats/pokedex/entries/182.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/183.asm (renamed from stats/pokedex/entries/183.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/184.asm (renamed from stats/pokedex/entries/184.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/185.asm (renamed from stats/pokedex/entries/185.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/186.asm (renamed from stats/pokedex/entries/186.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/187.asm (renamed from stats/pokedex/entries/187.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/188.asm (renamed from stats/pokedex/entries/188.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/189.asm (renamed from stats/pokedex/entries/189.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/190.asm (renamed from stats/pokedex/entries/190.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/191.asm (renamed from stats/pokedex/entries/191.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/192.asm (renamed from stats/pokedex/entries/192.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/193.asm (renamed from stats/pokedex/entries/193.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/194.asm (renamed from stats/pokedex/entries/194.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/195.asm (renamed from stats/pokedex/entries/195.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/196.asm (renamed from stats/pokedex/entries/196.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/197.asm (renamed from stats/pokedex/entries/197.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/198.asm (renamed from stats/pokedex/entries/198.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/199.asm (renamed from stats/pokedex/entries/199.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/200.asm (renamed from stats/pokedex/entries/200.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/201.asm (renamed from stats/pokedex/entries/201.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/202.asm (renamed from stats/pokedex/entries/202.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/203.asm (renamed from stats/pokedex/entries/203.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/204.asm (renamed from stats/pokedex/entries/204.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/205.asm (renamed from stats/pokedex/entries/205.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/206.asm (renamed from stats/pokedex/entries/206.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/207.asm (renamed from stats/pokedex/entries/207.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/208.asm (renamed from stats/pokedex/entries/208.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/209.asm (renamed from stats/pokedex/entries/209.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/210.asm (renamed from stats/pokedex/entries/210.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/211.asm (renamed from stats/pokedex/entries/211.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/212.asm (renamed from stats/pokedex/entries/212.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/213.asm (renamed from stats/pokedex/entries/213.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/214.asm (renamed from stats/pokedex/entries/214.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/215.asm (renamed from stats/pokedex/entries/215.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/216.asm (renamed from stats/pokedex/entries/216.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/217.asm (renamed from stats/pokedex/entries/217.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/218.asm (renamed from stats/pokedex/entries/218.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/219.asm (renamed from stats/pokedex/entries/219.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/220.asm (renamed from stats/pokedex/entries/220.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/221.asm (renamed from stats/pokedex/entries/221.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/222.asm (renamed from stats/pokedex/entries/222.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/223.asm (renamed from stats/pokedex/entries/223.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/224.asm (renamed from stats/pokedex/entries/224.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/225.asm (renamed from stats/pokedex/entries/225.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/226.asm (renamed from stats/pokedex/entries/226.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/227.asm (renamed from stats/pokedex/entries/227.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/228.asm (renamed from stats/pokedex/entries/228.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/229.asm (renamed from stats/pokedex/entries/229.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/230.asm (renamed from stats/pokedex/entries/230.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/231.asm (renamed from stats/pokedex/entries/231.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/232.asm (renamed from stats/pokedex/entries/232.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/233.asm (renamed from stats/pokedex/entries/233.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/234.asm (renamed from stats/pokedex/entries/234.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/235.asm (renamed from stats/pokedex/entries/235.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/236.asm (renamed from stats/pokedex/entries/236.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/237.asm (renamed from stats/pokedex/entries/237.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/238.asm (renamed from stats/pokedex/entries/238.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/239.asm (renamed from stats/pokedex/entries/239.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/240.asm (renamed from stats/pokedex/entries/240.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/241.asm (renamed from stats/pokedex/entries/241.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/242.asm (renamed from stats/pokedex/entries/242.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/243.asm (renamed from stats/pokedex/entries/243.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/244.asm (renamed from stats/pokedex/entries/244.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/245.asm (renamed from stats/pokedex/entries/245.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/246.asm (renamed from stats/pokedex/entries/246.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/247.asm (renamed from stats/pokedex/entries/247.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/248.asm (renamed from stats/pokedex/entries/248.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/249.asm (renamed from stats/pokedex/entries/249.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/250.asm (renamed from stats/pokedex/entries/250.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries/251.asm (renamed from stats/pokedex/entries/251.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/entries_1.asm | 64 | ||||
| -rw-r--r-- | data/pokedex/entries_2.asm | 64 | ||||
| -rw-r--r-- | data/pokedex/entries_3.asm | 64 | ||||
| -rw-r--r-- | data/pokedex/entries_4.asm | 59 | ||||
| -rw-r--r-- | data/pokedex/entries_crystal.asm | 3 | ||||
| -rw-r--r-- | data/pokedex/entry_pointers.asm (renamed from stats/pokedex/entry_pointers.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/order_alpha.asm (renamed from stats/pokedex/order_alpha.asm) | 0 | ||||
| -rw-r--r-- | data/pokedex/order_new.asm (renamed from stats/pokedex/order_new.asm) | 0 | ||||
| -rw-r--r-- | data/pokemon_names.asm (renamed from stats/pokemon_names.asm) | 0 | ||||
| -rw-r--r-- | data/wild/fish.asm (renamed from stats/wild/fish.asm) | 0 | ||||
| -rw-r--r-- | data/wild/johto_grass.asm (renamed from stats/wild/johto_grass.asm) | 0 | ||||
| -rw-r--r-- | data/wild/johto_water.asm (renamed from stats/wild/johto_water.asm) | 0 | ||||
| -rw-r--r-- | data/wild/kanto_grass.asm (renamed from stats/wild/kanto_grass.asm) | 0 | ||||
| -rw-r--r-- | data/wild/kanto_water.asm (renamed from stats/wild/kanto_water.asm) | 0 | ||||
| -rw-r--r-- | data/wild/swarm_grass.asm (renamed from stats/wild/swarm_grass.asm) | 0 | ||||
| -rw-r--r-- | data/wild/swarm_water.asm (renamed from stats/wild/swarm_water.asm) | 0 | ||||
| -rw-r--r-- | engine/credits.asm | 10 | ||||
| -rw-r--r-- | engine/title.asm | 8 | ||||
| m--------- | extras | 0 | ||||
| -rw-r--r-- | gfx/pics/animation.asm | 2 | ||||
| -rw-r--r-- | home.asm | 6 | ||||
| -rw-r--r-- | home/decompress.asm | 444 | ||||
| -rw-r--r-- | home/map.asm | 6 | ||||
| -rw-r--r-- | home/text.asm | 10 | ||||
| -rw-r--r-- | items/item_effects.asm | 8 | ||||
| -rw-r--r-- | macros.asm | 14 | ||||
| -rw-r--r-- | main.asm | 2279 | ||||
| -rw-r--r-- | misc/crystal_misc.asm | 10 | ||||
| -rw-r--r-- | stats/egg_moves_crystal.asm | 3 | ||||
| -rw-r--r-- | stats/evos_attacks_crystal.asm | 3 | ||||
| -rw-r--r-- | stats/pokedex/entries_1.asm | 64 | ||||
| -rw-r--r-- | stats/pokedex/entries_2.asm | 64 | ||||
| -rw-r--r-- | stats/pokedex/entries_3.asm | 64 | ||||
| -rw-r--r-- | stats/pokedex/entries_4.asm | 59 | ||||
| -rw-r--r-- | stats/pokedex/entries_crystal.asm | 3 |
303 files changed, 1999 insertions, 2010 deletions
@@ -23,9 +23,9 @@ engine/events.o \ engine/scripting_crystal.o \ engine/events_2.o \ engine/credits_crystal.o \ -stats/egg_moves_crystal.o \ -stats/evos_attacks_crystal.o \ -stats/pokedex/entries_crystal.o \ +data/egg_moves_crystal.o \ +data/evos_attacks_crystal.o \ +data/pokedex/entries_crystal.o \ misc/crystal_misc.o \ gfx/pics.o diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index 34aca79ce..011e0e08a 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -353,11 +353,11 @@ Functionc81c0: ; c81c0 (32:41c0) push bc call Functionc9038 jr nz, .asm_c81d1 - ld hl, $c4ac + hlcoord 12, 0 ld bc, $707 jr .asm_c81d7 .asm_c81d1 - ld hl, $c51a + hlcoord 2, 6 ld bc, $606 .asm_c81d7 call ClearBox @@ -458,11 +458,11 @@ Functionc825a: ; c825a (32:425a) push bc call Functionc9038 jr nz, .asm_c826b - ld hl, $c524 + hlcoord 12, 6 ld bc, $107 jr .asm_c8271 .asm_c826b - ld hl, $c51a + hlcoord 2, 6 ld bc, $106 .asm_c8271 call ClearBox @@ -529,11 +529,11 @@ Functionc82c7: ; c82c7 (32:42c7) push bc call Functionc9038 jr nz, .asm_c82d8 - ld hl, $c510 + hlcoord 12, 5 ld bc, $207 jr .asm_c82de .asm_c82d8 - ld hl, $c51a + hlcoord 2, 6 ld bc, $206 .asm_c82de call ClearBox @@ -594,7 +594,7 @@ Functionc831d: ; c831d (32:431d) ld a, [hl] and a jr z, .asm_c833e - ld hl, $c518 + hlcoord 0, 6 ld de, $806 .asm_c832b push de @@ -613,7 +613,7 @@ Functionc831d: ; c831d (32:431d) jr nz, .asm_c832b jr .asm_c8355 .asm_c833e - ld hl, $c4b3 + hlcoord 19, 0 ld de, $807 .asm_c8344 push de diff --git a/battle/core.asm b/battle/core.asm index 2477f3f9f..6cb19b7d6 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -82,7 +82,7 @@ Function3c000: ; 3c000 ld a, [hl] ld [CurPartySpecies], a ld [TempBattleMonSpecies], a - ld hl, $c505 + hlcoord 1, 5 ld a, $9 call Function3d490 call Function309d @@ -2063,12 +2063,12 @@ Function3cd36: ; 3cd36 Function3cd3c: ; 3cd3c - ld hl, $c55e + hlcoord 10, 9 ld a, [hBattleTurn] and a ld a, $1 jr z, .asm_3cd4a - ld hl, $c4ca + hlcoord 2, 2 xor a .asm_3cd4a @@ -2146,7 +2146,7 @@ Function3cdca: ; 3cdca cp $1 jr z, .asm_3cde6 call ClearSprites - ld hl, $c4a1 + hlcoord 1, 0 ld bc, $040a call ClearBox call Function3d2b3 @@ -2330,7 +2330,7 @@ Function3cef1: ; 3cef1 ld a, [BattleMonSpecies] call Function37b6 call Function3d43b - ld hl, $c535 + hlcoord 9, 7 ld bc, $050b call ClearBox ld hl, BattleText_0x80a75 @@ -3140,14 +3140,14 @@ LostBattle: ; 3d38e Function3d432: ; 3d432 - ld hl, $c510 - ld de, $c524 + hlcoord 12, 5 + decoord 12, 6 jp Function3d444 ; 3d43b Function3d43b: ; 3d43b - ld hl, $c569 - ld de, $c57d + hlcoord 1, 10 + decoord 1, 11 jp Function3d444 ; 3d444 @@ -3348,7 +3348,7 @@ Function3d557: ; 3d557 ld [$c6e6], a xor a ld [$c730], a - ld hl, $c4b2 + hlcoord 18, 0 ld a, $8 call Function3d490 call EmptyBattleTextBox @@ -3675,7 +3675,7 @@ Function3d7a0: ; 3d7a0 ld [hBGMapMode], a call Function1c07 call ClearSprites - ld hl, $c4a1 + hlcoord 1, 0 ld bc, $040a call ClearBox call WaitBGMap @@ -3718,7 +3718,7 @@ Function3d7c7: ; 3d7c7 jr c, .asm_3d82c callba CheckBattleScene jr c, .asm_3d821 - ld hl, $c4ac + hlcoord 12, 0 ld d, $0 ld e, $0 ld a, $47 @@ -4180,7 +4180,7 @@ Function3db5f: ; 3db5f ld hl, BattleMonAtkDefDV ld a, $2d call Predef - ld hl, $c505 + hlcoord 1, 5 ld b, $7 ld c, $8 call ClearBox @@ -4496,9 +4496,9 @@ Function3dd2f: ; 3dd2f ld a, [hBattleTurn] ld [$d10a], a and a - ld hl, $c4ca + hlcoord 2, 2 jr z, .asm_3dda4 - ld hl, $c55e + hlcoord 10, 9 .asm_3dda4 ld [$d10a], a @@ -4885,9 +4885,9 @@ PrintPlayerHUD: ; 3dfbf ld a, $f5 .asm_3e013 - ld hl, $c551 + hlcoord 17, 8 ld [hl], a - ld hl, $c54e + hlcoord 14, 8 push af push hl ld de, BattleMonStatus @@ -4922,7 +4922,7 @@ Function3e036:: ; 3e036 Function3e043: ; 3e043 xor a ld [hBGMapMode], a - ld hl, $c4a1 + hlcoord 1, 0 ld bc, $040b call ClearBox callba Function2c0c5 @@ -4931,7 +4931,7 @@ Function3e043: ; 3e043 ld [CurPartySpecies], a call GetBaseData ld de, EnemyMonNick - ld hl, $c4a1 + hlcoord 1, 0 call Function3e138 call PlaceString ld h, b @@ -4960,9 +4960,9 @@ Function3e043: ; 3e043 ld a, $f5 .asm_3e09a - ld hl, $c4bd + hlcoord 9, 1 ld [hl], a - ld hl, $c4ba + hlcoord 6, 1 push af push hl ld de, EnemyMonStatus @@ -5041,7 +5041,7 @@ Function3e043: ; 3e043 .asm_3e11a xor a ld [$d10a], a - ld hl, $c4ca + hlcoord 2, 2 ld b, $0 call DrawHPBar ret @@ -5552,23 +5552,23 @@ Function3e4bc: ; 3e4bc call CopyBytes xor a ld [hBGMapMode], a - ld hl, $c594 + hlcoord 4, 12 ld b, $4 ld c, $e ld a, [$d235] cp $2 jr nz, .asm_3e503 - ld hl, $c544 + hlcoord 4, 8 ld b, $4 ld c, $e .asm_3e503 call TextBox - ld hl, $c5aa + hlcoord 6, 13 ld a, [$d235] cp $2 jr nz, .asm_3e513 - ld hl, $c55a + hlcoord 6, 9 .asm_3e513 ld a, $14 @@ -5630,7 +5630,7 @@ Function3e4bc: ; 3e4bc jr z, .asm_3e58e dec a jr nz, .asm_3e5a3 - ld hl, $c5c3 + hlcoord 11, 14 ld de, .string_3e61c call PlaceString jr .asm_3e5a3 @@ -5640,7 +5640,7 @@ Function3e4bc: ; 3e4bc ld a, [$d0e3] and a jr z, .asm_3e5a3 - ld hl, $c5a9 + hlcoord 5, 13 ld bc, $0014 dec a call AddNTimes @@ -6796,7 +6796,7 @@ Function3ebd8: ; 3ebd8 ld [TrainerClass], a ld de, VTiles2 callab Function5120d - ld hl, $c4b3 + hlcoord 19, 0 ld c, $0 .asm_3ebf3 inc c @@ -7296,6 +7296,7 @@ Function3ee27: ; 3ee27 Function3ee3b: ; 3ee3b +; Give experience. ld a, [InLinkBattle] and a ret nz @@ -7329,7 +7330,7 @@ Function3ee3b: ; 3ee3b add hl, bc ld d, h ld e, l - ld hl, EnemyMonType2 + ld hl, EnemyMonBaseStats - 1 push bc ld c, $5 .asm_3ee7c @@ -7403,20 +7404,20 @@ Function3ee3b: ; 3ee3b jr z, .asm_3eee2 .asm_3eedd - call Function3f106 + call DoubleExp ld a, $1 .asm_3eee2 ld [$d088], a ld a, [IsInBattle] dec a - call nz, Function3f106 + call nz, DoubleExp push bc - ld a, $1 + ld a, PartyMon1Item - PartyMon1 call GetPartyParamLocation ld a, [hl] - cp $7e - call z, Function3f106 + cp LUCKY_EGG + call z, DoubleExp ld a, [$ffb6] ld [$d087], a ld a, [$ffb5] @@ -7464,7 +7465,7 @@ Function3ee3b: ; 3ee3b ld [CurSpecies], a call GetBaseData push bc - ld d, $64 + ld d, MAX_LEVEL callab Function50e47 pop bc ld hl, $000a @@ -7497,10 +7498,10 @@ Function3ee3b: ; 3ee3b call Predef callab Function50e1b pop bc - ld hl, $001f + ld hl, PartyMon1Level - PartyMon1 add hl, bc ld a, [hl] - cp $64 + cp MAX_LEVEL jp nc, .asm_3f0b9 cp d jp z, .asm_3f0b9 @@ -7510,7 +7511,7 @@ Function3ee3b: ; 3ee3b ld a, d ld [CurPartyLevel], a ld [hl], a - ld hl, $0000 + ld hl, PartyMon1Species - PartyMon1 add hl, bc ld a, [hl] ld [CurSpecies], a @@ -7609,11 +7610,11 @@ Function3ee3b: ; 3ee3b ld [MonType], a ld a, $1f call Predef - ld hl, $c4a9 + hlcoord 9, 0 ld b, $a ld c, $9 call TextBox - ld hl, $c4bf + hlcoord 11, 1 ld bc, $0004 ld a, $28 call Predef @@ -7704,7 +7705,7 @@ Function3f0d4: ; 3f0d4 ret ; 3f106 -Function3f106: ; 3f106 +DoubleExp: ; 3f106 push bc ld a, [$ffb5] ld b, a @@ -7791,7 +7792,7 @@ Function3f136: ; 3f136 ld [hl], a .asm_3f186 - ld d, $64 + ld d, MAX_LEVEL callab Function50e47 ld a, [hMultiplicand] ld b, a @@ -7895,7 +7896,7 @@ Function3f22c: ; 3f22c inc b push bc push de - ld hl, $c58d + hlcoord 17, 11 call Function3f41c pop de ld a, $1 @@ -7911,7 +7912,7 @@ Function3f22c: ; 3f22c inc b push bc push de - ld hl, $c58d + hlcoord 17, 11 call Function3f41c pop de ld a, $1 @@ -8478,7 +8479,7 @@ Function3f594: ; 3f594 ld [$ffad], a dec a ld [$c6e6], a - ld hl, $c4ac + hlcoord 12, 0 ld bc, $0707 ld a, $13 call Predef @@ -8546,7 +8547,7 @@ Function3f607: ; 3f607 xor a ld [TrainerClass], a ld [$ffad], a - ld hl, $c4ac + hlcoord 12, 0 ld bc, $0707 ld a, $13 call Predef @@ -8748,7 +8749,7 @@ Function3f77c: ; 3f77c jr .asm_3f7c3 .asm_3f7c3 - ld hl, $c546 + hlcoord 6, 8 call PlaceString callba Function106187 ld c, $c8 @@ -8781,7 +8782,7 @@ Function3f77c: ; 3f77c Function3f80f: ; 3f80f - ld hl, $c546 + hlcoord 6, 8 ld de, .Invalid call PlaceString ld c, $c8 @@ -8826,7 +8827,7 @@ Function3f85f: ; 3f85f call ClearTileMap call ClearSprites call .asm_3f8e0 - ld hl, $c540 + hlcoord 0, 8 ld b, $5 ld de, $b268 .asm_3f870 @@ -8895,19 +8896,19 @@ Function3f85f: ; 3f85f ret .asm_3f8e0 - ld hl, $c4a1 + hlcoord 1, 0 ld de, .Record call PlaceString - ld hl, $c518 + hlcoord 0, 6 ld de, .Result call PlaceString - ld hl, $c4c8 + hlcoord 0, 2 ld de, .Total call PlaceString - ld hl, $c4f6 + hlcoord 6, 4 ld de, $b260 call .asm_3f92b jr c, .asm_3f92a @@ -8915,14 +8916,14 @@ Function3f85f: ; 3f85f ld bc, $0204 call PrintNum - ld hl, $c4fb + hlcoord 11, 4 ld de, $b262 call .asm_3f92b ld bc, $0204 call PrintNum - ld hl, $c500 + hlcoord 16, 4 ld de, $b264 call .asm_3f92b @@ -9277,12 +9278,12 @@ Function3fb54: ; 3fb54 Function3fb6c: ; 3fb6c call Function3fbf8 - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call TextBox callba MobileTextBorder - ld hl, $c505 + hlcoord 1, 5 ld bc, $0307 call ClearBox call Functione51 @@ -9302,7 +9303,7 @@ Function3fb6c: ; 3fb6c ld [hBGMapMode], a ld a, $31 ld [$ffad], a - ld hl, $c51a + hlcoord 2, 6 ld bc, $0606 ld a, $13 call Predef @@ -9398,7 +9399,7 @@ Function3fc30: ; 3fc30 call Function3fc5b ld a, $31 ld [$ffad], a - ld hl, $c51a + hlcoord 2, 6 ld bc, $0606 ld a, $13 call Predef diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 05cbc8146..d16528d22 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -4657,7 +4657,7 @@ BattleCommand42: ; 35926 call .asm_3597d ld a, $1 ld [$d10a], a - ld hl, $c55e + hlcoord 10, 9 ld a, $b call Predef ld hl, EnemyMonHPHi @@ -4673,7 +4673,7 @@ BattleCommand42: ; 35926 xor a ld [$d10a], a call ResetDamage - ld hl, $c4ca + hlcoord 2, 2 ld a, $b call Predef callba Function178000 @@ -5383,7 +5383,7 @@ Function35d1c: ; 35d1c ld [$d1ef], a ld a, [hl] ld [$d1ee], a - ld hl, $c4ca + hlcoord 2, 2 xor a ld [$d10a], a ld a, $b @@ -5441,7 +5441,7 @@ Function35d7e: ; 35d7e ld [$d1eb], a ld a, [hl] ld [$d1ea], a - ld hl, $c55e + hlcoord 10, 9 ld a, $1 ld [$d10a], a ld a, $b @@ -5884,10 +5884,10 @@ Function36011: ; 36011 .asm_36070 ld a, [hBattleTurn] and a - ld hl, $c55e + hlcoord 10, 9 ld a, $1 jr z, .asm_3607e ; 0x36078 $4 - ld hl, $c4ca + hlcoord 2, 2 xor a .asm_3607e ld [$d10a], a @@ -7268,7 +7268,7 @@ BattleCommand23: ; 3680f call AnimateCurrentMove ld c, $14 call DelayFrames - ld hl, $c4a1 + hlcoord 1, 0 ld bc, $040a call ClearBox ld c, $14 @@ -7362,7 +7362,7 @@ BattleCommand23: ; 3680f call AnimateCurrentMove ld c, $14 call DelayFrames - ld hl, $c535 + hlcoord 9, 7 ld bc, $050b call ClearBox ld c, $14 @@ -8029,12 +8029,12 @@ BattleCommand27: ; 36cb2 ld [hli], a ld [hl], a .asm_36cfe - ld hl, $c55e + hlcoord 10, 9 ld a, [hBattleTurn] and a ld a, $1 jr z, .asm_36d0c ; 36d06 $4 - ld hl, $c4ca + hlcoord 2, 2 xor a .asm_36d0c ld [$d10a], a diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 5af896533..9236887a4 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -1,8 +1,10 @@ -; name length +; strings PLAYER_NAME_LENGTH EQU 8 PKMN_NAME_LENGTH EQU 11 NAME_LENGTH EQU 11 +LV_CHAR EQU $6e + ; boxes NUM_BOXES EQU 14 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 2fb6fdbe0..6d82ca926 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -1,3 +1,8 @@ +; growth rate +MEDIUM_FAST EQU 0 +MEDIUM_SLOW EQU 3 +SLOW EQU 4 +FAST EQU 5 ; egg group constants diff --git a/contents.asm b/contents.asm index 62756c88d..2bea33066 100644 --- a/contents.asm +++ b/contents.asm @@ -13,17 +13,17 @@ TILESETS_7 EQU $77 TILESETS_8 EQU $78 -; stats/egg_moves.o +; data/egg_moves.o EGG_MOVES EQU $8 -; stats/evos_attacks.o +; data/evos_attacks.o EVOS_ATTACKS EQU $10 -; stats/pokedex/entries.o +; data/pokedex/entries.o POKEDEX_ENTRIES_1 EQU $60 POKEDEX_ENTRIES_2 EQU $6E diff --git a/stats/base_stats.asm b/data/base_stats.asm index 3050af95e..631ba56d7 100644 --- a/stats/base_stats.asm +++ b/data/base_stats.asm @@ -17,7 +17,7 @@ BulbasaurBaseData:: ; 0x51424 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups ; tmhm @@ -50,7 +50,7 @@ IvysaurBaseData:: ; 0x51444 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups ; tmhm @@ -81,7 +81,7 @@ VenusaurBaseData:: ; 0x51464 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups ; tmhm @@ -112,7 +112,7 @@ CharmanderBaseData:: ; 0x51484 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, REPTILE ; egg groups ; tmhm @@ -143,7 +143,7 @@ CharmeleonBaseData:: ; 0x514a4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, REPTILE ; egg groups ; tmhm @@ -174,7 +174,7 @@ CharizardBaseData:: ; 0x514c4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, REPTILE ; egg groups ; tmhm @@ -205,7 +205,7 @@ SquirtleBaseData:: ; 0x514e4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups ; tmhm @@ -236,7 +236,7 @@ WartortleBaseData:: ; 0x51504 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups ; tmhm @@ -267,7 +267,7 @@ BlastoiseBaseData:: ; 0x51524 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups ; tmhm @@ -298,7 +298,7 @@ CaterpieBaseData:: ; 0x51544 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -329,7 +329,7 @@ MetapodBaseData:: ; 0x51564 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -360,7 +360,7 @@ ButterfreeBaseData:: ; 0x51584 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -391,7 +391,7 @@ WeedleBaseData:: ; 0x515a4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -422,7 +422,7 @@ KakunaBaseData:: ; 0x515c4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -453,7 +453,7 @@ BeedrillBaseData:: ; 0x515e4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -484,7 +484,7 @@ PidgeyBaseData:: ; 0x51604 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -515,7 +515,7 @@ PidgeottoBaseData:: ; 0x51624 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -546,7 +546,7 @@ PidgeotBaseData:: ; 0x51644 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -577,7 +577,7 @@ RattataBaseData:: ; 0x51664 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -608,7 +608,7 @@ RaticateBaseData:: ; 0x51684 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -639,7 +639,7 @@ SpearowBaseData:: ; 0x516a4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -670,7 +670,7 @@ FearowBaseData:: ; 0x516c4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -701,7 +701,7 @@ EkansBaseData:: ; 0x516e4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, REPTILE ; egg groups ; tmhm @@ -732,7 +732,7 @@ ArbokBaseData:: ; 0x51704 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, REPTILE ; egg groups ; tmhm @@ -763,7 +763,7 @@ PikachuBaseData:: ; 0x51724 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FAIRY ; egg groups ; tmhm @@ -794,7 +794,7 @@ RaichuBaseData:: ; 0x51744 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FAIRY ; egg groups ; tmhm @@ -825,7 +825,7 @@ SandshrewBaseData:: ; 0x51764 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -856,7 +856,7 @@ SandslashBaseData:: ; 0x51784 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -887,7 +887,7 @@ Nidoran_FBaseData:: ; 0x517a4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups ; tmhm @@ -918,7 +918,7 @@ NidorinaBaseData:: ; 0x517c4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -949,7 +949,7 @@ NidoqueenBaseData:: ; 0x517e4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -980,7 +980,7 @@ Nidoran_MBaseData:: ; 0x51804 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups ; tmhm @@ -1011,7 +1011,7 @@ NidorinoBaseData:: ; 0x51824 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups ; tmhm @@ -1042,7 +1042,7 @@ NidokingBaseData:: ; 0x51844 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups ; tmhm @@ -1073,7 +1073,7 @@ ClefairyBaseData:: ; 0x51864 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn FAIRY, FAIRY ; egg groups ; tmhm @@ -1104,7 +1104,7 @@ ClefableBaseData:: ; 0x51884 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn FAIRY, FAIRY ; egg groups ; tmhm @@ -1135,7 +1135,7 @@ VulpixBaseData:: ; 0x518a4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -1166,7 +1166,7 @@ NinetalesBaseData:: ; 0x518c4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -1197,7 +1197,7 @@ JigglypuffBaseData:: ; 0x518e4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn FAIRY, FAIRY ; egg groups ; tmhm @@ -1228,7 +1228,7 @@ WigglytuffBaseData:: ; 0x51904 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn FAIRY, FAIRY ; egg groups ; tmhm @@ -1259,7 +1259,7 @@ ZubatBaseData:: ; 0x51924 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -1290,7 +1290,7 @@ GolbatBaseData:: ; 0x51944 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -1321,7 +1321,7 @@ OddishBaseData:: ; 0x51964 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups ; tmhm @@ -1352,7 +1352,7 @@ GloomBaseData:: ; 0x51984 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups ; tmhm @@ -1383,7 +1383,7 @@ VileplumeBaseData:: ; 0x519a4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups ; tmhm @@ -1414,7 +1414,7 @@ ParasBaseData:: ; 0x519c4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INSECT, PLANT ; egg groups ; tmhm @@ -1445,7 +1445,7 @@ ParasectBaseData:: ; 0x519e4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INSECT, PLANT ; egg groups ; tmhm @@ -1476,7 +1476,7 @@ VenonatBaseData:: ; 0x51a04 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -1507,7 +1507,7 @@ VenomothBaseData:: ; 0x51a24 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -1538,7 +1538,7 @@ DiglettBaseData:: ; 0x51a44 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -1569,7 +1569,7 @@ DugtrioBaseData:: ; 0x51a64 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -1600,7 +1600,7 @@ MeowthBaseData:: ; 0x51a84 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -1631,7 +1631,7 @@ PersianBaseData:: ; 0x51aa4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -1662,7 +1662,7 @@ PsyduckBaseData:: ; 0x51ac4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups ; tmhm @@ -1693,7 +1693,7 @@ GolduckBaseData:: ; 0x51ae4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups ; tmhm @@ -1724,7 +1724,7 @@ MankeyBaseData:: ; 0x51b04 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -1755,7 +1755,7 @@ PrimeapeBaseData:: ; 0x51b24 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -1786,7 +1786,7 @@ GrowlitheBaseData:: ; 0x51b44 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -1817,7 +1817,7 @@ ArcanineBaseData:: ; 0x51b64 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -1848,7 +1848,7 @@ PoliwagBaseData:: ; 0x51b84 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups ; tmhm @@ -1879,7 +1879,7 @@ PoliwhirlBaseData:: ; 0x51ba4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups ; tmhm @@ -1910,7 +1910,7 @@ PoliwrathBaseData:: ; 0x51bc4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups ; tmhm @@ -1941,7 +1941,7 @@ AbraBaseData:: ; 0x51be4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups ; tmhm @@ -1972,7 +1972,7 @@ KadabraBaseData:: ; 0x51c04 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups ; tmhm @@ -2003,7 +2003,7 @@ AlakazamBaseData:: ; 0x51c24 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups ; tmhm @@ -2034,7 +2034,7 @@ MachopBaseData:: ; 0x51c44 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups ; tmhm @@ -2065,7 +2065,7 @@ MachokeBaseData:: ; 0x51c64 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups ; tmhm @@ -2096,7 +2096,7 @@ MachampBaseData:: ; 0x51c84 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups ; tmhm @@ -2127,7 +2127,7 @@ BellsproutBaseData:: ; 0x51ca4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups ; tmhm @@ -2158,7 +2158,7 @@ WeepinbellBaseData:: ; 0x51cc4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups ; tmhm @@ -2189,7 +2189,7 @@ VictreebelBaseData:: ; 0x51ce4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups ; tmhm @@ -2220,7 +2220,7 @@ TentacoolBaseData:: ; 0x51d04 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups ; tmhm @@ -2251,7 +2251,7 @@ TentacruelBaseData:: ; 0x51d24 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups ; tmhm @@ -2282,7 +2282,7 @@ GeodudeBaseData:: ; 0x51d44 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn INANIMATE, INANIMATE ; egg groups ; tmhm @@ -2313,7 +2313,7 @@ GravelerBaseData:: ; 0x51d64 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn INANIMATE, INANIMATE ; egg groups ; tmhm @@ -2344,7 +2344,7 @@ GolemBaseData:: ; 0x51d84 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn INANIMATE, INANIMATE ; egg groups ; tmhm @@ -2375,7 +2375,7 @@ PonytaBaseData:: ; 0x51da4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -2406,7 +2406,7 @@ RapidashBaseData:: ; 0x51dc4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -2437,7 +2437,7 @@ SlowpokeBaseData:: ; 0x51de4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn MONSTER, AMPHIBIAN ; egg groups ; tmhm @@ -2468,7 +2468,7 @@ SlowbroBaseData:: ; 0x51e04 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn MONSTER, AMPHIBIAN ; egg groups ; tmhm @@ -2499,7 +2499,7 @@ MagnemiteBaseData:: ; 0x51e24 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups ; tmhm @@ -2530,7 +2530,7 @@ MagnetonBaseData:: ; 0x51e44 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups ; tmhm @@ -2561,7 +2561,7 @@ Farfetch_DBaseData:: ; 0x51e64 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AVIAN, FIELD ; egg groups ; tmhm @@ -2592,7 +2592,7 @@ DoduoBaseData:: ; 0x51e84 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -2623,7 +2623,7 @@ DodrioBaseData:: ; 0x51ea4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -2654,7 +2654,7 @@ SeelBaseData:: ; 0x51ec4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups ; tmhm @@ -2685,7 +2685,7 @@ DewgongBaseData:: ; 0x51ee4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups ; tmhm @@ -2716,7 +2716,7 @@ GrimerBaseData:: ; 0x51f04 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups ; tmhm @@ -2747,7 +2747,7 @@ MukBaseData:: ; 0x51f24 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups ; tmhm @@ -2778,7 +2778,7 @@ ShellderBaseData:: ; 0x51f44 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups ; tmhm @@ -2809,7 +2809,7 @@ CloysterBaseData:: ; 0x51f64 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups ; tmhm @@ -2840,7 +2840,7 @@ GastlyBaseData:: ; 0x51f84 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups ; tmhm @@ -2871,7 +2871,7 @@ HaunterBaseData:: ; 0x51fa4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups ; tmhm @@ -2902,7 +2902,7 @@ GengarBaseData:: ; 0x51fc4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups ; tmhm @@ -2933,7 +2933,7 @@ OnixBaseData:: ; 0x51fe4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups ; tmhm @@ -2964,7 +2964,7 @@ DrowzeeBaseData:: ; 0x52004 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups ; tmhm @@ -2995,7 +2995,7 @@ HypnoBaseData:: ; 0x52024 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups ; tmhm @@ -3026,7 +3026,7 @@ KrabbyBaseData:: ; 0x52044 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups ; tmhm @@ -3057,7 +3057,7 @@ KinglerBaseData:: ; 0x52064 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups ; tmhm @@ -3088,7 +3088,7 @@ VoltorbBaseData:: ; 0x52084 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups ; tmhm @@ -3119,7 +3119,7 @@ ElectrodeBaseData:: ; 0x520a4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups ; tmhm @@ -3150,7 +3150,7 @@ ExeggcuteBaseData:: ; 0x520c4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn PLANT, PLANT ; egg groups ; tmhm @@ -3181,7 +3181,7 @@ ExeggutorBaseData:: ; 0x520e4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn PLANT, PLANT ; egg groups ; tmhm @@ -3212,7 +3212,7 @@ CuboneBaseData:: ; 0x52104 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups ; tmhm @@ -3243,7 +3243,7 @@ MarowakBaseData:: ; 0x52124 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups ; tmhm @@ -3274,7 +3274,7 @@ HitmonleeBaseData:: ; 0x52144 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups ; tmhm @@ -3305,7 +3305,7 @@ HitmonchanBaseData:: ; 0x52164 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups ; tmhm @@ -3336,7 +3336,7 @@ LickitungBaseData:: ; 0x52184 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups ; tmhm @@ -3367,7 +3367,7 @@ KoffingBaseData:: ; 0x521a4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups ; tmhm @@ -3398,7 +3398,7 @@ WeezingBaseData:: ; 0x521c4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups ; tmhm @@ -3429,7 +3429,7 @@ RhyhornBaseData:: ; 0x521e4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn MONSTER, FIELD ; egg groups ; tmhm @@ -3460,7 +3460,7 @@ RhydonBaseData:: ; 0x52204 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn MONSTER, FIELD ; egg groups ; tmhm @@ -3491,7 +3491,7 @@ ChanseyBaseData:: ; 0x52224 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn FAIRY, FAIRY ; egg groups ; tmhm @@ -3522,7 +3522,7 @@ TangelaBaseData:: ; 0x52244 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn PLANT, PLANT ; egg groups ; tmhm @@ -3553,7 +3553,7 @@ KangaskhanBaseData:: ; 0x52264 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups ; tmhm @@ -3584,7 +3584,7 @@ HorseaBaseData:: ; 0x52284 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMPHIBIAN, REPTILE ; egg groups ; tmhm @@ -3615,7 +3615,7 @@ SeadraBaseData:: ; 0x522a4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMPHIBIAN, REPTILE ; egg groups ; tmhm @@ -3646,7 +3646,7 @@ GoldeenBaseData:: ; 0x522c4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FISH, FISH ; egg groups ; tmhm @@ -3677,7 +3677,7 @@ SeakingBaseData:: ; 0x522e4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FISH, FISH ; egg groups ; tmhm @@ -3708,7 +3708,7 @@ StaryuBaseData:: ; 0x52304 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups ; tmhm @@ -3739,7 +3739,7 @@ StarmieBaseData:: ; 0x52324 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups ; tmhm @@ -3770,7 +3770,7 @@ Mr__MimeBaseData:: ; 0x52344 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups ; tmhm @@ -3801,7 +3801,7 @@ ScytherBaseData:: ; 0x52364 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -3832,7 +3832,7 @@ JynxBaseData:: ; 0x52384 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups ; tmhm @@ -3863,7 +3863,7 @@ ElectabuzzBaseData:: ; 0x523a4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups ; tmhm @@ -3894,7 +3894,7 @@ MagmarBaseData:: ; 0x523c4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups ; tmhm @@ -3925,7 +3925,7 @@ PinsirBaseData:: ; 0x523e4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -3956,7 +3956,7 @@ TaurosBaseData:: ; 0x52404 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -3987,7 +3987,7 @@ MagikarpBaseData:: ; 0x52424 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn FISH, REPTILE ; egg groups ; tmhm @@ -4018,7 +4018,7 @@ GyaradosBaseData:: ; 0x52444 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn FISH, REPTILE ; egg groups ; tmhm @@ -4049,7 +4049,7 @@ LaprasBaseData:: ; 0x52464 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn MONSTER, AMPHIBIAN ; egg groups ; tmhm @@ -4080,7 +4080,7 @@ DittoBaseData:: ; 0x52484 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn LADIES_MAN, LADIES_MAN ; egg groups ; tmhm @@ -4111,7 +4111,7 @@ EeveeBaseData:: ; 0x524a4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -4142,7 +4142,7 @@ VaporeonBaseData:: ; 0x524c4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -4173,7 +4173,7 @@ JolteonBaseData:: ; 0x524e4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -4204,7 +4204,7 @@ FlareonBaseData:: ; 0x52504 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -4235,7 +4235,7 @@ PorygonBaseData:: ; 0x52524 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups ; tmhm @@ -4266,7 +4266,7 @@ OmanyteBaseData:: ; 0x52544 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups ; tmhm @@ -4297,7 +4297,7 @@ OmastarBaseData:: ; 0x52564 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups ; tmhm @@ -4328,7 +4328,7 @@ KabutoBaseData:: ; 0x52584 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups ; tmhm @@ -4359,7 +4359,7 @@ KabutopsBaseData:: ; 0x525a4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups ; tmhm @@ -4390,7 +4390,7 @@ AerodactylBaseData:: ; 0x525c4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -4421,7 +4421,7 @@ SnorlaxBaseData:: ; 0x525e4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn MONSTER, MONSTER ; egg groups ; tmhm @@ -4452,7 +4452,7 @@ ArticunoBaseData:: ; 0x52604 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -4483,7 +4483,7 @@ ZapdosBaseData:: ; 0x52624 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -4514,7 +4514,7 @@ MoltresBaseData:: ; 0x52644 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -4545,7 +4545,7 @@ DratiniBaseData:: ; 0x52664 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn AMPHIBIAN, REPTILE ; egg groups ; tmhm @@ -4576,7 +4576,7 @@ DragonairBaseData:: ; 0x52684 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn AMPHIBIAN, REPTILE ; egg groups ; tmhm @@ -4607,7 +4607,7 @@ DragoniteBaseData:: ; 0x526a4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn AMPHIBIAN, REPTILE ; egg groups ; tmhm @@ -4638,7 +4638,7 @@ MewtwoBaseData:: ; 0x526c4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -4669,7 +4669,7 @@ MewBaseData:: ; 0x526e4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -4700,7 +4700,7 @@ ChikoritaBaseData:: ; 0x52704 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups ; tmhm @@ -4731,7 +4731,7 @@ BayleefBaseData:: ; 0x52724 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups ; tmhm @@ -4762,7 +4762,7 @@ MeganiumBaseData:: ; 0x52744 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups ; tmhm @@ -4793,7 +4793,7 @@ CyndaquilBaseData:: ; 0x52764 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -4824,7 +4824,7 @@ QuilavaBaseData:: ; 0x52784 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -4855,7 +4855,7 @@ TyphlosionBaseData:: ; 0x527a4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -4886,7 +4886,7 @@ TotodileBaseData:: ; 0x527c4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups ; tmhm @@ -4917,7 +4917,7 @@ CroconawBaseData:: ; 0x527e4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups ; tmhm @@ -4948,7 +4948,7 @@ FeraligatrBaseData:: ; 0x52804 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups ; tmhm @@ -4979,7 +4979,7 @@ SentretBaseData:: ; 0x52824 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -5010,7 +5010,7 @@ FurretBaseData:: ; 0x52844 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -5041,7 +5041,7 @@ HoothootBaseData:: ; 0x52864 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -5072,7 +5072,7 @@ NoctowlBaseData:: ; 0x52884 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -5103,7 +5103,7 @@ LedybaBaseData:: ; 0x528a4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -5134,7 +5134,7 @@ LedianBaseData:: ; 0x528c4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -5165,7 +5165,7 @@ SpinarakBaseData:: ; 0x528e4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -5196,7 +5196,7 @@ AriadosBaseData:: ; 0x52904 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -5227,7 +5227,7 @@ CrobatBaseData:: ; 0x52924 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -5258,7 +5258,7 @@ ChinchouBaseData:: ; 0x52944 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn FISH, FISH ; egg groups ; tmhm @@ -5289,7 +5289,7 @@ LanturnBaseData:: ; 0x52964 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn FISH, FISH ; egg groups ; tmhm @@ -5320,7 +5320,7 @@ PichuBaseData:: ; 0x52984 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -5351,7 +5351,7 @@ CleffaBaseData:: ; 0x529a4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -5382,7 +5382,7 @@ IgglybuffBaseData:: ; 0x529c4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -5413,7 +5413,7 @@ TogepiBaseData:: ; 0x529e4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -5444,7 +5444,7 @@ TogeticBaseData:: ; 0x52a04 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn AVIAN, FAIRY ; egg groups ; tmhm @@ -5475,7 +5475,7 @@ NatuBaseData:: ; 0x52a24 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -5506,7 +5506,7 @@ XatuBaseData:: ; 0x52a44 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -5537,7 +5537,7 @@ MareepBaseData:: ; 0x52a64 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups ; tmhm @@ -5568,7 +5568,7 @@ FlaaffyBaseData:: ; 0x52a84 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups ; tmhm @@ -5599,7 +5599,7 @@ AmpharosBaseData:: ; 0x52aa4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups ; tmhm @@ -5630,7 +5630,7 @@ BellossomBaseData:: ; 0x52ac4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups ; tmhm @@ -5661,7 +5661,7 @@ MarillBaseData:: ; 0x52ae4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn AMPHIBIAN, FAIRY ; egg groups ; tmhm @@ -5692,7 +5692,7 @@ AzumarillBaseData:: ; 0x52b04 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn AMPHIBIAN, FAIRY ; egg groups ; tmhm @@ -5723,7 +5723,7 @@ SudowoodoBaseData:: ; 0x52b24 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups ; tmhm @@ -5754,7 +5754,7 @@ PolitoedBaseData:: ; 0x52b44 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups ; tmhm @@ -5785,7 +5785,7 @@ HoppipBaseData:: ; 0x52b64 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn FAIRY, PLANT ; egg groups ; tmhm @@ -5816,7 +5816,7 @@ SkiploomBaseData:: ; 0x52b84 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn FAIRY, PLANT ; egg groups ; tmhm @@ -5847,7 +5847,7 @@ JumpluffBaseData:: ; 0x52ba4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn FAIRY, PLANT ; egg groups ; tmhm @@ -5878,7 +5878,7 @@ AipomBaseData:: ; 0x52bc4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -5909,7 +5909,7 @@ SunkernBaseData:: ; 0x52be4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups ; tmhm @@ -5940,7 +5940,7 @@ SunfloraBaseData:: ; 0x52c04 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups ; tmhm @@ -5971,7 +5971,7 @@ YanmaBaseData:: ; 0x52c24 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -6002,7 +6002,7 @@ WooperBaseData:: ; 0x52c44 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups ; tmhm @@ -6033,7 +6033,7 @@ QuagsireBaseData:: ; 0x52c64 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups ; tmhm @@ -6064,7 +6064,7 @@ EspeonBaseData:: ; 0x52c84 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -6095,7 +6095,7 @@ UmbreonBaseData:: ; 0x52ca4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -6126,7 +6126,7 @@ MurkrowBaseData:: ; 0x52cc4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -6157,7 +6157,7 @@ SlowkingBaseData:: ; 0x52ce4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn MONSTER, AMPHIBIAN ; egg groups ; tmhm @@ -6188,7 +6188,7 @@ MisdreavusBaseData:: ; 0x52d04 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups ; tmhm @@ -6219,7 +6219,7 @@ UnownBaseData:: ; 0x52d24 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -6250,7 +6250,7 @@ WobbuffetBaseData:: ; 0x52d44 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups ; tmhm @@ -6281,7 +6281,7 @@ GirafarigBaseData:: ; 0x52d64 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -6312,7 +6312,7 @@ PinecoBaseData:: ; 0x52d84 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -6343,7 +6343,7 @@ ForretressBaseData:: ; 0x52da4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -6374,7 +6374,7 @@ DunsparceBaseData:: ; 0x52dc4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -6405,7 +6405,7 @@ GligarBaseData:: ; 0x52de4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -6436,7 +6436,7 @@ SteelixBaseData:: ; 0x52e04 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups ; tmhm @@ -6467,7 +6467,7 @@ SnubbullBaseData:: ; 0x52e24 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn FIELD, FAIRY ; egg groups ; tmhm @@ -6498,7 +6498,7 @@ GranbullBaseData:: ; 0x52e44 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn FIELD, FAIRY ; egg groups ; tmhm @@ -6529,7 +6529,7 @@ QwilfishBaseData:: ; 0x52e64 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FISH, FISH ; egg groups ; tmhm @@ -6560,7 +6560,7 @@ ScizorBaseData:: ; 0x52e84 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -6591,7 +6591,7 @@ ShuckleBaseData:: ; 0x52ea4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -6622,7 +6622,7 @@ HeracrossBaseData:: ; 0x52ec4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn INSECT, INSECT ; egg groups ; tmhm @@ -6653,7 +6653,7 @@ SneaselBaseData:: ; 0x52ee4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -6684,7 +6684,7 @@ TeddiursaBaseData:: ; 0x52f04 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -6715,7 +6715,7 @@ UrsaringBaseData:: ; 0x52f24 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -6746,7 +6746,7 @@ SlugmaBaseData:: ; 0x52f44 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups ; tmhm @@ -6777,7 +6777,7 @@ MagcargoBaseData:: ; 0x52f64 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups ; tmhm @@ -6808,7 +6808,7 @@ SwinubBaseData:: ; 0x52f84 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -6839,7 +6839,7 @@ PiloswineBaseData:: ; 0x52fa4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -6870,7 +6870,7 @@ CorsolaBaseData:: ; 0x52fc4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups ; tmhm @@ -6901,7 +6901,7 @@ RemoraidBaseData:: ; 0x52fe4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FISH ; egg groups ; tmhm @@ -6932,7 +6932,7 @@ OctilleryBaseData:: ; 0x53004 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FISH ; egg groups ; tmhm @@ -6963,7 +6963,7 @@ DelibirdBaseData:: ; 0x53024 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn AMPHIBIAN, FIELD ; egg groups ; tmhm @@ -6994,7 +6994,7 @@ MantineBaseData:: ; 0x53044 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups ; tmhm @@ -7025,7 +7025,7 @@ SkarmoryBaseData:: ; 0x53064 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn AVIAN, AVIAN ; egg groups ; tmhm @@ -7056,7 +7056,7 @@ HoundourBaseData:: ; 0x53084 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -7087,7 +7087,7 @@ HoundoomBaseData:: ; 0x530a4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -7118,7 +7118,7 @@ KingdraBaseData:: ; 0x530c4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn AMPHIBIAN, REPTILE ; egg groups ; tmhm @@ -7149,7 +7149,7 @@ PhanpyBaseData:: ; 0x530e4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -7180,7 +7180,7 @@ DonphanBaseData:: ; 0x53104 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -7211,7 +7211,7 @@ Porygon2BaseData:: ; 0x53124 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups ; tmhm @@ -7242,7 +7242,7 @@ StantlerBaseData:: ; 0x53144 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -7273,7 +7273,7 @@ SmeargleBaseData:: ; 0x53164 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -7304,7 +7304,7 @@ TyrogueBaseData:: ; 0x53184 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -7335,7 +7335,7 @@ HitmontopBaseData:: ; 0x531a4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups ; tmhm @@ -7366,7 +7366,7 @@ SmoochumBaseData:: ; 0x531c4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -7397,7 +7397,7 @@ ElekidBaseData:: ; 0x531e4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -7428,7 +7428,7 @@ MagbyBaseData:: ; 0x53204 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 0 ; growth rate + db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -7459,7 +7459,7 @@ MiltankBaseData:: ; 0x53224 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn FIELD, FIELD ; egg groups ; tmhm @@ -7490,7 +7490,7 @@ BlisseyBaseData:: ; 0x53244 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 4 ; growth rate + db SLOW ; growth rate dn FAIRY, FAIRY ; egg groups ; tmhm @@ -7521,7 +7521,7 @@ RaikouBaseData:: ; 0x53264 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -7552,7 +7552,7 @@ EnteiBaseData:: ; 0x53284 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -7583,7 +7583,7 @@ SuicuneBaseData:: ; 0x532a4 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -7614,7 +7614,7 @@ LarvitarBaseData:: ; 0x532c4 db 5 ; unknown dn 5, 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn MONSTER, MONSTER ; egg groups ; tmhm @@ -7645,7 +7645,7 @@ PupitarBaseData:: ; 0x532e4 db 5 ; unknown dn 6, 6 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn MONSTER, MONSTER ; egg groups ; tmhm @@ -7676,7 +7676,7 @@ TyranitarBaseData:: ; 0x53304 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn MONSTER, MONSTER ; egg groups ; tmhm @@ -7707,7 +7707,7 @@ LugiaBaseData:: ; 0x53324 db 5 ; unknown dn 7, 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -7738,7 +7738,7 @@ Ho_OhBaseData:: ; 0x53344 db 5 ; unknown dn 7 , 7 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 5 ; growth rate + db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm @@ -7769,7 +7769,7 @@ CelebiBaseData:: ; 0x53364 db 5 ; unknown dn 5 , 5 ; frontpic dimensions db 0, 0, 0, 0 ; padding - db 3 ; growth rate + db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups ; tmhm diff --git a/stats/battle_tower.asm b/data/battle_tower.asm index 044f351f8..044f351f8 100644 --- a/stats/battle_tower.asm +++ b/data/battle_tower.asm diff --git a/stats/egg_move_pointers.asm b/data/egg_move_pointers.asm index 11665f23e..11665f23e 100644 --- a/stats/egg_move_pointers.asm +++ b/data/egg_move_pointers.asm diff --git a/stats/egg_moves.asm b/data/egg_moves.asm index bba403c01..d48f36989 100644 --- a/stats/egg_moves.asm +++ b/data/egg_moves.asm @@ -10,7 +10,7 @@ SECTION "Egg Moves", ROMX, BANK[EGG_MOVES] ; and can only breed with Ditto. -INCLUDE "stats/egg_move_pointers.asm" +INCLUDE "data/egg_move_pointers.asm" EggMoves:: diff --git a/data/egg_moves_crystal.asm b/data/egg_moves_crystal.asm new file mode 100644 index 000000000..f307e67a0 --- /dev/null +++ b/data/egg_moves_crystal.asm @@ -0,0 +1,3 @@ +INCLUDE "pokecrystal.asm" +INCLUDE "data/egg_moves.asm" + diff --git a/stats/evos_attacks.asm b/data/evos_attacks.asm index 02f4e561b..a85b5b306 100644 --- a/stats/evos_attacks.asm +++ b/data/evos_attacks.asm @@ -4,7 +4,7 @@ INCLUDE "includes.asm" SECTION "Evolutions and Attacks", ROMX, BANK[EVOS_ATTACKS] -INCLUDE "stats/evos_attacks_pointers.asm" +INCLUDE "data/evos_attacks_pointers.asm" EvosAttacks:: diff --git a/data/evos_attacks_crystal.asm b/data/evos_attacks_crystal.asm new file mode 100644 index 000000000..5f2628db5 --- /dev/null +++ b/data/evos_attacks_crystal.asm @@ -0,0 +1,3 @@ +INCLUDE "pokecrystal.asm" +INCLUDE "data/evos_attacks.asm" + diff --git a/stats/evos_attacks_pointers.asm b/data/evos_attacks_pointers.asm index 4ce10b105..4ce10b105 100644 --- a/stats/evos_attacks_pointers.asm +++ b/data/evos_attacks_pointers.asm diff --git a/stats/odd_eggs.asm b/data/odd_eggs.asm index 68062ec3b..68062ec3b 100644 --- a/stats/odd_eggs.asm +++ b/data/odd_eggs.asm diff --git a/stats/pokedex/entries.asm b/data/pokedex/entries.asm index b9dfe7559..50dccd9c1 100644 --- a/stats/pokedex/entries.asm +++ b/data/pokedex/entries.asm @@ -4,23 +4,23 @@ INCLUDE "includes.asm" SECTION "Pokedex Entries 001-064", ROMX, BANK[POKEDEX_ENTRIES_1] PokedexEntries1:: -INCLUDE "stats/pokedex/entries_1.asm" +INCLUDE "data/pokedex/entries_1.asm" SECTION "Pokedex Entries 065-128", ROMX, BANK[POKEDEX_ENTRIES_2] PokedexEntries2:: -INCLUDE "stats/pokedex/entries_2.asm" +INCLUDE "data/pokedex/entries_2.asm" SECTION "Pokedex Entries 129-192", ROMX, BANK[POKEDEX_ENTRIES_3] PokedexEntries3:: -INCLUDE "stats/pokedex/entries_3.asm" +INCLUDE "data/pokedex/entries_3.asm" SECTION "Pokedex Entries 193-251", ROMX, BANK[POKEDEX_ENTRIES_4] PokedexEntries4:: -INCLUDE "stats/pokedex/entries_4.asm" +INCLUDE "data/pokedex/entries_4.asm" diff --git a/stats/pokedex/entries/001.asm b/data/pokedex/entries/001.asm index 299b9d387..299b9d387 100644 --- a/stats/pokedex/entries/001.asm +++ b/data/pokedex/entries/001.asm diff --git a/stats/pokedex/entries/002.asm b/data/pokedex/entries/002.asm index 140ca6bde..140ca6bde 100644 --- a/stats/pokedex/entries/002.asm +++ b/data/pokedex/entries/002.asm diff --git a/stats/pokedex/entries/003.asm b/data/pokedex/entries/003.asm index ed7fdde27..ed7fdde27 100644 --- a/stats/pokedex/entries/003.asm +++ b/data/pokedex/entries/003.asm diff --git a/stats/pokedex/entries/004.asm b/data/pokedex/entries/004.asm index 1452f6208..1452f6208 100644 --- a/stats/pokedex/entries/004.asm +++ b/data/pokedex/entries/004.asm diff --git a/stats/pokedex/entries/005.asm b/data/pokedex/entries/005.asm index bd0e9dac5..bd0e9dac5 100644 --- a/stats/pokedex/entries/005.asm +++ b/data/pokedex/entries/005.asm diff --git a/stats/pokedex/entries/006.asm b/data/pokedex/entries/006.asm index e0cadfb8e..e0cadfb8e 100644 --- a/stats/pokedex/entries/006.asm +++ b/data/pokedex/entries/006.asm diff --git a/stats/pokedex/entries/007.asm b/data/pokedex/entries/007.asm index a02173d66..a02173d66 100644 --- a/stats/pokedex/entries/007.asm +++ b/data/pokedex/entries/007.asm diff --git a/stats/pokedex/entries/008.asm b/data/pokedex/entries/008.asm index 72871a561..72871a561 100644 --- a/stats/pokedex/entries/008.asm +++ b/data/pokedex/entries/008.asm diff --git a/stats/pokedex/entries/009.asm b/data/pokedex/entries/009.asm index 4ca3a99b8..4ca3a99b8 100644 --- a/stats/pokedex/entries/009.asm +++ b/data/pokedex/entries/009.asm diff --git a/stats/pokedex/entries/010.asm b/data/pokedex/entries/010.asm index ccdc9c0ef..ccdc9c0ef 100644 --- a/stats/pokedex/entries/010.asm +++ b/data/pokedex/entries/010.asm diff --git a/stats/pokedex/entries/011.asm b/data/pokedex/entries/011.asm index d93280727..d93280727 100644 --- a/stats/pokedex/entries/011.asm +++ b/data/pokedex/entries/011.asm diff --git a/stats/pokedex/entries/012.asm b/data/pokedex/entries/012.asm index ef345aca6..ef345aca6 100644 --- a/stats/pokedex/entries/012.asm +++ b/data/pokedex/entries/012.asm diff --git a/stats/pokedex/entries/013.asm b/data/pokedex/entries/013.asm index 89908939d..89908939d 100644 --- a/stats/pokedex/entries/013.asm +++ b/data/pokedex/entries/013.asm diff --git a/stats/pokedex/entries/014.asm b/data/pokedex/entries/014.asm index c6bd19d24..c6bd19d24 100644 --- a/stats/pokedex/entries/014.asm +++ b/data/pokedex/entries/014.asm diff --git a/stats/pokedex/entries/015.asm b/data/pokedex/entries/015.asm index 5d8d060e4..5d8d060e4 100644 --- a/stats/pokedex/entries/015.asm +++ b/data/pokedex/entries/015.asm diff --git a/stats/pokedex/entries/016.asm b/data/pokedex/entries/016.asm index 3222c5a72..3222c5a72 100644 --- a/stats/pokedex/entries/016.asm +++ b/data/pokedex/entries/016.asm diff --git a/stats/pokedex/entries/017.asm b/data/pokedex/entries/017.asm index 72550788f..72550788f 100644 --- a/stats/pokedex/entries/017.asm +++ b/data/pokedex/entries/017.asm diff --git a/stats/pokedex/entries/018.asm b/data/pokedex/entries/018.asm index 4e9c6b54a..4e9c6b54a 100644 --- a/stats/pokedex/entries/018.asm +++ b/data/pokedex/entries/018.asm diff --git a/stats/pokedex/entries/019.asm b/data/pokedex/entries/019.asm index c8b44042e..c8b44042e 100644 --- a/stats/pokedex/entries/019.asm +++ b/data/pokedex/entries/019.asm diff --git a/stats/pokedex/entries/020.asm b/data/pokedex/entries/020.asm index 2a0cb2861..2a0cb2861 100644 --- a/stats/pokedex/entries/020.asm +++ b/data/pokedex/entries/020.asm diff --git a/stats/pokedex/entries/021.asm b/data/pokedex/entries/021.asm index dbfd79bf9..dbfd79bf9 100644 --- a/stats/pokedex/entries/021.asm +++ b/data/pokedex/entries/021.asm diff --git a/stats/pokedex/entries/022.asm b/data/pokedex/entries/022.asm index b47860334..b47860334 100644 --- a/stats/pokedex/entries/022.asm +++ b/data/pokedex/entries/022.asm diff --git a/stats/pokedex/entries/023.asm b/data/pokedex/entries/023.asm index 40e71fb17..40e71fb17 100644 --- a/stats/pokedex/entries/023.asm +++ b/data/pokedex/entries/023.asm diff --git a/stats/pokedex/entries/024.asm b/data/pokedex/entries/024.asm index c8d83f43e..c8d83f43e 100644 --- a/stats/pokedex/entries/024.asm +++ b/data/pokedex/entries/024.asm diff --git a/stats/pokedex/entries/025.asm b/data/pokedex/entries/025.asm index b0dd180dc..b0dd180dc 100644 --- a/stats/pokedex/entries/025.asm +++ b/data/pokedex/entries/025.asm diff --git a/stats/pokedex/entries/026.asm b/data/pokedex/entries/026.asm index 65fffc0b9..65fffc0b9 100644 --- a/stats/pokedex/entries/026.asm +++ b/data/pokedex/entries/026.asm diff --git a/stats/pokedex/entries/027.asm b/data/pokedex/entries/027.asm index a52fd2c14..a52fd2c14 100644 --- a/stats/pokedex/entries/027.asm +++ b/data/pokedex/entries/027.asm diff --git a/stats/pokedex/entries/028.asm b/data/pokedex/entries/028.asm index 37abbf54a..37abbf54a 100644 --- a/stats/pokedex/entries/028.asm +++ b/data/pokedex/entries/028.asm diff --git a/stats/pokedex/entries/029.asm b/data/pokedex/entries/029.asm index ad4816de2..ad4816de2 100644 --- a/stats/pokedex/entries/029.asm +++ b/data/pokedex/entries/029.asm diff --git a/stats/pokedex/entries/030.asm b/data/pokedex/entries/030.asm index 50fb9fcba..50fb9fcba 100644 --- a/stats/pokedex/entries/030.asm +++ b/data/pokedex/entries/030.asm diff --git a/stats/pokedex/entries/031.asm b/data/pokedex/entries/031.asm index 3df9bee0d..3df9bee0d 100644 --- a/stats/pokedex/entries/031.asm +++ b/data/pokedex/entries/031.asm diff --git a/stats/pokedex/entries/032.asm b/data/pokedex/entries/032.asm index a61159e2f..a61159e2f 100644 --- a/stats/pokedex/entries/032.asm +++ b/data/pokedex/entries/032.asm diff --git a/stats/pokedex/entries/033.asm b/data/pokedex/entries/033.asm index 3b55e179d..3b55e179d 100644 --- a/stats/pokedex/entries/033.asm +++ b/data/pokedex/entries/033.asm diff --git a/stats/pokedex/entries/034.asm b/data/pokedex/entries/034.asm index 5dd0ec3ec..5dd0ec3ec 100644 --- a/stats/pokedex/entries/034.asm +++ b/data/pokedex/entries/034.asm diff --git a/stats/pokedex/entries/035.asm b/data/pokedex/entries/035.asm index 4c830828c..4c830828c 100644 --- a/stats/pokedex/entries/035.asm +++ b/data/pokedex/entries/035.asm diff --git a/stats/pokedex/entries/036.asm b/data/pokedex/entries/036.asm index b077f4200..b077f4200 100644 --- a/stats/pokedex/entries/036.asm +++ b/data/pokedex/entries/036.asm diff --git a/stats/pokedex/entries/037.asm b/data/pokedex/entries/037.asm index 82f96fa38..82f96fa38 100644 --- a/stats/pokedex/entries/037.asm +++ b/data/pokedex/entries/037.asm diff --git a/stats/pokedex/entries/038.asm b/data/pokedex/entries/038.asm index 7a0b920cc..7a0b920cc 100644 --- a/stats/pokedex/entries/038.asm +++ b/data/pokedex/entries/038.asm diff --git a/stats/pokedex/entries/039.asm b/data/pokedex/entries/039.asm index bd82e78b3..bd82e78b3 100644 --- a/stats/pokedex/entries/039.asm +++ b/data/pokedex/entries/039.asm diff --git a/stats/pokedex/entries/040.asm b/data/pokedex/entries/040.asm index b286443fe..b286443fe 100644 --- a/stats/pokedex/entries/040.asm +++ b/data/pokedex/entries/040.asm diff --git a/stats/pokedex/entries/041.asm b/data/pokedex/entries/041.asm index af8ff5f9f..af8ff5f9f 100644 --- a/stats/pokedex/entries/041.asm +++ b/data/pokedex/entries/041.asm diff --git a/stats/pokedex/entries/042.asm b/data/pokedex/entries/042.asm index 947176126..947176126 100644 --- a/stats/pokedex/entries/042.asm +++ b/data/pokedex/entries/042.asm diff --git a/stats/pokedex/entries/043.asm b/data/pokedex/entries/043.asm index 89b2243d7..89b2243d7 100644 --- a/stats/pokedex/entries/043.asm +++ b/data/pokedex/entries/043.asm diff --git a/stats/pokedex/entries/044.asm b/data/pokedex/entries/044.asm index 0e1c0bced..0e1c0bced 100644 --- a/stats/pokedex/entries/044.asm +++ b/data/pokedex/entries/044.asm diff --git a/stats/pokedex/entries/045.asm b/data/pokedex/entries/045.asm index 07b2afbce..07b2afbce 100644 --- a/stats/pokedex/entries/045.asm +++ b/data/pokedex/entries/045.asm diff --git a/stats/pokedex/entries/046.asm b/data/pokedex/entries/046.asm index cca0a6bd3..cca0a6bd3 100644 --- a/stats/pokedex/entries/046.asm +++ b/data/pokedex/entries/046.asm diff --git a/stats/pokedex/entries/047.asm b/data/pokedex/entries/047.asm index 10ee37924..10ee37924 100644 --- a/stats/pokedex/entries/047.asm +++ b/data/pokedex/entries/047.asm diff --git a/stats/pokedex/entries/048.asm b/data/pokedex/entries/048.asm index 2a57a58e9..2a57a58e9 100644 --- a/stats/pokedex/entries/048.asm +++ b/data/pokedex/entries/048.asm diff --git a/stats/pokedex/entries/049.asm b/data/pokedex/entries/049.asm index 813a46174..813a46174 100644 --- a/stats/pokedex/entries/049.asm +++ b/data/pokedex/entries/049.asm diff --git a/stats/pokedex/entries/050.asm b/data/pokedex/entries/050.asm index b6ff3e44e..b6ff3e44e 100644 --- a/stats/pokedex/entries/050.asm +++ b/data/pokedex/entries/050.asm diff --git a/stats/pokedex/entries/051.asm b/data/pokedex/entries/051.asm index a5e204f5a..a5e204f5a 100644 --- a/stats/pokedex/entries/051.asm +++ b/data/pokedex/entries/051.asm diff --git a/stats/pokedex/entries/052.asm b/data/pokedex/entries/052.asm index 933d944dc..933d944dc 100644 --- a/stats/pokedex/entries/052.asm +++ b/data/pokedex/entries/052.asm diff --git a/stats/pokedex/entries/053.asm b/data/pokedex/entries/053.asm index 2f4fff6c9..2f4fff6c9 100644 --- a/stats/pokedex/entries/053.asm +++ b/data/pokedex/entries/053.asm diff --git a/stats/pokedex/entries/054.asm b/data/pokedex/entries/054.asm index 3802f2853..3802f2853 100644 --- a/stats/pokedex/entries/054.asm +++ b/data/pokedex/entries/054.asm diff --git a/stats/pokedex/entries/055.asm b/data/pokedex/entries/055.asm index 80bbb362d..80bbb362d 100644 --- a/stats/pokedex/entries/055.asm +++ b/data/pokedex/entries/055.asm diff --git a/stats/pokedex/entries/056.asm b/data/pokedex/entries/056.asm index c82e4fea3..c82e4fea3 100644 --- a/stats/pokedex/entries/056.asm +++ b/data/pokedex/entries/056.asm diff --git a/stats/pokedex/entries/057.asm b/data/pokedex/entries/057.asm index c4e988a2a..c4e988a2a 100644 --- a/stats/pokedex/entries/057.asm +++ b/data/pokedex/entries/057.asm diff --git a/stats/pokedex/entries/058.asm b/data/pokedex/entries/058.asm index f86bd1450..f86bd1450 100644 --- a/stats/pokedex/entries/058.asm +++ b/data/pokedex/entries/058.asm diff --git a/stats/pokedex/entries/059.asm b/data/pokedex/entries/059.asm index d96b98f56..d96b98f56 100644 --- a/stats/pokedex/entries/059.asm +++ b/data/pokedex/entries/059.asm diff --git a/stats/pokedex/entries/060.asm b/data/pokedex/entries/060.asm index 5a65c2ff8..5a65c2ff8 100644 --- a/stats/pokedex/entries/060.asm +++ b/data/pokedex/entries/060.asm diff --git a/stats/pokedex/entries/061.asm b/data/pokedex/entries/061.asm index aa1d3108e..aa1d3108e 100644 --- a/stats/pokedex/entries/061.asm +++ b/data/pokedex/entries/061.asm diff --git a/stats/pokedex/entries/062.asm b/data/pokedex/entries/062.asm index f496abd4f..f496abd4f 100644 --- a/stats/pokedex/entries/062.asm +++ b/data/pokedex/entries/062.asm diff --git a/stats/pokedex/entries/063.asm b/data/pokedex/entries/063.asm index 154061ae3..154061ae3 100644 --- a/stats/pokedex/entries/063.asm +++ b/data/pokedex/entries/063.asm diff --git a/stats/pokedex/entries/064.asm b/data/pokedex/entries/064.asm index 4a11eac1e..4a11eac1e 100644 --- a/stats/pokedex/entries/064.asm +++ b/data/pokedex/entries/064.asm diff --git a/stats/pokedex/entries/065.asm b/data/pokedex/entries/065.asm index 5e37ce288..5e37ce288 100644 --- a/stats/pokedex/entries/065.asm +++ b/data/pokedex/entries/065.asm diff --git a/stats/pokedex/entries/066.asm b/data/pokedex/entries/066.asm index 9d0fc0a27..9d0fc0a27 100644 --- a/stats/pokedex/entries/066.asm +++ b/data/pokedex/entries/066.asm diff --git a/stats/pokedex/entries/067.asm b/data/pokedex/entries/067.asm index 02ab56ef7..02ab56ef7 100644 --- a/stats/pokedex/entries/067.asm +++ b/data/pokedex/entries/067.asm diff --git a/stats/pokedex/entries/068.asm b/data/pokedex/entries/068.asm index d971888d8..d971888d8 100644 --- a/stats/pokedex/entries/068.asm +++ b/data/pokedex/entries/068.asm diff --git a/stats/pokedex/entries/069.asm b/data/pokedex/entries/069.asm index 4447bcb51..4447bcb51 100644 --- a/stats/pokedex/entries/069.asm +++ b/data/pokedex/entries/069.asm diff --git a/stats/pokedex/entries/070.asm b/data/pokedex/entries/070.asm index 91b55c298..91b55c298 100644 --- a/stats/pokedex/entries/070.asm +++ b/data/pokedex/entries/070.asm diff --git a/stats/pokedex/entries/071.asm b/data/pokedex/entries/071.asm index 30cd3fccb..30cd3fccb 100644 --- a/stats/pokedex/entries/071.asm +++ b/data/pokedex/entries/071.asm diff --git a/stats/pokedex/entries/072.asm b/data/pokedex/entries/072.asm index f0b8eaa2a..f0b8eaa2a 100644 --- a/stats/pokedex/entries/072.asm +++ b/data/pokedex/entries/072.asm diff --git a/stats/pokedex/entries/073.asm b/data/pokedex/entries/073.asm index 040bba5b2..040bba5b2 100644 --- a/stats/pokedex/entries/073.asm +++ b/data/pokedex/entries/073.asm diff --git a/stats/pokedex/entries/074.asm b/data/pokedex/entries/074.asm index b9edb3bdb..b9edb3bdb 100644 --- a/stats/pokedex/entries/074.asm +++ b/data/pokedex/entries/074.asm diff --git a/stats/pokedex/entries/075.asm b/data/pokedex/entries/075.asm index 136692839..136692839 100644 --- a/stats/pokedex/entries/075.asm +++ b/data/pokedex/entries/075.asm diff --git a/stats/pokedex/entries/076.asm b/data/pokedex/entries/076.asm index 46d4e404b..46d4e404b 100644 --- a/stats/pokedex/entries/076.asm +++ b/data/pokedex/entries/076.asm diff --git a/stats/pokedex/entries/077.asm b/data/pokedex/entries/077.asm index 0135d7d6b..0135d7d6b 100644 --- a/stats/pokedex/entries/077.asm +++ b/data/pokedex/entries/077.asm diff --git a/stats/pokedex/entries/078.asm b/data/pokedex/entries/078.asm index 644a83196..644a83196 100644 --- a/stats/pokedex/entries/078.asm +++ b/data/pokedex/entries/078.asm diff --git a/stats/pokedex/entries/079.asm b/data/pokedex/entries/079.asm index 552a2d245..552a2d245 100644 --- a/stats/pokedex/entries/079.asm +++ b/data/pokedex/entries/079.asm diff --git a/stats/pokedex/entries/080.asm b/data/pokedex/entries/080.asm index 442e3bc27..442e3bc27 100644 --- a/stats/pokedex/entries/080.asm +++ b/data/pokedex/entries/080.asm diff --git a/stats/pokedex/entries/081.asm b/data/pokedex/entries/081.asm index 13f27ee29..13f27ee29 100644 --- a/stats/pokedex/entries/081.asm +++ b/data/pokedex/entries/081.asm diff --git a/stats/pokedex/entries/082.asm b/data/pokedex/entries/082.asm index 2a769478c..2a769478c 100644 --- a/stats/pokedex/entries/082.asm +++ b/data/pokedex/entries/082.asm diff --git a/stats/pokedex/entries/083.asm b/data/pokedex/entries/083.asm index e380d0799..e380d0799 100644 --- a/stats/pokedex/entries/083.asm +++ b/data/pokedex/entries/083.asm diff --git a/stats/pokedex/entries/084.asm b/data/pokedex/entries/084.asm index c9e476a97..c9e476a97 100644 --- a/stats/pokedex/entries/084.asm +++ b/data/pokedex/entries/084.asm diff --git a/stats/pokedex/entries/085.asm b/data/pokedex/entries/085.asm index 44a159c8f..44a159c8f 100644 --- a/stats/pokedex/entries/085.asm +++ b/data/pokedex/entries/085.asm diff --git a/stats/pokedex/entries/086.asm b/data/pokedex/entries/086.asm index 08fb67d40..08fb67d40 100644 --- a/stats/pokedex/entries/086.asm +++ b/data/pokedex/entries/086.asm diff --git a/stats/pokedex/entries/087.asm b/data/pokedex/entries/087.asm index 8cd936c57..8cd936c57 100644 --- a/stats/pokedex/entries/087.asm +++ b/data/pokedex/entries/087.asm diff --git a/stats/pokedex/entries/088.asm b/data/pokedex/entries/088.asm index be9673224..be9673224 100644 --- a/stats/pokedex/entries/088.asm +++ b/data/pokedex/entries/088.asm diff --git a/stats/pokedex/entries/089.asm b/data/pokedex/entries/089.asm index ee2656dd0..ee2656dd0 100644 --- a/stats/pokedex/entries/089.asm +++ b/data/pokedex/entries/089.asm diff --git a/stats/pokedex/entries/090.asm b/data/pokedex/entries/090.asm index d573cae91..d573cae91 100644 --- a/stats/pokedex/entries/090.asm +++ b/data/pokedex/entries/090.asm diff --git a/stats/pokedex/entries/091.asm b/data/pokedex/entries/091.asm index 7e6c21ddd..7e6c21ddd 100644 --- a/stats/pokedex/entries/091.asm +++ b/data/pokedex/entries/091.asm diff --git a/stats/pokedex/entries/092.asm b/data/pokedex/entries/092.asm index 74f9a655b..74f9a655b 100644 --- a/stats/pokedex/entries/092.asm +++ b/data/pokedex/entries/092.asm diff --git a/stats/pokedex/entries/093.asm b/data/pokedex/entries/093.asm index ef1ff419a..ef1ff419a 100644 --- a/stats/pokedex/entries/093.asm +++ b/data/pokedex/entries/093.asm diff --git a/stats/pokedex/entries/094.asm b/data/pokedex/entries/094.asm index 9f374edd6..9f374edd6 100644 --- a/stats/pokedex/entries/094.asm +++ b/data/pokedex/entries/094.asm diff --git a/stats/pokedex/entries/095.asm b/data/pokedex/entries/095.asm index bf036c445..bf036c445 100644 --- a/stats/pokedex/entries/095.asm +++ b/data/pokedex/entries/095.asm diff --git a/stats/pokedex/entries/096.asm b/data/pokedex/entries/096.asm index 1ee6646b9..1ee6646b9 100644 --- a/stats/pokedex/entries/096.asm +++ b/data/pokedex/entries/096.asm diff --git a/stats/pokedex/entries/097.asm b/data/pokedex/entries/097.asm index ddc6a71fa..ddc6a71fa 100644 --- a/stats/pokedex/entries/097.asm +++ b/data/pokedex/entries/097.asm diff --git a/stats/pokedex/entries/098.asm b/data/pokedex/entries/098.asm index 85e6f8c3d..85e6f8c3d 100644 --- a/stats/pokedex/entries/098.asm +++ b/data/pokedex/entries/098.asm diff --git a/stats/pokedex/entries/099.asm b/data/pokedex/entries/099.asm index e558dcdb4..e558dcdb4 100644 --- a/stats/pokedex/entries/099.asm +++ b/data/pokedex/entries/099.asm diff --git a/stats/pokedex/entries/100.asm b/data/pokedex/entries/100.asm index 99d351a39..99d351a39 100644 --- a/stats/pokedex/entries/100.asm +++ b/data/pokedex/entries/100.asm diff --git a/stats/pokedex/entries/101.asm b/data/pokedex/entries/101.asm index 4c093460e..4c093460e 100644 --- a/stats/pokedex/entries/101.asm +++ b/data/pokedex/entries/101.asm diff --git a/stats/pokedex/entries/102.asm b/data/pokedex/entries/102.asm index 853c52de5..853c52de5 100644 --- a/stats/pokedex/entries/102.asm +++ b/data/pokedex/entries/102.asm diff --git a/stats/pokedex/entries/103.asm b/data/pokedex/entries/103.asm index 6fc78c00c..6fc78c00c 100644 --- a/stats/pokedex/entries/103.asm +++ b/data/pokedex/entries/103.asm diff --git a/stats/pokedex/entries/104.asm b/data/pokedex/entries/104.asm index 3288d8117..3288d8117 100644 --- a/stats/pokedex/entries/104.asm +++ b/data/pokedex/entries/104.asm diff --git a/stats/pokedex/entries/105.asm b/data/pokedex/entries/105.asm index cd987271e..cd987271e 100644 --- a/stats/pokedex/entries/105.asm +++ b/data/pokedex/entries/105.asm diff --git a/stats/pokedex/entries/106.asm b/data/pokedex/entries/106.asm index edbce8213..edbce8213 100644 --- a/stats/pokedex/entries/106.asm +++ b/data/pokedex/entries/106.asm diff --git a/stats/pokedex/entries/107.asm b/data/pokedex/entries/107.asm index 93abedee0..93abedee0 100644 --- a/stats/pokedex/entries/107.asm +++ b/data/pokedex/entries/107.asm diff --git a/stats/pokedex/entries/108.asm b/data/pokedex/entries/108.asm index 8ba734493..8ba734493 100644 --- a/stats/pokedex/entries/108.asm +++ b/data/pokedex/entries/108.asm diff --git a/stats/pokedex/entries/109.asm b/data/pokedex/entries/109.asm index f12f8b948..f12f8b948 100644 --- a/stats/pokedex/entries/109.asm +++ b/data/pokedex/entries/109.asm diff --git a/stats/pokedex/entries/110.asm b/data/pokedex/entries/110.asm index 2536b4377..2536b4377 100644 --- a/stats/pokedex/entries/110.asm +++ b/data/pokedex/entries/110.asm diff --git a/stats/pokedex/entries/111.asm b/data/pokedex/entries/111.asm index 77e1ecc82..77e1ecc82 100644 --- a/stats/pokedex/entries/111.asm +++ b/data/pokedex/entries/111.asm diff --git a/stats/pokedex/entries/112.asm b/data/pokedex/entries/112.asm index 93fc1c806..93fc1c806 100644 --- a/stats/pokedex/entries/112.asm +++ b/data/pokedex/entries/112.asm diff --git a/stats/pokedex/entries/113.asm b/data/pokedex/entries/113.asm index a6774dcf9..a6774dcf9 100644 --- a/stats/pokedex/entries/113.asm +++ b/data/pokedex/entries/113.asm diff --git a/stats/pokedex/entries/114.asm b/data/pokedex/entries/114.asm index f2cee4ef8..f2cee4ef8 100644 --- a/stats/pokedex/entries/114.asm +++ b/data/pokedex/entries/114.asm diff --git a/stats/pokedex/entries/115.asm b/data/pokedex/entries/115.asm index aa64e86dd..aa64e86dd 100644 --- a/stats/pokedex/entries/115.asm +++ b/data/pokedex/entries/115.asm diff --git a/stats/pokedex/entries/116.asm b/data/pokedex/entries/116.asm index 32398b4e8..32398b4e8 100644 --- a/stats/pokedex/entries/116.asm +++ b/data/pokedex/entries/116.asm diff --git a/stats/pokedex/entries/117.asm b/data/pokedex/entries/117.asm index 6b24c13f0..6b24c13f0 100644 --- a/stats/pokedex/entries/117.asm +++ b/data/pokedex/entries/117.asm diff --git a/stats/pokedex/entries/118.asm b/data/pokedex/entries/118.asm index bae8e00cf..bae8e00cf 100644 --- a/stats/pokedex/entries/118.asm +++ b/data/pokedex/entries/118.asm diff --git a/stats/pokedex/entries/119.asm b/data/pokedex/entries/119.asm index ecb96c86b..ecb96c86b 100644 --- a/stats/pokedex/entries/119.asm +++ b/data/pokedex/entries/119.asm diff --git a/stats/pokedex/entries/120.asm b/data/pokedex/entries/120.asm index d2bfe22dd..d2bfe22dd 100644 --- a/stats/pokedex/entries/120.asm +++ b/data/pokedex/entries/120.asm diff --git a/stats/pokedex/entries/121.asm b/data/pokedex/entries/121.asm index 4ae383bbd..4ae383bbd 100644 --- a/stats/pokedex/entries/121.asm +++ b/data/pokedex/entries/121.asm diff --git a/stats/pokedex/entries/122.asm b/data/pokedex/entries/122.asm index f9d84ec16..f9d84ec16 100644 --- a/stats/pokedex/entries/122.asm +++ b/data/pokedex/entries/122.asm diff --git a/stats/pokedex/entries/123.asm b/data/pokedex/entries/123.asm index e7a67ca0b..e7a67ca0b 100644 --- a/stats/pokedex/entries/123.asm +++ b/data/pokedex/entries/123.asm diff --git a/stats/pokedex/entries/124.asm b/data/pokedex/entries/124.asm index da3997c69..da3997c69 100644 --- a/stats/pokedex/entries/124.asm +++ b/data/pokedex/entries/124.asm diff --git a/stats/pokedex/entries/125.asm b/data/pokedex/entries/125.asm index 239258364..239258364 100644 --- a/stats/pokedex/entries/125.asm +++ b/data/pokedex/entries/125.asm diff --git a/stats/pokedex/entries/126.asm b/data/pokedex/entries/126.asm index 2930a5a13..2930a5a13 100644 --- a/stats/pokedex/entries/126.asm +++ b/data/pokedex/entries/126.asm diff --git a/stats/pokedex/entries/127.asm b/data/pokedex/entries/127.asm index 760abaaf9..760abaaf9 100644 --- a/stats/pokedex/entries/127.asm +++ b/data/pokedex/entries/127.asm diff --git a/stats/pokedex/entries/128.asm b/data/pokedex/entries/128.asm index 3c1f59f40..3c1f59f40 100644 --- a/stats/pokedex/entries/128.asm +++ b/data/pokedex/entries/128.asm diff --git a/stats/pokedex/entries/129.asm b/data/pokedex/entries/129.asm index ad79a2811..ad79a2811 100644 --- a/stats/pokedex/entries/129.asm +++ b/data/pokedex/entries/129.asm diff --git a/stats/pokedex/entries/130.asm b/data/pokedex/entries/130.asm index 3cdd1b851..3cdd1b851 100644 --- a/stats/pokedex/entries/130.asm +++ b/data/pokedex/entries/130.asm diff --git a/stats/pokedex/entries/131.asm b/data/pokedex/entries/131.asm index c1d5fe035..c1d5fe035 100644 --- a/stats/pokedex/entries/131.asm +++ b/data/pokedex/entries/131.asm diff --git a/stats/pokedex/entries/132.asm b/data/pokedex/entries/132.asm index 587334848..587334848 100644 --- a/stats/pokedex/entries/132.asm +++ b/data/pokedex/entries/132.asm diff --git a/stats/pokedex/entries/133.asm b/data/pokedex/entries/133.asm index 2b055a7d0..2b055a7d0 100644 --- a/stats/pokedex/entries/133.asm +++ b/data/pokedex/entries/133.asm diff --git a/stats/pokedex/entries/134.asm b/data/pokedex/entries/134.asm index 2db4ca0d9..2db4ca0d9 100644 --- a/stats/pokedex/entries/134.asm +++ b/data/pokedex/entries/134.asm diff --git a/stats/pokedex/entries/135.asm b/data/pokedex/entries/135.asm index 0d37fccd7..0d37fccd7 100644 --- a/stats/pokedex/entries/135.asm +++ b/data/pokedex/entries/135.asm diff --git a/stats/pokedex/entries/136.asm b/data/pokedex/entries/136.asm index c03bf0cf6..c03bf0cf6 100644 --- a/stats/pokedex/entries/136.asm +++ b/data/pokedex/entries/136.asm diff --git a/stats/pokedex/entries/137.asm b/data/pokedex/entries/137.asm index 31cf31698..31cf31698 100644 --- a/stats/pokedex/entries/137.asm +++ b/data/pokedex/entries/137.asm diff --git a/stats/pokedex/entries/138.asm b/data/pokedex/entries/138.asm index e221bc453..e221bc453 100644 --- a/stats/pokedex/entries/138.asm +++ b/data/pokedex/entries/138.asm diff --git a/stats/pokedex/entries/139.asm b/data/pokedex/entries/139.asm index 90d148b3a..90d148b3a 100644 --- a/stats/pokedex/entries/139.asm +++ b/data/pokedex/entries/139.asm diff --git a/stats/pokedex/entries/140.asm b/data/pokedex/entries/140.asm index 31a342303..31a342303 100644 --- a/stats/pokedex/entries/140.asm +++ b/data/pokedex/entries/140.asm diff --git a/stats/pokedex/entries/141.asm b/data/pokedex/entries/141.asm index bdce32657..bdce32657 100644 --- a/stats/pokedex/entries/141.asm +++ b/data/pokedex/entries/141.asm diff --git a/stats/pokedex/entries/142.asm b/data/pokedex/entries/142.asm index d47b508a6..d47b508a6 100644 --- a/stats/pokedex/entries/142.asm +++ b/data/pokedex/entries/142.asm diff --git a/stats/pokedex/entries/143.asm b/data/pokedex/entries/143.asm index b58089efc..b58089efc 100644 --- a/stats/pokedex/entries/143.asm +++ b/data/pokedex/entries/143.asm diff --git a/stats/pokedex/entries/144.asm b/data/pokedex/entries/144.asm index c705e912e..c705e912e 100644 --- a/stats/pokedex/entries/144.asm +++ b/data/pokedex/entries/144.asm diff --git a/stats/pokedex/entries/145.asm b/data/pokedex/entries/145.asm index b0e012c29..b0e012c29 100644 --- a/stats/pokedex/entries/145.asm +++ b/data/pokedex/entries/145.asm diff --git a/stats/pokedex/entries/146.asm b/data/pokedex/entries/146.asm index 7a314baf1..7a314baf1 100644 --- a/stats/pokedex/entries/146.asm +++ b/data/pokedex/entries/146.asm diff --git a/stats/pokedex/entries/147.asm b/data/pokedex/entries/147.asm index 2763ed608..2763ed608 100644 --- a/stats/pokedex/entries/147.asm +++ b/data/pokedex/entries/147.asm diff --git a/stats/pokedex/entries/148.asm b/data/pokedex/entries/148.asm index 2bb507f88..2bb507f88 100644 --- a/stats/pokedex/entries/148.asm +++ b/data/pokedex/entries/148.asm diff --git a/stats/pokedex/entries/149.asm b/data/pokedex/entries/149.asm index 1ddfab146..1ddfab146 100644 --- a/stats/pokedex/entries/149.asm +++ b/data/pokedex/entries/149.asm diff --git a/stats/pokedex/entries/150.asm b/data/pokedex/entries/150.asm index a1e922e05..a1e922e05 100644 --- a/stats/pokedex/entries/150.asm +++ b/data/pokedex/entries/150.asm diff --git a/stats/pokedex/entries/151.asm b/data/pokedex/entries/151.asm index 1415d07b7..1415d07b7 100644 --- a/stats/pokedex/entries/151.asm +++ b/data/pokedex/entries/151.asm diff --git a/stats/pokedex/entries/152.asm b/data/pokedex/entries/152.asm index a7d279643..a7d279643 100644 --- a/stats/pokedex/entries/152.asm +++ b/data/pokedex/entries/152.asm diff --git a/stats/pokedex/entries/153.asm b/data/pokedex/entries/153.asm index 22be1337a..22be1337a 100644 --- a/stats/pokedex/entries/153.asm +++ b/data/pokedex/entries/153.asm diff --git a/stats/pokedex/entries/154.asm b/data/pokedex/entries/154.asm index 7144a6b09..7144a6b09 100644 --- a/stats/pokedex/entries/154.asm +++ b/data/pokedex/entries/154.asm diff --git a/stats/pokedex/entries/155.asm b/data/pokedex/entries/155.asm index 9a1f7749a..9a1f7749a 100644 --- a/stats/pokedex/entries/155.asm +++ b/data/pokedex/entries/155.asm diff --git a/stats/pokedex/entries/156.asm b/data/pokedex/entries/156.asm index 2840d0c93..2840d0c93 100644 --- a/stats/pokedex/entries/156.asm +++ b/data/pokedex/entries/156.asm diff --git a/stats/pokedex/entries/157.asm b/data/pokedex/entries/157.asm index b21d62268..b21d62268 100644 --- a/stats/pokedex/entries/157.asm +++ b/data/pokedex/entries/157.asm diff --git a/stats/pokedex/entries/158.asm b/data/pokedex/entries/158.asm index d3f3f97ab..d3f3f97ab 100644 --- a/stats/pokedex/entries/158.asm +++ b/data/pokedex/entries/158.asm diff --git a/stats/pokedex/entries/159.asm b/data/pokedex/entries/159.asm index d44f99d0e..d44f99d0e 100644 --- a/stats/pokedex/entries/159.asm +++ b/data/pokedex/entries/159.asm diff --git a/stats/pokedex/entries/160.asm b/data/pokedex/entries/160.asm index 31aee2d44..31aee2d44 100644 --- a/stats/pokedex/entries/160.asm +++ b/data/pokedex/entries/160.asm diff --git a/stats/pokedex/entries/161.asm b/data/pokedex/entries/161.asm index 991c22baa..991c22baa 100644 --- a/stats/pokedex/entries/161.asm +++ b/data/pokedex/entries/161.asm diff --git a/stats/pokedex/entries/162.asm b/data/pokedex/entries/162.asm index e6e7a0121..e6e7a0121 100644 --- a/stats/pokedex/entries/162.asm +++ b/data/pokedex/entries/162.asm diff --git a/stats/pokedex/entries/163.asm b/data/pokedex/entries/163.asm index 0a1841ccf..0a1841ccf 100644 --- a/stats/pokedex/entries/163.asm +++ b/data/pokedex/entries/163.asm diff --git a/stats/pokedex/entries/164.asm b/data/pokedex/entries/164.asm index c1828b350..c1828b350 100644 --- a/stats/pokedex/entries/164.asm +++ b/data/pokedex/entries/164.asm diff --git a/stats/pokedex/entries/165.asm b/data/pokedex/entries/165.asm index 7abaf54ea..7abaf54ea 100644 --- a/stats/pokedex/entries/165.asm +++ b/data/pokedex/entries/165.asm diff --git a/stats/pokedex/entries/166.asm b/data/pokedex/entries/166.asm index 80284d756..80284d756 100644 --- a/stats/pokedex/entries/166.asm +++ b/data/pokedex/entries/166.asm diff --git a/stats/pokedex/entries/167.asm b/data/pokedex/entries/167.asm index eecfe3b5d..eecfe3b5d 100644 --- a/stats/pokedex/entries/167.asm +++ b/data/pokedex/entries/167.asm diff --git a/stats/pokedex/entries/168.asm b/data/pokedex/entries/168.asm index 0318cdf73..0318cdf73 100644 --- a/stats/pokedex/entries/168.asm +++ b/data/pokedex/entries/168.asm diff --git a/stats/pokedex/entries/169.asm b/data/pokedex/entries/169.asm index d5483e029..d5483e029 100644 --- a/stats/pokedex/entries/169.asm +++ b/data/pokedex/entries/169.asm diff --git a/stats/pokedex/entries/170.asm b/data/pokedex/entries/170.asm index b3d5344ff..b3d5344ff 100644 --- a/stats/pokedex/entries/170.asm +++ b/data/pokedex/entries/170.asm diff --git a/stats/pokedex/entries/171.asm b/data/pokedex/entries/171.asm index 5ec3afdfc..5ec3afdfc 100644 --- a/stats/pokedex/entries/171.asm +++ b/data/pokedex/entries/171.asm diff --git a/stats/pokedex/entries/172.asm b/data/pokedex/entries/172.asm index 896a40684..896a40684 100644 --- a/stats/pokedex/entries/172.asm +++ b/data/pokedex/entries/172.asm diff --git a/stats/pokedex/entries/173.asm b/data/pokedex/entries/173.asm index 6b87925cd..6b87925cd 100644 --- a/stats/pokedex/entries/173.asm +++ b/data/pokedex/entries/173.asm diff --git a/stats/pokedex/entries/174.asm b/data/pokedex/entries/174.asm index 683dc2955..683dc2955 100644 --- a/stats/pokedex/entries/174.asm +++ b/data/pokedex/entries/174.asm diff --git a/stats/pokedex/entries/175.asm b/data/pokedex/entries/175.asm index 07b139abe..07b139abe 100644 --- a/stats/pokedex/entries/175.asm +++ b/data/pokedex/entries/175.asm diff --git a/stats/pokedex/entries/176.asm b/data/pokedex/entries/176.asm index 14f02bad0..14f02bad0 100644 --- a/stats/pokedex/entries/176.asm +++ b/data/pokedex/entries/176.asm diff --git a/stats/pokedex/entries/177.asm b/data/pokedex/entries/177.asm index 7dab8f356..7dab8f356 100644 --- a/stats/pokedex/entries/177.asm +++ b/data/pokedex/entries/177.asm diff --git a/stats/pokedex/entries/178.asm b/data/pokedex/entries/178.asm index 169efa407..169efa407 100644 --- a/stats/pokedex/entries/178.asm +++ b/data/pokedex/entries/178.asm diff --git a/stats/pokedex/entries/179.asm b/data/pokedex/entries/179.asm index 4c64aff8a..4c64aff8a 100644 --- a/stats/pokedex/entries/179.asm +++ b/data/pokedex/entries/179.asm diff --git a/stats/pokedex/entries/180.asm b/data/pokedex/entries/180.asm index d30f7c877..d30f7c877 100644 --- a/stats/pokedex/entries/180.asm +++ b/data/pokedex/entries/180.asm diff --git a/stats/pokedex/entries/181.asm b/data/pokedex/entries/181.asm index da50c306c..da50c306c 100644 --- a/stats/pokedex/entries/181.asm +++ b/data/pokedex/entries/181.asm diff --git a/stats/pokedex/entries/182.asm b/data/pokedex/entries/182.asm index 381e85fc1..381e85fc1 100644 --- a/stats/pokedex/entries/182.asm +++ b/data/pokedex/entries/182.asm diff --git a/stats/pokedex/entries/183.asm b/data/pokedex/entries/183.asm index 44ba743eb..44ba743eb 100644 --- a/stats/pokedex/entries/183.asm +++ b/data/pokedex/entries/183.asm diff --git a/stats/pokedex/entries/184.asm b/data/pokedex/entries/184.asm index b50f6aea7..b50f6aea7 100644 --- a/stats/pokedex/entries/184.asm +++ b/data/pokedex/entries/184.asm diff --git a/stats/pokedex/entries/185.asm b/data/pokedex/entries/185.asm index 1c991d895..1c991d895 100644 --- a/stats/pokedex/entries/185.asm +++ b/data/pokedex/entries/185.asm diff --git a/stats/pokedex/entries/186.asm b/data/pokedex/entries/186.asm index 7db0bea6e..7db0bea6e 100644 --- a/stats/pokedex/entries/186.asm +++ b/data/pokedex/entries/186.asm diff --git a/stats/pokedex/entries/187.asm b/data/pokedex/entries/187.asm index d9f294382..d9f294382 100644 --- a/stats/pokedex/entries/187.asm +++ b/data/pokedex/entries/187.asm diff --git a/stats/pokedex/entries/188.asm b/data/pokedex/entries/188.asm index aa5afd0cb..aa5afd0cb 100644 --- a/stats/pokedex/entries/188.asm +++ b/data/pokedex/entries/188.asm diff --git a/stats/pokedex/entries/189.asm b/data/pokedex/entries/189.asm index 94199651a..94199651a 100644 --- a/stats/pokedex/entries/189.asm +++ b/data/pokedex/entries/189.asm diff --git a/stats/pokedex/entries/190.asm b/data/pokedex/entries/190.asm index 1d9cbf18f..1d9cbf18f 100644 --- a/stats/pokedex/entries/190.asm +++ b/data/pokedex/entries/190.asm diff --git a/stats/pokedex/entries/191.asm b/data/pokedex/entries/191.asm index c4f7917ab..c4f7917ab 100644 --- a/stats/pokedex/entries/191.asm +++ b/data/pokedex/entries/191.asm diff --git a/stats/pokedex/entries/192.asm b/data/pokedex/entries/192.asm index fd4ab5010..fd4ab5010 100644 --- a/stats/pokedex/entries/192.asm +++ b/data/pokedex/entries/192.asm diff --git a/stats/pokedex/entries/193.asm b/data/pokedex/entries/193.asm index 7a3d1e901..7a3d1e901 100644 --- a/stats/pokedex/entries/193.asm +++ b/data/pokedex/entries/193.asm diff --git a/stats/pokedex/entries/194.asm b/data/pokedex/entries/194.asm index 8b73d95f8..8b73d95f8 100644 --- a/stats/pokedex/entries/194.asm +++ b/data/pokedex/entries/194.asm diff --git a/stats/pokedex/entries/195.asm b/data/pokedex/entries/195.asm index 0c8cd45de..0c8cd45de 100644 --- a/stats/pokedex/entries/195.asm +++ b/data/pokedex/entries/195.asm diff --git a/stats/pokedex/entries/196.asm b/data/pokedex/entries/196.asm index e5a0ddefe..e5a0ddefe 100644 --- a/stats/pokedex/entries/196.asm +++ b/data/pokedex/entries/196.asm diff --git a/stats/pokedex/entries/197.asm b/data/pokedex/entries/197.asm index 9e7ae227e..9e7ae227e 100644 --- a/stats/pokedex/entries/197.asm +++ b/data/pokedex/entries/197.asm diff --git a/stats/pokedex/entries/198.asm b/data/pokedex/entries/198.asm index fd5db0d7d..fd5db0d7d 100644 --- a/stats/pokedex/entries/198.asm +++ b/data/pokedex/entries/198.asm diff --git a/stats/pokedex/entries/199.asm b/data/pokedex/entries/199.asm index 057976b6f..057976b6f 100644 --- a/stats/pokedex/entries/199.asm +++ b/data/pokedex/entries/199.asm diff --git a/stats/pokedex/entries/200.asm b/data/pokedex/entries/200.asm index 9e1f5b7af..9e1f5b7af 100644 --- a/stats/pokedex/entries/200.asm +++ b/data/pokedex/entries/200.asm diff --git a/stats/pokedex/entries/201.asm b/data/pokedex/entries/201.asm index d7df7f924..d7df7f924 100644 --- a/stats/pokedex/entries/201.asm +++ b/data/pokedex/entries/201.asm diff --git a/stats/pokedex/entries/202.asm b/data/pokedex/entries/202.asm index 2d3d29142..2d3d29142 100644 --- a/stats/pokedex/entries/202.asm +++ b/data/pokedex/entries/202.asm diff --git a/stats/pokedex/entries/203.asm b/data/pokedex/entries/203.asm index ba5e8286c..ba5e8286c 100644 --- a/stats/pokedex/entries/203.asm +++ b/data/pokedex/entries/203.asm diff --git a/stats/pokedex/entries/204.asm b/data/pokedex/entries/204.asm index 6edeb49c0..6edeb49c0 100644 --- a/stats/pokedex/entries/204.asm +++ b/data/pokedex/entries/204.asm diff --git a/stats/pokedex/entries/205.asm b/data/pokedex/entries/205.asm index 540d64797..540d64797 100644 --- a/stats/pokedex/entries/205.asm +++ b/data/pokedex/entries/205.asm diff --git a/stats/pokedex/entries/206.asm b/data/pokedex/entries/206.asm index 517436a21..517436a21 100644 --- a/stats/pokedex/entries/206.asm +++ b/data/pokedex/entries/206.asm diff --git a/stats/pokedex/entries/207.asm b/data/pokedex/entries/207.asm index 03f973837..03f973837 100644 --- a/stats/pokedex/entries/207.asm +++ b/data/pokedex/entries/207.asm diff --git a/stats/pokedex/entries/208.asm b/data/pokedex/entries/208.asm index c3741a11c..c3741a11c 100644 --- a/stats/pokedex/entries/208.asm +++ b/data/pokedex/entries/208.asm diff --git a/stats/pokedex/entries/209.asm b/data/pokedex/entries/209.asm index 1966611ae..1966611ae 100644 --- a/stats/pokedex/entries/209.asm +++ b/data/pokedex/entries/209.asm diff --git a/stats/pokedex/entries/210.asm b/data/pokedex/entries/210.asm index 0ecc4d9fb..0ecc4d9fb 100644 --- a/stats/pokedex/entries/210.asm +++ b/data/pokedex/entries/210.asm diff --git a/stats/pokedex/entries/211.asm b/data/pokedex/entries/211.asm index 8733eaba2..8733eaba2 100644 --- a/stats/pokedex/entries/211.asm +++ b/data/pokedex/entries/211.asm diff --git a/stats/pokedex/entries/212.asm b/data/pokedex/entries/212.asm index a97794f32..a97794f32 100644 --- a/stats/pokedex/entries/212.asm +++ b/data/pokedex/entries/212.asm diff --git a/stats/pokedex/entries/213.asm b/data/pokedex/entries/213.asm index 3723eb0ef..3723eb0ef 100644 --- a/stats/pokedex/entries/213.asm +++ b/data/pokedex/entries/213.asm diff --git a/stats/pokedex/entries/214.asm b/data/pokedex/entries/214.asm index 7ce1d1d4d..7ce1d1d4d 100644 --- a/stats/pokedex/entries/214.asm +++ b/data/pokedex/entries/214.asm diff --git a/stats/pokedex/entries/215.asm b/data/pokedex/entries/215.asm index b8aba2b53..b8aba2b53 100644 --- a/stats/pokedex/entries/215.asm +++ b/data/pokedex/entries/215.asm diff --git a/stats/pokedex/entries/216.asm b/data/pokedex/entries/216.asm index c6e303cba..c6e303cba 100644 --- a/stats/pokedex/entries/216.asm +++ b/data/pokedex/entries/216.asm diff --git a/stats/pokedex/entries/217.asm b/data/pokedex/entries/217.asm index db944463c..db944463c 100644 --- a/stats/pokedex/entries/217.asm +++ b/data/pokedex/entries/217.asm diff --git a/stats/pokedex/entries/218.asm b/data/pokedex/entries/218.asm index d6998cb2e..d6998cb2e 100644 --- a/stats/pokedex/entries/218.asm +++ b/data/pokedex/entries/218.asm diff --git a/stats/pokedex/entries/219.asm b/data/pokedex/entries/219.asm index e83798886..e83798886 100644 --- a/stats/pokedex/entries/219.asm +++ b/data/pokedex/entries/219.asm diff --git a/stats/pokedex/entries/220.asm b/data/pokedex/entries/220.asm index b93d42115..b93d42115 100644 --- a/stats/pokedex/entries/220.asm +++ b/data/pokedex/entries/220.asm diff --git a/stats/pokedex/entries/221.asm b/data/pokedex/entries/221.asm index 035437976..035437976 100644 --- a/stats/pokedex/entries/221.asm +++ b/data/pokedex/entries/221.asm diff --git a/stats/pokedex/entries/222.asm b/data/pokedex/entries/222.asm index 0c91cb5fd..0c91cb5fd 100644 --- a/stats/pokedex/entries/222.asm +++ b/data/pokedex/entries/222.asm diff --git a/stats/pokedex/entries/223.asm b/data/pokedex/entries/223.asm index 2691f746e..2691f746e 100644 --- a/stats/pokedex/entries/223.asm +++ b/data/pokedex/entries/223.asm diff --git a/stats/pokedex/entries/224.asm b/data/pokedex/entries/224.asm index d6e641b79..d6e641b79 100644 --- a/stats/pokedex/entries/224.asm +++ b/data/pokedex/entries/224.asm diff --git a/stats/pokedex/entries/225.asm b/data/pokedex/entries/225.asm index 17407b962..17407b962 100644 --- a/stats/pokedex/entries/225.asm +++ b/data/pokedex/entries/225.asm diff --git a/stats/pokedex/entries/226.asm b/data/pokedex/entries/226.asm index 25dc6abcc..25dc6abcc 100644 --- a/stats/pokedex/entries/226.asm +++ b/data/pokedex/entries/226.asm diff --git a/stats/pokedex/entries/227.asm b/data/pokedex/entries/227.asm index 51b0041b1..51b0041b1 100644 --- a/stats/pokedex/entries/227.asm +++ b/data/pokedex/entries/227.asm diff --git a/stats/pokedex/entries/228.asm b/data/pokedex/entries/228.asm index a9e97dc80..a9e97dc80 100644 --- a/stats/pokedex/entries/228.asm +++ b/data/pokedex/entries/228.asm diff --git a/stats/pokedex/entries/229.asm b/data/pokedex/entries/229.asm index dc66b4e1a..dc66b4e1a 100644 --- a/stats/pokedex/entries/229.asm +++ b/data/pokedex/entries/229.asm diff --git a/stats/pokedex/entries/230.asm b/data/pokedex/entries/230.asm index efe33cf9f..efe33cf9f 100644 --- a/stats/pokedex/entries/230.asm +++ b/data/pokedex/entries/230.asm diff --git a/stats/pokedex/entries/231.asm b/data/pokedex/entries/231.asm index b05619682..b05619682 100644 --- a/stats/pokedex/entries/231.asm +++ b/data/pokedex/entries/231.asm diff --git a/stats/pokedex/entries/232.asm b/data/pokedex/entries/232.asm index 3c8e4a1f3..3c8e4a1f3 100644 --- a/stats/pokedex/entries/232.asm +++ b/data/pokedex/entries/232.asm diff --git a/stats/pokedex/entries/233.asm b/data/pokedex/entries/233.asm index c6be07b88..c6be07b88 100644 --- a/stats/pokedex/entries/233.asm +++ b/data/pokedex/entries/233.asm diff --git a/stats/pokedex/entries/234.asm b/data/pokedex/entries/234.asm index 25a37388a..25a37388a 100644 --- a/stats/pokedex/entries/234.asm +++ b/data/pokedex/entries/234.asm diff --git a/stats/pokedex/entries/235.asm b/data/pokedex/entries/235.asm index e775600df..e775600df 100644 --- a/stats/pokedex/entries/235.asm +++ b/data/pokedex/entries/235.asm diff --git a/stats/pokedex/entries/236.asm b/data/pokedex/entries/236.asm index 3eb4ef54c..3eb4ef54c 100644 --- a/stats/pokedex/entries/236.asm +++ b/data/pokedex/entries/236.asm diff --git a/stats/pokedex/entries/237.asm b/data/pokedex/entries/237.asm index 192aeae0b..192aeae0b 100644 --- a/stats/pokedex/entries/237.asm +++ b/data/pokedex/entries/237.asm diff --git a/stats/pokedex/entries/238.asm b/data/pokedex/entries/238.asm index 5b10b2572..5b10b2572 100644 --- a/stats/pokedex/entries/238.asm +++ b/data/pokedex/entries/238.asm diff --git a/stats/pokedex/entries/239.asm b/data/pokedex/entries/239.asm index 9553aa2f5..9553aa2f5 100644 --- a/stats/pokedex/entries/239.asm +++ b/data/pokedex/entries/239.asm diff --git a/stats/pokedex/entries/240.asm b/data/pokedex/entries/240.asm index 6ca68128b..6ca68128b 100644 --- a/stats/pokedex/entries/240.asm +++ b/data/pokedex/entries/240.asm diff --git a/stats/pokedex/entries/241.asm b/data/pokedex/entries/241.asm index da449be03..da449be03 100644 --- a/stats/pokedex/entries/241.asm +++ b/data/pokedex/entries/241.asm diff --git a/stats/pokedex/entries/242.asm b/data/pokedex/entries/242.asm index 38f3a7895..38f3a7895 100644 --- a/stats/pokedex/entries/242.asm +++ b/data/pokedex/entries/242.asm diff --git a/stats/pokedex/entries/243.asm b/data/pokedex/entries/243.asm index ed6d3bb21..ed6d3bb21 100644 --- a/stats/pokedex/entries/243.asm +++ b/data/pokedex/entries/243.asm diff --git a/stats/pokedex/entries/244.asm b/data/pokedex/entries/244.asm index b30afa9b2..b30afa9b2 100644 --- a/stats/pokedex/entries/244.asm +++ b/data/pokedex/entries/244.asm diff --git a/stats/pokedex/entries/245.asm b/data/pokedex/entries/245.asm index f8763699f..f8763699f 100644 --- a/stats/pokedex/entries/245.asm +++ b/data/pokedex/entries/245.asm diff --git a/stats/pokedex/entries/246.asm b/data/pokedex/entries/246.asm index bfa45f911..bfa45f911 100644 --- a/stats/pokedex/entries/246.asm +++ b/data/pokedex/entries/246.asm diff --git a/stats/pokedex/entries/247.asm b/data/pokedex/entries/247.asm index dfe104c4f..dfe104c4f 100644 --- a/stats/pokedex/entries/247.asm +++ b/data/pokedex/entries/247.asm diff --git a/stats/pokedex/entries/248.asm b/data/pokedex/entries/248.asm index 8c5852b56..8c5852b56 100644 --- a/stats/pokedex/entries/248.asm +++ b/data/pokedex/entries/248.asm diff --git a/stats/pokedex/entries/249.asm b/data/pokedex/entries/249.asm index c84ea7cbb..c84ea7cbb 100644 --- a/stats/pokedex/entries/249.asm +++ b/data/pokedex/entries/249.asm diff --git a/stats/pokedex/entries/250.asm b/data/pokedex/entries/250.asm index 62390b1a5..62390b1a5 100644 --- a/stats/pokedex/entries/250.asm +++ b/data/pokedex/entries/250.asm diff --git a/stats/pokedex/entries/251.asm b/data/pokedex/entries/251.asm index 770b654d5..770b654d5 100644 --- a/stats/pokedex/entries/251.asm +++ b/data/pokedex/entries/251.asm diff --git a/data/pokedex/entries_1.asm b/data/pokedex/entries_1.asm new file mode 100644 index 000000000..f45bba49f --- /dev/null +++ b/data/pokedex/entries_1.asm @@ -0,0 +1,64 @@ +BulbasaurPokedexEntry:: INCLUDE "data/pokedex/entries/001.asm" +IvysaurPokedexEntry:: INCLUDE "data/pokedex/entries/002.asm" +VenusaurPokedexEntry:: INCLUDE "data/pokedex/entries/003.asm" +CharmanderPokedexEntry:: INCLUDE "data/pokedex/entries/004.asm" +CharmeleonPokedexEntry:: INCLUDE "data/pokedex/entries/005.asm" +CharizardPokedexEntry:: INCLUDE "data/pokedex/entries/006.asm" +SquirtlePokedexEntry:: INCLUDE "data/pokedex/entries/007.asm" +WartortlePokedexEntry:: INCLUDE "data/pokedex/entries/008.asm" +BlastoisePokedexEntry:: INCLUDE "data/pokedex/entries/009.asm" +CaterpiePokedexEntry:: INCLUDE "data/pokedex/entries/010.asm" +MetapodPokedexEntry:: INCLUDE "data/pokedex/entries/011.asm" +ButterfreePokedexEntry:: INCLUDE "data/pokedex/entries/012.asm" +WeedlePokedexEntry:: INCLUDE "data/pokedex/entries/013.asm" +KakunaPokedexEntry:: INCLUDE "data/pokedex/entries/014.asm" +BeedrillPokedexEntry:: INCLUDE "data/pokedex/entries/015.asm" +PidgeyPokedexEntry:: INCLUDE "data/pokedex/entries/016.asm" +PidgeottoPokedexEntry:: INCLUDE "data/pokedex/entries/017.asm" +PidgeotPokedexEntry:: INCLUDE "data/pokedex/entries/018.asm" +RattataPokedexEntry:: INCLUDE "data/pokedex/entries/019.asm" +RaticatePokedexEntry:: INCLUDE "data/pokedex/entries/020.asm" +SpearowPokedexEntry:: INCLUDE "data/pokedex/entries/021.asm" +FearowPokedexEntry:: INCLUDE "data/pokedex/entries/022.asm" +EkansPokedexEntry:: INCLUDE "data/pokedex/entries/023.asm" +ArbokPokedexEntry:: INCLUDE "data/pokedex/entries/024.asm" +PikachuPokedexEntry:: INCLUDE "data/pokedex/entries/025.asm" +RaichuPokedexEntry:: INCLUDE "data/pokedex/entries/026.asm" +SandshrewPokedexEntry:: INCLUDE "data/pokedex/entries/027.asm" +SandslashPokedexEntry:: INCLUDE "data/pokedex/entries/028.asm" +NidoranFPokedexEntry:: INCLUDE "data/pokedex/entries/029.asm" +NidorinaPokedexEntry:: INCLUDE "data/pokedex/entries/030.asm" +NidoqueenPokedexEntry:: INCLUDE "data/pokedex/entries/031.asm" +NidoranMPokedexEntry:: INCLUDE "data/pokedex/entries/032.asm" +NidorinoPokedexEntry:: INCLUDE "data/pokedex/entries/033.asm" +NidokingPokedexEntry:: INCLUDE "data/pokedex/entries/034.asm" +ClefairyPokedexEntry:: INCLUDE "data/pokedex/entries/035.asm" +ClefablePokedexEntry:: INCLUDE "data/pokedex/entries/036.asm" +VulpixPokedexEntry:: INCLUDE "data/pokedex/entries/037.asm" +NinetalesPokedexEntry:: INCLUDE "data/pokedex/entries/038.asm" +JigglypuffPokedexEntry:: INCLUDE "data/pokedex/entries/039.asm" +WigglytuffPokedexEntry:: INCLUDE "data/pokedex/entries/040.asm" +ZubatPokedexEntry:: INCLUDE "data/pokedex/entries/041.asm" +GolbatPokedexEntry:: INCLUDE "data/pokedex/entries/042.asm" +OddishPokedexEntry:: INCLUDE "data/pokedex/entries/043.asm" +GloomPokedexEntry:: INCLUDE "data/pokedex/entries/044.asm" +VileplumePokedexEntry:: INCLUDE "data/pokedex/entries/045.asm" +ParasPokedexEntry:: INCLUDE "data/pokedex/entries/046.asm" +ParasectPokedexEntry:: INCLUDE "data/pokedex/entries/047.asm" +VenonatPokedexEntry:: INCLUDE "data/pokedex/entries/048.asm" +VenomothPokedexEntry:: INCLUDE "data/pokedex/entries/049.asm" +DiglettPokedexEntry:: INCLUDE "data/pokedex/entries/050.asm" +DugtrioPokedexEntry:: INCLUDE "data/pokedex/entries/051.asm" +MeowthPokedexEntry:: INCLUDE "data/pokedex/entries/052.asm" +PersianPokedexEntry:: INCLUDE "data/pokedex/entries/053.asm" +PsyduckPokedexEntry:: INCLUDE "data/pokedex/entries/054.asm" +GolduckPokedexEntry:: INCLUDE "data/pokedex/entries/055.asm" +MankeyPokedexEntry:: INCLUDE "data/pokedex/entries/056.asm" +PrimeapePokedexEntry:: INCLUDE "data/pokedex/entries/057.asm" +GrowlithePokedexEntry:: INCLUDE "data/pokedex/entries/058.asm" +ArcaninePokedexEntry:: INCLUDE "data/pokedex/entries/059.asm" +PoliwagPokedexEntry:: INCLUDE "data/pokedex/entries/060.asm" +PoliwhirlPokedexEntry:: INCLUDE "data/pokedex/entries/061.asm" +PoliwrathPokedexEntry:: INCLUDE "data/pokedex/entries/062.asm" +AbraPokedexEntry:: INCLUDE "data/pokedex/entries/063.asm" +KadabraPokedexEntry:: INCLUDE "data/pokedex/entries/064.asm" diff --git a/data/pokedex/entries_2.asm b/data/pokedex/entries_2.asm new file mode 100644 index 000000000..2561d6c3e --- /dev/null +++ b/data/pokedex/entries_2.asm @@ -0,0 +1,64 @@ +AlakazamPokedexEntry:: INCLUDE "data/pokedex/entries/065.asm" +MachopPokedexEntry:: INCLUDE "data/pokedex/entries/066.asm" +MachokePokedexEntry:: INCLUDE "data/pokedex/entries/067.asm" +MachampPokedexEntry:: INCLUDE "data/pokedex/entries/068.asm" +BellsproutPokedexEntry:: INCLUDE "data/pokedex/entries/069.asm" +WeepinbellPokedexEntry:: INCLUDE "data/pokedex/entries/070.asm" +VictreebelPokedexEntry:: INCLUDE "data/pokedex/entries/071.asm" +TentacoolPokedexEntry:: INCLUDE "data/pokedex/entries/072.asm" +TentacruelPokedexEntry:: INCLUDE "data/pokedex/entries/073.asm" +GeodudePokedexEntry:: INCLUDE "data/pokedex/entries/074.asm" +GravelerPokedexEntry:: INCLUDE "data/pokedex/entries/075.asm" +GolemPokedexEntry:: INCLUDE "data/pokedex/entries/076.asm" +PonytaPokedexEntry:: INCLUDE "data/pokedex/entries/077.asm" +RapidashPokedexEntry:: INCLUDE "data/pokedex/entries/078.asm" +SlowpokePokedexEntry:: INCLUDE "data/pokedex/entries/079.asm" +SlowbroPokedexEntry:: INCLUDE "data/pokedex/entries/080.asm" +MagnemitePokedexEntry:: INCLUDE "data/pokedex/entries/081.asm" +MagnetonPokedexEntry:: INCLUDE "data/pokedex/entries/082.asm" +FarfetchDPokedexEntry:: INCLUDE "data/pokedex/entries/083.asm" +DoduoPokedexEntry:: INCLUDE "data/pokedex/entries/084.asm" +DodrioPokedexEntry:: INCLUDE "data/pokedex/entries/085.asm" +SeelPokedexEntry:: INCLUDE "data/pokedex/entries/086.asm" +DewgongPokedexEntry:: INCLUDE "data/pokedex/entries/087.asm" +GrimerPokedexEntry:: INCLUDE "data/pokedex/entries/088.asm" +MukPokedexEntry:: INCLUDE "data/pokedex/entries/089.asm" +ShellderPokedexEntry:: INCLUDE "data/pokedex/entries/090.asm" +CloysterPokedexEntry:: INCLUDE "data/pokedex/entries/091.asm" +GastlyPokedexEntry:: INCLUDE "data/pokedex/entries/092.asm" +HaunterPokedexEntry:: INCLUDE "data/pokedex/entries/093.asm" +GengarPokedexEntry:: INCLUDE "data/pokedex/entries/094.asm" +OnixPokedexEntry:: INCLUDE "data/pokedex/entries/095.asm" +DrowzeePokedexEntry:: INCLUDE "data/pokedex/entries/096.asm" +HypnoPokedexEntry:: INCLUDE "data/pokedex/entries/097.asm" +KrabbyPokedexEntry:: INCLUDE "data/pokedex/entries/098.asm" +KinglerPokedexEntry:: INCLUDE "data/pokedex/entries/099.asm" +VoltorbPokedexEntry:: INCLUDE "data/pokedex/entries/100.asm" +ElectrodePokedexEntry:: INCLUDE "data/pokedex/entries/101.asm" +ExeggcutePokedexEntry:: INCLUDE "data/pokedex/entries/102.asm" +ExeggutorPokedexEntry:: INCLUDE "data/pokedex/entries/103.asm" +CubonePokedexEntry:: INCLUDE "data/pokedex/entries/104.asm" +MarowakPokedexEntry:: INCLUDE "data/pokedex/entries/105.asm" +HitmonleePokedexEntry:: INCLUDE "data/pokedex/entries/106.asm" +HitmonchanPokedexEntry:: INCLUDE "data/pokedex/entries/107.asm" +LickitungPokedexEntry:: INCLUDE "data/pokedex/entries/108.asm" +KoffingPokedexEntry:: INCLUDE "data/pokedex/entries/109.asm" +WeezingPokedexEntry:: INCLUDE "data/pokedex/entries/110.asm" +RhyhornPokedexEntry:: INCLUDE "data/pokedex/entries/111.asm" +RhydonPokedexEntry:: INCLUDE "data/pokedex/entries/112.asm" +ChanseyPokedexEntry:: INCLUDE "data/pokedex/entries/113.asm" +TangelaPokedexEntry:: INCLUDE "data/pokedex/entries/114.asm" +KangaskhanPokedexEntry:: INCLUDE "data/pokedex/entries/115.asm" +HorseaPokedexEntry:: INCLUDE "data/pokedex/entries/116.asm" +SeadraPokedexEntry:: INCLUDE "data/pokedex/entries/117.asm" +GoldeenPokedexEntry:: INCLUDE "data/pokedex/entries/118.asm" +SeakingPokedexEntry:: INCLUDE "data/pokedex/entries/119.asm" +StaryuPokedexEntry:: INCLUDE "data/pokedex/entries/120.asm" +StarmiePokedexEntry:: INCLUDE "data/pokedex/entries/121.asm" +MrMimePokedexEntry:: INCLUDE "data/pokedex/entries/122.asm" +ScytherPokedexEntry:: INCLUDE "data/pokedex/entries/123.asm" +JynxPokedexEntry:: INCLUDE "data/pokedex/entries/124.asm" +ElectabuzzPokedexEntry:: INCLUDE "data/pokedex/entries/125.asm" +MagmarPokedexEntry:: INCLUDE "data/pokedex/entries/126.asm" +PinsirPokedexEntry:: INCLUDE "data/pokedex/entries/127.asm" +TaurosPokedexEntry:: INCLUDE "data/pokedex/entries/128.asm" diff --git a/data/pokedex/entries_3.asm b/data/pokedex/entries_3.asm new file mode 100644 index 000000000..8aa1c28c1 --- /dev/null +++ b/data/pokedex/entries_3.asm @@ -0,0 +1,64 @@ +MagikarpPokedexEntry:: INCLUDE "data/pokedex/entries/129.asm" +GyaradosPokedexEntry:: INCLUDE "data/pokedex/entries/130.asm" +LaprasPokedexEntry:: INCLUDE "data/pokedex/entries/131.asm" +DittoPokedexEntry:: INCLUDE "data/pokedex/entries/132.asm" +EeveePokedexEntry:: INCLUDE "data/pokedex/entries/133.asm" +VaporeonPokedexEntry:: INCLUDE "data/pokedex/entries/134.asm" +JolteonPokedexEntry:: INCLUDE "data/pokedex/entries/135.asm" +FlareonPokedexEntry:: INCLUDE "data/pokedex/entries/136.asm" +PorygonPokedexEntry:: INCLUDE "data/pokedex/entries/137.asm" +OmanytePokedexEntry:: INCLUDE "data/pokedex/entries/138.asm" +OmastarPokedexEntry:: INCLUDE "data/pokedex/entries/139.asm" +KabutoPokedexEntry:: INCLUDE "data/pokedex/entries/140.asm" +KabutopsPokedexEntry:: INCLUDE "data/pokedex/entries/141.asm" +AerodactylPokedexEntry:: INCLUDE "data/pokedex/entries/142.asm" +SnorlaxPokedexEntry:: INCLUDE "data/pokedex/entries/143.asm" +ArticunoPokedexEntry:: INCLUDE "data/pokedex/entries/144.asm" +ZapdosPokedexEntry:: INCLUDE "data/pokedex/entries/145.asm" +MoltresPokedexEntry:: INCLUDE "data/pokedex/entries/146.asm" +DratiniPokedexEntry:: INCLUDE "data/pokedex/entries/147.asm" +DragonairPokedexEntry:: INCLUDE "data/pokedex/entries/148.asm" +DragonitePokedexEntry:: INCLUDE "data/pokedex/entries/149.asm" +MewtwoPokedexEntry:: INCLUDE "data/pokedex/entries/150.asm" +MewPokedexEntry:: INCLUDE "data/pokedex/entries/151.asm" +ChikoritaPokedexEntry:: INCLUDE "data/pokedex/entries/152.asm" +BayleefPokedexEntry:: INCLUDE "data/pokedex/entries/153.asm" +MeganiumPokedexEntry:: INCLUDE "data/pokedex/entries/154.asm" +CyndaquilPokedexEntry:: INCLUDE "data/pokedex/entries/155.asm" +QuilavaPokedexEntry:: INCLUDE "data/pokedex/entries/156.asm" +TyphlosionPokedexEntry:: INCLUDE "data/pokedex/entries/157.asm" +TotodilePokedexEntry:: INCLUDE "data/pokedex/entries/158.asm" +CroconawPokedexEntry:: INCLUDE "data/pokedex/entries/159.asm" +FeraligatrPokedexEntry:: INCLUDE "data/pokedex/entries/160.asm" +SentretPokedexEntry:: INCLUDE "data/pokedex/entries/161.asm" +FurretPokedexEntry:: INCLUDE "data/pokedex/entries/162.asm" +HoothootPokedexEntry:: INCLUDE "data/pokedex/entries/163.asm" +NoctowlPokedexEntry:: INCLUDE "data/pokedex/entries/164.asm" +LedybaPokedexEntry:: INCLUDE "data/pokedex/entries/165.asm" +LedianPokedexEntry:: INCLUDE "data/pokedex/entries/166.asm" +SpinarakPokedexEntry:: INCLUDE "data/pokedex/entries/167.asm" +AriadosPokedexEntry:: INCLUDE "data/pokedex/entries/168.asm" +CrobatPokedexEntry:: INCLUDE "data/pokedex/entries/169.asm" +ChinchouPokedexEntry:: INCLUDE "data/pokedex/entries/170.asm" +LanturnPokedexEntry:: INCLUDE "data/pokedex/entries/171.asm" +PichuPokedexEntry:: INCLUDE "data/pokedex/entries/172.asm" +CleffaPokedexEntry:: INCLUDE "data/pokedex/entries/173.asm" +IgglybuffPokedexEntry:: INCLUDE "data/pokedex/entries/174.asm" +TogepiPokedexEntry:: INCLUDE "data/pokedex/entries/175.asm" +TogeticPokedexEntry:: INCLUDE "data/pokedex/entries/176.asm" +NatuPokedexEntry:: INCLUDE "data/pokedex/entries/177.asm" +XatuPokedexEntry:: INCLUDE "data/pokedex/entries/178.asm" +MareepPokedexEntry:: INCLUDE "data/pokedex/entries/179.asm" +FlaaffyPokedexEntry:: INCLUDE "data/pokedex/entries/180.asm" +AmpharosPokedexEntry:: INCLUDE "data/pokedex/entries/181.asm" +BellossomPokedexEntry:: INCLUDE "data/pokedex/entries/182.asm" +MarillPokedexEntry:: INCLUDE "data/pokedex/entries/183.asm" +AzumarillPokedexEntry:: INCLUDE "data/pokedex/entries/184.asm" +SudowoodoPokedexEntry:: INCLUDE "data/pokedex/entries/185.asm" +PolitoedPokedexEntry:: INCLUDE "data/pokedex/entries/186.asm" +HoppipPokedexEntry:: INCLUDE "data/pokedex/entries/187.asm" +SkiploomPokedexEntry:: INCLUDE "data/pokedex/entries/188.asm" +JumpluffPokedexEntry:: INCLUDE "data/pokedex/entries/189.asm" +AipomPokedexEntry:: INCLUDE "data/pokedex/entries/190.asm" +SunkernPokedexEntry:: INCLUDE "data/pokedex/entries/191.asm" +SunfloraPokedexEntry:: INCLUDE "data/pokedex/entries/192.asm" diff --git a/data/pokedex/entries_4.asm b/data/pokedex/entries_4.asm new file mode 100644 index 000000000..846a4b91a --- /dev/null +++ b/data/pokedex/entries_4.asm @@ -0,0 +1,59 @@ +YanmaPokedexEntry:: INCLUDE "data/pokedex/entries/193.asm" +WooperPokedexEntry:: INCLUDE "data/pokedex/entries/194.asm" +QuagsirePokedexEntry:: INCLUDE "data/pokedex/entries/195.asm" +EspeonPokedexEntry:: INCLUDE "data/pokedex/entries/196.asm" +UmbreonPokedexEntry:: INCLUDE "data/pokedex/entries/197.asm" +MurkrowPokedexEntry:: INCLUDE "data/pokedex/entries/198.asm" +SlowkingPokedexEntry:: INCLUDE "data/pokedex/entries/199.asm" +MisdreavusPokedexEntry:: INCLUDE "data/pokedex/entries/200.asm" +UnownPokedexEntry:: INCLUDE "data/pokedex/entries/201.asm" +WobbuffetPokedexEntry:: INCLUDE "data/pokedex/entries/202.asm" +GirafarigPokedexEntry:: INCLUDE "data/pokedex/entries/203.asm" +PinecoPokedexEntry:: INCLUDE "data/pokedex/entries/204.asm" +ForretressPokedexEntry:: INCLUDE "data/pokedex/entries/205.asm" +DunsparcePokedexEntry:: INCLUDE "data/pokedex/entries/206.asm" +GligarPokedexEntry:: INCLUDE "data/pokedex/entries/207.asm" +SteelixPokedexEntry:: INCLUDE "data/pokedex/entries/208.asm" +SnubbullPokedexEntry:: INCLUDE "data/pokedex/entries/209.asm" +GranbullPokedexEntry:: INCLUDE "data/pokedex/entries/210.asm" +QwilfishPokedexEntry:: INCLUDE "data/pokedex/entries/211.asm" +ScizorPokedexEntry:: INCLUDE "data/pokedex/entries/212.asm" +ShucklePokedexEntry:: INCLUDE "data/pokedex/entries/213.asm" +HeracrossPokedexEntry:: INCLUDE "data/pokedex/entries/214.asm" +SneaselPokedexEntry:: INCLUDE "data/pokedex/entries/215.asm" +TeddiursaPokedexEntry:: INCLUDE "data/pokedex/entries/216.asm" +UrsaringPokedexEntry:: INCLUDE "data/pokedex/entries/217.asm" +SlugmaPokedexEntry:: INCLUDE "data/pokedex/entries/218.asm" +MagcargoPokedexEntry:: INCLUDE "data/pokedex/entries/219.asm" +SwinubPokedexEntry:: INCLUDE "data/pokedex/entries/220.asm" +PiloswinePokedexEntry:: INCLUDE "data/pokedex/entries/221.asm" +CorsolaPokedexEntry:: INCLUDE "data/pokedex/entries/222.asm" +RemoraidPokedexEntry:: INCLUDE "data/pokedex/entries/223.asm" +OctilleryPokedexEntry:: INCLUDE "data/pokedex/entries/224.asm" +DelibirdPokedexEntry:: INCLUDE "data/pokedex/entries/225.asm" +MantinePokedexEntry:: INCLUDE "data/pokedex/entries/226.asm" +SkarmoryPokedexEntry:: INCLUDE "data/pokedex/entries/227.asm" +HoundourPokedexEntry:: INCLUDE "data/pokedex/entries/228.asm" +HoundoomPokedexEntry:: INCLUDE "data/pokedex/entries/229.asm" +KingdraPokedexEntry:: INCLUDE "data/pokedex/entries/230.asm" +PhanpyPokedexEntry:: INCLUDE "data/pokedex/entries/231.asm" +DonphanPokedexEntry:: INCLUDE "data/pokedex/entries/232.asm" +Porygon2PokedexEntry:: INCLUDE "data/pokedex/entries/233.asm" +StantlerPokedexEntry:: INCLUDE "data/pokedex/entries/234.asm" +SmearglePokedexEntry:: INCLUDE "data/pokedex/entries/235.asm" +TyroguePokedexEntry:: INCLUDE "data/pokedex/entries/236.asm" +HitmontopPokedexEntry:: INCLUDE "data/pokedex/entries/237.asm" +SmoochumPokedexEntry:: INCLUDE "data/pokedex/entries/238.asm" +ElekidPokedexEntry:: INCLUDE "data/pokedex/entries/239.asm" +MagbyPokedexEntry:: INCLUDE "data/pokedex/entries/240.asm" +MiltankPokedexEntry:: INCLUDE "data/pokedex/entries/241.asm" +BlisseyPokedexEntry:: INCLUDE "data/pokedex/entries/242.asm" +RaikouPokedexEntry:: INCLUDE "data/pokedex/entries/243.asm" +EnteiPokedexEntry:: INCLUDE "data/pokedex/entries/244.asm" +SuicunePokedexEntry:: INCLUDE "data/pokedex/entries/245.asm" +LarvitarPokedexEntry:: INCLUDE "data/pokedex/entries/246.asm" +PupitarPokedexEntry:: INCLUDE "data/pokedex/entries/247.asm" +TyranitarPokedexEntry:: INCLUDE "data/pokedex/entries/248.asm" +LugiaPokedexEntry:: INCLUDE "data/pokedex/entries/249.asm" +HoOhPokedexEntry:: INCLUDE "data/pokedex/entries/250.asm" +CelebiPokedexEntry:: INCLUDE "data/pokedex/entries/251.asm" diff --git a/data/pokedex/entries_crystal.asm b/data/pokedex/entries_crystal.asm new file mode 100644 index 000000000..dda18db9e --- /dev/null +++ b/data/pokedex/entries_crystal.asm @@ -0,0 +1,3 @@ +INCLUDE "pokecrystal.asm" +INCLUDE "data/pokedex/entries.asm" + diff --git a/stats/pokedex/entry_pointers.asm b/data/pokedex/entry_pointers.asm index 4f0f8aff2..4f0f8aff2 100644 --- a/stats/pokedex/entry_pointers.asm +++ b/data/pokedex/entry_pointers.asm diff --git a/stats/pokedex/order_alpha.asm b/data/pokedex/order_alpha.asm index bab0a981d..bab0a981d 100644 --- a/stats/pokedex/order_alpha.asm +++ b/data/pokedex/order_alpha.asm diff --git a/stats/pokedex/order_new.asm b/data/pokedex/order_new.asm index a98a658cd..a98a658cd 100644 --- a/stats/pokedex/order_new.asm +++ b/data/pokedex/order_new.asm diff --git a/stats/pokemon_names.asm b/data/pokemon_names.asm index 06b1a6e55..06b1a6e55 100644 --- a/stats/pokemon_names.asm +++ b/data/pokemon_names.asm diff --git a/stats/wild/fish.asm b/data/wild/fish.asm index 44a30a0b2..44a30a0b2 100644 --- a/stats/wild/fish.asm +++ b/data/wild/fish.asm diff --git a/stats/wild/johto_grass.asm b/data/wild/johto_grass.asm index 619b5ff45..619b5ff45 100644 --- a/stats/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm diff --git a/stats/wild/johto_water.asm b/data/wild/johto_water.asm index 313f608a4..313f608a4 100644 --- a/stats/wild/johto_water.asm +++ b/data/wild/johto_water.asm diff --git a/stats/wild/kanto_grass.asm b/data/wild/kanto_grass.asm index 416c34363..416c34363 100644 --- a/stats/wild/kanto_grass.asm +++ b/data/wild/kanto_grass.asm diff --git a/stats/wild/kanto_water.asm b/data/wild/kanto_water.asm index 011d6fd34..011d6fd34 100644 --- a/stats/wild/kanto_water.asm +++ b/data/wild/kanto_water.asm diff --git a/stats/wild/swarm_grass.asm b/data/wild/swarm_grass.asm index 319b71d3c..319b71d3c 100644 --- a/stats/wild/swarm_grass.asm +++ b/data/wild/swarm_grass.asm diff --git a/stats/wild/swarm_water.asm b/data/wild/swarm_water.asm index 4199556f7..4199556f7 100644 --- a/stats/wild/swarm_water.asm +++ b/data/wild/swarm_water.asm diff --git a/engine/credits.asm b/engine/credits.asm index a68f7ceb0..0fa2faf46 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -537,13 +537,13 @@ Function109a95: ; 109a95 (42:5a95) ld bc, $168 call ByteFill ld a, $7f - ld hl, $c4f0 + hlcoord 0, 4 ld bc, $118 call ByteFill - ld hl, $c4f0 + hlcoord 0, 4 ld a, $24 call Function109b1d - ld hl, $c5f4 + hlcoord 0, 17 ld a, $20 call Function109b1d ld hl, AttrMap ; $cdd9 @@ -787,9 +787,9 @@ CreditsMonsFrames: ; 109bf1 ; known jump sources: 109a1b (42:5a1b) Function109c11: ; 109c11 (42:5c11) ld a, $40 - ld hl, $c55a + hlcoord 6, 9 call Function109c1c - ld hl, $c56e + hlcoord 6, 10 ; known jump sources: 109c16 (42:5c16) Function109c1c: ; 109c1c (42:5c1c) diff --git a/engine/title.asm b/engine/title.asm index 6c3f7fee1..3f52d000c 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -115,15 +115,15 @@ _TitleScreen: ; 10ed67 call ByteFill ; Draw Pokemon logo - ld hl, $c4dc ; TileMap(0,3) - ld bc, $0714 ; 20x7 + hlcoord 0, 3 + lb bc, 7, 20 ld d, $80 ld e, $14 call DrawTitleGraphic ; Draw copyright text ld hl, $9c03 ; BGMap1(3,0) - ld bc, $010d ; 13x1 + lb bc, 1, 13 ld d, $c ld e, $10 call DrawTitleGraphic @@ -262,7 +262,7 @@ Unknown_10eece: ; 10eece Function10eed2: ; 10eed2 - ld hl, $c596 + hlcoord 6, 12 ld b, $6 .asm_10eed7 ld c, $8 diff --git a/extras b/extras -Subproject b73c3096662c243fc5d76046e960d7f80d09dfe +Subproject 10fb7465e407111d9b191a00518f064a04f93a6 diff --git a/gfx/pics/animation.asm b/gfx/pics/animation.asm index c9b3e4436..6d79ff433 100644 --- a/gfx/pics/animation.asm +++ b/gfx/pics/animation.asm @@ -2,7 +2,7 @@ Functiond0000: ; d0000 - ld hl, $c4ac + hlcoord 12, 0 ld a, [IsInBattle] cp $1 jr z, .asm_d0012 @@ -1829,7 +1829,7 @@ PrintLevel:: ; 382d ; Print TempMonLevel at hl ld a, [TempMonLevel] - ld [hl], $6e ; ":L" + ld [hl], LV_CHAR inc hl ; How many digits? @@ -1845,7 +1845,7 @@ PrintLevel:: ; 382d Function383d:: ; 383d ; Print :L and all 3 digits - ld [hl], $6e + ld [hl], LV_CHAR inc hl ld c, 3 ; 3842 @@ -2350,7 +2350,7 @@ Function3eea:: ; 3eea Function3efd:: ; 3efd push hl - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call Function3f0d diff --git a/home/decompress.asm b/home/decompress.asm index 23c86864a..15dab48f8 100644 --- a/home/decompress.asm +++ b/home/decompress.asm @@ -1,19 +1,14 @@ FarDecompress:: ; b40 -; Decompress graphics data at a:hl to de +; Decompress graphics data from a:hl to de. -; put a away for a sec ld [$c2c4], a -; save bank ld a, [hROMBank] push af -; bankswitch ld a, [$c2c4] rst Bankswitch - -; what we came here for + call Decompress - -; restore bank + pop af rst Bankswitch ret @@ -22,346 +17,325 @@ FarDecompress:: ; b40 Decompress:: ; b50 ; Pokemon Crystal uses an lz variant for compression. +; This is mainly (but not necessarily) used for graphics. + +; This function decompresses lz-compressed data from hl to de. + + +LZ_END EQU $ff ; Compressed data is terminated with $ff. + + +; A typical control command consists of: + +LZ_CMD EQU %11100000 ; command id (bits 5-7) +LZ_LEN EQU %00011111 ; length n (bits 0-4) -; This is mainly used for graphics, but the intro's -; tilemaps also use this compression. +; Additional parameters are read during command execution. -; This function decompresses lz-compressed data at hl to de. +; Commands: -; Basic rundown: +LZ_LITERAL EQU 0 << 5 ; Read literal data for n bytes. +LZ_ITERATE EQU 1 << 5 ; Write the same byte for n bytes. +LZ_ALTERNATE EQU 2 << 5 ; Alternate two bytes for n bytes. +LZ_ZERO EQU 3 << 5 ; Write 0 for n bytes. -; A typical control command consists of: -; -the command (bits 5-7) -; -the count (bits 0-4) -; -and any additional params -; $ff is used as a terminator. +; Another class of commands reuses data from the decompressed output. +LZ_RW EQU 2 + 5 ; bit +; These commands take a signed offset to start copying from. +; Wraparound is simulated. +; Positive offsets (15-bit) are added to the start address. +; Negative offsets (7-bit) are subtracted from the current position. -; Commands: +LZ_REPEAT EQU 4 << 5 ; Repeat n bytes from the offset. +LZ_FLIP EQU 5 << 5 ; Repeat n bitflipped bytes. +LZ_REVERSE EQU 6 << 5 ; Repeat n bytes in reverse. -; 0: literal -; literal data for some number of bytes -; 1: iterate -; one byte repeated for some number of bytes -; 2: alternate -; two bytes alternated for some number of bytes -; 3: zero (whitespace) -; 0x00 repeated for some number of bytes -; Repeater control commands have a signed parameter used to determine the start point. -; Wraparound is simulated: -; Positive values are added to the start address of the decompressed data -; and negative values are subtracted from the current position. +; If the value in the count needs to be larger than 5 bits, +; LZ_LONG can be used to expand the count to 10 bits. +LZ_LONG EQU 7 << 5 -; 4: repeat -; repeat some number of bytes from decompressed data -; 5: flipped -; repeat some number of flipped bytes from decompressed data -; ex: $ad = %10101101 -> %10110101 = $b5 -; 6: reverse -; repeat some number of bytes in reverse from decompressed data +; A new control command is read in bits 2-4. +; The top two bits of the length are bits 0-1. +; Another byte is read containing the bottom 8 bits. +LZ_LONG_HI EQU %00000011 -; If the value in the count needs to be larger than 5 bits, -; control code 7 can be used to expand the count to 10 bits. +; In other words, the structure of the command becomes +; 111xxxyy yyyyyyyy +; x: the new control command +; y: the length -; A new control command is read in bits 2-4. -; The new 10-bit count is split: -; bits 0-1 contain the top 2 bits -; another byte is added containing the latter 8 -; So, the structure of the control command becomes: -; 111xxxyy yyyyyyyy -; | | | | -; | | our new count -; | the control command for this count -; 7 (this command) +; For more information, refer to the code below and in extras/gfx.py. -; For more information, refer to the code below and in extras/gfx.py . -; save starting output address + ; Save the output address + ; for rewrite commands. ld a, e ld [$c2c2], a ld a, d - ld [$c2c3], a - -.loop -; get next byte + ld [$c2c2 + 1], a + +.Main ld a, [hl] -; done? - cp $ff ; end + cp LZ_END ret z -; get control code - and %11100000 - -; 10-bit param? - cp $e0 ; LZ_HI - jr nz, .normal - - -; 10-bit param: - -; get next 3 bits (%00011100) + and LZ_CMD + + cp LZ_LONG + jr nz, .short + +.long +; The count is now 10 bits. + + ; Read the next 3 bits. + ; %00011100 -> %11100000 ld a, [hl] add a add a ; << 3 add a - -; this is our new control code - and %11100000 + + ; This is our new control code. + and LZ_CMD push af - -; get param hi + ld a, [hli] - and %00000011 + and LZ_LONG_HI ld b, a - -; get param lo ld a, [hli] ld c, a - -; read at least 1 byte + + ; read at least 1 byte inc bc - jr .readers - - -.normal -; push control code + jr .command + + +.short push af -; get param + ld a, [hli] - and %00011111 + and LZ_LEN ld c, a - ld b, $0 -; read at least 1 byte + ld b, 0 + + ; read at least 1 byte inc c - -.readers -; let's get started -; inc loop counts since we bail as soon as they hit 0 + +.command + ; Increment loop counts. + ; We bail the moment they hit 0. inc b inc c - -; get control code + pop af -; command type - bit 7, a ; 80, a0, c0 - jr nz, .repeatertype - -; literals - cp $20 ; LZ_ITER - jr z, .iter - cp $40 ; LZ_ALT - jr z, .alt - cp $60 ; LZ_ZERO - jr z, .zero - ; else $00 - -; 00 ; LZ_LIT -; literal data for bc bytes -.loop1 -; done? + + bit LZ_RW, a + jr nz, .rewrite + + cp LZ_ITERATE + jr z, .Iter + cp LZ_ALTERNATE + jr z, .Alt + cp LZ_ZERO + jr z, .Zero + + +.Literal +; Read literal data for bc bytes. +.lloop dec c - jr nz, .next1 + jr nz, .lnext dec b - jp z, .loop - -.next1 + jp z, .Main + +.lnext ld a, [hli] ld [de], a inc de - jr .loop1 - - -; 20 ; LZ_ITER -; write byte for bc bytes -.iter + jr .lloop + + +.Iter +; Write the same byte for bc bytes. ld a, [hli] - + .iterloop dec c jr nz, .iternext dec b - jp z, .loop - + jp z, .Main + .iternext ld [de], a inc de jr .iterloop - - -; 40 ; LZ_ALT -; alternate two bytes for bc bytes - -; next pair -.alt -; done? + + +.Alt +; Alternate two bytes for bc bytes. dec c - jr nz, .alt0 + jr nz, .anext1 dec b - jp z, .altclose0 - -; alternate for bc -.alt0 + jp z, .adone1 +.anext1 ld a, [hli] ld [de], a inc de + dec c - jr nz, .alt1 -; done? + jr nz, .anext2 dec b - jp z, .altclose1 -.alt1 + jp z, .adone2 +.anext2 ld a, [hld] ld [de], a inc de - jr .alt - -; skip past the bytes we were alternating -.altclose0 + + jr .Alt + + ; Skip past the bytes we were alternating. +.adone1 inc hl -.altclose1 +.adone2 inc hl - jr .loop - - -; 60 ; LZ_ZERO -; write 00 for bc bytes -.zero + jr .Main + + +.Zero +; Write 0 for bc bytes. xor a - -.zeroloop + +.zloop dec c - jr nz, .zeronext + jr nz, .znext dec b - jp z, .loop - -.zeronext + jp z, .Main + +.znext ld [de], a inc de - jr .zeroloop - - -; repeats -; 80, a0, c0 -; repeat decompressed data from output -.repeatertype + jr .zloop + + +.rewrite +; Repeat decompressed data from output. push hl push af -; get next byte + ld a, [hli] -; absolute? - bit 7, a - jr z, .absolute - -; relative -; a = -a - and %01111111 ; forget the bit we just looked at + bit 7, a ; sign + jr z, .positive + +.negative +; hl = de - a + ; Since we can't subtract a from de, + ; Make it negative and add de. + and %01111111 cpl -; add de (current output address) add e ld l, a - ld a, $ff ; -1 + ld a, -1 adc d ld h, a - jr .repeaters - -.absolute -; get next byte (lo) + jr .ok + +.positive +; Positive offsets are two bytes. ld l, [hl] -; last byte (hi) ld h, a -; add starting output address + ; add to starting output address ld a, [$c2c2] add l ld l, a ld a, [$c2c3] adc h ld h, a - -.repeaters + +.ok pop af - cp $80 ; LZ_REPEAT - jr z, .repeat - cp $a0 ; LZ_FLIP - jr z, .flip - cp $c0 ; LZ_REVERSE - jr z, .reverse - -; e0 -> 80 - -; 80 ; LZ_REPEAT -; repeat some decompressed data -.repeat -; done? + + cp LZ_REPEAT + jr z, .Repeat + cp LZ_FLIP + jr z, .Flip + cp LZ_REVERSE + jr z, .Reverse + +; Since LZ_LONG is command 7, +; only commands 0-6 are passed in. +; This leaves room for an extra command 7. +; However, lengths longer than 768 +; would be interpreted as LZ_END. + +; For now, it defaults to LZ_REPEAT. + + +.Repeat +; Copy decompressed data for bc bytes. dec c - jr nz, .repeatnext + jr nz, .rnext dec b - jr z, .cleanup - -.repeatnext + jr z, .donerw + +.rnext ld a, [hli] ld [de], a inc de - jr .repeat - - -; a0 ; LZ_FLIP -; repeat some decompressed data w/ flipped bit order -.flip + jr .Repeat + + +.Flip +; Copy bitflipped decompressed data for bc bytes. dec c - jr nz, .flipnext + jr nz, .fnext dec b - jp z, .cleanup - -.flipnext + jp z, .donerw + +.fnext ld a, [hli] push bc - ld bc, $0008 - -.fliploop + lb bc, 0, 8 + +.floop rra rl b dec c - jr nz, .fliploop + jr nz, .floop ld a, b pop bc ld [de], a inc de - jr .flip - - -; c0 ; LZ_REVERSE -; repeat some decompressed data in reverse -.reverse + jr .Flip + + +.Reverse +; Copy reversed decompressed data for bc bytes. dec c - jr nz, .reversenext - + jr nz, .rvnext + dec b - jp z, .cleanup - -.reversenext + jp z, .donerw + +.rvnext ld a, [hld] ld [de], a inc de - jr .reverse - - -.cleanup -; get type of repeat we just used + jr .Reverse + + +.donerw pop hl -; was it relative or absolute? + bit 7, [hl] jr nz, .next - -; skip two bytes for absolute - inc hl -; skip one byte for relative + inc hl ; positive offset is two bytes .next inc hl - jp .loop + jp .Main ; c2f diff --git a/home/map.asm b/home/map.asm index 6c7a79592..77a53b8d2 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1219,7 +1219,7 @@ Function272a:: ; 272a ; 2748 Function2748:: ; 2748 - ld hl, $c5e0 + hlcoord 0, 16 ld de, BGMapBuffer call Function27b7 ld c, $28 @@ -1258,7 +1258,7 @@ Function2771:: ; 2771 ; 278f Function278f:: ; 278f - ld hl, $c4b2 + hlcoord 18, 0 ld de, BGMapBuffer call Function27c0 ld c, $24 @@ -1987,7 +1987,7 @@ Function2b74:: ; 0x2b74 call WhiteBGMap call ClearSprites call Function2bae - ld hl, $c590 ; tile 0, 12 + hlcoord 0, 12 ld bc, $0412 call TextBox ld hl, VramState diff --git a/home/text.asm b/home/text.asm index 73bda459c..33d8dba14 100644 --- a/home/text.asm +++ b/home/text.asm @@ -605,13 +605,13 @@ Function12f2:: ; 12f2 .asm_1301 call Function13b6 call Functionaaf - ld hl, $c5b9 + hlcoord 1, 14 ld bc, $0312 call ClearBox call Function13cd ld c, $14 call DelayFrames - ld hl, $c5b9 + hlcoord 1, 14 pop de jp NextChar ; 131f @@ -704,8 +704,8 @@ Function1383:: ; 1383 ; 138c Function138c:: ; 138c - ld hl, $c5b9 - ld de, $c5a5 + hlcoord 1, 14 + decoord 1, 13 ld a, $3 .asm_1394 push af @@ -723,7 +723,7 @@ Function138c:: ; 138c pop af dec a jr nz, .asm_1394 - ld hl, $c5e1 + hlcoord 1, 16 ld a, $7f ld bc, $0012 call ByteFill diff --git a/items/item_effects.asm b/items/item_effects.asm index ca5336a07..51994ca1f 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -1352,7 +1352,7 @@ RareCandy: ; ef14 call GetPartyParamLocation ld a, [hl] - cp 100 + cp MAX_LEVEL jp nc, Functionee83 inc a @@ -1408,12 +1408,12 @@ RareCandy: ; ef14 ld a, $1f call Predef - ld hl, $c4a9 + hlcoord 9, 0 ld b, 10 ld c, 9 call TextBox - ld hl, $c4bf + hlcoord 11, 1 ld bc, $0004 ld a, $28 call Predef @@ -1829,7 +1829,7 @@ Functionf1db: ; f1db (3:71db) call WaitPlaySFX pop de ld a, [CurPartyMon] ; $d109 - ld hl, $c4ab + hlcoord 11, 0 ld bc, $28 call AddNTimes ld a, $2 diff --git a/macros.asm b/macros.asm index a9948ae6a..aa8876055 100644 --- a/macros.asm +++ b/macros.asm @@ -117,24 +117,16 @@ A# EQU 11 B_ EQU 12 -; It's better to use *coord than FuncCoord. -FuncCoord: MACRO -Coord = $c4a0 + 20 * \2 + \1 - ENDM - bccoord: MACRO - FuncCoord \1, \2 - ld bc, Coord + ld bc, TileMap + SCREEN_WIDTH * \2 + \1 ENDM decoord: MACRO - FuncCoord \1, \2 - ld de, Coord + ld de, TileMap + SCREEN_WIDTH * \2 + \1 ENDM hlcoord: MACRO - FuncCoord \1, \2 - ld hl, Coord + ld hl, TileMap + SCREEN_WIDTH * \2 + \1 ENDM @@ -4617,7 +4617,7 @@ Function610f: ; 610f ld c, 8 call DelayFrames - ld hl, $c50a + hlcoord 6, 5 ld b, 7 ld c, 7 call ClearBox @@ -4680,7 +4680,7 @@ Function619c: ; 619c callba Function5120d xor a ld [$ffad], a - ld hl, $c4f6 + hlcoord 6, 4 ld bc, $0707 ld a, $13 call Predef @@ -4694,7 +4694,7 @@ Function61b4: ; 61b4 call Predef xor a ld [$ffad], a - ld hl, $c4f6 + hlcoord 6, 4 ld bc, $0707 ld a, $13 call Predef @@ -5381,11 +5381,11 @@ Function65d3: ; 65d3 push hl ld hl, UnknownText_0x6670 call PrintText - ld hl, $c4cd + hlcoord 5, 2 ld b, $8 ld c, $d call TextBox - ld hl, $c4f7 + hlcoord 7, 4 ld a, $28 ld [Buffer1], a ld a, $20 @@ -16117,11 +16117,11 @@ Function10955: ; 10955 ld bc, $0600 ld a, BANK(PackMenuGFX) call FarCopyBytes - ld hl, $c4b4 + hlcoord 0, 1 ld bc, $00dc ld a, $24 call ByteFill - ld hl, $c4b9 + hlcoord 5, 1 ld bc, $0b0f call ClearBox ld hl, TileMap @@ -16134,7 +16134,7 @@ Function10955: ; 10955 jr nz, .asm_1098a call Function109bb call Function109a5 - ld hl, $c590 + hlcoord 0, 12 ld bc, $0412 call TextBox call EnableLCD @@ -16143,7 +16143,7 @@ Function10955: ; 10955 ; 109a5 Function109a5: ; 109a5 - ld hl, $c4dc + hlcoord 0, 3 ld a, $50 ld de, 15 ld b, 3 @@ -16174,7 +16174,7 @@ Function109bb: ; 109bb add hl, de ld d, h ld e, l - ld hl, $c52c + hlcoord 0, 7 ld c, 3 .asm_109d0 ld b, 5 @@ -16218,7 +16218,7 @@ Function10a2a: ; 10a2a ; known jump sources: 1005a (4:405a), 10099 (4:4099), 100d8 (4:40d8), 1018b (4:418b), 104ed (4:44ed), 1052c (4:452c), 1056b (4:456b), 10599 (4:4599), 10765 (4:4765) Function10a36: ; 10a36 (4:4a36) - ld hl, $c4cd + hlcoord 5, 2 ld bc, $a0f call ClearBox ret @@ -17092,14 +17092,14 @@ Function1173e: ; 1173e (4:573e) ld a, [CurPartySpecies] ; $d108 ld [$d265], a call GetPokemonName - ld hl, $c4cd + hlcoord 5, 2 call PlaceString ld l, c ld h, b ld de, Strings_11780 call PlaceString inc de - ld hl, $c4f5 + hlcoord 5, 4 call PlaceString callba GetGender jr c, .asm_1177c @@ -17107,7 +17107,7 @@ Function1173e: ; 1173e (4:573e) jr nz, .asm_11778 ld a, $f5 .asm_11778 - ld hl, $c4c9 + hlcoord 1, 2 ld [hl], a .asm_1177c call Function1187b @@ -17123,7 +17123,7 @@ Strings_11780: ; 11780 Function1178d: ; 1178d (4:578d) callba GetPlayerIcon call Function11847 - ld hl, $c4cd + hlcoord 5, 2 ld de, String_117a3 call PlaceString call Function11882 @@ -17139,7 +17139,7 @@ Function117ae: ; 117ae (4:57ae) ld de, SilverSpriteGFX ld b, BANK(SilverSpriteGFX) call Function11847 - ld hl, $c4cd + hlcoord 5, 2 ld de, String_117c3 call PlaceString call Function11882 @@ -17155,7 +17155,7 @@ Function117d1: ; 117d1 (4:57d1) ld de, MomSpriteGFX ld b, BANK(MomSpriteGFX) call Function11847 - ld hl, $c4cd + hlcoord 5, 2 ld de, String_117e6 call PlaceString call Function11882 @@ -17182,7 +17182,7 @@ Function117f5: ; 117f5 (4:57f5) ld hl, $1 add hl, bc ld [hl], $0 - ld hl, $c4cd + hlcoord 5, 2 ld de, String_11822 call PlaceString call Function11889 @@ -17195,7 +17195,7 @@ String_11822: ; 11822 ; no known jump sources Function1182c: ; 1182c (4:582c) - ld hl, $c4cb + hlcoord 3, 2 ld de, String_11839 call PlaceString call Function11882 @@ -17242,19 +17242,19 @@ Function11847: ; 11847 (4:5847) ; known jump sources: 1177c (4:577c) Function1187b: ; 1187b (4:587b) ld a, $a - ld hl, $c51d + hlcoord 5, 6 jr Function11890 ; known jump sources: 1179f (4:579f), 117bf (4:57bf), 117e2 (4:57e2), 11835 (4:5835) Function11882: ; 11882 (4:5882) ld a, $7 - ld hl, $c51d + hlcoord 5, 6 jr Function11890 ; known jump sources: 1181e (4:581e) Function11889: ; 11889 (4:5889) ld a, $8 - ld hl, $c4f5 + hlcoord 5, 4 jr Function11890 ; known jump sources: 11880 (4:5880), 11887 (4:5887), 1188e (4:588e) @@ -17285,7 +17285,7 @@ Function118a8: ; 118a8 ld bc, $0168 ld a, $60 call ByteFill - ld hl, $c4b5 + hlcoord 1, 1 ld bc, $0612 call Function1189c jr nz, .asm_118c4 @@ -17304,24 +17304,24 @@ Function118ca: ; 118ca .asm_118d5 push de - ld hl, $c541 + hlcoord 1, 8 ld bc, $0712 call Function1189c jr nz, .asm_118e7 - ld hl, $c519 + hlcoord 1, 6 ld bc, $0912 .asm_118e7 call ClearBox - ld hl, $c5e1 + hlcoord 1, 16 ld bc, $0112 call ClearBox pop de - ld hl, $c542 + hlcoord 2, 8 ld b, $5 call Function1189c jr nz, .asm_11903 - ld hl, $c51a + hlcoord 2, 6 ld b, $6 .asm_11903 @@ -17366,10 +17366,10 @@ Function11915: ; 11915 Function11940: ; 11940 xor a ld [hBGMapMode], a - ld hl, $c505 + hlcoord 1, 5 call Function1189c jr nz, .asm_1194e - ld hl, $c4dd + hlcoord 1, 3 .asm_1194e ld bc, $0112 @@ -18061,18 +18061,18 @@ Function11f84: ; 11f84 (4:5f84) ld bc, $78 ld a, $60 call ByteFill - ld hl, $c518 + hlcoord 0, 6 ld bc, $f0 ld a, $7f call ByteFill - ld hl, $c4b5 + hlcoord 1, 1 ld bc, $412 call ClearBox ld de, String_121dd ; known jump sources: 120b6 (4:60b6), 120bd (4:60bd) Function11fa9: ; 11fa9 (4:5fa9) - ld hl, $c52d + hlcoord 1, 7 ld b, $6 .asm_11fae ld c, $13 @@ -18115,14 +18115,14 @@ Function11fc0: ; 11fc0 (4:5fc0) Function11feb: ; 11feb (4:5feb) xor a ld [hBGMapMode], a ; $ff00+$d4 - ld hl, $c4b5 + hlcoord 1, 1 ld bc, $412 call ClearBox ld hl, PlayerSDefLevel ; $c6d0 ld e, [hl] inc hl ld d, [hl] - ld hl, $c4ca + hlcoord 2, 2 call PlaceString ld a, $1 ld [hBGMapMode], a ; $ff00+$d4 @@ -20557,13 +20557,13 @@ Function12fd5: ; 12fd5 .asm_13018 ld a, $7f - ld hl, $c57d + hlcoord 1, 11 ld bc, $0005 call ByteFill - ld hl, $c591 + hlcoord 1, 12 ld bc, $0512 call ClearBox - ld hl, $c591 + hlcoord 1, 12 ld de, $716b call PlaceString jp .asm_12ff2 @@ -20577,7 +20577,7 @@ Function12fd5: ; 12fd5 ld [$cfa9], a xor a ld [$d0e3], a - ld hl, $c4c9 + hlcoord 1, 2 ld bc, $0812 call ClearBox jp .asm_12fe8 @@ -20689,10 +20689,10 @@ Function12fd5: ; 12fd5 ld de, SFX_SWITCH_POKEMON call PlaySFX call WaitSFX - ld hl, $c4c9 + hlcoord 1, 2 ld bc, $0812 call ClearBox - ld hl, $c572 + hlcoord 10, 10 ld bc, $0109 call ClearBox jp .asm_12fe8 @@ -20755,15 +20755,15 @@ Function13172: ; 13172 ld [$d265], a ld e, $2 callba Function8e83f - ld hl, $c4b4 + hlcoord 0, 1 ld b, $9 ld c, $12 call TextBox - ld hl, $c57c + hlcoord 0, 11 ld b, $5 ld c, $12 call TextBox - ld hl, $c4a2 + hlcoord 2, 0 ld bc, $0203 call ClearBox xor a @@ -20771,7 +20771,7 @@ Function13172: ; 13172 ld hl, PartyMon1Nickname ld a, [CurPartyMon] call GetNick - ld hl, $c4b9 + hlcoord 5, 1 call PlaceString push bc callba Function5084a @@ -20781,7 +20781,7 @@ Function13172: ; 13172 call SetHPPal ld b, $e call GetSGBLayout - ld hl, $c4b0 + hlcoord 16, 0 ld bc, $0103 jp ClearBox ; 131ef @@ -20799,10 +20799,10 @@ Function131ef: ; 131ef call CopyBytes ld a, $28 ld [Buffer1], a - ld hl, $c4de + hlcoord 2, 3 ld a, $20 call Predef - ld hl, $c4fa + hlcoord 10, 4 ld a, $23 call Predef call WaitBGMap @@ -20810,7 +20810,7 @@ Function131ef: ; 131ef ld a, [$d0eb] inc a ld [$cfa3], a - ld hl, $c57c + hlcoord 0, 11 ld b, $5 ld c, $12 jp TextBox @@ -20828,7 +20828,7 @@ Function13235: ; 13235 add hl, bc ld a, [hl] ld [CurSpecies], a - ld hl, $c591 + hlcoord 1, 12 ld bc, $0512 jp ClearBox ; 13256 @@ -20836,18 +20836,18 @@ Function13235: ; 13235 Function13256: ; 13256 xor a ld [hBGMapMode], a - ld hl, $c568 + hlcoord 0, 10 ld de, String_132ba call PlaceString - ld hl, $c57c + hlcoord 0, 11 ld de, String_132c2 call PlaceString - ld hl, $c59c + hlcoord 12, 12 ld de, String_132ca call PlaceString ld a, [CurSpecies] ld b, a - ld hl, $c592 + hlcoord 2, 12 ld a, PREDEF_PRINT_MOVE_TYPE call Predef ld a, [CurSpecies] @@ -20857,7 +20857,7 @@ Function13256: ; 13256 call AddNTimes ld a, BANK(Moves) call GetFarByte - ld hl, $c5a0 + hlcoord 16, 12 cp $2 jr c, .asm_132a7 ld [$d265], a @@ -20871,7 +20871,7 @@ Function13256: ; 13256 call PlaceString .asm_132ad - ld hl, $c5b9 + hlcoord 1, 14 ld a, $11 call Predef ld a, $1 @@ -20923,7 +20923,7 @@ Function132da: ; 132da ret .asm_132f8 - ld hl, $c4b0 + hlcoord 16, 0 ld [hl], $71 ret ; 132fe @@ -21314,10 +21314,10 @@ Function13512: ; 13512 ld b, $4 ld c, $8 call TextBox - ld hl, $c4c9 + hlcoord 1, 2 ld de, String_13537 call PlaceString - ld hl, $c4f4 + hlcoord 4, 4 call Function1353f pop af ld [Options], a @@ -22210,15 +22210,15 @@ Function13a47: ; 13a47 ld a, [hl] and a ret z - cp $7 + cp 6 + 1 jr c, .asm_13a54 - ld a, $6 + ld a, 6 ld [hl], a .asm_13a54 inc hl ld b, a - ld c, $0 + ld c, 0 .asm_13a58 ld a, [hl] and a @@ -22229,13 +22229,13 @@ Function13a47: ; 13a47 jr c, .asm_13a73 .asm_13a64 - ld [hl], $eb + ld [hl], SMEARGLE push hl push bc ld a, c - ld hl, PartyMon1 + ld hl, PartyMon1Species call GetPartyLocation - ld [hl], $eb + ld [hl], SMEARGLE pop bc pop hl @@ -22248,7 +22248,7 @@ Function13a47: ; 13a47 ld hl, PartyMon1 ld a, [PartyCount] ld d, a - ld e, $0 + ld e, 0 .asm_13a83 push de push hl @@ -22261,35 +22261,34 @@ Function13a47: ; 13a47 jr c, .asm_13a9c .asm_13a8f - ld [hl], $eb + ld [hl], SMEARGLE push de - ld d, $0 + ld d, 0 ld hl, PartySpecies add hl, de pop de - ld a, $eb + ld a, SMEARGLE ld [hl], a .asm_13a9c ld [CurSpecies], a call GetBaseData - ld hl, $001f + ld hl, PartyMon1Level - PartyMon1 add hl, bc ld a, [hl] - cp $2 - ld a, $2 + cp 2 + ld a, 2 jr c, .asm_13ab4 ld a, [hl] - cp $64 + cp MAX_LEVEL jr c, .asm_13ab5 - ld a, $64 - + ld a, MAX_LEVEL .asm_13ab4 ld [hl], a - .asm_13ab5 ld [CurPartyLevel], a - ld hl, $0024 + + ld hl, PartyMon1MaxHP - PartyMon1 add hl, bc ld d, h ld e, l @@ -22299,16 +22298,16 @@ Function13a47: ; 13a47 ld a, $c call Predef pop hl - ld bc, $0030 + ld bc, PartyMon2 - PartyMon1 add hl, bc pop de inc e dec d jr nz, .asm_13a83 - ld de, $de41 + ld de, PartyMonNicknames ld a, [PartyCount] ld b, a - ld c, $0 + ld c, 0 .asm_13adc push bc call Function13b71 @@ -22321,11 +22320,11 @@ Function13a47: ; 13a47 push hl ld hl, PartySpecies push bc - ld b, $0 + ld b, 0 add hl, bc pop bc ld a, [hl] - cp $fd + cp EGG ld hl, String_13b6b jr z, .asm_13b06 ld [$d265], a @@ -22342,10 +22341,10 @@ Function13a47: ; 13a47 inc c dec b jr nz, .asm_13adc - ld de, $ddff + ld de, PartyMonOT ld a, [PartyCount] ld b, a - ld c, $0 + ld c, 0 .asm_13b1b push bc call Function13b71 @@ -22364,12 +22363,13 @@ Function13a47: ; 13a47 inc c dec b jr nz, .asm_13b1b - ld hl, $dce1 + + ld hl, PartyMon1Moves ld a, [PartyCount] ld b, a .asm_13b40 push hl - ld c, $4 + ld c, NUM_MOVES ld a, [hl] and a jr z, .asm_13b4b @@ -22377,13 +22377,13 @@ Function13a47: ; 13a47 jr c, .asm_13b4d .asm_13b4b - ld [hl], $1 + ld [hl], POUND .asm_13b4d ld a, [hl] and a jr z, .asm_13b55 - cp $fc + cp NUM_ATTACKS + 1 jr c, .asm_13b5c .asm_13b55 @@ -22401,7 +22401,7 @@ Function13a47: ; 13a47 .asm_13b60 pop hl push bc - ld bc, $0030 + ld bc, PartyMon2 - PartyMon1 add hl, bc pop bc dec b @@ -22415,11 +22415,11 @@ String_13b6b: ; 13b6b Function13b71: ; 13b71 push de - ld c, $1 - ld b, $6 + ld c, 1 + ld b, 6 .asm_13b76 ld a, [de] - cp $50 + cp "@" jr z, .asm_13b85 inc de inc c @@ -22427,7 +22427,7 @@ Function13b71: ; 13b71 jr nz, .asm_13b76 dec c dec de - ld a, $50 + ld a, "@" ld [de], a .asm_13b85 @@ -27623,7 +27623,7 @@ Function15efd: ; 15efd callba Function24fe1 call Function1c07 jr c, .asm_15f6e - ld hl, $c5b9 + hlcoord 1, 14 ld bc, $0312 call ClearBox ld hl, UnknownText_0x15f78 @@ -27638,7 +27638,7 @@ Function15efd: ; 15efd call TossItem ld a, $3b call Predef - ld hl, $c5b9 + hlcoord 1, 14 ld bc, $0312 call ClearBox ld hl, UnknownText_0x15fbe @@ -28276,20 +28276,20 @@ Function16439: ; 16439 .asm_1644b call Function164ea - ld bc, $c5b9 + bccoord 1, 14 ld hl, UnknownText_0x164f4 call Function13e5 call YesNoBox ret c call Function164ea - ld bc, $c5b9 + bccoord 1, 14 ld hl, UnknownText_0x164f9 call Function13e5 ret .asm_16468 call Function164ea - ld bc, $c5b9 + bccoord 1, 14 ld a, [$d4c2] bit 7, a jr z, .asm_16497 @@ -28302,7 +28302,7 @@ Function16439: ; 16439 ld [$d4c2], a call Function164d1 call Function164ea - ld bc, $c5b9 + bccoord 1, 14 ld hl, UnknownText_0x1650d call Function13e5 ret @@ -28317,7 +28317,7 @@ Function16439: ; 16439 ld [$d4c2], a call Function164b9 call Function164ea - ld bc, $c5b9 + bccoord 1, 14 ld hl, UnknownText_0x16503 call Function13e5 ret @@ -28355,7 +28355,7 @@ Function164d1: ; 164d1 ; 164ea Function164ea: ; 164ea - ld hl, $c5b9 + hlcoord 1, 14 ld bc, $0312 call ClearBox ret @@ -28411,24 +28411,24 @@ Function1651a: ; 1651a ld hl, TileMap ld bc, $0612 call TextBox - ld hl, $c4c9 + hlcoord 1, 2 ld de, String_16699 call PlaceString - ld hl, $c4d4 + hlcoord 12, 2 ld de, $d851 ld bc, $2306 call PrintNum - ld hl, $c4f1 + hlcoord 1, 4 ld de, String_166b0 call PlaceString - ld hl, $c4fc + hlcoord 12, 4 ld de, Money ld bc, $2306 call PrintNum - ld hl, $c519 + hlcoord 1, 6 pop de call PlaceString - ld hl, $c524 + hlcoord 12, 6 ld de, StringBuffer2 ld bc, $a306 call PrintNum @@ -28456,18 +28456,18 @@ Function16571: ; 16571 call Function165b9 xor a ld [hBGMapMode], a - ld hl, $c524 + hlcoord 12, 6 ld bc, $0007 ld a, $7f call ByteFill - ld hl, $c524 + hlcoord 12, 6 ld de, StringBuffer2 ld bc, $a306 call PrintNum ld a, [$ff9b] and $10 jr nz, .asm_165b0 - ld hl, $c525 + hlcoord 13, 6 ld a, [$cf64] ld c, a ld b, $0 @@ -29502,23 +29502,23 @@ Function16be4: ; 16be4 ld bc, $0312 call TextBox - ld hl, $c504 + hlcoord 0, 5 ld bc, $0707 call TextBox - ld hl, $c5b8 + hlcoord 0, 14 ld bc, $0212 call TextBox - ld hl, $c4c9 + hlcoord 1, 2 ld de, AlphRuinsStampString call PlaceString - ld hl, $c5e1 + hlcoord 1, 16 ld de, UnownDexDoWhatString call PlaceString - ld hl, $c522 + hlcoord 10, 6 ld de, UnownDexMenuString call PlaceString @@ -29619,7 +29619,7 @@ Function16cc8: ; 16cc8 ld a, $3c call Predef call Function16cff - ld hl, $c519 + hlcoord 1, 6 xor a ld [$ffad], a ld bc, $0707 @@ -29650,10 +29650,10 @@ Function16cff: ; 16cff ; 16d20 Function16d20: ; 16d20 - ld hl, $c519 + hlcoord 1, 6 ld bc, $0707 call ClearBox - ld hl, $c555 + hlcoord 1, 9 ld de, UnownDexVacantString call PlaceString xor a @@ -29701,7 +29701,7 @@ Function16dac: ; 16dac ld bc, $0168 ld a, $7f call ByteFill - ld hl, $c583 + hlcoord 7, 11 ld a, $31 ld [$ffad], a ld bc, $0707 @@ -30498,7 +30498,7 @@ Function1728f: ; 1728f (5:728f) ld de, MUSIC_EVOLUTION call PlayMusic call EnableLCD - ld hl, $c4f7 + hlcoord 7, 4 ld b, $98 ld c, $31 ld a, EGG @@ -30545,7 +30545,7 @@ Function1728f: ; 1728f (5:728f) ld [$c3c0], a call ClearSprites call Function173b3 - ld hl, $c4e2 + hlcoord 6, 3 ld b, $98 ld c, $0 ld a, [$cf63] @@ -30554,7 +30554,7 @@ Function1728f: ; 1728f (5:728f) call WaitSFX ld a, [$cf63] ld [CurPartySpecies], a ; $d108 - ld hl, $c4e2 + hlcoord 6, 3 ld d, $0 ld e, $5 ld a, $47 @@ -30980,11 +30980,11 @@ Function200ba: ; 200ba (8:40ba) ; known jump sources: 20078 (8:4078), 2009f (8:409f), 200bf (8:40bf) Function2011f: ; 2011f (8:411f) - ld hl, $c504 + hlcoord 0, 5 ld b, $5 ld c, $12 call TextBox - ld de, $c541 + decoord 1, 8 ld a, [$d1ed] ld b, a callba Function5b05 @@ -30992,7 +30992,7 @@ Function2011f: ; 2011f (8:411f) ld b, a ld a, [$d1ef] ld c, a - ld de, $c54b + decoord 11, 8 callba Function1dd6bb ld a, [Buffer2] ; $d1eb (aliases: MovementType) lb de, $7f, $7f @@ -31895,7 +31895,7 @@ Function244c3: ; 0x244c3 ld a, [MenuSelection] cp $ff ret z - ld de, $c5b9 + decoord 1, 14 callba GetItemDescription ret ; 0x244e3 @@ -32925,39 +32925,39 @@ MenuDataHeader_0x24b1d: ; 0x24b1d ; 0x24b25 Function24b25: ; 24b25 - ld hl, $c4ab + hlcoord 11, 0 ld b, $1 ld c, $7 call TextBox - ld hl, $c4ac + hlcoord 12, 0 ld de, CoinString call PlaceString - ld hl, $c4c5 + hlcoord 17, 1 ld de, String24b8e call PlaceString ld de, Coins ld bc, $0204 - ld hl, $c4c1 + hlcoord 13, 1 call PrintNum ret ; 24b4e Function24b4e: ; 24b4e - ld hl, $c4a5 + hlcoord 5, 0 ld b, $3 ld c, $d call TextBox - ld hl, $c4ba + hlcoord 6, 1 ld de, MoneyString call PlaceString - ld hl, $c4c0 + hlcoord 12, 1 ld de, Money ld bc, $2306 call PrintNum - ld hl, $c4e2 + hlcoord 6, 3 ld de, CoinString call PlaceString - ld hl, $c4eb + hlcoord 15, 3 ld de, Coins ld bc, $0204 call PrintNum @@ -32981,17 +32981,17 @@ Function24b8f: ; 24b8f ld b, $3 ld c, $7 call TextBox - ld hl, $c4b5 + hlcoord 1, 1 ld de, $dc7a ld bc, $0203 call PrintNum - ld hl, $c4b8 + hlcoord 4, 1 ld de, String24bcf call PlaceString - ld hl, $c4dd + hlcoord 1, 3 ld de, String24bd4 call PlaceString - ld hl, $c4e1 + hlcoord 5, 3 ld de, $dc79 ld bc, $0102 call PrintNum @@ -33020,14 +33020,14 @@ Function24be7: ; 24be7 push af set 4, [hl] call Function24bdc - ld hl, $c505 + hlcoord 1, 5 ld de, String24c52 call PlaceString - ld hl, $c50c + hlcoord 8, 5 ld de, $dc79 ld bc, $4102 call PrintNum - ld hl, $c4b5 + hlcoord 1, 1 ld de, String24c4b call PlaceString ld a, [$df9c] @@ -33038,12 +33038,12 @@ Function24be7: ; 24be7 call GetPokemonName .asm_24c1e - ld hl, $c4bc + hlcoord 8, 1 call PlaceString ld a, [$df9c] and a jr z, .asm_24c3e - ld hl, $c4dd + hlcoord 1, 3 ld de, String24c5e call PlaceString ld a, [$dfbb] @@ -33561,7 +33561,7 @@ Strings24f5f: ; 24f5f ; 24f7c Function24f7c: ; 24f7c - ld hl, $c5b5 + hlcoord 17, 13 ld de, $dc79 ld bc, $8102 call PrintNum @@ -33593,7 +33593,7 @@ Strings24f9a: ; 24f9a ; 24fb2 Function24fb2: ; 24fb2 - ld hl, $c5ed + hlcoord 13, 16 ld de, $dc79 ld bc, $8102 call PrintNum @@ -33889,7 +33889,7 @@ Function2513b: ; 2513b (9:513b) ld a, BANK(CardStatusGFX) call FarCopyBytes call Function25299 - ld hl, $c540 + hlcoord 0, 8 ld d, $6 call Function253b0 call EnableLCD @@ -33945,7 +33945,7 @@ Function251b0: ; 251b0 (9:51b0) ; no known jump sources Function251b6: ; 251b6 (9:51b6) call ClearSprites - ld hl, $c540 + hlcoord 0, 8 ld d, $6 call Function253b0 call WaitBGMap @@ -33983,7 +33983,7 @@ Function251e9: ; 251e9 ; no known jump sources Function251f4: ; 251f4 (9:51f4) call ClearSprites - ld hl, $c540 + hlcoord 0, 8 ld d, $6 call Function253b0 call WaitBGMap @@ -34034,7 +34034,7 @@ Function25246: ; 25246 ; no known jump sources Function2524c: ; 2524c (9:524c) call ClearSprites - ld hl, $c540 + hlcoord 0, 8 ld d, $6 call Function253b0 call WaitBGMap @@ -34076,27 +34076,27 @@ Function25299: ; 25299 (9:5299) ld hl, TileMap ; $c4a0 (aliases: SpritesEnd) ld d, $5 call Function253b0 - ld hl, $c4ca + hlcoord 2, 2 ld de, String_252ec call PlaceString - ld hl, $c4f2 + hlcoord 2, 4 ld de, Tilemap_252f9 call Function253a8 - ld hl, $c4cf + hlcoord 7, 2 ld de, PlayerName ; $d47d call PlaceString - ld hl, $c4f5 + hlcoord 5, 4 ld de, PlayerID ; $d47b ld bc, $8205 call PrintNum - ld hl, $c51f + hlcoord 7, 6 ld de, Money ; $d84e ld bc, $2306 call PrintNum - ld hl, $c4dd + hlcoord 1, 3 ld de, Tilemap_252fc call Function253a8 - ld hl, $c4c2 + hlcoord 14, 1 ld bc, $507 xor a ld [$FF00+$ad], a @@ -34119,27 +34119,27 @@ Tilemap_252fc: ; 252fc ; known jump sources: 251d0 (9:51d0) Function2530a: ; 2530a (9:530a) - ld hl, $c56a + hlcoord 2, 10 ld de, String_2534c call PlaceString - ld hl, $c5d6 + hlcoord 10, 15 ld de, String_2535c call PlaceString ld hl, PokedexCaught ; $de99 ld b, $20 call CountSetBits ld de, $d265 - ld hl, $c577 + hlcoord 15, 10 ld bc, $103 call PrintNum call Function25415 - ld hl, $c542 + hlcoord 2, 8 ld de, Tilemap_25366 call Function253a8 ld a, [StatusFlags] ; $d84c bit 0, a ret nz - ld hl, $c555 + hlcoord 1, 9 ld bc, $211 call ClearBox ret @@ -34161,10 +34161,10 @@ Tilemap_25366: ; 25366 ; known jump sources: 2521a (9:521a), 25272 (9:5272) Function2536c: ; 2536c (9:536c) - ld hl, $c542 + hlcoord 2, 8 ld de, Tilemap_253a2 call Function253a8 - ld hl, $c56a + hlcoord 2, 10 ld a, $29 ld c, $4 .asm_2537c @@ -34175,7 +34175,7 @@ Function2536c: ; 2536c (9:536c) inc hl dec c jr nz, .asm_2537c - ld hl, $c5a6 + hlcoord 2, 13 ld a, $51 ld c, $4 .asm_2538d @@ -34293,7 +34293,7 @@ Function253f4: ; 253f4 (9:53f4) ; known jump sources: 251d7 (9:51d7), 25330 (9:5330) Function25415: ; 25415 (9:5415) - ld hl, $c59b + hlcoord 11, 12 ld de, GameTimeHours ; $d4c4 ld bc, $204 call PrintNum @@ -34304,7 +34304,7 @@ Function25415: ; 25415 (9:5415) ld a, [$FF00+$9b] and $1f ret nz - ld hl, $c59f + hlcoord 15, 12 ld a, [hl] xor $51 ld [hl], a @@ -36271,13 +36271,13 @@ Function28000: ; 28000 call Functione58 callba Function16d69a call Function3200 - ld hl, $c543 + hlcoord 3, 8 ld b, $2 ld c, $c ld d, h ld e, l callba Function4d35b - ld hl, $c56c + hlcoord 4, 10 ld de, String28419 call PlaceString call Function28eff @@ -36738,7 +36738,7 @@ Function283b2: ; 283b2 ld [hl], a ld [$ff9e], a push de - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 push de @@ -36747,7 +36747,7 @@ Function283b2: ; 283b2 callba Function4d35b pop de pop hl - ld bc, $c5b9 + bccoord 1, 14 call Function13e5 call Function4b6 call Functionfdb @@ -37616,11 +37616,11 @@ Function28926: ; 28926 call Function309d ld a, [$cfa9] push af - ld hl, $c5cc + hlcoord 0, 15 ld b, $1 ld c, $12 call Function28eef - ld hl, $c5e2 + hlcoord 2, 16 ld de, String28ab4 call PlaceString callba Function4d354 @@ -37693,11 +37693,11 @@ Function28926: ; 28926 callab Function50db9 callba Function4d319 call Function30b4 - ld hl, $c4ba + hlcoord 6, 1 ld bc, $0601 ld a, $7f call Function28b77 - ld hl, $c4c5 + hlcoord 17, 1 ld bc, $0601 ld a, $7f call Function28b77 @@ -37725,13 +37725,13 @@ Function28926: ; 28926 xor a ld [$cf57], a ld [$cf52], a - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call Function28eef callba Function4d354 ld hl, UnknownText_0x28aaf - ld bc, $c5b9 + bccoord 1, 14 call Function13e5 jr .asm_28a89 @@ -37747,21 +37747,21 @@ Function28926: ; 28926 ld a, [hl] ld [$d265], a call GetPokemonName - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call Function28eef callba Function4d354 ld hl, UnknownText_0x28ac4 - ld bc, $c5b9 + bccoord 1, 14 call Function13e5 .asm_28a89 - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call Function28eef - ld hl, $c5b9 + hlcoord 1, 14 ld de, String28ece call PlaceString ld a, $1 @@ -37857,15 +37857,15 @@ Function28b22: ; 28b22 ; 28b42 Function28b42: ; 28b42 - ld hl, $c5e0 + hlcoord 0, 16 ld a, $7e ld bc, $0028 call ByteFill - ld hl, $c5e1 + hlcoord 1, 16 ld a, $7f ld bc, $0012 call ByteFill - ld hl, $c5e2 + hlcoord 2, 16 ld de, String_28b61 jp PlaceString ; 28b61 @@ -37876,7 +37876,7 @@ String_28b61: ; 28b61 Function28b68: ; 28b68 ld a, [$cf51] - ld hl, $c55a + hlcoord 6, 9 ld bc, $0014 call AddNTimes ld [hl], $ec @@ -37904,7 +37904,7 @@ Function28b87: ; 28b87 xor a ld [$cf57], a ld [$cf52], a - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call Function28eef @@ -37930,15 +37930,15 @@ Function28b87: ; 28b87 ld [$d265], a call GetPokemonName ld hl, UnknownText_0x28eb8 - ld bc, $c5b9 + bccoord 1, 14 call Function13e5 call Function1d6e - ld hl, $c536 + hlcoord 10, 7 ld b, $3 ld c, $7 call Function28eef ld de, String28eab - ld hl, $c54c + hlcoord 12, 8 call PlaceString ld a, $8 ld [$cfa1], a @@ -37973,11 +37973,11 @@ Function28b87: ; 28b87 .asm_28c33 ld a, $1 ld [$cf56], a - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call Function28eef - ld hl, $c5b9 + hlcoord 1, 14 ld de, String28ece call PlaceString callba Function16d6ce @@ -37990,11 +37990,11 @@ Function28b87: ; 28b87 ld a, [$cf51] dec a jr nz, .asm_28c7b - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call Function28eef - ld hl, $c5b9 + hlcoord 1, 14 ld de, String28ece call PlaceString jp Function28ea3 @@ -38223,11 +38223,11 @@ Function28b87: ; 28b87 callba Function106187 ld c, $28 call DelayFrames - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call Function28eef - ld hl, $c5b9 + hlcoord 1, 14 ld de, String28ebd call PlaceString callba Function4d354 @@ -38822,20 +38822,20 @@ Jumptable_2928f: ; 2928f Function29297: ; 29297 call Function297cf - ld hl, $c4e5 + hlcoord 9, 3 ld [hl], $5b inc hl ld bc, $000a ld a, $60 call ByteFill - ld hl, $c4cb + hlcoord 3, 2 call Function292ec ret ; 292af Function292af: ; 292af call Function297cf - ld hl, $c4dc + hlcoord 0, 3 ld bc, $0014 ld a, $60 call ByteFill @@ -38844,11 +38844,11 @@ Function292af: ; 292af Function292be: ; 292be call Function297cf - ld hl, $c4dc + hlcoord 0, 3 ld bc, $0011 ld a, $60 call ByteFill - ld hl, $c4ed + hlcoord 17, 3 ld a, $5d ld [hl], a ld a, $61 @@ -38864,7 +38864,7 @@ Function292be: ; 292be ld [hld], a ld a, $5b ld [hl], a - ld hl, $c522 + hlcoord 10, 6 call Function292ec ret ; 292ec @@ -38887,7 +38887,7 @@ Function292f6: ; 292f6 ld bc, $0014 ld a, $7a call ByteFill - ld hl, $c4b4 + hlcoord 0, 1 ld de, $c736 call PlaceString ld hl, $c741 @@ -38900,11 +38900,11 @@ Function292f6: ; 292f6 jr .asm_2931e .asm_29326 - ld hl, $c4f0 + hlcoord 0, 4 add hl, de ld de, $c741 call PlaceString - ld hl, $c4cf + hlcoord 7, 2 ld bc, $0006 pop af call ByteFill @@ -38922,7 +38922,7 @@ Function29348: ; 29348 ld a, $a0 ld [hSCX], a call DelayFrame - ld hl, $c4d0 + hlcoord 8, 2 ld de, Tilemap_298f7 lb bc, 3, 12 call Function297db @@ -39147,7 +39147,7 @@ Function294c3: ; 294c3 call Request2bpp call WaitTop call Function297cf - ld hl, $c4cf + hlcoord 7, 2 xor a ld [$ffad], a ld bc, $0707 @@ -39244,11 +39244,11 @@ Function29573: ; 29573 call Function297cf ld a, $9c ld [$ffd7], a - ld hl, $c4a3 + hlcoord 3, 0 ld b, $6 ld c, $d call TextBox - ld hl, $c4a4 + hlcoord 4, 0 ld de, String29591 call PlaceString ret @@ -39266,11 +39266,11 @@ Function295a1: ; 295a1 call Function297cf ld a, $9c ld [$ffd7], a - ld hl, $c4a3 + hlcoord 3, 0 ld b, $6 ld c, $d call TextBox - ld hl, $c4cc + hlcoord 4, 2 ld de, String295c2 call PlaceString call Function295d8 @@ -39292,7 +39292,7 @@ Function295d8: ; 295d8 ; 295e3 Function295e3: ; 295e3 - ld hl, $c4aa + hlcoord 10, 0 ld bc, $8103 call PrintNum ld [hl], $7f @@ -39300,7 +39300,7 @@ Function295e3: ; 295e3 ; 295ef Function295ef: ; 295ef - ld hl, $c4cc + hlcoord 4, 2 call PlaceString ret ; 295f6 @@ -39312,7 +39312,7 @@ Function295f6: ; 295f6 .asm_295fb push af - ld hl, $c4f7 + hlcoord 7, 4 call PlaceString inc bc pop af @@ -39330,7 +39330,7 @@ Unknown_2960e: ; 2960e ; 29611 Function29611: ; 29611 - ld hl, $c51f + hlcoord 7, 6 ld bc, $8205 call PrintNum ret @@ -39567,7 +39567,7 @@ UnknownText_0x29757: ; 0x29757 Function2975c: ; 2975c call WaitTop - ld hl, $c568 + hlcoord 0, 10 ld bc, $00a0 ld a, $7f call ByteFill @@ -41394,22 +41394,22 @@ Function2a567: ; 2a567 WildMons1: ; 0x2a5e9 -INCLUDE "stats/wild/johto_grass.asm" +INCLUDE "data/wild/johto_grass.asm" WildMons2: ; 0x2b11d -INCLUDE "stats/wild/johto_water.asm" +INCLUDE "data/wild/johto_water.asm" WildMons3: ; 0x2b274 -INCLUDE "stats/wild/kanto_grass.asm" +INCLUDE "data/wild/kanto_grass.asm" WildMons4: ; 0x2b7f7 -INCLUDE "stats/wild/kanto_water.asm" +INCLUDE "data/wild/kanto_water.asm" WildMons5: ; 0x2b8d0 -INCLUDE "stats/wild/swarm_grass.asm" +INCLUDE "data/wild/swarm_grass.asm" WildMons6: ; 0x2b92f -INCLUDE "stats/wild/swarm_water.asm" +INCLUDE "data/wild/swarm_water.asm" Function2b930: ; 2b930 @@ -41706,7 +41706,7 @@ DrawPlayerExpBar: ; 2c095 ld de, $d004 ld bc, 4 call CopyBytes - ld hl, $c57a + hlcoord 18, 10 ld de, -1 jr Function2c0f1 @@ -41722,7 +41722,7 @@ Function2c0ad: ; 2c0ad ld de, $d004 ld bc, 4 call CopyBytes - ld hl, $c57a + hlcoord 18, 10 ld de, -1 jr Function2c0f1 @@ -41735,7 +41735,7 @@ Function2c0c5: ; 2c0c5 ld de, $d004 ld bc, 4 call CopyBytes - ld hl, $c4c9 + hlcoord 1, 2 ld de, 1 call Function2c0f1 ld a, [IsInBattle] @@ -41745,7 +41745,7 @@ Function2c0c5: ; 2c0c5 dec a call CheckCaughtMon ret z - ld hl, $c4b5 + hlcoord 1, 1 ld [hl], $5d ret @@ -41839,17 +41839,17 @@ INCBIN "gfx/battle/balls.2bpp" Function2c1b2: ; 2c1b2 call WhiteBGMap call Functione5f - ld hl, $c4de + hlcoord 2, 3 ld b, $9 ld c, $e call TextBox - ld hl, $c508 + hlcoord 4, 5 ld de, PlayerName call PlaceString - ld hl, $c56c + hlcoord 4, 10 ld de, $d26b call PlaceString - ld hl, $c549 + hlcoord 9, 8 ld a, $69 ld [hli], a ld [hl], $6a @@ -42734,7 +42734,7 @@ Function2c915: ; 2c915 (b:4915) Function2c946: ; 2c946 (b:4946) call Function2c98a jp nc, Function2c9af - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call TextBox @@ -42746,7 +42746,7 @@ Function2c946: ; 2c946 (b:4946) call Predef ld a, [$d265] ld [CurSpecies], a ; $cf60 - ld hl, $c5b9 + hlcoord 1, 14 call PrintMoveDesc jp Function2c915 @@ -42836,7 +42836,7 @@ Function2c9e2: ; 2c9e2 (b:49e2) ld a, [BattleType] ; $d230 cp $3 jp z, Function2caca - ld hl, $c4cd + hlcoord 5, 2 ld bc, $a0f ld a, $7f call ClearBox @@ -42926,7 +42926,7 @@ Function2c9e2: ; 2c9e2 (b:49e2) ; known jump sources: 2ca0c (b:4a0c), 2ca77 (b:4a77) Function2ca86: ; 2ca86 (b:4a86) - ld hl, $c4a5 + hlcoord 5, 0 ld bc, $28 ld a, $6 sub d @@ -42977,7 +42977,7 @@ Function2cab5: ; 2cab5 (b:4ab5) ; known jump sources: 2c9e7 (b:49e7) Function2caca: ; 2caca (b:4aca) - ld hl, $c4e5 + hlcoord 9, 3 push de ld de, String_2caae call PlaceString @@ -44165,7 +44165,7 @@ Function383f8: ; 383f8 ld [$d1ef], a asm_38436: ; 38436 (e:4436) call Function38571 - ld hl, $c4ca + hlcoord 2, 2 xor a ld [$d10a], a call Function3839a @@ -45043,7 +45043,7 @@ Function4013c: ; 4013c (10:413c) ld bc, $168 call ByteFill callba Function1de171 - ld hl, $c5f4 + hlcoord 0, 17 ld de, $47f2 call Function40acd ld a, $7 @@ -45072,7 +45072,7 @@ Function4013c: ; 4013c (10:413c) call Function41423 call Function41148 callba Function1de171 - ld hl, $c5f4 + hlcoord 0, 17 ld de, $47f2 call Function40acd ld a, $7 @@ -45917,7 +45917,7 @@ Function40741: ; 40741 ; known jump sources: 40169 (10:4169) Function4074c: ; 4074c (10:474c) - ld hl, $c5f4 + hlcoord 0, 17 ld de, Unknown_407f2 call Function40acd ld a, $32 @@ -45927,47 +45927,47 @@ Function4074c: ; 4074c (10:474c) ld hl, TileMap ; $c4a0 (aliases: SpritesEnd) ld bc, $707 call Function40ad5 - ld hl, $c554 + hlcoord 0, 9 ld bc, $607 call Function40ad5 - ld hl, $c57d + hlcoord 1, 11 ld de, Unknown_407e1 call Function40acd ld hl, PokedexSeen ; $deb9 (aliases: EndPokedexSeen) ld b, $20 call CountSetBits ld de, $d265 - ld hl, $c595 + hlcoord 5, 12 ld bc, $103 call PrintNum - ld hl, $c5b9 + hlcoord 1, 14 ld de, Unknown_407e6 call Function40acd ld hl, PokedexCaught ; $de99 ld b, $20 call CountSetBits ld de, $d265 - ld hl, $c5d1 + hlcoord 5, 15 ld bc, $103 call PrintNum - ld hl, $c5f5 + hlcoord 1, 17 ld de, Unknown_407ea call Function40acd - ld hl, $c4bc + hlcoord 8, 1 ld b, $7 ld a, $5a call Function40741 - ld hl, $c570 + hlcoord 8, 10 ld b, $6 ld a, $5a call Function40741 - ld hl, $c4a8 + hlcoord 8, 0 ld [hl], $59 - ld hl, $c548 + hlcoord 8, 8 ld [hl], $53 - ld hl, $c55c + hlcoord 8, 9 ld [hl], $54 - ld hl, $c5e8 + hlcoord 8, 16 ld [hl], $5b call Function40ab2 ret @@ -45988,28 +45988,28 @@ Function407fd: ; 407fd ld hl, TileMap ld bc, $0f12 call Function40ad5 - ld hl, $c4b3 + hlcoord 19, 0 ld [hl], $34 - ld hl, $c4c7 + hlcoord 19, 1 ld a, $7f ld b, $f call Function40741 ld [hl], $39 - ld hl, $c569 + hlcoord 1, 10 ld bc, $0013 ld a, $61 call ByteFill - ld hl, $c5f5 + hlcoord 1, 17 ld bc, $0012 ld a, $7f call ByteFill - ld hl, $c535 + hlcoord 9, 7 ld de, Unknown_40852 call Function40acd - ld hl, $c55d + hlcoord 9, 9 ld de, Unknown_4085c call Function40acd - ld hl, $c5f4 + hlcoord 0, 17 ld de, Unknown_40867 call Function40acd call Function40ab2 @@ -46029,22 +46029,22 @@ Unknown_40867: ; 40867 ; known jump sources: 403a3 (10:43a3) Function4087c: ; 4087c (10:487c) call Function40aa6 - ld hl, $c4c8 + hlcoord 0, 2 ld bc, $812 call Function40ad5 - ld hl, $c590 + hlcoord 0, 12 ld bc, $412 call Function40ad5 - ld hl, $c4b4 + hlcoord 0, 1 ld de, Unknown_408b2 call Function40acd - ld hl, $c4f3 + hlcoord 3, 4 ld de, String_408bd call PlaceString ld a, [$c7dc] and a ret z - ld hl, $c56b + hlcoord 3, 10 ld de, String_408e5 call PlaceString ret @@ -46067,22 +46067,22 @@ String_408e5: ; 408e5 ; known jump sources: 40449 (10:4449) Function408f0: ; 408f0 (10:48f0) call Function40aa6 - ld hl, $c4c8 + hlcoord 0, 2 ld bc, $e12 call Function40ad5 - ld hl, $c4b4 + hlcoord 0, 1 ld de, Unknown_4092a call Function40acd - ld hl, $c4f8 + hlcoord 8, 4 ld de, Unknown_40935 call Function40acd - ld hl, $c520 + hlcoord 8, 6 ld de, Unknown_40935 call Function40acd - ld hl, $c4f3 + hlcoord 3, 4 ld de, String_40940 call PlaceString - ld hl, $c5a7 + hlcoord 3, 13 ld de, String_4094c call PlaceString ret @@ -46111,27 +46111,27 @@ Function40962: ; 40962 (10:4962) ld hl, TileMap ; $c4a0 (aliases: SpritesEnd) ld bc, $707 call Function40ad5 - ld hl, $c57c + hlcoord 0, 11 ld bc, $512 call Function40ad5 - ld hl, $c591 + hlcoord 1, 12 ld de, String_409ae call PlaceString ld de, $c7d7 - ld hl, $c5e1 + hlcoord 1, 16 ld bc, $103 call PrintNum - ld hl, $c4a8 + hlcoord 8, 0 ld [hl], $59 - ld hl, $c4bc + hlcoord 8, 1 ld b, $7 ld a, $5a call Function40741 - ld hl, $c548 + hlcoord 8, 8 ld [hl], $53 - ld hl, $c55c + hlcoord 8, 9 ld [hl], $69 - ld hl, $c570 + hlcoord 8, 10 ld [hl], $6a call Function40ab2 ret @@ -46146,7 +46146,7 @@ String_409ae: ; 409ae ; known jump sources: 40523 (10:4523), 4054e (10:454e) Function409cf: ; 409cf (10:49cf) ld a, [$c7d5] - ld hl, $c5b8 + hlcoord 0, 14 call Function40fcd ld a, [$c7d5] ld b, a @@ -46155,9 +46155,9 @@ Function409cf: ; 409cf (10:49cf) jr z, .asm_409f0 cp b jr z, .asm_409f0 - ld hl, $c5ce + hlcoord 2, 15 call Function40fcd - ld hl, $c5cd + hlcoord 1, 15 ld [hl], $f3 .asm_409f0 ret @@ -46165,17 +46165,17 @@ Function409cf: ; 409cf (10:49cf) ; known jump sources: 405c0 (10:45c0) Function409f1: ; 409f1 (10:49f1) call Function40aa6 - ld hl, $c4b6 + hlcoord 2, 1 ld bc, $a0d call Function40ad5 - ld hl, $c5ba + hlcoord 2, 14 ld bc, $10d call Function40ad5 - ld hl, $c5ce + hlcoord 2, 15 ld [hl], $3d - ld hl, $c5dc + hlcoord 16, 15 ld [hl], $3e - ld hl, $c50a + hlcoord 6, 5 call Function40ab5 ld de, $0 ld b, $0 @@ -46246,7 +46246,7 @@ Function40aa6: ; 40aa6 ; 40ab2 Function40ab2: ; 40ab2 - ld hl, $c4b5 + hlcoord 1, 1 Function40ab5: ; 40ab5 xor a ld b, $7 @@ -46336,7 +46336,7 @@ Function40b0f: ; 40b0f (10:4b0f) .asm_40b1a ld c, $b .asm_40b1c - ld hl, $c4b4 + hlcoord 0, 1 ld a, [$c7d3] add a inc a @@ -46350,7 +46350,7 @@ Function40b0f: ; 40b0f (10:4b0f) add hl, de ld e, l ld d, h - ld hl, $c4c8 + hlcoord 0, 2 ld a, [$c7d3] .asm_40b3c push af @@ -46427,12 +46427,12 @@ String_40b9a: ; 40b9a ; 40ba0 Function40ba0: ; 40ba0 - ld hl, $c4c6 + hlcoord 18, 1 ld a, $62 ld [hli], a inc a ld [hl], a - ld hl, $c4da + hlcoord 18, 2 ld a, $64 ld [hli], a inc a @@ -46582,15 +46582,15 @@ Function40c30: ; 40c30 ; 40c65 AlphabeticalPokedexOrder: ; 0x40c65 -INCLUDE "stats/pokedex/order_alpha.asm" +INCLUDE "data/pokedex/order_alpha.asm" NewPokedexOrder: ; 0x40d60 -INCLUDE "stats/pokedex/order_new.asm" +INCLUDE "data/pokedex/order_new.asm" Function40e5b: ; 40e5b xor a ld [hBGMapMode], a - ld hl, $c590 + hlcoord 0, 12 ld bc, $0412 call Function40ad5 ld a, [$c7d8] @@ -46598,7 +46598,7 @@ Function40e5b: ; 40e5b call Function41432 ld e, l ld d, h - ld hl, $c5b9 + hlcoord 1, 14 call PlaceString ld a, $1 ld [hBGMapMode], a @@ -46636,11 +46636,11 @@ String_40ee4: ; 40ee4 Function40f08: ; 40f08 (10:4f08) xor a ld [hBGMapMode], a ; $ff00+$d4 - ld hl, $c590 + hlcoord 0, 12 ld bc, $412 call Function40ad5 ld de, $4f32 - ld hl, $c5b9 + hlcoord 1, 14 call PlaceString ld a, $1 ld [hBGMapMode], a ; $ff00+$d4 @@ -46726,15 +46726,15 @@ Function40f84: ; 40f84 Function40fa8: ; 40fa8 (10:4fa8) xor a ld [hBGMapMode], a ; $ff00+$d4 - ld hl, $c4e5 + hlcoord 9, 3 ld bc, $408 ld a, $7f call Function413fe ld a, [$c7d5] - ld hl, $c4f9 + hlcoord 9, 4 call Function40fcd ld a, [$c7d6] - ld hl, $c521 + hlcoord 9, 6 call Function40fcd ld a, $1 ld [hBGMapMode], a ; $ff00+$d4 @@ -46881,11 +46881,11 @@ Unknown_410f6: ; 410f6 Function41107: ; 41107 xor a ld [hBGMapMode], a - ld hl, $c590 + hlcoord 0, 12 ld bc, $0412 call Function40ad5 ld de, String_41126 - ld hl, $c5b9 + hlcoord 1, 14 call PlaceString ld a, $1 ld [hBGMapMode], a @@ -47482,7 +47482,7 @@ Function41a7f: ; 41a7f ld [CurPartySpecies], a call Function407fd call Function40ba0 - ld hl, $c5f4 + hlcoord 0, 17 ld [hl], $3b inc hl ld bc, $0013 @@ -48515,19 +48515,19 @@ Unknown_44228: ; 44228 Function4424d: ; 4424d call GetPokemonName - ld hl, $c4e5 + hlcoord 9, 3 call PlaceString ld a, [$d265] ld b, a call Function44333 ld a, b push af - ld hl, $c50d + hlcoord 9, 5 call Function13d4 ld h, b ld l, c push de - ld hl, $c542 + hlcoord 2, 8 ld a, $5c ld [hli], a ld a, $5d @@ -48561,10 +48561,10 @@ Function4424d: ; 4424d ld hl, [sp+$0] ld d, h ld e, l - ld hl, $c538 + hlcoord 12, 7 ld bc, $0224 call PrintNum - ld hl, $c53a + hlcoord 14, 7 ld [hl], $5e pop af pop hl @@ -48585,31 +48585,31 @@ Function4424d: ; 4424d ld hl, [sp+$0] ld d, h ld e, l - ld hl, $c55f + hlcoord 11, 9 ld bc, ClearVRAM call PrintNum pop de .asm_442cd ld bc, $0512 - ld hl, $c57e + hlcoord 2, 11 call ClearBox - ld hl, $c569 + hlcoord 1, 10 ld bc, $0013 ld a, $61 call ByteFill - ld hl, $c555 + hlcoord 1, 9 ld [hl], $55 inc hl ld [hl], $55 - ld hl, $c569 + hlcoord 1, 10 ld [hl], $56 inc hl ld [hl], $57 pop de inc de pop af - ld hl, $c57e + hlcoord 2, 11 push af call Function13d4 pop bc @@ -48619,24 +48619,24 @@ Function4424d: ; 4424d push bc push de ld bc, $0512 - ld hl, $c57e + hlcoord 2, 11 call ClearBox - ld hl, $c569 + hlcoord 1, 10 ld bc, $0013 ld a, $61 call ByteFill - ld hl, $c555 + hlcoord 1, 9 ld [hl], $55 inc hl ld [hl], $55 - ld hl, $c569 + hlcoord 1, 10 ld [hl], $56 inc hl ld [hl], $58 pop de inc de pop af - ld hl, $c57e + hlcoord 2, 11 call Function13d4 ret ; 44331 @@ -48717,7 +48717,7 @@ Function44355: ; 44355 PokedexDataPointerTable: ; 0x44378 -INCLUDE "stats/pokedex/entry_pointers.asm" +INCLUDE "data/pokedex/entry_pointers.asm" Function4456e: ; 4456e @@ -49384,33 +49384,33 @@ Function4802f: ; 4802f (12:402f) ld b, $2 ld c, $14 call ClearBox - ld hl, $c4b4 + hlcoord 0, 1 ld a, $c ld [hl], a ld bc, $13 add hl, bc ld [hl], a ld de, MobileProfileString - ld hl, $c4b5 + hlcoord 1, 1 call PlaceString - ld hl, $c4c8 + hlcoord 0, 2 ld b, $a ld c, $12 call Function48cdc - ld hl, $c4f2 + hlcoord 2, 4 ld de, String_48482 call PlaceString .asm_480d7 - ld hl, $c51a + hlcoord 2, 6 ld de, String_48489 call PlaceString - ld hl, $c542 + hlcoord 2, 8 ld de, String_4848d call PlaceString - ld hl, $c56a + hlcoord 2, 10 ld de, String_48495 call PlaceString - ld hl, $c592 + hlcoord 2, 12 ld de, String_4849e call PlaceString ld a, [DefaultFlypoint] ; $d002 @@ -49421,10 +49421,10 @@ Function4802f: ; 4802f (12:402f) call GetNthString ld d, h ld e, l - ld hl, $c4fb + hlcoord 11, 4 call PlaceString .asm_48113 - ld hl, $c523 + hlcoord 11, 6 call Function487ec ld a, [$d474] dec a @@ -49432,15 +49432,15 @@ Function4802f: ; 4802f (12:402f) call GetNthString ld d, h ld e, l - ld hl, $c54b + hlcoord 11, 8 call PlaceString - ld hl, $c573 + hlcoord 11, 10 call Function489ea - ld hl, $c5b8 + hlcoord 0, 14 ld b, $2 ld c, $12 call TextBox - ld hl, $c5e1 + hlcoord 1, 16 ld de, String_48275 call PlaceString call Function48187 @@ -49492,12 +49492,12 @@ Function48187: ; 48187 (12:4187) call Function48725 jr c, .asm_481a2 ld bc, $104 - ld hl, $c592 + hlcoord 2, 12 call ClearBox jr .asm_481ad .asm_481a2 push de - ld hl, $c592 + hlcoord 2, 12 ld de, String_4849e call PlaceString pop de @@ -49508,19 +49508,19 @@ Function48187: ; 48187 (12:4187) bit 0, d jr nz, .asm_481c1 ld bc, $108 - ld hl, $c4fb + hlcoord 11, 4 call ClearBox .asm_481c1 bit 1, d jr nz, .asm_481ce ld bc, $108 - ld hl, $c523 + hlcoord 11, 6 call ClearBox .asm_481ce bit 2, d jr nz, .asm_481db ld bc, $208 - ld hl, $c537 + hlcoord 11, 7 call ClearBox .asm_481db bit 3, d @@ -49529,7 +49529,7 @@ Function48187: ; 48187 (12:4187) bit 0, a jr nz, .asm_481f8 ld bc, $108 - ld hl, $c573 + hlcoord 11, 10 call ClearBox jr .asm_48201 .asm_481f1 @@ -49537,7 +49537,7 @@ Function48187: ; 48187 (12:4187) bit 0, a jr nz, .asm_48201 .asm_481f8 - ld hl, $c573 + hlcoord 11, 10 ld de, String_48202 call PlaceString .asm_48201 @@ -49578,12 +49578,12 @@ Function4820d: ; 4820d (12:420d) jr .asm_4825c ; 48241 (12:4241) - ld hl, $c5cd + hlcoord 1, 15 ld b, $2 ld c, $12 call ClearBox ld de, String_484a1 - ld hl, $c5e1 + hlcoord 1, 16 call PlaceString call WaitBGMap ld c, $30 @@ -49613,27 +49613,27 @@ String_48275: ; 48275 ; known jump sources: 4828d (12:428d), 48304 (12:4304), 4840f (12:440f), 4876f (12:476f), 488d3 (12:48d3) Function48283: ; 48283 (12:4283) ld bc, $212 - ld hl, $c5cd + hlcoord 1, 15 call ClearBox ret ; known jump sources: 48222 (12:4222) asm_4828d: ; 4828d (12:428d) call Function48283 - ld hl, $c5e1 + hlcoord 1, 16 ld de, String_484b1 call PlaceString ld hl, MenuDataHeader_0x484f1 call LoadMenuDataHeader call Function4873c - ld hl, $c4d3 + hlcoord 11, 2 ld b, $4 ld c, $7 call Function48cdc - ld hl, $c4fd + hlcoord 13, 4 ld de, String_484fb call PlaceString - ld hl, $c525 + hlcoord 13, 6 ld de, String_484ff call PlaceString call WaitBGMap @@ -49663,7 +49663,7 @@ asm_4828d: ; 4828d (12:428d) .asm_482f1 ld d, h ld e, l - ld hl, $c4fb + hlcoord 11, 4 call PlaceString ld a, [$d003] set 0, a @@ -49673,14 +49673,14 @@ asm_4828d: ; 4828d (12:428d) ; known jump sources: 4822b (12:422b) Function48304: ; 48304 (12:4304) call Function48283 - ld hl, $c5e1 + hlcoord 1, 16 ld de, String_484cf call PlaceString ld hl, MenuDataHeader_0x48504 call LoadMenuDataHeader ld hl, MenuDataHeader_0x48513 call LoadMenuDataHeader - ld hl, $c4aa + hlcoord 10, 0 ld b, $c ld c, $8 call Function48cdc @@ -49791,9 +49791,9 @@ Function483bb: ; 483bb (12:43bb) ld e, l ld b, $2 ld c, $8 - ld hl, $c537 + hlcoord 11, 7 call ClearBox - ld hl, $c54b + hlcoord 11, 8 call PlaceString ret ; 483e8 (12:43e8) @@ -49831,7 +49831,7 @@ Function483e8: ; 483e8 Function4840c: ; 4840c (12:440c) call Function48187 call Function48283 - ld hl, $c5e1 + hlcoord 1, 16 ld de, String_48275 call PlaceString call Function486bf @@ -49843,13 +49843,13 @@ Function4840c: ; 4840c (12:440c) jr nz, .asm_48437 ld b, $9 ld c, $1 - ld hl, $c4f1 + hlcoord 1, 4 call ClearBox jp Function48157 .asm_48437 ld b, $7 ld c, $1 - ld hl, $c519 + hlcoord 1, 6 call ClearBox jp Function48157 @@ -50015,16 +50015,16 @@ Function48689: ; 48689 (12:4689) ld b, $4 ld c, $14 call ClearBox - ld hl, $c4c8 + hlcoord 0, 2 ld a, $c ld [hl], a ld bc, $13 add hl, bc ld [hl], a ld de, MobileProfileString - ld hl, $c4c9 + hlcoord 1, 2 call PlaceString - ld hl, $c4f0 + hlcoord 0, 4 ld b, $8 ld c, $12 call Function48cdc @@ -50157,7 +50157,7 @@ Function4873c: ; 4873c (12:473c) ; known jump sources: 48226 (12:4226) Function4876f: ; 4876f (12:476f) call Function48283 - ld hl, $c5e1 + hlcoord 1, 16 ld de, String_484be call PlaceString ld hl, MenuDataHeader_0x48509 @@ -50166,7 +50166,7 @@ Function4876f: ; 4876f (12:476f) push af ld a, $1 ld [$FF00+$aa], a - ld hl, $c50e + hlcoord 10, 5 ld b, $1 ld c, $8 call Function48cdc @@ -50176,20 +50176,20 @@ Function4876f: ; 4876f (12:476f) jr z, .asm_487ab cp $64 jr z, .asm_487b2 - ld hl, $c510 + hlcoord 12, 5 ld [hl], $10 - ld hl, $c538 + hlcoord 12, 7 ld [hl], $11 jr .asm_487b7 .asm_487ab - ld hl, $c510 + hlcoord 12, 5 ld [hl], $10 jr .asm_487b7 .asm_487b2 - ld hl, $c538 + hlcoord 12, 7 ld [hl], $11 .asm_487b7 - ld hl, $c523 + hlcoord 11, 6 call Function487ec ld c, $a call DelayFrames @@ -50208,7 +50208,7 @@ Function4876f: ; 4876f (12:476f) .asm_487da ld a, [$d473] call Function1c07 - ld hl, $c523 + hlcoord 11, 6 call Function487ec pop af ld [$FF00+$aa], a @@ -50312,28 +50312,28 @@ Function4880e: ; 4880e (12:480e) cp $64 jr z, .asm_48898 jr z, .asm_488a7 - ld hl, $c510 + hlcoord 12, 5 ld [hl], $10 - ld hl, $c538 + hlcoord 12, 7 ld [hl], $11 jr .asm_488a7 .asm_48887 - ld hl, $c50e + hlcoord 10, 5 ld b, $1 ld c, $8 call Function48cdc - ld hl, $c510 + hlcoord 12, 5 ld [hl], $10 jr .asm_488a7 .asm_48898 - ld hl, $c50e + hlcoord 10, 5 ld b, $1 ld c, $8 call Function48cdc - ld hl, $c538 + hlcoord 12, 7 ld [hl], $11 .asm_488a7 - ld hl, $c523 + hlcoord 11, 6 call Function487ec call WaitBGMap ld a, $1 @@ -50365,7 +50365,7 @@ INCBIN "baserom.gbc",$488cb,$488d3 - $488cb ; known jump sources: 48230 (12:4230) Function488d3: ; 488d3 (12:48d3) call Function48283 - ld hl, $c5e1 + hlcoord 1, 16 ld de, String_484e2 call PlaceString call Function48a3a @@ -50376,14 +50376,14 @@ Function488d3: ; 488d3 (12:48d3) push af ld a, $1 ld [$FF00+$aa], a - ld hl, $c55e + hlcoord 10, 9 ld b, $1 ld c, $8 call Function48cdc ld a, [$d475] and $f ld d, $0 - ld hl, $c573 + hlcoord 11, 10 call Function489ea call WaitBGMap ld a, [$d475] @@ -50471,7 +50471,7 @@ asm_48972: ; 48972 (12:4972) and $cf ld [DefaultFlypoint], a ; $d002 .asm_48988 - ld hl, $c573 + hlcoord 11, 10 ld b, $0 ld c, d add hl, bc @@ -50517,9 +50517,9 @@ asm_48972: ; 48972 (12:4972) pop bc pop af call Function1c07 - ld hl, $c573 + hlcoord 11, 10 call Function489ea - ld hl, $c55f + hlcoord 11, 9 ld bc, $108 call ClearBox pop af @@ -50581,11 +50581,11 @@ Function48a3a: ; 48a3a (12:4a3a) ld [$cfa2], a ld a, $1 ld [$cfa9], a - ld hl, $c54a + hlcoord 10, 8 ld b, $4 ld c, $8 call Function48cdc - ld hl, $c574 + hlcoord 12, 10 ld de, String_48aa1 call PlaceString call Function1bc9 @@ -50695,7 +50695,7 @@ Function48ab5: ; 48ab5 (12:4ab5) push hl push af ld e, $0 - ld hl, $c573 + hlcoord 11, 10 ld a, d .asm_48b25 and a @@ -50717,7 +50717,7 @@ Function48ab5: ; 48ab5 (12:4ab5) ld a, [hl] and $10 jr nz, .asm_48b9d - ld hl, $c573 + hlcoord 11, 10 call Function489ea ld a, [DefaultFlypoint] ; $d002 bit 7, a @@ -50741,13 +50741,13 @@ Function48ab5: ; 48ab5 (12:4ab5) .asm_48b62 push de push af - ld hl, $c55e + hlcoord 10, 9 ld b, $1 ld c, $8 call Function48cdc pop af pop de - ld hl, $c573 + hlcoord 11, 10 ld b, a ld a, d cp $3 @@ -50779,7 +50779,7 @@ Function48ab5: ; 48ab5 (12:4ab5) jr .asm_48b62 .asm_48b9d push de - ld hl, $c55e + hlcoord 10, 9 ld b, $1 ld c, $8 call Function48cdc @@ -50809,7 +50809,7 @@ Function48ab5: ; 48ab5 (12:4ab5) ; known jump sources: 48bc2 (12:4bc2), 48bf6 (12:4bf6), 48bfe (12:4bfe) asm_48bc7: ; 48bc7 (12:4bc7) - ld hl, $c573 + hlcoord 11, 10 push af ld a, d cp $3 @@ -50824,7 +50824,7 @@ asm_48bc7: ; 48bc7 (12:4bc7) ; known jump sources: 48b3c (12:4b3c) Function48bd7: ; 48bd7 (12:4bd7) push de - ld hl, $c55e + hlcoord 10, 9 ld b, $1 ld c, $8 call Function48cdc @@ -50856,7 +50856,7 @@ Function48bd7: ; 48bd7 (12:4bd7) ; known jump sources: 48b8a (12:4b8a), 48bd5 (12:4bd5) Function48c00: ; 48c00 (12:4c00) push af - ld hl, $c573 + hlcoord 11, 10 call Function489ea ld a, $1 and a @@ -50978,7 +50978,7 @@ Function48c8e: ; 48c8e ld d, h ld e, l callba Function48c63 - ld hl, $c536 + hlcoord 10, 7 call PlaceString call WaitBGMap ret @@ -52848,7 +52848,7 @@ Function49e27: ; 49e27 call Function6e3 and $80 jr nz, .asm_49e39 - ld hl, $c5b8 + hlcoord 0, 14 ld b, $2 ld c, $12 call TextBox @@ -52978,20 +52978,20 @@ Function49f16: ; 49f16 call Function4a071 ld c, $c call DelayFrames - ld hl, $c4a4 + hlcoord 4, 0 ld b, $a ld c, $a call Function48cdc - ld hl, $c4ce + hlcoord 6, 2 ld de, MobileString1 call PlaceString - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call TextBox xor a ld de, String_0x49fe9 - ld hl, $c5b9 + hlcoord 1, 14 call PlaceString call Function3200 call Function32f9 @@ -53046,11 +53046,11 @@ Function49f16: ; 49f16 call GetNthString ld d, h ld e, l - ld hl, $c5a5 + hlcoord 1, 13 ld b, $4 ld c, $12 call ClearBox - ld hl, $c5b9 + hlcoord 1, 14 call PlaceString jp .asm_49fb7 @@ -53061,7 +53061,7 @@ Function49f16: ; 49f16 ld [hl], b ld b, $a ld c, $1 - ld hl, $c4b9 + hlcoord 5, 1 call ClearBox jp .asm_49f55 ; 49fcc @@ -53232,14 +53232,14 @@ Function4a13b: ; 4a13b (12:613b) ; known jump sources: 4a236 (12:6236) Function4a149: ; 4a149 (12:6149) - ld hl, $c4c9 + hlcoord 1, 2 ld b, $6 ld c, $10 call Function48cdc - ld hl, $c4f3 + hlcoord 3, 4 ld de, String_4a1ef call PlaceString - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call TextBox @@ -53249,11 +53249,11 @@ Function4a149: ; 4a149 (12:6149) call GetNthString ld d, h ld e, l - ld hl, $c5a5 + hlcoord 1, 13 ld b, $4 ld c, $12 call ClearBox - ld hl, $c5b9 + hlcoord 1, 14 call PlaceString callba Function104148 call Function32f9 @@ -53297,11 +53297,11 @@ asm_4a19d: ; 4a19d (12:619d) call GetNthString ld d, h ld e, l - ld hl, $c5a5 + hlcoord 1, 13 ld b, $4 ld c, $12 call ClearBox - ld hl, $c5b9 + hlcoord 1, 14 call PlaceString jr .asm_4a1db .asm_4a1db @@ -53310,7 +53310,7 @@ asm_4a19d: ; 4a19d (12:619d) ld hl, $cfa9 ld [hl], b ld bc, $601 - ld hl, $c4de + hlcoord 2, 3 call ClearBox jp Function4a195 ; 4a1ef (12:61ef) @@ -53364,7 +53364,7 @@ Strings_4a23d: ; 4a23d ; known jump sources: 4a226 (12:6226) Function4a28a: ; 4a28a (12:628a) - ld hl, $c4de + hlcoord 2, 3 ld bc, $601 ld a, $7f call Function4a6d8 @@ -53377,11 +53377,11 @@ Function4a28a: ; 4a28a (12:628a) call CloseSRAM and a jr z, .asm_4a2df - ld hl, $c4ac + hlcoord 12, 0 ld b, $5 ld c, $6 call Function48cdc - ld hl, $c4c2 + hlcoord 14, 1 ld de, String_4a34b call PlaceString callba Function104148 @@ -53408,7 +53408,7 @@ Function4a28a: ; 4a28a (12:628a) call Function1bee ld hl, UnknownText_0x4a358 call PrintText - ld hl, $c53a + hlcoord 14, 7 ld b, $3 ld c, $4 call TextBox @@ -53541,7 +53541,7 @@ Function4a3aa: ; 4a3aa ld bc, $101 ld a, $7f call Function4a6d8 - ld hl, $c4a1 + hlcoord 1, 0 ld a, $1 ld bc, $312 call Function4a6d8 @@ -53557,7 +53557,7 @@ Function4a3aa: ; 4a3aa ld bc, $b12 ld a, $7f call Function4a6d8 - ld hl, $c4b3 + hlcoord 19, 0 ld bc, $301 ld a, $0 call Function4a6d8 @@ -53658,26 +53658,26 @@ Function4a4c4: ; 4a4c4 (12:64c4) call WhiteBGMap ld c, $14 call DelayFrames - ld hl, $c4a2 + hlcoord 2, 0 ld b, $a ld c, $e call Function48cdc - ld hl, $c4cc + hlcoord 4, 2 ld de, String_4a5c5 call PlaceString - ld hl, $c4f4 + hlcoord 4, 4 ld de, String_4a5cd call PlaceString - ld hl, $c51c + hlcoord 4, 6 ld de, String_4a5da call PlaceString - ld hl, $c544 + hlcoord 4, 8 ld de, String_4a5e6 call PlaceString - ld hl, $c56c + hlcoord 4, 10 ld de, String_4a5f2 call PlaceString - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call TextBox @@ -53685,14 +53685,14 @@ Function4a4c4: ; 4a4c4 (12:64c4) ld hl, Strings_4a5f6 ld d, h ld e, l - ld hl, $c5b9 + hlcoord 1, 14 call PlaceString ld a, $1 ld hl, Strings_4a5f6 call GetNthString ld d, h ld e, l - ld hl, $c5e1 + hlcoord 1, 16 call PlaceString call Function3200 call Function32f9 @@ -53744,11 +53744,11 @@ asm_4a54d: ; 4a54d (12:654d) call GetNthString ld d, h ld e, l - ld hl, $c5a5 + hlcoord 1, 13 ld b, $4 ld c, $12 call ClearBox - ld hl, $c5b9 + hlcoord 1, 14 call PlaceString pop af inc a @@ -53756,7 +53756,7 @@ asm_4a54d: ; 4a54d (12:654d) call GetNthString ld d, h ld e, l - ld hl, $c5e1 + hlcoord 1, 16 call PlaceString jp Function4a5b0 @@ -53768,7 +53768,7 @@ Function4a5b0: ; 4a5b0 (12:65b0) ld [hl], b ld b, $a ld c, $1 - ld hl, $c4b7 + hlcoord 3, 1 call ClearBox jp Function4a545 ; 4a5c5 (12:65c5) @@ -54571,7 +54571,7 @@ Function4aab6: ; 4aab6 jr z, .asm_4aad2 push de push hl - ld hl, $c4b4 + hlcoord 0, 1 ld bc, $0028 call AddNTimes ld [hl], $ec @@ -54803,12 +54803,12 @@ Function4abc3: ; 4abc3 ld [$cfaa], a .asm_4ac29 - ld hl, $c4b4 + hlcoord 0, 1 ld bc, $0d01 call ClearBox call Function4aab6 ld a, [PartyCount] - ld hl, $c4ba + hlcoord 6, 1 .asm_4ac3b ld bc, $0028 add hl, bc @@ -54835,7 +54835,7 @@ Function4abc3: ; 4abc3 Function4ac58: ; 4ac58 ld bc, $0212 - ld hl, $c5cd + hlcoord 1, 15 call ClearBox callba Function8ea4a ld hl, MenuDataHeader_0x4aca2 @@ -54843,17 +54843,17 @@ Function4ac58: ; 4ac58 ld hl, $d019 bit 1, [hl] jr z, .asm_4ac89 - ld hl, $c5af + hlcoord 11, 13 ld b, $3 ld c, $7 call TextBox - ld hl, $c5c5 + hlcoord 13, 14 ld de, String_4ada7 call PlaceString jr .asm_4ac96 .asm_4ac89 - ld hl, $c55f + hlcoord 11, 9 ld b, $7 ld c, $7 call TextBox @@ -54992,17 +54992,17 @@ Function4ad67: ; 4ad67 ; 4ad68 Function4ad68: ; 4ad68 - ld hl, $c59d + hlcoord 13, 12 ld de, String_4ad88 call PlaceString call Function4adb2 jr c, .asm_4ad7e - ld hl, $c575 + hlcoord 13, 10 ld de, String_4ada0 jr .asm_4ad84 .asm_4ad7e - ld hl, $c575 + hlcoord 13, 10 ld de, String_4ad9a .asm_4ad84 @@ -55997,7 +55997,7 @@ UnknownText_0x4d463: ; 0x4d463 ; 0x4d468 Function4d468: ; 4d468 - ld hl, $c5da + hlcoord 14, 15 ld de, StringBuffer2 ld c, $5 .asm_4d470 @@ -56007,11 +56007,11 @@ Function4d468: ; 4d468 inc de dec c jr nz, .asm_4d470 - ld hl, $c5ee + hlcoord 14, 16 ld bc, $0005 ld a, $7f call ByteFill - ld hl, $c5ee + hlcoord 14, 16 ld a, [$d08b] ld e, a ld d, $0 @@ -56311,7 +56311,7 @@ Function4d81e: ; 4d81e callba Function294c0 ld a, [PlayerLightScreenCount] ld [CurPartySpecies], a - ld hl, $c4cf + hlcoord 7, 2 ld d, $0 ld e, $3 ld a, $47 @@ -57358,25 +57358,25 @@ Function4deea: ; 4deea (13:5eea) ld a, [CurBaseData] ; $d236 (aliases: BaseDexNo) ld [$d265], a ld [CurSpecies], a ; $cf60 - ld hl, $c4a8 + hlcoord 8, 0 ld [hl], "№" inc hl ld [hl], "." inc hl - ld hl, $c4aa + hlcoord 10, 0 ld bc, $8103 ld de, $d265 call PrintNum - ld hl, $c4ae + hlcoord 14, 0 call PrintLevel ld hl, Unknown_4df77 call Function4e528 call Function4e505 - ld hl, $c4d0 + hlcoord 8, 2 call PlaceString - ld hl, $c4b2 + hlcoord 18, 0 call Function4df66 - ld hl, $c4f9 + hlcoord 9, 4 ld a, $f3 ld [hli], a ld a, [CurBaseData] ; $d236 (aliases: BaseDexNo) @@ -57412,7 +57412,7 @@ Function4df66: ; 4df66 (13:5f66) callba GetGender pop hl ret c - ld a, "♂"" + ld a, "♂" jr nz, .asm_4df75 ld a, "♀" .asm_4df75 @@ -57421,12 +57421,29 @@ Function4df66: ; 4df66 (13:5f66) ; 4df77 (13:5f77) Unknown_4df77: ; 4df77 -INCBIN "baserom.gbc",$4df77,$4df8f - $4df77 + dw $de41 + dw $d3ea + dw $b082 + dw $d002 +; 4df7f + +Function4df7f: ; 4df7f + hlcoord 7, 0 + ld bc, 20 + ld d, 18 +.asm_4df87 + ld a, $31 + ld [hl], a + add hl, bc + dec d + jr nz, .asm_4df87 + ret +; 4df8f ; known jump sources: 4df3b (13:5f3b), 4e348 (13:6348) Function4df8f: ; 4df8f (13:5f8f) - ld hl, $c52c - ld b, $14 + hlcoord 0, 7 + ld b, 20 ld a, $62 .asm_4df96 ld [hli], a @@ -57436,9 +57453,9 @@ Function4df8f: ; 4df8f (13:5f8f) ; known jump sources: 4df3e (13:5f3e) Function4df9b: ; 4df9b (13:5f9b) - ld hl, $c524 + hlcoord 12, 6 ld [hl], $71 - ld hl, $c52b + hlcoord 19, 6 ld [hl], $ed ret @@ -57447,7 +57464,7 @@ Function4dfa6: ; 4dfa6 (13:5fa6) ld bc, TempMonDVs ; $d123 callba CheckShininess ret nc - ld hl, $c4b3 + hlcoord 19, 0 ld [hl], $3f ret @@ -57476,7 +57493,7 @@ Function4dfda: ; 4dfda (13:5fda) and $3 ld c, a call Function4e4cd - ld hl, $c540 + hlcoord 0, 8 ld bc, $a14 call ClearBox ret @@ -57510,14 +57527,14 @@ Jumptable_4e00d: ; 4e00d (13:600d) ; no known jump sources Function4e013: ; 4e013 (13:6013) - ld hl, $c554 + hlcoord 0, 9 ld b, $0 ld a, $26 call Predef - ld hl, $c55c + hlcoord 8, 9 ld [hl], $41 ld de, String_4e119 - ld hl, $c590 + hlcoord 0, 12 call PlaceString ld a, [$d12a] ld b, a @@ -57526,13 +57543,13 @@ Function4e013: ; 4e013 (13:6013) ld a, b and $f0 jr z, .asm_4e03d - ld hl, $c548 + hlcoord 8, 8 ld [hl], $e8 .asm_4e03d ld a, [MonType] ; $cf5f cp $2 jr z, .asm_4e060 - ld hl, $c5aa + hlcoord 6, 13 push hl ld de, TempMonStatus ; $d12e ld a, $45 @@ -57542,17 +57559,17 @@ Function4e013: ; 4e013 (13:6013) jr .asm_4e060 .asm_4e055 ld de, String_4e142 - ld hl, $c5a5 + hlcoord 1, 13 call PlaceString jr .asm_4e066 .asm_4e060 ld de, String_4e127 call PlaceString .asm_4e066 - ld hl, $c5cd + hlcoord 1, 15 ld a, $2c call Predef - ld hl, $c549 + hlcoord 9, 8 ld de, $14 ld b, $a ld a, $31 @@ -57562,34 +57579,34 @@ Function4e013: ; 4e013 (13:6013) dec b jr nz, .asm_4e078 ld de, String_4e12b - ld hl, $c55e + hlcoord 10, 9 call PlaceString - ld hl, $c5c9 + hlcoord 17, 14 call Function4e0d3 - ld hl, $c575 + hlcoord 13, 10 ld bc, $307 ld de, TempMonExp ; $d116 call PrintNum call Function4e0e7 - ld hl, $c5b1 + hlcoord 13, 13 ld bc, $307 ld de, Buffer1 ; $d1ea (aliases: MagikarpLength) call PrintNum ld de, String_4e136 - ld hl, $c59a + hlcoord 10, 12 call PlaceString ld de, String_4e13f - ld hl, $c5c6 + hlcoord 14, 14 call PlaceString - ld hl, $c5eb + hlcoord 11, 16 ld a, [TempMonLevel] ; $d12d ld b, a ld de, $d118 ld a, $17 call Predef - ld hl, $c5ea + hlcoord 10, 16 ld [hl], $40 - ld hl, $c5f3 + hlcoord 19, 16 ld [hl], $41 ret @@ -57666,24 +57683,24 @@ String_4e142: ; 4e142 ; no known jump sources Function4e147: ; 4e147 (13:6147) ld de, String_4e1a0 - ld hl, $c540 + hlcoord 0, 8 call PlaceString call Function4e189 - ld hl, $c548 + hlcoord 8, 8 call PlaceString ld de, String_4e1a9 - ld hl, $c568 + hlcoord 0, 10 call PlaceString ld hl, TempMonMoves ; $d110 (aliases: TempMonMove1) ld de, $d25e ld bc, $4 call CopyBytes - ld hl, $c570 + hlcoord 8, 10 ld a, $28 ld [Buffer1], a ; $d1ea (aliases: MagikarpLength) ld a, $20 call Predef - ld hl, $c588 + hlcoord 12, 11 ld a, $28 ld [Buffer1], a ; $d1ea (aliases: MagikarpLength) ld a, $23 @@ -57719,7 +57736,7 @@ String_4e1a9: ; 4e1a9 ; no known jump sources Function4e1ae: ; 4e1ae (13:61ae) call Function4e1cc - ld hl, $c54a + hlcoord 10, 8 ld de, $14 ld b, $a ld a, $31 @@ -57728,7 +57745,7 @@ Function4e1ae: ; 4e1ae (13:61ae) add hl, de dec b jr nz, .asm_4e1bb - ld hl, $c54b + hlcoord 11, 8 ld bc, $6 ld a, $28 call Predef @@ -57737,12 +57754,12 @@ Function4e1ae: ; 4e1ae (13:61ae) ; known jump sources: 4e1ae (13:61ae) Function4e1cc: ; 4e1cc (13:61cc) ld de, IDNoString - ld hl, $c554 + hlcoord 0, 9 call PlaceString ld de, OTString - ld hl, $c590 + hlcoord 0, 12 call PlaceString - ld hl, $c56a + hlcoord 2, 10 ld bc, $8205 ld de, TempMonID ; $d114 call PrintNum @@ -57750,7 +57767,7 @@ Function4e1cc: ; 4e1cc (13:61cc) call Function4e528 call Function4e505 callba CheckNickErrors - ld hl, $c5a6 + hlcoord 2, 13 call PlaceString ld a, [$d12c] and a @@ -57762,7 +57779,7 @@ Function4e1cc: ; 4e1cc (13:61cc) jr z, .asm_4e211 ld a, "♀" .asm_4e211 - ld hl, $c5ad + hlcoord 9, 13 ld [hl], a .asm_4e215 ret @@ -58075,23 +58092,23 @@ Function4e497: ; 4e497 (13:6497) ; known jump sources: 4dfe0 (13:5fe0) Function4e4cd: ; 4e4cd (13:64cd) - ld hl, $c511 + hlcoord 13, 5 ld a, $36 call Function4e4f7 - ld hl, $c513 + hlcoord 15, 5 ld a, $36 call Function4e4f7 - ld hl, $c515 + hlcoord 17, 5 ld a, $36 call Function4e4f7 ld a, c cp $2 ld a, $3a - ld hl, $c511 + hlcoord 13, 5 jr c, Function4e4f7 - ld hl, $c513 + hlcoord 15, 5 jr z, Function4e4f7 - ld hl, $c515 + hlcoord 17, 5 ; known jump sources: 4e4d2 (13:64d2), 4e4da (13:64da), 4e4e2 (13:64e2), 4e4ed (13:64ed), 4e4f2 (13:64f2) Function4e4f7: ; 4e4f7 (13:64f7) @@ -58375,7 +58392,7 @@ _EvolutionAnimation: ; 4e607 ld a, [PlayerHPPal] ld [CurPartySpecies], a - ld hl, $c4cf + hlcoord 7, 2 ld d, $0 ld e, $4 ld a, $47 @@ -58416,7 +58433,7 @@ Function4e703: ; 4e703 Function4e708: ; 4e708 call GetBaseData - ld hl, $c4cf + hlcoord 7, 2 jp Function3786 ; 4e711 @@ -58472,7 +58489,7 @@ Function4e755: ; 4e755 push bc xor a ld [hBGMapMode], a - ld hl, $c4cf + hlcoord 7, 2 ld bc, $0707 ld de, $000d .asm_4e762 @@ -58928,7 +58945,7 @@ Function4ea0a: ; 4ea0a ld a, $1 ld [rSVBK], a ld bc, $cd53 - ld de, $c5b9 + decoord 1, 14 callba Function11c0c6 pop af ld [rSVBK], a @@ -59084,7 +59101,7 @@ Jumptable_50089: ; 50089 ; 5009b Function5009b: ; 5009b - ld hl, $c4b7 + hlcoord 3, 1 ld a, [PartyCount] and a jr z, .asm_500bf @@ -59128,7 +59145,7 @@ Function500cf: ; 500cf ret z ld c, a ld b, $0 - ld hl, $c4d3 + hlcoord 11, 2 .asm_500de push bc push hl @@ -59198,7 +59215,7 @@ Function50138: ; 50138 ret z ld c, a ld b, $0 - ld hl, $c4c1 + hlcoord 13, 1 .asm_50143 push bc push hl @@ -59239,8 +59256,8 @@ Function50176: ; 50176 and a ret z ld c, a - ld b, $0 - ld hl, $c4d0 + ld b, 0 + hlcoord 8, 2 .asm_50181 push bc push hl @@ -59248,26 +59265,25 @@ Function50176: ; 50176 jr z, .asm_501a7 push hl ld a, b - ld bc, $0030 + ld bc, PartyMon2 - PartyMon1 ld hl, PartyMon1Level call AddNTimes ld e, l ld d, h pop hl ld a, [de] - cp $64 + cp 100 ; This is distinct from MAX_LEVEL. jr nc, .asm_501a1 - ld a, $6e + ld a, LV_CHAR ld [hli], a ld bc, $4102 - .asm_501a1 ld bc, $4103 call PrintNum .asm_501a7 pop hl - ld de, $0028 + ld de, SCREEN_WIDTH * 2 add hl, de pop bc inc b @@ -59281,8 +59297,8 @@ Function501b2: ; 501b2 and a ret z ld c, a - ld b, $0 - ld hl, $c4cd + ld b, 0 + hlcoord 5, 2 .asm_501bd push bc push hl @@ -59290,7 +59306,7 @@ Function501b2: ; 501b2 jr z, .asm_501d5 push hl ld a, b - ld bc, $0030 + ld bc, PartyMon2 - PartyMon1 ld hl, PartyMon1Status call AddNTimes ld e, l @@ -59300,7 +59316,7 @@ Function501b2: ; 501b2 .asm_501d5 pop hl - ld de, $0028 + ld de, SCREEN_WIDTH * 2 add hl, de pop bc inc b @@ -59314,8 +59330,8 @@ Function501e0: ; 501e0 and a ret z ld c, a - ld b, $0 - ld hl, $c4d4 + ld b, 0 + hlcoord 12, 2 .asm_501eb push bc push hl @@ -59324,7 +59340,7 @@ Function501e0: ; 501e0 push hl ld hl, PartySpecies ld e, b - ld d, $0 + ld d, 0 add hl, de ld a, [hl] ld [CurPartySpecies], a @@ -59336,7 +59352,7 @@ Function501e0: ; 501e0 .asm_5020a pop hl - ld de, $0028 + ld de, SCREEN_WIDTH * 2 add hl, de pop bc inc b @@ -59372,7 +59388,7 @@ Function5022f: ; 5022f ret z ld c, a ld b, 0 - ld hl, $c4d4 + hlcoord 12, 2 .asm_5023a push bc push hl @@ -59456,7 +59472,7 @@ Function502b1: ; 502b1 ret z ld c, a ld b, 0 - ld hl, $c4d4 + hlcoord 12, 2 .asm_502bc push bc push hl @@ -59509,7 +59525,7 @@ Function50307: ; 50307 ret z ld c, a ld b, 0 - ld hl, $c4c0 + hlcoord 12, 1 .asm_50312 push bc push hl @@ -59538,7 +59554,7 @@ Function50307: ; 50307 .asm_5033b push hl push bc - ld hl, $c4c0 + hlcoord 12, 1 .asm_50340 and a jr z, .asm_5034a @@ -59767,7 +59783,7 @@ PartyMenuSelect: ; 0x50457 PrintPartyMenuText: ; 5049a - ld hl, $c5b8 + hlcoord 0, 14 ld bc, $0212 call TextBox ld a, [PartyCount] @@ -59791,7 +59807,7 @@ PrintPartyMenuText: ; 5049a push af set 4, a ; disable text delay ld [Options], a - ld hl, $c5e1 ; Coord + hlcoord 1, 16 ; Coord call PlaceString pop af ld [Options], a @@ -61187,7 +61203,7 @@ Function50e1b: ; 50e1b .asm_50e26 inc d ld a, d - cp MAX_LEVEL + 1 + cp (MAX_LEVEL + 1) % $100 jr z, .asm_50e45 call Function50e47 push hl @@ -61344,13 +61360,13 @@ Function50eed: ; 50eed GrowthRates: ; 50efa growth_rate: MACRO -; [1]/[2]*n^3 + [3]*n^2 + [4]*n - [5] +; [1]/[2]*n**3 + [3]*n**2 + [4]*n - [5] dn \1, \2 - IF \3 & $80 ; signed - db ((\3 ^ $ff) + 1) | $80 - ELSE + if \3 & $80 ; signed + db -\3 | $80 + else db \3 - ENDC + endc db \4, \5 ENDM @@ -61383,7 +61399,7 @@ Function50f12: ; known jump sources: 50f2a (14:4f2a), 50f30 (14:4f30) Function50f34: ; 50f34 (14:4f34) push af - ld hl, $c4b4 + hlcoord 0, 1 ld bc, $28 call AddNTimes ld bc, $28 @@ -62132,10 +62148,10 @@ Function513e0: ; 513e0 ; 51424 BaseData:: -INCLUDE "stats/base_stats.asm" +INCLUDE "data/base_stats.asm" PokemonNames:: -INCLUDE "stats/pokemon_names.asm" +INCLUDE "data/pokemon_names.asm" INCBIN "baserom.gbc",$53d84,$53d9c - $53d84 @@ -63611,15 +63627,15 @@ Function81adb: ; 81adb ld bc, $0168 ld a, $6f call ByteFill - ld hl, $c4dd + hlcoord 1, 3 ld bc, $0712 ld a, $6c call Function81efc - ld hl, $c4ab + hlcoord 11, 0 ld bc, $0203 ld a, $6d call Function81efc - ld hl, $c4b0 + hlcoord 16, 0 ld bc, $0203 ld a, $6e call Function81efc @@ -63629,7 +63645,7 @@ Function81adb: ; 81adb inc a ld [CurPartySpecies], a ld [$d265], a - ld hl, $c4b4 + hlcoord 0, 1 ld de, $d265 ld bc, $8103 call PrintNum @@ -63639,18 +63655,18 @@ Function81adb: ; 81adb ld a, $1 ld [UnownLetter], a call GetPokemonName - ld hl, $c4b8 + hlcoord 4, 1 call PlaceString xor a ld [$c2c6], a - ld hl, $c4e8 + hlcoord 12, 3 call Function378b ld de, $9310 ld a, $3d call Predef ld a, $31 ld [$ffad], a - ld hl, $c4f2 + hlcoord 2, 4 ld bc, $0606 ld a, $13 call Predef @@ -63664,9 +63680,9 @@ Function81adb: ; 81adb ld de, String_81bb4 .asm_81b69 - ld hl, $c5fb + hlcoord 7, 17 call PlaceString - ld hl, $c5f4 + hlcoord 0, 17 ld de, String_81bb9 call PlaceString jr .asm_81ba9 @@ -63676,14 +63692,14 @@ Function81adb: ; 81adb ld [TrainerClass], a callab Function3957b ld de, StringBuffer1 - ld hl, $c4b8 + hlcoord 4, 1 call PlaceString ld de, VTiles2 callab Function5120d xor a ld [TempEnemyMonSpecies], a ld [$ffad], a - ld hl, $c4de + hlcoord 2, 3 ld bc, $0707 ld a, $13 call Predef @@ -63701,15 +63717,15 @@ String_81bb9: db $7a, "きりかえ▶@" ; (A) switches Function81bc0: ; 81bc0 ld de, $ceb5 - ld hl, $c57e + hlcoord 2, 11 ld a, $1 call Function81bde ld de, $cedd - ld hl, $c5a6 + hlcoord 2, 13 ld a, $2 call Function81bde ld de, $cf05 - ld hl, $c5ce + hlcoord 2, 15 ld a, $3 Function81bde: ; 81bde @@ -63776,10 +63792,10 @@ Function81c33: ; 81c33 ld de, EnemyMoveAnimation ld c, $1 call Function81ee3 - ld hl, $c4d2 + hlcoord 10, 2 ld de, EnemyMoveAnimation call Function81ca7 - ld hl, $c4d7 + hlcoord 15, 2 ld de, EnemyMovePower call Function81ca7 ld a, $1 @@ -63812,10 +63828,10 @@ Function81c33: ; 81c33 ld [hl], a ld hl, $cda9 call Function81f0c - ld hl, $c4d2 + hlcoord 10, 2 ld de, EnemyMoveAnimation call Function81ca7 - ld hl, $c4d7 + hlcoord 15, 2 ld de, EnemyMovePower call Function81ca7 ld a, $3 @@ -63989,11 +64005,11 @@ Function81d89: ; 81d89 ; 81d8e Function81d8e: ; 81d8e - ld hl, $c568 + hlcoord 0, 10 ld bc, $00a0 ld a, $6f call ByteFill - ld hl, $c592 + hlcoord 2, 12 ld de, String_81fcd call PlaceString xor a @@ -64062,13 +64078,13 @@ Function81dc7: ; 81dc7 ; 81df4 Function81df4: ; 81df4 - ld hl, $c586 + hlcoord 10, 11 call Function81e5e - ld hl, $c59a + hlcoord 10, 12 call Function81e5e - ld hl, $c5ae + hlcoord 10, 13 call Function81e5e - ld hl, $c5c2 + hlcoord 10, 14 call Function81e5e ld a, [$d004] inc a @@ -64078,7 +64094,7 @@ Function81df4: ; 81df4 ld a, [$d265] ld [$d262], a call GetMoveName - ld hl, $c59a + hlcoord 10, 12 call PlaceString ld a, [$d004] call Function81e55 @@ -64092,7 +64108,7 @@ Function81df4: ; 81df4 ld de, String_81e4d .asm_81e3f - ld hl, $c5c2 + hlcoord 10, 14 call PlaceString ret ; 81e46 @@ -64304,15 +64320,15 @@ Function81f1d: ; 81f1d Function81f5e: ; 81f5e ld a, $6f - ld hl, $c4aa + hlcoord 10, 0 ld [hl], a - ld hl, $c4af + hlcoord 15, 0 ld [hl], a - ld hl, $c57d + hlcoord 1, 11 ld [hl], a - ld hl, $c5a5 + hlcoord 1, 13 ld [hl], a - ld hl, $c5cd + hlcoord 1, 15 ld [hl], a ld a, [$cf63] cp $3 @@ -64321,7 +64337,7 @@ Function81f5e: ; 81f5e and a jr z, .asm_81f8d dec a - ld hl, $c57d + hlcoord 1, 11 ld bc, $0028 call AddNTimes ld [hl], $ed @@ -64330,11 +64346,11 @@ Function81f5e: ; 81f5e ld a, [$cf65] and a jr z, .asm_81f98 - ld hl, $c4af + hlcoord 15, 0 jr .asm_81f9b .asm_81f98 - ld hl, $c4aa + hlcoord 10, 0 .asm_81f9b ld [hl], $ed @@ -64465,11 +64481,11 @@ Function821de: ; 821de ; 821f4 Function821f4: ; 821f4 - ld hl, $c4f2 + hlcoord 2, 4 call Function82203 - ld hl, $c51a + hlcoord 2, 6 call Function82203 - ld hl, $c542 + hlcoord 2, 8 Function82203: ; 82203 ld a, $6a @@ -64577,16 +64593,16 @@ Function822a3: ; 822a3 ld hl, EnemyMoveAnimation ld bc, $0008 call CopyBytes - ld hl, $c4a1 + hlcoord 1, 0 ld de, EnemyMoveAnimation call Function81ca7 - ld hl, $c4a6 + hlcoord 6, 0 ld de, EnemyMovePower call Function81ca7 - ld hl, $c4ab + hlcoord 11, 0 ld de, EnemyMoveAccuracy call Function81ca7 - ld hl, $c4b0 + hlcoord 16, 0 ld de, EnemyMoveEffectChance call Function81ca7 pop af @@ -65931,7 +65947,7 @@ Function84785: ; 84785 push af xor a ld [hBGMapMode], a - ld hl, $c504 + hlcoord 0, 5 ld bc, $0a12 call TextBox pop af @@ -65943,10 +65959,10 @@ Function84785: ; 84785 ld e, [hl] inc hl ld d, [hl] - ld hl, $c52d + hlcoord 1, 7 ld a, $77 call Function13d4 - ld hl, $c5ce + hlcoord 2, 15 ld de, String_847f5 call PlaceString ld a, $1 @@ -65963,7 +65979,7 @@ Function847bd: ; 847bd push af xor a ld [hBGMapMode], a - ld hl, $c4f2 + hlcoord 2, 4 ld bc, $0d10 call ClearBox pop af @@ -65975,10 +65991,10 @@ Function847bd: ; 847bd ld e, [hl] inc hl ld d, [hl] - ld hl, $c530 + hlcoord 4, 7 ld a, BANK(GBPrinterStrings) call Function13d4 - ld hl, $c5d0 + hlcoord 4, 15 ld de, String_847f5 call PlaceString ld a, $1 @@ -66018,7 +66034,7 @@ Function84817: ; 84817 (21:4817) call ByteFill call Function849e9 call Function849d7 - ld hl, $c4e0 + hlcoord 4, 3 ld de, String_84865 call PlaceString ld a, [MovementBuffer] ; $d007 @@ -66027,11 +66043,11 @@ Function84817: ; 84817 (21:4817) call AddNTimes ld d, h ld e, l - ld hl, $c50a + hlcoord 6, 5 call PlaceString ld a, $1 call Function849c6 - ld hl, $c556 + hlcoord 2, 9 ld c, $3 call Function848e7 ret @@ -66054,7 +66070,7 @@ Function8486f: ; 8486f (21:486f) ret nz ld a, $4 call Function849c6 - ld hl, $c4a2 + hlcoord 2, 0 ld c, $6 call Function848e7 ret @@ -66072,7 +66088,7 @@ Function84893: ; 84893 (21:4893) ret nz ld a, $a call Function849c6 - ld hl, $c4a2 + hlcoord 2, 0 ld c, $6 call Function848e7 ret @@ -66084,7 +66100,7 @@ Function848b7: ; 848b7 (21:48b7) ld a, $7f call ByteFill call Function84a0e - ld hl, $c5cd + hlcoord 1, 15 ld bc, $212 call ClearBox call Function849e9 @@ -66094,7 +66110,7 @@ Function848b7: ; 848b7 (21:48b7) ret nz ld a, $10 call Function849c6 - ld hl, $c4a2 + hlcoord 2, 0 ld c, $5 call Function848e7 ret @@ -66276,7 +66292,7 @@ Function849e9: ; 849e9 (21:49e9) ; known jump sources: 848d1 (21:48d1) Function849fc: ; 849fc (21:49fc) - ld hl, $c5f4 + hlcoord 0, 17 ld a, $7d ld [hli], a ld a, $7a @@ -66291,7 +66307,7 @@ Function849fc: ; 849fc (21:49fc) ; known jump sources: 84826 (21:4826), 8487a (21:487a), 8489e (21:489e), 848c2 (21:48c2) Function84a0e: ; 84a0e (21:4a0e) - ld hl, $c4a2 + hlcoord 2, 0 ld c, $6 .asm_84a13 push bc @@ -66438,10 +66454,10 @@ Function864c3: ; 864c3 Function8650c: ; 8650c call Function86748 ld de, String_8652c - ld hl, $c4c9 + hlcoord 1, 2 call PlaceString call WaitBGMap - ld de, $c50a + decoord 6, 5 ld c, $6 ld a, $49 call Predef @@ -66562,7 +66578,7 @@ Function865b5: ; 865b5 call Predef ld a, $31 ld [$ffad], a - ld hl, $c51e + hlcoord 6, 6 ld bc, $0606 ld a, $13 call Predef @@ -66583,7 +66599,7 @@ Function865b5: ; 865b5 ld bc, $0168 ld a, $7f call ByteFill - ld hl, $c50a + hlcoord 6, 5 call Function378b call WaitBGMap xor a @@ -66691,20 +66707,20 @@ Function86692: ; 86692 cp 200 + 1 jr c, .asm_866c6 ld de, String_866fc - ld hl, $c4c9 + hlcoord 1, 2 call PlaceString - ld hl, $c4d5 + hlcoord 13, 2 jr .asm_866de .asm_866c6 ld de, String_8670c - ld hl, $c4c9 + hlcoord 1, 2 call PlaceString - ld hl, $c4ca + hlcoord 2, 2 ld de, EnemyMoveAnimation ld bc, $0103 call PrintNum - ld hl, $c4d3 + hlcoord 11, 2 .asm_866de ld de, String_866fb @@ -66713,7 +66729,7 @@ Function86692: ; 86692 ld b, $1a call GetSGBLayout call Function32f9 - ld de, $c50a + decoord 6, 5 ld c, $6 ld a, $49 call Predef @@ -66788,7 +66804,7 @@ Function86748: ; 86748 ld hl, TileMap ld bc, $0312 call TextBox - ld hl, $c590 + hlcoord 0, 12 ld bc, $0412 call TextBox ld a, [TempMonSpecies] @@ -66799,21 +66815,21 @@ Function86748: ; 86748 call Predef xor a ld [$c2c6], a - ld hl, $c50a + hlcoord 6, 5 call Function378b ld a, [CurPartySpecies] cp EGG jr z, .asm_867f8 - ld hl, $c5a5 + hlcoord 1, 13 ld a, $74 ld [hli], a ld [hl], $f2 - ld hl, $c5a7 + hlcoord 3, 13 ld de, $d265 ld bc, $8103 call PrintNum call GetBasePokemonName - ld hl, $c5ab + hlcoord 7, 13 call PlaceString ld a, $3 ld [MonType], a @@ -66825,24 +66841,24 @@ Function86748: ; 86748 ld a, $f5 .asm_867e2 - ld hl, $c5b6 + hlcoord 18, 13 ld [hli], a - ld hl, $c5c0 + hlcoord 8, 14 ld a, $f3 ld [hli], a ld de, StringBuffer2 call PlaceString - ld hl, $c5e1 + hlcoord 1, 16 call PrintLevel .asm_867f8 - ld hl, $c5e7 + hlcoord 7, 16 ld a, $73 ld [hli], a ld a, $74 ld [hli], a ld [hl], $f3 - ld hl, $c5ea + hlcoord 10, 16 ld de, TempMonID ld bc, $8205 call PrintNum @@ -68590,7 +68606,7 @@ Function89655: ; 89655 Function8966c: ; 8966c push bc call Function89688 - ld hl, $c4a4 + hlcoord 4, 0 ld c, $8 call Function896f5 pop bc @@ -68602,7 +68618,7 @@ Function8966c: ; 8966c Function8967a: ; 8967a (22:567a) push bc call Function89688 - ld hl, $c4a2 + hlcoord 2, 0 ld c, $c call Function896f5 pop bc @@ -68906,7 +68922,7 @@ Function897d5: ; 897d5 .asm_897f3 ld a, $37 ld [$ffad], a - ld hl, $c4e8 + hlcoord 12, 3 ld bc, $0707 ld a, $13 call Predef @@ -68980,7 +68996,7 @@ Function89856: ; 89856 call Function898f3 push bc ld bc, $d008 - ld hl, $c56a + hlcoord 2, 10 call Function89975 pop bc call Function897d5 @@ -68994,15 +69010,15 @@ Function8987f: ; 8987f (22:587f) call Function895f2 call Function8967a call Function899d3 - ld hl, $c4b9 + hlcoord 5, 1 call Function8999c - ld hl, $c4e9 + hlcoord 13, 3 call Function89829 call Function899b2 - ld hl, $c509 + hlcoord 5, 5 call Function899c9 ld bc, $d008 - ld hl, $c56a + hlcoord 2, 10 call Function89975 ret @@ -69011,7 +69027,7 @@ Function898aa: ; 898aa and a ret z push bc - ld hl, $c4ba + hlcoord 6, 1 ld de, MenuSelection ld bc, $8102 call PrintNum @@ -69028,7 +69044,7 @@ Function898be: ; 898be ld de, String_89116 .asm_898cd - ld hl, $c4bd + hlcoord 9, 1 ld a, [MenuSelection] and a jr nz, .asm_898d7 @@ -69051,7 +69067,7 @@ Function898dc: ; 898dc ld de, String_89116 .asm_898eb - ld hl, $c4f6 + hlcoord 6, 4 call PlaceString pop bc ret @@ -69065,13 +69081,13 @@ Function898f3: ; 898f3 ld e, l call Function8934a jr c, .asm_8990a - ld hl, $c509 + hlcoord 5, 5 ld bc, $8205 call PrintNum jr .asm_89913 .asm_8990a - ld hl, $c509 + hlcoord 5, 5 ld de, String_89116 call PlaceString @@ -69222,7 +69238,7 @@ Function899b2: ; 899b2 (22:59b2) .asm_899bf ld de, String_89116 .asm_899c2 - ld hl, $c4f6 + hlcoord 6, 4 call PlaceString ret @@ -69234,19 +69250,19 @@ Function899c9: ; 899c9 (22:59c9) ret Function899d3: ; 899d3 - ld hl, $c4f1 + hlcoord 1, 4 call Function89753 - ld hl, $c506 + hlcoord 2, 5 call Function8975b - ld hl, $c555 + hlcoord 1, 9 call Function89771 - ld hl, $c57d + hlcoord 1, 11 call Function8977a - ld hl, $c505 + hlcoord 1, 5 call Function89797 - ld hl, $c4f2 + hlcoord 2, 4 call Function89962 - ld hl, $c556 + hlcoord 2, 9 call Function89915 ret ; 899fe @@ -69283,7 +69299,7 @@ Function89a0c: ; 89a0c ; known jump sources: 8a729 (22:6729), 8a818 (22:6818), 8a8ac (22:68ac), 8a8fa (22:68fa), 8aab6 (22:6ab6), 8ab24 (22:6b24) Function89a23: ; 89a23 (22:5a23) - ld hl, $c57c + hlcoord 0, 11 ld b, $4 ld c, $12 call Function8921f @@ -69291,14 +69307,14 @@ Function89a23: ; 89a23 (22:5a23) ; known jump sources: 8a6ee (22:66ee), 8a80d (22:680d), 8aa3d (22:6a3d) Function89a2e: ; 89a2e (22:5a2e) - ld hl, $c59b + hlcoord 11, 12 ld b, $2 ld c, $6 call TextBox - ld hl, $c5b1 + hlcoord 13, 13 ld de, String_89a4e call PlaceString - ld hl, $c5c5 + hlcoord 13, 14 ld de, String_89a53 call PlaceString call Function89655 @@ -70051,7 +70067,7 @@ Function89e6f: ; 89e6f (22:5e6f) call Function89245 call Function89ee1 call Function89e9a - ld hl, $c4f7 + hlcoord 7, 4 call Function8a58d ld a, $5 ld hl, $ce30 @@ -70090,7 +70106,7 @@ Function89eb9: ; 89eb9 (22:5eb9) call Function891fe call Function89ee1 call Function89e9a - ld hl, $c4f7 + hlcoord 7, 4 call Function8a58d ld a, $5 ld hl, $ce30 @@ -70109,7 +70125,7 @@ Function89ee1: ; 89ee1 (22:5ee1) call Function8923c callba Function4a3a7 callba Function49384 - ld hl, $c4a1 + hlcoord 1, 0 call Function8a53d ret @@ -70316,7 +70332,7 @@ Function89ff6: ; 89ff6 (22:5ff6) call CloseSRAM call Function8987f call Function89160 - ld hl, $c5a5 + hlcoord 1, 13 ld bc, $a007 call Function89a0c call CloseSRAM @@ -70366,7 +70382,7 @@ Function8a055: ; 8a055 (22:6055) cp $b jr nz, .asm_8a059 call Function8a0a1 - ld hl, $c4fc + hlcoord 12, 4 call Function8a58d ld a, $5 ld hl, $ce35 @@ -70538,7 +70554,7 @@ MenuDataHeader_0x8a176: ; 0x8a176 ; known jump sources: 8a124 (22:6124) Function8a17b: ; 8a17b (22:617b) - ld de, $c4ae + decoord 14, 0 ld b, $5 ld c, $4 call Function89b3b @@ -70571,11 +70587,11 @@ MenuData2_0x8a1a2: ; 0x8a1a2 ; 0x8a1b0 Function8a1b0: ; 8a1b0 - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call TextBox - ld hl, $c5b9 + hlcoord 1, 14 ld a, [$cfa9] ld de, Strings_8a1cc dec a @@ -70660,9 +70676,9 @@ Function8a262: ; 8a262 (22:6262) call Function8923c callba Function4a3a7 callba Function49384 - ld hl, $c4a1 + hlcoord 1, 0 call Function8a53d - ld hl, $c4fc + hlcoord 12, 4 call Function8a58d ld a, $5 ld hl, $ce35 @@ -70758,9 +70774,9 @@ Function8a31c: ; 8a31c (22:631c) call Function8923c callba Function4a3a7 callba Function49384 - ld hl, $c4a1 + hlcoord 1, 0 call Function8a53d - ld hl, $c4fc + hlcoord 12, 4 call Function8a58d call Function8a3b2 pop bc @@ -70838,14 +70854,14 @@ Function8a3b2: ; 8a3b2 (22:63b2) call Function8a4fc call Function8a3df jr nc, .asm_8a3ce - ld de, $c4c8 + decoord 0, 2 ld b, $6 ld c, $9 call Function89b3b ld hl, MenuDataHeader_0x8a435 jr .asm_8a3db .asm_8a3ce - ld de, $c4c8 + decoord 0, 2 ld b, $8 ld c, $9 call Function89b3b @@ -70920,11 +70936,11 @@ MenuData2_0x8a43d: ; 0x8a43d ; known jump sources: 8a354 (22:6354) Function8a453: ; 8a453 (22:6453) - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call TextBox - ld hl, $c5b9 + hlcoord 1, 14 ld de, String_8a476 ld a, [MenuSelection] ; $cf74 cp $ff @@ -71245,7 +71261,7 @@ Function8a679: ; 8a679 (22:6679) call Function89160 call Function8939a call Function89856 - ld hl, $c5a5 + hlcoord 1, 13 call Function899fe call Function891ab call CloseSRAM @@ -71323,7 +71339,7 @@ Function8a6cd: ; 8a6cd (22:66cd) call Function8923c call Function89448 call Function89a23 - ld hl, $c5a5 + hlcoord 1, 13 ld de, String_89135 call PlaceString call WaitBGMap @@ -71472,7 +71488,7 @@ Function8a818: ; 8a818 (22:6818) ld hl, $d008 ld c, $8 call Function89193 - ld hl, $c5a5 + hlcoord 1, 13 ld de, .string_8a868 call PlaceString call WaitBGMap @@ -71492,7 +71508,7 @@ Function8a818: ; 8a818 (22:6818) .asm_8a87a ld de, String_8911c .asm_8a87d - ld hl, $c5a5 + hlcoord 1, 13 call PlaceString call WaitBGMap call Functiona36 @@ -71512,7 +71528,7 @@ Function8a8a1: ; 8a8a1 (22:68a1) call CloseSRAM jr nc, .asm_8a8bf call Function89a23 - ld hl, $c5a5 + hlcoord 1, 13 ld de, String_89135 call PlaceString ld a, $2 @@ -71537,7 +71553,7 @@ Function8a8c3: ; 8a8c3 (22:68c3) call Function89856 call CloseSRAM call Function891ab - ld hl, $c5a5 + hlcoord 1, 13 ld de, String_8a919 call PlaceString ld a, $2 @@ -71548,7 +71564,7 @@ Function8a8c3: ; 8a8c3 (22:68c3) call CloseSRAM call Function89a23 call Function8923c - ld hl, $c5a5 + hlcoord 1, 13 ld de, String_8a926 call PlaceString call WaitBGMap @@ -71665,7 +71681,7 @@ MenuDataHeader_0x8a9c9: ; 0x8a9c9 ; known jump sources: 8a9a1 (22:69a1) Function8a9ce: ; 8a9ce (22:69ce) push bc - ld de, $c4fb + decoord 11, 4 ld b, $6 ld c, $6 call Function89b3b @@ -71808,7 +71824,7 @@ Function8aab6: ; 8aab6 (22:6ab6) ld de, $a603 ld c, $8 call Function89193 - ld hl, $c5a5 + hlcoord 1, 13 ld de, String_8aaf0 call PlaceString call WaitBGMap @@ -71825,7 +71841,7 @@ String_8aaf0: ; 8aaf0 Function8ab00: ; 8ab00 ld de, String_8911c - ld hl, $c5a5 + hlcoord 1, 13 call PlaceString call WaitBGMap call Function89235 @@ -71842,7 +71858,7 @@ Function8ab11: ; 8ab11 (22:6b11) call CloseSRAM jr z, .asm_8ab37 call Function89a23 - ld hl, $c5a5 + hlcoord 1, 13 ld de, String_89135 call PlaceString ld a, $2 @@ -71870,7 +71886,7 @@ Function8ab3b: ; 8ab3b (22:6b3b) call CloseSRAM call Function8987f call Function89160 - ld hl, $c5a5 + hlcoord 1, 13 ld bc, $a007 call Function89a0c call CloseSRAM @@ -71951,7 +71967,7 @@ Function8aba9: ; 8aba9 call Function89160 call Function8939a call Function89856 - ld hl, $c5a5 + hlcoord 1, 13 call Function899fe call CloseSRAM call Function891ab @@ -71962,11 +71978,11 @@ Function8aba9: ; 8aba9 jr z, .asm_8abe5 cp $2 jr z, .asm_8ac0f - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call TextBox - ld hl, $c5b9 + hlcoord 1, 14 ld de, String_8ac3b call PlaceString ld a, $1 @@ -71993,7 +72009,7 @@ Function8ac4e: ; 8ac4e call Function89844 call Function8939a call Function89856 - ld hl, $c5a5 + hlcoord 1, 13 call Function899fe call Function891ab ret @@ -72104,7 +72120,7 @@ Function8ad0b: ; 8ad0b call Function89844 call Function8939a call Function89856 - ld hl, $c5a5 + hlcoord 1, 13 call Function899fe call CloseSRAM call Function891ab @@ -72120,23 +72136,23 @@ Function8ad0b: ; 8ad0b jr z, .asm_8ad37 call Function8923c push bc - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call TextBox ld de, String_8ad89 - ld hl, $c5b9 + hlcoord 1, 14 call PlaceString ld a, $2 call Function8925e jr c, .asm_8ad87 call Function8923c - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call TextBox ld de, String_8ad9c - ld hl, $c5b9 + hlcoord 1, 14 call PlaceString ld a, $1 call Function8925e @@ -73923,13 +73939,13 @@ Function8b75d: ; 8b75d ld a, $1 ld bc, $0014 call ByteFill - ld hl, $c4b4 + hlcoord 0, 1 ld a, $2 ld [hl], a - ld hl, $c4bd + hlcoord 9, 1 ld c, $b call Function8b788 - ld hl, $c4b5 + hlcoord 1, 1 ld a, $4 ld e, $8 .asm_8b780 @@ -74014,7 +74030,7 @@ Function8b7bd: ; 8b7bd ld [$cf77], a .asm_8b7ea - ld hl, $c4c8 + hlcoord 0, 2 ld b, $b ld c, $12 call Function8b703 @@ -74163,7 +74179,7 @@ Function8b88c: ; 8b88c ; 8b8c8 Function8b8c8: ; 8b8c8 - ld hl, $c5b8 + hlcoord 0, 14 ld b, $2 ld c, $12 call TextBox @@ -74178,18 +74194,18 @@ Function8b8c8: ; 8b8c8 ld l, a ld d, h ld e, l - ld hl, $c5e1 + hlcoord 1, 16 call PlaceString - ld hl, $c5a4 + hlcoord 0, 13 ld a, $f ld [hl], a - ld hl, $c5b7 + hlcoord 19, 13 ld a, $11 ld [hl], a ld a, [$d0e4] cp $24 ret c - ld hl, $c5a4 + hlcoord 0, 13 ld c, $12 call Function8b732 ret @@ -74226,14 +74242,14 @@ Function8b960: ; 8b960 (22:7960) call LoadMenuDataHeader call Function8b9e9 jr c, .asm_8b97a - ld hl, $c4ab + hlcoord 11, 0 ld b, $6 ld c, $7 call Function8b703 ld hl, MenuDataHeader_0x8b9b1 jr .asm_8b987 .asm_8b97a - ld hl, $c4ab + hlcoord 11, 0 ld b, $a ld c, $7 call Function8b703 @@ -75165,8 +75181,7 @@ Unknown_8c490: ; 8c490 macro_8c490: MACRO db \1 dw \2 - FuncCoord \3, \4 - dw Coord + dw TileMap + SCREEN_WIDTH * \4 + \3 ENDM macro_8c490 0, Unknown_8c538, 1, 6 @@ -75340,7 +75355,7 @@ Function8c5dc: ; 8c5dc (23:45dc) dec b jr nz, .asm_8c5f0 call Function8c6b1 - ld hl, $c4b6 + hlcoord 2, 1 ld b, $10 .asm_8c602 push hl @@ -80415,7 +80430,7 @@ Function902b3: ; 902b3 Function902c9: ; 902c9 call Function90375 - ld hl, $c4c9 + hlcoord 1, 2 ld [hl], $62 inc hl inc hl @@ -80517,7 +80532,7 @@ Function90357 Function90363: ; 90363 (24:4363) push bc call Function90375 - ld hl, $c4b5 + hlcoord 1, 1 ld [hl], $62 inc hl inc hl @@ -80831,15 +80846,15 @@ Function90672: ; 90672 (24:4672) .asm_906e8 ld hl, UnknownText_0x90879 call PrintText - ld hl, $c52f + hlcoord 3, 7 ld b, $2 ld c, $f call TextBox - ld hl, $c537 + hlcoord 11, 7 ld [hl], $1 - ld hl, $c573 + hlcoord 11, 10 ld [hl], $2 - ld hl, $c558 + hlcoord 4, 9 call Function907de ld c, $a call DelayFrames @@ -80859,14 +80874,14 @@ Function90672: ; 90672 (24:4672) .asm_9072e ld hl, UnknownText_0x9089a call PrintText - ld hl, $c537 + hlcoord 11, 7 ld bc, $207 call TextBox - ld hl, $c53b + hlcoord 15, 7 ld [hl], $1 - ld hl, $c577 + hlcoord 15, 10 ld [hl], $2 - ld hl, $c560 + hlcoord 12, 9 call Function90859 ld c, 10 call DelayFrames @@ -80943,11 +80958,11 @@ Function90795: ; 90795 (24:4795) ld [hl], a .asm_907c6 - ld hl, $c558 + hlcoord 4, 9 ld a, " " ld bc, 15 call ByteFill - ld hl, $c558 + hlcoord 4, 9 call Function907de call WaitBGMap and a @@ -81034,11 +81049,11 @@ Function90810: ; 90810 (24:4810) inc a ld [hl], a .asm_90841 - ld hl, $c560 + hlcoord 12, 9 ld a, " " ld bc, 7 call ByteFill - ld hl, $c560 + hlcoord 12, 9 call Function90859 call WaitBGMap and a @@ -81088,7 +81103,7 @@ UnknownText_0x90886: ; 0x90886 ; What?@ @ text_jump UnknownText_0x1bc2fd start_asm - ld hl, $c5e1 + hlcoord 1, 16 call Function907de ld hl, UnknownText_0x90895 ret @@ -81115,7 +81130,7 @@ UnknownText_0x908a4: ; 0x908a4 text_jump UnknownText_0x1bc31b start_asm ; 0x908a9 - ld hl, $c5bf + hlcoord 7, 14 call Function90859 ld hl, UnknownText_0x908b3 ret @@ -81129,7 +81144,7 @@ UnknownText_0x908b3: ; 0x908b3 UnknownText_0x908b8: ; 0x908b8 start_asm - ld de, $c5b9 + decoord 1, 14 ld a, [$c61c] ld c, a call Function90b3e @@ -81200,21 +81215,21 @@ Function90913: ; 90913 xor a ld [DefaultFlypoint], a .asm_90936 - ld hl, $c590 + hlcoord 0, 12 ld bc, $0412 call TextBox call Function1d6e ld hl, UnknownText_0x90a3f call PrintText - ld hl, $c4e5 + hlcoord 9, 3 ld b, $2 ld c, $9 call TextBox - ld hl, $c4ea + hlcoord 14, 3 ld [hl], $ef - ld hl, $c526 + hlcoord 14, 6 ld [hl], $f5 - ld hl, $c50e + hlcoord 10, 5 call Function909de call Function321c ld c, $a @@ -81283,11 +81298,11 @@ Function90993: ; 90993 .asm_909c6 xor a ld [hBGMapMode], a - ld hl, $c4fa + hlcoord 10, 4 ld b, $2 ld c, $9 call ClearBox - ld hl, $c50e + hlcoord 10, 5 call Function909de call WaitBGMap and a @@ -81337,7 +81352,7 @@ UnknownText_0x90a3f: ; 0x90a3f UnknownText_0x90a44: ; 0x90a44 start_asm - ld hl, $c5b9 + hlcoord 1, 14 call Function909de ld hl, UnknownText_0x90a4f ret @@ -81353,7 +81368,7 @@ Function90a54: ; 90a54 ld a, [$d4c2] set 7, a ld [$d4c2], a - ld hl, $c5b9 + hlcoord 1, 14 ld bc, $0312 call ClearBox ld hl, UnknownText_0x90a6c @@ -81368,7 +81383,7 @@ UnknownText_0x90a6c: ; 90a6c ld b, a ld a, [hMinutes] ; $ff00+$96 ld c, a - ld de, $c5b9 + decoord 1, 14 callba Function1dd6bb ld hl, UnknownText_0x90a83 ret @@ -81384,7 +81399,7 @@ Function90a88: ; 90a88 ld a, [$d4c2] res 7, a ld [$d4c2], a - ld hl, $c5b9 + hlcoord 1, 14 ld bc, $0312 call ClearBox ld hl, UnknownText_0x90aa0 @@ -81399,7 +81414,7 @@ UnknownText_0x90aa0: ; 90aa0 ld b, a ld a, [hMinutes] ld c, a - ld de, $c5b9 + decoord 1, 14 callba Function1dd6bb ld hl, UnknownText_0x90ab7 ret @@ -81412,7 +81427,7 @@ UnknownText_0x90ab7: ; 0x90ab7 ; 0x90abc Function90abc: ; 90abc - ld hl, $c5b9 + hlcoord 1, 14 ld bc, $0312 call ClearBox ld hl, UnknownText_0x90acc @@ -81860,10 +81875,10 @@ Jumptable_90e12: ; 90e12 Function90e1a: ; 90e1a ld de, ClockTilemapRLE call Function914bb - ld hl, $c4c0 + hlcoord 12, 1 ld de, .switch call PlaceString - ld hl, $c590 + hlcoord 0, 12 lb bc, 4, 18 call TextBox call Function90f86 @@ -81890,11 +81905,11 @@ Function90e3f: ; 90e3f callba Function91ae1 ld a, $7 ld bc, $12 - ld hl, $c4c9 + hlcoord 1, 2 call ByteFill - ld hl, $c4c8 + hlcoord 0, 2 ld [hl], $6 - ld hl, $c4db + hlcoord 19, 2 ld [hl], $17 ld a, [$c6d7] call Function910b4 @@ -81904,7 +81919,7 @@ Function90e3f: ; 90e3f Function90e72: ; 90e72 ld de, RadioTilemapRLE call Function914bb - ld hl, $c590 + hlcoord 0, 12 ld bc, $412 call TextBox ret @@ -81913,7 +81928,7 @@ Function90e72: ; 90e72 Function90e82: ; 90e82 ld de, PhoneTilemapRLE call Function914bb - ld hl, $c590 + hlcoord 0, 12 ld bc, $412 call TextBox call Function90e98 @@ -81923,18 +81938,18 @@ Function90e82: ; 90e82 ; known jump sources: 90e91 (24:4e91) Function90e98: ; 90e98 (24:4e98) - ld hl, $c4c5 + hlcoord 17, 1 ld a, $3c ld [hli], a inc a ld [hl], a - ld hl, $c4d9 + hlcoord 17, 2 inc a ld [hli], a call Function2d05 and a ret nz - ld hl, $c4da + hlcoord 18, 2 ld [hl], $3f ret @@ -81944,7 +81959,7 @@ Function90eb0: ; 90eb0 (24:4eb0) ld bc, $8 ld a, $4f call ByteFill - ld hl, $c4b4 + hlcoord 0, 1 ld bc, $8 ld a, $4f call ByteFill @@ -81965,19 +81980,19 @@ Function90eb0: ; 90eb0 (24:4eb0) ; known jump sources: 90ecc (24:4ecc) Function90ee4: ; 90ee4 (24:4ee4) - ld hl, $c4a2 + hlcoord 2, 0 ld a, $40 jr Function90ef7 ; known jump sources: 90ed2 (24:4ed2) Function90eeb: ; 90eeb (24:4eeb) - ld hl, $c4a4 + hlcoord 4, 0 ld a, $44 jr Function90ef7 ; known jump sources: 90ed8 (24:4ed8) Function90ef2: ; 90ef2 (24:4ef2) - ld hl, $c4a6 + hlcoord 6, 0 ld a, $42 ; known jump sources: 90ee0 (24:4ee0), 90ee9 (24:4ee9), 90ef0 (24:4ef0) @@ -82081,17 +82096,17 @@ Function90f7b: ; 90f7b (24:4f7b) ; known jump sources: 90e32 (24:4e32), 90f7e (24:4f7e) Function90f86: ; 90f86 (24:4f86) - ld hl, $c507 + hlcoord 3, 5 ld bc, $50e call ClearBox ld a, [hHours] ; $ff00+$94 ld b, a ld a, [hMinutes] ; $ff00+$96 ld c, a - ld de, $c546 + decoord 6, 8 callba Function1dd6bb ld hl, UnknownText_0x90faf - ld bc, $c51e + bccoord 6, 6 call Function13e5 ret ; 90fa8 (24:4fa8) @@ -82283,7 +82298,7 @@ Function91098: ; 91098 Function910b4: ; 910b4 push af - ld hl, $c4a8 + hlcoord 8, 0 ld bc, $020c call ClearBox pop af @@ -82292,7 +82307,7 @@ Function910b4: ; 910b4 callba GetLandmarkName pop de callba Function1de2c5 - ld hl, $c4a8 + hlcoord 8, 0 ld [hl], $34 ret ; 910d4 @@ -82462,7 +82477,7 @@ Function91171: ; 91171 (24:5171) ret z ld [$c6d3], a - ld hl, $c4f1 + hlcoord 1, 4 ld a, [$c6d1] ld bc, 20 * 2 call AddNTimes @@ -82606,15 +82621,15 @@ Function9126d: ; 9126d (24:526d) ; known jump sources: 9122c (24:522c), 912a6 (24:52a6), 9131a (24:531a) Function912b7: ; 912b7 (24:52b7) ld a, " " - ld hl, $c4f1 + hlcoord 1, 4 ld [hl], a - ld hl, $c519 + hlcoord 1, 6 ld [hl], a - ld hl, $c541 + hlcoord 1, 8 ld [hl], a - ld hl, $c569 + hlcoord 1, 10 ld [hl], a - ld hl, $c4f1 + hlcoord 1, 4 ld a, [$c6d1] ld bc, $28 call AddNTimes @@ -82623,7 +82638,7 @@ Function912b7: ; 912b7 (24:52b7) ; known jump sources: 90e94 (24:4e94), 912b0 (24:52b0), 913d7 (24:53d7) Function912d8: ; 912d8 (24:52d8) - ld hl, $c4dd + hlcoord 1, 3 ld b, $9 ld a, $7f .asm_912df @@ -82647,7 +82662,7 @@ Function912d8: ; 912d8 (24:52d8) ld a, [hli] push hl push af - ld hl, $c4f2 + hlcoord 2, 4 ld a, [$c6d0] ld bc, $28 call AddNTimes @@ -83077,7 +83092,7 @@ UpdateRadioStation: ; 9166f (24:566f) ret z xor a ld [hBGMapMode], a - ld hl, $c556 + hlcoord 2, 9 call PlaceString ld a, $1 ld [hBGMapMode], a @@ -83410,10 +83425,10 @@ NoRadioMusic: ; 9189d (24:589d) NoRadioName: ; 918a9 (24:58a9) xor a ld [hBGMapMode], a ; $ff00+$d4 - ld hl, $c541 + hlcoord 1, 8 ld bc, $312 call ClearBox - ld hl, $c590 + hlcoord 0, 12 ld bc, $412 call TextBox ret @@ -83575,21 +83590,21 @@ Function91a04: ; 91a04 callba Function91ae1 ld a, $7 ld bc, $0006 - ld hl, $c4a1 + hlcoord 1, 0 call ByteFill ld hl, TileMap ld [hl], $6 - ld hl, $c4a7 + hlcoord 7, 0 ld [hl], $17 - ld hl, $c4bb + hlcoord 7, 1 ld [hl], $16 - ld hl, $c4cf + hlcoord 7, 2 ld [hl], $26 ld a, $7 ld bc, $000b - ld hl, $c4d0 + hlcoord 8, 2 call ByteFill - ld hl, $c4db + hlcoord 19, 2 ld [hl], $17 ld a, [$d003] call Function910b4 @@ -83646,13 +83661,13 @@ Function91a87: ; 91a87 .asm_91a9b push de - ld hl, $c590 + hlcoord 0, 12 ld bc, $0412 call TextBox - ld hl, $c5b9 + hlcoord 1, 14 ld [hl], $72 pop de - ld hl, $c5ba + hlcoord 2, 14 call PlaceString ld h, b ld l, c @@ -84254,7 +84269,7 @@ Function91de9: ; 91de9 ld bc, $0014 ld a, $7f call ByteFill - ld hl, $c4b4 + hlcoord 0, 1 ld a, $6 ld [hli], a ld bc, $0012 @@ -84262,7 +84277,7 @@ Function91de9: ; 91de9 call ByteFill ld [hl], $17 call GetPokemonName - ld hl, $c4a2 + hlcoord 2, 0 call PlaceString ld h, b ld l, c @@ -84772,7 +84787,7 @@ Function923b8: ; 923b8 ; 92402 -INCLUDE "stats/wild/fish.asm" +INCLUDE "data/wild/fish.asm" Function926c7: @@ -84922,11 +84937,11 @@ Function927d4: ; 927d4 ; known jump sources: 927c6 (24:67c6) Function927f8: ; 927f8 (24:67f8) - ld hl, $c4b9 + hlcoord 5, 1 ld de, Coins ; $d855 ld bc, $8204 call PrintNum - ld hl, $c4bf + hlcoord 11, 1 ld de, $c711 ld bc, $8204 call PrintNum @@ -86416,17 +86431,17 @@ Function9303f: ; 9303f (24:703f) Function9304c: ; 9304c (24:704c) ld b, $23 asm_9304e: ; 9304e (24:704e) - ld hl, $c4cb + hlcoord 3, 2 call Function93069 - ld hl, $c56b + hlcoord 3, 10 call Function93069 asm_9305a: ; 9305a (24:705a) - ld hl, $c4f3 + hlcoord 3, 4 call Function93069 - ld hl, $c543 + hlcoord 3, 8 call Function93069 asm_93066: ; 93066 (24:7066) - ld hl, $c51b + hlcoord 3, 6 ; known jump sources: 93051 (24:7051), 93057 (24:7057), 9305d (24:705d), 93063 (24:7063) Function93069: ; 93069 (24:7069) @@ -86653,7 +86668,7 @@ Function931ba: ; 931ba ld [$c5a7], a inc a ld [$c5bb], a - ld hl, $c606 + hlcoord 18, 17 ld [hl], $ee ld hl, UnknownText_0x931db inc bc @@ -87116,7 +87131,7 @@ Functionb80e1: ; b80e1 (2e:40e1) srl a ld b, $0 ld c, a - ld hl, $c4c8 + hlcoord 0, 2 add hl, bc ld de, StringBuffer1 ; $d073 call PlaceString @@ -87926,7 +87941,7 @@ Functionb86ea: ; b86ea (2e:46ea) ld [$d005], a cp $2 jr nz, .asm_b870a - ld bc, $c5e1 + bccoord 1, 16 call Function13e5 jr .asm_b870d .asm_b870a @@ -88462,7 +88477,7 @@ Functionb8994: ; b8994 (2e:4994) ld hl, $d004 dec [hl] ret nz - ld hl, $c5c1 + hlcoord 9, 14 ld de, String_b89a4 ld a, $3d jp Functionb8a00 @@ -88477,7 +88492,7 @@ Functionb89a9: ; b89a9 (2e:49a9) ld hl, $d004 dec [hl] ret nz - ld hl, $c5e1 + hlcoord 1, 16 ld de, String_b89b9 ld a, $3e jp Functionb8a00 @@ -88492,7 +88507,7 @@ Functionb89c6: ; b89c6 (2e:49c6) ld hl, $d004 dec [hl] ret nz - ld hl, $c5ec + hlcoord 12, 16 ld de, String_b89d6 ld a, $3f jp Functionb8a00 @@ -88535,18 +88550,18 @@ Functionb8a00: ; b8a00 (2e:4a00) ; known jump sources: b873c (2e:473c) Functionb8a0b: ; b8a0b (2e:4a0b) - ld hl, $c5cc - ld de, $c5a4 + hlcoord 0, 15 + decoord 0, 13 ld bc, $28 jp CopyBytes ; known jump sources: b873f (2e:473f) Functionb8a17: ; b8a17 (2e:4a17) - ld hl, $c5cd + hlcoord 1, 15 ld bc, $12 ld a, $7f call ByteFill - ld hl, $c5e1 + hlcoord 1, 16 ld bc, $12 ld a, $7f jp ByteFill @@ -89535,7 +89550,7 @@ Functionb8f22: ; b8f22 (2e:4f22) xor a ld [hBGMapMode], a ; $ff00+$d4 ld de, String_b9171 - ld hl, $c556 + hlcoord 2, 9 call PlaceString pop af ld [hBGMapMode], a ; $ff00+$d4 @@ -90181,46 +90196,46 @@ Functionb9351: ; b9351 ld c, $40 call Functionb9915 call Functionb9858 - ld hl, $c5ce + hlcoord 2, 15 ld a, $3f call Functionb98d4 ld a, $39 - ld hl, $c5c7 + hlcoord 15, 14 call Functionb98fc ld a, $44 - ld hl, $c4ca + hlcoord 2, 2 call Functionb98ee - ld hl, $c58b + hlcoord 15, 11 call Functionb98ee ld a, $4c - ld hl, $c593 + hlcoord 3, 12 call Functionb98ee - ld hl, $c4d7 + hlcoord 15, 2 call Functionb98ee ld a, $50 - ld hl, $c4e2 + hlcoord 6, 3 call Functionb98ee ld a, $40 - ld hl, $c4d5 + hlcoord 13, 2 ld [hli], a - ld hl, $c5be + hlcoord 6, 14 ld [hl], a ld a, $41 - ld hl, $c508 + hlcoord 4, 5 ld [hli], a - ld hl, $c515 + hlcoord 17, 5 ld [hli], a - ld hl, $c59d + hlcoord 13, 12 ld [hl], a ld a, $42 - ld hl, $c4d1 + hlcoord 9, 2 ld [hli], a - ld hl, $c512 + hlcoord 14, 5 ld [hli], a - ld hl, $c56b + hlcoord 3, 10 ld [hl], a ld a, $43 - ld hl, $c582 + hlcoord 6, 11 ld [hli], a pop hl jp Functionb9803 @@ -90257,18 +90272,18 @@ Functionb93d2: ; b93d2 ld a, $31 ld hl, TileMap call Functionb98a8 - ld hl, $c5f5 + hlcoord 1, 17 call Functionb98a8 ld a, $33 - ld hl, $c4b4 + hlcoord 0, 1 call Functionb98ba - ld hl, $c4b3 + hlcoord 19, 0 call Functionb98ba - ld hl, $c5ce + hlcoord 2, 15 ld a, $35 call Functionb98d4 inc a - ld hl, $c5c7 + hlcoord 15, 14 call Functionb98fc call Functionb9491 pop hl @@ -90294,11 +90309,11 @@ Functionb944b: ; b944b ld c, $8 call Functionb990c call Functionb987b - ld hl, $c5ce + hlcoord 2, 15 ld a, $3c call Functionb98d4 ld a, $36 - ld hl, $c5c7 + hlcoord 15, 14 call Functionb98fc call Functionb9491 pop hl @@ -90307,32 +90322,32 @@ Functionb944b: ; b944b Functionb9491: ; b9491 ld a, $3d - ld hl, $c4ca + hlcoord 2, 2 call Functionb98ee - ld hl, $c4d8 + hlcoord 16, 2 call Functionb98ee - ld hl, $c4f9 + hlcoord 9, 4 call Functionb98ee - ld hl, $c57e + hlcoord 2, 11 call Functionb98ee - ld hl, $c596 + hlcoord 6, 12 call Functionb98ee - ld hl, $c588 + hlcoord 12, 11 call Functionb98ee ld a, $41 - ld hl, $c4f5 + hlcoord 5, 4 ld [hl], a - ld hl, $c4ce + hlcoord 6, 2 ld [hl], a - ld hl, $c4fc + hlcoord 12, 4 ld [hl], a - ld hl, $c4d6 + hlcoord 14, 2 ld [hl], a - ld hl, $c5a7 + hlcoord 3, 13 ld [hl], a - ld hl, $c585 + hlcoord 9, 11 ld [hl], a - ld hl, $c5a0 + hlcoord 16, 12 ld [hl], a ret ; b94d6 @@ -90362,52 +90377,52 @@ Functionb94d6: ; b94d6 call Functionb991e call Functionb987b ld a, $31 - ld hl, $c4b5 + hlcoord 1, 1 call Functionb98ee - ld hl, $c5dd + hlcoord 17, 15 call Functionb98ee - ld hl, $c4dd + hlcoord 1, 3 ld [hl], a - ld hl, $c4b7 + hlcoord 3, 1 ld [hl], a - ld hl, $c5f0 + hlcoord 16, 16 ld [hl], a - ld hl, $c5ca + hlcoord 18, 14 ld [hl], a ld a, $36 - ld hl, $c4f1 + hlcoord 1, 4 ld [hl], a - ld hl, $c4de + hlcoord 2, 3 ld [hl], a - ld hl, $c4cb + hlcoord 3, 2 ld [hl], a - ld hl, $c4b8 + hlcoord 4, 1 ld [hl], a inc a - ld hl, $c5ef + hlcoord 15, 16 ld [hl], a - ld hl, $c5dc + hlcoord 16, 15 ld [hl], a - ld hl, $c5c9 + hlcoord 17, 14 ld [hl], a - ld hl, $c5b6 + hlcoord 18, 13 ld [hl], a inc a - ld hl, $c5ce + hlcoord 2, 15 ld b, $e call Functionb98de inc a - ld hl, $c57e + hlcoord 2, 11 call Functionb98d4 - ld hl, $c506 + hlcoord 2, 5 call Functionb98d4 inc a - ld hl, $c4ba + hlcoord 6, 1 call Functionb98d0 - ld hl, $c5e1 + hlcoord 1, 16 call Functionb98d0 inc a - ld hl, $c5a7 + hlcoord 3, 13 call Functionb98fc pop hl jp Functionb9803 @@ -90446,45 +90461,45 @@ Functionb9582: ; b9582 ld a, $31 ld hl, TileMap call Functionb98dc - ld hl, $c4b4 + hlcoord 0, 1 call Functionb98e3 - ld hl, $c4c7 + hlcoord 19, 1 call Functionb98e3 inc a - ld hl, $c5f4 + hlcoord 0, 17 call Functionb98dc inc a - ld hl, $c5e0 + hlcoord 0, 16 call Functionb98dc inc a - ld hl, $c4ca + hlcoord 2, 2 call Functionb9636 - ld hl, $c4df + hlcoord 3, 3 call Functionb9636 - ld hl, $c4f4 + hlcoord 4, 4 call Functionb9636 dec hl ld [hl], $7f dec a - ld hl, $c5c7 + hlcoord 15, 14 call Functionb98ee add $4 - ld hl, $c5ef + hlcoord 15, 16 ld [hli], a inc a ld [hl], a inc a push af - ld hl, $c4c0 + hlcoord 12, 1 call Functionb98fc pop af - ld hl, $c4ff + hlcoord 15, 4 call Functionb98fc inc a - ld hl, $c57e + hlcoord 2, 11 call Functionb98d4 inc a - ld hl, $c4e6 + hlcoord 10, 3 call Functionb98ee pop hl jp Functionb9803 @@ -90518,37 +90533,37 @@ Functionb963e: ; b963e ld c, $20 call Functionb9915 call Functionb9858 - ld hl, $c5ce + hlcoord 2, 15 ld a, $3d call Functionb98d4 ld a, $39 - ld hl, $c5b4 + hlcoord 16, 13 call Functionb98ee - ld hl, $c5a6 + hlcoord 2, 13 call Functionb98ee ld a, $3e - ld hl, $c4ca + hlcoord 2, 2 call Functionb98ee - ld hl, $c4e1 + hlcoord 5, 3 call Functionb98ee - ld hl, $c4d2 + hlcoord 10, 2 call Functionb98ee - ld hl, $c4ec + hlcoord 16, 3 call Functionb98ee - ld hl, $c581 + hlcoord 5, 11 call Functionb98ee - ld hl, $c578 + hlcoord 16, 10 call Functionb98ee ld a, $42 - ld hl, $c4f3 + hlcoord 3, 4 call Functionb98ee - ld hl, $c4e8 + hlcoord 12, 3 call Functionb98ee - ld hl, $c4d6 + hlcoord 14, 2 call Functionb98ee - ld hl, $c56a + hlcoord 2, 10 call Functionb98ee - ld hl, $c58a + hlcoord 14, 11 call Functionb98ee pop hl jp Functionb9803 @@ -90571,14 +90586,14 @@ Functionb96ca: ; b96ca ld c, $8 call Functionb9915 call Functionb987b - ld hl, $c5d4 + hlcoord 8, 15 ld a, $36 ld b, $a call Functionb98de call Functionb9491 ld a, $1 ld [UnownLetter], a - ld hl, $c569 + hlcoord 1, 10 call Function3786 pop hl jp Functionb9803 @@ -90608,18 +90623,18 @@ Functionb9710: ; b9710 ld a, $31 ld hl, TileMap call Functionb98a8 - ld hl, $c5f5 + hlcoord 1, 17 call Functionb98a8 ld a, $33 - ld hl, $c4b4 + hlcoord 0, 1 call Functionb98ba - ld hl, $c4b3 + hlcoord 19, 0 call Functionb98ba ld a, $35 - ld hl, $c5ce + hlcoord 2, 15 call Functionb989e ld a, $37 - ld hl, $c5c7 + hlcoord 15, 14 call Functionb98fc call Functionb9491 pop hl @@ -90645,42 +90660,42 @@ Functionb9776: ; b9776 call Functionb990c call Functionb987b ld a, $36 - ld hl, $c5e1 + hlcoord 1, 16 call Functionb98d8 inc a - ld hl, $c5c7 + hlcoord 15, 14 call Functionb98fc inc a - ld hl, $c5ef + hlcoord 15, 16 ld [hli], a inc a ld [hl], a ld a, $3f - ld hl, $c4b5 + hlcoord 1, 1 call Functionb98a8 ld a, $41 - ld hl, $c4c8 + hlcoord 0, 2 call Functionb98b5 ld a, $43 - ld hl, $c4db + hlcoord 19, 2 call Functionb98b5 ld a, $45 - ld hl, $c4b4 + hlcoord 0, 1 ld [hl], a inc a - ld hl, $c4c7 + hlcoord 19, 1 ld [hl], a inc a - ld hl, $c5e0 + hlcoord 0, 16 ld [hl], a inc a - ld hl, $c5f3 + hlcoord 19, 16 ld [hl], a inc a - ld hl, $c506 + hlcoord 2, 5 call Functionb98d4 inc a - ld hl, $c57e + hlcoord 2, 11 call Functionb98d4 pop hl jp Functionb9803 @@ -90714,20 +90729,20 @@ Functionb9803: ; b9803 ld [$d023], a ld [$d05a], a ld de, $d002 - ld hl, $c52e + hlcoord 2, 7 call PlaceString ld de, $d050 ld a, [de] and a ret z ld a, [$d1ec] - ld hl, $c5c0 + hlcoord 8, 14 cp $3 jr z, .asm_b984b - ld hl, $c5be + hlcoord 6, 14 cp $6 jr z, .asm_b984b - ld hl, $c5bd + hlcoord 5, 14 .asm_b984b jp PlaceString @@ -90759,7 +90774,7 @@ Functionb9858: ; b9858 ld [hli], a inc a call Functionb98d8 - ld hl, $c4c7 + hlcoord 19, 1 ld a, $35 call Functionb98e3 ld a, $38 @@ -90781,7 +90796,7 @@ Functionb987b: ; b987b inc hl inc a call Functionb98d8 - ld hl, $c4c7 + hlcoord 19, 1 ld a, $35 call Functionb98e3 ld [hl], $31 @@ -91680,7 +91695,7 @@ Functione0217: ; e0217 ld hl, TileMap ld bc, $0c09 call Functione04e5 - ld hl, $c4a9 + hlcoord 9, 0 ld bc, $0014 ld a, [$c6e8] call AddNTimes @@ -91689,13 +91704,13 @@ Functione0217: ; e0217 ld [hBGMapMode], a ld c, $14 call DelayFrames - ld hl, $c4a2 + hlcoord 2, 0 call Functione03c1 ld a, $1 ld [hBGMapMode], a ld c, $14 call DelayFrames - ld hl, $c51a + hlcoord 2, 6 call Functione03c1 call WaitBGMap ld hl, UnknownText_0xe02b2 @@ -91909,12 +91924,12 @@ Functione03ac: ; e03ac ld a, [$cf66] and a jr nz, .asm_e03ba - ld hl, $c4a2 + hlcoord 2, 0 ld bc, $1018 jr .asm_e03c0 .asm_e03ba - ld hl, $c51a + hlcoord 2, 6 ld bc, $4018 .asm_e03c0 @@ -92011,7 +92026,7 @@ Unknown_e0459: ; e0459 Functione0489: ; e0489 push hl - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call TextBox @@ -92022,14 +92037,14 @@ Functione0489: ; e0489 ; e049c Functione049c: ; e049c - ld hl, $c5d5 + hlcoord 9, 15 ld b, $1 ld c, $9 call TextBox - ld hl, $c5ea + hlcoord 10, 16 ld de, String_e04bc call PlaceString - ld hl, $c5ef + hlcoord 15, 16 ld de, Coins ld bc, $8204 call PrintNum @@ -92048,11 +92063,11 @@ Functione04c1: ; e04c1 (38:44c1) ld bc, $168 ld a, $29 call ByteFill - ld hl, $c4a9 + hlcoord 9, 0 ld de, Unknown_e110c lb bc, 12, 11 call Functione04f7 - ld hl, $c590 + hlcoord 0, 12 ld bc, $412 call TextBox ret @@ -92172,7 +92187,7 @@ Functione055f: ; e055f ld a, [hl] and a jr nz, .asm_e0575 - ld hl, $c4e9 + hlcoord 13, 3 add hl, bc add hl, bc ld [hl], $36 @@ -92182,7 +92197,7 @@ Functione055f: ; e055f ret .asm_e0575 - ld hl, $c4e9 + hlcoord 13, 3 add hl, bc add hl, bc ld [hl], $36 @@ -92198,7 +92213,7 @@ Functione0583: ; e0583 ld a, [hl] and a jr nz, .asm_e0599 - ld hl, $c4fd + hlcoord 13, 4 add hl, bc add hl, bc ld [hl], $3b @@ -92208,7 +92223,7 @@ Functione0583: ; e0583 ret .asm_e0599 - ld hl, $c4fd + hlcoord 13, 4 add hl, bc add hl, bc ld [hl], $3d @@ -92224,7 +92239,7 @@ Functione05a7: ; e05a7 ld a, [hl] and a jr nz, .asm_e05bd - ld hl, $c525 + hlcoord 13, 6 add hl, bc add hl, bc ld [hl], $36 @@ -92234,7 +92249,7 @@ Functione05a7: ; e05a7 ret .asm_e05bd - ld hl, $c525 + hlcoord 13, 6 add hl, bc add hl, bc ld [hl], $36 @@ -92250,7 +92265,7 @@ Functione05cb: ; e05cb ld a, [hl] and a jr nz, .asm_e05e1 - ld hl, $c539 + hlcoord 13, 7 add hl, bc add hl, bc ld [hl], $3c @@ -92260,7 +92275,7 @@ Functione05cb: ; e05cb ret .asm_e05e1 - ld hl, $c539 + hlcoord 13, 7 add hl, bc add hl, bc ld [hl], $3d @@ -92276,7 +92291,7 @@ Functione05ef: ; e05ef ld a, [hl] and a jr nz, .asm_e0605 - ld hl, $c561 + hlcoord 13, 9 add hl, bc add hl, bc ld [hl], $36 @@ -92286,7 +92301,7 @@ Functione05ef: ; e05ef ret .asm_e0605 - ld hl, $c561 + hlcoord 13, 9 add hl, bc add hl, bc ld [hl], $36 @@ -92302,7 +92317,7 @@ Functione0613: ; e0613 ld a, [hl] and a jr nz, .asm_e0629 - ld hl, $c575 + hlcoord 13, 10 add hl, bc add hl, bc ld [hl], $3c @@ -92312,7 +92327,7 @@ Functione0613: ; e0613 ret .asm_e0629 - ld hl, $c575 + hlcoord 13, 10 add hl, bc add hl, bc ld [hl], $3d @@ -93239,7 +93254,7 @@ Functione1190: ; e1190 ld bc, $0168 ld a, $ee call ByteFill - ld hl, $c4e0 + hlcoord 4, 3 ld bc, $0c0c ld a, $ef call Functione13ee @@ -93329,7 +93344,7 @@ INCBIN "baserom.gbc",$e126d,$e127d - $e126d Functione127d: ; e127d call Functione128d - ld hl, $c5e5 + hlcoord 5, 16 ld a, $f6 ld c, $a .asm_e1287 @@ -93341,31 +93356,31 @@ Functione127d: ; e127d ; e128d Functione128d: ; e128d - ld hl, $c5d0 + hlcoord 4, 15 ld a, $f0 ld [hli], a ld bc, $000a ld a, $f1 call ByteFill - ld hl, $c5db + hlcoord 15, 15 ld a, $f2 ld [hli], a - ld hl, $c5e4 + hlcoord 4, 16 ld a, $f3 ld [hli], a ld bc, $000a ld a, $ef call ByteFill - ld hl, $c5ef + hlcoord 15, 16 ld a, $f3 ld [hli], a - ld hl, $c5f8 + hlcoord 4, 17 ld a, $f4 ld [hli], a ld bc, $000a ld a, $f1 call ByteFill - ld hl, $c603 + hlcoord 15, 17 ld a, $f5 ld [hl], a ret @@ -94128,7 +94143,7 @@ Functione1f1c: ; e1f1c Functione1f42: ; e1f42 ld a, [PlayerLightScreenCount] - ld hl, $c4b1 + hlcoord 17, 0 add $f6 ld [hl], a ld hl, PlayerLightScreenCount @@ -94295,7 +94310,7 @@ Functione2010: ; e2010 inc [hl] inc [hl] ld d, $0 - ld hl, $c4a5 + hlcoord 5, 0 add hl, de call Functione2128 ld hl, UnknownText_0xe2083 @@ -94322,7 +94337,7 @@ UnknownText_0xe2083: ; 0xe2083 Functione2084: ; e2084 push bc - ld hl, $c5a6 + hlcoord 2, 13 call Functione2128 ld hl, UnknownText_0xe2093 pop bc @@ -94468,7 +94483,7 @@ Functione2152: ; e2152 ld hl, TileMap ld de, String_e2177 call PlaceString - ld hl, $c4af + hlcoord 15, 0 ld de, String_e217d call PlaceString ld hl, UnknownText_0xe2176 @@ -94495,7 +94510,7 @@ Functione2183: ; e2183 .asm_e218c add $9 ld e, a - ld hl, $c4c9 + hlcoord 1, 2 ld bc, $0028 .asm_e2195 ld a, d @@ -94865,11 +94880,11 @@ Functione2564: ; e2564 ld b, $4 ld c, $8 call ClearBox - ld hl, $c4f0 + hlcoord 0, 4 ld b, $a ld c, $9 call ClearBox - ld hl, $c5b8 + hlcoord 0, 14 ld b, $2 ld c, $8 call ClearBox @@ -95630,20 +95645,20 @@ Functione2a6c: ; e2a6c ; known jump sources: e23f8 (38:63f8), e2471 (38:6471), e24c4 (38:64c4), e24f1 (38:64f1), e252f (38:652f), e25f0 (38:65f0), e2669 (38:6669), e26bc (38:66bc), e26e4 (38:66e4), e2723 (38:6723), e2f4c (38:6f4c), e2f6b (38:6f6b), e30e7 (38:70e7), e316d (38:716d) Functione2a6e: ; e2a6e (38:6a6e) push de - ld hl, $c5cc + hlcoord 0, 15 ld bc, $112 call TextBox pop de - ld hl, $c5e1 + hlcoord 1, 16 call PlaceString ret ; e2a80 (38:6a80) Functione2a80: ; e2a80 call Functione2a8e - ld hl, $c4bc + hlcoord 8, 1 ld [hl], $5f - ld hl, $c4c7 + hlcoord 19, 1 ld [hl], $5e ret ; e2a8e @@ -96517,14 +96532,14 @@ Functione307c: ; e307c (38:707c) ld hl, TileMap ; $c4a0 (aliases: SpritesEnd) ld bc, $f08 call ClearBox - ld hl, $c5c0 + hlcoord 8, 14 ld bc, $103 call ClearBox - ld hl, $c5cc + hlcoord 0, 15 ld bc, $112 call TextBox call WaitBGMap - ld hl, $c5e1 + hlcoord 1, 16 ld de, String_e3563 call PlaceString ld l, c @@ -96573,14 +96588,14 @@ Functione30fa: ; e30fa (38:70fa) ld hl, TileMap ; $c4a0 (aliases: SpritesEnd) ld bc, $f08 call ClearBox - ld hl, $c5c0 + hlcoord 8, 14 ld bc, $103 call ClearBox - ld hl, $c5cc + hlcoord 0, 15 ld bc, $112 call TextBox call WaitBGMap - ld hl, $c5e1 + hlcoord 1, 16 ld de, String_e356b call PlaceString ld l, c @@ -96609,10 +96624,10 @@ Functione3180: ; e3180 (38:7180) ld hl, TileMap ; $c4a0 (aliases: SpritesEnd) ld bc, $f08 call ClearBox - ld hl, $c5c0 + hlcoord 8, 14 ld bc, $103 call ClearBox - ld hl, $c5cc + hlcoord 0, 15 ld bc, $112 call TextBox call WaitBGMap @@ -96626,15 +96641,15 @@ Functione3180: ; e3180 (38:7180) ld a, [CurPartySpecies] ; $d108 ld [$d265], a call GetPokemonName - ld hl, $c5e1 + hlcoord 1, 16 ld de, String_e3551 call PlaceString ld c, 80 call DelayFrames - ld hl, $c5cc + hlcoord 0, 15 ld bc, $112 call TextBox - ld hl, $c5e1 + hlcoord 1, 16 ld de, String_e355e call PlaceString ld l, c @@ -96655,10 +96670,10 @@ Functione31e7: ; e31e7 push de push bc push af - ld hl, $c5cc + hlcoord 0, 15 ld bc, $0112 call TextBox - ld hl, $c5e1 + hlcoord 1, 16 ld de, String_e3233 call PlaceString ld c, 20 @@ -96998,7 +97013,7 @@ Functione35aa: ; e35aa (38:75aa) call Function1d3c xor a ld [$d0e4], a - ld hl, $c4f0 + hlcoord 0, 4 ld bc, $809 call TextBox call Function350c @@ -97068,18 +97083,18 @@ Functione3626: ; e3626 (38:7626) ; e3632 (38:7632) Functione3632: ; e3632 - ld hl, $c537 + hlcoord 11, 7 ld bc, $0507 call TextBox ld a, [MenuSelection] cp $ff ret z - ld hl, $c560 + hlcoord 12, 9 ld de, String_e3663 call PlaceString call Functione366c ld [$d265], a - ld hl, $c589 + hlcoord 13, 11 ld de, $d265 ld bc, $0102 call PrintNum @@ -97161,13 +97176,13 @@ Functione36cf: ; e36cf (38:76cf) ld b, $2 ld c, $12 call TextBox - ld hl, $c4c9 + hlcoord 1, 2 ld de, String_e36f1 call PlaceString ld a, [wCurBox] and $f call Functione3626 - ld hl, $c4d3 + hlcoord 11, 2 call PlaceString ret ; e36f1 (38:76f1) @@ -97303,11 +97318,11 @@ String_e37d3: ; e37d3 ; known jump sources: e379f (38:779f), e37b2 (38:77b2), e37c1 (38:77c1) Functione37e3: ; e37e3 (38:77e3) push de - ld hl, $c5b8 + hlcoord 0, 14 ld bc, $212 call TextBox pop de - ld hl, $c5e1 + hlcoord 1, 16 call PlaceString ld a, $1 ld [hBGMapMode], a ; $ff00+$d4 @@ -97330,7 +97345,7 @@ _OptionsMenu: ; e41d0 ld b, $10 ld c, $12 call TextBox - ld hl, $c4ca + hlcoord 2, 2 ld de, StringOptions call PlaceString xor a @@ -97816,7 +97831,7 @@ Options_Frame: ; e44fa Functione4512: ; e4512 ld a, [TextBoxFrame] - ld hl, $c5dc ;where on the screen the number is drawn + hlcoord 16, 15 ;where on the screen the number is drawn add "1" ld [hl], a call Functione5f @@ -100425,20 +100440,20 @@ Functionfb5dd: ; fb5dd ; fb60d Functionfb60d: ; fb60d - ld hl, $c4a4 + hlcoord 4, 0 ld de, PlayerName call PlaceString ld a, $14 ld [bc], a - ld hl, $c544 + hlcoord 4, 8 ld de, $d26b call PlaceString ld a, $14 ld [bc], a - ld hl, $c4bb + hlcoord 7, 1 ld de, PartySpecies call Functionfb634 - ld hl, $c55b + hlcoord 7, 9 ld de, OTPartySpecies Functionfb634: ; fb634 @@ -101026,7 +101041,7 @@ Functionfba18: ; fba18 ; no known jump sources Functionfba2e: ; fba2e (3e:7a2e) - ld hl, $c5d0 + hlcoord 4, 15 ld bc, $c ld a, $7f call ByteFill @@ -101044,7 +101059,7 @@ Functionfba2e: ; fba2e (3e:7a2e) ld a, [hli] ld e, a ld d, [hl] - ld hl, $c5d0 + hlcoord 4, 15 .asm_fba52 ld a, [de] cp $ff @@ -101275,13 +101290,13 @@ Functionfbd91: ; fbd91 (3e:7d91) ; known jump sources: fbd5c (3e:7d5c), fbd7f (3e:7d7f) Functionfbd96: ; fbd96 (3e:7d96) - ld hl, $c4ac + hlcoord 12, 0 ld bc, $707 ret ; known jump sources: fbd61 (3e:7d61), fbd85 (3e:7d85) Functionfbd9d: ; fbd9d (3e:7d9d) - ld hl, $c51a + hlcoord 2, 6 ld bc, $606 ret @@ -103177,7 +103192,7 @@ Function100504: ; 100504 call Function3f20 call Function1ad2 pop de - ld hl, $c4cc + hlcoord 4, 2 call PlaceString ret ; 100513 @@ -103534,7 +103549,7 @@ Function1008e0: ; 1008e0 ; 100902 Function100902: ; 100902 - ld hl, $c56b + hlcoord 3, 10 ld b, $1 ld c, $b call TextBox @@ -103545,9 +103560,9 @@ Function100902: ; 100902 ld [StringBuffer2], a jr z, .asm_10093f ld de, .string_100966 - ld hl, $c580 + hlcoord 4, 11 call PlaceString - ld hl, $c584 + hlcoord 8, 11 ld bc, $0102 ld de, StringBuffer2 call PrintNum @@ -103560,7 +103575,7 @@ Function100902: ; 100902 .asm_10093f ld de, .string_10095a - ld hl, $c580 + hlcoord 4, 11 call PlaceString ld de, SFX_4_NOTE_DITTY call PlaySFX @@ -104008,7 +104023,7 @@ Function100bc2: ; 100bc2 ; 100c74 Function100c74: ; 100c74 - ld hl, $c540 + hlcoord 0, 8 ld b, $8 ld c, $8 call TextBox @@ -104018,7 +104033,7 @@ Function100c74: ; 100c74 call CopyBytes ld a, $28 ld [Buffer1], a - ld hl, $c56a + hlcoord 2, 10 ld a, $20 call Predef ret @@ -104541,7 +104556,7 @@ Function10202c: ; 10202c call Function10142c ld e, $d call Function101ee4 - ld hl, $c4f4 + hlcoord 4, 4 call Function100681 ret ; 102048 @@ -105896,7 +105911,7 @@ Function1048ba: ; 1048ba (41:48ba) call ClearSprites call WaitBGMap call Function105153 - ld hl, $c543 + hlcoord 3, 8 ld de, $49cd call PlaceString call WaitBGMap @@ -105922,7 +105937,7 @@ Function1048ba: ; 1048ba (41:48ba) call GetSGBLayout call Function32f9 pop de - ld hl, $c542 + hlcoord 2, 8 ld a, d ld de, $49fd cp $10 @@ -107166,7 +107181,7 @@ Function105153: ; 105153 (41:5153) ld a, $42 ld bc, $168 call ByteFill - ld hl, $c52f + hlcoord 3, 7 ld bc, $90f call ClearBox ld hl, TileMap ; $c4a0 (aliases: SpritesEnd) @@ -107174,69 +107189,69 @@ Function105153: ; 105153 (41:5153) ld [hli], a inc a ld [hl], a - ld hl, $c4b4 + hlcoord 0, 1 inc a ld [hli], a inc a ld [hl], a - ld hl, $c4bb + hlcoord 7, 1 ld a, $12 call Function10522e - ld hl, $c4ca + hlcoord 2, 2 ld a, $17 call Function105236 - ld hl, $c4de + hlcoord 2, 3 ld a, $27 call Function105236 - ld hl, $c4f9 + hlcoord 9, 4 ld a, $37 ld [hli], a inc a ld [hl], a - ld hl, $c4c9 + hlcoord 1, 2 ld [hl], $4 - ld hl, $c4dd + hlcoord 1, 3 ld a, $5 call Function105246 ld a, $9 - ld hl, $c516 + hlcoord 18, 5 call Function105242 - ld hl, $c506 + hlcoord 2, 5 ld a, $b call Function105251 - ld hl, $c5e2 + hlcoord 2, 16 ld a, $7 call Function105251 - ld hl, $c506 + hlcoord 2, 5 ld a, $d call Function10522e - ld hl, $c50b + hlcoord 7, 5 ld [hl], $c - ld hl, $c516 + hlcoord 18, 5 ld [hl], $a - ld hl, $c5f2 + hlcoord 18, 16 ld [hl], $8 - ld hl, $c5e1 + hlcoord 1, 16 ld [hl], $6 - ld hl, $c51a + hlcoord 2, 6 ld a, $3a call Function105251 - ld hl, $c5ce + hlcoord 2, 15 ld a, $40 call Function105251 - ld hl, $c51a + hlcoord 2, 6 ld a, $3c call Function10523e - ld hl, $c529 + hlcoord 17, 6 ld a, $3e call Function10523e - ld hl, $c51a + hlcoord 2, 6 ld [hl], $39 - ld hl, $c529 + hlcoord 17, 6 ld [hl], $3b - ld hl, $c5ce + hlcoord 2, 15 ld [hl], $3f - ld hl, $c5dd + hlcoord 17, 15 ld [hl], $41 call EnableLCD call WaitBGMap @@ -107307,7 +107322,7 @@ Function105688: ; 105688 (41:5688) call ClearSprites call WaitBGMap call Function1057d7 - ld hl, $c543 + hlcoord 3, 8 ld de, $572e call PlaceString call WaitBGMap @@ -107458,7 +107473,7 @@ Function1057d7: ; 1057d7 (41:57d7) ld a, $3f ld bc, $168 call ByteFill - ld hl, $c52f + hlcoord 3, 7 ld bc, $90f call ClearBox ld hl, TileMap ; $c4a0 (aliases: SpritesEnd) @@ -107466,64 +107481,64 @@ Function1057d7: ; 1057d7 (41:57d7) ld [hli], a inc a ld [hl], a - ld hl, $c4b4 + hlcoord 0, 1 inc a ld [hli], a inc a ld [hl], a - ld hl, $c4cc + hlcoord 4, 2 ld a, $13 call Function1058ca - ld hl, $c4e0 + hlcoord 4, 3 ld a, $1e call Function1058ce - ld hl, $c4f4 + hlcoord 4, 4 ld a, $2a call Function1058ce - ld hl, $c4c9 + hlcoord 1, 2 ld [hl], $4 - ld hl, $c4dd + hlcoord 1, 3 ld a, $5 call Function1058de ld a, $9 - ld hl, $c516 + hlcoord 18, 5 call Function1058da - ld hl, $c506 + hlcoord 2, 5 ld a, $b call Function1058e9 - ld hl, $c5e2 + hlcoord 2, 16 ld a, $7 call Function1058e9 - ld hl, $c506 + hlcoord 2, 5 ld a, $d call Function1058c6 - ld hl, $c50c + hlcoord 8, 5 ld [hl], $c - ld hl, $c516 + hlcoord 18, 5 ld [hl], $a - ld hl, $c5f2 + hlcoord 18, 16 ld [hl], $8 - ld hl, $c5e1 + hlcoord 1, 16 ld [hl], $6 - ld hl, $c51a + hlcoord 2, 6 ld a, $37 call Function1058e9 - ld hl, $c5ce + hlcoord 2, 15 ld a, $3d call Function1058e9 - ld hl, $c51a + hlcoord 2, 6 ld a, $39 call Function1058d6 - ld hl, $c529 + hlcoord 17, 6 ld a, $3b call Function1058d6 - ld hl, $c51a + hlcoord 2, 6 ld [hl], $36 - ld hl, $c529 + hlcoord 17, 6 ld [hl], $38 - ld hl, $c5ce + hlcoord 2, 15 ld [hl], $3c - ld hl, $c5dd + hlcoord 17, 15 ld [hl], $3e ld de, Sprites ; $c400 ld hl, $58f0 @@ -110072,7 +110087,7 @@ asm_1177d6: ; 1177d6 (45:77d6) add hl, de xor a ld [hl], a - ld hl, $c4f2 + hlcoord 2, 4 add hl, de ld [hl], a ret @@ -110181,7 +110196,7 @@ Function11784c: ; 11784c (45:784c) add hl, de ld [hl], a pop de - ld hl, $c4f2 + hlcoord 2, 4 add hl, de sub $20 ld [hl], a @@ -110201,13 +110216,13 @@ Function1178aa: ; 1178aa (45:78aa) call Function1cbb call Function1cfd callba Function104061 - ld hl, $c550 + hlcoord 16, 8 ld de, $79c5 call PlaceString - ld hl, $c577 + hlcoord 15, 10 ld a, $ed ld [hl], a - ld hl, $c5b9 + hlcoord 1, 14 ld de, $79cc call PlaceString ld a, $1 @@ -110230,10 +110245,10 @@ Function1178e8: ; 1178e8 (45:78e8) ret z dec a ld [$cd4e], a - ld hl, $c54f + hlcoord 15, 8 ld a, $ed ld [hl], a - ld hl, $c577 + hlcoord 15, 10 ld a, $7f ld [hl], a ret @@ -110243,10 +110258,10 @@ Function1178e8: ; 1178e8 (45:78e8) ret nz inc a ld [$cd4e], a - ld hl, $c54f + hlcoord 15, 8 ld a, $7f ld [hl], a - ld hl, $c577 + hlcoord 15, 10 ld a, $ed ld [hl], a ret @@ -110267,7 +110282,7 @@ Function1178e8: ; 1178e8 (45:78e8) ; no known jump sources Function117942: ; 117942 (45:7942) call SpeechTextBox - ld hl, $c5b9 + hlcoord 1, 14 ld de, $79f7 call PlaceString ld a, $1e @@ -110304,7 +110319,7 @@ Function117984: ; 117984 (45:7984) call Function1cbb call Function1cfd callba Function104061 - ld hl, $c5b9 + hlcoord 1, 14 ld de, $79e1 call PlaceString ld a, $1e @@ -110436,10 +110451,10 @@ Function117b31: call LoadMenuDataHeader call Function1cbb call Function1cfd - ld hl, $c550 + hlcoord 16, 8 ld de, YesNo117ccc call PlaceString - ld hl, $c54f + hlcoord 15, 8 ld a, "▶" ld [hl], a jp Function117cdd @@ -110459,10 +110474,10 @@ Function117b4f: ret z dec a ld [$cf64], a - ld hl, $c54f + hlcoord 15, 8 ld a, "▶" ld [hl], a - ld hl, $c577 + hlcoord 15, 10 ld a, " " ld [hl], a ret @@ -110472,10 +110487,10 @@ Function117b4f: ret nz inc a ld [$cf64], a - ld hl, $c54f + hlcoord 15, 8 ld a, " " ld [hl], a - ld hl, $c577 + hlcoord 15, 10 ld a, "▶" ld [hl], a ret @@ -112287,10 +112302,10 @@ Function11acb7: ; 11acb7 sla c rl b add hl, bc - ld de, $c51e + decoord 6, 6 ld a, [hli] ld [de], a - ld de, $c52c + decoord 0, 7 ld bc, $0007 call CopyBytes ld a, [$cd49] @@ -112314,7 +112329,7 @@ Function11acb7: ; 11acb7 sla c rl b add hl, bc - ld de, $c557 + decoord 3, 9 ld bc, $0007 call CopyBytes ld a, [$cd4a] @@ -113007,7 +113022,7 @@ Function11c000:: ; 11c000 ld a, [hl] ld l, c ld h, a - ld bc, $c5b9 + bccoord 1, 14 pop af ld [rSVBK], a call Function13e5 @@ -113354,7 +113369,7 @@ Function11c254: ; 11c254 ; known jump sources: 11c3c2 (47:43c2), 11c52c (47:452c), 11c658 (47:4658), 11cd20 (47:4d20), 11ce0b (47:4e0b) Function11c277: ; 11c277 (47:4277) ld a, $7f - ld hl, $c518 + hlcoord 0, 6 ld bc, $f0 call ByteFill ret @@ -113555,10 +113570,10 @@ Function11c3c2: ; 11c3c2 (47:43c2) call Function11c277 ld de, $4fbe call Function11d035 - ld hl, $c52d + hlcoord 1, 7 ld de, $44db call PlaceString - ld hl, $c5e1 + hlcoord 1, 16 ld de, $451b call PlaceString call Function11c4be @@ -113626,7 +113641,7 @@ Function11c3ed: ; 11c3ed (47:43ed) jr z, .asm_11c460 ld de, $4fba call Function11cfce - ld de, $c4c9 + decoord 1, 2 ld bc, $cd36 call Function11c08f ld hl, $cd24 @@ -113889,7 +113904,7 @@ Function11c5f0: ; 11c5f0 (47:45f0) pop af dec a jr nz, .asm_11c5f8 - ld hl, $c5f5 + hlcoord 1, 17 ld de, $462a call PlaceString ret @@ -114246,10 +114261,10 @@ Function11c86e: ; 11c86e (47:486e) ld a, [$cd26] and a jr z, .asm_11c88a - ld hl, $c5f6 + hlcoord 2, 17 ld de, $48f0 call PlaceString - ld hl, $c5fa + hlcoord 6, 17 ld c, $3 xor a .asm_11c883 @@ -114259,7 +114274,7 @@ Function11c86e: ; 11c86e (47:486e) jr nz, .asm_11c883 jr .asm_11c895 .asm_11c88a - ld hl, $c5f6 + hlcoord 2, 17 ld c, $7 ld a, $7f .asm_11c891 @@ -114273,10 +114288,10 @@ Function11c86e: ; 11c86e (47:486e) jr c, .asm_11c8b7 cp [hl] jr nc, .asm_11c8b7 - ld hl, $c604 + hlcoord 16, 17 ld de, $48f3 call PlaceString - ld hl, $c5ff + hlcoord 11, 17 ld a, $3 ld c, a .asm_11c8b1 @@ -114286,10 +114301,10 @@ Function11c86e: ; 11c86e (47:486e) jr nz, .asm_11c8b1 ret .asm_11c8b7 - ld hl, $c5f1 + hlcoord 17, 16 ld a, $7f ld [hl], a - ld hl, $c5ff + hlcoord 11, 17 ld c, $7 .asm_11c8c2 ld [hli], a @@ -114410,7 +114425,7 @@ INCBIN "baserom.gbc",$11c986,$11c992 - $11c986 ; known jump sources: 11c6c4 (47:46c4) Function11c992: ; 11c992 (47:4992) ld a, $8 - ld hl, $c52e + hlcoord 2, 7 .asm_11c997 push af ld a, $7f @@ -114562,10 +114577,10 @@ Function11ca7f: ; 11ca7f (47:4a7f) call Function11cfce ld de, $4fca call Function11cfce - ld hl, $c5b9 + hlcoord 1, 14 pop de call PlaceString - ld hl, $c550 + hlcoord 16, 8 ld de, $4a57 call PlaceString call Function11ca01 @@ -114610,7 +114625,7 @@ Function11cab3: ; 11cab3 (47:4ab3) jr z, .asm_11caf3 ld a, $ff ld [$cd35], a - ld hl, $c5b9 + hlcoord 1, 14 ld de, $4b31 call PlaceString ld a, $1 @@ -114725,7 +114740,7 @@ Function11cb66: ; 11cb66 (47:4b66) ld e, a ld a, [hl] ld d, a - ld hl, $c5b9 + hlcoord 1, 14 call PlaceString ld hl, $cf63 inc [hl] @@ -114774,7 +114789,7 @@ INCBIN "baserom.gbc",$11cc01,$11ccef - $11cc01 Function11ccef: ; 11ccef (47:4cef) ld de, $4fc6 call Function11cfce - ld hl, $c5b9 + hlcoord 1, 14 ld de, $4d10 call PlaceString call Function11ca19 @@ -114798,7 +114813,7 @@ Function11cd20: ; 11cd20 (47:4d20) call Function11c277 ld de, $4fc6 call Function11cfce - ld hl, $c5b9 + hlcoord 1, 14 ld a, [$cd2b] ld [$cd2c], a and a @@ -114809,7 +114824,7 @@ Function11cd20: ; 11cd20 (47:4d20) ld de, $4dd9 .asm_11cd3d call PlaceString - ld hl, $c544 + hlcoord 4, 8 ld de, $4df5 call PlaceString call Function11cdaa @@ -114869,7 +114884,7 @@ Function11cd54: ; 11cd54 (47:4d54) ld de, $4fc6 call Function11cfce pop de - ld hl, $c5b9 + hlcoord 1, 14 call PlaceString ret @@ -114892,10 +114907,10 @@ INCBIN "baserom.gbc",$11cdc7,$11ce0b - $11cdc7 ; no known jump sources Function11ce0b: ; 11ce0b (47:4e0b) call Function11c277 - ld hl, $c52d + hlcoord 1, 7 ld de, $4f79 call PlaceString - ld hl, $c5f5 + hlcoord 1, 17 ld de, $462a call PlaceString call Function11c618 @@ -115806,7 +115821,7 @@ Function16d673: ; 16d673 call Function16d6ae callba Function49856 callba Functionfb60d - ld hl, $c5fe + hlcoord 10, 17 ld de, $568f call PlaceString ret @@ -115840,7 +115855,7 @@ Function16d6ae: ; 16d6ae ld bc, $0028 call CopyBytes ld hl, $55f5 - ld de, $c5e0 + decoord 0, 16 ld bc, $0028 call CopyBytes ret @@ -115861,12 +115876,12 @@ Function16d6ce: ; 16d6ce ; 16d6e1 Function16d6e1: ; 16d6e1 - ld hl, $c56c + hlcoord 4, 10 ld b, $1 ld c, $a ld a, $10 call Predef - ld hl, $c581 + hlcoord 5, 11 ld de, $5701 call PlaceString call WaitBGMap @@ -116991,7 +117006,7 @@ Function171a5d: ; 171a5d (5c:5a5d) ; no known jump sources Function171a95: ; 171a95 (5c:5a95) callba Function171ccd - ld hl, $c542 + hlcoord 2, 8 ld de, $5aa7 call PlaceString jp Function171c66 @@ -117027,7 +117042,7 @@ Function171aec: ; 171aec (5c:5aec) callba Function118452 pop af ld [rSVBK], a ; $ff00+$70 - ld hl, $c51a + hlcoord 2, 6 ld a, $8 .asm_171b01 push af @@ -117041,7 +117056,7 @@ Function171aec: ; 171aec (5c:5aec) pop af dec a jr nz, .asm_171b01 - ld hl, $c52e + hlcoord 2, 7 ld a, $3 ld de, EnemyMoveAnimation ; $c608 (aliases: EnemyMoveStruct) .asm_171b1b @@ -117190,7 +117205,7 @@ Function171beb: ; 171beb (5c:5beb) call Function1cbb call Function1cfd callba Function104061 - ld hl, $c5b9 + hlcoord 1, 14 ld de, $5c73 call PlaceString ld a, [$cd4a] @@ -117265,10 +117280,10 @@ Function171c87: ; 171c87 (5c:5c87) ld de, AttrMap ; $cdd9 ld bc, $168 call CopyBytes - ld hl, $c4cb + hlcoord 3, 2 ld de, $6e31 call PlaceString - ld hl, $c5e3 + hlcoord 3, 16 ld de, $6e3f call PlaceString ret @@ -117296,7 +117311,7 @@ Function171ccd: ; 171ccd (5c:5ccd) ; no known jump sources Function171cf0: ; 171cf0 (5c:5cf0) xor a - ld hl, $c5d0 + hlcoord 4, 15 ld [hli], a ld [hli], a ld a, [$cd4b] @@ -117305,18 +117320,18 @@ Function171cf0: ; 171cf0 (5c:5cf0) and a jr nz, .asm_171d16 ld hl, $651d - ld de, $c52c + decoord 0, 7 ld bc, $8c call CopyBytes - ld hl, $c5e3 + hlcoord 3, 16 ld de, $6e3f jp PlaceString .asm_171d16 ld hl, $65f9 - ld de, $c52c + decoord 0, 7 ld bc, $8c call CopyBytes - ld hl, $c5e3 + hlcoord 3, 16 ld de, $6e4e jp PlaceString @@ -117339,10 +117354,10 @@ Function171d2b: ; 171d2b (5c:5d2b) ld de, AttrMap ; $cdd9 ld bc, $168 call CopyBytes - ld hl, $c4ca + hlcoord 2, 2 ld de, $6e5d call PlaceString - ld hl, $c5ee + hlcoord 14, 16 ld de, $6e58 call PlaceString ret @@ -119027,20 +119042,20 @@ Function17f5e4: ; 17f5e4 ld hl, AttrMap ld bc, $0168 call ByteFill - ld hl, $c4b6 + hlcoord 2, 1 ld b, $1 ld c, $e call Function3eea - ld hl, $c4f1 + hlcoord 1, 4 ld b, $c ld c, $10 call Function3eea - ld hl, $c4cb + hlcoord 3, 2 ld de, $76dc call PlaceString call Function17ff3c jr nc, .asm_17f632 - ld hl, $c4d3 + hlcoord 11, 2 call Function17f6b7 .asm_17f632 @@ -119104,7 +119119,7 @@ Function17f5e4: ; 17f5e4 jr .asm_17f684 .asm_17f67d - ld hl, $c51a + hlcoord 2, 6 call PlaceString ret @@ -119119,7 +119134,7 @@ Function17f5e4: ; 17f5e4 ld e, a ld a, [hl] ld d, a - ld hl, $c51a + hlcoord 2, 6 call PlaceString ret ; 17f699 @@ -119174,7 +119189,7 @@ Function17ff3c: ; 17ff3c ld a, [$c300] cp $d0 ret c - ld hl, $c4d2 + hlcoord 10, 2 ld de, $7f68 call PlaceString ld a, [$c300] @@ -119182,7 +119197,7 @@ Function17ff3c: ; 17ff3c sub $d0 inc a ld [$c300], a - ld hl, $c4d6 + hlcoord 14, 2 ld de, $c300 ld bc, $8103 call PrintNum @@ -119411,14 +119426,14 @@ Function1dc381: ; 1dc381 xor a ld [MonType], a callba Function5084a - ld hl, $c52c + hlcoord 0, 7 ld b, $9 ld c, $12 call TextBox - ld hl, $c4d0 + hlcoord 8, 2 ld a, [TempMonLevel] call Function383d - ld hl, $c4d4 + hlcoord 12, 2 ld [hl], $71 inc hl ld de, TempMonMaxHP @@ -119429,14 +119444,14 @@ Function1dc381: ; 1dc381 ld [CurSpecies], a ld hl, PartyMon1Nickname call Function1dc50e - ld hl, $c4f8 + hlcoord 8, 4 call PlaceString - ld hl, $c521 + hlcoord 9, 6 ld [hl], $f3 call GetPokemonName - ld hl, $c522 + hlcoord 10, 6 call PlaceString - ld hl, $c4a8 + hlcoord 8, 0 ld [hl], $74 inc hl ld [hl], $e8 @@ -119444,24 +119459,24 @@ Function1dc381: ; 1dc381 ld de, $d265 ld bc, $8103 call PrintNum - ld hl, $c555 + hlcoord 1, 9 ld de, String1dc550 call PlaceString ld hl, PartyMon1OT call Function1dc50e - ld hl, $c558 + hlcoord 4, 9 call PlaceString - ld hl, $c57d + hlcoord 1, 11 ld de, String1dc559 call PlaceString - ld hl, $c580 + hlcoord 4, 11 ld de, TempMonID ld bc, $8205 call PrintNum - ld hl, $c5b9 + hlcoord 1, 14 ld de, String1dc554 call PlaceString - ld hl, $c5bf + hlcoord 7, 14 ld a, [TempMonMove1] call Function1dc51a call Function1dc52c @@ -119502,33 +119517,33 @@ Function1dc47b: ; 1dc47b call TextBox ld bc, SCREEN_WIDTH ld de, TileMap - ld hl, $c4b4 + hlcoord 0, 1 call CopyBytes - ld hl, $c4a7 + hlcoord 7, 0 ld a, [TempMonMove2] call Function1dc51a - ld hl, $c4cf + hlcoord 7, 2 ld a, [TempMonMove3] call Function1dc51a - ld hl, $c4f7 + hlcoord 7, 4 ld a, [TempMonMove4] call Function1dc51a - ld hl, $c533 + hlcoord 7, 7 ld de, String1dc55d call PlaceString - ld hl, $c53c + hlcoord 16, 7 ld de, TempMonAtk call Function1dc507 - ld hl, $c564 + hlcoord 16, 9 ld de, TempMonDef call Function1dc507 - ld hl, $c58c + hlcoord 16, 11 ld de, TempMonSpclAtk call Function1dc507 - ld hl, $c5b4 + hlcoord 16, 13 ld de, TempMonSpclDef call Function1dc507 - ld hl, $c5dc + hlcoord 16, 15 ld de, TempMonSpd call Function1dc507 call WaitBGMap @@ -119578,12 +119593,12 @@ Function1dc52c: ; 1dc52c ld a, $f5 .asm_1dc53c - ld hl, $c4d9 + hlcoord 17, 2 ld [hl], a ld bc, TempMonDVs callba CheckShininess ret nc - ld hl, $c4da + hlcoord 18, 2 ld [hl], $3f ret ; 1dc550 @@ -119687,16 +119702,16 @@ Function1dd709: ; 1dd709 ld bc, $0168 call CopyBytes ld de, $5760 - ld hl, $c506 + hlcoord 2, 5 call PlaceString ld de, $5767 - ld hl, $c513 + hlcoord 15, 5 call PlaceString ld de, PlayerName - ld hl, $c50d + hlcoord 9, 5 call PlaceString ld de, $5768 - ld hl, $c542 + hlcoord 2, 8 call PlaceString call EnableLCD call WaitBGMap @@ -119719,12 +119734,12 @@ Function1dd7ae: ; 1dd7ae ld bc, $0168 call CopyBytes ld de, $57fa - ld hl, $c4a8 + hlcoord 8, 0 call PlaceString ld de, $57f0 - ld hl, $c5cf + hlcoord 3, 15 call PlaceString - ld hl, $c5d8 + hlcoord 12, 15 ld de, GameTimeHours ld bc, $0204 call PrintNum @@ -119771,10 +119786,10 @@ INCBIN "baserom.gbc",$1de0e1,$1de171 - $1de0e1 ; no known jump sources Function1de171: ; 1de171 (77:6171) ld a, $32 - ld hl, $c5f4 + hlcoord 0, 17 ld bc, $c call ByteFill - ld hl, $c4b4 + hlcoord 0, 1 ld bc, $f0b call ClearBox ld a, $34 @@ -119782,29 +119797,29 @@ Function1de171: ; 1de171 (77:6171) ld bc, $b call ByteFill ld a, $39 - ld hl, $c5e0 + hlcoord 0, 16 ld bc, $b call ByteFill - ld hl, $c4a5 + hlcoord 5, 0 ld [hl], $3f - ld hl, $c5e5 + hlcoord 5, 16 ld [hl], $40 ld a, [$c7d4] cp $1 jr z, .asm_1de1bf - ld hl, $c4ab + hlcoord 11, 0 ld [hl], $50 ld a, $51 - ld hl, $c4bf + hlcoord 11, 1 ld b, $f call Function1de27f ld [hl], $52 jr .asm_1de1d0 .asm_1de1bf - ld hl, $c4ab + hlcoord 11, 0 ld [hl], $66 ld a, $67 - ld hl, $c4bf + hlcoord 11, 1 ld b, $f call Function1de27f ld [hl], $68 @@ -119818,40 +119833,40 @@ Function1de1d1: ; 1de1d1 (77:61d1) ld bc, $b call ByteFill ld a, $39 - ld hl, $c568 + hlcoord 0, 10 ld bc, $b call ByteFill - ld hl, $c4a5 + hlcoord 5, 0 ld [hl], $3f - ld hl, $c56d + hlcoord 5, 10 ld [hl], $40 - ld hl, $c4ab + hlcoord 11, 0 ld [hl], $66 ld a, $67 - ld hl, $c4bf + hlcoord 11, 1 ld b, $9 call Function1de27f ld [hl], $68 ld a, $34 - ld hl, $c57c + hlcoord 0, 11 ld bc, $b call ByteFill ld a, $39 - ld hl, $c5f4 + hlcoord 0, 17 ld bc, $b call ByteFill - ld hl, $c587 + hlcoord 11, 11 ld [hl], $66 ld a, $67 - ld hl, $c59b + hlcoord 11, 12 ld b, $5 call Function1de27f ld [hl], $68 - ld hl, $c590 + hlcoord 0, 12 ld bc, $50b call ClearBox ld de, $623c - ld hl, $c590 + hlcoord 0, 12 call PlaceString ret ; 1de23c (77:623c) @@ -119870,14 +119885,14 @@ Function1de247: ; 1de247 ld [hBGMapAddress], a ld a, h ld [$ffd7], a - ld hl, $c4b3 + hlcoord 19, 0 ld [hl], $66 - ld hl, $c4c7 + hlcoord 19, 1 ld a, $67 ld b, $f call Function1de27f ld [hl], $68 - ld hl, $c607 + hlcoord 19, 17 ld [hl], $3c xor a ld b, $12 @@ -119977,7 +119992,7 @@ Function1de2c5: ; 1de2c5 .asm_1de2da ld de, StringBuffer1 - ld hl, $c4a9 + hlcoord 9, 0 call PlaceString ret ; 1de2e4 @@ -120142,8 +120157,8 @@ INCBIN "baserom.gbc",$1f4018,$1f636a - $1f4018 SECTION "bank7E", ROMX, BANK[$7E] -INCLUDE "stats/battle_tower.asm" -INCLUDE "stats/odd_eggs.asm" +INCLUDE "data/battle_tower.asm" +INCLUDE "data/odd_eggs.asm" SECTION "bank7F", ROMX, BANK[$7F] diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm index 1b402b61c..8e6b15acc 100644 --- a/misc/crystal_misc.asm +++ b/misc/crystal_misc.asm @@ -481,10 +481,10 @@ Function17a964: ; 17a964 (5e:6964) ; known jump sources: 17a75b (5e:675b) Function17a97b: ; 17a97b (5e:697b) - ld hl, $c4b5 + hlcoord 1, 1 ld bc, $212 call ClearBox - ld hl, $c4cb + hlcoord 3, 2 ld de, Buffer1 ; $d1ea (aliases: MagikarpLength) ld a, [$d08c] and a @@ -505,11 +505,11 @@ Function17a97b: ; 17a97b (5e:697b) ; known jump sources: 17a92f (5e:692f) Function17a99e: ; 17a99e (5e:699e) - ld hl, $c590 + hlcoord 0, 12 ld b, $4 ld c, $12 call Function17ac46 - ld hl, $c5ba + hlcoord 2, 14 ld de, $69b2 call PlaceString ret @@ -784,7 +784,7 @@ Function17ac0c: ; 17ac0c (5e:6c0c) ; known jump sources: 17a7e3 (5e:67e3), 17a804 (5e:6804), 17a826 (5e:6826), 17ac0c (5e:6c0c) Function17ac1d: ; 17ac1d (5e:6c1d) ld hl, $6cd5 - ld de, $c4f0 + decoord 0, 4 ld bc, $118 call CopyBytes ret diff --git a/stats/egg_moves_crystal.asm b/stats/egg_moves_crystal.asm deleted file mode 100644 index c0713e5a5..000000000 --- a/stats/egg_moves_crystal.asm +++ /dev/null @@ -1,3 +0,0 @@ -INCLUDE "pokecrystal.asm" -INCLUDE "stats/egg_moves.asm" - diff --git a/stats/evos_attacks_crystal.asm b/stats/evos_attacks_crystal.asm deleted file mode 100644 index 2dbfe0d19..000000000 --- a/stats/evos_attacks_crystal.asm +++ /dev/null @@ -1,3 +0,0 @@ -INCLUDE "pokecrystal.asm" -INCLUDE "stats/evos_attacks.asm" - diff --git a/stats/pokedex/entries_1.asm b/stats/pokedex/entries_1.asm deleted file mode 100644 index cd3b95c0b..000000000 --- a/stats/pokedex/entries_1.asm +++ /dev/null @@ -1,64 +0,0 @@ -BulbasaurPokedexEntry:: INCLUDE "stats/pokedex/entries/001.asm" -IvysaurPokedexEntry:: INCLUDE "stats/pokedex/entries/002.asm" -VenusaurPokedexEntry:: INCLUDE "stats/pokedex/entries/003.asm" -CharmanderPokedexEntry:: INCLUDE "stats/pokedex/entries/004.asm" -CharmeleonPokedexEntry:: INCLUDE "stats/pokedex/entries/005.asm" -CharizardPokedexEntry:: INCLUDE "stats/pokedex/entries/006.asm" -SquirtlePokedexEntry:: INCLUDE "stats/pokedex/entries/007.asm" -WartortlePokedexEntry:: INCLUDE "stats/pokedex/entries/008.asm" -BlastoisePokedexEntry:: INCLUDE "stats/pokedex/entries/009.asm" -CaterpiePokedexEntry:: INCLUDE "stats/pokedex/entries/010.asm" -MetapodPokedexEntry:: INCLUDE "stats/pokedex/entries/011.asm" -ButterfreePokedexEntry:: INCLUDE "stats/pokedex/entries/012.asm" -WeedlePokedexEntry:: INCLUDE "stats/pokedex/entries/013.asm" -KakunaPokedexEntry:: INCLUDE "stats/pokedex/entries/014.asm" -BeedrillPokedexEntry:: INCLUDE "stats/pokedex/entries/015.asm" -PidgeyPokedexEntry:: INCLUDE "stats/pokedex/entries/016.asm" -PidgeottoPokedexEntry:: INCLUDE "stats/pokedex/entries/017.asm" -PidgeotPokedexEntry:: INCLUDE "stats/pokedex/entries/018.asm" -RattataPokedexEntry:: INCLUDE "stats/pokedex/entries/019.asm" -RaticatePokedexEntry:: INCLUDE "stats/pokedex/entries/020.asm" -SpearowPokedexEntry:: INCLUDE "stats/pokedex/entries/021.asm" -FearowPokedexEntry:: INCLUDE "stats/pokedex/entries/022.asm" -EkansPokedexEntry:: INCLUDE "stats/pokedex/entries/023.asm" -ArbokPokedexEntry:: INCLUDE "stats/pokedex/entries/024.asm" -PikachuPokedexEntry:: INCLUDE "stats/pokedex/entries/025.asm" -RaichuPokedexEntry:: INCLUDE "stats/pokedex/entries/026.asm" -SandshrewPokedexEntry:: INCLUDE "stats/pokedex/entries/027.asm" -SandslashPokedexEntry:: INCLUDE "stats/pokedex/entries/028.asm" -NidoranFPokedexEntry:: INCLUDE "stats/pokedex/entries/029.asm" -NidorinaPokedexEntry:: INCLUDE "stats/pokedex/entries/030.asm" -NidoqueenPokedexEntry:: INCLUDE "stats/pokedex/entries/031.asm" -NidoranMPokedexEntry:: INCLUDE "stats/pokedex/entries/032.asm" -NidorinoPokedexEntry:: INCLUDE "stats/pokedex/entries/033.asm" -NidokingPokedexEntry:: INCLUDE "stats/pokedex/entries/034.asm" -ClefairyPokedexEntry:: INCLUDE "stats/pokedex/entries/035.asm" -ClefablePokedexEntry:: INCLUDE "stats/pokedex/entries/036.asm" -VulpixPokedexEntry:: INCLUDE "stats/pokedex/entries/037.asm" -NinetalesPokedexEntry:: INCLUDE "stats/pokedex/entries/038.asm" -JigglypuffPokedexEntry:: INCLUDE "stats/pokedex/entries/039.asm" -WigglytuffPokedexEntry:: INCLUDE "stats/pokedex/entries/040.asm" -ZubatPokedexEntry:: INCLUDE "stats/pokedex/entries/041.asm" -GolbatPokedexEntry:: INCLUDE "stats/pokedex/entries/042.asm" -OddishPokedexEntry:: INCLUDE "stats/pokedex/entries/043.asm" -GloomPokedexEntry:: INCLUDE "stats/pokedex/entries/044.asm" -VileplumePokedexEntry:: INCLUDE "stats/pokedex/entries/045.asm" -ParasPokedexEntry:: INCLUDE "stats/pokedex/entries/046.asm" -ParasectPokedexEntry:: INCLUDE "stats/pokedex/entries/047.asm" -VenonatPokedexEntry:: INCLUDE "stats/pokedex/entries/048.asm" -VenomothPokedexEntry:: INCLUDE "stats/pokedex/entries/049.asm" -DiglettPokedexEntry:: INCLUDE "stats/pokedex/entries/050.asm" -DugtrioPokedexEntry:: INCLUDE "stats/pokedex/entries/051.asm" -MeowthPokedexEntry:: INCLUDE "stats/pokedex/entries/052.asm" -PersianPokedexEntry:: INCLUDE "stats/pokedex/entries/053.asm" -PsyduckPokedexEntry:: INCLUDE "stats/pokedex/entries/054.asm" -GolduckPokedexEntry:: INCLUDE "stats/pokedex/entries/055.asm" -MankeyPokedexEntry:: INCLUDE "stats/pokedex/entries/056.asm" -PrimeapePokedexEntry:: INCLUDE "stats/pokedex/entries/057.asm" -GrowlithePokedexEntry:: INCLUDE "stats/pokedex/entries/058.asm" -ArcaninePokedexEntry:: INCLUDE "stats/pokedex/entries/059.asm" -PoliwagPokedexEntry:: INCLUDE "stats/pokedex/entries/060.asm" -PoliwhirlPokedexEntry:: INCLUDE "stats/pokedex/entries/061.asm" -PoliwrathPokedexEntry:: INCLUDE "stats/pokedex/entries/062.asm" -AbraPokedexEntry:: INCLUDE "stats/pokedex/entries/063.asm" -KadabraPokedexEntry:: INCLUDE "stats/pokedex/entries/064.asm" diff --git a/stats/pokedex/entries_2.asm b/stats/pokedex/entries_2.asm deleted file mode 100644 index b4291a891..000000000 --- a/stats/pokedex/entries_2.asm +++ /dev/null @@ -1,64 +0,0 @@ -AlakazamPokedexEntry:: INCLUDE "stats/pokedex/entries/065.asm" -MachopPokedexEntry:: INCLUDE "stats/pokedex/entries/066.asm" -MachokePokedexEntry:: INCLUDE "stats/pokedex/entries/067.asm" -MachampPokedexEntry:: INCLUDE "stats/pokedex/entries/068.asm" -BellsproutPokedexEntry:: INCLUDE "stats/pokedex/entries/069.asm" -WeepinbellPokedexEntry:: INCLUDE "stats/pokedex/entries/070.asm" -VictreebelPokedexEntry:: INCLUDE "stats/pokedex/entries/071.asm" -TentacoolPokedexEntry:: INCLUDE "stats/pokedex/entries/072.asm" -TentacruelPokedexEntry:: INCLUDE "stats/pokedex/entries/073.asm" -GeodudePokedexEntry:: INCLUDE "stats/pokedex/entries/074.asm" -GravelerPokedexEntry:: INCLUDE "stats/pokedex/entries/075.asm" -GolemPokedexEntry:: INCLUDE "stats/pokedex/entries/076.asm" -PonytaPokedexEntry:: INCLUDE "stats/pokedex/entries/077.asm" -RapidashPokedexEntry:: INCLUDE "stats/pokedex/entries/078.asm" -SlowpokePokedexEntry:: INCLUDE "stats/pokedex/entries/079.asm" -SlowbroPokedexEntry:: INCLUDE "stats/pokedex/entries/080.asm" -MagnemitePokedexEntry:: INCLUDE "stats/pokedex/entries/081.asm" -MagnetonPokedexEntry:: INCLUDE "stats/pokedex/entries/082.asm" -FarfetchDPokedexEntry:: INCLUDE "stats/pokedex/entries/083.asm" -DoduoPokedexEntry:: INCLUDE "stats/pokedex/entries/084.asm" -DodrioPokedexEntry:: INCLUDE "stats/pokedex/entries/085.asm" -SeelPokedexEntry:: INCLUDE "stats/pokedex/entries/086.asm" -DewgongPokedexEntry:: INCLUDE "stats/pokedex/entries/087.asm" -GrimerPokedexEntry:: INCLUDE "stats/pokedex/entries/088.asm" -MukPokedexEntry:: INCLUDE "stats/pokedex/entries/089.asm" -ShellderPokedexEntry:: INCLUDE "stats/pokedex/entries/090.asm" -CloysterPokedexEntry:: INCLUDE "stats/pokedex/entries/091.asm" -GastlyPokedexEntry:: INCLUDE "stats/pokedex/entries/092.asm" -HaunterPokedexEntry:: INCLUDE "stats/pokedex/entries/093.asm" -GengarPokedexEntry:: INCLUDE "stats/pokedex/entries/094.asm" -OnixPokedexEntry:: INCLUDE "stats/pokedex/entries/095.asm" -DrowzeePokedexEntry:: INCLUDE "stats/pokedex/entries/096.asm" -HypnoPokedexEntry:: INCLUDE "stats/pokedex/entries/097.asm" -KrabbyPokedexEntry:: INCLUDE "stats/pokedex/entries/098.asm" -KinglerPokedexEntry:: INCLUDE "stats/pokedex/entries/099.asm" -VoltorbPokedexEntry:: INCLUDE "stats/pokedex/entries/100.asm" -ElectrodePokedexEntry:: INCLUDE "stats/pokedex/entries/101.asm" -ExeggcutePokedexEntry:: INCLUDE "stats/pokedex/entries/102.asm" -ExeggutorPokedexEntry:: INCLUDE "stats/pokedex/entries/103.asm" -CubonePokedexEntry:: INCLUDE "stats/pokedex/entries/104.asm" -MarowakPokedexEntry:: INCLUDE "stats/pokedex/entries/105.asm" -HitmonleePokedexEntry:: INCLUDE "stats/pokedex/entries/106.asm" -HitmonchanPokedexEntry:: INCLUDE "stats/pokedex/entries/107.asm" -LickitungPokedexEntry:: INCLUDE "stats/pokedex/entries/108.asm" -KoffingPokedexEntry:: INCLUDE "stats/pokedex/entries/109.asm" -WeezingPokedexEntry:: INCLUDE "stats/pokedex/entries/110.asm" -RhyhornPokedexEntry:: INCLUDE "stats/pokedex/entries/111.asm" -RhydonPokedexEntry:: INCLUDE "stats/pokedex/entries/112.asm" -ChanseyPokedexEntry:: INCLUDE "stats/pokedex/entries/113.asm" -TangelaPokedexEntry:: INCLUDE "stats/pokedex/entries/114.asm" -KangaskhanPokedexEntry:: INCLUDE "stats/pokedex/entries/115.asm" -HorseaPokedexEntry:: INCLUDE "stats/pokedex/entries/116.asm" -SeadraPokedexEntry:: INCLUDE "stats/pokedex/entries/117.asm" -GoldeenPokedexEntry:: INCLUDE "stats/pokedex/entries/118.asm" -SeakingPokedexEntry:: INCLUDE "stats/pokedex/entries/119.asm" -StaryuPokedexEntry:: INCLUDE "stats/pokedex/entries/120.asm" -StarmiePokedexEntry:: INCLUDE "stats/pokedex/entries/121.asm" -MrMimePokedexEntry:: INCLUDE "stats/pokedex/entries/122.asm" -ScytherPokedexEntry:: INCLUDE "stats/pokedex/entries/123.asm" -JynxPokedexEntry:: INCLUDE "stats/pokedex/entries/124.asm" -ElectabuzzPokedexEntry:: INCLUDE "stats/pokedex/entries/125.asm" -MagmarPokedexEntry:: INCLUDE "stats/pokedex/entries/126.asm" -PinsirPokedexEntry:: INCLUDE "stats/pokedex/entries/127.asm" -TaurosPokedexEntry:: INCLUDE "stats/pokedex/entries/128.asm" diff --git a/stats/pokedex/entries_3.asm b/stats/pokedex/entries_3.asm deleted file mode 100644 index 2526951ba..000000000 --- a/stats/pokedex/entries_3.asm +++ /dev/null @@ -1,64 +0,0 @@ -MagikarpPokedexEntry:: INCLUDE "stats/pokedex/entries/129.asm" -GyaradosPokedexEntry:: INCLUDE "stats/pokedex/entries/130.asm" -LaprasPokedexEntry:: INCLUDE "stats/pokedex/entries/131.asm" -DittoPokedexEntry:: INCLUDE "stats/pokedex/entries/132.asm" -EeveePokedexEntry:: INCLUDE "stats/pokedex/entries/133.asm" -VaporeonPokedexEntry:: INCLUDE "stats/pokedex/entries/134.asm" -JolteonPokedexEntry:: INCLUDE "stats/pokedex/entries/135.asm" -FlareonPokedexEntry:: INCLUDE "stats/pokedex/entries/136.asm" -PorygonPokedexEntry:: INCLUDE "stats/pokedex/entries/137.asm" -OmanytePokedexEntry:: INCLUDE "stats/pokedex/entries/138.asm" -OmastarPokedexEntry:: INCLUDE "stats/pokedex/entries/139.asm" -KabutoPokedexEntry:: INCLUDE "stats/pokedex/entries/140.asm" -KabutopsPokedexEntry:: INCLUDE "stats/pokedex/entries/141.asm" -AerodactylPokedexEntry:: INCLUDE "stats/pokedex/entries/142.asm" -SnorlaxPokedexEntry:: INCLUDE "stats/pokedex/entries/143.asm" -ArticunoPokedexEntry:: INCLUDE "stats/pokedex/entries/144.asm" -ZapdosPokedexEntry:: INCLUDE "stats/pokedex/entries/145.asm" -MoltresPokedexEntry:: INCLUDE "stats/pokedex/entries/146.asm" -DratiniPokedexEntry:: INCLUDE "stats/pokedex/entries/147.asm" -DragonairPokedexEntry:: INCLUDE "stats/pokedex/entries/148.asm" -DragonitePokedexEntry:: INCLUDE "stats/pokedex/entries/149.asm" -MewtwoPokedexEntry:: INCLUDE "stats/pokedex/entries/150.asm" -MewPokedexEntry:: INCLUDE "stats/pokedex/entries/151.asm" -ChikoritaPokedexEntry:: INCLUDE "stats/pokedex/entries/152.asm" -BayleefPokedexEntry:: INCLUDE "stats/pokedex/entries/153.asm" -MeganiumPokedexEntry:: INCLUDE "stats/pokedex/entries/154.asm" -CyndaquilPokedexEntry:: INCLUDE "stats/pokedex/entries/155.asm" -QuilavaPokedexEntry:: INCLUDE "stats/pokedex/entries/156.asm" -TyphlosionPokedexEntry:: INCLUDE "stats/pokedex/entries/157.asm" -TotodilePokedexEntry:: INCLUDE "stats/pokedex/entries/158.asm" -CroconawPokedexEntry:: INCLUDE "stats/pokedex/entries/159.asm" -FeraligatrPokedexEntry:: INCLUDE "stats/pokedex/entries/160.asm" -SentretPokedexEntry:: INCLUDE "stats/pokedex/entries/161.asm" -FurretPokedexEntry:: INCLUDE "stats/pokedex/entries/162.asm" -HoothootPokedexEntry:: INCLUDE "stats/pokedex/entries/163.asm" -NoctowlPokedexEntry:: INCLUDE "stats/pokedex/entries/164.asm" -LedybaPokedexEntry:: INCLUDE "stats/pokedex/entries/165.asm" -LedianPokedexEntry:: INCLUDE "stats/pokedex/entries/166.asm" -SpinarakPokedexEntry:: INCLUDE "stats/pokedex/entries/167.asm" -AriadosPokedexEntry:: INCLUDE "stats/pokedex/entries/168.asm" -CrobatPokedexEntry:: INCLUDE "stats/pokedex/entries/169.asm" -ChinchouPokedexEntry:: INCLUDE "stats/pokedex/entries/170.asm" -LanturnPokedexEntry:: INCLUDE "stats/pokedex/entries/171.asm" -PichuPokedexEntry:: INCLUDE "stats/pokedex/entries/172.asm" -CleffaPokedexEntry:: INCLUDE "stats/pokedex/entries/173.asm" -IgglybuffPokedexEntry:: INCLUDE "stats/pokedex/entries/174.asm" -TogepiPokedexEntry:: INCLUDE "stats/pokedex/entries/175.asm" -TogeticPokedexEntry:: INCLUDE "stats/pokedex/entries/176.asm" -NatuPokedexEntry:: INCLUDE "stats/pokedex/entries/177.asm" -XatuPokedexEntry:: INCLUDE "stats/pokedex/entries/178.asm" -MareepPokedexEntry:: INCLUDE "stats/pokedex/entries/179.asm" -FlaaffyPokedexEntry:: INCLUDE "stats/pokedex/entries/180.asm" -AmpharosPokedexEntry:: INCLUDE "stats/pokedex/entries/181.asm" -BellossomPokedexEntry:: INCLUDE "stats/pokedex/entries/182.asm" -MarillPokedexEntry:: INCLUDE "stats/pokedex/entries/183.asm" -AzumarillPokedexEntry:: INCLUDE "stats/pokedex/entries/184.asm" -SudowoodoPokedexEntry:: INCLUDE "stats/pokedex/entries/185.asm" -PolitoedPokedexEntry:: INCLUDE "stats/pokedex/entries/186.asm" -HoppipPokedexEntry:: INCLUDE "stats/pokedex/entries/187.asm" -SkiploomPokedexEntry:: INCLUDE "stats/pokedex/entries/188.asm" -JumpluffPokedexEntry:: INCLUDE "stats/pokedex/entries/189.asm" -AipomPokedexEntry:: INCLUDE "stats/pokedex/entries/190.asm" -SunkernPokedexEntry:: INCLUDE "stats/pokedex/entries/191.asm" -SunfloraPokedexEntry:: INCLUDE "stats/pokedex/entries/192.asm" diff --git a/stats/pokedex/entries_4.asm b/stats/pokedex/entries_4.asm deleted file mode 100644 index 90ba19420..000000000 --- a/stats/pokedex/entries_4.asm +++ /dev/null @@ -1,59 +0,0 @@ -YanmaPokedexEntry:: INCLUDE "stats/pokedex/entries/193.asm" -WooperPokedexEntry:: INCLUDE "stats/pokedex/entries/194.asm" -QuagsirePokedexEntry:: INCLUDE "stats/pokedex/entries/195.asm" -EspeonPokedexEntry:: INCLUDE "stats/pokedex/entries/196.asm" -UmbreonPokedexEntry:: INCLUDE "stats/pokedex/entries/197.asm" -MurkrowPokedexEntry:: INCLUDE "stats/pokedex/entries/198.asm" -SlowkingPokedexEntry:: INCLUDE "stats/pokedex/entries/199.asm" -MisdreavusPokedexEntry:: INCLUDE "stats/pokedex/entries/200.asm" -UnownPokedexEntry:: INCLUDE "stats/pokedex/entries/201.asm" -WobbuffetPokedexEntry:: INCLUDE "stats/pokedex/entries/202.asm" -GirafarigPokedexEntry:: INCLUDE "stats/pokedex/entries/203.asm" -PinecoPokedexEntry:: INCLUDE "stats/pokedex/entries/204.asm" -ForretressPokedexEntry:: INCLUDE "stats/pokedex/entries/205.asm" -DunsparcePokedexEntry:: INCLUDE "stats/pokedex/entries/206.asm" -GligarPokedexEntry:: INCLUDE "stats/pokedex/entries/207.asm" -SteelixPokedexEntry:: INCLUDE "stats/pokedex/entries/208.asm" -SnubbullPokedexEntry:: INCLUDE "stats/pokedex/entries/209.asm" -GranbullPokedexEntry:: INCLUDE "stats/pokedex/entries/210.asm" -QwilfishPokedexEntry:: INCLUDE "stats/pokedex/entries/211.asm" -ScizorPokedexEntry:: INCLUDE "stats/pokedex/entries/212.asm" -ShucklePokedexEntry:: INCLUDE "stats/pokedex/entries/213.asm" -HeracrossPokedexEntry:: INCLUDE "stats/pokedex/entries/214.asm" -SneaselPokedexEntry:: INCLUDE "stats/pokedex/entries/215.asm" -TeddiursaPokedexEntry:: INCLUDE "stats/pokedex/entries/216.asm" -UrsaringPokedexEntry:: INCLUDE "stats/pokedex/entries/217.asm" -SlugmaPokedexEntry:: INCLUDE "stats/pokedex/entries/218.asm" -MagcargoPokedexEntry:: INCLUDE "stats/pokedex/entries/219.asm" -SwinubPokedexEntry:: INCLUDE "stats/pokedex/entries/220.asm" -PiloswinePokedexEntry:: INCLUDE "stats/pokedex/entries/221.asm" -CorsolaPokedexEntry:: INCLUDE "stats/pokedex/entries/222.asm" -RemoraidPokedexEntry:: INCLUDE "stats/pokedex/entries/223.asm" -OctilleryPokedexEntry:: INCLUDE "stats/pokedex/entries/224.asm" -DelibirdPokedexEntry:: INCLUDE "stats/pokedex/entries/225.asm" -MantinePokedexEntry:: INCLUDE "stats/pokedex/entries/226.asm" -SkarmoryPokedexEntry:: INCLUDE "stats/pokedex/entries/227.asm" -HoundourPokedexEntry:: INCLUDE "stats/pokedex/entries/228.asm" -HoundoomPokedexEntry:: INCLUDE "stats/pokedex/entries/229.asm" -KingdraPokedexEntry:: INCLUDE "stats/pokedex/entries/230.asm" -PhanpyPokedexEntry:: INCLUDE "stats/pokedex/entries/231.asm" -DonphanPokedexEntry:: INCLUDE "stats/pokedex/entries/232.asm" -Porygon2PokedexEntry:: INCLUDE "stats/pokedex/entries/233.asm" -StantlerPokedexEntry:: INCLUDE "stats/pokedex/entries/234.asm" -SmearglePokedexEntry:: INCLUDE "stats/pokedex/entries/235.asm" -TyroguePokedexEntry:: INCLUDE "stats/pokedex/entries/236.asm" -HitmontopPokedexEntry:: INCLUDE "stats/pokedex/entries/237.asm" -SmoochumPokedexEntry:: INCLUDE "stats/pokedex/entries/238.asm" -ElekidPokedexEntry:: INCLUDE "stats/pokedex/entries/239.asm" -MagbyPokedexEntry:: INCLUDE "stats/pokedex/entries/240.asm" -MiltankPokedexEntry:: INCLUDE "stats/pokedex/entries/241.asm" -BlisseyPokedexEntry:: INCLUDE "stats/pokedex/entries/242.asm" -RaikouPokedexEntry:: INCLUDE "stats/pokedex/entries/243.asm" -EnteiPokedexEntry:: INCLUDE "stats/pokedex/entries/244.asm" -SuicunePokedexEntry:: INCLUDE "stats/pokedex/entries/245.asm" -LarvitarPokedexEntry:: INCLUDE "stats/pokedex/entries/246.asm" -PupitarPokedexEntry:: INCLUDE "stats/pokedex/entries/247.asm" -TyranitarPokedexEntry:: INCLUDE "stats/pokedex/entries/248.asm" -LugiaPokedexEntry:: INCLUDE "stats/pokedex/entries/249.asm" -HoOhPokedexEntry:: INCLUDE "stats/pokedex/entries/250.asm" -CelebiPokedexEntry:: INCLUDE "stats/pokedex/entries/251.asm" diff --git a/stats/pokedex/entries_crystal.asm b/stats/pokedex/entries_crystal.asm deleted file mode 100644 index d33c9d7bc..000000000 --- a/stats/pokedex/entries_crystal.asm +++ /dev/null @@ -1,3 +0,0 @@ -INCLUDE "pokecrystal.asm" -INCLUDE "stats/pokedex/entries.asm" - |