diff options
| author | dannye <33dannye@gmail.com> | 2024-05-05 11:06:40 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2024-05-05 11:06:40 -0500 |
| commit | b135272f9510ed78e8c062efe552d6dbdcc1523f (patch) | |
| tree | 5dc1941a3b42651f268dbb90f6e3170ccd977408 /ram/wram.asm | |
| parent | Remove pcm.py since pcm.c handles it (diff) | |
| parent | Use constant in wram for hidden item flags (#445) (diff) | |
| download | pokeyellow-b135272f9510ed78e8c062efe552d6dbdcc1523f.tar.gz pokeyellow-b135272f9510ed78e8c062efe552d6dbdcc1523f.tar.xz pokeyellow-b135272f9510ed78e8c062efe552d6dbdcc1523f.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'ram/wram.asm')
| -rw-r--r-- | ram/wram.asm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ram/wram.asm b/ram/wram.asm index 74d6ae34..d7acee2c 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1977,7 +1977,7 @@ wUnusedD366:: db wCurMapHeader:: wCurMapTileset:: db -wCurMapHeight:: db +wCurMapHeight:: db wCurMapWidth:: db wCurMapDataPtr:: dw wCurMapTextPtr:: dw @@ -2162,7 +2162,7 @@ wNumHoFTeams:: db wUnusedD5A3:: db -wPlayerCoins:: ds 2 ; BCD +wPlayerCoins:: dw ; BCD ; bit array of missable objects. set = removed wMissableObjectFlags:: flag_array $100 @@ -2300,9 +2300,9 @@ wGameProgressFlagsEnd:: ds 56 -wObtainedHiddenItemsFlags:: flag_array 112 +wObtainedHiddenItemsFlags:: flag_array MAX_HIDDEN_ITEMS -wObtainedHiddenCoinsFlags:: flag_array 16 +wObtainedHiddenCoinsFlags:: flag_array MAX_HIDDEN_COINS ; $00 = walking ; $01 = biking @@ -2594,3 +2594,5 @@ SECTION "Stack", WRAM0 ; the stack grows downward ds $eb - 1 wStack:: db + +ENDSECTION |