diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-10 01:36:41 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-10 01:49:12 -0600 |
| commit | 29079c4b990076e0a9d3a299064262c8d522a4c5 (patch) | |
| tree | 87a79ee4d3073169742746ed3528974a29103a3b /asm | |
| parent | 09e431077af3c6fe672ad8a775b58d955596b81d (diff) | |
Dump numerous baseroms, begin moving data to proper files
Diffstat (limited to 'asm')
| -rwxr-xr-x | asm/battle_tower.s | 4 | ||||
| -rw-r--r-- | asm/field_control_avatar.s | 2 | ||||
| -rw-r--r-- | asm/macros/event.inc | 6 | ||||
| -rw-r--r-- | asm/macros/movement.inc | 5 |
4 files changed, 12 insertions, 5 deletions
diff --git a/asm/battle_tower.s b/asm/battle_tower.s index ec59fab9a..5be24297b 100755 --- 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] diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 33216d82d..2247c80c0 100644 --- 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 diff --git a/asm/macros/event.inc b/asm/macros/event.inc index f0577f777..b23678a45 100644 --- 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 diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index 40fb3ca4e..6ca58c57e 100644 --- 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 |