mirror of
https://github.com/zeldaret/oot.git
synced 2024-12-02 15:55:59 +00:00
b28ad659e3
* Fix reversed array access in z_boss_dodongo.c
* Remove useless return in z_en_encount2.c
* Remove some redundant externs or declarations
* Move some undefs to be performed as early as possible
* AudioOcarina_ResetStaffs -> AudioOcarina_ResetStaves
The plural appears to be staves for the music term
* Remove some uses of UNK_PTR
* Use NULL for pointers set to 0 in z_game_dlftbls.c
* Remove useless !! in z_en_tk.c
* Revert "AudioOcarina_ResetStaffs -> AudioOcarina_ResetStaves"
This reverts commit 1b7fe62408.
* Remove more redundant externs from PR suggestion
18 lines
1.1 KiB
C
18 lines
1.1 KiB
C
#include "global.h"
|
|
|
|
#define GAMESTATE_OVERLAY(name, init, destroy, size) \
|
|
{ \
|
|
NULL, (u32)_ovl_##name##SegmentRomStart, (u32)_ovl_##name##SegmentRomEnd, _ovl_##name##SegmentStart, \
|
|
_ovl_##name##SegmentEnd, NULL, init, destroy, NULL, NULL, 0, size \
|
|
}
|
|
#define GAMESTATE_OVERLAY_INTERNAL(init, destroy, size) \
|
|
{ NULL, 0, 0, NULL, NULL, NULL, init, destroy, NULL, NULL, 0, size }
|
|
|
|
GameStateOverlay gGameStateOverlayTable[] = {
|
|
GAMESTATE_OVERLAY_INTERNAL(TitleSetup_Init, TitleSetup_Destroy, sizeof(GameState)),
|
|
GAMESTATE_OVERLAY(select, Select_Init, Select_Destroy, sizeof(SelectContext)),
|
|
GAMESTATE_OVERLAY(title, Title_Init, Title_Destroy, sizeof(TitleContext)),
|
|
GAMESTATE_OVERLAY_INTERNAL(Play_Init, Play_Destroy, sizeof(PlayState)),
|
|
GAMESTATE_OVERLAY(opening, Opening_Init, Opening_Destroy, sizeof(OpeningContext)),
|
|
GAMESTATE_OVERLAY(file_choose, FileChoose_Init, FileChoose_Destroy, sizeof(FileChooseContext)),
|
|
};
|