pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Remove the nested UNION within battle WRAM

Browse Source
This commit is contained in:
Rangi 2019-01-30 18:59:48 -05:00
parent 4fe0d93d4c
commit 88465686cf
3 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/games/unown_puzzle.asm
View File

@ -14,8 +14,8 @@ _UnownPuzzle:
xor a
ldh [hBGMapMode], a
call DisableLCD
ld hl, wc608 ; includes wPuzzlePieces
ld bc, wc7e8 - wc608
ld hl, wUnownPuzzle ; includes wPuzzlePieces
ld bc, wUnownPuzzleEnd - wUnownPuzzle
xor a
call ByteFill
ld hl, UnownPuzzleCursorGFX

2
pokecrystal.link
View File

@ -319,7 +319,7 @@ WRAM0
align 8
"Sprites"
"Tilemap"
"Battle"
"Miscellaneous"
"Overworld Map"
"Video"
WRAMX 1

50
wram.asm
View File

@ -354,7 +354,7 @@ wTileMap:: ; c4a0
wTileMapEnd::
SECTION "Battle", WRAM0
SECTION "Miscellaneous", WRAM0
UNION ; c608
; unidentified uses
@ -578,9 +578,6 @@ wPlayerAtkLevel:: db ; c6cc
wPlayerDefLevel:: db ; c6cd
wPlayerSpdLevel:: db ; c6ce
wPlayerSAtkLevel:: db ; c6cf
UNION ; c6d0
; finish battle RAM
wPlayerSDefLevel:: db ; c6d0
wPlayerAccLevel:: db ; c6d1
wPlayerEvaLevel:: db ; c6d2
@ -739,12 +736,11 @@ wSomeoneIsRampaging:: db ; c73b
wPlayerJustGotFrozen:: db ; c73c
wEnemyJustGotFrozen:: db ; c73d
wBattleEnd::
; Battle RAM
; c741
NEXTU ; c6d0
NEXTU ; c608
; trade
wTrademons::
ds 200
wTrademons:: ; c6d0
wPlayerTrademon:: trademon wPlayerTrademon
wOTTrademon:: trademon wOTTrademon
wTrademonsEnd::
@ -754,8 +750,9 @@ wLinkPlayer2Name:: ds NAME_LENGTH
wLinkTradeSendmonSpecies:: db
wLinkTradeGetmonSpecies:: db
NEXTU ; c6d0
NEXTU ; c608
; naming screen
ds 200
wNamingScreenDestinationPointer:: dw ; c6d0
wNamingScreenCurNameLength:: db ; c6d2
wNamingScreenMaxNameLength:: db ; c6d3
@ -764,8 +761,9 @@ wNamingScreenCursorObjectPointer:: dw ; c6d5
wNamingScreenLastCharacter:: db ; c6d7
wNamingScreenStringEntryCoord:: dw ; c6d8
NEXTU ; c6d0
NEXTU ; c608
; pokegear
ds 200
wPokegearPhoneLoadNameBuffer:: db ; c6d0
wPokegearPhoneCursorPosition:: db ; c6d1
wPokegearPhoneScrollPosition:: db ; c6d2
@ -778,9 +776,10 @@ wPokegearRadioChannelBank:: db ; c6d9
wPokegearRadioChannelAddr:: dw ; c6da
wPokegearRadioMusicPlaying:: db ; c6dc
NEXTU ; c6d0
NEXTU ; c608
; slot machine
wSlots::
ds 200
wSlots:: ; c6d0
wReel1:: slot_reel wReel1
wReel2:: slot_reel wReel2
wReel3:: slot_reel wReel3
@ -803,9 +802,10 @@ wSlotsDataEnd::
ds 28
wSlotsEnd::
NEXTU ; c6d0
NEXTU ; c608
; card flip
wCardFlip::
ds 200
wCardFlip:: ; c6d0
wDeck:: ds 24
wDeckEnd::
; c6e8
@ -815,9 +815,10 @@ wDiscardPile:: ds 24
wDiscardPileEnd::
wCardFlipEnd::
NEXTU ; c6d0
NEXTU ; c608
; dummy game
wDummyGame::
ds 200
wDummyGame:: ; c6d0
wDummyGameCards:: ds 9 * 5
wDummyGameCardsEnd::
wDummyGameLastCardPicked:: db ; c6fd
@ -831,15 +832,18 @@ wDummyGameCounter:: db ; c708
wDummyGameNumCardsMatched:: db ; c709
wDummyGameEnd::
NEXTU ; c6d0
NEXTU ; c608
; unown puzzle
wUnownPuzzle::
wUnownPuzzle:: ; c608
ds 200
wPuzzlePieces:: ds 6 * 6
wUnownPuzzleEnd::
ds 244
wUnownPuzzleEnd:: ; c7e8
NEXTU ; c6d0
NEXTU ; c608
; pokedex
wPokedexDataStart::
ds 200
wPokedexDataStart:: ; c6d0
wPokedexOrder:: ds $100 ; >= NUM_POKEMON
wPokedexOrderEnd::
wDexListingScrollOffset:: db ; offset of the first displayed entry from the start
@ -871,8 +875,9 @@ wPokedexDataEnd:: ds 1
endc
ds 2
NEXTU ; c6d0
NEXTU ; c608
; mobile data
ds 200
wc6d0:: ds 56
wc708:: db
wc709:: db
@ -896,7 +901,6 @@ wc7d2:: ds 1
wc7d3:: ds 1
wc7d4:: ds 1
ENDU ; c7e8
ENDU ; c7e8
wc7e8:: ds 24
wc7e8_End::