aboutsummaryrefslogtreecommitdiffstats
path: root/wram.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-10-11 23:56:16 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-10-11 23:56:16 -0400
commit9b2c58dfd3021bb0c4eedb9df1cfe5ca23060c17 (patch)
tree4499dd3298b7b1526460f3c93aac035ec61d9d96 /wram.asm
parentengine/items/items.asm (diff)
parentFix build errors (diff)
downloadpokeyellow-9b2c58dfd3021bb0c4eedb9df1cfe5ca23060c17.tar.gz
pokeyellow-9b2c58dfd3021bb0c4eedb9df1cfe5ca23060c17.tar.xz
pokeyellow-9b2c58dfd3021bb0c4eedb9df1cfe5ca23060c17.zip
Merge pull request #3 from PikalaxALT/master
ModifyPikachuHappiness
Diffstat (limited to 'wram.asm')
-rwxr-xr-xwram.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/wram.asm b/wram.asm
index 79d3c6a5..58f8cf2e 100755
--- a/wram.asm
+++ b/wram.asm
@@ -2523,8 +2523,8 @@ wd44b:: ds 1
ds 36
-wd470:: ds 1
-wd471:: ds 1
+wPikachuHappiness:: ds 1
+wPikachuMood:: ds 1
wd472:: ds 1
wd473:: ds 1