summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-07-10 20:37:42 -0700
committerYamaArashi <shadow962@live.com>2016-07-10 20:37:42 -0700
commit324e7e7d1ee7cee8cb6217ae8a2671dfb2301cfd (patch)
tree8b2ea71b675b603e4e4f8e653a157b287b284070
parent8e7173b4f5f70b27b84b2ec211abcf315739dc2d (diff)
nature power moves and other misc data
-rw-r--r--asm/rom3.s2
-rw-r--r--data/data2.s43
2 files changed, 40 insertions, 5 deletions
diff --git a/asm/rom3.s b/asm/rom3.s
index 10790af42..a703f976e 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -64455,7 +64455,7 @@ atkCC_callterrainattack: @ 8029F50
_08029FA0: .4byte 0x02024c6c
_08029FA4: .4byte 0xfffffbff
_08029FA8: .4byte 0x02024be6
-_08029FAC: .4byte gUnknown_081FAD32
+_08029FAC: .4byte gNaturePowerMoves
_08029FB0: .4byte 0x0300428c
_08029FB4: .4byte 0x02024c08
_08029FB8: .4byte gUnknown_081D6BBC
diff --git a/data/data2.s b/data/data2.s
index 0776bb783..e407a4efa 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -1295,14 +1295,49 @@ gUnknown_081FACEF:: @ 81FACEF
gUnknown_081FACF6:: @ 81FACF6
.incbin "baserom.gba", 0x001facf6, 0x8
+ .align 1
gUnknown_081FACFE:: @ 81FACFE
- .incbin "baserom.gba", 0x001facfe, 0x28
+ .2byte MOVE_METRONOME
+ .2byte MOVE_STRUGGLE
+ .2byte MOVE_SKETCH
+ .2byte MOVE_MIMIC
+ .2byte 0xFFFE
+ .2byte MOVE_COUNTER
+ .2byte MOVE_MIRROR_COAT
+ .2byte MOVE_PROTECT
+ .2byte MOVE_DETECT
+ .2byte MOVE_ENDURE
+ .2byte MOVE_DESTINY_BOND
+ .2byte MOVE_SLEEP_TALK
+ .2byte MOVE_THIEF
+ .2byte MOVE_FOLLOW_ME
+ .2byte MOVE_SNATCH
+ .2byte MOVE_HELPING_HAND
+ .2byte MOVE_COVET
+ .2byte MOVE_TRICK
+ .2byte MOVE_FOCUS_PUNCH
+ .2byte 0xFFFF
gUnknown_081FAD26:: @ 81FAD26
- .incbin "baserom.gba", 0x001fad26, 0xc
+ .byte 1, 200
+ .byte 4, 150
+ .byte 9, 100
+ .byte 16, 80
+ .byte 32, 40
+ .byte 48, 20
-gUnknown_081FAD32:: @ 81FAD32
- .incbin "baserom.gba", 0x001fad32, 0x14
+ .align 1
+gNaturePowerMoves:: @ 81FAD32
+ .2byte MOVE_STUN_SPORE
+ .2byte MOVE_RAZOR_LEAF
+ .2byte MOVE_EARTHQUAKE
+ .2byte MOVE_HYDRO_PUMP
+ .2byte MOVE_SURF
+ .2byte MOVE_BUBBLE_BEAM
+ .2byte MOVE_ROCK_SLIDE
+ .2byte MOVE_SHADOW_BALL
+ .2byte MOVE_SWIFT
+ .2byte MOVE_SWIFT
@ weight-based damage table for Low Kick
@ format: min. weight (hectograms), base power