thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Named a test battle variable

Browse source
This commit is contained in:
YamaArashi 2015-08-13 19:13:47 -07:00
parent 0750db0d72
commit f6d618090a
4 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engine/battle/core.asm
View file

@ -2634,7 +2634,7 @@ MoveSelectionMenu: ; 3d219 (f:5219)
cp LINK_STATE_BATTLING
jr z, .matchedkeyspicked
ld a, [W_FLAGS_D733]
bit 0, a
bit BIT_TEST_BATTLE, a
ld b, D_UP | D_DOWN | A_BUTTON | B_BUTTON | SELECT
jr z, .matchedkeyspicked
ld b, $ff
@ -2662,7 +2662,7 @@ SelectMenuItem: ; 3d2fe (f:52fe)
jr .select
.battleselect
ld a, [W_FLAGS_D733]
bit 0, a
bit BIT_TEST_BATTLE, a
jr nz, .select
call PrintMenuItem
ld a, [wMenuItemToSwap]
@ -6170,8 +6170,8 @@ GetCurrentMove: ; 3eabe (f:6abe)
.player
ld de, W_PLAYERMOVENUM
ld a, [W_FLAGS_D733]
bit 0, a
ld a, [wccd9]
bit BIT_TEST_BATTLE, a
ld a, [wTestBattlePlayerSelectedMove]
jr nz, .selected
ld a, [wPlayerSelectedMove]
.selected

4
engine/battle/init_battle_variables.asm
View file

@ -25,8 +25,8 @@ InitBattleVariables: ; 525af (14:65af)
ld [hli], a
dec b
jr nz, .loop
inc a
ld [wccd9], a
inc a ; POUND
ld [wTestBattlePlayerSelectedMove], a
ld a, [W_CURMAP]
cp SAFARI_ZONE_EAST
jr c, .notSafariBattle