Move all scripts to data/scripts.s

This commit is contained in:
octorock 2021-03-04 21:11:00 +01:00
parent 223cf98a51
commit e94df6de4a
10 changed files with 3328 additions and 3259 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,384 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
gUnk_08012AB0:: @ 08012AB0
.incbin "baserom.gba", 0x012AB0, 0x00000F8
gUnk_08012BA8:: @ 08012BA8
.incbin "baserom.gba", 0x012BA8, 0x0000050
gUnk_08012BF8:: @ 08012BF8
.incbin "baserom.gba", 0x012BF8, 0x0000014
gUnk_08012C0C:: @ 08012C0C
.incbin "baserom.gba", 0x012C0C, 0x000003C
gUnk_08012C48:: @ 08012C48
.incbin "baserom.gba", 0x012C48, 0x0000050
gUnk_08012C98:: @ 08012C98
.incbin "baserom.gba", 0x012C98, 0x0000040
gUnk_08012CD8:: @ 08012CD8
.incbin "baserom.gba", 0x012CD8, 0x0000040
gUnk_08012D18:: @ 08012D18
.incbin "baserom.gba", 0x012D18, 0x0000058
gUnk_08012D70:: @ 08012D70
.incbin "baserom.gba", 0x012D70, 0x0000031
gUnk_08012DA1:: @ 08012DA1
.incbin "baserom.gba", 0x012DA1, 0x000000F
gUnk_08012DB0:: @ 08012DB0
.incbin "baserom.gba", 0x012DB0, 0x0000028
gUnk_08012DD8:: @ 08012DD8
.incbin "baserom.gba", 0x012DD8, 0x0000048
gUnk_08012E20:: @ 08012E20
.incbin "baserom.gba", 0x012E20, 0x0000024
gUnk_08012E44:: @ 08012E44
.incbin "baserom.gba", 0x012E44, 0x0000044
gUnk_08012E88:: @ 08012E88
.incbin "baserom.gba", 0x012E88, 0x0000038
gUnk_08012EC0:: @ 08012EC0
.incbin "baserom.gba", 0x012EC0, 0x000004C
gUnk_08012F0C:: @ 08012F0C
.incbin "baserom.gba", 0x012F0C, 0x00000F5
gUnk_08013001:: @ 08013001
.incbin "baserom.gba", 0x013001, 0x0000002
gUnk_08013003:: @ 08013003
.incbin "baserom.gba", 0x013003, 0x0000008
gUnk_0801300B:: @ 0801300B
.incbin "baserom.gba", 0x01300B, 0x0000031
gUnk_0801303C:: @ 0801303C
.incbin "baserom.gba", 0x01303C, 0x0000034
gUnk_08013070:: @ 08013070
.incbin "baserom.gba", 0x013070, 0x0000011
gUnk_08013081:: @ 08013081
.incbin "baserom.gba", 0x013081, 0x000000F
gUnk_08013090:: @ 08013090
.incbin "baserom.gba", 0x013090, 0x0000084
gUnk_08013114:: @ 08013114
.incbin "baserom.gba", 0x013114, 0x0000074
gUnk_08013188:: @ 08013188
.incbin "baserom.gba", 0x013188, 0x0000024
gUnk_080131AC:: @ 080131AC
.incbin "baserom.gba", 0x0131AC, 0x0000138
gUnk_080132E4:: @ 080132E4
.incbin "baserom.gba", 0x0132E4, 0x000004C
gUnk_08013330:: @ 08013330
.incbin "baserom.gba", 0x013330, 0x000001C
gUnk_0801334C:: @ 0801334C
.incbin "baserom.gba", 0x01334C, 0x000002C
gUnk_08013378:: @ 08013378
.incbin "baserom.gba", 0x013378, 0x000004C
gUnk_080133C4:: @ 080133C4
.incbin "baserom.gba", 0x0133C4, 0x0000034
gUnk_080133F8:: @ 080133F8
.incbin "baserom.gba", 0x0133F8, 0x00000E4
gUnk_080134DC:: @ 080134DC
.incbin "baserom.gba", 0x0134DC, 0x00001FC
gUnk_080136D8:: @ 080136D8
.incbin "baserom.gba", 0x0136D8, 0x0000048
gUnk_08013720:: @ 08013720
.incbin "baserom.gba", 0x013720, 0x00000BA
gUnk_080137DA:: @ 080137DA
.incbin "baserom.gba", 0x0137DA, 0x00000DA
gUnk_080138B4:: @ 080138B4
.incbin "baserom.gba", 0x0138B4, 0x0000264
gUnk_08013B18:: @ 08013B18
.incbin "baserom.gba", 0x013B18, 0x0000058
gUnk_08013B70:: @ 08013B70
.incbin "baserom.gba", 0x013B70, 0x0000038
gUnk_08013BA8:: @ 08013BA8
.incbin "baserom.gba", 0x013BA8, 0x0000040
gUnk_08013BE8:: @ 08013BE8
.incbin "baserom.gba", 0x013BE8, 0x00000BC
gUnk_08013CA4:: @ 08013CA4
.incbin "baserom.gba", 0x013CA4, 0x0000160
gUnk_08013E04:: @ 08013E04
.incbin "baserom.gba", 0x013E04, 0x0000048
gUnk_08013E4C:: @ 08013E4C
.incbin "baserom.gba", 0x013E4C, 0x0000024
gUnk_08013E70:: @ 08013E70
.incbin "baserom.gba", 0x013E70, 0x0000024
gUnk_08013E94:: @ 08013E94
.incbin "baserom.gba", 0x013E94, 0x000001C
gUnk_08013EB0:: @ 08013EB0
.incbin "baserom.gba", 0x013EB0, 0x000001C
gUnk_08013ECC:: @ 08013ECC
.incbin "baserom.gba", 0x013ECC, 0x000001C
gUnk_08013EE8:: @ 08013EE8
.incbin "baserom.gba", 0x013EE8, 0x000001C
gUnk_08013F04:: @ 08013F04
.incbin "baserom.gba", 0x013F04, 0x0000030
gUnk_08013F34:: @ 08013F34
.incbin "baserom.gba", 0x013F34, 0x0000030
gUnk_08013F64:: @ 08013F64
.incbin "baserom.gba", 0x013F64, 0x0000030
gUnk_08013F94:: @ 08013F94
.incbin "baserom.gba", 0x013F94, 0x0000054
gUnk_08013FE8:: @ 08013FE8
.incbin "baserom.gba", 0x013FE8, 0x000006C
gUnk_08014054:: @ 08014054
.incbin "baserom.gba", 0x014054, 0x0000020
gUnk_08014074:: @ 08014074
.incbin "baserom.gba", 0x014074, 0x0000020
gUnk_08014094:: @ 08014094
.incbin "baserom.gba", 0x014094, 0x0000048
gUnk_080140DC:: @ 080140DC
.incbin "baserom.gba", 0x0140DC, 0x000001C
gUnk_080140F8:: @ 080140F8
.incbin "baserom.gba", 0x0140F8, 0x0000020
gUnk_08014118:: @ 08014118
.incbin "baserom.gba", 0x014118, 0x000003C
gUnk_08014154:: @ 08014154
.incbin "baserom.gba", 0x014154, 0x0000088
gUnk_080141DC:: @ 080141DC
.incbin "baserom.gba", 0x0141DC, 0x0000034
gUnk_08014210:: @ 08014210
.incbin "baserom.gba", 0x014210, 0x0000064
gUnk_08014274:: @ 08014274
.incbin "baserom.gba", 0x014274, 0x000003C
gUnk_080142B0:: @ 080142B0
.incbin "baserom.gba", 0x0142B0, 0x00000D4
gUnk_08014384:: @ 08014384
.incbin "baserom.gba", 0x014384, 0x000003C
gUnk_080143C0:: @ 080143C0
.incbin "baserom.gba", 0x0143C0, 0x0000042
gUnk_08014402:: @ 08014402
.incbin "baserom.gba", 0x014402, 0x000004E
gUnk_08014450:: @ 08014450
.incbin "baserom.gba", 0x014450, 0x00000BC
gUnk_0801450C:: @ 0801450C
.incbin "baserom.gba", 0x01450C, 0x000003C
gUnk_08014548:: @ 08014548
.incbin "baserom.gba", 0x014548, 0x0000058
gUnk_080145A0:: @ 080145A0
.incbin "baserom.gba", 0x0145A0, 0x0000010
gUnk_080145B0:: @ 080145B0
.incbin "baserom.gba", 0x0145B0, 0x0000038
gUnk_080145E8:: @ 080145E8
.incbin "baserom.gba", 0x0145E8, 0x0000040
gUnk_08014628:: @ 08014628
.incbin "baserom.gba", 0x014628, 0x00001DC
gUnk_08014804:: @ 08014804
.incbin "baserom.gba", 0x014804, 0x00000EC
gUnk_080148F0:: @ 080148F0
.incbin "baserom.gba", 0x0148F0, 0x0000068
gUnk_08014958:: @ 08014958
.incbin "baserom.gba", 0x014958, 0x000003C
gUnk_08014994:: @ 08014994
.incbin "baserom.gba", 0x014994, 0x0000038
gUnk_080149CC:: @ 080149CC
.incbin "baserom.gba", 0x0149CC, 0x000005C
gUnk_08014A28:: @ 08014A28
.incbin "baserom.gba", 0x014A28, 0x000002C
gUnk_08014A54:: @ 08014A54
.incbin "baserom.gba", 0x014A54, 0x000002C
gUnk_08014A80:: @ 08014A80
.incbin "baserom.gba", 0x014A80, 0x0000044
gUnk_08014AC4:: @ 08014AC4
.incbin "baserom.gba", 0x014AC4, 0x0000070
gUnk_08014B34:: @ 08014B34
.incbin "baserom.gba", 0x014B34, 0x00000F8
gUnk_08014C2C:: @ 08014C2C
.incbin "baserom.gba", 0x014C2C, 0x0000068
gUnk_08014C94:: @ 08014C94
.incbin "baserom.gba", 0x014C94, 0x0000048
gUnk_08014CDC:: @ 08014CDC
.incbin "baserom.gba", 0x014CDC, 0x00000F0
gUnk_08014DCC:: @ 08014DCC
.incbin "baserom.gba", 0x014DCC, 0x0000048
gUnk_08014E14:: @ 08014E14
.incbin "baserom.gba", 0x014E14, 0x000003C
gUnk_08014E50:: @ 08014E50
.incbin "baserom.gba", 0x014E50, 0x000007C
gUnk_08014ECC:: @ 08014ECC
.incbin "baserom.gba", 0x014ECC, 0x000002C
gUnk_08014EF8:: @ 08014EF8
.incbin "baserom.gba", 0x014EF8, 0x0000038
gUnk_08014F30:: @ 08014F30
.incbin "baserom.gba", 0x014F30, 0x000008C
gUnk_08014FBC:: @ 08014FBC
.incbin "baserom.gba", 0x014FBC, 0x0000045
gUnk_08015001:: @ 08015001
.incbin "baserom.gba", 0x015001, 0x0000086
gUnk_08015087:: @ 08015087
.incbin "baserom.gba", 0x015087, 0x0000068
gUnk_080150EF:: @ 080150EF
.incbin "baserom.gba", 0x0150EF, 0x0000145
gUnk_08015234:: @ 08015234
.incbin "baserom.gba", 0x015234, 0x0000080
gUnk_080152B4:: @ 080152B4
.incbin "baserom.gba", 0x0152B4, 0x00000DC
gUnk_08015390:: @ 08015390
.incbin "baserom.gba", 0x015390, 0x000005C
gUnk_080153EC:: @ 080153EC
.incbin "baserom.gba", 0x0153EC, 0x0000120
gUnk_0801550C:: @ 0801550C
.incbin "baserom.gba", 0x01550C, 0x000010C
gUnk_08015618:: @ 08015618
.incbin "baserom.gba", 0x015618, 0x000006C
gUnk_08015684:: @ 08015684
.incbin "baserom.gba", 0x015684, 0x000001C
gUnk_080156A0:: @ 080156A0
.incbin "baserom.gba", 0x0156A0, 0x00000B4
gUnk_08015754:: @ 08015754
.incbin "baserom.gba", 0x015754, 0x0000058
gUnk_080157AC:: @ 080157AC
.incbin "baserom.gba", 0x0157AC, 0x000014C
gUnk_080158F8:: @ 080158F8
.incbin "baserom.gba", 0x0158F8, 0x0000040
gUnk_08015938:: @ 08015938
.incbin "baserom.gba", 0x015938, 0x0000020
gUnk_08015958:: @ 08015958
.incbin "baserom.gba", 0x015958, 0x000016C
gUnk_08015AC4:: @ 08015AC4
.incbin "baserom.gba", 0x015AC4, 0x0000050
gUnk_08015B14:: @ 08015B14
.incbin "baserom.gba", 0x015B14, 0x0000020
gUnk_08015B34:: @ 08015B34
.incbin "baserom.gba", 0x015B34, 0x0000050
gUnk_08015B84:: @ 08015B84
.incbin "baserom.gba", 0x015B84, 0x0000024
gUnk_08015BA8:: @ 08015BA8
.incbin "baserom.gba", 0x015BA8, 0x0000040
gUnk_08015BE8:: @ 08015BE8
.incbin "baserom.gba", 0x015BE8, 0x00000EC
gUnk_08015CD4:: @ 08015CD4
.incbin "baserom.gba", 0x015CD4, 0x000011C
gUnk_08015DF0:: @ 08015DF0
.incbin "baserom.gba", 0x015DF0, 0x0000068
gUnk_08015E58:: @ 08015E58
.incbin "baserom.gba", 0x015E58, 0x00000B0
gUnk_08015F08:: @ 08015F08
.incbin "baserom.gba", 0x015F08, 0x0000034
gUnk_08015F3C:: @ 08015F3C
.incbin "baserom.gba", 0x015F3C, 0x0000068
gUnk_08015FA4:: @ 08015FA4
.incbin "baserom.gba", 0x015FA4, 0x000001C
gUnk_08015FC0:: @ 08015FC0
.incbin "baserom.gba", 0x015FC0, 0x0000061
gUnk_08016021:: @ 08016021
.incbin "baserom.gba", 0x016021, 0x000000F

View File

@ -4,68 +4,6 @@
.syntax unified
.text
gUnk_0801606C:: @ 0801606C
.incbin "baserom.gba", 0x01606C, 0x000003C
gUnk_080160A8:: @ 080160A8
.incbin "baserom.gba", 0x0160A8, 0x0000042
gUnk_080160EA:: @ 080160EA
.incbin "baserom.gba", 0x0160EA, 0x0000052
gUnk_0801613C:: @ 0801613C
.incbin "baserom.gba", 0x01613C, 0x0000054
gUnk_08016190:: @ 08016190
.incbin "baserom.gba", 0x016190, 0x0000058
gUnk_080161E8:: @ 080161E8
.incbin "baserom.gba", 0x0161E8, 0x0000174
gUnk_0801635C:: @ 0801635C
.incbin "baserom.gba", 0x01635C, 0x0000021
gUnk_0801637D:: @ 0801637D
.incbin "baserom.gba", 0x01637D, 0x0000007
gUnk_08016384:: @ 08016384
.incbin "baserom.gba", 0x016384, 0x0000084
gUnk_08016408:: @ 08016408
.incbin "baserom.gba", 0x016408, 0x00001F0
gUnk_080165F8:: @ 080165F8
.incbin "baserom.gba", 0x0165F8, 0x0000014
gUnk_0801660C:: @ 0801660C
.incbin "baserom.gba", 0x01660C, 0x000001C
gUnk_08016628:: @ 08016628
.incbin "baserom.gba", 0x016628, 0x000001C
gUnk_08016644:: @ 08016644
.incbin "baserom.gba", 0x016644, 0x0000028
gUnk_0801666C:: @ 0801666C
.incbin "baserom.gba", 0x01666C, 0x000004C
gUnk_080166B8:: @ 080166B8
.incbin "baserom.gba", 0x0166B8, 0x0000044
gUnk_080166FC:: @ 080166FC
.incbin "baserom.gba", 0x0166FC, 0x000009C
gUnk_08016798:: @ 08016798
.incbin "baserom.gba", 0x016798, 0x00000AC
gUnk_08016844:: @ 08016844
.incbin "baserom.gba", 0x016844, 0x000009C
gUnk_080168E0:: @ 080168E0
.incbin "baserom.gba", 0x0168E0, 0x0000014
gUnk_080168F4:: @ 080168F4
.incbin "baserom.gba", 0x0168F4, 0x0000090
gUnk_08016984:: @ 08016984
.incbin "baserom.gba", 0x016984, 0x0000002

View File

@ -2,10 +2,9 @@
@ Generated by disassemble_script.py
.macro SCRIPT_START name
.globl \name
.section .rodata
.section .text
\name:
.endm
.macro SCRIPT_END
.short 0xffff
.endm
@ -112,11 +111,25 @@
.short 0x0418
.endm
.macro sub_0807E30C
.short 0x0419
.endm
.macro sub_0807E40C s
.short 0x081d
.short \s
.endm
.macro sub_0807E5F8 w
.short 0x0c28
.word \w
.endm
.macro sub_0807E650 s
.short 0x082d
.short \s
.endm
.macro sub_0807E680 s
.short 0x0831
.short \s
@ -127,6 +140,10 @@
.word \w
.endm
.macro sub_0807E6DC
.short 0x0434
.endm
.macro sub_0807E864
.short 0x0443
.endm
@ -161,6 +178,10 @@
.short \s
.endm
.macro sub_0807E944
.short 0x0451
.endm
.macro sub_0807E9D4
.short 0x0453
.endm
@ -169,10 +190,23 @@
.short 0x0454
.endm
.macro sub_0807E9F0
.short 0x0456
.endm
.macro sub_0807EA4C
.short 0x0457
.endm
.macro sub_0807EA94
.short 0x0459
.endm
.macro sub_0807EAB4 s
.short 0x085a
.short \s
.endm
.macro sub_0807EAD0 a,b
.short 0x0c5c
.short \a
@ -184,13 +218,22 @@
.short \s
.endm
.macro sub_0807EB44 s
.short 0x0861
.short \s
.endm
.macro sub_0807EB74
.short 0x0463
.endm
.macro sub_0807EB8C
.short 0x0464
.endm
.macro sub_0807EBC0 param
.macro sub_0807EBC0 s
.short 0x0867
.short \param
.short \s
.endm
.macro sub_0807EC1C s
@ -198,6 +241,17 @@
.short \s
.endm
.macro sub_0807ECF4 s
.short 0x0871
.short \s
.endm
.macro sub_0807EDD4 a,b
.short 0x0c73
.short \a
.short \b
.endm
.macro sub_0807EE30
.short 0x0475
.endm
@ -215,3 +269,17 @@
.macro sub_0807EFE4
.short 0x047e
.endm
.macro sub_0807F034 s
.short 0x0882
.short \s
.endm
.macro sub_0807F098
.short 0x0487
.endm
.macro sub_0807F0B4 s
.short 0x0889
.short \s
.endm

3214
data/scripts.s Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,3 @@
.include "asm/macros/script.inc"
SCRIPT_START gUnk_080126FC
sub_0807E004
sub_0807EBC0 0x0040

View File

@ -0,0 +1,19 @@
SCRIPT_START gUnk_08016030
sub_0807E004
sub_0807E40C 0x0009
sub_0807E050 0x002a
sub_0807E014
sub_0807E6AC 0x00000001
sub_0807EF80 0x0010
sub_0807E680 0x003c
sub_0807EBC0 0x0020
sub_0807ECF4 0x0080
sub_0807E680 0x001e
sub_0807EF80 0x0010
sub_0807E5F8 0x0000008
.short 0xffff
.short 0x0c6a
.short 0xfff0
.short 0x0000
.short 0xffff
.short 0x0000

View File

@ -295,11 +295,9 @@ SECTIONS {
asm/code_080043E8.o(.text);
data/data_08007DF4.o(.rodata);
asm/code_0800857C.o(.text);
data/scripts/ezlo_angry.o(.rodata);
src/scripts/ezlo_angry.o(.rodata);
asm/code_08012AB0.o(.text);
src/scripts/npc4e_fusion.o(.rodata);
asm/code_0801606C.o(.text);
/* scripts */
data/scripts.o(.text);
asm/code_08016984.o(.text);
asm/sub_08016AE4.o(.text);

View File

@ -1,18 +0,0 @@
#include "scriptMacros.h"
#include "functions.h"
#include "script.h"
extern void sub_0807F3C8(Entity*, ScriptExecutionContext*);
extern void sub_0807F5B0(Entity*, ScriptExecutionContext*);
extern void sub_0806D96C(Entity*, ScriptExecutionContext*);
extern void sub_0806D944(Entity*, ScriptExecutionContext*);
extern void sub_0806D908(Entity*, ScriptExecutionContext*);
extern void sub_0807F9A4(Entity*, ScriptExecutionContext*);
extern void sub_0807DF28(Entity*, ScriptExecutionContext*);
extern void sub_0807DF50(Entity*, ScriptExecutionContext*);
extern void sub_0806D8A0(Entity*, ScriptExecutionContext*);
extern void sub_0806D9A4(Entity*, ScriptExecutionContext*);
// clang-format off
//START_SCRIPT(gUnk_080126FC)
asm(".section .rodata");
// clang-format on

View File

@ -72,11 +72,11 @@ commands = [
{'fun': 'sub_0807E280'},
{'fun': 'sub_0807E2A8', 'params': 's'},
{'fun': 'sub_0807E2E4', 'params': ''},
{'fun': 'sub_0807E30C'},
{'fun': 'sub_0807E30C', 'params': ''},
{'fun': 'sub_0807E390'},
{'fun': 'sub_0807E3BC'},
{'fun': 'sub_0807E3E8'},
{'fun': 'sub_0807E40C'},
{'fun': 'sub_0807E40C', 'params': 's'},
{'fun': 'sub_0807E42C'},
{'fun': 'sub_0807E48C'},
{'fun': 'sub_0807E4CC'},
@ -92,14 +92,14 @@ commands = [
{'fun': 'sub_0807E628'},
{'fun': 'sub_0807E634'},
{'fun': 'sub_0807E644'},
{'fun': 'sub_0807E650'},
{'fun': 'sub_0807E650', 'params': 's'},
{'fun': 'sub_0807E65C'},
{'fun': 'sub_0807E668'},
{'fun': 'sub_0807E674'},
{'fun': 'sub_0807E680', 'params': 's'},
{'fun': 'sub_0807E690'},
{'fun': 'sub_0807E6AC', 'params': 'w'},
{'fun': 'sub_0807E6DC'},
{'fun': 'sub_0807E6DC', 'params': ''},
{'fun': 'sub_0807E700'},
{'fun': 'sub_0807E72C'},
{'fun': 'sub_0807E75C'},
@ -128,25 +128,25 @@ commands = [
{'fun': 'sub_0807E914'},
{'fun': 'sub_0807E924'},
{'fun': 'sub_0807E930', 'params': 's'},
{'fun': 'sub_0807E944'},
{'fun': 'sub_0807E944', 'params': ''},
{'fun': 'sub_0807E974'},
{'fun': 'sub_0807E9D4', 'params': ''},
{'fun': 'sub_0807E9DC', 'params': ''},
{'fun': 'sub_0807E9E4'},
{'fun': 'sub_0807E9F0'},
{'fun': 'sub_0807EA4C'},
{'fun': 'sub_0807E9F0', 'params': ''},
{'fun': 'sub_0807EA4C', 'params': ''},
{'fun': 'sub_0807EA88'},
{'fun': 'sub_0807EA94', 'params': ''},
{'fun': 'sub_0807EAB4'},
{'fun': 'sub_0807EAB4', 'params': 's'},
{'fun': 'sub_0807EAC0'},
{'fun': 'sub_0807EAD0', 'params': 'ss'},
{'fun': 'sub_0807EAF0'},
{'fun': 'sub_0807EB18'},
{'fun': 'sub_0807EB28', 'params': 's'},
{'fun': 'sub_0807EB38'},
{'fun': 'sub_0807EB44'},
{'fun': 'sub_0807EB44', 'params': 's'},
{'fun': 'sub_0807EB4C'},
{'fun': 'sub_0807EB74'},
{'fun': 'sub_0807EB74', 'params': ''},
{'fun': 'sub_0807EB8C', 'params': ''},
{'fun': 'sub_0807EBA8'},
{'fun': 'sub_0807EBB0'},
@ -160,9 +160,9 @@ commands = [
{'fun': 'sub_0807EC64'},
{'fun': 'sub_0807EC94'},
{'fun': 'sub_0807ECC4'},
{'fun': 'sub_0807ECF4'},
{'fun': 'sub_0807ECF4', 'params': 's'},
{'fun': 'sub_0807ED24'},
{'fun': 'sub_0807EDD4'},
{'fun': 'sub_0807EDD4', 'params': 'ss'},
{'fun': 'sub_0807EE04'},
{'fun': 'sub_0807EE30', 'params': ''},
{'fun': 'sub_0807EEB4'},
@ -177,14 +177,14 @@ commands = [
{'fun': 'sub_0807EFF4'},
{'fun': 'sub_0807F004'},
{'fun': 'sub_0807F010'},
{'fun': 'sub_0807F034'},
{'fun': 'sub_0807F034', 'params': 's'},
{'fun': 'sub_0807F050'},
{'fun': 'sub_0807F060'},
{'fun': 'sub_0807F078'},
{'fun': 'sub_0807F088'},
{'fun': 'sub_0807F098'},
{'fun': 'sub_0807F098', 'params': ''},
{'fun': 'sub_0807F0A4'},
{'fun': 'sub_0807F0B4'},
{'fun': 'sub_0807F0B4', 'params': 's'},
{'fun': 'sub_0807F0C8'}
]
@ -212,13 +212,13 @@ parameters = {
'length': 2,
'param': 'a,b',
'expr': ' .short \\a\n .short \\b',
'read': lambda ctx: ','.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+6]))
'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+6]))
},
'ww': {
'length': 4,
'param': 'a,b',
'expr': ' .word \\a\n .word \\b',
'read': lambda ctx: ','.join(barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+10]))
'read': lambda ctx: ', '.join(barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+10]))
},
}
@ -248,7 +248,7 @@ def ExecuteScriptCommandSet(ctx: Context):
raise Exception('Parameter configuration ' + command['params'] + ' not defined')
params = parameters[command['params']]
if unk_06-1 != params['length']:
raise Exception('Call with ' + (unk_06-1) +' length, while length of ' + params['length']+' defined')
raise Exception(f'Call {command["fun"]} with ' + str(unk_06-1) +' length, while length of ' + str(params['length'])+' defined')
print(command['fun'] + ' ' + params['read'](ctx))
@ -270,7 +270,7 @@ def disassemble_script(input_data):
# Print rest (did not manage to get there)
print(',\n'.join(barray_to_u16_hex(ctx.data[ctx.ptr:])))
print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr:])]))
def generate_macros():
@ -279,7 +279,7 @@ def generate_macros():
print('.macro SCRIPT_START name')
print(' .globl \\name')
print(' .section .rodata')
print(' .section .text')
print('\\name:')
print('.endm')