Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename MON_ID to MON_OT_ID (#1114)

Browse Source 
* Rename MON_ID to MON_TRAINER_ID

The constant name MON_ID implies it relates to the ID number of the
Pokémon itself. However, it actually refers to the Trainer ID number of
the Pokémon's Original Trainer. Renaming it to MON_TRAINER_ID makes it
substantially more clear what its purpose is.

The original definition of MON_ID is preserved in macros/legacy.asm

* Remove MON_ID from macros/legacy.asm

Co-authored-by: Sylvie <35663410+Rangi42@users.noreply.github.com>

* Apply rename to missed file

* Rename to `MON_OT_ID`

---------

Co-authored-by: SnorlaxMonster <snorlaxmonster@users.noreply.github.com>
Co-authored-by: Sylvie <35663410+Rangi42@users.noreply.github.com>
Co-authored-by: vulcandth <vulcandth@gmail.com>
This commit is contained in:
SnorlaxMonster
2024-04-28 03:16:34 +10:00
committed by GitHub
parent b0b5ed2eb8
commit b9dce73573
10 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/pokemon/breeding.asm
View File

@@ -296,7 +296,7 @@ HatchEggs:
ld [hli], a
ld a, [de]
ld [hl], a
ld hl, MON_ID
ld hl, MON_OT_ID
add hl, bc
ld a, [wPlayerID]
ld [hli], a

6
engine/pokemon/search_owned.asm
View File

@@ -191,7 +191,7 @@ CheckOwnMon:
; wScriptVar should contain the species we're looking for
; outputs:
; sets carry if monster matches species, ID, and OT name.
; sets carry if monster matches species, Trainer ID, and OT name.
push bc
push hl
@@ -206,9 +206,9 @@ CheckOwnMon:
cp b
jr nz, .notfound
; check ID number
; check Trainer ID number
ld bc, MON_ID
ld bc, MON_OT_ID
add hl, bc
ld a, [wPlayerID]
cp [hl]