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

constants for flag actions

Browse source
This commit is contained in:
YamaArashi 2015-07-19 20:45:34 -07:00
parent 1d86932cc9
commit db7d941d22
16 changed files with 57 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
constants/misc_constants.asm
View file

@ -133,6 +133,12 @@ PLAYER_DIR_LEFT EQU (1 << PLAYER_DIR_BIT_LEFT)
PLAYER_DIR_DOWN EQU (1 << PLAYER_DIR_BIT_DOWN) PLAYER_DIR_DOWN EQU (1 << PLAYER_DIR_BIT_DOWN)
PLAYER_DIR_UP EQU (1 << PLAYER_DIR_BIT_UP) PLAYER_DIR_UP EQU (1 << PLAYER_DIR_BIT_UP)
; flag operations
FLAG_RESET EQU 0
FLAG_SET EQU 1
FLAG_TEST EQU 2
; serial ; serial
ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01 ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01

12
engine/battle/core.asm
View file

@ -328,7 +328,7 @@ StartBattle: ; 3c11e (f:411e)
call SaveScreenTilesToBuffer1 call SaveScreenTilesToBuffer1
ld a, [wWhichPokemon] ld a, [wWhichPokemon]
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
push bc push bc
ld hl, wPartyGainExpFlags ld hl, wPartyGainExpFlags
predef FlagActionPredef predef FlagActionPredef
@ -1081,7 +1081,7 @@ RemoveFaintedPlayerMon: ; 3c741 (f:4741)
ld a, [wPlayerMonNumber] ld a, [wPlayerMonNumber]
ld c, a ld c, a
ld hl, wPartyGainExpFlags ld hl, wPartyGainExpFlags
ld b, $0 ld b, FLAG_RESET
predef FlagActionPredef ; clear gain exp flag for fainted mon predef FlagActionPredef ; clear gain exp flag for fainted mon
ld hl, W_ENEMYBATTSTATUS1 ld hl, W_ENEMYBATTSTATUS1
res 2, [hl] ; reset "attacking multiple times" flag res 2, [hl] ; reset "attacking multiple times" flag
@ -1181,7 +1181,7 @@ ChooseNextMon: ; 3c7d8 (f:47d8)
ld [wPlayerMonNumber], a ld [wPlayerMonNumber], a
ld c, a ld c, a
ld hl, wPartyGainExpFlags ld hl, wPartyGainExpFlags
ld b, $1 ld b, FLAG_SET
push bc push bc
predef FlagActionPredef predef FlagActionPredef
pop bc pop bc
@ -1350,7 +1350,7 @@ EnemySendOut: ; 3c90e (f:490e)
ld [hl],a ld [hl],a
ld a,[wPlayerMonNumber] ld a,[wPlayerMonNumber]
ld c,a ld c,a
ld b,1 ld b,FLAG_SET
push bc push bc
predef FlagActionPredef predef FlagActionPredef
ld hl,wPartyFoughtCurrentEnemyFlags ld hl,wPartyFoughtCurrentEnemyFlags
@ -2490,7 +2490,7 @@ SwitchPlayerMon: ; 3d1ba (f:51ba)
ld a, [wWhichPokemon] ld a, [wWhichPokemon]
ld [wPlayerMonNumber], a ld [wPlayerMonNumber], a
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
push bc push bc
ld hl, wPartyGainExpFlags ld hl, wPartyGainExpFlags
predef FlagActionPredef predef FlagActionPredef
@ -6326,7 +6326,7 @@ LoadEnemyMonData: ; 3eb01 (f:6b01)
ld a, [wd11e] ld a, [wd11e]
dec a dec a
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
ld hl, wPokedexSeen ld hl, wPokedexSeen
predef FlagActionPredef ; mark this mon as seen in the pokedex predef FlagActionPredef ; mark this mon as seen in the pokedex
ld hl, wEnemyMonLevel ld hl, wEnemyMonLevel

6
engine/battle/experience.asm
View file

@ -15,7 +15,7 @@ GainExperience: ; 5524f (15:524f)
ld hl, wPartyGainExpFlags ld hl, wPartyGainExpFlags
ld a, [wWhichPokemon] ld a, [wWhichPokemon]
ld c, a ld c, a
ld b, $2 ld b, FLAG_TEST
predef FlagActionPredef predef FlagActionPredef
ld a, c ld a, c
and a ; is mon's gain exp flag set? and a ; is mon's gain exp flag set?
@ -257,7 +257,7 @@ GainExperience: ; 5524f (15:524f)
ld hl, wCanEvolveFlags ld hl, wCanEvolveFlags
ld a, [wWhichPokemon] ld a, [wWhichPokemon]
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
predef FlagActionPredef predef FlagActionPredef
pop hl pop hl
pop af pop af
@ -281,7 +281,7 @@ GainExperience: ; 5524f (15:524f)
ld [hl], a ; clear gain exp flags ld [hl], a ; clear gain exp flags
ld a, [wPlayerMonNumber] ld a, [wPlayerMonNumber]
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
push bc push bc
predef FlagActionPredef ; set the gain exp flag for the mon that is currently out predef FlagActionPredef ; set the gain exp flag for the mon that is currently out
ld hl, wPartyFoughtCurrentEnemyFlags ld hl, wPartyFoughtCurrentEnemyFlags

6
engine/evos_moves.asm
View file

@ -5,7 +5,7 @@ TryEvolvingMon: ; 3ad0e (e:6d0e)
ld [hl], a ld [hl], a
ld a, [wWhichPokemon] ld a, [wWhichPokemon]
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
call Evolution_FlagAction call Evolution_FlagAction
; this is only called after battle ; this is only called after battle
@ -36,7 +36,7 @@ Evolution_PartyMonLoop: ; loop over party mons
ld a, [wWhichPokemon] ld a, [wWhichPokemon]
ld c, a ld c, a
ld hl, wCanEvolveFlags ld hl, wCanEvolveFlags
ld b, $2 ld b, FLAG_TEST
call Evolution_FlagAction call Evolution_FlagAction
ld a, c ld a, c
and a ; is the mon's bit set? and a ; is the mon's bit set?
@ -217,7 +217,7 @@ Evolution_PartyMonLoop: ; loop over party mons
ld a, [wd11e] ld a, [wd11e]
dec a dec a
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
ld hl, wPokedexOwned ld hl, wPokedexOwned
push bc push bc
call Evolution_FlagAction call Evolution_FlagAction

2
engine/give_pokemon.asm
View file

@ -60,7 +60,7 @@ SetPokedexOwnedFlag: ; 4fe11 (13:7e11)
dec a dec a
ld c, a ld c, a
ld hl, wPokedexOwned ld hl, wPokedexOwned
ld b, $1 ld b, FLAG_SET
predef FlagActionPredef predef FlagActionPredef
pop af pop af
ld [wd11e], a ld [wd11e], a

8
engine/hidden_object_functions7.asm
View file

@ -209,7 +209,7 @@ CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92)
call PrintText call PrintText
ld a, [$ffe0] ld a, [$ffe0]
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
call CinnabarGymQuiz_1ea8a call CinnabarGymQuiz_1ea8a
jp CinnabarGymQuiz_1eb0a jp CinnabarGymQuiz_1eb0a
.asm_1eab8 .asm_1eab8
@ -222,7 +222,7 @@ CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92)
ld a, [$ffdb] ld a, [$ffdb]
add $2 add $2
ld c, a ld c, a
ld b, $2 ld b, FLAG_TEST
ld hl, wd79a ld hl, wd79a
predef FlagActionPredef predef FlagActionPredef
ld a, c ld a, c
@ -241,7 +241,7 @@ CinnabarGymQuizCorrectText: ; 1eae3 (7:6ae3)
ld a, [$ffe0] ld a, [$ffe0]
ld c, a ld c, a
ld b, $2 ld b, FLAG_TEST
call CinnabarGymQuiz_1ea8a call CinnabarGymQuiz_1ea8a
ld a, c ld a, c
and a and a
@ -278,7 +278,7 @@ CinnabarGymQuiz_1eb0a: ; 1eb0a (7:6b0a)
ld a, [$ffdb] ld a, [$ffdb]
ld [$ffe0], a ld [$ffe0], a
ld c, a ld c, a
ld b, $2 ld b, FLAG_TEST
call CinnabarGymQuiz_1ea8a call CinnabarGymQuiz_1ea8a
ld a, c ld a, c
and a and a

4
engine/in_game_trades.asm
View file

@ -38,7 +38,7 @@ DoInGameTradeDialogue: ; 71ad9 (1c:5ad9)
ld hl,wCompletedInGameTradeFlags ld hl,wCompletedInGameTradeFlags
ld a,[wWhichTrade] ld a,[wWhichTrade]
ld c,a ld c,a
ld b,$2 ld b,FLAG_TEST
predef FlagActionPredef predef FlagActionPredef
ld a,c ld a,c
and a and a
@ -112,7 +112,7 @@ InGameTrade_DoTrade: ; 71c07 (1c:5c07)
ld hl,wCompletedInGameTradeFlags ld hl,wCompletedInGameTradeFlags
ld a,[wWhichTrade] ld a,[wWhichTrade]
ld c,a ld c,a
ld b,$1 ld b,FLAG_SET
predef FlagActionPredef predef FlagActionPredef
ld hl, ConnectCableText ld hl, ConnectCableText
call PrintText call PrintText

2
engine/items/itemfinder.asm
View file

@ -10,7 +10,7 @@ HiddenItemNear: ; 7481f (1d:481f)
push hl push hl
ld hl, wObtainedHiddenItemsFlags ld hl, wObtainedHiddenItemsFlags
ld c, b ld c, b
ld b, $2 ld b, FLAG_TEST
predef FlagActionPredef predef FlagActionPredef
ld a, c ld a, c
pop hl pop hl

14
engine/items/items.asm
View file

@ -400,15 +400,15 @@ ItemUseBall: ; d687 (3:5687)
ld a,[wd11e] ld a,[wd11e]
dec a dec a
ld c,a ld c,a
ld b,2 ld b,FLAG_TEST
ld hl,wPokedexOwned ;Dex_own_flags (pokemon) ld hl,wPokedexOwned
predef FlagActionPredef predef FlagActionPredef
ld a,c ld a,c
push af push af
ld a,[wd11e] ld a,[wd11e]
dec a dec a
ld c,a ld c,a
ld b,1 ld b,FLAG_SET
predef FlagActionPredef predef FlagActionPredef
pop af pop af
and a and a
@ -804,7 +804,7 @@ ItemUseMedicine: ; dabb (3:5abb)
ld a,[wUsedItemOnWhichPokemon] ld a,[wUsedItemOnWhichPokemon]
ld c,a ld c,a
ld hl,wPartyFoughtCurrentEnemyFlags ld hl,wPartyFoughtCurrentEnemyFlags
ld b,$02 ld b,FLAG_TEST
predef FlagActionPredef predef FlagActionPredef
ld a,c ld a,c
and a and a
@ -812,7 +812,7 @@ ItemUseMedicine: ; dabb (3:5abb)
ld a,[wUsedItemOnWhichPokemon] ld a,[wUsedItemOnWhichPokemon]
ld c,a ld c,a
ld hl,wPartyGainExpFlags ld hl,wPartyGainExpFlags
ld b,$01 ld b,FLAG_SET
predef FlagActionPredef predef FlagActionPredef
.next .next
pop bc pop bc
@ -2550,8 +2550,8 @@ IsKeyItem_: ; e764 (3:6764)
dec a dec a
ld c,a ld c,a
ld hl,wHPBarMaxHP ld hl,wHPBarMaxHP
ld b,$02 ; test bit ld b,FLAG_TEST
predef FlagActionPredef ; bitfield operation function predef FlagActionPredef
ld a,c ld a,c
and a and a
ret nz ret nz

2
engine/items/tms.asm
View file

@ -17,7 +17,7 @@ CanLearnTM: ; 1373e (4:773e)
jr .findTMloop jr .findTMloop
.TMfoundLoop .TMfoundLoop
pop hl pop hl
ld b, $2 ; read corresponding bit from TM compatibility array ld b, FLAG_TEST
predef_jump FlagActionPredef predef_jump FlagActionPredef
; converts TM/HM number in wd11e into move number ; converts TM/HM number in wd11e into move number

2
engine/menu/pokedex.asm
View file

@ -379,7 +379,7 @@ IsPokemonBitSet: ; 402c2 (10:42c2)
ld a,[wd11e] ld a,[wd11e]
dec a dec a
ld c,a ld c,a
ld b,2 ld b,FLAG_TEST
predef FlagActionPredef predef FlagActionPredef
ld a,c ld a,c
and a and a

8
engine/overworld/hidden_items.asm
View file

@ -5,7 +5,7 @@ HiddenItems: ; 76688 (1d:6688)
ld hl, wObtainedHiddenItemsFlags ld hl, wObtainedHiddenItemsFlags
ld a, [wHiddenItemOrCoinsIndex] ld a, [wHiddenItemOrCoinsIndex]
ld c, a ld c, a
ld b, $2 ld b, FLAG_TEST
predef FlagActionPredef predef FlagActionPredef
ld a, c ld a, c
and a and a
@ -31,7 +31,7 @@ FoundHiddenItemText: ; 7675b (1d:675b)
ld hl, wObtainedHiddenItemsFlags ld hl, wObtainedHiddenItemsFlags
ld a, [wTrainerScreenX] ld a, [wTrainerScreenX]
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
predef FlagActionPredef predef FlagActionPredef
ld a, SFX_GET_ITEM_2 ld a, SFX_GET_ITEM_2
call PlaySoundWaitForCurrent call PlaySoundWaitForCurrent
@ -61,7 +61,7 @@ HiddenCoins: ; 76799 (1d:6799)
ld hl, wObtainedHiddenCoinsFlags ld hl, wObtainedHiddenCoinsFlags
ld a, [wHiddenItemOrCoinsIndex] ld a, [wHiddenItemOrCoinsIndex]
ld c, a ld c, a
ld b, $2 ld b, FLAG_TEST
predef FlagActionPredef predef FlagActionPredef
ld a, c ld a, c
and a and a
@ -102,7 +102,7 @@ HiddenCoins: ; 76799 (1d:6799)
ld hl, wObtainedHiddenCoinsFlags ld hl, wObtainedHiddenCoinsFlags
ld a, [wTrainerScreenX] ld a, [wTrainerScreenX]
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
predef FlagActionPredef predef FlagActionPredef
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld a, [wPlayerCoins] ld a, [wPlayerCoins]

6
home.asm
View file

@ -2297,7 +2297,7 @@ TalkToTrainer:: ; 31cc (0:31cc)
call ReadTrainerHeaderInfo ; read flag's byte ptr call ReadTrainerHeaderInfo ; read flag's byte ptr
ld a, [wTrainerHeaderFlagBit] ld a, [wTrainerHeaderFlagBit]
ld c, a ld c, a
ld b, $2 ld b, FLAG_TEST
call TrainerFlagAction ; read trainer's flag call TrainerFlagAction ; read trainer's flag
ld a, c ld a, c
and a and a
@ -2392,7 +2392,7 @@ EndTrainerBattle:: ; 3275 (0:3275)
call ReadTrainerHeaderInfo call ReadTrainerHeaderInfo
ld a, [wTrainerHeaderFlagBit] ld a, [wTrainerHeaderFlagBit]
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
call TrainerFlagAction ; flag trainer as fought call TrainerFlagAction ; flag trainer as fought
ld a, [W_ENEMYMONORTRAINERCLASS] ld a, [W_ENEMYMONORTRAINERCLASS]
cp $c8 cp $c8
@ -2470,7 +2470,7 @@ CheckForEngagingTrainers:: ; 3306 (0:3306)
ret z ret z
ld a, $2 ld a, $2
call ReadTrainerHeaderInfo ; read trainer flag's byte ptr call ReadTrainerHeaderInfo ; read trainer flag's byte ptr
ld b, $2 ld b, FLAG_TEST
ld a, [wTrainerHeaderFlagBit] ld a, [wTrainerHeaderFlagBit]
ld c, a ld c, a
call TrainerFlagAction ; read trainer flag call TrainerFlagAction ; read trainer flag

18
main.asm
View file

@ -2038,7 +2038,7 @@ _DisplayPokedex: ; 7c18 (1:7c18)
ld a, [wd11e] ld a, [wd11e]
dec a dec a
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
ld hl, wPokedexSeen ld hl, wPokedexSeen
predef FlagActionPredef predef FlagActionPredef
ld a, $1 ld a, $1
@ -3235,7 +3235,7 @@ MarkTownVisitedAndLoadMissableObjects: ; f113 (3:7113)
cp ROUTE_1 cp ROUTE_1
jr nc, .notInTown jr nc, .notInTown
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
ld hl, W_TOWNVISITEDFLAG ; mark town as visited (for flying) ld hl, W_TOWNVISITEDFLAG ; mark town as visited (for flying)
predef FlagActionPredef predef FlagActionPredef
.notInTown .notInTown
@ -3319,7 +3319,7 @@ InitializeMissableObjectsFlags: ; f175 (3:7175)
ld hl, W_MISSABLEOBJECTFLAGS ld hl, W_MISSABLEOBJECTFLAGS
ld a, [wd048] ld a, [wd048]
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
call MissableObjectFlagAction ; set flag iff Item is hidden call MissableObjectFlagAction ; set flag iff Item is hidden
.asm_f19d .asm_f19d
ld hl, wd048 ld hl, wd048
@ -3343,7 +3343,7 @@ IsObjectHidden: ; f1a6 (3:71a6)
ld a, [hli] ld a, [hli]
jr nz, .loop jr nz, .loop
ld c, a ld c, a
ld b, $2 ld b, FLAG_TEST
ld hl, W_MISSABLEOBJECTFLAGS ld hl, W_MISSABLEOBJECTFLAGS
call MissableObjectFlagAction call MissableObjectFlagAction
ld a, c ld a, c
@ -3362,7 +3362,7 @@ ShowObject2:
ld hl, W_MISSABLEOBJECTFLAGS ld hl, W_MISSABLEOBJECTFLAGS
ld a, [wcc4d] ld a, [wcc4d]
ld c, a ld c, a
ld b, $0 ld b, FLAG_RESET
call MissableObjectFlagAction ; reset "removed" flag call MissableObjectFlagAction ; reset "removed" flag
jp UpdateSprites jp UpdateSprites
@ -3372,7 +3372,7 @@ HideObject: ; f1d7 (3:71d7)
ld hl, W_MISSABLEOBJECTFLAGS ld hl, W_MISSABLEOBJECTFLAGS
ld a, [wcc4d] ld a, [wcc4d]
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
call MissableObjectFlagAction ; set "removed" flag call MissableObjectFlagAction ; set "removed" flag
jp UpdateSprites jp UpdateSprites
@ -3642,7 +3642,7 @@ _AddPartyMon: ; f2e5 (3:72e5)
ld a, [wd11e] ld a, [wd11e]
dec a dec a
ld c, a ld c, a
ld b, $2 ld b, FLAG_TEST
ld hl, wPokedexOwned ld hl, wPokedexOwned
call FlagAction call FlagAction
ld a, c ld a, c
@ -3650,7 +3650,7 @@ _AddPartyMon: ; f2e5 (3:72e5)
ld a, [wd11e] ld a, [wd11e]
dec a dec a
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
push bc push bc
call FlagAction call FlagAction
pop bc pop bc
@ -3882,7 +3882,7 @@ _AddEnemyMonToPlayerParty: ; f49d (3:749d)
ld a, [wd11e] ld a, [wd11e]
dec a dec a
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
ld hl, wPokedexOwned ld hl, wPokedexOwned
push bc push bc
call FlagAction ; add to owned pokemon call FlagAction ; add to owned pokemon

6
scripts/cinnabargym.asm
View file

@ -99,7 +99,7 @@ CinnabarGymScript2: ; 757f6 (1d:57f6)
ld a, [wTrainerHeaderFlagBit] ld a, [wTrainerHeaderFlagBit]
ld [$ffdb], a ld [$ffdb], a
ld c, a ld c, a
ld b, $2 ld b, FLAG_TEST
ld hl, wd79a ld hl, wd79a
call CinnabarGymScript_757f1 call CinnabarGymScript_757f1
ld a, c ld a, c
@ -113,13 +113,13 @@ CinnabarGymScript2: ; 757f6 (1d:57f6)
ld a, [wTrainerHeaderFlagBit] ld a, [wTrainerHeaderFlagBit]
ld [$ffdb], a ld [$ffdb], a
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
ld hl, wd79a ld hl, wd79a
call CinnabarGymScript_757f1 call CinnabarGymScript_757f1
ld a, [wTrainerHeaderFlagBit] ld a, [wTrainerHeaderFlagBit]
sub $2 sub $2
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
ld hl, wd79c ld hl, wd79c
call CinnabarGymScript_757f1 call CinnabarGymScript_757f1
call Func_3ead call Func_3ead

6
scripts/route23.asm
View file

@ -52,7 +52,7 @@ Route23Script0: ; 51219 (14:5219)
ld [hSpriteIndexOrTextID], a ld [hSpriteIndexOrTextID], a
ld a, c ld a, c
ld [wWhichBadge], a ld [wWhichBadge], a
ld b, $2 ld b, FLAG_TEST
ld hl, wd7ed ld hl, wd7ed
predef FlagActionPredef predef FlagActionPredef
ld a, c ld a, c
@ -193,7 +193,7 @@ Route23Script_51346: ; 51346 (14:5346)
ld a, [wWhichBadge] ld a, [wWhichBadge]
inc a inc a
ld c, a ld c, a
ld b, $2 ld b, FLAG_TEST
ld hl, W_OBTAINEDBADGES ld hl, W_OBTAINEDBADGES
predef FlagActionPredef predef FlagActionPredef
ld a, c ld a, c
@ -210,7 +210,7 @@ Route23Script_51346: ; 51346 (14:5346)
call PrintText call PrintText
ld a, [wWhichBadge] ld a, [wWhichBadge]
ld c, a ld c, a
ld b, $1 ld b, FLAG_SET
ld hl, wd7ed ld hl, wd7ed
predef FlagActionPredef predef FlagActionPredef
ld a, $2 ld a, $2