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

pret · Nov 22, 2023 · 04f7f7f · 04f7f7f
2 parents 1fb52c0 + 3c76871
commit 04f7f7f
Show file tree

Hide file tree

Showing 50 changed files with 346 additions and 362 deletions.
diff --git a/.github/webhook.sh b/.github/webhook.sh
@@ -2,7 +2,7 @@
 set -e
 
 # Report unnamed symbols
-content="$(tools/unnamed.py -r . pokeyellow.sym | head)"
+content="$(tools/unnamed.py -r . -l 30 pokeyellow.sym | head)"
 
 curl -H 'Content-Type: application/json' -X POST "$DISCORD_WEBHOOK_URL" -d@- << EOF
 {

diff --git a/INSTALL.md b/INSTALL.md
@@ -101,11 +101,9 @@ Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building
 To install the software required for **pokeyellow**:
 
 ```bash
-sudo pacman -S make gcc git
+sudo pacman -S make gcc git rgbds
 ```
 
-Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for Arch Linux to install **rgbds 0.6.1**.
-
 If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.6.1** from source.
 
 ### Termux

diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm
@@ -0,0 +1,8 @@
+; AnimationTypePointerTable indexes (see engine/battle/animations.asm)
+	const_def 1
+	const ANIMATIONTYPE_SHAKE_SCREEN_VERTICALLY          ; 1
+	const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_HEAVY  ; 2
+	const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_SLOW   ; 3
+	const ANIMATIONTYPE_BLINK_ENEMY_MON_SPRITE           ; 4
+	const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT  ; 5
+	const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_SLOW_2 ; 6
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
@@ -1,15 +1,20 @@
 DEF MAX_LEVEL EQU 100
 
+; maximum moves known per mon
 DEF NUM_MOVES EQU 4
 
+; significant stat values
+DEF BASE_STAT_LEVEL EQU 7
+DEF MAX_STAT_LEVEL EQU 13
+
 ; VitaminStats indexes (see data/battle/stat_names.asm)
-	const_def
+	const_def 1
 	const STAT_HEALTH
 	const STAT_ATTACK
 	const STAT_DEFENSE
 	const STAT_SPEED
 	const STAT_SPECIAL
-DEF NUM_STATS EQU const_value
+DEF NUM_STATS EQU const_value - 1
 
 ; StatModTextStrings indexes (see data/battle/stat_mod_names.asm)
 	const_def

diff --git a/constants/item_constants.asm b/constants/item_constants.asm
@@ -28,9 +28,9 @@
 	const SUPER_POTION  ; $13
 	const POTION        ; $14
 	const BOULDERBADGE  ; $15
+DEF SAFARI_BAIT EQU BOULDERBADGE ; overload
 	const CASCADEBADGE  ; $16
-DEF SAFARI_BAIT EQU $15 ; overload
-DEF SAFARI_ROCK EQU $16 ; overload
+DEF SAFARI_ROCK EQU CASCADEBADGE ; overload
 	const THUNDERBADGE  ; $17
 	const RAINBOWBADGE  ; $18
 	const SOULBADGE     ; $19
@@ -52,13 +52,13 @@ DEF SAFARI_ROCK EQU $16 ; overload
 	const DOME_FOSSIL   ; $29
 	const HELIX_FOSSIL  ; $2A
 	const SECRET_KEY    ; $2B
-	const UNUSED_ITEM   ; $2C "?????"
+	const ITEM_2C       ; $2C
 	const BIKE_VOUCHER  ; $2D
 	const X_ACCURACY    ; $2E
 	const LEAF_STONE    ; $2F
 	const CARD_KEY      ; $30
 	const NUGGET        ; $31
-	const PP_UP_2       ; $32
+	const ITEM_32       ; $32
 	const POKE_DOLL     ; $33
 	const FULL_HEAL     ; $34
 	const REVIVE        ; $35

diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
@@ -79,12 +79,9 @@ DEF HOF_TEAM_CAPACITY EQU 50
 
 ; Evolution types
 	const_def 1
-	const EV_LEVEL ; 1
-	const EV_ITEM  ; 2
-	const EV_TRADE ; 3
-
-DEF MAX_EVOLUTIONS EQU 3
-DEF EVOLUTION_SIZE EQU 4
+	const EVOLVE_LEVEL ; 1
+	const EVOLVE_ITEM  ; 2
+	const EVOLVE_TRADE ; 3
 
 
 ; wMonHGrowthRate values

diff --git a/data/items/key_items.asm b/data/items/key_items.asm
@@ -43,13 +43,13 @@ KeyItemFlags:
 	dbit TRUE  ; DOME_FOSSIL
 	dbit TRUE  ; HELIX_FOSSIL
 	dbit TRUE  ; SECRET_KEY
-	dbit TRUE  ; UNUSED_ITEM
+	dbit TRUE  ; ITEM_2C
 	dbit TRUE  ; BIKE_VOUCHER
 	dbit FALSE ; X_ACCURACY
 	dbit FALSE ; LEAF_STONE
 	dbit TRUE  ; CARD_KEY
 	dbit FALSE ; NUGGET
-	dbit FALSE ; PP_UP_2
+	dbit FALSE ; ITEM_32
 	dbit FALSE ; POKE_DOLL
 	dbit FALSE ; FULL_HEAL
 	dbit FALSE ; REVIVE

diff --git a/data/items/names.asm b/data/items/names.asm
@@ -6,7 +6,7 @@ ItemNames::
 	li "POKé BALL"
 	li "TOWN MAP"
 	li "BICYCLE"
-	li "?????"
+	li "?????" ; SURFBOARD
 	li "SAFARI BALL"
 	li "POKéDEX"
 	li "MOON STONE"
@@ -43,13 +43,13 @@ ItemNames::
 	li "DOME FOSSIL"
 	li "HELIX FOSSIL"
 	li "SECRET KEY"
-	li "?????"
+	li "?????" ; ITEM_2C
 	li "BIKE VOUCHER"
 	li "X ACCURACY"
 	li "LEAF STONE"
 	li "CARD KEY"
 	li "NUGGET"
-	li "PP UP"
+	li "PP UP" ; ITEM_32
 	li "POKé DOLL"
 	li "FULL HEAL"
 	li "REVIVE"

diff --git a/data/items/prices.asm b/data/items/prices.asm
@@ -43,13 +43,13 @@ ItemPrices::
 	bcd3 0     ; DOME_FOSSIL
 	bcd3 0     ; HELIX_FOSSIL
 	bcd3 0     ; SECRET_KEY
-	bcd3 0     ; XXX
+	bcd3 0     ; ITEM_2C
 	bcd3 0     ; BIKE_VOUCHER
 	bcd3 950   ; X_ACCURACY
 	bcd3 2100  ; LEAF_STONE
 	bcd3 0     ; CARD_KEY
 	bcd3 10000 ; NUGGET
-	bcd3 9800  ; XXX PP_UP
+	bcd3 9800  ; ITEM_32
 	bcd3 1000  ; POKE_DOLL
 	bcd3 600   ; FULL_HEAL
 	bcd3 1500  ; REVIVE

diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm
@@ -17,11 +17,11 @@ FightingDojo_Object:
 	def_bg_events
 
 	def_object_events
-	object_event  5,  3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_KARATE_MASTER
-	object_event  3,  4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT1
-	object_event  3,  6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT2
-	object_event  5,  5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT3
-	object_event  5,  7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT4
+	object_event  5,  3, SPRITE_HIKER, STAY, DOWN, TEXT_FIGHTINGDOJO_KARATE_MASTER, OPP_BLACKBELT, 1
+	object_event  3,  4, SPRITE_HIKER, STAY, RIGHT, TEXT_FIGHTINGDOJO_BLACKBELT1, OPP_BLACKBELT, 2
+	object_event  3,  6, SPRITE_HIKER, STAY, RIGHT, TEXT_FIGHTINGDOJO_BLACKBELT2, OPP_BLACKBELT, 3
+	object_event  5,  5, SPRITE_HIKER, STAY, LEFT, TEXT_FIGHTINGDOJO_BLACKBELT3, OPP_BLACKBELT, 4
+	object_event  5,  7, SPRITE_HIKER, STAY, LEFT, TEXT_FIGHTINGDOJO_BLACKBELT4, OPP_BLACKBELT, 5
 	object_event  4,  1, SPRITE_POKE_BALL, STAY, NONE, TEXT_FIGHTINGDOJO_HITMONLEE_POKE_BALL
 	object_event  5,  1, SPRITE_POKE_BALL, STAY, NONE, TEXT_FIGHTINGDOJO_HITMONCHAN_POKE_BALL
 

diff --git a/data/maps/objects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm
@@ -13,8 +13,8 @@ PewterNidoranHouse_Object:
 	def_bg_events
 
 	def_object_events
-	object_event  4,  5, SPRITE_MONSTER, STAY, LEFT, PEWTERNIDORANHOUSE_NIDORAN
-	object_event  3,  5, SPRITE_LITTLE_BOY, STAY, RIGHT, PEWTERNIDORANHOUSE_LITTLE_BOY
-	object_event  1,  2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN
+	object_event  4,  5, SPRITE_MONSTER, STAY, LEFT, TEXT_PEWTERNIDORANHOUSE_NIDORAN
+	object_event  3,  5, SPRITE_LITTLE_BOY, STAY, RIGHT, TEXT_PEWTERNIDORANHOUSE_LITTLE_BOY
+	object_event  1,  2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, TEXT_PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN
 
 	def_warps_to PEWTER_NIDORAN_HOUSE
diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm
@@ -13,12 +13,12 @@ Route18_Object:
 	warp_event 40,  9, ROUTE_18_GATE_1F, 3
 
 	def_bg_events
-	bg_event 43,  7, SCRIPT_ROUTE18_SIGN
-	bg_event 33,  5, SCRIPT_ROUTE18_CYCLING_ROAD_SIGN
+	bg_event 43,  7, TEXT_ROUTE18_SIGN
+	bg_event 33,  5, TEXT_ROUTE18_CYCLING_ROAD_SIGN
 
 	def_object_events
-	object_event 36, 11, SPRITE_COOLTRAINER_M, STAY, RIGHT, SCRIPT_ROUTE18_COOLTRAINER_M1, OPP_BIRD_KEEPER, 8
-	object_event 40, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, SCRIPT_ROUTE18_COOLTRAINER_M2, OPP_BIRD_KEEPER, 9
-	object_event 42, 13, SPRITE_COOLTRAINER_M, STAY, LEFT, SCRIPT_ROUTE18_COOLTRAINER_M3, OPP_BIRD_KEEPER, 10
+	object_event 36, 11, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE18_COOLTRAINER_M1, OPP_BIRD_KEEPER, 8
+	object_event 40, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE18_COOLTRAINER_M2, OPP_BIRD_KEEPER, 9
+	object_event 42, 13, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE18_COOLTRAINER_M3, OPP_BIRD_KEEPER, 10
 
 	def_warps_to ROUTE_18
diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm
@@ -37,8 +37,8 @@ SSAnneB1FRooms_Object:
 	object_event  0,  4, SPRITE_FISHER, STAY, RIGHT, TEXT_SSANNEB1FROOMS_FISHER, OPP_FISHER, 2
 	object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_SSANNEB1FROOMS_SUPER_NERD
 	object_event 11, 12, SPRITE_MONSTER, STAY, NONE, TEXT_SSANNEB1FROOMS_MACHOKE
-	object_event 20,  2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER
-	object_event 10,  2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST
-	object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_POTION
+	object_event 20,  2, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNEB1FROOMS_ETHER, ETHER
+	object_event 10,  2, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNEB1FROOMS_TM_REST, TM_REST
+	object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNEB1FROOMS_MAX_POTION, MAX_POTION
 
 	def_warps_to SS_ANNE_B1F_ROOMS