Clean up wram constants and bad address labels/comments.

5 files changed, 157 insertions, 142 deletions

diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index fba6f2ff..4ff9e2db 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -1,12 +1,19 @@
-; InputType: ; c2c7
+; wInputType:: ; c1c6
 AUTO_INPUT EQU $ff
 
-; wDebugFlags:: ; c2cc
+; wDebugFlags:: ; c1cb
 	const_def
 	const DEBUG_BATTLE_F
 	const DEBUG_FIELD_F
 
-; wMonType:: ; cf5f
+; wCurDexMode::
+	const_def
+	const DEXMODE_NEW
+	const DEXMODE_OLD
+	const DEXMODE_ABC
+	const DEXMODE_UNOWN
+
+; wMonType:: ; ce5f
 	const_def
 	const PARTYMON   ; 0
 	const OTPARTYMON ; 1
@@ -14,11 +21,11 @@ AUTO_INPUT EQU $ff
 	const TEMPMON    ; 3
 	const WILDMON    ; 4
 
-; wGameTimerPause:: ; cfbc
+; wGameTimerPause:: ; d8b8
 GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0
 GAMETIMERPAUSE_MOBILE_7_F     EQU 7
 
-; wOptions:: ; cfcc
+; wOptions:: ; d199
 TEXT_DELAY_MASK EQU %111
 	const_def 4
 	const NO_TEXT_SCROLL ; 4
@@ -30,23 +37,35 @@ TEXT_DELAY_FAST EQU %001 ; 1
 TEXT_DELAY_MED  EQU %011 ; 3
 TEXT_DELAY_SLOW EQU %101 ; 5
 
-; wOptions2::
+; wTextboxFrame:: ; d19b
 	const_def
-	const MENU_ACCOUNT ; 0
-
-; wTextboxFlags::
+	const FRAME_1 ; 0
+	const FRAME_2 ; 1
+	const FRAME_3 ; 2
+	const FRAME_4 ; 3
+	const FRAME_5 ; 4
+	const FRAME_6 ; 5
+	const FRAME_7 ; 6
+	const FRAME_8 ; 7
+NUM_FRAMES EQU const_value
+
+; wTextboxFlags:: ; d19c
 	const_def
 	const FAST_TEXT_DELAY_F ; 0
 	const NO_TEXT_DELAY_F   ; 1
 
-; GBPrinter:
-PRINT_LIGHTEST EQU $00
-PRINT_LIGHTER  EQU $20
-PRINT_NORMAL   EQU $40
-PRINT_DARKER   EQU $60
-PRINT_DARKEST  EQU $7f
+; wGBPrinterBrightness:: ; d19d
+GBPRINTER_LIGHTEST EQU $00
+GBPRINTER_LIGHTER  EQU $20
+GBPRINTER_NORMAL   EQU $40
+GBPRINTER_DARKER   EQU $60
+GBPRINTER_DARKEST  EQU $7f
+
+; wOptions2:: ; d19e
+	const_def
+	const MENU_ACCOUNT ; 0
 
-; WalkingDirection: ; d043
+; wWalkingDirection:: ; cf2e
 	const_def -1
 	const STANDING ; -1
 	const DOWN     ; 0
@@ -60,70 +79,83 @@ UP_MASK    EQU 1 << UP
 LEFT_MASK  EQU 1 << LEFT
 RIGHT_MASK EQU 1 << RIGHT
 
-; FacingDirection: ; d044
+; wFacingDirection:: ; cf2f
 FACE_CURRENT EQU 0
 FACE_DOWN  EQU 8
 FACE_UP    EQU 4
 FACE_LEFT  EQU 2
 FACE_RIGHT EQU 1
 
-; TimeOfDay: ; d269
-MORN_F     EQU 0
-DAY_F      EQU 1
-NITE_F     EQU 2
-DARKNESS_F EQU 3
+; wPokemonWithdrawDepositParameter:: ; d008
+PC_WITHDRAW EQU 0
+PC_DEPOSIT EQU 1
+DAY_CARE_WITHDRAW EQU 2
+DAY_CARE_DEPOSIT  EQU 3
+
+; wTimeOfDay:: ; d157
+	const_def
+	const MORN_F     ; 0
+	const DAY_F      ; 1
+	const NITE_F     ; 2
+	const DARKNESS_F ; 3
+NUM_DAYTIMES EQU const_value
 
 MORN     EQU 1 << MORN_F
 DAY      EQU 1 << DAY_F
 NITE     EQU 1 << NITE_F
 DARKNESS EQU 1 << DARKNESS_F
 
-; ScriptFlags: ; d434
+; wScriptFlags::
 SCRIPT_RUNNING EQU 2
 
-; ScriptMode: ; d437
-SCRIPT_OFF EQU 0
-SCRIPT_READ EQU 1
-SCRIPT_WAIT_MOVEMENT EQU 2
-SCRIPT_WAIT EQU 3
-
-; CurDay: ; d4cb
-SUNDAY    EQU 0
-MONDAY    EQU 1
-TUESDAY   EQU 2
-WEDNESDAY EQU 3
-THURSDAY  EQU 4
-FRIDAY    EQU 5
-SATURDAY  EQU 6
+; wScriptMode::
+	const_def
+	const SCRIPT_OFF
+	const SCRIPT_READ
+	const SCRIPT_WAIT_MOVEMENT
+	const SCRIPT_WAIT
 
-; MapObjects: ; d71e
+; wSpawnAfterChampion::
+SPAWN_LANCE EQU 1
+SPAWN_RED EQU 2
 
+; wCurDay:: ; d1f2
+	const_def
+	const SUNDAY    ; 0
+	const MONDAY    ; 1
+	const TUESDAY   ; 2
+	const WEDNESDAY ; 3
+	const THURSDAY  ; 4
+	const FRIDAY    ; 5
+	const SATURDAY  ; 6
+
+; wMapObjects:: ; d445
 PLAYER_OBJECT EQU 0
 NUM_OBJECTS   EQU 16
 
-; wStatusFlags::
-        const_def
-        const STATUSFLAGS_POKEDEX_F                  ; 0
-        const STATUSFLAGS_UNOWN_DEX_F                ; 1
-        const STATUSFLAGS_FLASH_F                    ; 2
-        const STATUSFLAGS_CAUGHT_POKERUS_F           ; 3
-        const STATUSFLAGS_ROCKET_SIGNAL_F            ; 4
-        const STATUSFLAGS_NO_WILD_ENCOUNTERS_F       ; 5
-        const STATUSFLAGS_HALL_OF_FAME_F             ; 6
-        const STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F ; 7
-
-; wStatusFlags2::
-        const_def
-        const STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F ; 0
-        const STATUSFLAGS2_SAFARI_GAME_F            ; 1
-        const STATUSFLAGS2_BUG_CONTEST_TIMER_F      ; 2
-        const STATUSFLAGS2_UNUSED_3_F               ; 3
-        const STATUSFLAGS2_BIKE_SHOP_CALL_F         ; 4
-        const STATUSFLAGS2_UNUSED_5_F               ; 5
-        const STATUSFLAGS2_REACHED_GOLDENROD_F      ; 6
-        const STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F    ; 7
-
-; wJohtoBadges: ; d57c
+; wStatusFlags:: ; d571
+	const_def
+	const STATUSFLAGS_POKEDEX_F                  ; 0
+	const STATUSFLAGS_UNOWN_DEX_F                ; 1
+	const STATUSFLAGS_FLASH_F                    ; 2
+	const STATUSFLAGS_CAUGHT_POKERUS_F           ; 3
+	const STATUSFLAGS_ROCKET_SIGNAL_F            ; 4
+	const STATUSFLAGS_NO_WILD_ENCOUNTERS_F       ; 5
+	const STATUSFLAGS_HALL_OF_FAME_F             ; 6
+	const STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F ; 7
+
+; wStatusFlags2:: ; d572
+	const_def
+	const STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F ; 0
+	const STATUSFLAGS2_SAFARI_GAME_F            ; 1
+	const STATUSFLAGS2_BUG_CONTEST_TIMER_F      ; 2
+	const STATUSFLAGS2_UNUSED_3_F               ; 3
+	const STATUSFLAGS2_BIKE_SHOP_CALL_F         ; 4
+	const STATUSFLAGS2_UNUSED_5_F               ; 5
+	const STATUSFLAGS2_REACHED_GOLDENROD_F      ; 6
+	const STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F    ; 7
+
+; wJohtoBadges:: ; d57c
 	const_def
 	const ZEPHYRBADGE
 	const HIVEBADGE
@@ -150,10 +182,17 @@ NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES
 
 POKEGEAR_OBTAINED_F EQU 7
 
-; WhichRegisteredItem: ; d95b
+; wWhichRegisteredItem:: ; d680
 REGISTERED_POCKET EQU %11000000
 REGISTERED_NUMBER EQU %00111111
 
+; wPlayerState:: ; d682
+PLAYER_NORMAL    EQU 0
+PLAYER_BIKE      EQU 1
+PLAYER_SKATE     EQU 2
+PLAYER_SURF      EQU 4
+PLAYER_SURF_PIKA EQU 8
+
 ; wDayCareMan:: ; dc40
 DAYCAREMAN_HAS_MON_F         EQU 0
 DAYCAREMAN_MONS_COMPATIBLE_F EQU 5
@@ -164,27 +203,3 @@ DAYCARELADY_HAS_MON_F        EQU 0
 
 ; used with both wDayCareMan and wDayCareLady
 DAYCARE_INTRO_SEEN_F         EQU 7
-
-; PlayerState: ; d95d
-PLAYER_NORMAL    EQU 0
-PLAYER_BIKE      EQU 1
-PLAYER_SLIP      EQU 2
-PLAYER_SURF      EQU 4
-PLAYER_SURF_PIKA EQU 8
-
-; After-Champion Spawn
-SPAWN_LANCE EQU 1
-SPAWN_RED EQU 2
-
-; wPokemonWithdrawDepositParameter
-PC_WITHDRAW EQU 0
-PC_DEPOSIT EQU 1
-DAYCARE_WITHDRAW EQU 2
-DAYCARE_DEPOSIT EQU 3
-
-; wCurrentDexMode
-	const_def
-	const DEXMODE_NEW
-	const DEXMODE_OLD
-	const DEXMODE_ABC
-	const DEXMODE_UNOWN
diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm
index 2e5cec79..fa574d07 100644
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -433,10 +433,10 @@ StartMenu_Save:
 
 	call BufferScreen
 	farcall SaveMenu
-	jr nc, .asm_12919
+	jr nc, .asm_12ce0
 	ld a, 0
 	ret
-.asm_12919
+.asm_12ce0
 	ld a, 1
 	ret
 
@@ -460,13 +460,13 @@ StartMenu_Status:
 StartMenu_Pokedex:
 	ld a, [wPartyCount]
 	and a
-	jr z, .asm_12949
+	jr z, .asm_12de0
 
 	call FadeToMenu
 	farcall Pokedex
 	call CloseSubmenu
 
-.asm_12949
+.asm_12de0
 	ld a, 0
 	ret
 
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm
index e05fbb9d..579ae6f9 100755
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -33,7 +33,7 @@ Function1002d: ; 1002d (4:402d)
 	jr z, .asm_10060
 	cp PLAYER_BIKE
 	jr z, .asm_10044
-	cp PLAYER_SLIP
+	cp PLAYER_SKATE
 	jr z, .asm_10074
 .asm_10044
 	call Function102cb
diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm
index 71b86a8a..6cc65879 100644
--- a/engine/pokemon/mon_menu.asm
+++ b/engine/pokemon/mon_menu.asm
@@ -346,11 +346,11 @@ TakePartyItem:
 	call GetPartyItemLocation
 	ld a, [hl]
 	and a
-	jr z, .asm_12c8c
+	jr z, .asm_13053
 
 	ld [wCurItem], a
 	call ReceiveItemFromPokemon
-	jr nc, .asm_12c94
+	jr nc, .asm_1305b
 
 	farcall ItemIsMail
 	call GetPartyItemLocation
@@ -360,18 +360,18 @@ TakePartyItem:
 	call GetItemName
 	ld hl, PokemonTookItemText
 	call MenuTextboxBackup
-	jr .asm_12c9a
+	jr .asm_13061
 
-.asm_12c8c
+.asm_13053
 	ld hl, PokemonNotHoldingText
 	call MenuTextboxBackup
-	jr .asm_12c9a
+	jr .asm_13061
 
-.asm_12c94
+.asm_1305b
 	ld hl, ItemStorageFullText
 	call MenuTextboxBackup
 
-.asm_12c9a
+.asm_13061
 	ret
 
 GiveTakeItemMenuData:
diff --git a/wram.asm b/wram.asm
index ff178310..6a2ad8e6 100644
--- a/wram.asm
+++ b/wram.asm
@@ -9,21 +9,21 @@ SECTION "Audio RAM", WRAM0
 wMusic::
 
 ; nonzero if playing
-wMusicPlaying:: db ; c100
+wMusicPlaying:: db ; c000
 
 wChannels::
-wChannel1:: channel_struct wChannel1 ; c101
-wChannel2:: channel_struct wChannel2 ; c133
-wChannel3:: channel_struct wChannel3 ; c165
-wChannel4:: channel_struct wChannel4 ; c197
+wChannel1:: channel_struct wChannel1 ; c001
+wChannel2:: channel_struct wChannel2 ; c033
+wChannel3:: channel_struct wChannel3 ; c065
+wChannel4:: channel_struct wChannel4 ; c097
 
 wSFXChannels::
-wChannel5:: channel_struct wChannel5 ; c1c9
-wChannel6:: channel_struct wChannel6 ; c1fb
-wChannel7:: channel_struct wChannel7 ; c22d
-wChannel8:: channel_struct wChannel8 ; c25f
+wChannel5:: channel_struct wChannel5 ; c0c9
+wChannel6:: channel_struct wChannel6 ; c0fb
+wChannel7:: channel_struct wChannel7 ; c12d
+wChannel8:: channel_struct wChannel8 ; c15f
 
-	ds 1 ; c291
+	ds 1 ; c191
 
 wCurTrackDuty:: db
 wCurTrackVolumeEnvelope:: db
@@ -31,9 +31,9 @@ wCurTrackFrequency:: dw
 wUnusedBCDNumber:: db ; BCD value, dummied out
 wCurNoteDuration:: db ; used in MusicE0 and LoadNote
 
-wCurMusicByte:: db ; c298
-wCurChannel:: db ; c299
-wVolume:: ; c29a
+wCurMusicByte:: db ; c198
+wCurChannel:: db ; c199
+wVolume:: ; c19a
 ; corresponds to rNR50
 ; Channel control / ON-OFF / Volume (R/W)
 ;   bit 7 - Vin->SO2 ON/OFF
@@ -41,12 +41,12 @@ wVolume:: ; c29a
 ;   bit 3 - Vin->SO1 ON/OFF
 ;   bit 2-0 - SO1 output level (volume) (# 0-7)
 	db
-wSoundOutput:: ; c29b
+wSoundOutput:: ; c19b
 ; corresponds to rNR51
 ; bit 4-7: ch1-4 so2 on/off
 ; bit 0-3: ch1-4 so1 on/off
 	db
-wPitchSweep:: ; c29c
+wPitchSweep:: ; c19c
 ; corresponds to rNR10
 ; bit 7:   unused
 ; bit 4-6: sweep time
@@ -54,38 +54,38 @@ wPitchSweep:: ; c29c
 ; but 0-2: sweep shift
 	db
 
-wMusicID:: dw ; c29d
-wMusicBank:: db ; c29f
-wNoiseSampleAddress:: dw ; c2a0
-wNoiseSampleDelay:: db ; c2a2
-	ds 1 ; c2a3
-wMusicNoiseSampleSet:: db ; c2a4
-wSFXNoiseSampleSet:: db ; c2a5
+wMusicID:: dw ; c19d
+wMusicBank:: db ; c19f
+wNoiseSampleAddress:: dw ; c1a0
+wNoiseSampleDelay:: db ; c1a2
+	ds 1 ; c1a3
+wMusicNoiseSampleSet:: db ; c1a4
+wSFXNoiseSampleSet:: db ; c1a5
 
-wLowHealthAlarm:: ; c2a6
+wLowHealthAlarm:: ; c1a6
 ; bit 7: on/off
 ; bit 4: pitch
 ; bit 0-3: counter
 	db
 
-wMusicFade:: ; c2a7
+wMusicFade:: ; c1a7
 ; fades volume over x frames
 ; bit 7: fade in/out
 ; bit 0-5: number of frames for each volume level
 ; $00 = none (default)
 	db
-wMusicFadeCount:: db ; c2a8
-wMusicFadeID:: dw ; c2a9
+wMusicFadeCount:: db ; c1a8
+wMusicFadeID:: dw ; c1a9
 
 	ds 5
 
-wCryPitch:: dw ; c2b0
-wCryLength:: dw ; c2b2
+wCryPitch:: dw ; c1b0
+wCryLength:: dw ; c1b2
 
-wLastVolume:: db ; c2b4
-wUnusedMusicF9Flag:: db ; c2b5
+wLastVolume:: db ; c1b4
+wUnusedMusicF9Flag:: db ; c1b5
 
-wSFXPriority:: ; c2b6
+wSFXPriority:: ; c1b6
 ; if nonzero, turn off music when playing sfx
 	db
 
@@ -96,20 +96,20 @@ wChannel2JumpCondition:: db
 wChannel3JumpCondition:: db
 wChannel4JumpCondition:: db
 
-wStereoPanningMask:: db ; c2bc
+wStereoPanningMask:: db ; c1bc
 
-wCryTracks:: ; c2bd
+wCryTracks:: ; c1bd
 ; plays only in left or right track depending on what side the monster is on
 ; both tracks active outside of battle
 	db
 
 wSFXDuration:: db
-wCurSFX:: ; c2bf
+wCurSFX:: ; c1bf
 ; id of sfx currently playing
 	db
 wChannelsEnd::
 
-wMapMusic:: db ; c2c0
+wMapMusic:: db ; c1c0
 
 wDontPlayMapMusicOnReload:: db
 wMusicEnd::
@@ -117,15 +117,15 @@ wMusicEnd::
 
 SECTION "WRAM", WRAM0
 
-wLZAddress:: dw ; c2c2
-wLZBank::    db ; c2c4
+wLZAddress:: dw ; c1c2
+wLZBank::    db ; c1c4
 
-wBoxAlignment:: db ; c2c5
+wBoxAlignment:: db ; c1c5
 
-wInputType::        db ; c2c6
-wAutoInputAddress:: dw ; c2c7
-wAutoInputBank::    db ; c2c9
-wAutoInputLength::  db ; c2ca
+wInputType::        db ; c1c6
+wAutoInputAddress:: dw ; c1c7
+wAutoInputBank::    db ; c1c9
+wAutoInputLength::  db ; c1ca
 
 wDebugFlags:: ds 1 ; c1cb
 wGameLogicPaused:: ds 1 ; c1cc
@@ -2836,7 +2836,7 @@ wd14e:: ds 1 ; d14e
 wWildMon:: ds 1 ; d14f
 wd150:: ds 1 ; d150
 
-; d265 has many different short-term uses
+; d151 has many different short-term uses
 wNamedObjectIndexBuffer::
 wDeciramBuffer::
 wTempByteValue::
@@ -2947,7 +2947,7 @@ wTextboxFlags:: ; d19c
 ; bit 0: 1-frame text delay
 ; bit 1: when unset, no text delay
 	ds 1
-wGBPrinter:: ; d19d
+wGBPrinterBrightness:: ; d19d
 ; bit 0-6: brightness
 ;   lightest: $00
 ;   lighter:  $20