mirror of
https://github.com/pret/pmd-sky.git
synced 2026-04-26 16:37:17 -05:00
Merge pull request #228 from slaw-22/GameMode
Some checks failed
build / build (push) Has been cancelled
Some checks failed
build / build (push) Has been cancelled
Decomp GetGameMode
This commit is contained in:
commit
4a78adb0fa
|
|
@ -224,6 +224,7 @@
|
||||||
.public GetDexNumber
|
.public GetDexNumber
|
||||||
.public GetDungeonResultString
|
.public GetDungeonResultString
|
||||||
.public GetExecuteSpecialEpisodeType
|
.public GetExecuteSpecialEpisodeType
|
||||||
|
.public GetGameMode
|
||||||
.public GetHeldButtons
|
.public GetHeldButtons
|
||||||
.public GetHero
|
.public GetHero
|
||||||
.public GetHeroMemberIdx
|
.public GetHeroMemberIdx
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,7 @@
|
||||||
.public EnableIrqFlag
|
.public EnableIrqFlag
|
||||||
.public FX_AtanIdxTable_
|
.public FX_AtanIdxTable_
|
||||||
.public GetProcessorMode
|
.public GetProcessorMode
|
||||||
|
.public GetGameMode
|
||||||
.public gGXState
|
.public gGXState
|
||||||
.public GXi_DmaId
|
.public GXi_DmaId
|
||||||
.public GXi_VRamLockId
|
.public GXi_VRamLockId
|
||||||
|
|
|
||||||
|
|
@ -18058,12 +18058,3 @@ sub_0204AFAC: ; 0x0204AFAC
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_0204AFBC: .word _022AB0A0
|
_0204AFBC: .word _022AB0A0
|
||||||
arm_func_end sub_0204AFAC
|
arm_func_end sub_0204AFAC
|
||||||
|
|
||||||
arm_func_start GetGameMode
|
|
||||||
GetGameMode: ; 0x0204AFC0
|
|
||||||
ldr r0, _0204AFCC ; =GAME_MODE
|
|
||||||
ldrb r0, [r0]
|
|
||||||
bx lr
|
|
||||||
.align 2, 0
|
|
||||||
_0204AFCC: .word GAME_MODE
|
|
||||||
arm_func_end GetGameMode
|
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
#include "enums.h"
|
#include "enums.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
||||||
|
enum game_mode GetGameMode();
|
||||||
bool8 sub_0204AFD0();
|
bool8 sub_0204AFD0();
|
||||||
bool8 IsGameModeRescue();
|
bool8 IsGameModeRescue();
|
||||||
void SetGameMode(enum game_mode new_game_mode);
|
void SetGameMode(enum game_mode new_game_mode);
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,10 @@
|
||||||
|
|
||||||
extern enum game_mode GAME_MODE;
|
extern enum game_mode GAME_MODE;
|
||||||
|
|
||||||
|
enum game_mode GetGameMode() {
|
||||||
|
return GAME_MODE;
|
||||||
|
}
|
||||||
|
|
||||||
u8 sub_0204AFD0() {
|
u8 sub_0204AFD0() {
|
||||||
if ((u8)(GAME_MODE + 0xFE) <= 1) {
|
if ((u8)(GAME_MODE + 0xFE) <= 1) {
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user