shithub: pokecrystal

Download patch

ref: 2a53d758079e461e5cd45c2d9a81f9b70b603815
parent: 68d855c21312f871115984ccc932ce28861cf787
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Fri Feb 2 16:15:15 EST 2018

Similar formatting for similar WRAM areas

--- a/home/text.asm
+++ b/home/text.asm
@@ -568,7 +568,7 @@
 
 
 PlaceDexEnd:: ; 1356
-; Legacy: ends a Pokédex entry (Red).
+; Ends a Pokédex entry in Gen 1.
 ; Dex entries are now regular strings.
 	ld [hl], "."
 	pop hl
--- a/macros/rst.asm
+++ b/macros/rst.asm
@@ -14,10 +14,6 @@
 	rst FarCall
 ENDM
 
-; legacy support for pre-2018 pokecrystal
-callba EQUS "farcall"
-callab EQUS "callfar"
-
 homecall: MACRO
 	ld a, [hROMBank]
 	push af
--- a/wram.asm
+++ b/wram.asm
@@ -940,9 +940,9 @@
 NEXTU ; c800
 ; link data members
 wLinkPlayerName:: ds NAME_LENGTH
-wLinkPartyCount:: db
+wLinkPartyCount::   db
 wLinkPartySpecies:: ds PARTY_LENGTH
-wLinkPartySpeciesEnd:: db ; legacy scripts don't check PartyCount
+wLinkPartyEnd::     db ; Gen 1 scripts don't check PartyCount
 
 UNION ; c813
 ; time capsule party data
@@ -2198,11 +2198,11 @@
 OTPlayerName:: ds NAME_LENGTH ; d26b
 ENDU ; d276
 
-OTPlayerID:: ds 2 ; d276
+OTPlayerID:: dw ; d276
 	ds 8
-OTPartyCount::   ds 1 ; d280
+OTPartyCount::   db ; d280
 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
 ; ot party mons
@@ -2767,9 +2767,9 @@
 
 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
-PartyEnd:: db ; dcde ; legacy scripts don't check PartyCount
+PartyEnd::     db ; dcde ; Gen 1 scripts don't check PartyCount
 
 PartyMons::
 PartyMon1:: party_struct PartyMon1 ; dcdf