V1.2.2:

- Fixed a bug where the game could crash while catching a pokemon during bug contests
- Fixed a bug with odd egg pokemon moves
- Fixed casino mon locations in pokedex
- Updated credits
- Added held item percentages to pokedex

Author: cRz-Shadows

constants/credits_constants.asm

@@ -145,6 +145,13 @@
 	const POKECRYSTAL3
 	const POKECRYSTAL4
 	const POKECRYSTAL5
+	const POKECRYSTAL6
+	const POKECRYSTAL7
+	const POKECRYSTAL8
+	const POKECRYSTAL9
+	const POKECRYSTAL10
+	const POKECRYSTAL11
+	const POKECRYSTAL12
 	const POKECRYSTALDISASSEMBLY
 	const NAYRUTHANKSTEXT
 NUM_CREDITS_STRINGS EQU const_value

data/credits_script.asm

@@ -120,6 +120,21 @@ CreditsScript:
 
 	db CREDITS_WAIT, 12
 
+	db             TUTORIALS, 0
+	db       POKECRYSTAL6, 1
+	db       POKECRYSTAL7, 2
+	db       POKECRYSTAL8, 3
+	db       POKECRYSTAL9, 4
+
+	db CREDITS_WAIT, 12
+
+	db             TUTORIALS, 0
+	db       POKECRYSTAL10, 1
+	db       POKECRYSTAL11, 2
+	db       POKECRYSTAL12, 3
+
+	db CREDITS_WAIT, 12
+
 	; Clear the banner.
 	db CREDITS_CLEAR
 

data/credits_strings.asm

@@ -146,6 +146,13 @@ CreditsStringsPointers:
 	dw .Pokecrystal3
 	dw .Pokecrystal4
 	dw .Pokecrystal5
+	dw .Pokecrystal6
+	dw .Pokecrystal7
+	dw .Pokecrystal8
+	dw .Pokecrystal9
+	dw .Pokecrystal10
+	dw .Pokecrystal11
+	dw .Pokecrystal12
 	dw .Pokecrystal
 	dw .NayruThanksText
 	assert_table_length NUM_CREDITS_STRINGS
@@ -298,6 +305,13 @@ CreditsStringsPointers:
 .Pokecrystal3: 		  db "       IDAIN@"
 .Pokecrystal4: 		  db "    DAMIENDOURY@"
 .Pokecrystal5: 		  db "  AAAAAA123456789@"
+.Pokecrystal6: 		  db "    EDTV-THEVOID@"
+.Pokecrystal7: 		  db "   COCO-BANDICOOT@"
+.Pokecrystal8: 		  db "   MAJORAGNOSTIC@"
+.Pokecrystal9: 		  db "       KDLPRO@"
+.Pokecrystal10: 	  db "      NICK-PC@"
+.Pokecrystal11: 	  db "     XAEROCHILL@"
+.Pokecrystal12: 	  db "    NOBODYSOCIETY@"
 .Pokecrystal:         db "  THANK YOU TO THE"
 					next " PRET TEAM FOR THE"
 					next "    POKECRYSTAL"

data/events/odd_eggs.asm

@@ -194,7 +194,7 @@ OddEggs:
 
 	db SMOOCHUM
 	db NO_ITEM
-	db POUND, LICK, DIZZY_PUNCH, 0
+	db POWDER_SNOW, POUND, LICK, DIZZY_PUNCH
 	dw 03584 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -220,7 +220,7 @@ OddEggs:
 
 	db SMOOCHUM
 	db NO_ITEM
-	db POUND, LICK, DIZZY_PUNCH, 0
+	db POWDER_SNOW, POUND, LICK, DIZZY_PUNCH
 	dw 00512 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -246,7 +246,7 @@ OddEggs:
 
 	db MAGBY
 	db NO_ITEM
-	db EMBER, DIZZY_PUNCH, 0, 0
+	db EMBER, LEER, DIZZY_PUNCH, 0
 	dw 02560 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -272,7 +272,7 @@ OddEggs:
 
 	db MAGBY
 	db NO_ITEM
-	db EMBER, DIZZY_PUNCH, 0, 0
+	db EMBER, LEER, DIZZY_PUNCH, 0
 	dw 00512 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -298,7 +298,7 @@ OddEggs:
 
 	db ELEKID
 	db NO_ITEM
-	db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0
+	db THUNDERSHOCK, LEER, DIZZY_PUNCH, 0
 	dw 03072 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -324,7 +324,7 @@ OddEggs:
 
 	db ELEKID
 	db NO_ITEM
-	db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0
+	db THUNDERSHOCK, LEER, DIZZY_PUNCH, 0
 	dw 00512 ; OT ID
 	dt 125 ; Exp
 	; Stat exp

data/wild/non_wildmon_locations.asm

@@ -20,8 +20,8 @@ CasinoMons::
 	; johto, from maps\goldenrodgamecorner.asm
 	map_id GOLDENROD_GAME_CORNER
 	casinomon ABRA, GOLDENRODGAMECORNER_ABRA_COINS
-	casinomon CUBONE, GOLDENRODGAMECORNER_CUBONE_COINS
-	casinomon WOBBUFFET, GOLDENRODGAMECORNER_WOBBUFFET_COINS 
+	casinomon PORYGON, GOLDENRODGAMECORNER_CUBONE_COINS
+	casinomon DRATINI, GOLDENRODGAMECORNER_WOBBUFFET_COINS 
 	db -1
 	; kanto, from maps\celadongamecornerprizeroom.asm
 	map_id CELADON_GAME_CORNER_PRIZE_ROOM

engine/pokedex/pokedex.asm

@@ -1671,7 +1671,7 @@ Pokedex_DrawDexEntryScreenBG:
 	call ByteFill
 
 	hlcoord 2, 17
-	ld bc, $7 tiles
+	ld bc, $7
 	ld a, $7f ; black square
 	call ByteFill
 	ld c, 4

engine/pokedex/pokedex_stats_page.asm

@@ -187,10 +187,10 @@ Pokedex_Get_Items:
 	hlcoord 3, 10
 	ld de, .BS_ITEM_text
 	call PlaceString
-	hlcoord 3, 11
+	hlcoord 2, 11
 	ld de, .BS_ITEM1
 	call PlaceString
-	hlcoord 3, 12
+	hlcoord 2, 12
 	ld de, .BS_ITEM2
 	call PlaceString
 
@@ -229,9 +229,9 @@ Pokedex_Get_Items:
 .BS_ITEM_text:
 	db "Wild Held Items:@"
 .BS_ITEM1:
-	db "[1]@"
+	db "[23<%>]@"
 .BS_ITEM2:
-	db "[2]@"
+	db "[ 2<%>]@"
 
 Pokedex_EggG_SetUp:
 	ld a, [wBaseEggGroups]