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

pret · Nov 21, 2023 · 298e99d · 298e99d
2 parents 613e1c6 + 3bbd38a
commit 298e99d
Show file tree

Hide file tree

Showing 730 changed files with 14,943 additions and 13,232 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -66,11 +66,12 @@ jobs:
         if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
         run: |
           cp -v *.sym symbols/
+          cp -v *.map symbols/
 
       - name: Update symbols
         if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
         uses: EndBug/add-and-commit@v9
         with:
           cwd: "./symbols"
-          add: "*.sym"
+          add: "*.sym *.map"
           message: ${{ github.event.commits[0].message }}
diff --git a/README.md b/README.md
@@ -15,32 +15,13 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md).
 
 - [**Wiki**][wiki] (includes [tutorials][tutorials])
 - [**Symbols**][symbols]
-- **Discord:** [pret][discord]
-- **IRC:** [libera#pret][irc]
-
-Other disassembly projects:
-
-- [**Pokémon Red/Blue**][pokered]
-- [**Pokémon Gold/Silver**][pokegold]
-- [**Pokémon Crystal**][pokecrystal]
-- [**Pokémon Pinball**][pokepinball]
-- [**Pokémon TCG**][poketcg]
-- [**Pokémon Ruby**][pokeruby]
-- [**Pokémon FireRed**][pokefirered]
-- [**Pokémon Emerald**][pokeemerald]
-
-[pokered]: https://github.com/pret/pokered
-[pokegold]: https://github.com/pret/pokegold
-[pokecrystal]: https://github.com/pret/pokecrystal
-[pokepinball]: https://github.com/pret/pokepinball
-[poketcg]: https://github.com/pret/poketcg
-[pokeruby]: https://github.com/pret/pokeruby
-[pokefirered]: https://github.com/pret/pokefirered
-[pokeemerald]: https://github.com/pret/pokeemerald
+
+You can find us on [Discord (pret, #pokered)](https://discord.gg/d5dubZ3).
+
+For other pret projects, see [pret.github.io](https://pret.github.io/).
+
 [wiki]: https://github.com/pret/pokeyellow/wiki
 [tutorials]: https://github.com/pret/pokeyellow/wiki/Tutorials
 [symbols]: https://github.com/pret/pokeyellow/tree/symbols
-[discord]: https://discord.gg/d5dubZ3
-[irc]: https://web.libera.chat/?#pret
 [ci]: https://github.com/pret/pokeyellow/actions
 [ci-badge]: https://github.com/pret/pokeyellow/actions/workflows/main.yml/badge.svg
diff --git a/charmap.asm → constants/charmap.asm b/charmap.asm → constants/charmap.asm
diff --git a/constants/event_constants.asm b/constants/event_constants.asm
@@ -27,10 +27,10 @@
 	const EVENT_VIRIDIAN_GYM_OPEN
 	const EVENT_GOT_TM42
 	const_skip 2
-	const EVENT_02C
-	const EVENT_02D
-	const EVENT_02E
-	const EVENT_02F
+	const EVENT_SPAWNED_OLD_MAN_1
+	const EVENT_COMPLETED_CATCH_TRAINING
+	const EVENT_COMPLETED_CATCH_TRAINING_AGAIN
+	const EVENT_INITIAL_CATCH_TRAINING
 	const_skip 8
 	const EVENT_OAK_GOT_PARCEL
 	const EVENT_GOT_OAKS_PARCEL
@@ -110,7 +110,7 @@
 	const_next $150
 	const_skip
 	const EVENT_GOT_BIKE_VOUCHER
-	const EVENT_152
+	const EVENT_LEFT_FANCLUB_AFTER_BIKE_VOUCHER
 	const_skip 3
 	const EVENT_SEEL_FAN_BOAST
 	const EVENT_PIKACHU_FAN_BOAST

diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm
@@ -9,7 +9,7 @@ DEF SHOW EQU $15
 	const HS_PALLET_TOWN_OAK               ; 00
 	const HS_LYING_OLD_MAN                 ; 01
 	const HS_OLD_MAN_1                     ; 02
-	const HS_OLD_MAN                       ; 03
+	const HS_OLD_MAN_2                     ; 03
 	const HS_MUSEUM_GUY                    ; 04
 	const HS_GYM_GUY                       ; 05
 	const HS_CERULEAN_RIVAL                ; 06

diff --git a/constants/item_constants.asm b/constants/item_constants.asm
@@ -13,7 +13,7 @@
 	const POKE_BALL     ; $04
 	const TOWN_MAP      ; $05
 	const BICYCLE       ; $06
-	const SURFBOARD     ; $07 buggy?
+	const SURFBOARD     ; $07
 	const SAFARI_BALL   ; $08
 	const POKEDEX       ; $09
 	const MOON_STONE    ; $0A

diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
@@ -3,6 +3,13 @@
 DEF MAP_BORDER EQU 3
 
 ; connection directions
+	const_def
+	const EAST_F
+	const WEST_F
+	const SOUTH_F
+	const NORTH_F
+
+; wCurMapConnections
 	const_def
 	shift_const EAST   ; 1
 	shift_const WEST   ; 2

diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
@@ -16,3 +16,6 @@ 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/sprite_constants.asm b/constants/sprite_constants.asm
@@ -28,7 +28,7 @@
 	const SPRITE_ROCKET                  ; $18
 	const SPRITE_CHANNELER               ; $19
 	const SPRITE_WAITER                  ; $1a
-	const SPRITE_ERIKA                   ; $1b
+	const SPRITE_SILPH_WORKER_F          ; $1b
 	const SPRITE_MIDDLE_AGED_WOMAN       ; $1c
 	const SPRITE_BRUNETTE_GIRL           ; $1d
 	const SPRITE_LANCE                   ; $1e
@@ -45,7 +45,7 @@
 	const SPRITE_NURSE                   ; $29
 	const SPRITE_LINK_RECEPTIONIST       ; $2a
 	const SPRITE_SILPH_PRESIDENT         ; $2b
-	const SPRITE_SILPH_WORKER            ; $2c
+	const SPRITE_SILPH_WORKER_M          ; $2c
 	const SPRITE_WARDEN                  ; $2d
 	const SPRITE_CAPTAIN                 ; $2e
 	const SPRITE_FISHER                  ; $2f

diff --git a/data/items/marts.asm b/data/items/marts.asm
@@ -1,50 +1,50 @@
 ; mart inventories are below
 ; they are texts
 
-ViridianCashierText::
+ViridianMartClerkText::
 	script_mart POKE_BALL, POTION, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL
 
-PewterCashierText::
+PewterMartClerkText::
 	script_mart POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
 
-CeruleanCashierText::
+CeruleanMartClerkText::
 	script_mart POKE_BALL, POTION, ESCAPE_ROPE, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
 
-BikeShopCashierText:: ; unreferenced
+UnusedBikeShopClerkText:: ; unreferenced
 	script_mart BICYCLE
 
-VermilionCashierText::
+VermilionMartClerkText::
 	script_mart POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL
 
-LavenderCashierText::
+LavenderMartClerkText::
 	script_mart GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL
 
-CeladonMart2Clerk1Text::
+CeladonMart2FClerk1Text::
 	script_mart GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL
 
-CeladonMart2Clerk2Text::
+CeladonMart2FClerk2Text::
 	script_mart TM_DOUBLE_TEAM, TM_REFLECT, TM_RAZOR_WIND, TM_HORN_DRILL, TM_EGG_BOMB, TM_MEGA_PUNCH, TM_MEGA_KICK, TM_TAKE_DOWN, TM_SUBMISSION
 
-CeladonMart4ClerkText::
+CeladonMart4FClerkText::
 	script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE
 
-CeladonMart5Clerk1Text::
+CeladonMart5FClerk1Text::
 	script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL
 
-CeladonMart5Clerk2Text::
+CeladonMart5FClerk2Text::
 	script_mart HP_UP, PROTEIN, IRON, CARBOS, CALCIUM
 
-FuchsiaCashierText::
+FuchsiaMartClerkText::
 	script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL
 
-UnusedCashierText:: ; unreferenced
+UnusedMartClerkText:: ; unreferenced
 	script_mart GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE
 
-CinnabarCashierText::
+CinnabarMartClerkText::
 	script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
 
-SaffronCashierText::
+SaffronMartClerkText::
 	script_mart GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
 
-IndigoCashierText::
+IndigoPlateauLobbyClerkText::
 	script_mart ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL