Skip to content

Commit 06f5e7a

Browse files
rr-rr-
committed
rename the repository
1 parent 75c4bcc commit 06f5e7a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+266
-265
lines changed

‎.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Build project
1919
run: |
2020
make build
21-
7z a release.zip ./bin/tombati.exe ./build/TR1Main.dll TR1Main.json
21+
7z a release.zip ./bin/tombati.exe ./build/Tomb1Main.dll Tomb1Main.json
2222
- name: Create Release
2323
id: create_release
2424
uses: actions/create-release@v1
@@ -40,5 +40,5 @@ jobs:
4040
with:
4141
upload_url: ${{ steps.create_release.outputs.upload_url }}
4242
asset_path: release.zip
43-
asset_name: TR1Main-${{ steps.get_version.outputs.VERSION }}.zip
43+
asset_name: Tomb1Main-${{ steps.get_version.outputs.VERSION }}.zip
4444
asset_content_type: application/zip

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CC=i686-w64-mingw32-gcc
22
CFLAGS=-W -static -shared -Isrc
33

44
build: $(shell find src)
5-
$(CC) $(CFLAGS) $(shell find src -type f -iname '*.c') -ldbghelp -o build/TR1Main.dll
5+
$(CC) $(CFLAGS) $(shell find src -type f -iname '*.c') -ldbghelp -o build/Tomb1Main.dll
66

77
docker_build:
88
docker build -t tr1main .

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# TR1Main
1+
# Tomb1Main
22

33
This is a dynamic library for the classic Tomb Raider I game (TombATI version).
44
The purpose of the library is to reimplement all the routines performed by the
@@ -10,13 +10,13 @@ This project is inspired by Arsunt's
1010
## Installing
1111

1212
Get a copy of the latest release from
13-
[here](https://github.com/rr-/TR1Main/releases) and unpack the contents to your
14-
game directory. Make sure you overwrite existing files. Currently TR1Main
13+
[here](https://github.com/rr-/Tomb1Main/releases) and unpack the contents to your
14+
game directory. Make sure you overwrite existing files. Currently Tomb1Main
1515
requires you to have the TombATI patch installed to work.
1616

1717
## Configuring
1818

19-
To configure TR1Main, edit the `TR1Main.json` file in your text editor such as
19+
To configure Tomb1Main, edit the `Tomb1Main.json` file in your text editor such as
2020
Notepad.
2121

2222
Currently the following configuration options are supported:

‎TR1Main.json ‎Tomb1Main.json

File renamed without changes.

‎bin/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## TR1Main binaries
1+
## Tomb1Main binaries
22

3-
- `tombati.exe` - a patched version of TombATI executable that loads the `TR1Main.dll` library.
3+
- `tombati.exe` - a patched version of TombATI executable that loads the `Tomb1Main.dll` library.
44
- `tombati.orig.exe` - the original TombATI version.

‎bin/tombati.exe

0 Bytes
Binary file not shown.

‎docs/progress.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Flags:
22
# - to do
3-
# * to do, called by TR1Main
3+
# * to do, called by Tomb1Main
44
# + fully decompiled
55
#
66
# Name Offset Size Flags

‎src/3dsystem/3d_gen.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_3DSYSTEM_3D_GEN_H
2-
#define TR1MAIN_3DSYSTEM_3D_GEN_H
1+
#ifndef TOMB1MAIN_3DSYSTEM_3D_GEN_H
2+
#define TOMB1MAIN_3DSYSTEM_3D_GEN_H
33

44
// clang-format off
55
#define S_InsertRoom ((void __cdecl(*)(int16_t* objptr))0x00401BD0)

‎src/3dsystem/3d_insert.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_3DSYSTEM_3D_INSERT_H
2-
#define TR1MAIN_3DSYSTEM_3D_INSERT_H
1+
#ifndef TOMB1MAIN_3DSYSTEM_3D_INSERT_H
2+
#define TOMB1MAIN_3DSYSTEM_3D_INSERT_H
33

44
// clang-format off
55
#define Insert2DLine ((void __cdecl(*)(int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t z, uint8_t color))0x00402710)

‎src/3dsystem/phd_math.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_3DSYSTEM_PHD_MATH_H
2-
#define TR1MAIN_3DSYSTEM_PHD_MATH_H
1+
#ifndef TOMB1MAIN_3DSYSTEM_PHD_MATH_H
2+
#define TOMB1MAIN_3DSYSTEM_PHD_MATH_H
33

44
// clang-format off
55
#define phd_atan ((int32_t __cdecl(*)(int32_t x, int32_t y))0x0042A8A0)

‎src/3dsystem/scalespr.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_3DSYSTEM_SCALESPR_H
2-
#define TR1MAIN_3DSYSTEM_SCALESPR_H
1+
#ifndef TOMB1MAIN_3DSYSTEM_SCALESPR_H
2+
#define TOMB1MAIN_3DSYSTEM_SCALESPR_H
33

44
// clang-format off
55
#define S_DrawUISprite ((void __cdecl(*)(int32_t x, int32_t y, int32_t scale, int16_t sprnum, int16_t brightness))0x00435D80)

‎src/game/box.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_GAME_BOX_H
2-
#define TR1MAIN_GAME_BOX_H
1+
#ifndef TOMB1MAIN_GAME_BOX_H
2+
#define TOMB1MAIN_GAME_BOX_H
33

44
#include "game/types.h"
55

‎src/game/camera.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_GAME_CAMERA_H
2-
#define TR1MAIN_GAME_CAMERA_H
1+
#ifndef TOMB1MAIN_GAME_CAMERA_H
2+
#define TOMB1MAIN_GAME_CAMERA_H
33

44
// clang-format off
55
#define CalculateCamera ((void __cdecl(*)())0x00410B40)

‎src/game/collide.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_GAME_COLLIDE_H
2-
#define TR1MAIN_GAME_COLLIDE_H
1+
#ifndef TOMB1MAIN_GAME_COLLIDE_H
2+
#define TOMB1MAIN_GAME_COLLIDE_H
33

44
#include "types.h"
55

‎src/game/const.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_GAME_CONST_H
2-
#define TR1MAIN_GAME_CONST_H
1+
#ifndef TOMB1MAIN_GAME_CONST_H
2+
#define TOMB1MAIN_GAME_CONST_H
33

44
#define ONE_DEGREE 182
55
#define NUM_PU 3

‎src/game/control.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -125,21 +125,21 @@ int32_t __cdecl ControlPhase(int32_t nframes, int demo_mode)
125125
++SaveGame[0].timer;
126126
--HealthBarTimer;
127127

128-
if (TR1MConfig.disable_healing_between_levels) {
128+
if (Tomb1MConfig.disable_healing_between_levels) {
129129
int lara_found = 0;
130130
for (int i = 0; i < LevelItemCount; i++) {
131131
if (Items[i].object_number == O_LARA) {
132132
lara_found = 1;
133133
}
134134
}
135135
if (lara_found) {
136-
TR1MData.stored_lara_health =
136+
Tomb1MData.stored_lara_health =
137137
LaraItem ? LaraItem->hit_points : LARA_HITPOINTS;
138138
}
139139
}
140140

141-
if (TR1MConfig.healthbar_showing_mode == TR1M_BSM_ALWAYS
142-
|| (TR1MConfig.healthbar_showing_mode == TR1M_BSM_FLASHING
141+
if (Tomb1MConfig.healthbar_showing_mode == Tomb1M_BSM_ALWAYS
142+
|| (Tomb1MConfig.healthbar_showing_mode == Tomb1M_BSM_FLASHING
143143
&& LaraItem
144144
&& LaraItem->hit_points < (LARA_HITPOINTS * 20) / 100)) {
145145
HealthBarTimer = 1;
@@ -148,7 +148,7 @@ int32_t __cdecl ControlPhase(int32_t nframes, int demo_mode)
148148
return 0;
149149
}
150150

151-
void TR1MInjectGameControl()
151+
void Tomb1MInjectGameControl()
152152
{
153153
INJECT(0x004133B0, ControlPhase);
154154
}

‎src/game/control.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_GAME_CONTROL_H
2-
#define TR1MAIN_GAME_CONTROL_H
1+
#ifndef TOMB1MAIN_GAME_CONTROL_H
2+
#define TOMB1MAIN_GAME_CONTROL_H
33

44
#include <stdint.h>
55

@@ -14,6 +14,6 @@
1414

1515
int32_t __cdecl ControlPhase(int32_t nframes, int demo_mode);
1616

17-
void TR1MInjectGameControl();
17+
void Tomb1MInjectGameControl();
1818

1919
#endif

‎src/game/data.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_GAME_DATA_H
2-
#define TR1MAIN_GAME_DATA_H
1+
#ifndef TOMB1MAIN_GAME_DATA_H
2+
#define TOMB1MAIN_GAME_DATA_H
33

44
#include "game/const.h"
55
#include "game/types.h"

‎src/game/demo.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_GAME_DEMO_H
2-
#define TR1MAIN_GAME_DEMO_H
1+
#ifndef TOMB1MAIN_GAME_DEMO_H
2+
#define TOMB1MAIN_GAME_DEMO_H
33

44
// clang-format off
55
#define GetDemoInput ((void __cdecl(*)())0x00415D70)

‎src/game/draw.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void __cdecl PrintRooms(int16_t room_number)
6363
r->bound_top = PhdWinMaxY;
6464
}
6565

66-
void TR1MInjectGameDraw()
66+
void Tomb1MInjectGameDraw()
6767
{
6868
INJECT(0x004171E0, PrintRooms);
6969
}

‎src/game/draw.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_GAME_DRAW_H
2-
#define TR1MAIN_GAME_DRAW_H
1+
#ifndef TOMB1MAIN_GAME_DRAW_H
2+
#define TOMB1MAIN_GAME_DRAW_H
33

44
#include <stdint.h>
55

@@ -11,6 +11,6 @@
1111

1212
void __cdecl PrintRooms(int16_t room_number);
1313

14-
void TR1MInjectGameDraw();
14+
void Tomb1MInjectGameDraw();
1515

1616
#endif

‎src/game/effects.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
void __cdecl FxChainBlock(ITEM_INFO* item)
77
{
8-
if (TR1MConfig.fix_tihocan_secret_sound) {
8+
if (Tomb1MConfig.fix_tihocan_secret_sound) {
99
SoundEffect(33, NULL, 0);
1010
FlipEffect = -1;
1111
} else {
@@ -21,7 +21,7 @@ void __cdecl FxChainBlock(ITEM_INFO* item)
2121
}
2222
}
2323

24-
void TR1MInjectGameEffects()
24+
void Tomb1MInjectGameEffects()
2525
{
2626
INJECT(0x0041AD00, FxChainBlock);
2727
}

‎src/game/effects.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_GAME_EFFECTS_H
2-
#define TR1MAIN_GAME_EFFECTS_H
1+
#ifndef TOMB1MAIN_GAME_EFFECTS_H
2+
#define TOMB1MAIN_GAME_EFFECTS_H
33

44
#include <stdint.h>
55
#include "game/types.h"
@@ -13,6 +13,6 @@
1313

1414
void __cdecl FxChainBlock(ITEM_INFO* item);
1515

16-
void TR1MInjectGameEffects();
16+
void Tomb1MInjectGameEffects();
1717

1818
#endif

‎src/game/health.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ void __cdecl DrawGameInfo()
1414
DrawAirBar();
1515
DrawPickups();
1616

17-
if (TR1MConfig.enable_enemy_healthbar && Lara.target) {
18-
TR1MRenderBar(
17+
if (Tomb1MConfig.enable_enemy_healthbar && Lara.target) {
18+
Tomb1MRenderBar(
1919
Lara.target->hit_points,
2020
Objects[Lara.target->object_number].hit_points
2121
* (SaveGame[0].bonus_flag ? 2 : 1),
22-
TR1M_BAR_ENEMY_HEALTH);
22+
Tomb1M_BAR_ENEMY_HEALTH);
2323
}
2424
}
2525

@@ -144,7 +144,7 @@ void __cdecl DrawPickups()
144144
pu->duration = 0;
145145
} else {
146146
S_DrawUISprite(
147-
x, y, TR1MGetRenderScale(12288), pu->sprnum, 4096);
147+
x, y, Tomb1MGetRenderScale(12288), pu->sprnum, 4096);
148148
x -= sprite_width;
149149
}
150150
}
@@ -162,7 +162,7 @@ void __cdecl AddDisplayPickup(int16_t objnum)
162162
}
163163
}
164164

165-
void TR1MInjectGameHealth()
165+
void Tomb1MInjectGameHealth()
166166
{
167167
INJECT(0x0041DD00, DrawGameInfo);
168168
INJECT(0x0041DEA0, DrawHealthBar);

‎src/game/health.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_GAME_HEALTH_H
2-
#define TR1MAIN_GAME_HEALTH_H
1+
#ifndef TOMB1MAIN_GAME_HEALTH_H
2+
#define TOMB1MAIN_GAME_HEALTH_H
33

44
void __cdecl MakeAmmoString(char* string);
55
void __cdecl DrawAmmoInfo();
@@ -10,6 +10,6 @@ void __cdecl AddDisplayPickup(int16_t objnum);
1010
void __cdecl InitialisePickUpDisplay();
1111
void __cdecl DrawPickups();
1212

13-
void TR1MInjectGameHealth();
13+
void Tomb1MInjectGameHealth();
1414

1515
#endif

‎src/game/inv.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_GAME_INV_H
2-
#define TR1MAIN_GAME_INV_H
1+
#ifndef TOMB1MAIN_GAME_INV_H
2+
#define TOMB1MAIN_GAME_INV_H
33

44
// clang-format off
55
#define Inv_RemoveItem ((void __cdecl(*)(int16_t item_num))0x004212A0)

‎src/game/items.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void __cdecl InitialiseFXArray()
1515
fx->next_fx = NO_ITEM;
1616
}
1717

18-
void TR1MInjectGameItems()
18+
void Tomb1MInjectGameItems()
1919
{
2020
INJECT(0x00422250, InitialiseFXArray);
2121
}

‎src/game/items.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef TR1MAIN_GAME_ITEMS_H
2-
#define TR1MAIN_GAME_ITEMS_H
1+
#ifndef TOMB1MAIN_GAME_ITEMS_H
2+
#define TOMB1MAIN_GAME_ITEMS_H
33

44
// clang-format off
55
#define InitialiseItemArray ((void __cdecl(*)(int item_count))0x00421B10)
@@ -8,6 +8,6 @@
88

99
void __cdecl InitialiseFXArray();
1010

11-
void TR1MInjectGameItems();
11+
void Tomb1MInjectGameItems();
1212

1313
#endif

0 commit comments

Comments
 (0)