From 45f7c94e87e215645ac3f0bddc56e08b05838352 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Sat, 27 Apr 2024 12:14:25 -0500 Subject: [PATCH] Rename to `MON_OT_ID` --- constants/pokemon_data_constants.asm | 2 +- engine/battle/core.asm | 10 +++++----- engine/battle/effect_commands.asm | 2 +- engine/events/daycare.asm | 2 +- engine/events/halloffame.asm | 2 +- engine/events/lucky_number.asm | 2 +- engine/events/magikarp.asm | 2 +- engine/events/poke_seer.asm | 2 +- engine/pokemon/breeding.asm | 2 +- engine/pokemon/search_owned.asm | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index c295e133b1e..a31ad058ae3 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -77,7 +77,7 @@ rsreset DEF MON_SPECIES rb DEF MON_ITEM rb DEF MON_MOVES rb NUM_MOVES -DEF MON_TRAINER_ID rw +DEF MON_OT_ID rw DEF MON_EXP rb 3 DEF MON_STAT_EXP rw NUM_EXP_STATS rsset MON_STAT_EXP diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 36a2ac53ec9..77ed507fb9c 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3864,9 +3864,9 @@ InitBattleMon: ld a, MON_SPECIES call GetPartyParamLocation ld de, wBattleMonSpecies - ld bc, MON_TRAINER_ID + ld bc, MON_OT_ID call CopyBytes - ld bc, MON_DVS - MON_TRAINER_ID + ld bc, MON_DVS - MON_OT_ID add hl, bc ld de, wBattleMonDVs ld bc, MON_POKERUS - MON_DVS @@ -3950,9 +3950,9 @@ InitEnemyMon: ld hl, wOTPartyMon1Species call GetPartyLocation ld de, wEnemyMonSpecies - ld bc, MON_TRAINER_ID + ld bc, MON_OT_ID call CopyBytes - ld bc, MON_DVS - MON_TRAINER_ID + ld bc, MON_DVS - MON_OT_ID add hl, bc ld de, wEnemyMonDVs ld bc, MON_POKERUS - MON_DVS @@ -7074,7 +7074,7 @@ GiveExperiencePoints: call Divide ; Boost Experience for traded Pokemon pop bc - ld hl, MON_TRAINER_ID + ld hl, MON_OT_ID add hl, bc ld a, [wPlayerID] cp [hl] diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 506bac463b5..82398f7c06f 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -657,7 +657,7 @@ BattleCommand_CheckObedience: ; If the Pokémon's Trainer ID doesn't match the player's, ; some conditions need to be met. - ld a, MON_TRAINER_ID + ld a, MON_OT_ID call BattlePartyAttr ld a, [wPlayerID] diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index 5bb9ad6cb26..ec386185f4a 100644 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -491,7 +491,7 @@ DayCare_GiveEgg: call AddNTimes ld b, h ld c, l - ld hl, MON_TRAINER_ID + 1 + ld hl, MON_OT_ID + 1 add hl, bc push hl ld hl, MON_MAXHP diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 5f9c2eb6dbe..60070eeda28 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -172,7 +172,7 @@ GetHallOfFameParty: ld [de], a inc de - ld hl, MON_TRAINER_ID + ld hl, MON_OT_ID add hl, bc ld a, [hli] ld [de], a diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index fe879af96e0..46f073c2bdd 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -149,7 +149,7 @@ CheckForLuckyNumberWinners: .done pop hl push hl - ld de, MON_SPECIES - MON_TRAINER_ID + ld de, MON_SPECIES - MON_OT_ID add hl, de ld a, [hl] pop hl diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 1a3da71f71c..acd46c24f58 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -22,7 +22,7 @@ CheckMagikarpLength: ld d, h ld e, l pop hl - ld bc, MON_TRAINER_ID + ld bc, MON_OT_ID add hl, bc ld b, h ld c, l diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm index b0e2a5877e0..9e5e7a04e94 100644 --- a/engine/events/poke_seer.asm +++ b/engine/events/poke_seer.asm @@ -107,7 +107,7 @@ ReadCaughtData: ld a, SEERACTION_TRADED ld [wSeerAction], a - ld a, MON_TRAINER_ID + ld a, MON_OT_ID call GetPartyParamLocation ld a, [wPlayerID] cp [hl] diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index fb1514e8f26..73b04570bb0 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -296,7 +296,7 @@ HatchEggs: ld [hli], a ld a, [de] ld [hl], a - ld hl, MON_TRAINER_ID + ld hl, MON_OT_ID add hl, bc ld a, [wPlayerID] ld [hli], a diff --git a/engine/pokemon/search_owned.asm b/engine/pokemon/search_owned.asm index 6cb18966cbf..c4960a86e4b 100644 --- a/engine/pokemon/search_owned.asm +++ b/engine/pokemon/search_owned.asm @@ -208,7 +208,7 @@ CheckOwnMon: ; check Trainer ID number - ld bc, MON_TRAINER_ID + ld bc, MON_OT_ID add hl, bc ld a, [wPlayerID] cp [hl]