summaryrefslogtreecommitdiff
path: root/macros.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 /macros.asm
parent66fbdbbf5aba6bd7ad8b388b01d8f1929ad4cd3e (diff)
parent805b4fa7fd18deaec63442db975a381f11445b02 (diff)
Merge pull request #3 from PikalaxALT/master
ModifyPikachuHappiness
Diffstat (limited to 'macros.asm')
-rw-r--r--macros.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/macros.asm b/macros.asm
index 3db547dd..effe098c 100644
--- a/macros.asm
+++ b/macros.asm
@@ -97,16 +97,16 @@ callab: MACRO
call Bankswitch
ENDM
-calladb_Func_f430a: MACRO
- ld hl, Func_f430a
+calladb_ModifyPikachuHappiness: MACRO
+ ld hl, ModifyPikachuHappiness
ld d, \1
- ld b, BANK(Func_f430a)
+ ld b, BANK(ModifyPikachuHappiness)
call Bankswitch
ENDM
-callabd_Func_f430a: MACRO
- ld hl, Func_f430a
- ld b, BANK(Func_f430a)
+callabd_ModifyPikachuHappiness: MACRO
+ ld hl, ModifyPikachuHappiness
+ ld b, BANK(ModifyPikachuHappiness)
ld d, \1
call Bankswitch
ENDM