dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pret/master' into pokefirered_pokeemeraldSync4

Browse Source 
# Conflicts:
#	include/battle.h
#	include/cable_club.h
#	src/battle_anim_fire.c
#	src/battle_anim_ghost.c
#	src/battle_anim_ground.c
#	src/battle_message.c
#	src/cable_club.c
This commit is contained in:
Eduardo Quezada
2022-09-04 17:44:13 -03:00
parent 616ab63d94 b3c7b9e09f
commit 9241dc6fe7
355 changed files with 20064 additions and 19067 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/trainers.h
+4 -2
View File
@@ -175,8 +175,10 @@
#define TRAINER_BACK_PIC_POKEDUDE 4
#define TRAINER_BACK_PIC_OLD_MAN 5
// Leftover from R/S
#define TRAINER_SECRET_BASE 1024
// Special Trainer Ids.
#define TRAINER_UNION_ROOM 0xC00
#define TRAINER_LINK_OPPONENT 0x800
#define TRAINER_SECRET_BASE 0x400
#define TRAINER_CLASS_NONE 0
#define TRAINER_CLASS_PKMN_TRAINER_UNUSED 1