ref: e4e0af4d6713161d46cc0a1d580645ca40d6fa81
parent: 7e92d5ba8c7d7c255a49bce76239ec12d6398cef
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Fri Jul 3 21:00:45 EDT 2020
Remove remaining raw $xxxx values, and replace "+ -1" with "- 1" (supported by rgbds 0.4.0)
--- a/constants/hardware_constants.asm
+++ b/constants/hardware_constants.asm
@@ -2,6 +2,19 @@
GBC EQU $11
+; memory map
+VRAM_Begin EQU $8000
+VRAM_End EQU $a000
+SRAM_Begin EQU $a000
+SRAM_End EQU $c000
+WRAM0_Begin EQU $c000
+WRAM0_End EQU $d000
+WRAM1_Begin EQU $d000
+WRAM1_End EQU $e000
+; hardware registers $ff00-$ff80 (see below)
+HRAM_Begin EQU $ff80
+HRAM_End EQU $ffff
+
; MBC1
MBC1SRamEnable EQU $0000
MBC1RomBank EQU $2000
--- a/constants/move_constants.asm
+++ b/constants/move_constants.asm
@@ -165,7 +165,7 @@
const SLASH ; a3
const SUBSTITUTE ; a4
-NUM_ATTACKS EQU const_value + -1
+NUM_ATTACKS EQU const_value - 1
const STRUGGLE ; a5
--- a/constants/pokedex_constants.asm
+++ b/constants/pokedex_constants.asm
@@ -151,4 +151,4 @@
const DEX_MEWTWO ; 150
const DEX_MEW ; 151
-NUM_POKEMON EQU const_value + -1
+NUM_POKEMON EQU const_value - 1
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -191,4 +191,4 @@
const WEEPINBELL ; $BD
const VICTREEBEL ; $BE
-NUM_POKEMON_INDEXES EQU const_value + -1
+NUM_POKEMON_INDEXES EQU const_value - 1
--- a/data/moves/effects_pointers.asm
+++ b/data/moves/effects_pointers.asm
@@ -7,7 +7,7 @@
dw FreezeBurnParalyzeEffect ; PARALYZE_SIDE_EFFECT1
dw ExplodeEffect ; EXPLODE_EFFECT
dw DrainHPEffect ; DREAM_EATER_EFFECT
- dw $0000 ; MIRROR_MOVE_EFFECT
+ dw NULL ; MIRROR_MOVE_EFFECT
dw StatModifierUpEffect ; ATTACK_UP1_EFFECT
dw StatModifierUpEffect ; DEFENSE_UP1_EFFECT
dw StatModifierUpEffect ; SPEED_UP1_EFFECT
@@ -15,7 +15,7 @@
dw StatModifierUpEffect ; ACCURACY_UP1_EFFECT
dw StatModifierUpEffect ; EVASION_UP1_EFFECT
dw PayDayEffect ; PAY_DAY_EFFECT
- dw $0000 ; SWIFT_EFFECT
+ dw NULL ; SWIFT_EFFECT
dw StatModifierDownEffect ; ATTACK_DOWN1_EFFECT
dw StatModifierDownEffect ; DEFENSE_DOWN1_EFFECT
dw StatModifierDownEffect ; SPEED_DOWN1_EFFECT
@@ -38,12 +38,12 @@
dw FlinchSideEffect ; FLINCH_SIDE_EFFECT2
dw OneHitKOEffect ; OHKO_EFFECT
dw ChargeEffect ; CHARGE_EFFECT
- dw $0000 ; SUPER_FANG_EFFECT
- dw $0000 ; SPECIAL_DAMAGE_EFFECT
+ dw NULL ; SUPER_FANG_EFFECT
+ dw NULL ; SPECIAL_DAMAGE_EFFECT
dw TrappingEffect ; TRAPPING_EFFECT
dw ChargeEffect ; FLY_EFFECT
dw TwoToFiveAttacksEffect ; ATTACK_TWICE_EFFECT
- dw $0000 ; JUMP_KICK_EFFECT
+ dw NULL ; JUMP_KICK_EFFECT
dw MistEffect ; MIST_EFFECT
dw FocusEnergyEffect ; FOCUS_ENERGY_EFFECT
dw RecoilEffect ; RECOIL_EFFECT
@@ -76,12 +76,12 @@
dw StatModifierDownEffect ; unused effect
dw ConfusionSideEffect ; CONFUSION_SIDE_EFFECT
dw TwoToFiveAttacksEffect ; TWINEEDLE_EFFECT
- dw $0000 ; unused effect
+ dw NULL ; unused effect
dw SubstituteEffect ; SUBSTITUTE_EFFECT
dw HyperBeamEffect ; HYPER_BEAM_EFFECT
dw RageEffect ; RAGE_EFFECT
dw MimicEffect ; MIMIC_EFFECT
- dw $0000 ; METRONOME_EFFECT
+ dw NULL ; METRONOME_EFFECT
dw LeechSeedEffect ; LEECH_SEED_EFFECT
dw SplashEffect ; SPLASH_EFFECT
dw DisableEffect ; DISABLE_EFFECT
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -1735,7 +1735,7 @@
jr nz, .loop
call AnimationHideMonPic
ld hl, wTempPic
- ld bc, $0310
+ ld bc, $310
xor a
call FillMemory
jp CopyTempPicToMonPic
@@ -1896,7 +1896,7 @@
; Changes the pokemon's sprite to the mini sprite
ld hl, wTempPic
xor a
- ld bc, $0310
+ ld bc, $310
call FillMemory
ld a, [hWhoseTurn]
and a
@@ -1932,7 +1932,7 @@
jp AnimationShowMonPic
CopySlowbroSpriteData:
- ld bc, $0010
+ ld bc, $10
ld a, BANK(SlowbroSprite)
jp FarCopyData2
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -582,7 +582,7 @@
ld a, [de] ; increment toxic counter
inc a
ld [de], a
- ld hl, $0000
+ ld hl, 0
.toxicTicksLoop
add hl, bc
dec a
@@ -5345,8 +5345,8 @@
ret z ; Swift never misses (interestingly, Azure Heights lists this is a myth, but it appears to be true)
call CheckTargetSubstitute ; substitute check (note that this overwrites a)
jr z, .checkForDigOrFlyStatus
-; this code is buggy. it's supposed to prevent HP draining moves from working on substitutes.
-; since $7b79 overwrites a with either $00 or $01, it never works.
+; This code is buggy. It's supposed to prevent HP draining moves from working on substitutes.
+; Since CheckTargetSubstitute overwrites a with either $00 or $01, it never works.
cp DRAIN_HP_EFFECT
jp z, .moveMissed
cp DREAM_EATER_EFFECT
@@ -6335,9 +6335,9 @@
ld de, vBackPic
call InterlaceMergeSpriteBuffers
ld a, $a
- ld [$0], a
+ ld [MBC1SRamEnable], a
xor a
- ld [$4000], a
+ ld [MBC1SRamBank], a
ld hl, vSprites
ld de, sSpriteBuffer1
ld a, [hLoadedROMBank]
@@ -6345,7 +6345,7 @@
ld c, 7 * 7
call CopyVideoData
xor a
- ld [$0], a
+ ld [MBC1SRamEnable], a
ld a, $31
ld [hStartTileID], a
coord hl, 1, 5
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -134,7 +134,7 @@
push de
push bc
ld hl, StatusAilmentMoveEffects
- ld de, $0001
+ ld de, 1
call IsInArray
pop bc
pop de
--- a/engine/events/diploma.asm
+++ b/engine/events/diploma.asm
@@ -9,7 +9,7 @@
call DisableLCD
ld hl, CircleTile
ld de, vChars2 + $700
- ld bc, $0010
+ ld bc, $10
ld a, BANK(CircleTile)
call FarCopyData2
coord hl, 0, 0
--- a/engine/events/prize_menu.asm
+++ b/engine/events/prize_menu.asm
@@ -131,10 +131,8 @@
coord hl, 13, 5
; reg. c:
; [low nybble] number of bytes
-; [bit 765 = %100] space-padding (not zero-padding)
+; [bits 765 = %100] space-padding (not zero-padding)
ld c, (1 << 7 | 2)
-; Function $15CD displays BCD value (same routine
-; used by text-command $02)
call PrintBCDNumber
ld de, wPrize2Price
coord hl, 13, 7
--- a/engine/menus/display_text_id_init.asm
+++ b/engine/menus/display_text_id_init.asm
@@ -43,7 +43,7 @@
; the original direction they were facing must be restored after the dialogue is over
ld hl, wSpriteStateData1 + $19
ld c, $0f
- ld de, $0010
+ ld de, $10
.spriteFacingDirectionCopyLoop
ld a, [hl]
inc h
@@ -55,7 +55,7 @@
; loop to force all the sprites in the middle of animation to stand still
; (so that they don't like they're frozen mid-step during the dialogue)
ld hl, wSpriteStateData1 + 2
- ld de, $0010
+ ld de, $10
ld c, e
.spriteStandStillLoop
ld a, [hl]
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -702,7 +702,7 @@
PadSRAM_FF:
ld [MBC1SRamBank], a
- ld hl, $a000 ; start of SRAM
- ld bc, $2000 ; size of SRAM
+ ld hl, SRAM_Begin
+ ld bc, SRAM_End - SRAM_Begin
ld a, $ff
jp FillMemory
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -491,12 +491,12 @@
call CopyData
ld hl, TrainerInfoTextBoxTileGraphics ; trainer info text box tile patterns
ld de, vChars2 + $770
- ld bc, $0080
+ ld bc, $80
push bc
call TrainerInfo_FarCopyData
ld hl, BlankLeaderNames
ld de, vChars2 + $600
- ld bc, $0170
+ ld bc, $170
call TrainerInfo_FarCopyData
pop bc
ld hl, BadgeNumbersTileGraphics ; badge number tile patterns
@@ -504,14 +504,14 @@
call TrainerInfo_FarCopyData
ld hl, GymLeaderFaceAndBadgeTileGraphics ; gym leader face and badge tile patterns
ld de, vChars2 + $200
- ld bc, $0400
+ ld bc, $400
ld a, $03
call FarCopyData2
ld hl, TextBoxGraphics
- ld de, $00d0
+ ld de, $d0
add hl, de ; hl = colon tile pattern
ld de, vChars1 + $560
- ld bc, $0010
+ ld bc, $10
ld a, $04
push bc
call FarCopyData2
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -317,7 +317,7 @@
xor a
ld [wPlayerCharacterOAMTile], a
ld hl, wOAMBuffer
- ld de, $605a
+ lb de, $60, $5a
ld b, 7
.loop
push de
--- a/engine/overworld/map_sprites.asm
+++ b/engine/overworld/map_sprites.asm
@@ -133,8 +133,7 @@
jr nc, .fourTileSpriteVRAMAddr
ld d, a
dec d
-; Equivalent to multiplying $C0 (number of bytes in 12 tiles) times the VRAM
-; slot and adding the result to $8000 (the VRAM base address).
+; vSprites += [hVRAMSlot] * $C0 (the number of bytes in 12 tiles)
.calculateVRAMAddrLoop
add hl, bc
dec d
--- a/engine/overworld/wild_mons.asm
+++ b/engine/overworld/wild_mons.asm
@@ -16,10 +16,10 @@
jr z, .NoGrassData ; if no grass data, skip to surfing data
push hl
ld de, wGrassMons ; otherwise, load grass data
- ld bc, $0014
+ ld bc, $14
call CopyData
pop hl
- ld bc, $0014
+ ld bc, $14
add hl, bc
.NoGrassData
ld a, [hli]
@@ -27,7 +27,7 @@
and a
ret z ; if no water data, we're done
ld de, wWaterMons ; otherwise, load surfing data
- ld bc, $0014
+ ld bc, $14
jp CopyData
INCLUDE "data/wild/grass_water.asm"
--- a/engine/pokemon/status_screen.asm
+++ b/engine/pokemon/status_screen.asm
@@ -254,7 +254,7 @@
ld c, 8
call TextBoxBorder ; Draws the box
coord hl, 1, 9 ; Start printing stats from here
- ld bc, $0019 ; Number offset
+ ld bc, $19 ; Number offset
jr .PrintStats
.DifferentBox
coord hl, 9, 2
@@ -262,7 +262,7 @@
ld c, 9
call TextBoxBorder
coord hl, 11, 3
- ld bc, $0018
+ ld bc, $18
.PrintStats
push bc
push hl
--- a/engine/slots/slot_machine.asm
+++ b/engine/slots/slot_machine.asm
@@ -31,7 +31,7 @@
xor a
ld [wSlotMachineAllowMatchesCounter], a
ld hl, wStoppingWhichSlotMachineWheel
- ld bc, $0014
+ ld bc, $14
call FillMemory
call MainSlotMachineLoop
ld hl, wd730
--- a/home/init.asm
+++ b/home/init.asm
@@ -41,8 +41,8 @@
ld sp, wStack
- ld hl, $c000 ; start of WRAM
- ld bc, $2000 ; size of WRAM
+ ld hl, WRAM0_Begin
+ ld bc, WRAM1_End - WRAM0_Begin
.loop
ld [hl], 0
inc hl
@@ -53,8 +53,8 @@
call ClearVram
- ld hl, $ff80 ; start of HRAM
- ld bc, $ffff - $ff80 ; size of HRAM
+ ld hl, HRAM_Begin
+ ld bc, HRAM_End - HRAM_Begin
call FillMemory
call ClearSprites
@@ -119,8 +119,8 @@
jp SetDefaultNamesBeforeTitlescreen
ClearVram::
- ld hl, $8000
- ld bc, $2000
+ ld hl, VRAM_Begin
+ ld bc, VRAM_End - VRAM_Begin
xor a
jp FillMemory
--- a/home/list_menu.asm
+++ b/home/list_menu.asm
@@ -454,7 +454,7 @@
ld [wLoadedMonLevel], a
.skipCopyingLevel
pop hl
- ld bc, $001c
+ ld bc, $1c
add hl, bc
call PrintLevel
pop af
--- a/home/names2.asm
+++ b/home/names2.asm
@@ -77,7 +77,7 @@
ld h, d
ld l, e
ld de, wcd6d
- ld bc, $0014
+ ld bc, $14
call CopyData
.gotPtr
ld a, e
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -1424,18 +1424,18 @@
dec b
jr nz, .rowLoop
ld hl, wTileMapBackup
- ld bc, $0000
+ ld bc, $0
.adjustForYCoordWithinTileBlock
ld a, [wYBlockCoord]
and a
jr z, .adjustForXCoordWithinTileBlock
- ld bc, $0030
+ ld bc, $30
add hl, bc
.adjustForXCoordWithinTileBlock
ld a, [wXBlockCoord]
and a
jr z, .copyToVisibleAreaBuffer
- ld bc, $0002
+ ld bc, $2
add hl, bc
.copyToVisibleAreaBuffer
coord de, 0, 0 ; base address for the tiles that are directly transferred to VRAM during V-blank
@@ -1739,7 +1739,7 @@
ld l, a
ld a, [wMapViewVRAMPointer + 1]
ld h, a
- ld bc, $0200
+ ld bc, $200
add hl, bc
ld a, h
and $03
@@ -1835,7 +1835,7 @@
ld a, [de]
ld [hl], a
inc de
- ld bc, $0015
+ ld bc, $15
add hl, bc
pop bc
dec c
@@ -2180,7 +2180,7 @@
jr nz, .zeroSpriteDataLoop
; initialize all C100-C1FF sprite entries to disabled (other than player's)
ld hl, wSpriteStateData1 + $12
- ld de, $0010
+ ld de, $10
ld c, $0f
.disableSpriteEntriesLoop
ld [hl], $ff
--- a/home/pics.asm
+++ b/home/pics.asm
@@ -93,7 +93,7 @@
add a ; 8*(7*((8-w)/2) + 7-h) ; combined overall offset (in bytes)
ld [hSpriteOffset], a
xor a
- ld [$4000], a
+ ld [MBC1SRamBank], a
ld hl, sSpriteBuffer0
call ZeroSpriteBuffer ; zero buffer 0
ld de, sSpriteBuffer1
@@ -151,7 +151,7 @@
; de: output address
InterlaceMergeSpriteBuffers::
xor a
- ld [$4000], a
+ ld [MBC1SRamBank], a
push de
ld hl, sSpriteBuffer2 + (SPRITEBUFFERSIZE - 1) ; destination: end of buffer 2
ld de, sSpriteBuffer1 + (SPRITEBUFFERSIZE - 1) ; source 2: end of buffer 1
--- a/home/predef_text.asm
+++ b/home/predef_text.asm
@@ -119,7 +119,7 @@
; loop to make sprites face the directions they originally faced before the dialogue
ld hl, wSpriteStateData2 + $19
ld c, $0f
- ld de, $0010
+ ld de, $10
.restoreSpriteFacingDirectionLoop
ld a, [hl]
dec h
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -183,7 +183,7 @@
;\3, \4, ... = additional (optional) event indices
SetEvents: MACRO
SetEvent \1
- rept (_NARG + -1)
+ rept _NARG - 1
SetEventReuseHL \2
shift
endr
@@ -235,7 +235,7 @@
;\3 = event index (optional)
ResetEvents: MACRO
ResetEvent \1
- rept (_NARG + -1)
+ rept _NARG - 1
ResetEventReuseHL \2
shift
endr
@@ -283,7 +283,7 @@
event_fill_count = event_end_byte - event_start_byte - 1
IF ((\1) % 8) == 0
-event_fill_start = event_fill_start + -1
+event_fill_start = event_fill_start - 1
event_fill_count = event_fill_count + 1
ELSE
ld a, [wEventFlags + event_start_byte]
@@ -304,7 +304,7 @@
ld a, $ff
ld hl, wEventFlags + event_fill_start
- REPT event_fill_count + -1
+ REPT event_fill_count - 1
ld [hli], a
ENDR
@@ -345,7 +345,7 @@
event_fill_count = event_end_byte - event_start_byte - 1
IF ((\1) % 8) == 0
-event_fill_start = event_fill_start + -1
+event_fill_start = event_fill_start - 1
event_fill_count = event_fill_count + 1
ELSE
ld a, [wEventFlags + event_start_byte]
@@ -370,7 +370,7 @@
xor a
ENDC
- REPT event_fill_count + -1
+ REPT event_fill_count - 1
ld [hli], a
ENDR
--- /dev/null
+++ b/macros/wram.asm
@@ -1,0 +1,92 @@
+; Used in wram.asm
+
+flag_array: MACRO
+ ds ((\1) + 7) / 8
+ENDM
+
+BOX_STRUCT_LENGTH EQU 25 + NUM_MOVES * 2
+
+box_struct: MACRO
+\1Species:: db
+\1HP:: dw
+\1BoxLevel:: db
+\1Status:: db
+\1Type::
+\1Type1:: db
+\1Type2:: db
+\1CatchRate:: db
+\1Moves:: ds NUM_MOVES
+\1OTID:: dw
+\1Exp:: ds 3
+\1HPExp:: dw
+\1AttackExp:: dw
+\1DefenseExp:: dw
+\1SpeedExp:: dw
+\1SpecialExp:: dw
+\1DVs:: ds 2
+\1PP:: ds NUM_MOVES
+ENDM
+
+party_struct: MACRO
+ box_struct \1
+\1Level:: db
+\1Stats::
+\1MaxHP:: dw
+\1Attack:: dw
+\1Defense:: dw
+\1Speed:: dw
+\1Special:: dw
+ENDM
+
+battle_struct: MACRO
+\1Species:: db
+\1HP:: dw
+\1PartyPos::
+\1BoxLevel:: db
+\1Status:: db
+\1Type::
+\1Type1:: db
+\1Type2:: db
+\1CatchRate:: db
+\1Moves:: ds NUM_MOVES
+\1DVs:: ds 2
+\1Level:: db
+\1Stats::
+\1MaxHP:: dw
+\1Attack:: dw
+\1Defense:: dw
+\1Speed:: dw
+\1Special:: dw
+\1PP:: ds NUM_MOVES
+ENDM
+
+spritestatedata1: MACRO
+\1PictureID:: db
+\1MovementStatus:: db
+\1ImageIndex:: db
+\1YStepVector:: db
+\1YPixels:: db
+\1XStepVector:: db
+\1XPixels:: db
+\1IntraAnimFrameCounter:: db
+\1AnimFrameCounter:: db
+\1FacingDirection:: db
+ ds 6
+\1End::
+ENDM
+
+spritestatedata2: MACRO
+\1WalkAnimationCounter:: db
+ ds 1
+\1YDisplacement:: db
+\1XDisplacement:: db
+\1MapY:: db
+\1MapX:: db
+\1MovementByte1:: db
+\1GrassPriority:: db
+\1MovementDelay:: db
+ ds 5
+\1ImageBaseOffset:: db
+ ds 1
+\1End::
+ENDM
--- a/scripts/OaksLab.asm
+++ b/scripts/OaksLab.asm
@@ -652,7 +652,7 @@
OaksLabScript_RemoveParcel:
ld hl, wBagItems
- ld bc, $0000
+ ld bc, 0
.loop
ld a, [hli]
cp $ff
--- a/scripts/VermilionDock.asm
+++ b/scripts/VermilionDock.asm
@@ -78,7 +78,7 @@
ld d, $0
ld e, $8
.asm_1dbfa
- ld hl, $0002
+ ld hl, $2
add hl, bc
ld a, l
ld [wMapViewVRAMPointer], a
--- a/wram.asm
+++ b/wram.asm
@@ -1,65 +1,8 @@
INCLUDE "constants.asm"
-flag_array: MACRO
- ds ((\1) + 7) / 8
-ENDM
+INCLUDE "macros/wram.asm"
-box_struct_length EQU 25 + NUM_MOVES * 2
-box_struct: MACRO
-\1Species:: db
-\1HP:: dw
-\1BoxLevel:: db
-\1Status:: db
-\1Type::
-\1Type1:: db
-\1Type2:: db
-\1CatchRate:: db
-\1Moves:: ds NUM_MOVES
-\1OTID:: dw
-\1Exp:: ds 3
-\1HPExp:: dw
-\1AttackExp:: dw
-\1DefenseExp:: dw
-\1SpeedExp:: dw
-\1SpecialExp:: dw
-\1DVs:: ds 2
-\1PP:: ds NUM_MOVES
-ENDM
-party_struct: MACRO
- box_struct \1
-\1Level:: db
-\1Stats::
-\1MaxHP:: dw
-\1Attack:: dw
-\1Defense:: dw
-\1Speed:: dw
-\1Special:: dw
-ENDM
-
-battle_struct: MACRO
-\1Species:: db
-\1HP:: dw
-\1PartyPos::
-\1BoxLevel:: db
-\1Status:: db
-\1Type::
-\1Type1:: db
-\1Type2:: db
-\1CatchRate:: db
-\1Moves:: ds NUM_MOVES
-\1DVs:: ds 2
-\1Level:: db
-\1Stats::
-\1MaxHP:: dw
-\1Attack:: dw
-\1Defense:: dw
-\1Speed:: dw
-\1Special:: dw
-\1PP:: ds NUM_MOVES
-ENDM
-
-
SECTION "WRAM Bank 0", WRAM0
wUnusedC000::
@@ -228,21 +171,6 @@
; C1xD
; C1xE
; C1xF
-spritestatedata1: MACRO
-\1PictureID:: db
-\1MovementStatus:: db
-\1ImageIndex:: db
-\1YStepVector:: db
-\1YPixels:: db
-\1XStepVector:: db
-\1XPixels:: db
-\1IntraAnimFrameCounter:: db
-\1AnimFrameCounter:: db
-\1FacingDirection:: db
- ds 6
-\1End::
-endm
-
wSpritePlayerStateData1:: spritestatedata1 wSpritePlayerStateData1
wSprite01StateData1:: spritestatedata1 wSprite01StateData1
wSprite02StateData1:: spritestatedata1 wSprite02StateData1
@@ -280,22 +208,6 @@
; C2xD
; C2xE: sprite image base offset (in video ram, player always has value 1, used to compute c1x2)
; C2xF
-spritestatedata2: MACRO
-\1WalkAnimationCounter:: db
- ds 1
-\1YDisplacement:: db
-\1XDisplacement:: db
-\1MapY:: db
-\1MapX:: db
-\1MovementByte1:: db
-\1GrassPriority:: db
-\1MovementDelay:: db
- ds 5
-\1ImageBaseOffset:: db
- ds 1
-\1End::
-endm
-
wSpritePlayerStateData2:: spritestatedata2 wSpritePlayerStateData2
wSprite01StateData2:: spritestatedata2 wSprite01StateData2
wSprite02StateData2:: spritestatedata2 wSprite02StateData2
@@ -1050,7 +962,7 @@
ds 1
wDayCarePerLevelCost::
-; 2-byte BCD number (always set to $0100)
+; 2-byte BCD number (always set to $100)
wHoFTeamIndex2::
@@ -3185,7 +3097,7 @@
wBoxMons::
wBoxMon1:: box_struct wBoxMon1
-wBoxMon2:: ds box_struct_length * (MONS_PER_BOX + -1)
+wBoxMon2:: ds BOX_STRUCT_LENGTH * (MONS_PER_BOX - 1)
wBoxMonOT:: ds NAME_LENGTH * MONS_PER_BOX
wBoxMonNicks:: ds NAME_LENGTH * MONS_PER_BOX