Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove RAM address comments

This commit is contained in:
Rangi 2020-06-20 23:03:40 -04:00
parent 273324e787
commit 9433b5a752
6 changed files with 1157 additions and 1175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
constants/wram_constants.asm
View File

@ -1,19 +1,19 @@
; wInputType:: ; c2c7 ; wInputType::
AUTO_INPUT EQU $ff AUTO_INPUT EQU $ff
; wDebugFlags:: ; c2cc ; wDebugFlags::
const_def const_def
const DEBUG_BATTLE_F const DEBUG_BATTLE_F
const DEBUG_FIELD_F const DEBUG_FIELD_F
; wCurDexMode:: ; c7d4 ; wCurDexMode::
const_def const_def
const DEXMODE_NEW const DEXMODE_NEW
const DEXMODE_OLD const DEXMODE_OLD
const DEXMODE_ABC const DEXMODE_ABC
const DEXMODE_UNOWN const DEXMODE_UNOWN
; wMonType:: ; cf5f ; wMonType::
const_def const_def
const PARTYMON ; 0 const PARTYMON ; 0
const OTPARTYMON ; 1 const OTPARTYMON ; 1
@ -21,11 +21,11 @@ AUTO_INPUT EQU $ff
const TEMPMON ; 3 const TEMPMON ; 3
const WILDMON ; 4 const WILDMON ; 4
; wGameTimerPause:: ; cfbc ; wGameTimerPause::
GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0 GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0
GAMETIMERPAUSE_MOBILE_7_F EQU 7 GAMETIMERPAUSE_MOBILE_7_F EQU 7
; wOptions:: ; cfcc ; wOptions::
TEXT_DELAY_MASK EQU %111 TEXT_DELAY_MASK EQU %111
const_def 4 const_def 4
const NO_TEXT_SCROLL ; 4 const NO_TEXT_SCROLL ; 4
@ -37,7 +37,7 @@ TEXT_DELAY_FAST EQU %001 ; 1
TEXT_DELAY_MED EQU %011 ; 3 TEXT_DELAY_MED EQU %011 ; 3
TEXT_DELAY_SLOW EQU %101 ; 5 TEXT_DELAY_SLOW EQU %101 ; 5
; wTextboxFrame:: ; cfce ; wTextboxFrame::
const_def const_def
const FRAME_1 ; 0 const FRAME_1 ; 0
const FRAME_2 ; 1 const FRAME_2 ; 1
@ -49,23 +49,23 @@ TEXT_DELAY_SLOW EQU %101 ; 5
const FRAME_8 ; 7 const FRAME_8 ; 7
NUM_FRAMES EQU const_value NUM_FRAMES EQU const_value
; wTextboxFlags:: ; cfcf ; wTextboxFlags::
const_def const_def
const FAST_TEXT_DELAY_F ; 0 const FAST_TEXT_DELAY_F ; 0
const NO_TEXT_DELAY_F ; 1 const NO_TEXT_DELAY_F ; 1
; wGBPrinterBrightness:: ; cfd0 ; wGBPrinterBrightness::
GBPRINTER_LIGHTEST EQU $00 GBPRINTER_LIGHTEST EQU $00
GBPRINTER_LIGHTER EQU $20 GBPRINTER_LIGHTER EQU $20
GBPRINTER_NORMAL EQU $40 GBPRINTER_NORMAL EQU $40
GBPRINTER_DARKER EQU $60 GBPRINTER_DARKER EQU $60
GBPRINTER_DARKEST EQU $7f GBPRINTER_DARKEST EQU $7f
; wOptions2:: ; cfd1 ; wOptions2::
const_def const_def
const MENU_ACCOUNT ; 0 const MENU_ACCOUNT ; 0
; wWalkingDirection:: ; d043 ; wWalkingDirection::
const_def -1 const_def -1
const STANDING ; -1 const STANDING ; -1
const DOWN ; 0 const DOWN ; 0
@ -79,14 +79,14 @@ UP_MASK EQU 1 << UP
LEFT_MASK EQU 1 << LEFT LEFT_MASK EQU 1 << LEFT
RIGHT_MASK EQU 1 << RIGHT RIGHT_MASK EQU 1 << RIGHT
; wFacingDirection:: ; d044 ; wFacingDirection::
FACE_CURRENT EQU 0 FACE_CURRENT EQU 0
FACE_DOWN EQU 8 FACE_DOWN EQU 8
FACE_UP EQU 4 FACE_UP EQU 4
FACE_LEFT EQU 2 FACE_LEFT EQU 2
FACE_RIGHT EQU 1 FACE_RIGHT EQU 1
; wPokemonWithdrawDepositParameter:: ; d10b ; wPokemonWithdrawDepositParameter::
PC_WITHDRAW EQU 0 PC_WITHDRAW EQU 0
PC_DEPOSIT EQU 1 PC_DEPOSIT EQU 1
REMOVE_PARTY EQU 0 REMOVE_PARTY EQU 0
@ -94,21 +94,21 @@ REMOVE_BOX EQU 1
DAY_CARE_WITHDRAW EQU 2 DAY_CARE_WITHDRAW EQU 2
DAY_CARE_DEPOSIT EQU 3 DAY_CARE_DEPOSIT EQU 3
; wPlayerStepFlags:: ; d150 ; wPlayerStepFlags::
const_def 4 const_def 4
const PLAYERSTEP_MIDAIR_F ; 4 const PLAYERSTEP_MIDAIR_F ; 4
const PLAYERSTEP_CONTINUE_F ; 5 const PLAYERSTEP_CONTINUE_F ; 5
const PLAYERSTEP_STOP_F ; 6 const PLAYERSTEP_STOP_F ; 6
const PLAYERSTEP_START_F ; 7 const PLAYERSTEP_START_F ; 7
; wInitListType:: ; d263 ; wInitListType::
INIT_ENEMYOT_LIST EQU 1 INIT_ENEMYOT_LIST EQU 1
INIT_BAG_ITEM_LIST EQU 2 INIT_BAG_ITEM_LIST EQU 2
INIT_OTHER_ITEM_LIST EQU 3 INIT_OTHER_ITEM_LIST EQU 3
INIT_PLAYEROT_LIST EQU 4 INIT_PLAYEROT_LIST EQU 4
INIT_MON_LIST EQU 5 INIT_MON_LIST EQU 5
; wTimeOfDay:: ; d269 ; wTimeOfDay::
const_def const_def
const MORN_F ; 0 const MORN_F ; 0
const DAY_F ; 1 const DAY_F ; 1
@ -123,50 +123,50 @@ DARKNESS EQU 1 << DARKNESS_F
ANYTIME EQU MORN | DAY | NITE ANYTIME EQU MORN | DAY | NITE
; wBattleAnimFlags:: ; d40f ; wBattleAnimFlags::
const_def const_def
const BATTLEANIM_STOP_F ; 0 const BATTLEANIM_STOP_F ; 0
const BATTLEANIM_IN_SUBROUTINE_F ; 1 const BATTLEANIM_IN_SUBROUTINE_F ; 1
const BATTLEANIM_IN_LOOP_F ; 2 const BATTLEANIM_IN_LOOP_F ; 2
const BATTLEANIM_KEEPSPRITES_F ; 3 const BATTLEANIM_KEEPSPRITES_F ; 3
; wPlayerSpriteSetupFlags:: ; d45b ; wPlayerSpriteSetupFlags::
PLAYERSPRITESETUP_FACING_MASK EQU %11 PLAYERSPRITESETUP_FACING_MASK EQU %11
PLAYERSPRITESETUP_FEMALE_TO_MALE_F EQU 2 PLAYERSPRITESETUP_FEMALE_TO_MALE_F EQU 2
PLAYERSPRITESETUP_CUSTOM_FACING_F EQU 5 PLAYERSPRITESETUP_CUSTOM_FACING_F EQU 5
PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F EQU 6 PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F EQU 6
PLAYERSPRITESETUP_RESET_ACTION_F EQU 7 PLAYERSPRITESETUP_RESET_ACTION_F EQU 7
; wPlayerGender:: ; d472 ; wPlayerGender::
PLAYERGENDER_FEMALE_F EQU 0 PLAYERGENDER_FEMALE_F EQU 0
; wMapStatus:: ; d432 ; wMapStatus::
const_def const_def
const MAPSTATUS_START ; 0 const MAPSTATUS_START ; 0
const MAPSTATUS_ENTER ; 1 const MAPSTATUS_ENTER ; 1
const MAPSTATUS_HANDLE ; 2 const MAPSTATUS_HANDLE ; 2
const MAPSTATUS_DONE ; 3 const MAPSTATUS_DONE ; 3
; wMapEventStatus:: ; d433 ; wMapEventStatus::
const_def const_def
const MAPEVENTS_ON ; 0 const MAPEVENTS_ON ; 0
const MAPEVENTS_OFF ; 1 const MAPEVENTS_OFF ; 1
; wScriptFlags:: ; d434 ; wScriptFlags::
SCRIPT_RUNNING EQU 2 SCRIPT_RUNNING EQU 2
; wScriptMode:: ; d437 ; wScriptMode::
const_def const_def
const SCRIPT_OFF const SCRIPT_OFF
const SCRIPT_READ const SCRIPT_READ
const SCRIPT_WAIT_MOVEMENT const SCRIPT_WAIT_MOVEMENT
const SCRIPT_WAIT const SCRIPT_WAIT
; wSpawnAfterChampion:: ; d4b5 ; wSpawnAfterChampion::
SPAWN_LANCE EQU 1 SPAWN_LANCE EQU 1
SPAWN_RED EQU 2 SPAWN_RED EQU 2
; wCurDay:: ; d4cb ; wCurDay::
const_def const_def
const SUNDAY ; 0 const SUNDAY ; 0
const MONDAY ; 1 const MONDAY ; 1
@ -176,11 +176,11 @@ SPAWN_RED EQU 2
const FRIDAY ; 5 const FRIDAY ; 5
const SATURDAY ; 6 const SATURDAY ; 6
; wMapObjects:: ; d71e ; wMapObjects::
PLAYER_OBJECT EQU 0 PLAYER_OBJECT EQU 0
NUM_OBJECTS EQU 16 NUM_OBJECTS EQU 16
; wStatusFlags:: ; d84c ; wStatusFlags::
const_def const_def
const STATUSFLAGS_POKEDEX_F ; 0 const STATUSFLAGS_POKEDEX_F ; 0
const STATUSFLAGS_UNOWN_DEX_F ; 1 const STATUSFLAGS_UNOWN_DEX_F ; 1
@ -191,7 +191,7 @@ NUM_OBJECTS EQU 16
const STATUSFLAGS_HALL_OF_FAME_F ; 6 const STATUSFLAGS_HALL_OF_FAME_F ; 6
const STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F ; 7 const STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F ; 7
; wStatusFlags2:: ; d84d ; wStatusFlags2::
const_def const_def
const STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F ; 0 const STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F ; 0
const STATUSFLAGS2_SAFARI_GAME_F ; 1 const STATUSFLAGS2_SAFARI_GAME_F ; 1
@ -202,7 +202,7 @@ NUM_OBJECTS EQU 16
const STATUSFLAGS2_REACHED_GOLDENROD_F ; 6 const STATUSFLAGS2_REACHED_GOLDENROD_F ; 6
const STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F ; 7 const STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F ; 7
; wMomSavingMoney:: ; d854 ; wMomSavingMoney::
MOM_SAVING_SOME_MONEY_F EQU 0 MOM_SAVING_SOME_MONEY_F EQU 0
MOM_SAVING_HALF_MONEY_F EQU 1 MOM_SAVING_HALF_MONEY_F EQU 1
MOM_SAVING_ALL_MONEY_F EQU 2 MOM_SAVING_ALL_MONEY_F EQU 2
@ -210,7 +210,7 @@ MOM_ACTIVE_F EQU 7
MOM_SAVING_MONEY_MASK EQU (1 << MOM_SAVING_SOME_MONEY_F) | (1 << MOM_SAVING_HALF_MONEY_F) | (1 << MOM_SAVING_ALL_MONEY_F) MOM_SAVING_MONEY_MASK EQU (1 << MOM_SAVING_SOME_MONEY_F) | (1 << MOM_SAVING_HALF_MONEY_F) | (1 << MOM_SAVING_ALL_MONEY_F)
; wJohtoBadges:: ; d857 ; wJohtoBadges::
const_def const_def
const ZEPHYRBADGE const ZEPHYRBADGE
const HIVEBADGE const HIVEBADGE
@ -222,7 +222,7 @@ MOM_SAVING_MONEY_MASK EQU (1 << MOM_SAVING_SOME_MONEY_F) | (1 << MOM_SAVING_HALF
const RISINGBADGE const RISINGBADGE
NUM_JOHTO_BADGES EQU const_value NUM_JOHTO_BADGES EQU const_value
; wKantoBadges:: ; d858 ; wKantoBadges::
const_def const_def
const BOULDERBADGE const BOULDERBADGE
const CASCADEBADGE const CASCADEBADGE
@ -235,7 +235,7 @@ NUM_JOHTO_BADGES EQU const_value
NUM_KANTO_BADGES EQU const_value NUM_KANTO_BADGES EQU const_value
NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES
; wPokegearFlags:: ; d957 ; wPokegearFlags::
const_def const_def
const POKEGEAR_MAP_CARD_F ; 0 const POKEGEAR_MAP_CARD_F ; 0
const POKEGEAR_RADIO_CARD_F ; 1 const POKEGEAR_RADIO_CARD_F ; 1
@ -244,27 +244,27 @@ NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES
POKEGEAR_OBTAINED_F EQU 7 POKEGEAR_OBTAINED_F EQU 7
; wWhichRegisteredItem:: ; d95b ; wWhichRegisteredItem::
REGISTERED_POCKET EQU %11000000 REGISTERED_POCKET EQU %11000000
REGISTERED_NUMBER EQU %00111111 REGISTERED_NUMBER EQU %00111111
; wPlayerState:: ; d95d ; wPlayerState::
PLAYER_NORMAL EQU 0 PLAYER_NORMAL EQU 0
PLAYER_BIKE EQU 1 PLAYER_BIKE EQU 1
PLAYER_SKATE EQU 2 PLAYER_SKATE EQU 2
PLAYER_SURF EQU 4 PLAYER_SURF EQU 4
PLAYER_SURF_PIKA EQU 8 PLAYER_SURF_PIKA EQU 8
; wCelebiEvent:: ; dbf3 ; wCelebiEvent::
CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2 CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2
; wBikeFlags:: ; dbf5 ; wBikeFlags::
const_def const_def
const BIKEFLAGS_STRENGTH_ACTIVE_F ; 0 const BIKEFLAGS_STRENGTH_ACTIVE_F ; 0
const BIKEFLAGS_ALWAYS_ON_BIKE_F ; 1 const BIKEFLAGS_ALWAYS_ON_BIKE_F ; 1
const BIKEFLAGS_DOWNHILL_F ; 2 const BIKEFLAGS_DOWNHILL_F ; 2
; wDailyFlags1:: ; dc1e ; wDailyFlags1::
const_def const_def
const DAILYFLAGS1_KURT_MAKING_BALLS_F ; 0 const DAILYFLAGS1_KURT_MAKING_BALLS_F ; 0
const DAILYFLAGS1_BUG_CONTEST_F ; 1 const DAILYFLAGS1_BUG_CONTEST_F ; 1
@ -275,7 +275,7 @@ CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2
const DAILYFLAGS1_GOLDENROD_UNDERGROUND_BARGAIN_F ; 6 const DAILYFLAGS1_GOLDENROD_UNDERGROUND_BARGAIN_F ; 6
const DAILYFLAGS1_TRAINER_HOUSE_F ; 7 const DAILYFLAGS1_TRAINER_HOUSE_F ; 7
; wDailyFlags2:: ; dc1f ; wDailyFlags2::
const_def const_def
const DAILYFLAGS2_MT_MOON_SQUARE_CLEFAIRY_F ; 0 const DAILYFLAGS2_MT_MOON_SQUARE_CLEFAIRY_F ; 0
const DAILYFLAGS2_UNION_CAVE_LAPRAS_F ; 1 const DAILYFLAGS2_UNION_CAVE_LAPRAS_F ; 1
@ -286,7 +286,7 @@ CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2
const DAILYFLAGS2_MOVE_TUTOR_F ; 6 const DAILYFLAGS2_MOVE_TUTOR_F ; 6
const DAILYFLAGS2_BUENAS_PASSWORD_F ; 7 const DAILYFLAGS2_BUENAS_PASSWORD_F ; 7
; wSwarmFlags:: ; dc20 ; wSwarmFlags::
const_def const_def
const SWARMFLAGS_BUENAS_PASSWORD_F ; 0 const SWARMFLAGS_BUENAS_PASSWORD_F ; 0
const SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F ; 1 const SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F ; 1
@ -294,15 +294,15 @@ CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2
const SWARMFLAGS_YANMA_SWARM_F ; 3 const SWARMFLAGS_YANMA_SWARM_F ; 3
const SWARMFLAGS_MOBILE_4_F ; 4 const SWARMFLAGS_MOBILE_4_F ; 4
; wLuckyNumberShowFlag:: ; dc9d ; wLuckyNumberShowFlag::
LUCKYNUMBERSHOW_GAME_OVER_F EQU 0 LUCKYNUMBERSHOW_GAME_OVER_F EQU 0
; wDayCareMan:: ; def5 ; wDayCareMan::
DAYCAREMAN_HAS_MON_F EQU 0 DAYCAREMAN_HAS_MON_F EQU 0
DAYCAREMAN_MONS_COMPATIBLE_F EQU 5 DAYCAREMAN_MONS_COMPATIBLE_F EQU 5
DAYCAREMAN_HAS_EGG_F EQU 6 DAYCAREMAN_HAS_EGG_F EQU 6
DAYCAREMAN_ACTIVE_F EQU 7 DAYCAREMAN_ACTIVE_F EQU 7
; wDayCareLady:: ; df2c ; wDayCareLady::
DAYCARELADY_HAS_MON_F EQU 0 DAYCARELADY_HAS_MON_F EQU 0
DAYCARELADY_ACTIVE_F EQU 7 DAYCARELADY_ACTIVE_F EQU 7

6
docs/bugs_and_glitches.md
View File

@ -371,12 +371,12 @@ This makes the Berserk Gene use the regular confusion duration (2-5 turns).
First, edit [wram.asm](https://github.com/pret/pokecrystal/blob/master/wram.asm): First, edit [wram.asm](https://github.com/pret/pokecrystal/blob/master/wram.asm):
```diff ```diff
wTurnEnded:: db ; c6b4 wTurnEnded:: db
- ds 1 - ds 1
+wIsConfusionDamage:: db ; c6b5 +wIsConfusionDamage:: db
wPlayerStats:: ; c6b6 wPlayerStats::
``` ```
Then edit four routines in [engine/battle/effect_commands.asm](https://github.com/pret/pokecrystal/blob/master/engine/battle/effect_commands.asm): Then edit four routines in [engine/battle/effect_commands.asm](https://github.com/pret/pokecrystal/blob/master/engine/battle/effect_commands.asm):

1
engine/printer/printer.asm
View File

@ -514,7 +514,6 @@ CheckPrinterStatus:
cp -1 cp -1
jr z, .error_2 jr z, .error_2
.printer_connected .printer_connected
; ca89 contains printer status flags
ld a, [wPrinterStatusFlags] ld a, [wPrinterStatusFlags]
and %11100000 and %11100000
ret z ; no error ret z ; no error

248
hram.asm
View File

@ -1,169 +1,171 @@
SECTION "HRAM", HRAM SECTION "HRAM", HRAM
hTransferVirtualOAM:: ds 10 ; ff80 hTransferVirtualOAM:: ds 10
hROMBankBackup:: db ; ff8a hROMBankBackup:: db
hFarByte:: hFarByte::
hTempBank:: db ; ff8b hTempBank:: db
hSRAMBank:: db ; ff8c hSRAMBank:: db
hRTCDayHi:: db ; ff8d hRTCDayHi:: db
hRTCDayLo:: db ; ff8e hRTCDayLo:: db
hRTCHours:: db ; ff8f hRTCHours:: db
hRTCMinutes:: db ; ff90 hRTCMinutes:: db
hRTCSeconds:: db ; ff91 hRTCSeconds:: db
ds 2 ds 2
hHours:: db ; ff94 hHours:: db
ds 1 ds 1
hMinutes:: db ; ff96 hMinutes:: db
ds 1 ds 1
hSeconds:: db ; ff98 hSeconds:: db
ds 1 ds 1
ds 1 ds 1
hVBlankCounter:: db ; ff9b hVBlankCounter:: db
ds 1 ds 1
hROMBank:: db ; ff9d hROMBank:: db
hVBlank:: db ; ff9e hVBlank:: db
hMapEntryMethod:: db ; ff9f hMapEntryMethod:: db
hMenuReturn:: db ; ffa0 hMenuReturn:: db
hUnusedFFA1:: db ; ffa1 hUnusedFFA1:: db
hJoypadReleased:: db ; ffa2 hJoypadReleased:: db
hJoypadPressed:: db ; ffa3 hJoypadPressed:: db
hJoypadDown:: db ; ffa4 hJoypadDown:: db
hJoypadSum:: db ; ffa5 hJoypadSum:: db
hJoyReleased:: db ; ffa6 hJoyReleased:: db
hJoyPressed:: db ; ffa7 hJoyPressed:: db
hJoyDown:: db ; ffa8 hJoyDown:: db
hJoyLast:: db ; ffa9 hJoyLast:: db
hInMenu:: db ; ffaa hInMenu:: db
ds 1 ds 1
hPrinter:: db ; ffac hPrinter:: db
hGraphicStartTile:: db ; ffad hGraphicStartTile:: db
hMoveMon:: db ; ffae hMoveMon:: db
UNION ; ffaf
hMapObjectIndexBuffer:: db ; ffaf
hObjectStructIndexBuffer:: db ; ffb0
NEXTU ; ffaf
hConnectionStripLength:: db ; ffaf
hConnectedMapWidth:: db ; ffb0
ENDU ; ffb1
hEnemyMonSpeed:: dw ; ffb1
UNION ; ffb3
; math-related values
UNION ; ffb3
; inputs to Multiply
ds 1
hMultiplicand:: ds 3 ; ffb4
hMultiplier:: db ; ffb7
NEXTU ; ffb3
; result of Multiply
hProduct:: ds 4 ; ffb3
NEXTU ; ffb3
; inputs to Divide
hDividend:: ds 4 ; ffb3
hDivisor:: db ; ffb7
NEXTU ; ffb3
; results of Divide
hQuotient:: ds 4 ; ffb3
hRemainder:: db ; ffb7
ENDU ; ffb8
hMathBuffer:: ds 5 ; ffb8
NEXTU ; ffb3
; PrintNum scratch space
hPrintNumBuffer:: ds 10 ; ffb3
NEXTU ; ffb3
; miscellaneous
ds 9
hMGStatusFlags:: db ; ffbc
ENDU ; ffbd
UNION UNION
hUsedSpriteIndex:: db ; ffbd hMapObjectIndexBuffer:: db
hUsedSpriteTile:: db ; ffbe hObjectStructIndexBuffer:: db
NEXTU NEXTU
hCurSpriteXCoord:: db ; ffbd hConnectionStripLength:: db
hCurSpriteYCoord:: db ; ffbe hConnectedMapWidth:: db
hCurSpriteXPixel:: db ; ffbf
hCurSpriteYPixel:: db ; ffc0
hCurSpriteTile:: db ; ffc1
hCurSpriteOAMFlags:: db ; ffc2
ENDU ENDU
UNION ; ffc3 hEnemyMonSpeed:: dw
hMoneyTemp:: ds 3 ; ffc3
NEXTU ; ffc3
hMGJoypadPressed:: db ; ffc3
hMGJoypadReleased:: db ; ffc4
hMGPrevTIMA:: db ; ffc5
ENDU ; ffc6
hLCDCPointer:: db ; ffc6 UNION
hLYOverrideStart:: db ; ffc7 ; math-related values
hLYOverrideEnd:: db ; ffc8
hMobileReceive:: db ; ffc9 UNION
hSerialReceivedNewData:: db ; ffca ; inputs to Multiply
hSerialConnectionStatus:: db ; ffcb ds 1
hSerialIgnoringInitialData:: db ; ffcc hMultiplicand:: ds 3
hSerialSend:: db ; ffcd hMultiplier:: db
hSerialReceive:: db ; ffce NEXTU
; result of Multiply
hProduct:: ds 4
NEXTU
; inputs to Divide
hDividend:: ds 4
hDivisor:: db
NEXTU
; results of Divide
hQuotient:: ds 4
hRemainder:: db
ENDU
hSCX:: db ; ffcf hMathBuffer:: ds 5
hSCY:: db ; ffd0
hWX:: db ; ffd1
hWY:: db ; ffd2
hTilesPerCycle:: db ; ffd3
hBGMapMode:: db ; ffd4
hBGMapThird:: db ; ffd5
hBGMapAddress:: dw ; ffd6
hOAMUpdate:: db ; ffd8 NEXTU
; PrintNum scratch space
hPrintNumBuffer:: ds 10
hSPBuffer:: dw ; ffd9 NEXTU
; miscellaneous
ds 9
hMGStatusFlags:: db
ENDU
hBGMapUpdate:: db ; ffdb UNION
hBGMapTileCount:: db ; ffdc hUsedSpriteIndex:: db
hUsedSpriteTile:: db
NEXTU
hCurSpriteXCoord:: db
hCurSpriteYCoord:: db
hCurSpriteXPixel:: db
hCurSpriteYPixel:: db
hCurSpriteTile:: db
hCurSpriteOAMFlags:: db
ENDU
UNION
hMoneyTemp:: ds 3
NEXTU
hMGJoypadPressed:: db
hMGJoypadReleased:: db
hMGPrevTIMA:: db
ENDU
hLCDCPointer:: db
hLYOverrideStart:: db
hLYOverrideEnd:: db
hMobileReceive:: db
hSerialReceivedNewData:: db
hSerialConnectionStatus:: db
hSerialIgnoringInitialData:: db
hSerialSend:: db
hSerialReceive:: db
hSCX:: db
hSCY:: db
hWX:: db
hWY:: db
hTilesPerCycle:: db
hBGMapMode:: db
hBGMapThird:: db
hBGMapAddress:: dw
hOAMUpdate:: db
hSPBuffer:: dw
hBGMapUpdate:: db
hBGMapTileCount:: db
ds 1 ds 1
hMapAnims:: db ; ffde hMapAnims:: db
hTileAnimFrame:: db ; ffdf hTileAnimFrame:: db
hLastTalked:: db ; ffe0 hLastTalked:: db
hRandom:: hRandom::
hRandomAdd:: db ; ffe1 hRandomAdd:: db
hRandomSub:: db ; ffe2 hRandomSub:: db
hUnusedBackup:: db ; ffe3 hUnusedBackup:: db
hBattleTurn:: ; ffe4 hBattleTurn::
; Which trainer's turn is it? 0: player, 1: opponent trainer ; Which trainer's turn is it? 0: player, 1: opponent trainer
db db
hCGBPalUpdate:: db ; ffe5 hCGBPalUpdate:: db
hCGB:: db ; ffe6 hCGB:: db
hSGB:: db ; ffe7 hSGB:: db
hDMATransfer:: db ; ffe8 hDMATransfer:: db
hMobile:: db ; ffe9 hMobile:: db
hSystemBooted:: db ; ffea hSystemBooted:: db
hClockResetTrigger:: db ; ffeb hClockResetTrigger:: db
ds 19

143
sram.asm
View File

@ -1,11 +1,10 @@
SECTION "Scratch", SRAM SECTION "Scratch", SRAM
sScratch:: ds $600 ; a000 sScratch:: ds $600
SECTION "SRAM Bank 0", SRAM SECTION "SRAM Bank 0", SRAM
; a600
sPartyMail:: sPartyMail::
sPartyMon1Mail:: mailmsg sPartyMon1Mail sPartyMon1Mail:: mailmsg sPartyMon1Mail
sPartyMon2Mail:: mailmsg sPartyMon2Mail sPartyMon2Mail:: mailmsg sPartyMon2Mail
@ -14,7 +13,6 @@ sPartyMon4Mail:: mailmsg sPartyMon4Mail
sPartyMon5Mail:: mailmsg sPartyMon5Mail sPartyMon5Mail:: mailmsg sPartyMon5Mail
sPartyMon6Mail:: mailmsg sPartyMon6Mail sPartyMon6Mail:: mailmsg sPartyMon6Mail
; a71a
sPartyMailBackup:: sPartyMailBackup::
sPartyMon1MailBackup:: mailmsg sPartyMon1MailBackup sPartyMon1MailBackup:: mailmsg sPartyMon1MailBackup
sPartyMon2MailBackup:: mailmsg sPartyMon2MailBackup sPartyMon2MailBackup:: mailmsg sPartyMon2MailBackup
@ -23,7 +21,6 @@ sPartyMon4MailBackup:: mailmsg sPartyMon4MailBackup
sPartyMon5MailBackup:: mailmsg sPartyMon5MailBackup sPartyMon5MailBackup:: mailmsg sPartyMon5MailBackup
sPartyMon6MailBackup:: mailmsg sPartyMon6MailBackup sPartyMon6MailBackup:: mailmsg sPartyMon6MailBackup
; a834
sMailboxCount:: db sMailboxCount:: db
sMailbox:: sMailbox::
sMailbox1:: mailmsg sMailbox1 sMailbox1:: mailmsg sMailbox1
@ -37,7 +34,6 @@ sMailbox8:: mailmsg sMailbox8
sMailbox9:: mailmsg sMailbox9 sMailbox9:: mailmsg sMailbox9
sMailbox10:: mailmsg sMailbox10 sMailbox10:: mailmsg sMailbox10
; aa0b
sMailboxCountBackup:: db sMailboxCountBackup:: db
sMailboxBackup:: sMailboxBackup::
sMailbox1Backup:: mailmsg sMailbox1Backup sMailbox1Backup:: mailmsg sMailbox1Backup
@ -51,7 +47,6 @@ sMailbox8Backup:: mailmsg sMailbox8Backup
sMailbox9Backup:: mailmsg sMailbox9Backup sMailbox9Backup:: mailmsg sMailbox9Backup
sMailbox10Backup:: mailmsg sMailbox10Backup sMailbox10Backup:: mailmsg sMailbox10Backup
; abe2
sMysteryGiftItem:: db sMysteryGiftItem:: db
sMysteryGiftUnlocked:: db sMysteryGiftUnlocked:: db
sBackupMysteryGiftItem:: db sBackupMysteryGiftItem:: db
@ -65,7 +60,7 @@ sMysteryGiftTimerStartDay:: db
sMysteryGiftTrainerHouseFlag:: db sMysteryGiftTrainerHouseFlag:: db
sMysteryGiftPartnerName:: ds NAME_LENGTH sMysteryGiftPartnerName:: ds NAME_LENGTH
s0_ac09:: ds 1 s0_ac09:: ds 1
sMysteryGiftTrainer:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2 ; ac0a sMysteryGiftTrainer:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2
sBackupMysteryGiftItemEnd:: sBackupMysteryGiftItemEnd::
ds $30 ds $30
@ -81,15 +76,13 @@ sBackupOptions:: ds wOptionsEnd - wOptions
sBackupCheckValue1:: db ; loaded with SAVE_CHECK_VALUE_1, used to check save corruption sBackupCheckValue1:: db ; loaded with SAVE_CHECK_VALUE_1, used to check save corruption
sBackupGameData:: ; b209 sBackupGameData::
sBackupPlayerData:: ds wPlayerDataEnd - wPlayerData sBackupPlayerData:: ds wPlayerDataEnd - wPlayerData
sBackupCurMapData:: ds wCurMapDataEnd - wCurMapData sBackupCurMapData:: ds wCurMapDataEnd - wCurMapData
sBackupPokemonData:: ds wPokemonDataEnd - wPokemonData sBackupPokemonData:: ds wPokemonDataEnd - wPokemonData
sBackupGameDataEnd:: sBackupGameDataEnd::
; bd83
ds $18a ds $18a
; bf0d
sBackupChecksum:: dw sBackupChecksum:: dw
@ -104,15 +97,13 @@ sOptions:: ds wOptionsEnd - wOptions
sCheckValue1:: db ; loaded with SAVE_CHECK_VALUE_1, used to check save corruption sCheckValue1:: db ; loaded with SAVE_CHECK_VALUE_1, used to check save corruption
sGameData:: ; a009 sGameData::
sPlayerData:: ds wPlayerDataEnd - wPlayerData sPlayerData:: ds wPlayerDataEnd - wPlayerData
sCurMapData:: ds wCurMapDataEnd - wCurMapData sCurMapData:: ds wCurMapDataEnd - wCurMapData
sPokemonData:: ds wPokemonDataEnd - wPokemonData sPokemonData:: ds wPokemonDataEnd - wPokemonData
sGameDataEnd:: sGameDataEnd::
; ab83
ds $18a ds $18a
; ad0d
sChecksum:: dw sChecksum:: dw
@ -121,9 +112,7 @@ sCheckValue2:: db ; loaded with SAVE_CHECK_VALUE_2, used to check save corruptio
SECTION "Active Box", SRAM SECTION "Active Box", SRAM
; ad10
sBox:: box sBox sBox:: box sBox
; b160
ds $100 ds $100
@ -131,9 +120,9 @@ sBox:: box sBox
SECTION "Link Battle Data", SRAM SECTION "Link Battle Data", SRAM
sLinkBattleStats:: sLinkBattleStats::
sLinkBattleWins:: dw ; b260 sLinkBattleWins:: dw
sLinkBattleLosses:: dw ; b262 sLinkBattleLosses:: dw
sLinkBattleDraws:: dw ; b264 sLinkBattleDraws:: dw
sLinkBattleRecord:: sLinkBattleRecord::
sLinkBattleRecord1:: link_battle_record sLinkBattleRecord1 sLinkBattleRecord1:: link_battle_record sLinkBattleRecord1
@ -146,7 +135,7 @@ sLinkBattleStatsEnd::
SECTION "SRAM Hall of Fame", SRAM SECTION "SRAM Hall of Fame", SRAM
sHallOfFame:: ; b2c0 sHallOfFame::
sHallOfFame01:: hall_of_fame sHallOfFame01 sHallOfFame01:: hall_of_fame sHallOfFame01
sHallOfFame02:: hall_of_fame sHallOfFame02 sHallOfFame02:: hall_of_fame sHallOfFame02
sHallOfFame03:: hall_of_fame sHallOfFame03 sHallOfFame03:: hall_of_fame sHallOfFame03
@ -182,11 +171,11 @@ sHallOfFameEnd::
SECTION "SRAM Crystal Data", SRAM SECTION "SRAM Crystal Data", SRAM
sMobileEventIndex:: db ; be3c sMobileEventIndex:: db
sCrystalData:: ds wCrystalDataEnd - wCrystalData sCrystalData:: ds wCrystalDataEnd - wCrystalData
sMobileEventIndexBackup:: db ; be44 sMobileEventIndexBackup:: db
SECTION "SRAM Battle Tower", SRAM SECTION "SRAM Battle Tower", SRAM
@ -197,7 +186,7 @@ sBattleTowerChallengeState::
; 2: battle tower ; 2: battle tower
db db
sBattleTower:: ; be46 sBattleTower::
sNrOfBeatenBattleTowerTrainers:: db sNrOfBeatenBattleTowerTrainers:: db
sBTChoiceOfLevelGroup:: db sBTChoiceOfLevelGroup:: db
; Battle Tower trainers are saved here, so nobody appears more than once ; Battle Tower trainers are saved here, so nobody appears more than once
@ -206,7 +195,7 @@ sBattleTowerSaveFileFlags:: db
sBattleTowerReward:: db sBattleTowerReward:: db
; team of previous trainer ; team of previous trainer
sBTMonOfTrainers:: ; be51 sBTMonOfTrainers::
sBTMonPrevTrainer1:: db sBTMonPrevTrainer1:: db
sBTMonPrevTrainer2:: db sBTMonPrevTrainer2:: db
sBTMonPrevTrainer3:: db sBTMonPrevTrainer3:: db
@ -242,34 +231,34 @@ SECTION "SRAM Mobile 1", SRAM
ds $7 ds $7
s4_a007:: ; struct size $30 ; a007 s4_a007:: ; struct size $30
ds $c ds $c
s4_a013:: ds 36 ; a013 s4_a013:: ds 36
s4_a037:: ds 4 ; a037 s4_a037:: ds 4
s4_a03b:: ds 37 * 40 ; a03b s4_a03b:: ds 37 * 40
s4_a603:: ds 8 ; a603 s4_a603:: ds 8
s4_a60b:: db ; a60b s4_a60b:: db
s4_a60c:: db ; a60c s4_a60c:: db
s4_a60d:: db ; a60d s4_a60d:: db
s4_a60e:: dw ; a60e s4_a60e:: dw
ds $1f0 ds $1f0
sMobileBattleTimer:: ds 3 ; a800 sMobileBattleTimer:: ds 3
SECTION "SRAM Mobile 2", SRAM SECTION "SRAM Mobile 2", SRAM
ds 1 ; former location for sMobileEventIndex, moved to 1:BE3C in English ds 1 ; former location for sMobileEventIndex, moved to 1:BE3C in English
sTrainerRankings:: ; a001 sTrainerRankings::
sTrainerRankingGameTimeHOF:: ds 4 sTrainerRankingGameTimeHOF:: ds 4
sTrainerRankingStepCountHOF:: ds 4 sTrainerRankingStepCountHOF:: ds 4
sTrainerRankingHealingsHOF:: ds 4 sTrainerRankingHealingsHOF:: ds 4
@ -313,108 +302,108 @@ sTrainerRankingLongestMagikarp:: ds 2
sTrainerRankingShortestMagikarp:: ds 2 sTrainerRankingShortestMagikarp:: ds 2
sTrainerRankingBugContestScore:: ds 2 sTrainerRankingBugContestScore:: ds 2
sTrainerRankingsChecksum:: ds 2 sTrainerRankingsChecksum:: ds 2
sTrainerRankingsEnd:: ; a083 sTrainerRankingsEnd::
ds 1 ; Former location for sMobileEventIndexBackup, moved to 1:BE44 in English ds 1 ; Former location for sMobileEventIndexBackup, moved to 1:BE44 in English
sTrainerRankingsBackup:: ds sTrainerRankingsEnd - sTrainerRankings ; a084 sTrainerRankingsBackup:: ds sTrainerRankingsEnd - sTrainerRankings
ds $6fa ds $6fa
s5_a800:: db ; a800 s5_a800:: db
ds $24 ds $24
s5_a825:: db ; a825 s5_a825:: db
s5_a826:: db ; a826 s5_a826:: db
ds $6d ds $6d
s5_a894:: ds NAME_LENGTH_JAPANESE ; a894 s5_a894:: ds NAME_LENGTH_JAPANESE
ds $1 ds $1
s5_a89b:: ds 1 ; a89b s5_a89b:: ds 1
s5_a89c:: ds 22 ; a89c s5_a89c:: ds 22
s5_a8b2:: ds 150 ; a8b2 s5_a8b2:: ds 150
s5_a948:: ds 246 ; a948 s5_a948:: ds 246
ds $3 ds $3
s5_aa41:: ds 4 ; aa41 s5_aa41:: ds 4
ds $2 ds $2
s5_aa47:: db ; aa47 s5_aa47:: db
s5_aa48:: db ; aa48 s5_aa48:: db
ds $1 ds $1
s5_aa4a:: db ; aa4a s5_aa4a:: db
sMobileLoginPassword:: ds MOBILE_LOGIN_PASSWORD_LENGTH ; aa4b sMobileLoginPassword:: ds MOBILE_LOGIN_PASSWORD_LENGTH
ds $1 ds $1
s5_aa5d:: ds MOBILE_LOGIN_PASSWORD_LENGTH ; aa5d s5_aa5d:: ds MOBILE_LOGIN_PASSWORD_LENGTH
ds $4 ds $4
s5_aa72:: db ; aa72 s5_aa72:: db
s5_aa73:: ds 12 ; aa73 s5_aa73:: ds 12
s5_aa7f:: ds 12 ; aa7f s5_aa7f:: ds 12
s5_aa8b:: db ; aa8b s5_aa8b:: db
s5_aa8c:: db ; aa8c s5_aa8c:: db
s5_aa8d:: db ; aa8d s5_aa8d:: db
s5_aa8e:: ds 7 * $cc ; aa8e s5_aa8e:: ds 7 * $cc
ds $1 ds $1
s5_b023:: ds 105 ; b023 s5_b023:: ds 105
s5_b08c:: ds 4 ; b08c s5_b08c:: ds 4
s5_b090:: db ; b090 s5_b090:: db
s5_b091:: db ; b091 s5_b091:: db
s5_b092:: ds 31 ; b092 s5_b092:: ds 31
ds $100 ds $100
s5_b1b1:: db ; b1b1 s5_b1b1:: db
s5_b1b2:: db ; b1b2 s5_b1b2:: db
s5_b1b3:: db ; b1b3 s5_b1b3:: db
s5_b1b4:: db ; b1b4 s5_b1b4:: db
ds $1e ds $1e
s5_b1d3:: ; b1d3 s5_b1d3::
ds $120 ds $120
s5_b2f3:: db ; b2f3 s5_b2f3:: db
s5_b2f4:: ds 4 ; b2f4 s5_b2f4:: ds 4
ds $1 ds $1
s5_b2f9:: db ; b2f9 s5_b2f9:: db
s5_b2fa:: db ; b2fa s5_b2fa:: db
s5_b2fb:: db ; b2fb s5_b2fb:: db
ds $b49 ds $b49
s5_be45:: db ; be45 s5_be45:: db
s5_be46:: db ; be46 s5_be46:: db
ds $1b8 ds $1b8
s5_bfff:: db ; bfff s5_bfff:: db
SECTION "SRAM Mobile 3", SRAM SECTION "SRAM Mobile 3", SRAM
s6_a000:: ; a000 s6_a000::
SECTION "SRAM Mobile 4", SRAM SECTION "SRAM Mobile 4", SRAM
s7_a000:: ; a000 s7_a000::

1850
wram.asm
View File

File diff suppressed because it is too large Load Diff