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
This commit is contained in:
@@ -159,7 +159,7 @@ PrintPartyMonPage1: ; 1dc381
|
||||
|
||||
xor a
|
||||
ld [MonType], a
|
||||
farcall CopyPkmnToTempMon
|
||||
farcall Predef_CopyPkmnToTempMon
|
||||
hlcoord 0, 7
|
||||
ld b, 9
|
||||
ld c, 18
|
||||
@@ -215,7 +215,7 @@ PrintPartyMonPage1: ; 1dc381
|
||||
call Function1dc51a
|
||||
call Function1dc52c
|
||||
ld hl, TempMonDVs
|
||||
predef GetUnownLetter
|
||||
predef Predef_GetUnownLetter
|
||||
ld hl, wBoxAlignment
|
||||
xor a
|
||||
ld [hl], a
|
||||
@@ -243,7 +243,7 @@ PrintPartyMonPage2: ; 1dc47b
|
||||
call LoadFontsBattleExtra
|
||||
xor a
|
||||
ld [MonType], a
|
||||
farcall CopyPkmnToTempMon
|
||||
farcall Predef_CopyPkmnToTempMon
|
||||
hlcoord 0, 0
|
||||
ld b, 15
|
||||
ld c, 18
|
||||
@@ -318,7 +318,7 @@ Function1dc51a: ; 1dc51a
|
||||
; 1dc52c
|
||||
|
||||
Function1dc52c: ; 1dc52c
|
||||
farcall GetGender
|
||||
farcall Predef_GetGender
|
||||
ld a, " "
|
||||
jr c, .got_gender
|
||||
ld a, "♂"
|
||||
|
Reference in New Issue
Block a user