diff options
| -rw-r--r-- | data/nature_stat_table.inc | 27 | ||||
| -rw-r--r-- | data/pokemon.s | 3 | ||||
| -rw-r--r-- | src/pokemon_data.c | 29 |
3 files changed, 29 insertions, 30 deletions
diff --git a/data/nature_stat_table.inc b/data/nature_stat_table.inc deleted file mode 100644 index e09d41a43..000000000 --- a/data/nature_stat_table.inc +++ /dev/null @@ -1,27 +0,0 @@ -gNatureStatTable:: @ 81FD070 - @ Atk Def Spd Sp.Atk Sp.Def - .byte 0, 0, 0, 0, 0 @ Hardy - .byte 1, -1, 0, 0, 0 @ Lonely - .byte 1, 0, -1, 0, 0 @ Brave - .byte 1, 0, 0, -1, 0 @ Adamant - .byte 1, 0, 0, 0, -1 @ Naughty - .byte -1, 1, 0, 0, 0 @ Bold - .byte 0, 0, 0, 0, 0 @ Docile - .byte 0, 1, -1, 0, 0 @ Relaxed - .byte 0, 1, 0, -1, 0 @ Impish - .byte 0, 1, 0, 0, -1 @ Lax - .byte -1, 0, 1, 0, 0 @ Timid - .byte 0, -1, 1, 0, 0 @ Hasty - .byte 0, 0, 0, 0, 0 @ Serious - .byte 0, 0, 1, -1, 0 @ Jolly - .byte 0, 0, 1, 0, -1 @ Naive - .byte -1, 0, 0, 1, 0 @ Modest - .byte 0, -1, 0, 1, 0 @ Mild - .byte 0, 0, -1, 1, 0 @ Quiet - .byte 0, 0, 0, 0, 0 @ Bashful - .byte 0, 0, 0, 1, -1 @ Rash - .byte -1, 0, 0, 0, 1 @ Calm - .byte 0, -1, 0, 0, 1 @ Gentle - .byte 0, 0, -1, 0, 1 @ Sassy - .byte 0, 0, 0, -1, 1 @ Careful - .byte 0, 0, 0, 0, 0 @ Quirky diff --git a/data/pokemon.s b/data/pokemon.s index 9b517810c..1fcbcebc4 100644 --- a/data/pokemon.s +++ b/data/pokemon.s @@ -3,9 +3,6 @@ .section .rodata -@ 81FD070 - .include "data/nature_stat_table.inc" - @ 81FD0F0 .include "data/tm_hm_learnsets.inc" diff --git a/src/pokemon_data.c b/src/pokemon_data.c index 39f2a7509..df698d12d 100644 --- a/src/pokemon_data.c +++ b/src/pokemon_data.c @@ -902,3 +902,32 @@ const u8 *const gItemEffectTable[] = { NULL, NULL }; + +const s8 gNatureStatTable[][5] = { + // Atk Def Spd Sp.Atk Sp.Def + { 0, 0, 0, 0, 0}, // Hardy + { 1, -1, 0, 0, 0}, // Lonely + { 1, 0, -1, 0, 0}, // Brave + { 1, 0, 0, -1, 0}, // Adamant + { 1, 0, 0, 0, -1}, // Naughty + { -1, 1, 0, 0, 0}, // Bold + { 0, 0, 0, 0, 0}, // Docile + { 0, 1, -1, 0, 0}, // Relaxed + { 0, 1, 0, -1, 0}, // Impish + { 0, 1, 0, 0, -1}, // Lax + { -1, 0, 1, 0, 0}, // Timid + { 0, -1, 1, 0, 0}, // Hasty + { 0, 0, 0, 0, 0}, // Serious + { 0, 0, 1, -1, 0}, // Jolly + { 0, 0, 1, 0, -1}, // Naive + { -1, 0, 0, 1, 0}, // Modest + { 0, -1, 0, 1, 0}, // Mild + { 0, 0, -1, 1, 0}, // Quiet + { 0, 0, 0, 0, 0}, // Bashful + { 0, 0, 0, 1, -1}, // Rash + { -1, 0, 0, 0, 1}, // Calm + { 0, -1, 0, 0, 1}, // Gentle + { 0, 0, -1, 0, 1}, // Sassy + { 0, 0, 0, -1, 1}, // Careful + { 0, 0, 0, 0, 0} // Quirky +}; |