diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-18 15:37:40 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-18 15:37:40 -0400 |
| commit | bb97b63af1fbeca208cb30a41f8195b4408821dc (patch) | |
| tree | 106b0bab693daa5335445b01c43a8cd4c851d231 /engine/battle | |
| parent | More bank3 documentation (diff) | |
| download | pokeyellow-bb97b63af1fbeca208cb30a41f8195b4408821dc.tar.gz pokeyellow-bb97b63af1fbeca208cb30a41f8195b4408821dc.tar.xz pokeyellow-bb97b63af1fbeca208cb30a41f8195b4408821dc.zip | |
Complete documentation of bank3
Also: split out bcd predefs from yellow/main.asm, start removing traces
of W_
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/core.asm | 16 | ||||
| -rw-r--r-- | engine/battle/wild_encounters.asm | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 8a46c705..e5fd98f8 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2557,13 +2557,13 @@ MoveSelectionMenu: ; 3d219 (f:5219) .writemoves ld de, wMovesString - ld a, [hFlags_0xFFF6] + ld a, [hFlags_0xFFFA] set 2, a - ld [hFlags_0xFFF6], a + ld [hFlags_0xFFFA], a call PlaceString - ld a, [hFlags_0xFFF6] + ld a, [hFlags_0xFFFA] res 2, a - ld [hFlags_0xFFF6], a + ld [hFlags_0xFFFA], a ret .regularmenu @@ -2682,10 +2682,10 @@ SelectMenuItem: ; 3d2fe (f:52fe) call AddNTimes ld [hl], $ec .select - ld hl, hFlags_0xFFF6 + ld hl, hFlags_0xFFFA set 1, [hl] call HandleMenuInput - ld hl, hFlags_0xFFF6 + ld hl, hFlags_0xFFFA res 1, [hl] bit 6, a jp nz, CursorUp ; up @@ -4053,7 +4053,7 @@ CheckForDisobedience: ; 3dc88 (f:5c88) ; it was traded .monIsTraded ; what level might disobey? - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges bit 7, [hl] ld a, 101 jr nz, .next @@ -6660,7 +6660,7 @@ ApplyBadgeStatBoosts: ; 3ee19 (f:6e19) ld a, [wLinkState] cp LINK_STATE_BATTLING ret z ; return if link battle - ld a, [W_OBTAINEDBADGES] + ld a, [wObtainedBadges] ld b, a ld hl, wBattleMonAttack ld c, $4 diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm index 144234bb..908bd493 100644 --- a/engine/battle/wild_encounters.asm +++ b/engine/battle/wild_encounters.asm @@ -41,7 +41,7 @@ TryDoWildEncounter: ; 13870 (4:7870) ld a, [W_CURMAP] cp REDS_HOUSE_1F ; is this an indoor map? jr c, .CantEncounter2 - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] cp FOREST ; Viridian Forest/Safari Zone jr z, .CantEncounter2 ld a, [W_GRASSRATE] |