Skip to content

Commit

Permalink
(ending_details) Renames
Browse files Browse the repository at this point in the history
  • Loading branch information
@Eebit
Eebit committed Oct 27, 2024
1 parent 5809d99 commit e291394
Show file tree
Hide file tree
Showing 9 changed files with 254 additions and 253 deletions.
4 changes: 2 additions & 2 deletions data/data_59E8E0.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ gUnknown_085A638C: @ 0x085A638C
gUnknown_085A643C: @ 0x085A643C
.incbin "baserom.gba", 0x5A643C, 0x40

.global gUnknown_085A647C
gUnknown_085A647C: @ 0x085A647C
.global Tsa_PlayerRankFog
Tsa_PlayerRankFog: @ 0x085A647C
.incbin "baserom.gba", 0x5A647C, 0x804

.global Img_DanceringFx
Expand Down
4 changes: 2 additions & 2 deletions data/data_A01CC4.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ gPal_08A07C58: @ 0x08A07C58
Img_ChapterIntroFog: @ 0x08A07DD8
.incbin "baserom.gba", 0xA07DD8, 0x1C84

.global gUnknown_08A09A5C
gUnknown_08A09A5C: @ 0x08A09A5C
.global Pal_PlayerRankFog
Pal_PlayerRankFog: @ 0x08A09A5C
.incbin "baserom.gba", 0xA09A5C, 0x3F0

.global gGfx_08A09E4C
Expand Down
36 changes: 18 additions & 18 deletions data/data_A3E4D4.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

.incbin "baserom.gba", 0xA3EFB4, 0x75C

.global gPal_CharacterEndingMenu
gPal_CharacterEndingMenu: @ 0x08A3F710
.global Pal_CharacterEndingMenu
Pal_CharacterEndingMenu: @ 0x08A3F710
.incbin "baserom.gba", 0xA3F710, 0x40

.global gGfx_CharacterEndingMenu
gGfx_CharacterEndingMenu: @ 0x08A3F750
.global Img_CharacterEndingMenu
Img_CharacterEndingMenu: @ 0x08A3F750
.incbin "baserom.gba", 0xA3F750, 0x89C

.global gUnknown_08A3FFEC
gUnknown_08A3FFEC: @ 0x08A3FFEC
.global Tsa_CharacterEnding_TopBorder
Tsa_CharacterEnding_TopBorder: @ 0x08A3FFEC
.incbin "baserom.gba", 0xA3FFEC, 0x7C

.global gUnknown_08A40068
gUnknown_08A40068: @ 0x08A40068
.global Tsa_CharacterEnding_BottomBorder
Tsa_CharacterEnding_BottomBorder: @ 0x08A40068
.incbin "baserom.gba", 0xA40068, 0x7C

.global gTsa_SoloEndingNameplate
Expand All @@ -34,24 +34,24 @@ gTsa_PairedEndingNameplates: @ 0x08A4034C
gTsa_PairedEndingWindow: @ 0x08A40470
.incbin "baserom.gba", 0xA40470, 0x144

.global gPal_FinScreen
gPal_FinScreen: @ 0x08A405B4
.global Pal_FinScreen
Pal_FinScreen: @ 0x08A405B4
.incbin "baserom.gba", 0xA405B4, 0x20

.global gGfx_FinScreen
gGfx_FinScreen: @ 0x08A405D4
.global Img_FinScreen
Img_FinScreen: @ 0x08A405D4
.incbin "baserom.gba", 0xA405D4, 0x3FC

.global gTsa_FinScreen
gTsa_FinScreen: @ 0x08A409D0
.global Tsa_FinScreen
Tsa_FinScreen: @ 0x08A409D0
.incbin "baserom.gba", 0xA409D0, 0x104

.global gUnknown_08A40AD4
gUnknown_08A40AD4: @ 0x08A40AD4
.global Pal_08A40AD4
Pal_08A40AD4: @ 0x08A40AD4
.incbin "baserom.gba", 0xA40AD4, 0x40

.global gUnknown_08A40B14
gUnknown_08A40B14: @ 0x08A40B14
.global Tsa_08A40B14
Tsa_08A40B14: @ 0x08A40B14
.incbin "baserom.gba", 0xA40B14, 0x4B4

.global Pal_StaffReelEnt_08A40FC8
Expand Down
54 changes: 27 additions & 27 deletions include/ending_details.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,20 @@ struct CharacterEndingProc
/* 00 */ PROC_HEADER;

/* 29 */ STRUCT_PAD(0x29, 0x2E);
/* 2E */ u16 unk_2e;
/* 30 */ struct CharacterEndingEnt * unk_30;
/* 34 */ struct CharacterEndingEnt * unk_34;
/* 2E */ u16 unk_2e; // unused? Initialized and unreferenced after
/* 30 */ struct CharacterEndingEnt * pCharacterEnding;
/* 34 */ struct CharacterEndingEnt * pCharacterEndingBkp;
/* 38 */ struct Unit * unitA;
/* 3C */ struct Unit * unitB;
/* 40 */ u32 unk_40[8]; // flags for characters who have already been shown in an ending
/* 40 */ u32 pidShownFlags[8]; // flags for characters who have already been shown in an ending
};

struct EndingBattleDisplayProc
{
/* 00 */ PROC_HEADER;

/* 2C */ struct Unit * units[2];
/* 34 */ int unk_34;
/* 34 */ int timer;
/* 38 */ struct CharacterEndingEnt * pCharacterEnding;
/* 3C */ u16 battleAmounts[2];
/* 40 */ u16 winAmounts[2];
Expand All @@ -78,7 +78,7 @@ struct EndingBattleTextProc
/* 2C */ struct CharacterEndingEnt * pCharacterEnding;
/* 30 */ struct Unit * unitA;
/* 34 */ struct Unit * unitB;
/* 38 */ u32 unk_38;
/* 38 */ STRUCT_PAD(0x38, 0x3C);
/* 3C */ int pauseTimer;
/* 40 */ int defaultPauseDelay;
/* 44 */ const char * str;
Expand All @@ -90,20 +90,20 @@ struct FinScreenProc
/* 00 */ PROC_HEADER;

/* 29 */ STRUCT_PAD(0x29, 0x4C);
/* 4C */ u16 unk_4c;
/* 4C */ u16 blendTimer;
/* 4E */ STRUCT_PAD(0x4E, 0x58);
/* 58 */ int unk_58;
/* 58 */ int timer;
};

struct EndingTurnRecordProc
{
/* 00 */ PROC_HEADER;

/* 2C */ int unk_2c;
/* 30 */ int unk_30;
/* 34 */ int unk_34;
/* 38 */ u8 unk_38;
/* 39 */ u8 unk_39;
/* 2C */ int chapterId;
/* 30 */ int yPos;
/* 34 */ int yScrollAmt;
/* 38 */ u8 chapterStatsIdx;
/* 39 */ u8 displayId;
/* 3A */ STRUCT_PAD(0x3A, 0x4C);
/* 4C */ s16 unk_4c;
};
Expand Down Expand Up @@ -132,10 +132,10 @@ extern char * CONST_DATA gpDefeatedEndingLocString;
// ??? SetupCharacterEndingGfx(???);
// ??? sub_80B6810(???);
// ??? sub_80B689C(???);
// ??? sub_80B6920(???);
// ??? InitCharacterEndingText(???);
// ??? CharacterEnding_Init(???);
// ??? sub_80B69D4(???);
// ??? sub_80B6A10(???);
// ??? CharacterEnding_80B69D4(???);
// ??? GetUnitForCharacterEnding(???);
// ??? GetUnitASupporterPid(???);
// ??? DoesUnitHavePairedEnding(???);
// ??? LoadNextCharacterEnding(???);
Expand All @@ -144,14 +144,14 @@ extern char * CONST_DATA gpDefeatedEndingLocString;
// ??? CharacterEnding_End(???);
// ??? CharacterEnding_Unused_80B6C74(???);
void StartCharacterEndings(ProcPtr parent);
// ??? sub_80B6CA8(???);
// ??? CharacterEnding_LoadUnitBattleStats(???);
// ??? SoloEndingBattleDisp_Init(???);
// ??? SoloEndingBattleDisp_Loop(???);
void StartSoloEndingBattleDisplay(struct CharacterEndingEnt *, struct Unit *, struct CharacterEndingProc *);
// ??? sub_80B6F34(???);
// ??? sub_80B71DC(???);
// ??? sub_80B723C(???);
// ??? sub_80B7274(???);
// ??? PairedEndingBattleDisp_Init(???);
// ??? PairedEndingBattleDisp_Loop_SlideIn(???);
// ??? PairedEndingBattleDisp_InitBlend(???);
// ??? PairedEndingBattleDisp_Loop_Blend(???);
void StartPairedEndingBattleDisplay(struct CharacterEndingEnt *, struct Unit *, struct Unit *, struct CharacterEndingProc *);
// ??? EndingBattleInitText(???);
// ??? EndingBattleText_Loop(???);
Expand All @@ -166,13 +166,13 @@ void EndEndingBattleText(void);
void StartFinScreen(ProcPtr);
// ??? sub_80B75AC(???);
// ??? sub_80B7614(???);
// ??? sub_80B7648(???);
// ??? sub_80B770C(???);
// ??? sub_80B7800(???);
// ??? sub_80B7B30(???);
// ??? TurnRecord_Init(???);
// ??? TurnRecord_SetupText(???);
// ??? HandleTurnRecordText(???);
// ??? TurnRecord_Loop_Main(???);
// ??? sub_80B7BD8(???);
// ??? sub_80B8014(???);
// ??? sub_80B8168(???);
// ??? TurnRecord_SetupGfx(???);
// ??? TurnRecord_End(???);
void StartEndingTurnRecordScreen(ProcPtr parent);

#endif // GUARD_ENDINGDETAILS_H
2 changes: 1 addition & 1 deletion include/face.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ int FaceBlinkProc_GenBlinkInterval(struct FaceBlinkProc* proc);
void sub_80064D4(struct FaceProc* proc, int unk);
void sub_80064DC(int slot, int unk);
struct FaceProc* StartFace2(int slot, int fid, int x, int y, int disp);
void sub_8006618(int slot, int x, int y);
void SetFacePosition(int slot, int x, int y);
void sub_800662C(struct UnkFaceProc* proc);
void sub_8006650(struct UnkFaceProc* proc);
void sub_80066A8(struct UnkFaceProc* proc);
Expand Down
22 changes: 11 additions & 11 deletions include/variables.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ extern u16 CONST_DATA Tsa_EventWarp[];

extern u8 gUnknown_085A638C[];
extern u16 gUnknown_085A643C[];
extern u8 gUnknown_085A647C[]; // tsa
extern u8 Tsa_PlayerRankFog[]; // tsa

extern u16 CONST_DATA Img_DanceringFx[];
extern u16 CONST_DATA Tsa_DanceringFx[];
Expand Down Expand Up @@ -833,7 +833,7 @@ extern u16 gPal_08A07AD8[]; // pal
// extern ??? gUnknown_08A07C0A
extern u16 gPal_08A07C58[]; // pal
extern u16 CONST_DATA Img_ChapterIntroFog[];
extern u16 gUnknown_08A09A5C[]; // pal
extern u16 Pal_PlayerRankFog[]; // pal
extern u8 gGfx_08A09E4C[]; // gfx
// extern ??? gUnknown_08A0A4E8
extern u8 gTsa_08A0A9F8[]; // tsa
Expand Down Expand Up @@ -997,19 +997,19 @@ extern u16 gUnknown_08A37300[]; // pal
// extern ??? gUnknown_08A3CB50
// extern ??? gCGDataTable

extern u16 gPal_CharacterEndingMenu[];
extern u8 gGfx_CharacterEndingMenu[];
extern u8 gUnknown_08A3FFEC[]; // tsa
extern u8 gUnknown_08A40068[]; // tsa
extern u16 Pal_CharacterEndingMenu[];
extern u8 Img_CharacterEndingMenu[];
extern u8 Tsa_CharacterEnding_TopBorder[]; // tsa
extern u8 Tsa_CharacterEnding_BottomBorder[]; // tsa
extern u8 gTsa_SoloEndingNameplate[];
extern u8 gTsa_SoloEndingWindow[];
extern u8 gTsa_PairedEndingNameplates[];
extern u8 gTsa_PairedEndingWindow[];
extern u16 gPal_FinScreen[];
extern u8 gGfx_FinScreen[];
extern u8 gTsa_FinScreen[];
extern u16 gUnknown_08A40AD4[]; // pal
extern u8 gUnknown_08A40B14[]; // tsa
extern u16 Pal_FinScreen[];
extern u8 Img_FinScreen[];
extern u8 Tsa_FinScreen[];
extern u16 Pal_08A40AD4[]; // pal
extern u8 Tsa_08A40B14[]; // tsa
extern u16 Pal_StaffReelEnt_08A40FC8[];
extern u8 Img_StaffReelEnt_08A40FE8[];
extern u8 Img_StaffReelEnt_08A41B30[];
Expand Down
Loading

0 comments on commit e291394

Please sign in to comment.