diff options
| author | yenatch <yenatch@gmail.com> | 2013-10-11 03:04:21 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-10-11 03:04:21 -0400 |
| commit | 0ead58cdaac5e231650ed39db38344e52051254f (patch) | |
| tree | 3e4ce4a22df7f57b2e2f234794fbe971d8d82135 | |
| parent | 946a213f09db39243c883ad677a22de738977836 (diff) | |
fix labels for and rename GetBattleVarPair to GetBattleVar
| -rw-r--r-- | battle/effect_commands.asm | 412 | ||||
| -rw-r--r-- | battle/effects/curse.asm | 2 | ||||
| -rw-r--r-- | battle/effects/endure.asm | 2 | ||||
| -rw-r--r-- | battle/effects/protect.asm | 4 | ||||
| -rw-r--r-- | battle/hidden_power.asm | 2 | ||||
| -rw-r--r-- | main.asm | 68 |
6 files changed, 245 insertions, 245 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 16d03b5e9..d0ce88404 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -46,7 +46,7 @@ DoTurn: ; 3401d DoMove: ; 3402c ; Get the user's move effect. ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar ld c, a ld b, 0 ld hl, MoveEffectsPointers @@ -124,7 +124,7 @@ BattleCommand01: ; 34084 ; Move $ff immediately ends the turn. ld a, BATTLE_VARS_MOVE - call CleanGetBattleVarPair + call GetBattleVar inc a jp z, Function0x34385 @@ -367,11 +367,11 @@ CheckPlayerTurn: CantMove: ; 341f0 ld a, BATTLE_VARS_SUBSTATUS1 - call GetBattleVarPair + call _GetBattleVar res 6, [hl] ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarPair + call _GetBattleVar ld a, [hl] and $ec ld [hl], a @@ -379,7 +379,7 @@ CantMove: ; 341f0 call ResetFuryCutterCount ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar cp FLY jr z, .asm_3420f @@ -569,7 +569,7 @@ CheckEnemyTurn: ; 3421f ; Flicker the monster pic unless flying or underground. ld de, $0115 ld a, BATTLE_VARS_SUBSTATUS3_OPP - call CleanGetBattleVarPair + call GetBattleVar and $60 call z, PlayFXAnimID @@ -658,11 +658,11 @@ MoveDisabled: ; 3438d ; Make sure any charged moves fail ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarPair + call _GetBattleVar res 4, [hl] ld a, BATTLE_VARS_MOVE - call CleanGetBattleVarPair + call GetBattleVar ld [$d265], a call GetMoveName @@ -693,7 +693,7 @@ HitConfusion: ; 343a5 ; Flicker the monster pic unless flying or underground. ld de, $0115 ld a, BATTLE_VARS_SUBSTATUS3_OPP - call CleanGetBattleVarPair + call GetBattleVar and $60 call z, PlayFXAnimID @@ -1026,7 +1026,7 @@ Function0x3450c: ; 3450c IgnoreSleepOnly: ; 3451f ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar cp SNORE jr z, .CheckSleep @@ -1037,7 +1037,7 @@ IgnoreSleepOnly: ; 3451f .CheckSleep ld a, BATTLE_VARS_STATUS - call CleanGetBattleVarPair + call GetBattleVar and 7 ret z @@ -1095,7 +1095,7 @@ BattleCommand04: ; 34555 ld [bc], a ld a, BATTLE_VARS_MOVE - call CleanGetBattleVarPair + call GetBattleVar cp STRUGGLE ret z @@ -1180,7 +1180,7 @@ BattleCommand04: ; 34555 call BattleCommandaa ; get move effect ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar ; continuous? ld hl, .continuousmoves ld de, 1 @@ -1222,7 +1222,7 @@ Function0x3460b: ; 3460b call UserPartyAttr ld a, BATTLE_VARS_MOVE - call CleanGetBattleVarPair + call GetBattleVar cp MIMIC jr z, .asm_3462f @@ -1250,7 +1250,7 @@ BattleCommand05: ; 34631 ld [CriticalHit], a ld a, BATTLE_VARS_MOVE_POWER - call CleanGetBattleVarPair + call GetBattleVar and a ret z @@ -1288,7 +1288,7 @@ BattleCommand05: ; 34631 .FocusEnergy ld a, BATTLE_VARS_SUBSTATUS4 - call CleanGetBattleVarPair + call GetBattleVar bit 2, a jr z, .CheckCritical @@ -1297,7 +1297,7 @@ BattleCommand05: ; 34631 .CheckCritical ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar ld de, 1 ld hl, .Criticals push bc @@ -1382,7 +1382,7 @@ BattleCommand4f: ; 346cd BattleCommand07: ; 346d2 ; stab ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar cp STRUGGLE ret z @@ -1410,7 +1410,7 @@ BattleCommand07: ; 346d2 .go ld a, BATTLE_VARS_MOVE_TYPE - call GetBattleVarPair + call _GetBattleVar ld [$d265], a push hl @@ -1457,7 +1457,7 @@ BattleCommand07: ; 346d2 .asm_3473a ld a, BATTLE_VARS_MOVE_TYPE - call CleanGetBattleVarPair + call GetBattleVar ld b, a ld hl, TypeMatchup @@ -1471,7 +1471,7 @@ BattleCommand07: ; 346d2 cp $fe jr nz, .asm_34757 ld a, BATTLE_VARS_SUBSTATUS1_OPP - call CleanGetBattleVarPair + call GetBattleVar bit 3, a jr nz, .end @@ -1579,7 +1579,7 @@ Function0x347d3: ; 347d3 push de push bc ld a, BATTLE_VARS_MOVE_TYPE - call CleanGetBattleVarPair + call GetBattleVar ld d, a ld b, [hl] inc hl @@ -1594,7 +1594,7 @@ Function0x347d3: ; 347d3 cp $fe jr nz, .asm_347fb ; 0x347ee $b ld a, BATTLE_VARS_SUBSTATUS1_OPP - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_IDENTIFIED, a jr nz, .asm_3482f ; 0x347f7 $36 jr .asm_347e7 ; 0x347f9 $ec @@ -2388,7 +2388,7 @@ BattleCommand09: ; 34d32 ; Perfect-accuracy moves ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_ALWAYS_HIT ret z @@ -2434,7 +2434,7 @@ BattleCommand09: ; 34d32 .Miss ; Keep the damage value intact if we're using (Hi) Jump Kick. ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_JUMP_KICK jr z, .Missed call ResetDamage @@ -2449,12 +2449,12 @@ BattleCommand09: ; 34d32 ; Return z if we're trying to eat the dream of ; a monster that isn't sleeping. ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_DREAM_EATER ret nz ld a, BATTLE_VARS_STATUS_OPP - call CleanGetBattleVarPair + call GetBattleVar and SLP ret @@ -2462,7 +2462,7 @@ BattleCommand09: ; 34d32 .Protect ; Return nz if the opponent is protected. ld a, BATTLE_VARS_SUBSTATUS1_OPP - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_PROTECT, a ret z @@ -2485,18 +2485,18 @@ BattleCommand09: ; 34d32 ; Return nz if we are locked-on and aren't trying to use Earthquake, ; Fissure or Magnitude on a monster that is flying. ld a, BATTLE_VARS_SUBSTATUS5_OPP - call GetBattleVarPair + call _GetBattleVar bit SUBSTATUS_LOCK_ON, [hl] res SUBSTATUS_LOCK_ON, [hl] ret z ld a, BATTLE_VARS_SUBSTATUS3_OPP - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_FLYING, a jr z, .LockedOn ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar cp EARTHQUAKE ret z @@ -2517,7 +2517,7 @@ BattleCommand09: ; 34d32 jr z, .asm_34e00 ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_LEECH_HIT ret z @@ -2535,7 +2535,7 @@ BattleCommand09: ; 34d32 ; Return z if the current move can hit the opponent. ld a, BATTLE_VARS_SUBSTATUS3_OPP - call CleanGetBattleVarPair + call GetBattleVar and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND ret z @@ -2543,7 +2543,7 @@ BattleCommand09: ; 34d32 jr z, .DigMoves ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar cp GUST ret z @@ -2556,7 +2556,7 @@ BattleCommand09: ; 34d32 .DigMoves ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar cp EARTHQUAKE ret z @@ -2569,7 +2569,7 @@ BattleCommand09: ; 34d32 .ThunderRain ; Return z if the current move always hits in rain, and it is raining. ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_THUNDER ret nz @@ -2581,7 +2581,7 @@ BattleCommand09: ; 34d32 .UnleashedEnergy ; Return nz if unleashing energy from Bide. ld a, BATTLE_VARS_SUBSTATUS4 - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_UNLEASH, a ret @@ -2610,7 +2610,7 @@ BattleCommand09: ; 34d32 jr c, .asm_34e6b ld a, BATTLE_VARS_SUBSTATUS1_OPP - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_IDENTIFIED, a ret nz @@ -2717,17 +2717,17 @@ BattleCommand90: ; 34ecc BattleCommand0a: ; 34eee ld a, BATTLE_VARS_SUBSTATUS4 - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_SUBSTITUTE, a ret z ld a, BATTLE_VARS_SUBSTATUS3 - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_CHARGED, a jr nz, .asm_34f18 ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_RAZOR_WIND jr z, .asm_34f21 cp EFFECT_SKY_ATTACK @@ -2764,7 +2764,7 @@ BattleCommand0a: ; 34eee .Rampage ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_ROLLOUT jr z, .asm_34f4d cp EFFECT_RAMPAGE @@ -2807,7 +2807,7 @@ BattleCommand0b: ; 34f60 .asm_34f76 ld [$cfca], a ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_MULTI_HIT jr z, .asm_34fb0 cp EFFECT_CONVERSION @@ -2824,13 +2824,13 @@ BattleCommand0b: ; 34f60 .asm_34f96 ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar ld e, a ld d, 0 call PlayFXAnimID ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar cp FLY jr z, .asm_34fad cp DIG @@ -2848,7 +2848,7 @@ BattleCommand0b: ; 34f60 cp $1 push af ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar ld e, a ld d, 0 pop af @@ -2889,7 +2889,7 @@ BattleCommand91_92: ; 34feb xor a ld [$c689], a ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar ld e, a ld d, 0 jp PlayFXAnimID @@ -2909,7 +2909,7 @@ BattleCommand93: ; 34ffd BattleCommand0c: ; 35004 ld a, BATTLE_VARS_SUBSTATUS4 - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_SUBSTITUTE, a ret z @@ -2934,7 +2934,7 @@ BattleCommand0d: ; 35023 call Function0x350e4 ld a, BATTLE_VARS_MOVE_ANIM - call GetBattleVarPair + call _GetBattleVar cp FLY jr z, .asm_3504f ; 35032 $1b @@ -2959,7 +2959,7 @@ BattleCommand0d: ; 35023 .asm_3504f ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarPair + call _GetBattleVar res SUBSTATUS_UNDERGROUND, [hl] res SUBSTATUS_FLYING, [hl] call Function0x37ece @@ -2971,7 +2971,7 @@ BattleCommand0e: ; 3505e ; checkfaint ld a, BATTLE_VARS_SUBSTATUS1_OPP - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_ENDURE, a jr z, .asm_35072 ; 35065 $b call BattleCommand4b @@ -3027,7 +3027,7 @@ BattleCommand0e: ; 3505e .asm_50bb ld a, BATTLE_VARS_SUBSTATUS4_OPP - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_SUBSTITUTE, a ret nz @@ -3065,7 +3065,7 @@ Function0x350e4: ; 350e4 and $7f jr z, .asm_35110 ; 0x350ef $1f ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_FUTURE_SIGHT ld hl, ButItFailedText ld de, ItFailedText @@ -3081,7 +3081,7 @@ Function0x350e4: ; 350e4 xor a ld [CriticalHit], a ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_JUMP_KICK ret nz ld a, [TypeModifier] @@ -3117,7 +3117,7 @@ Function0x350e4: ; 350e4 Function0x35157: ; 35157 ld a, BATTLE_VARS_SUBSTATUS1_OPP - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_PROTECT, a jr z, .asm_35162 ld h, d @@ -3192,7 +3192,7 @@ BattleCommandad: ; 351a5 ; supereffectivelooptext ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarPair + call _GetBattleVar bit 2, a ret nz @@ -3232,7 +3232,7 @@ BattleCommand11: ; 351c0 ret nz ld a, BATTLE_VARS_SUBSTATUS5_OPP - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_DESTINY_BOND, a jr z, .asm_35231 @@ -3285,7 +3285,7 @@ BattleCommand11: ; 351c0 .asm_35231 ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_MULTI_HIT jr z, .asm_3524a cp EFFECT_DOUBLE_HIT @@ -3315,7 +3315,7 @@ BattleCommand12: ; 35250 ret nz ld a, BATTLE_VARS_SUBSTATUS4_OPP - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_RAGE, a ret z @@ -4042,7 +4042,7 @@ BattleCommand62: ; 35612 ; Return 1 if successful, else 0. ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar ; Selfdestruct and Explosion halve defense. cp EFFECT_EXPLOSION @@ -4144,7 +4144,7 @@ BattleCommand62: ; 35612 ; Type ld b, a ld a, BATTLE_VARS_MOVE_TYPE - call CleanGetBattleVarPair + call GetBattleVar cp b jr nz, .DoneItem @@ -4303,14 +4303,14 @@ BattleCommand3f: ; 35726 .asm_35731 ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_LEVEL_DAMAGE ld b, [hl] ld a, 0 jr z, .asm_3578c ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_PSYWAVE jr z, .asm_35758 @@ -4321,7 +4321,7 @@ BattleCommand3f: ; 35726 jr z, .asm_35792 ld a, BATTLE_VARS_MOVE_POWER - call CleanGetBattleVarPair + call GetBattleVar ld b, a ld a, $0 jr .asm_3578c @@ -4464,7 +4464,7 @@ BattleCommand40: ; 35813 ld a, $1 ld [AttackMissed], a ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call CleanGetBattleVarPair + call GetBattleVar and a ret z ld b, a @@ -4483,7 +4483,7 @@ BattleCommand40: ; 35813 call Function0x36abf ret z ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call CleanGetBattleVarPair + call GetBattleVar dec a ld de, StringBuffer1 call GetMoveData @@ -4526,7 +4526,7 @@ BattleCommand41: ; 35864 ld de, PlayerEncoreCount .asm_35875 ld a, BATTLE_VARS_LAST_MOVE_OPP - call CleanGetBattleVarPair + call GetBattleVar and a jp z, Function0x35923 cp STRUGGLE @@ -4551,7 +4551,7 @@ BattleCommand41: ; 35864 and a jp nz, Function0x35923 ld a, BATTLE_VARS_SUBSTATUS5_OPP - call GetBattleVarPair + call _GetBattleVar bit 4, [hl] jp nz, Function0x35923 set 4, [hl] @@ -4743,7 +4743,7 @@ Function0x359cd: ; 359cd BattleCommand43: ; 359d0 ; snore ld a, BATTLE_VARS_STATUS - call CleanGetBattleVarPair + call GetBattleVar and SLP ret nz call ResetDamage @@ -4767,7 +4767,7 @@ BattleCommand44: ; 359e6 ld hl, EnemyMonType1 .asm_359f7 ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call CleanGetBattleVarPair + call GetBattleVar and a jr z, .asm_35a50 ; 359fd $51 push hl @@ -4795,7 +4795,7 @@ BattleCommand44: ; 359e6 ld [hld], a push hl ld a, BATTLE_VARS_MOVE_TYPE - call GetBattleVarPair + call _GetBattleVar push af push hl ld a, d @@ -4830,7 +4830,7 @@ BattleCommand45: ; 35a53 and a jr nz, .asm_35a6e ld a, BATTLE_VARS_SUBSTATUS5_OPP - call GetBattleVarPair + call _GetBattleVar set SUBSTATUS_LOCK_ON, [hl] call Function0x37e01 @@ -4856,7 +4856,7 @@ BattleCommand46: ; 35a74 call CheckSubstituteOpp jp nz, .asm_35b10 ld a, BATTLE_VARS_SUBSTATUS5_OPP - call GetBattleVarPair + call _GetBattleVar bit 3, [hl] jp nz, .asm_35b10 ld a, $2 @@ -4870,7 +4870,7 @@ BattleCommand46: ; 35a74 ld hl, EnemyMonMoves .asm_35aa5 ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call CleanGetBattleVarPair + call GetBattleVar ld [$d265], a ld b, a and a @@ -4955,12 +4955,12 @@ BattleCommand47: ; 35b16 call Function0x37e01 ld a, BATTLE_VARS_STATUS_OPP - call GetBattleVarPair + call _GetBattleVar call Defrost ; Sharply raise accuracy ld a, BATTLE_VARS_MOVE_EFFECT - call GetBattleVarPair + call _GetBattleVar ld a, [hl] push hl push af @@ -4994,7 +4994,7 @@ BattleCommand48: ; 35b33 ld d, a .asm_35b4f ld a, BATTLE_VARS_STATUS - call CleanGetBattleVarPair + call GetBattleVar and $7 jr z, .asm_35ba3 ; 35b56 $4b ld a, [hl] @@ -5016,7 +5016,7 @@ BattleCommand48: ; 35b33 jr z, .asm_35b62 ; 35b6f $f1 ld e, a ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar cp e jr z, .asm_35b62 ; 35b78 $e8 ld a, e @@ -5025,7 +5025,7 @@ BattleCommand48: ; 35b33 call .asm_35bdf jr z, .asm_35b62 ; 35b81 $df ld a, BATTLE_VARS_MOVE - call GetBattleVarPair + call _GetBattleVar ld a, e ld [hl], a call Function0x34548 @@ -5063,7 +5063,7 @@ BattleCommand48: ; 35b33 .asm_35bbe ld b, a ld a, $10 - call CleanGetBattleVarPair + call GetBattleVar ld c, a dec hl ld d, $4 @@ -5127,7 +5127,7 @@ BattleCommand49: ; 35bff ; destinybond ld a, BATTLE_VARS_SUBSTATUS5 - call GetBattleVarPair + call _GetBattleVar set 6, [hl] call Function0x37e01 ld hl, DestinyBondEffectText @@ -5149,7 +5149,7 @@ BattleCommand4a: ; 35c0f ld hl, BattleMonMoves .asm_35c24 ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call CleanGetBattleVarPair + call GetBattleVar and a jr z, .asm_35c91 ; 35c2a $65 cp $a5 @@ -5196,7 +5196,7 @@ BattleCommand4a: ; 35c0f add hl, bc ld e, a ld a, BATTLE_VARS_SUBSTATUS5_OPP - call CleanGetBattleVarPair + call GetBattleVar bit 3, a jr nz, .asm_35c82 ; 35c70 $10 ld a, [hBattleTurn] @@ -5270,7 +5270,7 @@ BattleCommand4c: ; 35cc9 ; healbell ld a, BATTLE_VARS_SUBSTATUS1 - call GetBattleVarPair + call _GetBattleVar res 0, [hl] ld de, PartyMon1Status ld a, [hBattleTurn] @@ -5279,7 +5279,7 @@ BattleCommand4c: ; 35cc9 ld de, OTPartyMon1Status .asm_35cdb ld a, BATTLE_VARS_STATUS - call GetBattleVarPair + call _GetBattleVar xor a ld [hl], a ld h, d @@ -5308,7 +5308,7 @@ FarPlayBattleAnimation: ; 35d00 ; battle animations disabled? ld a, BATTLE_VARS_SUBSTATUS3 - call CleanGetBattleVarPair + call GetBattleVar and $60 ; bit 6 | 5 ret nz @@ -5475,7 +5475,7 @@ Function0x35de0: ; 35de0 .asm_35dff ld a, BATTLE_VARS_SUBSTATUS4_OPP - call GetBattleVarPair + call _GetBattleVar res 4, [hl] ld hl, SubFadedText @@ -5484,13 +5484,13 @@ Function0x35de0: ; 35de0 call SwitchTurn call BattleCommanda7 ld a, BATTLE_VARS_SUBSTATUS3 - call CleanGetBattleVarPair + call GetBattleVar and $60 ; fly | dig call z, Function0x37ec7 call SwitchTurn ld a, BATTLE_VARS_MOVE_EFFECT - call GetBattleVarPair + call _GetBattleVar cp EFFECT_MULTI_HIT jr z, .asm_35e3a cp EFFECT_DOUBLE_HIT @@ -5514,12 +5514,12 @@ Function0x35de0: ; 35de0 UpdateMoveData: ; 35e40 ld a, BATTLE_VARS_MOVE_ANIM - call GetBattleVarPair + call _GetBattleVar ld d, h ld e, l ld a, BATTLE_VARS_MOVE - call CleanGetBattleVarPair + call GetBattleVar ld [$cf60], a ; not CurSpecies ld [$d265], a @@ -5545,7 +5545,7 @@ BattleCommand14: ; 35e5c .asm_35e70 ld a, BATTLE_VARS_STATUS_OPP - call GetBattleVarPair + call _GetBattleVar ld d, h ld e, l ld a, [de] @@ -5641,7 +5641,7 @@ BattleCommand13: ; 35eee call CheckSubstituteOpp ret nz ld a, BATTLE_VARS_STATUS_OPP - call GetBattleVarPair + call _GetBattleVar and a ret nz ld a, [TypeModifier] @@ -5683,7 +5683,7 @@ BattleCommand2f: ; 35f2c call Function0x35fe1 jp z, .asm_35fb8 ld a, BATTLE_VARS_STATUS_OPP - call CleanGetBattleVarPair + call GetBattleVar ld b, a ld hl, AlreadyPoisonedText and $8 @@ -5700,7 +5700,7 @@ BattleCommand2f: ; 35f2c .asm_35f5f ld hl, DidntAffect1Text ld a, BATTLE_VARS_STATUS_OPP - call CleanGetBattleVarPair + call GetBattleVar and a jr nz, .asm_35fb8 ; 35f68 $4e ld a, [hBattleTurn] @@ -5764,7 +5764,7 @@ Function0x35fc0: ; 35fc0 Function0x35fc9: ; 35fc9 ld a, BATTLE_VARS_SUBSTATUS5_OPP - call GetBattleVarPair + call _GetBattleVar ld a, [hBattleTurn] and a ld de, $c67c @@ -5772,7 +5772,7 @@ Function0x35fc9: ; 35fc9 ld de, $c674 .asm_35fd9 ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_TOXIC ret ; 35fe1 @@ -5797,7 +5797,7 @@ Function0x35fe1: ; 35fe1 Function0x35ff5: ; 35ff5 ld a, BATTLE_VARS_STATUS_OPP - call GetBattleVarPair + call _GetBattleVar set PSN, [hl] jp UpdateOpponentInParty ; 35fff @@ -5910,7 +5910,7 @@ BattleCommand17: ; 3608c call CheckSubstituteOpp ret nz ld a, BATTLE_VARS_STATUS_OPP - call GetBattleVarPair + call _GetBattleVar and a jp nz, Defrost ld a, [TypeModifier] @@ -5928,7 +5928,7 @@ BattleCommand17: ; 3608c call Function0x37962 ret nz ld a, BATTLE_VARS_STATUS_OPP - call GetBattleVarPair + call _GetBattleVar set 4, [hl] call UpdateOpponentInParty ld hl, $6c76 @@ -5982,7 +5982,7 @@ BattleCommand18: ; 36102 call CheckSubstituteOpp ret nz ld a, BATTLE_VARS_STATUS_OPP - call GetBattleVarPair + call _GetBattleVar and a ret nz ld a, [TypeModifier] @@ -6003,7 +6003,7 @@ BattleCommand18: ; 36102 call Function0x37962 ret nz ld a, BATTLE_VARS_STATUS_OPP - call GetBattleVarPair + call _GetBattleVar set 5, [hl] call UpdateOpponentInParty ld de, $0108 @@ -6038,7 +6038,7 @@ BattleCommand19: ; 36165 call CheckSubstituteOpp ret nz ld a, BATTLE_VARS_STATUS_OPP - call GetBattleVarPair + call _GetBattleVar and a ret nz ld a, [TypeModifier] @@ -6054,7 +6054,7 @@ BattleCommand19: ; 36165 call Function0x37962 ret nz ld a, BATTLE_VARS_STATUS_OPP - call GetBattleVarPair + call _GetBattleVar set 6, [hl] call UpdateOpponentInParty ld hl, $6c39 @@ -6247,7 +6247,7 @@ Function0x36281: ; 36281 ld hl, $7486 .asm_36292 ld a, $c - call CleanGetBattleVarPair + call GetBattleVar cp $6b ret nz ld a, $1 @@ -6371,7 +6371,7 @@ BattleCommand1d: ; 362e3 ; Attacking moves that also lower accuracy are unaffected. ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_ACCURACY_DOWN_HIT jr z, .DidntMiss @@ -6444,7 +6444,7 @@ BattleCommand1d: ; 362e3 Function0x36391: ; 36391 ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_ATTACK_DOWN jr c, .asm_363ae cp EFFECT_EVASION_DOWN + 1 @@ -6462,7 +6462,7 @@ Function0x36391: ; 36391 ret .asm_363b0 ld a, BATTLE_VARS_SUBSTATUS4_OPP - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_MIST, a ret ; 363b8 @@ -6808,7 +6808,7 @@ BattleCommandac: ; 3658f BattleCommandaf: ; 365a7 ; curl ld a, BATTLE_VARS_SUBSTATUS2 - call GetBattleVarPair + call _GetBattleVar set 0, [hl] ret ; 365af @@ -6956,7 +6956,7 @@ BattleCommand21: ; 36671 ; storeenergy ld a, BATTLE_VARS_SUBSTATUS3 - call CleanGetBattleVarPair + call GetBattleVar bit 0, a ret z ld hl, PlayerRolloutCount @@ -6968,14 +6968,14 @@ BattleCommand21: ; 36671 dec [hl] jr nz, .asm_366dc ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarPair + call _GetBattleVar res 0, [hl] ld hl, UnleashedEnergyText call StdBattleTextBox ld a, BATTLE_VARS_MOVE_POWER - call GetBattleVarPair + call _GetBattleVar ld a, 1 ld [hl], a ld hl, PlayerDamageTaken + 1 @@ -7009,7 +7009,7 @@ BattleCommand21: ; 36671 ld [de], a ld a, BATTLE_VARS_MOVE_ANIM - call GetBattleVarPair + call _GetBattleVar ld a, BIDE ld [hl], a @@ -7035,7 +7035,7 @@ BattleCommand22: ; 366e5 ld bc, EnemyRolloutCount .asm_366f6 ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarPair + call _GetBattleVar set 0, [hl] xor a ld [de], a @@ -7065,7 +7065,7 @@ BattleCommand3e: ; 3671a ld de, EnemyRolloutCount .asm_36725 ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarPair + call _GetBattleVar bit 1, [hl] ret z ld a, [de] @@ -7097,7 +7097,7 @@ BattleCommand3d: ; 36751 ; No rampage during Sleep Talk. ld a, BATTLE_VARS_STATUS - call CleanGetBattleVarPair + call GetBattleVar and 7 ret nz @@ -7108,7 +7108,7 @@ BattleCommand3d: ; 36751 ld de, EnemyRolloutCount .asm_36764 ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarPair + call _GetBattleVar set 1, [hl] call BattleRandom and $1 @@ -7134,7 +7134,7 @@ BattleCommanda0: ; 36778 jr z, .asm_367b9 ld a, BATTLE_VARS_SUBSTATUS5_OPP - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_CANT_RUN, a jr nz, .asm_367b9 ld a, [hBattleTurn] @@ -7478,12 +7478,12 @@ BattleCommand24: ; 369b6 .asm_369c7 ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarPair + call _GetBattleVar bit 2, [hl] jp nz, .asm_36a43 set 2, [hl] ld a, BATTLE_VARS_MOVE_EFFECT - call GetBattleVarPair + call _GetBattleVar ld a, [hl] cp EFFECT_TWINEEDLE jr z, .asm_36a3f @@ -7525,7 +7525,7 @@ BattleCommand24: ; 369b6 .asm_36a1e ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarPair + call _GetBattleVar res 2, [hl] call BattleCommanda8 jp EndMoveEffect @@ -7554,7 +7554,7 @@ BattleCommand24: ; 369b6 jr nz, .asm_36a6b ; 36a46 $23 .asm_36a48 ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarPair + call _GetBattleVar res 2, [hl] ld hl, PlayerHitTimesText @@ -7566,7 +7566,7 @@ BattleCommand24: ; 369b6 push bc ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_BEAT_UP jr z, .asm_36a67 call StdBattleTextBox @@ -7603,7 +7603,7 @@ BattleCommand94: ; 36a82 call CheckSubstituteOpp jr nz, .asm_36a9a ; 36a8a $e ld a, BATTLE_VARS_STATUS_OPP - call CleanGetBattleVarPair + call GetBattleVar and $27 jr nz, .asm_36a9a ; 36a93 $5 call Function0x36abf @@ -7619,7 +7619,7 @@ BattleCommand25: ; 36aa0 call CheckSubstituteOpp ret nz ld a, BATTLE_VARS_STATUS_OPP - call CleanGetBattleVarPair + call GetBattleVar and $27 ret nz call Function0x36abf @@ -7634,7 +7634,7 @@ BattleCommand25: ; 36aa0 Function0x36ab5: ; 36ab5 ld a, BATTLE_VARS_SUBSTATUS3_OPP - call GetBattleVarPair + call _GetBattleVar set 3, [hl] jp EndRechargeOpp ; 36abf @@ -7666,7 +7666,7 @@ BattleCommand4d: ; 36ac9 call CheckSubstituteOpp ret nz ld a, BATTLE_VARS_MOVE_EFFECT - call GetBattleVarPair + call _GetBattleVar ld d, h ld e, l call GetUserItem @@ -7675,7 +7675,7 @@ BattleCommand4d: ; 36ac9 ret nc call EndRechargeOpp ld a, BATTLE_VARS_SUBSTATUS3_OPP - call GetBattleVarPair + call _GetBattleVar set 3, [hl] ret ; 36af3 @@ -7733,7 +7733,7 @@ BattleCommand3a: ; 36b3a ; charged? ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarPair + call _GetBattleVar bit 4, [hl] ret z ; go to town @@ -7750,7 +7750,7 @@ BattleCommand39: ; 36b4d call BattleCommand38 ld a, BATTLE_VARS_STATUS - call CleanGetBattleVarPair + call GetBattleVar and $7 jr z, .asm_36b65 @@ -7761,7 +7761,7 @@ BattleCommand39: ; 36b4d .asm_36b65 ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarPair + call _GetBattleVar set 4, [hl] ld hl, IgnoredOrders2Text @@ -7776,7 +7776,7 @@ BattleCommand39: ; 36b4d ld [$c689], a call Function0x37e36 ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar cp $13 jr z, .asm_36b96 ; 36b8b $9 cp $5b @@ -7787,9 +7787,9 @@ BattleCommand39: ; 36b4d call Function0x37ec0 .asm_36b99 ld a, BATTLE_VARS_SUBSTATUS3 - call GetBattleVarPair + call _GetBattleVar ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar ld b, a cp $13 jr z, .asm_36bb0 ; 36ba6 $8 @@ -7805,10 +7805,10 @@ BattleCommand39: ; 36b4d call Function0x34548 jr nz, .asm_36bc3 ; 36bb5 $c ld a, BATTLE_VARS_LAST_COUNTER_MOVE - call GetBattleVarPair + call _GetBattleVar ld [hl], b ld a, BATTLE_VARS_LAST_MOVE - call GetBattleVarPair + call _GetBattleVar ld [hl], b .asm_36bc3 @@ -7818,7 +7818,7 @@ BattleCommand39: ; 36b4d call BattleTextBox ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_SKULL_BASH ld b, $fe ; endturn jp z, SkipToBattleCommand @@ -7830,7 +7830,7 @@ BattleCommand39: ; 36b4d start_asm ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar cp RAZOR_WIND ld hl, .RazorWind jr z, .asm_36c0d @@ -7914,7 +7914,7 @@ BattleCommand3b: ; 36c2d and a ret nz ld a, BATTLE_VARS_SUBSTATUS4_OPP - call CleanGetBattleVarPair + call GetBattleVar bit 4, a ret nz call BattleRandom @@ -7924,7 +7924,7 @@ BattleCommand3b: ; 36c2d inc a ld [hl], a ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar ld [de], a ld b, a ld hl, .Traps @@ -7956,7 +7956,7 @@ BattleCommand28: ; 36c7e ; mist ld a, BATTLE_VARS_SUBSTATUS4 - call GetBattleVarPair + call _GetBattleVar bit 1, [hl] jr nz, .asm_36c92 ; 36c85 $b set 1, [hl] @@ -7973,7 +7973,7 @@ BattleCommand29: ; 36c98 ; focusenergy ld a, BATTLE_VARS_SUBSTATUS4 - call GetBattleVarPair + call _GetBattleVar bit 2, [hl] jr nz, .asm_36cac ; 36c9f $b set 2, [hl] @@ -7996,7 +7996,7 @@ BattleCommand27: ; 36cb2 ld hl, EnemyMonMaxHPHi .asm_36cbd ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar ld d, a ld a, [CurDamage] ld b, a @@ -8067,7 +8067,7 @@ BattleCommand2b: ; 36d1d call CheckSubstituteOpp ret nz ld a, BATTLE_VARS_SUBSTATUS3_OPP - call GetBattleVarPair + call _GetBattleVar bit 7, [hl] ret nz jr Function0x36d70 @@ -8089,7 +8089,7 @@ BattleCommand2a: ; 36d3b .asm_36d53 ld a, BATTLE_VARS_SUBSTATUS3_OPP - call GetBattleVarPair + call _GetBattleVar bit 7, [hl] jr z, .asm_36d65 call Function0x37e77 @@ -8123,7 +8123,7 @@ Function0x36d70: ; 36d70 ld [bc], a ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_CONFUSE_HIT jr z, .asm_36d99 cp EFFECT_SNORE @@ -8152,7 +8152,7 @@ Function0x36d70: ; 36d70 Function0x36db6: ; 36db6 ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_CONFUSE_HIT ret z cp EFFECT_SNORE @@ -8167,7 +8167,7 @@ BattleCommand30: ; 36dc7 ; paralyze ld a, BATTLE_VARS_STATUS_OPP - call CleanGetBattleVarPair + call GetBattleVar bit 6, a jr nz, .asm_36e49 ; 36dce $79 ld a, [TypeModifier] @@ -8201,7 +8201,7 @@ BattleCommand30: ; 36dc7 jr c, .asm_36e52 ; 36e0c $44 .asm_36e0e ld a, BATTLE_VARS_STATUS_OPP - call GetBattleVarPair + call _GetBattleVar and a jr nz, .asm_36e52 ; 36e14 $3c ld a, [AttackMissed] @@ -8215,7 +8215,7 @@ BattleCommand30: ; 36dc7 ld a, $1 ld [$ffd4], a ld a, BATTLE_VARS_STATUS_OPP - call GetBattleVarPair + call _GetBattleVar set 6, [hl] call UpdateOpponentInParty ld hl, $6c39 @@ -8250,7 +8250,7 @@ Function0x36e5b: ; 36e5b .ok ld a, BATTLE_VARS_MOVE_TYPE - call CleanGetBattleVarPair + call GetBattleVar cp NORMAL jr z, .normal @@ -8285,7 +8285,7 @@ BattleCommand31: ; 36e7c ld de, $c6e0 .asm_36e90 ld a, BATTLE_VARS_SUBSTATUS4 - call CleanGetBattleVarPair + call GetBattleVar bit 4, a jr nz, .asm_36ef4 ; 36e97 $5b ld a, [hli] @@ -8312,7 +8312,7 @@ BattleCommand31: ; 36e7c inc hl ld [hl], e ld a, BATTLE_VARS_SUBSTATUS4 - call GetBattleVarPair + call _GetBattleVar set 4, [hl] ld hl, $c730 ld de, $c72e @@ -8356,7 +8356,7 @@ BattleCommand31: ; 36e7c BattleCommand32: ; 36f0b ; rechargenextturn ld a, BATTLE_VARS_SUBSTATUS4 - call GetBattleVarPair + call _GetBattleVar set 5, [hl] ret ; 36f13 @@ -8365,7 +8365,7 @@ BattleCommand32: ; 36f0b EndRechargeOpp: ; 36f13 push hl ld a, BATTLE_VARS_SUBSTATUS4_OPP - call GetBattleVarPair + call _GetBattleVar res 5, [hl] pop hl ret @@ -8375,7 +8375,7 @@ EndRechargeOpp: ; 36f13 BattleCommand97: ; 36f1d ; rage ld a, BATTLE_VARS_SUBSTATUS4 - call GetBattleVarPair + call _GetBattleVar set 6, [hl] ret ; 36f25 @@ -8384,7 +8384,7 @@ BattleCommand97: ; 36f1d BattleCommand98: ; 36f25 ; doubleflyingdamage ld a, BATTLE_VARS_SUBSTATUS3_OPP - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_FLYING, a ret z jr DoubleDamage @@ -8394,7 +8394,7 @@ BattleCommand98: ; 36f25 BattleCommand99: ; 36f2f ; doubleundergrounddamage ld a, BATTLE_VARS_SUBSTATUS3_OPP - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_UNDERGROUND, a ret z @@ -8434,7 +8434,7 @@ BattleCommand33: ; 36f46 call CheckHiddenOpponent jr nz, .asm_36f9a ; 36f60 $38 ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call CleanGetBattleVarPair + call GetBattleVar and a jr z, .asm_36f9a ; 36f68 $30 cp $a5 @@ -8454,7 +8454,7 @@ BattleCommand33: ; 36f46 jr nz, .asm_36f79 ; 36f7c $fb inc hl ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call CleanGetBattleVarPair + call GetBattleVar ld [hl], a ld [$d265], a ld bc, $0006 @@ -8490,7 +8490,7 @@ BattleCommand35: ; 36f9d cp $16 jr z, .asm_36fd2 ; 36fbc $14 ld a, BATTLE_VARS_SUBSTATUS4_OPP - call GetBattleVarPair + call _GetBattleVar bit 7, [hl] jr nz, .asm_36fd8 ; 36fc5 $11 set 7, [hl] @@ -8534,7 +8534,7 @@ BattleCommand37: ; 36fed and a jr nz, .asm_37059 ; 37006 $51 ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call CleanGetBattleVarPair + call GetBattleVar and a jr z, .asm_37059 ; 3700e $49 cp $a5 @@ -8574,7 +8574,7 @@ BattleCommand37: ; 36fed inc hl .asm_37047 ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call CleanGetBattleVarPair + call GetBattleVar ld [hl], a ld [$d265], a call GetMoveName @@ -8757,7 +8757,7 @@ BattleCommand2c: ; 3713e ld hl, EnemyMonMaxHPHi .asm_3714f ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar ld b, a push hl push de @@ -8776,10 +8776,10 @@ BattleCommand2c: ; 3713e push af call BattleCommandaa ld a, BATTLE_VARS_SUBSTATUS5 - call GetBattleVarPair + call _GetBattleVar res 0, [hl] ld a, BATTLE_VARS_STATUS - call GetBattleVarPair + call _GetBattleVar ld a, [hl] and a ld [hl], $3 @@ -8830,7 +8830,7 @@ BattleCommand2d: ; 371cd call Function0x372d8 ld a, BATTLE_VARS_SUBSTATUS5_OPP - call GetBattleVarPair + call _GetBattleVar bit 3, [hl] jp nz, Function0x372d2 call CheckHiddenOpponent @@ -8841,7 +8841,7 @@ BattleCommand2d: ; 371cd ld a, $1 ld [$c689], a ld a, BATTLE_VARS_SUBSTATUS4 - call GetBattleVarPair + call _GetBattleVar bit 4, [hl] push af jr z, .asm_37200 ; 371f4 $a @@ -8851,7 +8851,7 @@ BattleCommand2d: ; 371cd call Function0x37e44 .asm_37200 ld a, BATTLE_VARS_SUBSTATUS5 - call GetBattleVarPair + call _GetBattleVar set 3, [hl] call Function0x372e7 ld hl, BattleMonSpecies @@ -8987,12 +8987,12 @@ Function0x372d2: ; 372d2 Function0x372d8: ; 372d8 ld a, BATTLE_VARS_LAST_COUNTER_MOVE - call GetBattleVarPair + call _GetBattleVar xor a ld [hl], a ld a, BATTLE_VARS_LAST_MOVE - call GetBattleVarPair + call _GetBattleVar xor a ld [hl], a ret @@ -9030,7 +9030,7 @@ BattleCommand2e: ; 372fc .asm_3730d ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar cp EFFECT_LIGHT_SCREEN jr nz, .Reflect @@ -9130,7 +9130,7 @@ PrintParalyze: ; 37372 CheckSubstituteOpp: ; 37378 ld a, BATTLE_VARS_SUBSTATUS4_OPP - call CleanGetBattleVarPair + call GetBattleVar bit 4, a ret ; 37380 @@ -9145,7 +9145,7 @@ BattleCommand1a: ; 37380 ld c, $3 call DelayFrames ld a, BATTLE_VARS_STATUS - call GetBattleVarPair + call _GetBattleVar xor a ld [hli], a inc hl @@ -9156,10 +9156,10 @@ BattleCommand1a: ; 37380 call BattleCommand0a call Function0x37e36 ld a, BATTLE_VARS_SUBSTATUS4 - call GetBattleVarPair + call _GetBattleVar res 7, [hl] ld a, BATTLE_VARS_SUBSTATUS5_OPP - call GetBattleVarPair + call _GetBattleVar res 6, [hl] call Function0x37ed5 ret nc @@ -9179,9 +9179,9 @@ BattleCommand1b: ; 373c9 call Function0x372d8 ld a, BATTLE_VARS_MOVE - call GetBattleVarPair + call _GetBattleVar ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call CleanGetBattleVarPair + call GetBattleVar and a jr z, .asm_373de ; 373d7 $5 call CheckUserMove @@ -9197,7 +9197,7 @@ BattleCommand1b: ; 373c9 ld [$d265], a push af ld a, BATTLE_VARS_MOVE_ANIM - call GetBattleVarPair + call _GetBattleVar ld d, h ld e, l pop af @@ -9256,7 +9256,7 @@ BattleCommand34: ; 37418 ld a, BATTLE_VARS_MOVE - call GetBattleVarPair + call _GetBattleVar ld [hl], b call UpdateMoveData jp ResetTurn @@ -9452,7 +9452,7 @@ BattleCommand51: ; 37517 ; Don't trap if the opponent is already trapped. ld a, BATTLE_VARS_SUBSTATUS5 - call GetBattleVarPair + call _GetBattleVar bit SUBSTATUS_CANT_RUN, [hl] jr nz, .failed @@ -9485,14 +9485,14 @@ BattleCommand52: ; 37536 ; Only works on a sleeping opponent. ld a, BATTLE_VARS_STATUS_OPP - call GetBattleVarPair + call _GetBattleVar and SLP jr z, .failed ; Bail if the opponent is already having a nightmare. ld a, BATTLE_VARS_SUBSTATUS1_OPP - call GetBattleVarPair + call _GetBattleVar bit SUBSTATUS_NIGHTMARE, [hl] jr nz, .failed @@ -9515,7 +9515,7 @@ BattleCommand53: ; 37563 ; Thaw the user. ld a, BATTLE_VARS_STATUS - call GetBattleVarPair + call _GetBattleVar bit FRZ, [hl] ret z res FRZ, [hl] @@ -9560,7 +9560,7 @@ BattleCommand57: ; 376a0 call CheckHiddenOpponent jr nz, .asm_376bf ld a, BATTLE_VARS_SUBSTATUS1_OPP - call GetBattleVarPair + call _GetBattleVar bit SUBSTATUS_IDENTIFIED, [hl] jr nz, .asm_376bf set SUBSTATUS_IDENTIFIED, [hl] @@ -9635,7 +9635,7 @@ BattleCommand5b: ; 37718 ld de, EnemyRolloutCount .asm_37723 ld a, BATTLE_VARS_SUBSTATUS1 - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_ENCORED, a jr z, .asm_37731 @@ -9653,7 +9653,7 @@ BattleCommand5c: ; 37734 ; rolloutpower ld a, BATTLE_VARS_STATUS - call CleanGetBattleVarPair + call GetBattleVar and 7 ret nz @@ -9676,7 +9676,7 @@ BattleCommand5c: ; 37734 jr z, .hit ld a, BATTLE_VARS_SUBSTATUS1 - call GetBattleVarPair + call _GetBattleVar res 6, [hl] ret @@ -9687,18 +9687,18 @@ BattleCommand5c: ; 37734 cp $5 jr c, .asm_3776e ; 37763 $9 ld a, BATTLE_VARS_SUBSTATUS1 - call GetBattleVarPair + call _GetBattleVar res 6, [hl] jr .asm_37775 ; 3776c $7 .asm_3776e ld a, BATTLE_VARS_SUBSTATUS1 - call GetBattleVarPair + call _GetBattleVar set 6, [hl] .asm_37775 ld a, BATTLE_VARS_SUBSTATUS2 - call CleanGetBattleVarPair + call GetBattleVar bit 0, a jr z, .asm_3777f ; 3777c $1 inc b @@ -9795,7 +9795,7 @@ BattleCommand5f: ; 377ce call CheckHiddenOpponent jr nz, .asm_377f2 ld a, BATTLE_VARS_SUBSTATUS1_OPP - call GetBattleVarPair + call _GetBattleVar bit 7, [hl] jr nz, .asm_377f2 @@ -10266,11 +10266,11 @@ Function0x37aab: ; 37aab Function0x37ab1: ; 37ab1 ld a, BATTLE_VARS_STATUS - call CleanGetBattleVarPair + call GetBattleVar and 7 jr nz, .asm_37ac1 ld a, BATTLE_VARS_SUBSTATUS1 - call GetBattleVarPair + call _GetBattleVar res 0, [hl] .asm_37ac1 @@ -10281,11 +10281,11 @@ Function0x37ab1: ; 37ab1 res 7, [hl] ld hl, PlayerSubStatus5 ld a, BATTLE_VARS_SUBSTATUS5 - call GetBattleVarPair + call _GetBattleVar res 3, [hl] res 4, [hl] ld a, BATTLE_VARS_LAST_MOVE - call GetBattleVarPair + call _GetBattleVar ld [hl], 0 xor a ld [$c730], a @@ -10373,7 +10373,7 @@ BattleCommand69: ; 37b39 ; clearhazards ld a, BATTLE_VARS_SUBSTATUS4 - call GetBattleVarPair + call _GetBattleVar bit 7, [hl] jr z, .asm_37b4a ; 37b40 $8 res 7, [hl] @@ -10638,7 +10638,7 @@ BattleCommand9a: ; 37c95 ld a, $1 ld [AttackMissed], a ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call CleanGetBattleVarPair + call GetBattleVar and a ret z ld b, a @@ -10655,7 +10655,7 @@ BattleCommand9a: ; 37c95 call Function0x36abf ret z ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP - call CleanGetBattleVarPair + call GetBattleVar dec a ld de, StringBuffer1 call GetMoveData @@ -10754,13 +10754,13 @@ BattleCommand9c: ; 37d34 call Function0x34548 jr nz, .asm_37d4b ; 37d37 $12 ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar ld b, a ld a, BATTLE_VARS_LAST_COUNTER_MOVE - call GetBattleVarPair + call _GetBattleVar ld [hl], b ld a, BATTLE_VARS_LAST_MOVE - call GetBattleVarPair + call _GetBattleVar ld [hl], b .asm_37d4b ld hl, $c71d @@ -10808,7 +10808,7 @@ BattleCommand9f: ; 37d94 ; thunderaccuracy ld a, BATTLE_VARS_MOVE_TYPE - call GetBattleVarPair + call _GetBattleVar inc hl ld a, [Weather] cp WEATHER_RAIN @@ -10825,7 +10825,7 @@ BattleCommand9f: ; 37d94 CheckHiddenOpponent: ; 37daa ld a, BATTLE_VARS_SUBSTATUS3_OPP - call CleanGetBattleVarPair + call GetBattleVar and $60 ; fly | dig ret ; 37db2 @@ -10920,7 +10920,7 @@ Function0x37e19: ; 37e19 ld [FXAnimIDHi], a ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar and a ret z @@ -10945,7 +10945,7 @@ Function0x37e36: ; 37e36 ld [FXAnimIDHi], a ld a, BATTLE_VARS_MOVE_ANIM - call CleanGetBattleVarPair + call GetBattleVar and a ret z diff --git a/battle/effects/curse.asm b/battle/effects/curse.asm index 41ffc3a8d..9dc7f4b1d 100644 --- a/battle/effects/curse.asm +++ b/battle/effects/curse.asm @@ -66,7 +66,7 @@ BattleCommand54: ; 37588 jr nz, .failed ld a, BATTLE_VARS_SUBSTATUS1_OPP - call GetBattleVarPair + call _GetBattleVar bit 1, [hl] jr nz, .failed diff --git a/battle/effects/endure.asm b/battle/effects/endure.asm index 79f657a24..b2c622079 100644 --- a/battle/effects/endure.asm +++ b/battle/effects/endure.asm @@ -7,7 +7,7 @@ BattleCommand5a: ; 3766f ret c ld a, BATTLE_VARS_SUBSTATUS1 - call GetBattleVarPair + call _GetBattleVar set SUBSTATUS_ENDURE, [hl] call Function0x37e01 diff --git a/battle/effects/protect.asm b/battle/effects/protect.asm index 80edc0d85..45e9a75d4 100644 --- a/battle/effects/protect.asm +++ b/battle/effects/protect.asm @@ -4,7 +4,7 @@ BattleCommand55: ; 37618 ret c ld a, BATTLE_VARS_SUBSTATUS1 - call GetBattleVarPair + call _GetBattleVar set SUBSTATUS_PROTECT, [hl] call Function0x37e01 @@ -29,7 +29,7 @@ ProtectChance: ; 3762c ; Can't have a substitute. ld a, BATTLE_VARS_SUBSTATUS4 - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_SUBSTITUTE, a jr nz, .failed diff --git a/battle/hidden_power.asm b/battle/hidden_power.asm index 995acea2d..3dc40c946 100644 --- a/battle/hidden_power.asm +++ b/battle/hidden_power.asm @@ -94,7 +94,7 @@ GetHiddenPower: ; fbced .GotType push af ld a, BATTLE_VARS_MOVE_TYPE - call GetBattleVarPair + call _GetBattleVar pop af ld [hl], a @@ -2660,15 +2660,15 @@ UpdateBattleHuds: ; 39d4 ; 39e1 -CleanGetBattleVarPair: ; 39e1 +GetBattleVar: ; 39e1 ; Preserves hl. push hl - call GetBattleVarPair + call _GetBattleVar pop hl ret ; 39e7 -GetBattleVarPair: ; 39e7 +_GetBattleVar: ; 39e7 ; Get variable from pair a, depending on whose turn it is. ; There are 21 variable pairs. @@ -37192,11 +37192,11 @@ Function3c27c: ; 3c27c xor a ld [hl], a ld a, $2 - call GetBattleVarPair + call _GetBattleVar push af set 7, [hl] ld a, $c - call GetBattleVarPair + call _GetBattleVar push hl push af xor a @@ -37815,18 +37815,18 @@ Function3c6de: ; 3c6de Function3c6ed: ; 3c6ed ld a, $5 - call GetBattleVarPair + call _GetBattleVar res 2, [hl] res 5, [hl] ld a, $9 - call GetBattleVarPair + call _GetBattleVar res 6, [hl] ret ; 3c6fe Function3c6fe: ; 3c6fe ld a, $4 - call GetBattleVarPair + call _GetBattleVar res 6, [hl] ret ; 3c706 @@ -37851,7 +37851,7 @@ Function3c716: ; 3c716 call Function3c706 ret z ld a, $a - call CleanGetBattleVarPair + call GetBattleVar and $18 jr z, .asm_3c768 ld hl, $47e2 @@ -37877,7 +37877,7 @@ Function3c716: ; 3c716 .asm_3c74d ld a, $4 - call CleanGetBattleVarPair + call GetBattleVar bit 0, a jr z, .asm_3c765 call Function3cc76 @@ -37899,7 +37899,7 @@ Function3c716: ; 3c716 call Function3c706 jp z, $47f7 ld a, $3 - call GetBattleVarPair + call _GetBattleVar bit 7, [hl] jr z, .asm_3c7a1 call Function3c8e4 @@ -37907,7 +37907,7 @@ Function3c716: ; 3c716 ld [$cfca], a ld de, $0107 ld a, $7 - call CleanGetBattleVarPair + call GetBattleVar and $60 call z, Function3ee0f call Function3c8e4 @@ -37923,7 +37923,7 @@ Function3c716: ; 3c716 call Function3c706 jr z, .asm_3c7f7 ld a, $0 - call GetBattleVarPair + call _GetBattleVar bit 0, [hl] jr z, .asm_3c7c5 xor a @@ -37939,7 +37939,7 @@ Function3c716: ; 3c716 call Function3c706 jr z, .asm_3c7f7 ld a, $0 - call GetBattleVarPair + call _GetBattleVar bit 1, [hl] jr z, .asm_3c7e9 xor a @@ -37992,7 +37992,7 @@ Function3c801: ; 3c801 .asm_3c827 ld a, $0 - call CleanGetBattleVarPair + call GetBattleVar bit 4, a ret z dec [hl] @@ -38004,7 +38004,7 @@ Function3c801: ; 3c801 pop af ret nz ld a, $0 - call GetBattleVarPair + call _GetBattleVar res 4, [hl] ld a, [hBattleTurn] and a @@ -38064,7 +38064,7 @@ Function3c874: ; 3c874 and a ret z ld a, $3 - call CleanGetBattleVarPair + call GetBattleVar bit 4, a ret nz ld a, [de] @@ -38074,7 +38074,7 @@ Function3c874: ; 3c874 dec [hl] jr z, .asm_3c8de ld a, $2 - call CleanGetBattleVarPair + call GetBattleVar and $60 jr nz, .asm_3c8d3 call Function3c8e4 @@ -38320,7 +38320,7 @@ Function3ca26: ; 3ca26 ld hl, $48b6 call StdBattleTextBox ld a, $10 - call GetBattleVarPair + call _GetBattleVar push af ld a, $f8 ld [hl], a @@ -38335,7 +38335,7 @@ Function3ca26: ; 3ca26 ld [CurDamage], a ld [$d257], a ld a, $10 - call GetBattleVarPair + call _GetBattleVar pop af ld [hl], a call UpdateBattleMonInParty @@ -38539,7 +38539,7 @@ HandleWeather: ; 3cb9e .asm_3cbd0 ld a, BATTLE_VARS_SUBSTATUS3 - call CleanGetBattleVarPair + call GetBattleVar bit SUBSTATUS_UNDERGROUND, a ret nz @@ -41087,7 +41087,7 @@ Function3dc5a: ; 3dc5a Function3dc5b: ; 3dc5b ld a, $10 - call CleanGetBattleVarPair + call GetBattleVar ld b, a call Function3c5ec ld a, b @@ -41107,7 +41107,7 @@ Function3dc5b: ; 3dc5b ld a, $d rst FarCall ld a, $10 - call GetBattleVarPair + call _GetBattleVar ld a, $ff ld [hl], a pop af @@ -41323,7 +41323,7 @@ Function3dde9: ; 3dde9 dec hl ld b, [hl] ld a, $b - call GetBattleVarPair + call _GetBattleVar and b ret z xor a @@ -41332,18 +41332,18 @@ Function3dde9: ; 3dde9 call UpdateOpponentInParty pop bc ld a, $9 - call GetBattleVarPair + call _GetBattleVar and [hl] res 0, [hl] ld a, $5 - call GetBattleVarPair + call _GetBattleVar and [hl] res 0, [hl] ld a, b cp $7f jr nz, .asm_3de26 ld a, $7 - call GetBattleVarPair + call _GetBattleVar res 7, [hl] .asm_3de26 @@ -41378,7 +41378,7 @@ Function3dde9: ; 3dde9 Function3de51: ; 3de51 ld a, $7 - call CleanGetBattleVarPair + call GetBattleVar bit 7, a ret z callab GetOpponentItem @@ -41392,7 +41392,7 @@ Function3de51: ; 3de51 ld a, [hl] ld [$d265], a ld a, $7 - call GetBattleVarPair + call _GetBattleVar res 7, [hl] call GetItemName call Function3ddc8 @@ -44057,7 +44057,7 @@ _BattleRandom: ; 3edd8 Function3ee0f: ; 3ee0f ld a, BATTLE_VARS_SUBSTATUS3 - call CleanGetBattleVarPair + call GetBattleVar and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND ret nz ; 3ee17 @@ -72689,7 +72689,7 @@ DoWeatherModifiers: ; fbda4 ld de, .WeatherMoveModifiers ld a, BATTLE_VARS_MOVE_EFFECT - call CleanGetBattleVarPair + call GetBattleVar ld c, a .CheckWeatherMove @@ -77584,17 +77584,17 @@ UsedMoveText: ; 105db9 .start ; get address for last move ld a, $13 ; last move - call GetBattleVarPair + call _GetBattleVar ld d, h ld e, l ; get address for last counter move ld a, $11 - call GetBattleVarPair + call _GetBattleVar ; get move animation (id) ld a, $c ; move animation - call CleanGetBattleVarPair + call GetBattleVar ld [$d265], a ; check actor ???? |