diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 22:56:36 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 22:56:36 -0500 |
| commit | 5c28d05bb40b47f084a34eb732da92c899e18db6 (patch) | |
| tree | b7e427bbb988bfdc51e347a87f6ab663c1f45a7b /gfx/font.asm | |
| parent | 8e1e583640fcb82cb8d6327a0174a892b4ba0ad2 (diff) | |
| parent | 2c789b64b1bfa9ec33d805d06ad3a7141e3871f1 (diff) | |
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
# Conflicts:
# data/items/descriptions.asm
# data/sprite_anims/framesets.asm
# engine/crystal_colors.asm
# engine/events/kurt.asm
# engine/events/special.asm
# engine/events/std_scripts.asm
# engine/events_3.asm
# engine/item_effects.asm
# engine/namingscreen.asm
# engine/scripting.asm
# engine/stats_screen.asm
# engine/trade_animation.asm
# home/audio.asm
# main.asm
# maps/BattleTower1F.asm
# maps/BattleTowerBattleRoom.asm
# maps/BurnedTowerB1F.asm
# maps/ElmsLab.asm
# maps/GoldenrodDeptStore5F.asm
# maps/GoldenrodUnderground.asm
# maps/HallOfFame.asm
# maps/MahoganyTown.asm
# maps/ManiasHouse.asm
# maps/MobileBattleRoom.asm
# maps/MobileTradeRoomMobile.asm
# maps/RadioTower2F.asm
# maps/Route35NationalParkGate.asm
# maps/Route36NationalParkGate.asm
# maps/Route39Farmhouse.asm
# tilesets/palette_maps.asm
Diffstat (limited to 'gfx/font.asm')
| -rwxr-xr-x | gfx/font.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gfx/font.asm b/gfx/font.asm index fd95c9434..e525df85b 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -83,18 +83,18 @@ INCLUDE "gfx/footprints.asm" ; This and the following two functions are unreferenced. ; Debug, perhaps? -Unknown_fb434: +Unreferenced_fb434: db 0 -Functionfb435: ; 4b435 - ld a, [Unknown_fb434] +Unreferenced_Functionfb435: ; 4b435 + ld a, [Unreferenced_fb434] and a jp nz, Get1bpp_2 jp Get1bpp ; fb43f -Functionfb43f: ; fb43f - ld a, [Unknown_fb434] +Unreferenced_Functionfb43f: ; fb43f + ld a, [Unreferenced_fb434] and a jp nz, Get2bpp_2 jp Get2bpp |