diff options
| author | YamaArashi <shadow962@live.com> | 2015-10-13 06:59:37 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-10-13 06:59:37 -0700 |
| commit | f678112ce1c204decbef5c089a19e46af76dca4e (patch) | |
| tree | ff206cef2a45e2e14dcbb1e516d1833d6c50ff9a | |
| parent | 654b3eef7c8d29d0caeec31788a1be15d5f14ddb (diff) | |
nature stat table
| -rw-r--r-- | asm/emerald.s | 6 | ||||
| -rw-r--r-- | data/data2.s | 4 | ||||
| -rw-r--r-- | data/nature_stat_table.s | 27 |
3 files changed, 32 insertions, 5 deletions
diff --git a/asm/emerald.s b/asm/emerald.s index 7f2e6102b..e70726274 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -195207,7 +195207,7 @@ nature_stat_mod: ; 806D8D4 adds r0, r3, 0 b @0806D92E @0806D8F2: - ldr r0, =gUnknown_0831E818 + ldr r0, =gNatureStatTable lsls r1, r4, 2 adds r1, r4 subs r1, 0x1 @@ -777048,7 +777048,7 @@ sub_81924E0: ; 81924E0 adds r0, r3 ldrb r2, [r0] @08192B7E: - ldr r1, =gUnknown_0831E818 + ldr r1, =gNatureStatTable lsls r0, r2, 2 adds r0, r2 adds r0, r5, r0 @@ -777222,7 +777222,7 @@ sub_81924E0: ; 81924E0 lsls r0, r2, 2 adds r0, r2 adds r0, r5, r0 - ldr r1, =gUnknown_0831E818 + ldr r1, =gNatureStatTable adds r0, r1 ldrb r0, [r0] lsls r0, 24 diff --git a/data/data2.s b/data/data2.s index c4fe0e761..64a506879 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1645,8 +1645,8 @@ gUnknown_0831C89C: ; 831C89C ; 831E380 .include "data/item_effect_info.s" -gUnknown_0831E818: ; 831E818 - .incbin "base_emerald.gba", 0x31e818, 0x80 +; 831E818 + .include "data/nature_stat_table.s" ; 831E898 .include "data/tm_hm_learnsets.s" diff --git a/data/nature_stat_table.s b/data/nature_stat_table.s new file mode 100644 index 000000000..d0c5e9f1b --- /dev/null +++ b/data/nature_stat_table.s @@ -0,0 +1,27 @@ +gNatureStatTable: ; 831E818 +; 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 |