Skip to content

Align some stuff with SA1 #224

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

Merged
freshollie merged 15 commits into from
Oct 20, 2025
Merged

Align some stuff with SA1 #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d1ce5ab
Occurences of gLoadedSaveGame -> LOADED_SAVE
JaceCear Oct 20, 2025
ac2eb9e
More occurences of gLoadedSaveGame -> LOADED_SAVE
JaceCear Oct 20, 2025
90b54e7
Align Task_GameStage with SA1
JaceCear Oct 20, 2025
193f025
Rename gUnknown_080D5768 -> sMPFinishTileInfo
JaceCear Oct 20, 2025
7af47a0
More LOADED_SAVE renames
JaceCear Oct 20, 2025
a31e3f5
Formatter...
JaceCear Oct 20, 2025
40e1c27
Start aligning mp_finish with SA1
JaceCear Oct 20, 2025
9b6ce23
Align CreateMultiplayerFinishHandler with current state in SA1
JaceCear Oct 20, 2025
b945917
Move scratch link to SA1 func
JaceCear Oct 20, 2025
51bf187
Align MP finish.c with SA1
JaceCear Oct 20, 2025
a157cb0
Add notes
JaceCear Oct 20, 2025
910f832
Rename item_box -> itembox
JaceCear Oct 20, 2025
65da3a1
Fix build
JaceCear Oct 20, 2025
34c6583
Fix build
JaceCear Oct 20, 2025
feb1639
Fix collect_rings build
JaceCear Oct 20, 2025
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
4 changes: 2 additions & 2 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@
"heart_particles_effect.h": "c",
"results.h": "c",
"time_display.h": "c",
"item_box.h": "c",
"mystery_item_box.h": "c",
"itembox.h": "c",
"mystery_itembox.h": "c",
"stage_palette_loader.h": "c",
"093.h": "c",
"flying_handle.h": "c",
Expand Down
0 include/game/mystery_item_box.h → include/game/mystery_itembox.h
View file
Open in desktop
File renamed without changes.
0 include/game/sa1_sa2_shared/item_box.h → include/game/sa1_sa2_shared/itembox.h
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions ldscript.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ SECTIONS
src/game/sa1_sa2_shared/spot_light.o(.text);
src/game/sa1_sa2_shared/pause_menu.o(.text);
src/game/sa1_sa2_shared/collect_ring_effect.o(.text);
src/game/sa1_sa2_shared/item_box.o(.text);
src/game/sa1_sa2_shared/itembox.o(.text);
src/game/sa1_sa2_shared/dust_cloud.o(.text);
src/game/sa1_sa2_shared/magnetic_ring.o(.text);
src/game/sa1_sa2_shared/music_manager.o(.text);
Expand Down Expand Up @@ -293,7 +293,7 @@ SECTIONS

src/game/math.o(.text);

src/game/mystery_item_box.o(.text);
src/game/mystery_itembox.o(.text);
src/game/heart_particles_effect.o(.text);
src/game/race_progress.o(.text);
src/game/multiplayer/mp_attack_1_effect.o(.text);
Expand Down Expand Up @@ -375,13 +375,13 @@ SECTIONS
src/game/assets/compressed/entities.o(.rodata);
src/game/assets/compressed/roms.o(.rodata);

/* "SA1 Leftovers" data */
/* "sa1_sa2_shared" data */
src/game/sa1_sa2_shared/rings_manager.o(.rodata);
src/game/sa1_sa2_shared/entities_manager.o(.rodata);
src/game/sa1_sa2_shared/unused_level_select.o(.rodata);
src/game/sa1_sa2_shared/unused_flash_task.o(.rodata);
src/game/sa1_sa2_shared/pause_menu.o(.rodata);
src/game/sa1_sa2_shared/item_box.o(.rodata);
src/game/sa1_sa2_shared/itembox.o(.rodata);
src/game/sa1_sa2_shared/music_manager.o(.rodata);
src/game/sa1_sa2_shared/input_buffer.o(.rodata);
src/game/sa1_sa2_shared/interactables/spring.o(.rodata);
Expand Down Expand Up @@ -472,7 +472,7 @@ SECTIONS
src/game/multiboot/connection.o(.rodata);
src/game/multiboot/collect_rings/time_display.o(.rodata);
src/game/math.o(.rodata);
src/game/mystery_item_box.o(.rodata);
src/game/mystery_itembox.o(.rodata);
src/game/race_progress.o(.rodata);
src/game/multiplayer/mp_attack_1_effect.o(.rodata);
src/game/multiplayer_lobby.o(.rodata);
Expand Down Expand Up @@ -587,7 +587,7 @@ SECTIONS
sound/songs/midi/se_amy_super_hammer_attack.o(.rodata);
sound/songs/midi/se_amy_hammer_swirl.o(.rodata);
sound/songs/midi/se_sa1_goal_post.o(.rodata);
sound/songs/midi/se_item_box.o(.rodata);
sound/songs/midi/se_itembox.o(.rodata);
sound/songs/midi/se_timer.o(.rodata);
sound/songs/midi/se_stage_result_counter.o(.rodata);
sound/songs/midi/se_stage_result_counter_done.o(.rodata);
Expand All @@ -599,7 +599,7 @@ SECTIONS
sound/songs/midi/se_spin.o(.rodata);
sound/songs/midi/se_148.o(.rodata);
sound/songs/midi/se_time_up.o(.rodata);
sound/songs/midi/se_item_box_2.o(.rodata);
sound/songs/midi/se_itembox_2.o(.rodata);
sound/songs/midi/se_151.o(.rodata);
sound/songs/midi/se_checkpoint.o(.rodata);
sound/songs/midi/se_spring.o(.rodata);
Expand Down
4 changes: 2 additions & 2 deletions multi_boot/roms/collect_rings/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ SA2_C_FILES := \
sa2/game/multiboot/collect_rings/results.c \
sa2/game/sa1_sa2_shared/entities_manager.c \
sa2/game/sa1_sa2_shared/collision.c \
sa2/game/mystery_item_box.c \
sa2/game/mystery_itembox.c \
sa2/game/sa1_sa2_shared/rings_manager.c \
sa2/game/multiboot/collect_rings/time_display.c \
sa2/game/multiplayer/indicators.c \
Expand Down Expand Up @@ -160,7 +160,7 @@ SA2_MID_FILES := \
sa2/mus_fanfare.mid \
sa2/se_spin_dash_release.mid \
sa2/se_life_lost.mid \
sa2/se_item_box_2.mid \
sa2/se_itembox_2.mid \
sa2/se_spikes.mid \
sa2/se_276.mid \
sa2/se_grinding.mid \
Expand Down
6 changes: 3 additions & 3 deletions multi_boot/roms/collect_rings/ldscript.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ SECTIONS {
build/collect_rings/src/sa2/game/multiboot/collect_rings/results.o(.text);
build/collect_rings/src/sa2/game/sa1_sa2_shared/entities_manager.o(.text);
build/collect_rings/src/sa2/game/sa1_sa2_shared/collision.o(.text);
build/collect_rings/src/sa2/game/mystery_item_box.o(.text);
build/collect_rings/src/sa2/game/mystery_itembox.o(.text);
build/collect_rings/src/sa2/game/sa1_sa2_shared/rings_manager.o(.text);
build/collect_rings/src/sa2/game/multiboot/collect_rings/time_display.o(.text);
build/collect_rings/src/sa2/game/multiplayer/indicators.o(.text);
Expand Down Expand Up @@ -95,7 +95,7 @@ SECTIONS {
build/collect_rings/src/sa2/sprite.o(.rodata);
build/collect_rings/src/sa2/game/multiplayer/multiplayer_event_mgr.o(.rodata);
build/collect_rings/src/sa2/game/sa1_sa2_shared/entities_manager.o(.rodata);
build/collect_rings/src/sa2/game/mystery_item_box.o(.rodata);
build/collect_rings/src/sa2/game/mystery_itembox.o(.rodata);
build/collect_rings/src/sa2/game/multiboot/collect_rings/time_display.o(.rodata);
build/collect_rings/src/sa2/game/multiplayer/mp_player.o(.rodata);
build/collect_rings/src/sa2/game/multiplayer/finish.o(.rodata);
Expand All @@ -121,7 +121,7 @@ SECTIONS {
build/collect_rings/sound/songs/midi/se_rings_lost__collect_rings.o(.rodata);
build/collect_rings/sound/songs/midi/se_life_lost.o(.rodata);
build/collect_rings/sound/songs/midi/se_time_up.o(.rodata);
build/collect_rings/sound/songs/midi/se_item_box_2.o(.rodata);
build/collect_rings/sound/songs/midi/se_itembox_2.o(.rodata);
build/collect_rings/sound/songs/midi/se_spring__collect_rings.o(.rodata);
build/collect_rings/sound/songs/midi/se_spikes.o(.rodata);
build/collect_rings/sound/songs/midi/se_alarm_1.o(.rodata);
Expand Down
2 changes: 1 addition & 1 deletion multi_boot/roms/collect_rings/songs.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ $(MID_SUBDIR)/se_life_lost.s: %.s: %.mid
$(MID_SUBDIR)/se_time_up.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G0 -P20 -V89

$(MID_SUBDIR)/se_item_box_2.s: %.s: %.mid
$(MID_SUBDIR)/se_itembox_2.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G0 -P20 -V127

$(MID_SUBDIR)/se_151.s: %.s: %.mid
Expand Down
2 changes: 1 addition & 1 deletion multi_boot/roms/collect_rings/sound/song_table.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ gSongTable: @ 0x02016D8C
song se_rings_lost__collect_rings, 3, 3
song se_life_lost, 2, 2
song se_time_up, 2, 2
song se_item_box_2, 2, 2
song se_itembox_2, 2, 2
song se_spring__collect_rings, 2, 2
song se_spikes, 2, 2
song se_alarm_1, 2, 2
Expand Down
4 changes: 2 additions & 2 deletions songs.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ $(MID_SUBDIR)/se_amy_hammer_swirl.s: %.s: %.mid
$(MID_SUBDIR)/se_sa1_goal_post.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G3 -P20 -V120

$(MID_SUBDIR)/se_item_box.s: %.s: %.mid
$(MID_SUBDIR)/se_itembox.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G0 -P50 -V127

$(MID_SUBDIR)/se_timer.s: %.s: %.mid
Expand Down Expand Up @@ -295,7 +295,7 @@ $(MID_SUBDIR)/se_148.s: %.s: %.mid
$(MID_SUBDIR)/se_time_up.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G3 -P20 -V89

$(MID_SUBDIR)/se_item_box_2.s: %.s: %.mid
$(MID_SUBDIR)/se_itembox_2.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G0 -P50 -V127

$(MID_SUBDIR)/se_151.s: %.s: %.mid
Expand Down
4 changes: 2 additions & 2 deletions sound/song_table.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ mAlignWord
mAlignWord
song C_DECL(dummy_song_header), 0, 0
mAlignWord
song C_DECL(se_item_box), 2, 2
song C_DECL(se_itembox), 2, 2
mAlignWord
song C_DECL(se_timer), 2, 2
mAlignWord
Expand All @@ -301,7 +301,7 @@ mAlignWord
mAlignWord
song C_DECL(se_time_up), 3, 3
mAlignWord
song C_DECL(se_item_box_2), 2, 2
song C_DECL(se_itembox_2), 2, 2
mAlignWord
song C_DECL(se_151), 2, 2
mAlignWord
Expand Down
0 sound/songs/midi/se_item_box.mid → sound/songs/midi/se_itembox.mid
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 sound/songs/midi/se_item_box_2.mid → sound/songs/midi/se_itembox_2.mid
100755 → 100644
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/game/character_select.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,7 +1596,7 @@ static void Task_MultiplayerWaitForSelections(void)
union MultiSioData *send, *recv;
u32 i, j;
Sprite *s;
u8 charactersSelected[NUM_CHARACTERS] = { 0, 0, 0, 0, 0 };
u8 charactersSelected[NUM_CHARACTERS] = { 0 };

struct CharacterSelectionScreen *characterScreen = TASK_DATA(gCurTask);
BackgroundAnim();
Expand Down
2 changes: 1 addition & 1 deletion src/game/multiboot/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ void StartSinglePakConnect(void)

t = TaskCreate(sub_8081604, sizeof(struct SinglePakConnectScreen), 0x2000, 0, NULL);
connectScreen = TASK_DATA(t);
connectScreen->unkFA = gLoadedSaveGame->language;
connectScreen->unkFA = LOADED_SAVE->language;

if ((u8)LanguageIndex(connectScreen->unkFA) > LanguageIndex(LANG_ITALIAN)) {
connectScreen->unkFA = 1;
Expand Down
Loading
Loading