Merge pull request #203 from mateon1/EXECUTESCRIPTCOMMAND

ExecuteScriptCommand
pret · Jul 23, 2024 · fa79776 · fa79776
2 parents 55fd673 + 3ac1edf
commit fa79776
Show file tree

Hide file tree

Showing 51 changed files with 4,202 additions and 7,059 deletions.
diff --git a/asm/code_8010F28.s b/asm/code_8010F28.s
@@ -887,7 +887,7 @@ _08011624: .4byte 0x00004df8
 _08011628: .4byte 0x00004ddc
 _0801162C: .4byte 0x00004de0
 _08011630: .4byte gUnknown_80D4104
-_08011634: .4byte gUnknown_202DE30
+_08011634: .4byte gFormatData_202DE30
 _08011638: .4byte gUnknown_202DE58
 _0801163C: .4byte gUnknown_80D4120
 _08011640:

diff --git a/asm/code_80140DC.s b/asm/code_80140DC.s
@@ -1460,7 +1460,7 @@ _08014E78:
 	b _08014F0E
 	.align 2, 0
 _08014E7C: .4byte gUnknown_80D4900
-_08014E80: .4byte gUnknown_202DE30
+_08014E80: .4byte gFormatData_202DE30
 _08014E84:
 	adds r5, 0x1
 	ldr r1, _08014EBC
@@ -1492,7 +1492,7 @@ _08014EB2:
 	bne _08014EAC
 	b _08014E78
 	.align 2, 0
-_08014EBC: .4byte gUnknown_202DE30
+_08014EBC: .4byte gFormatData_202DE30
 _08014EC0: .4byte gUnknown_80D4904
 _08014EC4:
 	adds r5, 0x1
@@ -1525,7 +1525,7 @@ _08014EF2:
 	bne _08014EEC
 	b _08014E78
 	.align 2, 0
-_08014EFC: .4byte gUnknown_202DE30
+_08014EFC: .4byte gFormatData_202DE30
 _08014F00: .4byte gUnknown_80D4908
 _08014F04:
 	ldr r4, _08014F08

diff --git a/asm/code_8040094.s b/asm/code_8040094.s
@@ -1739,7 +1739,7 @@ _08040EB8: .4byte gUnknown_202F224
 _08040EBC: .4byte gDungeon
 _08040EC0: .4byte 0x00018204
 _08040EC4: .4byte gUnknown_8106A8C
-_08040EC8: .4byte gUnknown_202DE30
+_08040EC8: .4byte gFormatData_202DE30
 _08040ECC: .4byte gPtrMagnitudeMessage
 _08040ED0:
 	cmp r1, 0x76

diff --git a/asm/code_8042B34.s b/asm/code_8042B34.s
@@ -874,7 +874,7 @@ _08043208: .4byte 0x0000067c
 _0804320C: .4byte 0x00ffffff
 _08043210: .4byte gDungeon
 _08043214: .4byte 0x00000644
-_08043218: .4byte gUnknown_202DE30
+_08043218: .4byte gFormatData_202DE30
 _0804321C: .4byte 0x0000067b
 _08043220: .4byte gUnknown_80FEC48
 _08043224:
@@ -948,7 +948,7 @@ _0804326A:
 _080432B4: .4byte gUnknown_80FEC7C
 _080432B8: .4byte gDungeon
 _080432BC: .4byte 0x00000644
-_080432C0: .4byte gUnknown_202DE30
+_080432C0: .4byte gFormatData_202DE30
 _080432C4: .4byte gUnknown_81002B8
 _080432C8:
 	ldr r4, _080432CC

diff --git a/asm/code_805D8C8.s b/asm/code_805D8C8.s
@@ -4317,7 +4317,7 @@ _0805FBB0: .4byte gFieldMenuTeamPtr
 _0805FBB4: .4byte gFieldMenuOthersPtr
 _0805FBB8: .4byte gFieldMenuGroundPtr
 _0805FBBC: .4byte gPlayTimeRef
-_0805FBC0: .4byte gUnknown_202DE30
+_0805FBC0: .4byte gFormatData_202DE30
 _0805FBC4: .4byte gUnknown_80F9174
 _0805FBC8: .4byte gTeamInventoryRef
 _0805FBCC: .4byte gUnknown_80F9190
@@ -7317,7 +7317,7 @@ _080613EE:
 	b _08061438
 	.align 2, 0
 _0806141C: .4byte gUnknown_8106BD0
-_08061420: .4byte gUnknown_202DE30
+_08061420: .4byte gFormatData_202DE30
 _08061424: .4byte gUnknown_202EE10
 _08061428: .4byte gUnknown_8106BD4
 _0806142C:

diff --git a/asm/code_8066D04.s b/asm/code_8066D04.s
@@ -2163,7 +2163,7 @@ _08067F4C:
 	b _08067FA4
 	.align 2, 0
 _08067F8C: .4byte gAvailablePokemonNames
-_08067F90: .4byte gUnknown_202DE30
+_08067F90: .4byte gFormatData_202DE30
 _08067F94: .4byte gUnknown_202DE58
 _08067F98: .4byte gUnknown_8106E2C
 _08067F9C:
@@ -2262,7 +2262,7 @@ _0806804C:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08068064: .4byte gUnknown_202DE30
+_08068064: .4byte gFormatData_202DE30
 _08068068: .4byte gUnknown_8106E6C
 	thumb_func_end sub_8067F00
 

diff --git a/asm/code_806CD90.s b/asm/code_806CD90.s
@@ -1010,7 +1010,7 @@ _0806D808:
 	bl sub_80522F4
 	b _0806D84A
 	.align 2, 0
-_0806D824: .4byte gUnknown_202DE30
+_0806D824: .4byte gFormatData_202DE30
 _0806D828: .4byte gUnknown_80F9764
 _0806D82C: .4byte 0x000003e7
 _0806D830:

diff --git a/asm/code_80718D8.s b/asm/code_80718D8.s
@@ -170,7 +170,7 @@ _08071EB6:
 	movs r1, 0
 	b _08071F02
 	.align 2, 0
-_08071EE8: .4byte gUnknown_202DE30
+_08071EE8: .4byte gFormatData_202DE30
 _08071EEC: .4byte gAvailablePokemonNames
 _08071EF0: .4byte gUnknown_80F9E64
 _08071EF4: .4byte 0x00000149
@@ -303,7 +303,7 @@ _08071FE2:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08071FF4: .4byte gUnknown_202DE30
+_08071FF4: .4byte gFormatData_202DE30
 _08071FF8: .4byte gAvailablePokemonNames
 _08071FFC: .4byte gUnknown_202DE58
 _08072000: .4byte gUnknown_80FF730
@@ -494,7 +494,7 @@ _08072162:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08072174: .4byte gUnknown_202DE30
+_08072174: .4byte gFormatData_202DE30
 _08072178: .4byte gAvailablePokemonNames
 _0807217C: .4byte gUnknown_202DE58
 _08072180: .4byte gUnknown_80FF730
@@ -690,7 +690,7 @@ _080722F4:
 	bx r0
 	.align 2, 0
 _08072308: .4byte gUnknown_80FCF18
-_0807230C: .4byte gUnknown_202DE30
+_0807230C: .4byte gFormatData_202DE30
 _08072310: .4byte gUnknown_80F9ACC
 _08072314: .4byte gUnknown_8107010
 _08072318: .4byte gUnknown_8107018
@@ -870,7 +870,7 @@ _08072456:
 	bl sub_80528F4
 	b _080724A4
 	.align 2, 0
-_08072474: .4byte gUnknown_202DE30
+_08072474: .4byte gFormatData_202DE30
 _08072478: .4byte gAvailablePokemonNames
 _0807247C: .4byte gUnknown_80F9E80
 _08072480:
@@ -1010,7 +1010,7 @@ _08072576:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08072588: .4byte gUnknown_202DE30
+_08072588: .4byte gFormatData_202DE30
 _0807258C: .4byte gAvailablePokemonNames
 _08072590: .4byte gUnknown_80F9E80
 _08072594: .4byte 0x03e60000
@@ -1261,7 +1261,7 @@ _08072760:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08072770: .4byte gUnknown_202DE30
+_08072770: .4byte gFormatData_202DE30
 _08072774: .4byte gUnknown_80F9EC8
 	thumb_func_end sub_80725A4
 

diff --git a/asm/code_807E5AC.s b/asm/code_807E5AC.s
@@ -1392,7 +1392,7 @@ _0807F158:
 _0807F168: .4byte gDungeon
 _0807F16C: .4byte 0xffff0000
 _0807F170: .4byte 0xff00ffff
-_0807F174: .4byte gUnknown_202DE30
+_0807F174: .4byte gFormatData_202DE30
 _0807F178: .4byte gUnknown_80FE5C0
 _0807F17C: .4byte 0x0000068c
 _0807F180: .4byte 0x0000e240
@@ -1451,7 +1451,7 @@ _0807F1EC: .4byte 0xffff0000
 _0807F1F0: .4byte 0xff00ffff
 _0807F1F4: .4byte gDungeon
 _0807F1F8: .4byte 0x00000694
-_0807F1FC: .4byte gUnknown_202DE30
+_0807F1FC: .4byte gFormatData_202DE30
 _0807F200: .4byte gUnknown_80FE568
 _0807F204:
 	ldr r0, _0807F224

diff --git a/asm/code_8098468.s b/asm/code_8098468.s
@@ -111,7 +111,7 @@ _08098522:
 	bl sub_809C5C4
 	bl sub_809A560
 	bl sub_809CB50
-	bl sub_80A4A7C
+	bl AllocGroundMapAction
 	bl nullsub_117
 	bl sub_80AD990
 	bl sub_80A77F8
@@ -164,7 +164,7 @@ _080985DC:
 	movs r0, 0x1
 	negs r0, r0
 	bl sub_809A71C
-	bl sub_809A76C
+	bl ScriptPrintNullTextbox
 	bl sub_809977C
 	ldr r0, _08098600
 	ldr r0, [r0]
@@ -394,10 +394,10 @@ _080987C0:
 	bl sub_809A62C
 	bl GroundMap_Reset
 	bl sub_809D0BC
-	bl sub_80AD9D0
-	bl sub_80A786C
-	bl sub_80ABB98
-	bl sub_80ACBD4
+	bl DeleteBlankGroundEvents
+	bl DeleteBlankGroundLives
+	bl DeleteBlankGroundObjects
+	bl DeleteBlankGroundEffects
 	bl sub_809C658
 	bl nullsub_16
 	bl sub_8097944
@@ -539,7 +539,7 @@ _08098988:
 	bhi _08098990
 	b _080985DC
 _08098990:
-	bl sub_80A4AC4
+	bl FreeGroundMapAction
 	bl nullsub_118
 	bl sub_80A78F0
 	bl sub_80ABBD4

diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s
@@ -450,7 +450,7 @@ sub_80993F0:
 	movs r0, 0
 	movs r1, 0
 	bl sub_8005838
-	bl sub_80A4A7C
+	bl AllocGroundMapAction
 	mov r7, sp
 	add r0, sp, 0x8
 	mov r8, r0
@@ -662,7 +662,7 @@ _08099620: .4byte gGameOptionsRef
 _08099624:
 	movs r0, 0x10
 	bl FadeOutAllMusic
-	bl sub_80A4AC4
+	bl FreeGroundMapAction
 	bl sub_8099768
 	bl nullsub_103
 	add sp, 0x28

diff --git a/asm/code_809A560.s b/asm/code_809A560.s
@@ -747,16 +747,16 @@ _0809AE8A:
 	bx r1
 	thumb_func_end sub_809AE3C
 
-	thumb_func_start sub_809AE90
-sub_809AE90:
+	thumb_func_start ScriptPrintText
+ScriptPrintText:
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r2, 0
 	lsls r1, 16
 	asrs r6, r1, 16
 	cmp r4, 0
 	bne _0809AEA4
-	bl sub_809A76C
+	bl ScriptPrintNullTextbox
 	b _0809AEE0
 _0809AEA4:
 	ldrb r0, [r4]
@@ -784,14 +784,14 @@ _0809AED0: .4byte gUnknown_8116134
 _0809AED4: .4byte gUnknown_3001B64
 _0809AED8: .4byte gUnknown_8116148
 _0809AEDC:
-	bl sub_809A7B4
+	bl ScriptPrintEmptyTextbox
 _0809AEE0:
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_809AE90
+	thumb_func_end ScriptPrintText
 
 	thumb_func_start sub_809AEEC
 sub_809AEEC:
@@ -817,7 +817,7 @@ sub_809AEEC:
 	.align 2, 0
 _0809AF18: .4byte gUnknown_3001B64
 _0809AF1C:
-	bl sub_809A76C
+	bl ScriptPrintNullTextbox
 _0809AF20:
 	lsls r0, 24
 	lsrs r0, 24
@@ -850,7 +850,7 @@ sub_809AF2C:
 	.align 2, 0
 _0809AF58: .4byte gUnknown_3001B64
 _0809AF5C:
-	bl sub_809A76C
+	bl ScriptPrintNullTextbox
 _0809AF60:
 	lsls r0, 24
 	lsrs r0, 24
@@ -883,7 +883,7 @@ sub_809AF6C:
 	.align 2, 0
 _0809AF98: .4byte gUnknown_3001B64
 _0809AF9C:
-	bl sub_809A76C
+	bl ScriptPrintNullTextbox
 _0809AFA0:
 	lsls r0, 24
 	lsrs r0, 24

diff --git a/asm/code_809C5C4.s b/asm/code_809C5C4.s
@@ -75,7 +75,7 @@ _0809CC20:
 	movs r0, 0
 	adds r2, r5, 0
 _0809CC4A:
-	bl sub_809AE90
+	bl ScriptPrintText
 _0809CC4E:
 	movs r0, 0
 	b _0809CC82
@@ -94,7 +94,7 @@ _0809CC5E:
 	negs r1, r1
 	movs r0, 0
 	adds r2, r7, 0
-	bl sub_809AE90
+	bl ScriptPrintText
 	movs r1, 0x80
 	lsls r1, 1
 	movs r0, 0xCB

diff --git a/asm/code_809D148.s b/asm/code_809D148.s
@@ -8,8 +8,8 @@
 
 
 
-	thumb_func_start sub_809D600
-sub_809D600:
+	thumb_func_start InitActionWithParams
+InitActionWithParams:
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -22,7 +22,7 @@ sub_809D600:
 	asrs r4, 16
 	lsls r5, 24
 	asrs r5, 24
-	bl sub_809D5B8
+	bl InitAction
 	str r6, [r7]
 	mov r0, r8
 	str r0, [r7, 0x4]
@@ -45,12 +45,12 @@ _0809D63C:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_809D600
+	thumb_func_end InitActionWithParams
 
 	thumb_func_start sub_809D648
 sub_809D648:
 	push {lr}
-	bl sub_809D5B8
+	bl InitAction
 	pop {r0}
 	bx r0
 	thumb_func_end sub_809D648

diff --git a/asm/dungeon_2.s b/asm/dungeon_2.s
@@ -147,7 +147,7 @@ _0809043C:
 	ldr r0, _08090470
 	b _08090476
 	.align 2, 0
-_08090464: .4byte gUnknown_202DE30
+_08090464: .4byte gFormatData_202DE30
 _08090468: .4byte gUnknown_81159DC
 _0809046C: .4byte gDungeons
 _08090470: .4byte gUnknown_8115A80