summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/data_835B488.s18
-rw-r--r--data/event_scripts.s2
-rw-r--r--data/script_cmd_table.inc12
3 files changed, 8 insertions, 24 deletions
diff --git a/data/data_835B488.s b/data/data_835B488.s
index 8d2183672..6e387a536 100644
--- a/data/data_835B488.s
+++ b/data/data_835B488.s
@@ -657,23 +657,7 @@ gUnknown_83A720C:: @ 83A720C
gUnknown_83A7240:: @ 83A7240
.asciz "0"
- .align 2
-gNullScriptPtr:: @ 83A7244
- .incbin "baserom.gba", 0x3A7244, 0x4
-
-gUnknown_83A7248:: @ 83A7248
- .incbin "baserom.gba", 0x3A7248, 0x14
-
-gUnknown_83A725C:: @ 83A725C
- .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c"
-
- .align 2
-gUnknown_83A7290:: @ 83A7290
- .asciz "0"
-
- .align 2
-gUnknown_83A7294:: @ 83A7294
- .incbin "baserom.gba", 0x3A7294, 0xC
+ .section .rodata.83A72A0
gUnknown_83A72A0:: @ 83A72A0
.incbin "baserom.gba", 0x3A72A0, 0x2
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 9baa201e5..23f6ad5a9 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -40,7 +40,7 @@ gStdScripts:: @ 8160450
.4byte gStdScript_81A676C
.4byte gStdScript_81A8E58
.4byte gStdScript_81A4E66
-gStdScripts_End::
+gStdScriptsEnd::
gUnknown_8160478:: @ 8160478
.incbin "baserom.gba", 0x160478, 0x886C
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index 29850d685..aee959808 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -1,8 +1,8 @@
.align 2
gScriptCmdTable:: @ 815F9B4
- .4byte sub_8069ED0
- .4byte sub_8069ED4
+ .4byte ScrCmd_nop
+ .4byte ScrCmd_nop1
.4byte ScrCmd_end
.4byte ScrCmd_return
.4byte ScrCmd_call
@@ -38,9 +38,9 @@ gScriptCmdTable:: @ 815F9B4
.4byte ScrCmd_compare_var_to_var
.4byte ScrCmd_callnative
.4byte ScrCmd_gotonative
- .4byte sub_8069EFC
- .4byte sub_8069F3C
- .4byte sub_8069FA4
+ .4byte ScrCmd_special
+ .4byte ScrCmd_specialvar
+ .4byte ScrCmd_waitstate
.4byte ScrCmd_delay
.4byte ScrCmd_setflag
.4byte ScrCmd_clearflag
@@ -216,4 +216,4 @@ gScriptCmdTable:: @ 815F9B4
.4byte sub_806BD90
gScriptCmdTableEnd:: @ 815FD08
- .4byte sub_8069ED0
+ .4byte ScrCmd_nop