mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-16 02:13:23 +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
-
103 lines
1.8 KiB
NASM
103 lines
1.8 KiB
NASM
CinnabarLabFossilRoom_Script:
|
|
jp EnableAutoTextBoxDrawing
|
|
|
|
CinnabarLabFossilRoom_TextPointers:
|
|
dw Lab4Text1
|
|
|
|
Lab4Script_GetFossilsInBag:
|
|
; construct a list of all fossils in the player's bag
|
|
xor a
|
|
ld [wFilteredBagItemsCount], a
|
|
ld de, wFilteredBagItems
|
|
ld hl, FossilsList
|
|
.loop
|
|
ld a, [hli]
|
|
and a
|
|
jr z, .done
|
|
push hl
|
|
push de
|
|
ld [wd11e], a
|
|
ld b, a
|
|
predef GetQuantityOfItemInBag
|
|
pop de
|
|
pop hl
|
|
ld a, b
|
|
and a
|
|
jr z, .loop
|
|
|
|
; A fossil's in the bag
|
|
ld a, [wd11e]
|
|
ld [de], a
|
|
inc de
|
|
push hl
|
|
ld hl, wFilteredBagItemsCount
|
|
inc [hl]
|
|
pop hl
|
|
jr .loop
|
|
.done
|
|
ld a, $ff
|
|
ld [de], a
|
|
ret
|
|
|
|
FossilsList:
|
|
db DOME_FOSSIL
|
|
db HELIX_FOSSIL
|
|
db OLD_AMBER
|
|
db WING_FOSSIL
|
|
db 0 ; end
|
|
|
|
Lab4Text1:
|
|
text_asm
|
|
CheckEvent EVENT_GAVE_FOSSIL_TO_LAB
|
|
jr nz, .asm_75d96
|
|
ld hl, Lab4Text_75dc6
|
|
call PrintText
|
|
call Lab4Script_GetFossilsInBag
|
|
ld a, [wFilteredBagItemsCount]
|
|
and a
|
|
jr z, .asm_75d8d
|
|
farcall GiveFossilToCinnabarLab
|
|
jr .asm_75d93
|
|
.asm_75d8d
|
|
ld hl, Lab4Text_75dcb
|
|
call PrintText
|
|
.asm_75d93
|
|
jp TextScriptEnd
|
|
.asm_75d96
|
|
CheckEventAfterBranchReuseA EVENT_LAB_STILL_REVIVING_FOSSIL, EVENT_GAVE_FOSSIL_TO_LAB
|
|
jr z, .asm_75da2
|
|
ld hl, Lab4Text_75dd0
|
|
call PrintText
|
|
jr .asm_75d93
|
|
.asm_75da2
|
|
call LoadFossilItemAndMonNameBank1D
|
|
ld hl, Lab4Text_75dd5
|
|
call PrintText
|
|
SetEvent EVENT_LAB_HANDING_OVER_FOSSIL_MON
|
|
ld a, [wFossilMon]
|
|
ld b, a
|
|
ld c, 35
|
|
call GivePokemon
|
|
jr nc, .asm_75d93
|
|
ResetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL, EVENT_LAB_HANDING_OVER_FOSSIL_MON
|
|
jr .asm_75d93
|
|
|
|
Lab4Text_75dc6:
|
|
text_far _Lab4Text_75dc6
|
|
text_end
|
|
|
|
Lab4Text_75dcb:
|
|
text_far _Lab4Text_75dcb
|
|
text_end
|
|
|
|
Lab4Text_75dd0:
|
|
text_far _Lab4Text_75dd0
|
|
text_end
|
|
|
|
Lab4Text_75dd5:
|
|
text_far _Lab4Text_75dd5
|
|
text_end
|
|
|
|
LoadFossilItemAndMonNameBank1D:
|
|
farjp LoadFossilItemAndMonName
|