summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorlibjet <libj3t@gmail.com>2021-01-21 14:37:20 +0000
committerhuderlem <huderlem@gmail.com>2021-01-21 12:17:13 -0600
commitd2fd9503da799885ba73357638e6ccbb8a3226a2 (patch)
treea579304a32a3c33362d15f60c8b0d5419a3e927d /engine
parent9f755164ec5990bba8daed72ef05c689edf61b77 (diff)
Update to RGBDS 0.4.2
Diffstat (limited to 'engine')
-rw-r--r--engine/pinball_game/draw_sprites/draw_red_field_sprites.asm2
-rw-r--r--engine/pinball_game/object_collision/red_stage_resolve_collision.asm2
-rw-r--r--engine/pokedex.asm10
3 files changed, 7 insertions, 7 deletions
diff --git a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
index d2c4674..6455eea 100644
--- a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
@@ -534,7 +534,7 @@ EvolutionTrinketOAMOffsets_RedFieldTop:
db $59, $7A
db $71, $7A
-EvolutionTrinketOAMOffsets_RedFieldBottom
+EvolutionTrinketOAMOffsets_RedFieldBottom:
; x, y offsets
db $3D, $13
db $5B, $13
diff --git a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
index 397be8c..84867d6 100644
--- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
@@ -1020,7 +1020,7 @@ ResolveBallUpgradeTriggersCollision_RedField: ; 0x1535d
call UpdatePinballUpgradeBlinkingAnimation_RedField
ret z
-LoadPinballUpgradeTriggersGraphics_RedField
+LoadPinballUpgradeTriggersGraphics_RedField:
; Loads the on or off graphics for each of the 3 pinball upgrade trigger dots, depending on their current toggle state.
ld a, [wStageCollisionState]
bit 0, a
diff --git a/engine/pokedex.asm b/engine/pokedex.asm
index 2bb3cfb..f3d95a9 100644
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -1896,10 +1896,10 @@ Func_28cd4: ; 0x28cd4
cp [hl]
ret z
ld [hl], a
- ld de, .Data_28ce0
- jr asm_28d1d
+ ld de, .data_28ce0
+ jr Func_28d1d
-.Data_28ce0: ; 0x28ce0
+.data_28ce0: ; 0x28ce0
db $0
db $1
db $2
@@ -1932,7 +1932,7 @@ Func_28cf8: ; 0x28cf8
ret z
ld [hl], a
ld de, .data_28d05
- jr asm_28d1d
+ jr Func_28d1d
.data_28d05
db $fe
@@ -1960,7 +1960,7 @@ Func_28cf8: ; 0x28cf8
db $fe
db $fe
-asm_28d1d
+Func_28d1d:
hlCoord 1, 3, vBGMap
ld b, $4
.asm_28d22