Merge branch 'master' of https://github.com/pret/pokered

12 files changed, 238 insertions, 65 deletions

diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm
index 5cecedf3..2932f119 100644
--- a/constants/audio_constants.asm
+++ b/constants/audio_constants.asm
@@ -76,3 +76,11 @@ DEF HW_CH4_DISABLE_MASK EQU (~HW_CH4_ENABLE_MASK & $ff)
 
 ; wChannelFlags2 constant (only has one flag)
 DEF BIT_EXECUTE_MUSIC EQU 0 ; if in execute music
+
+; wMuteAudioAndPauseMusic
+DEF BIT_MUTE_AUDIO EQU 7
+
+; wLowHealthAlarm
+DEF BIT_LOW_HEALTH_ALARM EQU 7
+DEF LOW_HEALTH_TIMER_MASK EQU %01111111
+DEF DISABLE_LOW_HEALTH_ALARM EQU $ff
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
index 90f4c3d3..d945c927 100644
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -37,9 +37,6 @@ DEF MOVE_ACC    rb
 DEF MOVE_PP     rb
 DEF MOVE_LENGTH EQU _RS
 
-; D733 flags
-DEF BIT_TEST_BATTLE EQU 0
-
 ; battle type constants (wBattleType values)
 	const_def
 	const BATTLE_TYPE_NORMAL  ; 0
@@ -77,10 +74,14 @@ DEF MAX_STAT_VALUE EQU 999
 DEF ATKDEFDV_TRAINER EQU $98
 DEF SPDSPCDV_TRAINER EQU $88
 
+; wDamageMultipliers
+DEF BIT_STAB_DAMAGE EQU 7
+DEF EFFECTIVENESS_MASK EQU %01111111
+
 ; wPlayerBattleStatus1 or wEnemyBattleStatus1 bit flags
 	const_def
 	const STORING_ENERGY           ; 0 ; Bide
-	const THRASHING_ABOUT          ; 1 ; e.g. Thrash
+	const THRASHING_ABOUT          ; 1 ; Thrash, Petal Dance
 	const ATTACKING_MULTIPLE_TIMES ; 2 ; e.g. Double Kick, Fury Attack
 	const FLINCHED                 ; 3
 	const CHARGING_UP              ; 4 ; e.g. Solar Beam, Fly
@@ -97,11 +98,11 @@ DEF SPDSPCDV_TRAINER EQU $88
 	const HAS_SUBSTITUTE_UP   ; 4
 	const NEEDS_TO_RECHARGE   ; 5 ; Hyper Beam
 	const USING_RAGE          ; 6
-	const SEEDED              ; 7
+	const SEEDED              ; 7 ; Leech Seed
 
 ; wPlayerBattleStatus3 or wEnemyBattleStatus3 bit flags
 	const_def
-	const BADLY_POISONED      ; 0
+	const BADLY_POISONED      ; 0 ; Toxic
 	const HAS_LIGHT_SCREEN_UP ; 1
 	const HAS_REFLECT_UP      ; 2
 	const TRANSFORMED         ; 3
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm
index 7cb7322e..16f3b985 100644
--- a/constants/gfx_constants.asm
+++ b/constants/gfx_constants.asm
@@ -34,6 +34,12 @@ DEF TRANSFERBOTTOM EQU 2
 DEF REDRAW_COL EQU 1
 DEF REDRAW_ROW EQU 2
 
+; hUILayoutFlags
+	const_def
+	const BIT_PARTY_MENU_HP_BAR   ; 0
+	const BIT_DOUBLE_SPACED_MENU  ; 1
+	const BIT_SINGLE_SPACED_LINES ; 2
+
 ; tile list ids
 ; TileIDListPointerTable indexes (see data/tilemaps.asm)
 	const_def
diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm
index dc06a05d..d1dcdd69 100644
--- a/constants/hardware_constants.asm
+++ b/constants/hardware_constants.asm
@@ -82,8 +82,14 @@ DEF rWave_d           EQU $ff3d
 DEF rWave_e           EQU $ff3e
 DEF rWave_f           EQU $ff3f
 DEF rLCDC             EQU $ff40 ; LCD Control (R/W)
-DEF rLCDC_ENABLE      EQU 7
-DEF rLCDC_ENABLE_MASK EQU 1 << rLCDC_ENABLE
+DEF rLCDC_BG_PRIORITY    EQU 0
+DEF rLCDC_SPRITES_ENABLE EQU 1
+DEF rLCDC_SPRITE_SIZE    EQU 2
+DEF rLCDC_BG_TILEMAP     EQU 3
+DEF rLCDC_TILE_DATA      EQU 4
+DEF rLCDC_WINDOW_ENABLE  EQU 5
+DEF rLCDC_WINDOW_TILEMAP EQU 6
+DEF rLCDC_ENABLE         EQU 7
 DEF rSTAT             EQU $ff41 ; LCDC Status (R/W)
 DEF rSCY              EQU $ff42 ; Scroll Y (R/W)
 DEF rSCX              EQU $ff43 ; Scroll X (R/W)
@@ -112,3 +118,8 @@ DEF rSVBK             EQU $ff70 ; CGB Mode Only - WRAM Bank
 DEF rPCM12            EQU $ff76 ; Channels 1 & 2 Amplitude (R)
 DEF rPCM34            EQU $ff77 ; Channels 3 & 4 Amplitude (R)
 DEF rIE               EQU $ffff ; Interrupt Enable (R/W)
+DEF rIE_VBLANK EQU 0
+DEF rIE_LCD    EQU 1
+DEF rIE_TIMER  EQU 2
+DEF rIE_SERIAL EQU 3
+DEF rIE_JOYPAD EQU 4
diff --git a/constants/icon_constants.asm b/constants/icon_constants.asm
index f3c1b150..1a1ee100 100644
--- a/constants/icon_constants.asm
+++ b/constants/icon_constants.asm
@@ -1,18 +1,18 @@
 ; party menu icons
 ; used in MonPartySpritePointers (see data/icon_pointers.asm)
 	const_def
-	const ICON_MON       ; $0
-	const ICON_BALL      ; $1
-	const ICON_HELIX     ; $2
-	const ICON_FAIRY     ; $3
-	const ICON_BIRD      ; $4
-	const ICON_WATER     ; $5
-	const ICON_BUG       ; $6
-	const ICON_GRASS     ; $7
-	const ICON_SNAKE     ; $8
-	const ICON_QUADRUPED ; $9
-	const ICON_PIKACHU   ; $A
-
-DEF ICON_TRADEBUBBLE EQU $e
+	const ICON_MON         ; $0
+	const ICON_BALL        ; $1
+	const ICON_HELIX       ; $2
+	const ICON_FAIRY       ; $3
+	const ICON_BIRD        ; $4
+	const ICON_WATER       ; $5
+	const ICON_BUG         ; $6
+	const ICON_GRASS       ; $7
+	const ICON_SNAKE       ; $8
+	const ICON_QUADRUPED   ; $9
+	const ICON_PIKACHU     ; $a
+	const_skip 3
+	const ICON_TRADEBUBBLE ; $e
 
 DEF ICONOFFSET EQU $40 ; difference between alternating icon frames' tile IDs
diff --git a/constants/input_constants.asm b/constants/input_constants.asm
index f9070cba..68233dea 100644
--- a/constants/input_constants.asm
+++ b/constants/input_constants.asm
@@ -1,13 +1,13 @@
 ; joypad buttons
 	const_def
-	const BIT_A_BUTTON
-	const BIT_B_BUTTON
-	const BIT_SELECT
-	const BIT_START
-	const BIT_D_RIGHT
-	const BIT_D_LEFT
-	const BIT_D_UP
-	const BIT_D_DOWN
+	const BIT_A_BUTTON ; 0
+	const BIT_B_BUTTON ; 1
+	const BIT_SELECT   ; 2
+	const BIT_START    ; 3
+	const BIT_D_RIGHT  ; 4
+	const BIT_D_LEFT   ; 5
+	const BIT_D_UP     ; 6
+	const BIT_D_DOWN   ; 7
 
 DEF NO_INPUT EQU 0
 DEF A_BUTTON EQU 1 << BIT_A_BUTTON
diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm
index 377edcea..3b17c6ae 100644
--- a/constants/map_object_constants.asm
+++ b/constants/map_object_constants.asm
@@ -40,9 +40,16 @@ DEF SPRITESTATEDATA2_LENGTH EQU const_value
 
 DEF NUM_SPRITESTATEDATA_STRUCTS EQU 16
 
+	const_def 6
+	const BIT_TRAINER ; 6
+	const BIT_ITEM    ; 7
+
 ; different kinds of people events
-DEF ITEM    EQU $80
-DEF TRAINER EQU $40
+DEF TRAINER EQU 1 << BIT_TRAINER
+DEF ITEM    EQU 1 << BIT_ITEM
+
+; movement status
+DEF BIT_FACE_PLAYER EQU 7
 
 DEF WALK EQU $FE
 DEF STAY EQU $FF
diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm
index f1f0d417..a6e035e7 100644
--- a/constants/menu_constants.asm
+++ b/constants/menu_constants.asm
@@ -44,6 +44,9 @@ DEF PC_ITEM_CAPACITY  EQU 50
 	const NO_YES_MENU       ; 7
 DEF NUM_TWO_OPTION_MENUS EQU const_value
 
+; wTwoOptionMenuID
+DEF BIT_SECOND_MENU_OPTION_DEFAULT EQU 7
+
 ; menu exit method constants for list menus and the buy/sell/quit menu
 DEF CHOSE_MENU_ITEM   EQU 1 ; pressed A
 DEF CANCELLED_MENU    EQU 2 ; pressed B
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index a230b3d7..3562042b 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -7,15 +7,3 @@ DEF TRUE  EQU 1
 	const FLAG_RESET ; 0
 	const FLAG_SET   ; 1
 	const FLAG_TEST  ; 2
-
-; wOptions
-DEF TEXT_DELAY_FAST   EQU %001 ; 1
-DEF TEXT_DELAY_MEDIUM EQU %011 ; 3
-DEF TEXT_DELAY_SLOW   EQU %101 ; 5
-
-	const_def 6
-	const BIT_BATTLE_SHIFT     ; 6
-	const BIT_BATTLE_ANIMATION ; 7
-
-; wd732 flags
-DEF BIT_DEBUG_MODE EQU 1
diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm
index 0c9a3c72..d0ae3157 100644
--- a/constants/oam_constants.asm
+++ b/constants/oam_constants.asm
@@ -1,14 +1,20 @@
-; OAM flags used by this game
-DEF OAMFLAG_ENDOFDATA   EQU %00000001 ; pseudo OAM flag, only used by game logic
-DEF OAMFLAG_CANBEMASKED EQU %00000010 ; pseudo OAM flag, only used by game logic
+; Pseudo-OAM flags used by game logic
+	const_def
+	const BIT_END_OF_OAM_DATA    ; 0
+	const BIT_SPRITE_UNDER_GRASS ; 1
+
+; Used in SpriteFacingAndAnimationTable (see data/sprites/facings.asm)
+DEF FACING_END  EQU 1 << BIT_END_OF_OAM_DATA
+DEF UNDER_GRASS EQU 1 << BIT_SPRITE_UNDER_GRASS
 
 ; OAM attribute flags
-DEF OAM_PALETTE   EQU %111
-DEF OAM_TILE_BANK EQU 3
-DEF OAM_OBP_NUM   EQU 4 ; Non CGB Mode Only
-DEF OAM_X_FLIP    EQU 5
-DEF OAM_Y_FLIP    EQU 6
-DEF OAM_PRIORITY  EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3)
+DEF OAM_PALETTE EQU %111
+	const_def 3
+	const OAM_TILE_BANK ; 3
+	const OAM_OBP_NUM   ; 4 ; Non CGB Mode Only
+	const OAM_X_FLIP    ; 5
+	const OAM_Y_FLIP    ; 6
+	const OAM_PRIORITY  ; 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3)
 
 ; OAM attribute masks
 DEF OAM_HIGH_PALS EQU 1 << 2            ; palettes %100-%111 are OBP1
diff --git a/constants/ram_constants.asm b/constants/ram_constants.asm
new file mode 100644
index 00000000..c054b542
--- /dev/null
+++ b/constants/ram_constants.asm
@@ -0,0 +1,156 @@
+; wSlotMachineFlags
+	const_def 6
+	const BIT_SLOTS_CAN_WIN               ; 6
+	const BIT_SLOTS_CAN_WIN_WITH_7_OR_BAR ; 7
+
+; wMiscFlags
+	const_def
+	const BIT_SEEN_BY_TRAINER      ; 0
+	const BIT_BOULDER_DUST         ; 1
+	const BIT_TURNING              ; 2
+	const BIT_USING_GENERIC_PC     ; 3
+	const BIT_NO_SPRITE_UPDATES    ; 4
+	const BIT_NO_MENU_BUTTON_SOUND ; 5
+	const BIT_TRIED_PUSH_BOULDER   ; 6
+	const BIT_PUSHED_BOULDER       ; 7
+
+; wAutoTextBoxDrawingControl
+DEF BIT_NO_AUTO_TEXT_BOX EQU 0
+
+; wTextPredefFlag
+DEF BIT_TEXT_PREDEF EQU 0
+
+; wFontLoaded
+DEF BIT_FONT_LOADED EQU 0
+
+; wCurrentMapScriptFlags
+	const_def 5
+	const BIT_CUR_MAP_LOADED_1 ; 5
+	const BIT_CUR_MAP_LOADED_2 ; 6
+	const BIT_CUR_MAP_USED_ELEVATOR ; 7
+
+; wOptions
+DEF TEXT_DELAY_MASK EQU %000111
+DEF SOUND_MASK      EQU %110000
+	const_def 6
+	const BIT_BATTLE_SHIFT     ; 6
+	const BIT_BATTLE_ANIMATION ; 7
+
+DEF TEXT_DELAY_FAST   EQU %001 ; 1
+DEF TEXT_DELAY_MEDIUM EQU %011 ; 3
+DEF TEXT_DELAY_SLOW   EQU %101 ; 5
+
+; wLetterPrintingDelayFlags
+	const_def
+	const BIT_FAST_TEXT_DELAY ; 0
+	const BIT_TEXT_DELAY      ; 1
+
+; wCurMapTileset
+DEF BIT_NO_PREVIOUS_MAP EQU 7
+
+; wCurrentBoxNum
+DEF BIT_HAS_CHANGED_BOXES EQU 7
+
+; wObtainedBadges, wBeatGymFlags
+	const_def
+	const BIT_BOULDERBADGE ; 0
+	const BIT_CASCADEBADGE ; 1
+	const BIT_THUNDERBADGE ; 2
+	const BIT_RAINBOWBADGE ; 3
+	const BIT_SOULBADGE    ; 4
+	const BIT_MARSHBADGE   ; 5
+	const BIT_VOLCANOBADGE ; 6
+	const BIT_EARTHBADGE   ; 7
+DEF NUM_BADGES EQU const_value
+
+; wStatusFlags1
+	const_def
+	const BIT_STRENGTH_ACTIVE           ; 0
+	const BIT_SURF_ALLOWED              ; 1
+	const_skip                          ; 2 ; unused
+	const BIT_GOT_OLD_ROD               ; 3
+	const BIT_GOT_GOOD_ROD              ; 4
+	const BIT_GOT_SUPER_ROD             ; 5
+	const BIT_GAVE_SAFFRON_GUARDS_DRINK ; 6
+	const BIT_UNUSED_CARD_KEY           ; 7
+
+; wStatusFlags2
+	const_def
+	const BIT_WILD_ENCOUNTER_COOLDOWN ; 0
+	const BIT_NO_AUDIO_FADE_OUT       ; 1
+
+; wStatusFlags3
+	const_def
+	const BIT_INIT_TRADE_CENTER_FACING ; 0
+	const_skip 2                       ; 1-2 ; unused
+	const BIT_WARP_FROM_CUR_SCRIPT     ; 3
+	const BIT_ON_DUNGEON_WARP          ; 4
+	const BIT_NO_NPC_FACE_PLAYER       ; 5
+	const BIT_TALKED_TO_TRAINER        ; 6
+	const BIT_PRINT_END_BATTLE_TEXT    ; 7
+
+; wStatusFlags4
+	const_def
+	const BIT_GOT_LAPRAS              ; 0
+	const BIT_UNKNOWN_4_1             ; 1
+	const BIT_USED_POKECENTER         ; 2
+	const BIT_GOT_STARTER             ; 3
+	const BIT_NO_BATTLES              ; 4
+	const BIT_BATTLE_OVER_OR_BLACKOUT ; 5
+	const BIT_LINK_CONNECTED          ; 6
+	const BIT_INIT_SCRIPTED_MOVEMENT  ; 7
+
+; wStatusFlags5
+	const_def
+	const BIT_SCRIPTED_NPC_MOVEMENT   ; 0
+	const BIT_UNKNOWN_5_1             ; 1
+	const BIT_UNKNOWN_5_2             ; 2
+	const_skip                        ; 3 ; unused
+	const BIT_UNKNOWN_5_4             ; 4
+	const BIT_DISABLE_JOYPAD          ; 5
+	const BIT_NO_TEXT_DELAY           ; 6
+	const BIT_SCRIPTED_MOVEMENT_STATE ; 7
+
+; wStatusFlags6
+	const_def
+	const BIT_GAME_TIMER_COUNTING ; 0
+	const BIT_DEBUG_MODE          ; 1
+	const BIT_FLY_OR_DUNGEON_WARP ; 2
+	const BIT_FLY_WARP            ; 3
+	const BIT_DUNGEON_WARP        ; 4
+	const BIT_ALWAYS_ON_BIKE      ; 5
+	const BIT_ESCAPE_WARP         ; 6
+
+; wStatusFlags7
+	const_def
+	const BIT_TEST_BATTLE        ; 0
+	const BIT_NO_MAP_MUSIC       ; 1
+	const BIT_FORCED_WARP        ; 2
+	const BIT_TRAINER_BATTLE     ; 3
+	const BIT_USE_CUR_MAP_SCRIPT ; 4
+	const_skip 2                 ; 5-6 ; unused
+	const BIT_USED_FLY           ; 7
+
+; wElite4Flags
+	const_def
+	const BIT_UNUSED_BEAT_ELITE_4 ; 0
+	const BIT_STARTED_ELITE_4     ; 1
+
+; wMovementFlags
+	const_def
+	const BIT_STANDING_ON_DOOR ; 0
+	const BIT_EXITING_DOOR     ; 1
+	const BIT_STANDING_ON_WARP ; 2
+	const_skip 3               ; 3-5 ; unused
+	const BIT_LEDGE_OR_FISHING ; 6
+	const BIT_SPINNING         ; 7
+
+; hFindPathFlags
+	const_def
+	const BIT_PATH_FOUND_Y ; 0
+	const BIT_PATH_FOUND_X ; 1
+
+; hNPCPlayerRelativePosFlags
+	const_def
+	const BIT_PLAYER_LOWER_Y ; 0
+	const BIT_PLAYER_LOWER_X ; 1
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index 005fbb14..56aee78f 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -44,19 +44,6 @@ DEF NUM_NPC_TRADES EQU const_value
 	const TRADE_DIALOGSET_EVOLUTION
 	const TRADE_DIALOGSET_HAPPY
 
-; badges
-; wObtainedBadges and wBeatGymFlags bits
-	const_def
-	const BIT_BOULDERBADGE ; 0
-	const BIT_CASCADEBADGE ; 1
-	const BIT_THUNDERBADGE ; 2
-	const BIT_RAINBOWBADGE ; 3
-	const BIT_SOULBADGE    ; 4
-	const BIT_MARSHBADGE   ; 5
-	const BIT_VOLCANOBADGE ; 6
-	const BIT_EARTHBADGE   ; 7
-DEF NUM_BADGES EQU const_value
-
 ; OaksAideScript results
 DEF OAKS_AIDE_BAG_FULL        EQU $00
 DEF OAKS_AIDE_GOT_ITEM        EQU $01