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

Clean up some Odd Egg and Battle Tower code and data

Browse Source 
Fixes #589
This commit is contained in:
Rangi 2019-01-02 19:04:50 -05:00
parent 583838a39d
commit b975f3e068
7 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/battle_tower_constants.asm
View File

@ -5,7 +5,7 @@ BATTLETOWER_NUM_UNIQUE_MON EQU 21
BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70 BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70
BATTLETOWER_TRAINERDATALENGTH EQU $24 BATTLETOWER_TRAINERDATALENGTH EQU $24
BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * (PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH BATTLE_TOWER_STRUCT_LENGTH EQUS "(NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * NICKNAMED_MON_STRUCT_LENGTH + BATTLETOWER_TRAINERDATALENGTH)"
; BattleTowerAction writebyte arguments (see engine/events/battle_tower/battle_tower.asm) ; BattleTowerAction writebyte arguments (see engine/events/battle_tower/battle_tower.asm)
const_def const_def

12
constants/pokemon_data_constants.asm
View File

@ -97,6 +97,8 @@ MON_SAT EQUS "(wPartyMon1SpclAtk - wPartyMon1)"
MON_SDF EQUS "(wPartyMon1SpclDef - wPartyMon1)" MON_SDF EQUS "(wPartyMon1SpclDef - wPartyMon1)"
BOXMON_STRUCT_LENGTH EQUS "(wPartyMon1End - wPartyMon1)" BOXMON_STRUCT_LENGTH EQUS "(wPartyMon1End - wPartyMon1)"
PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)" PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)"
NICKNAMED_MON_STRUCT_LENGTH EQUS "(PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH)"
REDMON_STRUCT_LENGTH EQU 44 REDMON_STRUCT_LENGTH EQU 44
; caught data ; caught data
@ -121,9 +123,9 @@ MONS_PER_BOX EQU 20
NUM_BOXES EQU 14 NUM_BOXES EQU 14
; hall of fame ; hall of fame
HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH + -1) ; species, id, dvs, level, nick HOF_MON_LENGTH EQU 1 + 2 + 2 + 1 + (MON_NAME_LENGTH + -1) ; species, id, dvs, level, nick
HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator HOF_LENGTH EQU 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator
NUM_HOF_TEAMS = 30 NUM_HOF_TEAMS EQU 30
; evolution types (used in data/pokemon/evos_attacks.asm) ; evolution types (used in data/pokemon/evos_attacks.asm)
const_def 1 const_def 1
@ -150,8 +152,8 @@ NUM_HOF_TEAMS = 30
NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size
NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size
GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2 GRASS_WILDDATA_LENGTH EQU 2 + (1 + NUM_GRASSMON * 2) * 3
WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2 WATER_WILDDATA_LENGTH EQU 2 + (1 + NUM_WATERMON * 2) * 1
FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3 FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3
NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm) NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm)

30
data/events/odd_eggs.asm
View File

@ -29,7 +29,6 @@ prob_total = 0
OddEggs: OddEggs:
OddEgg1:
db PICHU db PICHU
db NO_ITEM db NO_ITEM
db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0 db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0
@ -43,7 +42,7 @@ OddEgg1:
bigdw 0 bigdw 0
dn 0, 0, 0, 0 ; DVs dn 0, 0, 0, 0 ; DVs
db 30, 20, 10, 0 ; PP db 30, 20, 10, 0 ; PP
db 20 ; Happiness db 20 ; Step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level db 5 ; Level
db 0, 0 ; Status db 0, 0 ; Status
@ -55,7 +54,6 @@ OddEgg1:
bigdw 8 ; SAtk bigdw 8 ; SAtk
bigdw 8 ; SDef bigdw 8 ; SDef
db "EGG@@@@@@@@" db "EGG@@@@@@@@"
OddEgg1End:
db PICHU db PICHU
db NO_ITEM db NO_ITEM
@ -70,7 +68,7 @@ OddEgg1End:
bigdw 0 bigdw 0
dn 2, 10, 10, 10 ; DVs dn 2, 10, 10, 10 ; DVs
db 30, 20, 10, 0 ; PP db 30, 20, 10, 0 ; PP
db 20 ; Happiness db 20 ; Step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level db 5 ; Level
db 0, 0 ; Status db 0, 0 ; Status
@ -96,7 +94,7 @@ OddEgg1End:
bigdw 0 bigdw 0
dn 0, 0, 0, 0 ; DVs dn 0, 0, 0, 0 ; DVs
db 35, 20, 10, 0 ; PP db 35, 20, 10, 0 ; PP
db 20 ; Happiness db 20 ; Step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level db 5 ; Level
db 0, 0 ; Status db 0, 0 ; Status
@ -122,7 +120,7 @@ OddEgg1End:
bigdw 0 bigdw 0
dn 2, 10, 10, 10 ; DVs dn 2, 10, 10, 10 ; DVs
db 35, 20, 10, 0 ; PP db 35, 20, 10, 0 ; PP
db 20 ; Happiness db 20 ; Step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level db 5 ; Level
db 0, 0 ; Status db 0, 0 ; Status
@ -148,7 +146,7 @@ OddEgg1End:
bigdw 0 bigdw 0
dn 0, 0, 0, 0 ; DVs dn 0, 0, 0, 0 ; DVs
db 15, 20, 10, 0 ; PP db 15, 20, 10, 0 ; PP
db 20 ; Happiness db 20 ; Step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level db 5 ; Level
db 0, 0 ; Status db 0, 0 ; Status
@ -174,7 +172,7 @@ OddEgg1End:
bigdw 0 bigdw 0
dn 2, 10, 10, 10 ; DVs dn 2, 10, 10, 10 ; DVs
db 15, 20, 10, 0 ; PP db 15, 20, 10, 0 ; PP
db 20 ; Happiness db 20 ; Step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level db 5 ; Level
db 0, 0 ; Status db 0, 0 ; Status
@ -200,7 +198,7 @@ OddEgg1End:
bigdw 0 bigdw 0
dn 0, 0, 0, 0 ; DVs dn 0, 0, 0, 0 ; DVs
db 35, 30, 10, 0 ; PP db 35, 30, 10, 0 ; PP
db 20 ; Happiness db 20 ; Step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level db 5 ; Level
db 0, 0 ; Status db 0, 0 ; Status
@ -226,7 +224,7 @@ OddEgg1End:
bigdw 0 bigdw 0
dn 2, 10, 10, 10 ; DVs dn 2, 10, 10, 10 ; DVs
db 35, 30, 10, 0 ; PP db 35, 30, 10, 0 ; PP
db 20 ; Happiness db 20 ; Step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level db 5 ; Level
db 0, 0 ; Status db 0, 0 ; Status
@ -252,7 +250,7 @@ OddEgg1End:
bigdw 0 bigdw 0
dn 0, 0, 0, 0 ; DVs dn 0, 0, 0, 0 ; DVs
db 25, 10, 0, 0 ; PP db 25, 10, 0, 0 ; PP
db 20 ; Happiness db 20 ; Step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level db 5 ; Level
db 0, 0 ; Status db 0, 0 ; Status
@ -278,7 +276,7 @@ OddEgg1End:
bigdw 0 bigdw 0
dn 2, 10, 10, 10 ; DVs dn 2, 10, 10, 10 ; DVs
db 25, 10, 0, 0 ; PP db 25, 10, 0, 0 ; PP
db 20 ; Happiness db 20 ; Step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level db 5 ; Level
db 0, 0 ; Status db 0, 0 ; Status
@ -304,7 +302,7 @@ OddEgg1End:
bigdw 0 bigdw 0
dn 0, 0, 0, 0 ; DVs dn 0, 0, 0, 0 ; DVs
db 30, 30, 10, 0 ; PP db 30, 30, 10, 0 ; PP
db 20 ; Happiness db 20 ; Step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level db 5 ; Level
db 0, 0 ; Status db 0, 0 ; Status
@ -330,7 +328,7 @@ OddEgg1End:
bigdw 0 bigdw 0
dn 2, 10, 10, 10 ; DVs dn 2, 10, 10, 10 ; DVs
db 30, 30, 10, 0 ; PP db 30, 30, 10, 0 ; PP
db 20 ; Happiness db 20 ; Step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level db 5 ; Level
db 0, 0 ; Status db 0, 0 ; Status
@ -356,7 +354,7 @@ OddEgg1End:
bigdw 0 bigdw 0
dn 0, 0, 0, 0 ; DVs dn 0, 0, 0, 0 ; DVs
db 35, 10, 0, 0 ; PP db 35, 10, 0, 0 ; PP
db 20 ; Happiness db 20 ; Step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level db 5 ; Level
db 0, 0 ; Status db 0, 0 ; Status
@ -382,7 +380,7 @@ OddEgg1End:
bigdw 0 bigdw 0
dn 2, 10, 10, 10 ; DVs dn 2, 10, 10, 10 ; DVs
db 35, 10, 0, 0 ; PP db 35, 10, 0, 0 ; PP
db 20 ; Happiness db 20 ; Step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level db 5 ; Level
db 0, 0 ; Status db 0, 0 ; Status

2
engine/events/battle_tower/battle_tower.asm
View File

@ -480,7 +480,7 @@ endr
ld a, [hl] ld a, [hl]
ld [de], a ld [de], a
pop hl pop hl
ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH ld bc, NICKNAMED_MON_STRUCT_LENGTH
add hl, bc add hl, bc
pop de pop de
dec d dec d

10
engine/events/battle_tower/load_trainer.asm
View File

@ -7,7 +7,7 @@ Function_LoadOpponentTrainerAndPokemons:
; Fill wBT_OTTrainer with zeros ; Fill wBT_OTTrainer with zeros
xor a xor a
ld hl, wBT_OTTrainer ld hl, wBT_OTTrainer
ld bc, wBT_OTTrainerEnd - wBT_OTTrainer ld bc, BATTLE_TOWER_STRUCT_LENGTH
call ByteFill call ByteFill
; Write $ff into the Item-Slots ; Write $ff into the Item-Slots
@ -104,7 +104,7 @@ Function_LoadRandomBattleTowerMon:
ld a, [wBTChoiceOfLvlGroup] ld a, [wBTChoiceOfLvlGroup]
dec a dec a
ld hl, BattleTowerMons ld hl, BattleTowerMons
ld bc, BattleTowerMons2 - BattleTowerMons1 ; size of one level group ld bc, BATTLETOWER_NUM_UNIQUE_MON * NICKNAMED_MON_STRUCT_LENGTH
call AddNTimes call AddNTimes
ldh a, [hRandomAdd] ldh a, [hRandomAdd]
@ -122,7 +122,7 @@ Function_LoadRandomBattleTowerMon:
; Check if mon was already loaded before ; Check if mon was already loaded before
; Check current and the 2 previous teams ; Check current and the 2 previous teams
; includes check if item is double at the current team ; includes check if item is double at the current team
ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH ld bc, NICKNAMED_MON_STRUCT_LENGTH
call AddNTimes call AddNTimes
ld a, [hli] ld a, [hli]
ld b, a ld b, a
@ -165,13 +165,13 @@ Function_LoadRandomBattleTowerMon:
cp b cp b
jr z, .FindARandomBattleTowerMon jr z, .FindARandomBattleTowerMon
ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH ld bc, NICKNAMED_MON_STRUCT_LENGTH
call CopyBytes call CopyBytes
ld a, [wNamedObjectIndexBuffer] ld a, [wNamedObjectIndexBuffer]
push af push af
push de push de
ld hl, - (PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH) ld hl, -NICKNAMED_MON_STRUCT_LENGTH
add hl, de add hl, de
ld a, [hl] ld a, [hl]
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a

14
engine/events/odd_egg.asm
View File

@ -39,11 +39,13 @@ _GiveOddEgg:
.done .done
ld hl, OddEggs ld hl, OddEggs
ld a, OddEgg1End - OddEgg1 ld a, NICKNAMED_MON_STRUCT_LENGTH
call AddNTimes call AddNTimes
ld de, wOddEggSpecies ; Writes to wOddEgg, wOddEggName, and wOddEggOTName,
ld bc, PARTYMON_STRUCT_LENGTH + 2 * MON_NAME_LENGTH ; even though OddEggs does not have data for wOddEggOTName
ld de, wOddEgg
ld bc, NICKNAMED_MON_STRUCT_LENGTH + MON_NAME_LENGTH
call CopyBytes call CopyBytes
ld a, EGG_TICKET ld a, EGG_TICKET
@ -64,10 +66,10 @@ _GiveOddEgg:
ld [wMobileMonSpeciesPointerBuffer], a ld [wMobileMonSpeciesPointerBuffer], a
ld a, HIGH(wMobileMonSpeciesBuffer - 1) ld a, HIGH(wMobileMonSpeciesBuffer - 1)
ld [wMobileMonSpeciesPointerBuffer + 1], a ld [wMobileMonSpeciesPointerBuffer + 1], a
; load pointer to wOddEggSpecies in wMobileMonStructurePointerBuffer ; load pointer to wOddEgg in wMobileMonStructurePointerBuffer
ld a, LOW(wOddEggSpecies) ld a, LOW(wOddEgg)
ld [wMobileMonStructurePointerBuffer], a ld [wMobileMonStructurePointerBuffer], a
ld a, HIGH(wOddEggSpecies) ld a, HIGH(wOddEgg)
ld [wMobileMonStructurePointerBuffer + 1], a ld [wMobileMonStructurePointerBuffer + 1], a
; load Odd Egg Name in wTempOddEggNickname ; load Odd Egg Name in wTempOddEggNickname

2
mobile/mobile_5c.asm
View File

@ -242,7 +242,7 @@ CheckBTMonMovesForErrors:
.done .done
pop hl pop hl
ld de, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH ld de, NICKNAMED_MON_STRUCT_LENGTH
add hl, de add hl, de
dec c dec c
jr nz, .loop jr nz, .loop