pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix wVirtualOAM labels, part 2.

Browse Source
This commit is contained in:
luckytyphlosion 2018-01-30 14:52:46 -05:00
parent 3c7ba37de7
commit 0b45e2e846
29 changed files with 106 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/battle/core.asm
View File

@ -9327,7 +9327,7 @@ CopyBackpic: ; 3fc30
; 3fc5b ; 3fc5b
.LoadTrainerBackpicAsOAM: ; 3fc5b .LoadTrainerBackpicAsOAM: ; 3fc5b
ld hl, wSprite01 ld hl, wVirtualOAMSprite00
xor a xor a
ld [hMapObjectIndexBuffer], a ld [hMapObjectIndexBuffer], a
ld b, 6 ld b, 6

2
engine/battle/sliding_intro.asm
View File

@ -60,7 +60,7 @@ BattleIntroSlidingPics: ; 4e980
; 4e9d6 ; 4e9d6
.subfunction3 ; 4e9d6 .subfunction3 ; 4e9d6
ld hl, wSprite01XCoord ld hl, wVirtualOAMSprite00XCoord
ld c, $12 ; 18 ld c, $12 ; 18
ld de, SPRITEOAMSTRUCT_LENGTH ld de, SPRITEOAMSTRUCT_LENGTH
.loop3 .loop3

8
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, wSprite01 ld hl, wVirtualOAMSprite00
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, wSprite01 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH ld hl, wVirtualOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
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, wSprite01 ld hl, wVirtualOAMSprite00
call LoadTrainerHudOAM call LoadTrainerHudOAM
ld hl, wOTPartyMon1HP ld hl, wOTPartyMon1HP
@ -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, wSprite01 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH ld hl, wVirtualOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
jp LoadTrainerHudOAM jp LoadTrainerHudOAM
; 2c143 ; 2c143

2
engine/battle_anims/anim_commands.asm
View File

@ -257,7 +257,7 @@ BattleAnim_ClearCGB_OAMFlags: ; cc23d
bit 3, a bit 3, a
jr z, .delete jr z, .delete
ld hl, wSprite01Attributes ld hl, wVirtualOAMSprite00Attributes
ld c, NUM_SPRITE_OAM_STRUCTS ld c, NUM_SPRITE_OAM_STRUCTS
.loop .loop
ld a, [hl] ld a, [hl]

4
engine/billspc.asm
View File

@ -1498,7 +1498,7 @@ BillsPC_UpdateSelectionCursor: ; e2e01 (38:6e01)
.place_cursor .place_cursor
ld hl, .OAM ld hl, .OAM
ld de, wSprite01 ld de, wVirtualOAMSprite00
.loop .loop
ld a, [hl] ld a, [hl]
cp -1 cp -1
@ -1548,7 +1548,7 @@ endr
BillsPC_UpdateInsertCursor: ; e2e8c BillsPC_UpdateInsertCursor: ; e2e8c
ld hl, .OAM ld hl, .OAM
ld de, wSprite01 ld de, wVirtualOAMSprite00
.loop .loop
ld a, [hl] ld a, [hl]
cp -1 cp -1

2
engine/card_flip.asm
View File

@ -601,7 +601,7 @@ CardFlip_CopyToBox: ; e04f7 (38:44f7)
; e0509 (38:4509) ; e0509 (38:4509)
CardFlip_CopyOAM: ; e0509 CardFlip_CopyOAM: ; e0509
ld de, wSprite01 ld de, wVirtualOAMSprite00
ld a, [hli] ld a, [hli]
.loop .loop
push af push af

6
engine/events/celebi.asm
View File

@ -52,7 +52,7 @@ Special_CelebiShrineEvent: ; 4989a
; 498f9 ; 498f9
.RestorePlayerSprite_DespawnLeaves: ; 498f9 .RestorePlayerSprite_DespawnLeaves: ; 498f9
ld hl, wSprite01TileID ld hl, wVirtualOAMSprite00TileID
xor a xor a
ld c, 4 ld c, 4
.OAMloop: .OAMloop:
@ -63,8 +63,8 @@ endr
inc a inc a
dec c dec c
jr nz, .OAMloop jr nz, .OAMloop
ld hl, wSprite05 ld hl, wVirtualOAMSprite04
ld bc, wSpritesEnd - wSprite05 ld bc, wSpritesEnd - wVirtualOAMSprite04
xor a xor a
call ByteFill call ByteFill
ret ret

10
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, wSprite37 ld hl, wVirtualOAMSprite36
ld bc, wSpritesEnd - wSprite37 ld bc, wSpritesEnd - wVirtualOAMSprite36
xor a xor a
call ByteFill call ByteFill
ld de, Font ld de, Font
@ -393,7 +393,7 @@ FlyToAnim: ; 8cb33
ret ret
.RestorePlayerSprite_DespawnLeaves: ; 8cb82 (23:4b82) .RestorePlayerSprite_DespawnLeaves: ; 8cb82 (23:4b82)
ld hl, wSprite01TileID ld hl, wVirtualOAMSprite00TileID
xor a xor a
ld c, 4 ld c, 4
.OAMloop .OAMloop
@ -404,8 +404,8 @@ endr
inc a inc a
dec c dec c
jr nz, .OAMloop jr nz, .OAMloop
ld hl, wSprite05 ld hl, wVirtualOAMSprite04
ld bc, wSpritesEnd - wSprite05 ld bc, wSpritesEnd - wVirtualOAMSprite04
xor a xor a
call ByteFill call ByteFill
ret ret

4
engine/events/heal_machine_anim.asm
View File

@ -97,14 +97,14 @@ ENDM
; 12393 ; 12393
.PC_LoadBallsOntoMachine: ; 12393 .PC_LoadBallsOntoMachine: ; 12393
ld hl, wSprite33 ld hl, wVirtualOAMSprite32
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, wSprite33 ld hl, wVirtualOAMSprite32
ld de, .HOF_OAM ld de, .HOF_OAM
.LoadBallsOntoMachine: ; 123a7 .LoadBallsOntoMachine: ; 123a7

2
engine/evolution_animation.asm
View File

@ -346,7 +346,7 @@ EvolutionAnimation: ; 4e5e1
inc a inc a
and $7 and $7
ld b, a ld b, a
ld hl, wSprite01Attributes ld hl, wVirtualOAMSprite00Attributes
ld c, NUM_SPRITE_OAM_STRUCTS ld c, NUM_SPRITE_OAM_STRUCTS
.loop6 .loop6
ld a, [hl] ld a, [hl]

2
engine/intro_menu.asm
View File

@ -969,7 +969,7 @@ Intro_PlacePlayerSprite: ; 61cd
ld hl, vTiles0 ld hl, vTiles0
call Request2bpp call Request2bpp
ld hl, wSprite01 ld hl, wVirtualOAMSprite00
ld de, .sprites ld de, .sprites
ld a, [de] ld a, [de]
inc de inc de

6
engine/mystery_gift.asm
View File

@ -1458,7 +1458,7 @@ Function105688: ; 105688 (41:5688)
Function1056eb: ; 1056eb (41:56eb) Function1056eb: ; 1056eb (41:56eb)
ld c, 16 ld c, 16
.loop .loop
ld hl, wSprite01YCoord ld hl, wVirtualOAMSprite00YCoord
ld b, 8 ld b, 8
.dec_y_loop .dec_y_loop
dec [hl] dec [hl]
@ -1467,7 +1467,7 @@ rept SPRITEOAMSTRUCT_LENGTH
endr endr
dec b dec b
jr nz, .dec_y_loop jr nz, .dec_y_loop
ld hl, wSprite09YCoord ld hl, wVirtualOAMSprite08YCoord
ld b, 8 ld b, 8
.inc_y_loop .inc_y_loop
inc [hl] inc [hl]
@ -1656,7 +1656,7 @@ Function1057d7: ; 1057d7 (41:57d7)
ld [hl], $3c ld [hl], $3c
hlcoord 17, 15 hlcoord 17, 15
ld [hl], $3e ld [hl], $3e
ld de, wSprite01 ld de, wVirtualOAMSprite00
ld hl, .OAM_data ld hl, .OAM_data
ld bc, 16 * SPRITEOAMSTRUCT_LENGTH ld bc, 16 * SPRITEOAMSTRUCT_LENGTH
call CopyBytes call CopyBytes

2
engine/pokedex/pokedex.asm
View File

@ -2117,7 +2117,7 @@ Pokedex_UpdateSearchResultsCursorOAM: ; 41281 (10:5281)
db -1 db -1
Pokedex_LoadCursorOAM: ; 412f1 (10:52f1) Pokedex_LoadCursorOAM: ; 412f1 (10:52f1)
ld de, wSprite01 ld de, wVirtualOAMSprite00
.loop .loop
ld a, [hl] ld a, [hl]
cp -1 cp -1

2
engine/pokedex/pokedex_2.asm
View File

@ -41,7 +41,7 @@ AnimateDexSearchSlowpoke: ; 441cf
DoDexSearchSlowpokeFrame: ; 44207 DoDexSearchSlowpokeFrame: ; 44207
ld a, [wDexSearchSlowpokeFrame] ld a, [wDexSearchSlowpokeFrame]
ld hl, .SlowpokeSpriteData ld hl, .SlowpokeSpriteData
ld de, wSprite01 ld de, wVirtualOAMSprite00
.loop .loop
ld a, [hli] ld a, [hli]
cp -1 cp -1

8
engine/pokegear.asm
View File

@ -2627,7 +2627,7 @@ Pokedex_GetArea: ; 91d11
ld e, a ld e, a
farcall FindNest ; load nest landmarks into wTileMap[0,0] farcall FindNest ; load nest landmarks into wTileMap[0,0]
decoord 0, 0 decoord 0, 0
ld hl, wSprite01 ld hl, wVirtualOAMSprite00
.nestloop .nestloop
ld a, [de] ld a, [de]
and a and a
@ -2671,7 +2671,7 @@ Pokedex_GetArea: ; 91d11
ld c, e ld c, e
ld b, d ld b, d
ld de, .PlayerOAM ld de, .PlayerOAM
ld hl, wSprite01 ld hl, wVirtualOAMSprite00
.ShowPlayerLoop: .ShowPlayerLoop:
ld a, [de] ld a, [de]
cp $80 cp $80
@ -2700,8 +2700,8 @@ Pokedex_GetArea: ; 91d11
jr .ShowPlayerLoop jr .ShowPlayerLoop
.clear_oam .clear_oam
ld hl, wSprite05 ld hl, wVirtualOAMSprite04
ld bc, wSpritesEnd - wSprite05 ld bc, wSpritesEnd - wVirtualOAMSprite04
xor a xor a
call ByteFill call ByteFill
ret ret

2
engine/routines/switchpartymons.asm
View File

@ -25,7 +25,7 @@ _SwitchPartyMons:
ld a, " " ld a, " "
call ByteFill call ByteFill
pop af pop af
ld hl, wSprite01 ld hl, wVirtualOAMSprite00
ld bc, 4 * SPRITEOAMSTRUCT_LENGTH ld bc, 4 * SPRITEOAMSTRUCT_LENGTH
call AddNTimes call AddNTimes
ld de, SPRITEOAMSTRUCT_LENGTH ld de, SPRITEOAMSTRUCT_LENGTH

8
engine/slot_machine.asm
View File

@ -261,7 +261,7 @@ Unreferenced_Function9282c: ; 9282c
inc [hl] inc [hl]
and $7 and $7
ret nz ret nz
ld hl, wSprite17TileID ld hl, wVirtualOAMSprite16TileID
ld c, NUM_SPRITE_OAM_STRUCTS - 16 ld c, NUM_SPRITE_OAM_STRUCTS - 16
.loop .loop
ld a, [hl] ld a, [hl]
@ -671,7 +671,7 @@ Slots_InitReelTiles: ; 92a98 (24:6a98)
ld bc, wReel1 ld bc, wReel1
ld hl, REEL_OAM_ADDR ld hl, REEL_OAM_ADDR
add hl, bc add hl, bc
ld de, wSprite17 ld de, wVirtualOAMSprite16
ld [hl], e ld [hl], e
inc hl inc hl
ld [hl], d ld [hl], d
@ -689,7 +689,7 @@ Slots_InitReelTiles: ; 92a98 (24:6a98)
ld bc, wReel2 ld bc, wReel2
ld hl, REEL_OAM_ADDR ld hl, REEL_OAM_ADDR
add hl, bc add hl, bc
ld de, wSprite25 ld de, wVirtualOAMSprite24
ld [hl], e ld [hl], e
inc hl inc hl
ld [hl], d ld [hl], d
@ -707,7 +707,7 @@ Slots_InitReelTiles: ; 92a98 (24:6a98)
ld bc, wReel3 ld bc, wReel3
ld hl, REEL_OAM_ADDR ld hl, REEL_OAM_ADDR
add hl, bc add hl, bc
ld de, wSprite33 ld de, wVirtualOAMSprite32
ld [hl], e ld [hl], e
inc hl inc hl
ld [hl], d ld [hl], d

6
engine/sprites.asm
View File

@ -100,11 +100,11 @@ DoNextFrameForFirst16Sprites: ; 8cfa8 (23:4fa8)
ld a, [wCurrSpriteOAMAddr] ld a, [wCurrSpriteOAMAddr]
ld l, a ld l, a
ld h, HIGH(wSprite17) ld h, HIGH(wVirtualOAMSprite16)
.loop2 ; Clear (wVirtualOAM + [wCurrSpriteOAMAddr] --> Sprites + $40) .loop2 ; Clear (wVirtualOAM + [wCurrSpriteOAMAddr] --> Sprites + $40)
ld a, l ld a, l
cp LOW(wSprite17) cp LOW(wVirtualOAMSprite16)
jr nc, .done jr nc, .done
xor a xor a
ld [hli], a ld [hli], a
@ -649,7 +649,7 @@ AnimateEndOfExpBar: ; 8e79d
; 8e7c6 ; 8e7c6
.AnimateFrame: ; 8e7c6 .AnimateFrame: ; 8e7c6
ld hl, wSprite01 ld hl, wVirtualOAMSprite00
ld c, 8 ; number of animated circles ld c, 8 ; number of animated circles
.anim_loop .anim_loop
ld a, c ld a, c

4
engine/title.asm
View File

@ -323,7 +323,7 @@ DrawTitleGraphic: ; 10eeef
; 10ef06 ; 10ef06
InitializeBackground: ; 10ef06 InitializeBackground: ; 10ef06
ld hl, wSprite01 ld hl, wVirtualOAMSprite00
ld d, -$22 ld d, -$22
ld e, $0 ld e, $0
ld c, 5 ld c, 5
@ -366,7 +366,7 @@ AnimateTitleCrystal: ; 10ef32
; Stop at y=6 ; Stop at y=6
; y is really from the bottom of the sprite, which is two tiles high ; y is really from the bottom of the sprite, which is two tiles high
ld hl, wSprite01YCoord ld hl, wVirtualOAMSprite00YCoord
ld a, [hl] ld a, [hl]
cp 6 + 2 * TILE_WIDTH cp 6 + 2 * TILE_WIDTH
ret z ret z

2
engine/trainer_card.asm
View File

@ -479,7 +479,7 @@ TrainerCard_Page2_3_OAMUpdate: ; 25448 (9:5448)
ld d, a ld d, a
ld a, [de] ld a, [de]
ld c, a ld c, a
ld de, wSprite01 ld de, wVirtualOAMSprite00
ld b, NUM_JOHTO_BADGES ld b, NUM_JOHTO_BADGES
.loop .loop
srl c srl c

2
engine/unown_puzzle.asm
View File

@ -549,7 +549,7 @@ RedrawUnownPuzzlePieces: ; e14d9
ld hl, .OAM_NotHoldingPiece ld hl, .OAM_NotHoldingPiece
.load .load
ld de, wSprite01 ld de, wVirtualOAMSprite00
.loop .loop
ld a, [hli] ld a, [hli]
cp -1 cp -1

2
engine/unused_title.asm
View File

@ -49,7 +49,7 @@ UnusedTitleScreen: ; 10c000
jr nz, .copy jr nz, .copy
ld hl, UnusedTitleFG_OAM ld hl, UnusedTitleFG_OAM
ld de, wSprite01 ld de, wVirtualOAMSprite00
ld bc, SPRITEOAMSTRUCT_LENGTH * NUM_SPRITE_OAM_STRUCTS ld bc, SPRITEOAMSTRUCT_LENGTH * NUM_SPRITE_OAM_STRUCTS
call CopyBytes call CopyBytes

2
home.asm
View File

@ -181,7 +181,7 @@ ClearSprites:: ; 300b
HideSprites:: ; 3016 HideSprites:: ; 3016
; Set all OAM y-positions to 160 to hide them offscreen ; Set all OAM y-positions to 160 to hide them offscreen
ld hl, wSprite01YCoord ld hl, wVirtualOAMSprite00YCoord
ld de, SPRITEOAMSTRUCT_LENGTH ld de, SPRITEOAMSTRUCT_LENGTH
ld b, NUM_SPRITE_OAM_STRUCTS ld b, NUM_SPRITE_OAM_STRUCTS
ld a, SCREEN_WIDTH_PX ld a, SCREEN_WIDTH_PX

20
home/audio.asm
View File

@ -506,15 +506,15 @@ Unreferenced_Function3d9f:: ; 3d9f
; Places a BCD number at the ; Places a BCD number at the
; upper center of the screen. ; upper center of the screen.
ld a, 4 * TILE_WIDTH ld a, 4 * TILE_WIDTH
ld [wSprite39YCoord], a ld [wVirtualOAMSprite38YCoord], a
ld [wSprite40YCoord], a ld [wVirtualOAMSprite39YCoord], a
ld a, 10 * TILE_WIDTH ld a, 10 * TILE_WIDTH
ld [wSprite39XCoord], a ld [wVirtualOAMSprite38XCoord], a
ld a, 11 * TILE_WIDTH ld a, 11 * TILE_WIDTH
ld [wSprite40XCoord], a ld [wVirtualOAMSprite39XCoord], a
xor a xor a
ld [wSprite39Attributes], a ld [wVirtualOAMSprite38Attributes], a
ld [wSprite40Attributes], a ld [wVirtualOAMSprite39Attributes], a
ld a, [wc296] ld a, [wc296]
cp 100 cp 100
jr nc, .max jr nc, .max
@ -524,17 +524,17 @@ Unreferenced_Function3d9f:: ; 3d9f
swap a swap a
and $f and $f
add "0" add "0"
ld [wSprite39TileID], a ld [wVirtualOAMSprite38TileID], a
ld a, b ld a, b
and $f and $f
add "0" add "0"
ld [wSprite40TileID], a ld [wVirtualOAMSprite39TileID], a
ret ret
.max .max
ld a, "9" ld a, "9"
ld [wSprite39TileID], a ld [wVirtualOAMSprite38TileID], a
ld [wSprite40TileID], a ld [wVirtualOAMSprite39TileID], a
ret ret
; 3dde ; 3dde

6
mobile/mobile_22.asm
View File

@ -1923,7 +1923,7 @@ Function89b97: ; 89b97 (22:5b97)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld de, wSprite01 ld de, wVirtualOAMSprite00
.asm_89bb4 .asm_89bb4
ld a, [hli] ld a, [hli]
cp $ff cp $ff
@ -2013,7 +2013,7 @@ Function89c44: ; 89c44 (22:5c44)
pop de pop de
ret ret
.asm_89c4f .asm_89c4f
ld hl, wSprite01 ld hl, wVirtualOAMSprite00
push de push de
ld a, b ld a, b
ld [hli], a ; y ld [hli], a ; y
@ -2123,7 +2123,7 @@ Function89cdf: ; 89cdf (22:5cdf)
ld c, a ld c, a
ld e, $2 ld e, $2
ld a, $2 ld a, $2
ld hl, wSprite01 ld hl, wVirtualOAMSprite00
.asm_89cee .asm_89cee
push af push af
push bc push bc

10
mobile/mobile_45_sprite_engine.asm
View File

@ -22,7 +22,7 @@ Function115dc3: ; 115dc3
xor a xor a
ld [wc305], a ld [wc305], a
ld a, $a0 ld a, $a0
ld hl, wSprite32 ld hl, wVirtualOAMSprite31
ld bc, 8 * SPRITEOAMSTRUCT_LENGTH ld bc, 8 * SPRITEOAMSTRUCT_LENGTH
call ByteFill call ByteFill
ret ret
@ -34,7 +34,7 @@ Function115dd3: ; 115dd3
and a and a
ret z ret z
ld a, $a0 ld a, $a0
ld hl, wSprite32 ld hl, wVirtualOAMSprite31
ld bc, 8 * SPRITEOAMSTRUCT_LENGTH ld bc, 8 * SPRITEOAMSTRUCT_LENGTH
call ByteFill call ByteFill
call Function115e22 call Function115e22
@ -50,7 +50,7 @@ Function115dd3: ; 115dd3
ld d, a ld d, a
push de push de
pop hl pop hl
ld de, wSprite32 ld de, wVirtualOAMSprite31
ld a, [wc307] ld a, [wc307]
ld c, a ld c, a
ld a, [wc308] ld a, [wc308]
@ -585,7 +585,7 @@ Function1162f2: ; 1162f2
ld e, a ld e, a
ld a, [hli] ld a, [hli]
sub e sub e
ld de, wSprite10 ld de, wVirtualOAMSprite09
.asm_116321 .asm_116321
push af push af
ld a, [hli] ld a, [hli]
@ -626,7 +626,7 @@ Function1162f2: ; 1162f2
ld e, a ld e, a
ld a, [hli] ld a, [hli]
sub e sub e
ld de, wSprite01 ld de, wVirtualOAMSprite00
.asm_11635a .asm_11635a
push af push af
ld a, [hli] ld a, [hli]

4
mobile/mobile_46.asm
View File

@ -6921,7 +6921,7 @@ Function11b31b: ; 11b31b
db $39 ; 13 db $39 ; 13
Function11b397: ; 11b397 Function11b397: ; 11b397
ld de, wSprite01 ld de, wVirtualOAMSprite00
.loop .loop
ld a, [hl] ld a, [hl]
cp $ff cp $ff
@ -6979,7 +6979,7 @@ Unreferenced_Function11b3b6: ; 11b3b6
; 11b3d9 ; 11b3d9
Function11b3d9: ; 11b3d9 Function11b3d9: ; 11b3d9
ld de, wSprite29 ld de, wVirtualOAMSprite28
push de push de
ld a, [wc7d2] ld a, [wc7d2]
dec a dec a

1
replace.sh Normal file
View File

@ -0,0 +1 @@
sed -i 's/\<'$1'\>/'$2'/' $(grep -lwr --include="*.asm" --exclude-dir=".git" --exclude-dir="tools" --exclude-dir="extras" --exclude-dir="crowdmap" $1)

80
wram.asm
View File

@ -303,46 +303,46 @@ wc3fc:: ds 1
SECTION "Sprites", WRAM0 SECTION "Sprites", WRAM0
wVirtualOAM:: ; c400 wVirtualOAM:: ; c400
wSprite01:: sprite_oam_struct wSprite01 wVirtualOAMSprite00:: sprite_oam_struct wVirtualOAMSprite00
wSprite02:: sprite_oam_struct wSprite02 wVirtualOAMSprite01:: sprite_oam_struct wVirtualOAMSprite01
wSprite03:: sprite_oam_struct wSprite03 wVirtualOAMSprite02:: sprite_oam_struct wVirtualOAMSprite02
wSprite04:: sprite_oam_struct wSprite04 wVirtualOAMSprite03:: sprite_oam_struct wVirtualOAMSprite03
wSprite05:: sprite_oam_struct wSprite05 wVirtualOAMSprite04:: sprite_oam_struct wVirtualOAMSprite04
wSprite06:: sprite_oam_struct wSprite06 wVirtualOAMSprite05:: sprite_oam_struct wVirtualOAMSprite05
wSprite07:: sprite_oam_struct wSprite07 wVirtualOAMSprite06:: sprite_oam_struct wVirtualOAMSprite06
wSprite08:: sprite_oam_struct wSprite08 wVirtualOAMSprite07:: sprite_oam_struct wVirtualOAMSprite07
wSprite09:: sprite_oam_struct wSprite09 wVirtualOAMSprite08:: sprite_oam_struct wVirtualOAMSprite08
wSprite10:: sprite_oam_struct wSprite10 wVirtualOAMSprite09:: sprite_oam_struct wVirtualOAMSprite09
wSprite11:: sprite_oam_struct wSprite11 wVirtualOAMSprite10:: sprite_oam_struct wVirtualOAMSprite10
wSprite12:: sprite_oam_struct wSprite12 wVirtualOAMSprite11:: sprite_oam_struct wVirtualOAMSprite11
wSprite13:: sprite_oam_struct wSprite13 wVirtualOAMSprite12:: sprite_oam_struct wVirtualOAMSprite12
wSprite14:: sprite_oam_struct wSprite14 wVirtualOAMSprite13:: sprite_oam_struct wVirtualOAMSprite13
wSprite15:: sprite_oam_struct wSprite15 wVirtualOAMSprite14:: sprite_oam_struct wVirtualOAMSprite14
wSprite16:: sprite_oam_struct wSprite16 wVirtualOAMSprite15:: sprite_oam_struct wVirtualOAMSprite15
wSprite17:: sprite_oam_struct wSprite17 wVirtualOAMSprite16:: sprite_oam_struct wVirtualOAMSprite16
wSprite18:: sprite_oam_struct wSprite18 wVirtualOAMSprite17:: sprite_oam_struct wVirtualOAMSprite17
wSprite19:: sprite_oam_struct wSprite19 wVirtualOAMSprite18:: sprite_oam_struct wVirtualOAMSprite18
wSprite20:: sprite_oam_struct wSprite20 wVirtualOAMSprite19:: sprite_oam_struct wVirtualOAMSprite19
wSprite21:: sprite_oam_struct wSprite21 wVirtualOAMSprite20:: sprite_oam_struct wVirtualOAMSprite20
wSprite22:: sprite_oam_struct wSprite22 wVirtualOAMSprite21:: sprite_oam_struct wVirtualOAMSprite21
wSprite23:: sprite_oam_struct wSprite23 wVirtualOAMSprite22:: sprite_oam_struct wVirtualOAMSprite22
wSprite24:: sprite_oam_struct wSprite24 wVirtualOAMSprite23:: sprite_oam_struct wVirtualOAMSprite23
wSprite25:: sprite_oam_struct wSprite25 wVirtualOAMSprite24:: sprite_oam_struct wVirtualOAMSprite24
wSprite26:: sprite_oam_struct wSprite26 wVirtualOAMSprite25:: sprite_oam_struct wVirtualOAMSprite25
wSprite27:: sprite_oam_struct wSprite27 wVirtualOAMSprite26:: sprite_oam_struct wVirtualOAMSprite26
wSprite28:: sprite_oam_struct wSprite28 wVirtualOAMSprite27:: sprite_oam_struct wVirtualOAMSprite27
wSprite29:: sprite_oam_struct wSprite29 wVirtualOAMSprite28:: sprite_oam_struct wVirtualOAMSprite28
wSprite30:: sprite_oam_struct wSprite30 wVirtualOAMSprite29:: sprite_oam_struct wVirtualOAMSprite29
wSprite31:: sprite_oam_struct wSprite31 wVirtualOAMSprite30:: sprite_oam_struct wVirtualOAMSprite30
wSprite32:: sprite_oam_struct wSprite32 wVirtualOAMSprite31:: sprite_oam_struct wVirtualOAMSprite31
wSprite33:: sprite_oam_struct wSprite33 wVirtualOAMSprite32:: sprite_oam_struct wVirtualOAMSprite32
wSprite34:: sprite_oam_struct wSprite34 wVirtualOAMSprite33:: sprite_oam_struct wVirtualOAMSprite33
wSprite35:: sprite_oam_struct wSprite35 wVirtualOAMSprite34:: sprite_oam_struct wVirtualOAMSprite34
wSprite36:: sprite_oam_struct wSprite36 wVirtualOAMSprite35:: sprite_oam_struct wVirtualOAMSprite35
wSprite37:: sprite_oam_struct wSprite37 wVirtualOAMSprite36:: sprite_oam_struct wVirtualOAMSprite36
wSprite38:: sprite_oam_struct wSprite38 wVirtualOAMSprite37:: sprite_oam_struct wVirtualOAMSprite37
wSprite39:: sprite_oam_struct wSprite39 wVirtualOAMSprite38:: sprite_oam_struct wVirtualOAMSprite38
wSprite40:: sprite_oam_struct wSprite40 wVirtualOAMSprite39:: sprite_oam_struct wVirtualOAMSprite39
wSpritesEnd:: wSpritesEnd::