diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-13 13:04:22 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-05-13 13:04:22 -0700 |
| commit | 4bc797117826dff27cdb0901b10c382d5f4fa4ab (patch) | |
| tree | f8d0432e20330792f04d20598a23a4a941702c6c /engine | |
| parent | 5837b8a4b25bca509431895c241cba269ab5f888 (diff) | |
Rename 'evolution line' to 'catchem mon' because those constants represent catchable pokemon during catchem mode
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/pinball_game/catchem_mode.asm | 10 | ||||
| -rw-r--r-- | engine/pokedex.asm | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engine/pinball_game/catchem_mode.asm b/engine/pinball_game/catchem_mode.asm index f67f1d5..6876345 100644 --- a/engine/pinball_game/catchem_mode.asm +++ b/engine/pinball_game/catchem_mode.asm @@ -74,13 +74,13 @@ StartCatchEmMode: ; 0x1003f ld a, [wCurrentCatchEmMon] ;wow gamefreak
ld c, a
ld b, $0
- ld hl, EvolutionLineIds ;fetch the mon's evolution line
+ ld hl, CatchemMonIds ; fetch the mon's catchem id
add hl, bc
ld c, [hl]
ld h, b
ld l, c
add hl, bc
- add hl, bc ; multiply the evolution line id by 3, add it to pointer to ???
+ add hl, bc ; multiply the catchem mod id by 3, add it to pointer to ???
ld bc, CatchSpriteFrameDurations ;mystery data, seems pokedex related too
add hl, bc
ld a, [hli]
@@ -1217,9 +1217,9 @@ Func_10871: ; 0x10871 ld a, [wCurrentCatchEmMon]
ld c, a
ld b, $0
- ld hl, EvolutionLineIds
+ ld hl, CatchemMonIds
add hl, bc
- ld a, [hl] ; a contains evolution line id
+ ld a, [hl]
ld c, a
ld b, $0
ld l, c
@@ -1352,7 +1352,7 @@ Func_1098c: ; 0x1098c ld a, [wCurrentCatchEmMon]
ld c, a
ld b, $0
- ld hl, EvolutionLineIds
+ ld hl, CatchemMonIds
add hl, bc
ld a, [hl]
ld c, a
diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 107ee19..2bb3cfb 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -1809,9 +1809,9 @@ Func_28bf5: ; 0x28bf5 ld a, [wCurPokedexIndex]
ld c, a
ld b, $0
- ld hl, EvolutionLineIds
+ ld hl, CatchemMonIds
add hl, bc
- ld a, BANK(EvolutionLineIds)
+ ld a, BANK(CatchemMonIds)
call ReadByteFromBank
ld c, a
ld b, $0
|