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

Merge remote-tracking branch 'danny/master'

Browse source
This commit is contained in:
yenatch 2014-06-06 16:03:47 -07:00
parent 80f7845a07 32de1b2694
commit 35493bef27
19 changed files with 306 additions and 330 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/wildPokemon/fishinggroup1.asm
View file

@ -1,4 +0,0 @@
FishingGroup1: ; e97d (3:697d)
db 2
db 15,TENTACOOL
db 15,POLIWAG

6
data/wildPokemon/fishinggroup10.asm
View file

@ -1,6 +0,0 @@
FishingGroup10: ; e9bc (3:69bc)
db 4
db 23,SEAKING
db 15,KRABBY
db 15,GOLDEEN
db 15,MAGIKARP

4
data/wildPokemon/fishinggroup2.asm
View file

@ -1,4 +0,0 @@
FishingGroup2: ; e982 (3:6982)
db 2
db 15,GOLDEEN
db 15,POLIWAG

5
data/wildPokemon/fishinggroup3.asm
View file

@ -1,5 +0,0 @@
FishingGroup3: ; e987 (3:6987)
db 3
db 15,PSYDUCK
db 15,GOLDEEN
db 15,KRABBY

4
data/wildPokemon/fishinggroup4.asm
View file

@ -1,4 +0,0 @@
FishingGroup4: ; e98e (3:698e)
db 2
db 15,KRABBY
db 15,SHELLDER

4
data/wildPokemon/fishinggroup5.asm
View file

@ -1,4 +0,0 @@
FishingGroup5: ; e993 (3:6993)
db 2
db 23,POLIWHIRL
db 15,SLOWPOKE

6
data/wildPokemon/fishinggroup6.asm
View file

@ -1,6 +0,0 @@
FishingGroup6: ; e998 (3:6998)
db 4
db 15,DRATINI
db 15,KRABBY
db 15,PSYDUCK
db 15,SLOWPOKE

6
data/wildPokemon/fishinggroup7.asm
View file

@ -1,6 +0,0 @@
FishingGroup7: ; e9a1 (3:69a1)
db 4
db 5,TENTACOOL
db 15,KRABBY
db 15,GOLDEEN
db 15,MAGIKARP

6
data/wildPokemon/fishinggroup8.asm
View file

@ -1,6 +0,0 @@
FishingGroup8: ; e9aa (3:69aa)
db 4
db 15,STARYU
db 15,HORSEA
db 15,SHELLDER
db 15,GOLDEEN

6
data/wildPokemon/fishinggroup9.asm
View file

@ -1,6 +0,0 @@
FishingGroup9: ; e9b3 (3:69b3)
db 4
db 23,SLOWBRO
db 23,SEAKING
db 23,KINGLER
db 23,SEADRA

5
engine/HoF_room_pc.asm
View file

@ -243,7 +243,7 @@ Credits: ; 7418e (1d:418e)
call CopyVideoData
FuncCoord 4, 8
ld hl, Coord
ld de, UnnamedText_74229 ; $4229
ld de, TheEndTextString
call PlaceString
FuncCoord 4, 9
ld hl, Coord
@ -251,7 +251,8 @@ Credits: ; 7418e (1d:418e)
call PlaceString
jp Func_740ba
UnnamedText_74229: ; 74229 (1d:4229)
TheEndTextString: ; 74229 (1d:4229)
; "T H E E N D"
db $60," ",$62," ",$64," ",$64," ",$66," ",$68,"@"
db $61," ",$63," ",$65," ",$65," ",$67," ",$69,"@"

553
engine/battle/1c.asm
View file

File diff suppressed because it is too large Load diff

2
engine/battle/core.asm
View file

@ -6213,7 +6213,7 @@ Func_3ec32: ; 3ec32 (f:6c32)
.asm_3ec4d
call DelayFrame
ld a, $30
call Predef ; indirect jump to Func_7096d (7096d (1c:496d))
call Predef ; indirect jump to BattleTransition (7096d (1c:496d))
callab Func_3ee58
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba

5
engine/predefs.asm
View file

@ -113,11 +113,12 @@ MoveAnimationPredef: ; 4fe91 (13:7e91)
dbw BANK(Func_5a5f),Func_5a5f
dbw BANK(DrawBadges), DrawBadges
dbw BANK(Func_410f3),Func_410f3
dbw BANK(Func_7096d),Func_7096d
dbw BANK(BattleTransition),BattleTransition
dbw BANK(Func_79dda),Func_79dda
dbw BANK(PlayIntro),PlayIntro
dbw BANK(Func_79869),Func_79869
dbw BANK(Func_70b5d),Func_70b5d
db BANK(BattleTransition_FlashScreen_)
dw BattleTransition_FlashScreen_
dbw BANK(Func_c586),Func_c586
dbw BANK(StatusScreen),StatusScreen ; 37 0x12953
dbw BANK(StatusScreen2),StatusScreen2 ; 38

2
scripts/ceruleancity.asm
View file

@ -291,7 +291,7 @@ CeruleanCityText2: ; 1967c (6:567c)
.asm_4ca20 ; 0x196ad
ld hl, CeruleanCityText_196f3
call PrintText
ld bc, $e401
ld bc, (TM_28 << 8) + 1
call GiveItem
jr c, .Success
ld hl, TM28NoRoomText

4
scripts/pokemontower6.asm
View file

@ -7,7 +7,7 @@ PokemonTower6Script: ; 60aef (18:4aef)
ld [W_POKEMONTOWER6CURSCRIPT], a
ret
Func_60b02: ; 60b02 (18:4b02)
PokemonTower6Script_60b02: ; 60b02 (18:4b02)
xor a
ld [wJoyIgnore], a
ld [W_POKEMONTOWER6CURSCRIPT], a
@ -48,7 +48,7 @@ CoordsData_60b45: ; 60b45 (18:4b45)
PokemonTower6Script4: ; 60b48 (18:4b48)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, Func_60b02
jp z, PokemonTower6Script_60b02
ld a, $ff
ld [wJoyIgnore], a
ld a, [wd72d]

4
scripts/route16.asm
View file

@ -7,7 +7,7 @@ Route16Script: ; 59933 (16:5933)
ld [W_ROUTE16CURSCRIPT], a
ret
Func_59946: ; 59946 (16:5946)
Route16Script_59946: ; 59946 (16:5946)
xor a
ld [wJoyIgnore], a
ld [W_ROUTE16CURSCRIPT], a
@ -47,7 +47,7 @@ Route16Script0: ; 59959 (16:5959)
Route16Script3: ; 5998f (16:598f)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, Func_59946
jp z, Route16Script_59946
call UpdateSprites
ld a, [wcf0b]
cp $2

6
scripts/route16gate.asm
View file

@ -13,7 +13,7 @@ Route16GateScriptPointers: ; 496cf (12:56cf)
dw Route16GateScript3
Route16GateScript0: ; 496d7 (12:56d7)
call Func_49755
call Route16GateScript_49755
ret nz
ld hl, CoordsData_49714
call ArePlayerCoordsInArray
@ -82,7 +82,7 @@ Route16GateScript3: ; 49741 (12:5741)
ld [W_ROUTE16GATECURSCRIPT], a
ret
Func_49755: ; 49755 (12:5755)
Route16GateScript_49755: ; 49755 (12:5755)
ld b, BICYCLE
jp IsItemInBag
@ -93,7 +93,7 @@ Route16GateTextPointers: ; 4975a (12:575a)
Route16GateText1: ; 49760 (12:5760)
db $08 ; asm
call Func_49755
call Route16GateScript_49755
jr z, .asm_0bdf3 ; 0x49764
ld hl, Route16GateText_4977c
call PrintText

4
scripts/route18gate.asm
View file

@ -13,7 +13,7 @@ Route18GateScriptPointers: ; 49887 (12:5887)
dw Route18GateScript3
Route18GateScript0: ; 4988f (12:588f)
call Func_49755
call Route16GateScript_49755
ret nz
ld hl, CoordsData_498cc
call ArePlayerCoordsInArray
@ -88,7 +88,7 @@ Route18GateTextPointers: ; 4990d (12:590d)
Route18GateText1: ; 49911 (12:5911)
db $08 ; asm
call Func_49755
call Route16GateScript_49755
jr z, .asm_3c84d ; 0x49915
ld hl, Route18GateText_4992d
call PrintText