ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 20:24:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,196 Commits 1 Branch 0 Tags 235 MiB
598f5dd914
Commit Graph

6196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan
598f5dd914 cherry pick 8960588d0b0b9e31c8971173396f6e631930229b 2021-04-01 20:14:32 -06:00
Evan
d3d29d7cb5 cherry pick 0cccbfd0ba608287d5f2b642ea613d9674cd919d 2021-04-01 20:12:43 -06:00
Evan
3f94abf03d fix collision freezing 2021-04-01 20:11:16 -06:00
Evan
7d4545c088 fix same-level movement on stairs 2021-04-01 20:11:09 -06:00
Evan
492683eeb6 fix stairs north dir bug 2021-04-01 20:11:01 -06:00
Evan
228b76e136 finish conditional slow stairs movement, clean up code a bit 2021-04-01 20:10:41 -06:00
Evan
e4674ccd03 fully working walk/run/mach bike/acro bike regular movement 2021-04-01 20:10:30 -06:00
Evan
31e9f97d52 cherry pick 4eb7fcc261934c0f9f10985761cd3e7b7abf0dab 2021-04-01 20:10:21 -06:00
Evan
33dfa321b0 init branch 2021-04-01 20:09:12 -06:00
GriffinR
21fd6827b0
Merge pull request #1394 from GriffinRichards/fix-bgevent 
Fix bg event macros
 2021-04-01 14:22:48 -04:00
GriffinR
038505984c Fix bg event macros 2021-04-01 02:42:02 -04:00
GriffinR
6b070010b2
Merge pull request #1392 from GriffinRichards/multichoicebool 
Use bool for multichoice ignoreBPress
 2021-03-31 01:27:42 -04:00
GriffinR
5d7c438efc
Merge pull request #1391 from GriffinRichards/objvram 
Add some uses of OBJ_VRAM/VRAM_SIZE
 2021-03-31 00:36:20 -04:00
GriffinR
f602a9dcbf Use bool for multichoice ignoreBPress 2021-03-31 00:35:56 -04:00
GriffinR
8c6e89e994 Bit shifts from hex to decimal 2021-03-30 17:38:09 -04:00
GriffinR
d5d1caf965 Add some uses of OBJ_VRAM/VRAM_SIZE 2021-03-30 15:07:04 -04:00
GriffinR
e8b6b4b65e
Merge pull request #1383 from Kurausukun/fr_doc 
Port Some Documentation from FR
 2021-03-29 18:53:26 -04:00
Kurausukun
102582a3df Merge branch 'master' of https://github.com/pret/pokeemerald into fr_doc 2021-03-29 18:36:18 -04:00
Kurausukun
79a8eb481f 1 to true 2021-03-29 18:32:22 -04:00
GriffinR
c40fb9288c
Merge pull request #1378 from GriffinRichards/doc-berrycrush 
Document Berry Crush
 2021-03-29 12:38:16 -04:00
GriffinR
731a442035
Merge pull request #1389 from huderlem/text_doc 
Document some text-related things
 2021-03-29 12:32:26 -04:00
Marcus Huderle
6cceb05cb7 Document some text-related things 2021-03-29 11:20:00 -05:00
Scott
5cb8ec4247 Rename IsNotEventLegalMewOrDeoxys 2021-03-27 17:27:32 -05:00
GriffinR
7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05:00
GriffinR
0f869fb266 Remaining labels in trainer_card 2021-03-22 15:30:19 -05:00
GriffinR
2be0c52c17 Remaining labels in map_name_popup 2021-03-22 15:30:19 -05:00
GriffinR
1cc0a3506f Label misc field effects 2021-03-22 15:30:19 -05:00
GriffinR
4077c53338 A few labels in party, start, option menus 2021-03-22 15:30:19 -05:00
GriffinR
9773b436d2 Clean up shop.c 2021-03-22 15:30:19 -05:00
GriffinR
6127c6f32e Misc labels in battle facilities 2021-03-22 15:30:19 -05:00
Kurausukun
9eb5794482 cleanup some m4a code (thanks to shoomer) 2021-03-21 13:43:53 -05:00
GriffinR
dfc6ee0e9e Add SAFE_DIV 2021-03-21 13:43:14 -05:00
GriffinR
28aff5b179 Correct ClearRankingHallRecords bugfix 2021-03-21 13:43:14 -05:00
GriffinR
557152b06e Minor link cleanup 2021-03-21 13:40:40 -05:00
Kurausukun
0691632ac6 oops 2021-03-19 18:52:37 -04:00
Kurausukun
7198d40ec8 port some documentation from FR 2021-03-19 18:49:19 -04:00
Kurausukun
5b910a11b4 port miscellaneous fr documentation 2021-03-18 20:35:39 -04:00
GriffinR
8eafe1fd4e Move pointillism points array to src 2021-03-18 17:36:18 -05:00
GriffinR
22e2c0a47c Document Berry Crush 2021-03-18 15:18:23 -04:00
GriffinR
3cb9300744
Merge pull request #1377 from Kurausukun/temp 
Port Some Missed Berry Crush Documentation
 2021-03-16 00:02:27 -04:00
Kurausukun
3baac6ef3c port some missed berry crush documentation 2021-03-15 23:55:10 -04:00
GriffinR
ecd269ba2c
Merge pull request #1372 from GriffinRichards/doc-countdown 
Document minigame countdown
 2021-03-15 21:39:58 -04:00
GriffinR
9242ec30de
Merge pull request #1376 from PikalaxALT/battle_multi_buffer 
Resolve link comm buffers in gBattleStruct
 2021-03-15 21:35:16 -04:00
PikalaxALT
925e68c03f Update newly named fields 2021-03-15 15:22:41 -04:00
PikalaxALT
8352ebcc48 Merge branch 'master' of github.com:pret/pokeemerald into battle_multi_buffer 2021-03-15 09:46:57 -04:00
GriffinR
780e49dbc8
Merge pull request #1375 from GriffinRichards/bugfix-end 
Note missing end in Trainer Hill
 2021-03-14 19:08:36 -04:00
GriffinR
cc9d54bf6d
Merge pull request #1374 from SethBarberee/berry_crush_sync 
berry_crush: sync some pokefirered names with pokeemerald
 2021-03-13 16:52:11 -05:00
GriffinR
fd3175bde4 Note missing end in Trainer Hill 2021-03-13 16:40:29 -05:00
Seth Barberee
4158f07dee move bgBuffers back to unk138 2021-03-12 19:24:03 -06:00
Seth Barberee
fda56d6f47 berry_crush: sync some pokefirered names with pokeemerald 2021-03-12 18:39:25 -06:00