pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)

Browse Source 
# Conflicts:
#	engine/battle/core.asm
#	engine/save.asm
This commit is contained in:
Remy Oukaour 2018-01-14 23:00:22 -05:00
commit dfcca93b45
54 changed files with 298 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/engine.asm
View File

@ -40,7 +40,7 @@ _MapSetup_Sound_Off:: ; e8000
ld hl, Channels ; start of channel data
ld de, ChannelsEnd - Channels ; length of area to clear (entire sound wram area)
.clearchannels ; clear Channel1-$c2bf
.clearchannels
xor a
ld [hli], a
dec de
@ -2749,7 +2749,7 @@ PlayStereoSFX:: ; e8ca6
add hl, bc
ld [hl], a
ld hl, Channel1Field30 - Channel1 ; $c131 - Channel1
ld hl, Channel1Field30 - Channel1
add hl, bc
ld [hl], a
@ -2760,11 +2760,11 @@ PlayStereoSFX:: ; e8ca6
; ch3-4
ld a, [wSFXDuration]
ld hl, Channel1Field2e - Channel1 ; $c12f - Channel1
ld hl, Channel1Field2e - Channel1
add hl, bc
ld [hl], a
ld hl, Channel1Field2f - Channel1 ; $c130 - Channel1
ld hl, Channel1Field2f - Channel1
add hl, bc
ld [hl], a

3
data/default_options.asm
View File

@ -11,8 +11,7 @@ DefaultOptions: ; 14f7c
db GBPRINTER_NORMAL
; Options2: menu account on
db 1 << MENU_ACCOUNT
; $cfd2: ??
db $00
; $cfd3: ??
db $00
; 14f84

16
engine/battle/battle_transition.asm
View File

@ -23,7 +23,7 @@ Predef_DoBattleTransition: ; 8c20f
.done
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, wBGPals1
@ -44,7 +44,7 @@ Predef_DoBattleTransition: ; 8c20f
ld [hLYOverrideEnd], a
ld [hSCY], a
ld a, $1
ld a, 1 ; unnecessary bankswitch?
ld [rSVBK], a
pop af
ld [hVBlank], a
@ -116,7 +116,7 @@ LoadTrainerBattlePokeballTiles:
ConvertTrainerBattlePokeballTilesTo2bpp: ; 8c2cf
ld a, [rSVBK]
push af
ld a, $6
ld a, BANK(wDecompressScratch)
ld [rSVBK], a
push hl
ld hl, wDecompressScratch
@ -298,7 +298,7 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab)
StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8)
farcall Function5602
ld a, $5 ; BANK(LYOverrides)
ld a, BANK(LYOverrides)
ld [rSVBK], a
call StartTrainerBattle_NextScene
@ -356,7 +356,7 @@ StartTrainerBattle_SineWave: ; 8c408 (23:4408)
StartTrainerBattle_SetUpForSpinOutro: ; 8c43d (23:443d)
farcall Function5602
ld a, $5 ; BANK(LYOverrides)
ld a, BANK(LYOverrides)
ld [rSVBK], a
call StartTrainerBattle_NextScene
xor a
@ -498,7 +498,7 @@ ENDM
StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578)
farcall Function5602
ld a, $5 ; BANK(LYOverrides)
ld a, BANK(LYOverrides)
ld [rSVBK], a
call StartTrainerBattle_NextScene
ld a, $10
@ -647,7 +647,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
.daytime
ld a, [rSVBK]
push af
ld a, $5 ; WRAM5 = palettes
ld a, BANK(wBGPals1)
ld [rSVBK], a
call .copypals
push hl
@ -724,7 +724,7 @@ PokeBallTransition:
WipeLYOverrides: ; 8c6d8
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(LYOverrides)
ld [rSVBK], a
ld hl, LYOverrides

8
engine/battle/checkbattlescene.asm
View File

@ -1,7 +1,7 @@
CheckBattleScene: ; 4ea44
; Return carry if battle scene is turned off.
ld a, 0
ld a, BANK(wLinkMode)
ld hl, wLinkMode
call GetFarWRAMByte
cp LINK_MOBILE
@ -19,9 +19,9 @@ CheckBattleScene: ; 4ea44
and a
jr nz, .from_wram
ld a, $4
ld a, 4 ; MBC30 bank used by JP Crystal; inaccessible by MBC3
call GetSRAMBank
ld a, [$a60c]
ld a, [$a60c] ; address of MBC30 bank
ld c, a
call CloseSRAM
@ -33,7 +33,7 @@ CheckBattleScene: ; 4ea44
ret
.from_wram
ld a, $5
ld a, BANK(w5_dc00)
ld hl, w5_dc00
call GetFarWRAMByte
bit 0, a

10
engine/battle/core.asm
View File

@ -233,9 +233,9 @@ BattleTurn: ; 3c12f
Stubbed_Function3c1bf:
ret
ld a, $5
ld a, 5 ; MBC30 bank used by JP Crystal; inaccessible by MBC3
call GetSRAMBank
ld hl, $a89b ; s5_a89b
ld hl, $a89b ; address of MBC30 bank
inc [hl]
jr nz, .finish
dec hl
@ -8365,7 +8365,7 @@ InitEnemy: ; 3f55e
BackUpBGMap2: ; 3f568
ld a, [rSVBK]
push af
ld a, $6 ; BANK(wDecompressScratch)
ld a, BANK(wDecompressScratch)
ld [rSVBK], a
ld hl, wDecompressScratch
ld bc, $40 tiles ; vBGMap3 - vBGMap2
@ -9244,7 +9244,7 @@ InitBattleDisplay: ; 3fb6c
.BlankBGMap: ; 3fbd6
ld a, [rSVBK]
push af
ld a, $6
ld a, BANK(wDecompressScratch)
ld [rSVBK], a
ld hl, wDecompressScratch
@ -9305,7 +9305,7 @@ GetTrainerBackpic: ; 3fbff
CopyBackpic: ; 3fc30
ld a, [rSVBK]
push af
ld a, $6
ld a, BANK(wDecompressScratch)
ld [rSVBK], a
ld hl, vTiles0
ld de, vTiles2 tile $31

2
engine/battle/sliding_intro.asm
View File

@ -1,7 +1,7 @@
BattleIntroSlidingPics: ; 4e980
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(LYOverrides)
ld [rSVBK], a
call .subfunction1
ld a, rSCX - $ff00

36
engine/battle_anims/anim_commands.asm
View File

@ -5,7 +5,7 @@ Predef_PlayBattleAnim: ; cc0d6
ld a, [rSVBK]
push af
ld a, 5
ld a, BANK(ActiveAnimObjects)
ld [rSVBK], a
call _PlayBattleAnim
@ -163,7 +163,7 @@ BattleAnimRestoreHuds: ; cc1bb
ld a, [rSVBK]
push af
ld a, $1
ld a, BANK(CurBattleMon) ; alternatively: BANK(TempMon), BANK(PartyMon1), several others
ld [rSVBK], a
ld hl, UpdateBattleHuds
@ -916,7 +916,7 @@ BattleAnimCmd_E7: ; cc5db (33:45db)
BattleAnimCmd_Transform: ; cc5dc (33:45dc)
ld a, [rSVBK]
push af
ld a, 1
ld a, BANK(CurPartySpecies)
ld [rSVBK], a
ld a, [CurPartySpecies] ; CurPartySpecies
push af
@ -972,9 +972,9 @@ BattleAnimCmd_RaiseSub: ; cc640 (33:4640)
ld a, [rSVBK]
push af
ld a, 1
ld a, 1 ; unnecessary bankswitch?
ld [rSVBK], a
xor a
xor a ; sScratch
call GetSRAMBank
GetSubstitutePic: ; cc64c
@ -1046,9 +1046,9 @@ GetSubstitutePic: ; cc64c
BattleAnimCmd_MinimizeOpp: ; cc6cf (33:46cf)
ld a, [rSVBK]
push af
ld a, $1
ld a, 1 ; unnecessary bankswitch?
ld [rSVBK], a
xor a
xor a ; sScratch
call GetSRAMBank
call GetMinimizePic
call Request2bpp
@ -1102,9 +1102,9 @@ INCBIN "gfx/battle/minimize.2bpp"
BattleAnimCmd_Minimize: ; cc735 (33:4735)
ld a, [rSVBK]
push af
ld a, $1
ld a, 1 ; unnecessary bankswitch?
ld [rSVBK], a
xor a
xor a ; sScratch
call GetSRAMBank
call GetMinimizePic
ld hl, vTiles0 tile $00
@ -1117,7 +1117,7 @@ BattleAnimCmd_Minimize: ; cc735 (33:4735)
BattleAnimCmd_DropSub: ; cc750 (33:4750)
ld a, [rSVBK]
push af
ld a, $1
ld a, BANK(CurPartySpecies)
ld [rSVBK], a
ld a, [CurPartySpecies] ; CurPartySpecies
@ -1142,7 +1142,7 @@ BattleAnimCmd_DropSub: ; cc750 (33:4750)
BattleAnimCmd_BeatUp: ; cc776 (33:4776)
ld a, [rSVBK]
push af
ld a, $1
ld a, BANK(CurPartySpecies)
ld [rSVBK], a
ld a, [CurPartySpecies] ; CurPartySpecies
push af
@ -1253,7 +1253,7 @@ endr
ld a, [rSVBK]
push af
ld a, 1
ld a, BANK(EnemyMon) ; BattleMon is in WRAM0, but EnemyMon is in WRAMX
ld [rSVBK], a
ld a, [hBattleTurn]
@ -1261,14 +1261,14 @@ endr
jr nz, .enemy
ld a, $f0
ld [CryTracks], a ; CryTracks
ld a, [BattleMonSpecies] ; BattleMonSpecies
ld [CryTracks], a
ld a, [BattleMonSpecies]
jr .done_cry_tracks
.enemy
ld a, $0f
ld [CryTracks], a ; CryTracks
ld a, [EnemyMonSpecies] ; EnemyMon
ld [CryTracks], a
ld a, [EnemyMonSpecies]
.done_cry_tracks
push hl
@ -1430,7 +1430,7 @@ BattleAnim_SetBGPals: ; cc91a
ret z
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, wBGPals2
ld de, wBGPals1
@ -1458,7 +1458,7 @@ BattleAnim_SetOBPals: ; cc94b
ret z
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wOBPals1)
ld [rSVBK], a
ld hl, wOBPals2 palette PAL_BATTLE_OB_GRAY
ld de, wOBPals1 palette PAL_BATTLE_OB_GRAY

4
engine/battle_anims/bg_effects.asm
View File

@ -2578,7 +2578,7 @@ BGEffects_LoadBGPal0_OBPal1: ; c8e52 (32:4e52)
ld h, a
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld a, h
push bc
@ -2605,7 +2605,7 @@ BGEffects_LoadBGPal1_OBPal0: ; c8e7f (32:4e7f)
ld h, a
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld a, h
push bc

4
engine/battle_anims/functions.asm
View File

@ -428,9 +428,9 @@ GetBallAnimPal: ; cd249 (33:5249)
ld hl, BallColors
ld a, [rSVBK]
push af
ld a, $1
ld a, BANK(CurItem)
ld [rSVBK], a
ld a, [CurItem] ; CurItem
ld a, [CurItem]
ld e, a
pop af
ld [rSVBK], a

2
engine/battle_anims/getpokeballwobble.asm
View File

@ -8,7 +8,7 @@ GetPokeBallWobble: ; f971 (3:7971)
ld d, a
push de
ld a, 1 ; BANK(Buffer2)
ld a, BANK(Buffer2)
ld [rSVBK], a
ld a, [Buffer2]

2
engine/billspc.asm
View File

@ -2100,7 +2100,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
ld hl, wBillsPC_BackupScrollPosition
add [hl]
ld [CurPartyMon], a
ld a, $1
ld a, BANK(sBox)
call GetSRAMBank
ld hl, sBoxSpecies
call CopySpeciesToTemp

2
engine/card_flip.asm
View File

@ -1657,7 +1657,7 @@ CardFlip_InitAttrPals: ; e0c37 (38:4c37)
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, .palettes
ld de, wBGPals1

30
engine/color.asm
View File

@ -141,13 +141,13 @@ Unreferenced_Function8b07:
ld hl, .BGPal
ld de, wBGPals1
ld bc, 1 palettes
ld a, $5
ld a, BANK(wBGPals1)
call FarCopyWRAM
ld hl, .OBPal
ld de, wOBPals1
ld bc, 1 palettes
ld a, $5
ld a, BANK(wOBPals1)
call FarCopyWRAM
call ApplyPals
@ -351,7 +351,7 @@ ApplyHPBarPals:
ld bc, HPBarPals
add hl, bc
ld bc, 4
ld a, $5
ld a, BANK(wBGPals2)
call FarCopyWRAM
ld a, $1
ld [hCGBPalUpdate], a
@ -386,7 +386,7 @@ LoadStatsScreenPals:
add hl, bc
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld a, [hli]
ld [wBGPals1 palette 0], a
@ -435,7 +435,7 @@ LoadMailPalettes:
.cgb
ld de, wBGPals1
ld bc, 1 palettes
ld a, $5
ld a, BANK(wBGPals1)
call FarCopyWRAM
call ApplyPals
call WipeAttrMap
@ -451,7 +451,7 @@ Unreferenced_Function95f0:
ld hl, .Palette
ld de, wBGPals1
ld bc, 1 palettes
ld a, $5
ld a, BANK(wBGPals1)
call FarCopyWRAM
call ApplyPals
call WipeAttrMap
@ -495,7 +495,7 @@ GetPredefPal:
LoadHLPaletteIntoDE:
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wOBPals1)
ld [rSVBK], a
ld c, $8
.loop
@ -511,7 +511,7 @@ LoadHLPaletteIntoDE:
LoadPalette_White_Col1_Col2_Black:
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld a, LOW(palred 31 + palgreen 31 + palblue 31)
@ -563,7 +563,7 @@ ResetBGPals:
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, wBGPals1
@ -602,7 +602,7 @@ ApplyPals:
ld hl, wBGPals1
ld de, wBGPals2
ld bc, 16 palettes
ld a, $5
ld a, BANK(wPals)
call FarCopyWRAM
ret
@ -679,7 +679,7 @@ InitPartyMenuOBPals:
ld hl, PartyMenuOBPals
ld de, wOBPals1
ld bc, 2 palettes
ld a, $5
ld a, BANK(wOBPals1)
call FarCopyWRAM
ret
@ -753,7 +753,7 @@ Unreferenced_Function9779:
ld hl, BattleObjectPals
ld de, wOBPals1 palette 2
ld bc, 2 palettes
ld a, $5
ld a, BANK(wOBPals1)
call FarCopyWRAM
ret
@ -921,7 +921,7 @@ InitCGBPals::
jr nz, .obpals_loop
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, wBGPals1
call .LoadWhitePals
@ -1242,7 +1242,7 @@ LoadMapPals:
; Switch to palettes WRAM bank
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, wBGPals1
ld b, 8
@ -1309,7 +1309,7 @@ endr
.morn_day
ld de, wBGPals1 palette PAL_BG_ROOF + 2
ld bc, 4
ld a, $5
ld a, BANK(wBGPals1)
call FarCopyWRAM
ret

2
engine/credits.asm
View File

@ -13,7 +13,7 @@ Credits:: ; 109847
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wPals)
ld [rSVBK], a
call ClearBGPalettes

2
engine/crystal_colors.asm
View File

@ -241,7 +241,7 @@ Function49742: ; 49742
ld hl, .Palette_49757
ld de, wBGPals1
ld bc, 8 palettes
ld a, $5
ld a, BANK(wBGPals1)
call FarCopyWRAM
farcall ApplyPals
ret

48
engine/crystal_intro.asm
View File

@ -57,7 +57,7 @@ Copyright_GFPresents: ; e4579
ld a, [rSVBK]
push af
ld a, $6
ld a, BANK(wDecompressScratch)
ld [rSVBK], a
ld hl, IntroLogoGFX
@ -319,7 +319,7 @@ GameFreakLogoScene4: ; e4776 (39:4776)
add hl, de
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wOBPals2)
ld [rSVBK], a
ld a, [hli]
ld [wOBPals2 + 12], a
@ -352,7 +352,7 @@ INCBIN "gfx/splash/logo2.1bpp"
CrystalIntro: ; e48ac
ld a, [rSVBK]
push af
ld a, 5
ld a, BANK(wPals)
ld [rSVBK], a
ld a, [hInMenu]
push af
@ -480,7 +480,7 @@ IntroScene1: ; e495b (39:495b)
call Intro_DecompressRequest2bpp_64Tiles
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, Palette_365ad
ld de, wBGPals1
@ -553,7 +553,7 @@ IntroScene3: ; e49fd (39:49fd)
call Intro_DecompressRequest2bpp_64Tiles
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, Palette_e5edd
ld de, wBGPals1
@ -619,7 +619,7 @@ IntroScene5: ; e4a7a (39:4a7a)
call Intro_DecompressRequest2bpp_64Tiles
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, Palette_365ad
ld de, wBGPals1
@ -725,7 +725,7 @@ IntroScene7: ; e4b3f (39:4b3f)
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, Palette_e5edd
@ -884,7 +884,7 @@ IntroScene11: ; e4c86 (39:4c86)
call Intro_DecompressRequest2bpp_64Tiles
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, Palette_365ad
ld de, wBGPals1
@ -1011,7 +1011,7 @@ IntroScene13: ; e4d6d (39:4d6d)
call Intro_DecompressRequest2bpp_64Tiles
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, Palette_e5edd
ld de, wBGPals1
@ -1120,7 +1120,7 @@ IntroScene15: ; e4e40 (39:4e40)
call Intro_LoadTilemap
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, Palette_e77dd
ld de, wBGPals1
@ -1194,7 +1194,7 @@ IntroScene17: ; e4ef5 (39:4ef5)
call Intro_DecompressRequest2bpp_64Tiles
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, Palette_e6d6d
ld de, wBGPals1
@ -1268,7 +1268,7 @@ IntroScene19: ; e4f7e (39:4f7e)
call Intro_LoadTilemap
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, Palette_e77dd
ld de, wBGPals1
@ -1438,7 +1438,7 @@ IntroScene26: ; e50bb (39:50bb)
call Intro_DecompressRequest2bpp_64Tiles
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, Palette_e679d
ld de, wBGPals1
@ -1526,7 +1526,7 @@ Intro_Scene24_ApplyPaletteFade: ; e5172 (39:5172)
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals2)
ld [rSVBK], a
ld de, wBGPals2
ld b, 8 ; number of BG pals
@ -1617,7 +1617,7 @@ CrystalIntro_UnownFade: ; e5223 (39:5223)
ld b, $0
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals2)
ld [rSVBK], a
push hl
@ -1722,7 +1722,7 @@ Intro_Scene20_AppearUnown: ; e5348 (39:5348)
ld c, a
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals2)
ld [rSVBK], a
push bc
@ -1791,7 +1791,7 @@ endr
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals2)
ld [rSVBK], a
push hl
@ -1846,7 +1846,7 @@ endr
Intro_LoadTilemap: ; e541b (39:541b)
ld a, [rSVBK]
push af
ld a, $6
ld a, BANK(wDecompressScratch)
ld [rSVBK], a
ld hl, wDecompressScratch
@ -1946,7 +1946,7 @@ Intro_SetCGBPalUpdate: ; e549e (39:549e)
Intro_ClearBGPals: ; e54a3 (39:54a3)
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals2)
ld [rSVBK], a
ld hl, wBGPals2
@ -1965,7 +1965,7 @@ Intro_ClearBGPals: ; e54a3 (39:54a3)
Intro_DecompressRequest2bpp_128Tiles: ; e54c2 (39:54c2)
ld a, [rSVBK]
push af
ld a, $6
ld a, BANK(wDecompressScratch)
ld [rSVBK], a
push de
@ -1984,7 +1984,7 @@ Intro_DecompressRequest2bpp_128Tiles: ; e54c2 (39:54c2)
Intro_DecompressRequest2bpp_255Tiles: ; e54de (39:54de)
ld a, [rSVBK]
push af
ld a, $6
ld a, BANK(wDecompressScratch)
ld [rSVBK], a
push de
@ -2003,7 +2003,7 @@ Intro_DecompressRequest2bpp_255Tiles: ; e54de (39:54de)
Intro_DecompressRequest2bpp_64Tiles: ; e54fa (39:54fa)
ld a, [rSVBK]
push af
ld a, $6
ld a, BANK(wDecompressScratch)
ld [rSVBK], a
push de
@ -2022,7 +2022,7 @@ Intro_DecompressRequest2bpp_64Tiles: ; e54fa (39:54fa)
Intro_ResetLYOverrides: ; e5516 (39:5516)
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(LYOverrides)
ld [rSVBK], a
ld hl, LYOverrides
@ -2039,7 +2039,7 @@ Intro_ResetLYOverrides: ; e5516 (39:5516)
Intro_PerspectiveScrollBG: ; e552f (39:552f)
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(LYOverrides)
ld [rSVBK], a
; Scroll the grass every frame.
; Scroll the trees every other frame and at half speed.

10
engine/debug.asm
View File

@ -155,7 +155,7 @@ Function819a7: ; 819a7
ret z
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals2)
ld [rSVBK], a
ld hl, Palette_819f4
ld de, wBGPals2
@ -436,7 +436,7 @@ Function81c33: ; 81c33
jr z, .asm_81c69
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals2)
ld [rSVBK], a
ld hl, wBGPals2
ld de, wc608
@ -1145,7 +1145,7 @@ Function82203: ; 82203
Function8220f: ; 8220f
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals1)
ld [rSVBK], a
ld a, [wcf64]
ld l, a
@ -1198,7 +1198,7 @@ Function82236: ; 82236
call Function821d8
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals2)
ld [rSVBK], a
ld hl, wBGPals2
ld a, [wcf64]
@ -1228,7 +1228,7 @@ Function82236: ; 82236
Function822a3: ; 822a3
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wBGPals2)
ld [rSVBK], a
ld hl, wBGPals2
ld a, [wcf64]

10
engine/dma_transfer.asm
View File

@ -119,7 +119,7 @@ Mobile_ReloadMapPart: ; 104099
.unreferenced_1040da
ld a, $1
ld [rVBK], a
ld a, $3
ld a, BANK(w3_d800)
ld [rSVBK], a
ld de, w3_d800
ld a, [hBGMapAddress + 1]
@ -143,7 +143,7 @@ Mobile_ReloadMapPart: ; 104099
.unreferenced_104101
ld a, $1
ld [rVBK], a
ld a, $3
ld a, BANK(w3_d800)
ld [rSVBK], a
ld hl, w3_d800
call HDMATransferToWRAMBank3
@ -221,7 +221,7 @@ CallInSafeGFXMode: ; 104177
ld [hMapAnims], a
ld a, [rSVBK]
push af
ld a, $6
ld a, BANK(wScratchTileMap)
ld [rSVBK], a
ld a, [rVBK]
push af
@ -472,7 +472,7 @@ _Get2bpp:: ; 104284
; switch to WRAM bank 6
ld a, [rSVBK]
push af
ld a, $6
ld a, BANK(wScratchTileMap)
ld [rSVBK], a
push bc
@ -542,7 +542,7 @@ _Get1bpp:: ; 1042b2
.bankswitch ; 1042d6
ld a, [rSVBK]
push af
ld a, $6
ld a, BANK(wScratchTileMap)
ld [rSVBK], a
push bc

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

@ -102,7 +102,7 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081
.FindARandomBattleTowerPkmn:
; From Which LevelGroup are the Pkmn loaded
; a = 1..10
ld a, [wBTChoiceOfLvlGroup] ; [$d800]
ld a, [wBTChoiceOfLvlGroup]
dec a
ld hl, BattleTowerMons
ld bc, BattleTowerMons2 - BattleTowerMons1

4
engine/events/heal_machine_anim.asm
View File

@ -161,7 +161,7 @@ INCBIN "gfx/overworld/heal_machine.2bpp"
ld hl, .palettes
ld de, wOBPals2 palette PAL_OW_TREE
ld bc, 1 palettes
ld a, $5
ld a, BANK(wOBPals2)
call FarCopyWRAM
ld a, $1
ld [hCGBPalUpdate], a
@ -196,7 +196,7 @@ INCLUDE "gfx/overworld/heal_machine.pal"
.go
ld a, [rSVBK]
push af
ld a, $5
ld a, BANK(wOBPals2)
ld [rSVBK], a
ld hl, wOBPals2 palette PAL_OW_TREE

Some files were not shown because too many files have changed in this diff Show More