Skip to content

Commit

Permalink
Mom starts saving money without asking
Browse files Browse the repository at this point in the history
  • Loading branch information
fp555 committed Oct 19, 2024
1 parent 92648e2 commit bc67408
Show file tree
Hide file tree
Showing 7 changed files with 104 additions and 156 deletions.
16 changes: 5 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,9 @@ jobs:
run: |
sudo apt-get install -yq libpng-dev
sudo make install
cd ..
rm -rf rgbds
- name: Make
run: |
make -j$(nproc)
if ! git diff-index --quiet HEAD --; then
echo 'Uncommitted changes detected:'
git diff-index HEAD --
return 1
fi
- name: Make ROM
run: make -j$(nproc)

- name: Archive map file
uses: actions/upload-artifact@v4
Expand All @@ -42,7 +34,9 @@ jobs:
if-no-files-found: error

- name: Check free space
run: tools/free_space.awk BANK=all pokecrystal.map
run: |
chmod +x tools/free_space.awk
tools/free_space.awk BANK=all pokecrystal.map
- name: Create release draft
uses: ncipollo/release-action@v1
Expand Down
11 changes: 6 additions & 5 deletions data/phone/text/mom.asm
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ MomYouveSavedText:
done

MomOKIllSaveText:
text "OK. I'll save your"
line "money."
text "OK! I'll save your"
line "money!"
done

MomPhoneWontSaveMoneyText:
Expand Down Expand Up @@ -159,7 +159,8 @@ MomPhoneLectureText:

para "I wish you would"
line "have told me…"

para "What about money?"
line "Should I save it?"
para "Don't worry, I'll"
line "help you save"
cont "money, alright?"
done
10 changes: 0 additions & 10 deletions data/text/common_1.asm
Original file line number Diff line number Diff line change
Expand Up @@ -1362,19 +1362,9 @@ _MomLeavingText1::

para "On a long journey,"
line "money's important."

para "Do you want me to"
line "save your money?"
done

_MomLeavingText2::
text "OK, I'll take care"
line "of your money."

para "<……><……><……>"
prompt

_MomLeavingText3::
text "Be careful."

para "#MON are your"
Expand Down
Loading

0 comments on commit bc67408

Please sign in to comment.