From a9c6150a2bcf8e92577a0c528f18b0bf9b4dc4ec Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 2 Jul 2017 18:43:35 -0500 Subject: Cleanup references to wStageCollisionMap --- .../load_stage_data/load_blue_field.asm | 8 +-- .../load_stage_data/load_red_field.asm | 8 +-- .../blue_stage_resolve_collision.asm | 16 ++--- .../diglett_bonus_resolve_collision.asm | 74 +++++++++++----------- .../red_stage_resolve_collision.asm | 16 ++--- 5 files changed, 61 insertions(+), 61 deletions(-) (limited to 'engine') diff --git a/engine/pinball_game/load_stage_data/load_blue_field.asm b/engine/pinball_game/load_stage_data/load_blue_field.asm index 05a8457..2fc03a4 100755 --- a/engine/pinball_game/load_stage_data/load_blue_field.asm +++ b/engine/pinball_game/load_stage_data/load_blue_field.asm @@ -77,9 +77,9 @@ Func_1c235: ; 0x1c235 and a jr z, .asm_1c249 ld a, $54 - ld [wc7e3], a + ld [wStageCollisionMap + $e3], a ld a, $55 - ld [wc803], a + ld [wStageCollisionMap + $103], a ld a, $1 jr .asm_1c24a @@ -111,9 +111,9 @@ Func_1c235: ; 0x1c235 and a jr z, .asm_1c295 ld a, $52 - ld [wc7f0], a + ld [wStageCollisionMap + $f0], a ld a, $53 - ld [wc810], a + ld [wStageCollisionMap + $110], a ld a, [wd644] and a jr z, .asm_1c28a diff --git a/engine/pinball_game/load_stage_data/load_red_field.asm b/engine/pinball_game/load_stage_data/load_red_field.asm index 853a5ae..11c1106 100755 --- a/engine/pinball_game/load_stage_data/load_red_field.asm +++ b/engine/pinball_game/load_stage_data/load_red_field.asm @@ -115,9 +115,9 @@ Func_140f9: ; 0x140f9 jr z, .asm_1410c xor a ld a, $66 - ld [wc7e3], a + ld [wStageCollisionMap + $e3], a ld a, $67 - ld [wc803], a + ld [wStageCollisionMap + $103], a ld a, $2 .asm_1410c call Func_149d9 @@ -127,9 +127,9 @@ Func_140f9: ; 0x140f9 and a jr z, .asm_14127 ld a, $6a - ld [wc7f0], a + ld [wStageCollisionMap + $f0], a ld a, $6b - ld [wc810], a + ld [wStageCollisionMap+ $110], a ld a, $2 .asm_14127 add $3 diff --git a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm index a239cca..1aaf337 100755 --- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm @@ -3654,9 +3654,9 @@ ResolvePsyduckPoliwagCollision: ; 0x1dbd2 bit 0, a jr z, .asm_1dc06 ld a, $54 - ld [wc7e3], a + ld [wStageCollisionMap + $e3], a ld a, $55 - ld [wc803], a + ld [wStageCollisionMap + $103], a .asm_1dc06 ld a, $1 call Func_1de4b @@ -3692,9 +3692,9 @@ ResolvePsyduckPoliwagCollision: ; 0x1dbd2 bit 0, a jr z, .asm_1dc5c ld a, $52 - ld [wc7f0], a + ld [wStageCollisionMap + $f0], a ld a, $53 - ld [wc810], a + ld [wStageCollisionMap + $110], a .asm_1dc5c ld a, $3 call Func_1de4b @@ -3787,9 +3787,9 @@ Func_1dc95: ; 0x1dc95 bit 0, a jr z, .asm_1dd0c ld a, $5e - ld [wc7e3], a + ld [wStageCollisionMap + $e3], a ld a, $5f - ld [wc803], a + ld [wStageCollisionMap + $103], a .asm_1dd0c ld a, $0 ld [wd646], a @@ -3875,9 +3875,9 @@ Func_1dd2e: ; 0x1dd2e bit 0, a jr z, .asm_1dda9 ld a, $24 - ld [wc7f0], a + ld [wStageCollisionMap + $f0], a ld a, $25 - ld [wc810], a + ld [wStageCollisionMap + $110], a ld a, $0 ld [wd645], a .asm_1dda9 diff --git a/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm index 7abab10..6596d37 100755 --- a/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm @@ -15,13 +15,13 @@ Func_19b92: ; 0x19b92 ld [wStageCollisionState], a ld [wd73a], a xor a - ld [wc853], a - ld [wc873], a - ld [wc893], a + ld [wStageCollisionMap + $153], a + ld [wStageCollisionMap + $173], a + ld [wStageCollisionMap + $193], a ld a, $5 - ld [wc872], a + ld [wStageCollisionMap + $172], a ld a, $7 - ld [wc892], a + ld [wStageCollisionMap + $192], a call Func_19bbd ret @@ -420,97 +420,97 @@ Func_19df0: ; 0x19df0 ret Data_19e13: - dw wc7a1 + dw wStageCollisionMap + $a1 db $19, $19, $1A, $1B - dw wc7e1 + dw wStageCollisionMap + $e1 db $1C, $1C, $1D, $1E - dw wc821 + dw wStageCollisionMap + $121 db $1F, $1F, $20, $21 - dw wc7c3 + dw wStageCollisionMap + $c3 db $22, $22, $23, $24 - dw wc803 + dw wStageCollisionMap + $103 db $25, $25, $26, $27 - dw wc843 + dw wStageCollisionMap + $143 db $28, $28, $29, $2A - dw wc7a5 + dw wStageCollisionMap + $a5 db $2B, $2B, $2C, $2D - dw wc7e5 + dw wStageCollisionMap + $e5 db $2E, $2E, $2F, $30 - dw wc825 + dw wStageCollisionMap + $125 db $31, $31, $32, $33 - dw wc865 + dw wStageCollisionMap + $165 db $34, $34, $35, $36 - dw wc7c7 + dw wStageCollisionMap + $c7 db $37, $37, $38, $39 - dw wc807 + dw wStageCollisionMap + $107 db $3A, $3A, $3B, $3C - dw wc847 + dw wStageCollisionMap + $147 db $3D, $3D, $3E, $3F - dw wc887 + dw wStageCollisionMap + $187 db $40, $40, $41, $42 - dw wc7e9 + dw wStageCollisionMap + $e9 db $43, $43, $44, $45 - dw wc829 + dw wStageCollisionMap + $129 db $46, $46, $47, $48 - dw wc869 + dw wStageCollisionMap + $169 db $49, $49, $4A, $4B - dw wc7cb + dw wStageCollisionMap + $cb db $19, $19, $1A, $1B - dw wc80b + dw wStageCollisionMap + $10b db $1C, $1C, $1D, $1E - dw wc84b + dw wStageCollisionMap + $14b db $1F, $1F, $20, $21 - dw wc88b + dw wStageCollisionMap + $18b db $22, $22, $23, $24 - dw wc7ad + dw wStageCollisionMap + $ad db $25, $25, $26, $27 - dw wc7ed + dw wStageCollisionMap + $ed db $28, $28, $29, $2A - dw wc82d + dw wStageCollisionMap + $12d db $2B, $2B, $2C, $2D - dw wc86d + dw wStageCollisionMap + $16d db $2E, $2E, $2F, $30 - dw wc7cf + dw wStageCollisionMap + $cf db $31, $31, $32, $33 - dw wc80f + dw wStageCollisionMap + $10f db $34, $34, $35, $36 - dw wc84f + dw wStageCollisionMap + $14f db $37, $37, $38, $39 - dw wc7b1 + dw wStageCollisionMap + $b1 db $3A, $3A, $3B, $3C - dw wc7f1 + dw wStageCollisionMap + $f1 db $3D, $3D, $3E, $3F - dw wc831 + dw wStageCollisionMap + $131 db $40, $40, $41, $42 ; unused pointers? @@ -691,7 +691,7 @@ Func_1ab30: ; 0x1ab30 Func_1ac2c: ; 0x1ac2c ld hl, Data_1ac4a asm_1ac2f: - ld de, wc768 + ld de, wStageCollisionMap + $68 ld b, $3 .asm_1ac34 ld a, [hli] 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 b79baca..ba4f20a 100755 --- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm @@ -248,9 +248,9 @@ ResolveDiglettCollision: ; 0x147aa and a jr z, .asm_14807 ld a, $6a - ld [wc7f0], a + ld [wStageCollisionMap + $f0], a ld a, $6b - ld [wc810], a + ld [wStageCollisionMap + $110], a ld a, $5 call Func_149d9 ld a, [wRightMapMoveCounter] @@ -265,9 +265,9 @@ ResolveDiglettCollision: ; 0x147aa .asm_14807 ld a, $66 - ld [wc7e3], a + ld [wStageCollisionMap + $e3], a ld a, $67 - ld [wc803], a + ld [wStageCollisionMap + $103], a ld a, $2 call Func_149d9 ld a, [wLeftMapMoveCounter] @@ -295,9 +295,9 @@ ResolveDiglettCollision: ; 0x147aa call Func_149f5 .asm_1484d ld a, $64 - ld [wc7e3], a + ld [wStageCollisionMap + $e3], a ld a, $65 - ld [wc803], a + ld [wStageCollisionMap + $103], a .asm_14857 ld a, [wd4f1] and a @@ -313,9 +313,9 @@ ResolveDiglettCollision: ; 0x147aa call Func_149f5 .asm_14872 ld a, $68 - ld [wc7f0], a + ld [wStageCollisionMap + $f0], a ld a, $69 - ld [wc810], a + ld [wStageCollisionMap + $110], a .asm_1487c call Func_14990 ret -- cgit v1.2.3