aboutsummaryrefslogtreecommitdiffstats
path: root/engine
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-10-12 15:15:57 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-10-12 15:15:57 -0400
commitf0f3a56f4ac3af3efe1f248974e29c3ad8dce111 (patch)
treef8eb52bbc3a0ce9f83bbd785ed5a6af040241e55 /engine
parentIgnore changes to replace.sh (diff)
parentMerge branch 'master' of https://github.com/luckytyphlosion/pokeyellow (diff)
downloadpokeyellow-f0f3a56f4ac3af3efe1f248974e29c3ad8dce111.tar.gz
pokeyellow-f0f3a56f4ac3af3efe1f248974e29c3ad8dce111.tar.xz
pokeyellow-f0f3a56f4ac3af3efe1f248974e29c3ad8dce111.zip
Merge pull request #4 from PikalaxALT/master
Mass RGB translation in super_palettes.asm
Diffstat (limited to 'engine')
-rw-r--r--engine/bank3d/main.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/bank3d/main.asm b/engine/bank3d/main.asm
index 3855d096..131f4fca 100644
--- a/engine/bank3d/main.asm
+++ b/engine/bank3d/main.asm
@@ -146,7 +146,7 @@ ModifyPikachuHappiness:: ; f430a (3d:430a)
; Increase
db 5, 3, 2 ; Gained a level
db 5, 3, 2 ; HP restore
- db 1, 1, 0 ; Unknown (d = 3)
+ db 1, 1, 0 ; Used X item
db 3, 2, 1 ; Challenged Gym Leader
db 1, 1, 0 ; Teach TM/HM
db 2, 1, 1 ; Walking around