Merge pull request #258 from SethBarberee/nov_2024

Nov 2024
pret · Nov 27, 2024 · 55459b9 · 55459b9
2 parents 91e0c0b + 797ca93
commit 55459b9
Show file tree

Hide file tree

Showing 33 changed files with 1,776 additions and 2,362 deletions.
diff --git a/asm/code_807CD9C.s b/asm/code_807CD9C.s
diff --git a/asm/code_807E5AC.s b/asm/code_807E5AC.s
@@ -1034,7 +1034,7 @@ _0807EEA0:
 	adds r1, r5, 0
 	movs r2, 0x3
 	adds r3, r6, 0
-	bl sub_807D148
+	bl WarpTarget 
 	b _0807EE72
 _0807EEAE:
 	movs r6, 0
@@ -2301,7 +2301,7 @@ _0807F8BE:
 	mov r1, r8
 	movs r2, 0
 	movs r3, 0
-	bl sub_807D148
+	bl WarpTarget 
 	b _0807F8FA
 	.align 2, 0
 _0807F8D0: .4byte gAdjacentTileOffsets

diff --git a/data/data_8107010.s b/data/data_8107010.s
@@ -48,7 +48,7 @@ gUnknown_810702C: @ 810702C
 .string "pksdir0\0"
 .string "pksdir0\0"
 .string "pksdir0\0"
-@ sub_807DF38
+@ HandleExplosion 
 .string "pksdir0\0"
 
 .global gUnknown_81070E8

diff --git a/include/code_807CD9C.h b/include/code_807CD9C.h
@@ -1,8 +1,8 @@
 #ifndef CODE_807CD9C_H
 #define CODE_807CD9C_H 
 
-void sub_807CD9C(Entity *pokemon, Entity *target, u32 direction);
-void sub_807D148(Entity *pokemon, Entity *target, u32 param_3, DungeonPos *pos);
+void BlowAwayTarget(Entity *pokemon, Entity *target, u32 direction);
+void WarpTarget(Entity *pokemon, Entity *target, u32 param_3, DungeonPos *pos);
 void sub_807D3CC(Entity *param_1);
 
 #endif /* ifndef CODE_807CD9C_H */
diff --git a/include/constants/dungeon_action.h b/include/constants/dungeon_action.h
@@ -31,6 +31,7 @@ enum DungeonAction
     ACTION_UNK21 = 0x21,
     ACTION_EAT_AI = 0x23,
     ACTION_THROW_ITEM_AI = 0x24,
+    ACTION_STEPPED_ON_TRAP = 0x25,
     ACTION_STAIRS = 0x26,
     ACTION_THROW_STRAIGHT_PLAYER = 0x27,
     ACTION_USE_LINK_BOX = 0x2C,

diff --git a/include/dungeon_action.h b/include/dungeon_action.h
@@ -3,6 +3,7 @@
 
 #include "structs/dungeon_entity.h"
 
+void sub_8044C50(u16 action);
 void ClearMonsterActionFields(ActionContainer *actionPointer);
 void SetMonsterActionFields(ActionContainer *actionPointer, u16 action);
 void SetActionPassTurnOrWalk(ActionContainer *actionPointer, s16 species);

diff --git a/include/dungeon_map_access.h b/include/dungeon_map_access.h
@@ -9,4 +9,19 @@ Tile *GetTileMut(s32 x, s32 y);
 void sub_8049ED4(void);
 void sub_804AC20(DungeonPos *pos);
 
+void sub_80495E4(void);
+void LoadDungeonTilesetAssets(void);
+void sub_8049820(void);
+void sub_8049840(void);
+void sub_8049884(void);
+void sub_80498A8(s32 x, s32 y);
+void sub_8049B8C(void);
+void sub_8049BB0(s32 x, s32 y);
+void sub_804A1F0(s32 a0, s32 a1);
+void sub_804A49C(s32 a0, s32 a1);
+void sub_804A728(DungeonPos *pos, s32 a1, u8 a2, u8 a3);
+void sub_804AA60(void);
+void sub_804AAAC(void);
+void sub_804AAD4(void);
+
 #endif // GUARD_DUNGEON_MAP_ACCESS_H
diff --git a/include/move_effects_target.h b/include/move_effects_target.h
@@ -4,7 +4,7 @@
 #include "structs/dungeon_entity.h"
 
 u8 sub_8075BF4(Entity * pokemon, s32 sleepClassStatusTurns);
-void sub_8075C58(Entity * pokemon, Entity * target, s32 turns, bool8 displayMessage);
+void SleepStatusTarget(Entity * pokemon, Entity * target, s32 turns, bool8 displayMessage);
 bool8 CannotSleep(Entity * pokemon, Entity * target, u8 param_3, bool8 displayMessage);
 void NightmareStatusTarget(Entity * pokemon, Entity * target, s32 turns);
 void NappingStatusTarget(Entity * pokemon, Entity * target, s32 turns);

diff --git a/include/status_actions.h b/include/status_actions.h
@@ -4,50 +4,49 @@
 #include "constants/move.h"
 #include "structs/dungeon_entity.h"
 
-bool8 sub_805B668(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 DreamEaterMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 sub_805B734(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 RecycleMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 ReflectMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805B808(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805B884(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 DragonRageMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 DragonDanceMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 SkullBashMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805B910(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805B968(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 LusterPurgeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 StruggleMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 RockSmashMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 sub_805BA44(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805BA50(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 ThiefAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 sub_805BB64(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805BB74(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805BB98(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 SwitcherOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 StayawayOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 CleanseOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4);
-bool8 sub_805BC70(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805BC98(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 SlumberOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 TwoEdgeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 SilenceOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4);
 bool8 ScannerOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 RadarOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 TransferOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4);
-bool8 sub_805BE90(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 SlowDownMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 LuminousOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4);
 bool8 PetrifyOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805BEB8(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805BEC8(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 PounceOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 TrawlOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 EscapeOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4);
-bool8 sub_805BF34(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 DroughtOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 TrapbustOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4);
-bool8 sub_805C080(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805C128(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805C138(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 RollcallOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 OneShotOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 IdentifyOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805C1BC(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805C1E4(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 VacuumCutMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 ReviverOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 ShockerOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 sub_805C208(Entity *pokemon, Entity *target, Move *move, u32 param_4);
 bool8 sub_805C288(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805C2A0(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 OneRoomOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 FillInOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4);
 bool8 sub_805C3DC(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805C3F8(Entity *pokemon, Entity *target, Move *move, s32 param_4);
-bool8 sub_805C45C(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 ItemizeOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
+bool8 HurlOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 MobileOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 StairsOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);
 bool8 LongtossOrbAction(Entity *pokemon, Entity *target, Move *move, s32 param_4);

diff --git a/include/structs/map.h b/include/structs/map.h
@@ -26,6 +26,8 @@ enum TerrainType
     TERRAIN_TYPE_UNK_x400 = 1 << 10,
     TERRAIN_TYPE_UNK_x800 = 1 << 11,
     TERRAIN_TYPE_UNK_x1000 = 1 << 12,
+    TERRAIN_TYPE_UNK_x2000 = 1 << 13,
+    TERRAIN_TYPE_UNK_x4000 = 1 << 14,
     TERRAIN_TYPE_UNREACHABLE_FROM_STAIRS = 1 << 15, // 0x8000
 };
 

diff --git a/include/trap.h b/include/trap.h
@@ -11,7 +11,7 @@ bool8 sub_807FD84(Entity *entity);
 bool8 sub_807FE04(DungeonPos *pos, char param_2);
 bool8 sub_807FE44(DungeonPos *pos, char param_2);
 void GetTrapName(u8 *buffer, u8 trapIndex);
-void sub_807FE9C(Entity *pokemon, DungeonPos *pos, int param_3, char param_4);
+void HandleTrap(Entity *pokemon, DungeonPos *pos, int param_3, char param_4);
 void HandleMudTrap(Entity *pokemon, Entity *target);
 void HandleStickyTrap(Entity *pokemon, Entity *target);
 void HandleGrimyTrap(Entity *pokemon, Entity *target);
@@ -26,6 +26,8 @@ void HandleSelfdestructTrap(Entity *pokemon, Entity *target);
 void HandleExplosionTrap(Entity *pokemon, Entity *target);
 void HandlePPZeroTrap(Entity *pokemon, Entity *target);
 void HandleWonderTile(Entity *pokemon, Entity *target);
+void HandleSealTrap(Entity *pokemon, Entity *target);
+void HandleWhirlwindTrap(Entity *entity, Entity *target);
 
 // code_807FCD4.s
 extern void HandleSealTrap(Entity *pokemon, Entity *target);

diff --git a/ld_script.txt b/ld_script.txt
@@ -268,7 +268,6 @@ SECTIONS {
         src/dungeon_ai_attack.o(.text);
         src/targeting_flags.o(.text);
         src/code_807CD9C.o(.text);
-        asm/code_807CD9C.o(.text);
         src/code_807E1A0.o(.text);
         src/weather.o(.text);
         asm/code_807E5AC.o(.text);