diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/attributes.asm | 1 | ||||
| -rw-r--r-- | data/phone/text/bill.asm | 2 | ||||
| -rw-r--r-- | data/phone/text/trainers.asm (renamed from data/phone/text/trainers1.asm) | 0 | ||||
| -rw-r--r-- | data/pokemon/evos_attacks.asm | 20 | ||||
| -rw-r--r-- | data/trainers/parties.asm | 14 |
5 files changed, 25 insertions, 12 deletions
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index fff261319..31532b36f 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -16,6 +16,7 @@ CURRENT_MAP_HEIGHT = \2_HEIGHT db \4 ENDM +; Connections go in order: north, south, west, east connection: MACRO ;\1: direction ;\2: map name diff --git a/data/phone/text/bill.asm b/data/phone/text/bill.asm index 2eed7d98c..899e0c742 100644 --- a/data/phone/text/bill.asm +++ b/data/phone/text/bill.asm @@ -28,7 +28,7 @@ BillPhoneNiteGreetingText: ; 0x1b44b5 line "SERVICE." done -BillPhoneGeneriText: ; 0x1b44fe +BillPhoneGenericText: ; 0x1b44fe text "Who's calling?" para "<PLAY_G>, is it?" diff --git a/data/phone/text/trainers1.asm b/data/phone/text/trainers.asm index e5dcccddf..e5dcccddf 100644 --- a/data/phone/text/trainers1.asm +++ b/data/phone/text/trainers.asm diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm index 2649bb7a1..b57f88408 100644 --- a/data/pokemon/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -8,6 +8,18 @@ INCLUDE "data/pokemon/evos_attacks_pointers.asm" EvosAttacks:: +; Evos+attacks data structure: +; - Evolution methods: +; * db EVOLVE_LEVEL, level, species +; * db EVOLVE_ITEM, used item, species +; * db EVOLVE_TRADE, held item (or -1 for none), species +; * db EVOLVE_HAPPINESS, TR_* constant (ANYTIME, MORNDAY, NITE), species +; * db EVOLVE_STAT, level, ATK_*_DEF constant (LT, GT, EQ), species +; - db 0 ; no more evolutions +; - Learnset (in increasing level order): +; * db level, move +; - db 0 ; no more level-up moves + BulbasaurEvosAttacks: db EVOLVE_LEVEL, 16, IVYSAUR @@ -831,7 +843,7 @@ AbraEvosAttacks: db 0 ; no more level-up moves KadabraEvosAttacks: - db EVOLVE_TRADE, $ff, ALAKAZAM + db EVOLVE_TRADE, -1, ALAKAZAM db 0 ; no more evolutions db 1, TELEPORT db 1, KINESIS @@ -875,7 +887,7 @@ MachopEvosAttacks: db 0 ; no more level-up moves MachokeEvosAttacks: - db EVOLVE_TRADE, $ff, MACHAMP + db EVOLVE_TRADE, -1, MACHAMP db 0 ; no more evolutions db 1, LOW_KICK db 1, LEER @@ -989,7 +1001,7 @@ GeodudeEvosAttacks: db 0 ; no more level-up moves GravelerEvosAttacks: - db EVOLVE_TRADE, $ff, GOLEM + db EVOLVE_TRADE, -1, GOLEM db 0 ; no more evolutions db 1, TACKLE db 1, DEFENSE_CURL @@ -1248,7 +1260,7 @@ GastlyEvosAttacks: db 0 ; no more level-up moves HaunterEvosAttacks: - db EVOLVE_TRADE, $ff, GENGAR + db EVOLVE_TRADE, -1, GENGAR db 0 ; no more evolutions db 1, HYPNOSIS db 1, LICK diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 805dbe38e..3c07e6597 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -1,12 +1,12 @@ Trainers: ; Trainer data structure: -; db "NAME@", TRAINERTYPE_* constant -; 1 to 6 Pokémon: -; * for TRAINERTYPE_NORMAL: db level, species -; * for TRAINERTYPE_ITEM: db level, species, item -; * for TRAINERTYPE_MOVES: db level, species, 4 moves -; * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves -; db -1 ; end +; - db "NAME@", TRAINERTYPE_* constant +; - 1 to 6 Pokémon: +; * for TRAINERTYPE_NORMAL: db level, species +; * for TRAINERTYPE_ITEM: db level, species, item +; * for TRAINERTYPE_MOVES: db level, species, 4 moves +; * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves +; - db -1 ; end FalknerGroup: |