diff options
| author | yenatch <yenatch@gmail.com> | 2018-04-09 21:30:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 21:30:24 -0400 |
| commit | 40b537d45b4b8937038126f7e5d2d21ccee460c0 (patch) | |
| tree | 881a090b80b2c22985fc6d1231b03c6721a83462 /wram.asm | |
| parent | e4b41fad4fd3787ca2e61adb5377ba8f68fca7ef (diff) | |
| parent | 53ff57ca663dc5bf9c3731022b0eb0dc73f2207f (diff) | |
Merge pull request #503 from Rangi42/master
Factor wMisc into meaningful parts; move most code out of home.asm
Diffstat (limited to 'wram.asm')
| -rw-r--r-- | wram.asm | 40 |
1 files changed, 28 insertions, 12 deletions
@@ -361,9 +361,13 @@ UNION ; c608 wc608:: ds 480 NEXTU ; c608 -; miscellaneous -wMisc:: ds WMISC_WIDTH * WMISC_HEIGHT -wMiscEnd:: +; surrounding tiles +wSurroundingTiles:: ds SURROUNDING_WIDTH * SURROUNDING_HEIGHT + +NEXTU ; c608 +; box save buffer +wBoxPartialData:: ds 480 +wBoxPartialDataEnd:: NEXTU ; c608 ; odd egg @@ -389,7 +393,7 @@ wInitMinuteBuffer:: db ; c626 NEXTU ; c608 ; link engine data - ds 10 +wLink_c608:: ds 10 wc612:: ds 10 NEXTU ; c608 @@ -884,8 +888,9 @@ wc7e8_End:: SECTION "Overworld Map", WRAM0 UNION ; c800 -wOverworldMap:: ds 1300 ; c800 -wOverworldMapEnd:: +; overworld map blocks +wOverworldMapBlocks:: ds 1300 ; c800 +wOverworldMapBlocksEnd:: NEXTU ; c800 ; GB Printer screen RAM @@ -928,11 +933,15 @@ wGameboyPrinterRAMEnd:: NEXTU ; c800 ; bill's pc data -wBillsPCPokemonList:: ; c800 -; Pokemon, box number, list index +wBillsPCPokemonList:: +; (species, box number, list index) x30 ds 3 * 30 NEXTU ; c800 +; Hall of Fame data +wHallOfFamePokemonList:: hall_of_fame wHallOfFamePokemonList + +NEXTU ; c800 ; raw link data wLinkData:: ds $514 wLinkDataEnd:: @@ -1495,8 +1504,11 @@ wGameTimerPause:: ; cfbc ds 1 -wcfbe:: ; SGB flags? -; bit 7 +wcfbe:: ; cfbe +; bits 4, 6, or 7 can be used to disable joypad input +; bit 4 +; bit 6: mon fainted? +; bit 7: SGB flag? db ds 1 @@ -1884,7 +1896,11 @@ wVramState:: ; d0ed ; flickers when climbing waterfall db -wBattleResult:: db ; d0ee +wBattleResult:: ; d0ee +; WIN, LOSE, or DRAW +; bit 6: caught celebi +; bit 7: box full + db wUsingItemWithSelect:: db ; d0ef UNION ; d0f0 @@ -2760,7 +2776,7 @@ wMapGroup:: db ; dcb5 ; map group of current map wMapNumber:: db ; dcb6 ; map number of current map wYCoord:: db ; dcb7 ; current y coordinate relative to top-left corner of current map wXCoord:: db ; dcb8 ; current x coordinate relative to top-left corner of current map -wScreenSave:: ds 6 * 5 +wScreenSave:: ds SCREEN_META_WIDTH * SCREEN_META_HEIGHT wCurrMapDataEnd:: |