Merge pull request #30 from entrpntr/spring-cleaning

Spring Cleaning

1 files changed, 194 insertions, 91 deletions

diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 7cdebc05..0c4e6662 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:: ; c6d4
+	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,10 @@ 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 +36,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
+	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::
+; 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 +78,134 @@ 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
+FACE_DOWN    EQU 8
+FACE_UP      EQU 4
+FACE_LEFT    EQU 2
+FACE_RIGHT   EQU 1
+
+; wPokemonWithdrawDepositParameter:: ; d008
+PC_WITHDRAW       EQU 0
+PC_DEPOSIT        EQU 1
+REMOVE_PARTY      EQU 0
+REMOVE_BOX        EQU 1
+DAY_CARE_WITHDRAW EQU 2
+DAY_CARE_DEPOSIT  EQU 3
+
+; wPlayerStepFlags:: ; ce85
+	const_def 4
+	const PLAYERSTEP_MIDAIR_F   ; 4
+	const PLAYERSTEP_CONTINUE_F ; 5
+	const PLAYERSTEP_STOP_F     ; 6
+	const PLAYERSTEP_START_F    ; 7
+
+; wInitListType:: ; d14e
+INIT_ENEMYOT_LIST    EQU 1
+INIT_BAG_ITEM_LIST   EQU 2
+INIT_OTHER_ITEM_LIST EQU 3
+INIT_PLAYEROT_LIST   EQU 4
+INIT_MON_LIST        EQU 5
 
-; TimeOfDay: ; d269
-MORN_F     EQU 0
-DAY_F      EQU 1
-NITE_F     EQU 2
-DARKNESS_F 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
+ANYTIME EQU MORN | DAY | NITE
+
+; wBattleAnimFlags:: ; ca0f
+	const_def
+	const BATTLEANIM_STOP_F          ; 0
+	const BATTLEANIM_IN_SUBROUTINE_F ; 1
+	const BATTLEANIM_IN_LOOP_F       ; 2
+	const BATTLEANIM_KEEPSPRITES_F   ; 3
+
+; wPlayerSpriteSetupFlags:: ; d182
+PLAYERSPRITESETUP_FACING_MASK       EQU %11
+PLAYERSPRITESETUP_FEMALE_TO_MALE_F  EQU 2
+PLAYERSPRITESETUP_CUSTOM_FACING_F   EQU 5
+PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F EQU 6
+PLAYERSPRITESETUP_RESET_ACTION_F    EQU 7
+
+; wMapStatus:: ; d159
+	const_def
+	const MAPSTATUS_START  ; 0
+	const MAPSTATUS_ENTER  ; 1
+	const MAPSTATUS_HANDLE ; 2
+	const MAPSTATUS_DONE   ; 3
+
+; wMapEventStatus:: ; d15a
+	const_def
+	const MAPEVENTS_ON  ; 0
+	const MAPEVENTS_OFF ; 1
+
+; wScriptFlags:: ; d15b
 SCRIPT_RUNNING EQU 2
 
-; ScriptMode: ; d437
-SCRIPT_OFF EQU 0
-SCRIPT_READ EQU 1
-SCRIPT_WAIT_MOVEMENT EQU 2
-SCRIPT_WAIT EQU 3
+; wScriptMode:: ; d15e
+	const_def
+	const SCRIPT_OFF
+	const SCRIPT_READ
+	const SCRIPT_WAIT_MOVEMENT
+	const SCRIPT_WAIT
 
-; CurDay: ; d4cb
-SUNDAY    EQU 0
-MONDAY    EQU 1
-TUESDAY   EQU 2
-WEDNESDAY EQU 3
-THURSDAY  EQU 4
-FRIDAY    EQU 5
-SATURDAY  EQU 6
+; wSpawnAfterChampion:: ; d1db
+SPAWN_LANCE EQU 1
+SPAWN_RED   EQU 2
 
-; MapObjects: ; d71e
+; 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
+
+; 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
+
+; wMomSavingMoney:: ; d579
+MOM_SAVING_SOME_MONEY_F EQU 0
+MOM_SAVING_HALF_MONEY_F EQU 1
+MOM_SAVING_ALL_MONEY_F  EQU 2
+MOM_ACTIVE_F            EQU 7
+
+MOM_SAVING_MONEY_MASK EQU (1 << MOM_SAVING_SOME_MONEY_F) | (1 << MOM_SAVING_HALF_MONEY_F) | (1 << MOM_SAVING_ALL_MONEY_F)
+
+; wJohtoBadges:: ; d57c
 	const_def
 	const ZEPHYRBADGE
 	const HIVEBADGE
@@ -135,7 +217,7 @@ NUM_OBJECTS   EQU 16
 	const RISINGBADGE
 NUM_JOHTO_BADGES EQU const_value
 
-; wKantoBadges:: ds 1 ; d57d
+; wKantoBadges:: ; d57d
 	const_def
 	const BOULDERBADGE
 	const CASCADEBADGE
@@ -148,10 +230,55 @@ NUM_JOHTO_BADGES EQU const_value
 NUM_KANTO_BADGES EQU const_value
 NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES
 
-; WhichRegisteredItem: ; d95b
+; wPokegearFlags:: ; d67c
+	const_def
+	const POKEGEAR_MAP_CARD_F   ; 0
+	const POKEGEAR_RADIO_CARD_F ; 1
+	const POKEGEAR_PHONE_CARD_F ; 2
+	const POKEGEAR_EXPN_CARD_F  ; 3
+
+POKEGEAR_OBTAINED_F EQU 7
+
+; 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
+
+; wBikeFlags:: ; d93f
+	const_def
+	const BIKEFLAGS_STRENGTH_ACTIVE_F ; 0
+	const BIKEFLAGS_ALWAYS_ON_BIKE_F  ; 1
+	const BIKEFLAGS_DOWNHILL_F        ; 2
+
+; wDailyFlags1:: ; d968
+	const_def
+	const DAILYFLAGS1_KURT_MAKING_BALLS_F             ; 0
+	const DAILYFLAGS1_BUG_CONTEST_F                   ; 1
+	const DAILYFLAGS1_SWARM_F                         ; 2
+	const DAILYFLAGS1_TIME_CAPSULE_F                  ; 3
+	const DAILYFLAGS1_ALL_FRUIT_TREES_F               ; 4
+	const DAILYFLAGS1_GOT_SHUCKIE_TODAY_F             ; 5
+	const DAILYFLAGS1_GOLDENROD_UNDERGROUND_BARGAIN_F ; 6
+	const DAILYFLAGS1_TRAINER_HOUSE_F                 ; 7
+
+; wDailyFlags2:: ; d969
+	const_def
+	const DAILYFLAGS2_MT_MOON_SQUARE_CLEFAIRY_F           ; 0
+	const DAILYFLAGS2_UNION_CAVE_LAPRAS_F                 ; 1
+	const DAILYFLAGS2_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F ; 2
+	const DAILYFLAGS2_GOLDENROD_DEPT_STORE_TM27_RETURN_F  ; 3
+	const DAILYFLAGS2_DAISYS_GROOMING_F                   ; 4
+	const DAILYFLAGS2_INDIGO_PLATEAU_RIVAL_FIGHT_F        ; 5
+
+; wLuckyNumberShowFlag:: ; d9e7
+LUCKYNUMBERSHOW_GAME_OVER_F EQU 0
+
 ; wDayCareMan:: ; dc40
 DAYCAREMAN_HAS_MON_F         EQU 0
 DAYCAREMAN_MONS_COMPATIBLE_F EQU 5
@@ -160,29 +287,5 @@ DAYCAREMAN_HAS_EGG_F         EQU 6
 ; wDayCareLady:: ; dc77
 DAYCARELADY_HAS_MON_F        EQU 0
 
-; used with both wDayCareMan and wDayCareLady
+; shared flag between 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