Merge branch 'master' into build_more_roms

9 files changed, 337 insertions, 50 deletions

diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm
index c341e90..8d25540 100644
--- a/constants/audio_constants.asm
+++ b/constants/audio_constants.asm
@@ -1,21 +1,3 @@
-
-
-; pitch
-	const_def
-	const __
-	const C_
-	const C#
-	const D_
-	const D#
-	const E_
-	const F_
-	const F#
-	const G_
-	const G#
-	const A_
-	const A#
-	const B_
-
 ; channel
 	const_def
 	const CHAN1
diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index 017a58e..30af41c 100644
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -262,3 +262,7 @@ NUM_TMS = const_value - ITEM_TM01 - 2 ; discount ITEM_C8 and ITEM_E1
 NUM_HMS = const_value - ITEM_HM01
 
 NUM_TMS_HMS = NUM_TMS + NUM_HMS
+
+; leftovers from pokered
+ITEM_HM01_RED EQU $c4
+ITEM_TM01_RED EQU $c9
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
new file mode 100644
index 0000000..d01de98
--- /dev/null
+++ b/constants/misc_constants.asm
@@ -0,0 +1,24 @@
+; joypad
+
+	const_def
+	const A_BUTTON_F
+	const B_BUTTON_F
+	const SELECT_F
+	const START_F
+	const D_RIGHT_F
+	const D_LEFT_F
+	const D_UP_F
+	const D_DOWN_F
+
+NO_INPUT   EQU %00000000
+A_BUTTON   EQU 1 << A_BUTTON_F
+B_BUTTON   EQU 1 << B_BUTTON_F
+SELECT     EQU 1 << SELECT_F
+START      EQU 1 << START_F
+D_RIGHT    EQU 1 << D_RIGHT_F
+D_LEFT     EQU 1 << D_LEFT_F
+D_UP       EQU 1 << D_UP_F
+D_DOWN     EQU 1 << D_DOWN_F
+
+BUTTONS    EQU A_BUTTON | B_BUTTON | SELECT | START
+D_PAD      EQU D_RIGHT | D_LEFT | D_UP | D_DOWN
diff --git a/constants/move_constants.asm b/constants/move_constants.asm
index 1f04fe8..b7daf0e 100644
--- a/constants/move_constants.asm
+++ b/constants/move_constants.asm
@@ -94,7 +94,7 @@
 	const MOVE_DIG          ; 5b
 	const MOVE_TOXIC        ; 5c
 	const MOVE_CONFUSION    ; 5d
-	const MOVE_PSYCHIC_M    ; 5e
+	const MOVE_PSYCHIC      ; 5e
 	const MOVE_HYPNOSIS     ; 5f
 	const MOVE_MEDITATE     ; 60
 	const MOVE_AGILITY      ; 61
diff --git a/constants/name_constants.asm b/constants/name_constants.asm
new file mode 100755
index 0000000..7e35ebb
--- /dev/null
+++ b/constants/name_constants.asm
@@ -0,0 +1,2 @@
+; Name Lists

+ITEM_NAME EQU 4
\ No newline at end of file
diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm
index 9f410a8..e9d6d79 100755
--- a/constants/palette_constants.asm
+++ b/constants/palette_constants.asm
@@ -1,5 +1,5 @@
 	const_def
-	const PAL_TOWN_00 ; 00
+	const PAL_ROUTE ; 00
 	const PAL_TOWN_01 ; 01
 	const PAL_TOWN_02 ; 02
 	const PAL_TOWN_03 ; 03
@@ -24,19 +24,19 @@
 	const PAL_PINKMON ; 16
 	const PAL_YELLOWMON ; 17
 	const PAL_GREYMON ; 18
-	const PAL_DARKMEWMON ; 19
-	const PAL_DARKBLUEMON ; 1a
-	const PAL_DARKREDMON ; 1b
-	const PAL_DARKCYANMON ; 1c
-	const PAL_DARKPURPLEMON ; 1d
-	const PAL_DARKBROWNMON ; 1e
-	const PAL_TANMON ; 1f
-	const PAL_BLUEPINKMON ; 20
-	const PAL_ORANGEMON ; 21
-	const PAL_DARKGREYMON ; 22
-	const PAL_GREENBAR ; 23
-	const PAL_YELLOWBAR ; 24
-	const PAL_REDBAR ; 25
+	const PAL_SHINY_MEWMON ; 19
+	const PAL_SHINY_BLUEMON ; 1a
+	const PAL_SHINY_REDMON ; 1b
+	const PAL_SHINY_CYANMON ; 1c
+	const PAL_SHINY_PURPLEMON ; 1d
+	const PAL_SHINY_BROWNMON ; 1e
+	const PAL_SHINY_GREENMON ; 1f
+	const PAL_SHINY_PINKMON ; 20
+	const PAL_SHINY_YELLOWMON ; 21
+	const PAL_SHINY_GREYMON ; 22
+	const PAL_GREEN_BAR ; 23
+	const PAL_YELLOW_BAR ; 24
+	const PAL_RED_BAR ; 25
 	const PAL_TOWN_MAP ; 26
 	const PAL_LOGO_1 ; 27
 	const PAL_LOGO_2 ; 28
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
new file mode 100644
index 0000000..2678607
--- /dev/null
+++ b/constants/pokemon_constants.asm
@@ -0,0 +1,199 @@
+; old RBY index numbers
+; used primarily for cries
+	const_def
+	const MON_NONE        ; 00
+	const MON_SIDON       ; 01 RHYDON
+	const MON_GARURA      ; 02 KANGASKHAN
+	const MON_NIDORAN_M   ; 03 NIDORAN_M
+	const MON_PIPPI       ; 04 CLEFAIRY
+	const MON_ONISUZUME   ; 05 SPEAROW
+	const MON_BIRIRIDAMA  ; 06 VOLTORB
+	const MON_NIDOKING    ; 07 NIDOKING
+	const MON_YADORAN     ; 08 SLOWBRO
+	const MON_FUSHIGISOU  ; 09 IVYSAUR
+	const MON_NASSY       ; 0a EXEGGUTOR
+	const MON_BERORINGA   ; 0b LICKITUNG
+	const MON_TAMATAMA    ; 0c EXEGGCUTE
+	const MON_BETBETER    ; 0d GRIMER
+	const MON_GANGAR      ; 0e GENGAR
+	const MON_NIDORAN_F   ; 0f NIDORAN_F
+	const MON_NIDOQUEEN   ; 10 NIDOQUEEN
+	const MON_KARAKARA    ; 11 CUBONE
+	const MON_SIHORN      ; 12 RHYHORN
+	const MON_LAPLACE     ; 13 LAPRAS
+	const MON_WINDIE      ; 14 ARCANINE
+	const MON_MEW         ; 15 MEW
+	const MON_GYARADOS    ; 16 GYARADOS
+	const MON_SHELLDER    ; 17 SHELLDER
+	const MON_MENOKURAGE  ; 18 TENTACOOL
+	const MON_GHOS        ; 19 GASTLY
+	const MON_STRIKE      ; 1a SCYTHER
+	const MON_HITODEMAN   ; 1b STARYU
+	const MON_KAMEX       ; 1c BLASTOISE
+	const MON_KAILIOS     ; 1d PINSIR
+	const MON_MONJARA     ; 1e TANGELA
+	const MON_KAPOERER    ; 1f HITMONTOP
+	const MON_PUDIE       ; 20 (baby GROWLITHE)
+	const MON_GARDIE      ; 21 GROWLITHE
+	const MON_IWARK       ; 22 ONIX
+	const MON_ONIDRILL    ; 23 FEAROW
+	const MON_POPPO       ; 24 PIDGEY
+	const MON_YADON       ; 25 SLOWPOKE
+	const MON_YUNGERER    ; 26 KADABRA
+	const MON_GOLONE      ; 27 GRAVELER
+	const MON_LUCKY       ; 28 CHANSEY
+	const MON_GORIKY      ; 29 MACHOKE
+	const MON_BARRIERD    ; 2a MR__MIME
+	const MON_SAWAMULAR   ; 2b HITMONLEE
+	const MON_EBIWALAR    ; 2c HITMONCHAN
+	const MON_ARBOK       ; 2d ARBOK
+	const MON_PARASECT    ; 2e PARASECT
+	const MON_KODUCK      ; 2f PSYDUCK
+	const MON_SLEEPE      ; 30 DROWZEE
+	const MON_GOLONYA     ; 31 GOLEM
+	const MON_HANEKO      ; 32 HOPPIP
+	const MON_BOOBER      ; 33 MAGMAR
+	const MON_TAIL        ; 34 AIPOM
+	const MON_ELEBOO      ; 35 ELECTABUZZ
+	const MON_RARECOIL    ; 36 MAGNETON
+	const MON_DOGARS      ; 37 KOFFING
+	const MON_POPONEKO    ; 38 SKIPLOOM
+	const MON_MANKEY      ; 39 MANKEY
+	const MON_PAWOU       ; 3a SEEL
+	const MON_DIGDA       ; 3b DIGLETT
+	const MON_KENTAUROS   ; 3c TAUROS
+	const MON_WATANEKO    ; 3d JUMPLUFF
+	const MON_BARIRINA    ; 3e MIME_JR (baby MR__MIME)
+	const MON_LIP         ; 3f SMOOCHUM
+	const MON_KAMONEGI    ; 40 FARFETCH_D
+	const MON_KONGPANG    ; 41 VENONAT
+	const MON_KAIRYU      ; 42 DRAGONITE
+	const MON_ELEBABY     ; 43 ELEKID
+	const MON_BOOBY       ; 44 MAGBY
+	const MON_KIREIHANA   ; 45 BELLOSSOM
+	const MON_DODO        ; 46 DODUO
+	const MON_NYOROMO     ; 47 POLIWAG
+	const MON_ROUGELA     ; 48 JYNX
+	const MON_FIRE        ; 49 MOLTRES
+	const MON_FREEZER     ; 4a ARTICUNO
+	const MON_THUNDER     ; 4b ZAPDOS
+	const MON_METAMON     ; 4c DITTO
+	const MON_NYARTH      ; 4d MEOWTH
+	const MON_CRAB        ; 4e KRABBY
+	const MON_TSUBOMITTO  ; 4f (evolved WEEPINBELL)
+	const MON_MILTANK     ; 50 MILTANK
+	const MON_BOMBSEEKER  ; 51 (MISSINGNO)
+	const MON_ROKON       ; 52 VULPIX
+	const MON_KYUKON      ; 53 NINETALES
+	const MON_PIKACHU     ; 54 PIKACHU
+	const MON_RAICHU      ; 55 RAICHU
+	const MON_GIFT        ; 56 DELIBIRD
+	const MON_KOTORA      ; 57 (MISSINGNO)
+	const MON_MINIRYU     ; 58 DRATINI
+	const MON_HAKURYU     ; 59 DRAGONAIR
+	const MON_KABUTO      ; 5a KABUTO
+	const MON_KABUTOPS    ; 5b KABUTOPS
+	const MON_TATTU       ; 5c HORSEA
+	const MON_SEADRA      ; 5d SEADRA
+	const MON_RAITORA     ; 5e (MISSINGNO)
+	const MON_MADAME      ; 5f (evolved FARFETCH_D)
+	const MON_SAND        ; 60 SANDSHREW
+	const MON_SANDPAN     ; 61 SANDSLASH
+	const MON_OMNITE      ; 62 OMANYTE
+	const MON_OMSTAR      ; 63 OMASTAR
+	const MON_PURIN       ; 64 JIGGLYPUFF
+	const MON_PUKURIN     ; 65 WIGGLYTUFF
+	const MON_EIEVUI      ; 66 EEVEE
+	const MON_BOOSTER     ; 67 FLAREON
+	const MON_THUNDERS    ; 68 JOLTEON
+	const MON_SHOWERS     ; 69 VAPOREON
+	const MON_WANRIKY     ; 6a MACHOP
+	const MON_ZUBAT       ; 6b ZUBAT
+	const MON_ARBO        ; 6c EKANS
+	const MON_PARAS       ; 6d PARAS
+	const MON_NYOROZO     ; 6e POLIWHIRL
+	const MON_NYOROBON    ; 6f POLIWRATH
+	const MON_BEEDLE      ; 70 WEEDLE
+	const MON_COCOON      ; 71 KAKUNA
+	const MON_SPEAR       ; 72 BEEDRILL
+	const MON_NOROWARA    ; 73 (MISSINGNO)
+	const MON_DODORIO     ; 74 DODRIO
+	const MON_OKORIZARU   ; 75 PRIMEAPE
+	const MON_DUGTRIO     ; 76 DUGTRIO
+	const MON_MORPHON     ; 77 VENOMOTH
+	const MON_JUGON       ; 78 DEWGONG
+	const MON_KYONPAN     ; 79 (MISSINGNO)
+	const MON_YAMIKARASU  ; 7a MURKROW
+	const MON_CATERPIE    ; 7b CATERPIE
+	const MON_TRANSEL     ; 7c METAPOD
+	const MON_BUTTERFREE  ; 7d BUTTERFREE
+	const MON_KAIRIKY     ; 7e MACHAMP
+	const MON_HAPPI       ; 7f BLISSEY
+	const MON_GOLDUCK     ; 80 GOLDUCK
+	const MON_SLEEPER     ; 81 HYPNO
+	const MON_GOLBAT      ; 82 GOLBAT
+	const MON_MEWTWO      ; 83 MEWTWO
+	const MON_KABIGON     ; 84 SNORLAX
+	const MON_KOIKING     ; 85 MAGIKARP
+	const MON_SCISSORS    ; 86 SCIZOR
+	const MON_PURAKKUSU   ; 87 (evolved PINSIR)
+	const MON_BETBETON    ; 88 MUK
+	const MON_DEVIL       ; 89 HOUNDOUR
+	const MON_KINGLER     ; 8a KINGLER
+	const MON_PARSHEN     ; 8b CLOYSTER
+	const MON_HELGAA      ; 8c HOUNDOOM
+	const MON_MARUMINE    ; 8d ELECTRODE
+	const MON_PIXY        ; 8e CLEFABLE
+	const MON_MATADOGAS   ; 8f WEEZING
+	const MON_PERSIAN     ; 90 PERSIAN
+	const MON_GARAGARA    ; 91 MAROWAK
+	const MON_WOLFMAN     ; 92 (MISSINGNO)
+	const MON_GHOST       ; 93 HAUNTER
+	const MON_CASEY       ; 94 ABRA
+	const MON_FOODIN      ; 95 ALAKAZAM
+	const MON_PIGEON      ; 96 PIDGEOTTO
+	const MON_PIGEOT      ; 97 PIDGEOT
+	const MON_STARMIE     ; 98 STARMIE
+	const MON_FUSHIGIDANE ; 99 BULBASAUR
+	const MON_FUSHIGIBANA ; 9a VENUSAUR
+	const MON_DOKUKURAGE  ; 9b TENTACRUEL
+	const MON_WARWOLF     ; 9c (MISSINGNO)
+	const MON_TOSAKINTO   ; 9d GOLDEEN
+	const MON_AZUMAO      ; 9e SEAKING
+	const MON_PORYGON2    ; 9f PORYGON2
+	const MON_NAMEIL      ; a0 LICKILICKY (evolved LICKITUNG)
+	const MON_HAGANEIL    ; a1 STEELIX
+	const MON_KINGDRA     ; a2 KINGDRA
+	const MON_PONYTA      ; a3 PONYTA
+	const MON_GALLOP      ; a4 RAPIDASH
+	const MON_KORATTA     ; a5 RATTATA
+	const MON_RATTA       ; a6 RATICATE
+	const MON_NIDORINO    ; a7 NIDORINO
+	const MON_NIDORINA    ; a8 NIDORINA
+	const MON_ISITSUBUTE  ; a9 GEODUDE
+	const MON_PORYGON     ; aa PORYGON
+	const MON_PTERA       ; ab AERODACTYL
+	const MON_RAI         ; ac RAIKOU
+	const MON_COIL        ; ad MAGNEMITE
+	const MON_EN          ; ae ENTEI
+	const MON_SUI         ; af SUICUNE
+	const MON_HITOKAGE    ; b0 CHARMANDER
+	const MON_ZENIGAME    ; b1 SQUIRTLE
+	const MON_LIZARDO     ; b2 CHARMELEON
+	const MON_KAMEIL      ; b3 WARTORTLE
+	const MON_LIZARDON    ; b4 CHARIZARD
+	const MON_NYULA       ; b5 SNEASEL
+	const MON_HOUOU       ; b6 HO_OH
+	const MON_TOGEPY      ; b7 TOGEPI
+	const MON_BULU        ; b8 SNUBBULL
+	const MON_NAZONOKUSA  ; b9 ODDISH
+	const MON_KUSAIHANA   ; ba GLOOM
+	const MON_RUFFRESIA   ; bb VILEPLUME
+	const MON_MADATSUBOMI ; bc BELLSPROUT
+	const MON_UTSUDON     ; bd WEEPINBELL
+	const MON_UTSUBOT     ; be VICTREEBEL
+
+; LEAFY isn't in the table at 10:4B70
+; and its ID 0xFB will be found at
+; 10:4117 (index 0x4A7 + 1 % 0x100 = 0xA8)
+MON_LEAFY EQU MON_NIDORINA
diff --git a/constants/serial.asm b/constants/serial.asm
deleted file mode 100644
index e475798..0000000
--- a/constants/serial.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-; serial
-
-ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01
-ESTABLISH_CONNECTION_WITH_EXTERNAL_CLOCK EQU $02
-
-USING_EXTERNAL_CLOCK       EQU $01
-USING_INTERNAL_CLOCK       EQU $02
-CONNECTION_NOT_ESTABLISHED EQU $ff
-
-; signals the start of an array of bytes transferred over the link cable
-SERIAL_PREAMBLE_BYTE EQU $FD
-
-; this byte is used when there is no data to send
-SERIAL_NO_DATA_BYTE EQU $FE
-
-; signals the end of one part of a patch list (there are two parts) for player/enemy party data
-SERIAL_PATCH_LIST_PART_TERMINATOR EQU $FF
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
new file mode 100644
index 0000000..50b5d84
--- /dev/null
+++ b/constants/sprite_constants.asm
@@ -0,0 +1,93 @@
+	const_def
+	const SPRITE_NONE                  ; 00
+	const SPRITE_GOLD                  ; 01
+	const SPRITE_GOLD_BIKE             ; 02
+	const SPRITE_GOLD_SKATEBOARD       ; 03
+	const SPRITE_SILVER                ; 04
+	const SPRITE_OKIDO                 ; 05 PROF_OAK
+	const SPRITE_RED                   ; 06
+	const SPRITE_BLUE                  ; 07
+	const SPRITE_MASAKI                ; 08 BILL
+	const SPRITE_ELDER                 ; 09
+	const SPRITE_SAKAKI                ; 0a GIOVANNI
+	const SPRITE_GANTETSU              ; 0b KURT
+	const SPRITE_MOM                   ; 0c
+	const SPRITE_SILVERS_MOM           ; 0d
+	const SPRITE_REDS_MOM              ; 0e
+	const SPRITE_0F                    ; 0f duplicate SPRITE_REDS_MOM
+	const SPRITE_NANAMI                ; 10 DAISY
+	const SPRITE_EVIL_OKIDO            ; 11 EVIL_PROF_OAK
+	const SPRITE_KIKUKO                ; 12 AGATHA
+	const SPRITE_HAYATO                ; 13 FALKNER
+	const SPRITE_TSUKUSHI              ; 14 BUGSY
+	const SPRITE_15                    ; 15 duplicate SPRITE_TSUKUSHI
+	const SPRITE_ENOKI                 ; 16 MORTY
+	const SPRITE_MIKAN                 ; 17 JASMINE
+	const SPRITE_18                    ; 18 duplicate SPRITE_MIKAN
+	const SPRITE_COOLTRAINER_M         ; 19
+	const SPRITE_1A                    ; 1a duplicate SPRITE_COOLTRAINER_M
+	const SPRITE_1B                    ; 1b duplicate SPRITE_COOLTRAINER_M
+	const SPRITE_1C                    ; 1c duplicate SPRITE_COOLTRAINER_M
+	const SPRITE_1D                    ; 1d duplicate SPRITE_COOLTRAINER_M
+	const SPRITE_1E                    ; 1e duplicate SPRITE_COOLTRAINER_M
+	const SPRITE_1F                    ; 1f duplicate SPRITE_COOLTRAINER_M
+	const SPRITE_20                    ; 20 duplicate SPRITE_COOLTRAINER_M
+	const SPRITE_21                    ; 21 duplicate SPRITE_COOLTRAINER_M
+	const SPRITE_22                    ; 22 duplicate SPRITE_COOLTRAINER_M
+	const SPRITE_23                    ; 23 duplicate SPRITE_COOLTRAINER_M
+	const SPRITE_24                    ; 24 duplicate SPRITE_COOLTRAINER_M
+	const SPRITE_COOLTRAINER_F         ; 25
+	const SPRITE_BUG_CATCHER_BOY       ; 26
+	const SPRITE_TWIN                  ; 27
+	const SPRITE_YOUNGSTER             ; 28
+	const SPRITE_LASS                  ; 29
+	const SPRITE_TEACHER               ; 2a
+	const SPRITE_GIRL                  ; 2b
+	const SPRITE_SUPER_NERD            ; 2c
+	const SPRITE_ROCKER                ; 2d
+	const SPRITE_POKEFAN_M             ; 2e
+	const SPRITE_POKEFAN_F             ; 2f
+	const SPRITE_GRAMPS                ; 30
+	const SPRITE_GRANNY                ; 31
+	const SPRITE_SWIMMER_M             ; 32
+	const SPRITE_SWIMMER_F             ; 33
+	const SPRITE_ROCKET_M              ; 34
+	const SPRITE_35                    ; 35 duplicate SPRITE_ROCKET_M
+	const SPRITE_36                    ; 36 duplicate SPRITE_ROCKET_M
+	const SPRITE_ROCKET_F              ; 37
+	const SPRITE_NURSE                 ; 38
+	const SPRITE_LINK_RECEPTIONIST     ; 39
+	const SPRITE_CLERK                 ; 3a
+	const SPRITE_FISHER                ; 3b
+	const SPRITE_FISHING_GURU          ; 3c
+	const SPRITE_SCIENTIST             ; 3d
+	const SPRITE_MEDIUM                ; 3e
+	const SPRITE_SAGE                  ; 3f
+	const SPRITE_FROWNING_MAN          ; 40
+	const SPRITE_GENTLEMAN             ; 41
+	const SPRITE_BLACKBELT             ; 42
+	const SPRITE_RECEPTIONIST          ; 43
+	const SPRITE_OFFICER               ; 44
+	const SPRITE_CAPTAIN               ; 45
+	const SPRITE_46                    ; 46 duplicate SPRITE_CAPTAIN
+	const SPRITE_47                    ; 47 duplicate SPRITE_CAPTAIN
+	const SPRITE_MOHAWK                ; 48
+	const SPRITE_GYM_GUY               ; 49
+	const SPRITE_SAILOR                ; 4a
+	const SPRITE_HELMET                ; 4b
+	const SPRITE_BURGLAR               ; 4c
+	const SPRITE_SIDON                 ; 4d RHYDON
+	const SPRITE_PIPPI                 ; 4e CLEFAIRY
+	const SPRITE_POPPO                 ; 4f PIDGEY
+	const SPRITE_LIZARDON              ; 50 CHARIZARD
+	const SPRITE_KABIGON               ; 51 SNORLAX
+	const SPRITE_PAWOU                 ; 52 SEEL
+	const SPRITE_NYOROBON              ; 53 POLIWRATH
+	const SPRITE_LAPLACE               ; 54 LAPRAS
+	const SPRITE_POKE_BALL             ; 55
+	const SPRITE_POKEDEX               ; 56
+	const SPRITE_PAPER                 ; 57
+	const SPRITE_OLD_LINK_RECEPTIONIST ; 58
+	const SPRITE_59                    ; 59 duplicate SPRITE_OLD_LINK_RECEPTIONIST
+	const SPRITE_EGG                   ; 5a
+	const SPRITE_BOULDER               ; 5b