diff options
| author | vulcandth <vulcandth@gmail.com> | 2023-11-22 15:12:40 +0000 |
|---|---|---|
| committer | vulcandth <vulcandth@gmail.com> | 2023-11-22 15:12:40 +0000 |
| commit | d4d7b91aecf651b06d1f466ecc22b65da234a299 (patch) | |
| tree | 8386e18cebdb2f7270388af5d0f381395c94a901 | |
| parent | Delete a couple EOL whitespace. (diff) | |
| download | pokeyellow-d4d7b91aecf651b06d1f466ecc22b65da234a299.tar.gz pokeyellow-d4d7b91aecf651b06d1f466ecc22b65da234a299.tar.xz pokeyellow-d4d7b91aecf651b06d1f466ecc22b65da234a299.zip | |
Convert a couple ds 2 to dw
| -rw-r--r-- | macros/ram.asm | 4 | ||||
| -rw-r--r-- | ram/hram.asm | 2 | ||||
| -rw-r--r-- | ram/wram.asm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/macros/ram.asm b/macros/ram.asm index df5dcf90..5f2b8a6f 100644 --- a/macros/ram.asm +++ b/macros/ram.asm @@ -23,7 +23,7 @@ MACRO box_struct \1DefenseExp:: dw \1SpeedExp:: dw \1SpecialExp:: dw -\1DVs:: ds 2 +\1DVs:: dw \1PP:: ds NUM_MOVES ENDM @@ -49,7 +49,7 @@ MACRO battle_struct \1Type2:: db \1CatchRate:: db \1Moves:: ds NUM_MOVES -\1DVs:: ds 2 +\1DVs:: dw \1Level:: db \1Stats:: \1MaxHP:: dw diff --git a/ram/hram.asm b/ram/hram.asm index 72e9e13a..fc2f45bc 100644 --- a/ram/hram.asm +++ b/ram/hram.asm @@ -173,7 +173,7 @@ hMoney:: ds 3 ; BCD number NEXTU ; some code zeroes this for no reason when writing a coin amount hUnusedCoinsByte:: db -hCoins:: ds 2 ; BCD number +hCoins:: dw ; BCD number ENDU hDivideBCDDivisor:: diff --git a/ram/wram.asm b/ram/wram.asm index 3deb114a..ecd0602b 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1904,7 +1904,7 @@ wNumHoFTeams:: db wUnusedD5A3:: db -wPlayerCoins:: ds 2 ; BCD +wPlayerCoins:: dw ; BCD ; bit array of missable objects. set = removed wMissableObjectFlags:: flag_array $100 |