diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-07-22 15:40:18 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-07-22 15:40:18 -0700 |
| commit | 5d4c2f0304cf5a0784ac691f2355708414243471 (patch) | |
| tree | 0191449467264af46a5e6ffd4851750b6cd4cc66 | |
| parent | 87f5b3d0ac377c573ab40408bdca9bbd559d437d (diff) | |
Fix SPECIAL_COLLISION_STARYU_ALLEY_TRIGGER typo
| -rw-r--r-- | constants/special_collision_constants.asm | 2 | ||||
| -rw-r--r-- | engine/pinball_game/evolution_mode/evolution_mode_red_field.asm | 2 | ||||
| -rwxr-xr-x | engine/pinball_game/map_move.asm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/constants/special_collision_constants.asm b/constants/special_collision_constants.asm index 556f6a2..328fadd 100644 --- a/constants/special_collision_constants.asm +++ b/constants/special_collision_constants.asm @@ -1,7 +1,7 @@ SPECIAL_COLLISION_NOTHING EQU 0 SPECIAL_COLLISION_LEFT_TRIGGER EQU 1 SPECIAL_COLLISION_RIGHT_TRIGGER EQU 2 -SPECIAL_COLLISION_STARYU_ALLY_TRIGGER EQU 3 +SPECIAL_COLLISION_STARYU_ALLEY_TRIGGER EQU 3 SPECIAL_COLLISION_VOLTORB EQU 4 SPECIAL_COLLISION_SHELLDER EQU 4 SPECIAL_COLLISION_BELLSPROUT EQU 5 diff --git a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm index 219cb38..b42c4f8 100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm @@ -2,7 +2,7 @@ HandleRedEvoModeCollision: ; 0x20581 ld a, [wSpecialModeCollisionID]
cp SPECIAL_COLLISION_VOLTORB
jp z, Func_2080f ;voltorb
- cp SPECIAL_COLLISION_STARYU_ALLY_TRIGGER
+ cp SPECIAL_COLLISION_STARYU_ALLEY_TRIGGER
jp z, Func_20839
cp SPECIAL_COLLISION_BELLSPROUT
jp z, Func_2085a ;bellsprout
diff --git a/engine/pinball_game/map_move.asm b/engine/pinball_game/map_move.asm index 85494ff..27fcf1f 100755 --- a/engine/pinball_game/map_move.asm +++ b/engine/pinball_game/map_move.asm @@ -431,7 +431,7 @@ HandleRedMapModeCollision: ; 0x314ae jr z, .asm_314d0
cp SPECIAL_COLLISION_LEFT_TRIGGER
jp z, OpenRedMapMoveSlotFromLeft
- cp SPECIAL_COLLISION_STARYU_ALLY_TRIGGER
+ cp SPECIAL_COLLISION_STARYU_ALLEY_TRIGGER
jp z, OpenRedMapMoveSlotFromLeft
cp SPECIAL_COLLISION_RIGHT_TRIGGER
jp z, OpenRedMapMoveSlotFromRight
|