thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-14 00:56:40 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removing MissingNo to make room

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -259,7 +259,7 @@ Credits
* Chatot4444 - Assisting with gym scaling code * Chatot4444 - Assisting with gym scaling code
* ZumiIsawhat? - Restorations of beta OST * ZumiIsawhat? - Restorations of beta OST
* Helix Chamber, RacieBeep, loumilouminosus, Orchid, GBCRetro, & catstorm26 - Prototype Pokémon sprites * 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. * 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! * 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. * 大吟醸 (Daiginjo) - Assistance in translating the Tamamushi University Student Book, allowing for an accurate adaptation of the location.

5
constants/pokedex_constants.asm
View file

@ -3,8 +3,7 @@
; - BaseStats (see data/pokemon/base_stats.asm) ; - BaseStats (see data/pokemon/base_stats.asm)
; - MonPartyData (see data/pokemon/menu_icons.asm) ; - MonPartyData (see data/pokemon/menu_icons.asm)
; - MonsterPalettes (see data/pokemon/palettes.asm) ; - MonsterPalettes (see data/pokemon/palettes.asm)
const_def const_def 1
const DEX_MISSINGNO ; 0 (000)
const DEX_BULBASAUR ; 1 (001) const DEX_BULBASAUR ; 1 (001)
const DEX_IVYSAUR ; 2 (002) const DEX_IVYSAUR ; 2 (002)
const DEX_VENUSAUR ; 3 (003) const DEX_VENUSAUR ; 3 (003)
@ -257,4 +256,4 @@
const DEX_MELTAN ; (250) const DEX_MELTAN ; (250)
const DEX_MELMETAL ; (251) const DEX_MELMETAL ; (251)
DEF NUM_POKEMON EQU const_value DEF NUM_POKEMON EQU const_value - 1

7
constants/pokemon_constants.asm
View file

@ -258,10 +258,9 @@
const TAUROS_P ; $F9 const TAUROS_P ; $F9
const TAUROS_PA ; $FA const TAUROS_PA ; $FA
const TAUROS_PB ; $FB const TAUROS_PB ; $FB
const MISSINGNO ; $FC const FOSSIL_KABUTOPS ; $FC (was B6)
const FOSSIL_KABUTOPS ; $FD (was B6) const FOSSIL_AERODACTYL ; $FD (was B7)
const FOSSIL_AERODACTYL ; $FE (was B7) const MON_GHOST ; $FE (was B8)
const MON_GHOST ; $FF (was B8, need to make sure we can still put something here)
DEF NUM_POKEMON_INDEXES EQU const_value - 1 DEF NUM_POKEMON_INDEXES EQU const_value - 1

5
data/pokemon/base_stats.asm
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/mew.asm"
INCLUDE "data/pokemon/base_stats/meltan.asm" INCLUDE "data/pokemon/base_stats/meltan.asm"
INCLUDE "data/pokemon/base_stats/melmetal.asm" INCLUDE "data/pokemon/base_stats/melmetal.asm"
assert_table_length NUM_POKEMON - 1 ; discount MissingNo assert_table_length NUM_POKEMON
MissingnoBaseStats::
INCLUDE "data/pokemon/base_stats/missingno.asm"

1
data/pokemon/cries.asm
View file

@ -257,7 +257,6 @@ CryData::
mon_cry SFX_CRY_1D, $11, $40 ; Tauros-P 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-PA
mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PB 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_18, $EE, $01 ; MissingNo. (Kabutops Fossil)
mon_cry SFX_CRY_23, $20, $F0 ; MissingNo. (Aerodactyl Fossil) mon_cry SFX_CRY_23, $20, $F0 ; MissingNo. (Aerodactyl Fossil)
mon_cry SFX_CRY_06, $00, $00 ; MissingNo. (Ghost) mon_cry SFX_CRY_06, $00, $00 ; MissingNo. (Ghost)

1
data/pokemon/dex_entries.asm
View file

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

1
data/pokemon/dex_order.asm
View file

@ -251,7 +251,6 @@ PokedexOrder:
db DEX_TAUROS_P db DEX_TAUROS_P
db DEX_TAUROS_PA db DEX_TAUROS_PA
db DEX_TAUROS_PB db DEX_TAUROS_PB
db DEX_MISSINGNO
db 0 ; MISSINGNO. db 0 ; MISSINGNO.
db 0 ; MISSINGNO. db 0 ; MISSINGNO.
db 0 ; MISSINGNO. db 0 ; MISSINGNO.

7
data/pokemon/evos_moves.asm
View file

@ -263,7 +263,6 @@ EvosMovesPointerTable:
dw TaurosPEvosMoves dw TaurosPEvosMoves
dw TaurosPAEvosMoves dw TaurosPAEvosMoves
dw TaurosPBEvosMoves dw TaurosPBEvosMoves
dw MissingNoEvosMoves
dw FossilKabutopsEvosMoves dw FossilKabutopsEvosMoves
dw FossilAerodactylEvosMoves dw FossilAerodactylEvosMoves
dw MonGhostEvosMoves dw MonGhostEvosMoves
@ -3280,12 +3279,6 @@ TaurosPBEvosMoves:
db 51, FIRE_SPIN db 51, FIRE_SPIN
db 0 db 0
MissingNoEvosMoves:
; Evolutions
db 0
; Learnset
db 0
FossilKabutopsEvosMoves: FossilKabutopsEvosMoves:
; Evolutions ; Evolutions
db 0 db 0

2
data/pokemon/menu_icons.asm
View file

@ -251,4 +251,4 @@ MonPartyData:
nybble ICON_MON ; Mew nybble ICON_MON ; Mew
nybble ICON_BALL ; Meltan nybble ICON_BALL ; Meltan
nybble ICON_BALL ; Melmetal nybble ICON_BALL ; Melmetal
end_nybble_array NUM_POKEMON - 1 end_nybble_array NUM_POKEMON

1
data/pokemon/names.asm
View file

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

2
data/pokemon/palettes.asm
View file

@ -252,4 +252,4 @@ MonsterPalettes:
db PAL_MEWMON ; MEW db PAL_MEWMON ; MEW
db PAL_YELLOWMON ; MELTAN db PAL_YELLOWMON ; MELTAN
db PAL_YELLOWMON ; MELMETAL db PAL_YELLOWMON ; MELMETAL
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON + 1

3
data/wild/grass_water.asm
View file

@ -8,7 +8,7 @@ WildDataPointers:
dw NothingWildMons ; VERMILION_CITY dw NothingWildMons ; VERMILION_CITY
dw NothingWildMons ; CELADON_CITY dw NothingWildMons ; CELADON_CITY
dw NothingWildMons ; FUCHSIA_CITY dw NothingWildMons ; FUCHSIA_CITY
dw CinnabarWildMons ; CINNABAR_ISLAND dw NothingWildMons ; CINNABAR_ISLAND
dw NothingWildMons ; INDIGO_PLATEAU dw NothingWildMons ; INDIGO_PLATEAU
dw NothingWildMons ; SAFFRON_CITY dw NothingWildMons ; SAFFRON_CITY
dw NothingWildMons ; CITRINE_CITY dw NothingWildMons ; CITRINE_CITY
@ -263,7 +263,6 @@ WildDataPointers:
; level, species (ten times) ; level, species (ten times)
INCLUDE "data/wild/maps/nothing.asm" INCLUDE "data/wild/maps/nothing.asm"
INCLUDE "data/wild/maps/CinnabarIsland.asm"
INCLUDE "data/wild/maps/Route1.asm" INCLUDE "data/wild/maps/Route1.asm"
INCLUDE "data/wild/maps/Route2.asm" INCLUDE "data/wild/maps/Route2.asm"
INCLUDE "data/wild/maps/Route22.asm" INCLUDE "data/wild/maps/Route22.asm"

16
data/wild/maps/CinnabarIsland.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

2
engine/events/give_pokemon.asm
View file

@ -57,8 +57,6 @@ SetPokedexOwnedFlag:
ld [wd11e], a ld [wd11e], a
predef IndexToPokedex predef IndexToPokedex
ld a, [wd11e] ld a, [wd11e]
and a
ret z ; do nothing for missingno
dec a dec a
ld c, a ld c, a
ld hl, wPokedexOwned ld hl, wPokedexOwned

1
engine/gfx/mon_icons.asm
View file

@ -262,7 +262,6 @@ GetPartyMonSpriteID:
predef IndexToPokedex predef IndexToPokedex
ld a, [wd11e] ld a, [wd11e]
ld c, a ld c, a
dec a
srl a srl a
ld hl, MonPartyData ld hl, MonPartyData
ld e, a ld e, a

2
engine/items/item_effects.asm
View file

@ -545,8 +545,6 @@ ItemUseBall:
; Add the caught Pokémon to the Pokédex. ; Add the caught Pokémon to the Pokédex.
predef IndexToPokedex predef IndexToPokedex
ld a, [wd11e] ld a, [wd11e]
and a ; is it missingno?
jr z, .skipShowingPokedexData ; don't mark in pokedex if so
dec a dec a
ld c, a ld c, a
ld b, FLAG_TEST ld b, FLAG_TEST

3
engine/pokemon/add_mon.asm
View file

@ -86,8 +86,6 @@ _AddPartyMon::
predef IndexToPokedex predef IndexToPokedex
pop de pop de
ld a, [wd11e] ld a, [wd11e]
and a
jr z, .noMarkSeen ; if it's missingno don't do any pokedex actions
dec a dec a
ld c, a ld c, a
ld b, FLAG_TEST ld b, FLAG_TEST
@ -104,7 +102,6 @@ _AddPartyMon::
pop bc pop bc
ld hl, wPokedexSeen ld hl, wPokedexSeen
call FlagAction call FlagAction
.noMarkSeen
pop hl pop hl
push hl push hl

6
gfx/pics.asm
View file

@ -544,10 +544,8 @@ WugtrioPicFront:: INCBIN "gfx/pokemon/front/wugtrio.pic"
WugtrioPicBack:: INCBIN "gfx/pokemon/back/wugtriob.pic" WugtrioPicBack:: INCBIN "gfx/pokemon/back/wugtriob.pic"
ToedscoolPicFront:: INCBIN "gfx/pokemon/front/toedscool.pic" ToedscoolPicFront:: INCBIN "gfx/pokemon/front/toedscool.pic"
ToedscoolPicBack:: INCBIN "gfx/pokemon/back/toedscoolb.pic" ToedscoolPicBack:: INCBIN "gfx/pokemon/back/toedscoolb.pic"
ToedscruelPicFront:: INCBIN "gfx/pokemon/front/toedscruel.pic" ToedscruelPicFront:: INCBIN "gfx/pokemon/front/toedscruel.pic"
ToedscruelPicBack:: INCBIN "gfx/pokemon/back/toedscruelb.pic" ToedscruelPicBack:: INCBIN "gfx/pokemon/back/toedscruelb.pic"
MissingNoPicFront:: INCBIN "gfx/pokemon/front/missingno.pic"
MissingNoPicBack:: INCBIN "gfx/pokemon/back/missingnob.pic"
SECTION "Pics 10", ROMX ; Extra Trainer Bank, currently storing regionals here too SECTION "Pics 10", ROMX ; Extra Trainer Bank, currently storing regionals here too

9
home/pokemon.asm
View file

@ -100,6 +100,7 @@ LoadFrontSpriteByMonIndex::
ld [hl], b ld [hl], b
and a and a
pop hl pop hl
jr z, .invalidDexNumber ; dex #0 invalid
cp NUM_POKEMON + 1 cp NUM_POKEMON + 1
jr c, .validDexNumber ; dex numbers over normal limit invalid jr c, .validDexNumber ; dex numbers over normal limit invalid
.invalidDexNumber .invalidDexNumber
@ -378,8 +379,6 @@ GetMonHeader::
jr z, .specialID jr z, .specialID
predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number
ld a, [wd11e] ld a, [wd11e]
and a
jr z, .missingno ; index of 0 is missingno
dec a dec a
ld bc, BASE_DATA_SIZE ld bc, BASE_DATA_SIZE
ld hl, BaseStats ld hl, BaseStats
@ -388,12 +387,6 @@ GetMonHeader::
ld bc, BASE_DATA_SIZE ld bc, BASE_DATA_SIZE
call CopyData call CopyData
jr .done jr .done
.missingno
ld hl, MissingnoBaseStats
ld bc, BASE_DATA_SIZE
ld de, wMonHeader
call CopyData
jr .done
.specialID .specialID
ld hl, wMonHSpriteDim ld hl, wMonHSpriteDim
ld [hl], b ; write sprite dimensions ld [hl], b ; write sprite dimensions

4
ram/wram.asm
View file

@ -1743,10 +1743,10 @@ SECTION "Main Data", WRAM0
wMainDataStart:: wMainDataStart::
wPokedexOwned:: flag_array NUM_POKEMON - 1 ; discount MissingNo wPokedexOwned:: flag_array NUM_POKEMON
wPokedexOwnedEnd:: wPokedexOwnedEnd::
wPokedexSeen:: flag_array NUM_POKEMON - 1 ; discount MissingNo wPokedexSeen:: flag_array NUM_POKEMON
wPokedexSeenEnd:: wPokedexSeenEnd::
ds 28 ;;;;;;; moved bag code lower down to make bigger bag space ds 28 ;;;;;;; moved bag code lower down to make bigger bag space

2
scripts/CeladonMansion3F.asm
View file

@ -29,7 +29,7 @@ DirectorText:
ld b, wPokedexOwnedEnd - wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned
call CountSetBits call CountSetBits
ld a, [wNumSetBits] ld a, [wNumSetBits]
cp NUM_POKEMON - 1 cp NUM_POKEMON
jr nc, .completed_dex jr nc, .completed_dex
ld hl, .GameDesignerText ld hl, .GameDesignerText
jr .done jr .done