aboutsummaryrefslogtreecommitdiffstats
path: root/home
diff options
context:
space:
mode:
Diffstat (limited to 'home')
-rw-r--r--home/overworld.asm2
-rw-r--r--home/trainers.asm4
2 files changed, 3 insertions, 3 deletions
diff --git a/home/overworld.asm b/home/overworld.asm
index e994f694..58550167 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -2003,7 +2003,7 @@ LoadPlayerSpriteGraphicsCommon::
; function to load data from the map header
LoadMapHeader::
- farcall MarkTownVisitedAndLoadMissableObjects
+ farcall MarkTownVisitedAndLoadToggleableObjects
ld a, [wCurMapTileset]
ld [wUnusedCurMapTilesetCopy], a
ld a, [wCurMap]
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