mirror of https://github.com/pret/pokecrystal.git
Every diff line starts with +, -, or space
This commit is contained in:
parent
366330e981
commit
e346cc7b41
|
@ -153,43 +153,43 @@ Don't enforce `org $4000` in pokecrystal.link.
|
||||||
Modify `GetFrontpicPointer`:
|
Modify `GetFrontpicPointer`:
|
||||||
|
|
||||||
```diff
|
```diff
|
||||||
ld a, [wCurPartySpecies]
|
ld a, [wCurPartySpecies]
|
||||||
cp UNOWN
|
cp UNOWN
|
||||||
jr z, .unown
|
jr z, .unown
|
||||||
ld a, [wCurPartySpecies]
|
ld a, [wCurPartySpecies]
|
||||||
+ ld hl, PokemonPicPointers
|
+ ld hl, PokemonPicPointers
|
||||||
ld d, BANK(PokemonPicPointers)
|
ld d, BANK(PokemonPicPointers)
|
||||||
jr .ok
|
jr .ok
|
||||||
|
|
||||||
.unown
|
.unown
|
||||||
ld a, [wUnownLetter]
|
ld a, [wUnownLetter]
|
||||||
+ ld hl, UnownPicPointers
|
+ ld hl, UnownPicPointers
|
||||||
ld d, BANK(UnownPicPointers)
|
ld d, BANK(UnownPicPointers)
|
||||||
|
|
||||||
.ok
|
.ok
|
||||||
- ld hl, PokemonPicPointers ; UnownPicPointers
|
- ld hl, PokemonPicPointers ; UnownPicPointers
|
||||||
dec a
|
dec a
|
||||||
ld bc, 6
|
ld bc, 6
|
||||||
call AddNTimes
|
call AddNTimes
|
||||||
```
|
```
|
||||||
|
|
||||||
And `GetMonBackpic`:
|
And `GetMonBackpic`:
|
||||||
|
|
||||||
```asm
|
```diff
|
||||||
- ; These are assumed to be at the same address in their respective banks.
|
- ; These are assumed to be at the same address in their respective banks.
|
||||||
- ld hl, PokemonPicPointers ; UnownPicPointers
|
- ld hl, PokemonPicPointers ; UnownPicPointers
|
||||||
ld a, b
|
ld a, b
|
||||||
+ ld hl, PokemonPicPointers
|
+ ld hl, PokemonPicPointers
|
||||||
ld d, BANK(PokemonPicPointers)
|
ld d, BANK(PokemonPicPointers)
|
||||||
cp UNOWN
|
cp UNOWN
|
||||||
jr nz, .ok
|
jr nz, .ok
|
||||||
ld a, c
|
ld a, c
|
||||||
+ ld hl, UnownPicPointers
|
+ ld hl, UnownPicPointers
|
||||||
ld d, BANK(UnownPicPointers)
|
ld d, BANK(UnownPicPointers)
|
||||||
.ok
|
.ok
|
||||||
dec a
|
dec a
|
||||||
ld bc, 6
|
ld bc, 6
|
||||||
call AddNTimes
|
call AddNTimes
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
@ -273,12 +273,12 @@ Modify `Pokedex_LoadAnyFootprint`:
|
||||||
|
|
||||||
```diff
|
```diff
|
||||||
- push hl
|
- push hl
|
||||||
ld e, l
|
ld e, l
|
||||||
ld d, h
|
ld d, h
|
||||||
ld hl, vTiles2 tile $62
|
ld hl, vTiles2 tile $62
|
||||||
- lb bc, BANK(Footprints), 2
|
- lb bc, BANK(Footprints), 2
|
||||||
+ lb bc, BANK(Footprints), 4
|
+ lb bc, BANK(Footprints), 4
|
||||||
call Request1bpp
|
call Request1bpp
|
||||||
- pop hl
|
- pop hl
|
||||||
-
|
-
|
||||||
- ; Whoever was editing footprints forgot to fix their
|
- ; Whoever was editing footprints forgot to fix their
|
||||||
|
@ -359,9 +359,9 @@ Move `ITEM_C3` and `ITEM_DC` above all the TMs in every table of item data.
|
||||||
Modify engine/items/items.asm:
|
Modify engine/items/items.asm:
|
||||||
|
|
||||||
```diff
|
```diff
|
||||||
GetTMHMNumber::
|
GetTMHMNumber::
|
||||||
; Return the number of a TM/HM by item id c.
|
; Return the number of a TM/HM by item id c.
|
||||||
ld a, c
|
ld a, c
|
||||||
-; Skip any dummy items.
|
-; Skip any dummy items.
|
||||||
- cp ITEM_C3 ; TM04-05
|
- cp ITEM_C3 ; TM04-05
|
||||||
- jr c, .done
|
- jr c, .done
|
||||||
|
@ -371,14 +371,14 @@ GetTMHMNumber::
|
||||||
-.skip
|
-.skip
|
||||||
- dec a
|
- dec a
|
||||||
-.done
|
-.done
|
||||||
sub TM01
|
sub TM01
|
||||||
inc a
|
inc a
|
||||||
ld c, a
|
ld c, a
|
||||||
ret
|
ret
|
||||||
|
|
||||||
GetNumberedTMHM:
|
GetNumberedTMHM:
|
||||||
; Return the item id of a TM/HM by number c.
|
; Return the item id of a TM/HM by number c.
|
||||||
ld a, c
|
ld a, c
|
||||||
-; Skip any gaps.
|
-; Skip any gaps.
|
||||||
- cp ITEM_C3 - (TM01 - 1)
|
- cp ITEM_C3 - (TM01 - 1)
|
||||||
- jr c, .done
|
- jr c, .done
|
||||||
|
@ -389,10 +389,10 @@ GetNumberedTMHM:
|
||||||
-.skip_one
|
-.skip_one
|
||||||
- inc a
|
- inc a
|
||||||
-.done
|
-.done
|
||||||
add TM01
|
add TM01
|
||||||
dec a
|
dec a
|
||||||
ld c, a
|
ld c, a
|
||||||
ret
|
ret
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue