mirror of
https://github.com/pmret/papermario.git
synced 2024-09-18 23:42:35 +02:00
Add missing pause_tabs enums, fix BlueNinjaKoopa -> BlackNinjaKoopa (#1184)
This commit is contained in:
parent
dcba4f1883
commit
d35bdf466b
@ -1730,8 +1730,8 @@
|
|||||||
shadowOffset: 0
|
shadowOffset: 0
|
||||||
- BlackNinjakoopa:
|
- BlackNinjakoopa:
|
||||||
level: 17
|
level: 17
|
||||||
nameMsg: MSG_EnemyName_BlueNinjakoopa
|
nameMsg: MSG_EnemyName_BlackNinjakoopa
|
||||||
tattleMsg: MSG_EnemyTattle_BlueNinjakoopa
|
tattleMsg: MSG_EnemyTattle_BlackNinjakoopa
|
||||||
walkSound: [ SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B ]
|
walkSound: [ SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B ]
|
||||||
flySound: [ SOUND_NONE, SOUND_NONE ]
|
flySound: [ SOUND_NONE, SOUND_NONE ]
|
||||||
jumpSound: SOUND_ACTOR_JUMP
|
jumpSound: SOUND_ACTOR_JUMP
|
||||||
|
@ -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_set_render_pos(gPauseTabsIconIDs[0], baseX + 22, baseY + 7);
|
||||||
hud_element_draw_without_clipping(gPauseTabsIconIDs[0]);
|
hud_element_draw_without_clipping(gPauseTabsIconIDs[0]);
|
||||||
if (gPauseMenuCurrentTab == 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);
|
pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -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_set_render_pos(gPauseTabsIconIDs[1], baseX + 22, baseY + 7);
|
||||||
hud_element_draw_without_clipping(gPauseTabsIconIDs[1]);
|
hud_element_draw_without_clipping(gPauseTabsIconIDs[1]);
|
||||||
if (gPauseMenuCurrentTab == 0) {
|
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);
|
pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -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_set_render_pos(gPauseTabsIconIDs[2], baseX + 22, baseY + 7);
|
||||||
hud_element_draw_without_clipping(gPauseTabsIconIDs[2]);
|
hud_element_draw_without_clipping(gPauseTabsIconIDs[2]);
|
||||||
if (gPauseMenuCurrentTab == 0) {
|
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);
|
pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -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_set_render_pos(gPauseTabsIconIDs[3], baseX + 22, baseY + 7);
|
||||||
hud_element_draw_without_clipping(gPauseTabsIconIDs[3]);
|
hud_element_draw_without_clipping(gPauseTabsIconIDs[3]);
|
||||||
if (gPauseMenuCurrentTab == 0) {
|
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);
|
pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -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_set_render_pos(gPauseTabsIconIDs[4], baseX + 22, baseY + 7);
|
||||||
hud_element_draw_without_clipping(gPauseTabsIconIDs[4]);
|
hud_element_draw_without_clipping(gPauseTabsIconIDs[4]);
|
||||||
if (gPauseMenuCurrentTab == 0) {
|
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);
|
pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -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_set_render_pos(gPauseTabsIconIDs[5], baseX + 23, baseY + 7);
|
||||||
hud_element_draw_without_clipping(gPauseTabsIconIDs[5]);
|
hud_element_draw_without_clipping(gPauseTabsIconIDs[5]);
|
||||||
if (gPauseMenuCurrentTab == 0) {
|
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);
|
pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5141,7 +5141,7 @@
|
|||||||
- [0x1C, 0x000C, EnemyTattle_BillBlaster]
|
- [0x1C, 0x000C, EnemyTattle_BillBlaster]
|
||||||
- [0x1C, 0x000D, EnemyTattle_FakeBowser]
|
- [0x1C, 0x000D, EnemyTattle_FakeBowser]
|
||||||
- [0x1C, 0x000E, EnemyTattle_RedNinjakoopa]
|
- [0x1C, 0x000E, EnemyTattle_RedNinjakoopa]
|
||||||
- [0x1C, 0x000F, EnemyTattle_BlueNinjakoopa]
|
- [0x1C, 0x000F, EnemyTattle_BlackNinjakoopa]
|
||||||
- [0x1C, 0x0010, EnemyTattle_YellowNinjakoopa]
|
- [0x1C, 0x0010, EnemyTattle_YellowNinjakoopa]
|
||||||
- [0x1C, 0x0011, EnemyTattle_GreenNinjakoopa]
|
- [0x1C, 0x0011, EnemyTattle_GreenNinjakoopa]
|
||||||
- [0x1C, 0x0012, EnemyTattle_KoopaBros]
|
- [0x1C, 0x0012, EnemyTattle_KoopaBros]
|
||||||
@ -7570,7 +7570,7 @@
|
|||||||
- [0x29, 0x000C, EnemyName_BillBlaster]
|
- [0x29, 0x000C, EnemyName_BillBlaster]
|
||||||
- [0x29, 0x000D, EnemyName_FakeBowser]
|
- [0x29, 0x000D, EnemyName_FakeBowser]
|
||||||
- [0x29, 0x000E, EnemyName_RedNinjakoopa]
|
- [0x29, 0x000E, EnemyName_RedNinjakoopa]
|
||||||
- [0x29, 0x000F, EnemyName_BlueNinjakoopa]
|
- [0x29, 0x000F, EnemyName_BlackNinjakoopa]
|
||||||
- [0x29, 0x0010, EnemyName_YellowNinjakoopa]
|
- [0x29, 0x0010, EnemyName_YellowNinjakoopa]
|
||||||
- [0x29, 0x0011, EnemyName_GreenNinjakoopa]
|
- [0x29, 0x0011, EnemyName_GreenNinjakoopa]
|
||||||
- [0x29, 0x0012, EnemyName_KoopaBros]
|
- [0x29, 0x0012, EnemyName_KoopaBros]
|
||||||
|
@ -5141,7 +5141,7 @@
|
|||||||
- [0x1C, 0x000C, EnemyTattle_BillBlaster]
|
- [0x1C, 0x000C, EnemyTattle_BillBlaster]
|
||||||
- [0x1C, 0x000D, EnemyTattle_FakeBowser]
|
- [0x1C, 0x000D, EnemyTattle_FakeBowser]
|
||||||
- [0x1C, 0x000E, EnemyTattle_RedNinjakoopa]
|
- [0x1C, 0x000E, EnemyTattle_RedNinjakoopa]
|
||||||
- [0x1C, 0x000F, EnemyTattle_BlueNinjakoopa]
|
- [0x1C, 0x000F, EnemyTattle_BlackNinjakoopa]
|
||||||
- [0x1C, 0x0010, EnemyTattle_YellowNinjakoopa]
|
- [0x1C, 0x0010, EnemyTattle_YellowNinjakoopa]
|
||||||
- [0x1C, 0x0011, EnemyTattle_GreenNinjakoopa]
|
- [0x1C, 0x0011, EnemyTattle_GreenNinjakoopa]
|
||||||
- [0x1C, 0x0012, EnemyTattle_KoopaBros]
|
- [0x1C, 0x0012, EnemyTattle_KoopaBros]
|
||||||
@ -7570,7 +7570,7 @@
|
|||||||
- [0x29, 0x000C, EnemyName_BillBlaster]
|
- [0x29, 0x000C, EnemyName_BillBlaster]
|
||||||
- [0x29, 0x000D, EnemyName_FakeBowser]
|
- [0x29, 0x000D, EnemyName_FakeBowser]
|
||||||
- [0x29, 0x000E, EnemyName_RedNinjakoopa]
|
- [0x29, 0x000E, EnemyName_RedNinjakoopa]
|
||||||
- [0x29, 0x000F, EnemyName_BlueNinjakoopa]
|
- [0x29, 0x000F, EnemyName_BlackNinjakoopa]
|
||||||
- [0x29, 0x0010, EnemyName_YellowNinjakoopa]
|
- [0x29, 0x0010, EnemyName_YellowNinjakoopa]
|
||||||
- [0x29, 0x0011, EnemyName_GreenNinjakoopa]
|
- [0x29, 0x0011, EnemyName_GreenNinjakoopa]
|
||||||
- [0x29, 0x0012, EnemyName_KoopaBros]
|
- [0x29, 0x0012, EnemyName_KoopaBros]
|
||||||
|
@ -5146,7 +5146,7 @@
|
|||||||
- [0x1C, 0x000C, EnemyTattle_BillBlaster]
|
- [0x1C, 0x000C, EnemyTattle_BillBlaster]
|
||||||
- [0x1C, 0x000D, EnemyTattle_FakeBowser]
|
- [0x1C, 0x000D, EnemyTattle_FakeBowser]
|
||||||
- [0x1C, 0x000E, EnemyTattle_RedNinjakoopa]
|
- [0x1C, 0x000E, EnemyTattle_RedNinjakoopa]
|
||||||
- [0x1C, 0x000F, EnemyTattle_BlueNinjakoopa]
|
- [0x1C, 0x000F, EnemyTattle_BlackNinjakoopa]
|
||||||
- [0x1C, 0x0010, EnemyTattle_YellowNinjakoopa]
|
- [0x1C, 0x0010, EnemyTattle_YellowNinjakoopa]
|
||||||
- [0x1C, 0x0011, EnemyTattle_GreenNinjakoopa]
|
- [0x1C, 0x0011, EnemyTattle_GreenNinjakoopa]
|
||||||
- [0x1C, 0x0012, EnemyTattle_KoopaBros]
|
- [0x1C, 0x0012, EnemyTattle_KoopaBros]
|
||||||
@ -7622,7 +7622,7 @@
|
|||||||
- [0x29, 0x000C, EnemyName_BillBlaster]
|
- [0x29, 0x000C, EnemyName_BillBlaster]
|
||||||
- [0x29, 0x000D, EnemyName_FakeBowser]
|
- [0x29, 0x000D, EnemyName_FakeBowser]
|
||||||
- [0x29, 0x000E, EnemyName_RedNinjakoopa]
|
- [0x29, 0x000E, EnemyName_RedNinjakoopa]
|
||||||
- [0x29, 0x000F, EnemyName_BlueNinjakoopa]
|
- [0x29, 0x000F, EnemyName_BlackNinjakoopa]
|
||||||
- [0x29, 0x0010, EnemyName_YellowNinjakoopa]
|
- [0x29, 0x0010, EnemyName_YellowNinjakoopa]
|
||||||
- [0x29, 0x0011, EnemyName_GreenNinjakoopa]
|
- [0x29, 0x0011, EnemyName_GreenNinjakoopa]
|
||||||
- [0x29, 0x0012, EnemyName_KoopaBros]
|
- [0x29, 0x0012, EnemyName_KoopaBros]
|
||||||
|
Loading…
Reference in New Issue
Block a user