From b68913a782baee1334e9614661c712ff27895e8e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 9 Oct 2015 23:09:03 -0400 Subject: More radio labels --- constants/misc_constants.asm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'constants/misc_constants.asm') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 425801e8e..13adacc8e 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -113,3 +113,6 @@ BATTLETOWER_NROFPKMNS EQU 3 BATTLETOWER_TRAINERDATALENGTH EQU $24 BATTLETOWER_NROFTRAINERS EQU 7 +NUM_WILDMONS_PER_AREA_TIME_OF_DAY EQU 7 +WILDMON_GRASS_STRUCTURE_LENGTH EQU 2 + 3 * (1 + 2 * NUM_WILDMONS_PER_AREA_TIME_OF_DAY) + -- cgit v1.2.3 From d42330ed8b591db79c43ef680edc5965d6a7b14b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 10 Oct 2015 17:03:04 -0400 Subject: Annotation of PrintNum arguments in bc, and radio functions --- constants/misc_constants.asm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'constants/misc_constants.asm') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 13adacc8e..0306deb1e 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -116,3 +116,6 @@ BATTLETOWER_NROFTRAINERS EQU 7 NUM_WILDMONS_PER_AREA_TIME_OF_DAY EQU 7 WILDMON_GRASS_STRUCTURE_LENGTH EQU 2 + 3 * (1 + 2 * NUM_WILDMONS_PER_AREA_TIME_OF_DAY) +PRINTNUM_MONEY EQU %00100000 +PRINTNUM_RIGHTALIGN EQU %01000000 +PRINTNUM_LEADINGZEROS EQU %10000000 -- cgit v1.2.3 From 327faac497b4195dbf1d3c8dbfeb2adcda9deb27 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 11 Oct 2015 12:15:03 -0400 Subject: Magikarp functions moved to event/magikarp.asm --- constants/misc_constants.asm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'constants/misc_constants.asm') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 0306deb1e..784163acb 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -116,6 +116,11 @@ BATTLETOWER_NROFTRAINERS EQU 7 NUM_WILDMONS_PER_AREA_TIME_OF_DAY EQU 7 WILDMON_GRASS_STRUCTURE_LENGTH EQU 2 + 3 * (1 + 2 * NUM_WILDMONS_PER_AREA_TIME_OF_DAY) -PRINTNUM_MONEY EQU %00100000 -PRINTNUM_RIGHTALIGN EQU %01000000 -PRINTNUM_LEADINGZEROS EQU %10000000 + +PRINTNUM_MONEY_F EQU 5 +PRINTNUM_RIGHTALIGN_F EQU 6 +PRINTNUM_LEADINGZEROS_F EQU 7 + +PRINTNUM_MONEY EQU 1 << PRINTNUM_MONEY_F +PRINTNUM_RIGHTALIGN EQU 1 << PRINTNUM_RIGHTALIGN_F +PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F -- cgit v1.2.3 From 0c39f6e273910be3b0ed9317e73c40615d789ae3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 12 Oct 2015 12:33:24 -0400 Subject: Happiness and Mystery Gift constants --- constants/misc_constants.asm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'constants/misc_constants.asm') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 784163acb..9678faf8a 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -124,3 +124,25 @@ PRINTNUM_LEADINGZEROS_F EQU 7 PRINTNUM_MONEY EQU 1 << PRINTNUM_MONEY_F PRINTNUM_RIGHTALIGN EQU 1 << PRINTNUM_RIGHTALIGN_F PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F + +const_value = 1 + const HAPPINESS_GAINLEVEL ; 01 + const HAPPINESS_USEDITEM ; 02 + const HAPPINESS_USEDXITEM ; 03 + const HAPPINESS_GYMBATTLE ; 04 + const HAPPINESS_LEARNMOVE ; 05 + const HAPPINESS_FAINTED ; 06 + const HAPPINESS_POISONFAINT ; 07 + const HAPPINESS_BEATENBYSTRONGFOE ; 08 + const HAPPINESS_YOUNGCUT1 ; 09 + const HAPPINESS_YOUNGCUT2 ; 0a + const HAPPINESS_YOUNGCUT3 ; 0b + const HAPPINESS_OLDERCUT1 ; 0c + const HAPPINESS_OLDERCUT2 ; 0d + const HAPPINESS_OLDERCUT3 ; 0e + const HAPPINESS_BITTERPOWDER ; 0f + const HAPPINESS_ENERGYROOT ; 10 + const HAPPINESS_REVIVALHERB ; 11 + const HAPPINESS_MASSAGE ; 12 + const HAPPINESS_GAINLEVELATHOME ; 13 + -- cgit v1.2.3