Myriad of changes!

This is a pretty hefty commit, so let's break it down.
- Fixes Pokedex entries for Bittybat, Bulbasaur, and Shellder.
- ...presumably fixes the options menu.
- Adds a Fishing Group and water wild data to Diglett's Cave, also reduces the encounter rate. More to come.
- Modifies parties, including evolving Rival 2's starter.
- Attempts to fix the Ultra and Safari Balls by making `BallFactor` 4, which appears to be the intended number. Tests yielded positive results.
- Restores a ton of Japanese references that got removed in localisation, including some errors.
This commit is contained in:
May Evans 2022-12-11 21:40:43 +00:00
parent 17d12a0413
commit b7973444b2
15 changed files with 86 additions and 48 deletions

View file

@ -21,7 +21,7 @@ SetIshiharaTeam:
jr .loop
IshiharaTeam:
db KINGDRA, 90
db SCREAM_TAIL, 90
IF DEF(_DEBUG)
db MAGNEZONE, 50
ELSE
@ -29,7 +29,7 @@ ELSE
ENDC
db MAGMORTAR, 56
db ELECTIVIRE, 56
db PORYGON2, 57
db ANNIHILAPE, 57
IF DEF(_DEBUG)
db KADABRA, 16
ENDC
@ -86,13 +86,15 @@ IF DEF(_DEBUG)
ld a, 15
ld [hl], a
; Kadabra gets Flash.
; Kadabra gets Flash and Teleport
ld hl, wPartyMon6Moves + 2
ld a, FLASH
ld [hl], a
ld hl, wPartyMon6PP + 2
ld a, 15
ld [hl], a
ld a, TELEPORT
ld [hl], a
; Get some debug items.
ld hl, wNumBagItems
@ -142,10 +144,10 @@ DebugItemsList:
db BICYCLE, 1
db FULL_RESTORE, 99
db MAX_REPEL, 99
db ESCAPE_ROPE, 99
db RARE_CANDY, 99
db MASTER_BALL, 99
db DUBIOUS_DISC, 99
db ULTRA_BALL, 99
db GREAT_BALL, 99
db SECRET_KEY, 1
db CARD_KEY, 1
db S_S_TICKET, 1

View file

@ -275,6 +275,10 @@ ItemUseBall:
ld a, [wcf91]
cp GREAT_BALL
ld a, 12
cp ULTRA_BALL ; lower threshold for ultras and safaris fix
ld a, 4
cp SAFARI_BALL
ld a, 4 ; fix ends here
jr nz, .skip1
ld a, 8

View file

@ -127,7 +127,7 @@ MainMenu:
InitOptions:
ld a, TEXT_DELAY_FAST
ld [wLetterPrintingDelayFlags], a
ld a, TEXT_DELAY_FAST
ld a, TEXT_DELAY_FAST ; makes fasttext come up without the need to change settings
ld [wOptions], a
ret
@ -392,7 +392,7 @@ PrintSaveScreenText:
call PrintPlayTime
ld a, $1
ldh [hAutoBGTransferEnabled], a
ld c, 15 ; quicker player stat display
ld c, 30
jp DelayFrames
PrintNumBadges:
@ -713,4 +713,4 @@ CheckForPlayerNameInSRAM:
ld [MBC1SRamEnable], a
ld [MBC1SRamBankingMode], a
scf
ret
ret