Remove Mobile, Battle Tower, Mystery Gift, and Odd Egg (#1)

This commit is contained in:
xCrystal
2023-07-24 21:13:11 +02:00
parent 74b8214272
commit fc7f2d4e0e
201 changed files with 101 additions and 73760 deletions

View File

@@ -65,20 +65,11 @@ DoBattleTransition:
ret
.InitGFX:
ld a, [wLinkMode]
cp LINK_MOBILE
jr z, .mobile
farcall ReanchorBGMap_NoOAMUpdate
call UpdateSprites
call DelayFrame
call .NonMobile_LoadPokeballTiles
call .LoadPokeballTiles
call BattleStart_CopyTilemapAtOnce
jr .resume
.mobile
call LoadTrainerBattlePokeballTiles
.resume
ld a, SCREEN_HEIGHT_PX
ldh [hWY], a
call DelayFrame
@@ -92,7 +83,7 @@ DoBattleTransition:
call WipeLYOverrides
ret
.NonMobile_LoadPokeballTiles:
.LoadPokeballTiles:
call LoadTrainerBattlePokeballTiles
hlbgcoord 0, 0
call ConvertTrainerBattlePokeballTilesTo2bpp

View File

@@ -1,12 +1,5 @@
CheckBattleScene:
; Return carry if battle scene is turned off.
ld a, BANK(wLinkMode)
ld hl, wLinkMode
call GetFarWRAMByte
cp LINK_MOBILE
jr z, .mobile
ld a, [wOptions]
bit BATTLE_SCENE, a
jr nz, .off
@@ -14,34 +7,6 @@ CheckBattleScene:
and a
ret
.mobile
ld a, [wcd2f]
and a
jr nz, .from_wram
ld a, BANK(s4_a60c) ; MBC30 bank used by JP Crystal; inaccessible by MBC3
call OpenSRAM
ld a, [s4_a60c]
ld c, a
call CloseSRAM
ld a, c
bit 0, c
jr z, .off
and a
ret
.from_wram
ld a, BANK(w5_dc00)
ld hl, w5_dc00
call GetFarWRAMByte
bit 0, a
jr z, .off
and a
ret
.off
scf
ret

File diff suppressed because it is too large Load Diff

View File

@@ -32,10 +32,6 @@ BattleCommand_BatonPass:
call SetPalettes
call BatonPass_LinkPlayerSwitch
; Mobile link battles handle entrances differently
farcall CheckMobileBattleError
jp c, EndMoveEffect
ld hl, PassedBattleMonEntrance
call CallBattleCore
@@ -55,10 +51,6 @@ BattleCommand_BatonPass:
call AnimateCurrentMove
call BatonPass_LinkEnemySwitch
; Mobile link battles handle entrances differently
farcall CheckMobileBattleError
jp c, EndMoveEffect
; Passed enemy PartyMon entrance
xor a
ld [wEnemySwitchMonIndex], a

View File

@@ -1,5 +1,4 @@
BattleCommand_Selfdestruct:
farcall StubbedTrainerRankings_Selfdestruct
ld a, BATTLEANIM_PLAYER_DAMAGE
ld [wNumHits], a
ld c, 3

View File

@@ -1,4 +1,3 @@
BattleCommand_Splash:
call AnimateCurrentMove
farcall StubbedTrainerRankings_Splash
jp PrintNothingHappened

View File

@@ -1,8 +1,4 @@
ReadTrainerParty:
ld a, [wInBattleTowerBattle]
bit 0, a
ret nz
ld a, [wLinkMode]
and a
ret nz
@@ -19,14 +15,6 @@ ReadTrainerParty:
call ByteFill
ld a, [wOtherTrainerClass]
cp CAL
jr nz, .not_cal2
ld a, [wOtherTrainerID]
cp CAL2
jr z, .cal2
ld a, [wOtherTrainerClass]
.not_cal2
dec a
ld c, a
ld b, 0
@@ -72,14 +60,6 @@ ReadTrainerParty:
.done
jp ComputeTrainerReward
.cal2
ld a, BANK(sMysteryGiftTrainer)
call OpenSRAM
ld de, sMysteryGiftTrainer
call TrainerType2
call CloseSRAM
jr .done
TrainerTypes:
; entries correspond to TRAINERTYPE_* constants
dw TrainerType1 ; level, species
@@ -333,24 +313,6 @@ Battle_GetTrainerName::
ld c, a
GetTrainerName::
ld a, c
cp CAL
jr nz, .not_cal2
ld a, BANK(sMysteryGiftTrainerHouseFlag)
call OpenSRAM
ld a, [sMysteryGiftTrainerHouseFlag]
and a
call CloseSRAM
jr z, .not_cal2
ld a, BANK(sMysteryGiftPartnerName)
call OpenSRAM
ld hl, sMysteryGiftPartnerName
call CopyTrainerName
jp CloseSRAM
.not_cal2
dec c
push bc
ld b, 0