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

Merge branch 'master' of https://github.com/YamaArashi/pokered

Browse source 
Conflicts:
	engine/town_map.asm
This commit is contained in:
dannye 2015-07-14 00:58:09 -05:00
commit e25a7148d0
43 changed files with 1136 additions and 847 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/celadongamecorner.asm
View file

@ -12,7 +12,7 @@ CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf)
res 6, [hl]
ret z
call Random
ld a, [$ffd3]
ld a, [hRandomAdd]
cp $7
jr nc, .asm_48be2
ld a, $8
@ -20,7 +20,7 @@ CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf)
srl a
srl a
srl a
ld [wUnknownSlotVar], a
ld [wLuckySlotHiddenObjectIndex], a
ret
CeladonGameCornerScript_48bec: ; 48bec (12:4bec)

2
scripts/ceruleanhouse2.asm
View file

@ -26,7 +26,7 @@ CeruleanHouse2Text1: ; 74e15 (1d:4e15)
ld a, h
ld [wList + 1], a
xor a
ld [wcf93], a
ld [wPrintItemPrices], a
ld [wMenuItemToSwap], a
ld a, SPECIALLISTMENU
ld [wListMenuID], a

26
scripts/daycarem.asm
View file

@ -25,7 +25,7 @@ DayCareMText1: ; 56254 (15:6254)
call PrintText
xor a
ld [wUpdateSpritesEnabled], a
ld [wd07d], a
ld [wPartyMenuTypeOrMessageID], a
ld [wMenuItemToSwap], a
call DisplayPartyMenu
push af
@ -45,13 +45,13 @@ DayCareMText1: ; 56254 (15:6254)
call GetPartyMonName
ld hl, DayCareMText_56419
call PrintText
ld a, $1
ld a, 1
ld [W_DAYCARE_IN_USE], a
ld a, $3
ld [wcf95], a
call Func_3a68
ld a, PARTY_TO_DAYCARE
ld [wMoveMonType], a
call MoveMon
xor a
ld [wcf95], a
ld [wRemoveMonFromBox], a
call RemovePokemon
ld a, [wcf91]
call PlayCry
@ -158,26 +158,26 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
predef SubBCDPredef
ld a, (SFX_02_5a - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent
ld a, $13
ld a, MONEY_BOX
ld [wTextBoxID], a
call DisplayTextBoxID
ld hl, DayCareMText_5644f
call PrintText
ld a, $2
ld [wcf95], a
call Func_3a68
ld a, DAYCARE_TO_PARTY
ld [wMoveMonType], a
call MoveMon
ld a, [wDayCareMonSpecies]
ld [wcf91], a
ld a, [wPartyCount]
dec a
push af
ld bc, $002c
ld bc, wPartyMon2 - wPartyMon1
push bc
ld hl, wPartyMon1Moves
call AddNTimes
ld d, h
ld e, l
ld a, $1
ld a, 1
ld [wHPBarMaxHP], a
predef WriteMonMoves
pop bc
@ -186,7 +186,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
call AddNTimes
ld d, h
ld e, l
ld bc, $0021
ld bc, wPartyMon1MaxHP - wPartyMon1HP
add hl, bc
ld a, [hli]
ld [de], a

4
scripts/namerater.asm
View file

@ -49,7 +49,7 @@ NameRaterText1: ; 1da56 (7:5a56)
ld hl, NameRaterText_1dab8
call PrintText
xor a
ld [wd07d], a
ld [wPartyMenuTypeOrMessageID], a
ld [wUpdateSpritesEnabled], a
ld [wMenuItemToSwap], a
call DisplayPartyMenu
@ -68,7 +68,7 @@ NameRaterText1: ; 1da56 (7:5a56)
jr nz, .asm_1daae
ld hl, NameRaterText_1dac2
call PrintText
callba Func_655c
callba DisplayNameRaterScreen
jr c, .asm_1daae
ld hl, NameRaterText_1dac7
.asm_1daa8

2
scripts/oakslab.asm
View file

@ -641,7 +641,7 @@ OaksLabScript_1d00a: ; 1d00a (7:500a)
ld a, c
ld [wWhichPokemon], a
ld a, $1
ld [wcf96], a
ld [wItemQuantity], a
jp RemoveItemFromInventory
OaksLabScript_1d02b: ; 1d02b (7:502b)