Some bug fixes related to sprites and objects

astraldaughter · Oct 16, 2022 · 51f4e3a · 51f4e3a
1 parent c2b7ddb
commit 51f4e3a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
@@ -653,9 +653,8 @@ BattleAnimCmd_ResetObp0:
 	ret
 
 BattleAnimCmd_ClearObjs:
-; BUG: BattleAnimCmd only clears the first 6⅔ objects (see docs/bugs_and_glitches.md)
 	ld hl, wActiveAnimObjects
-	ld a, $a0
+	ld a, NUM_ANIM_OBJECTS * BATTLEANIMSTRUCT_LENGTH
 .loop
 	ld [hl], 0
 	inc hl

diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm
@@ -551,13 +551,12 @@ TryObjectEvent:
 	ld a, [hl]
 	and %00001111
 
-; BUG: TryObjectEvent arbitrary code execution (see docs/bugs_and_glitches.md)
 	push bc
 	ld de, 3
 	ld hl, ObjectEventTypeArray
 	call IsInArray
-	jr nc, .nope
 	pop bc
+	jr nc, .nope
 
 	inc hl
 	ld a, [hli]

diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm
@@ -346,8 +346,6 @@ AddSpriteGFX:
 	ret
 
 LoadSpriteGFX:
-; BUG: LoadSpriteGFX does not limit the capacity of UsedSprites (see docs/bugs_and_glitches.md)
-
 	ld hl, wUsedSprites
 	ld b, SPRITE_GFX_LIST_CAPACITY
 .loop
@@ -365,7 +363,9 @@ LoadSpriteGFX:
 	ret
 
 .LoadSprite:
+	push bc
 	call GetSprite
+	pop bc
 	ld a, l
 	ret