Organize mobile/battle_tower_*.asm data and code

This commit is contained in:
Remy Oukaour
2018-01-06 18:53:30 -05:00
parent 9069a395db
commit bdd3a55333
14 changed files with 188 additions and 178 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,46 +0,0 @@
GetMobileOTTrainerClass: ; mobile function
ld h, b
ld l, c
call .GetMobileOTTrainerClass
ld c, a
ret
.GetMobileOTTrainerClass: ; 4e930
ld a, [hli]
xor [hl]
ld c, a
jr z, .skip_male_trainers
srl c
srl c
.male_trainer_loop
srl c
ld a, c
cp MaleTrainersEnd - MaleTrainers - 1
jr nc, .male_trainer_loop
inc c
.skip_male_trainers
ld a, [de]
cp $1
ld hl, MaleTrainers
jr nz, .finished
ld hl, FemaleTrainers
ld a, c
and a
jr z, .finished
.female_trainer_loop
srl c
ld a, c
cp FemaleTrainersEnd - FemaleTrainers - 1
jr nc, .female_trainer_loop
inc c
.finished
ld b, $0
add hl, bc
ld a, [hl]
ret
INCLUDE "data/trainers/gendered_trainers.asm"

View File

@@ -75,7 +75,7 @@ Function17005a: ; 17005a
; 1700b0
INCLUDE "mobile/battle_tower_5c.asm"
INCLUDE "engine/events/battle_tower/battle_tower.asm"
Function170be4: ; 170be4
ld a, $5