From a7e358cd7e3bb99b3189afe753831656fcc0c354 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 31 May 2018 19:47:03 -0400 Subject: Keep pokemon data in data/pokemon Don't print "Here" a lot 'make mostlyclean' needs to remove .d files in case a file was renamed --- data/pokemon/palettes.inc | 257 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 257 insertions(+) create mode 100755 data/pokemon/palettes.inc (limited to 'data/pokemon') diff --git a/data/pokemon/palettes.inc b/data/pokemon/palettes.inc new file mode 100755 index 0000000..41ca0d5 --- /dev/null +++ b/data/pokemon/palettes.inc @@ -0,0 +1,257 @@ +PokemonPalettes: + db PAL_MEWMON ; NONE + db PAL_GREENMON ; FUSHIGIDANE + db PAL_GREENMON ; FUSHIGISOU + db PAL_GREENMON ; FUSHIGIBANA + db PAL_REDMON ; HITOKAGE + db PAL_REDMON ; LIZARDO + db PAL_REDMON ; LIZARDON + db PAL_CYANMON ; ZENIGAME + db PAL_CYANMON ; KAMEIL + db PAL_CYANMON ; KAMEX + db PAL_GREENMON ; CATERPIE + db PAL_GREENMON ; TRANSEL + db PAL_CYANMON ; BUTTERFREE + db PAL_YELLOWMON ; BEEDLE + db PAL_YELLOWMON ; COCOON + db PAL_YELLOWMON ; SPEAR + db PAL_BROWNMON ; POPPO + db PAL_BROWNMON ; PIGEON + db PAL_BROWNMON ; PIGEOT + db PAL_GREYMON ; KORATTA + db PAL_GREYMON ; RATTA + db PAL_BROWNMON ; ONISUZUME + db PAL_BROWNMON ; ONIDRILL + db PAL_PURPLEMON ; ARBO + db PAL_PURPLEMON ; ARBOK + db PAL_YELLOWMON ; PIKACHU + db PAL_YELLOWMON ; RAICHU + db PAL_BROWNMON ; SAND + db PAL_BROWNMON ; SANDPAN + db PAL_BLUEMON ; NIDORAN_F + db PAL_BLUEMON ; NIDORINA + db PAL_BLUEMON ; NIDOQUEEN + db PAL_PURPLEMON ; NIDORAN_M + db PAL_PURPLEMON ; NIDORINO + db PAL_PURPLEMON ; NIDOKING + db PAL_PINKMON ; PIPPI + db PAL_PINKMON ; PIXY + db PAL_REDMON ; ROKON + db PAL_YELLOWMON ; KYUKON + db PAL_PINKMON ; PURIN + db PAL_PINKMON ; PUKURIN + db PAL_BLUEMON ; ZUBAT + db PAL_BLUEMON ; GOLBAT + db PAL_GREENMON ; NAZONOKUSA + db PAL_REDMON ; KUSAIHANA + db PAL_REDMON ; RUFFRESIA + db PAL_REDMON ; PARAS + db PAL_REDMON ; PARASECT + db PAL_PURPLEMON ; KONGPANG + db PAL_PURPLEMON ; MORPHON + db PAL_BROWNMON ; DIGDA + db PAL_BROWNMON ; DUGTRIO + db PAL_YELLOWMON ; NYARTH + db PAL_YELLOWMON ; PERSIAN + db PAL_YELLOWMON ; KODUCK + db PAL_CYANMON ; GOLDUCK + db PAL_BROWNMON ; MANKEY + db PAL_BROWNMON ; OKORIZARU + db PAL_BROWNMON ; GARDIE + db PAL_REDMON ; WINDIE + db PAL_BLUEMON ; NYOROMO + db PAL_BLUEMON ; NYOROZO + db PAL_BLUEMON ; NYOROBON + db PAL_YELLOWMON ; CASEY + db PAL_YELLOWMON ; YUNGERER + db PAL_YELLOWMON ; FOODIN + db PAL_GREYMON ; WANRIKY + db PAL_GREYMON ; GORIKY + db PAL_GREYMON ; KAIRIKY + db PAL_GREENMON ; MADATSUBOMI + db PAL_GREENMON ; UTSUDON + db PAL_GREENMON ; UTSUBOT + db PAL_CYANMON ; MENOKURAGE + db PAL_CYANMON ; DOKUKURAGE + db PAL_GREYMON ; ISITSUBUTE + db PAL_GREYMON ; GOLONE + db PAL_GREYMON ; GOLONYA + db PAL_REDMON ; PONYTA + db PAL_REDMON ; GALLOP + db PAL_PINKMON ; YADON + db PAL_PINKMON ; YADORAN + db PAL_GREYMON ; COIL + db PAL_GREYMON ; RARECOIL + db PAL_BROWNMON ; KAMONEGI + db PAL_BROWNMON ; DODO + db PAL_BROWNMON ; DODORIO + db PAL_BLUEMON ; PAWOU + db PAL_BLUEMON ; JUGON + db PAL_PURPLEMON ; BETBETER + db PAL_PURPLEMON ; BETBETON + db PAL_GREYMON ; SHELLDER + db PAL_GREYMON ; PARSHEN + db PAL_PURPLEMON ; GHOS + db PAL_PURPLEMON ; GHOST + db PAL_PURPLEMON ; GANGAR + db PAL_GREYMON ; IWARK + db PAL_YELLOWMON ; SLEEPE + db PAL_YELLOWMON ; SLEEPER + db PAL_REDMON ; CRAB + db PAL_REDMON ; KINGLER + db PAL_YELLOWMON ; BIRIRIDAMA + db PAL_YELLOWMON ; MARUMINE + db PAL_PINKMON ; TAMATAMA + db PAL_GREENMON ; NASSY + db PAL_GREYMON ; KARAKARA + db PAL_GREYMON ; GARAGARA + db PAL_BROWNMON ; SAWAMULAR + db PAL_BROWNMON ; EBIWALAR + db PAL_PINKMON ; BERORINGA + db PAL_PURPLEMON ; DOGARS + db PAL_PURPLEMON ; MATADOGAS + db PAL_GREYMON ; SIHORN + db PAL_GREYMON ; SIDON + db PAL_PINKMON ; LUCKY + db PAL_BLUEMON ; MONJARA + db PAL_BROWNMON ; GARURA + db PAL_CYANMON ; TATTU + db PAL_CYANMON ; SEADRA + db PAL_REDMON ; TOSAKINTO + db PAL_REDMON ; AZUMAO + db PAL_REDMON ; HITODEMAN + db PAL_GREYMON ; STARMIE + db PAL_PINKMON ; BARRIERD + db PAL_GREENMON ; STRIKE + db PAL_MEWMON ; ROUGELA + db PAL_YELLOWMON ; ELEBOO + db PAL_REDMON ; BOOBER + db PAL_BROWNMON ; KAILIOS + db PAL_GREYMON ; KENTAUROS + db PAL_REDMON ; KOIKING + db PAL_BLUEMON ; GYARADOS + db PAL_CYANMON ; LAPLACE + db PAL_GREYMON ; METAMON + db PAL_GREYMON ; EIEVUI + db PAL_CYANMON ; SHOWERS + db PAL_YELLOWMON ; THUNDERS + db PAL_REDMON ; BOOSTER + db PAL_GREYMON ; PORYGON + db PAL_BLUEMON ; OMNITE + db PAL_BLUEMON ; OMSTAR + db PAL_BROWNMON ; KABUTO + db PAL_BROWNMON ; KABUTOPS + db PAL_GREYMON ; PTERA + db PAL_PINKMON ; KABIGON + db PAL_BLUEMON ; FREEZER + db PAL_YELLOWMON ; THUNDER + db PAL_REDMON ; FIRE + db PAL_GREYMON ; MINIRYU + db PAL_BLUEMON ; HAKURYU + db PAL_BROWNMON ; KAIRYU + db PAL_MEWMON ; MEWTWO + db PAL_MEWMON ; MEW + db PAL_GREENMON ; HAPPA + db PAL_GREENMON ; HANAMOGURA + db PAL_GREENMON ; HANARYU + db PAL_REDMON ; HONOGUMA + db PAL_REDMON ; VOLBEAR + db PAL_REDMON ; DYNABEAR + db PAL_CYANMON ; KURUSU + db PAL_CYANMON ; AQUA + db PAL_CYANMON ; AQUARIA + db PAL_BROWNMON ; HOHO + db PAL_BROWNMON ; BOBO + db PAL_PINKMON ; PACHIMEE + db PAL_PINKMON ; MOKOKO + db PAL_YELLOWMON ; DENRYU + db PAL_REDMON ; MIKON + db PAL_GREENMON ; MONJA + db PAL_GREENMON ; JARANRA + db PAL_CYANMON ; HANEEI + db PAL_BLUEMON ; PUKU + db PAL_BLUEMON ; SHIBIREFUGU + db PAL_YELLOWMON ; PICHU + db PAL_PINKMON ; PY + db PAL_PINKMON ; PUPURIN + db PAL_CYANMON ; MIZUUO + db PAL_BROWNMON ; NATY + db PAL_BROWNMON ; NATIO + db PAL_REDMON ; GYOPIN + db PAL_PINKMON ; MARIL + db PAL_CYANMON ; MANBO1 + db PAL_CYANMON ; IKARI + db PAL_BLUEMON ; GROTESS + db PAL_PURPLEMON ; EKSING + db PAL_REDMON ; PARA + db PAL_PURPLEMON ; KOKUMO + db PAL_PURPLEMON ; TWOHEAD + db PAL_GREYMON ; YOROIDORI + db PAL_GREYMON ; ANIMON + db PAL_BROWNMON ; HINAZU + db PAL_YELLOWMON ; SUNNY + db PAL_CYANMON ; PAON + db PAL_BROWNMON ; DONPHAN + db PAL_PURPLEMON ; TWINZ + db PAL_YELLOWMON ; KIRINRIKI + db PAL_BROWNMON ; PAINTER + db PAL_YELLOWMON ; KOUNYA + db PAL_BROWNMON ; RINRIN + db PAL_BROWNMON ; BERURUN + db PAL_GREENMON ; NYOROTONO + db PAL_PINKMON ; YADOKING + db PAL_MEWMON ; ANNON + db PAL_GREENMON ; REDIBA + db PAL_REDMON ; MITSUBOSHI + db PAL_REDMON ; PUCHICORN + db PAL_YELLOWMON ; EIFIE + db PAL_GREYMON ; BLACKY + db PAL_GREYMON ; TURBAN + db PAL_GREYMON ; BETBABY + db PAL_BLUEMON ; TEPPOUO + db PAL_REDMON ; OKUTANK + db PAL_BROWNMON ; GONGU + db PAL_BROWNMON ; KAPOERER + db PAL_BROWNMON ; PUDIE + db PAL_GREENMON ; HANEKO + db PAL_YELLOWMON ; POPONEKO + db PAL_PINKMON ; WATANEKO + db PAL_PINKMON ; BARIRINA + db PAL_MEWMON ; LIP + db PAL_YELLOWMON ; ELEBABY + db PAL_REDMON ; BOOBY + db PAL_PURPLEMON ; KIREIHANA + db PAL_GREENMON ; TSUBOMITTO + db PAL_BROWNMON ; MILTANK + db PAL_REDMON ; BOMBSEEKER + db PAL_REDMON ; GIFT + db PAL_YELLOWMON ; KOTORA + db PAL_YELLOWMON ; RAITORA + db PAL_BROWNMON ; MADAME + db PAL_BROWNMON ; NOROWARA + db PAL_PURPLEMON ; KYONPAN + db PAL_BLUEMON ; YAMIKARASU + db PAL_PINKMON ; HAPPI + db PAL_GREENMON ; SCISSORS + db PAL_BROWNMON ; PURAKKUSU + db PAL_REDMON ; DEVIL + db PAL_REDMON ; HELGAA + db PAL_BROWNMON ; WOLFMAN + db PAL_BROWNMON ; WARWOLF + db PAL_GREYMON ; PORYGON2 + db PAL_PINKMON ; NAMEIL + db PAL_GREYMON ; HAGANEIL + db PAL_BLUEMON ; KINGDRA + db PAL_YELLOWMON ; RAI + db PAL_REDMON ; EN + db PAL_CYANMON ; SUI + db PAL_BROWNMON ; NYULA + db PAL_REDMON ; HOUOU + db PAL_YELLOWMON ; TOGEPY + db PAL_BROWNMON ; BULU + db PAL_BROWNMON ; TAIL + db PAL_GREENMON ; LEAFY + db PAL_MEWMON ; NONE + db PAL_MEWMON ; NONE + db PAL_MEWMON ; NONE + db PAL_MEWMON ; NONE -- cgit v1.2.3 From 17c9b0eb5583dbfa0ff570fcaafec700c6262644 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 1 Jun 2018 10:46:40 -0400 Subject: Use fullwidth digits --- data/pokemon/names.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/pokemon') diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 29cf7e2..54d5263 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -182,7 +182,7 @@ PokemonNames:: db "ネイティオ" ; NATIO db "ギョピン@" ; GYOPIN db "マりル@@" ; MARIL - db "マンボー1" ; MANBO1 + db "マンボー１" ; MANBO1 db "イカり@@" ; IKARI db "グロテス@" ; GROTESS db "エクシング" ; EKSING @@ -241,7 +241,7 @@ PokemonNames:: db "へルガー@" ; HELGAA db "ウルフマン" ; WOLFMAN db "ワーウルフ" ; WARWOLF - db "ポりゴン2" ; PORYGON2 + db "ポりゴン２" ; PORYGON2 db "ナメール@" ; NAMEIL db "ハガネール" ; HAGANEIL db "キングドラ" ; KINGDRA -- cgit v1.2.3 From ad60797a76977212eda395502377862fc0dc1c42 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 2 Jun 2018 11:16:22 -0400 Subject: =?UTF-8?q?MOVE=5FPSYCHIC=5FM=20=E2=86=92=20MOVE=5FPSYCHIC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/pokemon/evos_attacks.asm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'data/pokemon') diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm index e78a5d0..c18757b 100644 --- a/data/pokemon/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -622,7 +622,7 @@ KongpangEvosAttacks: ; 42a1c db 35, MOVE_LEECH_LIFE db 42, MOVE_PSYBEAM db 49, MOVE_SLEEP_POWDER - db 56, MOVE_PSYCHIC_M + db 56, MOVE_PSYCHIC db 0 ; no more level-up moves MorphonEvosAttacks: ; 42a33 @@ -635,7 +635,7 @@ MorphonEvosAttacks: ; 42a33 db 40, MOVE_LEECH_LIFE db 48, MOVE_PSYBEAM db 56, MOVE_SLEEP_POWDER - db 64, MOVE_PSYCHIC_M + db 64, MOVE_PSYCHIC db 0 ; no more level-up moves DigdaEvosAttacks: ; 42a47 @@ -825,7 +825,7 @@ YungererEvosAttacks: ; 42b5d db 36, MOVE_RECOVER db 41, MOVE_REFLECT db 41, MOVE_LIGHT_SCREEN - db 46, MOVE_PSYCHIC_M + db 46, MOVE_PSYCHIC db 0 ; no more level-up moves FoodinEvosAttacks: ; 42b76 @@ -839,7 +839,7 @@ FoodinEvosAttacks: ; 42b76 db 36, MOVE_RECOVER db 41, MOVE_REFLECT db 41, MOVE_LIGHT_SCREEN - db 46, MOVE_PSYCHIC_M + db 46, MOVE_PSYCHIC db 0 ; no more level-up moves WanrikyEvosAttacks: ; 42b8c @@ -1032,7 +1032,7 @@ YadonEvosAttacks: ; 42cb3 db 22, MOVE_WATER_GUN db 31, MOVE_HEADBUTT db 41, MOVE_AMNESIA - db 52, MOVE_PSYCHIC_M + db 52, MOVE_PSYCHIC db 0 ; no more level-up moves YadoranEvosAttacks: ; 42cc6 @@ -1045,7 +1045,7 @@ YadoranEvosAttacks: ; 42cc6 db 37, MOVE_WITHDRAW db 39, MOVE_HEADBUTT db 51, MOVE_AMNESIA - db 64, MOVE_PSYCHIC_M + db 64, MOVE_PSYCHIC db 0 ; no more level-up moves CoilEvosAttacks: ; 42cdc @@ -1269,7 +1269,7 @@ SleepeEvosAttacks: ; 42e30 db 26, MOVE_POISON_GAS db 31, MOVE_MEDITATE db 36, MOVE_STALKER - db 41, MOVE_PSYCHIC_M + db 41, MOVE_PSYCHIC db 46, MOVE_CONFUSE_RAY db 0 ; no more level-up moves @@ -1283,7 +1283,7 @@ SleeperEvosAttacks: ; 42e49 db 31, MOVE_POISON_GAS db 37, MOVE_MEDITATE db 43, MOVE_STALKER - db 49, MOVE_PSYCHIC_M + db 49, MOVE_PSYCHIC db 55, MOVE_CONFUSE_RAY db 0 ; no more level-up moves @@ -1994,7 +1994,7 @@ MewtwoEvosAttacks: ; 432bf db 46, MOVE_RECOVER db 58, MOVE_SAFEGUARD db 71, MOVE_BARRIER - db 85, MOVE_PSYCHIC_M + db 85, MOVE_PSYCHIC db 100, MOVE_AMNESIA db 0 ; no more level-up moves @@ -2465,7 +2465,7 @@ KokumoEvosAttacks: ; 435a2 db 26, MOVE_BITE db 34, MOVE_SPIDER_WEB db 43, MOVE_NIGHT_SHADE - db 53, MOVE_PSYCHIC_M + db 53, MOVE_PSYCHIC db 0 ; no more level-up moves TwoheadEvosAttacks: ; 435b9 @@ -2478,7 +2478,7 @@ TwoheadEvosAttacks: ; 435b9 db 31, MOVE_BITE db 40, MOVE_SPIDER_WEB db 50, MOVE_NIGHT_SHADE - db 61, MOVE_PSYCHIC_M + db 61, MOVE_PSYCHIC db 0 ; no more level-up moves YoroidoriEvosAttacks: ; 435cd @@ -2644,7 +2644,7 @@ YadokingEvosAttacks: ; 436b6 db 37, MOVE_SWAGGER db 39, MOVE_HEADBUTT db 51, MOVE_AMNESIA - db 64, MOVE_PSYCHIC_M + db 64, MOVE_PSYCHIC db 0 ; no more level-up moves AnnonEvosAttacks: ; 436ca @@ -2697,7 +2697,7 @@ EifieEvosAttacks: ; 436ff db 42, MOVE_AGILITY db 49, MOVE_REFLECT db 56, MOVE_LIGHT_SCREEN - db 63, MOVE_PSYCHIC_M + db 63, MOVE_PSYCHIC db 0 ; no more level-up moves BlackyEvosAttacks: ; 43715 @@ -2998,7 +2998,7 @@ NorowaraEvosAttacks: ; 438d5 db 35, MOVE_CONFUSION db 46, MOVE_NIGHT_SHADE db 58, MOVE_SUBSTITUTE - db 71, MOVE_PSYCHIC_M + db 71, MOVE_PSYCHIC db 85, MOVE_PAIN_SPLIT db 100, MOVE_NAIL_DOWN db 0 ; no more level-up moves -- cgit v1.2.3