pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

name many battle messages

Browse Source
This commit is contained in:
Alex Bates 2021-02-10 20:16:33 +00:00
parent 5ae51ccf33
commit cdc6bc6a1b
3 changed files with 99 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/code_190B20.c
View File

@ -1,5 +1,6 @@
#include "common.h"
#include "battle/battle.h"
#include "message_ids.h"
s32 D_80280FC0[] = {
0x000A005A, 0x00000032, 0x0003000B, 0x00000032, 0x0001002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x00010031, 0x00000032, 0x00010031, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x00010032, 0x00000032, 0x00010032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x0003000A, 0x00000032, 0x0003000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000050, 0x0003000A, 0x00000014, 0x0003000B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, /* actor type name ids begin here */ 0x00290081, 0x00290082, 0x0029006B, 0x0029006C, 0x0029006D, 0x0029006E, 0x0029006F, 0x00290000, 0x00290002, 0x00290001, 0x00290009, 0x00290007, 0x00290008, 0x0029000A, 0x0029000A, 0x0029000B, 0x0029000C, 0x00290015, 0x00290014, 0x00290017, 0x00290016, 0x00290018, 0x0029001A, 0x00290019, 0x0029001E, 0x0029001F, 0x00290020, 0x00290021, 0x00290022, 0x00290023, 0x00290024, 0x00290027, 0x00290028, 0x0029002B, 0x0029002C, 0x0029002A, 0x00290029, 0x0029007C, 0x00290033, 0x00290034, 0x00290080, 0x00290035, 0x00290036, 0x00290038, 0x00290039, 0x00290037, 0x0029003D, 0x0029003E, 0x00290042, 0x0029003F, 0x00290040, 0x00290041, 0x00290044, 0x00290043, 0x00290047, 0x00290048, 0x0029004B, 0x0029004A, 0x00290056, 0x0029004C, 0x0029004F, 0x0029004E, 0x00290053, 0x00290052, 0x00290054, 0x0029004D, 0x00290050, 0x00290051, 0x00290055, 0x00290059, 0x0029005B, 0x0029005A, 0x0029005A, 0x00290060, 0x0029005F, 0x0029005E, 0x0029005D, 0x0029005C, 0x0029005C, 0x0029005C, 0x0029005C, 0x00290070, 0x00290070, 0x00290071, 0x00290071, 0x00290072, 0x00290072, 0x00290073, 0x00290073, 0x00290074, 0x00290074, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x001D0011, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290068, 0x00290069, 0x0029006A, 0x001D0007, 0x001D0008, 0x001D0009, 0x001D000A, 0x001D000F, 0x001D000C, 0x001D000D, 0x001D000E, 0x00290062, 0x00290013, 0x00290013, 0x00290013, 0x00290013, 0x00290013, 0x00290013, 0x00290013, 0x00290013, 0x00290004, 0x00290003, 0x00290005, 0x00290006, 0x001D0007, 0x0029005C, 0x0029005C, 0x0029005C, 0x0029005C, 0x0029000D, 0x00290012, 0x00290011, 0x0029000E, 0x0029000F, 0x00290010, 0x001D0007, 0x0029001B, 0x0029001C, 0x0029001D, 0x00290025, 0x00290025, 0x00290026, 0x00290032, 0x00290031, 0x00290030, 0x00290079, 0x0029002F, 0x0029007A, 0x00290027, 0x0029007B, 0x00290027, 0x0029002D, 0x0029002D, 0x0029002E, 0x00290005, 0x0029003A, 0x0029003A, 0x0029003B, 0x0029003B, 0x0029003C, 0x0029003A, 0x00290063, 0x00290045, 0x00290046, 0x00290049, 0x00290057, 0x00290057, 0x00290058, 0x00290061, 0x00290061, 0x00290061, 0x00290061, 0x00290061, 0x00290061, 0x00290061, 0x00290064, 0x00290065, 0x00290065, 0x00290066, 0x00290066, 0x00290067, 0x00290051, 0x00290076, 0x00290077, 0x00290078, 0x00290076, 0x00290076, 0x00290076,
@ -439,11 +440,23 @@ s32 D_80283744[] = {
};
MessageID bMessages[] = {
0x001D0071, 0x001D0072, 0x001D0073, 0x001D0075, 0x001D0076, 0x001D0077, 0x001D0078, 0x001D0079, 0x001D007A, 0x001D007B, 0x001D0088, 0x001D008B, 0x001D008A, 0x001D0089, 0x001D008C, 0x001D008D, 0x001D008E, 0x001D008F, 0x001D0090, 0x001D0093, 0x001D0092, 0x001D0091, 0x001D0094, 0x001D0095, 0x001D0096, 0x001D0097, 0x001D007F, 0x001D0081, 0x001D0080, 0x001D0082, 0x001D0083, 0x001D0084, 0x001D0085, 0x001D0086, 0x001D0087, 0x001D007C, 0x001D007D, 0x001D007E, 0x001D0098, 0x001D0099, 0x001D009A, 0x001D009B, 0x001D009C, 0x001D009D, 0x001D009E, 0x001D009A, 0x001D00AF, 0x001D00B0, 0x001D00B1, 0x001D00B2, 0x001D00B3, 0x001D00B4, 0x001D00AF, 0x001D00AF, 0x001D00B5, 0x001D00B6, 0x001D00B7, 0x001D00B8, 0x001D00B9, 0x001D00AF, 0x001D00BA, 0x001D00BB, 0x001D00BC, 0x001D00AF, 0x001D00BD, 0x001D00BE, 0x001D00BF, 0x001D00C0, 0x001D00C1, 0x001D00C2, 0x00000000, 0x00000000, 0x001D00C3, 0x001D00C6, 0x001D00C6, 0x001D00C6, 0x001D00C7, 0x001D00C7, 0x001D00C7, 0x001D00C8, 0x001D00C9, 0x001D00CA, 0x001D00C9, 0x001D00CA, 0x001D00C3,
MSG_merlee_increase_atk, MSG_merlee_increase_dmg, MSG_merlee_increase_star_points, MSG_merlee_end,
MSG_charge_hammer, MSG_charge_hammer_more, MSG_charge_jump, MSG_charge_jump_more, MSG_charge_max,
MSG_enemy_missed,
MSG_player_dazed, MSG_player_slept, MSG_player_frozen, MSG_player_poisoned, MSG_player_shrunk, MSG_player_paralyzed, MSG_player_electrified, MSG_player_transparent,
MSG_enemy_dazed, MSG_enemy_slept, MSG_enemy_frozen, MSG_enemy_poisoned, MSG_enemy_shrunk, MSG_enemy_paralyzed, MSG_enemy_electrified, MSG_enemy_cannot_move,
MSG_star_energy_increased, MSG_star_energy_max, MSG_star_energy_filled,
MSG_atk_up_n, MSG_def_up_n, 0x001D0084, 0x001D0085,
MSG_enemy_transparent, MSG_enemy_electric_charge,
MSG_partner_dazed, MSG_charge_goombario, MSG_charge_goombario_more, MSG_water_block_active, MSG_water_block_end, MSG_cloud_nine_active, MSG_cloud_nine_end, MSG_atk_up_active, MSG_atk_up_end, MSG_enemy_atk_down, MSG_cloud_nine_active,
MSG_action_cmd_jump, MSG_action_cmd_hammer, 0x001D00B1, 0x001D00B2, 0x001D00B3, 0x001D00B4, 0x001D00AF, 0x001D00AF, 0x001D00B5, 0x001D00B6, 0x001D00B7, 0x001D00B8, 0x001D00B9, 0x001D00AF, 0x001D00BA, 0x001D00BB, 0x001D00BC, 0x001D00AF, 0x001D00BD, 0x001D00BE, 0x001D00BF,
MSG_no_target_jump, MSG_no_target_hammer, MSG_no_battle_items, 0x00000000, 0x00000000,
0x001D00C3, MSG_hammer_disabled, MSG_hammer_disabled, MSG_hammer_disabled, MSG_jump_disabled, MSG_jump_disabled, MSG_jump_disabled, MSG_items_disabled,
MSG_no_switch_used_turn, MSG_no_switch_dazed, MSG_no_switch_used_turn, MSG_no_switch_dazed, 0x001D00C3,
};
MessageID bActorMessages[] = {
0x001D0013, 0x001D0007, 0x001D0008, 0x001D0009, 0x001D000A, 0x001D000B, 0x001D000C, 0x001D000D, 0x001D000E, 0x001D000F, 0x001D0010, 0x001D0011, 0x001D0012
MSG_party_mario, MSG_party_goombario, MSG_party_kooper, MSG_party_bombette, MSG_party_parakarry, MSG_party_goompa, MSG_party_watt, MSG_party_sushie, MSG_party_lakilester, MSG_party_bow, MSG_party_goombaria, MSG_party_twink, MSG_party_peach
};
s32 D_802838F8 = 0;

76
tools/splat.yaml
View File

@ -9486,6 +9486,82 @@ segments:
ids:
- [0x19, 0x03B, kmr_03_tattle]
- [0x19, 0x040, kmr_12_tattle]
- [0x1D, 0x007, party_goombario]
- [0x1D, 0x008, party_kooper]
- [0x1D, 0x009, party_bombette]
- [0x1D, 0x00A, party_parakarry]
- [0x1D, 0x00B, party_goompa]
- [0x1D, 0x00C, party_watt]
- [0x1D, 0x00D, party_sushie]
- [0x1D, 0x00E, party_lakilester]
- [0x1D, 0x00F, party_bow]
- [0x1D, 0x010, party_goombaria]
- [0x1D, 0x011, party_twink]
- [0x1D, 0x012, party_peach]
- [0x1D, 0x013, party_mario]
- [0x1D, 0x071, merlee_increase_atk, battle_popup]
- [0x1D, 0x072, merlee_increase_dmg, battle_popup]
- [0x1D, 0x073, merlee_increase_star_points, battle_popup]
- [0x1D, 0x074, merlee_increase_coins, battle_popup]
- [0x1D, 0x075, merlee_end, battle_popup]
- [0x1D, 0x076, charge_hammer, battle_popup]
- [0x1D, 0x077, charge_hammer_more, battle_popup]
- [0x1D, 0x078, charge_jump, battle_popup]
- [0x1D, 0x079, charge_jump_more, battle_popup]
- [0x1D, 0x07A, charge_max, battle_popup]
- [0x1D, 0x07B, enemy_missed, battle_popup]
- [0x1D, 0x07C, partner_dazed, battle_popup]
- [0x1D, 0x07D, charge_goombario, battle_popup]
- [0x1D, 0x07E, charge_goombario_more, battle_popup]
- [0x1D, 0x07F, star_energy_increased, battle_popup]
- [0x1D, 0x080, star_energy_filled, battle_popup]
- [0x1D, 0x081, star_energy_max, battle_popup]
- [0x1D, 0x082, atk_up_n, battle_popup]
- [0x1D, 0x083, def_up_n, battle_popup]
- [0x1D, 0x086, enemy_transparent, battle_popup]
- [0x1D, 0x087, enemy_electric_charge, battle_popup]
- [0x1D, 0x088, player_dazed, battle_popup]
- [0x1D, 0x089, player_poisoned, battle_popup]
- [0x1D, 0x08A, player_frozen, battle_popup]
- [0x1D, 0x08B, player_slept, battle_popup]
- [0x1D, 0x08C, player_shrunk, battle_popup]
- [0x1D, 0x08D, player_paralyzed, battle_popup]
- [0x1D, 0x08E, player_electrified, battle_popup]
- [0x1D, 0x08F, player_transparent, battle_popup]
- [0x1D, 0x090, enemy_dazed, battle_popup]
- [0x1D, 0x091, enemy_poisoned, battle_popup]
- [0x1D, 0x092, enemy_frozen, battle_popup]
- [0x1D, 0x093, enemy_slept, battle_popup]
- [0x1D, 0x094, enemy_shrunk, battle_popup]
- [0x1D, 0x095, enemy_paralyzed, battle_popup]
- [0x1D, 0x096, enemy_electrified, battle_popup]
- [0x1D, 0x097, enemy_cannot_move, battle_popup]
- [0x1D, 0x098, water_block_active, battle_popup]
- [0x1D, 0x099, water_block_end, battle_popup]
- [0x1D, 0x09A, cloud_nine_active, battle_popup]
- [0x1D, 0x09B, cloud_nine_end, battle_popup]
- [0x1D, 0x09B, cloud_nine_end, battle_popup]
- [0x1D, 0x09C, atk_up_active, battle_popup]
- [0x1D, 0x09D, atk_up_end, battle_popup]
- [0x1D, 0x09E, enemy_atk_down, battle_popup]
- [0x1D, 0x0AF, action_cmd_jump, action_command]
- [0x1D, 0x0B0, action_cmd_hammer, action_command]
- [0x1D, 0x0C0, no_target_jump, battle_popup]
- [0x1D, 0x0C1, no_target_hammer, battle_popup]
- [0x1D, 0x0C2, no_battle_items, battle_popup]
- [0x1D, 0x0C6, hammer_disabled, battle_popup]
- [0x1D, 0x0C7, jump_disabled, battle_popup]
- [0x1D, 0x0C8, items_disabled, battle_popup]
- [0x1D, 0x0C9, no_switch_used_turn, battle_popup]
- [0x1D, 0x0CA, no_switch_dazed, battle_popup]
- [0x1D, 0x167, kmr_12_sign_trap]
- [0x1D, 0x168, kmr_12_sign_to_fortress]
- [0x1C84D30, bin] # junk(?)

9
tools/splat_ext/PaperMarioMessages.py
View File

@ -404,7 +404,14 @@ class N64SegPaperMarioMessages(N64Segment):
self.f.write("\n")
msg_name = None
for section, index, goodname in self.ids:
for d in self.ids:
section, index, goodname = d[:3]
if len(d) > 3:
# these will actually do something in the future
context = d[3]
assert context in ["battle_popup", "action_command"]
if i == section and j == index:
msg_name = goodname
break