diff options
| author | Touched <jtouched@gmail.com> | 2017-06-30 21:34:15 +0200 |
|---|---|---|
| committer | Touched <jtouched@gmail.com> | 2017-06-30 21:34:15 +0200 |
| commit | c2daf4f6c9f915e1fcc7c76c2a3ed2ce5b4eb637 (patch) | |
| tree | 3a9e22dcc401c9a9e8fb243e07d3e9d9bd95b63e | |
| parent | b3e72c0e2841f19928b284b789b2d91222d056f8 (diff) | |
Rename rotating gate exported functions
| -rw-r--r-- | data/specials.inc | 4 | ||||
| -rw-r--r-- | include/rotating_gate.h | 2 | ||||
| -rw-r--r-- | src/rom4.c | 2 | ||||
| -rw-r--r-- | src/rotating_gate.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/data/specials.inc b/data/specials.inc index e0022bea1..f7aa3456a 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -201,8 +201,8 @@ gSpecials:: .4byte sub_80B7D0C .4byte ExecuteWhiteOut .4byte sp0C8_whiteout_maybe - .4byte sub_80C8040 - .4byte sub_80C8080 + .4byte RotatingGate_InitPuzzle + .4byte RotatingGate_InitPuzzleAndGraphics .4byte SetSSTidalFlag .4byte ResetSSTidalFlag .4byte EnterSafariMode diff --git a/include/rotating_gate.h b/include/rotating_gate.h index 6f4f38a9a..50a838953 100644 --- a/include/rotating_gate.h +++ b/include/rotating_gate.h @@ -2,7 +2,7 @@ #define GUARD_ROTATING_GATE_H void RotatingGatePuzzleCameraUpdate(s16, s16); -void sub_80C8080(); +void RotatingGate_InitPuzzleAndGraphics(); u32 CheckForRotatingGatePuzzleCollision(u8, s16, s16); #endif // GUARD_ROTATING_GATE_H diff --git a/src/rom4.c b/src/rom4.c index 2ddd5ed9f..bfc8e0e44 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -1672,7 +1672,7 @@ void mli4_mapscripts_and_other(void) void sub_8054E20(void) { sub_805B710(0, 0); - sub_80C8080(); + RotatingGate_InitPuzzleAndGraphics(); } void sub_8054E34(void) diff --git a/src/rotating_gate.c b/src/rotating_gate.c index 6fc10f2a3..d12a21240 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -1147,7 +1147,7 @@ _080C803C: .4byte sRotatingGate_RotationInfoEast\n\ } #endif -void sub_80C8040(void) +void RotatingGate_InitPuzzle(void) { if (GetCurrentMapRotatingGatePuzzleType()) { @@ -1165,7 +1165,7 @@ void RotatingGatePuzzleCameraUpdate(u16 deltaX, u16 deltaY) } } -void sub_80C8080(void) +void RotatingGate_InitPuzzleAndGraphics(void) { if (GetCurrentMapRotatingGatePuzzleType()) { |