pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Finish function labels in battle core

Browse Source
This commit is contained in:
PikalaxALT
2016-01-13 00:39:41 -05:00
parent 2ed6c357af
commit 7cc2571529
4 changed files with 149 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

266
battle/core.asm
View File

File diff suppressed because it is too large Load Diff

2
misc/mobile_40.asm
View File

@@ -2005,7 +2005,7 @@ Function100c98: ; 100c98
dn 2, 0 dn 2, 0
db D_UP | D_DOWN | A_BUTTON | B_BUTTON db D_UP | D_DOWN | A_BUTTON | B_BUTTON
Function100cb5: ; 100cb5 Mobile_PartyMenuSelect: ; 100cb5
call Function100dd8 call Function100dd8
ret c ret c
ld hl, w2DMenuFlags1 ld hl, w2DMenuFlags1

19
sram.asm
View File

@@ -122,16 +122,25 @@ s1_ad0f:: ds 1 ; loaded with 0x7f, used to check save corruption
; b160 ; b160
ds $f4 ds $f4
s1_b254:: ds $c sLinkBattleResults:: ds $c
sLinkBattleStats:: ; b260 sLinkBattleStats:: ; b260
sLinkBattleWins:: ds 2 sLinkBattleWins:: ds 2
sLinkBattleLosses:: ds 2 ; b262 sLinkBattleLosses:: ds 2 ; b262
sLinkBattleDraws:: ds 2 ; b264 sLinkBattleDraws:: ds 2 ; b264
s1_b266:: link_battle_record: MACRO
ds 17 \1Name:: ds NAME_LENGTH +- 1
s1_b277:: \1ID:: ds 2
ds 73 \1Wins:: ds 2
\1Losses:: ds 2
\1Draws:: ds 2
endm
sLinkBattleRecord::
sLinkBattleRecord1:: link_battle_record sLinkBattleRecord1
sLinkBattleRecord2:: link_battle_record sLinkBattleRecord2
sLinkBattleRecord3:: link_battle_record sLinkBattleRecord3
sLinkBattleRecord4:: link_battle_record sLinkBattleRecord4
sLinkBattleRecord5:: link_battle_record sLinkBattleRecord5
sLinkBattleStatsEnd:: sLinkBattleStatsEnd::
sHallOfFame:: ; b2c0 sHallOfFame:: ; b2c0

4
wram.asm
View File

@@ -2173,8 +2173,8 @@ wd271:: ds 5
; SECTION "Enemy Party", WRAMX, BANK [1] ; SECTION "Enemy Party", WRAMX, BANK [1]
OTPlayerName:: ds NAME_LENGTH OTPlayerName:: ds NAME_LENGTH ; d26b
OTPlayerID:: ds 2 OTPlayerID:: ds 2 ; d276
ds 8 ds 8
OTPartyCount:: ds 1 ; d280 OTPartyCount:: ds 1 ; d280
OTPartySpecies:: ds PARTY_LENGTH ; d281 OTPartySpecies:: ds PARTY_LENGTH ; d281