diff options
| author | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-15 08:36:58 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-15 08:36:58 -0400 |
| commit | aee8501a10f99a5db01870426fe9b06dc6d35acc (patch) | |
| tree | ddf8dc8186f8cca6f6736d002dab091098649eb9 /engine/menu | |
| parent | faffe1c1b8fbcb64a13d82530c91c995ffe4f501 (diff) | |
| parent | b78f2edbc3b3b2d01fc0590310a8d9e65648ee44 (diff) | |
Merge branch 'master' of https://github.com/pret/pokegold-spaceworld
Diffstat (limited to 'engine/menu')
| -rw-r--r-- | engine/menu/main_menu.asm | 2 | ||||
| -rw-r--r-- | engine/menu/reset_dialog.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 42bc2ca..bbd827e 100644 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -293,4 +293,4 @@ StartNewGame:: ; 555C call DebugSetUpPlayer jp IntroCleanup -; 558D
\ No newline at end of file +; 558D diff --git a/engine/menu/reset_dialog.asm b/engine/menu/reset_dialog.asm index 688a2e3..6e2b99b 100644 --- a/engine/menu/reset_dialog.asm +++ b/engine/menu/reset_dialog.asm @@ -12,4 +12,4 @@ DisplayResetDialog:: ; fc362 (3f:4362) _ResetConfirmText:: text "ほんとにりセットしますか？" - done
\ No newline at end of file + done |