Skip to content

Commit

Permalink
Rename MON_ID to MON_OT_ID (pret/pokecrystal#1114)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
4 people committed Apr 27, 2024
1 parent 202797a commit 144133d
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion constants/pokemon_data_constants.asm
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ rsreset
DEF MON_SPECIES rb
DEF MON_ITEM rb
DEF MON_MOVES rb NUM_MOVES
DEF MON_ID rw
DEF MON_OT_ID rw
DEF MON_EXP rb 3
DEF MON_STAT_EXP rw NUM_EXP_STATS
rsset MON_STAT_EXP
Expand Down
10 changes: 5 additions & 5 deletions engine/battle/core.asm
Original file line number Diff line number Diff line change
Expand Up @@ -3633,9 +3633,9 @@ InitBattleMon:
ld a, MON_SPECIES
call GetPartyParamLocation
ld de, wBattleMonSpecies
ld bc, MON_ID
ld bc, MON_OT_ID
call CopyBytes
ld bc, MON_DVS - MON_ID
ld bc, MON_DVS - MON_OT_ID
add hl, bc
ld de, wBattleMonDVs
ld bc, MON_POKERUS - MON_DVS
Expand Down Expand Up @@ -3719,9 +3719,9 @@ InitEnemyMon:
ld hl, wOTPartyMon1Species
call GetPartyLocation
ld de, wEnemyMonSpecies
ld bc, MON_ID
ld bc, MON_OT_ID
call CopyBytes
ld bc, MON_DVS - MON_ID
ld bc, MON_DVS - MON_OT_ID
add hl, bc
ld de, wEnemyMonDVs
ld bc, MON_POKERUS - MON_DVS
Expand Down Expand Up @@ -6834,7 +6834,7 @@ GiveExperiencePoints:
call Divide
; Boost Experience for traded Pokemon
pop bc
ld hl, MON_ID
ld hl, MON_OT_ID
add hl, bc
ld a, [wPlayerID]
cp [hl]
Expand Down
2 changes: 1 addition & 1 deletion engine/battle/effect_commands.asm
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ BattleCommand_CheckObedience:

; If the monster's 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]
Expand Down
2 changes: 1 addition & 1 deletion engine/events/daycare.asm
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ DayCare_GiveEgg:
call AddNTimes
ld b, h
ld c, l
ld hl, MON_ID + 1
ld hl, MON_OT_ID + 1
add hl, bc
push hl
ld hl, MON_MAXHP
Expand Down
2 changes: 1 addition & 1 deletion engine/events/halloffame.asm
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ GetHallOfFameParty:
ld [de], a
inc de

ld hl, MON_ID
ld hl, MON_OT_ID
add hl, bc
ld a, [hli]
ld [de], a
Expand Down
2 changes: 1 addition & 1 deletion engine/events/lucky_number.asm
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ CheckForLuckyNumberWinners:
.done
pop hl
push hl
ld de, MON_SPECIES - MON_ID
ld de, MON_SPECIES - MON_OT_ID
add hl, de
ld a, [hl]
pop hl
Expand Down
4 changes: 2 additions & 2 deletions engine/events/magikarp.asm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CheckMagikarpLength:
cp MAGIKARP
jr nz, .not_magikarp

; Now let's compute its length based on its DVs and ID.
; Now let's compute its length based on its DVs and Trainer ID.
ld a, [wCurPartyMon]
ld hl, wPartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH
Expand All @@ -22,7 +22,7 @@ CheckMagikarpLength:
ld d, h
ld e, l
pop hl
ld bc, MON_ID
ld bc, MON_OT_ID
add hl, bc
ld b, h
ld c, l
Expand Down
2 changes: 1 addition & 1 deletion engine/pokemon/breeding.asm
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,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
Expand Down

0 comments on commit 144133d

Please sign in to comment.