From 4bc797117826dff27cdb0901b10c382d5f4fa4ab Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 13 May 2018 13:04:22 -0700 Subject: Rename 'evolution line' to 'catchem mon' because those constants represent catchable pokemon during catchem mode --- engine/pinball_game/catchem_mode.asm | 10 +++++----- engine/pokedex.asm | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'engine') 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 -- cgit v1.2.3