summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKiritoDv <kiritodev01@gmail.com>2024-12-28 15:12:04 -0600
committerLywx <kiritodev01@gmail.com>2025-01-03 16:56:49 -0600
commitb403f5fbe77f9936b3b557a180b8f9e02eee2f9d (patch)
tree3b70ec8fcd3cec86a495e835ad836b9ef4ac6c91 /src
parentbc45e3ca87cbf61b5c7f1d1b55f607e0f8c284b6 (diff)
Renamed some events
Diffstat (limited to 'src')
-rw-r--r--src/engine/fox_display.c8
-rw-r--r--src/engine/fox_game.c8
-rw-r--r--src/port/hooks/list/EngineEvent.h8
-rw-r--r--src/port/mods/PortEnhancements.c6
4 files changed, 15 insertions, 15 deletions
diff --git a/src/engine/fox_display.c b/src/engine/fox_display.c
index 33a0d9f4..97d24fee 100644
--- a/src/engine/fox_display.c
+++ b/src/engine/fox_display.c
@@ -1781,8 +1781,8 @@ void Display_Update(void) {
}
#endif
- // @port: @event: Call DISPLAY_UPDATE_EVENT_PRE
- EventSystem_CallEvent(DISPLAY_UPDATE_EVENT_PRE, NULL);
+ // @port: @event: Call DisplayPreUpdateEvent
+ EventSystem_CallEvent(DisplayPreUpdateEvent, NULL);
Matrix_Push(&gGfxMatrix);
if ((gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].state == PLAYERSTATE_ACTIVE)) {
@@ -2015,6 +2015,6 @@ void Display_Update(void) {
sPlayersVisible[gPlayerNum] = false;
Matrix_Pop(&gGfxMatrix);
- // @port: @event: Call DISPLAY_UPDATE_EVENT_POST
- EventSystem_CallEvent(DISPLAY_UPDATE_EVENT_POST, NULL);
+ // @port: @event: Call DisplayPostUpdateEvent
+ EventSystem_CallEvent(DisplayPostUpdateEvent, NULL);
}
diff --git a/src/engine/fox_game.c b/src/engine/fox_game.c
index 58295050..b9f14276 100644
--- a/src/engine/fox_game.c
+++ b/src/engine/fox_game.c
@@ -347,8 +347,8 @@ void Game_Update(void) {
u8 partialFill;
u8 soundMode;
- // @port: @event: Call GAME_UPDATE_EVENT_PRE
- EventSystem_CallEvent(GAME_UPDATE_EVENT_PRE, NULL);
+ // @port: @event: Call GamePreUpdateEvent
+ EventSystem_CallEvent(GamePreUpdateEvent, NULL);
Game_SetGameState();
if (gGameStandby) {
@@ -605,8 +605,8 @@ void Game_Update(void) {
}
Audio_dummy_80016A50();
- // @port: @event: Call GAME_UPDATE_EVENT_POST
- EventSystem_CallEvent(GAME_UPDATE_EVENT_POST, NULL);
+ // @port: @event: Call GamePostUpdateEvent
+ EventSystem_CallEvent(GamePostUpdateEvent, NULL);
}
}
diff --git a/src/port/hooks/list/EngineEvent.h b/src/port/hooks/list/EngineEvent.h
index 6b3f8f8d..a16ba6f4 100644
--- a/src/port/hooks/list/EngineEvent.h
+++ b/src/port/hooks/list/EngineEvent.h
@@ -2,8 +2,8 @@
#include "port/hooks/impl/EventSystem.h"
-#define DISPLAY_UPDATE_EVENT_PRE INTERNAL_EVENT_ID(1, EVENT_TYPE_PRE)
-#define DISPLAY_UPDATE_EVENT_POST INTERNAL_EVENT_ID(1, EVENT_TYPE_POST)
+#define DisplayPreUpdateEvent INTERNAL_EVENT_ID(1, EVENT_TYPE_PRE)
+#define DisplayPostUpdateEvent INTERNAL_EVENT_ID(1, EVENT_TYPE_POST)
-#define GAME_UPDATE_EVENT_PRE INTERNAL_EVENT_ID(2, EVENT_TYPE_PRE)
-#define GAME_UPDATE_EVENT_POST INTERNAL_EVENT_ID(2, EVENT_TYPE_POST) \ No newline at end of file
+#define GamePreUpdateEvent INTERNAL_EVENT_ID(2, EVENT_TYPE_PRE)
+#define GamePostUpdateEvent INTERNAL_EVENT_ID(2, EVENT_TYPE_POST) \ No newline at end of file
diff --git a/src/port/mods/PortEnhancements.c b/src/port/mods/PortEnhancements.c
index 638514cb..04f0f5e8 100644
--- a/src/port/mods/PortEnhancements.c
+++ b/src/port/mods/PortEnhancements.c
@@ -1,5 +1,5 @@
#include "PortEnhancements.h"
-#include "port/hooks/list/EngineEvent.h"
+#include "port/hooks/Events.h"
#include "global.h"
#include "hit64.h"
#include "mods.h"
@@ -157,8 +157,8 @@ void OnGameUpdatePost(IEvent* event) {
void PortEnhancements_Init() {
// Register event listeners
- EventSystem_RegisterListener(DISPLAY_UPDATE_EVENT_PRE, OnDisplayUpdatePre, EVENT_PRIORITY_NORMAL);
- EventSystem_RegisterListener(GAME_UPDATE_EVENT_POST, OnGameUpdatePost, EVENT_PRIORITY_NORMAL);
+ EventSystem_RegisterListener(DisplayPreUpdateEvent, OnDisplayUpdatePre, EVENT_PRIORITY_NORMAL);
+ EventSystem_RegisterListener(GamePostUpdateEvent, OnGameUpdatePost, EVENT_PRIORITY_NORMAL);
}
void PortEnhancements_Exit() {