diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-25 22:39:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 22:39:51 -0500 |
| commit | 725148443f0ed0f70af747259ef49643359e92a2 (patch) | |
| tree | 5f8ccf80489e0820934d40a732a5ce8d7f65e1e3 /engine/search.asm | |
| parent | f44f306cfd4b438d0ba2f56b61be4b118ef3274b (diff) | |
| parent | 7453bd1aa8e55a1a9fcce7c69f62106f5e5f6e9c (diff) | |
Merge pull request #476 from Rangi42/master
Resolve some issues; rename some maps; move more tables into data/; warp_def → warp_event (ready to merge)
Diffstat (limited to 'engine/search.asm')
| -rwxr-xr-x | engine/search.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/search.asm b/engine/search.asm index 6c18f3e3d..57b489a37 100755 --- a/engine/search.asm +++ b/engine/search.asm @@ -1,4 +1,4 @@ -Special_BeastsCheck: ; 0x4a6e8 +BeastsCheck: ; 0x4a6e8 ; Check if the player owns all three legendary beasts. ; They must exist in either party or PC, and have the player's OT and ID. ; Return the result in wScriptVar. @@ -29,8 +29,8 @@ Special_BeastsCheck: ; 0x4a6e8 ret -Special_MonCheck: ; 0x4a711 -; Check if the player owns any monsters of the species in wScriptVar. +MonCheck: ; 0x4a711 +; Check if the player owns any Pokémon of the species in wScriptVar. ; Return the result in wScriptVar. call CheckOwnMonAnywhere @@ -219,7 +219,7 @@ CheckOwnMon: ; 0x4a7ba ld hl, wPlayerName -rept NAME_LENGTH_JAPANESE +- 2 ; should be PLAYER_NAME_LENGTH +- 2 +rept NAME_LENGTH_JAPANESE + -2 ; should be PLAYER_NAME_LENGTH + -2 ld a, [de] cp [hl] jr nz, .notfound |