diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-15 18:20:53 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-15 18:20:53 -0500 |
| commit | 6cbea9af6dba53cf5b74a37d0161188f7eb3b3ac (patch) | |
| tree | a2c5ca082bf9359ab056743afe4811f8c378be8a /asm/rotating_gate.s | |
| parent | 4a71a61e58507281252eb0406fea966d6fb7ebd4 (diff) | |
| parent | cfec30413c36f3a571d80162796c11a030f42767 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex
Diffstat (limited to 'asm/rotating_gate.s')
| -rw-r--r-- | asm/rotating_gate.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/rotating_gate.s b/asm/rotating_gate.s index da5e73034..9b57dc1b0 100644 --- a/asm/rotating_gate.s +++ b/asm/rotating_gate.s @@ -915,8 +915,8 @@ _080FBECA: bx r0 thumb_func_end RotatingGatePuzzleCameraUpdate - thumb_func_start sub_80FBED0 -sub_80FBED0: @ 80FBED0 + thumb_func_start RotatingGate_InitPuzzleAndGraphics +RotatingGate_InitPuzzleAndGraphics: @ 80FBED0 push {lr} bl GetCurrentMapRotatingGatePuzzleType cmp r0, 0 @@ -929,7 +929,7 @@ sub_80FBED0: @ 80FBED0 _080FBEEA: pop {r0} bx r0 - thumb_func_end sub_80FBED0 + thumb_func_end RotatingGate_InitPuzzleAndGraphics thumb_func_start CheckForRotatingGatePuzzleCollision CheckForRotatingGatePuzzleCollision: @ 80FBEF0 |