Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,379 Commits 1 Branch 0 Tags
Commit Graph

96 Commits

Author SHA1 Message Date
RoamerX
2e00ddb067 汉化补充修正 
汉化了树果混合器相关文本（src\berry_blender.c）
汉化了宝可方块相关文本（src\pokeblock.c）
汉化了所有奖章的说明文本（src\data\text\gift_ribbon_descriptions.h）
汉化了宝可梦导航器的相关文本（src\pokenav_main_menu.c，src\pokenav_list.c，src\pokenav_match_call_gfx.c，src\pokenav_menu_handler_gfx.c）
汉化了导航仪地图界面的地标名称（src\landmark.c），并统一了脚本中它们的叫法
汉化了零散遗漏的英文文本
宝可梦的量词按照朱紫统一成“只”而不是“个”
 2025-04-21 21:36:17 +08:00
12014
1e70488649 Translation of the texts of Player PC, the Pokemon storage System and some Graphics. 2025-04-15 22:07:47 +09:00
Eduardo Quezada
25075239a2 Merge branch '_RHH/master' into _RHH/upcoming 2024-12-21 08:46:33 -03:00
Eduardo Quezada
82252251e7 Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
Eduardo Quezada
5483e05db6 Fixed brace style inconsistencies 2024-12-05 12:46:50 -03:00
Frank DeBlasio
1b880a1185
Converted item-related variables to COMPOUND_STRINGs (#5714) 2024-12-03 23:11:59 +01:00
Martin Griffin
aab9678b02 Enable GF item names by default 
In the Pokémon Storage System, even FONT_SMALL_NARROWER isn't sufficient
to prevent clipping in all cases. e.g. Unremarkable Teacup clips. We
have decided to accept that cost to make the rest of the user experience
better, but downstream projects that don't like that trade-off can
either a) alter the Pokémon Storage System UI, or b) set
I_EXPANDED_ITEM_NAMES to FALSE.
 2024-04-25 18:40:37 +01:00
Eduardo Quezada
7ae37ab79c Merge branch 'pret_master' into RHH/upcoming 
# Conflicts:
#	README.md
#	data/battle_ai_scripts.s
#	data/event_scripts.s
 2023-10-27 11:03:37 -03:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern (#3412) 
* Fix Wall Werror errors

* fix hgss pokedex modern errors

* tests build on modern

* learnset change

* Update src/battle_ai_util.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/battle_anim_new.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/pokedex_plus_hgss.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* review changes

* unused cmd args

* various args back

---------

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-10-13 18:39:35 +02:00
Thomas Winwood
054d0f9852
Remove fakematch in NewGameInitPCItems 2023-10-07 12:52:57 -04:00
Eduardo Quezada
af210da972 Solved a bunch of -Wall errors on modern 2023-09-20 19:01:08 -03:00
GriffinR
431a7ef8dd Add missing cursorKind field usage 2022-11-09 15:37:47 -05:00
GriffinR
1107ff954d Clean up shop.c 2022-09-22 15:08:17 -04:00
tustin2121
1cb659df8c Renaming Script Contexts 
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
 2022-08-15 15:18:12 -04:00
Eduardo Quezada
7b3401ee27 Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
Eduardo Quezada
a37d8b1346 Documented boolean uses 2022-07-25 14:59:14 -04:00
GriffinR
1ca1bff81c Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg 2022-06-03 15:43:21 -04:00
GriffinR
34438e6bc4 Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
BlackShark
75a44fdd79 use more true & false constants 2022-05-27 02:18:52 +02:00
GriffinR
36e5d5e759 Add missing menu array counts 2022-02-27 13:47:50 -05:00
GriffinR
17b657d83a Finish menu documentation 2021-11-04 11:52:43 -04:00
GriffinR
50d3003a0d Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW 2021-11-03 19:54:20 -04:00
GriffinR
085f8adec6 Start remaining menu documentation 2021-11-03 17:38:08 -04:00
GriffinR
9a0618afc3 Add COPYWIN constants 2021-11-03 15:29:18 -04:00
GriffinR
fdaf436960 Add font id constants 2021-10-30 19:54:15 -04:00
GriffinR
d6571f2355
Merge pull request #1525 from GriffinRichards/doc-recmix 
Document remainder of Record Mixing
 2021-10-26 14:18:38 -04:00
GriffinR
7f3c529935 Document record mixing mail swap 2021-10-24 15:49:19 -04:00
GriffinR
a950f9c771 Clean up international_string_util 2021-10-17 21:51:11 -04:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00
GriffinR
034b7f0513 Fix conflicting PC window names 2021-08-11 19:14:50 -04:00
GriffinR
bd5cf07059
Merge branch 'master' into doc-playerpc 2021-08-02 14:08:10 -04:00
GriffinR
06b909bcd8 Document player pc 2021-08-02 13:58:40 -04:00
GriffinR
a274cc6a76
Merge branch 'master' into flatten_sprite_pos 2021-07-12 01:39:28 -04:00
PikalaxALT
810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -04:00
Kurausukun
10c80230c4 change printItemFunc to use u32 instead of s32 
also change a use of -2 to LIST_CANCEL
 2021-06-18 00:15:45 -04:00
Kurausukun
3b7f708eb0 fix player_pc goto 2021-05-13 11:29:11 -05:00
GriffinR
c786a9b20c Document pokeblock menu 2021-04-11 18:10:05 -04:00
GriffinR
1cac608dbe Document mail 2021-02-24 11:03:39 -05:00
GriffinR
b04f0aaa2b Use SPRITE_NONE constant 2021-02-24 11:03:32 -05:00
GriffinR
a5852d57d1 Use TASK_NONE constant 2021-02-24 11:03:25 -05:00
GriffinR
81a7f491b7 Use WINDOW_NONE constant 2021-02-24 11:03:08 -05:00
GriffinR
18b8e0ee8e
Merge pull request #1311 from GriffinRichards/clean-unused 
Remove unused local variables and functions
 2021-01-19 23:22:44 -05:00
GriffinR
b65980cd4e Remove unused local variables and functions 2021-01-19 18:19:33 -05:00
GriffinR
9dd867689e Use ARRAY_COUNT in PrintMenuTable 2021-01-19 04:19:14 -05:00
aaaaaa123456789
bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03:00
aaaaaa123456789
7dc95a0103 Undo PokeCodec's PRs 
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
 2020-09-13 06:30:55 -03:00
PokeCodec
28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
PokeCodec
c5aa91741b Change signedness and add casts to avoid implicit conversion warnings 2020-07-24 22:18:57 -04:00
Sierraffinity
74edaed426 Begin item_menu.c cleanup 2020-06-10 13:07:42 -07:00
GriffinR
084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00