pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07: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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -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

14
engine/events/odd_egg.asm
View File

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