would you believe me if i told you this still isnt done

in the middle of a breakdown here but i'm committing this because I don't wanna have an overwhelming number of changed files like the Big One

- Fixed a bug where an item couldn't be picked up in Mt. Moon Crater

- Gave new cries to Leafeon, Glaceon, Perrserker, Gentlarva, Carapthor, Gorotora, Magnezone, Tangrowth, Tricules, Magmortar and Meltan. Pupal and Lickilicky also got new cries but they'll probably be changed later

- Changed Citrine's map slightly for hopefully the final time, removing the tall grass to allow the Old Man Glitch to work there

- Brought Pokemon Tower 5F back for some reason

- Moved the Rocket Grunt on Silph 11F closer to the Omegadge door

- 'Fixed' a warp issue on Faraway Island, can definitely be improved though

- Gave Gapdos 10 more base special because i forgot the first time

- Fixed a typo in Hitmontop's dex entry

- Fixed some inconsistencies in Gao and Gorotora's movesets

- Added the unused ice tiles to Seafoam Islands and Garnet Cavern (credit to Vortiene)

- Added a stats page to the Pokedex that displays base stats and the type of caught Pokemon (again, credit to Vortiene)

- Made Sandshrew more common in Mt. Moon

- Improved the 'already caught' icon

- uncapitalised all new instances of "trainer" in the text to make it more consistent

- HOPEFULLY fixed the issue where the SS Anne still couldn't be reboarded
This commit is contained in:
Martha Schilling 2023-11-20 11:00:20 +00:00
parent d0decc8e66
commit ef62d0a43f
48 changed files with 465 additions and 360 deletions

View file

@ -516,7 +516,7 @@ ShowPokedexDataInternal:
ld a, c
and a
jp z, .waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description
jp z, .displaySeenBottomInfo ; if the pokemon has not been owned, don't print the height or weight, but show their type
inc de ; de = address of feet (height)
ld a, [de] ; reads feet, but a is overwritten without being used
hlcoord 12, 6
@ -573,6 +573,85 @@ ShowPokedexDataInternal:
ld a, %10
ldh [hClearLetterPrintingDelayFlags], a
call TextCommandProcessor ; print pokedex description text
;;;;;;;;;; PureRGBnote: ADDED: pokedex will display the pokemon's types and their base stats on a new third page.
CheckEvent EVENT_GOT_POKEDEX
jp z, .clearLetterPrintingFlags ; don't display this new third page if we're showing the starters before getting the pokedex.
ld hl, PromptText
call TextCommandProcessor
hlcoord 1, 10
lb bc, 7, 18
call ClearScreenArea
call PrintMonTypes
; print mon base stats
hlcoord 9, 10
ld de, BaseStatsText
call PlaceString
hlcoord 12, 11
ld de, HPText
call PlaceString
ld de, wMonHBaseHP
hlcoord 15, 11
lb bc, 1, 3
call PrintNumber
hlcoord 11, 12
ld de, AtkText
call PlaceString
ld de, wMonHBaseAttack
hlcoord 15, 12
lb bc, 1, 3
call PrintNumber
hlcoord 11, 13
ld de, DefText
call PlaceString
ld de, wMonHBaseDefense
hlcoord 15, 13
lb bc, 1, 3
call PrintNumber
hlcoord 11, 14
ld de, SpdText
call PlaceString
ld de, wMonHBaseSpeed
hlcoord 15, 14
lb bc, 1, 3
call PrintNumber
hlcoord 11, 15
ld de, SpcText
call PlaceString
ld de, wMonHBaseSpecial
hlcoord 15, 15
lb bc, 1, 3
call PrintNumber
hlcoord 9, 16
ld de, TotalText
call PlaceString
; calculate the base stat total to print it
ld b, 0
ld a, [wMonHBaseHP]
ld hl, 0
ld c, a
add hl, bc
ld a, [wMonHBaseAttack]
ld c, a
add hl, bc
ld a, [wMonHBaseDefense]
ld c, a
add hl, bc
ld a, [wMonHBaseSpeed]
ld c, a
add hl, bc
ld a, [wMonHBaseSpecial]
ld c, a
add hl, bc
ld a, h
ld [wSum], a
ld a, l
ld [wSum+1], a
ld de, wSum
hlcoord 15, 16
lb bc, 2, 3
call PrintNumber
.clearLetterPrintingFlags
;;;;;;;;;;
xor a
ldh [hClearLetterPrintingDelayFlags], a
.waitForButtonPress
@ -592,6 +671,26 @@ ShowPokedexDataInternal:
ld a, $77 ; max volume
ldh [rNR50], a
ret
.displaySeenBottomInfo
call PrintMonTypes ; PureRGBnote: ADDED: for pokemon you have seen but not caught it displays just their types on the bottom
jr .waitForButtonPress
PrintMonTypes:
hlcoord 1, 11
ld de, DexType1Text
call PlaceString
hlcoord 2, 12
predef PrintMonType
ld a, [wMonHType1]
ld b, a
ld a, [wMonHType2]
cp b
jr z, .done ; don't print TYPE2/ if the pokemon has 1 type only.
hlcoord 1, 13
ld de, DexType2Text
call PlaceString
.done
ret
HeightWeightText:
db "HT ???″"
@ -665,3 +764,34 @@ IndexToPokedex:
ret
INCLUDE "data/pokemon/dex_order.asm"
PromptText:
text_promptbutton
text_end
DexType1Text:
db "TYPE1/@"
DexType2Text:
db "TYPE2/@"
BaseStatsText:
db "BASE STATS@"
HPText:
db "HP@"
AtkText:
db "ATK@"
DefText:
db "DEF@"
SpdText:
db "SPD@"
SpcText:
db "SPC@"
TotalText:
db "TOTAL@"