diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-25 19:23:01 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-25 19:23:01 -0500 |
| commit | 60add76ee7b74fac4067feb0451eac2b8cf35a03 (patch) | |
| tree | 6248ec6fdc12e41432e2e20cec9a7bde73fe2e04 /engine | |
| parent | cbd423ec0826919a58f0661955bd565d256bdcf1 (diff) | |
* Remove rept 4 (fa3192e)
* FindGreaterThanThatLevel -> FindAboveLevel (132fe46)
* More meaningful egg group names (0eeb00d)
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/breeding.asm | 4 | ||||
| -rw-r--r-- | engine/events/specials.asm | 4 | ||||
| -rwxr-xr-x | engine/search2.asm | 6 | ||||
| -rwxr-xr-x | engine/sprites.asm | 5 |
4 files changed, 10 insertions, 9 deletions
diff --git a/engine/breeding.asm b/engine/breeding.asm index ee8bbbb31..fc183f644 100755 --- a/engine/breeding.asm +++ b/engine/breeding.asm @@ -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. diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 3904f4a31..acfc3c450 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -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 diff --git a/engine/search2.asm b/engine/search2.asm index c43555080..b7112f1f8 100755 --- a/engine/search2.asm +++ b/engine/search2.asm @@ -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 diff --git a/engine/sprites.asm b/engine/sprites.asm index 97ac13559..99d1d2ae4 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -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 |