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

4
engine/battle/effect_commands.asm
View File

@@ -655,9 +655,9 @@ BattleCommand_CheckObedience:
and a
ret nz
; If the monster's id doesn't match the player's,
; If the Pokémon's Trainer ID doesn't match the player's,
; some conditions need to be met.
ld a, MON_ID
ld a, MON_OT_ID
call BattlePartyAttr
ld a, [wPlayerID]