diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-02 19:04:50 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-02 19:04:50 -0500 |
| commit | b975f3e068fb9dbbe688445914cfb65036eeadc1 (patch) | |
| tree | 3ce596976e42c26f47c16f0f278b06d2d2325101 /engine/events/battle_tower | |
| parent | 583838a39d0c9ddd2440f9c12747a616b377e7ec (diff) | |
Clean up some Odd Egg and Battle Tower code and data
Fixes #589
Diffstat (limited to 'engine/events/battle_tower')
| -rw-r--r-- | engine/events/battle_tower/battle_tower.asm | 2 | ||||
| -rw-r--r-- | engine/events/battle_tower/load_trainer.asm | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 981491547..dcfe6ae22 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -480,7 +480,7 @@ endr ld a, [hl] ld [de], a pop hl - ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH + ld bc, NICKNAMED_MON_STRUCT_LENGTH add hl, bc pop de dec d diff --git a/engine/events/battle_tower/load_trainer.asm b/engine/events/battle_tower/load_trainer.asm index 517b0e48e..0e4c9d04a 100644 --- a/engine/events/battle_tower/load_trainer.asm +++ b/engine/events/battle_tower/load_trainer.asm @@ -7,7 +7,7 @@ Function_LoadOpponentTrainerAndPokemons: ; Fill wBT_OTTrainer with zeros xor a ld hl, wBT_OTTrainer - ld bc, wBT_OTTrainerEnd - wBT_OTTrainer + ld bc, BATTLE_TOWER_STRUCT_LENGTH call ByteFill ; Write $ff into the Item-Slots @@ -104,7 +104,7 @@ Function_LoadRandomBattleTowerMon: ld a, [wBTChoiceOfLvlGroup] dec a ld hl, BattleTowerMons - ld bc, BattleTowerMons2 - BattleTowerMons1 ; size of one level group + ld bc, BATTLETOWER_NUM_UNIQUE_MON * NICKNAMED_MON_STRUCT_LENGTH call AddNTimes ldh a, [hRandomAdd] @@ -122,7 +122,7 @@ Function_LoadRandomBattleTowerMon: ; Check if mon was already loaded before ; Check current and the 2 previous teams ; 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 ld a, [hli] ld b, a @@ -165,13 +165,13 @@ Function_LoadRandomBattleTowerMon: cp b jr z, .FindARandomBattleTowerMon - ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH + ld bc, NICKNAMED_MON_STRUCT_LENGTH call CopyBytes ld a, [wNamedObjectIndexBuffer] push af push de - ld hl, - (PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH) + ld hl, -NICKNAMED_MON_STRUCT_LENGTH add hl, de ld a, [hl] ld [wNamedObjectIndexBuffer], a |