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 /engine/namingscreen.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 'engine/namingscreen.asm')
| -rwxr-xr-x | engine/namingscreen.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index 98a64c775..f16f7176f 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -109,7 +109,7 @@ NamingScreen: ; 116c1 inc de hlcoord 5, 4 call PlaceString - farcall GetGender + farcall Predef_GetGender jr c, .genderless ld a, "♂" jr nz, .place_gender @@ -745,7 +745,7 @@ NamingScreen_AdvanceCursor_CheckEndOfString: ; 11b27 ; 11b39 (4:5b39) -; XXX +; unused ld a, [wNamingScreenCurrNameLength] and a ret z @@ -1043,7 +1043,7 @@ INCBIN "gfx/icons/mail2.2bpp" ; 11f7a (4:5f7a) -.Dummy: ; dummied out +.UnusedString11f7a: db "メールを かいてね@" ; 11f84 @@ -1426,7 +1426,7 @@ MailComposition_TryAddLastCharacter: ; 121ac (4:61ac) ; 121b2 (4:61b2) -; XXX +; unused ld a, [wNamingScreenCurrNameLength] and a ret z |