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

Clean up some bank 3 functions and rename flag action functions.

Browse source
This commit is contained in:
yenatch 2014-05-25 10:09:39 -07:00
parent cdd34eb45b
commit d307c85499
11 changed files with 326 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engine/battle/15.asm
View file

@ -17,8 +17,8 @@ Func_5525f: ; 5525f (15:525f)
ld a, [wWhichPokemon] ; $cf92
ld c, a
ld b, $2
ld a, $10
call Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
call Predef
ld a, c
and a
pop hl
@ -251,8 +251,8 @@ Func_5525f: ; 5525f (15:525f)
ld a, [wWhichPokemon] ; $cf92
ld c, a
ld b, $1
ld a, $10
call Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
call Predef
pop hl
pop af
ld [W_CURENEMYLVL], a ; $d127
@ -277,14 +277,14 @@ Func_55436: ; 55436 (15:5436)
ld c, a
ld b, $1
push bc
ld a, $10
call Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
call Predef
ld hl, $ccf5
xor a
ld [hl], a
pop bc
ld a, $10
jp Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
jp Predef
Func_5546c: ; 5546c (15:546c)
ld a, [W_PLAYERMONSALIVEFLAGS]

32
engine/battle/core.asm
View file

@ -320,12 +320,12 @@ Func_3c1ad: ; 3c1ad (f:41ad)
ld b, $1
push bc
ld hl, W_PLAYERMONSALIVEFLAGS
ld a, $10
call Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
call Predef
ld hl, $ccf5
pop bc
ld a, $10
call Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
call Predef
call Func_3cba6
call LoadScreenTilesFromBuffer1
call Func_3cc91
@ -1053,8 +1053,8 @@ Func_3c741: ; 3c741 (f:4741)
ld c, a
ld hl, W_PLAYERMONSALIVEFLAGS ; clear fainted mon's alive flag
ld b, $0
ld a, $10
call Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
call Predef
ld hl, W_ENEMYBATTSTATUS1 ; $d067
res 2, [hl] ; reset "attacking multiple times" flag
ld a, [$d083]
@ -1153,12 +1153,12 @@ Func_3c7d8: ; 3c7d8 (f:47d8)
ld hl, W_PLAYERMONSALIVEFLAGS
ld b, $1
push bc
ld a, $10
call Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
call Predef
pop bc
ld hl, $ccf5
ld a, $10
call Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
call Predef
call Func_3cba6
call GBPalWhiteOut
call Func_3ee5b
@ -2440,12 +2440,12 @@ Func_3d1ba: ; 3d1ba (f:51ba)
ld b, $1
push bc
ld hl, W_PLAYERMONSALIVEFLAGS
ld a, $10
call Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
call Predef
pop bc
ld hl, $ccf5
ld a, $10
call Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
call Predef
call Func_3cba6
call Func_3cc91
call SaveScreenTilesToBuffer1
@ -6185,8 +6185,8 @@ Func_3eb01: ; 3eb01 (f:6b01)
ld c, a
ld b, $1
ld hl, wPokedexSeen ; $d30a
ld a, $10
call Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
call Predef
ld hl, W_ENEMYMONLEVEL ; $cff3
ld de, $cd23
ld bc, $b

4
engine/evos_moves.asm
View file

@ -489,7 +489,7 @@ WriteMonMoves_ShiftMoveData: ; 3b04e (e:704e)
ret
Func_3b057: ; 3b057 (e:7057)
ld a, $10
jp Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
jp Predef
INCLUDE "data/evos_moves.asm"

4
engine/give_pokemon.asm
View file

@ -59,8 +59,8 @@ SetPokedexOwnedFlag: ; 4fe11 (13:7e11)
ld c, a
ld hl, wPokedexOwned ; $d2f7
ld b, $1
ld a, $10
call Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
call Predef
pop af
ld [$d11e], a
call GetMonName

8
engine/hidden_object_functions7.asm
View file

@ -194,8 +194,8 @@ CinnabarQuizQuestionsText6: ; 1ea85 (7:6a85)
CinnabarGymQuiz_1ea8a: ; 1ea8a (7:6a8a)
ld hl, $d79c
ld a, $10
jp Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
jp Predef
CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92)
call YesNoChoice
@ -227,8 +227,8 @@ CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92)
ld c, a
ld b, $2
ld hl, $d79a
ld a, $10
call Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
call Predef
ld a, c
and a
ret nz

4
engine/items/itemfinder.asm
View file

@ -11,8 +11,8 @@ HiddenItemNear: ; 7481f (1d:481f)
ld hl, $d6f0
ld c, b
ld b, $2
ld a, $10
call Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
call Predef
ld a, c
pop hl
pop bc

4
engine/items/tms.asm
View file

@ -18,8 +18,8 @@ TestMonMoveCompatibility: ; 1373e (4:773e)
.TMfoundLoop
pop hl
ld b, $2 ; read corresponding bit from TM compatibility array
ld a, $10
jp Predef ; indirect jump to HandleBitArray (f666 (3:7666))
ld a, $10 ; FlagActionPredef
jp Predef
; converts TM/HM number in $d11e into move number
; HMs start at 51

2
engine/predefs.asm
View file

@ -78,7 +78,7 @@ MoveAnimationPredef: ; 4fe91 (13:7e91)
dbw BANK(Func_f71e),Func_f71e
db BANK(InitializePlayerData)
dw InitializePlayerData
dbw BANK(HandleBitArray),HandleBitArray
dbw BANK(FlagActionPredef),FlagActionPredef
db BANK(RemoveMissableObject)
dw RemoveMissableObject
db BANK(IsMissableObjectHidden)