Merge pull request #12 from Skeli789/master

Update Unbound Branch from Master

.gitignore

@@ -2,7 +2,7 @@ a.exe
 *.gba
 build/*
 extracted/*
-src/generated/*
+assembly/generated/*
 scripts/__pycache__
 *.sgm
 *.dmp
@@ -10,4 +10,5 @@ scripts/__pycache__
 *.lnk
 *.sav
 offsets.ini
-generatedrepoints
+generatedrepoints
+*.idea

BPRE.ld

@@ -10,9 +10,11 @@ memset_ = 0x081E5ED8|1;
 gMain = 0x30030F0;
 
 GetGenderFromSpeciesAndPersonality = 0x803F78C | 1;
+GetMonData = 0x803FBE8 | 1;
 SpeciesToNationalPokedexNum = 0x8043298 | 1;
 DrawSpindaSpots = 0x8043458 | 1;
 GetUnownLetterFromPersonality = 0x8082AB8 | 1;
+SafeLoadMonIconPalette = 0x80970A0 | 1;
 LZ77UnCompWram = 0x81E3B70 | 1;
 
 /*The Deal Breaker*/

assembly/hooks.s

@@ -65,17 +65,7 @@ DexFlagCheckCall:
 	ldr r3, =0x8104AB0 | 1
 	bx r3
 
-@0x8045C58 with r0
-UpdateEggMoveLimit:
-	add r0, r2, #0x1
-	lsl r0, r0, #0x10
-	lsr r2, r0, #0x10
-	push {r2}
-	bl GetUpdatedEggMoveLimit
-	pop {r2}
-	ldr r1, =0x8045C60 | 1
-	bx r1
-
+.pool
 @0x800ECF2 with r4
 LoadSpecialPokePicHook:
 	mov r7, r8
@@ -91,6 +81,32 @@ LoadSpecialPokePicHook:
 	pop {r0}
 	bx r0
 
+.pool
+@0x8034356 with r1
+BattleLoadOpponentMonSpriteGfxHook:
+	ldr r1, [sp] @Personality
+	bl TryGetFemaleGenderedSpecies
+	mov r5, r0
+	ldr r6, [sp]
+	ldr r0, =0x803436C | 1
+	bx r0
+
+/*
+.pool
+@0x80747B4 with r0
+GetBattlerSpriteFinalYHook:
+	lsl r2, r2, #0x18
+	lsr r7, r2, #0x18
+	mov r0, r6
+	lsr r1, r1, #0x10
+	bl TryGetFemaleGenderedSpeciesFromBank
+
+	mov r0, r6
+	ldr r1, =0x80747BC | 1
+	bx r1
+*/
+
+.pool
 @0x8096E38 with r2
 GenderedMonIconHook:
 	lsr r7, r3, #0x10
@@ -106,4 +122,33 @@ GenderedMonIconHook:
 	ldr r1, [sp, #0x50] @Personality
 	ldr r0, =0x8096E40 | 1
 	bx r0
-	
+
+.pool
+@0x8139DDC with r1
+SummaryScreenIconPalHook:
+	mov r4, r0
+	mov r1, r0
+	mov r0, r5
+	bl TryGetFemaleGenderedSpecies
+	mov r5, r0
+	ldr r1, =SafeLoadMonIconPalette
+	bl bxr1
+	ldr r0, =0x8139DE4 | 1
+	bx r0
+
+.pool
+@0x808398C with r1
+CreateMonSprite_PicBoxHook:
+	mov r4, r0
+	mov r1, #0x0
+	mov r2, #0x80
+	lsl r2, #0x8 @0x8000
+	bl GetMonSpritePalStructFromOtIdPersonality
+	mov r1, r0
+	mov r0, r4
+	mov r4, r1 @Backup palette struct
+	ldrh r1, [r4, #0x4] @Tag
+	mov r3, #0x80
+	lsl r3, #0x8 @0x8000
+	ldr r2, =0x8083994 | 1
+	bx r2

audio/gCryAbomasnow_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryAccelgor_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryAegislash_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryAlomomola_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryAmaura_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryAmbipom_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryAmoonguss_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryAraquanid_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryArceus_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryArchen_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryArcheops_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryAromatisse_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryAudino_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryAurorus_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryAvalugg_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryAxew_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryAzelf_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBarbaracle_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBasculin_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBastiodon_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBeartic_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBeheeyem_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBergmite_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBewear_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBibarel_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBidoof_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBinacle_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBisharp_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBlacephalon_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBlitzle_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBoldore_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBonsly_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBouffalant_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBounsweet_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBraixen_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBraviary_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBrionne_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBronzong_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBronzor_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBruxish_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBudew_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBuizel_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBuneary_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBunnelby_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBurmy_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryBuzzwole_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCarbink_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCarnivine_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCarracosta_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCelesteela_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryChandelure_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCharjabug_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryChatot_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCherrim_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCherubi_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryChesnaught_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryChespin_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryChimchar_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryChingling_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCinccino_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryClauncher_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryClawitzer_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCobalion_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCofagrigus_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCombee_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryComfey_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryConkeldurr_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCosmoem_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCosmog_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCottonee_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCrabominable_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCrabrawler_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCranidos_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCresselia_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCroagunk_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCrustle_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCryogonal_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCubchoo_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryCutiefly_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDarkrai_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDarmanitan_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDartrix_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDarumaka_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDecidueye_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDedenne_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDeerling_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDeino_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDelphox_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDewott_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDewpider_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDhelmise_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDialga_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDiancie_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDiggersby_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDoublade_flags.txt

@@ -0,0 +1 @@
+-c

audio/gCryDragalge_flags.txt

@@ -0,0 +1 @@
+-c