Newbox Integration

Author: Dakorias

charmap.asm constants/charmap.asm

@@ -125,6 +125,17 @@ DEF rLCDC_WINDOW_TILEMAP EQU 6     ; 0=9800-9BFF, 1=9C00-9FFF
 DEF rLCDC_ENABLE         EQU 7     ; 0=Off, 1=On
 DEF LCDC_DEFAULT         EQU (1 << rLCDC_ENABLE) | (1 << rLCDC_WINDOW_TILEMAP) | (1 << rLCDC_WINDOW_ENABLE) | (1 << rLCDC_SPRITES_ENABLE) | (1 << rLCDC_BG_PRIORITY)
 DEF rSTAT                EQU $ff41 ; LCDC Status (R/W)
+DEF rSTAT_INT_LYC        EQU 6 ; LYC=LY interrupt
+DEF rSTAT_INT_MODE_2     EQU 5 ; Mode 2 interrupt (OAM search)
+DEF rSTAT_INT_MODE_1     EQU 4 ; Mode 1 interrupt (VBlank)
+DEF rSTAT_INT_MODE_0     EQU 3 ; Mode 0 interrupt (HBlank)
+DEF rSTAT_LYC_CMP        EQU 2 ; LYC=LY flag
+DEF rSTAT_MODE_0         EQU %00 ; HBlank
+DEF rSTAT_MODE_1         EQU %01 ; VBlank
+DEF rSTAT_MODE_2         EQU %10 ; Searching OAM
+DEF rSTAT_MODE_3         EQU %11 ; Transferring data to LCD
+DEF rSTAT_MODE_MASK      EQU %11
+DEF rSTAT_INT_DEFAULT    EQU rSTAT_INT_MODE_0
 DEF rSCY                 EQU $ff42 ; Scroll Y (R/W)
 DEF rSCX                 EQU $ff43 ; Scroll X (R/W)
 DEF rLY                  EQU $ff44 ; LCDC Y-Coordinate (R)

constants/hardware_constants.asm

@@ -0,0 +1,34 @@
+; pc themes (see data/pc/theme_names.asm)
+	const_def
+	const THEME_POKEDEX
+	const THEME_POKEGEAR_M
+	const THEME_POKEGEAR_F
+	const THEME_PACK_M
+	const THEME_PACK_F
+	const THEME_TRAINER_CARD_M
+	const THEME_TRAINER_CARD_F
+	const THEME_NORMAL
+	const THEME_FIGHTING
+	const THEME_FLYING
+	const THEME_POISON
+	const THEME_GROUND
+	const THEME_ROCK
+	const THEME_BUG
+	const THEME_GHOST
+	const THEME_STEEL
+	const THEME_FIRE
+	const THEME_WATER
+	const THEME_GRASS
+	const THEME_ELECTRIC
+	const THEME_PSYCHIC
+	const THEME_ICE
+	const THEME_DRAGON
+	const THEME_DARK
+DEF NUM_BILLS_PC_THEMES EQU const_value
+
+; sprite animation parameters
+DEF PCANIM_STATIC      EQU  0 ; used when holding stuff, we don't want to bop then
+DEF PCANIM_ANIMATE     EQU 90 ; baseline
+DEF PCANIM_PICKUP      EQU 91 ; we're picking up/placing down something
+DEF PCANIM_PICKUP_NEXT EQU 98 ; cursor is at the bottom, ready for pickup
+DEF PCANIM_QUICKFRAMES EQU  9

constants/pc_constants.asm

@@ -112,6 +112,40 @@ DEF MON_SAT                rw
 DEF MON_SDF                rw
 DEF PARTYMON_STRUCT_LENGTH EQU _RS
 
+; savemon_struct members (see macros/wram.asm)
+rsreset
+DEF SAVEMON_SPECIES            rb
+DEF SAVEMON_ITEM               rb
+DEF SAVEMON_MOVES              rb NUM_MOVES
+DEF SAVEMON_ID                 rw
+DEF SAVEMON_EXP                rb 3
+DEF SAVEMON_STAT_EXP           rw NUM_EXP_STATS
+rsset SAVEMON_STAT_EXP
+DEF SAVEMON_HP_EXP             rw
+DEF SAVEMON_ATK_EXP            rw
+DEF SAVEMON_DEF_EXP            rw
+DEF SAVEMON_SPD_EXP            rw
+DEF SAVEMON_SPC_EXP            rw
+DEF SAVEMON_DVS                rw
+; savemon_struct is identical to party_struct before this point
+DEF SAVEMON_PP_UPS             rb
+; savemon_struct is shifted from party_struct beyond this point
+DEF SAVEMON_HAPPINESS          rb
+DEF SAVEMON_PKRUS              rb
+DEF SAVEMON_CAUGHTDATA         rw
+rsset SAVEMON_CAUGHTDATA
+DEF SAVEMON_CAUGHTTIME         rb
+DEF SAVEMON_CAUGHTGENDER       rb
+rsset SAVEMON_CAUGHTDATA
+DEF SAVEMON_CAUGHTLEVEL        rb
+DEF SAVEMON_CAUGHTLOCATION     rb
+DEF SAVEMON_LEVEL              rb
+; savemon_struct is different from party_struct beyond this point
+DEF SAVEMON_ALTSPECIES         rb
+DEF SAVEMON_NICKNAME           rb MON_NAME_LENGTH - 1
+DEF SAVEMON_OT                 rb PLAYER_NAME_LENGTH - 1
+DEF SAVEMON_STRUCT_LENGTH EQU _RS
+
 DEF NICKNAMED_MON_STRUCT_LENGTH EQU PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH
 DEF REDMON_STRUCT_LENGTH EQU 44
 
@@ -136,9 +170,10 @@ DEF PARTY_LENGTH EQU 6
 
 ; boxes
 DEF MONS_PER_BOX EQU 20
-; box: count, species, mons, OTs, nicknames, padding
-DEF BOX_LENGTH EQU 1 + MONS_PER_BOX + 1 + (BOXMON_STRUCT_LENGTH + NAME_LENGTH + MON_NAME_LENGTH) * MONS_PER_BOX + 2 ; $450
-DEF NUM_BOXES EQU 14
+
+DEF MONDB_ENTRIES   EQU 174
+DEF MIN_MONDB_SLACK EQU 10
+DEF NUM_BOXES       EQU (MONDB_ENTRIES * 2 - MIN_MONDB_SLACK) / MONS_PER_BOX ; 16
 
 ; hall of fame
 ; hof_mon: species, id, dvs, level, nicknames

constants/pokemon_data_constants.asm

@@ -80,6 +80,11 @@ DEF NUM_SPRITEANIMDICT_ENTRIES EQU 10
 	const SPRITE_ANIM_INDEX_INTRO_UNOWN_F             ; 2a
 	const SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY        ; 2b
 	const SPRITE_ANIM_INDEX_CELEBI                    ; 2c
+	const SPRITE_ANIM_INDEX_PC_CURSOR                 ; 2d
+	const SPRITE_ANIM_INDEX_PC_QUICK                  ; 2e
+	const SPRITE_ANIM_INDEX_PC_MODE                   ; 2f
+	const SPRITE_ANIM_INDEX_PC_MODE2                  ; 30
+	const SPRITE_ANIM_INDEX_PC_PACK                   ; 31
 DEF NUM_SPRITE_ANIM_INDEXES EQU const_value
 
 ; DoAnimFrame.Jumptable indexes (see engine/gfx/sprite_anims.asm)
@@ -119,6 +124,10 @@ DEF NUM_SPRITE_ANIM_INDEXES EQU const_value
 	const SPRITE_ANIM_SEQ_INTRO_UNOWN               ; 20
 	const SPRITE_ANIM_SEQ_INTRO_UNOWN_F             ; 21
 	const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY        ; 22
+	const SPRITE_ANIM_SEQ_PC_CURSOR                 ; 23
+	const SPRITE_ANIM_SEQ_PC_QUICK                  ; 24
+	const SPRITE_ANIM_SEQ_PC_MODE                   ; 25
+	const SPRITE_ANIM_SEQ_PC_PACK                   ; 26
 DEF NUM_SPRITE_ANIM_SEQS EQU const_value
 
 ; SpriteAnimFrameData indexes (see data/sprite_anims/framesets.asm)
@@ -189,6 +198,12 @@ DEF NUM_SPRITE_ANIM_SEQS EQU const_value
 	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F             ; 3f
 	const SPRITE_ANIM_FRAMESET_CELEBI_LEFT               ; 40
 	const SPRITE_ANIM_FRAMESET_CELEBI_RIGHT              ; 41
+	const SPRITE_ANIM_FRAMESET_PC_CURSOR                 ; 42
+	const SPRITE_ANIM_FRAMESET_PC_CURSOR_ITEM            ; 43
+	const SPRITE_ANIM_FRAMESET_PC_QUICK                  ; 44
+	const SPRITE_ANIM_FRAMESET_PC_MODE                   ; 45
+	const SPRITE_ANIM_FRAMESET_PC_MODE2                  ; 46
+	const SPRITE_ANIM_FRAMESET_PC_PACK                   ; 47
 DEF NUM_SPRITE_ANIM_FRAMESETS EQU const_value
 
 ; SpriteAnimOAMData indexes (see data/sprite_anims/oam.asm)
@@ -335,4 +350,10 @@ DEF NUM_SPRITE_ANIM_FRAMESETS EQU const_value
 	const SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_11           ; 8b
 	const SPRITE_ANIM_OAMSET_PARTY_MON_1                 ; 8c
 	const SPRITE_ANIM_OAMSET_PARTY_MON_2                 ; 8d
+	const SPRITE_ANIM_OAMSET_PC_CURSOR                   ; 8e
+	const SPRITE_ANIM_OAMSET_PC_CURSOR_ITEM              ; 8f
+	const SPRITE_ANIM_OAMSET_PC_QUICK                    ; 90
+	const SPRITE_ANIM_OAMSET_PC_MODE                     ; 91
+	const SPRITE_ANIM_OAMSET_PC_MODE2                    ; 92
+	const SPRITE_ANIM_OAMSET_PC_PACK                     ; 93
 DEF NUM_SPRITE_ANIM_OAMSETS EQU const_value

constants/sprite_anim_constants.asm

@@ -50,3 +50,8 @@ DEF FIRST_HIRAGANA_DAKUTEN_CHAR EQU $20
 
 ; gfx/font/unown_font.png
 DEF FIRST_UNOWN_CHAR EQU $40
+
+; gfx/font/vwf.png
+DEF FIRST_VWF_CHAR    EQU " " ; first printable character
+DEF LAST_VWF_CHAR     EQU "9" ; last printable character
+DEF FAILSAFE_VWF_CHAR EQU "."

constants/text_constants.asm

@@ -20,6 +20,7 @@ DEF AUTO_INPUT EQU $ff
 	const BOXMON     ; 2
 	const TEMPMON    ; 3
 	const WILDMON    ; 4
+	const BUFFERMON  ; 5
 
 ; wGameTimerPaused::
 DEF GAME_TIMER_PAUSED_F EQU 0

constants/wram_constants.asm

@@ -4,7 +4,7 @@ ItemNames::
 	li "ULTRA BALL"
 	li "BRIGHTPOWDER"
 	li "GREAT BALL"
-	li "# BALL"
+	li "POKé BALL"
 	li "TOWN MAP"
 	li "BICYCLE"
 	li "MOON STONE"
@@ -36,7 +36,7 @@ ItemNames::
 	li "LEAF STONE"
 	li "METAL POWDER"
 	li "NUGGET"
-	li "# DOLL"
+	li "POKé DOLL"
 	li "FULL HEAL"
 	li "REVIVE"
 	li "MAX REVIVE"

data/items/names.asm

@@ -0,0 +1,31 @@
+BadEgg:
+; Failsafe if there is a checksum error
+	db BULBASAUR
+	db NO_ITEM
+	db POUND, NO_MOVE, NO_MOVE, NO_MOVE
+	dw 0 ; OT ID
+	db 0, 0, 0 ; Exp
+	; Stat exp
+	bigdw 0
+	bigdw 0
+	bigdw 0
+	bigdw 0
+	bigdw 0
+	dn 0, 0, 0, 0 ; DVs
+	db 0, 0, 0, 0 ; PP
+	db 255 ; Step cycles to hatch
+	db 0, 0, 0 ; Pokérus, Caught data
+	db EGG_LEVEL ; Level
+	db 0 ; Status
+	db 0 ; unused
+	bigdw 0 ; HP
+	bigdw 11 ; Max HP
+	bigdw 5 ; Atk
+	bigdw 5 ; Def
+	bigdw 5 ; Spd
+	bigdw 5 ; SAtk
+	bigdw 5 ; SDef
+	db EGG ; Alt species
+	db "BAD EGG@@@@" ; Nickname
+	db "?@@@@@@@@@@" ; OT name
+BadEggEnd:

data/pc/bad_egg.asm

@@ -0,0 +1,20 @@
+BillsPC_DefaultBoxThemes:
+	table_width 1, BillsPC_DefaultBoxThemes
+	db THEME_GRASS
+	db THEME_FIRE
+	db THEME_WATER
+	db THEME_ELECTRIC
+	db THEME_FIGHTING
+	db THEME_PSYCHIC
+	db THEME_NORMAL
+	db THEME_FLYING
+	db THEME_BUG
+	db THEME_POISON
+	db THEME_GROUND
+	db THEME_ROCK
+	db THEME_ICE
+	db THEME_GHOST
+	db THEME_DRAGON
+	db THEME_DARK
+	assert_table_length NUM_BOXES
+	db -1 ; end

data/pc/default_box_themes.asm

@@ -0,0 +1,52 @@
+BillsPC_ThemeNames:
+	table_width 2, BillsPC_ThemeNames
+	dw .Pokedex
+	dw .PokegearM
+	dw .PokegearF
+	dw .PackM
+	dw .PackF
+	dw .TrainerM
+	dw .TrainerF
+	dw .Normal
+	dw .Fighting
+	dw .Flying
+	dw .Poison
+	dw .Ground
+	dw .Rock
+	dw .Bug
+	dw .Ghost
+	dw .Steel
+	dw .Fire
+	dw .Water
+	dw .Grass
+	dw .Electric
+	dw .Psychic
+	dw .Ice
+	dw .Dragon
+	dw .Dark
+	assert_table_length NUM_BILLS_PC_THEMES
+
+.Pokedex:   db "#DEX@"
+.PokegearM: db "#GEAR♂@"
+.PokegearF: db "#GEAR♀@"
+.PackM:     db "PACK♂@"
+.PackF:     db "PACK♀@"
+.TrainerM:  db "TRAINER♂@"
+.TrainerF:  db "TRAINER♀@"
+.Normal:    db "NORMAL@"
+.Fighting:  db "FIGHTING@"
+.Flying:    db "FLYING@"
+.Poison:    db "POISON@"
+.Ground:    db "GROUND@"
+.Rock:      db "ROCK@"
+.Bug:       db "BUG@"
+.Ghost:     db "GHOST@"
+.Steel:     db "STEEL@"
+.Fire:      db "FIRE@"
+.Water:     db "WATER@"
+.Grass:     db "GRASS@"
+.Electric:  db "ELECTRIC@"
+.Psychic:   db "PSYCHIC@"
+.Ice:       db "ICE@"
+.Dragon:    db "DRAGON@"
+.Dark:      db "DARK@"

data/pc/theme_names.asm

@@ -17,7 +17,7 @@ INCLUDE "data/pokemon/evos_attacks_pointers.asm"
 EkansEvosAttacks:
 db EVOLVE_LEVEL, 26, ARBOK
 db 0 ; no more evolutions
-db 1, GUNK_SHOT
+db 1, POISON_STING
 db 1, LEER
 db 6, WRAP
 db 9, BITE

data/pokemon/evos_attacks.asm

@@ -15,7 +15,6 @@ PredefPointers::
 	add_predef FillPP
 	add_predef TryAddMonToParty
 	add_predef AddTempmonToParty
-	add_predef SendGetMonIntoFromBox
 	add_predef SendMonIntoBox
 	add_predef GiveEgg
 	add_predef AnimateHPBar

data/predef_pointers.asm

@@ -67,6 +67,12 @@ SpriteAnimFrameData:
 	dw .Frameset_IntroUnownF
 	dw .Frameset_CelebiLeft
 	dw .Frameset_CelebiRight
+	dw .Frameset_PCCursor
+	dw .Frameset_PCCursorItem
+	dw .Frameset_PCQuick
+	dw .Frameset_PCMode
+	dw .Frameset_PCMode2
+	dw .Frameset_PCPack
 	assert_table_length NUM_SPRITE_ANIM_FRAMESETS
 
 .Frameset_00:
@@ -497,3 +503,28 @@ SpriteAnimFrameData:
 	oamframe SPRITE_ANIM_OAMSET_CELEBI_1,  8, OAM_X_FLIP
 	oamframe SPRITE_ANIM_OAMSET_CELEBI_2,  8, OAM_X_FLIP
 	oamend
+
+.Frameset_PCCursor:
+	oamframe SPRITE_ANIM_OAMSET_PC_CURSOR, 32
+	oamrestart
+
+.Frameset_PCCursorItem:
+	; Conditionally switched to when dealing with items
+	oamframe SPRITE_ANIM_OAMSET_PC_CURSOR_ITEM, 32
+	oamrestart
+
+.Frameset_PCQuick:
+	oamframe SPRITE_ANIM_OAMSET_PC_QUICK, 8
+	oamdelete
+
+.Frameset_PCMode:
+	oamframe SPRITE_ANIM_OAMSET_PC_MODE, 32
+	oamrestart
+
+.Frameset_PCMode2:
+	oamframe SPRITE_ANIM_OAMSET_PC_MODE2, 32
+	oamrestart
+
+.Frameset_PCPack:
+	oamframe SPRITE_ANIM_OAMSET_PC_PACK, 32
+	oamrestart