Dump numerous baseroms, begin moving data to proper files

2017-11-10 01:36:41 -06:00
parent 09e431077a
commit 29079c4b99
127 changed files with 7973 additions and 5970 deletions
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -3547,11 +3547,11 @@ _08163E2C:
 	ldr r4, =gUnknown_02038BFC
 	movs r0, 0
 	strb r0, [r4]
-	ldr r0, =gUnknown_08224158
+	ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224157 + 1
 	bl BattleSetup_ConfigureTrainerBattle
 	movs r0, 0x1
 	strb r0, [r4]
-	ldr r0, =gUnknown_08224167
+	ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224166 + 1
 	bl BattleSetup_ConfigureTrainerBattle
 	ldr r0, =gPartnerTrainerId
 	strh r5, [r0]
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -1456,7 +1456,7 @@ _0809CAE4:
 	bl sub_81381F8
 	cmp r0, 0x1
 	bne _0809CAF8
-	ldr r0, =gUnknown_08224175
+	ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224175
 	bl ScriptContext1_SetupScript
 	b _0809CB28
 	.pool
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -645,6 +645,12 @@
 	.elseif \type == 9
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
+	.elseif \type == 10
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
+	.elseif \type == 11
+		.4byte \pointer1 @ text
+		.4byte \pointer2 @ text
 	.endif
 	.endm

--- a/asm/macros/movement.inc
+++ b/asm/macros/movement.inc
@@ -110,8 +110,9 @@
 	enum_start 0x91
 	create_movement step_91
 	create_movement step_92
-
-	enum_start 0x96
+	create_movement step_93
+	create_movement step_94
+	create_movement step_95
 	create_movement step_96

 	enum_start 0xfe