A couple of bug fixes

More still need to be done but I'm separating the commits so I don't get overwhelmed lol

- Fixes a bug with the Up-Grade NPC in Saffron. He now properly shows up only after defeating Giovanni.

- Fixes a bug where Silph could be entered before receiving the Poke Flute.

- Silph Gauntlet 5F has a complete remodel, more closely matching the original map found in the leaks.

- One of the Fuchsia Gym Trainers no longer uses a repeat Arbok.

- Wiglett and Wugtrio could learn Rock Slide via TM, which has now been fixed.

- Jacky uses a Porygon in place of Machop, as it ties into his polygonal, Virtua Fighter-inspired sprite.

- Chief uses a Gengar instead of Porygon2 to represent the Silph Scope.

- Omega's and Giovanni 2's levels have been toned down slightly.

- Lance now uses Crocky over Aerodactyl.

- Yujirou's non-initial teams have had their levels reduced to be the same level as the previously-fought Gym Leader, rather than the upcoming one.

- Updated README with additional credits.
This commit is contained in:
Martha Schilling 2023-07-21 19:35:23 +01:00
parent 8cd8f1ded0
commit c5eff723b1
16 changed files with 67 additions and 77 deletions

View file

@ -13,12 +13,11 @@ SaffronCity_TextPointers:
dw SaffronCityText9
dw SaffronCityText10
dw SaffronCityText11
dw SaffronCityText12
dw SaffronCityText13
dw SaffronCityText14
dw SaffronCityText15
dw SaffronCityText16
dw SaffronCityUpGrade
dw SaffronCityText16
dw SaffronCityText17
dw SaffronCityText18
dw MartSignText
@ -73,11 +72,6 @@ SaffronCityText11:
text_far _SaffronCityText11
text_end
SaffronCityText12:
text_far _SaffronCityText12
sound_cry_pidgeot
text_end
SaffronCityText13:
text_far _SaffronCityText13
text_end

View file

@ -95,7 +95,7 @@ SilphCo11ScriptOmegaBattle:
call DisplayTextID
ld a, OMEGA
ld [wCurOpponent], a
ld a, 45
ld a, 40
ld [wCurEnemyLVL], a
ld a, 0
ld [wIsTrainerBattle], a
@ -180,9 +180,6 @@ MissableObjectIDs_6219b:
db HS_SILPH_CO_7F_2
db HS_SILPH_CO_7F_3
db HS_SILPH_CO_7F_4
;db HS_SILPH_CO_8F_1
;db HS_SILPH_CO_8F_2
;db HS_SILPH_CO_8F_3
db HS_SILPH_CO_10F_1
db HS_SILPH_CO_10F_2
db HS_SILPH_CO_11F_1

View file

@ -26,17 +26,17 @@ SilphGauntlet5FTrainerHeaders:
SilphGauntlet5FTrainerHeader0:
trainer EVENT_BEAT_GAUNTLET_JUGGLER, 3, SilphGauntlet5FBattleText1, SilphGauntlet5FEndBattleText1, SilphGauntlet5FAfterBattleText1
SilphGauntlet5FTrainerHeader1:
trainer EVENT_BEAT_GAUNTLET_BIKER, 2, SilphGauntlet5FBattleText2, SilphGauntlet5FEndBattleText2, SilphGauntlet5FAfterBattleText2
trainer EVENT_BEAT_GAUNTLET_BIKER, 1, SilphGauntlet5FBattleText2, SilphGauntlet5FEndBattleText2, SilphGauntlet5FAfterBattleText2
SilphGauntlet5FTrainerHeader2:
trainer EVENT_BEAT_GAUNTLET_CUE_BALL, 1, SilphGauntlet5FBattleText3, SilphGauntlet5FEndBattleText3, SilphGauntlet5FAfterBattleText3
trainer EVENT_BEAT_GAUNTLET_CUE_BALL, 2, SilphGauntlet5FBattleText3, SilphGauntlet5FEndBattleText3, SilphGauntlet5FAfterBattleText3
SilphGauntlet5FTrainerHeader3:
trainer EVENT_BEAT_GAUNTLET_SWIMMER, 3, SilphGauntlet5FBattleText4, SilphGauntlet5FEndBattleText4, SilphGauntlet5FAfterBattleText4
trainer EVENT_BEAT_GAUNTLET_SWIMMER, 2, SilphGauntlet5FBattleText4, SilphGauntlet5FEndBattleText4, SilphGauntlet5FAfterBattleText4
SilphGauntlet5FTrainerHeader4:
trainer EVENT_BEAT_GAUNTLET_TAMER, 3, SilphGauntlet5FBattleText5, SilphGauntlet5FEndBattleText5, SilphGauntlet5FAfterBattleText5
trainer EVENT_BEAT_GAUNTLET_TAMER, 2, SilphGauntlet5FBattleText5, SilphGauntlet5FEndBattleText5, SilphGauntlet5FAfterBattleText5
SilphGauntlet5FTrainerHeader5:
trainer EVENT_BEAT_GAUNTLET_COOLTRAINER_F, 3, SilphGauntlet5FBattleText6, SilphGauntlet5FEndBattleText6, SilphGauntlet5FAfterBattleText6
trainer EVENT_BEAT_GAUNTLET_COOLTRAINER_F, 2, SilphGauntlet5FBattleText6, SilphGauntlet5FEndBattleText6, SilphGauntlet5FAfterBattleText6
SilphGauntlet5FTrainerHeader6:
trainer EVENT_BEAT_GAUNTLET_COOLTRAINER_M, 3, SilphGauntlet5FBattleText7, SilphGauntlet5FEndBattleText7, SilphGauntlet5FAfterBattleText7
trainer EVENT_BEAT_GAUNTLET_COOLTRAINER_M, 2, SilphGauntlet5FBattleText7, SilphGauntlet5FEndBattleText7, SilphGauntlet5FAfterBattleText7
db -1 ; end
SilphGauntlet5FText1: