diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 18:56:44 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 18:56:44 -0400 |
| commit | 2b7961759b3786725b95ee8f4a0b6e556091db7a (patch) | |
| tree | 6287d4bb7bad7d012f804dc18856341a09fc015b /yellow | |
| parent | Merge branch 'master' of https://github.com/iimarckus/pokered (diff) | |
| download | pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.gz pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.xz pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.zip | |
Fixes.
Diffstat (limited to 'yellow')
| -rwxr-xr-x | yellow/main.asm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/yellow/main.asm b/yellow/main.asm index 94ba27bd..bc3c79ef 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -67,7 +67,7 @@ PlayerPC:: ; 778e (1:778e) dr $778e,$7a0f _RemovePokemon:: ; 7a0f (1:7a0f) dr $7a0f,$7abf -Func_7abf:: ; 7c18 (1:7abf) +_DisplayPokedex:: ; 7c18 (1:7abf) dr $7abf,$8000 SECTION "bank02",ROMX,BANK[$02] @@ -385,8 +385,10 @@ SECTION "Graphics", ROMX, BANK[GFX] PokemonLogoJapanGraphics: INCBIN "gfx/pokemon_logo_japan.2bpp" FontGraphics: INCBIN "gfx/font.1bpp" +FontGraphicsEnd: ABTiles: INCBIN "gfx/AB.2bpp" HpBarAndStatusGraphics: INCBIN "gfx/hp_bar_and_status.2bpp" +HpBarAndStatusGraphicsEnd: BattleHudTiles1: INCBIN "gfx/battle_hud1.1bpp" BattleHudTiles2: INCBIN "gfx/battle_hud2.1bpp" BattleHudTiles3: INCBIN "gfx/battle_hud3.1bpp" @@ -394,6 +396,7 @@ NintendoCopyrightLogoGraphics: INCBIN "gfx/copyright.2bpp" GamefreakLogoGraphics: INCBIN "gfx/gamefreak.2bpp" NineTile: INCBIN "gfx/9_tile.2bpp" TextBoxGraphics: INCBIN "gfx/text_box.2bpp" +TextBoxGraphicsEnd: PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp" WorldMapTileGraphics: INCBIN "gfx/town_map.2bpp" PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" |