Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JP] Finished World Areas, Pause, Dead Maps (kzn, flo) and some more #1208

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+9,501 −753
Open

[JP] Finished World Areas, Pause, Dead Maps (kzn, flo) and some more #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions include/common_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2523,10 +2523,16 @@ typedef struct CreditsChar {
/* 0x18 */ s32 fadeInTime;
} CreditsChar; // size = unk

#if VERSION_JP
#define MAX_CREDITS_LINES 30
#else
#define MAX_CREDITS_LINES 32
#endif

typedef struct CreditsData {
/* 0x00 */ u32 workerID;
/* 0x04 */ CreditsLine lines[32];
} CreditsData; // size = 0x74
/* 0x04 */ CreditsLine lines[MAX_CREDITS_LINES];
} CreditsData; // size = 0xE84, JP size = 0xD9C

typedef struct CreditsPairOffset {
/* 0x00 */ u8 firstChar;
Expand Down
9 changes: 9 additions & 0 deletions include/dead.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,5 +337,14 @@
#define GetAnimatedRotationByTreeIndex dead_GetAnimatedRotationByTreeIndex
#define SetEncounterStatusFlags dead_SetEncounterStatusFlags
#define Entity_YellowBlock dead_Entity_YellowBlock
#if VERSION_JP
#define osSyncPrintf dead_osSyncPrintf
#define SetModelFlags dead_SetModelFlags
#define SetNpcScale dead_SetNpcScale
#define StartBattle dead_StartBattle
#define Entity_BrickBlock dead_Entity_BrickBlock
#define Entity_SimpleSpring dead_Entity_SimpleSpring
#define MakeTransformGroup dead_MakeTransformGroup
#endif

#endif
11 changes: 0 additions & 11 deletions src/77480.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,6 @@
#define i_spy_VRAM (void*)0x802B7000
#endif

#if VERSION_JP // TODO remove once segments are split
extern Addr i_spy_ROM_START;
extern Addr i_spy_ROM_END;
extern Addr pulse_stone_ROM_START;
extern Addr pulse_stone_ROM_END;
extern Addr speech_bubble_ROM_START;
extern Addr speech_bubble_ROM_END;
extern Addr inspect_icon_ROM_START;
extern Addr inspect_icon_ROM_END;
#endif

UNK_FUN_PTR(ISpyNotificationCallback);
UNK_FUN_PTR(PulseStoneNotificationCallback);
UNK_FUN_PTR(TalkNotificationCallback);
Expand Down
6 changes: 0 additions & 6 deletions src/battle/btl_states_actions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
#include "model.h"
#include "game_modes.h"

#if VERSION_JP
extern Addr btl_states_menus_ROM_START;
extern Addr btl_states_menus_ROM_END;
extern Addr btl_states_menus_VRAM;
#endif

extern StageListRow* gCurrentStagePtr;

extern s16 D_802809F6;
Expand Down
Loading
Loading