This commit is contained in:
Thorn Avery 2023-11-13 12:31:47 +11:00
parent 2b68600401
commit 2c28d50304
9 changed files with 1903 additions and 7 deletions

View file

@ -0,0 +1 @@
/nix/store/kvz5368wsc21943p8038p3n90vzb1mbh-source

View file

@ -0,0 +1 @@
/nix/store/p58d2j0ac7zvja5jl14xzbc19fakjxh2-source

View file

@ -0,0 +1 @@
/nix/store/xmyd2lyqdjsn4hcgwsl8z5587y8jvqkh-source

View file

@ -0,0 +1 @@
/nix/store/yj1wxm9hh8610iyzqnz75kvs6xl8j3my-source

View file

@ -0,0 +1 @@
/nix/store/ayfhlk9k47y780zqh1yidwm3ikkbf6p3-nix-shell-env

File diff suppressed because it is too large Load diff

View file

@ -844,7 +844,7 @@ FaintEnemyPokemon:
; This checks if the opponent is Meltan, the Jar isn't full, and it's in the bag. ; This checks if the opponent is Meltan, the Jar isn't full, and it's in the bag.
; If so, it increments the amount of candies in the jar. Once full, it stops counting. ; If so, it increments the amount of candies in the jar. Once full, it stops counting.
ld a, [wEnemyMonSpecies] ; Load species. ld a, [wEnemyMonSpecies] ; Load species.
cp $E4 ; Is it Meltan? cp $E6 ; Is it Meltan?
jr nz, .skip ; Continue as normal if not. jr nz, .skip ; Continue as normal if not.
ld b, CANDY_JAR ; Ok, we have a Meltan on our hands. Is the Jar in the bag? ld b, CANDY_JAR ; Ok, we have a Meltan on our hands. Is the Jar in the bag?

View file

@ -64,8 +64,7 @@ JamesText:
call RestoreScreenTilesAndReloadTilePatterns call RestoreScreenTilesAndReloadTilePatterns
call LoadGBPal call LoadGBPal
pop af pop af
ld hl, JamesDone jr c, .refused
call PrintText
; DV increasing process. ; DV increasing process.
; Thanks to Vimescarrot for giving me pointers on this! ; Thanks to Vimescarrot for giving me pointers on this!
@ -74,13 +73,26 @@ JamesText:
ld bc, wPartyMon2 - wPartyMon1 ; This gets to the right slot for DVs ld bc, wPartyMon2 - wPartyMon1 ; This gets to the right slot for DVs
call AddNTimes ; Gets us there call AddNTimes ; Gets us there
; check if already maxed
ld b, h
ld c, l
ld a, [hli]
cp a, %11111111
jr nz, .train
ld a, [hl]
cp a, %11111111
jr z, .alreadyTrained
.train
; Set the DVS
ld h, b
ld l, c
ld a, %11111111 ; Load FFFF FFFF, perfect 15s ld a, %11111111 ; Load FFFF FFFF, perfect 15s
ld [hli], a ; Attack + Defence ld [hli], a ; Attack + Defence
ld [hl], a ; Speed + Special ld [hl], a ; Speed + Special
; And we're done! ; And we're done!
; Currently this doesn't automatically change the stats because it's fucking insane ; Currently this doesn't automatically change the stats because it's fucking insane
ld hl, JamesDone
call PrintText
; Bottle Cap removal service ; Bottle Cap removal service
ld hl, BottleCapList ld hl, BottleCapList
.loop .loop

View file

@ -168,10 +168,10 @@ ResetLegendaryPokemon:
ResetEvent EVENT_BEAT_MEWTWO ResetEvent EVENT_BEAT_MEWTWO
ld a, HS_MEWTWO ld a, HS_MEWTWO
call ShowThis call ShowThis
ResetEvent EVENT_FIGHT_ROUTE12_SNORLAX ResetEvent EVENT_BEAT_ROUTE12_SNORLAX
ld a, HS_ROUTE_12_SNORLAX ld a, HS_ROUTE_12_SNORLAX
call ShowThis call ShowThis
ResetEvent EVENT_FIGHT_ROUTE16_SNORLAX ResetEvent EVENT_BEAT_ROUTE16_SNORLAX
ld a, HS_ROUTE_16_SNORLAX ld a, HS_ROUTE_16_SNORLAX
call ShowThis call ShowThis