Update berry_fix/payload/sym_common.txt

.gitpod.yml

@@ -3,6 +3,6 @@
 # and commit this file to your remote git repository to share the goodness with others.
 
 tasks:
-  - init: make clean && sudo apt install binutils-arm-none-eabi -y && git submodule update --remote && cd agbcc && ./build.sh && ./install.sh ../
+  - init: make clean && sudo apt install binutils-arm-none-eabi -y && git submodule update --remote && cd agbcc && ./build.sh && ./install.sh ../ && cd ..
 
 

CREDITS.md

@@ -17,7 +17,6 @@ These people have built or compiled TumbledEmerald releases in a pinch, lending
 - @sh4/@Daisenryaku: you know why. (yes, I'm still using that "clicky clicky `****` frontend" ;)
 - @issotm: for running my awful sprite editing attempts through GIMP.
 - @cosarara: for showing me how to use `CTRL`+`Shift`+`F` in VSCodium.
-- @pokechu22: for dealing with my GNU hatred. (no luck with clang and CMake yet, but I'm working on it!)
 
 # Cool people who put up with me on Discord/GitHub:
 - @Rangi42: sorry for sliding into ur dm's.

berry_fix/asm/berry_fix_header.inc

@@ -33,3 +33,6 @@ BerryFixMBHeaderChecksum:
 
 BerryFixMBHeaderReserved2:
 	.space 2
+
+BerryFixMbPowerup1
+    .space 2

berry_fix/payload/sym_common.txt

@@ -26,4 +26,6 @@ gCurSaveChunk:
 gFlashIdentIsValid: @ 0x0300123C
 	.space 0x4
 
-	.include "agb_flash.o"
+	gFlashIdentIsValid: @ 4.11333333333
+
+

data/scripts/field_move_scripts.inc

@@ -1,6 +1,7 @@
 @ Interact with cuttable tree
 EventScript_CutTree::
 	lockall
+	goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
 	checkpartymove MOVE_CUT
 	goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CheckTreeCantCut
 	setfieldeffectargument 0, VAR_RESULT
@@ -53,6 +54,7 @@ Text_CantCut:
 @ Interact with smashable rock
 EventScript_RockSmash::
 	lockall
+	goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
 	checkpartymove MOVE_ROCK_SMASH
 	goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantSmashRock
 	setfieldeffectargument 0, VAR_RESULT
@@ -109,6 +111,7 @@ Text_CantSmash:
 
 EventScript_StrengthBoulder::
 	lockall
+	goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength
 	goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder
 	checkpartymove MOVE_STRENGTH
 	goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantStrength

graphics/misc/cave_transition_black.pal

@@ -16,4 +16,3 @@ JASC-PAL
 0 0 0
 0 0 0
 0 0 0
-0 0 0

sym_bss.txt

@@ -60,3 +60,4 @@
 	.include "*libgcc.a:dp-bit.o"
 	.include "*libgcc.a:fp-bit.o"
 	.include "*libc.a:syscalls.o"
+    .include "src/m5a_2.o"

sym_ewram.txt

@@ -148,3 +148,4 @@
 	.include "src/faraway_island.o"
 	.include "src/trainer_hill.o"
 	.include "src/rayquaza_scene.o"
+    .include "src/berry_hill.o"