diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-25 10:26:30 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-25 10:26:30 -0500 |
| commit | 0c6f94effd1cb4278b0c0a2f02117055a69537e1 (patch) | |
| tree | f9d84ffeab661e6e97c2b16a2aa0d7ebceae1be4 /engine/scripting.asm | |
| parent | f599e477fc3306dbca9cad4aeadfe7a66b84c7bc (diff) | |
Final relabeling before merge
Diffstat (limited to 'engine/scripting.asm')
| -rw-r--r-- | engine/scripting.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index 945368e2b..c80343a4c 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -929,7 +929,7 @@ Script_winlosstext: ; 9714c Script_talkaftercancel: ; 97163 ; script command 0x66 - ld a, [wd04d] + ld a, [wRunningTrainerBattleScript] and a ret z jp Script_end @@ -940,7 +940,7 @@ Script_talkaftercheck: ; 9716b ld a, 1 ld [ScriptVar], a - ld a, [wd04d] + ld a, [wRunningTrainerBattleScript] and a ret nz xor a @@ -1485,7 +1485,7 @@ Script_battlecheck: ; 973fb ; script command 0x5b xor a - ld [wd459], a + ld [wBattleScriptFlags], a ret ; 97400 @@ -1493,7 +1493,7 @@ Script_loadtrainerdata: ; 97400 ; script command 0x5c ld a, (1 << 7) | 1 - ld [wd459], a + ld [wBattleScriptFlags], a ld a, [WalkingDirection] ld [OtherTrainerClass], a ld a, [FacingDirection] @@ -1508,7 +1508,7 @@ Script_loadpokedata: ; 97412 ; level (DecimalParam) ld a, (1 << 7) - ld [wd459], a + ld [wBattleScriptFlags], a call GetScriptByte ld [TempWildMonSpecies], a call GetScriptByte @@ -1523,7 +1523,7 @@ Script_loadtrainer: ; 97424 ; trainer_id (TrainerIdParam) ld a, (1 << 7) | 1 - ld [wd459], a + ld [wBattleScriptFlags], a call GetScriptByte ld [OtherTrainerClass], a call GetScriptByte @@ -1557,7 +1557,7 @@ Script_catchtutorial: ; 97447 Script_returnafterbattle: ; 97459 ; script command 0x60 - ld hl, wd459 + ld hl, wBattleScriptFlags ld d, [hl] ld [hl], $0 ld a, [wBattleResult] @@ -1589,7 +1589,7 @@ Script_reloadmap: ; 97491 ; script command 0x7b xor a - ld [wd459], a + ld [wBattleScriptFlags], a ld a, MAPSETUP_RELOADMAP ld [hMapEntryMethod], a ld a, $1 |