diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/battle_transitions.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 4 | ||||
| -rwxr-xr-x | engine/battle/read_trainer_party.asm | 2 | ||||
| -rwxr-xr-x | engine/cable_club.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/npc_movement.asm | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 8f57777c..9a5f62b1 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -82,7 +82,7 @@ BattleTransitions: ; 709d2 (1c:49d2) GetBattleTransitionID_WildOrTrainer: ; 709e2 (1c:49e2) ld a, [W_CUROPPONENT] - cp $c8 + cp 200 jr nc, .trainer res 0, c ret diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 418447ba..feadcd82 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1214,7 +1214,7 @@ HandlePlayerBlackOut: ; 3c837 (f:4837) cp LINK_STATE_BATTLING jr z, .notSony1Battle ld a, [W_CUROPPONENT] - cp $c8 + SONY1 + cp OPP_SONY1 jr nz, .notSony1Battle coord hl, 0, 0 ; sony 1 battle lb bc, 8, 21 @@ -6861,7 +6861,7 @@ InitBattleCommon: ; 3ef3d (f:6f3d) res 1, [hl] callab InitBattleVariables ld a, [wEnemyMonSpecies2] - sub $c8 + sub 200 jp c, InitWildBattle ld [W_TRAINERCLASS], a call GetTrainerInformation diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index 0976c7c7..37a45476 100755 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -101,7 +101,7 @@ ReadTrainer: ; 39c53 (e:5c53) ; get trainer class number ld a,[W_CUROPPONENT] - sub $C8 + sub 200 ld b,a ld hl,TeamMoves diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 31eee481..503f3062 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -274,7 +274,7 @@ CableClub_DoBattleOrTradeAgain: ; 5345 jr nz, .asm_5506 ld a, LINK_STATE_BATTLING ld [wLinkState], a - ld a, SONY1 + $c8 + ld a, OPP_SONY1 ld [W_CUROPPONENT], a call ClearScreen call Delay3 diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index fa5ac222..098be875 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -286,7 +286,7 @@ FreezeEnemyTrainerSprite: ; 1a5e7 (6:65e7) jp SetSpriteMovementBytesToFF RivalIDs: ; 1a605 (6:6605) - db SONY1 + $c8 - db SONY2 + $c8 - db SONY3 + $c8 + db OPP_SONY1 + db OPP_SONY2 + db OPP_SONY3 db $ff |