diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/link/link.asm | 10 | ||||
| -rwxr-xr-x | engine/pokedex/pokedex.asm | 2 | ||||
| -rwxr-xr-x | engine/pokemon/evolve.asm | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/engine/link/link.asm b/engine/link/link.asm index 5f88a087..11657f4e 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -82,9 +82,9 @@ Gen2ToGen1LinkComms: call Serial_ExchangeBytes ld a, SERIAL_NO_DATA_BYTE ld [de], a - ld hl, wc508 + ld hl, wLink_c508 ld de, wTrademons - ld bc, wTrademons - wc508 + ld bc, wTrademons - wLink_c508 call Serial_ExchangeBytes xor a ldh [rIF], a @@ -226,9 +226,9 @@ Gen2ToGen2LinkComms: call Serial_ExchangeBytes ld a, SERIAL_NO_DATA_BYTE ld [de], a - ld hl, wc508 + ld hl, wLink_c508 ld de, wTrademons - ld bc, wTrademons - wc508 + ld bc, wTrademons - wLink_c508 call Serial_ExchangeBytes ld a, [wLinkMode] cp LINK_TRADECENTER @@ -514,7 +514,7 @@ FixDataForLinkTransfer: ld [hli], a dec b jr nz, .loop2 - ld hl, wc508 + ld hl, wLink_c508 ld a, SERIAL_PREAMBLE_BYTE ld [hli], a ld [hli], a diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 88fb4f39..039766e7 100755 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -2368,7 +2368,7 @@ Pokedex_LoadSelectedMonTiles: ret .QuestionMark: - ld a, 0 + ld a, BANK(sScratch) call OpenSRAM farcall LoadQuestionMarkPic ld hl, vTiles2 diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index dbc1d899..cd7ad782 100755 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -881,7 +881,8 @@ endr ret .GFX: - dr $4273d, $4278d +INCBIN "gfx/evo/bubble_large.2bpp" +INCBIN "gfx/evo/bubble.2bpp" GetPreEvolution: ; Find the first mon to evolve into wCurPartySpecies. |