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

add MessageID constants

Browse Source
This commit is contained in:
Alex Bates 2020-10-20 06:48:47 +01:00
parent 9d1715d198
commit a9310efa85
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
4 changed files with 69 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common.h
View File

@ -9,5 +9,6 @@
#include "macros.h"
#include "enums.h"
#include "si.h"
#include "messages.h"
#endif

65
include/messages.h Normal file
View File

@ -0,0 +1,65 @@
#ifndef _MESSAGES_H_
#define _MESSAGES_H_
#include "types.h"
typedef s32 MessageID;
#define MESSAGE_ID(section, index) ((section << 0x10) + index)
// 00 Introduction
// 01 Postgame Celebration
// 02 Toad Town Gate Sector
// 03 Toad Town Castle Sector
// 04 Toad Town Bridge Sector
// 05 Toad Town Train Sector
// 06 Toad Town Warehouse Sector
// 07 Toad Town Docks Sector
// 08 Minigames
// 09 Castle Grounds
// 0A Shooting Star Summit
// 0B Chapter 0
// 0C Chapter 1
// 0D Chapter 2
// 0E Chapter 3
// 0F Chapter 4
// 10 Chapter 5
// 11 Chapter 6
// 12 Chapter 7
// 13 Bowser's Castle
// 14 Peach Segments
// 15 Koopa Koot Favors
// 16 Russ T Advice
// 17 News Bulletin
// 18 Gossip Bulletin
// 19 Map Tattles
#define MessageID_TATTLE_KMR_12 MESSAGE_ID(0x19, 0x40)
// 1A NPC Tattles
// 1B Entity Tattles
// 1C Enemy Tattles
// 1D Menus I
#define MessageID_SIGN_MUSHROOM_GOOMBA_TRAP MESSAGE_ID(0x1D, 0x167)
#define MessageID_SIGN_GOOMBA_KINGS_FORTRESS_AHEAD MESSAGE_ID(0x1D, 0x168)
// 1E Choices
// 1F Menus II
// 20 Party Letters + Luigi's Diary
// 21 Advice Fortunes
// 22 Treasure Fortunes
// 23 Item Descriptions I
// 24 Item Descriptions II
// 25 Item Descriptions III
// 26 Item Names
// 27 Shop Messages
// 28 Partner Descriptions
// 29 Enemy Names
// 2A Mario Moves
// 2B Partner Moves
// 2C Quiz Questions
// 2D Quiz Options
// 2E Credits
#endif

5
src/world/area_kmr/kmr_12/events.c
View File

@ -68,7 +68,7 @@ static Script read_west_sign = {
// "Eat a Mushroom to regain your energy!"
SI_SUSPEND_GROUP(1),
SI_CALL(DisablePlayerInput, TRUE),
SI_CALL(ShowMessageAtScreenPos, 0x1D0167, 160, 40),
SI_CALL(ShowMessageAtScreenPos, MessageID_SIGN_MUSHROOM_GOOMBA_TRAP, 160, 40),
SI_RESUME_GROUP(1),
SI_SET(SI_FLAG(0), FALSE),
@ -204,10 +204,9 @@ static Script read_east_sign = {
SI_GROUP(0),
// "Goomba King's Fortress Ahead"
SI_CALL(func_802D5830, 1),
SI_CALL(DisablePlayerInput, 1),
SI_CALL(ShowMessageAtScreenPos, 0x1D0168, 160, 40),
SI_CALL(ShowMessageAtScreenPos, MessageID_SIGN_GOOMBA_KINGS_FORTRESS_AHEAD, 160, 40),
SI_CALL(DisablePlayerInput, 0),
SI_CALL(func_802D5830, 0),

2
src/world/area_kmr/kmr_12/header.c
View File

@ -10,7 +10,7 @@ MapHeader header = {
.entryList = entryList,
.entryCount = ENTRY_COUNT(entryList),
.background = 0x80200000,
.tattle = 0x00190040,
.tattle = MessageID_TATTLE_KMR_12,
};
Script kmr_12_play_music = {