From 699495bfcb732559114ad1450e704844a86308a1 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 13:37:15 -0500 Subject: Consistent capitalization for map names, matching their constants --- wram.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index ee0bcbbde..9b96f2bb6 100644 --- a/wram.asm +++ b/wram.asm @@ -1862,8 +1862,8 @@ wWhichHPBar:: wPokemonWithdrawDepositParameter:: ; 0: Take from PC ; 1: Put into PC -; 2: Take from Daycare -; 3: Put into Daycare +; 2: Take from Day-Care +; 3: Put into Day-Care db wItemQuantityChangeBuffer:: db @@ -2749,11 +2749,11 @@ UnownDex:: ds NUM_UNOWN ; ded9 UnlockedUnowns:: db ; def3 wFirstUnownSeen:: db -wDaycareMan:: ; def5 +wDayCareMan:: ; def5 ; bit 7: active ; bit 6: monsters are compatible ; bit 5: egg ready -; bit 0: monster 1 in daycare +; bit 0: monster 1 in day-care db wBreedMon1:: @@ -2761,9 +2761,9 @@ wBreedMon1Nick:: ds PKMN_NAME_LENGTH ; def6 wBreedMon1OT:: ds NAME_LENGTH ; df01 wBreedMon1Stats:: box_struct wBreedMon1 ; df0c -wDaycareLady:: ; df2c +wDayCareLady:: ; df2c ; bit 7: active -; bit 0: monster 2 in daycare +; bit 0: monster 2 in day-care db wStepsToEgg:: ; df2d -- cgit v1.2.3 From c2ad79c4f21b5f4dd661d69a7a81b69506be8821 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 12:20:01 -0500 Subject: Add constants for time-of-day boundaries Split off more misc constants into proper files --- wram.asm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index 9b96f2bb6..e70457eba 100644 --- a/wram.asm +++ b/wram.asm @@ -355,6 +355,8 @@ NEXTU ; c608 ; timeset temp storage ds 20 wInitHourBuffer:: db ; c61c + ds 9 +wInitMinuteBuffer:: db ; c626 NEXTU ; c608 ; link engine data -- cgit v1.2.3 From 31cce83e9b3bab01d8a605b170549fbd25ca5fee Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 13:47:58 -0500 Subject: Move lots of data tables into individual data/ files (This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.) --- wram.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index e70457eba..e7ed6741c 100644 --- a/wram.asm +++ b/wram.asm @@ -1613,9 +1613,9 @@ wTrainerHUDTiles:: db NEXTU ; d002 ; mobile participant nicknames ds 4 -wMobileParticipant1Nickname:: ds 6 -wMobileParticipant2Nickname:: ds 6 -wMobileParticipant3Nickname:: ds 6 +wMobileParticipant1Nickname:: ds NAME_LENGTH_JAPANESE +wMobileParticipant2Nickname:: ds NAME_LENGTH_JAPANESE +wMobileParticipant3Nickname:: ds NAME_LENGTH_JAPANESE NEXTU ; d002 ; earthquake data buffer -- cgit v1.2.3 From 4afc2f01ef96e6e94f3171c1c6bac84e70596854 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 17:35:35 -0500 Subject: Add member constants for the base data struct, same as most other structs --- wram.asm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index e7ed6741c..0dd30a8f4 100644 --- a/wram.asm +++ b/wram.asm @@ -1997,6 +1997,7 @@ TilesetCollisionAddress:: dw ; d1e0 TilesetAnim:: dw ; bank 3f ; d1e2 ds 2 ; unused ; d1e4 TilesetPalettes:: dw ; bank 3f ; d1e6 +TilesetHeaderEnd:: EvolvableFlags:: flag_array PARTY_LENGTH ; d1e8 @@ -2109,7 +2110,9 @@ BaseType1:: db ; d23d BaseType2:: db ; d23e BaseCatchRate:: db ; d23f BaseExp:: db ; d240 -BaseItems:: dw ; d241 +BaseItems:: ; d241 +BaseItem1:: db ; d241 +BaseItem2:: db ; d242 BaseGender:: db ; d243 BaseUnknown1:: db ; d244 BaseEggSteps:: db ; d245 @@ -2119,6 +2122,7 @@ BasePadding:: ds 4 ; d248 BaseGrowthRate:: db ; d24c BaseEggGroups:: db ; d24d BaseTMHM:: flag_array NUM_TM_HM_TUTOR ; d24e +CurBaseDataEnd:: CurDamage:: dw ; d256 -- cgit v1.2.3 From 79873a1bfc0e40067c45dc74fbbebf547d177978 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 23:44:29 -0500 Subject: Move pic animation documentation to docs/ Move growth rates to a data/ table Name more SECTIONs --- wram.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index 0dd30a8f4..c58c76631 100644 --- a/wram.asm +++ b/wram.asm @@ -2995,7 +2995,7 @@ wBattleAnimEnd:: ENDU ; d462 -SECTION "WRAM 5 MOBILE", WRAMX +SECTION "Mobile RAM", WRAMX w5_d800:: ds $200 w5_da00:: ds $200 @@ -3008,7 +3008,7 @@ w5_MobileOpponentBattleWinMessage:: ds $c ; dc32 w5_MobileOpponentBattleLossMessage:: ds $c ; dc3e -SECTION "WRAM 6", WRAMX +SECTION "Scratch RAM", WRAMX UNION ; d000 wScratchTileMap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT @@ -3020,7 +3020,7 @@ wDecompressEnemyFrontpic:: ds $80 tiles ENDU ; e000 -SECTION "WRAM 7", WRAMX +SECTION "Stack RAM", WRAMX wWindowStack:: ds $1000 - 1 wWindowStackBottom:: ds 1 -- cgit v1.2.3