mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-17 02:40:50 +12:00
7742104bbb
(kinda just clearing my commits list while I'm working on 1.3 still.)
- Lance's Room is no longer listed as a dungeon map
- Changed the layout of Cinnabar Volcano YET AGAIN, making it a little more visually appealing. If you get softlocked here, I will just sigh disapprovingly.
- Various moveset fixes:
- Arcanine-H gets EQ and Fissure now
- Raichu-A loses Counter
- Raticate-A gets TBolt and Thunder
- Swapped Bullet Punch and Iron Head around in Scizor's learnset
- Umbreon gets Psychic
- WigWug both now get Ice Beam and Blizzard
- Seel and Dewgong get Water Gun by level up
- Swapped inconsistent moveset levels for Omanyte and Omastar
- Eevee gets Quick Attack earlier
- Fixed a typo in Slowbro-G's dex entry
- Changed the Tauros Combat Breed trader's text to remove a moveset inaccuracy
- Changed Misty's AI to now use X Specials instead of Potions
- Gave Chief's teams a slightly updated moveset
- Fixed an issue where Steel just...didn't resist Rock? How did I miss this?????
- Made Sandshrew more common in Mt Moon B2F
- Changed the Marowaks on Silph Gauntlet 4F to Guardias
- Fixed issues where receiving a Gym badge wouldn't play the correct sound in most situations
- Increased the level of the Salesman's Cubone gift from 17 to 23
- Decreased the levels of the Fossil gifts from 44 to 35
- More text fixes
-
147 lines
3.7 KiB
NASM
147 lines
3.7 KiB
NASM
SilphGauntlet3F_Script:
|
|
call EnableAutoTextBoxDrawing
|
|
ld hl, SilphGauntlet3FTrainerHeaders
|
|
ld de, SilphGauntlet3F_ScriptPointers
|
|
ld a, [wSilphGauntlet3FCurScript]
|
|
call ExecuteCurMapScriptInTable
|
|
ld [wSilphGauntlet3FCurScript], a
|
|
ret
|
|
|
|
SilphGauntlet3F_ScriptPointers:
|
|
dw CheckFightingMapTrainers
|
|
dw DisplayEnemyTrainerTextAndStartBattle
|
|
dw EndTrainerBattle
|
|
|
|
SilphGauntlet3F_TextPointers:
|
|
dw SilphGauntlet3FText1
|
|
dw SilphGauntlet3FText2
|
|
dw SilphGauntlet3FText3
|
|
dw SilphGauntlet3FText4
|
|
dw SilphGauntlet3FText5
|
|
dw SilphGauntlet3FText6
|
|
|
|
SilphGauntlet3FTrainerHeaders:
|
|
def_trainers
|
|
SilphGauntlet3FTrainerHeader0:
|
|
trainer EVENT_BEAT_GAUNTLET_SAILOR, 1, SilphGauntlet3FBattleText1, SilphGauntlet3FEndBattleText1, SilphGauntlet3FAfterBattleText1
|
|
SilphGauntlet3FTrainerHeader1:
|
|
trainer EVENT_BEAT_GAUNTLET_FIREFIGHTER, 2, SilphGauntlet3FBattleText2, SilphGauntlet3FEndBattleText2, SilphGauntlet3FAfterBattleText2
|
|
SilphGauntlet3FTrainerHeader2:
|
|
trainer EVENT_BEAT_GAUNTLET_GENTLEMAN, 2, SilphGauntlet3FBattleText3, SilphGauntlet3FEndBattleText3, SilphGauntlet3FAfterBattleText3
|
|
SilphGauntlet3FTrainerHeader3:
|
|
trainer EVENT_BEAT_GAUNTLET_ENGINEER, 1, SilphGauntlet3FBattleText4, SilphGauntlet3FEndBattleText4, SilphGauntlet3FAfterBattleText4
|
|
SilphGauntlet3FTrainerHeader4:
|
|
trainer EVENT_BEAT_GAUNTLET_ROCKER, 2, SilphGauntlet3FBattleText5, SilphGauntlet3FEndBattleText5, SilphGauntlet3FAfterBattleText5
|
|
SilphGauntlet3FTrainerHeader5:
|
|
trainer EVENT_BEAT_GAUNTLET_FISHER, 2, SilphGauntlet3FBattleText6, SilphGauntlet3FEndBattleText6, SilphGauntlet3FAfterBattleText6
|
|
db -1 ; end
|
|
|
|
SilphGauntlet3FText1:
|
|
text_asm
|
|
ld hl, SilphGauntlet3FTrainerHeader0
|
|
call TalkToTrainer
|
|
jp TextScriptEnd
|
|
|
|
SilphGauntlet3FBattleText1:
|
|
text_far _SilphGauntlet3FBattleText1
|
|
text_end
|
|
|
|
SilphGauntlet3FEndBattleText1:
|
|
text_far _SilphGauntlet3FEndBattleText1
|
|
text_end
|
|
|
|
SilphGauntlet3FAfterBattleText1:
|
|
text_far _SilphGauntlet3FAfterBattleText1
|
|
text_end
|
|
|
|
SilphGauntlet3FText2:
|
|
text_asm
|
|
ld hl, SilphGauntlet3FTrainerHeader1
|
|
call TalkToTrainer
|
|
jp TextScriptEnd
|
|
|
|
SilphGauntlet3FBattleText2:
|
|
text_far _SilphGauntlet3FBattleText2
|
|
text_end
|
|
|
|
SilphGauntlet3FEndBattleText2:
|
|
text_far _SilphGauntlet3FEndBattleText2
|
|
text_end
|
|
|
|
SilphGauntlet3FAfterBattleText2:
|
|
text_far _SilphGauntlet3FAfterBattleText2
|
|
text_end
|
|
|
|
SilphGauntlet3FText3:
|
|
text_asm
|
|
ld hl, SilphGauntlet3FTrainerHeader2
|
|
call TalkToTrainer
|
|
jp TextScriptEnd
|
|
|
|
SilphGauntlet3FBattleText3:
|
|
text_far _SilphGauntlet3FBattleText3
|
|
text_end
|
|
|
|
SilphGauntlet3FEndBattleText3:
|
|
text_far _SilphGauntlet3FEndBattleText3
|
|
text_end
|
|
|
|
SilphGauntlet3FAfterBattleText3:
|
|
text_far _SilphGauntlet3FAfterBattleText3
|
|
text_end
|
|
|
|
SilphGauntlet3FText4:
|
|
text_asm
|
|
ld hl, SilphGauntlet3FTrainerHeader3
|
|
call TalkToTrainer
|
|
jp TextScriptEnd
|
|
|
|
SilphGauntlet3FBattleText4:
|
|
text_far _SilphGauntlet3FBattleText4
|
|
text_end
|
|
|
|
SilphGauntlet3FEndBattleText4:
|
|
text_far _SilphGauntlet3FEndBattleText4
|
|
text_end
|
|
|
|
SilphGauntlet3FAfterBattleText4:
|
|
text_far _SilphGauntlet3FAfterBattleText4
|
|
text_end
|
|
|
|
SilphGauntlet3FText5:
|
|
text_asm
|
|
ld hl, SilphGauntlet3FTrainerHeader4
|
|
call TalkToTrainer
|
|
jp TextScriptEnd
|
|
|
|
SilphGauntlet3FBattleText5:
|
|
text_far _SilphGauntlet3FBattleText5
|
|
text_end
|
|
|
|
SilphGauntlet3FEndBattleText5:
|
|
text_far _SilphGauntlet3FEndBattleText5
|
|
text_end
|
|
|
|
SilphGauntlet3FAfterBattleText5:
|
|
text_far _SilphGauntlet3FAfterBattleText5
|
|
text_end
|
|
|
|
SilphGauntlet3FText6:
|
|
text_asm
|
|
ld hl, SilphGauntlet3FTrainerHeader5
|
|
call TalkToTrainer
|
|
jp TextScriptEnd
|
|
|
|
SilphGauntlet3FBattleText6:
|
|
text_far _SilphGauntlet3FBattleText6
|
|
text_end
|
|
|
|
SilphGauntlet3FEndBattleText6:
|
|
text_far _SilphGauntlet3FEndBattleText6
|
|
text_end
|
|
|
|
SilphGauntlet3FAfterBattleText6:
|
|
text_far _SilphGauntlet3FAfterBattleText6
|
|
text_end
|
|
|
|
text_end |