diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-11 18:00:44 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-11 18:00:44 -0400 |
| commit | 2048f845d30b041e0bcab50a556935fc79f09b4e (patch) | |
| tree | 05e2bf33cbd65d9d8742a7547788e0f98f718af7 /engine/bank3f | |
| parent | more annotations on ModifyPikachuHappiness (diff) | |
| parent | engine/items/items.asm (diff) | |
| download | pokeyellow-2048f845d30b041e0bcab50a556935fc79f09b4e.tar.gz pokeyellow-2048f845d30b041e0bcab50a556935fc79f09b4e.tar.xz pokeyellow-2048f845d30b041e0bcab50a556935fc79f09b4e.zip | |
Merge branch 'master' of https://github.com/luckytyphlosion/pokeyellow
Diffstat (limited to 'engine/bank3f')
| -rw-r--r-- | engine/bank3f/main.asm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engine/bank3f/main.asm b/engine/bank3f/main.asm index 86c504f2..ae79a5ca 100644 --- a/engine/bank3f/main.asm +++ b/engine/bank3f/main.asm @@ -1724,7 +1724,9 @@ Func_fceab:: ; fceab (3f:4eab) ret Func_fcf0c:: ; fcf0c (3f:4f0c) - dr $fcf0c,$fd004 + dr $fcf0c,$fd001 +Func_fd001:: ; fd001 (3f:5001) + dr $fd001,$fd004 Func_fd004:: ; fd004 (3f:5004) dr $fd004,$fd0d0 Func_fd0d0:: ; fd0d0 (3f:50d0) |