thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-04-08 19:40:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'mistress' into renewables

Browse source
This commit is contained in:
Thorn Avery 2024-01-03 15:13:35 +11:00
commit 65be95e494
37 changed files with 593 additions and 456 deletions
Download patch file Download diff file Expand all files Collapse all files

23
scripts/CeladonMansionRoofHouse.asm
View file

@ -18,20 +18,38 @@ CeladonMansionRoofHouse_ScriptPointers:
dw JackyBeat
JackyBeat:
;joenote - This script will always run after the battle with Jacky.
;Notice how there is no check to see if the player actually lost.
;Let's go ahead and add that real quick.
ld a, [wIsInBattle] ;if wIsInBattle is -1, then the battle was lost
inc a ;if A holds -1, it will increment to 0 and set the z flag (but not the c flag, dec and inc cannot affect it).
jr z, .resetMapScript ;Kick out if the player lost.
CheckEvent EVENT_BEAT_JACKY
jr nz, .resetMapScript ;Kick out if the player already beat Jacky before and got the prize.
SetEvent EVENT_BEAT_JACKY
ld a, EEVEE ; Getting the Pokemon the player needs before printing the text
; ld a, EEVEE ; Getting the Pokemon the player needs before printing the text
;joenote - the above line is overwritten by the very next line.
ld a, [wPlayerStarter] ; Load the player's starter after Eevee loads.
cp EEVEE ; Was your starter Eevee?
ld a, EEVEE ; joenote - you can load EEVEE into A at this line,
; because the LD instruction does not alter the flag bits
jr nz, .skip ; If not, skip this.
ld a, PIKACHU ; Load in Pikachu if true
.skip
;joenote - If the player's starter was EEVEE, then PIKACHU goes into wd11e.
; But if it wasn't EEVEE, then the player's starter would have gone into wd11e.
; With the above alteration, EEVEE is goes into wd11e instead of the starter.
ld [wd11e], a
call GetMonName
ld a, $1 ; Load Jacky's NPC ID
ldh [hSpriteIndex], a ; Slap it in the index
call DisplayTextID
.resetMapScript ;joenote - adding this label so we can jump to it
ld a, $0
ld [wCeladonMansionRoofHouseCurScript], a ; kick the player back downstairs
ld [wCurMapScript], a ;joenote - really, really need to also reset the current map script
TheRetONator: ; fallthrough
ret
@ -84,6 +102,9 @@ CeladonMansion5Text1:
ld a, $1
ld [wCeladonMansionRoofHouseCurScript], a
ld [wCurMapScript], a ;joenote - really, really need to also set the current map script
;joenote - remember that, win or lose, the next map update after the battle
; will run index number 1 in the map script list which is JackyBeat
jr .done
.gotGift
ld hl, JackyGift

2
scripts/FarawayIslandInside.asm
View file

@ -28,7 +28,7 @@ FarawayIslandInsideText2:
jp TextScriptEnd
MewBattleText:
text_far _MewtwoBattleText ; Mew!
text_far _MewBattleText
text_asm
ld a, MEW
call PlayCry

7
scripts/FightingDojo.asm
View file

@ -21,10 +21,6 @@ FightingDojo_ScriptPointers:
dw FightingDojoScript3
FightingDojoScript1:
CheckEvent EVENT_POST_GAME_ATTAINED ; Required in the case you have cleared the game, but not cleared the dojo. It's an optional deal.
ret nz
CheckEvent EVENT_DEFEATED_FIGHTING_DOJO
ret nz
call CheckFightingMapTrainers
ld a, [wTrainerHeaderFlagBit]
and a
@ -109,11 +105,14 @@ FightingDojoText1: ; gym scaling can be removed to make space
text_asm
CheckEvent EVENT_POST_GAME_ATTAINED ; No need to view previous stuff, technically you can skip Bide this way but I think that's hilarious
jp z, .normalProcessing
CheckEvent EVENT_DEFEATED_FIGHTING_DOJO
jp z, .normalProcessing
ld hl, KoichiRematchPreBattleText ; Rematch functionality. Just loads pre-battle text and his trainer.
call PrintText
ld c, BANK(Music_MeetMaleTrainer)
ld a, MUSIC_MEET_MALE_TRAINER
call PlayMusic
ld hl, wd72d
set 6, [hl]
set 7, [hl]
ldh a, [hSpriteIndex]

9
scripts/Route1.asm
View file

@ -12,6 +12,12 @@ Route1Script0:
ret ; yeah it's just a switch-off. shush.
OakVibeCheck:
;joenote - Notice how there is no check to see if the player actually lost.
;Let's go ahead and add that real quick.
ld a, [wIsInBattle] ;if wIsInBattle is -1, then the battle was lost
inc a ;if A holds -1, it will increment to 0 and set the z flag (but not the c flag, dec and inc cannot affect it).
jr z, .skip ;Kick out if the player lost.
SetEvent EVENT_BEAT_OAK_ONCE ; This is set every time, but it doesn't matter, it sticks at 1 anyway.
CheckEvent EVENT_RECEIVED_CITRINE_PASS ; Before we do, has the player got the pass?
jr nz, .skip ; Yes? Now we go to auto-ret.
@ -19,6 +25,7 @@ OakVibeCheck:
.skip
ld a, $0
ld [wRoute1CurScript], a
ld [wCurMapScript], a ;joenote - also set the value for current map script or you will have a bad time
ret
OakFirstWin:
@ -30,6 +37,7 @@ OakFirstWin:
.skip
ld a, $0
ld [wRoute1CurScript], a
ld [wCurMapScript], a ;joenote - also set the value for current map script or you will have a bad time
ret
Route1_TextPointers:
@ -157,6 +165,7 @@ Route1OakText:
ld a, $1
ld [wRoute1CurScript], a
ld [wCurMapScript], a ;joenote - also set the value for current map script or you will have a bad time
.done
jp TextScriptEnd