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

Resolve #461

Browse Source
This commit is contained in:
Remy Oukaour
2018-01-10 13:47:57 -05:00
parent cc95d1208d
commit 417937cffc
35 changed files with 350 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
constants/gfx_constants.asm
View File

@@ -20,3 +20,12 @@ HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels
EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels
PALPACKET_LENGTH EQU $10 PALPACKET_LENGTH EQU $10
; sprite_oam_struct members (see macros/wram.asm)
const_def
const SPRITEOAMSTRUCT_YCOORD ; 0
const SPRITEOAMSTRUCT_XCOORD ; 1
const SPRITEOAMSTRUCT_TILE_ID ; 2
const SPRITEOAMSTRUCT_ATTRIBUTES ; 3
SPRITEOAMSTRUCT_LENGTH EQU const_value
NUM_SPRITE_OAM_STRUCTS EQU 40 ; see Sprites

24
engine/battle/core.asm
View File

@@ -9329,27 +9329,27 @@ CopyBackpic: ; 3fc30
; 3fc5b ; 3fc5b
.LoadTrainerBackpicAsOAM: ; 3fc5b .LoadTrainerBackpicAsOAM: ; 3fc5b
ld hl, Sprites ld hl, Sprite01
xor a xor a
ld [hMapObjectIndexBuffer], a ld [hMapObjectIndexBuffer], a
ld b, $6 ld b, 6
ld e, 21 * 8 ld e, (SCREEN_WIDTH + 1) * TILE_WIDTH
.outer_loop .outer_loop
ld c, $3 ld c, 3
ld d, 8 * 8 ld d, 8 * TILE_WIDTH
.inner_loop .inner_loop
ld [hl], d ld [hl], d ; y
inc hl inc hl
ld [hl], e ld [hl], e ; x
inc hl inc hl
ld a, [hMapObjectIndexBuffer] ld a, [hMapObjectIndexBuffer]
ld [hli], a ld [hli], a ; tile id
inc a inc a
ld [hMapObjectIndexBuffer], a ld [hMapObjectIndexBuffer], a
ld a, $1 ld a, PAL_BATTLE_OB_PLAYER
ld [hli], a ld [hli], a ; attributes
ld a, d ld a, d
add $8 add 1 * TILE_WIDTH
ld d, a ld d, a
dec c dec c
jr nz, .inner_loop jr nz, .inner_loop
@@ -9357,7 +9357,7 @@ CopyBackpic: ; 3fc30
add $3 add $3
ld [hMapObjectIndexBuffer], a ld [hMapObjectIndexBuffer], a
ld a, e ld a, e
add $8 add 1 * TILE_WIDTH
ld e, a ld e, a
dec b dec b
jr nz, .outer_loop jr nz, .outer_loop

4
engine/battle/sliding_intro.asm
View File

@@ -60,9 +60,9 @@ BattleIntroSlidingPics: ; 4e980
; 4e9d6 ; 4e9d6
.subfunction3 ; 4e9d6 .subfunction3 ; 4e9d6
ld hl, Sprites + 1 ; x pixel ld hl, Sprite01XCoord
ld c, $12 ; 18 ld c, $12 ; 18
ld de, $4 ld de, SPRITEOAMSTRUCT_LENGTH
.loop3 .loop3
dec [hl] dec [hl]
dec [hl] dec [hl]

18
engine/battle/trainer_huds.asm
View File

@@ -28,7 +28,7 @@ ShowPlayerMonsRemaining: ; 2c01c
ld [hl], a ld [hl], a
ld a, 8 ld a, 8
ld [wPlaceBallsDirection], a ld [wPlaceBallsDirection], a
ld hl, Sprites ld hl, Sprite01
jp LoadTrainerHudOAM jp LoadTrainerHudOAM
; 2c03a ; 2c03a
@@ -44,7 +44,7 @@ ShowOTTrainerMonsRemaining: ; 2c03a
ld [hl], 4 * 8 ld [hl], 4 * 8
ld a, -8 ld a, -8
ld [wPlaceBallsDirection], a ld [wPlaceBallsDirection], a
ld hl, Sprites + PARTY_LENGTH * 4 ld hl, Sprite07
jp LoadTrainerHudOAM jp LoadTrainerHudOAM
; 2c059 ; 2c059
@@ -193,7 +193,7 @@ LinkBattle_TrainerHuds: ; 2c10d
ld [hl], 8 * 8 ld [hl], 8 * 8
ld a, $8 ld a, $8
ld [wPlaceBallsDirection], a ld [wPlaceBallsDirection], a
ld hl, Sprites ld hl, Sprite01
call LoadTrainerHudOAM call LoadTrainerHudOAM
ld hl, OTPartyMon1HP ld hl, OTPartyMon1HP
@@ -203,7 +203,7 @@ LinkBattle_TrainerHuds: ; 2c10d
ld a, 10 * 8 ld a, 10 * 8
ld [hli], a ld [hli], a
ld [hl], 13 * 8 ld [hl], 13 * 8
ld hl, Sprites + PARTY_LENGTH * 4 ld hl, Sprite07
jp LoadTrainerHudOAM jp LoadTrainerHudOAM
; 2c143 ; 2c143
@@ -212,13 +212,13 @@ LoadTrainerHudOAM: ; 2c143
ld c, PARTY_LENGTH ld c, PARTY_LENGTH
.loop .loop
ld a, [wPlaceBallsY] ld a, [wPlaceBallsY]
ld [hli], a ld [hli], a ; y
ld a, [wPlaceBallsX] ld a, [wPlaceBallsX]
ld [hli], a ld [hli], a ; x
ld a, [de] ld a, [de]
ld [hli], a ld [hli], a ; tile id
ld a, $3 ld a, PAL_BATTLE_OB_YELLOW
ld [hli], a ld [hli], a ; attributes
ld a, [wPlaceBallsX] ld a, [wPlaceBallsX]
ld b, a ld b, a
ld a, [wPlaceBallsDirection] ld a, [wPlaceBallsDirection]

8
engine/battle_anims/anim_commands.asm
View File

@@ -258,15 +258,15 @@ BattleAnim_ClearCGB_OAMFlags: ; cc23d
bit 3, a bit 3, a
jr z, .delete jr z, .delete
ld hl, Sprites + 3 ld hl, Sprite01Attributes
ld c, (SpritesEnd - Sprites) / 4 ld c, NUM_SPRITE_OAM_STRUCTS
.loop .loop
ld a, [hl] ld a, [hl]
and $f0 and $f0
ld [hli], a ld [hli], a
rept SPRITEOAMSTRUCT_LENGTH +- 1
inc hl inc hl
inc hl endr
inc hl
dec c dec c
jr nz, .loop jr nz, .loop
ret ret

0
engine/battle_anims/engine.asm → engine/battle_anims/core.asm
View File

12
engine/billspc.asm
View File

@@ -1502,7 +1502,7 @@ BillsPC_UpdateSelectionCursor: ; e2e01 (38:6e01)
.place_cursor .place_cursor
ld hl, .OAM ld hl, .OAM
ld de, Sprites ld de, Sprite01
.loop .loop
ld a, [hl] ld a, [hl]
cp -1 cp -1
@@ -1512,9 +1512,9 @@ BillsPC_UpdateSelectionCursor: ; e2e01 (38:6e01)
swap a swap a
add [hl] add [hl]
inc hl inc hl
ld [de], a ld [de], a ; y
inc de inc de
rept 3 rept SPRITEOAMSTRUCT_LENGTH +- 1
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
inc de inc de
@@ -1552,7 +1552,7 @@ endr
BillsPC_UpdateInsertCursor: ; e2e8c BillsPC_UpdateInsertCursor: ; e2e8c
ld hl, .OAM ld hl, .OAM
ld de, Sprites ld de, Sprite01
.loop .loop
ld a, [hl] ld a, [hl]
cp -1 cp -1
@@ -1562,9 +1562,9 @@ BillsPC_UpdateInsertCursor: ; e2e8c
swap a swap a
add [hl] add [hl]
inc hl inc hl
ld [de], a ld [de], a ; y
inc de inc de
rept 3 rept SPRITEOAMSTRUCT_LENGTH +- 1
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
inc de inc de

16
engine/card_flip.asm
View File

@@ -594,23 +594,23 @@ CardFlip_CopyToBox: ; e04f7 (38:44f7)
; e0509 (38:4509) ; e0509 (38:4509)
CardFlip_CopyOAM: ; e0509 CardFlip_CopyOAM: ; e0509
ld de, Sprites ld de, Sprite01
ld a, [hli] ld a, [hli]
.loop .loop
push af push af
ld a, [hli] ld a, [hli]
add b add b
ld [de], a ld [de], a ; y
inc de inc de
ld a, [hli] ld a, [hli]
add c add c
ld [de], a ld [de], a ; x
inc de inc de
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a ; tile id
inc de inc de
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a ; attributes
inc de inc de
pop af pop af
dec a dec a
@@ -619,11 +619,11 @@ CardFlip_CopyOAM: ; e0509
; e0521 ; e0521
CardFlip_ShiftDigitsLeftTwoPixels: ; e0521 (38:4521) CardFlip_ShiftDigitsLeftTwoPixels: ; e0521 (38:4521)
ld de, vTiles1 tile ("0" & $7f) ld de, vTiles0 tile "0"
ld hl, vTiles1 tile ("0" & $7f) + 2 ld hl, vTiles0 tile "0" + 2
ld bc, 10 tiles - 2 ld bc, 10 tiles - 2
call CopyBytes call CopyBytes
ld hl, vTiles1 tile $7f + 1 tiles - 2 ld hl, vTiles0 tile "9" + 1 tiles - 2
xor a xor a
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a

12
engine/debug.asm
View File

@@ -1016,17 +1016,17 @@ Function81f5e: ; 81f5e
.asm_81fb7 .asm_81fb7
ld a, b ld a, b
ld [hli], a ld [hli], a ; y
ld a, [de] ld a, [de]
add a add a
add a add a
add $18 add 3 * TILE_WIDTH
ld [hli], a ld [hli], a ; x
xor a xor a
ld [hli], a ld [hli], a ; tile id
ld a, c ld a, c
ld [hli], a ld [hli], a ; attributes
ld a, $10 ld a, 2 * TILE_WIDTH
add b add b
ld b, a ld b, a
inc c inc c

18
engine/events/celebi.asm
View File

@@ -43,26 +43,26 @@ Special_CelebiShrineEvent: ; 4989a
.done .done
pop af pop af
ld [VramState], a ld [VramState], a
call .RefreshPlayerSprite_ClearAllOthers call .RestorePlayerSprite_DespawnLeaves
call CelebiEvent_SetBattleType call CelebiEvent_SetBattleType
ret ret
; 498f9 ; 498f9
.RefreshPlayerSprite_ClearAllOthers: ; 498f9 .RestorePlayerSprite_DespawnLeaves: ; 498f9
ld hl, Sprites + 2 ld hl, Sprite01TileID
xor a xor a
ld c, $4 ld c, 4
.OAMloop: .OAMloop:
ld [hli], a ld [hli], a ; tile id
inc hl rept SPRITEOAMSTRUCT_LENGTH +- 1
inc hl
inc hl inc hl
endr
inc a inc a
dec c dec c
jr nz, .OAMloop jr nz, .OAMloop
ld hl, Sprites + 4 * 4 ld hl, Sprite05
ld bc, 36 * 4 ld bc, SpritesEnd - Sprite05
xor a xor a
call ByteFill call ByteFill
ret ret

22
engine/events/field_moves.asm
View File

@@ -62,8 +62,8 @@ ShakeHeadbuttTree: ; 8c80a
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
farcall ClearSpriteAnims farcall ClearSpriteAnims
ld hl, Sprites + 36 * 4 ld hl, Sprite37
ld bc, SpritesEnd - (Sprites + 36 * 4) ld bc, SpritesEnd - Sprite37
xor a xor a
call ByteFill call ByteFill
ld de, Font ld de, Font
@@ -393,19 +393,19 @@ FlyToAnim: ; 8cb33
ret ret
.RestorePlayerSprite_DespawnLeaves: ; 8cb82 (23:4b82) .RestorePlayerSprite_DespawnLeaves: ; 8cb82 (23:4b82)
ld hl, Sprites + 2 ; Tile ID ld hl, Sprite01TileID
xor a xor a
ld c, $4 ld c, 4
.loop2 .OAMloop
ld [hli], a ld [hli], a ; tile id
inc hl rept SPRITEOAMSTRUCT_LENGTH +- 1
inc hl
inc hl inc hl
endr
inc a inc a
dec c dec c
jr nz, .loop2 jr nz, .OAMloop
ld hl, Sprites + 4 * 4 ld hl, Sprite05
ld bc, SpritesEnd - (Sprites + 4 * 4) ld bc, SpritesEnd - Sprite05
xor a xor a
call ByteFill call ByteFill
ret ret

14
engine/events/heal_machine_anim.asm
View File

@@ -73,20 +73,20 @@ HealMachineAnim: ; 12324
call .LoadPalettes call .LoadPalettes
ld de, .HealMachineGFX ld de, .HealMachineGFX
ld hl, vTiles0 tile $7c ld hl, vTiles0 tile $7c
lb bc, BANK(.HealMachineGFX), $2 lb bc, BANK(.HealMachineGFX), 2
call Request2bpp call Request2bpp
ret ret
; 12393 ; 12393
.PC_LoadBallsOntoMachine: ; 12393 .PC_LoadBallsOntoMachine: ; 12393
ld hl, Sprites + $80 ld hl, Sprite33
ld de, .PC_ElmsLab_OAM ld de, .PC_ElmsLab_OAM
call .PlaceHealingMachineTile call .PlaceHealingMachineTile
call .PlaceHealingMachineTile call .PlaceHealingMachineTile
jr .LoadBallsOntoMachine jr .LoadBallsOntoMachine
.HOF_LoadBallsOntoMachine: ; 123a1 .HOF_LoadBallsOntoMachine: ; 123a1
ld hl, Sprites + $80 ld hl, Sprite33
ld de, .HOF_OAM ld de, .HOF_OAM
.LoadBallsOntoMachine: ; 123a7 .LoadBallsOntoMachine: ; 123a7
@@ -249,17 +249,17 @@ INCBIN "gfx/overworld/heal_machine.2bpp"
ld a, [de] ld a, [de]
add c add c
inc de inc de
ld [hli], a ld [hli], a ; y
ld a, [de] ld a, [de]
add b add b
inc de inc de
ld [hli], a ld [hli], a ; x
ld a, [de] ld a, [de]
inc de inc de
ld [hli], a ld [hli], a ; tile id
ld a, [de] ld a, [de]
inc de inc de
ld [hli], a ld [hli], a ; attributes
pop bc pop bc
ret ret
; 124c1 ; 124c1

10
engine/evolution_animation.asm
View File

@@ -346,15 +346,15 @@ EvolutionAnimation: ; 4e5e1
inc a inc a
and $7 and $7
ld b, a ld b, a
ld hl, Sprites + 3 ; attributes ld hl, Sprite01Attributes
ld c, 40 ld c, NUM_SPRITE_OAM_STRUCTS
.loop6 .loop6
ld a, [hl] ld a, [hl]
or b or b
ld [hli], a ld [hli], a ; attributes
inc hl rept SPRITEOAMSTRUCT_LENGTH +- 1
inc hl
inc hl inc hl
endr
dec c dec c
jr nz, .loop6 jr nz, .loop6
pop bc pop bc

13
engine/intro_menu.asm
View File

@@ -971,7 +971,7 @@ Intro_PlacePlayerSprite: ; 61cd
ld hl, vTiles0 ld hl, vTiles0
call Request2bpp call Request2bpp
ld hl, Sprites ld hl, Sprite01
ld de, .sprites ld de, .sprites
ld a, [de] ld a, [de]
inc de inc de
@@ -980,19 +980,19 @@ Intro_PlacePlayerSprite: ; 61cd
.loop .loop
ld a, [de] ld a, [de]
inc de inc de
ld [hli], a ld [hli], a ; y
ld a, [de] ld a, [de]
inc de inc de
ld [hli], a ld [hli], a ; x
ld a, [de] ld a, [de]
inc de inc de
ld [hli], a ld [hli], a ; tile id
ld b, 0 ld b, PAL_OW_RED
ld a, [wPlayerGender] ld a, [wPlayerGender]
bit 0, a bit 0, a
jr z, .male jr z, .male
ld b, 1 ld b, PAL_OW_BLUE
.male .male
ld a, b ld a, b
@@ -1004,6 +1004,7 @@ Intro_PlacePlayerSprite: ; 61cd
.sprites ; 61fe .sprites ; 61fe
db 4 db 4
; y pxl, x pxl, tile offset
db 9 * 8 + 4, 9 * 8, 0 db 9 * 8 + 4, 9 * 8, 0
db 9 * 8 + 4, 10 * 8, 1 db 9 * 8 + 4, 10 * 8, 1
db 10 * 8 + 4, 9 * 8, 2 db 10 * 8 + 4, 9 * 8, 2

17
engine/map_objects.asm
View File

@@ -2793,6 +2793,7 @@ Function5903: ; 5903
db SPRITEMOVEDATA_STANDING_LEFT db SPRITEMOVEDATA_STANDING_LEFT
db SPRITEMOVEDATA_STANDING_RIGHT db SPRITEMOVEDATA_STANDING_RIGHT
; 5920 ; 5920
_UpdateSprites:: ; 5920 _UpdateSprites:: ; 5920
ld a, [VramState] ld a, [VramState]
bit 0, a bit 0, a
@@ -2814,18 +2815,18 @@ _UpdateSprites:: ; 5920
bit 1, a bit 1, a
ld b, LOW(SpritesEnd) ld b, LOW(SpritesEnd)
jr z, .ok jr z, .ok
ld b, 28 * 4 ld b, 28 * SPRITEOAMSTRUCT_LENGTH
.ok .ok
ld a, [hUsedSpriteIndex] ld a, [hUsedSpriteIndex]
cp b cp b
ret nc ret nc
ld l, a ld l, a
ld h, HIGH(Sprites) ld h, HIGH(Sprites)
ld de, 4 ld de, SPRITEOAMSTRUCT_LENGTH
ld a, b ld a, b
ld c, SCREEN_HEIGHT_PX + 16 ld c, SCREEN_HEIGHT_PX + 2 * TILE_WIDTH
.loop .loop
ld [hl], c ld [hl], c ; y
add hl, de add hl, de
cp l cp l
jr nz, .loop jr nz, .loop
@@ -3042,12 +3043,12 @@ PRIORITY_HIGH EQU $30
ld a, [hFFC0] ld a, [hFFC0]
add [hl] add [hl]
inc hl inc hl
ld [bc], a ld [bc], a ; y
inc c inc c
ld a, [hFFBF] ld a, [hFFBF]
add [hl] add [hl]
inc hl inc hl
ld [bc], a ld [bc], a ; x
inc c inc c
ld e, [hl] ld e, [hl]
inc hl inc hl
@@ -3058,7 +3059,7 @@ PRIORITY_HIGH EQU $30
.nope1 .nope1
add [hl] add [hl]
inc hl inc hl
ld [bc], a ld [bc], a ; tile id
inc c inc c
ld a, e ld a, e
bit 1, a bit 1, a
@@ -3068,7 +3069,7 @@ PRIORITY_HIGH EQU $30
.nope2 .nope2
and %11110000 and %11110000
or d or d
ld [bc], a ld [bc], a ; attributes
inc c inc c
ld a, [hUsedSpriteTile] ld a, [hUsedSpriteTile]
dec a dec a

32
engine/mystery_gift.asm
View File

@@ -1456,33 +1456,33 @@ Function105688: ; 105688 (41:5688)
jr asm_105726 jr asm_105726
Function1056eb: ; 1056eb (41:56eb) Function1056eb: ; 1056eb (41:56eb)
ld c, $10 ld c, 16
.asm_1056ed .loop
ld hl, Sprites ld hl, Sprite01YCoord
ld b, $8 ld b, 8
.asm_1056f2 .dec_y_loop
dec [hl] dec [hl]
rept 4 rept SPRITEOAMSTRUCT_LENGTH
inc hl inc hl
endr endr
dec b dec b
jr nz, .asm_1056f2 jr nz, .dec_y_loop
ld hl, Sprites + $20 ld hl, Sprite09YCoord
ld b, $8 ld b, 8
.asm_1056ff .inc_y_loop
inc [hl] inc [hl]
rept 4 rept SPRITEOAMSTRUCT_LENGTH
inc hl inc hl
endr endr
dec b dec b
jr nz, .asm_1056ff jr nz, .inc_y_loop
dec c dec c
ret z ret z
push bc push bc
ld c, 4 ld c, 4
call DelayFrames call DelayFrames
pop bc pop bc
jr .asm_1056ed jr .loop
Function105712: ; 105712 (41:5712) Function105712: ; 105712 (41:5712)
call Function105777 call Function105777
@@ -1580,7 +1580,7 @@ Function1057d7: ; 1057d7 (41:57d7)
ld a, BANK(MysteryGiftJP_GFX) ld a, BANK(MysteryGiftJP_GFX)
lb bc, 4, 0 lb bc, 4, 0
call FarCopyBytes call FarCopyBytes
ld hl, MysteryGiftJP_GFX + $400 ld hl, MysteryGiftJP_GFX + $40 tiles
ld de, vTiles0 tile $00 ld de, vTiles0 tile $00
ld a, BANK(MysteryGiftJP_GFX) ld a, BANK(MysteryGiftJP_GFX)
ld bc, $80 ld bc, $80
@@ -1656,9 +1656,9 @@ Function1057d7: ; 1057d7 (41:57d7)
ld [hl], $3c ld [hl], $3c
hlcoord 17, 15 hlcoord 17, 15
ld [hl], $3e ld [hl], $3e
ld de, Sprites ld de, Sprite01
ld hl, .OAM_data ld hl, .OAM_data
ld bc, $40 ld bc, 16 * SPRITEOAMSTRUCT_LENGTH
call CopyBytes call CopyBytes
call EnableLCD call EnableLCD
call WaitBGMap call WaitBGMap

20
engine/pokedex.asm
View File

@@ -2050,7 +2050,7 @@ Pokedex_PutOldModeCursorOAM: ; 41157 (10:5157)
dsprite 5, 0, 19, -2, $32, 7 | X_FLIP | Y_FLIP dsprite 5, 0, 19, -2, $32, 7 | X_FLIP | Y_FLIP
dsprite 5, 0, 20, -2, $31, 7 | X_FLIP | Y_FLIP dsprite 5, 0, 20, -2, $31, 7 | X_FLIP | Y_FLIP
dsprite 4, 0, 20, -2, $30, 7 | X_FLIP | Y_FLIP dsprite 4, 0, 20, -2, $30, 7 | X_FLIP | Y_FLIP
db $ff db -1
.CursorAtTopOAM: ; 411c8 .CursorAtTopOAM: ; 411c8
; OAM data for when the cursor is at the top of the list. The tiles at the top ; OAM data for when the cursor is at the top of the list. The tiles at the top
@@ -2079,7 +2079,7 @@ Pokedex_PutOldModeCursorOAM: ; 41157 (10:5157)
dsprite 5, 0, 19, -2, $32, 7 | X_FLIP | Y_FLIP dsprite 5, 0, 19, -2, $32, 7 | X_FLIP | Y_FLIP
dsprite 5, 0, 20, -2, $31, 7 | X_FLIP | Y_FLIP dsprite 5, 0, 20, -2, $31, 7 | X_FLIP | Y_FLIP
dsprite 4, 0, 20, -2, $30, 7 | X_FLIP | Y_FLIP dsprite 4, 0, 20, -2, $30, 7 | X_FLIP | Y_FLIP
db $ff db -1
Pokedex_PutNewModeABCModeCursorOAM: ; 41229 (10:5229) Pokedex_PutNewModeABCModeCursorOAM: ; 41229 (10:5229)
ld hl, .CursorOAM ld hl, .CursorOAM
@@ -2107,7 +2107,7 @@ Pokedex_PutNewModeABCModeCursorOAM: ; 41229 (10:5229)
dsprite 5, 3, 18, 0, $32, 7 | X_FLIP | Y_FLIP dsprite 5, 3, 18, 0, $32, 7 | X_FLIP | Y_FLIP
dsprite 5, 3, 19, 0, $31, 7 | X_FLIP | Y_FLIP dsprite 5, 3, 19, 0, $31, 7 | X_FLIP | Y_FLIP
dsprite 4, 3, 19, 0, $30, 7 | X_FLIP | Y_FLIP dsprite 4, 3, 19, 0, $30, 7 | X_FLIP | Y_FLIP
db $ff db -1
Pokedex_UpdateSearchResultsCursorOAM: ; 41281 (10:5281) Pokedex_UpdateSearchResultsCursorOAM: ; 41281 (10:5281)
ld a, [wCurrentDexMode] ld a, [wCurrentDexMode]
@@ -2142,28 +2142,28 @@ Pokedex_UpdateSearchResultsCursorOAM: ; 41281 (10:5281)
dsprite 5, 3, 19, -2, $32, 7 | X_FLIP | Y_FLIP dsprite 5, 3, 19, -2, $32, 7 | X_FLIP | Y_FLIP
dsprite 5, 3, 20, -2, $31, 7 | X_FLIP | Y_FLIP dsprite 5, 3, 20, -2, $31, 7 | X_FLIP | Y_FLIP
dsprite 4, 3, 20, -2, $30, 7 | X_FLIP | Y_FLIP dsprite 4, 3, 20, -2, $30, 7 | X_FLIP | Y_FLIP
db $ff db -1
Pokedex_LoadCursorOAM: ; 412f1 (10:52f1) Pokedex_LoadCursorOAM: ; 412f1 (10:52f1)
ld de, Sprites ld de, Sprite01
.loop .loop
ld a, [hl] ld a, [hl]
cp $ff cp -1
ret z ret z
ld a, [wDexListingCursor] ld a, [wDexListingCursor]
and $7 and $7
swap a swap a
add [hl] add [hl] ; y
inc hl inc hl
ld [de], a ld [de], a
inc de inc de
ld a, [hli] ld a, [hli] ; x
ld [de], a ld [de], a
inc de inc de
ld a, [hli] ld a, [hli] ; tile id
ld [de], a ld [de], a
inc de inc de
ld a, [hli] ld a, [hli] ; attributes
ld [de], a ld [de], a
inc de inc de
jr .loop jr .loop

10
engine/pokedex_2.asm
View File

@@ -41,15 +41,15 @@ AnimateDexSearchSlowpoke: ; 441cf
DoDexSearchSlowpokeFrame: ; 44207 DoDexSearchSlowpokeFrame: ; 44207
ld a, [wDexSearchSlowpokeFrame] ld a, [wDexSearchSlowpokeFrame]
ld hl, .SlowpokeSpriteData ld hl, .SlowpokeSpriteData
ld de, Sprites ld de, Sprite01
.loop .loop
ld a, [hli] ld a, [hli]
cp -1 cp -1
ret z ret z
ld [de], a ld [de], a ; y
inc de inc de
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a ; x
inc de inc de
ld a, [wDexSearchSlowpokeFrame] ld a, [wDexSearchSlowpokeFrame]
ld b, a ld b, a
@@ -57,10 +57,10 @@ DoDexSearchSlowpokeFrame: ; 44207
add b add b
add [hl] add [hl]
inc hl inc hl
ld [de], a ld [de], a ; tile id
inc de inc de
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a ; attributes
inc de inc de
jr .loop jr .loop

35
engine/pokegear.asm
View File

@@ -2596,7 +2596,7 @@ _Area: ; 91d11
ld e, a ld e, a
farcall FindNest ; load nest landmarks into TileMap[0,0] farcall FindNest ; load nest landmarks into TileMap[0,0]
decoord 0, 0 decoord 0, 0
ld hl, Sprites ld hl, Sprite01
.nestloop .nestloop
ld a, [de] ld a, [de]
and a and a
@@ -2609,14 +2609,14 @@ _Area: ; 91d11
; load into OAM ; load into OAM
ld a, d ld a, d
sub 4 sub 4
ld [hli], a ld [hli], a ; y
ld a, e ld a, e
sub 4 sub 4
ld [hli], a ld [hli], a ; x
ld a, $7f ; nest icon in this context ld a, $7f ; nest icon
ld [hli], a ld [hli], a ; tile id
xor a xor a
ld [hli], a ld [hli], a ; attributes
; next ; next
pop de pop de
inc de inc de
@@ -2640,37 +2640,37 @@ _Area: ; 91d11
ld c, e ld c, e
ld b, d ld b, d
ld de, .PlayerOAM ld de, .PlayerOAM
ld hl, Sprites ld hl, Sprite01
.ShowPlayerLoop: .ShowPlayerLoop:
ld a, [de] ld a, [de]
cp $80 cp $80
jr z, .clear_oam jr z, .clear_oam
add b add b
ld [hli], a ld [hli], a ; y
inc de inc de
ld a, [de] ld a, [de]
add c add c
ld [hli], a ld [hli], a ; x
inc de inc de
ld a, [de] ld a, [de]
add $78 ; where the player's sprite is loaded add $78 ; where the player's sprite is loaded
ld [hli], a ld [hli], a ; tile id
inc de inc de
push bc push bc
ld c, 0 ; RED ld c, PAL_OW_RED
ld a, [wPlayerGender] ld a, [wPlayerGender]
bit 0, a bit 0, a
jr z, .got_gender jr z, .male
inc c ; BLUE inc c ; PAL_OW_BLUE
.got_gender .male
ld a, c ld a, c
ld [hli], a ld [hli], a ; attributes
pop bc pop bc
jr .ShowPlayerLoop jr .ShowPlayerLoop
.clear_oam .clear_oam
ld hl, Sprites + 4 * 4 ld hl, Sprite05
ld bc, SpritesEnd - (Sprites + 4 * 4) ld bc, SpritesEnd - Sprite05
xor a xor a
call ByteFill call ByteFill
ret ret
@@ -2678,6 +2678,7 @@ _Area: ; 91d11
; 91e9c ; 91e9c
.PlayerOAM: ; 91e9c .PlayerOAM: ; 91e9c
; y pxl, x pxl, tile offset
db -1 * 8, -1 * 8, 0 ; top left db -1 * 8, -1 * 8, 0 ; top left
db -1 * 8, 0 * 8, 1 ; top right db -1 * 8, 0 * 8, 1 ; top right
db 0 * 8, -1 * 8, 2 ; bottom left db 0 * 8, -1 * 8, 2 ; bottom left

2
engine/routines/loadpushoam.asm
View File

@@ -13,7 +13,7 @@ LoadPushOAM:: ; 4031
.PushOAM: ; 403f .PushOAM: ; 403f
ld a, HIGH(Sprites) ld a, HIGH(Sprites)
ld [rDMA], a ld [rDMA], a
ld a, (SpritesEnd - Sprites) / 4 ; 40 ld a, NUM_SPRITE_OAM_STRUCTS
.pushoam_loop .pushoam_loop
dec a dec a
jr nz, .pushoam_loop jr nz, .pushoam_loop

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