diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-11-04 19:40:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-04 19:40:58 -0500 |
| commit | 9ebe549347aa16ae3f10d3261242bb1e7bbb6ca6 (patch) | |
| tree | 521a897c2da997534abd6f6adc1625968bc4603a /mobile | |
| parent | c9563d5c5e8e3612ac40d70d6f6f5e03ba231f16 (diff) | |
| parent | d076159745e688bd58f1e512c4e0fcdd942161e9 (diff) | |
Merge pull request #654 from Rangi42/master
Miscellaneous cleanup issues
Diffstat (limited to 'mobile')
| -rw-r--r-- | mobile/mobile_22.asm | 6 | ||||
| -rw-r--r-- | mobile/mobile_5f.asm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 45886f47c..d3d88d9b1 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -183,7 +183,7 @@ Function8921f: pop de ret -Mobile22_ButtonSound: +Mobile22_PromptButton: call JoyWaitAorB call PlayClickSFX ret @@ -2509,7 +2509,7 @@ Function89ff6: call Function89a0c call CloseSRAM call Function891ab - call Mobile22_ButtonSound + call Mobile22_PromptButton jp Function89e36 Function8a03d: @@ -3892,7 +3892,7 @@ Function8ab00: hlcoord 1, 13 call PlaceString call WaitBGMap - call Mobile22_ButtonSound + call Mobile22_PromptButton and a ret diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index c4fae15ac..2350cd0c4 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -716,7 +716,7 @@ Function17d48d: ld de, wc608 ld bc, $40 call CopyBytes - ld hl, TileAttrmap_17eb8e + ld hl, PokemonNewsTileAttrmap decoord 0, 0 bccoord 0, 0, wAttrMap ld a, $12 @@ -3533,8 +3533,8 @@ INCBIN "gfx/mobile/pokemon_news.2bpp" GFX_17eb7e: INCBIN "gfx/unknown/17eb7e.2bpp" -TileAttrmap_17eb8e: -INCBIN "gfx/unknown/17eb8e.attrmap" +PokemonNewsTileAttrmap: +INCBIN "gfx/mobile/pokemon_news.bin" Palette_17eff6: RGB 24, 9, 8 |