thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

use the new battle type constants

Browse source
This commit is contained in:
YamaArashi 2015-08-29 23:35:58 -07:00
parent 38d771dc44
commit 30063216cd
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
engine/battle/core.asm
View file

@ -1584,7 +1584,7 @@ TryRunningFromBattle: ; 3cab9 (f:4ab9)
call IsGhostBattle call IsGhostBattle
jp z, .canEscape ; jump if it's a ghost battle jp z, .canEscape ; jump if it's a ghost battle
ld a, [W_BATTLETYPE] ld a, [W_BATTLETYPE]
cp $2 cp BATTLE_TYPE_SAFARI
jp z, .canEscape ; jump if it's a safari battle jp z, .canEscape ; jump if it's a safari battle
ld a, [wLinkState] ld a, [wLinkState]
cp LINK_STATE_BATTLING cp LINK_STATE_BATTLING
@ -2094,7 +2094,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3)
call SaveScreenTilesToBuffer1 call SaveScreenTilesToBuffer1
.nonstandardbattle .nonstandardbattle
ld a, [W_BATTLETYPE] ld a, [W_BATTLETYPE]
cp $2 ; safari cp BATTLE_TYPE_SAFARI
ld a, BATTLE_MENU_TEMPLATE ld a, BATTLE_MENU_TEMPLATE
jr nz, .menuselected jr nz, .menuselected
ld a, SAFARI_BATTLE_MENU_TEMPLATE ld a, SAFARI_BATTLE_MENU_TEMPLATE
@ -2144,7 +2144,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3)
jr .rightColumn jr .rightColumn
.leftColumn ; put cursor in left column of menu .leftColumn ; put cursor in left column of menu
ld a, [W_BATTLETYPE] ld a, [W_BATTLETYPE]
cp $2 cp BATTLE_TYPE_SAFARI
ld a, " " ld a, " "
jr z, .safariLeftColumn jr z, .safariLeftColumn
; put cursor in left column for normal battle menu (i.e. when it's not a Safari battle) ; put cursor in left column for normal battle menu (i.e. when it's not a Safari battle)
@ -2177,7 +2177,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3)
jr .AButtonPressed ; the A button was pressed jr .AButtonPressed ; the A button was pressed
.rightColumn ; put cursor in right column of menu .rightColumn ; put cursor in right column of menu
ld a, [W_BATTLETYPE] ld a, [W_BATTLETYPE]
cp $2 cp BATTLE_TYPE_SAFARI
ld a, " " ld a, " "
jr z, .safariRightColumn jr z, .safariRightColumn
; put cursor in right column for normal battle menu (i.e. when it's not a Safari battle) ; put cursor in right column for normal battle menu (i.e. when it's not a Safari battle)
@ -2214,7 +2214,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3)
.AButtonPressed .AButtonPressed
call PlaceUnfilledArrowMenuCursor call PlaceUnfilledArrowMenuCursor
ld a, [W_BATTLETYPE] ld a, [W_BATTLETYPE]
cp $2 ; is it a Safari battle? cp BATTLE_TYPE_SAFARI
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
ld [wBattleAndStartSavedMenuItem], a ld [wBattleAndStartSavedMenuItem], a
jr z, .handleMenuSelection jr z, .handleMenuSelection
@ -2236,7 +2236,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3)
jr nz, .upperLeftMenuItemWasNotSelected jr nz, .upperLeftMenuItemWasNotSelected
; the upper left menu item was selected ; the upper left menu item was selected
ld a, [W_BATTLETYPE] ld a, [W_BATTLETYPE]
cp $2 cp BATTLE_TYPE_SAFARI
jr z, .throwSafariBallWasSelected jr z, .throwSafariBallWasSelected
; the "FIGHT" menu was selected ; the "FIGHT" menu was selected
xor a xor a
@ -2264,7 +2264,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3)
.notLinkBattle .notLinkBattle
call SaveScreenTilesToBuffer2 call SaveScreenTilesToBuffer2
ld a, [W_BATTLETYPE] ld a, [W_BATTLETYPE]
cp $2 ; is it a safari battle? cp BATTLE_TYPE_SAFARI
jr nz, BagWasSelected jr nz, BagWasSelected
; bait was selected ; bait was selected
@ -2333,7 +2333,7 @@ UseBagItem:
xor a xor a
ld [wCurrentMenuItem], a ld [wCurrentMenuItem], a
ld a, [W_BATTLETYPE] ld a, [W_BATTLETYPE]
cp $2 ; is it a safari battle? cp BATTLE_TYPE_SAFARI
jr z, .checkIfMonCaptured jr z, .checkIfMonCaptured
ld a, [wActionResultOrTookBattleTurn] ld a, [wActionResultOrTookBattleTurn]
@ -2355,7 +2355,7 @@ UseBagItem:
jr nz, .returnAfterCapturingMon jr nz, .returnAfterCapturingMon
ld a, [W_BATTLETYPE] ld a, [W_BATTLETYPE]
cp $2 ; is it a safari battle? cp BATTLE_TYPE_SAFARI
jr z, .returnAfterUsingItem_NoCapture jr z, .returnAfterUsingItem_NoCapture
; not a safari battle ; not a safari battle
call LoadScreenTilesFromBuffer1 call LoadScreenTilesFromBuffer1
@ -2386,7 +2386,7 @@ PartyMenuOrRockOrRun:
; party menu or rock was selected ; party menu or rock was selected
call SaveScreenTilesToBuffer2 call SaveScreenTilesToBuffer2
ld a, [W_BATTLETYPE] ld a, [W_BATTLETYPE]
cp $2 ; is it a safari battle? cp BATTLE_TYPE_SAFARI
jr nz, .partyMenuWasSelected jr nz, .partyMenuWasSelected
; safari battle ; safari battle
ld a, SAFARI_ROCK ld a, SAFARI_ROCK

2
engine/battle/init_battle_variables.asm
View file

@ -32,7 +32,7 @@ InitBattleVariables: ; 525af (14:65af)
jr c, .notSafariBattle jr c, .notSafariBattle
cp SAFARI_ZONE_REST_HOUSE_1 cp SAFARI_ZONE_REST_HOUSE_1
jr nc, .notSafariBattle jr nc, .notSafariBattle
ld a, $2 ; safari battle ld a, BATTLE_TYPE_SAFARI
ld [W_BATTLETYPE], a ld [W_BATTLETYPE], a
.notSafariBattle .notSafariBattle
jpab PlayBattleMusic jpab PlayBattleMusic

2
scripts/viridiancity.asm
View file

@ -71,7 +71,7 @@ ViridianCityScript1: ; 19062 (6:5062)
ld [wListScrollOffset], a ld [wListScrollOffset], a
; set up battle for Old Man ; set up battle for Old Man
ld a, $1 ld a, BATTLE_TYPE_OLD_MAN
ld [W_BATTLETYPE], a ld [W_BATTLETYPE], a
ld a, 5 ld a, 5
ld [W_CURENEMYLVL], a ld [W_CURENEMYLVL], a