* Remove rept 4 (fa3192e)

* FindGreaterThanThatLevel -> FindAboveLevel (132fe46)
* More meaningful egg group names (0eeb00d)
This commit is contained in:
Rangi
2018-02-25 19:23:01 -05:00
parent cbd423ec08
commit 60add76ee7
95 changed files with 105 additions and 104 deletions

View File

@@ -112,14 +112,14 @@ CheckBreedmonCompatibility: ; 16e1d
ld [wCurSpecies], a
call GetBaseData
ld a, [wBaseEggGroups]
cp EGG_UNDISCOVERED * $11
cp EGG_NONE * $11
jr z, .Incompatible
ld a, [wBreedMon1Species]
ld [wCurSpecies], a
call GetBaseData
ld a, [wBaseEggGroups]
cp EGG_UNDISCOVERED * $11
cp EGG_NONE * $11
jr z, .Incompatible
; Ditto is automatically compatible with everything.

View File

@@ -50,10 +50,10 @@ UnusedSetSeenMon: ; c252
ret
; c25a
FindPartyMonGreaterThanThatLevel: ; c25a
FindPartyMonAboveLevel: ; c25a
ld a, [wScriptVar]
ld b, a
farcall _FindPartyMonGreaterThanThatLevel
farcall _FindPartyMonAboveLevel
jr z, FoundNone
jr FoundOne

View File

@@ -1,6 +1,6 @@
_FindPartyMonGreaterThanThatLevel: ; 4dbd2
_FindPartyMonAboveLevel: ; 4dbd2
ld hl, wPartyMon1Level
call FindGreaterThanThatLevel
call FindAboveLevel
ret
_FindPartyMonAtLeastThatHappy: ; 4dbd9
@@ -69,7 +69,7 @@ FindAtLeastThatHappy: ; 4dc0a
and a
ret
FindGreaterThanThatLevel: ; 4dc31
FindAboveLevel: ; 4dc31
ld c, $0
ld a, [wPartyCount]
ld d, a

View File

@@ -562,9 +562,10 @@ INCLUDE "data/sprite_anims/oam.asm"
BrokenStdGFXPointers:
; tile count, bank, pointer
; (all pointers were dummied out to .deleted)
rept 4
dbbw 128, $01, .deleted
endr
dbbw 128, $01, .deleted
dbbw 128, $01, .deleted
dbbw 128, $01, .deleted
dbbw 16, $37, .deleted
dbbw 16, $11, .deleted
dbbw 16, $39, .deleted