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

Clean many labels of scripts of all gyms

Browse source
This commit is contained in:
Yoann Fievez 2021-05-17 12:48:26 +02:00
parent 7b2eb6b252
commit a448ac897d
18 changed files with 547 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

84
scripts/CeladonGym.asm
View file

@ -22,7 +22,7 @@ CeladonGym_Script:
.LeaderName:
db "ERIKA@"
CeladonGymText_48943:
CeladonGymResetScripts:
xor a
ld [wJoyIgnore], a
ld [wCeladonGymCurScript], a
@ -33,16 +33,16 @@ CeladonGym_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
dw CeladonGymScript3
dw CeladonGymErikaPostBattle
CeladonGymScript3:
CeladonGymErikaPostBattle:
ld a, [wIsInBattle]
cp $ff
jp z, CeladonGymText_48943
jp z, CeladonGymResetScripts
ld a, $f0
ld [wJoyIgnore], a
CeladonGymText_48963:
CeladonGymReceiveTM21:
ld a, $9
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
@ -68,19 +68,19 @@ CeladonGymText_48963:
; deactivate gym trainers
SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_6
jp CeladonGymText_48943
jp CeladonGymResetScripts
CeladonGym_TextPointers:
dw CeladonGymText1
dw CeladonGymText2
dw CeladonGymText3
dw CeladonGymText4
dw CeladonGymText5
dw CeladonGymText6
dw CeladonGymText7
dw CeladonGymText8
dw CeladonGymText9
dw TM21Text
dw ErikaText
dw CeladonGymTrainerText1
dw CeladonGymTrainerText2
dw CeladonGymTrainerText3
dw CeladonGymTrainerText4
dw CeladonGymTrainerText5
dw CeladonGymTrainerText6
dw CeladonGymTrainerText7
dw ErikaRainbowBadgeInfoText
dw ReceivedTM21Text
dw TM21NoRoomText
CeladonGymTrainerHeaders:
@ -101,27 +101,27 @@ CeladonGymTrainerHeader6:
trainer EVENT_BEAT_CELADON_GYM_TRAINER_6, 3, CeladonGymBattleText8, CeladonGymEndBattleText8, CeladonGymAfterBattleText8
db -1 ; end
CeladonGymText1:
ErikaText:
text_asm
CheckEvent EVENT_BEAT_ERIKA
jr z, .beginBattle
jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM21
jr nz, .afterVictory
call z, CeladonGymText_48963
jr nz, .afterBeat
call z, CeladonGymReceiveTM21
call DisableWaitingAfterTextDisplay
jr .done
.afterVictory
ld hl, CeladonGymText_48a68
.afterBeat
ld hl, ErikaPostBattleAdviceText
call PrintText
jr .done
.beginBattle
ld hl, CeladonGymText_48a5e
.beforeBeat
ld hl, ErikaPreBattleText
call PrintText
ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, CeladonGymText_48a63
ld de, CeladonGymText_48a63
ld hl, ReceivedRainbowBadgeText
ld de, ReceivedRainbowBadgeText
call SaveEndBattleTextPointers
ldh a, [hSpriteIndex]
ld [wSpriteIndex], a
@ -135,23 +135,23 @@ CeladonGymText1:
.done
jp TextScriptEnd
CeladonGymText_48a5e:
text_far _CeladonGymText_48a5e
ErikaPreBattleText:
text_far _ErikaPreBattleText
text_end
CeladonGymText_48a63:
text_far _CeladonGymText_48a63
ReceivedRainbowBadgeText:
text_far _ReceivedRainbowBadgeText
text_end
CeladonGymText_48a68:
text_far _CeladonGymText_48a68
ErikaPostBattleAdviceText:
text_far _ErikaPostBattleAdviceText
text_end
CeladonGymText9:
text_far _CeladonGymText9
ErikaRainbowBadgeInfoText:
text_far _ErikaRainbowBadgeInfoText
text_end
TM21Text:
ReceivedTM21Text:
text_far _ReceivedTM21Text
sound_get_item_1
text_far _TM21ExplanationText
@ -161,7 +161,7 @@ TM21NoRoomText:
text_far _TM21NoRoomText
text_end
CeladonGymText2:
CeladonGymTrainerText1:
text_asm
ld hl, CeladonGymTrainerHeader0
call TalkToTrainer
@ -179,7 +179,7 @@ CeladonGymAfterBattleText2:
text_far _CeladonGymAfterBattleText2
text_end
CeladonGymText3:
CeladonGymTrainerText2:
text_asm
ld hl, CeladonGymTrainerHeader1
call TalkToTrainer
@ -197,7 +197,7 @@ CeladonGymAfterBattleText3:
text_far _CeladonGymAfterBattleText3
text_end
CeladonGymText4:
CeladonGymTrainerText3:
text_asm
ld hl, CeladonGymTrainerHeader2
call TalkToTrainer
@ -215,7 +215,7 @@ CeladonGymAfterBattleText4:
text_far _CeladonGymAfterBattleText4
text_end
CeladonGymText5:
CeladonGymTrainerText4:
text_asm
ld hl, CeladonGymTrainerHeader3
call TalkToTrainer
@ -233,7 +233,7 @@ CeladonGymAfterBattleText5:
text_far _CeladonGymAfterBattleText5
text_end
CeladonGymText6:
CeladonGymTrainerText5:
text_asm
ld hl, CeladonGymTrainerHeader4
call TalkToTrainer
@ -251,7 +251,7 @@ CeladonGymAfterBattleText6:
text_far _CeladonGymAfterBattleText6
text_end
CeladonGymText7:
CeladonGymTrainerText6:
text_asm
ld hl, CeladonGymTrainerHeader5
call TalkToTrainer
@ -269,7 +269,7 @@ CeladonGymAfterBattleText7:
text_far _CeladonGymAfterBattleText7
text_end
CeladonGymText8:
CeladonGymTrainerText7:
text_asm
ld hl, CeladonGymTrainerHeader6
call TalkToTrainer