Skip to content

Commit

Permalink
Merge pull request #128 from celias-stupid-team/demo-2-point-5
Browse files Browse the repository at this point in the history
Demo 2 point 5
  • Loading branch information
CeliaDawn authored Jan 20, 2025
2 parents 436669e + 4798d01 commit 513b228
Show file tree
Hide file tree
Showing 233 changed files with 6,304 additions and 5,008 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Misc Assets/Celadon Map color-coded.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Misc Assets/celadon map that works.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Promo Screenshots/pokedex.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Promo Screenshots/pokefirered-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Promo Screenshots/pokefirered-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Promo Screenshots/pokefirered-10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Promo Screenshots/pokefirered-11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Promo Screenshots/pokefirered-12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Promo Screenshots/pokefirered-13.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Promo Screenshots/pokefirered-14.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Promo Screenshots/pokefirered-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Promo Screenshots/pokefirered-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Promo Screenshots/pokefirered-5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Promo Screenshots/pokefirered-8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Promo Screenshots/pokefirered-9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 26 additions & 1 deletion data/battle_scripts_1.s
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectDoubleKick @ EFFECT_DOUBLE_KICK
.4byte BattleScript_EffectDoNothing @ EFFECT_DO_NOTHING
.4byte BattleScript_EffectFickleBeam @ EFFECT_FICKLE_BEAM
.4byte BattleScript_EffectFoursight @ EFFECT_FOURSIGHT
.4byte BattleScript_EffectCounterStupid @ EFFECT_COUNTER_STUPID



Expand Down Expand Up @@ -4740,4 +4742,27 @@ BattleScript_FickleBeamDoNothing::
pause B_WAIT_TIME_SHORT
printfromtable gDoNothingStringIds
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
goto BattleScript_MoveEnd


BattleScript_EffectFoursight::
attackcanceler
attackstring
ppreduce
trysetfutureattack BattleScript_ButItFailed
attackanimation
waitanimation
printfromtable gFutureMoveUsedStringIds
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd

BattleScript_EffectCounterStupid::
attackcanceler
attackstring
ppreduce
attackanimation
waitanimation
incrementgamestat GAME_STAT_USED_SPLASH
printstring STRINGID_BUTNOTHINGHAPPENED
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
7 changes: 5 additions & 2 deletions data/event_scripts.s
Original file line number Diff line number Diff line change
Expand Up @@ -957,8 +957,11 @@ Text_AccessedProfOaksPC::

@ todo for Celia write non placeholder text here
Text_HavePokedexRated::
.string "Oak: Does your dumb ass need\n"
.string "a hint?$"
.string "OAK: Ah, {PLAYER}!\n"
.string "I hope you're doing well!\p"
.string "I see you're making good work on\n"
.string "your POKéDEX.\l"
.string "Would you like to have a hint?$"

Text_ClosedLinkToProfOaksPC::
.string "Closed link to PROF. OAK's PC.$"
Expand Down
Binary file modified data/layouts/CeladonCity/map.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion data/layouts/DiglettsCave_B1F/map.bin

Large diffs are not rendered by default.

Binary file modified data/layouts/RocketHideout_B4F/map.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion data/layouts/Route1/map.bin
Original file line number Diff line number Diff line change
@@ -1 +1 @@
�0�0�0�0$%$%$%$'�0�0�0�0&%$%$%$%0 00 00 00 0�0�0�0�0 00 00 000000000000�0�0�01�0�0�0�0�0�0�0�00 00 00 0�0�0�0�0�0�0�0�01�0�0�0������������00�0�0�0�000000000000000000000000000000000000000000000000000000000000000000000000000000000000&0'0&0'0&0'0&'000�0�0�0�0�0�0�0�0�000000000 0 00�0�01�0�0�0�0�0�000000000000�0�0�000000000000000000000000000������000000&'000000&%$%$'00000000000000000�0�0�0000000000�0�0�0�0�0�0�0�01�0�00000000 00�0�0�01�0�0�0�0�0�0�0000000��0����00�����������0 00�0�0�01�0�0�0�0�0�0�0�0�0�0�0�0�00 00�0�0�0�0�0�0�0�0�0�0�0�0�01�0�0�00000000000000000�0�0�0�00000000000000000�0�0�0�0000000�0�0�0�0&%$%$%$%$'000000����00000 00 00 0000000�0�0�0�00000000000000000�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�01�0�0�0�0�0�0�0�0�0�0�0�01�0�01�0�0�0�0�0�0�0���� 000������������0 00000000�0�0�0�00 000000000000000�0�0�0�000000000000000 00�0�0�0�00000000000000000 000000000 00����������00��������000000000�00�0000000�00�00
�0�0�0�0$%$%$%$'�0�0�0�0&%$%$%$%0 00 00 00 0�0�0�0�0 00 00 000000000000�0�0�01�0�0�0�0�0�0�0�00 00 00 0�0�0�0�0�0�0�0�01�0�0�0������������00�0�0�0�000000000000000000000000000000000000000000000000000000000000000000000000000000000000&'&'&'&'000�0�0�0�0�0�0�0�0�000000000 0 00�0�01�0�0�0�0�0�000000000000�0�0�000000000000000000000000000������000000&'000000&%$%$'00000000000000000�0�0�0000000000�0�0�0�0�0�0�0�01�0�00000000 00�0�0�01�0�0�0�0�0�0�0000000��0����00�����������0 00�0�0�01�0�0�0�0�0�0�0�0�0�0�0�0�00 00�0�0�0�0�0�0�0�0�0�0�0�0�01�0�0�00000000000000000�0�0�0�00000000000000000�0�0�0�0000000�0�0�0�0&%$%$%$%$'000000����00000 00 00 0000000�0�0�0�00000000000000000�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�01�0�0�0�0�0�0�0�0�0�0�0�01�0�01�0�0�0�0�0�0�0���� 000������������0 00000000�0�0�0�00 000000000000000�0�0�0�000000000000000 00�0�0�0�00000000000000000 000000000 00����������00��������000000000�00�0000000�00�00
Expand Down
2 changes: 1 addition & 1 deletion data/layouts/Route10/map.bin
Original file line number Diff line number Diff line change
@@ -1 +1 @@
m�||||||||||||||||||||�quu ##################!squu*++++++++++++++++++,squu*++++++++++++++++++,squr3131313131313131313131313131313141)+,squr����������������*+,sq}r0 00000000000000 0�*+,sqy��0�00 0000000000000�*+,sq�0�0�0�0�0000000000000 0�*+,sq�0�0�0�0�0 0000000000000�*+,sq�0�0�01�0000000000000 0�*+,sq��0�0 00 00 00 00 00 00 00�*+,sqm��������������00�L*+,squr0 00 00 00 00 00 00 00 0�*+,squr0000000000000000�*+,squ�iiiiiiiij 00 00 00 0�*+,sq�llllllllmr�0�0�0�0�000�*+,sqqqqqqqqqqur�0�0�0�0�00 0�*+,sq|||||||||}r�0�0�0�0�000�*+,sqq�yyyyyy�0yz�0�0�0�0�00 0�*+,sqq��0�0�0�0�01�0�00 00 00 000�*+,sqq��0�0����0000000 0�*+,sqq��0�0�0�01�00 00 00 00 000�*+,sqq��0�0�0�0�0000000000 0�*+,sqq��0�0�0�0�000 00 00 00 00 0�*+,sqq��0�0�01�00000000000�*+,sqq��01�0�0�00000 00 00 00 0�*+,sqq��0�00000 000000000�*+,sqqr0 00 000000 00 00 00 0�*+,sqqr000000 000000000�0�*+,sqqr�����������������*+,sqq�iiij0hiiiiiiiiiiiiiiqqkllm�i�klllllllllllllmqqsqq�lll�qqqqqqqqqqqqquqq{||||||||�qqqqqqquq�yP�%�%�%�%�S�sqqqqqqquqr0Q,-$-$-$-.Tps�||||||}qr0R3���������Upsu�|||||�qr0�2����Wpsu�{1|1}1~11sqr0�� !!!#�Tpsu�HIJK�sq����()3*+�U3�su�PQRS�sqr00000313"323330�0�0�{}�XYZ[�sq�j000000�0�0�0�0�qq�`ab��sqqr�0�0�0�0�0�0�0�0�0�0�0�yyz0 00 00sqq��0�0�0�0�0�0�0�0�0�0�0�0�0�0000000sqq��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0 00 0�0sqq��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0sqqu #############!�0�0�0�0�0sqqu*+++++++++++++0####!sqqu*++++++++++++++++++,sqqXYqqqqqqqqqqqqqqqqqqqqqqqqq
m�||||||||||||||||||||�quu ##################!squu*++++++++++++++++++,squu*++++++++++++++++++,squr3131313131313131313131313131313141)+,squr����������������*+,sq}r0 00000000000000 0�*+,sqy��0�00 0000000000000�*+,sq�0�0�0�0�0000000000000 0�*+,sq�0�0�0�0�0 0000000000000�*+,sq�0�0�01�0000000000000 0�*+,sq��0�0 00 00 00 00 00 00 00�*+,sqm��������������00�L*+,squr0 00 00 00 00 00 00 00 0�*+,squr0000000000000000�*+,squ�iiiiiiiiij0 00 00 0�*+,sq�llllllllmqr000000�*+,sqqqqqqqqqquqr0 00 00 0�*+,sq|||||||||}qr000000�*+,sqq�yyyyyy�0y�z00 00 00 0�*+,sqq��0�0�0�0�01�0�0 00 00 000�*+,sqq��0�0����"�0�0�0�0�00 0�*+,sqq��0�0�0�01�00 0�0�0�0�0�000�*+,sqq��0�0�0�0�0000"�0�0�0�0�00 0�*+,sqq��0�0�0�0�000 0�0�0�0�0�00 0�*+,sqq��0�0�01�0000"0000000�*+,sqq��01�0�0�0000 00 00 00 0�*+,sqq��0�00000 00#0000000�*+,sqqr0 00 000000 00 00 00 0�*+,sqqr000000 0000000000�*+,sqqr�����������������*+,sqq�iiij0hiiiiiiiiiiiiiiqqkllm�i�klllllllllllllmqqsqq�lll�qqqqqqqqqqqqquqq{||||||||�qqqqqqquq�yP�%�%�%�%�S�sqqqqqqquqr0Q,-$-$-$-.Tps�||||||}qr0R3���������Upsu�|||||�qr0�2����Wpsu�{1|1}1~11sqr0�� !!!#�Tpsu�HIJK�sq����()3*+�U3�su�PQRS�sqr00000313"323330�0�0�{}�XYZ[�sq�j000000�0�0�0�0�qq�`ab��sqqr�0�0�0�0�0�0�0�0�0�0�0�yyz0 00 00sqq��0�0�0�0�0�0�0�0�0�0�0�0�0�0000000sqq��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0 00 0�0sqq��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0sqqu #############!�0�0�0�0�0sqqu*+++++++++++++0####!sqqu*++++++++++++++++++,sqqXYqqqqqqqqqqqqqqqqqqqqqqqqq
Expand Down
2 changes: 1 addition & 1 deletion data/layouts/Route16/map.bin
Original file line number Diff line number Diff line change
@@ -1 +1 @@
�,�,+,(21&%$%$%$]-0-0-0^$%$%$%$DEEEEF%$%$%$%$%$%$%$%,��������45667������.LMMMMN/��������������,�0�0�0�0�0�0�0<=BC?�0�0�000�081LMMMMN<1�0�0�0�0�00 00 00 00 00,�0�0�0�0�0�01�0�0�0�0�01�0�000�0@1LMMMMND1�0�0�0�0�0000000000,�0�0�0�0�0�0�0�0�0�0�0�0�0�0�000�0H1������L1�0�01�0�00 00 00 00 00,�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0000 0DEEEEF0 00�0�01�0�0�0000000,�0000000000000000000LMMMMN000�0�0�0�0�0�0 00 00 00,��������������������LMMMMN����0�0�0�0�0�0000000,�0 00 00 00 00 00 00���0 0�1�������10������������&%$%$%,�0�0�0�00000�0�0�0�0�0���0�081������<1�0�00 00 00 00 00 00 00 00,�0�0�0�00 00 0�0�0�0�0�0���0�0@1\]0]0]0]0^D1�0�0000000000000000000,�0�0�0�00000�0�0�0�0�0$%&0�0H1deeeefL1�0�00 00 00 00 00 00 00 00,�0�0�0�00 00 0�0�0�0�0�0���������������������������������,�0�0�0�00000�0�0�0�0�0�,�0�0�01�0�0�01�0�0�0�0�,�0�0�0�0�0�0�0�0�0�0�0�0�0�,�0�0�01�0�0�0�01�01�0�0�
�,�,+,(21&%$%$%$]-0-0-0^$%$%$%$DEEEEF%$%$%$%$%$%$%$%,��������45667������.LMMMMN/���()���������,�0�0�0�0�0�0�0<=BC?�0�0�000�081LMMMMN<1�0�0�0�0�00 00 00 00 00,�0�0�0�0�0�01�0�0�0�0�01�0�000�0@1LMMMMND1�0�0�0�0�0000000000,�0�0�0�0�0�0�0�0�0�0�0�0�0�0�000�0H1������L1�0�01�0�00 00 00 00 00,�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0000 0DEEEEF0 00�0�01�0�0�0000000,�0000000000000000000LMMMMN000�0�0�0�0�0�0 00 00 00,��������������������LMMMMN����0�0�0�0�0�0000000,�0 00 00 00 00 00 00���0 0�1�������10������������&%$%$%,�0�0�0�00000�0�0�0�0�0���0�081������<1�0�00 00 00 00 00 00 00 00,�0�0�0�00 00 0�0�0�0�0�0���0�0@1\]0]0]0]0^D1�0�0000000000000000000,�0�0�0�00000�0�0�0�0�0$%&0�0H1deeeefL1�0�00 00 00 00 00 00 00 00,�0�0�0�00 00 0�0�0�0�0�0���������������������������������,�0�0�0�00000�0�0�0�0�0�,�0�0�01�0�0�01�0�0�0�0�,�0�0�0�0�0�0�0�0�0�0�0�0�0�,�0�0�01�0�0�0�01�01�0�0�
Expand Down
2 changes: 1 addition & 1 deletion data/layouts/Route24/map.bin
Original file line number Diff line number Diff line change
@@ -1 +1 @@
qqqqqqqqqqq�|||||||�qqqqqq�||||||||}qqqqqqq{||||qqu�yyyyyyyyy|yyyyyyyyyyq�}r0 00 0(2)20 0�0��0�0�0�0 00 00 0quqr00000000�0��0�0�0�000000qu���0�0�0�0�0�0�0�0�0��0�0�0�000 00 0qu������0�0������0�0�0�������qu��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0qu��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0qu��0�0�0�0�0�0�01�01�0�0�0�0�0�0�0�0�0�0�0qur000000�0�0�0F>>>>>>>>>>qur00 0000 0�0�0�0W0 00 00 00 00 0qur000 00 00�0�0�0W000hiiiiii�}r00 0"#$��0�0�0M0 00pqklllluqr00�0*+,��2�2�2�000pqsqqqquqr 000*+,��2�2�2�0 00pk�qqqquqr000*+,��2�2�2�000psqqqqquqr000*+,��2�2�2�0 00psqqqqquqr000*+,��2�2�2�000psqqqqquqr000*+,��2�2�2�0 00psqqqqquqr000*+,��2�2�2�000psqqqqquqr000*+,��2�2�2�0 00psqqqqquqr000*+,��2�2�2�000p{�qqqquqr000*+,��2�2�2�0 00pqsqqqquqr000*+,��2�2�2�000pqsqqqquqr000*+,��2�2�2�0 00x�{||||uqr000*+,��2�2�2�000�x|||||uqr000*+,��2�2�2�0 00�"#####�mr000*+,��2�2�2�000�*+����qur000*+,��2�2�2�0 00�*+����qur000*+,��2�2�2�000�*�����qur000*+,��2�2�2�0 00�*�����qu�j0"1+,��2�2�2�000�*�����ququ0*++,��2�2�2�0 00�*�����ququ0*++,��2�2�2�000�*�����
qqqqqqqqqqq�|||||||�qqqqqq�||||||||}qqqqqqq{||||qqu�yyyyyyyyy|yyyyyyyyyyq�}r0 00 0(2)20 0�0��0�0�0�0 00 00 0quqr00000000�0��0�0�0�000000qu���0�0�0�0�0�0�0�0�0��0�0�0�000 00 0qu������0�0������0�0�0�������qu��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0qu��0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0qu��0�0�0�0�0�0�01�01�0�0�0�0�0�0�0�0�0�0�0qur000000�0�0�0F>>>>>>>>>>qur00 0000 0�0�0�0W0 00 00 00 00 0qur000 00 00�0�0�0W000hiiiiii�}r00 0"#$��0�0�0M0 00pqklllluqr00�0*+,��2�2�2�000pqsqqqquqr 000*+,��2�2�2�0 00pk�qqqquqr000*+,��2�2�2�000psqqqqquqr000*+,��2�2�2�0 00psqqqqquqr000*+,��2�2�2�000psqqqqquqr000*+,��2�2�2�0 00psqqqqquqr000*+,��2�2�2�000psqqqqquqr000*+,��2�2�2�0 00psqqqqquqr000*+,��2�2�2�000p{�qqqquqr000*+,��2�2�2�0 00pqsqqqquqr000*+,��2�2�2�000pqsqqqquqr000*+,��2�2�2�0 00x�{||||uqr000*+,��2�2�2�000�x|||||uqr000*+,��2�2�2�0 00�"#####�mr000*+,��2�2�2�000�*+����qur000*+,��2�2�2�0 00�*+����qur000*+,��2�2�2�000�*�����qur000*+,��2�2�2�0 00�*�����qu�j0"1+,��2�2�2�000�*�����quqr0*++,��2�2�2�0 00�*�����quqr0*++,��2�2�2�000�*�����
Expand Down
Loading

0 comments on commit 513b228

Please sign in to comment.