diff options
| author | YamaArashi <shadow962@live.com> | 2015-02-07 02:43:08 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-02-07 02:43:08 -0800 |
| commit | 3fdb8a0d8995746d5605136ece384516338489b0 (patch) | |
| tree | 214030fb5b6ec943cdcb2ba84e622fba0ad3fb8f /engine/battle/4_2.asm | |
| parent | add constants for volatile statuses and more battle labels/commentary/constants (diff) | |
| download | pokeyellow-3fdb8a0d8995746d5605136ece384516338489b0.tar.gz pokeyellow-3fdb8a0d8995746d5605136ece384516338489b0.tar.xz pokeyellow-3fdb8a0d8995746d5605136ece384516338489b0.zip | |
serial/trade/misc
Diffstat (limited to 'engine/battle/4_2.asm')
| -rwxr-xr-x | engine/battle/4_2.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/battle/4_2.asm b/engine/battle/4_2.asm index 6ab5c004..a3ef1264 100755 --- a/engine/battle/4_2.asm +++ b/engine/battle/4_2.asm @@ -1,6 +1,6 @@ EndOfBattle: ; 137aa (4:77aa) - ld a, [W_ISLINKBATTLE] - cp $4 + ld a, [wLinkState] + cp LINK_STATE_BATTLING jr nz, .notLinkBattle ; link battle ld a, [wEnemyMonPartyPos] @@ -110,7 +110,7 @@ Func_13870: ; 13870 (4:7870) jr z, .lastRepelStep ld [wRepelRemainingSteps], a .asm_1389e -; determine if wild pokémon can appear in the half-block we’re standing +; determine if wild pokmon can appear in the half-block were standing ; is the bottom right tile (9,9) of the half-block are we standing a grass/water tile? hlCoord 9, 9 ld c, [hl] @@ -122,9 +122,9 @@ Func_13870: ; 13870 (4:7870) cp c ld a, [W_WATERRATE] jr z, .CanEncounter -; even if not in grass/water, standing anywhere we can encounter pokémon -; so long as the map is “indoor” and has wild pokémon defined. -; …as long as it’s not Viridian Forest or Safari Zone. +; even if not in grass/water, standing anywhere we can encounter pokmon +; so long as the map is indoor and has wild pokmon defined. +; as long as its not Viridian Forest or Safari Zone. ld a, [W_CURMAP] cp REDS_HOUSE_1F ; is this an indoor map? jr c, .CantEncounter @@ -148,7 +148,7 @@ Func_13870: ; 13870 (4:7870) inc hl jr .determineEncounterSlot .gotEncounterSlot -; determine which wild pokémon (grass or water) can appear in the half-block we’re standing +; determine which wild pokmon (grass or water) can appear in the half-block were standing ld c, [hl] ld hl, W_GRASSMONS aCoord 8, 9 @@ -314,7 +314,7 @@ HazeEffect_: ; 139da (4:79da) call Func_13a43 ld hl, wEnemyMonAttackMod call Func_13a43 - ld hl, wcd12 + ld hl, wPlayerMonUnmodifiedAttack ld de, wBattleMonAttack call Func_13a4a ld hl, wEnemyMonUnmodifiedAttack @@ -386,8 +386,8 @@ StatusChangesEliminatedText: ; 13a53 (4:7a53) db "@" GetTrainerName_: ; 13a58 (4:7a58) - ld hl, W_GRASSRATE - ld a, [W_ISLINKBATTLE] + ld hl, W_GRASSRATE + ld a, [wLinkState] and a jr nz, .rival ld hl, W_RIVALNAME ; wd34a |