diff options
| author | Daniel Harding <33dannye@gmail.com> | 2018-07-15 21:45:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-15 21:45:22 -0500 |
| commit | c9da8510c88524c3c50e33f41ea1881594898d36 (patch) | |
| tree | bd01b71757307249064ca236fdc9c8eb94b19f3b | |
| parent | 929c65f805ba144e7e093b2c5b2f70b84176ba00 (diff) | |
| parent | eddcbba82fa07705b35f3958a4f729878f22ecc2 (diff) | |
Merge pull request #187 from Rangi42/master
Document MissingNo's base stats, and silence an rgbds warning
| -rw-r--r-- | constants/pokemon_constants.asm | 2 | ||||
| -rwxr-xr-x | data/pokedex_entries.asm | 2 | ||||
| -rwxr-xr-x | data/trainer_parties.asm | 8 | ||||
| -rwxr-xr-x | macros/asm_macros.asm | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 96d44ef5..c4189911 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -136,7 +136,7 @@ const_value = 1 const MISSINGNO_86 ; $86 const MISSINGNO_87 ; $87 const MUK ; $88 - const MISSINGNO_8A ; $8A + const MISSINGNO_89 ; $89 const KINGLER ; $8A const CLOYSTER ; $8B const MISSINGNO_8C ; $8C diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm index 3fb2d3c6..495a8e33 100755 --- a/data/pokedex_entries.asm +++ b/data/pokedex_entries.asm @@ -1256,4 +1256,4 @@ MissingNoDexEntry: db "???@" db 10 ; 1.0 m db 100 ; 10.0 kg - db 0,"コメント さくせいちゅう@" ; コメント作成中 (Comment to be written) + text "コメント さくせいちゅう@" ; コメント作成中 (Comment to be written) diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index da4f80c9..e448d431 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -258,6 +258,14 @@ BikerData: db 33,WEEZING,0 db 26,GRIMER,GRIMER,GRIMER,GRIMER,0 ; Route 17 + ; From https://www.smogon.com/smog/issue27/glitch: + ; 0E:5FC2 is offset of the ending 0 for this first Biker on Route 17. + ; BaseStats + (MonBaseStatsEnd - MonBaseStats) * (000 - 1) = $5FC2; + ; that's the formula from GetMonHeader for the base stats of mon #000. + ; (BaseStats = $43DE and BANK(BaseStats) = $0E.) + ; Finally, PokedexOrder lists 0 as the dex ID for every MissingNo. + ; The result is that this data gets interpreted as the base stats + ; for MissingNo: 0,33,MUK,0,29,VOLTORB,VOLTORB,0,...,28,GRIMER,GRIMER. db 28,WEEZING,KOFFING,WEEZING,0 db 33,MUK,0 db 29,VOLTORB,VOLTORB,0 diff --git a/macros/asm_macros.asm b/macros/asm_macros.asm index 28d2d95e..d3f00b0c 100755 --- a/macros/asm_macros.asm +++ b/macros/asm_macros.asm @@ -1,6 +1,6 @@ lb: MACRO ; r, hi, lo - ld \1, (\2) << 8 + ((\3) & $ff) + ld \1, ((\2) & $ff) << 8 + ((\3) & $ff) ENDM homecall: MACRO |