Removing MissingNo to make room

This commit is contained in:
MementoMartha 2023-04-09 20:41:31 +01:00
parent fb3a20a51d
commit c7499a1fd2
21 changed files with 17 additions and 67 deletions

View file

@ -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

View file

@ -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)

View file

@ -254,7 +254,6 @@ PokedexEntryPointers:
dw MissingNoDexEntry
dw MissingNoDexEntry
dw MissingNoDexEntry
dw MissingNoDexEntry
assert_table_length NUM_POKEMON_INDEXES
; string: species name

View file

@ -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.

View file

@ -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

View file

@ -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

View file

@ -254,6 +254,5 @@ MonsterNames::
db "MISSINGNO."
db "MISSINGNO."
db "MISSINGNO."
db "MISSINGNO."
assert_table_length NUM_POKEMON_INDEXES

View file

@ -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

View file

@ -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"

View file

@ -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