disassemble last map event scripts

This commit is contained in:
garak
2019-10-16 17:54:18 -04:00
parent 4ac92f7cb5
commit 0ee7b5af14
3 changed files with 2241 additions and 364 deletions
+4 -4
View File
@@ -1999,13 +1999,13 @@ BattleSetup_GetScriptAddrAfterBattle: @ 80805E8
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080805F4 bne _080805F4
ldr r0, _080805FC @ =gUnknown_81C555B ldr r0, _080805FC @ =EventScript_1C555B
_080805F4: _080805F4:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_080805F8: .4byte gUnknown_20386C4 _080805F8: .4byte gUnknown_20386C4
_080805FC: .4byte gUnknown_81C555B _080805FC: .4byte EventScript_1C555B
thumb_func_end BattleSetup_GetScriptAddrAfterBattle thumb_func_end BattleSetup_GetScriptAddrAfterBattle
thumb_func_start BattleSetup_GetTrainerPostBattleScript thumb_func_start BattleSetup_GetTrainerPostBattleScript
@@ -2015,13 +2015,13 @@ BattleSetup_GetTrainerPostBattleScript: @ 8080600
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
bne _0808060C bne _0808060C
ldr r0, _08080614 @ =gUnknown_81C555B ldr r0, _08080614 @ =EventScript_1C555B
_0808060C: _0808060C:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_08080610: .4byte gUnknown_20386C8 _08080610: .4byte gUnknown_20386C8
_08080614: .4byte gUnknown_81C555B _08080614: .4byte EventScript_1C555B
thumb_func_end BattleSetup_GetTrainerPostBattleScript thumb_func_end BattleSetup_GetTrainerPostBattleScript
thumb_func_start sub_8080618 thumb_func_start sub_8080618
+8 -8
View File
@@ -1100,11 +1100,11 @@ sub_806D0E4: @ 806D0E4
ldr r0, [r5, 0x8] ldr r0, [r5, 0x8]
cmp r0, 0 cmp r0, 0
bne _0806D120 bne _0806D120
ldr r0, _0806D11C @ =gUnknown_81C555B ldr r0, _0806D11C @ =EventScript_1C555B
b _0806D1E6 b _0806D1E6
.align 2, 0 .align 2, 0
_0806D118: .4byte gMapHeader _0806D118: .4byte gMapHeader
_0806D11C: .4byte gUnknown_81C555B _0806D11C: .4byte EventScript_1C555B
_0806D120: _0806D120:
adds r0, r7, 0 adds r0, r7, 0
adds r1, r6, 0 adds r1, r6, 0
@@ -1330,10 +1330,10 @@ _0806D2F0:
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _0806D308 bne _0806D308
ldr r0, _0806D304 @ =gUnknown_81C549C ldr r0, _0806D304 @ =EventScript_1C549C
b _0806D53E b _0806D53E
.align 2, 0 .align 2, 0
_0806D304: .4byte gUnknown_81C549C _0806D304: .4byte EventScript_1C549C
_0806D308: _0806D308:
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
@@ -2150,13 +2150,13 @@ _0806D950:
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
cmp r0, 0 cmp r0, 0
bne _0806D958 bne _0806D958
ldr r0, _0806D960 @ =gUnknown_81C555B ldr r0, _0806D960 @ =EventScript_1C555B
_0806D958: _0806D958:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0806D960: .4byte gUnknown_81C555B _0806D960: .4byte EventScript_1C555B
thumb_func_end sub_806D928 thumb_func_end sub_806D928
thumb_func_start mapheader_run_first_tag2_script_list_match_conditionally thumb_func_start mapheader_run_first_tag2_script_list_match_conditionally
@@ -2332,12 +2332,12 @@ _0806DAC4:
cmp r0, 0x1 cmp r0, 0x1
bne _0806DAE4 bne _0806DAE4
bl ResetInitialPlayerAvatarState bl ResetInitialPlayerAvatarState
ldr r0, _0806DAE0 @ =gUnknown_81C1361 ldr r0, _0806DAE0 @ =EventScript_1C1361
bl ScriptContext1_SetupScript bl ScriptContext1_SetupScript
movs r0, 0x1 movs r0, 0x1
b _0806DAEE b _0806DAEE
.align 2, 0 .align 2, 0
_0806DAE0: .4byte gUnknown_81C1361 _0806DAE0: .4byte EventScript_1C1361
_0806DAE4: _0806DAE4:
bl DoWarp bl DoWarp
movs r0, 0x1 movs r0, 0x1
+2229 -352
View File
File diff suppressed because it is too large Load Diff