Merge branch 'master' of https://github.com/YamaArashi/pokered

Conflicts:
	engine/town_map.asm

constants/list_constants.asm

@@ -12,3 +12,9 @@ ITEM_NAME     EQU 4
 PLAYEROT_NAME EQU 5
 ENEMYOT_NAME  EQU 6
 TRAINER_NAME  EQU 7
+
+INIT_ENEMYOT_LIST    EQU 1
+INIT_BAG_ITEM_LIST   EQU 2
+INIT_OTHER_ITEM_LIST EQU 3
+INIT_PLAYEROT_LIST   EQU 4
+INIT_MON_LIST        EQU 5

constants/misc_constants.asm

@@ -58,6 +58,57 @@ TRADE_CANCEL_MENU EQU 5
 HEAL_CANCEL_MENU  EQU 6
 NO_YES_MENU       EQU 7
 
+; menu exit method constants for list menus and the buy/sell/quit menu
+CHOSE_MENU_ITEM   EQU 1 ; pressed A
+CANCELLED_MENU    EQU 2 ; pressed B
+
+; menu exit method constants for two-option menus
+CHOSE_FIRST_ITEM  EQU 1
+CHOSE_SECOND_ITEM EQU 2
+
+; move mon constants
+BOX_TO_PARTY     EQU 0
+PARTY_TO_BOX     EQU 1
+DAYCARE_TO_PARTY EQU 2
+PARTY_TO_DAYCARE EQU 3
+
+; emotion bubbles
+EXCLAMATION_BUBBLE EQU 0
+QUESTION_BUBBLE    EQU 1
+SMILE_BUBBLE       EQU 2
+
+; slot symbols
+SLOTS7		EQU $0200
+SLOTSBAR	EQU $0604
+SLOTSCHERRY	EQU $0A08
+SLOTSFISH	EQU $0E0C
+SLOTSBIRD	EQU $1210
+SLOTSMOUSE	EQU $1614
+
+; party menu types
+NORMAL_PARTY_MENU    EQU 0
+USE_ITEM_PARTY_MENU  EQU 1
+BATTLE_PARTY_MENU    EQU 2
+TMHM_PARTY_MENU      EQU 3
+SWAP_MONS_PARTY_MENU EQU 4
+EVO_STONE_PARTY_MENU EQU 5
+
+; party memu message IDs
+ANTIDOTE_MSG     EQU $F0
+BURN_HEAL_MSG    EQU $F1
+ICE_HEAL_MSG     EQU $F2
+AWAKENING_MSG    EQU $F3
+PARALYZ_HEAL_MSG EQU $F4
+POTION_MSG       EQU $F5
+FULL_HEAL_MSG    EQU $F6
+REVIVE_MSG       EQU $F7
+RARE_CANDY_MSG   EQU $F8
+
+; naming screen types
+NAME_PLAYER_SCREEN EQU 0
+NAME_RIVAL_SCREEN  EQU 1
+NAME_MON_SCREEN    EQU 2
+
 ; serial
 
 ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01