Skip to content

Commit

Permalink
Ban Japanese Gen 1 Events in Int Formats: Part 2 (smogon#7581)
Browse files Browse the repository at this point in the history
Co-authored-by: Guangcong Luo <guangcongluo@gmail.com>
  • Loading branch information
2 people authored and Quanyails committed May 12, 2021
1 parent 428bf81 commit 5dde3aa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 4 additions & 4 deletions data/mods/gen2/learnsets.ts
Expand Up @@ -998,7 +998,7 @@ export const Learnsets: {[k: string]: ModdedLearnsetData} = {
whirlwind: ["1M"],
},
eventData: [
{generation: 1, level: 20, moves: ["growl", "leer", "furyattack", "payday"]},
{generation: 1, level: 20, moves: ["growl", "leer", "furyattack", "payday"], japan: true},
],
},
ekans: {
Expand Down Expand Up @@ -1201,7 +1201,7 @@ export const Learnsets: {[k: string]: ModdedLearnsetData} = {
},
eventData: [
{generation: 1, level: 5, moves: ["surf"]},
{generation: 1, level: 5, moves: ["fly"]},
{generation: 1, level: 5, moves: ["fly"], japan: true},
{generation: 1, level: 5, moves: ["thundershock", "growl", "surf"]},
],
},
Expand Down Expand Up @@ -4206,7 +4206,7 @@ export const Learnsets: {[k: string]: ModdedLearnsetData} = {
toxic: ["2M", "1M"],
},
eventData: [
{generation: 1, level: 40, moves: ["ember", "firespin", "stomp", "payday"]},
{generation: 1, level: 40, moves: ["ember", "firespin", "stomp", "payday"], japan: true},
],
},
slowpoke: {
Expand Down Expand Up @@ -7230,7 +7230,7 @@ export const Learnsets: {[k: string]: ModdedLearnsetData} = {
tackle: ["2L15", "1L15"],
},
eventData: [
{generation: 1, level: 5, moves: ["dragonrage"]},
{generation: 1, level: 5, moves: ["dragonrage"], japan: true},
{generation: 2, level: 5, shiny: 1, moves: ["splash", "bubble"]},
{generation: 2, level: 5, shiny: 1, moves: ["splash", "reversal"]},
],
Expand Down
2 changes: 2 additions & 0 deletions sim/global-types.ts
Expand Up @@ -116,6 +116,8 @@ interface EventInfo {
moves?: string[];
pokeball?: string;
from?: string;
/** Japan-only events can't be transferred to international games in Gen 1 */
japan?: boolean;
}

type Effect = Ability | Item | ActiveMove | Species | Condition | Format;
Expand Down

0 comments on commit 5dde3aa

Please sign in to comment.