Bug Fix

patches/game_engine/quick_hacks.asm

@@ -1,10 +1,10 @@
 EGG_HATCH_LEVEL EQU 1
 EV_CAP EQU 252
 
-PLAYER_S_X EQU 0x42
-PLAYER_S_Y EQU 0x14
+PLAYER_S_X EQU 0x0
+PLAYER_S_Y EQU 0x0
 
-PLAYER_S_B EQU 0x0
+PLAYER_S_B EQU 0xFF
 PLAYER_S_M EQU 0x0
 
 // Something //

preproc.exe.stackdump

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

sots-private

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

src/include/script/mugshot.h

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

src/interface/mugshot_table.s

@@ -3,120 +3,25 @@
 .section .rodata
 .align 2
 .global mugshots
-mugshots:
-
-@@----------------------------------------------------------------------------------------------------------
-@@ Noah
-@@----------------------------------------------------------------------------------------------------------
-.word mug_01_00Tiles
-.word mug_01_00Pal
-.word mug_01_01Tiles
-.word mug_01_01Pal
-.word mug_01_02Tiles
-.word mug_01_02Pal
-.word mug_01_03Tiles
-.word mug_01_03Pal
-.word mug_01_04Tiles
-.word mug_01_04Pal
-.word mug_01_05Tiles
-.word mug_01_05Pal
-.word mug_01_06Tiles
-.word mug_01_06Pal
-.word mug_01_07Tiles
-.word mug_01_07Pal
-
-@@----------------------------------------------------------------------------------------------------------
-@@ Emma
-@@----------------------------------------------------------------------------------------------------------
-.word mug_02_00Tiles
-.word mug_02_00Pal
-.word mug_02_01Tiles
-.word mug_02_01Pal
-.word mug_02_02Tiles
-.word mug_02_02Pal
-.word mug_02_03Tiles
-.word mug_02_03Pal
-.word mug_02_04Tiles
-.word mug_02_04Pal
-.word mug_02_05Tiles
-.word mug_02_05Pal
-.word mug_02_06Tiles
-.word mug_02_06Pal
-.word mug_02_07Tiles
-.word mug_02_07Pal
-
-@@----------------------------------------------------------------------------------------------------------
-@@ Linda
-@@----------------------------------------------------------------------------------------------------------
-.word mug_03_00Tiles
-.word mug_03_00Pal
-.word mug_03_01Tiles
-.word mug_03_01Pal
-.word mug_03_02Tiles
-.word mug_03_02Pal
-
-@@----------------------------------------------------------------------------------------------------------
-@@ Idan
-@@----------------------------------------------------------------------------------------------------------
-.word mug_04_00Tiles
-.word mug_04_00Pal
-.word mug_04_01Tiles
-.word mug_04_01Pal
-.word mug_04_02Tiles
-.word mug_04_02Pal
-.word mug_04_03Tiles
-.word mug_04_03Pal
-@@.word mug_04_04Tiles those do not exist
-@@.word mug_04_04Pal
-
-@@----------------------------------------------------------------------------------------------------------
-@@ Achim
-@@----------------------------------------------------------------------------------------------------------
-.word mug_05_00Tiles
-.word mug_05_00Pal
-.word mug_05_01Tiles
-.word mug_05_01Pal
-.word mug_05_02Tiles
-.word mug_05_02Pal
 
-@@----------------------------------------------------------------------------------------------------------
-@@ Norman
-@@----------------------------------------------------------------------------------------------------------
-.word mug_06_00Tiles
-.word mug_06_00Pal
-.word mug_06_01Tiles
-.word mug_06_01Pal
-.word mug_06_02Tiles
-.word mug_06_02Pal
-
-@@----------------------------------------------------------------------------------------------------------
-@@ Jana
-@@----------------------------------------------------------------------------------------------------------
-.word mug_07_00Tiles
-.word mug_07_00Pal
-.word mug_07_01Tiles
-.word mug_07_01Pal
-.word mug_07_02Tiles
-.word mug_07_02Pal
-
-@@----------------------------------------------------------------------------------------------------------
-@@ Markus
-@@----------------------------------------------------------------------------------------------------------
-.word mug_08_00Tiles
-.word mug_08_00Pal
-.word mug_08_01Tiles
-.word mug_08_01Pal
-
-@@----------------------------------------------------------------------------------------------------------
-@@ Isabelle
-@@----------------------------------------------------------------------------------------------------------
-.word mug_09_00Tiles
-.word mug_09_00Pal
-.word mug_09_01Tiles
-.word mug_09_01Pal
-
-@@----------------------------------------------------------------------------------------------------------
-@@ Diana
-@@----------------------------------------------------------------------------------------------------------
-.word mug_10_00Tiles
-.word mug_10_00Pal
+mugshots:
+.word mug_001Tiles
+.word mug_001Pal
+.word mug_002Tiles
+.word mug_002Pal
+.word mug_003Tiles
+.word mug_003Pal
+.word mug_004Tiles
+.word mug_004Pal
+.word mug_005Tiles
+.word mug_005Pal
+.word mug_006Tiles
+.word mug_006Pal
+.word mug_007Tiles
+.word mug_007Pal
+.word mug_008Tiles
+.word mug_008Pal
+.word mug_009Tiles
+.word mug_009Pal
+.word mug_010Tiles
+.word mug_010Pal