diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-11-11 21:46:57 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-11-11 21:46:57 -0500 |
| commit | 734cbfdb202f366ed39b5304e030478aaa3ea090 (patch) | |
| tree | 54b3c92ced32331a50c27cb710f8a4624fc9cdc6 /include | |
| parent | f316b22f96753c8580d86a8b7957ec69d7bd0c3c (diff) | |
Decomp map_name_popup
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.fieldmap.h | 2 | ||||
| -rw-r--r-- | include/map_name_popup.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 3 | ||||
| -rw-r--r-- | include/text_window.h | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index c0f25fa93..70e806266 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -163,7 +163,7 @@ struct MapHeader /* 0x17 */ u8 mapType; /* 0x18 */ u8 filler_18; /* 0x19 */ u8 escapeRope; - /* 0x1A */ u8 flags; + /* 0x1A */ s8 flags; /* 0x1B */ u8 battleType; }; diff --git a/include/map_name_popup.h b/include/map_name_popup.h index cf9b005d9..6f4a6528c 100644 --- a/include/map_name_popup.h +++ b/include/map_name_popup.h @@ -9,6 +9,6 @@ // Exported ROM declarations void HideMapNamePopUpWindow(void); -void sub_8098110(u8); +void CreateMapNamePopupIfNotAlreadyRunning(u8); #endif //GUARD_MAP_NAME_POPUP_H diff --git a/include/strings.h b/include/strings.h index 983caf509..6ad76e2fa 100644 --- a/include/strings.h +++ b/include/strings.h @@ -738,4 +738,7 @@ extern const u8 gText_GiveUpTryingToTeachNewMove[]; // pokemon_size_record extern const u8 gText_DecimalPoint[]; +// map_name_popup +extern const u8 gUnknown_841D18D[]; + #endif //GUARD_STRINGS_H diff --git a/include/text_window.h b/include/text_window.h index c1463a9c7..8e8466145 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -29,5 +29,6 @@ void DrawTextBorderOuter(u8 windowId, u16 tileStart, u8 palette); void TextWindow_LoadTilesStdFrame1(u8 windowId, u16 destOffset); void sub_814FE6C(u8 windowId, u16 destOffset, u8 palIdx); void sub_814FEEC(u8 windowId, u16 destOffset, u8 palIdx); +void sub_814FF6C(u8 windowId, u16 destOffset); #endif // GUARD_TEXT_WINDOW_H |