Merge branch 'master' of https://github.com/pret/pokeemerald into constants-num-frames

2023-02-01 15:59:02 -05:00
parent 60e1ad20e4 603d870ea0
commit 3b15fd34cc
890 changed files with 40310 additions and 37715 deletions
--- a/include/data.h
+++ b/include/data.h
@@ -11,7 +11,8 @@
 #define TRAINER_PIC_HEIGHT 64
 #define TRAINER_PIC_SIZE (TRAINER_PIC_WIDTH * TRAINER_PIC_HEIGHT / 2)

-#define MAX_TRAINER_PIC_FRAMES 4 // ? Red and Leaf's back pics have 5 frames
+// Red and Leaf's back pics have 5 frames, but this is presumably irrelevant in the places this is used.
+#define MAX_TRAINER_PIC_FRAMES 4

 enum {
    BATTLER_AFFINE_NORMAL,