Fill in a lot of missing bank $04 code.

5 files changed, 72 insertions, 3 deletions

diff --git a/constants/icon_constants.asm b/constants/icon_constants.asm
new file mode 100644
index 00000000..870175f4
--- /dev/null
+++ b/constants/icon_constants.asm
@@ -0,0 +1,51 @@
+; IconPointers indexes (see data/icon_pointers.asm)
+	const_def
+	const ICON_NULL
+	const ICON_POLIWAG
+	const ICON_JIGGLYPUFF
+	const ICON_DIGLETT
+	const ICON_PIKACHU
+	const ICON_STARYU
+	const ICON_FISH
+	const ICON_BIRD
+	const ICON_MONSTER
+	const ICON_CLEFAIRY
+	const ICON_ODDISH
+	const ICON_BUG
+	const ICON_GHOST
+	const ICON_LAPRAS
+	const ICON_HUMANSHAPE
+	const ICON_FOX
+	const ICON_EQUINE
+	const ICON_SHELL
+	const ICON_BLOB
+	const ICON_SERPENT
+	const ICON_VOLTORB
+	const ICON_SQUIRTLE
+	const ICON_BULBASAUR
+	const ICON_CHARMANDER
+	const ICON_CATERPILLAR
+	const ICON_UNOWN
+	const ICON_GEODUDE
+	const ICON_FIGHTER
+	const ICON_EGG
+	const ICON_JELLYFISH
+	const ICON_MOTH
+	const ICON_BAT
+	const ICON_SNORLAX
+	const ICON_HO_OH
+	const ICON_LUGIA
+	const ICON_GYARADOS
+	const ICON_SLOWPOKE
+	const ICON_SUDOWOODO
+	const ICON_BIGMON
+
+; LoadMenuMonIcon.Jumptable indexes (see engine/gfx/mon_icons.asm)
+	const_def
+	const MONICON_PARTYMENU
+	const MONICON_NAMINGSCREEN
+	const MONICON_MOVES
+	const MONICON_TRADE
+	const MONICON_MOBILE1
+	const MONICON_MOBILE2
+	const MONICON_UNUSED
diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm
index 7c5f2337..2c6c7910 100644
--- a/constants/menu_constants.asm
+++ b/constants/menu_constants.asm
@@ -32,6 +32,11 @@
 	shift_const SCROLLINGMENU_ENABLE_START
 	shift_const SCROLLINGMENU_ENABLE_SELECT
 
+; ScrollingMenu items structure format
+	const_def 1
+	const SCROLLINGMENU_ITEMS_NORMAL
+	const SCROLLINGMENU_ITEMS_QUANTITY
+
 ; MonMenuOptions indexes (see data/mon_menu.asm)
 ; used by PokemonActionSubmenu (see engine/menus/start_menu.asm)
 	const_def 1
diff --git a/constants/phone_constants.asm b/constants/phone_constants.asm
index 9247e927..1718e892 100644
--- a/constants/phone_constants.asm
+++ b/constants/phone_constants.asm
@@ -63,5 +63,5 @@
 	const PHONE_CONTACT_SCRIPT2_BANK
 	const PHONE_CONTACT_SCRIPT2_ADDR_LO
 	const PHONE_CONTACT_SCRIPT2_ADDR_HI
-PHONE_TABLE_WIDTH EQU const_value
+PHONE_CONTACT_SIZE EQU const_value
 CONTACT_LIST_SIZE EQU 10
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 04df889b..d29b4121 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -62,8 +62,9 @@ GENDER_UNKNOWN EQU -1
 	const EGG_DRAGON        ; e
 	const EGG_NONE          ; f (Undiscovered)
 
-; menu sprites
-const_value SET 1
+; IconPointers indexes (see data/icon_pointers.asm)
+	const_def
+	const ICON_NULL
 	const ICON_POLIWAG
 	const ICON_JIGGLYPUFF
 	const ICON_DIGLETT
@@ -103,6 +104,16 @@ const_value SET 1
 	const ICON_SUDOWOODO
 	const ICON_BIGMON
 
+; LoadMenuMonIcon.Jumptable indexes (see engine/gfx/mon_icons.asm)
+	const_def
+	const MONICON_PARTYMENU
+	const MONICON_NAMINGSCREEN
+	const MONICON_MOVES
+	const MONICON_TRADE
+	const MONICON_MOBILE1
+	const MONICON_MOBILE2
+	const MONICON_UNUSED
+
 ; maximum number of party pokemon
 PARTY_LENGTH EQU 6
 
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 7cdebc05..fba6f2ff 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -148,6 +148,8 @@ NUM_JOHTO_BADGES EQU const_value
 NUM_KANTO_BADGES EQU const_value
 NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES
 
+POKEGEAR_OBTAINED_F EQU 7
+
 ; WhichRegisteredItem: ; d95b
 REGISTERED_POCKET EQU %11000000
 REGISTERED_NUMBER EQU %00111111