aboutsummaryrefslogtreecommitdiffstats
path: root/engine/events/hidden_objects
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 15:58:06 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 15:58:06 -0400
commit76289dfda0b7405944e10a78b7381c723475bea4 (patch)
treeb3041f6324c7a5b6065a84d94af66ddb098dee2c /engine/events/hidden_objects
parentDefine constants for subanimations' base coords and frame block modes (diff)
downloadpokeyellow-76289dfda0b7405944e10a78b7381c723475bea4.tar.gz
pokeyellow-76289dfda0b7405944e10a78b7381c723475bea4.tar.xz
pokeyellow-76289dfda0b7405944e10a78b7381c723475bea4.zip
Port dbsprite macro for OAM y,x,tile,attr data from pokecrystal
Diffstat (limited to 'engine/events/hidden_objects')
-rw-r--r--engine/events/hidden_objects/cinnabar_gym_quiz.asm22
1 files changed, 14 insertions, 8 deletions
diff --git a/engine/events/hidden_objects/cinnabar_gym_quiz.asm b/engine/events/hidden_objects/cinnabar_gym_quiz.asm
index 2e4f48f3..e2ae7fbe 100644
--- a/engine/events/hidden_objects/cinnabar_gym_quiz.asm
+++ b/engine/events/hidden_objects/cinnabar_gym_quiz.asm
@@ -183,12 +183,18 @@ UpdateCinnabarGymGateTileBlocks_::
jr nz, .loop
ret
+gym_gate_coord: MACRO
+ db \1, \2, \3, 0
+ENDM
+
+HORIZONTAL_GATE_BLOCK EQU $54
+VERTICAL_GATE_BLOCK EQU $5f
+
CinnabarGymGateCoords:
- ; format: x-coord, y-coord, direction, padding
- ; direction: $54 = horizontal gate, $5f = vertical gate
- db $09,$03,$54,$00
- db $06,$03,$54,$00
- db $06,$06,$54,$00
- db $03,$08,$5f,$00
- db $02,$06,$54,$00
- db $02,$03,$54,$00
+ ; x coord, y coord, block id
+ gym_gate_coord 9, 3, HORIZONTAL_GATE_BLOCK
+ gym_gate_coord 6, 3, HORIZONTAL_GATE_BLOCK
+ gym_gate_coord 6, 6, HORIZONTAL_GATE_BLOCK
+ gym_gate_coord 3, 8, VERTICAL_GATE_BLOCK
+ gym_gate_coord 2, 6, HORIZONTAL_GATE_BLOCK
+ gym_gate_coord 2, 3, HORIZONTAL_GATE_BLOCK