diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-26 15:33:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-26 15:33:56 -0500 |
| commit | 2e934469b82a41cb7871c04898547e1a5d58c621 (patch) | |
| tree | 36e73aae0bcd3178cc29354f7e40172d194d0bb9 /asm/overworld.s | |
| parent | a2c6174ee995f8980bcd38d3199ab2e395cca2ae (diff) | |
| parent | 5b36288064ee0e999a2201b2dd6479da3c99d01e (diff) | |
Merge pull request #242 from jiangzhengwenjz/field
field_screen_effect
Diffstat (limited to 'asm/overworld.s')
| -rw-r--r-- | asm/overworld.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/overworld.s b/asm/overworld.s index 92ffbd038..5c904c607 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -2247,7 +2247,7 @@ _08055CEC: .4byte gSaveBlock1Ptr _08055CF0: ldr r0, _08055D00 @ =gSaveBlock1Ptr ldr r0, [r0] - ldr r1, _08055D04 @ =gUnknown_83C68E0 + ldr r1, _08055D04 @ =gMaxFlashLevel ldr r1, [r1] _08055CF8: adds r0, 0x30 @@ -2257,7 +2257,7 @@ _08055CFA: bx r0 .align 2, 0 _08055D00: .4byte gSaveBlock1Ptr -_08055D04: .4byte gUnknown_83C68E0 +_08055D04: .4byte gMaxFlashLevel thumb_func_end sub_8055CB8 thumb_func_start Overworld_SetFlashLevel @@ -2266,7 +2266,7 @@ Overworld_SetFlashLevel: @ 8055D08 adds r1, r0, 0 cmp r1, 0 blt _08055D18 - ldr r0, _08055D28 @ =gUnknown_83C68E0 + ldr r0, _08055D28 @ =gMaxFlashLevel ldr r0, [r0] cmp r1, r0 ble _08055D1A @@ -2280,7 +2280,7 @@ _08055D1A: pop {r0} bx r0 .align 2, 0 -_08055D28: .4byte gUnknown_83C68E0 +_08055D28: .4byte gMaxFlashLevel _08055D2C: .4byte gSaveBlock1Ptr thumb_func_end Overworld_SetFlashLevel |