diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/bank01.asm | 23 | ||||
| -rw-r--r-- | src/engine/home.asm | 4 | ||||
| -rw-r--r-- | src/gfx.asm | 20 | ||||
| -rw-r--r-- | src/hram.asm | 2 | ||||
| -rw-r--r-- | src/main.asm | 22 | ||||
| -rw-r--r-- | src/text.asm | 6 |
6 files changed, 40 insertions, 37 deletions
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 7933fc4..6a21178 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -3436,39 +3436,42 @@ AIUseEnergyCard: ; 69a5 (1:69a5) INCROM $69c5, $6d84 -; converts clefairy doll/mysterious fossil to pokemon card -ConvertTrainerCardToPokemon: ; 6d84 (1:6d84) +; given the deck index of a turn holder's card in register a, +; and a pointer in hl to the wLoadedCard* buffer where the card data is loaded, +; check if the card is Clefairy Doll or Mysterious Fossil, and, if so, convert it +; to a Pokemon card in the wLoadedCard* buffer, using .trainer_to_pkmn_data. +ConvertSpecialTrainerCardToPokemon: ; 6d84 (1:6d84) ld c, a ld a, [hl] cp TYPE_TRAINER - ret nz + ret nz ; return if the card is not TRAINER type push hl ldh a, [hWhoseTurn] ld h, a ld l, c ld a, [hl] - and TYPE_TRAINER + and CARD_LOCATION_PLAY_AREA pop hl - ret z + ret z ; return if the card is not in the arena or bench ld a, e cp MYSTERIOUS_FOSSIL jr nz, .check_for_clefairy_doll ld a, d - cp $00 + cp $00 ; MYSTERIOUS_FOSSIL >> 8 jr z, .start_ram_data_overwrite ret .check_for_clefairy_doll cp CLEFAIRY_DOLL ret nz ld a, d - cp $00 + cp $00 ; CLEFAIRY_DOLL >> 8 ret nz .start_ram_data_overwrite push de - ld [hl], COLORLESS + ld [hl], TYPE_PKMN_COLORLESS ld bc, CARD_DATA_HP add hl, bc - ld de, .data_to_overwrite + ld de, .trainer_to_pkmn_data ld c, CARD_DATA_UNKNOWN2 - CARD_DATA_HP .loop ld a, [de] @@ -3479,7 +3482,7 @@ ConvertTrainerCardToPokemon: ; 6d84 (1:6d84) pop de ret -.data_to_overwrite +.trainer_to_pkmn_data db 10 ; CARD_DATA_HP ds $07 ; CARD_DATA_MOVE1_NAME - (CARD_DATA_HP + 1) tx DiscardName ; CARD_DATA_MOVE1_NAME diff --git a/src/engine/home.asm b/src/engine/home.asm index 240d016..f3b5baf 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -3499,7 +3499,7 @@ LoadCardDataToBuffer1_FromDeckIndex: ; 1376 (0:1376) call LoadCardDataToBuffer1_FromCardID pop af ld hl, wLoadedCard1 - bank1call ConvertTrainerCardToPokemon + bank1call ConvertSpecialTrainerCardToPokemon ld a, e pop bc pop de @@ -3516,7 +3516,7 @@ LoadCardDataToBuffer2_FromDeckIndex: ; 138c (0:138c) call LoadCardDataToBuffer2_FromCardID pop af ld hl, wLoadedCard2 - bank1call ConvertTrainerCardToPokemon + bank1call ConvertSpecialTrainerCardToPokemon ld a, e pop bc pop de diff --git a/src/gfx.asm b/src/gfx.asm index 475fd93..aa5527d 100644 --- a/src/gfx.asm +++ b/src/gfx.asm @@ -36,9 +36,6 @@ rept $2b68 db $ff endr -SECTION "Empty Bank 1F", ROMX - emptybank - SECTION "Gfx 3", ROMX INCROM $84000, $87828 @@ -905,22 +902,16 @@ FightingGfx: ; a8e12 (2a:4e12) INCROM $a8e54, $ac000 SECTION "Gfx 13", ROMX -INCBIN "baserom.gbc", $ac000, $4000 + INCROM $ac000, $b0000 SECTION "Gfx 14", ROMX -INCBIN "baserom.gbc", $b0000, $4000 + INCROM $b0000, $b4000 SECTION "Gfx 15", ROMX -INCBIN "baserom.gbc", $b4000, $4000 + INCROM $b4000, $b8000 SECTION "Gfx 16", ROMX -INCBIN "baserom.gbc", $b8000, $4000 - -SECTION "Empty Bank 2F", ROMX - emptybank - -SECTION "Empty Bank 30", ROMX - emptybank + INCROM $b8000, $bc000 SECTION "Card Gfx 1", ROMX @@ -1861,6 +1852,3 @@ RecycleCardGfx:: ; ef388 (3b:7388) rept $970 db $ff endr - -SECTION "Empty Bank 3C", ROMX - emptybank diff --git a/src/hram.asm b/src/hram.asm index b96ee37..9cb5e8c 100644 --- a/src/hram.asm +++ b/src/hram.asm @@ -116,4 +116,4 @@ hffb5:: ; ffb5 ; used in DivideBCbyDE hffb6:: ; ffb6 - ds 1
\ No newline at end of file + ds 1 diff --git a/src/main.asm b/src/main.asm index 8e60df6..1533d0d 100644 --- a/src/main.asm +++ b/src/main.asm @@ -30,10 +30,10 @@ INCLUDE "engine/booster_packs.asm" SECTION "Bank 8", ROMX INCLUDE "engine/bank08.asm" -SECTION "Bank 9", ROMX +SECTION "Empty Bank 9", ROMX emptybank -SECTION "Bank A", ROMX +SECTION "Empty Bank A", ROMX emptybank SECTION "Effect Functions", ROMX @@ -45,8 +45,26 @@ INCLUDE "data/decks.asm" SECTION "Cards", ROMX INCLUDE "data/cards.asm" +SECTION "Empty Bank 1A", ROMX + emptybank + +SECTION "Empty Bank 1B", ROMX + emptybank + SECTION "Bank 1C", ROMX INCLUDE "engine/bank1c.asm" +SECTION "Empty Bank 1F", ROMX + emptybank + SECTION "Bank 20", ROMX INCLUDE "engine/bank20.asm" + +SECTION "Empty Bank 2F", ROMX + emptybank + +SECTION "Empty Bank 30", ROMX + emptybank + +SECTION "Empty Bank 3C", ROMX + emptybank diff --git a/src/text.asm b/src/text.asm index c818938..7d2140e 100644 --- a/src/text.asm +++ b/src/text.asm @@ -40,9 +40,3 @@ INCLUDE "text/text12.asm" SECTION "Text 13", ROMX INCLUDE "text/text13.asm" - -SECTION "Empty Bank 1A", ROMX - emptybank - -SECTION "Empty Bank 1B", ROMX - emptybank |