thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-10 23:40:59 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
constants/misc_constants.asm
View file

@ -164,6 +164,9 @@ HP_BAR_GREEN EQU 0
HP_BAR_YELLOW EQU 1 HP_BAR_YELLOW EQU 1
HP_BAR_RED EQU 2 HP_BAR_RED EQU 2
; D733 flags
BIT_TEST_BATTLE EQU 0
; serial ; serial
ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01 ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01

8
engine/battle/core.asm
View file

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

4
engine/battle/init_battle_variables.asm
View file

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

8
wram.asm
View file

@ -577,7 +577,12 @@ wPlayerSubstituteHP:: ; ccd7
wEnemySubstituteHP:: ; ccd8 wEnemySubstituteHP:: ; ccd8
ds 1 ds 1
wccd9:: ds 2 ; used in InitBattleVariablesLoop (written to after the loop is finished) wTestBattlePlayerSelectedMove:: ; ccd9
; The player's selected move during a test battle.
; InitBattleVariables sets it to the move Pound.
ds 1
ds 1
wMoveMenuType:: ; ccdb wMoveMenuType:: ; ccdb
; 0=regular, 1=mimic, 2=above message box (relearn, heal pp..) ; 0=regular, 1=mimic, 2=above message box (relearn, heal pp..)
@ -2951,6 +2956,7 @@ wd732:: ; d732
ds 1 ds 1
W_FLAGS_D733:: ; d733 W_FLAGS_D733:: ; d733
; bit 0: running a test battle
; bit 4: use variable [W_CURMAPSCRIPT] instead of the provided index for next frame's map script (used to start battle when talking to trainers) ; bit 4: use variable [W_CURMAPSCRIPT] instead of the provided index for next frame's map script (used to start battle when talking to trainers)
; bit 7: used fly out of battle ; bit 7: used fly out of battle
ds 1 ds 1