diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2026-01-07 22:05:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-07 22:05:20 -0500 |
| commit | fe1e76466b293c83e6cd3a7d4639fb3c49da26ad (patch) | |
| tree | aba22f9f595e09024b902c08ddfdac67ee0e85f3 /home/trainers.asm | |
| parent | Update RGBDS to 1.0.1 (although 1.0.0 still works) (diff) | |
| download | pokeyellow-fe1e76466b293c83e6cd3a7d4639fb3c49da26ad.tar.gz pokeyellow-fe1e76466b293c83e6cd3a7d4639fb3c49da26ad.tar.xz pokeyellow-fe1e76466b293c83e6cd3a7d4639fb3c49da26ad.zip | |
Use macros to enforce "missable/hide/show object" constraints, and rename them to "toggleable objects" (#557)
Diffstat (limited to 'home/trainers.asm')
| -rw-r--r-- | home/trainers.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/home/trainers.asm b/home/trainers.asm index 8d2cceaf..87bc7d69 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -202,13 +202,13 @@ EndTrainerBattle:: ld a, [wEnemyMonOrTrainerClass] cp OPP_ID_OFFSET jr nc, .skipRemoveSprite ; test if trainer was fought (in that case skip removing the corresponding sprite) - ld hl, wMissableObjectList + ld hl, wToggleableObjectList ld de, $2 ld a, [wSpriteIndex] call IsInArray ; search for sprite ID inc hl ld a, [hl] - ld [wMissableObjectIndex], a ; load corresponding missable object index and remove it + ld [wToggleableObjectIndex], a ; load corresponding toggleable object index and remove it predef HideObject .skipRemoveSprite ld hl, wStatusFlags5 |