Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue #345:

Browse Source 
- GetMonFrontpic → GetEnemyMonFrontpic
- GetMonBackpic → GetBattleMonBackpic
- FrontpicPredef → GetAnimatedFrontpicPredef
- GetFrontpic → GetMonFrontpic
- GetBackpic → GetMonBackpic
- CutAndPasteMap → PadMapForHDMATransfer
This commit is contained in:
Remy Oukaour
2017-12-24 15:03:20 -05:00
parent 4e5fd7a521
commit 9973e43d5a
21 changed files with 71 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/billspc.asm
View File

@@ -1108,7 +1108,7 @@ PCMonInfo: ; e2ac6 (38:6ac6)
predef GetUnownLetter
call GetBaseData
ld de, VTiles2 tile $00
predef GetFrontpic
predef GetMonFrontpic
xor a
ld [wBillsPC_MonHasMail], a
ld a, [CurPartySpecies]

4
engine/breeding.asm
View File

@@ -649,7 +649,7 @@ GetEggFrontpic: ; 17224 (5:7224)
ld hl, BattleMonDVs
predef GetUnownLetter
pop de
predef_jump GetFrontpic
predef_jump GetMonFrontpic
GetHatchlingFrontpic: ; 1723c (5:723c)
push de
@@ -659,7 +659,7 @@ GetHatchlingFrontpic: ; 1723c (5:723c)
ld hl, BattleMonDVs
predef GetUnownLetter
pop de
predef_jump FrontpicPredef
predef_jump GetAnimatedFrontpicPredef
Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
push af

2
engine/debug.asm
View File

@@ -315,7 +315,7 @@ Function81adb: ; 81adb
hlcoord 12, 3
call _PrepMonFrontpic
ld de, VTiles2 tile $31
predef GetBackpic
predef GetMonBackpic
ld a, $31
ld [hGraphicStartTile], a
hlcoord 2, 4

37
engine/dma_transfer.asm
View File

@@ -5,10 +5,10 @@ HDMATransferAttrMapAndTileMapToWRAMBank3:: ; 104000
.Function:
decoord 0, 0, AttrMap
ld hl, wScratchAttrMap
call CutAndPasteAttrMap
call PadAttrMapForHDMATransfer
decoord 0, 0
ld hl, wScratchTileMap
call CutAndPasteTilemap
call PadTilemapForHDMATransfer
ld a, $0
ld [rVBK], a
ld hl, wScratchTileMap
@@ -27,7 +27,7 @@ HDMATransferTileMapToWRAMBank3:: ; 10402d
.Function:
decoord 0, 0
ld hl, wScratchTileMap
call CutAndPasteTilemap
call PadTilemapForHDMATransfer
ld a, $0
ld [rVBK], a
ld hl, wScratchTileMap
@@ -42,7 +42,7 @@ HDMATransferAttrMapToWRAMBank3: ; 104047
.Function:
decoord 0, 0, AttrMap
ld hl, wScratchAttrMap
call CutAndPasteAttrMap
call PadAttrMapForHDMATransfer
ld a, $1
ld [rVBK], a
ld hl, wScratchAttrMap
@@ -57,10 +57,10 @@ ReloadMapPart:: ; 104061
.Function:
decoord 0, 0, AttrMap
ld hl, wScratchAttrMap
call CutAndPasteAttrMap
call PadAttrMapForHDMATransfer
decoord 0, 0
ld hl, wScratchTileMap
call CutAndPasteTilemap
call PadTilemapForHDMATransfer
call DelayFrame
di
@@ -88,10 +88,10 @@ Mobile_ReloadMapPart: ; 104099
.Function:
decoord 0, 0, AttrMap
ld hl, wScratchAttrMap
call CutAndPasteAttrMap
call PadAttrMapForHDMATransfer
decoord 0, 0
ld hl, wScratchTileMap
call CutAndPasteTilemap
call PadTilemapForHDMATransfer
call DelayFrame
di
@@ -161,10 +161,10 @@ OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: ; 104110
; Fill vBGTiles with " "
decoord 0, 0, AttrMap
ld hl, wScratchAttrMap
call CutAndPasteAttrMap
call PadAttrMapForHDMATransfer
decoord 0, 0
ld hl, wScratchTileMap
call CutAndPasteTilemap
call PadTilemapForHDMATransfer
call DelayFrame
di
@@ -194,11 +194,11 @@ Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap: ; 104148 (41:4148)
; Fill vBGTiles with $ff
decoord 0, 0, AttrMap
ld hl, wScratchAttrMap
call CutAndPasteAttrMap
call PadAttrMapForHDMATransfer
ld c, $ff
decoord 0, 0
ld hl, wScratchTileMap
call CutAndPasteMap
call PadMapForHDMATransfer
ld a, $1
ld [rVBK], a
@@ -422,15 +422,16 @@ _LoadHDMAParameters: ; 10424e (41:424e)
ld [rHDMA4], a
ret
CutAndPasteTilemap: ; 10425f (41:425f)
PadTilemapForHDMATransfer: ; 10425f (41:425f)
ld c, " "
jr CutAndPasteMap
jr PadMapForHDMATransfer
CutAndPasteAttrMap: ; 104263 (41:4263)
PadAttrMapForHDMATransfer: ; 104263 (41:4263)
ld c, $0
CutAndPasteMap: ; 104265 (41:4265)
; back up the value of c to hMapObjectIndexBuffer
PadMapForHDMATransfer: ; 104265 (41:4265)
; pad a 20x18 map to 32x18 for HDMA transfer
; back up the padding value in c to hMapObjectIndexBuffer
ld a, [hMapObjectIndexBuffer]
push af
ld a, c
@@ -449,7 +450,7 @@ CutAndPasteMap: ; 104265 (41:4265)
dec b
jr nz, .loop2
; load the original value of c into hl 12 times
; load the original padding value of c into hl for 32 - 20 = 12 rows
ld a, [hMapObjectIndexBuffer]
ld b, BG_MAP_WIDTH - SCREEN_WIDTH
.loop3

2
engine/evolution_animation.asm
View File

@@ -168,7 +168,7 @@ EvolutionAnimation: ; 4e5e1
ld a, $1
ld [wBoxAlignment], a
ld de, VTiles2
predef FrontpicPredef
predef GetAnimatedFrontpicPredef
xor a
ld [wBoxAlignment], a
ret

6
engine/pokedex.asm
View File

@@ -2403,7 +2403,7 @@ Pokedex_LoadSelectedMonTiles: ; 4143b
ld [CurPartySpecies], a
call GetBaseData
ld de, VTiles2
predef GetFrontpic
predef GetMonFrontpic
ret
.QuestionMark:
@@ -2556,7 +2556,7 @@ Pokedex_LoadUnownFrontpicTiles: ; 41a58 (10:5a58)
ld [CurPartySpecies], a
call GetBaseData
ld de, VTiles2 tile $00
predef GetFrontpic
predef GetMonFrontpic
pop af
ld [UnownLetter], a
ret
@@ -2586,7 +2586,7 @@ _NewPokedexEntry: ; 41a7f
call WaitBGMap
call GetBaseData
ld de, VTiles2
predef GetFrontpic
predef GetMonFrontpic
ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout
ld a, [CurPartySpecies]

2
engine/pokepic.asm
View File

@@ -12,7 +12,7 @@ Pokepic:: ; 244e3
ld [CurSpecies], a
call GetBaseData
ld de, VTiles1
predef GetFrontpic
predef GetMonFrontpic
ld a, [wMenuBorderTopCoord]
inc a
ld b, a

10
engine/predef.asm
View File

@@ -54,8 +54,8 @@ PredefPointers:: ; 856b
add_predef UpdateEnemyHUD
add_predef StartBattle
add_predef FillInExpBar
add_predef GetMonBackpic ; $18
add_predef GetMonFrontpic
add_predef GetBattleMonBackpic ; $18
add_predef GetEnemyMonFrontpic
add_predef LearnLevelMoves
add_predef FillMoves
add_predef EvolveAfterBattle
@@ -90,9 +90,9 @@ PredefPointers:: ; 856b
add_predef Predef39
add_predef Predef3A
add_predef PartyMonItemName
add_predef GetFrontpic
add_predef GetBackpic
add_predef FrontpicPredef
add_predef GetMonFrontpic
add_predef GetMonBackpic
add_predef GetAnimatedFrontpicPredef
add_predef GetTrainerPic
add_predef DecompressPredef ; $40
add_predef CheckTypeMatchup

4
engine/stats_screen.asm
View File

@@ -866,7 +866,7 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226)
ret c
call StatsScreen_LoadTextBoxSpaceGFX
ld de, VTiles2 tile $00
predef FrontpicPredef
predef GetAnimatedFrontpicPredef
hlcoord 0, 0
ld d, $0
ld e, ANIM_MON_MENU
@@ -1071,7 +1071,7 @@ StatsScreen_AnimateEgg: ; 4e497 (13:6497)
ld [wBoxAlignment], a
call StatsScreen_LoadTextBoxSpaceGFX
ld de, VTiles2 tile $00
predef FrontpicPredef
predef GetAnimatedFrontpicPredef
pop de
hlcoord 0, 0
ld d, $0

2
engine/trade_animation.asm
View File

@@ -877,7 +877,7 @@ TradeAnim_GetFrontpic: ; 29491
ld [CurSpecies], a
call GetBaseData
pop de
predef GetFrontpic
predef GetMonFrontpic
ret
; 294a9

2
engine/trademon_frontpic.asm
View File

@@ -10,7 +10,7 @@ GetTrademonFrontpic: ; 4d7fd
ld [CurSpecies], a
call GetBaseData
pop de
predef FrontpicPredef
predef GetAnimatedFrontpicPredef
ret
AnimateTrademonFrontpic: ; 4d81e