Merge branch 'master' of https://github.com/plaguevonkarma/kep-hack

README.md

@@ -1,3 +1,55 @@
+Kanto Expansion Pak
+===================
+This is a ROM Hack of Pokémon Red and Blue, aiming to expand the dex with 
+
+QoL Enhancements
+====
+- PC added to Celadon Hotel where the event usually is. Why not?
+- Artificial Save Delay has been removed.
+
+Bug Fixes
+====
+Many non-multiplayer, non-battle related bugs have been fixed. The aforementioned have been preserved for the RBY battle experience. Bugs that are fixed are ones that objectively hurt the gameplay experience. Much of this can be attributed to [the tutorials](https://github.com/pret/pokered/wiki/Bugs-and-Glitches) made by the good people at pret.
+- Blaine is no longer addicted to Super Potions.
+- CoolTrainerF no longer switches a lot.
+- Transformed Pokemon aren't presumed to be Dittos! (very important given Animon)
+- Status curing items don't remove modifiers anymore.
+- Learning new moves plays the sound in the correct bank.
+- Falling through a hole on a bike now properly resets the music, as you fall off a bike when going down.
+- Using an Escape Rope no longer shows weird characters on DMG and spins correctly on DMG.
+- The Item Finder will correctly find items at X/Y 0.0
+- Glitch Pokémon will no longer corrupt the Hall of Fame.
+- Strength smoke puffs now show properly.
+- Game Corner slots no longer load too many tiles; the lucky machine stops when it should if there's a 7, few other objective issues. Also, the 40-coin hidden item is fixed, and there can always be a lucky machine.
+- 2 invisible stars that show on the title screen are cut off; also, the "presents" logo from RG is re-used!
+- The healing machine animates correctly! 
+- Using Minimize or Substitute, looking at the Pokedex, and then battling won't cause sprite corruption.
+- OAM Updates can no longer be interrupted by V-Blank, avoiding some sprite corruption.
+- Trainer Card transition no longer shows weird garbage on DMGs; this was due to not having enough time to load properly.
+- Battle victory music plays at the right time; there were some situations where it would happen when you lost.
+- Music in Oak's Lab is delayed a frame so it always plays with the correct channels; V-Blank could otherwise interrupt it.
+- The hidden item sfx no longer gets cut off sometimes
+- The audio engine no longer borrows from the high bytes of the wrong frequency.
+- Oak no longer has his line overwrite itself when giving Poke Balls.
+- Player correctly faces the Route 8 guard when stopped.
+- Weird behaviour when going to 11F in Silph Co. and forcing a player to leave despite not moving is fixed.
+- Fixed weirdness in Pokemon Tower where saving Mr. Fuji won't immediately let you leave. Also fixed coord termination on 2F which could cause some terribleness.
+and more!
+
+Credits
+====
+* Plague von Karma - Creator of the Showdown Mod, Developer
+* Martha's Against Humanity - Developer 
+* Ema Sky - Developer 
+* ausma - Showdown Mod assistance
+* Paulluxx - Showdown Mod assistance
+* DuoM2 - Showdown Mod assistance 
+* Albatross - Much of the new sprites used in the hack 
+* ZumiIsawhat? - Restorations of beta OST
+* Helix Chamber, RacieBeep, et al - Prototype Pokémon sprites
+* pret et al - Pokémon Red and Blue Disassembly Project, many tutorials helped us!
+
+Original README.md proceeding;
 # Pokémon Red and Blue [![Build Status][ci-badge]][ci]
 
 This is a disassembly of Pokémon Red and Blue.

audio/engine_1.asm

@@ -1190,13 +1190,13 @@ Audio1_InitPitchSlideVars:
 ; This means that the result will be 0x200 greater than it should be if the
 ; low byte of the current frequency is greater than the low byte of the
 ; target frequency.
-	ld a, d
+; kep fixes this - PvK
-	sbc b
+	push af
-	ld d, a
-
 	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
+	pop af
 	ld a, [hl]
+	sbc b
 	sub d
 	ld d, a
 	ld b, 0

audio/engine_2.asm

@@ -1253,13 +1253,13 @@ Audio2_InitPitchSlideVars:
 ; This means that the result will be 0x200 greater than it should be if the
 ; low byte of the current frequency is greater than the low byte of the
 ; target frequency.
-	ld a, d
+; kep fixes this - PvK
-	sbc b
+	push af
-	ld d, a
-
 	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
+	pop af
 	ld a, [hl]
+	sbc b
 	sub d
 	ld d, a
 	ld b, 0

audio/engine_3.asm

@@ -1190,13 +1190,13 @@ Audio3_InitPitchSlideVars:
 ; This means that the result will be 0x200 greater than it should be if the
 ; low byte of the current frequency is greater than the low byte of the
 ; target frequency.
-	ld a, d
+; kep fixes this - PvK
-	sbc b
+	push af
-	ld d, a
-
 	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
+	pop af
 	ld a, [hl]
+	sbc b
 	sub d
 	ld d, a
 	ld b, 0

constants/move_constants.asm

@@ -171,6 +171,19 @@
 	const SLASH        ; a3
 	const SUBSTITUTE   ; a4
 	const STRUGGLE     ; a5
+	const FAIRY_WIND   ; a6
+	const DRAININGKISS ; a7
+	const METAL_SOUND  ; a8
+	const MAGNET_BOMB  ; a9
+	const IRON_DEFENSE ; aa
+	const DAZZLE_GLEAM ; ab
+	const NIGHT_SLASH  ; ac
+	const FEINT_ATTACK ; ad
+	const IRON_HEAD    ; ae
+	const BRUTAL_SWING ; af
+	const CHARM 	 ; b0
+	const SWEET_KISS   ; b1
+	const BULLET_PUNCH ; b2
 DEF NUM_ATTACKS EQU const_value - 1
 
 	; Moves do double duty as animation identifiers.

constants/pokedex_constants.asm

@@ -12,7 +12,7 @@
 	const DEX_CHARIZARD  ; 6
 	const DEX_SQUIRTLE   ; 7
 	const DEX_WARTORTLE  ; 8
-	const DEX_BLASTOISE  ; 9
+	const DEX_TOTARTLE   ; 9
 	const DEX_CATERPIE   ; 10
 	const DEX_METAPOD    ; 11
 	const DEX_BUTTERFREE ; 12
@@ -30,6 +30,7 @@
 	const DEX_ARBOK      ; 24
 	const DEX_PIKACHU    ; 25
 	const DEX_RAICHU     ; 26
+	const DEX_GOROCHU   
 	const DEX_SANDSHREW  ; 27
 	const DEX_SANDSLASH  ; 28
 	const DEX_NIDORAN_F  ; 29
@@ -38,29 +39,41 @@
 	const DEX_NIDORAN_M  ; 32
 	const DEX_NIDORINO   ; 33
 	const DEX_NIDOKING   ; 34
+	const DEX_NIDOREIGN
 	const DEX_CLEFAIRY   ; 35
 	const DEX_CLEFABLE   ; 36
+	const DEX_MIKON      
 	const DEX_VULPIX     ; 37
 	const DEX_NINETALES  ; 38
 	const DEX_JIGGLYPUFF ; 39
 	const DEX_WIGGLYTUFF ; 40
+	const DEX_BITTYBAT
 	const DEX_ZUBAT      ; 41
 	const DEX_GOLBAT     ; 42
 	const DEX_ODDISH     ; 43
 	const DEX_GLOOM      ; 44
 	const DEX_VILEPLUME  ; 45
+	const DEX_BELLOSSOM 
+	const DEX_PARA
 	const DEX_PARAS      ; 46
 	const DEX_PARASECT   ; 47
 	const DEX_VENONAT    ; 48
 	const DEX_VENOMOTH   ; 49
+	const DEX_CHEEP    
+	const DEX_JABETTA    
+	const DEX_RIBBITO   
+	const DEX_CROAKOZUNA 
 	const DEX_DIGLETT    ; 50
 	const DEX_DUGTRIO    ; 51
+	const DEX_KONYA 
 	const DEX_MEOWTH     ; 52
 	const DEX_PERSIAN    ; 53
 	const DEX_PSYDUCK    ; 54
+	const DEX_WEIRDUCK   
 	const DEX_GOLDUCK    ; 55
 	const DEX_MANKEY     ; 56
 	const DEX_PRIMEAPE   ; 57
+	const DEX_PUDI
 	const DEX_GROWLITHE  ; 58
 	const DEX_ARCANINE   ; 59
 	const DEX_POLIWAG    ; 60
@@ -75,22 +88,33 @@
 	const DEX_BELLSPROUT ; 69
 	const DEX_WEEPINBELL ; 70
 	const DEX_VICTREEBEL ; 71
+	const DEX_TSUBOMITTO
 	const DEX_TENTACOOL  ; 72
 	const DEX_TENTACRUEL ; 73
 	const DEX_GEODUDE    ; 74
 	const DEX_GRAVELER   ; 75
 	const DEX_GOLEM      ; 76
+	const DEX_BLOTTLE   
+	const DEX_PENDRAKEN 
+	const DEX_PUCHIKOON
 	const DEX_PONYTA     ; 77
 	const DEX_RAPIDASH   ; 78
 	const DEX_SLOWPOKE   ; 79
 	const DEX_SLOWBRO    ; 80
 	const DEX_MAGNEMITE  ; 81
+	const DEX_MAGNETITE
 	const DEX_MAGNETON   ; 82
-	const DEX_FARFETCHD  ; 83
+	const DEX_BARUNDA 
+	const DEX_FARFETCHD  ; 83 
+	const DEX_MADAAMU    
+	const DEX_BLASTYKE  
+	const DEX_BLASTOISE 
+	const DEX_HINAAZU
 	const DEX_DODUO      ; 84
-	const DEX_DODRIO     ; 85
+	const DEX_DODRIO     ; 85 
 	const DEX_SEEL       ; 86
 	const DEX_DEWGONG    ; 87
+	const DEX_BETOBEBII
 	const DEX_GRIMER     ; 88
 	const DEX_MUK        ; 89
 	const DEX_SHELLDER   ; 90
@@ -101,14 +125,22 @@
 	const DEX_ONIX       ; 95
 	const DEX_DROWZEE    ; 96
 	const DEX_HYPNO      ; 97
+	const DEX_KOTORA
+	const DEX_GAOTORA
+	const DEX_GOROTORA 
 	const DEX_KRABBY     ; 98
 	const DEX_KINGLER    ; 99
 	const DEX_VOLTORB    ; 100
 	const DEX_ELECTRODE  ; 101
+	const DEX_CACTUS
+	const DEX_CROCKY
+	const DEX_DEER
 	const DEX_EXEGGCUTE  ; 102
 	const DEX_EXEGGUTOR  ; 103
 	const DEX_CUBONE     ; 104
 	const DEX_MAROWAK    ; 105
+	const DEX_GUARDIA 
+	const DEX_KANGASKHAN ; 115
 	const DEX_HITMONLEE  ; 106
 	const DEX_HITMONCHAN ; 107
 	const DEX_LICKITUNG  ; 108
@@ -117,26 +149,39 @@
 	const DEX_RHYHORN    ; 111
 	const DEX_RHYDON     ; 112
 	const DEX_CHANSEY    ; 113
-	const DEX_TANGELA    ; 114
+	const DEX_MONJA
-	const DEX_KANGASKHAN ; 115
+	const DEX_TANGELA    ; 114 
+	const DEX_DECILLA   
+	const DEX_GYAOON     
+	const DEX_OMEGA      
 	const DEX_HORSEA     ; 116
 	const DEX_SEADRA     ; 117
+	const DEX_GYOPIN
 	const DEX_GOLDEEN    ; 118
 	const DEX_SEAKING    ; 119
+	const DEX_SKIMPER    
+	const DEX_BAWLIGUA    
+	const DEX_CRYITHAN   
 	const DEX_STARYU     ; 120
 	const DEX_STARMIE    ; 121
+	const DEX_JAGG
 	const DEX_MR_MIME    ; 122
 	const DEX_SCYTHER    ; 123
+	const DEX_SCIZOR
+	const DEX_PINSIR     ; 127
+	const DEX_PURAKKUSU 
 	const DEX_JYNX       ; 124
+	const DEX_BUU
 	const DEX_ELECTABUZZ ; 125
 	const DEX_MAGMAR     ; 126
-	const DEX_PINSIR     ; 127
+	const DEX_TRAMPEL    ; 
 	const DEX_TAUROS     ; 128
 	const DEX_MAGIKARP   ; 129
 	const DEX_GYARADOS   ; 130
 	const DEX_LAPRAS     ; 131
 	const DEX_DITTO      ; 132
-	const DEX_EEVEE      ; 133
+	const DEX_ANIMON
+	const DEX_EEVEE      ; 133	
 	const DEX_VAPOREON   ; 134
 	const DEX_JOLTEON    ; 135
 	const DEX_FLAREON    ; 136

constants/pokemon_constants.asm

@@ -37,8 +37,8 @@
 	const BLASTOISE          ; $1C
 	const PINSIR             ; $1D
 	const TANGELA            ; $1E
-	const_skip               ; $1F
+	const GYAOON             ; $1F	(new)
-	const_skip               ; $20
+	const NIDOREIGN          ; $20	(new)
 	const GROWLITHE          ; $21
 	const ONIX               ; $22
 	const FEAROW             ; $23
@@ -56,26 +56,26 @@
 	const PSYDUCK            ; $2F
 	const DROWZEE            ; $30
 	const GOLEM              ; $31
-	const_skip               ; $32
+	const BARUNDA            ; $32	(new)
 	const MAGMAR             ; $33
-	const_skip               ; $34
+	const BUU	             ; $34	(new)
 	const ELECTABUZZ         ; $35
 	const MAGNETON           ; $36
 	const KOFFING            ; $37
-	const_skip               ; $38
+	const DEER               ; $38	(new)
 	const MANKEY             ; $39
 	const SEEL               ; $3A
 	const DIGLETT            ; $3B
 	const TAUROS             ; $3C
-	const_skip               ; $3D
+	const TRAMPEL            ; $3D	(new)
-	const_skip               ; $3E
+	const CROCKY             ; $3E	(new)
-	const_skip               ; $3F
+	const BLOTTLE            ; $3F	(new)
 	const FARFETCHD          ; $40
 	const VENONAT            ; $41
 	const DRAGONITE          ; $42
-	const_skip               ; $43
+	const CACTUS             ; $43	(new)
-	const_skip               ; $44
+	const JAGG               ; $44	(new)
-	const_skip               ; $45
+	const BITTYBAT           ; $45	(new)
 	const DODUO              ; $46
 	const POLIWAG            ; $47
 	const JYNX               ; $48
@@ -85,23 +85,23 @@
 	const DITTO              ; $4C
 	const MEOWTH             ; $4D
 	const KRABBY             ; $4E
-	const_skip               ; $4F
+	const CHEEP              ; $4F	(new)
-	const_skip               ; $50
+	const JABETTA            ; $50	(new)
-	const_skip               ; $51
+	const MIKON              ; $51	(new)
 	const VULPIX             ; $52
 	const NINETALES          ; $53
 	const PIKACHU            ; $54
 	const RAICHU             ; $55
-	const_skip               ; $56
+	const RIBBITO            ; $56	(new)
-	const_skip               ; $57
+	const CROAKOZUNA         ; $57	(new)
 	const DRATINI            ; $58
 	const DRAGONAIR          ; $59
 	const KABUTO             ; $5A
 	const KABUTOPS           ; $5B
 	const HORSEA             ; $5C
 	const SEADRA             ; $5D
-	const_skip               ; $5E
+	const BAWLIGUA           ; $5E	(new)
-	const_skip               ; $5F
+	const CRYITHAN           ; $5F	(new)
 	const SANDSHREW          ; $60
 	const SANDSLASH          ; $61
 	const OMANYTE            ; $62
@@ -121,38 +121,38 @@
 	const WEEDLE             ; $70
 	const KAKUNA             ; $71
 	const BEEDRILL           ; $72
-	const_skip               ; $73
+	const MADAAMU            ; $73	(new)
 	const DODRIO             ; $74
 	const PRIMEAPE           ; $75
 	const DUGTRIO            ; $76
 	const VENOMOTH           ; $77
 	const DEWGONG            ; $78
-	const_skip               ; $79
+	const PURAKKUSU          ; $79	(new)
-	const_skip               ; $7A
+	const PENDRAKEN          ; $7A	(new)
 	const CATERPIE           ; $7B
 	const METAPOD            ; $7C
 	const BUTTERFREE         ; $7D
 	const MACHAMP            ; $7E
-	const_skip               ; $7F
+	const WEIRDUCK           ; $7F	(new)
 	const GOLDUCK            ; $80
 	const HYPNO              ; $81
 	const GOLBAT             ; $82
 	const MEWTWO             ; $83
 	const SNORLAX            ; $84
 	const MAGIKARP           ; $85
-	const_skip               ; $86
+	const KONYA              ; $86	(new)
-	const_skip               ; $87
+	const OMEGA              ; $87	(new)
 	const MUK                ; $88
-	const_skip               ; $89
+	const DECILLA            ; $89	(new)
 	const KINGLER            ; $8A
 	const CLOYSTER           ; $8B
-	const_skip               ; $8C
+	const MAGNETITE          ; $8C	(new)
 	const ELECTRODE          ; $8D
 	const CLEFABLE           ; $8E
 	const WEEZING            ; $8F
 	const PERSIAN            ; $90
 	const MAROWAK            ; $91
-	const_skip               ; $92
+	const GUARDIA            ; $92	(new)
 	const HAUNTER            ; $93
 	const ABRA               ; $94
 	const ALAKAZAM           ; $95
@@ -162,13 +162,13 @@
 	const BULBASAUR          ; $99
 	const VENUSAUR           ; $9A
 	const TENTACRUEL         ; $9B
-	const_skip               ; $9C
+	const GYOPIN             ; $9C	(new)
 	const GOLDEEN            ; $9D
 	const SEAKING            ; $9E
-	const_skip               ; $9F
+	const KOTORA             ; $9F	(new)
-	const_skip               ; $A0
+	const GAOTORA            ; $A0	(new)
-	const_skip               ; $A1
+	const GOROTORA           ; $A1	(new)
-	const_skip               ; $A2
+	const PUCHIKOON          ; $A2	(new)
 	const PONYTA             ; $A3
 	const RAPIDASH           ; $A4
 	const RATTATA            ; $A5
@@ -178,25 +178,34 @@
 	const GEODUDE            ; $A9
 	const PORYGON            ; $AA
 	const AERODACTYL         ; $AB
-	const_skip               ; $AC
+	const BLASTYKE           ; $AC	(new)
 	const MAGNEMITE          ; $AD
-	const_skip               ; $AE
+	const SKIMPER            ; $AE	(new)
-	const_skip               ; $AF
+	const GOROCHU            ; $AF	(new)
 	const CHARMANDER         ; $B0
 	const SQUIRTLE           ; $B1
 	const CHARMELEON         ; $B2
 	const WARTORTLE          ; $B3
 	const CHARIZARD          ; $B4
-	const_skip               ; $B5
+	const TOTARTLE           ; $B5	(new)
-	const FOSSIL_KABUTOPS    ; $B6
+	const FOSSIL_KABUTOPS    ; $B6	(missingno.)
-	const FOSSIL_AERODACTYL  ; $B7
+	const FOSSIL_AERODACTYL  ; $B7	(missingno.)
-	const MON_GHOST          ; $B8
+	const MON_GHOST          ; $B8	(missingno.)
 	const ODDISH             ; $B9
 	const GLOOM              ; $BA
 	const VILEPLUME          ; $BB
 	const BELLSPROUT         ; $BC
 	const WEEPINBELL         ; $BD
 	const VICTREEBEL         ; $BE
+	const TSUBOMITTO         ; $BF	(new)
+	const ANIMON             ; $C0	(new)
+	const MONJA              ; $C1	(new)
+	const PARA               ; $C2	(new)
+	const HINAAZU            ; $C3	(new)
+	const PUDI               ; $C4	(new)
+	const BETOBEBII          ; $C5	(new)
+	const BELLOSSOM          ; $C6	(new)
+	const SCIZOR             ; $C7	(new)
 
 DEF NUM_POKEMON_INDEXES EQU const_value - 1
 

constants/type_constants.asm

@@ -11,6 +11,7 @@ DEF PHYSICAL EQU const_value
 	const BIRD         ; $06
 	const BUG          ; $07
 	const GHOST        ; $08
+	const STEEL        ; $09
 
 	const_next 20
 
@@ -22,5 +23,7 @@ DEF SPECIAL EQU const_value
 	const PSYCHIC_TYPE ; $18
 	const ICE          ; $19
 	const DRAGON       ; $1A
+	const DARK		 ; $1B
+	const FAIRY		 ; $1C
 
 DEF NUM_TYPES EQU const_value

data/moves/animations.asm

@@ -165,6 +165,19 @@ AttackAnimationPointers:
 	dw SlashAnim
 	dw SubstituteAnim
 	dw StruggleAnim
+	dw FairyWindAnim
+	dw DrainingKissAnim
+	dw MetalSoundAnim
+	dw MagnetBombAnim
+	dw IronDefenseAnim
+	dw DazzleGleamAnim
+	dw NightSlashAnim
+	dw FeintAttackAnim
+	dw IronHeadAnim
+	dw BrutalSwingAnim
+	dw CharmAnim
+	dw SweetKissAnim
+	dw BulletPunchAnim
 	assert_table_length NUM_ATTACKS
 	dw ShowPicAnim
 	dw EnemyFlashAnim
@@ -243,6 +256,7 @@ DoubleSlapAnim:
 	battle_anim DOUBLESLAP, SUBANIM_01, 0, 5
 	db -1 ; end
 
+BulletPunchAnim:
 CometPunchAnim:
 	battle_anim COMET_PUNCH, SUBANIM_02, 0, 4
 	battle_anim COMET_PUNCH, SUBANIM_02, 0, 4
@@ -282,6 +296,7 @@ VicegripAnim:
 	battle_anim VICEGRIP, SUBANIM_2A, 0, 8
 	db -1 ; end
 
+NightSlashAnim:
 GuillotineAnim:
 	battle_anim GUILLOTINE, SUBANIM_2A, 0, 6
 	db -1 ; end
@@ -301,6 +316,7 @@ CutAnim:
 	battle_anim NO_MOVE, SUBANIM_16, 0, 4
 	db -1 ; end
 
+FairyWindAnim:
 GustAnim:
 	battle_anim GUST, SUBANIM_10, 1, 6
 	battle_anim NO_MOVE, SUBANIM_02, 0, 6
@@ -410,6 +426,7 @@ ThrashAnim:
 	battle_anim THRASH, SUBANIM_04, 1, 6
 	db -1 ; end
 
+IronHeadAnim:
 DoubleEdgeAnim:
 	battle_anim LEECH_SEED, SE_LIGHT_SCREEN_PALETTE
 	battle_anim NO_MOVE, SUBANIM_2D, 0, 6
@@ -565,6 +582,7 @@ DrillPeckAnim:
 	battle_anim DRILL_PECK, SUBANIM_04, 1, 6
 	db -1 ; end
 
+BrutalSwingAnim:
 SubmissionAnim:
 	battle_anim SUBMISSION, SE_SLIDE_MON_OFF
 	battle_anim NO_MOVE, SUBANIM_01, 0, 6
@@ -603,6 +621,7 @@ StrengthAnim:
 	battle_anim FIRE_PUNCH, SUBANIM_04, 1, 6
 	db -1 ; end
 
+DrainingKissAnim:
 AbsorbAnim:
 	battle_anim ABSORB, SE_LIGHT_SCREEN_PALETTE
 	battle_anim NO_MOVE, SUBANIM_21, 0, 6
@@ -751,6 +770,7 @@ AgilityAnim:
 	battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE
 	db -1 ; end
 
+FeintAttackAnim:
 QuickAttackAnim:
 	battle_anim QUICK_ATTACK, SE_SLIDE_MON_OFF
 	battle_anim NO_MOVE, SUBANIM_04, 1, 6
@@ -776,6 +796,7 @@ MimicAnim:
 	battle_anim MIMIC, SUBANIM_22, 1, 6
 	db -1 ; end
 
+MetalSoundAnim:
 ScreechAnim:
 	battle_anim SCREECH, SUBANIM_12, 1, 6
 	db -1 ; end
@@ -799,6 +820,7 @@ RecoverAnim:
 	battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE
 	db -1 ; end
 
+IronDefenseAnim:
 HardenAnim:
 	battle_anim HARDEN, SE_LIGHT_SCREEN_PALETTE
 	battle_anim NO_MOVE, SUBANIM_43, 1, 6
@@ -903,6 +925,7 @@ SelfdestructAnim:
 	battle_anim SELFDESTRUCT, SUBANIM_34, 1, 3
 	db -1 ; end
 
+MagnetBombAnim:
 EggBombAnim:
 	battle_anim EGG_BOMB, SUBANIM_41, 1, 4
 	battle_anim EGG_BOMB, SUBANIM_42, 1, 4
@@ -1019,6 +1042,8 @@ LeechLifeAnim:
 	battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH
 	db -1 ; end
 
+SweetKissAnim:
+CharmAnim:
 LovelyKissAnim:
 	battle_anim LOVELY_KISS, SUBANIM_12, 0, 6
 	db -1 ; end
@@ -1052,6 +1077,7 @@ SporeAnim:
 	battle_anim SPORE, SUBANIM_36, 0, 6
 	db -1 ; end
 
+DazzleGleamAnim:
 FlashAnim:
 	battle_anim LEECH_SEED, SE_LIGHT_SCREEN_PALETTE
 	battle_anim GLARE, SE_DARK_SCREEN_FLASH

data/moves/moves.asm

@@ -176,4 +176,17 @@ Moves:
 	move SLASH,        NO_ADDITIONAL_EFFECT,        70, NORMAL,       100, 20
 	move SUBSTITUTE,   SUBSTITUTE_EFFECT,            0, NORMAL,       100, 10
 	move STRUGGLE,     RECOIL_EFFECT,               50, NORMAL,       100, 10
+	move FAIRY_WIND,   NO_ADDITIONAL_EFFECT,        40, FAIRY,        100, 30
+	move DRAININGKISS, DRAIN_HP_EFFECT,             50, FAIRY,        100, 10
+	move METAL_SOUND,  SPECIAL_DOWN2_EFFECT,         0, STEEL,         85, 40
+	move MAGNET_BOMB,  SWIFT_EFFECT,                60, STEEL,        100, 20
+	move IRON_DEFENSE, DEFENSE_UP2_EFFECT,           0, STEEL,        100, 15
+	move DAZZLE_GLEAM, NO_ADDITIONAL_EFFECT,        80, FAIRY,        100, 10
+	move NIGHT_SLASH,  NO_ADDITIONAL_EFFECT,        70, DARK,         100, 15
+	move FEINT_ATTACK, SWIFT_EFFECT,                60, DARK,         100, 20
+	move IRON_HEAD,    FLINCH_SIDE_EFFECT2,         80, STEEL,        100, 15
+	move BRUTAL_SWING, NO_ADDITIONAL_EFFECT,        60, DARK,         100, 20
+	move CHARM,        ATTACK_DOWN2_EFFECT,          0, FAIRY,        100, 20
+	move SWEET_KISS,   CONFUSION_EFFECT,             0, FAIRY,         75, 10
+	move BULLET_PUNCH, NO_ADDITIONAL_EFFECT,        40, STEEL,        100, 30
 	assert_table_length NUM_ATTACKS

data/moves/names.asm

@@ -165,4 +165,17 @@ MoveNames::
 	li "SLASH"
 	li "SUBSTITUTE"
 	li "STRUGGLE"
+	li "FAIRY WIND"
+	li "DRAININGKISS"
+	li "METAL SOUND"
+	li "MAGNET BOMB"
+	li "IRON DEFENSE"
+	li "DAZZLE GLEAM"
+	li "NIGHT SLASH"
+	li "FEINT ATTACK"
+	li "IRON HEAD"
+	li "BRUTAL SWING"
+	li "CHARM"
+	li "SWEET KISS"
+	li "BULLET PUNCH"
 	assert_list_length NUM_ATTACKS

data/moves/sfx.asm

@@ -166,5 +166,18 @@ MoveSoundTable:
 	db SFX_NOT_VERY_EFFECTIVE, $01, $ff ; SLASH
 	db SFX_BATTLE_2C,          $d8, $04 ; SUBSTITUTE
 	db SFX_BATTLE_0B,          $00, $80 ; STRUGGLE
+	db SFX_BATTLE_12,          $00, $c0 ; FAIRY_WIND
+	db SFX_BATTLE_24,          $00, $80 ; DRAININGKISS
+	db SFX_BATTLE_31,          $00, $80 ; METAL_SOUND
+	db SFX_BATTLE_34,          $00, $40 ; MAGNET_BOMB
+	db SFX_BATTLE_14,          $11, $20 ; IRON_DEFENSE
+	db SFX_BATTLE_13,          $f8, $ff ; DAZZLE_GLEAM
+	db SFX_BATTLE_0F,          $00, $80 ; NIGHT_SLASH
+	db SFX_BATTLE_25,          $00, $10 ; FEINT_ATTACK
+	db SFX_SUPER_EFFECTIVE,    $20, $c0 ; IRON_HEAD
+	db SFX_BATTLE_23,          $01, $c0 ; BRUTAL_SWING
+	db SFX_BATTLE_09,          $88, $10 ; CHARM
+	db SFX_BATTLE_09,          $88, $10 ; SWEET_KISS
+	db SFX_BATTLE_0B,          $01, $80 ; BULLET_PUNCH
 	assert_table_length NUM_ATTACKS
 	db SFX_BATTLE_0B,          $00, $80

data/pokemon/cries.asm

@@ -36,8 +36,8 @@ CryData::
 	mon_cry SFX_CRY_13, $00, $80 ; Blastoise
 	mon_cry SFX_CRY_14, $00, $80 ; Pinsir
 	mon_cry SFX_CRY_12, $00, $80 ; Tangela
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_0F, $00, $80 ; Gyaoon
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_0A, $2C, $80 ; Nidoreign
 	mon_cry SFX_CRY_1F, $20, $40 ; Growlithe
 	mon_cry SFX_CRY_17, $FF, $C0 ; Onix
 	mon_cry SFX_CRY_18, $40, $A0 ; Fearow
@@ -55,26 +55,26 @@ CryData::
 	mon_cry SFX_CRY_21, $20, $60 ; Psyduck
 	mon_cry SFX_CRY_0D, $88, $20 ; Drowzee
 	mon_cry SFX_CRY_12, $E0, $40 ; Golem
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_0E, $00, $80 ; Barunda
 	mon_cry SFX_CRY_04, $FF, $30 ; Magmar
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_0D, $2E, $E0 ; Buu
 	mon_cry SFX_CRY_06, $8F, $FF ; Electabuzz
 	mon_cry SFX_CRY_1C, $20, $C0 ; Magneton
 	mon_cry SFX_CRY_12, $E6, $DD ; Koffing
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_15, $40, $A5 ; Deer
 	mon_cry SFX_CRY_0A, $DD, $60 ; Mankey
 	mon_cry SFX_CRY_0C, $88, $C0 ; Seel
 	mon_cry SFX_CRY_0B, $AA, $01 ; Diglett
 	mon_cry SFX_CRY_1D, $11, $40 ; Tauros
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_03, $90, $B0 ; Trampel
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_1C, $C6, $F0 ; Crocky
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_13, $93, $00 ; Blottle
 	mon_cry SFX_CRY_10, $DD, $01 ; Farfetch'd
 	mon_cry SFX_CRY_1A, $44, $40 ; Venonat
 	mon_cry SFX_CRY_0F, $3C, $C0 ; Dragonite
-	mon_cry SFX_CRY_00, $80, $10 ; MissingNo.
+	mon_cry SFX_CRY_00, $80, $10 ; Cactus
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_17, $C8, $C0 ; Jagg
-	mon_cry SFX_CRY_1D, $E0, $80 ; MissingNo.
+	mon_cry SFX_CRY_1D, $B4, $4E ; Bittybat
 	mon_cry SFX_CRY_0B, $BB, $01 ; Doduo
 	mon_cry SFX_CRY_0E, $FF, $FF ; Poliwag
 	mon_cry SFX_CRY_0D, $FF, $FF ; Jynx
@@ -84,23 +84,23 @@ CryData::
 	mon_cry SFX_CRY_0E, $FF, $FF ; Ditto
 	mon_cry SFX_CRY_19, $77, $10 ; Meowth
 	mon_cry SFX_CRY_20, $20, $E0 ; Krabby
-	mon_cry SFX_CRY_22, $FF, $40 ; MissingNo.
+	mon_cry SFX_CRY_22, $FF, $40 ; Cheep
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_22, $32, $FF ; Jabetta
-	mon_cry SFX_CRY_0E, $E0, $60 ; MissingNo.
+	mon_cry SFX_CRY_0E, $E0, $60 ; Mikon
 	mon_cry SFX_CRY_24, $4F, $10 ; Vulpix
 	mon_cry SFX_CRY_24, $88, $60 ; Ninetales
 	mon_cry SFX_CRY_0F, $EE, $01 ; Pikachu
 	mon_cry SFX_CRY_09, $EE, $08 ; Raichu
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_12, $93, $60 ; Ribbito
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_12, $25, $FF ; Croakozuna
 	mon_cry SFX_CRY_0F, $60, $40 ; Dratini
 	mon_cry SFX_CRY_0F, $40, $80 ; Dragonair
 	mon_cry SFX_CRY_16, $BB, $40 ; Kabuto
 	mon_cry SFX_CRY_18, $EE, $01 ; Kabutops
 	mon_cry SFX_CRY_19, $99, $10 ; Horsea
 	mon_cry SFX_CRY_19, $3C, $01 ; Seadra
-	mon_cry SFX_CRY_0F, $40, $C0 ; MissingNo.
+	mon_cry SFX_CRY_0F, $40, $C0 ; Bawligua
-	mon_cry SFX_CRY_0F, $20, $C0 ; MissingNo.
+	mon_cry SFX_CRY_0F, $20, $C0 ; Cryithan
 	mon_cry SFX_CRY_00, $20, $40 ; Sandshrew
 	mon_cry SFX_CRY_00, $FF, $FF ; Sandslash
 	mon_cry SFX_CRY_1F, $F0, $01 ; Omanyte
@@ -120,38 +120,38 @@ CryData::
 	mon_cry SFX_CRY_15, $EE, $01 ; Weedle
 	mon_cry SFX_CRY_13, $FF, $01 ; Kakuna
 	mon_cry SFX_CRY_13, $60, $80 ; Beedrill
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_18, $19, $FF ; Luxwan
 	mon_cry SFX_CRY_0B, $99, $20 ; Dodrio
 	mon_cry SFX_CRY_0A, $AF, $40 ; Primeape
 	mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio
 	mon_cry SFX_CRY_1A, $29, $80 ; Venomoth
 	mon_cry SFX_CRY_0C, $23, $FF ; Dewgong
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_09, $FF, $20 ; Purakkusu
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_13, $3C, $00 ; Pendraken
 	mon_cry SFX_CRY_16, $80, $20 ; Caterpie
 	mon_cry SFX_CRY_1C, $CC, $01 ; Metapod
 	mon_cry SFX_CRY_16, $77, $40 ; Butterfree
 	mon_cry SFX_CRY_1F, $08, $C0 ; Machamp
-	mon_cry SFX_CRY_11, $20, $10 ; MissingNo.
+	mon_cry SFX_CRY_21, $93, $50 ; Weirduck
 	mon_cry SFX_CRY_21, $FF, $40 ; Golduck
 	mon_cry SFX_CRY_0D, $EE, $40 ; Hypno
 	mon_cry SFX_CRY_1D, $FA, $80 ; Golbat
 	mon_cry SFX_CRY_1E, $99, $FF ; Mewtwo
 	mon_cry SFX_CRY_05, $55, $01 ; Snorlax
 	mon_cry SFX_CRY_17, $80, $00 ; Magikarp
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_19, $C1, $1C ; Konya
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_13, $00, $00 ; Omega
 	mon_cry SFX_CRY_07, $EF, $FF ; Muk
-	mon_cry SFX_CRY_0F, $40, $80 ; MissingNo.
+	mon_cry SFX_CRY_0F, $40, $80 ; Decilla
 	mon_cry SFX_CRY_20, $EE, $E0 ; Kingler
 	mon_cry SFX_CRY_18, $6F, $E0 ; Cloyster
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_1C, $B1, $90 ; Magnetite
 	mon_cry SFX_CRY_06, $A8, $90 ; Electrode
 	mon_cry SFX_CRY_19, $AA, $20 ; Clefable
 	mon_cry SFX_CRY_12, $FF, $FF ; Weezing
 	mon_cry SFX_CRY_19, $99, $FF ; Persian
 	mon_cry SFX_CRY_08, $4F, $60 ; Marowak
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_08, $00, $FF ; Guardia
 	mon_cry SFX_CRY_1C, $30, $40 ; Haunter
 	mon_cry SFX_CRY_1C, $C0, $01 ; Abra
 	mon_cry SFX_CRY_1C, $98, $FF ; Alakazam
@@ -161,13 +161,13 @@ CryData::
 	mon_cry SFX_CRY_0F, $80, $01 ; Bulbasaur
 	mon_cry SFX_CRY_0F, $00, $C0 ; Venusaur
 	mon_cry SFX_CRY_1A, $EE, $FF ; Tentacruel
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_16, $89, $0E ; Gyopin
 	mon_cry SFX_CRY_16, $80, $40 ; Goldeen
 	mon_cry SFX_CRY_16, $10, $FF ; Seaking
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_03, $A3, $01 ; Kotora
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_03, $2D, $01 ; Gaotora
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_03, $05, $01 ; Gorotora
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_25, $37, $10 ; Puchikoon
 	mon_cry SFX_CRY_25, $00, $80 ; Ponyta
 	mon_cry SFX_CRY_25, $20, $C0 ; Rapidash
 	mon_cry SFX_CRY_22, $00, $80 ; Rattata
@@ -177,16 +177,16 @@ CryData::
 	mon_cry SFX_CRY_24, $F0, $10 ; Geodude
 	mon_cry SFX_CRY_25, $AA, $FF ; Porygon
 	mon_cry SFX_CRY_23, $20, $F0 ; Aerodactyl
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_13, $F7, $00 ; Blastyke
 	mon_cry SFX_CRY_1C, $80, $60 ; Magnemite
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_0F, $63, $40 ; Skimper
-	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
+	mon_cry SFX_CRY_17, $C1, $E4 ; Gorochu
 	mon_cry SFX_CRY_04, $60, $40 ; Charmander
 	mon_cry SFX_CRY_1D, $60, $40 ; Squirtle
 	mon_cry SFX_CRY_04, $20, $40 ; Charmeleon
 	mon_cry SFX_CRY_1D, $20, $40 ; Wartortle
 	mon_cry SFX_CRY_04, $00, $80 ; Charizard
-	mon_cry SFX_CRY_1D, $00, $80 ; MissingNo.
+	mon_cry SFX_CRY_1D, $00, $80 ; Totartle
 	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
@@ -196,4 +196,13 @@ CryData::
 	mon_cry SFX_CRY_21, $55, $01 ; Bellsprout
 	mon_cry SFX_CRY_25, $44, $20 ; Weepinbell
 	mon_cry SFX_CRY_25, $66, $CC ; Victreebel
+	mon_cry SFX_CRY_21, $DD, $80 ; Tsubomitto
+	mon_cry SFX_CRY_0E, $50, $FF ; Animon
+	mon_cry SFX_CRY_12, $93, $00 ; Monja
+	mon_cry SFX_CRY_1E, $79, $40 ; Para
+	mon_cry SFX_CRY_00, $00, $00 ; Hinaazu (unfinished)
+	mon_cry SFX_CRY_1F, $40, $01 ; Pudi
+	mon_cry SFX_CRY_05, $FF, $40 ; Betobebii
+	mon_cry SFX_CRY_00, $00, $00 ; Bellossom (unfinished)
+	mon_cry SFX_CRY_00, $00, $00 ; Scizor (unfinished)
 	assert_table_length NUM_POKEMON_INDEXES

data/pokemon/dex_order.asm

@@ -30,8 +30,8 @@ PokedexOrder:
 	db DEX_BLASTOISE
 	db DEX_PINSIR
 	db DEX_TANGELA
-	db 0 ; MISSINGNO.
+	db DEX_GYAOON
-	db 0 ; MISSINGNO.
+	db DEX_NIDOREIGN
 	db DEX_GROWLITHE
 	db DEX_ONIX
 	db DEX_FEAROW
@@ -49,26 +49,26 @@ PokedexOrder:
 	db DEX_PSYDUCK
 	db DEX_DROWZEE
 	db DEX_GOLEM
-	db 0 ; MISSINGNO.
+	db DEX_BARUNDA
 	db DEX_MAGMAR
-	db 0 ; MISSINGNO.
+	db DEX_BUU
 	db DEX_ELECTABUZZ
 	db DEX_MAGNETON
 	db DEX_KOFFING
-	db 0 ; MISSINGNO.
+	db DEX_DEER
 	db DEX_MANKEY
 	db DEX_SEEL
 	db DEX_DIGLETT
 	db DEX_TAUROS
-	db 0 ; MISSINGNO.
+	db DEX_TRAMPEL
-	db 0 ; MISSINGNO.
+	db DEX_CROCKY
-	db 0 ; MISSINGNO.
+	db DEX_BLOTTLE
 	db DEX_FARFETCHD
 	db DEX_VENONAT
 	db DEX_DRAGONITE
-	db 0 ; MISSINGNO.
+	db DEX_CACTUS
-	db 0 ; MISSINGNO.
+	db DEX_JAGG
-	db 0 ; MISSINGNO.
+	db DEX_BITTYBAT
 	db DEX_DODUO
 	db DEX_POLIWAG
 	db DEX_JYNX
@@ -78,23 +78,23 @@ PokedexOrder:
 	db DEX_DITTO
 	db DEX_MEOWTH
 	db DEX_KRABBY
-	db 0 ; MISSINGNO.
+	db DEX_CHEEP
-	db 0 ; MISSINGNO.
+	db DEX_JABETTA
-	db 0 ; MISSINGNO.
+	db DEX_MIKON
 	db DEX_VULPIX
 	db DEX_NINETALES
 	db DEX_PIKACHU
 	db DEX_RAICHU
-	db 0 ; MISSINGNO.
+	db DEX_RIBBITO
-	db 0 ; MISSINGNO.
+	db DEX_CROAKOZUNA
 	db DEX_DRATINI
 	db DEX_DRAGONAIR
 	db DEX_KABUTO
 	db DEX_KABUTOPS
 	db DEX_HORSEA
 	db DEX_SEADRA
-	db 0 ; MISSINGNO.
+	db DEX_BAWLIGUA
-	db 0 ; MISSINGNO.
+	db DEX_CRYITHAN
 	db DEX_SANDSHREW
 	db DEX_SANDSLASH
 	db DEX_OMANYTE
@@ -114,38 +114,38 @@ PokedexOrder:
 	db DEX_WEEDLE
 	db DEX_KAKUNA
 	db DEX_BEEDRILL
-	db 0 ; MISSINGNO.
+	db DEX_MADAAMU
 	db DEX_DODRIO
 	db DEX_PRIMEAPE
 	db DEX_DUGTRIO
 	db DEX_VENOMOTH
 	db DEX_DEWGONG
-	db 0 ; MISSINGNO.
+	db DEX_PURAKKUSU
-	db 0 ; MISSINGNO.
+	db DEX_PENDRAKEN
 	db DEX_CATERPIE
 	db DEX_METAPOD
 	db DEX_BUTTERFREE
 	db DEX_MACHAMP
-	db 0 ; MISSINGNO.
+	db DEX_WEIRDUCK
 	db DEX_GOLDUCK
 	db DEX_HYPNO
 	db DEX_GOLBAT
 	db DEX_MEWTWO
 	db DEX_SNORLAX
 	db DEX_MAGIKARP
-	db 0 ; MISSINGNO.
+	db DEX_KONYA
-	db 0 ; MISSINGNO.
+	db DEX_OMEGA
 	db DEX_MUK
-	db 0 ; MISSINGNO.
+	db DEX_DECILLA
 	db DEX_KINGLER
 	db DEX_CLOYSTER
-	db 0 ; MISSINGNO.
+	db DEX_MAGNETITE
 	db DEX_ELECTRODE
 	db DEX_CLEFABLE
 	db DEX_WEEZING
 	db DEX_PERSIAN
 	db DEX_MAROWAK
-	db 0 ; MISSINGNO.
+	db DEX_GUARDIA
 	db DEX_HAUNTER
 	db DEX_ABRA
 	db DEX_ALAKAZAM
@@ -155,13 +155,13 @@ PokedexOrder:
 	db DEX_BULBASAUR
 	db DEX_VENUSAUR
 	db DEX_TENTACRUEL
-	db 0 ; MISSINGNO.
+	db DEX_GYOPIN
 	db DEX_GOLDEEN
 	db DEX_SEAKING
-	db 0 ; MISSINGNO.
+	db DEX_KOTORA
-	db 0 ; MISSINGNO.
+	db DEX_GAOTORA
-	db 0 ; MISSINGNO.
+	db DEX_GOROTORA
-	db 0 ; MISSINGNO.
+	db DEX_PUCHIKOON
 	db DEX_PONYTA
 	db DEX_RAPIDASH
 	db DEX_RATTATA
@@ -171,16 +171,16 @@ PokedexOrder:
 	db DEX_GEODUDE
 	db DEX_PORYGON
 	db DEX_AERODACTYL
-	db 0 ; MISSINGNO.
+	db DEX_BLASTYKE
 	db DEX_MAGNEMITE
-	db 0 ; MISSINGNO.
+	db DEX_SKIMPER
-	db 0 ; MISSINGNO.
+	db DEX_GOROCHU
 	db DEX_CHARMANDER
 	db DEX_SQUIRTLE
 	db DEX_CHARMELEON
 	db DEX_WARTORTLE
 	db DEX_CHARIZARD
-	db 0 ; MISSINGNO.
+	db DEX_TOTARTLE
 	db 0 ; MISSINGNO.
 	db 0 ; MISSINGNO.
 	db 0 ; MISSINGNO.
@@ -190,4 +190,13 @@ PokedexOrder:
 	db DEX_BELLSPROUT
 	db DEX_WEEPINBELL
 	db DEX_VICTREEBEL
+	db DEX_TSUBOMITTO
+	db DEX_ANIMON
+	db DEX_MONJA
+	db DEX_PARA
+	db DEX_HINAAZU
+	db DEX_PUDI
+	db DEX_BETOBEBII
+	db DEX_BELLOSSOM
+	db DEX_SCIZOR
 	assert_table_length NUM_POKEMON_INDEXES

data/pokemon/menu_icons.asm

@@ -8,7 +8,7 @@ MonPartyData:
 	nybble ICON_MON       ; Charizard
 	nybble ICON_WATER     ; Squirtle
 	nybble ICON_WATER     ; Wartortle
-	nybble ICON_WATER     ; Blastoise
+	nybble ICON_WATER     ; Totartle
 	nybble ICON_BUG       ; Caterpie
 	nybble ICON_BUG       ; Metapod
 	nybble ICON_BUG       ; Butterfree
@@ -26,6 +26,7 @@ MonPartyData:
 	nybble ICON_SNAKE     ; Arbok
 	nybble ICON_FAIRY     ; Pikachu
 	nybble ICON_FAIRY     ; Raichu
+	nybble ICON_FAIRY     ; Gorochu
 	nybble ICON_MON       ; Sandshrew
 	nybble ICON_MON       ; Sandslash
 	nybble ICON_MON       ; NidoranF
@@ -34,29 +35,41 @@ MonPartyData:
 	nybble ICON_MON       ; NidoranM
 	nybble ICON_MON       ; Nidorino
 	nybble ICON_MON       ; Nidoking
+	nybble ICON_MON       ; Nidoreign
 	nybble ICON_FAIRY     ; Clefairy
 	nybble ICON_FAIRY     ; Clefable
+	nybble ICON_QUADRUPED ; Mikon
 	nybble ICON_QUADRUPED ; Vulpix
 	nybble ICON_QUADRUPED ; Ninetales
 	nybble ICON_FAIRY     ; Jigglypuff
 	nybble ICON_FAIRY     ; Wigglytuff
+	nybble ICON_MON       ; Bittybat
 	nybble ICON_MON       ; Zubat
 	nybble ICON_MON       ; Golbat
 	nybble ICON_GRASS     ; Oddish
 	nybble ICON_GRASS     ; Gloom
 	nybble ICON_GRASS     ; Vileplume
+	nybble ICON_GRASS     ; Bellossom
+	nybble ICON_BUG       ; Para
 	nybble ICON_BUG       ; Paras
 	nybble ICON_BUG       ; Parasect
 	nybble ICON_BUG       ; Venonat
 	nybble ICON_BUG       ; Venomoth
+	nybble ICON_WATER     ; Cheep
+	nybble ICON_WATER     ; Jabetta
+	nybble ICON_MON       ; Ribbito
+	nybble ICON_MON       ; Croakozuna
 	nybble ICON_MON       ; Diglett
 	nybble ICON_MON       ; Dugtrio
+	nybble ICON_MON       ; Konya
 	nybble ICON_MON       ; Meowth
 	nybble ICON_MON       ; Persian
 	nybble ICON_MON       ; Psyduck
+	nybble ICON_MON       ; Weirduck
 	nybble ICON_MON       ; Golduck
 	nybble ICON_MON       ; Mankey
 	nybble ICON_MON       ; Primeape
+	nybble ICON_QUADRUPED ; Pudi
 	nybble ICON_QUADRUPED ; Growlithe
 	nybble ICON_QUADRUPED ; Arcanine
 	nybble ICON_MON       ; Poliwag
@@ -71,22 +84,33 @@ MonPartyData:
 	nybble ICON_GRASS     ; Bellsprout
 	nybble ICON_GRASS     ; Weepinbell
 	nybble ICON_GRASS     ; Victreebel
+	nybble ICON_GRASS	    ; Tsubomitto
 	nybble ICON_WATER     ; Tentacool
 	nybble ICON_WATER     ; Tentacruel
 	nybble ICON_MON       ; Geodude
 	nybble ICON_MON       ; Graveler
 	nybble ICON_MON       ; Golem
+	nybble ICON_WATER     ; Blottle
+	nybble ICON_WATER     ; Pendraken
+	nybble ICON_QUADRUPED ; Puchikoon
 	nybble ICON_QUADRUPED ; Ponyta
 	nybble ICON_QUADRUPED ; Rapidash
 	nybble ICON_QUADRUPED ; Slowpoke
 	nybble ICON_MON       ; Slowbro
 	nybble ICON_BALL      ; Magnemite
+	nybble ICON_BALL      ; Magnetite
 	nybble ICON_BALL      ; Magneton
+	nybble ICON_BALL      ; Barunda
 	nybble ICON_BIRD      ; Farfetch'd
+	nybble ICON_BIRD	    ; Madaamu
+	nybble ICON_WATER     ; Blastyke
+	nybble ICON_WATER     ; Blastoise
+	nybble ICON_BIRD      ; Hinaazu
 	nybble ICON_BIRD      ; Doduo
 	nybble ICON_BIRD      ; Dodrio
 	nybble ICON_WATER     ; Seel
 	nybble ICON_WATER     ; Dewgong
+	nybble ICON_MON	    ; Betobebii
 	nybble ICON_MON       ; Grimer
 	nybble ICON_MON       ; Muk
 	nybble ICON_HELIX     ; Shellder
@@ -97,14 +121,22 @@ MonPartyData:
 	nybble ICON_SNAKE     ; Onix
 	nybble ICON_MON       ; Drowzee
 	nybble ICON_MON       ; Hypno
+	nybble ICON_QUADRUPED ; Kotora
+	nybble ICON_QUADRUPED ; Gaotora
+	nybble ICON_QUADRUPED ; Gorotora
 	nybble ICON_WATER     ; Krabby
 	nybble ICON_WATER     ; Kingler
 	nybble ICON_BALL      ; Voltorb
 	nybble ICON_BALL      ; Electrode
+	nybble ICON_GRASS	    ; Cactus
+	nybble ICON_MON	    ; Crocky
+	nybble ICON_QUADRUPED ; Deer
 	nybble ICON_GRASS     ; Exeggcute
 	nybble ICON_GRASS     ; Exeggutor
 	nybble ICON_MON       ; Cubone
 	nybble ICON_MON       ; Marowak
+	nybble ICON_MON	    ; Guardia
+	nybble ICON_MON	    ; Kangaskhan
 	nybble ICON_MON       ; Hitmonlee
 	nybble ICON_MON       ; Hitmonchan
 	nybble ICON_MON       ; Lickitung
@@ -113,25 +145,38 @@ MonPartyData:
 	nybble ICON_QUADRUPED ; Rhyhorn
 	nybble ICON_MON       ; Rhydon
 	nybble ICON_FAIRY     ; Chansey
+	nybble ICON_GRASS     ; Monja
 	nybble ICON_GRASS     ; Tangela
-	nybble ICON_MON       ; Kangaskhan
+	nybble ICON_MON	    ; Decilla
+	nybble ICON_MON	    ; Gyaoon
+	nybble ICON_MON	    ; Omega
 	nybble ICON_WATER     ; Horsea
 	nybble ICON_WATER     ; Seadra
+	nybble ICON_WATER     ; Gyopin
 	nybble ICON_WATER     ; Goldeen
 	nybble ICON_WATER     ; Seaking
+	nybble ICON_MON	    ; Skimper
+	nybble ICON_MON	    ; Bawligua
+	nybble ICON_MON	    ; Cryithan
 	nybble ICON_HELIX     ; Staryu
 	nybble ICON_HELIX     ; Starmie
+	nybble ICON_WATER	    ; Jagg
 	nybble ICON_MON       ; Mr.Mime
 	nybble ICON_BUG       ; Scyther
+	nybble ICON_BUG       ; Scizor
+	nybble ICON_BUG       ; Pinsir
+	nybble ICON_BUG       ; Purakkusu
 	nybble ICON_MON       ; Jynx
+	nybble ICON_MON       ; Buu
 	nybble ICON_MON       ; Electabuzz
 	nybble ICON_MON       ; Magmar
-	nybble ICON_BUG       ; Pinsir
+	nybble ICON_MON       ; Trampel
 	nybble ICON_QUADRUPED ; Tauros
 	nybble ICON_WATER     ; Magikarp
 	nybble ICON_SNAKE     ; Gyarados
 	nybble ICON_WATER     ; Lapras
 	nybble ICON_MON       ; Ditto
+	nybble ICON_MON       ; Animon
 	nybble ICON_QUADRUPED ; Eevee
 	nybble ICON_QUADRUPED ; Vaporeon
 	nybble ICON_QUADRUPED ; Jolteon

data/pokemon/names.asm

@@ -30,8 +30,8 @@ MonsterNames::
 	db "BLASTOISE@"
 	db "PINSIR@@@@"
 	db "TANGELA@@@"
-	db "MISSINGNO."
+	db "GYAOON@@@@"
-	db "MISSINGNO."
+	db "NIDOREIGN@"
 	db "GROWLITHE@"
 	db "ONIX@@@@@@"
 	db "FEAROW@@@@"
@@ -49,26 +49,26 @@ MonsterNames::
 	db "PSYDUCK@@@"
 	db "DROWZEE@@@"
 	db "GOLEM@@@@@"
-	db "MISSINGNO."
+	db "BARUNDA@@@"
 	db "MAGMAR@@@@"
-	db "MISSINGNO."
+	db "BUU@@@@@@@"
 	db "ELECTABUZZ"
 	db "MAGNETON@@"
 	db "KOFFING@@@"
-	db "MISSINGNO."
+	db "DEER@@@@@@"
 	db "MANKEY@@@@"
 	db "SEEL@@@@@@"
 	db "DIGLETT@@@"
 	db "TAUROS@@@@"
-	db "MISSINGNO."
+	db "TRAMPEL@@@"
-	db "MISSINGNO."
+	db "CROCKY@@@@"
-	db "MISSINGNO."
+	db "BLOTTLE@@@"
 	db "FARFETCH'D"
 	db "VENONAT@@@"
 	db "DRAGONITE@"
-	db "MISSINGNO."
+	db "CACTUS@@@@"
-	db "MISSINGNO."
+	db "JAGG@@@@@@"
-	db "MISSINGNO."
+	db "BITTYBAT@@"
 	db "DODUO@@@@@"
 	db "POLIWAG@@@"
 	db "JYNX@@@@@@"
@@ -78,23 +78,23 @@ MonsterNames::
 	db "DITTO@@@@@"
 	db "MEOWTH@@@@"
 	db "KRABBY@@@@"
-	db "MISSINGNO."
+	db "CHEEP@@@@@"
-	db "MISSINGNO."
+	db "JABETTA@@@"
-	db "MISSINGNO."
+	db "MIKON@@@@@"
 	db "VULPIX@@@@"
 	db "NINETALES@"
 	db "PIKACHU@@@"
 	db "RAICHU@@@@"
-	db "MISSINGNO."
+	db "RIBBITO@@@"
-	db "MISSINGNO."
+	db "CROAKOZUNA"
 	db "DRATINI@@@"
 	db "DRAGONAIR@"
 	db "KABUTO@@@@"
 	db "KABUTOPS@@"
 	db "HORSEA@@@@"
 	db "SEADRA@@@@"
-	db "MISSINGNO."
+	db "BAWLIGUA@@"
-	db "MISSINGNO."
+	db "CRYITHAN@@"
 	db "SANDSHREW@"
 	db "SANDSLASH@"
 	db "OMANYTE@@@"
@@ -114,38 +114,38 @@ MonsterNames::
 	db "WEEDLE@@@@"
 	db "KAKUNA@@@@"
 	db "BEEDRILL@@"
-	db "MISSINGNO."
+	db "MADAAMU@@@"
 	db "DODRIO@@@@"
 	db "PRIMEAPE@@"
 	db "DUGTRIO@@@"
 	db "VENOMOTH@@"
 	db "DEWGONG@@@"
-	db "MISSINGNO."
+	db "PURAKKUSU@"
-	db "MISSINGNO."
+	db "PENDRAKEN@"
 	db "CATERPIE@@"
 	db "METAPOD@@@"
 	db "BUTTERFREE"
 	db "MACHAMP@@@"
-	db "MISSINGNO."
+	db "WEIRDUCK@@"
 	db "GOLDUCK@@@"
 	db "HYPNO@@@@@"
 	db "GOLBAT@@@@"
 	db "MEWTWO@@@@"
 	db "SNORLAX@@@"
 	db "MAGIKARP@@"
-	db "MISSINGNO."
+	db "KONYA@@@@@"
-	db "MISSINGNO."
+	db "OMEGA@@@@@"
 	db "MUK@@@@@@@"
-	db "MISSINGNO."
+	db "DECILLA@@@"
 	db "KINGLER@@@"
 	db "CLOYSTER@@"
-	db "MISSINGNO."
+	db "MAGNETITE@"
 	db "ELECTRODE@"
 	db "CLEFABLE@@"
 	db "WEEZING@@@"
 	db "PERSIAN@@@"
 	db "MAROWAK@@@"
-	db "MISSINGNO."
+	db "GUARDIA@@@"
 	db "HAUNTER@@@"
 	db "ABRA@@@@@@"
 	db "ALAKAZAM@@"
@@ -155,13 +155,13 @@ MonsterNames::
 	db "BULBASAUR@"
 	db "VENUSAUR@@"
 	db "TENTACRUEL"
-	db "MISSINGNO."
+	db "GYOPIN@@@@"
 	db "GOLDEEN@@@"
 	db "SEAKING@@@"
-	db "MISSINGNO."
+	db "KOTORA@@@@"
-	db "MISSINGNO."
+	db "GAOTORA@@@"
-	db "MISSINGNO."
+	db "GOROTORA@@"
-	db "MISSINGNO."
+	db "PUCHIKOON@"
 	db "PONYTA@@@@"
 	db "RAPIDASH@@"
 	db "RATTATA@@@"
@@ -171,16 +171,16 @@ MonsterNames::
 	db "GEODUDE@@@"
 	db "PORYGON@@@"
 	db "AERODACTYL"
-	db "MISSINGNO."
+	db "BLASTYKE@@"
 	db "MAGNEMITE@"
-	db "MISSINGNO."
+	db "SKIMPER@@@"
-	db "MISSINGNO."
+	db "GOROCHU@@@"
 	db "CHARMANDER"
 	db "SQUIRTLE@@"
 	db "CHARMELEON"
 	db "WARTORTLE@"
 	db "CHARIZARD@"
-	db "MISSINGNO."
+	db "TOTARTLE@@"
 	db "MISSINGNO."
 	db "MISSINGNO."
 	db "MISSINGNO."
@@ -190,4 +190,13 @@ MonsterNames::
 	db "BELLSPROUT"
 	db "WEEPINBELL"
 	db "VICTREEBEL"
+	db "TSUBOMITTO"
+	db "ANIMON@@@@"
+	db "MONJA@@@@@"
+	db "PARA@@@@@@"
+	db "HINAAZU@@@"
+	db "PUDI@@@@@@"
+	db "BETOBEBII@"
+	db "BELLOSSOM@"
+	db "SCIZOR@@@@"
 	assert_table_length NUM_POKEMON_INDEXES

data/pokemon/palettes.asm

@@ -9,7 +9,7 @@ MonsterPalettes:
 	db PAL_REDMON    ; CHARIZARD
 	db PAL_CYANMON   ; SQUIRTLE
 	db PAL_CYANMON   ; WARTORTLE
-	db PAL_CYANMON   ; BLASTOISE
+	db PAL_CYANMON   ; TOTARTLE
 	db PAL_GREENMON  ; CATERPIE
 	db PAL_GREENMON  ; METAPOD
 	db PAL_CYANMON   ; BUTTERFREE
@@ -19,14 +19,15 @@ MonsterPalettes:
 	db PAL_BROWNMON  ; PIDGEY
 	db PAL_BROWNMON  ; PIDGEOTTO
 	db PAL_BROWNMON  ; PIDGEOT
-	db PAL_GREYMON   ; RATTATA
+	db PAL_PURPLEMON ; RATTATA
-	db PAL_GREYMON   ; RATICATE
+	db PAL_BROWNMON  ; RATICATE
 	db PAL_BROWNMON  ; SPEAROW
 	db PAL_BROWNMON  ; FEAROW
 	db PAL_PURPLEMON ; EKANS
 	db PAL_PURPLEMON ; ARBOK
 	db PAL_YELLOWMON ; PIKACHU
 	db PAL_YELLOWMON ; RAICHU
+	db PAL_YELLOWMON ; GOROCHU
 	db PAL_BROWNMON  ; SANDSHREW
 	db PAL_BROWNMON  ; SANDSLASH
 	db PAL_BLUEMON   ; NIDORAN_F
@@ -35,30 +36,42 @@ MonsterPalettes:
 	db PAL_PURPLEMON ; NIDORAN_M
 	db PAL_PURPLEMON ; NIDORINO
 	db PAL_PURPLEMON ; NIDOKING
+	db PAL_GREYMON   ; NIDOREIGN
 	db PAL_PINKMON   ; CLEFAIRY
 	db PAL_PINKMON   ; CLEFABLE
+	db PAL_REDMON    ; MIKON
 	db PAL_REDMON    ; VULPIX
 	db PAL_YELLOWMON ; NINETALES
 	db PAL_PINKMON   ; JIGGLYPUFF
 	db PAL_PINKMON   ; WIGGLYTUFF
+	db PAL_BLUEMON   ; BITTYBAT
 	db PAL_BLUEMON   ; ZUBAT
 	db PAL_BLUEMON   ; GOLBAT
 	db PAL_GREENMON  ; ODDISH
 	db PAL_REDMON    ; GLOOM
 	db PAL_REDMON    ; VILEPLUME
+	db PAL_PURPLEMON ; BELLOSSOM
+	db PAL_REDMON    ; PARA
 	db PAL_REDMON    ; PARAS
 	db PAL_REDMON    ; PARASECT
 	db PAL_PURPLEMON ; VENONAT
 	db PAL_PURPLEMON ; VENOMOTH
+	db PAL_PURPLEMON ; CHEEP
+	db PAL_PURPLEMON ; JABETTA
+	db PAL_GREENMON  ; RIBBITO
+	db PAL_GREENMON  ; CROAKOZUNA
 	db PAL_BROWNMON  ; DIGLETT
 	db PAL_BROWNMON  ; DUGTRIO
+	db PAL_YELLOWMON ; KONYA
 	db PAL_YELLOWMON ; MEOWTH
 	db PAL_YELLOWMON ; PERSIAN
 	db PAL_YELLOWMON ; PSYDUCK
+	db PAL_GREENMON  ; WEIRDUCK
 	db PAL_CYANMON   ; GOLDUCK
 	db PAL_BROWNMON  ; MANKEY
 	db PAL_BROWNMON  ; PRIMEAPE
-	db PAL_BROWNMON  ; GROWLITHE
+	db PAL_REDMON    ; PUDI
+	db PAL_REDMON    ; GROWLITHE
 	db PAL_REDMON    ; ARCANINE
 	db PAL_BLUEMON   ; POLIWAG
 	db PAL_BLUEMON   ; POLIWHIRL
@@ -72,40 +85,59 @@ MonsterPalettes:
 	db PAL_GREENMON  ; BELLSPROUT
 	db PAL_GREENMON  ; WEEPINBELL
 	db PAL_GREENMON  ; VICTREEBEL
+	db PAL_GREENMON  ; TSUBOMITTO
 	db PAL_CYANMON   ; TENTACOOL
 	db PAL_CYANMON   ; TENTACRUEL
 	db PAL_GREYMON   ; GEODUDE
 	db PAL_GREYMON   ; GRAVELER
 	db PAL_GREYMON   ; GOLEM
+	db PAL_MEWMON    ; BLOTTLE
+	db PAL_MEWMON    ; PENDRAKEN
+	db PAL_REDMON    ; PUCHIKOON
 	db PAL_REDMON    ; PONYTA
 	db PAL_REDMON    ; RAPIDASH
 	db PAL_PINKMON   ; SLOWPOKE
 	db PAL_PINKMON   ; SLOWBRO
 	db PAL_GREYMON   ; MAGNEMITE
+	db PAL_GREYMON   ; MAGNETITE
 	db PAL_GREYMON   ; MAGNETON
+	db PAL_PINKMON   ; BARUNDA
 	db PAL_BROWNMON  ; FARFETCHD
+	db PAL_BROWNMON  ; MADAAMU
+	db PAL_CYANMON   ; BLASTYKE
+	db PAL_CYANMON   ; BLASTOISE
+	db PAL_BROWNMON  ; HINAAZU
 	db PAL_BROWNMON  ; DODUO
 	db PAL_BROWNMON  ; DODRIO
 	db PAL_BLUEMON   ; SEEL
 	db PAL_BLUEMON   ; DEWGONG
+	db PAL_PURPLEMON ; BETOBEBII
 	db PAL_PURPLEMON ; GRIMER
 	db PAL_PURPLEMON ; MUK
-	db PAL_GREYMON   ; SHELLDER
+	db PAL_PURPLEMON ; SHELLDER
-	db PAL_GREYMON   ; CLOYSTER
+	db PAL_PURPLEMON ; CLOYSTER
 	db PAL_PURPLEMON ; GASTLY
 	db PAL_PURPLEMON ; HAUNTER
 	db PAL_PURPLEMON ; GENGAR
 	db PAL_GREYMON   ; ONIX
 	db PAL_YELLOWMON ; DROWZEE
 	db PAL_YELLOWMON ; HYPNO
+	db PAL_YELLOWMON ; KOTORA
+	db PAL_YELLOWMON ; GAOTORA
+	db PAL_YELLOWMON ; GOROTORA
 	db PAL_REDMON    ; KRABBY
 	db PAL_REDMON    ; KINGLER
-	db PAL_YELLOWMON ; VOLTORB
+	db PAL_REDMON    ; VOLTORB
-	db PAL_YELLOWMON ; ELECTRODE
+	db PAL_REDMON    ; ELECTRODE
+	db PAL_GREENMON  ; CACTUS
+	db PAL_GREENMON  ; CROCKY
+	db PAL_BROWNMON  ; DEER
 	db PAL_PINKMON   ; EXEGGCUTE
 	db PAL_GREENMON  ; EXEGGUTOR
-	db PAL_GREYMON   ; CUBONE
+	db PAL_BROWNMON  ; CUBONE
-	db PAL_GREYMON   ; MAROWAK
+	db PAL_BROWNMON  ; MAROWAK
+	db PAL_BROWNMON  ; GUARDIA
+	db PAL_BROWNMON  ; KANGASKHAN
 	db PAL_BROWNMON  ; HITMONLEE
 	db PAL_BROWNMON  ; HITMONCHAN
 	db PAL_PINKMON   ; LICKITUNG
@@ -114,40 +146,53 @@ MonsterPalettes:
 	db PAL_GREYMON   ; RHYHORN
 	db PAL_GREYMON   ; RHYDON
 	db PAL_PINKMON   ; CHANSEY
+	db PAL_BLUEMON   ; MONJA
 	db PAL_BLUEMON   ; TANGELA
-	db PAL_BROWNMON  ; KANGASKHAN
+	db PAL_GREENMON  ; DECILLA
+	db PAL_GREENMON  ; GYAOON
+	db PAL_GREYMON   ; OMEGA
 	db PAL_CYANMON   ; HORSEA
 	db PAL_CYANMON   ; SEADRA
+	db PAL_REDMON    ; GYOPIN
 	db PAL_REDMON    ; GOLDEEN
 	db PAL_REDMON    ; SEAKING
+	db PAL_CYANMON   ; SKIMPER
+	db PAL_CYANMON   ; BAWLIGUA
+	db PAL_CYANMON   ; CRYITHAN
 	db PAL_REDMON    ; STARYU
-	db PAL_GREYMON   ; STARMIE
+	db PAL_PURPLEMON ; STARMIE
+	db PAL_BLUEMON   ; JAGG
 	db PAL_PINKMON   ; MR_MIME
 	db PAL_GREENMON  ; SCYTHER
-	db PAL_MEWMON    ; JYNX
+	db PAL_GREENMON  ; SCIZOR
+	db PAL_BROWNMON  ; PINSIR
+	db PAL_BROWNMON  ; PURAKKUSU
+	db PAL_REDBAR    ; JYNX
+	db PAL_BLUEMON   ; BUU
 	db PAL_YELLOWMON ; ELECTABUZZ
 	db PAL_REDMON    ; MAGMAR
-	db PAL_BROWNMON  ; PINSIR
+	db PAL_GREYMON   ; TRAMPEL
-	db PAL_GREYMON   ; TAUROS
+	db PAL_BROWNMON  ; TAUROS
 	db PAL_REDMON    ; MAGIKARP
 	db PAL_BLUEMON   ; GYARADOS
 	db PAL_CYANMON   ; LAPRAS
-	db PAL_GREYMON   ; DITTO
+	db PAL_PURPLEMON ; DITTO
-	db PAL_GREYMON   ; EEVEE
+	db PAL_PURPLEMON ; ANIMON
+	db PAL_BROWNMON  ; EEVEE
 	db PAL_CYANMON   ; VAPOREON
 	db PAL_YELLOWMON ; JOLTEON
 	db PAL_REDMON    ; FLAREON
-	db PAL_GREYMON   ; PORYGON
+	db PAL_MEWMON    ; PORYGON
 	db PAL_BLUEMON   ; OMANYTE
 	db PAL_BLUEMON   ; OMASTAR
 	db PAL_BROWNMON  ; KABUTO
 	db PAL_BROWNMON  ; KABUTOPS
 	db PAL_GREYMON   ; AERODACTYL
-	db PAL_PINKMON   ; SNORLAX
+	db PAL_MEWMON    ; SNORLAX
 	db PAL_BLUEMON   ; ARTICUNO
 	db PAL_YELLOWMON ; ZAPDOS
 	db PAL_REDMON    ; MOLTRES
-	db PAL_GREYMON   ; DRATINI
+	db PAL_BLUEMON   ; DRATINI
 	db PAL_BLUEMON   ; DRAGONAIR
 	db PAL_BROWNMON  ; DRAGONITE
 	db PAL_MEWMON    ; MEWTWO

data/pokemon/title_mons.asm

@@ -1,38 +1,38 @@
 TitleMons:
 ; mons on the title screen are randomly chosen from here
 IF DEF(_RED)
-	db STARTER1
+	db CHARIZARD
-	db STARTER2
+	db TOTARTLE
-	db STARTER3
+	db VENUSAUR
-	db WEEDLE
+	db GOROCHU
-	db NIDORAN_M
+	db CACTUS
-	db SCYTHER
+	db DEER
-	db PIKACHU
+	db BARUNDA
-	db CLEFAIRY
+	db RIBBITO
-	db RHYDON
+	db GYAOON
-	db ABRA
+	db PUDI
-	db GASTLY
+	db MAGNETITE
-	db DITTO
+	db MONJA
-	db PIDGEOTTO
+	db ANIMON
-	db ONIX
+	db SCIZOR
-	db PONYTA
+	db BELLOSSOM
-	db MAGIKARP
+	db BUU
 ENDC
 IF DEF(_BLUE)
-	db STARTER2
+	db TOTARTLE
-	db STARTER1
+	db CHARIZARD
-	db STARTER3
+	db VENUSAUR
-	db MANKEY
+	db GOROCHU
-	db HITMONLEE
+	db CROCKY
-	db VULPIX
+	db TRAMPEL
-	db CHANSEY
+	db JAGG
-	db AERODACTYL
+	db CHEEP
-	db JOLTEON
+	db OMEGA
-	db SNORLAX
+	db MIKON
-	db GLOOM
+	db WEIRDUCK
-	db POLIWAG
+	db BLOTTLE
-	db DODUO
+	db MADAAMU
-	db PORYGON
+	db PURAKKUSU
-	db GENGAR
+	db TSUBOMITTO
-	db RAICHU
+	db GUARDIA
 ENDC

data/sgb/sgb_palettes.asm

@@ -1,53 +1,53 @@
 SuperPalettes:
 ; entries correspond to PAL_* constants
 	table_width 2 * 4, SuperPalettes
-	RGB 31,29,31, 21,28,11, 20,26,31, 03,02,02 ; PAL_ROUTE
+	RGB 31,31,31, 16,31,04, 11,23,31, 03,03,03 ; PAL_ROUTE
-	RGB 31,29,31, 25,28,27, 20,26,31, 03,02,02 ; PAL_PALLET
+	RGB 31,31,31, 23,17,31, 11,23,31, 03,03,03 ; PAL_PALLET
-	RGB 31,29,31, 17,26,03, 20,26,31, 03,02,02 ; PAL_VIRIDIAN
+	RGB 31,31,31, 19,31,00, 11,23,31, 03,03,03 ; PAL_VIRIDIAN
-	RGB 31,29,31, 23,25,16, 20,26,31, 03,02,02 ; PAL_PEWTER
+	RGB 31,31,31, 18,18,15, 11,23,31, 03,03,03 ; PAL_PEWTER
-	RGB 31,29,31, 17,20,30, 20,26,31, 03,02,02 ; PAL_CERULEAN
+	RGB 31,31,31, 05,08,31, 11,23,31, 03,03,03 ; PAL_CERULEAN
-	RGB 31,29,31, 27,20,27, 20,26,31, 03,02,02 ; PAL_LAVENDER
+	RGB 31,31,31, 25,04,31, 11,23,31, 03,03,03 ; PAL_LAVENDER
-	RGB 31,29,31, 30,18,00, 20,26,31, 03,02,02 ; PAL_VERMILION
+	RGB 31,31,31, 31,19,00, 11,23,31, 03,03,03 ; PAL_VERMILION
-	RGB 31,29,31, 16,30,22, 20,26,31, 03,02,02 ; PAL_CELADON
+	RGB 31,31,31, 05,31,05, 11,23,31, 03,03,03 ; PAL_CELADON
-	RGB 31,29,31, 31,15,22, 20,26,31, 03,02,02 ; PAL_FUCHSIA
+	RGB 31,31,31, 31,15,15, 11,23,31, 03,03,03 ; PAL_FUCHSIA
-	RGB 31,29,31, 26,10,06, 20,26,31, 03,02,02 ; PAL_CINNABAR
+	RGB 31,31,31, 31,08,08, 11,23,31, 03,03,03 ; PAL_CINNABAR
-	RGB 31,29,31, 22,14,24, 20,26,31, 03,02,02 ; PAL_INDIGO
+	RGB 31,31,31, 11,08,31, 11,23,31, 03,03,03 ; PAL_INDIGO
-	RGB 31,29,31, 27,27,03, 20,26,31, 03,02,02 ; PAL_SAFFRON
+	RGB 31,31,31, 31,31,00, 11,23,31, 03,03,03 ; PAL_SAFFRON
-	RGB 31,29,31, 20,26,31, 17,23,10, 03,02,02 ; PAL_TOWNMAP
+	RGB 31,31,31, 00,21,31, 10,28,00, 01,01,01 ; PAL_TOWNMAP
 IF DEF(_RED)
-	RGB 31,29,31, 30,30,17, 17,23,10, 21,00,04 ; PAL_LOGO1
+	RGB 31,31,31, 31,31,00, 17,23,10, 23,03,03 ; PAL_LOGO1
 ENDC
 IF DEF(_BLUE)
-	RGB 31,29,31, 30,30,17, 21,00,04, 14,19,29 ; PAL_LOGO1
+	RGB 31,31,31, 31,31,00, 21,00,04, 03,03,23 ; PAL_LOGO1
 ENDC
-	RGB 31,29,31, 30,30,17, 18,18,24, 07,07,16 ; PAL_LOGO2
+	RGB 31,31,31, 31,31,00, 07,07,25, 00,00,17 ; PAL_LOGO2
-	RGB 31,29,31, 24,20,30, 11,20,30, 03,02,02 ; PAL_0F
+	RGB 31,31,31, 13,01,31, 00,09,31, 01,01,01 ; PAL_0F
-	RGB 31,29,31, 30,22,17, 16,14,19, 03,02,02 ; PAL_MEWMON
+	RGB 31,31,31, 30,17,11, 11,05,14, 03,03,03 ; PAL_MEWMON
-	RGB 31,29,31, 18,20,27, 11,15,23, 03,02,02 ; PAL_BLUEMON
+	RGB 31,31,31, 16,18,31, 00,01,25, 03,03,03 ; PAL_BLUEMON
-	RGB 31,29,31, 31,20,10, 26,10,06, 03,02,02 ; PAL_REDMON
+	RGB 31,31,31, 31,17,00, 31,00,00, 03,03,03 ; PAL_REDMON
-	RGB 31,29,31, 21,25,29, 14,19,25, 03,02,02 ; PAL_CYANMON
+	RGB 31,31,31, 16,26,31, 00,17,31, 03,03,03 ; PAL_CYANMON
-	RGB 31,29,31, 27,22,24, 21,15,23, 03,02,02 ; PAL_PURPLEMON
+	RGB 31,31,31, 25,15,31, 19,00,22, 03,03,03 ; PAL_PURPLEMON
-	RGB 31,29,31, 28,20,15, 21,14,09, 03,02,02 ; PAL_BROWNMON
+	RGB 31,31,31, 29,18,10, 17,09,05, 03,03,03 ; PAL_BROWNMON
-	RGB 31,29,31, 20,26,16, 09,20,11, 03,02,02 ; PAL_GREENMON
+	RGB 31,31,31, 17,31,11, 01,22,06, 03,03,03 ; PAL_GREENMON
-	RGB 31,29,31, 30,22,24, 28,15,21, 03,02,02 ; PAL_PINKMON
+	RGB 31,31,31, 31,15,18, 31,00,06, 03,03,03 ; PAL_PINKMON
-	RGB 31,29,31, 31,28,14, 26,20,00, 03,02,02 ; PAL_YELLOWMON
+	RGB 31,31,31, 31,31,00, 28,14,00, 03,03,03 ; PAL_YELLOWMON
-	RGB 31,29,31, 26,21,22, 15,15,18, 03,02,02 ; PAL_GREYMON
+	RGB 31,31,31, 18,18,19, 10,10,10, 03,03,03 ; PAL_GREYMON
-	RGB 31,29,31, 26,21,22, 27,20,06, 03,02,02 ; PAL_SLOTS1
+	RGB 31,31,31, 21,12,15, 21,14,00, 03,03,03 ; PAL_SLOTS1
 IF DEF(_RED)
-	RGB 31,29,31, 31,31,17, 25,17,21, 03,02,02 ; PAL_SLOTS2
+	RGB 31,31,31, 31,31,00, 20,08,15, 03,03,03 ; PAL_SLOTS2
-	RGB 31,29,31, 22,31,16, 25,17,21, 03,02,02 ; PAL_SLOTS3
+	RGB 31,31,31, 03,31,09, 20,08,15, 03,03,03 ; PAL_SLOTS3
-	RGB 31,29,31, 16,19,29, 25,17,21, 03,02,02 ; PAL_SLOTS4
+	RGB 31,31,31, 09,05,30, 20,08,15, 03,03,03 ; PAL_SLOTS4
 ENDC
 IF DEF(_BLUE)
-	RGB 31,29,31, 31,31,17, 16,19,29, 03,02,02 ; PAL_SLOTS2
+	RGB 31,31,31, 31,31,00, 09,05,30, 03,03,03 ; PAL_SLOTS2
-	RGB 31,29,31, 22,31,16, 16,19,29, 03,02,02 ; PAL_SLOTS3
+	RGB 31,31,31, 03,31,09, 09,05,30, 03,03,03 ; PAL_SLOTS3
-	RGB 31,29,31, 25,17,21, 16,19,29, 03,02,02 ; PAL_SLOTS4
+	RGB 31,31,31, 20,08,15, 09,05,30, 03,03,03 ; PAL_SLOTS4
 ENDC
-	RGB 31,29,31, 07,07,07, 02,03,03, 03,02,02 ; PAL_BLACK
+	RGB 31,31,31, 03,03,03, 03,03,03, 03,03,03 ; PAL_BLACK
-	RGB 31,29,31, 30,26,15, 09,20,11, 03,02,02 ; PAL_GREENBAR
+	RGB 31,31,31, 31,31,00, 00,31,00, 03,03,03 ; PAL_GREENBAR
-	RGB 31,29,31, 30,26,15, 26,20,00, 03,02,02 ; PAL_YELLOWBAR
+	RGB 31,31,31, 31,31,00, 31,18,00, 03,03,03 ; PAL_YELLOWBAR
-	RGB 31,29,31, 30,26,15, 26,10,06, 03,02,02 ; PAL_REDBAR
+	RGB 31,31,31, 31,31,00, 31,00,00, 03,03,03 ; PAL_REDBAR
-	RGB 31,29,31, 30,22,17, 11,15,23, 03,02,02 ; PAL_BADGE
+	RGB 31,31,31, 03,11,06, 03,17,11, 03,03,03 ; PAL_BADGE
-	RGB 31,29,31, 21,14,09, 18,24,22, 03,02,02 ; PAL_CAVE
+	RGB 31,31,31, 23,08,00, 17,14,11, 03,03,03 ; PAL_CAVE
-	RGB 31,29,31, 31,28,14, 24,20,10, 03,02,02 ; PAL_GAMEFREAK
+	RGB 31,31,31, 31,19,00, 19,19,00, 03,03,03 ; PAL_GAMEFREAK
 	assert_table_length NUM_SGB_PALS

data/tilesets/door_tile_ids.asm

@@ -12,6 +12,7 @@ DoorTileIDPointers:
 	dbw LAB,         .LabDoorTileIDs
 	dbw FACILITY,    .FacilityDoorTileIDs
 	dbw PLATEAU,     .PlateauDoorTileIDs
+	dbw INTERIOR,    .InteriorDoorTileIDs ; fixes weirdness in silph co.
 	db -1 ; end
 
 MACRO door_tiles
@@ -53,3 +54,6 @@ ENDM
 
 .PlateauDoorTileIDs:
 	door_tiles $3b, $1b
+
+.InteriorDoorTileIDs:
+	door_tiles $04, $15

data/trainers/parties.asm

@@ -497,9 +497,9 @@ Green1Data:
 
 ProfOakData:
 ; Unused
-	db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 69, BLASTOISE, 70, GYARADOS, 0
+	db $FF, 66, TAUROS, 67, GYARADOS, 68, ARCANINE, 68, EXEGGUTOR, 69, NIDOKING, 70, TOTARTLE, 0
-	db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 69, VENUSAUR, 70, GYARADOS, 0
+	db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, GYARADOS, 68, ARCANINE, 60, NIDOKING, 70, VENUSAUR, 0
-	db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 69, CHARIZARD, 70, GYARADOS, 0
+	db $FF, 66, TAUROS, 67, ARCANINE, 68, EXEGGUTOR, 68, GYARADOS, 69, NIDOKING, 70, CHARIZARD, 0
 
 ChiefData:
 ; none
@@ -537,7 +537,7 @@ GiovanniData:
 ; Silph Co. 11F
 	db $FF, 37, NIDORINO, 35, KANGASKHAN, 37, RHYHORN, 41, NIDOQUEEN, 0
 ; Viridian Gym
-	db $FF, 45, RHYHORN, 42, DUGTRIO, 44, NIDOQUEEN, 45, NIDOKING, 50, RHYDON, 0
+	db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, PERSIAN, 48, NIDOKING, 50, RHYDON, 0
 
 RocketData:
 ; Mt. Moon B2F
@@ -636,28 +636,28 @@ CooltrainerFData:
 	db 43, PERSIAN, NINETALES, RAICHU, 0
 
 BrunoData:
-	db $FF, 53, ONIX, 55, HITMONCHAN, 55, HITMONLEE, 56, ONIX, 58, MACHAMP, 0
+	db $FF, 54, PRIMEAPE, 55, ONIX, 55, POLIWRATH, 56, HITMONLEE, 56, PURAKKUSU, 58, MACHAMP, 0
 
 BrockData:
-	db $FF, 12, GEODUDE, 14, ONIX, 0
+	db $FF, 13, GEODUDE, 12, OMANYTE, 12, KABUTO, 12, DECILLA, 15, ONIX, 0
 
 MistyData:
-	db $FF, 18, STARYU, 21, STARMIE, 0
+	db $FF, 19, HORSEA, 18, CHEEP, 18, BLOTTLE, 19, BLASTYKE, 21, STARMIE, 0
 
 LtSurgeData:
-	db $FF, 21, VOLTORB, 18, PIKACHU, 24, RAICHU, 0
+	db $FF, 22, VOLTORB, 21, GAOTORA, 22, MAGNEMITE, 23, ELECTABUZZ, 24, GOROCHU, 0
 
 ErikaData:
-	db $FF, 29, VICTREEBEL, 24, TANGELA, 29, VILEPLUME, 0
+	db $FF, 28, WEEPINBELL, 29, TANGELA, 28, CACTUS, 28, PARASECT, 31, VILEPLUME, 0
 
 KogaData:
-	db $FF, 37, KOFFING, 39, MUK, 37, KOFFING, 43, WEEZING, 0
+	db $FF, 38, GOLBAT, 39, VENOMOTH, 38, NIDOREIGN, 39, MUK, 41, WEEZING, 0
 
 BlaineData:
-	db $FF, 42, GROWLITHE, 40, PONYTA, 42, RAPIDASH, 47, ARCANINE, 0
+	db $FF, 45, MAGMAR, 44, NINETALES, 45, RAPIDASH, 44, FLAREON, 47, ARCANINE, 0
 
 SabrinaData:
-	db $FF, 38, KADABRA, 37, MR_MIME, 38, VENOMOTH, 43, ALAKAZAM, 0
+	db $FF, 39, HYPNO, 40, MR_MIME, 39, SLOWBRO, 40, JYNX, 43, ALAKAZAM, 0
 
 GentlemanData:
 ; SS Anne 1F Rooms
@@ -680,21 +680,21 @@ Green2Data:
 	db $FF, 25, PIDGEOTTO, 23, GYARADOS, 22, GROWLITHE, 20, KADABRA, 25, IVYSAUR, 0
 	db $FF, 25, PIDGEOTTO, 23, EXEGGCUTE, 22, GYARADOS, 20, KADABRA, 25, CHARMELEON, 0
 ; Silph Co. 7F
-	db $FF, 37, PIDGEOT, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, BLASTOISE, 0
+	db $FF, 37, PIDGEOT, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, TOTARTLE, 0
 	db $FF, 37, PIDGEOT, 38, GYARADOS, 35, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0
 	db $FF, 37, PIDGEOT, 38, EXEGGCUTE, 35, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0
 ; Route 22
-	db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, BLASTOISE, 0
+	db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, TOTARTLE, 0
 	db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0
 	db $FF, 47, PIDGEOT, 45, RHYHORN, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0
 
 Green3Data:
-	db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, ARCANINE, 63, EXEGGUTOR, 65, BLASTOISE, 0
+	db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0
 	db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0
 	db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0
 
 LoreleiData:
-	db $FF, 54, DEWGONG, 53, CLOYSTER, 54, SLOWBRO, 56, JYNX, 56, LAPRAS, 0
+	db $FF, 54, DEWGONG, 53, CLOYSTER, 54, SLOWBRO, 55, JYNX, 55, BUU, 56, LAPRAS, 0
 
 ChannelerData:
 ; Unused
@@ -736,7 +736,7 @@ ChannelerData:
 	db 33, GASTLY, GASTLY, HAUNTER, 0
 
 AgathaData:
-	db $FF, 56, GENGAR, 56, GOLBAT, 55, HAUNTER, 58, ARBOK, 60, GENGAR, 0
+	db $FF, 57, GENGAR, 56, GOLBAT, 56, HAUNTER, 58, CROAKOZUNA, 58, ARBOK, 60, GENGAR, 0
 
 LanceData:
-	db $FF, 58, GYARADOS, 56, DRAGONAIR, 56, DRAGONAIR, 60, AERODACTYL, 62, DRAGONITE, 0
+	db $FF, 58, CROCKY, 57, GYARADOS, 57, AERODACTYL, 59, CRYITHAN, 59, CHARIZARD, 62, DRAGONITE, 0

data/types/names.asm

@@ -10,8 +10,9 @@ TypeNames:
 	dw .Bird
 	dw .Bug
 	dw .Ghost
+	dw .Steel
 
-REPT FIRE - GHOST - 1
+REPT FIRE - STEEL - 1
 	dw .Normal
 ENDR
 
@@ -22,6 +23,8 @@ ENDR
 	dw .Psychic
 	dw .Ice
 	dw .Dragon
+	dw .Dark
+	dw .Fairy
 
 	assert_table_length NUM_TYPES
 
@@ -41,3 +44,7 @@ ENDR
 .Bug:      db "BUG@"
 .Ghost:    db "GHOST@"
 .Dragon:   db "DRAGON@"
+.Steel:    db "STEEL@"
+.Fairy:    db "FAIRY@"
+.Dark:     db "DARK@"
+

data/types/type_matchups.asm

@@ -82,4 +82,32 @@ TypeEffects:
 	db GRASS,        DRAGON,       NOT_VERY_EFFECTIVE
 	db ICE,          DRAGON,       SUPER_EFFECTIVE
 	db DRAGON,       DRAGON,       SUPER_EFFECTIVE
+	db DARK,         PSYCHIC_TYPE, SUPER_EFFECTIVE
+	db DARK,         GHOST,        SUPER_EFFECTIVE
+	db DARK,         DARK,         SUPER_EFFECTIVE
+	db DARK,         NORMAL,       NOT_VERY_EFFECTIVE
+	db NORMAL,       DARK,         SUPER_EFFECTIVE
+	db BUG,          DARK,         SUPER_EFFECTIVE
+	db PSYCHIC_TYPE, DARK,         NOT_VERY_EFFECTIVE
+	db GHOST,        DARK,         NOT_VERY_EFFECTIVE
+	db STEEL,        ROCK,         SUPER_EFFECTIVE
+	db STEEL,        WATER,        NOT_VERY_EFFECTIVE
+	db STEEL,        ELECTRIC,     NOT_VERY_EFFECTIVE
+	db STEEL,        STEEL,        NO_EFFECT	
+	db WATER,        STEEL,        SUPER_EFFECTIVE
+	db ELECTRIC,     STEEL,        SUPER_EFFECTIVE
+	db POISON,       STEEL,        NOT_VERY_EFFECTIVE
+	db FIGHTING,     STEEL,        NOT_VERY_EFFECTIVE
+	db FAIRY,        DRAGON,       SUPER_EFFECTIVE
+	db FAIRY,        DARK,         SUPER_EFFECTIVE
+	db FAIRY,        FIGHTING,     SUPER_EFFECTIVE
+	db FAIRY,        FIRE,         NOT_VERY_EFFECTIVE
+	db FAIRY,        POISON,       NOT_VERY_EFFECTIVE
+	db FAIRY,        STEEL,        NOT_VERY_EFFECTIVE
+	db BUG,          FAIRY,        NOT_VERY_EFFECTIVE
+	db DARK,         FAIRY,        NOT_VERY_EFFECTIVE
+	db FIGHTING,     FAIRY,        NOT_VERY_EFFECTIVE
+	db POISON,       FAIRY,        SUPER_EFFECTIVE
+	db STEEL,        FAIRY,        SUPER_EFFECTIVE
+	db DRAGON,       FAIRY,        NO_EFFECT
 	db -1 ; end

data/wild/maps/Route4.asm

@@ -1,7 +1,7 @@
 Route4WildMons:
 	def_grass_wildmons 20 ; encounter rate
 	db 10, RATTATA
-	db 10, RIBITTO
+	db 10, HINAAZU
 	db  8, KONYA
 IF DEF(_RED)
 	db  6, EKANS

data/wild/maps/Route6.asm

@@ -8,7 +8,7 @@ IF DEF(_RED)
 	db 12, MANKEY
 	db 15, BELLSPROUT
 	db 16, BELLSPROUT
-	db 16, PIDGEY
+	db 16, HINAAZU
 	db 14, MEOWTH
 	db 16, MEOWTH
 ENDC
@@ -20,7 +20,7 @@ IF DEF(_BLUE)
 	db 12, MEOWTH
 	db 15, ODDISH
 	db 16, ODDISH
-	db 16, PIDGEY
+	db 16, HINAAZU
 	db 14, MANKEY
 	db 16, MANKEY
 ENDC

data/wild/super_rod.asm

@@ -47,13 +47,13 @@ SuperRodData:
 	db 5, GYOPIN
 
 .Group2:
-	db 2
+	db 3
 	db 10, MAGIKARP
 	db 7, POLIWAG
 	db 10, GYOPIN
 
 .Group3:
-	db 3
+	db 5
 	db 15, SKIMPER
 	db 19, MAGIKARP
 	db 15, KRABBY
@@ -61,7 +61,7 @@ SuperRodData:
 	db 15, CHEEP
 
 .Group4:
-	db 2
+	db 5
 	db 20, KRABBY
 	db 20, SHELLDER
 	db 20, TENTACOOL
@@ -69,7 +69,7 @@ SuperRodData:
 	db 20, HORSEA
 
 .Group5:
-	db 2
+	db 5
 	db 25, POLIWHIRL
 	db 25, SLOWPOKE
 	db 20, SKIMPER
@@ -77,7 +77,7 @@ SuperRodData:
 	db 25, BLOTTLE
 
 .Group6:
-	db 4
+	db 6
 	db 15, DRATINI
 	db 28, KRABBY
 	db 25, CHEEP
@@ -86,7 +86,7 @@ SuperRodData:
 	db 32, BAWLIGUA
 
 .Group7:
-	db 4
+	db 6
 	db 40, TENTACRUEL
 	db 40, KINGLER
 	db 40, SEAKING
@@ -102,7 +102,7 @@ SuperRodData:
 	db 40, PENDRAKEN
 
 .Group9:
-	db 4
+	db 5
 	db 50, GYARADOS
 	db 50, SEAKING
 	db 50, KINGLER
@@ -110,7 +110,7 @@ SuperRodData:
 	db 50, PENDRAKEN
 
 .Group10:
-	db 4
+	db 12
 	db 50, KINGLER
 	db 50, PENDRAKEN
 	db 50, SEAKING

engine/battle/animations.asm

@@ -1339,8 +1339,7 @@ AdjustOAMBlockYPos2:
 	add b
 	cp 112
 	jr c, .skipSettingPreviousEntrysAttribute
-	dec hl
+	ld a, 160 ; fixes the smoke puff bug - PvK
-	ld a, 160 ; bug, sets previous OAM entry's attribute
 	ld [hli], a
 .skipSettingPreviousEntrysAttribute
 	ld [hl], a

engine/battle/core.asm

@@ -368,14 +368,21 @@ MainInBattleLoop:
 	callfar SwitchEnemyMon
 .noLinkBattle
 	ld a, [wPlayerSelectedMove]
+	cp BULLET_PUNCH
+      jr z, .PriorityMoveUsed
 	cp QUICK_ATTACK
 	jr nz, .playerDidNotUseQuickAttack
+.PriorityMoveUsed
 	ld a, [wEnemySelectedMove]
+	cp BULLET_PUNCH
+	jr z, .compareSpeed
 	cp QUICK_ATTACK
 	jr z, .compareSpeed  ; if both used Quick Attack
 	jp .playerMovesFirst ; if player used Quick Attack and enemy didn't
 .playerDidNotUseQuickAttack
 	ld a, [wEnemySelectedMove]
+	cp BULLET_PUNCH
+	jr z, .enemyMovesFirst
 	cp QUICK_ATTACK
 	jr z, .enemyMovesFirst ; if enemy used Quick Attack and player didn't
 	ld a, [wPlayerSelectedMove]
@@ -773,6 +780,10 @@ FaintEnemyPokemon:
 	hlcoord 0, 0
 	lb bc, 4, 11
 	call ClearScreenArea
+	call AnyPartyAlive ; this fixes victory music playing at the wrong time ; PvK
+	ld a, d
+	and a
+	push af
 	ld a, [wIsInBattle]
 	dec a
 	jr z, .wild_win
@@ -791,11 +802,14 @@ FaintEnemyPokemon:
 	jr .sfxplayed
 .wild_win
 	call EndLowHealthAlarm
+	pop af
+	push af
 	ld a, MUSIC_DEFEATED_WILD_MON
-	call PlayBattleVictoryMusic
+	call nz, PlayBattleVictoryMusic
 .sfxplayed
 ; bug: win sfx is played for wild battles before checking for player mon HP
 ; this can lead to odd scenarios where both player and enemy faint, as the win sfx plays yet the player never won the battle
+; kep fixes this - PvK
 	ld hl, wBattleMonHP
 	ld a, [hli]
 	or [hl]
@@ -805,9 +819,7 @@ FaintEnemyPokemon:
 	jr nz, .playermonnotfaint ; if so, don't call RemoveFaintedPlayerMon twice
 	call RemoveFaintedPlayerMon
 .playermonnotfaint
-	call AnyPartyAlive
+	pop af
-	ld a, d
-	and a
 	ret z
 	ld hl, EnemyMonFaintedText
 	call PrintText
@@ -2368,6 +2380,8 @@ PartyMenuOrRockOrRun:
 	predef StatusScreen
 	predef StatusScreen2
 ; now we need to reload the enemy mon pic
+	ld a, 1
+	ldh [hWhoseTurn], a
 	ld a, [wEnemyBattleStatus2]
 	bit HAS_SUBSTITUTE_UP, a ; does the enemy mon have a substitute?
 	ld hl, AnimationSubstitute
@@ -5150,7 +5164,7 @@ MetronomePickMove:
 	and a
 	jr z, .pickMoveLoop
 	cp STRUGGLE
-	assert NUM_ATTACKS == STRUGGLE ; random numbers greater than STRUGGLE are not moves
+	assert NUM_ATTACKS == BULLET_PUNCH ; rerolls if greater than the last move in index
 	jr nc, .pickMoveLoop
 	cp METRONOME
 	jr z, .pickMoveLoop

engine/battle/trainer_ai.asm

@@ -345,7 +345,7 @@ CooltrainerFAI:
 	; The intended 25% chance to consider switching will not apply.
 	; Uncomment the line below to fix this.
 	cp 25 percent + 1
-	; ret nc
+	ret nc ; fixes the bug
 	ld a, 10
 	call AICheckIfHPBelowFraction
 	jp c, AIUseHyperPotion
@@ -387,6 +387,9 @@ KogaAI:
 BlaineAI:
 	cp 25 percent + 1
 	ret nc
+	ld a, 10
+	call AICheckIfHPBelowFraction
+	ret nc ; this fixes the super potion thing - PvK
 	jp AIUseSuperPotion
 
 SabrinaAI:

engine/events/hidden_items.asm

@@ -33,9 +33,15 @@ FoundHiddenItemText::
 	ld c, a
 	ld b, FLAG_SET
 	predef FlagActionPredef
+	ld a, [wAudioFadeOutControl] ; this stops it from getting cut off - PvK
+	push af
+	xor a
+	ld [wAudioFadeOutControl], a
 	ld a, SFX_GET_ITEM_2
 	call PlaySoundWaitForCurrent
 	call WaitForSoundToFinish
+	pop af
+	ld [wAudioFadeOutControl], a
 	jp TextScriptEnd
 .bagFull
 	call WaitForTextScrollButtonPress ; wait for button press
@@ -77,7 +83,7 @@ HiddenCoins:
 	cp 20
 	jr z, .bcd20
 	cp 40
-	jr z, .bcd20 ; should be bcd40
+	jr z, .bcd40 ; fixes the 40 coin stash thing - PvK
 	jr .bcd100
 .bcd10
 	ld a, $10
@@ -87,7 +93,7 @@ HiddenCoins:
 	ld a, $20
 	ldh [hCoins + 1], a
 	jr .bcdDone
-.bcd40 ; due to a typo, this is never used
+.bcd40
 	ld a, $40
 	ldh [hCoins + 1], a
 	jr .bcdDone

engine/items/item_effects.asm

@@ -473,9 +473,7 @@ ItemUseBall:
 ; Mirror Move even though the only wild Pokémon that knows Transform is Ditto.
 	ld hl, wEnemyBattleStatus3
 	bit TRANSFORMED, [hl]
-	jr z, .notTransformed
+	jr z, .notTransformed ; removed lines that cause above bug - PvK
-	ld a, DITTO
-	ld [wEnemyMonSpecies2], a
 	jr .skip6
 
 .notTransformed
@@ -909,7 +907,10 @@ ItemUseMedicine:
 	ld de, wBattleMonStats
 	ld bc, NUM_STATS * 2
 	call CopyData ; copy party stats to in-battle stat data
-	predef DoubleOrHalveSelectedStats
+	xor a
+	ld [wCalculateWhoseStats], a
+	callfar CalculateModifiedStats
+	callfar ApplyBadgeStatBoosts
 	jp .doneHealing
 .healHP
 	inc hl ; hl = address of current HP

engine/items/itemfinder.asm

@@ -27,7 +27,9 @@ HiddenItemNear:
 	ld a, [wYCoord]
 	call Sub5ClampTo0
 	cp d
+	jr z, .y_zflag ; starts to fix the y/x coord 0 no find bug - PvK
 	jr nc, .loop
+y_zflag
 	ld a, [wYCoord]
 	add 4
 	cp d
@@ -35,7 +37,9 @@ HiddenItemNear:
 	ld a, [wXCoord]
 	call Sub5ClampTo0
 	cp e
+	jr z, .x_zflag
 	jr nc, .loop
+.x_zflag
 	ld a, [wXCoord]
 	add 5
 	cp e
@@ -45,7 +49,7 @@ HiddenItemNear:
 
 Sub5ClampTo0:
 ; subtract 5 but clamp to 0
-	sub 5
+	sub 4
 	cp $f0
 	ret c
 	xor a

engine/menus/main_menu.asm

@@ -392,7 +392,7 @@ PrintSaveScreenText:
 	call PrintPlayTime
 	ld a, $1
 	ldh [hAutoBGTransferEnabled], a
-	ld c, 30
+	ld c, 15 ; quicker player stat display
 	jp DelayFrames
 
 PrintNumBadges:

engine/menus/naming_screen.asm

@@ -326,9 +326,7 @@ DisplayNamingScreen:
 LoadEDTile:
 	ld de, ED_Tile
 	ld hl, vFont tile $70
-	ld bc, (ED_TileEnd - ED_Tile) / $8
+	lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) / $8 ; bad emulators work fine w/ this
-	; to fix the graphical bug on poor emulators
-	;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) / $8
 	jp CopyVideoDataDouble
 
 ED_Tile:

engine/menus/save.asm

@@ -161,21 +161,14 @@ SaveSAV:
 	lb bc, 4, 18
 	call ClearScreenArea
 	hlcoord 1, 14
-	ld de, NowSavingString
-	call PlaceString
-	ld c, 120
-	call DelayFrames
 	ld hl, GameSavedText
 	call PrintText
 	ld a, SFX_SAVE
 	call PlaySoundWaitForCurrent
 	call WaitForSoundToFinish
-	ld c, 30
+	ld c, 10 ; removes the artificial save delay
 	jp DelayFrames
 
-NowSavingString:
-	db "Now saving...@"
-
 SaveSAVConfirm:
 	call PrintText
 	hlcoord 0, 7

engine/menus/start_sub_menus.asm

@@ -462,6 +462,9 @@ StartMenu_TrainerInfo::
 	predef DrawBadges ; draw badges
 	ld b, SET_PAL_TRAINER_CARD
 	call RunPaletteCommand
+	ld a, [wOnSGB] ; this fixes garbage on dmgs
+	and a
+	call z, Delay3
 	call GBPalNormal
 	call WaitForTextScrollButtonPress ; wait for button press
 	call GBPalWhiteOut
@@ -469,6 +472,9 @@ StartMenu_TrainerInfo::
 	call LoadScreenTilesFromBuffer2 ; restore saved screen
 	call RunDefaultPaletteCommand
 	call ReloadMapData
+	ld a, [wOnSGB] ; this fixes garbage on dmgs
+	and a
+	call z, Delay3
 	call LoadGBPal
 	pop af
 	ldh [hTileAnimations], a

engine/movie/splash.asm

@@ -124,7 +124,7 @@ AnimateShootingStar:
 	ld a, [wMoveDownSmallStarsOAMCount]
 	cp 24
 	jr z, .next2
-	add 6 ; should be 4, but the extra 2 aren't visible on screen
+	add 4 ; fixes the invisible extra 2 stars that can take up ram
 	ld [wMoveDownSmallStarsOAMCount], a
 .next2
 	call MoveDownSmallStars

engine/movie/title.asm

@@ -119,10 +119,10 @@ DisplayTitleScreen:
 	call EnableLCD
 
 IF DEF(_RED)
-	ld a, STARTER1 ; which Pokemon to show first on the title screen
+	ld a, CHARIZARD ; which Pokemon to show first on the title screen
 ENDC
 IF DEF(_BLUE)
-	ld a, STARTER2 ; which Pokemon to show first on the title screen
+	ld a, TOTARTLE ; which Pokemon to show first on the title screen
 ENDC
 	ld [wTitleMonSpecies], a
 	call LoadTitleMonSprite

engine/movie/title2.asm

@@ -90,11 +90,11 @@ TitleBallYTable:
 TitleScreenAnimateBallIfStarterOut:
 ; Animate the TitleBall if a starter just got scrolled out.
 	ld a, [wTitleMonSpecies]
-	cp STARTER1
+	cp VENUSAUR
 	jr z, .ok
-	cp STARTER2
+	cp CHARIZARD
 	jr z, .ok
-	cp STARTER3
+	cp TOTARTLE
 	ret nz
 .ok
 	ld e, 1 ; animate titleball

engine/overworld/healing_machine.asm

@@ -1,7 +1,7 @@
 AnimateHealingMachine:
 	ld de, PokeCenterFlashingMonitorAndHealBall
 	ld hl, vChars0 tile $7c
-	lb bc, BANK(PokeCenterFlashingMonitorAndHealBall), 3 ; should be 2
+	lb bc, BANK(PokeCenterFlashingMonitorAndHealBall), 2 ; fixed from 3 - PvK
 	call CopyVideoData
 	ld hl, wUpdateSpritesEnabled
 	ld a, [hl]

engine/overworld/player_animations.asm

@@ -88,6 +88,7 @@ PlayerSpinWhileMovingDown:
 	ld [hli], a ; wPlayerSpinWhileMovingUpOrDownAnimMaxY
 	call GetPlayerTeleportAnimFrameDelay
 	ld [hl], a ; wPlayerSpinWhileMovingUpOrDownAnimFrameDelay
+	ld hl, wFacingDirectionList ; this fixes the jp characters on dmg/sgb - PvK
 	jp PlayerSpinWhileMovingUpOrDown
 
 _LeaveMapAnim::
@@ -108,6 +109,7 @@ _LeaveMapAnim::
 	ld [hli], a ; wPlayerSpinWhileMovingUpOrDownAnimMaxY
 	call GetPlayerTeleportAnimFrameDelay
 	ld [hl], a ; wPlayerSpinWhileMovingUpOrDownAnimFrameDelay
+	ld hl, wFacingDirectionList ; this fixes the thing too - PvK
 	call PlayerSpinWhileMovingUpOrDown
 	call IsPlayerStandingOnWarpPadOrHole
 	ld a, b
@@ -202,6 +204,9 @@ FlyAnimationScreenCoords2:
 	db $F0, $00
 
 LeaveMapThroughHoleAnim:
+	ld a, [wLastMusicSoundID]
+	cp MUSIC_BIKE_RIDING
+	call z, PlayDefaultMusic ; this fixes the bike music persisting - PvK
 	ld a, $ff
 	ld [wUpdateSpritesEnabled], a ; disable UpdateSprites
 	; shift upper half of player's sprite down 8 pixels and hide lower half

engine/pokemon/learn_move.asm

@@ -205,12 +205,38 @@ TryingToLearnText:
 	text_far _TryingToLearnText
 	text_end
 
-OneTwoAndText:
+OneTwoAndText: ; uses the fixed move swap sound - PvK
 	text_far _OneTwoAndText
 	text_pause
 	text_asm
+	text_far _OneTwoAndText
+	text_pause
+	text_asm
+	push af
+	push bc
+	push de
+	push hl
+	ld a, $1
+	ld [wMuteAudioAndPauseMusic], a
+	call DelayFrame
+	ld a, [wAudioROMBank]
+	push af
+	ld a, BANK(SFX_Swap_1)
+	ld [wAudioROMBank], a
+	ld [wAudioSavedROMBank], a
+	call WaitForSoundToFinish
 	ld a, SFX_SWAP
-	call PlaySoundWaitForCurrent
+	call PlaySound
+	call WaitForSoundToFinish
+	pop af
+	ld [wAudioROMBank], a
+	ld [wAudioSavedROMBank], a
+	xor a
+	ld [wMuteAudioAndPauseMusic], a
+	pop hl
+	pop de
+	pop bc
+	pop af
 	ld hl, PoofText
 	ret
 

engine/slots/slot_machine.asm

@@ -304,7 +304,7 @@ SlotMachine_StopWheel1Early:
 .loop
 	ld a, [hli]
 	cp HIGH(SLOTS7)
-	jr c, .stopWheel ; condition never true
+	jr z, .stopWheel ; now works properly - PvK
 	dec c
 	jr nz, .loop
 	ret
@@ -329,9 +329,13 @@ SlotMachine_StopWheel2Early:
 ; player's odds.
 .sevenAndBarMode
 	call SlotMachine_FindWheel1Wheel2Matches
+	ret nz
 	ld a, [de]
 	cp HIGH(SLOTSBAR) + 1
-	ret nc
+	jr c, .stopWheel
+	ld a, [wSlotMachineFlags]
+	bit 6, a
+	ret z
 .stopWheel
 	xor a
 	ld [wSlotMachineWheel2SlipCounter], a
@@ -850,7 +854,7 @@ LoadSlotMachineTiles:
 	call DisableLCD
 	ld hl, SlotMachineTiles2
 	ld de, vChars0
-	ld bc, $1c tiles ; should be SlotMachineTiles2End - SlotMachineTiles2, or $18 tiles
+	ld bc, SlotMachineTiles2End - SlotMachineTiles2 ; fixes loading too many tiles - PvK
 	ld a, BANK(SlotMachineTiles2)
 	call FarCopyData2
 	ld hl, SlotMachineTiles1
@@ -860,7 +864,7 @@ LoadSlotMachineTiles:
 	call FarCopyData2
 	ld hl, SlotMachineTiles2
 	ld de, vChars2 tile $25
-	ld bc, $1c tiles ; should be SlotMachineTiles2End - SlotMachineTiles2, or $18 tiles
+	ld bc, SlotMachineTiles2End - SlotMachineTiles2
 	ld a, BANK(SlotMachineTiles2)
 	call FarCopyData2
 	ld hl, SlotMachineMap

home/uncompress.asm

@@ -34,14 +34,20 @@ _UncompressSpriteData::
 	ld [wSpriteLoadFlags], a
 	call ReadNextInputByte    ; first byte of input determines sprite width (high nybble) and height (low nybble) in tiles (8x8 pixels)
 	ld b, a
-	and $f
+	and $7 ; this stops the hall of fame from being corrupted by missingno. - PvK
+	jr nz, .skip1
+	inc a
+.skip1
 	add a
 	add a
 	add a
 	ld [wSpriteHeight], a
 	ld a, b
 	swap a
-	and $f
+	and $7
+	jr nz, .skip2
+	inc a
+.skip2
 	add a
 	add a
 	add a

home/update_sprites.asm

@@ -2,5 +2,9 @@ UpdateSprites::
 	ld a, [wUpdateSpritesEnabled]
 	dec a
 	ret nz
+	ld hl, hSkipOAMUpdates
+	set 0, [hl]
 	homecall _UpdateSprites
+	ld hl, hSkipOAMUpdates
+	res 0, [hl] ; this prevents v-blank interference - PvK
 	ret

home/vblank.asm

@@ -26,11 +26,15 @@ VBlank::
 	call VBlankCopy
 	call VBlankCopyDouble
 	call UpdateMovingBgTiles
-	call hDMARoutine
+	ld a, [hSkipOAMUpdates]
+	bit 0, a
+	jr nz, .skipOAM
+	call hDMARoutine ; this prevents v-blank interference - PvK
 	ld a, BANK(PrepareOAMData)
 	ldh [hLoadedROMBank], a
 	ld [MBC1RomBank], a
 	call PrepareOAMData
+.skipOAM
 
 	; VBlank-sensitive operations end.
 

maps/CeladonCity.blk

@@ -1,20 +1,8 @@
-lllllllllllllllllllllll
+lllllllllllllllllllllooooooooo
-
-
-
-
-
-
-
-
-oo
 ooo
 oooooo
-n !UUUU 
!U 
!UUUUUUUUUmnhi 

!hiUhi ! ! ! !Umn7~hi7}~y7:~7~7~7~|rUUUhiUUUUUUUUUUUUUUUUUUUU7::sUUUUUUUUUUUUUUUUUUUUUUUUy0	VwwwwUwwwwUUUUUUUUUNTM 
! !U ! !nwUUUUUUUUUgj7:~|~U7~7~nUUUUUUUUUCVwwVwUVwww5nUUUUUUUUUUUUUUUUUUUUUUmn !

 ! !UU ! ! ! ! !
+n !UUUU 
!U 
!UUUUUUUUUmnhi 

!hiUhi ! ! ! !Umn7~hi7}~y7:~7~7~7~|rUUUhiUUUUUUUUUUUUUUUUUUUU7::sUUUUUUUUUUUUUUUUUUUUUUUUy0	VwwwwUwwwwUUUUUUUUUNTM 
! !U ! !nwUUUUUUUgj7:~|~U7~7~nUUUUUUUCVwwVwUVwwwLnUUUUUUUUUUUUUUUUUUUUUUmn !

 ! !UU ! ! ! ! !mn7~7~7~UU7~|~|~7~|~mnUUUUUyUU !UUUUUUUUUUUU
-n7~7~7~UU7~|~|~7~|~
+n/7~UUUUUUUUUUUUmn
-nUUUUUyUU !UUUUUUUUUUUU
-n/7~UUUUUUUUUUUU
-n
 
 
 
@@ -24,5 +12,5 @@ n
 
 
 
-llllll26llll
+llllllmnllll
-nooooooooooooooooo6ooooo
+nooooooooooooooooooooooo

maps/CeladonHotel.blk

@@ -1,2 +1,2 @@
-
+#
 

maps/FuchsiaCity.blk

@@ -1,4 +1,18 @@
- 
!zoooooz7:~zooooooznttmVUwn




mnwVwVmzoo`wVwVwmzzzzzzznzzzzzzzzzzz !oooo`z 
!nlllmzz|szzzzzz7:~`wVwmzoooooyzznVUVzzzzzo

gmzzn
U
lllll11N
kkkPRR`
U
wwww11N









U_tnN>?????????;_t
+ 
!zoooooz7:~zooooooznttmVUwn




mnwVwVmzzznwVwVwmzzzzzzzzzzzzzzzzzzz !zzzz 
!znlllmz|szzzz7:~znVwwmoooooyzzzVUVzzzzzo

gmzzM
U
lllll11N
kkkPRRO
U
wwww11N










_tnN1wwwwwwwww1_t
 
 
-nN$ 
!WWWW !%_8989nNX|~0|rY1<=<=1nNX11111111Y_Vw1wnNZ\ooo\[



11nPRRRR>?;ttttPRRRRRn11111(,)1111>?;
+nNn 
!
+
+
+
+ !m_8989nNn|~0|rm1<=<=1nNn11111111m_Vw1wnN
+
+1ooooo1
+
+
+
+
+
+
+
+nPRRRR>?;ttttRRRRRRn11111(,)1111>?;

maps/Route23.blk

@@ -1,4 +1,4 @@
-566CB556566CB55656++CB,,5656ACBAAA5656BAACCC5656CACBAB5656ACCCBA5656CBBBBA56,+BACBAB,+AACCCBBBAAAAAAAAAAAA)






*A56A56AA''56A
+566CB556566CB55656++CB,,5656BBAACC5656CACBAB5656BBAACC5656ACAABA5656BBAACC56,+CACBAB,+AAAAAAAAAAAAAAAAAAAA)






*A56A56AA''56A
 H
 
 AAA

ram/hram.asm

@@ -387,7 +387,7 @@ hWhoseTurn:: db ; 0 on player's turn, 1 on enemy's turn
 
 hClearLetterPrintingDelayFlags:: db
 
-	ds 1
+hSkipOAMUpdates:: db ; this prevents v-blank interference - PvK
 
 ; bit 0: draw HP fraction to the right of bar instead of below (for party menu)
 ; bit 1: menu is double spaced

scripts/GameCorner.asm

@@ -15,7 +15,7 @@ CeladonGameCornerScript_48bcf:
 	ldh a, [hRandomAdd]
 	cp $7
 	jr nc, .asm_48be2
-	ld a, $8
+	ld a, $7 ; no longer makes the lucky machine a nonexistent one
 .asm_48be2
 	srl a
 	srl a

scripts/OaksLab.asm

@@ -118,6 +118,7 @@ OaksLabScript4:
 	call UpdateSprites
 	ld hl, wFlags_D733
 	res 1, [hl]
+	call DelayFrame
 	call PlayDefaultMusic
 
 	ld a, $5

scripts/PokemonTower2F.asm

@@ -60,7 +60,7 @@ ENDC
 CoordsData_6055e:
 	dbmapcoord 15,  5
 	dbmapcoord 14,  6
-	db $0F ; end? (should be $ff?)
+	db -1 ; fixes coord termination which can have adverse effects
 
 PokemonTower2Script1:
 	ld a, [wIsInBattle]

scripts/PokemonTower7F.asm

@@ -77,6 +77,8 @@ PokemonTower7Script4:
 	ld [wDestinationWarpID], a
 	ld a, LAVENDER_TOWN
 	ld [wLastMap], a
+	ld hl, wd736
+	set 2, [hl] ; fixes some weirdness when saving fuji - PvK
 	ld hl, wd72d
 	set 3, [hl]
 	ld a, $0