diff options
| author | chaos-lord <dd4791.mariokarter@hotmail.co.uk> | 2017-07-20 16:16:01 +0100 |
|---|---|---|
| committer | chaos-lord <dd4791.mariokarter@hotmail.co.uk> | 2017-07-20 16:16:01 +0100 |
| commit | a210d9b588d9fe886615a8886153c040110e52d9 (patch) | |
| tree | ee653fe6116cdcea4740391244a7d8265002cad8 /main.asm | |
| parent | 3f32c4b57a09fcdc1e9b89911de5caa6efff42a1 (diff) | |
| parent | f56a2fc512cfd0ff348f255a913bdeab29476893 (diff) | |
Merge remote-tracking branch 'origin/master' into chaos_requests-tppfork
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -110,9 +110,9 @@ CheckSpecialModeColision: ; 0x10000 ld a, c ld [wSpecialModeCollisionID], a ld a, [wSpecialMode] - cp SPECIAL_MODE_CATCHEM ;branch based on mode + cp SPECIAL_MODE_EVOLUTION ;branch based on mode jp z, HandleEvoModeCollision ;call evo mode logic - cp SPECIAL_MODE_EVOLUTION + cp SPECIAL_MODE_MAP_MOVE jr nz, .CatchMode ;call catch mode logic callba HandleMapModeCollision ;call map move logic ret |