From 18fb5fc4682a196e80a774af4aa1f68ead8186b9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 11 Oct 2015 18:00:03 -0400 Subject: more annotations on ModifyPikachuHappiness --- constants/misc_constants.asm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'constants/misc_constants.asm') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 1c3e07ad..57eca83c 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -196,3 +196,16 @@ LINK_STATE_START_BATTLE EQU $03 ; pre-battle initialisation LINK_STATE_BATTLING EQU $04 ; in a link battle LINK_STATE_RESET EQU $05 ; reset game (unused) LINK_STATE_TRADING EQU $32 ; in a link trade + +const_value set 1 + const PIKAHAPPY_LEVELUP + const PIKAHAPPY_USEDITEM + const PIKAHAPPY_3 + const PIKAHAPPY_GYMLEADER + const PIKAHAPPY_USEDTMHM + const PIKAHAPPY_WALKING + const PIKAHAPPY_DEPOSITED + const PIKAHAPPY_FAINTED + const PIKAHAPPY_PSNFNT + const PIKAHAPPY_10 + const PIKAHAPPY_11 -- cgit v1.2.3 From edebb637f4f390800246d1fc65931f6ae284c3e3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 11 Oct 2015 18:17:26 -0400 Subject: wram label renaming for pika happiness --- constants/misc_constants.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'constants/misc_constants.asm') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 57eca83c..f85ca3bf 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -200,7 +200,7 @@ LINK_STATE_TRADING EQU $32 ; in a link trade const_value set 1 const PIKAHAPPY_LEVELUP const PIKAHAPPY_USEDITEM - const PIKAHAPPY_3 + const PIKAHAPPY_USEDXITEM const PIKAHAPPY_GYMLEADER const PIKAHAPPY_USEDTMHM const PIKAHAPPY_WALKING -- cgit v1.2.3