diff options
| -rw-r--r-- | data/moves/tmhm_moves.asm | 2 | ||||
| -rw-r--r-- | data/pokemon/base_stats.asm | 3 | ||||
| -rw-r--r-- | data/pokemon/base_stats/annon.asm | 2 | ||||
| -rw-r--r-- | data/pokemon/base_stats/nidoran_f.asm (renamed from data/pokemon/base_stats/nidoranf.asm) | 0 | ||||
| -rw-r--r-- | data/pokemon/base_stats/nidoran_m.asm (renamed from data/pokemon/base_stats/nidoranm.asm) | 0 | ||||
| -rw-r--r-- | data/pokemon/dex_order_alpha.asm | 2 | ||||
| -rw-r--r-- | data/pokemon/evos_attacks.asm | 5 | ||||
| -rw-r--r-- | main.asm | 15 |
8 files changed, 16 insertions, 13 deletions
diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index 457eb60..c971bc7 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -1,5 +1,3 @@ -SECTION "TM/HM Moves", ROMX[$52D1],BANK[4] - ; This is a nearly-sequential table of new moves. ; It was probably meant for easy testing, not as ; a final set of TM moves. diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 9aea680..3e1ef5c 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -1,6 +1,3 @@ -SECTION "Base Data", ROMX[$4F10],BANK[$14] - - tmhm: MACRO ; used in data/pokemon/base_stats/*.asm tms1 = 0 ; TM01-TM24 (24) diff --git a/data/pokemon/base_stats/annon.asm b/data/pokemon/base_stats/annon.asm index 9c32103..432308f 100644 --- a/data/pokemon/base_stats/annon.asm +++ b/data/pokemon/base_stats/annon.asm @@ -10,7 +10,7 @@ db GENDER_50_50 ; gender ratio db 100, 4, 70 ; unknown dn 5, 5 ; sprite dimensions - dw UnownPicPtrsFront, dw UnownPicPtrsBack ; sprites + dw AnnonPicPtrsFront, AnnonPicPtrsBack ; sprites db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/nidoranf.asm b/data/pokemon/base_stats/nidoran_f.asm index 2fe41c4..2fe41c4 100644 --- a/data/pokemon/base_stats/nidoranf.asm +++ b/data/pokemon/base_stats/nidoran_f.asm diff --git a/data/pokemon/base_stats/nidoranm.asm b/data/pokemon/base_stats/nidoran_m.asm index 6d5a71c..6d5a71c 100644 --- a/data/pokemon/base_stats/nidoranm.asm +++ b/data/pokemon/base_stats/nidoran_m.asm diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 50e0ca6..3f7b5f6 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -1,5 +1,3 @@ -SECTION "Alphabetical Pokedex Order", ROMX[$4943],BANK[$10] - ; Every Pokémon sorted alphabetically by name (gojūon order). AlphabeticalPokedexOrder: ; 0x40943 diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm index 65bd7a3..d662dce 100644 --- a/data/pokemon/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -1,8 +1,3 @@ -INCLUDE "constants.asm" - - -SECTION "Evolutions and Attacks", ROMX[$6493],BANK[$10] - ; Evolutions for Pokémon available in the demo were removed, ; and have been left in comments. @@ -31,6 +31,21 @@ MainMenuStrings: ; 01:5428 db "じかんセット@" ; 01:5457 +SECTION "TM/HM Moves", ROMX[$52D1],BANK[$04] +INCLUDE "data/moves/tmhm_moves.asm" + +SECTION "Type Matchups", ROMX[$506D],BANK[$0D] +INCLUDE "data/types/type_matchups.asm" + +SECTION "Alphabetical Pokedex Order", ROMX[$4943],BANK[$10] +INCLUDE "data/pokemon/dex_order_alpha.asm" + +SECTION "Evolutions and Attacks", ROMX[$6493],BANK[$10] +INCLUDE "data/pokemon/evos_attacks.asm" + +;SECTION "Base Data", ROMX[$4F10],BANK[$14] +;INCLUDE "data/pokemon/base_stats.asm" + SECTION "Annon Pic Ptrs and Pics", ROMX[$4d6a], BANK[$1f] INCLUDE "gfx/pokemon/annon_pic_ptrs.asm" INCLUDE "gfx/pokemon/annon_pics.asm" |