pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Convert code samples in design_flaws.md to diffs

Browse Source
This commit is contained in:
Thomas Winwood 2018-06-09 23:27:47 +01:00 committed by GitHub
parent 6130fc5cd6
commit 62439a95a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
docs/design_flaws.md
View File

@ -151,21 +151,22 @@ Don't enforce `org $4000` in pokecrystal.link.
Modify `GetFrontpicPointer`: Modify `GetFrontpicPointer`:
```asm ```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
dec a dec a
ld bc, 6 ld bc, 6
call AddNTimes call AddNTimes
@ -174,13 +175,15 @@ Modify `GetFrontpicPointer`:
And `GetMonBackpic`: And `GetMonBackpic`:
```asm ```asm
- ; These are assumed to be at the same address in their respective banks.
- 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
@ -267,11 +270,25 @@ INCBIN "gfx/footprints/wartortle.1bpp"
Modify `Pokedex_LoadAnyFootprint`: Modify `Pokedex_LoadAnyFootprint`:
```asm ```diff
- push hl
- ld e, l
- ld d, h
- ld hl, vTiles2 tile $62
- lb bc, BANK(Footprints), 2
- call Request1bpp
- pop hl
-
- ; Whoever was editing footprints forgot to fix their
- ; tile editor. Now each bottom half is 8 tiles off.
- ld de, 8 tiles
- add hl, de
-
ld e, l ld e, l
ld d, h ld d, h
ld hl, vTiles2 tile $62 ld hl, vTiles2 tile $64
lb bc, BANK(Footprints), 4 - lb bc, BANK(Footprints), 2
+ lb bc, BANK(Footprints), 4
call Request1bpp call Request1bpp
``` ```
@ -340,10 +357,19 @@ 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:
```asm ```diff
GetTMHMNumber:: ; d407 GetTMHMNumber:: ; d407
; 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.
- cp ITEM_C3 ; TM04-05
- jr c, .done
- cp ITEM_DC ; TM28-29
- jr c, .skip
- dec a
-.skip
- dec a
-.done
sub TM01 sub TM01
inc a inc a
ld c, a ld c, a
@ -352,6 +378,16 @@ GetTMHMNumber:: ; d407
GetNumberedTMHM: ; d417 GetNumberedTMHM: ; d417
; 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.
- cp ITEM_C3 - (TM01 - 1)
- jr c, .done
- cp ITEM_DC - (TM01 - 1) - 1
- jr c, .skip_one
-.skip_two
- inc a
-.skip_one
- inc a
-.done
add TM01 add TM01
dec a dec a
ld c, a ld c, a