Merge remote-tracking branch 'origin/master' into pngs-kind-of

Conflicts:
	INSTALL.md

1 files changed, 53 insertions, 2 deletions

diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index 48471c5f8..833c84377 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -46,8 +46,6 @@ CHECK_FLAG EQU 2
 
 
 ; joypad
-BUTTONS    EQU %00010000
-D_PAD      EQU %00100000
 
 NO_INPUT   EQU %00000000
 A_BUTTON   EQU %00000001
@@ -59,6 +57,11 @@ D_LEFT     EQU %00100000
 D_UP       EQU %01000000
 D_DOWN     EQU %10000000
 
+BUTTONS    EQU A_BUTTON | B_BUTTON | SELECT | START
+D_PAD      EQU D_RIGHT | D_LEFT | D_UP | D_DOWN
+
+R_DPAD     EQU %00100000
+R_BUTTONS  EQU %00010000
 
 ; screen
 HP_BAR_LENGTH EQU 6
@@ -108,3 +111,51 @@ const_value = 1
 	const MOM_ITEM
 	const MOM_DOLL
 
+BATTLETOWER_PKMNSTRUCTLENGTH EQU $30
+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)
+
+
+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
+
+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
+	
+
+	const_def
+	const LINK_NULL
+	const LINK_TIMECAPSULE
+	const LINK_TRADECENTER
+	const LINK_COLOSSEUM
+	const LINK_MOBILE
+
+HMENURETURN_SCRIPT EQU %10000000
+HMENURETURN_ASM    EQU %11111111