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:
Remy Oukaour
@@ -7,14 +7,14 @@ NUM_STAT_PAGES EQU const_value +- 1
|
||||
BattleStatsScreenInit: ; 4dc7b (13:5c7b)
|
||||
ld a, [wLinkMode]
|
||||
cp LINK_MOBILE
|
||||
jr nz, StatsScreenInit
|
||||
jr nz, Predef_StatsScreenInit
|
||||
|
||||
ld a, [wBattleMode]
|
||||
and a
|
||||
jr z, StatsScreenInit
|
||||
jr z, Predef_StatsScreenInit
|
||||
jr _MobileStatsScreenInit
|
||||
|
||||
StatsScreenInit: ; 4dc8a
|
||||
Predef_StatsScreenInit: ; 4dc8a
|
||||
ld hl, StatsScreenMain
|
||||
jr StatsScreenInit_gotaddress
|
||||
|
||||
@@ -240,7 +240,7 @@ StatsScreen_CopyToTempMon: ; 4ddf2 (13:5df2)
|
||||
jr .done
|
||||
|
||||
.breedmon
|
||||
farcall CopyPkmnToTempMon
|
||||
farcall Predef_CopyPkmnToTempMon
|
||||
ld a, [CurPartySpecies]
|
||||
cp EGG
|
||||
jr z, .done
|
||||
@@ -425,7 +425,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
|
||||
ld a, [hli]
|
||||
ld d, a
|
||||
ld e, [hl]
|
||||
farcall ComputeHPBarPixels
|
||||
farcall Predef_ComputeHPBarPixels
|
||||
ld hl, wCurHPPal
|
||||
call SetHPPal
|
||||
ld b, SCGB_STATS_SCREEN_HP_PALS
|
||||
@@ -435,7 +435,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
|
||||
|
||||
.PlaceGenderChar: ; 4df66 (13:5f66)
|
||||
push hl
|
||||
farcall GetGender
|
||||
farcall Predef_GetGender
|
||||
pop hl
|
||||
ret c
|
||||
ld a, "♂"
|
||||
@@ -453,8 +453,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
|
||||
dw wBufferMonNick
|
||||
; 4df7f
|
||||
|
||||
Function4df7f: ; 4df7f
|
||||
; unreferenced
|
||||
Unreferenced_Function4df7f: ; 4df7f
|
||||
hlcoord 7, 0
|
||||
ld bc, SCREEN_WIDTH
|
||||
ld d, SCREEN_HEIGHT
|
||||
@@ -548,7 +547,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
|
||||
.PinkPage: ; 4e013 (13:6013)
|
||||
hlcoord 0, 9
|
||||
ld b, $0
|
||||
predef DrawPlayerHP
|
||||
predef Predef_DrawPlayerHP
|
||||
hlcoord 8, 9
|
||||
ld [hl], $41 ; right HP/exp bar end cap
|
||||
ld de, .Status_Type
|
||||
@@ -570,7 +569,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
|
||||
hlcoord 6, 13
|
||||
push hl
|
||||
ld de, TempMonStatus
|
||||
predef PlaceStatusString
|
||||
predef Predef_PlaceStatusString
|
||||
pop hl
|
||||
jr nz, .done_status
|
||||
jr .StatusOK
|
||||
@@ -584,7 +583,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
|
||||
call PlaceString
|
||||
.done_status
|
||||
hlcoord 1, 15
|
||||
predef PrintMonTypes
|
||||
predef Predef_PrintMonTypes
|
||||
hlcoord 9, 8
|
||||
ld de, SCREEN_WIDTH
|
||||
ld b, 10
|
||||
@@ -618,7 +617,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
|
||||
ld a, [TempMonLevel]
|
||||
ld b, a
|
||||
ld de, TempMonExp + 2
|
||||
predef FillInExpBar
|
||||
predef Predef_FillInExpBar
|
||||
hlcoord 10, 16
|
||||
ld [hl], $40 ; left exp bar end cap
|
||||
hlcoord 19, 16
|
||||
@@ -711,11 +710,11 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
|
||||
hlcoord 8, 10
|
||||
ld a, SCREEN_WIDTH * 2
|
||||
ld [Buffer1], a
|
||||
predef ListMoves
|
||||
predef Predef_ListMoves
|
||||
hlcoord 12, 11
|
||||
ld a, SCREEN_WIDTH * 2
|
||||
ld [Buffer1], a
|
||||
predef ListMovePP
|
||||
predef Predef_ListMovePP
|
||||
ret
|
||||
|
||||
.GetItemName: ; 4e189 (13:6189)
|
||||
@@ -756,7 +755,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
|
||||
jr nz, .BluePageVerticalDivider
|
||||
hlcoord 11, 8
|
||||
ld bc, 6
|
||||
predef PrintTempMonStats
|
||||
predef Predef_PrintTempMonStats
|
||||
ret
|
||||
|
||||
.PlaceOTInfo: ; 4e1cc (13:61cc)
|
||||
@@ -809,7 +808,7 @@ OTString: ; 4e222
|
||||
|
||||
StatsScreen_PlaceFrontpic: ; 4e226 (13:6226)
|
||||
ld hl, TempMonDVs
|
||||
predef GetUnownLetter
|
||||
predef Predef_GetUnownLetter
|
||||
call StatsScreen_GetAnimationParam
|
||||
jr c, .egg
|
||||
and a
|
||||
@@ -871,11 +870,11 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226)
|
||||
ret c
|
||||
call StatsScreen_LoadTextBoxSpaceGFX
|
||||
ld de, vTiles2 tile $00
|
||||
predef GetAnimatedFrontpicPredef
|
||||
predef Predef_GetAnimatedFrontpic
|
||||
hlcoord 0, 0
|
||||
ld d, $0
|
||||
ld e, ANIM_MON_MENU
|
||||
predef LoadMonAnimation
|
||||
predef Predef_LoadMonAnimation
|
||||
ld hl, wcf64
|
||||
set 6, [hl]
|
||||
ret
|
||||
@@ -969,9 +968,8 @@ StatsScreen_LoadTextBoxSpaceGFX: ; 4e307 (13:6307)
|
||||
ret
|
||||
; 4e32a (13:632a)
|
||||
|
||||
; unreferenced
|
||||
Unknown_4e32a: ; 4e32a
|
||||
; An unused space tile?
|
||||
Unreferenced_4e32a: ; 4e32a
|
||||
; A blank space tile?
|
||||
ds 16
|
||||
; 4e33a
|
||||
|
||||
@@ -1076,11 +1074,11 @@ StatsScreen_AnimateEgg: ; 4e497 (13:6497)
|
||||
ld [wBoxAlignment], a
|
||||
call StatsScreen_LoadTextBoxSpaceGFX
|
||||
ld de, vTiles2 tile $00
|
||||
predef GetAnimatedFrontpicPredef
|
||||
predef Predef_GetAnimatedFrontpic
|
||||
pop de
|
||||
hlcoord 0, 0
|
||||
ld d, $0
|
||||
predef LoadMonAnimation
|
||||
predef Predef_LoadMonAnimation
|
||||
ld hl, wcf64
|
||||
set 6, [hl]
|
||||
ret
|
||||
|
||||
Reference in New Issue
Block a user