Add more Time Capsule data.

2 files changed, 424 insertions, 59 deletions

diff --git a/stadiumgs/constants/pokemon_constants.s b/stadiumgs/constants/pokemon_constants.s
index 3de8f2f..ab593dd 100644
--- a/stadiumgs/constants/pokemon_constants.s
+++ b/stadiumgs/constants/pokemon_constants.s
@@ -249,3 +249,155 @@ TYRANITAR  EQU 248
 LUGIA      EQU 249
 HO_OH      EQU 250
 CELEBI     EQU 251
+
+RGBY_RHYDON     EQU 0x01
+RGBY_KANGASKHAN EQU 0x02
+RGBY_NIDORAN_M  EQU 0x03
+RGBY_CLEFAIRY   EQU 0x04
+RGBY_SPEAROW    EQU 0x05
+RGBY_VOLTORB    EQU 0x06
+RGBY_NIDOKING   EQU 0x07
+RGBY_SLOWBRO    EQU 0x08
+RGBY_IVYSAUR    EQU 0x09
+RGBY_EXEGGUTOR  EQU 0x0A
+RGBY_LICKITUNG  EQU 0x0B
+RGBY_EXEGGCUTE  EQU 0x0C
+RGBY_GRIMER     EQU 0x0D
+RGBY_GENGAR     EQU 0x0E
+RGBY_NIDORAN_F  EQU 0x0F
+RGBY_NIDOQUEEN  EQU 0x10
+RGBY_CUBONE     EQU 0x11
+RGBY_RHYHORN    EQU 0x12
+RGBY_LAPRAS     EQU 0x13
+RGBY_ARCANINE   EQU 0x14
+RGBY_MEW        EQU 0x15
+RGBY_GYARADOS   EQU 0x16
+RGBY_SHELLDER   EQU 0x17
+RGBY_TENTACOOL  EQU 0x18
+RGBY_GASTLY     EQU 0x19
+RGBY_SCYTHER    EQU 0x1A
+RGBY_STARYU     EQU 0x1B
+RGBY_BLASTOISE  EQU 0x1C
+RGBY_PINSIR     EQU 0x1D
+RGBY_TANGELA    EQU 0x1E
+RGBY_GROWLITHE  EQU 0x21
+RGBY_ONIX       EQU 0x22
+RGBY_FEAROW     EQU 0x23
+RGBY_PIDGEY     EQU 0x24
+RGBY_SLOWPOKE   EQU 0x25
+RGBY_KADABRA    EQU 0x26
+RGBY_GRAVELER   EQU 0x27
+RGBY_CHANSEY    EQU 0x28
+RGBY_MACHOKE    EQU 0x29
+RGBY_MR_MIME    EQU 0x2A
+RGBY_HITMONLEE  EQU 0x2B
+RGBY_HITMONCHAN EQU 0x2C
+RGBY_ARBOK      EQU 0x2D
+RGBY_PARASECT   EQU 0x2E
+RGBY_PSYDUCK    EQU 0x2F
+RGBY_DROWZEE    EQU 0x30
+RGBY_GOLEM      EQU 0x31
+RGBY_MAGMAR     EQU 0x33
+RGBY_ELECTABUZZ EQU 0x35
+RGBY_MAGNETON   EQU 0x36
+RGBY_KOFFING    EQU 0x37
+RGBY_MANKEY     EQU 0x39
+RGBY_SEEL       EQU 0x3A
+RGBY_DIGLETT    EQU 0x3B
+RGBY_TAUROS     EQU 0x3C
+RGBY_FARFETCH_D EQU 0x40
+RGBY_VENONAT    EQU 0x41
+RGBY_DRAGONITE  EQU 0x42
+RGBY_DODUO      EQU 0x46
+RGBY_POLIWAG    EQU 0x47
+RGBY_JYNX       EQU 0x48
+RGBY_MOLTRES    EQU 0x49
+RGBY_ARTICUNO   EQU 0x4A
+RGBY_ZAPDOS     EQU 0x4B
+RGBY_DITTO      EQU 0x4C
+RGBY_MEOWTH     EQU 0x4D
+RGBY_KRABBY     EQU 0x4E
+RGBY_VULPIX     EQU 0x52
+RGBY_NINETALES  EQU 0x53
+RGBY_PIKACHU    EQU 0x54
+RGBY_RAICHU     EQU 0x55
+RGBY_DRATINI    EQU 0x58
+RGBY_DRAGONAIR  EQU 0x59
+RGBY_KABUTO     EQU 0x5A
+RGBY_KABUTOPS   EQU 0x5B
+RGBY_HORSEA     EQU 0x5C
+RGBY_SEADRA     EQU 0x5D
+RGBY_SANDSHREW  EQU 0x60
+RGBY_SANDSLASH  EQU 0x61
+RGBY_OMANYTE    EQU 0x62
+RGBY_OMASTAR    EQU 0x63
+RGBY_JIGGLYPUFF EQU 0x64
+RGBY_WIGGLYTUFF EQU 0x65
+RGBY_EEVEE      EQU 0x66
+RGBY_FLAREON    EQU 0x67
+RGBY_JOLTEON    EQU 0x68
+RGBY_VAPOREON   EQU 0x69
+RGBY_MACHOP     EQU 0x6A
+RGBY_ZUBAT      EQU 0x6B
+RGBY_EKANS      EQU 0x6C
+RGBY_PARAS      EQU 0x6D
+RGBY_POLIWHIRL  EQU 0x6E
+RGBY_POLIWRATH  EQU 0x6F
+RGBY_WEEDLE     EQU 0x70
+RGBY_KAKUNA     EQU 0x71
+RGBY_BEEDRILL   EQU 0x72
+RGBY_DODRIO     EQU 0x74
+RGBY_PRIMEAPE   EQU 0x75
+RGBY_DUGTRIO    EQU 0x76
+RGBY_VENOMOTH   EQU 0x77
+RGBY_DEWGONG    EQU 0x78
+RGBY_CATERPIE   EQU 0x7B
+RGBY_METAPOD    EQU 0x7C
+RGBY_BUTTERFREE EQU 0x7D
+RGBY_MACHAMP    EQU 0x7E
+RGBY_GOLDUCK    EQU 0x80
+RGBY_HYPNO      EQU 0x81
+RGBY_GOLBAT     EQU 0x82
+RGBY_MEWTWO     EQU 0x83
+RGBY_SNORLAX    EQU 0x84
+RGBY_MAGIKARP   EQU 0x85
+RGBY_MUK        EQU 0x88
+RGBY_KINGLER    EQU 0x8A
+RGBY_CLOYSTER   EQU 0x8B
+RGBY_ELECTRODE  EQU 0x8D
+RGBY_CLEFABLE   EQU 0x8E
+RGBY_WEEZING    EQU 0x8F
+RGBY_PERSIAN    EQU 0x90
+RGBY_MAROWAK    EQU 0x91
+RGBY_HAUNTER    EQU 0x93
+RGBY_ABRA       EQU 0x94
+RGBY_ALAKAZAM   EQU 0x95
+RGBY_PIDGEOTTO  EQU 0x96
+RGBY_PIDGEOT    EQU 0x97
+RGBY_STARMIE    EQU 0x98
+RGBY_BULBASAUR  EQU 0x99
+RGBY_VENUSAUR   EQU 0x9A
+RGBY_TENTACRUEL EQU 0x9B
+RGBY_GOLDEEN    EQU 0x9D
+RGBY_SEAKING    EQU 0x9E
+RGBY_PONYTA     EQU 0xA3
+RGBY_RAPIDASH   EQU 0xA4
+RGBY_RATTATA    EQU 0xA5
+RGBY_RATICATE   EQU 0xA6
+RGBY_NIDORINO   EQU 0xA7
+RGBY_NIDORINA   EQU 0xA8
+RGBY_GEODUDE    EQU 0xA9
+RGBY_PORYGON    EQU 0xAA
+RGBY_AERODACTYL EQU 0xAB
+RGBY_MAGNEMITE  EQU 0xAD
+RGBY_CHARMANDER EQU 0xB0
+RGBY_SQUIRTLE   EQU 0xB1
+RGBY_CHARMELEON EQU 0xB2
+RGBY_WARTORTLE  EQU 0xB3
+RGBY_CHARIZARD  EQU 0xB4
+RGBY_ODDISH     EQU 0xB9
+RGBY_GLOOM      EQU 0xBA
+RGBY_VILEPLUME  EQU 0xBB
+RGBY_BELLSPROUT EQU 0xBC
+RGBY_WEEPINBELL EQU 0xBD
+RGBY_VICTREEBEL EQU 0xBE
diff --git a/stadiumgs/main.s b/stadiumgs/main.s
index 29e999f..4df617d 100644
--- a/stadiumgs/main.s
+++ b/stadiumgs/main.s
@@ -136,9 +136,221 @@ TimeCapsuleAltItems:
 
 	.align
 
-.incbin "baseromgs.n64",0x982a0,0x98370-0x982a0
+RBYTMHMMoves1:
+	.db MEGA_PUNCH
+	.db RAZOR_WIND
+	.db SWORDS_DANCE
+	.db WHIRLWIND
+	.db MEGA_KICK
+	.db TOXIC
+	.db HORN_DRILL
+	.db BODY_SLAM
+	.db TAKE_DOWN
+	.db DOUBLE_EDGE
+	.db BUBBLEBEAM
+	.db WATER_GUN
+	.db ICE_BEAM
+	.db BLIZZARD
+	.db HYPER_BEAM
+	.db PAY_DAY
+	.db SUBMISSION
+	.db COUNTER
+	.db SEISMIC_TOSS
+	.db RAGE
+	.db MEGA_DRAIN
+	.db SOLARBEAM
+	.db DRAGON_RAGE
+	.db THUNDERBOLT
+	.db THUNDER
+	.db EARTHQUAKE
+	.db FISSURE
+	.db DIG
+	.db PSYCHIC_M
+	.db TELEPORT
+	.db MIMIC
+	.db DOUBLE_TEAM
+	.db REFLECT
+	.db BIDE
+	.db METRONOME
+	.db SELFDESTRUCT
+	.db EGG_BOMB
+	.db FIRE_BLAST
+	.db SWIFT
+	.db SKULL_BASH
+	.db SOFTBOILED
+	.db DREAM_EATER
+	.db SKY_ATTACK
+	.db REST
+	.db THUNDER_WAVE
+	.db PSYWAVE
+	.db EXPLOSION
+	.db ROCK_SLIDE
+	.db TRI_ATTACK
+	.db SUBSTITUTE
+	.db CUT
+	.db FLY
+	.db SURF
+	.db STRENGTH
+	.db FLASH
+
+	.align
 
-Pokered_MonIndices:
+Pokered_MonIndices1:
+	.db RGBY_BULBASAUR
+	.db RGBY_IVYSAUR
+	.db RGBY_VENUSAUR
+	.db RGBY_CHARMANDER
+	.db RGBY_CHARMELEON
+	.db RGBY_CHARIZARD
+	.db RGBY_SQUIRTLE
+	.db RGBY_WARTORTLE
+	.db RGBY_BLASTOISE
+	.db RGBY_CATERPIE
+	.db RGBY_METAPOD
+	.db RGBY_BUTTERFREE
+	.db RGBY_WEEDLE
+	.db RGBY_KAKUNA
+	.db RGBY_BEEDRILL
+	.db RGBY_PIDGEY
+	.db RGBY_PIDGEOTTO
+	.db RGBY_PIDGEOT
+	.db RGBY_RATTATA
+	.db RGBY_RATICATE
+	.db RGBY_SPEAROW
+	.db RGBY_FEAROW
+	.db RGBY_EKANS
+	.db RGBY_ARBOK
+	.db RGBY_PIKACHU
+	.db RGBY_RAICHU
+	.db RGBY_SANDSHREW
+	.db RGBY_SANDSLASH
+	.db RGBY_NIDORAN_F
+	.db RGBY_NIDORINA
+	.db RGBY_NIDOQUEEN
+	.db RGBY_NIDORAN_M
+	.db RGBY_NIDORINO
+	.db RGBY_NIDOKING
+	.db RGBY_CLEFAIRY
+	.db RGBY_CLEFABLE
+	.db RGBY_VULPIX
+	.db RGBY_NINETALES
+	.db RGBY_JIGGLYPUFF
+	.db RGBY_WIGGLYTUFF
+	.db RGBY_ZUBAT
+	.db RGBY_GOLBAT
+	.db RGBY_ODDISH
+	.db RGBY_GLOOM
+	.db RGBY_VILEPLUME
+	.db RGBY_PARAS
+	.db RGBY_PARASECT
+	.db RGBY_VENONAT
+	.db RGBY_VENOMOTH
+	.db RGBY_DIGLETT
+	.db RGBY_DUGTRIO
+	.db RGBY_MEOWTH
+	.db RGBY_PERSIAN
+	.db RGBY_PSYDUCK
+	.db RGBY_GOLDUCK
+	.db RGBY_MANKEY
+	.db RGBY_PRIMEAPE
+	.db RGBY_GROWLITHE
+	.db RGBY_ARCANINE
+	.db RGBY_POLIWAG
+	.db RGBY_POLIWHIRL
+	.db RGBY_POLIWRATH
+	.db RGBY_ABRA
+	.db RGBY_KADABRA
+	.db RGBY_ALAKAZAM
+	.db RGBY_MACHOP
+	.db RGBY_MACHOKE
+	.db RGBY_MACHAMP
+	.db RGBY_BELLSPROUT
+	.db RGBY_WEEPINBELL
+	.db RGBY_VICTREEBEL
+	.db RGBY_TENTACOOL
+	.db RGBY_TENTACRUEL
+	.db RGBY_GEODUDE
+	.db RGBY_GRAVELER
+	.db RGBY_GOLEM
+	.db RGBY_PONYTA
+	.db RGBY_RAPIDASH
+	.db RGBY_SLOWPOKE
+	.db RGBY_SLOWBRO
+	.db RGBY_MAGNEMITE
+	.db RGBY_MAGNETON
+	.db RGBY_FARFETCH_D
+	.db RGBY_DODUO
+	.db RGBY_DODRIO
+	.db RGBY_SEEL
+	.db RGBY_DEWGONG
+	.db RGBY_GRIMER
+	.db RGBY_MUK
+	.db RGBY_SHELLDER
+	.db RGBY_CLOYSTER
+	.db RGBY_GASTLY
+	.db RGBY_HAUNTER
+	.db RGBY_GENGAR
+	.db RGBY_ONIX
+	.db RGBY_DROWZEE
+	.db RGBY_HYPNO
+	.db RGBY_KRABBY
+	.db RGBY_KINGLER
+	.db RGBY_VOLTORB
+	.db RGBY_ELECTRODE
+	.db RGBY_EXEGGCUTE
+	.db RGBY_EXEGGUTOR
+	.db RGBY_CUBONE
+	.db RGBY_MAROWAK
+	.db RGBY_HITMONLEE
+	.db RGBY_HITMONCHAN
+	.db RGBY_LICKITUNG
+	.db RGBY_KOFFING
+	.db RGBY_WEEZING
+	.db RGBY_RHYHORN
+	.db RGBY_RHYDON
+	.db RGBY_CHANSEY
+	.db RGBY_TANGELA
+	.db RGBY_KANGASKHAN
+	.db RGBY_HORSEA
+	.db RGBY_SEADRA
+	.db RGBY_GOLDEEN
+	.db RGBY_SEAKING
+	.db RGBY_STARYU
+	.db RGBY_STARMIE
+	.db RGBY_MR_MIME
+	.db RGBY_SCYTHER
+	.db RGBY_JYNX
+	.db RGBY_ELECTABUZZ
+	.db RGBY_MAGMAR
+	.db RGBY_PINSIR
+	.db RGBY_TAUROS
+	.db RGBY_MAGIKARP
+	.db RGBY_GYARADOS
+	.db RGBY_LAPRAS
+	.db RGBY_DITTO
+	.db RGBY_EEVEE
+	.db RGBY_VAPOREON
+	.db RGBY_JOLTEON
+	.db RGBY_FLAREON
+	.db RGBY_PORYGON
+	.db RGBY_OMANYTE
+	.db RGBY_OMASTAR
+	.db RGBY_KABUTO
+	.db RGBY_KABUTOPS
+	.db RGBY_AERODACTYL
+	.db RGBY_SNORLAX
+	.db RGBY_ARTICUNO
+	.db RGBY_ZAPDOS
+	.db RGBY_MOLTRES
+	.db RGBY_DRATINI
+	.db RGBY_DRAGONAIR
+	.db RGBY_DRAGONITE
+	.db RGBY_MEWTWO
+	.db RGBY_MEW
+
+	.align
+
+Pokered_MonIndices2:
 	.db RHYDON
 	.db KANGASKHAN
 	.db NIDORAN_M
@@ -343,7 +555,7 @@ Moves:
 .incbin "baseromgs.n64",0x98430,0x98a14-0x98430
 
 
-TMHMMoves:
+GSCTMHMMoves:
 	.db DYNAMICPUNCH
 	.db HEADBUTT
 	.db CURSE
@@ -403,62 +615,63 @@ TMHMMoves:
 	.db WATERFALL
 	.align
 
-UnknownData0x98A50: ; XXX what is this?
-	.db 0x05
-	.db 0x0D
-	.db 0x0E
-	.db 0x12
-	.db 0x19
-	.db 0x5C
-	.db 0x20
-	.db 0x22
-	.db 0x24
-	.db 0x26
-	.db 0x3D
-	.db 0x37
-	.db 0x3A
-	.db 0x3B
-	.db 0x3F
-	.db 0x06
-	.db 0x42
-	.db 0x44
-	.db 0x45
-	.db 0x63
-	.db 0x48
-	.db 0x4C
-	.db 0x52
-	.db 0x55
-	.db 0x57
-	.db 0x59
-	.db 0x5A
-	.db 0x5B
-	.db 0x5E
-	.db 0x64
-	.db 0x66
-	.db 0x68
-	.db 0x73
-	.db 0x75
-	.db 0x76
-	.db 0x78
-	.db 0x79
-	.db 0x7E
-	.db 0x81
-	.db 0x82
-	.db 0x87
-	.db 0x8A
-	.db 0x8F
-	.db 0x9C
-	.db 0x56
-	.db 0x95
-	.db 0x99
-	.db 0x9D
-	.db 0xA1
-	.db 0xA4
-	.db 0x0F
-	.db 0x13
-	.db 0x39
-	.db 0x46
-	.db 0x94
+RBYTMHMMoves2:
+	.db MEGA_PUNCH
+	.db RAZOR_WIND
+	.db SWORDS_DANCE
+	.db WHIRLWIND
+	.db MEGA_KICK
+	.db TOXIC
+	.db HORN_DRILL
+	.db BODY_SLAM
+	.db TAKE_DOWN
+	.db DOUBLE_EDGE
+	.db BUBBLEBEAM
+	.db WATER_GUN
+	.db ICE_BEAM
+	.db BLIZZARD
+	.db HYPER_BEAM
+	.db PAY_DAY
+	.db SUBMISSION
+	.db COUNTER
+	.db SEISMIC_TOSS
+	.db RAGE
+	.db MEGA_DRAIN
+	.db SOLARBEAM
+	.db DRAGON_RAGE
+	.db THUNDERBOLT
+	.db THUNDER
+	.db EARTHQUAKE
+	.db FISSURE
+	.db DIG
+	.db PSYCHIC_M
+	.db TELEPORT
+	.db MIMIC
+	.db DOUBLE_TEAM
+	.db REFLECT
+	.db BIDE
+	.db METRONOME
+	.db SELFDESTRUCT
+	.db EGG_BOMB
+	.db FIRE_BLAST
+	.db SWIFT
+	.db SKULL_BASH
+	.db SOFTBOILED
+	.db DREAM_EATER
+	.db SKY_ATTACK
+	.db REST
+	.db THUNDER_WAVE
+	.db PSYWAVE
+	.db EXPLOSION
+	.db ROCK_SLIDE
+	.db TRI_ATTACK
+	.db SUBSTITUTE
+	.db CUT
+	.db FLY
+	.db SURF
+	.db STRENGTH
+	.db FLASH
+
 	.align 16
 
 SUPER_EFFECTIVE    EQU 20