dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fix battle setup conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-12-17 20:26:13 +01:00
parent bb82032208 6d73bb4b57
commit 7517f6a030
46 changed files with 1365 additions and 1826 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_screen.s
+3 -3
View File
@@ -7777,8 +7777,8 @@ _080AEFB6:
bx r1
thumb_func_end sub_80AEEE8
thumb_func_start sub_80AEFBC
sub_80AEFBC: @ 80AEFBC
thumb_func_start UpdateWeatherPerDay
UpdateWeatherPerDay: @ 80AEFBC
lsls r0, 16
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]
@@ -7794,7 +7794,7 @@ sub_80AEFBC: @ 80AEFBC
strb r1, [r2]
bx lr
.pool
thumb_func_end sub_80AEFBC
thumb_func_end UpdateWeatherPerDay
thumb_func_start sub_80AEFDC
sub_80AEFDC: @ 80AEFDC