pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Similar formatting for similar WRAM areas

Browse Source
This commit is contained in:
Rangi 2018-02-02 21:15:15 -05:00
parent 68d855c213
commit 2a53d75807
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
home/text.asm
View File

@ -568,7 +568,7 @@ ContText:: ; 1345
PlaceDexEnd:: ; 1356 PlaceDexEnd:: ; 1356
; Legacy: ends a Pokédex entry (Red). ; Ends a Pokédex entry in Gen 1.
; Dex entries are now regular strings. ; Dex entries are now regular strings.
ld [hl], "." ld [hl], "."
pop hl pop hl

4
macros/rst.asm
View File

@ -14,10 +14,6 @@ callfar: MACRO ; address, bank
rst FarCall rst FarCall
ENDM ENDM
; legacy support for pre-2018 pokecrystal
callba EQUS "farcall"
callab EQUS "callfar"
homecall: MACRO homecall: MACRO
ld a, [hROMBank] ld a, [hROMBank]
push af push af

14
wram.asm
View File

@ -940,9 +940,9 @@ wLinkDataEnd::
NEXTU ; c800 NEXTU ; c800
; link data members ; link data members
wLinkPlayerName:: ds NAME_LENGTH wLinkPlayerName:: ds NAME_LENGTH
wLinkPartyCount:: db wLinkPartyCount:: db
wLinkPartySpecies:: ds PARTY_LENGTH wLinkPartySpecies:: ds PARTY_LENGTH
wLinkPartySpeciesEnd:: db ; legacy scripts don't check PartyCount wLinkPartyEnd:: db ; Gen 1 scripts don't check PartyCount
UNION ; c813 UNION ; c813
; time capsule party data ; time capsule party data
@ -2198,11 +2198,11 @@ NEXTU ; d26b
OTPlayerName:: ds NAME_LENGTH ; d26b OTPlayerName:: ds NAME_LENGTH ; d26b
ENDU ; d276 ENDU ; d276
OTPlayerID:: ds 2 ; d276 OTPlayerID:: dw ; d276
ds 8 ds 8
OTPartyCount:: ds 1 ; d280 OTPartyCount:: db ; d280
OTPartySpecies:: ds PARTY_LENGTH ; d281 OTPartySpecies:: ds PARTY_LENGTH ; d281
OTPartyEnd:: ds 1 ; legacy scripts don't check PartyCount OTPartyEnd:: db ; Gen 1 scripts don't check PartyCount
UNION ; d288 UNION ; d288
; ot party mons ; ot party mons
@ -2767,9 +2767,9 @@ SECTION "Party", WRAMX
wPokemonData:: wPokemonData::
PartyCount:: db ; dcd7 ; number of Pokémon in party PartyCount:: db ; dcd7 ; number of Pokémon in party
PartySpecies:: ds PARTY_LENGTH ; dcd8 ; species of each Pokémon in party PartySpecies:: ds PARTY_LENGTH ; dcd8 ; species of each Pokémon in party
PartyEnd:: db ; dcde ; legacy scripts don't check PartyCount PartyEnd:: db ; dcde ; Gen 1 scripts don't check PartyCount
PartyMons:: PartyMons::
PartyMon1:: party_struct PartyMon1 ; dcdf PartyMon1:: party_struct PartyMon1 ; dcdf