thru HandleEndTurn_MonFled

Missingmew · Oct 17, 2019 · 88ad62c · 88ad62c
1 parent 1862f70
commit 88ad62c
Show file tree

Hide file tree

Showing 8 changed files with 1,213 additions and 4,671 deletions.
diff --git a/asm/battle_2.s b/asm/battle_2.s
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
@@ -42,43 +42,43 @@ BattleScript_GiveExp:: @ 81D8694
 BattleScript_HandleFaintedMon:: @ 81D869D
 	.incbin "baserom.gba", 0x1D869D, 0x152
 
-gUnknown_81D87EF:: @ 81D87EF
+BattleScript_LocalTrainerBattleWon:: @ 81D87EF
 	.incbin "baserom.gba", 0x1D87EF, 0x14
 
-gUnknown_81D8803:: @ 81D8803
+BattleScript_PayDayMoneyAndPickUpItems:: @ 81D8803
 	.incbin "baserom.gba", 0x1D8803, 0x3
 
-gUnknown_81D8806:: @ 81D8806
+BattleScript_LocalBattleLost:: @ 81D8806
 	.incbin "baserom.gba", 0x1D8806, 0xC6
 
-gUnknown_81D88CC:: @ 81D88CC
+BattleScript_LinkBattleWonOrLost:: @ 81D88CC
 	.incbin "baserom.gba", 0x1D88CC, 0xB
 
 gUnknown_81D88D7:: @ 81D88D7
 	.incbin "baserom.gba", 0x1D88D7, 0x2A
 
-gUnknown_81D8901:: @ 81D8901
+BattleScript_SmokeBallEscape:: @ 81D8901
 	.incbin "baserom.gba", 0x1D8901, 0xE
 
-gUnknown_81D890F:: @ 81D890F
+BattleScript_RanAwayUsingMonAbility:: @ 81D890F
 	.incbin "baserom.gba", 0x1D890F, 0x7
 
-gUnknown_81D8916:: @ 81D8916
+BattleScript_GotAwaySafely:: @ 81D8916
 	.incbin "baserom.gba", 0x1D8916, 0x7
 
-gUnknown_81D891D:: @ 81D891D
+BattleScript_WildMonFled:: @ 81D891D
 	.incbin "baserom.gba", 0x1D891D, 0x7
 
-gUnknown_81D8924:: @ 81D8924
+BattleScript_PrintCantRunFromTrainer:: @ 81D8924
 	.incbin "baserom.gba", 0x1D8924, 0x16
 
 gUnknown_81D893A:: @ 81D893A
 	.incbin "baserom.gba", 0x1D893A, 0x9
 
-gUnknown_81D8943:: @ 81D8943
+BattleScript_PrintCantEscapeFromBattle:: @ 81D8943
 	.incbin "baserom.gba", 0x1D8943, 0x6
 
-gUnknown_81D8949:: @ 81D8949
+BattleScript_PrintFullBox:: @ 81D8949
 	.incbin "baserom.gba", 0x1D8949, 0x4
 
 gUnknown_81D894D:: @ 81D894D
@@ -237,7 +237,7 @@ BattleScript_OneHitKOMsg:: @ 81D8FE4
 BattleScript_SAtkDown2:: @ 81D8FEB
 	.incbin "baserom.gba", 0x1D8FEB, 0x2A
 
-gUnknown_81D9015:: @ 81D9015
+BattleScript_FocusPunchSetUp:: @ 81D9015
 	.incbin "baserom.gba", 0x1D9015, 0x14
 
 BattleScript_MoveUsedIsAsleep:: @ 81D9029

diff --git a/include/battle.h b/include/battle.h
@@ -532,7 +532,7 @@ struct BattleStruct
     void (*savedCallback)(void);
     u8 synchronizeMoveEffect;
     u8 multiplayerId;
-    u8 field_B6;
+    u8 overworldWeatherDone;
     u8 atkCancellerTracker;
     u16 usedHeldItems[MAX_BATTLERS_COUNT];
     u8 chosenItem[4]; // why is this an u8?
@@ -932,5 +932,6 @@ extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT];
 extern u8 gBattleTerrain;
 extern struct UnknownPokemonStruct4 gUnknown_2022B58[3];
 extern u16 *gUnknown_2022BC0;
+extern u16 gRandomTurnNumber;
 
 #endif // GUARD_BATTLE_H
diff --git a/include/battle_scripts.h b/include/battle_scripts.h
@@ -227,5 +227,7 @@ extern const u8 BattleScript_FlushMessageBox[];
 extern const u8 BattleScript_SpikesOnFaintedBattler[];
 extern const u8 BattleScript_GhostBallDodge[];
 extern const u8 gUnknown_81D9A88[];
+extern const u8 gUnknown_81D91A1[]; // knizz: silph scope unveil
+extern const u8 gUnknown_81D88D7[];
 
 #endif // GUARD_BATTLE_SCRIPTS_H
diff --git a/include/battle_setup.h b/include/battle_setup.h
@@ -18,5 +18,7 @@ u8 *BattleSetup_GetScriptAddrAfterBattle(void);
 u8 *BattleSetup_GetTrainerPostBattleScript(void);
 void sub_80803FC(void);
 u8 sub_8080060(void);
+u8 sub_80803CC(void);
+u16 sub_80803D8(void);
 
 #endif // GUARD_BATTLE_SETUP_H
diff --git a/include/global.h b/include/global.h
@@ -32,6 +32,13 @@
 // GF's lingo
 #define NELEMS ARRAY_COUNT
 
+#define SWAP(a, b, temp)    \
+{                           \
+    temp = a;               \
+    a = b;                  \
+    b = temp;               \
+}
+
 // useful math macros
 
 // Converts a number to Q8.8 fixed-point format

diff --git a/include/party_menu.h b/include/party_menu.h
@@ -85,5 +85,6 @@ void sub_8126EDC(void);
 void PartyMenuInit_FromPlayerPc(void);
 void CB2_PartyMenuFromStartMenu(void);
 void sub_8128198(void);
+void sub_8127FF4(u8 slot, u8 slot2);
 
 #endif // GUARD_PARTY_MENU_H