Skip to content

Commit

Permalink
Merge pull request #682 from Eebit/ending-details-cleanup
Browse files Browse the repository at this point in the history
Cleanup `ending_details`
  • Loading branch information
RevoSucks authored Oct 27, 2024
2 parents 5bd641d + e291394 commit 1193dee
Show file tree
Hide file tree
Showing 11 changed files with 1,093 additions and 810 deletions.
4 changes: 2 additions & 2 deletions data/data_59E8E0.s
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
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
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
93 changes: 90 additions & 3 deletions include/constants/chapters.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,93 @@
#pragma once

enum chapter_idx {
// todo
CHAPTER_IDX_PROLOGUE = 0,
enum chapter_idx
{
CHAPTER_L_PROLOGUE = 0x00, // The Fall of Renais
CHAPTER_L_1 = 0x01, // Ch1: Escape!
CHAPTER_L_2 = 0x02, // Ch2: The Protected
CHAPTER_L_3 = 0x03, // Ch3: The Bandits of Borgo
CHAPTER_L_4 = 0x04, // Ch4: Ancient Horrors
CHAPTER_L_5X = 0x05, // Ch5x: Unbroken Heart
CHAPTER_L_5 = 0x06, // Ch5: The Empire's Reach
CHAPTER_L_6 = 0x07, // Ch6: Victims of War
CHAPTER_L_7 = 0x08, // Ch7: Waterside Renvall
CHAPTER_L_8 = 0x09, // Ch8: It's a Trap!

CHAPTER_E_9 = 0x0A, // Ch9: Distant Blade
CHAPTER_E_10 = 0x0B, // Ch10: Revolt at Carcino
CHAPTER_E_12 = 0x0C, // Ch12: Village of Silence
CHAPTER_E_13 = 0x0D, // Ch13: Hamill Canyon
CHAPTER_E_14 = 0x0E, // Ch14: Queen of White Dunes
CHAPTER_E_15 = 0x0F, // Ch15: Scorched Sand
CHAPTER_E_16 = 0x10, // Ch16: Ruled by Madness
CHAPTER_E_17 = 0x11, // Ch17: River of Regrets
CHAPTER_E_18 = 0x12, // Ch18: Two Faces of Evil
CHAPTER_E_19 = 0x13, // Ch19: Last Hope
CHAPTER_E_20 = 0x14, // Ch20: Darkling Woods
CHAPTER_E_21 = 0x15, // Ch21: Sacred Stone
CHAPTER_E_21X = 0x16, // Ch21x: Sacred Stone

CHAPTER_I_9 = 0x17, // Ch9: Fort Rigwald
CHAPTER_I_10 = 0x18, // Ch10: Turning Traitor
CHAPTER_I_12 = 0x19, // Ch12: Landing at Taizel
CHAPTER_I_13 = 0x1A, // Ch13: Fluorspar's Oath
CHAPTER_I_14 = 0x1B, // Ch14: Father and Son
CHAPTER_I_15 = 0x1C, // Ch15: Scorched Sand
CHAPTER_I_16 = 0x1D, // Ch16: Ruled by Madness
CHAPTER_I_17 = 0x1E, // Ch17: River of Regrets
CHAPTER_I_18 = 0x1F, // Ch18: Two Faces of Evil
CHAPTER_I_19 = 0x20, // Ch19: Last Hope
CHAPTER_I_20 = 0x21, // Ch20: Darkling Woods
CHAPTER_I_21 = 0x22, // Ch21: Sacred Stone
CHAPTER_I_21X = 0x23, // Ch21x: Sacred Stone

CHAPTER_T_01 = 0x24, // Tower of Valni 1
CHAPTER_T_02 = 0x25, // Tower of Valni 2
CHAPTER_T_03 = 0x26, // Tower of Valni 3
CHAPTER_T_04 = 0x27, // Tower of Valni 4
CHAPTER_T_05 = 0x28, // Tower of Valni 5
CHAPTER_T_06 = 0x29, // Tower of Valni 6
CHAPTER_T_07 = 0x2A, // Tower of Valni 7
CHAPTER_T_08 = 0x2B, // Tower of Valni 8

CHAPTER_2C = 0x2C,
CHAPTER_2D = 0x2D,

CHAPTER_R_01 = 0x2E, // Lagdou Ruins 1
CHAPTER_R_02 = 0x2F, // Lagdou Ruins 2
CHAPTER_R_03 = 0x30, // Lagdou Ruins 3
CHAPTER_R_04 = 0x31, // Lagdou Ruins 4
CHAPTER_R_05 = 0x32, // Lagdou Ruins 5
CHAPTER_R_06 = 0x33, // Lagdou Ruins 6
CHAPTER_R_07 = 0x34, // Lagdou Ruins 7
CHAPTER_R_08 = 0x35, // Lagdou Ruins 8
CHAPTER_R_09 = 0x36, // Lagdou Ruins 9
CHAPTER_R_10 = 0x37, // Lagdou Ruins 10

CHAPTER_CASTLE_FRELIA = 0x38,
CHAPTER_MALKAEN_COAST = 0x39,

CHAPTER_3A = 0x3A,
CHAPTER_3B = 0x3B,
CHAPTER_3C = 0x3C,

CHAPTER_E_11 = 0x3D, // Ch11: Creeping Darkness
CHAPTER_I_11 = 0x3E, // Ch11: Phantom Ship

CHAPTER_3F = 0x3F,
CHAPTER_40 = 0x40,
CHAPTER_41 = 0x41,
CHAPTER_42 = 0x42,
CHAPTER_43 = 0x43,
CHAPTER_44 = 0x44,
CHAPTER_45 = 0x45,
CHAPTER_46 = 0x46,
CHAPTER_47 = 0x47,
CHAPTER_48 = 0x48,
CHAPTER_49 = 0x49,
CHAPTER_4A = 0x4A,
CHAPTER_4B = 0x4B,
CHAPTER_4C = 0x4C,
CHAPTER_4D = 0x4D,
CHAPTER_4E = 0x4E,
};
2 changes: 2 additions & 0 deletions include/constants/songs.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ enum song_idx {
SONG_43 = 0x43,
SONG_44 = 0x44,
SONG_45 = 0x45,
SONG_BGM_ED_AFTER = 0x046,
SONG_BGM_ED_STAFF_2 = 0x056,
SONG_5A = 0x5A,
SONG_5B = 0x5B,
SONG_5C = 0x5C,
Expand Down
Loading

0 comments on commit 1193dee

Please sign in to comment.