Skip to content

Commit

Permalink
pull some bank 1 code out of main.asm
Browse files Browse the repository at this point in the history
  • Loading branch information
YamaArashi committed Sep 18, 2016
1 parent 46a94c6 commit 6f1ac06
Show file tree
Hide file tree
Showing 8 changed files with 504 additions and 505 deletions.
6 changes: 6 additions & 0 deletions engine/cable_club.asm
Original file line number Diff line number Diff line change
Expand Up @@ -969,3 +969,9 @@ CableClub_DrawHorizontalLine:
dec d
jr nz, .loop
ret

LoadTrainerInfoTextBoxTiles:
ld de, TrainerInfoTextBoxTileGraphics
ld hl, vChars2 + $760
lb bc, BANK(TrainerInfoTextBoxTileGraphics), (TrainerInfoTextBoxTileGraphicsEnd - TrainerInfoTextBoxTileGraphics) / $10
jp CopyVideoData
49 changes: 49 additions & 0 deletions engine/load_mon_data.asm
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
LoadMonData_:
; Load monster [wWhichPokemon] from list [wMonDataLocation]:
; 0: partymon
; 1: enemymon
; 2: boxmon
; 3: daycaremon
; Return monster id at wcf91 and its data at wLoadedMon.
; Also load base stats at wMonHeader for convenience.

ld a, [wDayCareMonSpecies]
ld [wcf91], a
ld a, [wMonDataLocation]
cp DAYCARE_DATA
jr z, .GetMonHeader

ld a, [wWhichPokemon]
ld e, a
callab GetMonSpecies

.GetMonHeader
ld a, [wcf91]
ld [wd0b5], a ; input for GetMonHeader
call GetMonHeader

ld hl, wPartyMons
ld bc, wPartyMon2 - wPartyMon1
ld a, [wMonDataLocation]
cp ENEMY_PARTY_DATA
jr c, .getMonEntry

ld hl, wEnemyMons
jr z, .getMonEntry

cp 2
ld hl, wBoxMons
ld bc, wBoxMon2 - wBoxMon1
jr z, .getMonEntry

ld hl, wDayCareMon
jr .copyMonData

.getMonEntry
ld a, [wWhichPokemon]
call AddNTimes

.copyMonData
ld de, wLoadedMon
ld bc, wPartyMon2 - wPartyMon1
jp CopyData
Loading

0 comments on commit 6f1ac06

Please sign in to comment.