Karathan
/
source_of_the_sovereign
mirror of https://github.com/SBird1337/source_of_the_sovereign
Watch 1
Star 0
Fork 0
Code Issues Releases 0 Wiki Activity
Browse Source

Bug Fix

dragonflysots 6 years ago
parent
b47250201f
commit
eca3aed911
7 changed files with 3673 additions and 168 deletions
Split View Show Diff Stats
  1. 3618
    0
      assets/sound/Music/MID/test.s
  2. BIN
      object/linked.rar
  3. 3
    3
      patches/game_engine/quick_hacks.asm
  4. 20
    0
      preproc.exe.stackdump
  5. 1
    1
      sots-private
  6. 10
    48
      src/include/script/mugshot.h
  7. 21
    116
      src/interface/mugshot_table.s

+ 3618
- 0
assets/sound/Music/MID/test.s
File diff suppressed because it is too large
View File


BIN
object/linked.rar View File


+ 3
- 3
patches/game_engine/quick_hacks.asm View File 

@@ -1,10 +1,10 @@
1 1 
 EGG_HATCH_LEVEL EQU 1
2 2 
 EV_CAP EQU 252
3 3
4 
-PLAYER_S_X EQU 0x42
5 
-PLAYER_S_Y EQU 0x14
4 
+PLAYER_S_X EQU 0x0
5 
+PLAYER_S_Y EQU 0x0
6 6
7 
-PLAYER_S_B EQU 0x0
7 
+PLAYER_S_B EQU 0xFF
8 8 
 PLAYER_S_M EQU 0x0
9 9
10 10 
 // Something //

+ 20
- 0
preproc.exe.stackdump View File 

@@ -0,0 +1,20 @@
1 
+Exception: STATUS_ACCESS_VIOLATION at rip=001004018B3
2 
+rax=0000000000000024 rbx=00000000FFFFC1C0 rcx=00000000FFFFC1E4
3 
+rdx=00000000FFFFC1E4 rsi=0000686353206E65 rdi=000000060005B910
4 
+r8 =FFFFFFFAFFFA0838 r9 =0000000000000001 r10=0000000100000000
5 
+r11=00000001004018B3 r12=00000000FFFFC6E0 r13=0000000000000000
6 
+r14=00000003FE71C560 r15=00000000FFFFC6F0
7 
+rbp=000000010040A0B9 rsp=00000000FFFFC190
8 
+program=C:\cygwin64\usr\local\bin\preproc.exe, pid 18840, thread main
9 
+cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B
10 
+Stack trace:
11 
+Frame        Function    Args
12 
+0010040A0B9  001004018B3 (003FE7178CD, 000FFFFCBC6, 000FFFFC6E0, 00000000000)
13 
+000FFFFCBC6  00100401917 (00000000072, 0060005B8C0, 00000000001, 00600000028)
14 
+000FFFFCBC6  00100401E11 (00000000000, 00000000000, 7FFA7E426439, 45445F4E414C)
15 
+000FFFFCBC6  00100404CF1 (001802DC900, 04949435341, 00180189A8A, 0018005A474)
16 
+000FFFFCBC6  00100408225 (00000000000, 00000000000, 00000000030, 30001000300FF00)
17 
+000FFFFCCB0  001800479B2 (00000000000, 00000000000, 00000000000, 00000000000)
18 
+00000000000  00180045653 (00000000000, 00000000000, 00000000000, 00000000000)
19 
+000FFFFFFF0  00180045704 (00000000000, 00000000000, 00000000000, 00000000000)
20 
+End of stack trace

+ 1
- 1
sots-private 

@@ -1 +1 @@
1 
-Subproject commit 316fef592fbc55176ec56dab8220d65587b02659
1 
+Subproject commit 67d5677c7b48c4ba2bacc91d46456452aad0e81a

+ 10
- 48
src/include/script/mugshot.h View File 

@@ -2,52 +2,14 @@
2 2 
 #define MUG_IDS_H_
3 3
4 4 
 #define MUG_NOAH 1
5 
-#define MUG_EMMA 9
6 
-#define MUG_LINDA 17
7 
-#define MUG_IDAN 20
8 
-#define MUG_ACHIM 24
9 
-#define MUG_NORMAN 27
10 
-#define MUG_JANA 30
11 
-#define MUG_MARKUS 33
12 
-#define MUG_ISABELLE 35
13 
-#define MUG_DIANA 37
5 
+#define MUG_EMMA 2
6 
+#define MUG_LINDA 3
7 
+#define MUG_IDAN 4
8 
+#define MUG_ACHIM 5
9 
+#define MUG_NORMAN 6
10 
+#define MUG_JANA 7
11 
+#define MUG_MARKUS 8
12 
+#define MUG_ISABELLE 9
13 
+#define MUG_DIANA 10
14 14
15 
-#define MUG_NOAH_NORMAL 1
16 
-#define MUG_NOAH_LACHEN 2
17 
-#define MUG_NOAH_BESCHEIDEN 3
18 
-#define MUG_NOAH_ERSTAUNT 4
19 
-#define MUG_NOAH_TRAURIG 5
20 
-#define MUG_NOAH_SAUER 6
21 
-#define MUG_NOAH_WUT 7
22 
-#define MUG_NOAH_GRINSEN 8
23 
-#define MUG_EMMA_NORMAL 9
24 
-#define MUG_EMMA_LACHEN 10
25 
-#define MUG_EMMA_BESCHEIDEN 11
26 
-#define MUG_EMMA_ERSTAUNT 12
27 
-#define MUG_EMMA_TRAURIG 13
28 
-#define MUG_EMMA_SAUER 14
29 
-#define MUG_EMMA_WUT 15
30 
-#define MUG_EMMA_GRINSEN 16
31 
-#define MUG_LINDA_NORMAL 17
32 
-#define MUG_LINDA_LACHEN 18
33 
-#define MUG_LINDA_BESCHEIDEN 19
34 
-#define MUG_IDAN_NORMAL 20
35 
-#define MUG_IDAN_ERSTAUNT 21
36 
-#define MUG_IDAN_STUTZIG 22
37 
-#define MUG_IDAN_TRAURIG 23
38 
-#define MUG_ACHIM_NORMAL 24
39 
-#define MUG_ACHIM_GRINSEN 25
40 
-#define MUG_ACHIM_TRAURIG 26
41 
-#define MUG_NORMAN_NORMAL 27
42 
-#define MUG_NORMAN_GRINSEN 28
43 
-#define MUG_NORMAN_LACHEN 29
44 
-#define MUG_JANA_NORMAL 30
45 
-#define MUG_JANA_GRINSEN 31
46 
-#define MUG_JANA_LACHEN 32
47 
-#define MUG_MARKUS_NORMAL 33
48 
-#define MUG_MARKUS_NACHDENKEN 34
49 
-#define MUG_ISABELLE_NORMAL 35
50 
-#define MUG_ISABELLE_NACHDENKEN 36
51 
-#define MUG_DIANA_NORMAL 37
52 
-
53 
-#endif /* MUG_IDS_H */
15 
+#endif /* MUG_IDS_H */

+ 21
- 116
src/interface/mugshot_table.s View File 

@@ -3,120 +3,25 @@
3 3 
 .section .rodata
4 4 
 .align 2
5 5 
 .global mugshots
6 
-mugshots:
7 
-
8 
-@@----------------------------------------------------------------------------------------------------------
9 
-@@ Noah
10 
-@@----------------------------------------------------------------------------------------------------------
11 
-.word mug_01_00Tiles
12 
-.word mug_01_00Pal
13 
-.word mug_01_01Tiles
14 
-.word mug_01_01Pal
15 
-.word mug_01_02Tiles
16 
-.word mug_01_02Pal
17 
-.word mug_01_03Tiles
18 
-.word mug_01_03Pal
19 
-.word mug_01_04Tiles
20 
-.word mug_01_04Pal
21 
-.word mug_01_05Tiles
22 
-.word mug_01_05Pal
23 
-.word mug_01_06Tiles
24 
-.word mug_01_06Pal
25 
-.word mug_01_07Tiles
26 
-.word mug_01_07Pal
27 
-
28 
-@@----------------------------------------------------------------------------------------------------------
29 
-@@ Emma
30 
-@@----------------------------------------------------------------------------------------------------------
31 
-.word mug_02_00Tiles
32 
-.word mug_02_00Pal
33 
-.word mug_02_01Tiles
34 
-.word mug_02_01Pal
35 
-.word mug_02_02Tiles
36 
-.word mug_02_02Pal
37 
-.word mug_02_03Tiles
38 
-.word mug_02_03Pal
39 
-.word mug_02_04Tiles
40 
-.word mug_02_04Pal
41 
-.word mug_02_05Tiles
42 
-.word mug_02_05Pal
43 
-.word mug_02_06Tiles
44 
-.word mug_02_06Pal
45 
-.word mug_02_07Tiles
46 
-.word mug_02_07Pal
47 
-
48 
-@@----------------------------------------------------------------------------------------------------------
49 
-@@ Linda
50 
-@@----------------------------------------------------------------------------------------------------------
51 
-.word mug_03_00Tiles
52 
-.word mug_03_00Pal
53 
-.word mug_03_01Tiles
54 
-.word mug_03_01Pal
55 
-.word mug_03_02Tiles
56 
-.word mug_03_02Pal
57 
-
58 
-@@----------------------------------------------------------------------------------------------------------
59 
-@@ Idan
60 
-@@----------------------------------------------------------------------------------------------------------
61 
-.word mug_04_00Tiles
62 
-.word mug_04_00Pal
63 
-.word mug_04_01Tiles
64 
-.word mug_04_01Pal
65 
-.word mug_04_02Tiles
66 
-.word mug_04_02Pal
67 
-.word mug_04_03Tiles
68 
-.word mug_04_03Pal
69 
-@@.word mug_04_04Tiles those do not exist
70 
-@@.word mug_04_04Pal
71 
-
72 
-@@----------------------------------------------------------------------------------------------------------
73 
-@@ Achim
74 
-@@----------------------------------------------------------------------------------------------------------
75 
-.word mug_05_00Tiles
76 
-.word mug_05_00Pal
77 
-.word mug_05_01Tiles
78 
-.word mug_05_01Pal
79 
-.word mug_05_02Tiles
80 
-.word mug_05_02Pal
81 6
82 
-@@----------------------------------------------------------------------------------------------------------
83 
-@@ Norman
84 
-@@----------------------------------------------------------------------------------------------------------
85 
-.word mug_06_00Tiles
86 
-.word mug_06_00Pal
87 
-.word mug_06_01Tiles
88 
-.word mug_06_01Pal
89 
-.word mug_06_02Tiles
90 
-.word mug_06_02Pal
91 
-
92 
-@@----------------------------------------------------------------------------------------------------------
93 
-@@ Jana
94 
-@@----------------------------------------------------------------------------------------------------------
95 
-.word mug_07_00Tiles
96 
-.word mug_07_00Pal
97 
-.word mug_07_01Tiles
98 
-.word mug_07_01Pal
99 
-.word mug_07_02Tiles
100 
-.word mug_07_02Pal
101 
-
102 
-@@----------------------------------------------------------------------------------------------------------
103 
-@@ Markus
104 
-@@----------------------------------------------------------------------------------------------------------
105 
-.word mug_08_00Tiles
106 
-.word mug_08_00Pal
107 
-.word mug_08_01Tiles
108 
-.word mug_08_01Pal
109 
-
110 
-@@----------------------------------------------------------------------------------------------------------
111 
-@@ Isabelle
112 
-@@----------------------------------------------------------------------------------------------------------
113 
-.word mug_09_00Tiles
114 
-.word mug_09_00Pal
115 
-.word mug_09_01Tiles
116 
-.word mug_09_01Pal
117 
-
118 
-@@----------------------------------------------------------------------------------------------------------
119 
-@@ Diana
120 
-@@----------------------------------------------------------------------------------------------------------
121 
-.word mug_10_00Tiles
122 
-.word mug_10_00Pal
7 
+mugshots:
8 
+.word mug_001Tiles
9 
+.word mug_001Pal
10 
+.word mug_002Tiles
11 
+.word mug_002Pal
12 
+.word mug_003Tiles
13 
+.word mug_003Pal
14 
+.word mug_004Tiles
15 
+.word mug_004Pal
16 
+.word mug_005Tiles
17 
+.word mug_005Pal
18 
+.word mug_006Tiles
19 
+.word mug_006Pal
20 
+.word mug_007Tiles
21 
+.word mug_007Pal
22 
+.word mug_008Tiles
23 
+.word mug_008Pal
24 
+.word mug_009Tiles
25 
+.word mug_009Pal
26 
+.word mug_010Tiles
27 
+.word mug_010Pal