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
This commit is contained in:
dannye 2015-08-10 00:00:12 -05:00
commit 66bc517605
57 changed files with 1914 additions and 1651 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/celadonmansion3.asm
View file

@ -30,7 +30,7 @@ DirectorText: ; 487b2 (12:47b2)
ld hl, wPokedexOwned
ld b, wPokedexOwnedEnd - wPokedexOwned
call CountSetBits
ld a, [wd11e]
ld a, [wNumSetBits]
cp 150
jr nc, .CompletedDex
ld hl, .GameDesigner

4
scripts/ceruleancity.asm
View file

@ -65,7 +65,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
and a
jr z, .asm_19512
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
.asm_19512
ld c, BANK(Music_MeetRival)
@ -172,7 +172,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1)
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
ld a, $1

8
scripts/oakslab.asm
View file

@ -511,7 +511,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
ld [hJoyHeld], a
call EnableAutoTextBoxDrawing
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
ld a, $15
@ -612,7 +612,7 @@ OaksLabScript16: ; 1cf12 (7:4f12)
call FillMemory
ld [hl], $ff
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
ld a, $1
@ -969,8 +969,8 @@ OaksLabText5: ; 1d248 (7:5248)
ld hl, wPokedexOwned
ld b, wPokedexOwnedEnd - wPokedexOwned
call CountSetBits
ld a, [wd11e]
cp $2
ld a, [wNumSetBits]
cp 2
jr c, .asm_1d279
CheckEvent EVENT_GOT_POKEDEX
jr z, .asm_1d279

4
scripts/pewterpokecenter.asm
View file

@ -59,9 +59,9 @@ PewterPokecenterText3: ; 5c59b (17:459b)
ld c, 24
call DelayFrames
ld a, [wc026]
ld a, [wChannelSoundIDs]
ld b, a
ld a, [wc027]
ld a, [wChannelSoundIDs + CH1]
or b
jr nz, .loop

4
scripts/pokemontower2.asm
View file

@ -23,7 +23,7 @@ PokemonTower2Script0: ; 6050f (18:450f)
call ArePlayerCoordsInArray
ret nc
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
@ -77,7 +77,7 @@ PokemonTower2Script1: ; 60563 (18:4563)
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
ld a, $2

8
scripts/redshouse1f.asm
View file

@ -29,14 +29,14 @@ MomHealPokemon: ; 4818a (12:418a)
call ReloadMapData
predef HealParty
ld a, MUSIC_PKMN_HEALED
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
.next
ld a, [wc026]
ld a, [wChannelSoundIDs]
cp MUSIC_PKMN_HEALED
jr z, .next
ld a, [wd35b]
ld [wc0ee], a
ld a, [wMapMusicSoundID]
ld [wNewSoundID], a
call PlaySound
call GBFadeInFromWhite
ld hl, MomHealText2

8
scripts/route11gateupstairs.asm
View file

@ -20,9 +20,9 @@ Route11GateUpstairsText2: ; 4946c (12:546c)
CheckEvent EVENT_GOT_ITEMFINDER, 1
jr c, .asm_4949b
ld a, 30 ; pokemon needed
ld [$ffdb], a
ld [hOaksAideRequirement], a
ld a, ITEMFINDER ; oak's aide reward
ld [$ffdc], a
ld [hOaksAideItemReward], a
ld [wd11e], a
call GetItemName
ld h, d
@ -30,8 +30,8 @@ Route11GateUpstairsText2: ; 4946c (12:546c)
ld de, wcc5b
ld bc, $000d
call CopyData
predef OaksAideScript ; call oak's aide script
ld a, [$ffdb]
predef OaksAideScript
ld a, [hOaksAideResult]
dec a
jr nz, .asm_494a1
SetEvent EVENT_GOT_ITEMFINDER

8
scripts/route15gateupstairs.asm
View file

@ -10,17 +10,17 @@ Route15GateUpstairsText1: ; 49651 (12:5651)
CheckEvent EVENT_GOT_EXP_ALL
jr nz, .asm_49683
ld a, 50 ; pokemon needed
ld [$ffdb], a
ld [hOaksAideRequirement], a
ld a, EXP__ALL ; oak's aide reward
ld [$ffdc], a
ld [hOaksAideItemReward], a
ld [wd11e], a
call GetItemName
ld hl, wcd6d
ld de, wcc5b
ld bc, $000d
call CopyData
predef OaksAideScript ; call oak's aide script
ld a, [$ffdb]
predef OaksAideScript
ld a, [hOaksAideResult]
cp $1
jr nz, .asm_49689
SetEvent EVENT_GOT_EXP_ALL

10
scripts/route22.asm
View file

@ -89,7 +89,7 @@ Route22Script0: ; 50f00 (14:4f00)
and a
jr z, .asm_50f4e
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
.asm_50f4e
ld c, BANK(Music_MeetRival)
@ -168,7 +168,7 @@ Route22Script2: ; 50fb5 (14:4fb5)
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
ld a, [wcf0d]
@ -242,11 +242,11 @@ Route22Script_5104e: ; 5104e (14:504e)
and a
jr z, .skipYVisibilityTesta
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
.skipYVisibilityTesta
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateTempo
ld a, $2
@ -327,7 +327,7 @@ Route22Script5: ; 510df (14:50df)
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStartAndTempo
ld a, [wcf0d]

8
scripts/route2gate.asm
View file

@ -10,17 +10,17 @@ Route2GateText1: ; 5d5db (17:55db)
CheckEvent EVENT_GOT_HM05
jr nz, .asm_5d60d
ld a, 10 ; pokemon needed
ld [$ffdb], a
ld [hOaksAideRequirement], a
ld a, HM_05 ; oak's aide reward
ld [$ffdc], a
ld [hOaksAideItemReward], a
ld [wd11e], a
call GetItemName
ld hl, wcd6d
ld de, wcc5b
ld bc, $000d
call CopyData
predef OaksAideScript ; call oak's aide script
ld a, [$ffdb]
predef OaksAideScript
ld a, [hOaksAideResult]
cp $1
jr nz, .asm_5d613
SetEvent EVENT_GOT_HM05

4
scripts/silphco7.asm
View file

@ -131,7 +131,7 @@ SilphCo7Script0: ; 51c23 (14:5c23)
ld a, PLAYER_DIR_DOWN
ld [wPlayerMovingDirection], a
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
@ -220,7 +220,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8)
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
ld de, MovementData_51d1d

4
scripts/ssanne2.asm
View file

@ -25,7 +25,7 @@ SSAnne2Script0: ; 613be (18:53be)
call ArePlayerCoordsInArray
ret nc
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
@ -146,7 +146,7 @@ SSAnne2Script2: ; 6146d (18:546d)
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
ld a, $3

12
scripts/ssanne7.asm
View file

@ -44,21 +44,21 @@ SSAnne7Text1: ; 618ad (18:58ad)
SSAnne7RubText: ; 618ec (18:58ec)
TX_FAR _SSAnne7RubText
TX_ASM
ld a, [wc0ef]
ld a, [wAudioROMBank]
cp BANK(Audio3_UpdateMusic)
ld [wc0f0], a
ld [wAudioSavedROMBank], a
jr nz, .asm_61908
ld a, $ff
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
ld a, Bank(Music_PkmnHealed)
ld [wc0ef], a
ld [wAudioROMBank], a
.asm_61908
ld a, MUSIC_PKMN_HEALED
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
.asm_61910
ld a, [wc026]
ld a, [wChannelSoundIDs]
cp MUSIC_PKMN_HEALED
jr z, .asm_61910
call PlayDefaultMusic

2
scripts/vermiliondock.asm
View file

@ -40,7 +40,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
SetEventForceReuseHL EVENT_SS_ANNE_LEFT
ld a, $ff
ld [wJoyIgnore], a
ld [wc0ee], a
ld [wNewSoundID], a
call PlaySound
ld c, BANK(Music_Surfing)
ld a, MUSIC_SURFING