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

Add missing pause_tabs enums, fix BlueNinjaKoopa -> BlackNinjaKoopa #1184

Merged
merged 14 commits into from
Apr 22, 2024
+14 −14
Merged

Add missing pause_tabs enums, fix BlueNinjaKoopa -> BlackNinjaKoopa #1184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c149616
suggest possible bgm name if it is not found
Rainchus Mar 5, 2024
6cc4520
remove pointless ()
Rainchus Mar 5, 2024
c617eeb
run black
Rainchus Mar 5, 2024
c6018a6
...run updated black
Rainchus Mar 5, 2024
816d7f5
unhardcode many for loop conditions
Rainchus Mar 5, 2024
f7cfb52
Merge branch 'pmret:main' into master
Rainchus Mar 5, 2024
3bf973a
fix inconsistent RGBA_BUF_SIZE naming
Rainchus Mar 5, 2024
2ce1730
requested macro changes
Rainchus Mar 5, 2024
1154132
Merge branch 'main' of https://github.com/pmret/papermario
Rainchus Mar 9, 2024
c258024
unhardcode 64 in pause_badges.c
Rainchus Mar 9, 2024
a92df7e
Merge branch 'main' of https://github.com/pmret/papermario
Rainchus Apr 18, 2024
4f2220d
remove hardcoding of 3 move IDs in battle/sushie.c
Rainchus Apr 19, 2024
7d0efa6
pause_tabs enums, fix BlueNinjaKoopa -> BlackNinjaKoopa
Rainchus Apr 22, 2024
db1bdb7
Merge branch 'pmret:main' into master
Rainchus Apr 22, 2024
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 src/battle/actors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1730,8 +1730,8 @@
shadowOffset: 0
- BlackNinjakoopa:
level: 17
nameMsg: MSG_EnemyName_BlueNinjakoopa
tattleMsg: MSG_EnemyTattle_BlueNinjakoopa
nameMsg: MSG_EnemyName_BlackNinjakoopa
tattleMsg: MSG_EnemyTattle_BlackNinjakoopa
walkSound: [ SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B ]
flySound: [ SOUND_NONE, SOUND_NONE ]
jumpSound: SOUND_ACTOR_JUMP
Expand Down
12 changes: 6 additions & 6 deletions src/pause/pause_tabs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ void pause_tabs_draw_stats(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32
hud_element_set_render_pos(gPauseTabsIconIDs[0], baseX + 22, baseY + 7);
hud_element_draw_without_clipping(gPauseTabsIconIDs[0]);
if (gPauseMenuCurrentTab == 0) {
if (gPauseTabsWindowIDs[menu->col] == 25) {
if (gPauseTabsWindowIDs[menu->col] == WINDOW_ID_PAUSE_TAB_STATS) {
pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
}
}
Expand All @@ -231,7 +231,7 @@ void pause_tabs_draw_badges(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s3
hud_element_set_render_pos(gPauseTabsIconIDs[1], baseX + 22, baseY + 7);
hud_element_draw_without_clipping(gPauseTabsIconIDs[1]);
if (gPauseMenuCurrentTab == 0) {
if (gPauseTabsWindowIDs[menu->col] == 26) {
if (gPauseTabsWindowIDs[menu->col] == WINDOW_ID_PAUSE_TAB_BADGES) {
pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
}
}
Expand All @@ -249,7 +249,7 @@ void pause_tabs_draw_items(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32
hud_element_set_render_pos(gPauseTabsIconIDs[2], baseX + 22, baseY + 7);
hud_element_draw_without_clipping(gPauseTabsIconIDs[2]);
if (gPauseMenuCurrentTab == 0) {
if (gPauseTabsWindowIDs[menu->col] == 27) {
if (gPauseTabsWindowIDs[menu->col] == WINDOW_ID_PAUSE_TAB_ITEMS) {
pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
}
}
Expand All @@ -267,7 +267,7 @@ void pause_tabs_draw_party(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32
hud_element_set_render_pos(gPauseTabsIconIDs[3], baseX + 22, baseY + 7);
hud_element_draw_without_clipping(gPauseTabsIconIDs[3]);
if (gPauseMenuCurrentTab == 0) {
if (gPauseTabsWindowIDs[menu->col] == 28) {
if (gPauseTabsWindowIDs[menu->col] == WINDOW_ID_PAUSE_TAB_PARTY) {
pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
}
}
Expand All @@ -285,7 +285,7 @@ void pause_tabs_draw_spirits(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s
hud_element_set_render_pos(gPauseTabsIconIDs[4], baseX + 22, baseY + 7);
hud_element_draw_without_clipping(gPauseTabsIconIDs[4]);
if (gPauseMenuCurrentTab == 0) {
if (gPauseTabsWindowIDs[menu->col] == 29) {
if (gPauseTabsWindowIDs[menu->col] == WINDOW_ID_PAUSE_TAB_SPIRITS) {
pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
}
}
Expand All @@ -303,7 +303,7 @@ void pause_tabs_draw_map(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 h
hud_element_set_render_pos(gPauseTabsIconIDs[5], baseX + 23, baseY + 7);
hud_element_draw_without_clipping(gPauseTabsIconIDs[5]);
if (gPauseMenuCurrentTab == 0) {
if (gPauseTabsWindowIDs[menu->col] == 30) {
if (gPauseTabsWindowIDs[menu->col] == WINDOW_ID_PAUSE_TAB_MAP) {
pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
}
}
Expand Down
4 changes: 2 additions & 2 deletions tools/splat_ext/msg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5141,7 +5141,7 @@
- [0x1C, 0x000C, EnemyTattle_BillBlaster]
- [0x1C, 0x000D, EnemyTattle_FakeBowser]
- [0x1C, 0x000E, EnemyTattle_RedNinjakoopa]
- [0x1C, 0x000F, EnemyTattle_BlueNinjakoopa]
- [0x1C, 0x000F, EnemyTattle_BlackNinjakoopa]
- [0x1C, 0x0010, EnemyTattle_YellowNinjakoopa]
- [0x1C, 0x0011, EnemyTattle_GreenNinjakoopa]
- [0x1C, 0x0012, EnemyTattle_KoopaBros]
Expand Down Expand Up @@ -7570,7 +7570,7 @@
- [0x29, 0x000C, EnemyName_BillBlaster]
- [0x29, 0x000D, EnemyName_FakeBowser]
- [0x29, 0x000E, EnemyName_RedNinjakoopa]
- [0x29, 0x000F, EnemyName_BlueNinjakoopa]
- [0x29, 0x000F, EnemyName_BlackNinjakoopa]
- [0x29, 0x0010, EnemyName_YellowNinjakoopa]
- [0x29, 0x0011, EnemyName_GreenNinjakoopa]
- [0x29, 0x0012, EnemyName_KoopaBros]
Expand Down
4 changes: 2 additions & 2 deletions tools/splat_ext/msg_ique.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5141,7 +5141,7 @@
- [0x1C, 0x000C, EnemyTattle_BillBlaster]
- [0x1C, 0x000D, EnemyTattle_FakeBowser]
- [0x1C, 0x000E, EnemyTattle_RedNinjakoopa]
- [0x1C, 0x000F, EnemyTattle_BlueNinjakoopa]
- [0x1C, 0x000F, EnemyTattle_BlackNinjakoopa]
- [0x1C, 0x0010, EnemyTattle_YellowNinjakoopa]
- [0x1C, 0x0011, EnemyTattle_GreenNinjakoopa]
- [0x1C, 0x0012, EnemyTattle_KoopaBros]
Expand Down Expand Up @@ -7570,7 +7570,7 @@
- [0x29, 0x000C, EnemyName_BillBlaster]
- [0x29, 0x000D, EnemyName_FakeBowser]
- [0x29, 0x000E, EnemyName_RedNinjakoopa]
- [0x29, 0x000F, EnemyName_BlueNinjakoopa]
- [0x29, 0x000F, EnemyName_BlackNinjakoopa]
- [0x29, 0x0010, EnemyName_YellowNinjakoopa]
- [0x29, 0x0011, EnemyName_GreenNinjakoopa]
- [0x29, 0x0012, EnemyName_KoopaBros]
Expand Down
4 changes: 2 additions & 2 deletions tools/splat_ext/msg_pal_en.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5146,7 +5146,7 @@
- [0x1C, 0x000C, EnemyTattle_BillBlaster]
- [0x1C, 0x000D, EnemyTattle_FakeBowser]
- [0x1C, 0x000E, EnemyTattle_RedNinjakoopa]
- [0x1C, 0x000F, EnemyTattle_BlueNinjakoopa]
- [0x1C, 0x000F, EnemyTattle_BlackNinjakoopa]
- [0x1C, 0x0010, EnemyTattle_YellowNinjakoopa]
- [0x1C, 0x0011, EnemyTattle_GreenNinjakoopa]
- [0x1C, 0x0012, EnemyTattle_KoopaBros]
Expand Down Expand Up @@ -7622,7 +7622,7 @@
- [0x29, 0x000C, EnemyName_BillBlaster]
- [0x29, 0x000D, EnemyName_FakeBowser]
- [0x29, 0x000E, EnemyName_RedNinjakoopa]
- [0x29, 0x000F, EnemyName_BlueNinjakoopa]
- [0x29, 0x000F, EnemyName_BlackNinjakoopa]
- [0x29, 0x0010, EnemyName_YellowNinjakoopa]
- [0x29, 0x0011, EnemyName_GreenNinjakoopa]
- [0x29, 0x0012, EnemyName_KoopaBros]
Expand Down
Loading