Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6

.github/workflows/build.yml

@@ -32,8 +32,9 @@ jobs:
           repository: pret/agbcc
 
       - name: Install binutils
-        run: sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi
+        run: |
-        # build-essential, git, and libpng-dev are already installed
+          sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi libpng-dev
+        # build-essential and git are already installed
         # gcc-arm-none-eabi is only needed for the modern build
         # as an alternative to dkP
 

.gitignore

@@ -38,3 +38,5 @@ prefabs.json
 *.diff
 *.sym
 *.js
+/pokeemerald-*.png
+/pokeemerald_modern-*.png

common_syms/ereader_screen.txt

@@ -1 +1,2 @@
+gUnknownSpace
 gEReaderData

src/cable_car.c

@@ -880,8 +880,12 @@ static void CreateCableCarSprites(void)
     // 1/64 chance for an NPC to appear hiking on the ground below the Cable Car
     if ((rval % 64) == 0)
     {
-        // Unclear if this was intentional, but the - 1 in the below ARRAY_COUNT means the Zigzagoon is never used
+        // BUGFIX: The - 1 in the below ARRAY_COUNT means the Zigzagoon is never used
+#ifdef BUGFIX
+        spriteId = CreateObjectGraphicsSprite(hikerGraphicsIds[rval % ARRAY_COUNT(hikerGraphicsIds)], hikerCallbacks[GOING_DOWN], hikerCoords[GOING_DOWN][0], hikerCoords[GOING_DOWN][1], 106);
+#else
         spriteId = CreateObjectGraphicsSprite(hikerGraphicsIds[rval % (ARRAY_COUNT(hikerGraphicsIds) - 1)], hikerCallbacks[GOING_DOWN], hikerCoords[GOING_DOWN][0], hikerCoords[GOING_DOWN][1], 106);
+#endif
         if (spriteId != MAX_SPRITES)
         {
             gSprites[spriteId].oam.priority = 2;

src/ereader_screen.c

@@ -40,6 +40,9 @@ struct EReaderData
 
 static void Task_EReader(u8);
 
+// This belongs in COMMON somewhere between party_menu and ereader_screen, but it's unused so it's unclear where.
+UNUSED u8 gUnknownSpace[64];
+
 struct EReaderData gEReaderData;
 
 extern const u8 gMultiBootProgram_EReader_Start[];

src/field_poison.c

@@ -89,7 +89,11 @@ static void Task_TryFieldPoisonWhiteOut(u8 taskId)
         if (AllMonsFainted())
         {
             // Battle facilities have their own white out script to handle the challenge loss
+#ifdef BUGFIX
+            if (InBattlePyramid() || InBattlePike() || InTrainerHillChallenge())
+#else
             if (InBattlePyramid() | InBattlePike() || InTrainerHillChallenge())
+#endif
                 gSpecialVar_Result = FLDPSN_FRONTIER_WHITEOUT;
             else
                 gSpecialVar_Result = FLDPSN_WHITEOUT;

src/intro.c

@@ -112,6 +112,12 @@ extern const struct CompressedSpriteSheet gBattleAnimPicTable[];
 extern const struct CompressedSpritePalette gBattleAnimPaletteTable[];
 extern const struct SpriteTemplate gAncientPowerRockSpriteTemplate[];
 
+enum {
+    COPYRIGHT_INITIALIZE,
+    COPYRIGHT_START_FADE = 140,
+    COPYRIGHT_START_INTRO,
+};
+
 #define TAG_VOLBEAT   1500
 #define TAG_TORCHIC   1501
 #define TAG_MANECTRIC 1502
@@ -1067,7 +1073,7 @@ static u8 SetUpCopyrightScreen(void)
 {
     switch (gMain.state)
     {
-    case 0:
+    case COPYRIGHT_INITIALIZE:
         SetVBlankCallback(NULL);
         SetGpuReg(REG_OFFSET_BLDCNT, 0);
         SetGpuReg(REG_OFFSET_BLDALPHA, 0);
@@ -1101,7 +1107,7 @@ static u8 SetUpCopyrightScreen(void)
         gMain.state++;
         GameCubeMultiBoot_Main(&gMultibootProgramStruct);
         break;
-    case 140:
+    case COPYRIGHT_START_FADE:
         GameCubeMultiBoot_Main(&gMultibootProgramStruct);
         if (gMultibootProgramStruct.gcmb_field_2 != 1)
         {
@@ -1109,7 +1115,7 @@ static u8 SetUpCopyrightScreen(void)
             gMain.state++;
         }
         break;
-    case 141:
+    case COPYRIGHT_START_INTRO:
         if (UpdatePaletteFade())
             break;
         CreateTask(Task_Scene1_Load, 0);

sym_common.txt

@@ -1,37 +1,10 @@
-	.space 0x8
+	.align 4
 	.include "main.o"
-	@ ../src/bg.o
+	.include "bg.o"
-	.align 2
-gWindowTileAutoAllocEnabled:
-	.space 4
-	@ ../src/window.o
-	.align 4
-gTransparentTileNumber:
-	.space 1
-	.align 4
-gWindowBgTilemapBuffers:
-	.space 16
-	@ ../src/text.o
-	.align 4
-gFonts:
-	.space 4
-	.align 2
-gDisableTextPrinters:
-	.space 1
-	.align 4
-gCurGlyph:
-	.space 132
-	.align 2
-gTextFlags:
-	.space 4
-	@ ../src/sprite.o
-	.align 2
-gOamMatrixAllocBitmap:
-	.space 4
-	.align 2
-gReservedSpritePaletteCount:
-	.space 1
 	.align 4
+	.include "window.o"
+	.include "text.o"
+	.include "sprite.o"
 	.include "link.o"
 	.include "AgbRfu_LinkManager.o"
 	.include "link_rfu_2.o"
@@ -53,9 +26,7 @@ gReservedSpritePaletteCount:
 	.include "tv.o"
 	.include "mauville_old_man.o"
 	.include "image_processing_effects.o"
-
+	.align 4
-	.space 0x4
-
 	.include "contest_painting.o"
 	.include "field_specials.o"
 	.include "evolution_scene.o"
@@ -66,14 +37,9 @@ gReservedSpritePaletteCount:
 	.include "battle_anim_throw.o"
 	.include "battle_factory_screen.o"
 	.include "apprentice.o"
-
+	.align 4
-	.space 0x8
-
 	.include "list_menu.o"
 	.include "party_menu.o"
-
-	.space 0x44
-
 	.include "ereader_screen.o"
 	.include "m4a.o"
 	.include "agb_flash.o"