diff --git a/README.md b/README.md index 92ef1441..aff1dfaf 100644 --- a/README.md +++ b/README.md @@ -259,7 +259,7 @@ Credits * Chatot4444 - Assisting with gym scaling code * ZumiIsawhat? - Restorations of beta OST * Helix Chamber, RacieBeep, loumilouminosus, Orchid, GBCRetro, & catstorm26 - Prototype Pokémon sprites -* Vortyne - Reused a bit of code from their pureRGB hack, which was used to assist with making MissingNo. stable. Assisted in bug fixes. +* Vortyne - Reused a bit of code from their pureRGB hack. Assisted in bug fixes. * jojobear13 & Mateo - Move deleter & move relearner functionality from Shin Pokered, followed [this guide](https://github.com/jojobear13/shinpokered/blob/master/how%20to%20guides/how%20to%20add%20the%20move%20relearner%26deleter.txt). Tweaks were made to make it compatible with the pokered version we worked off of. * Rangi - Reused a bit of code from their Red* / Blue* hack to make HMs usable in the overworld! * 大吟醸 (Daiginjo) - Assistance in translating the Tamamushi University Student Book, allowing for an accurate adaptation of the location. diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 7997a025..07d014c3 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -3,8 +3,7 @@ ; - BaseStats (see data/pokemon/base_stats.asm) ; - MonPartyData (see data/pokemon/menu_icons.asm) ; - MonsterPalettes (see data/pokemon/palettes.asm) - const_def - const DEX_MISSINGNO ; 0 (000) + const_def 1 const DEX_BULBASAUR ; 1 (001) const DEX_IVYSAUR ; 2 (002) const DEX_VENUSAUR ; 3 (003) @@ -257,4 +256,4 @@ const DEX_MELTAN ; (250) const DEX_MELMETAL ; (251) -DEF NUM_POKEMON EQU const_value +DEF NUM_POKEMON EQU const_value - 1 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 8ce0cef8..5548dfeb 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -257,11 +257,10 @@ const WEEZING_G ; $F8 const TAUROS_P ; $F9 const TAUROS_PA ; $FA - const TAUROS_PB ; $FB - const MISSINGNO ; $FC - const FOSSIL_KABUTOPS ; $FD (was B6) - const FOSSIL_AERODACTYL ; $FE (was B7) - const MON_GHOST ; $FF (was B8, need to make sure we can still put something here) + const TAUROS_PB ; $FB + const FOSSIL_KABUTOPS ; $FC (was B6) + const FOSSIL_AERODACTYL ; $FD (was B7) + const MON_GHOST ; $FE (was B8) DEF NUM_POKEMON_INDEXES EQU const_value - 1 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 57e1a459..a6462560 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -251,7 +251,4 @@ INCLUDE "data/pokemon/base_stats/mewtwo.asm" INCLUDE "data/pokemon/base_stats/mew.asm" INCLUDE "data/pokemon/base_stats/meltan.asm" INCLUDE "data/pokemon/base_stats/melmetal.asm" - assert_table_length NUM_POKEMON - 1 ; discount MissingNo - -MissingnoBaseStats:: -INCLUDE "data/pokemon/base_stats/missingno.asm" + assert_table_length NUM_POKEMON diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index a3cd1c73..3857c8ca 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -257,7 +257,6 @@ CryData:: mon_cry SFX_CRY_1D, $11, $40 ; Tauros-P mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PA mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PB - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. mon_cry SFX_CRY_18, $EE, $01 ; MissingNo. (Kabutops Fossil) mon_cry SFX_CRY_23, $20, $F0 ; MissingNo. (Aerodactyl Fossil) mon_cry SFX_CRY_06, $00, $00 ; MissingNo. (Ghost) diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 1bd3e9fc..f955c673 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -254,7 +254,6 @@ PokedexEntryPointers: dw MissingNoDexEntry dw MissingNoDexEntry dw MissingNoDexEntry - dw MissingNoDexEntry assert_table_length NUM_POKEMON_INDEXES ; string: species name diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm index 61f0b30f..a85ec84b 100644 --- a/data/pokemon/dex_order.asm +++ b/data/pokemon/dex_order.asm @@ -251,7 +251,6 @@ PokedexOrder: db DEX_TAUROS_P db DEX_TAUROS_PA db DEX_TAUROS_PB - db DEX_MISSINGNO db 0 ; MISSINGNO. db 0 ; MISSINGNO. db 0 ; MISSINGNO. diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index a6eb6f84..f597e696 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -263,7 +263,6 @@ EvosMovesPointerTable: dw TaurosPEvosMoves dw TaurosPAEvosMoves dw TaurosPBEvosMoves - dw MissingNoEvosMoves dw FossilKabutopsEvosMoves dw FossilAerodactylEvosMoves dw MonGhostEvosMoves @@ -3279,12 +3278,6 @@ TaurosPBEvosMoves: db 44, RAGE db 51, FIRE_SPIN db 0 - -MissingNoEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 FossilKabutopsEvosMoves: ; Evolutions diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 5550161f..7ab6f74c 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -251,4 +251,4 @@ MonPartyData: nybble ICON_MON ; Mew nybble ICON_BALL ; Meltan nybble ICON_BALL ; Melmetal - end_nybble_array NUM_POKEMON - 1 + end_nybble_array NUM_POKEMON diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index e910cde9..5fe91a1f 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -254,6 +254,5 @@ MonsterNames:: db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." - db "MISSINGNO." assert_table_length NUM_POKEMON_INDEXES diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 2afcff65..f0fc90da 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -252,4 +252,4 @@ MonsterPalettes: db PAL_MEWMON ; MEW db PAL_YELLOWMON ; MELTAN db PAL_YELLOWMON ; MELMETAL - assert_table_length NUM_POKEMON + assert_table_length NUM_POKEMON + 1 diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index afa760d0..219720a5 100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -8,7 +8,7 @@ WildDataPointers: dw NothingWildMons ; VERMILION_CITY dw NothingWildMons ; CELADON_CITY dw NothingWildMons ; FUCHSIA_CITY - dw CinnabarWildMons ; CINNABAR_ISLAND + dw NothingWildMons ; CINNABAR_ISLAND dw NothingWildMons ; INDIGO_PLATEAU dw NothingWildMons ; SAFFRON_CITY dw NothingWildMons ; CITRINE_CITY @@ -263,7 +263,6 @@ WildDataPointers: ; level, species (ten times) INCLUDE "data/wild/maps/nothing.asm" -INCLUDE "data/wild/maps/CinnabarIsland.asm" INCLUDE "data/wild/maps/Route1.asm" INCLUDE "data/wild/maps/Route2.asm" INCLUDE "data/wild/maps/Route22.asm" diff --git a/data/wild/maps/CinnabarIsland.asm b/data/wild/maps/CinnabarIsland.asm deleted file mode 100644 index b4747a4b..00000000 --- a/data/wild/maps/CinnabarIsland.asm +++ /dev/null @@ -1,16 +0,0 @@ -CinnabarWildMons: ; This is used purely for testing MissingNo. - def_grass_wildmons 0 ; encounter rate - end_grass_wildmons - - def_water_wildmons 20 ; encounter rate - db 80, MISSINGNO - db 80, MISSINGNO - db 80, MISSINGNO - db 80, MISSINGNO - db 80, MISSINGNO - db 80, MISSINGNO - db 80, MISSINGNO - db 80, MISSINGNO - db 80, MISSINGNO - db 80, MISSINGNO - end_water_wildmons diff --git a/engine/events/give_pokemon.asm b/engine/events/give_pokemon.asm index d6bce061..f2374e1e 100644 --- a/engine/events/give_pokemon.asm +++ b/engine/events/give_pokemon.asm @@ -57,8 +57,6 @@ SetPokedexOwnedFlag: ld [wd11e], a predef IndexToPokedex ld a, [wd11e] - and a - ret z ; do nothing for missingno dec a ld c, a ld hl, wPokedexOwned diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm index 80ee40b6..3a7923ac 100644 --- a/engine/gfx/mon_icons.asm +++ b/engine/gfx/mon_icons.asm @@ -262,7 +262,6 @@ GetPartyMonSpriteID: predef IndexToPokedex ld a, [wd11e] ld c, a - dec a srl a ld hl, MonPartyData ld e, a diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 37859d2f..099fa4c7 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -545,8 +545,6 @@ ItemUseBall: ; Add the caught Pokémon to the Pokédex. predef IndexToPokedex ld a, [wd11e] - and a ; is it missingno? - jr z, .skipShowingPokedexData ; don't mark in pokedex if so dec a ld c, a ld b, FLAG_TEST diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm index 2a117b64..94410edd 100644 --- a/engine/pokemon/add_mon.asm +++ b/engine/pokemon/add_mon.asm @@ -86,8 +86,6 @@ _AddPartyMon:: predef IndexToPokedex pop de ld a, [wd11e] - and a - jr z, .noMarkSeen ; if it's missingno don't do any pokedex actions dec a ld c, a ld b, FLAG_TEST @@ -104,7 +102,6 @@ _AddPartyMon:: pop bc ld hl, wPokedexSeen call FlagAction -.noMarkSeen pop hl push hl diff --git a/gfx/pics.asm b/gfx/pics.asm index 35a875d6..7090e6c0 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -544,10 +544,8 @@ WugtrioPicFront:: INCBIN "gfx/pokemon/front/wugtrio.pic" WugtrioPicBack:: INCBIN "gfx/pokemon/back/wugtriob.pic" ToedscoolPicFront:: INCBIN "gfx/pokemon/front/toedscool.pic" ToedscoolPicBack:: INCBIN "gfx/pokemon/back/toedscoolb.pic" -ToedscruelPicFront:: INCBIN "gfx/pokemon/front/toedscruel.pic" -ToedscruelPicBack:: INCBIN "gfx/pokemon/back/toedscruelb.pic" -MissingNoPicFront:: INCBIN "gfx/pokemon/front/missingno.pic" -MissingNoPicBack:: INCBIN "gfx/pokemon/back/missingnob.pic" +ToedscruelPicFront:: INCBIN "gfx/pokemon/front/toedscruel.pic" +ToedscruelPicBack:: INCBIN "gfx/pokemon/back/toedscruelb.pic" SECTION "Pics 10", ROMX ; Extra Trainer Bank, currently storing regionals here too diff --git a/home/pokemon.asm b/home/pokemon.asm index 0462d5a4..c6f580c8 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -100,6 +100,7 @@ LoadFrontSpriteByMonIndex:: ld [hl], b and a pop hl + jr z, .invalidDexNumber ; dex #0 invalid cp NUM_POKEMON + 1 jr c, .validDexNumber ; dex numbers over normal limit invalid .invalidDexNumber @@ -378,8 +379,6 @@ GetMonHeader:: jr z, .specialID predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number ld a, [wd11e] - and a - jr z, .missingno ; index of 0 is missingno dec a ld bc, BASE_DATA_SIZE ld hl, BaseStats @@ -388,12 +387,6 @@ GetMonHeader:: ld bc, BASE_DATA_SIZE call CopyData jr .done -.missingno - ld hl, MissingnoBaseStats - ld bc, BASE_DATA_SIZE - ld de, wMonHeader - call CopyData - jr .done .specialID ld hl, wMonHSpriteDim ld [hl], b ; write sprite dimensions diff --git a/ram/wram.asm b/ram/wram.asm index 5b6f0313..5a6181a1 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1743,10 +1743,10 @@ SECTION "Main Data", WRAM0 wMainDataStart:: -wPokedexOwned:: flag_array NUM_POKEMON - 1 ; discount MissingNo +wPokedexOwned:: flag_array NUM_POKEMON wPokedexOwnedEnd:: -wPokedexSeen:: flag_array NUM_POKEMON - 1 ; discount MissingNo +wPokedexSeen:: flag_array NUM_POKEMON wPokedexSeenEnd:: ds 28 ;;;;;;; moved bag code lower down to make bigger bag space diff --git a/scripts/CeladonMansion3F.asm b/scripts/CeladonMansion3F.asm index 5f6278b5..566d7cf5 100644 --- a/scripts/CeladonMansion3F.asm +++ b/scripts/CeladonMansion3F.asm @@ -29,7 +29,7 @@ DirectorText: ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits ld a, [wNumSetBits] - cp NUM_POKEMON - 1 + cp NUM_POKEMON jr nc, .completed_dex ld hl, .GameDesignerText jr .done