Merge pull request #117 from AnonymousRandomPerson/main

Decomped GetTile

asm/include/overlay_29_023350FC.inc

@@ -1,86 +1,47 @@
 #pragma once
-.public _020AFC70
-.public _s32_div_f
 .public AbilityIsActiveVeneer
+.public CASTFORM_WEATHER_ATTRIBUTE_TABLE
 .public CalcSpeedStageWrapper
 .public CalcStatusDuration
-.public CASTFORM_WEATHER_ATTRIBUTE_TABLE
 .public CeilFixedPoint
 .public Conversion2IsActive
-.public Debug_Print0
-.public DEFAULT_TILE
-.public DetermineMonsterShadow
-.public DIRECTIONS_XY
-.public DisplayCharTextureUi
-.public DrawMinimapTile
 .public DUNGEON_PTR
+.public DetermineMonsterShadow
 .public DungeonGetSpriteIndex
 .public DungeonGoesUp
 .public EntityIsValid__023350D8
-.public EntityIsValid__02337CA8
 .public GetApparentWeather
-.public GetBgRegionArea
 .public GetIdleAnimationId
 .public GetLanguage
 .public GetLeader
 .public GetMonsterApparentId
 .public GetType
-.public GetVisibilityRange
 .public GetWeatherColorTable
 .public HasLowHealth
 .public InitRender3dElement64
-.public InitTilesetBuffer
-.public IsBackgroundTileset
 .public IsCurrentFixedRoomBossFight
-.public IsGoldenChamber
-.public IsSecretBazaar
 .public LoadWteFromFileDirectory
 .public LoadWtuFromBin
 .public LogMessageByIdWithPopupCheckUser
-.public ov10_022C2588
-.public ov10_022C25EC
-.public ov10_022C2638
-.public ov10_022C2654
-.public ov10_022C26A0
-.public ov10_022C2720
-.public ov29_022DE0EC
+.public ProcessWte
+.public SPORT_CONDITION_TURN_RANGE
+.public SetBothScreensWindowColorToDefault
+.public SetScreenWindowsColor
+.public TickStatusTurnCounter
+.public _020AFC70
+.public _s32_div_f
 .public ov29_022DE608
-.public ov29_022E0378
-.public ov29_022E2930
 .public ov29_022E65F4
-.public ov29_022E66C4
 .public ov29_022E9A6C
-.public ov29_022E9F80
-.public ov29_022FF958
 .public ov29_02304830
 .public ov29_02334E70
 .public ov29_02352B4C
-.public ov29_02352B60
-.public ov29_02352B74
-.public ov29_02352B88
-.public ov29_02352B9C
-.public ov29_02352D58
-.public ov29_02352F14
 .public ov29_0235371C
 .public ov29_02353720
 .public ov29_0237C850
-.public ov29_0237C9B8
 .public ov29_0237CA8C
 .public ov29_0237CA90
 .public ov29_0237CA96
-.public ov29_0237CAA0
-.public ov29_0237CAAC
-.public ov29_0237CAB8
-.public ProcessWte
-.public RandIntSafe
-.public SECONDARY_TERRAIN_TYPES
-.public SetBothScreensWindowColorToDefault
-.public SetScreenWindowsColor
-.public SPORT_CONDITION_TURN_RANGE
 .public sub_0201E020
 .public sub_0201E080
 .public sub_0201F2A0
-.public sub_0204AED0
-.public sub_02051D8C
-.public sub_02051E60
-.public TickStatusTurnCounter

asm/include/overlay_29_02336164.inc

@@ -0,0 +1,44 @@
+#pragma once
+.public DEFAULT_TILE
+.public DIRECTIONS_XY
+.public DUNGEON_PTR
+.public Debug_Print0
+.public DetermineMonsterShadow
+.public DrawMinimapTile
+.public EntityIsValid__02337CA8
+.public GetBgRegionArea
+.public GetLeader
+.public GetTile
+.public GetVisibilityRange
+.public InitTilesetBuffer
+.public IsBackgroundTileset
+.public IsCurrentFixedRoomBossFight
+.public IsGoldenChamber
+.public IsSecretBazaar
+.public RandIntSafe
+.public SECONDARY_TERRAIN_TYPES
+.public ov10_022C2588
+.public ov10_022C25EC
+.public ov10_022C2638
+.public ov10_022C2654
+.public ov10_022C26A0
+.public ov10_022C2720
+.public ov29_022DE0EC
+.public ov29_022E0378
+.public ov29_022E2930
+.public ov29_022E66C4
+.public ov29_022E9F80
+.public ov29_022FF958
+.public ov29_02352B60
+.public ov29_02352B74
+.public ov29_02352B88
+.public ov29_02352B9C
+.public ov29_02352D58
+.public ov29_02352F14
+.public ov29_0237C9B8
+.public ov29_0237CAA0
+.public ov29_0237CAAC
+.public ov29_0237CAB8
+.public sub_0204AED0
+.public sub_02051D8C
+.public sub_02051E60

include/dungeon_map_access.h

@@ -0,0 +1,8 @@
+#ifndef PMDSKY_DUNGEON_MAP_ACCESS_H
+#define PMDSKY_DUNGEON_MAP_ACCESS_H
+
+#include "dungeon_mode.h"
+
+struct tile* GetTile(s32 x, s32 y);
+
+#endif //PMDSKY_DUNGEON_MAP_ACCESS_H

main.lsf

@@ -394,6 +394,8 @@ Overlay OVY_29
 	Object asm/overlay_29_02333FD0.o
 	Object src/overlay_29_023350D8.o
 	Object asm/overlay_29_023350FC.o
+	Object src/dungeon_map_access.o
+	Object asm/overlay_29_02336164.o
 	Object src/overlay_29_02337CA8.o
 	Object asm/overlay_29_02337CCC.o
 	Object src/overlay_29_02338548.o

src/dungeon_ai_items.c

@@ -3,6 +3,7 @@
 #include "direction.h"
 #include "dungeon_ai_items_1.h"
 #include "dungeon_capabilities_1.h"
+#include "dungeon_map_access.h"
 #include "dungeon_util_static.h"
 #include "item.h"
 #include "item_util.h"
@@ -18,7 +19,6 @@ extern struct bag_items *BAG_ITEMS_PTR_MIRROR;
 
 extern void SetMonsterActionFields(struct action_data *action_pointer, u16 action);
 extern bool8 IqSkillIsEnabled(struct entity *entity, u8 iq_skill);
-extern const struct tile *GetTile(s32 x, s32 y);
 extern bool8 TestItemAiFlag(s16 item_id, s32 flag);
 extern void GetPossibleAiArcItemTargets(struct entity *user, struct item *item, struct position positions[], bool8 always_add_position);
 extern s32 GetDirectionTowardsPosition(struct position *origin, struct position *target);

src/dungeon_map_access.c

@@ -0,0 +1,22 @@
+#include "dungeon_map_access.h"
+#include "dungeon.h"
+
+extern struct tile* DEFAULT_TILE;
+extern struct dungeon* DUNGEON_PTR[];
+
+struct tile* GetTile(s32 x, s32 y)
+{
+    if (x < 0)
+        return DEFAULT_TILE;
+
+    if (y < 0)
+        return DEFAULT_TILE;
+
+    if (x >= DUNGEON_MAX_SIZE_X)
+        return DEFAULT_TILE;
+
+    if (y >= DUNGEON_MAX_SIZE_Y)
+        return DEFAULT_TILE;
+
+    return DUNGEON_PTR[0]->tile_ptrs[y][x];
+}

src/dungeon_range.c

@@ -1,11 +1,11 @@
 #include "dungeon_range.h"
 #include "dg_camera.h"
 #include "dungeon.h"
+#include "dungeon_map_access.h"
 #include "map.h"
 
 extern struct dungeon *DUNGEON_PTR[];
 
-extern struct tile* GetTile(int x, int y);
 extern s32 abs(s32 value);
 
 bool8 IsPositionActuallyInSight(struct position *origin, struct position *target, bool8 user_has_dropeye)