WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 0c0f9f8

Browse files
AnonymousRandomPersonAnonymousRandomPerson
authored
Merge pull request #213 from slaw-22/EventFlagResume-EventFlagBackup
Decomp EventFlagResume and EventFlagBackup
2 parents a798662 + fdcfbc4 commit 0c0f9f8

File tree

6 files changed

+82
-298
lines changed

6 files changed

+82
-298
lines changed

‎asm/include/main_0204BFC0.inc‎ renamed to ‎asm/include/main_0204C408.inc‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
#pragma once
22
.public DEBUG_SPECIAL_EPISODE_NUMBER
33
.public Debug_Print
4-
.public Debug_Print0
5-
.public GetGameMode
4+
.public EventFlagBackup
65
.public LoadScriptVariableRaw
76
.public LoadScriptVariableValue
87
.public LoadScriptVariableValueAtIndex
98
.public MemcpySimple
109
.public SCRIPT_VARS_VALUES
1110
.public SaveScriptVariableValue
1211
.public SaveScriptVariableValueAtIndex
13-
.public ScenarioFlagBackup
1412
.public ZinitScriptVariable
15-
.public _0209CF64
16-
.public _0209CF84
1713
.public _0209DFA0
18-
.public sub_0204CBE8

‎asm/main_0204BFC0.s‎ renamed to ‎asm/main_0204C408.s‎

Lines changed: 1 addition & 285 deletions
Original file line numberDiff line numberDiff line change
@@ -1,292 +1,8 @@
11
.include "asm/macros.inc"
2-
.include "main_0204BFC0.inc"
2+
.include "main_0204C408.inc"
33

44
.text
55

6-
arm_func_start EventFlagResume
7-
EventFlagResume: ; 0x0204BFC0
8-
stmdb sp!, {r4, lr}
9-
bl GetGameMode
10-
cmp r0, #1
11-
ldmlsia sp!, {r4, pc}
12-
sub r4, r0, #2
13-
ldr r0, _0204C1E0 ; =_0209CF64
14-
mov r1, r4
15-
bl Debug_Print0
16-
mov r0, r4, lsl #0x10
17-
mov r2, r0, lsr #0x10
18-
mov r0, #0
19-
mov r1, #0x21
20-
bl LoadScriptVariableValueAtIndex
21-
mov r2, r0
22-
mov r0, #0
23-
mov r1, #0x1c
24-
bl SaveScriptVariableValue
25-
mov r0, r4, lsl #0x10
26-
mov r2, r0, lsr #0x10
27-
mov r0, #0
28-
mov r1, #0x22
29-
bl LoadScriptVariableValueAtIndex
30-
mov r2, r0
31-
mov r0, #0
32-
mov r1, #0x1d
33-
bl SaveScriptVariableValue
34-
mov r0, #0
35-
mov r1, #0x23
36-
mov r2, r4, lsl #0x10
37-
mov r2, r2, lsr #0x10
38-
bl LoadScriptVariableValueAtIndex
39-
mov r2, r0
40-
mov r0, #0
41-
mov r1, #0x1e
42-
bl SaveScriptVariableValue
43-
mov r0, #0
44-
mov r1, #0x24
45-
mov r2, r4, lsl #0x10
46-
mov r2, r2, lsr #0x10
47-
bl LoadScriptVariableValueAtIndex
48-
mov r2, r0
49-
mov r0, #0
50-
mov r1, #0x1f
51-
bl SaveScriptVariableValue
52-
mov r0, #0
53-
mov r1, #0x25
54-
mov r2, r4, lsl #0x10
55-
mov r2, r2, lsr #0x10
56-
bl LoadScriptVariableValueAtIndex
57-
mov r2, r0
58-
mov r0, #0
59-
mov r1, #0x20
60-
bl SaveScriptVariableValue
61-
mov r0, #0
62-
mov r1, #0x2d
63-
mov r2, r4, lsl #0x10
64-
mov r2, r2, lsr #0x10
65-
bl LoadScriptVariableValueAtIndex
66-
mov r2, r0
67-
mov r0, #0
68-
mov r1, #0x27
69-
bl SaveScriptVariableValue
70-
mov r0, r4, lsl #0x10
71-
mov r2, r0, lsr #0x10
72-
mov r0, #0
73-
mov r1, #0x2e
74-
bl LoadScriptVariableValueAtIndex
75-
mov r2, r0
76-
mov r0, #0
77-
mov r1, #0x28
78-
bl SaveScriptVariableValue
79-
mov r0, r4, lsl #0x10
80-
mov r2, r0, lsr #0x10
81-
mov r0, #0
82-
mov r1, #0x2f
83-
bl LoadScriptVariableValueAtIndex
84-
mov r2, r0
85-
mov r0, #0
86-
mov r1, #0x29
87-
bl SaveScriptVariableValue
88-
mov r0, r4, lsl #0x10
89-
mov r2, r0, lsr #0x10
90-
mov r0, #0
91-
mov r1, #0x30
92-
bl LoadScriptVariableValueAtIndex
93-
mov r2, r0
94-
mov r0, #0
95-
mov r1, #0x2a
96-
bl SaveScriptVariableValue
97-
mov r0, #0
98-
mov r1, #0x31
99-
mov r2, r4, lsl #0x10
100-
mov r2, r2, lsr #0x10
101-
bl LoadScriptVariableValueAtIndex
102-
mov r2, r0
103-
mov r0, #0
104-
mov r1, #0x2b
105-
bl SaveScriptVariableValue
106-
mov r0, #0
107-
mov r1, #0x32
108-
mov r2, r4, lsl #0x10
109-
mov r2, r2, lsr #0x10
110-
bl LoadScriptVariableValueAtIndex
111-
mov r2, r0
112-
mov r0, #0
113-
mov r1, #0x2c
114-
bl SaveScriptVariableValue
115-
mov r0, #0
116-
mov r1, #0x37
117-
mov r2, r4, lsl #0x10
118-
mov r2, r2, lsr #0x10
119-
bl LoadScriptVariableValueAtIndex
120-
mov r2, r0
121-
mov r0, #0
122-
mov r1, #0x34
123-
bl SaveScriptVariableValue
124-
mov r0, #0
125-
mov r1, #0x38
126-
mov r2, r4, lsl #0x10
127-
mov r2, r2, lsr #0x10
128-
bl LoadScriptVariableValueAtIndex
129-
mov r2, r0
130-
mov r0, #0
131-
mov r1, #0x35
132-
bl SaveScriptVariableValue
133-
mov r0, r4, lsl #0x10
134-
mov r2, r0, lsr #0x10
135-
mov r0, #0
136-
mov r1, #0x39
137-
bl LoadScriptVariableValueAtIndex
138-
mov r2, r0
139-
mov r0, #0
140-
mov r1, #0x36
141-
bl SaveScriptVariableValue
142-
bl sub_0204CBE8
143-
ldmia sp!, {r4, pc}
144-
.align 2, 0
145-
_0204C1E0: .word _0209CF64
146-
arm_func_end EventFlagResume
147-
148-
arm_func_start EventFlagBackup
149-
EventFlagBackup: ; 0x0204C1E4
150-
stmdb sp!, {r4, lr}
151-
bl GetGameMode
152-
cmp r0, #1
153-
ldmlsia sp!, {r4, pc}
154-
sub r4, r0, #2
155-
ldr r0, _0204C404 ; =_0209CF84
156-
mov r1, r4
157-
bl Debug_Print0
158-
mov r0, #0
159-
mov r1, #0x1c
160-
bl LoadScriptVariableValue
161-
mov r1, r4, lsl #0x10
162-
mov r3, r0
163-
mov r2, r1, lsr #0x10
164-
mov r0, #0
165-
mov r1, #0x21
166-
bl SaveScriptVariableValueAtIndex
167-
mov r0, #0
168-
mov r1, #0x1d
169-
bl LoadScriptVariableValue
170-
mov r3, r0
171-
mov r0, #0
172-
mov r1, #0x22
173-
mov r2, r4, lsl #0x10
174-
mov r2, r2, lsr #0x10
175-
bl SaveScriptVariableValueAtIndex
176-
mov r0, #0
177-
mov r1, #0x1e
178-
bl LoadScriptVariableValue
179-
mov r3, r0
180-
mov r0, #0
181-
mov r1, #0x23
182-
mov r2, r4, lsl #0x10
183-
mov r2, r2, lsr #0x10
184-
bl SaveScriptVariableValueAtIndex
185-
mov r0, #0
186-
mov r1, #0x1f
187-
bl LoadScriptVariableValue
188-
mov r3, r0
189-
mov r0, #0
190-
mov r1, #0x24
191-
mov r2, r4, lsl #0x10
192-
mov r2, r2, lsr #0x10
193-
bl SaveScriptVariableValueAtIndex
194-
mov r0, #0
195-
mov r1, #0x20
196-
bl LoadScriptVariableValue
197-
mov r3, r0
198-
mov r0, #0
199-
mov r1, #0x25
200-
mov r2, r4, lsl #0x10
201-
mov r2, r2, lsr #0x10
202-
bl SaveScriptVariableValueAtIndex
203-
mov r0, #0
204-
mov r1, #0x27
205-
bl LoadScriptVariableValue
206-
mov r3, r0
207-
mov r0, #0
208-
mov r1, #0x2d
209-
mov r2, r4, lsl #0x10
210-
mov r2, r2, lsr #0x10
211-
bl SaveScriptVariableValueAtIndex
212-
mov r0, #0
213-
mov r1, #0x28
214-
bl LoadScriptVariableValue
215-
mov r1, r4, lsl #0x10
216-
mov r3, r0
217-
mov r2, r1, lsr #0x10
218-
mov r0, #0
219-
mov r1, #0x2e
220-
bl SaveScriptVariableValueAtIndex
221-
mov r0, #0
222-
mov r1, #0x29
223-
bl LoadScriptVariableValue
224-
mov r1, r4, lsl #0x10
225-
mov r2, r1, lsr #0x10
226-
mov r3, r0
227-
mov r0, #0
228-
mov r1, #0x2f
229-
bl SaveScriptVariableValueAtIndex
230-
mov r0, #0
231-
mov r1, #0x2a
232-
bl LoadScriptVariableValue
233-
mov r3, r0
234-
mov r0, #0
235-
mov r1, #0x30
236-
mov r2, r4, lsl #0x10
237-
mov r2, r2, lsr #0x10
238-
bl SaveScriptVariableValueAtIndex
239-
mov r0, #0
240-
mov r1, #0x2b
241-
bl LoadScriptVariableValue
242-
mov r3, r0
243-
mov r0, #0
244-
mov r1, #0x31
245-
mov r2, r4, lsl #0x10
246-
mov r2, r2, lsr #0x10
247-
bl SaveScriptVariableValueAtIndex
248-
mov r0, #0
249-
mov r1, #0x2c
250-
bl LoadScriptVariableValue
251-
mov r3, r0
252-
mov r0, #0
253-
mov r1, #0x32
254-
mov r2, r4, lsl #0x10
255-
mov r2, r2, lsr #0x10
256-
bl SaveScriptVariableValueAtIndex
257-
mov r0, #0
258-
mov r1, #0x34
259-
bl LoadScriptVariableValue
260-
mov r3, r0
261-
mov r0, #0
262-
mov r1, #0x37
263-
mov r2, r4, lsl #0x10
264-
mov r2, r2, lsr #0x10
265-
bl SaveScriptVariableValueAtIndex
266-
mov r0, #0
267-
mov r1, #0x35
268-
bl LoadScriptVariableValue
269-
mov r3, r0
270-
mov r0, r4, lsl #0x10
271-
mov r2, r0, lsr #0x10
272-
mov r0, #0
273-
mov r1, #0x38
274-
bl SaveScriptVariableValueAtIndex
275-
mov r0, #0
276-
mov r1, #0x36
277-
bl LoadScriptVariableValue
278-
mov r1, r4, lsl #0x10
279-
mov r3, r0
280-
mov r2, r1, lsr #0x10
281-
mov r0, #0
282-
mov r1, #0x39
283-
bl SaveScriptVariableValueAtIndex
284-
bl ScenarioFlagBackup
285-
ldmia sp!, {r4, pc}
286-
.align 2, 0
287-
_0204C404: .word _0209CF84
288-
arm_func_end EventFlagBackup
289-
2906
arm_func_start DumpScriptVariableValues
2917
DumpScriptVariableValues: ; 0x0204C408
2928
stmdb sp!, {r4, lr}

‎asm/main_rodata_0209CECC.s‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ EVENT_FLAG_EXPANSION_ERROR:
3131
EVENT_FLAG_RULE_ERROR:
3232
.byte 0x65, 0x76, 0x65, 0x6E, 0x74, 0x20, 0x66, 0x6C, 0x61, 0x67, 0x20, 0x72
3333
.byte 0x75, 0x6C, 0x65, 0x20, 0x65, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x25, 0x64, 0x00, 0x00, 0x00, 0x00
34-
.global _0209CF64
35-
_0209CF64:
34+
.global EVENT_FLAG_GAME_MODE_DEBUG_MSG
35+
EVENT_FLAG_GAME_MODE_DEBUG_MSG:
3636
.byte 0x45, 0x76, 0x65, 0x6E, 0x74, 0x46, 0x6C, 0x61, 0x67, 0x20, 0x52, 0x65, 0x73, 0x75, 0x6D, 0x65
3737
.byte 0x47, 0x61, 0x6D, 0x65, 0x4D, 0x6F, 0x64, 0x65, 0x20, 0x25, 0x64, 0x0A, 0x00, 0x00, 0x00, 0x00
38-
.global _0209CF84
39-
_0209CF84:
38+
.global EVENT_FLAG_BACKUP_DEBUG_MSG
39+
EVENT_FLAG_BACKUP_DEBUG_MSG:
4040
.byte 0x45, 0x76, 0x65, 0x6E, 0x74, 0x46, 0x6C, 0x61, 0x67, 0x20, 0x42, 0x61, 0x63, 0x6B, 0x75, 0x70
4141
.byte 0x47, 0x61, 0x6D, 0x65, 0x4D, 0x6F, 0x64, 0x65, 0x20, 0x25, 0x64, 0x0A, 0x00, 0x00, 0x00, 0x00
4242
.global _0209CFA4

‎include/script_variable.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void LoadScriptVariableRaw(struct script_var_raw* sv_raw, union script_var_value
3535
s32 LoadScriptVariableValue(union script_var_value sv_local[], enum script_var_id sv_id);
3636
s32 LoadScriptVariableValueAtIndex(union script_var_value sv_local[], enum script_var_id id, u16 idx);
3737
void SaveScriptVariableValue(union script_var_value sv_locals[], const enum script_var_id script_var_id, u32 new_val);
38-
void SaveScriptVariableValueAtIndex(union script_var_value sv_locals[], const enum script_var_id script_var_id, int idx, s32 new_val);
38+
void SaveScriptVariableValueAtIndex(union script_var_value sv_locals[], const enum script_var_id script_var_id, u16 idx, s32 new_val);
3939
s32 LoadScriptVariableValueSum(union script_var_value sv_local[], const enum script_var_id sv_id);
4040
void LoadScriptVariableValueBytes(const enum script_var_id sv_id, u8* result, s32 num_bytes);
4141
void LoadScriptVariableValueString(const enum script_var_id sv_id, u8* result, u8 num_bytes);
@@ -49,5 +49,7 @@ void UpdateScriptVarWithVar(union script_var_value sv_local[], enum script_var_i
4949
bool8 CompareScriptVariablesVeneer(s32 param_1, s32 param_2, enum compare_operation operation);
5050
s32 CompareScriptVarWithParam(union script_var_value sv_local[], enum script_var_id sv_id, s32 param, enum compare_operation op);
5151
s32 LoadAndCompareScriptVars(union script_var_value sv_local[], enum script_var_id sv_id_1, enum script_var_id sv_id_2, enum compare_operation op);
52+
void EventFlagResume();
53+
void EventFlagBackup();
5254

5355
#endif //PMDSKY_SCRIPTING_H

‎main.lsf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Static main
8282
Object asm/main_0204B018.o
8383
Object src/script_variable.o
8484
Object asm/main_rodata_0209CECC.o
85-
Object asm/main_0204BFC0.o
85+
Object asm/main_0204C408.o
8686
Object src/main_0204C938.o
8787
Object asm/main_0204C94C.o
8888
Object src/dungeon_recruitment_3.o

0 commit comments

Comments
 (0)