diff options
| author | mid-kid <esteve.varela@gmail.com> | 2020-02-21 21:11:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-21 21:11:36 +0100 |
| commit | 9a927c1b3efa2eca886f346a4fcca0eb57278faf (patch) | |
| tree | dce155e5ae72070b008d21e3fc6b2bacf4f970a3 /engine/items | |
| parent | 18013b468ad51c5a4979187c9608ba7d5ba3237a (diff) | |
| parent | 2a8c969bc7b10d9cc4c29f6660726ce1c943a597 (diff) | |
Merge pull request #685 from mid-kid/master
Moshi moshi? minoru enhansumentsu desu
Diffstat (limited to 'engine/items')
| -rw-r--r-- | engine/items/item_effects.asm | 4 | ||||
| -rw-r--r-- | engine/items/pack.asm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 96e0e0047..11928cd63 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -697,7 +697,7 @@ PokeBallEffect: jr z, .toss call ClearBGPalettes - call ClearTileMap + call ClearTilemap .toss ld hl, wNumItems @@ -1761,7 +1761,7 @@ ItemActionTextWaitButton: xor a ldh [hBGMapMode], a hlcoord 0, 0 - ld bc, wTileMapEnd - wTileMap + ld bc, wTilemapEnd - wTilemap ld a, " " call ByteFill ld a, [wPartyMenuActionText] diff --git a/engine/items/pack.asm b/engine/items/pack.asm index f19539b88..1331c039f 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -1326,7 +1326,7 @@ Pack_InterpretJoypad: Pack_InitGFX: call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites call DisableLCD ld hl, PackMenuGFX |