begin event data
This commit is contained in:
+1
-1
@@ -70,7 +70,7 @@ sub_809E7E8: @ 809E7E8
|
||||
subs r4, r0
|
||||
lsls r4, 16
|
||||
lsrs r4, 16
|
||||
bl sub_809D3A0
|
||||
bl ClearUpperFlags
|
||||
adds r0, r4, 0
|
||||
bl sub_8122580
|
||||
adds r0, r4, 0
|
||||
|
||||
+2
-2
@@ -10134,7 +10134,7 @@ _0811F0EC:
|
||||
thumb_func_start sub_811F0F8
|
||||
sub_811F0F8: @ 811F0F8
|
||||
push {lr}
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
@@ -10447,7 +10447,7 @@ _0811F358:
|
||||
movs r1, 0x14
|
||||
strh r1, [r0]
|
||||
_0811F37A:
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
beq _0811F398
|
||||
ldr r0, =gUnknown_0203A120
|
||||
|
||||
+24
-51
@@ -5,36 +5,9 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_809D300
|
||||
sub_809D300: @ 809D300
|
||||
push {r4,lr}
|
||||
ldr r4, =gSaveBlock1Ptr
|
||||
ldr r0, [r4]
|
||||
ldr r1, =0x00001270
|
||||
adds r0, r1
|
||||
movs r2, 0x96
|
||||
lsls r2, 1
|
||||
movs r1, 0
|
||||
bl memset
|
||||
ldr r0, [r4]
|
||||
ldr r1, =0x0000139c
|
||||
adds r0, r1
|
||||
movs r2, 0x80
|
||||
lsls r2, 2
|
||||
movs r1, 0
|
||||
bl memset
|
||||
ldr r0, =gUnknown_020375FC
|
||||
movs r1, 0
|
||||
movs r2, 0x10
|
||||
bl memset
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_809D300
|
||||
|
||||
thumb_func_start sub_809D344
|
||||
sub_809D344: @ 809D344
|
||||
thumb_func_start ClearTempFieldEventData
|
||||
ClearTempFieldEventData: @ 809D344
|
||||
push {lr}
|
||||
ldr r0, =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
@@ -61,10 +34,10 @@ sub_809D344: @ 809D344
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_809D344
|
||||
thumb_func_end ClearTempFieldEventData
|
||||
|
||||
thumb_func_start sub_809D3A0
|
||||
sub_809D3A0: @ 809D3A0
|
||||
thumb_func_start ClearUpperFlags
|
||||
ClearUpperFlags: @ 809D3A0
|
||||
push {lr}
|
||||
ldr r0, =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
@@ -76,10 +49,10 @@ sub_809D3A0: @ 809D3A0
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_809D3A0
|
||||
thumb_func_end ClearUpperFlags
|
||||
|
||||
thumb_func_start sub_809D3C0
|
||||
sub_809D3C0: @ 809D3C0
|
||||
thumb_func_start DisableNationalPokedex
|
||||
DisableNationalPokedex: @ 809D3C0
|
||||
push {lr}
|
||||
ldr r0, =0x00004046
|
||||
bl GetVarPointer
|
||||
@@ -93,10 +66,10 @@ sub_809D3C0: @ 809D3C0
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_809D3C0
|
||||
thumb_func_end DisableNationalPokedex
|
||||
|
||||
thumb_func_start sub_809D3E8
|
||||
sub_809D3E8: @ 809D3E8
|
||||
thumb_func_start EnableNationalPokedex
|
||||
EnableNationalPokedex: @ 809D3E8
|
||||
push {r4,r5,lr}
|
||||
ldr r0, =0x00004046
|
||||
bl GetVarPointer
|
||||
@@ -120,10 +93,10 @@ sub_809D3E8: @ 809D3E8
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_809D3E8
|
||||
thumb_func_end EnableNationalPokedex
|
||||
|
||||
thumb_func_start sub_809D42C
|
||||
sub_809D42C: @ 809D42C
|
||||
thumb_func_start IsNationalPokedexEnabled
|
||||
IsNationalPokedexEnabled: @ 809D42C
|
||||
push {lr}
|
||||
ldr r0, =gSaveBlock2Ptr
|
||||
ldr r0, [r0]
|
||||
@@ -149,30 +122,30 @@ _0809D468:
|
||||
_0809D46A:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_809D42C
|
||||
thumb_func_end IsNationalPokedexEnabled
|
||||
|
||||
thumb_func_start sub_809D470
|
||||
sub_809D470: @ 809D470
|
||||
thumb_func_start DisableMysteryGift
|
||||
DisableMysteryGift: @ 809D470
|
||||
push {lr}
|
||||
ldr r0, =0x000008ac
|
||||
bl FlagReset
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_809D470
|
||||
thumb_func_end DisableMysteryGift
|
||||
|
||||
thumb_func_start sub_809D480
|
||||
sub_809D480: @ 809D480
|
||||
thumb_func_start EnableMysteryGift
|
||||
EnableMysteryGift: @ 809D480
|
||||
push {lr}
|
||||
ldr r0, =0x000008ac
|
||||
bl FlagSet
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_809D480
|
||||
thumb_func_end EnableMysteryGift
|
||||
|
||||
thumb_func_start sub_809D490
|
||||
sub_809D490: @ 809D490
|
||||
thumb_func_start IsMysteryGiftEnabled
|
||||
IsMysteryGiftEnabled: @ 809D490
|
||||
push {lr}
|
||||
ldr r0, =0x000008ac
|
||||
bl FlagGet
|
||||
@@ -181,7 +154,7 @@ sub_809D490: @ 809D490
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_809D490
|
||||
thumb_func_end IsMysteryGiftEnabled
|
||||
|
||||
thumb_func_start sub_809D4A4
|
||||
sub_809D4A4: @ 809D4A4
|
||||
|
||||
+3
-3
@@ -307,7 +307,7 @@ sub_8009638: @ 8009638
|
||||
movs r0, 0x80
|
||||
lsls r0, 8
|
||||
strh r0, [r5, 0x2]
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
strb r0, [r5, 0x10]
|
||||
ldr r0, =0x0000087f
|
||||
bl FlagGet
|
||||
@@ -9240,7 +9240,7 @@ _0800DDC8:
|
||||
ands r4, r1
|
||||
orrs r4, r0
|
||||
strb r4, [r7]
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
ands r0, r6
|
||||
ldrb r1, [r7, 0x1]
|
||||
ands r5, r1
|
||||
@@ -39455,7 +39455,7 @@ sub_801DC20: @ 801DC20
|
||||
ldr r6, =gUnknown_020375F0
|
||||
bl sub_801B044
|
||||
adds r4, r0, 0
|
||||
bl sub_809D490
|
||||
bl IsMysteryGiftEnabled
|
||||
cmp r0, 0
|
||||
beq _0801DC3A
|
||||
bl sub_801B0CC
|
||||
|
||||
+1
-1
@@ -4650,7 +4650,7 @@ fmt_pokedex: @ 8031F7C
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bne _08031FFE
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
beq _08031FA4
|
||||
movs r0, 0x1
|
||||
|
||||
@@ -582,7 +582,7 @@ sub_8153BE4: @ 8153BE4
|
||||
sub_8153C4C: @ 8153C4C
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_809D3E8
|
||||
bl EnableNationalPokedex
|
||||
ldr r0, =gStringVar4
|
||||
ldr r1, =gUnknown_08674B9E
|
||||
bl StringExpandPlaceholders
|
||||
|
||||
+1
-1
@@ -280,7 +280,7 @@ _080844B2:
|
||||
bl set_player_trainer_id
|
||||
bl PlayTimeCounter_Reset
|
||||
bl sub_8084390
|
||||
bl sub_809D300
|
||||
bl InitEventData
|
||||
bl sub_80EBEE0
|
||||
bl GabbyAndTyNewGameInitData
|
||||
bl sub_80E8B28
|
||||
|
||||
+17
-17
@@ -30,7 +30,7 @@ sub_80BB2D0: @ 80BB2D0
|
||||
str r1, [r0, 0x1C]
|
||||
str r1, [r0, 0x20]
|
||||
str r1, [r0, 0x24]
|
||||
bl sub_809D3C0
|
||||
bl DisableNationalPokedex
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
ldr r3, =gSaveBlock1Ptr
|
||||
@@ -409,7 +409,7 @@ _080BB628:
|
||||
ldr r3, =0x00000612
|
||||
adds r1, r3
|
||||
strh r0, [r1]
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
adds r1, r0, 0
|
||||
cmp r1, 0
|
||||
bne _080BB65E
|
||||
@@ -439,7 +439,7 @@ _080BB65E:
|
||||
adds r0, r3
|
||||
movs r1, 0
|
||||
strb r1, [r0]
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
bne _080BB6D0
|
||||
movs r0, 0
|
||||
@@ -1181,7 +1181,7 @@ _080BBD7C:
|
||||
adds r3, 0x4
|
||||
adds r1, r3
|
||||
strh r0, [r1]
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
adds r1, r0, 0
|
||||
cmp r1, 0
|
||||
bne _080BBDB6
|
||||
@@ -1227,7 +1227,7 @@ sub_80BBDE8: @ 80BBDE8
|
||||
adds r1, r2
|
||||
ldrh r1, [r1]
|
||||
strb r1, [r0, 0x19]
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
adds r1, r0, 0
|
||||
cmp r1, 0
|
||||
bne _080BBE18
|
||||
@@ -1875,7 +1875,7 @@ sub_80BC3DC: @ 80BC3DC
|
||||
adds r3, 0x4
|
||||
adds r1, r3
|
||||
strh r0, [r1]
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
adds r1, r0, 0
|
||||
cmp r1, 0
|
||||
bne _080BC42A
|
||||
@@ -1940,7 +1940,7 @@ sub_80BC47C: @ 80BC47C
|
||||
adds r3, 0x4
|
||||
adds r1, r3
|
||||
strh r0, [r1]
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
adds r1, r0, 0
|
||||
cmp r1, 0
|
||||
bne _080BC4CA
|
||||
@@ -2295,7 +2295,7 @@ sub_80BC844: @ 80BC844
|
||||
b _080BC862
|
||||
.pool
|
||||
_080BC858:
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
bne _080BC870
|
||||
ldr r0, =gUnknown_08DC16F6
|
||||
@@ -2383,7 +2383,7 @@ _080BC8FC:
|
||||
b _080BC92C
|
||||
.pool
|
||||
_080BC910:
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
beq _080BC924
|
||||
mov r0, sp
|
||||
@@ -4743,7 +4743,7 @@ sub_80BDB7C: @ 80BDB7C
|
||||
beq _080BDCCC
|
||||
b _080BE414
|
||||
_080BDCCC:
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
beq _080BDCD6
|
||||
b _080BDF4C
|
||||
@@ -8589,7 +8589,7 @@ _080BFF78:
|
||||
adds r0, r2
|
||||
b _080C0038
|
||||
_080BFF82:
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
adds r1, r0, 0
|
||||
adds r0, r4, 0
|
||||
movs r2, 0x1
|
||||
@@ -11142,7 +11142,7 @@ _080C1332:
|
||||
movs r0, 0x3
|
||||
movs r3, 0
|
||||
bl copy_decompressed_tile_data_to_vram_autofree
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
bne _080C13E4
|
||||
ldr r1, =gUnknown_08DC3A0C
|
||||
@@ -11520,7 +11520,7 @@ sub_80C170C: @ 80C170C
|
||||
ldrsh r0, [r0, r1]
|
||||
cmp r0, 0
|
||||
beq _080C1740
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
ldr r6, =gUnknown_0856EDB8
|
||||
cmp r0, 0
|
||||
bne _080C174C
|
||||
@@ -11528,7 +11528,7 @@ sub_80C170C: @ 80C170C
|
||||
b _080C174C
|
||||
.pool
|
||||
_080C1740:
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
ldr r6, =gUnknown_0856ED9C
|
||||
cmp r0, 0
|
||||
bne _080C174C
|
||||
@@ -11594,7 +11594,7 @@ _080C178C:
|
||||
ldr r4, =gSaveBlock2Ptr
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, 0x19]
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
bne _080C17E8
|
||||
ldr r1, [r4]
|
||||
@@ -12368,7 +12368,7 @@ _080C1E94:
|
||||
b _080C1EC4
|
||||
.pool
|
||||
_080C1EA4:
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
bne _080C1ED0
|
||||
ldr r2, =gUnknown_0856ED48
|
||||
@@ -12722,7 +12722,7 @@ sub_80C20F8: @ 80C20F8
|
||||
movs r1, 0x2D
|
||||
movs r2, 0x41
|
||||
bl sub_80C1270
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
beq _080C21B6
|
||||
ldrh r0, [r5, 0xE]
|
||||
|
||||
+1
-1
@@ -4893,7 +4893,7 @@ sub_806E3C0: @ 806E3C0
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
beq _0806E3DA
|
||||
adds r0, r4, 0
|
||||
|
||||
+2
-2
@@ -1376,7 +1376,7 @@ _080850C8:
|
||||
bl set_current_map_header_from_sav1_save_old_name
|
||||
bl CopyFieldObjectTemplatesToSav1
|
||||
bl sav2_set_x9_depending_on_sav1_map
|
||||
bl sub_809D344
|
||||
bl ClearTempFieldEventData
|
||||
bl wild_pokemon_reroll
|
||||
bl prev_quest_postbuffer_cursor_backup_reset
|
||||
adds r0, r6, 0
|
||||
@@ -1464,7 +1464,7 @@ _080851A2:
|
||||
lsrs r6, r0, 24
|
||||
bl sub_80EB218
|
||||
bl sav2_set_x9_depending_on_sav1_map
|
||||
bl sub_809D344
|
||||
bl ClearTempFieldEventData
|
||||
bl wild_pokemon_reroll
|
||||
bl prev_quest_postbuffer_cursor_backup_reset
|
||||
ldr r0, =gSaveBlock1Ptr
|
||||
|
||||
+1
-1
@@ -4432,7 +4432,7 @@ _08137A70:
|
||||
_08137A80:
|
||||
ldr r1, =gUnknown_020375E4
|
||||
strh r0, [r1]
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
pop {r1}
|
||||
|
||||
+2
-2
@@ -34000,7 +34000,7 @@ _081970A2:
|
||||
adds r1, r7, 0
|
||||
bl StringExpandPlaceholders
|
||||
adds r5, r0, 0
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
beq _08197156
|
||||
strb r6, [r5]
|
||||
@@ -40566,7 +40566,7 @@ _0819A398:
|
||||
b _0819A43C
|
||||
.pool
|
||||
_0819A3A8:
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
beq _0819A3B8
|
||||
movs r0, 0x1
|
||||
|
||||
+2
-2
@@ -3578,7 +3578,7 @@ _0807912C:
|
||||
cmp r0, 0
|
||||
beq _08079158
|
||||
_08079138:
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
bne _08079164
|
||||
ldr r0, =gUnknown_0203229C
|
||||
@@ -6142,7 +6142,7 @@ _0807A60C:
|
||||
cmp r5, r7
|
||||
blt _0807A60C
|
||||
_0807A62E:
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
mov r1, r9
|
||||
lsls r4, r1, 2
|
||||
cmp r0, 0
|
||||
|
||||
+1
-1
@@ -1921,7 +1921,7 @@ _080C3740:
|
||||
thumb_func_start sub_80C376C
|
||||
sub_80C376C: @ 80C376C
|
||||
push {lr}
|
||||
bl sub_809D42C
|
||||
bl IsNationalPokedexEnabled
|
||||
cmp r0, 0
|
||||
bne _080C377E
|
||||
movs r0, 0x1
|
||||
|
||||
Reference in New Issue
Block a user