Consolidate monster structs in wram and sram.

The PartyMon struct is really the box struct with volatile variables like status added.

Some other labels have been reworked.
Move structs no longer have explicit labels since their location is arbitrary and usually shared.

1 files changed, 160 insertions, 554 deletions

diff --git a/wram.asm b/wram.asm
index eb572b201..77108fc6b 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1,51 +1,72 @@
 INCLUDE "includes.asm"
 
+flag_array: MACRO
+	ds ((\1) + 7) / 8
+ENDM
 
-party_struct: MACRO
-
-\1Species::  db
-\1Item::     db
-
-\1Moves::    ds NUM_MOVES
-
-\1ID::       dw
-\1Exp::      ds 3 ; Big endian
+box_struct_length EQU 32
+box_struct: MACRO
+\1Species::        db
+\1Item::           db
+\1Moves::          ds NUM_MOVES
+\1ID::             dw
+\1Exp::            ds 3
 \1StatExp::
-\1HPExp::    dw
-\1AtkExp::   dw
-\1DefExp::   dw
-\1SpdExp::   dw
-\1SpclExp::  dw
-
-\1DVs::
-\1AtkDefDV:: db
-\1SpdSpcDV:: db
-
-\1PP::       ds NUM_MOVES
-
-\1Happiness::     db
-\1PokerusStatus:: db
-
+\1HPExp::          dw
+\1AtkExp::         dw
+\1DefExp::         dw
+\1SpdExp::         dw
+\1SpcExp::         dw
+\1DVs::            ds 2
+\1PP::             ds NUM_MOVES
+\1Happiness::      db
+\1PokerusStatus::  db
 \1CaughtData::
 \1CaughtTime::
 \1CaughtLevel::    db
 \1CaughtGender::
 \1CaughtLocation:: db
+\1Level::          db
+\1End::
+ENDM
 
-\1Level:: db
-
-\1Status::   db
-\1Unused::   db
-
-; Stats are big endian.
-\1HP::       dw
-\1MaxHP::    dw
-\1Attack::   dw
-\1Defense::  dw
-\1Speed::    dw
-\1SpclAtk::  dw
-\1SpclDef::  dw
+party_struct: MACRO
+	box_struct \1
+\1Status::         db
+\1Unused::         db
+\1HP::             dw
+\1MaxHP::          dw
+\1Stats:: ; big endian
+\1Attack::         dw
+\1Defense::        dw
+\1Speed::          dw
+\1SpclAtk::        dw
+\1SpclDef::        dw
+\1StatsEnd::
+ENDM
 
+battle_struct: MACRO
+\1Species::   db
+\1Item::      db
+\1Moves::     ds NUM_MOVES
+\1MovesEnd::
+\1DVs::       ds 2
+\1PP::        ds NUM_MOVES
+\1Happiness:: db
+\1Level::     db
+\1Status::    ds 2
+\1HP::        dw
+\1MaxHP::     dw
+\1Stats:: ; big endian
+\1Attack::    dw
+\1Defense::   dw
+\1Speed::     dw
+\1SpclAtk::   dw
+\1SpclDef::   dw
+\1StatsEnd::
+\1Type::
+\1Type1::     db
+\1Type2::     db
 ENDM
 
 
@@ -422,100 +443,24 @@ Sprites:: ; c400
 ;		bit 4: pal # (non-cgb)
 ;		bit 3: vram bank (cgb only)
 ;		bit 2-0: pal # (cgb only)
-	ds 160
+	ds 4 * 40
 SpritesEnd::
 
 TileMap:: ; c4a0
 ; 20x18 grid of 8x8 tiles
-	ds 360
+	ds SCREEN_WIDTH * SCREEN_HEIGHT
 TileMapEnd::
 
-SECTION "BattleMons",WRAM0[$c608]
-
-EnemyMoveStruct::
-EnemyMoveAnimation:: ; c608
-	ds 1
-EnemyMoveEffect:: ; c609
-	ds 1
-EnemyMovePower:: ; c60a
-	ds 1
-EnemyMoveType:: ; c60b
-	ds 1
-EnemyMoveAccuracy:: ; c60c
-	ds 1
-EnemyMovePP:: ; c60d
-	ds 1
-EnemyMoveEffectChance:: ; c60e
-	ds 1
-
-PlayerMoveStruct::
-PlayerMoveAnimation:: ; c60f
-	ds 1
-PlayerMoveEffect:: ; c610
-	ds 1
-PlayerMovePower:: ; c611
-	ds 1
-PlayerMoveType:: ; c612
-	ds 1
-PlayerMoveAccuracy:: ; c613
-	ds 1
-PlayerMovePP:: ; c614
-	ds 1
-PlayerMoveEffectChance:: ; c615
-	ds 1
-
-EnemyMonNick:: ; c616
-	ds 11
-BattleMonNick:: ; c621
-	ds 11
-
 
-BattleMonSpecies:: ; c62c
-	ds 1
-BattleMonItem:: ; c62d
-	ds 1
+wBattle::
 
-BattleMonMoves:: ; c62e
-	ds NUM_MOVES
+wEnemyMoveStruct::  ds MOVE_LENGTH ; c608
+wPlayerMoveStruct:: ds MOVE_LENGTH ; c60f
 
-BattleMonDVs::
-BattleMonAtkDefDV:: ; c632
-	ds 1
-BattleMonSpdSpclDV:: ; c633
-	ds 1
-
-BattleMonPP:: ; c634
-	ds NUM_MOVES
-
-BattleMonHappiness:: ; c638
-	ds 1
-BattleMonLevel:: ; c639
-	ds 1
-
-BattleMonStatus:: ; c63a
-	ds 2
-
-BattleMonHP:: ; c63c
-	ds 2
-BattleMonMaxHP:: ; c63e
-	ds 2
-
-BattleMonAtk:: ; c640
-	ds 2
-BattleMonDef:: ; c642
-	ds 2
-BattleMonSpd:: ; c644
-	ds 2
-BattleMonSpclAtk:: ; c646
-	ds 2
-BattleMonSpclDef:: ; c648
-	ds 2
-
-BattleMonType1:: ; c64a
-	ds 1
-BattleMonType2:: ; c64b
-	ds 1
+EnemyMonNick::  ds 11 ; c616
+BattleMonNick:: ds 11 ; c621
 
+BattleMon:: battle_struct BattleMon ; c62c
 	ds 10
 
 OTName:: ; c656
@@ -812,7 +757,10 @@ EffectFailed:: ; c70d
 FailedMessage:: ; c70e
 	ds 1
 
-	ds 3
+	ds 1
+
+wPlayerIsSwitching:: ds 1 ; c710
+wEnemyIsSwitching::  ds 1 ; c711
 
 PlayerUsedMoves:: ; c712
 ; add a move that has been used once by the player
@@ -826,11 +774,14 @@ LastPlayerMove:: ; c71b
 LastEnemyMove:: ; c71c
 	ds 1
 
+	ds 23
 
-SECTION "battle",WRAM0[$c734]
 BattleEnded:: ; c734
 	ds 1
 
+	ds 12
+wBattleEnd::
+; c741
 
 SECTION "overworldmap",WRAM0[$c800]
 OverworldMap:: ; c800
@@ -868,7 +819,7 @@ AttrMap:: ; cdd9
 ; read horizontally from the top row
 ; bit 3: vram bank
 ; bit 0-2: palette id
-	ds 360
+	ds SCREEN_WIDTH * SCREEN_HEIGHT
 
 	ds 30
 	
@@ -1071,7 +1022,6 @@ CurPartyMon:: ; d109
 
 TempMon::
 	party_struct TempMon
-TempMonEnd:: ; d13e
 
 	ds 3
 
@@ -1214,7 +1164,7 @@ TilesetPalettes:: ; d1e6
 	ds 2
 
 EvolvableFlags:: ; d1e8
-	ds 1
+	flag_array PARTY_LENGTH
 
 	ds 1
 
@@ -1229,76 +1179,13 @@ SECTION "BattleMons2",WRAMX[$d1fa],BANK[1]
 LinkBattleRNs:: ; d1fa
 	ds 10
 
-TempEnemyMonSpecies:: ; d204
-	ds 1
-TempBattleMonSpecies:: ; d205
-	ds 1
-
-EnemyMon::
-EnemyMonSpecies:: ; d206
-	ds 1
-EnemyMonItem:: ; d207
-	ds 1
-
-EnemyMonMoves:: ; d208
-	ds NUM_MOVES
-EnemyMonMovesEnd::
-
-EnemyMonDVs::
-EnemyMonAtkDefDV:: ; d20c
-	ds 1
-EnemyMonSpdSpclDV:: ; d20d
-	ds 1
-	
-EnemyMonPP:: ; d20e
-	ds NUM_MOVES
-
-EnemyMonHappiness:: ; d212
-	ds 1
-EnemyMonLevel:: ; d213
-	ds 1
-	
-EnemyMonStatus:: ; d214
-	ds 2
-
-EnemyMonHP::
-EnemyMonHPHi:: ; d216
-	ds 1
-EnemyMonHPLo:: ; d217
-	ds 1
-
-EnemyMonMaxHP::
-EnemyMonMaxHPHi:: ; d218
-	ds 1
-EnemyMonMaxHPLo:: ; d219
-	ds 1
-
-EnemyMonStats::
-EnemyMonAtk:: ; d21a
-	ds 2
-EnemyMonDef:: ; d21c
-	ds 2
-EnemyMonSpd:: ; d21e
-	ds 2
-EnemyMonSpclAtk:: ; d220
-	ds 2
-EnemyMonSpclDef:: ; d222
-	ds 2
-EnemyMonStatsEnd::
-
-EnemyMonType1:: ; d224
-	ds 1
-EnemyMonType2:: ; d225
-	ds 1
-
-EnemyMonBaseStats:: ; d226
-	ds 5
-
-EnemyMonCatchRate:: ; d22b
-	ds 1
-EnemyMonBaseExp:: ; d22c
-	ds 1
+TempEnemyMonSpecies::  ds 1 ; d204
+TempBattleMonSpecies:: ds 1 ; d205
 
+EnemyMon:: battle_struct EnemyMon ; d206
+EnemyMonBaseStats:: ds 5 ; d226
+EnemyMonCatchRate:: db ; d22b
+EnemyMonBaseExp::   db ; d22c
 EnemyMonEnd::
 
 
@@ -1402,57 +1289,23 @@ SECTION "TimeOfDay",WRAMX[$d269],BANK[1]
 TimeOfDay:: ; d269
 	ds 1
 
+
 SECTION "OTParty",WRAMX[$d280],BANK[1]
 
-OTPartyCount:: ; d280
-	ds 1 ; number of Pokémon in party
-OTPartySpecies:: ; d281
-	ds 6 ; species of each Pokémon in party
-; d287
-	ds 1 ; any empty slots including the 7th must be FF
-	     ; or the routine will keep going
-
-OTPartyMon1:: ; d288
-	party_struct OTPartyMon1
-OTPartyMon2:: ; d2b8
-	party_struct OTPartyMon2
-OTPartyMon3:: ; d2e8
-	party_struct OTPartyMon3
-OTPartyMon4:: ; d318
-	party_struct OTPartyMon4
-OTPartyMon5:: ; d348
-	party_struct OTPartyMon5
-OTPartyMon6:: ; d378
-	party_struct OTPartyMon6
-
-
-OTPartyMonOT::
-OTPartyMon1OT:: ; d3a8
-	ds 11
-OTPartyMon2OT:: ; d3b3
-	ds 11
-OTPartyMon3OT:: ; d3be
-	ds 11
-OTPartyMon4OT:: ; d3c9
-	ds 11
-OTPartyMon5OT:: ; d3d4
-	ds 11
-OTPartyMon6OT:: ; d3df
-	ds 11
+OTPartyCount::   ds 1 ; d280
+OTPartySpecies:: ds 6 ; d281
+OTPartyEnd::     ds 1
+
+OTPartyMon1:: party_struct OTPartyMon1 ; d288
+OTPartyMon2:: party_struct OTPartyMon2 ; d2b8
+OTPartyMon3:: party_struct OTPartyMon3 ; d2e8
+OTPartyMon4:: party_struct OTPartyMon4 ; d318
+OTPartyMon5:: party_struct OTPartyMon5 ; d348
+OTPartyMon6:: party_struct OTPartyMon6 ; d378
+
+OTPartyMonOT:: ds 11 * 6 ; d3a8
+OTPartyMonNicknames:: ds 11 * 6 ; d3ea
 
-OTPartyMonNicknames::
-OTPartyMon1Nickname:: ; d3ea
-	ds 11
-OTPartyMon2Nickname:: ; d3f5
-	ds 11
-OTPartyMon3Nickname:: ; d400
-	ds 11
-OTPartyMon4Nickname:: ; d40b
-	ds 11
-OTPartyMon5Nickname:: ; d416
-	ds 11
-OTPartyMon6Nickname:: ; d421
-	ds 11
 
 SECTION "Map Events", WRAMX[$d432], BANK[1]
 MapStatus:: ; d432
@@ -1789,7 +1642,7 @@ EventFlags:: ; da72
 ;PoliceAtElmsLabEvent:: ; db52
 ;SalesmanMahoganyTownEvent:: ; db5c
 ;RedGyaradosEvent:: ; db5c
-	ds 250
+	flag_array 2000
 ; db6c
 
 SECTION "Boxes",WRAMX[$db72],BANK[1]
@@ -1800,35 +1653,7 @@ wCurBox:: ; db72
 	ds 2
 
 ; 8 chars + $50
-wBoxNames::
-Box1Name:: ; db75
-	ds 9
-Box2Name:: ; db7e
-	ds 9
-Box3Name:: ; db87
-	ds 9
-Box4Name:: ; db90
-	ds 9
-Box5Name:: ; db99
-	ds 9
-Box6Name:: ; dba2
-	ds 9
-Box7Name:: ; dbab
-	ds 9
-Box8Name:: ; dbb4
-	ds 9
-Box9Name:: ; dbbd
-	ds 9
-Box10Name:: ; dbc6
-	ds 9
-Box11Name:: ; dbcf
-	ds 9
-Box12Name:: ; dbd8
-	ds 9
-Box13Name:: ; dbe1
-	ds 9
-Box14Name:: ; dbea
-	ds 9
+wBoxNames:: ds 9 * NUM_BOXES ; db75
 
 SECTION "bike", WRAMX[$dbf5],BANK[1]
 BikeFlags:: ; dbf5
@@ -1867,7 +1692,7 @@ PoisonStepCount:: ; dc74
 
 SECTION "Visited Spawn Points", WRAMX[$dca5],BANK[1]
 VisitedSpawns:: ; dca5
-	ds 4
+	flag_array 27
 
 SECTION "BackupMapInfo", WRAMX[$dcad],BANK[1]
 
@@ -1901,155 +1726,87 @@ PartyEnd:: ; dcde
 	ds 1 ; legacy functions don't check PartyCount
 		 
 PartyMons::
-PartyMon1:: ; dcdf
-	party_struct PartyMon1
-PartyMon2:: ; dd0f
-	party_struct PartyMon2
-PartyMon3:: ; dd3f
-	party_struct PartyMon3
-PartyMon4:: ; dd6f
-	party_struct PartyMon4
-PartyMon5:: ; dd9f
-	party_struct PartyMon5
-PartyMon6:: ; ddcf
-	party_struct PartyMon6
-
-PartyMonOT::
-PartyMon1OT:: ; ddff
-	ds 11
-PartyMon2OT:: ; de0a
-	ds 11
-PartyMon3OT:: ; de15
-	ds 11
-PartyMon4OT:: ; de20
-	ds 11
-PartyMon5OT:: ; de2b
-	ds 11
-PartyMon6OT:: ; de36
-	ds 11
+PartyMon1:: party_struct PartyMon1 ; dcdf
+PartyMon2:: party_struct PartyMon2 ; dd0f
+PartyMon3:: party_struct PartyMon3 ; dd3f
+PartyMon4:: party_struct PartyMon4 ; dd6f
+PartyMon5:: party_struct PartyMon5 ; dd9f
+PartyMon6:: party_struct PartyMon6 ; ddcf
 
-PartyMonNicknames::
-PartyMon1Nickname:: ; de41
-	ds 11
-PartyMon2Nickname:: ; de4c
-	ds 11
-PartyMon3Nickname:: ; de57
-	ds 11
-PartyMon4Nickname:: ; de62
-	ds 11
-PartyMon5Nickname:: ; de6d
-	ds 11
-PartyMon6Nickname:: ; de78
-	ds 11
+PartyMonOT:: ds 11 * 6 ; ddff
+
+PartyMonNicknames:: ds 11 * 6 ; de41
 PartyMonNicknamesEnd::
 
-SECTION "Pokedex",WRAMX[$de99],BANK[1]
+
+SECTION "Pokedex", WRAMX[$de99], BANK[1]
+
 PokedexCaught:: ; de99
-	ds 32
+	flag_array 251
 EndPokedexCaught::
+
 PokedexSeen:: ; deb9
-	ds 32
+	flag_array 251
 EndPokedexSeen::
+
 UnownDex:: ; ded9
 	ds 26
 UnlockedUnowns:: ; def3
 	ds 1
 
-SECTION "Breeding",WRAMX[$def5],BANK[1]
-DaycareMan:: ; def5
+	ds 1
+
+wDaycareMan:: ; def5
 ; bit 7: active
 ; bit 6: monsters are compatible
 ; bit 5: egg ready
 ; bit 0: monster 1 in daycare
 	ds 1
 
-BreedMon1::
-BreedMon1Nick:: ; def6
-	ds 11
-BreedMon1OT:: ; df01
-	ds 11
-BreedMon1Stats::
-BreedMon1Species:: ; df0c
-	ds 1
-	ds 31
+wBreedMon1::
+wBreedMon1Nick:: ds PKMN_NAME_LENGTH ; def6
+wBreedMon1OT::   ds NAME_LENGTH ; df01
+wBreedMon1Stats:: box_struct wBreedMon1 ; df0c
 
-DaycareLady:: ; df2c
+wDaycareLady:: ; df2c
 ; bit 7: active
 ; bit 0: monster 2 in daycare
 	ds 1
 
-StepsToEgg:: ; df2d
+wStepsToEgg:: ; df2d
 	ds 1
-DittoInDaycare:: ; df2e
+wDittoInDaycare:: ; df2e
 ;  z: yes
 ; nz: no
 	ds 1
 
-BreedMon2::
-BreedMon2Nick:: ; df2f
-	ds 11
-BreedMon2OT:: ; df3a
-	ds 11
-BreedMon2Stats::
-BreedMon2Species:: ; df45
-	ds 1
-	ds 31
+wBreedMon2::
+wBreedMon2Nick:: ds PKMN_NAME_LENGTH ; df2f
+wBreedMon2OT::   ds NAME_LENGTH ; df3a
+wBreedMon2Stats:: box_struct wBreedMon2 ; df45
 
-EggNick:: ; df65
-; EGG@
-	ds 11
-EggOT:: ; df70
-	ds 11
-EggMon::
-EggSpecies:: ; df7b
-	ds 1
-	ds 31
+wEggNick:: ds PKMN_NAME_LENGTH ; df65
+wEggOT::   ds NAME_LENGTH ; df70
+wEggMon:: box_struct wEggMon ; df7b
 
 	ds 1
 
-wContestMon:: ; df9c
-	party_struct wContestMon
+wContestMon:: party_struct wContestMon ; df9c
 
 	ds 3
 
-RoamMon1Species:: ; dfcf
-	ds 1
-RoamMon1Level:: ; dfd0
-	ds 1
-RoamMon1MapGroup:: ; dfd1
-	ds 1
-RoamMon1MapNumber:: ; dfd2
-	ds 1
-RoamMon1HP:: ; dfd3
-	ds 1
-RoamMon1DVs:: ; dfd4
-	ds 2
-
-RoamMon2Species:: ; dfd6
-	ds 1
-RoamMon2Level:: ; dfd7
-	ds 1
-RoamMon2MapGroup:: ; dfd8
-	ds 1
-RoamMon2MapNumber:: ; dfd9
-	ds 1
-RoamMon2HP:: ; dfda
-	ds 1
-RoamMon2DVs:: ; dfdb
-	ds 2
+roam_struct: MACRO
+\1Species::   db
+\1Level::     db
+\1MapGroup::  db
+\1MapNumber:: db
+\1HP::        ds 1
+\1DVs::       ds 2
+ENDM
 
-RoamMon3Species:: ; dfdd
-	ds 1
-RoamMon3Level:: ; dfde
-	ds 1
-RoamMon3MapGroup:: ; dfdf
-	ds 1
-RoamMon3MapNumber:: ; dfe0
-	ds 1
-RoamMon3HP:: ; dfe1
-	ds 1
-RoamMon3DVs:: ; dfe2
-	ds 2
+wRoamMon1:: roam_struct wRoamMon1 ; dfcf
+wRoamMon2:: roam_struct wRoamMon2 ; dfd6
+wRoamMon3:: roam_struct wRoamMon3 ; dfdd
 
 
 
@@ -2107,175 +1864,24 @@ BattleAnimTemps:: ; d419
 	ds 8
 
 
-SECTION "SRAMBank1",SRAM,BANK[1]
+SECTION "Scratch", SRAM, BANK[0]
 
-SECTION "BoxMons",SRAM[$ad10],BANK[1]
-BoxCount:: ; ad10
-	ds 1
-BoxSpecies:: ; ad11
-	ds 20
-	ds 1
-BoxMons::
-BoxMon1::
-BoxMon1Species:: ; ad26
-	ds 1
-BoxMon1Item:: ; ad27
-	ds 1
-BoxMon1Moves:: ; ad28
-	ds 4
-BoxMon1ID:: ; ad2c
-	ds 2
-BoxMon1Exp:: ; ad2e
-	ds 3
-BoxMon1HPExp:: ; ad31
-	ds 2
-BoxMon1AtkExp:: ; ad33
-	ds 2
-BoxMon1DefExp:: ; ad35
-	ds 2
-BoxMon1SpdExp:: ; ad37
-	ds 2
-BoxMon1SpcExp:: ; ad39
-	ds 2
-BoxMon1DVs:: ; ad3b
-	ds 2
-BoxMon1PP:: ; ad3d
-	ds 4
-BoxMon1Happiness:: ; ad41
-	ds 1
-BoxMon1PokerusStatus:: ; ad42
-	ds 1
-BoxMon1CaughtData::
-BoxMon1CaughtTime::
-BoxMon1CaughtLevel:: ; ad43
-	ds 1
-BoxMon1CaughtGender::
-BoxMon1CaughtLocation:: ; ad44
-	ds 1
-BoxMon1Level:: ; ad45
-	ds 1
 
-BoxMon2:: ; ad46
-	ds 32
-BoxMon3:: ; ad66
-	ds 32
-BoxMon4:: ; ad86
-	ds 32
-BoxMon5:: ; ada6
-	ds 32
-BoxMon6:: ; adc6
-	ds 32
-BoxMon7:: ; ade6
-	ds 32
-BoxMon8:: ; ae06
-	ds 32
-BoxMon9:: ; ae26
-	ds 32
-BoxMon10:: ; ae46
-	ds 32
-BoxMon11:: ; ae66
-	ds 32
-BoxMon12:: ; ae86
-	ds 32
-BoxMon13:: ; aea6
-	ds 32
-BoxMon14:: ; aec6
-	ds 32
-BoxMon15:: ; aee6
-	ds 32
-BoxMon16:: ; af06
-	ds 32
-BoxMon17:: ; af26
-	ds 32
-BoxMon18:: ; af46
-	ds 32
-BoxMon19:: ; af66
-	ds 32
-BoxMon20:: ; af86
-	ds 32
+SECTION "SRAM Bank 1", SRAM, BANK[1]
 
-BoxMonOT::
-BoxMon1OT:: ; afa6
-	ds 11
-BoxMon2OT:: ; afb1
-	ds 11
-BoxMon3OT:: ; afbc
-	ds 11
-BoxMon4OT:: ; afc7
-	ds 11
-BoxMon5OT:: ; afd2
-	ds 11
-BoxMon6OT:: ; afdd
-	ds 11
-BoxMon7OT:: ; afe8
-	ds 11
-BoxMon8OT:: ; aff3
-	ds 11
-BoxMon9OT:: ; affe
-	ds 11
-BoxMon10OT:: ; b009
-	ds 11
-BoxMon11OT:: ; b014
-	ds 11
-BoxMon12OT:: ; b01f
-	ds 11
-BoxMon13OT:: ; b02a
-	ds 11
-BoxMon14OT:: ; b035
-	ds 11
-BoxMon15OT:: ; b040
-	ds 11
-BoxMon16OT:: ; b04b
-	ds 11
-BoxMon17OT:: ; b056
-	ds 11
-BoxMon18OT:: ; b061
-	ds 11
-BoxMon19OT:: ; b06c
-	ds 11
-BoxMon20OT:: ; b077
-	ds 11
+SECTION "BoxMons", SRAM[$ad10], BANK[1]
 
-BoxMonNicknames::
-BoxMon1Nickname:: ; b082
-	ds 11
-BoxMon2Nickname:: ; b08d
-	ds 11
-BoxMon3Nickname:: ; b098
-	ds 11
-BoxMon4Nickname:: ; b0a3
-	ds 11
-BoxMon5Nickname:: ; b0ae
-	ds 11
-BoxMon6Nickname:: ; b0b9
-	ds 11
-BoxMon7Nickname:: ; b0c4
-	ds 11
-BoxMon8Nickname:: ; b0cf
-	ds 11
-BoxMon9Nickname:: ; b0da
-	ds 11
-BoxMon10Nickname:: ; b0e5
-	ds 11
-BoxMon11Nickname:: ; b0f0
-	ds 11
-BoxMon12Nickname:: ; b0fb
-	ds 11
-BoxMon13Nickname:: ; b106
-	ds 11
-BoxMon14Nickname:: ; b111
-	ds 11
-BoxMon15Nickname:: ; b11c
-	ds 11
-BoxMon16Nickname:: ; b127
-	ds 11
-BoxMon17Nickname:: ; b132
-	ds 11
-BoxMon18Nickname:: ; b13d
-	ds 11
-BoxMon19Nickname:: ; b148
-	ds 11
-BoxMon20Nickname:: ; b153
-	ds 11
-BoxMonNicknamesEnd::
+sBoxCount::   ds 1 ; ad10
+sBoxSpecies:: ds MONS_PER_BOX ; ad11
+	ds 1
+
+sBoxMons:: ; ad26
+sBoxMon1:: box_struct sBoxMon1
+sBoxMon2::
+	ds box_struct_length * (MONS_PER_BOX +- 1)
+
+sBoxMonOT:: ds 11 * 20 ; afa6
 
+sBoxMonNicknames:: ds 11 * 20 ; b082
+sBoxMonNicknamesEnd::
+; b15e