Merge branch 'master' into pokemon_storage_system

INSTALL.md

@@ -6,12 +6,12 @@ Make sure that there is an environment variable called DEVKITARM with the path o
 
 Then get the compiler from https://github.com/pret/agbcc and run the following commands.
 
-	build.sh
-	install.sh PATH_OF_POKERUBY_DIRECTORY
+	./build.sh
+	./install.sh PATH_OF_POKERUBY_DIRECTORY
 
 Then in the pokeruby directory, build the tools.
 
-	build_tools.sh
+	./build_tools.sh
 
 Finally, build the rom.
 

Makefile

@@ -96,7 +96,7 @@ ifeq ($(COMPARE),1)
 endif
 
 clean: tidy
-	$(RM) sound/direct_sound_samples/*.bin
+	find sound/direct_sound_samples \( -iname '*.bin' \) -exec rm {} +
 	$(RM) $(ALL_OBJECTS)
 	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' \) -exec rm {} +
 
@@ -160,7 +160,7 @@ include override.mk
 
 #### Sound Rules ####
 
-sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif
+sound/direct_sound_samples/cries/cry_%.bin: sound/direct_sound_samples/cries/cry_%.aif
 	$(AIF2PCM) $< $@ --compress
 
 sound/%.bin: sound/%.aif

asm/contest_link_80C2020.s

@@ -657,7 +657,7 @@ sub_80C25C0: @ 80C25C0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8007ECC
+	bl IsLinkTaskFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080C25EC
@@ -5778,7 +5778,7 @@ sub_80C4B5C: @ 80C4B5C
 	ldrh r0, [r0]
 	cmp r0, 0x1
 	bne _080C4B90
-	bl sub_8007ECC
+	bl IsLinkTaskFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080C4B9E

data/specials.inc

@@ -1,4 +1,5 @@
 .macro def_special ptr
+.global SPECIAL_\ptr
 .set SPECIAL_\ptr, __special__
 .set __special__, __special__ + 1
     .4byte \ptr

include/contest.h

@@ -271,4 +271,16 @@ struct UnknownContestStruct6
 #define shared19338 ((struct UnknownContestStruct4 *)(gSharedMem + 0x19338))
 #define shared19348 (*(struct UnknownContestStruct8 *)(gSharedMem + 0x19348))
 
+extern u8 gContestPlayerMonIndex;
+extern u8 gIsLinkContest;
+extern u32 gContestRngValue;
+extern u8 gUnknown_02038696[4];
+extern s16 gUnknown_02038670[4];
+extern s16 gUnknown_02038678[4];
+extern s16 gUnknown_02038680[4];
+extern u16 gUnknown_02038688[4];
+extern u8 gContestFinalStandings[4];
+extern u8 gUnknown_02038696[4];
+extern u8 gUnknown_0203869B;
+
 #endif // GUARD_CONTEST_H

include/ewram.h

@@ -259,6 +259,7 @@ extern u8 gSharedMem[];
 #define eHallOfFame                     (struct HallOfFame *)(gSharedMem + 0x1E000)
 #define HALL_OF_FAME_SHEET_0            ((u8 *)(gSharedMem + 0x1E000))
 #define ewram1E000_2                    (const u8 *)(gSharedMem + 0x1E000)
+#define eContestLinkSendBuffer          gSharedMem + 0x1E000
 #define HALL_OF_FAME_SHEET_1            ((u8 *)(gSharedMem + 0x1E800))
 #define ewram_1f000                     (*(struct DecoPCPointers *)(gSharedMem + 0x1f000))
 #define ewramSavedPokeballsPocket       ((struct ItemSlot *)(gSharedMem + 0x1F000))  // saved Pokeballs pocket (for Wally battle)

include/fldeff_poison.h

@@ -1,7 +1,7 @@
 #ifndef GUARD_FLDEFF_POISON_H
 #define GUARD_FLDEFF_POISON_H
 
-void DoFieldPoisonEffect(void);
-bool32 FieldPoisonEffectIsRunning(void);
+void FldeffPoison_Start(void);
+bool32 FldeffPoison_IsActive(void);
 
 #endif // GUARD_FLDEFF_POISON_H

include/link.h

@@ -167,7 +167,7 @@ u8 GetMultiplayerId(void);
 u8 bitmask_all_link_players_but_self(void);
 bool8 SendBlock(u8, void *, u16);
 bool8 sub_8007E9C(u8);
-bool8 sub_8007ECC(void);
+bool8 IsLinkTaskFinished(void);
 u8 GetBlockReceivedStatus(void);
 void ResetBlockReceivedFlags(void);
 void ResetBlockReceivedFlag(u8);

ld_script.txt

@@ -172,7 +172,6 @@ SECTIONS {
         src/field/field_special_scene.o(.text);
         src/field/rotating_gate.o(.text);
         src/field/safari_zone.o(.text);
-        asm/contest_link_80C857C.o(.text);
         src/battle/contest_link_80C857C.o(.text);
         src/field/item_use.o(.text);
         src/battle/anim/powder.o(.text);