diff options
Diffstat (limited to 'wram.asm')
| -rw-r--r-- | wram.asm | 118 |
1 files changed, 88 insertions, 30 deletions
@@ -1,4 +1,4 @@ -INCLUDE "includes.asm" +INCLUDE "constants.asm" INCLUDE "macros/wram.asm" @@ -152,7 +152,7 @@ wMapTimeOfDay:: db wPrinterConnectionOpen:: db wPrinterOpcode:: db -wLastDexEntry:: db +wPrevDexEntry:: db wDisableTextAcceleration:: db wPreviousLandmark:: db wCurrentLandmark:: db @@ -303,20 +303,46 @@ wc3fc:: ds 1 SECTION "Sprites", WRAM0 Sprites:: ; c400 -; 4 bytes per sprite -; 40 sprites -; struct: -; y (px) -; x (px) -; tile id -; attributes: -; bit 7: priority -; bit 6: y flip -; bit 5: x flip -; bit 4: pal # (non-cgb) -; bit 3: vram bank (cgb only) -; bit 2-0: pal # (cgb only) - ds 4 * 40 +Sprite01:: sprite_oam_struct Sprite01 +Sprite02:: sprite_oam_struct Sprite02 +Sprite03:: sprite_oam_struct Sprite03 +Sprite04:: sprite_oam_struct Sprite04 +Sprite05:: sprite_oam_struct Sprite05 +Sprite06:: sprite_oam_struct Sprite06 +Sprite07:: sprite_oam_struct Sprite07 +Sprite08:: sprite_oam_struct Sprite08 +Sprite09:: sprite_oam_struct Sprite09 +Sprite10:: sprite_oam_struct Sprite10 +Sprite11:: sprite_oam_struct Sprite11 +Sprite12:: sprite_oam_struct Sprite12 +Sprite13:: sprite_oam_struct Sprite13 +Sprite14:: sprite_oam_struct Sprite14 +Sprite15:: sprite_oam_struct Sprite15 +Sprite16:: sprite_oam_struct Sprite16 +Sprite17:: sprite_oam_struct Sprite17 +Sprite18:: sprite_oam_struct Sprite18 +Sprite19:: sprite_oam_struct Sprite19 +Sprite20:: sprite_oam_struct Sprite20 +Sprite21:: sprite_oam_struct Sprite21 +Sprite22:: sprite_oam_struct Sprite22 +Sprite23:: sprite_oam_struct Sprite23 +Sprite24:: sprite_oam_struct Sprite24 +Sprite25:: sprite_oam_struct Sprite25 +Sprite26:: sprite_oam_struct Sprite26 +Sprite27:: sprite_oam_struct Sprite27 +Sprite28:: sprite_oam_struct Sprite28 +Sprite29:: sprite_oam_struct Sprite29 +Sprite30:: sprite_oam_struct Sprite30 +Sprite31:: sprite_oam_struct Sprite31 +Sprite32:: sprite_oam_struct Sprite32 +Sprite33:: sprite_oam_struct Sprite33 +Sprite34:: sprite_oam_struct Sprite34 +Sprite35:: sprite_oam_struct Sprite35 +Sprite36:: sprite_oam_struct Sprite36 +Sprite37:: sprite_oam_struct Sprite37 +Sprite38:: sprite_oam_struct Sprite38 +Sprite39:: sprite_oam_struct Sprite39 +Sprite40:: sprite_oam_struct Sprite40 SpritesEnd:: @@ -827,7 +853,7 @@ wDexListingCursorBackup:: db wBackupDexListingCursor:: db wBackupDexListingPage:: db wDexCurrentLocation:: db -if DEF(CRYSTAL11) +if DEF(_CRYSTAL11) wPokedexStatus:: db wPokedexDataEnd:: else @@ -1275,8 +1301,8 @@ wNamedObjectTypeBuffer:: db ds 1 -wBattleTowerBattleEnded:: wJumptableIndex:: +wBattleTowerBattleEnded:: db UNION ; cf64 @@ -1288,7 +1314,11 @@ wcf66:: db NEXTU ; cf64 ; intro and title data wIntroSceneFrameCounter:: db +UNION ; cf65 +wIntroSceneTimer:: db +NEXTU ; cf65 wTitleScreenTimer:: dw +ENDU NEXTU ; cf64 ; credits data @@ -1297,10 +1327,31 @@ wCreditsBorderMon:: db wCreditsLYOverride:: db NEXTU ; cf64 -; unown puzzle data -wHoldingUnownPuzzlePiece:: db -wUnownPuzzleCursorPosition:: db -wUnownPuzzleHeldPiece:: db +; pokedex +wPrevDexEntryJumptableIndex:: db +if DEF(_CRYSTAL11) +wPrevDexEntryBackup:: db +else +wPrevDexEntryBackup:: +wPokedexStatus:: db +endc + +NEXTU ; cf64 +; pokegear +wPokegearCard:: db +wPokegearMapRegion:: db + +NEXTU ; cf64 +; pack +wPackJumptableIndex:: db +wCurrPocket:: db +wPackUsedItem:: db + +NEXTU ; cf64 +; trainer card badges +wTrainerCardBadgeFrameCounter:: db +wTrainerCardBadgeTileID:: db +wTrainerCardBadgeAttributes:: db NEXTU ; cf64 ; card flip data @@ -1309,19 +1360,26 @@ wCardFlipCursorX:: db wCardFlipWhichCard:: db NEXTU ; cf64 -; pokedex -wDexEntryPrevJumptableIndex:: db -if !DEF(CRYSTAL11) -wPokedexStatus:: db -endc +; magnet train +wMagnetTrainOffset:: db +wMagnetTrainPosition:: db +wMagnetTrainWaitCounter:: db + +NEXTU ; cf64 +; unown puzzle data +wHoldingUnownPuzzlePiece:: db +wUnownPuzzleCursorPosition:: db +wUnownPuzzleHeldPiece:: db NEXTU ; cf64 ; miscellaneous +wFrameCounter:: wNrOfBeatenBattleTowerTrainers:: wMomBankDigitCursorPosition:: +wNamingScreenLetterCase:: +wHallOfFameMonCounter:: wSlotsDelay:: db -wCurrPocket:: wPrinterQueueLength:: db ENDU ; cf67 @@ -2438,9 +2496,9 @@ wCeruleanGymSceneID:: db ; d977 wRoute25SceneID:: db ; d978 wTrainerHouseB1FSceneID:: db ; d979 wVictoryRoadGateSceneID:: db ; d97a -wSaffronTrainStationSceneID:: db ; d97b +wSaffronMagnetTrainStationSceneID:: db ; d97b wRoute16GateSceneID:: db ; d97c -wRoute1718GateSceneID:: db ; d97d +wRoute17Route18GateSceneID:: db ; d97d wIndigoPlateauPokecenter1FSceneID:: db ; d97e wWillsRoomSceneID:: db ; d97f wKogasRoomSceneID:: db ; d980 |