ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,774 Commits 1 Branch 0 Tags 235 MiB
c67dead63d
Commit Graph

2774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diegoisawesome
58a5e4a261 Merge branch 'master' of github.com:pret/pokeemerald 2018-09-22 15:39:34 -05:00
Diegoisawesome
9e840dc5fe Merge remote-tracking branch 'Tetra/master' 2018-09-22 15:23:47 -05:00
Diegoisawesome
d50554bb8e Use macros and defines in tileset_anims 2018-09-22 15:02:49 -05:00
Diegoisawesome
925de13b44
Merge pull request #334 from Diegoisawesome/master 
Change order of inital vol command in mid2agb
 2018-09-22 14:20:33 -05:00
Diegoisawesome
f613176308 Fix order of initial vol command 2018-09-22 13:54:00 -05:00
Diegoisawesome
eb4408a6ff
Merge pull request #338 from DizzyEggg/small 
Rename gRandomMove to gCalledMove
 2018-09-22 12:13:03 -05:00
DizzyEggg
611360c29e calledattack to calledmove 2018-09-22 19:08:41 +02:00
DizzyEggg
e362c06aea gRandomMove to gCalledMove 2018-09-22 18:41:00 +02:00
Tetrable
1f767e4c49 Document and make tileset_anims.c easier to use 2018-09-22 13:27:43 +01:00
Tetrable
4d9c513e3e Document and improve tileset_anims.c further 2018-09-22 12:50:24 +01:00
Diegoisawesome
a1edceb595
Merge pull request #336 from Kurausukun/master 
port keysplit_tables from pokeruby
 2018-09-21 11:45:27 -05:00
Kurausukun
f9e8808234
Update voice_groups.inc 
Added instruments that were previously part of keysplit_tables.inc
 2018-09-21 12:42:32 -04:00
Kurausukun
3f7fb4fefd
Update keysplit_tables.inc 2018-09-21 12:36:48 -04:00
Kurausukun
e25a7d0276
Update keysplit_tables.inc 
move instrument definitions to end of file
 2018-09-21 12:32:22 -04:00
Diegoisawesome
b787f8ca04
Merge pull request #335 from DizzyEggg/battledoc 
Document some not labeled battle things
 2018-09-21 10:10:04 -05:00
Kurausukun
f1c0c79e21 ported keysplit_tables from pokeruby 2018-09-21 00:54:28 -04:00
DizzyEggg
66fd9b2ddf Label trainer hill battle type 2018-09-20 22:00:00 +02:00
DizzyEggg
bf64333299 Give labels to healthbox gfx 2018-09-20 21:42:38 +02:00
DizzyEggg
e4b7ba0977 Document some not labeled battle things 2018-09-20 11:55:35 +02:00
Diegoisawesome
25e469b664
Merge pull request #333 from Diegoisawesome/master 
Add defines for tile, metatile, and palette count
 2018-09-18 10:15:26 -05:00
Diegoisawesome
8a05bf82ec Merge branch 'master' of github.com:pret/pokeemerald 2018-09-18 10:03:57 -05:00
Diegoisawesome
899ae7a59a Add defines for tile, metatile, and palette count 2018-09-18 10:03:24 -05:00
Diegoisawesome
7f2d52d9e0
Merge pull request #332 from DizzyEggg/patch-5 
Use defines for BattleAI_ChooseMoveOrAction
 2018-09-17 10:11:25 -05:00
Diegoisawesome
6978a896d1
Merge pull request #331 from DizzyEggg/patch-3 
Use pokeruby's formatting for move descriptions
 2018-09-17 10:11:12 -05:00
Diegoisawesome
28f410737e
Merge pull request #330 from DizzyEggg/patch-2 
Make it easier to edit ability text
 2018-09-17 10:10:33 -05:00
Marcus Huderle
f2a76b54bd Re-dump tileset images as RGB-indexed, rather than greyscale 2018-09-16 11:07:48 -05:00
DizzyEggg
5164215c91
Use defines for BattleAI_ChooseMoveOrAction 2018-09-16 17:06:35 +02:00
DizzyEggg
94bbfa7fa0
Use pokeruby's formatting for move descriptions 2018-09-16 15:58:13 +02:00
DizzyEggg
de65ddf4b6
Make it easier to edit ability text 2018-09-16 10:17:10 +02:00
Diegoisawesome
6a8f27c1ac
Merge pull request #326 from DizzyEggg/cablecarutil 
Decompile cable_car_util.c
 2018-09-16 01:06:33 -05:00
Diegoisawesome
2bba2f91d6
Merge pull request #328 from DizzyEggg/slotmachine 
Decompile/Port slot_machine.c
 2018-09-16 00:59:53 -05:00
Diegoisawesome
3303c416d4 Merge remote-tracking branch 'Egg/slotmachine' 2018-09-15 20:42:58 -05:00
DizzyEggg
4d2637883a Slot machine is decompiled. 2018-09-15 23:19:37 +02:00
Diegoisawesome
b183b99694
Merge pull request #327 from Diegoisawesome/master 
Update mid2agb source
 2018-09-15 16:12:25 -05:00
DizzyEggg
db248dada2 slot machine is decompiled 2018-09-15 22:59:45 +02:00
Diegoisawesome
3028fdc353 Update mid2agb source 
Credit to @camthesaxman
 2018-09-15 15:49:31 -05:00
DizzyEggg
0547e260a4 More of slot machine 2018-09-15 18:01:20 +02:00
DizzyEggg
ff13cb6352 decompile cable car util which has nothing to do with actual cable car 2018-09-15 13:50:23 +02:00
Diegoisawesome
48586660fd Merge branch 'master' of github.com:Diegoisawesome/pokeemerald 2018-09-14 22:35:18 -05:00
Diegoisawesome
e8be47abb8 Add running status to mid2agb 2018-09-14 22:35:04 -05:00
Diegoisawesome
b8c9d9a980
Merge pull request #324 from Diegoisawesome/master 
Document main_menu
 2018-09-14 12:17:11 -05:00
Diegoisawesome
b860d583e4 Document main_menu 2018-09-14 12:15:46 -05:00
Diegoisawesome
095cbbc5c2
Merge pull request #321 from Slawter666/data 
Move more data to C
 2018-09-11 22:10:26 -05:00
Slawter666
f40fa37398 Move battle_bg data to C 2018-09-11 23:37:47 +01:00
Diegoisawesome
b9e0cf9f6f
Merge pull request #323 from Diegoisawesome/master 
Fix gbafix
 2018-09-11 17:34:37 -05:00
Diegoisawesome
a9a50f1357
Merge pull request #322 from huderlem/fixspritesheets 
Fix event object spritesheets
 2018-09-11 17:33:14 -05:00
Marcus Huderle
ba125b23fd Remove transparency from event object spritesheets 2018-09-11 17:18:10 -05:00
Slawter666
991151f461 Move item_use data to C 2018-09-11 03:04:19 +01:00
Slawter666
3c16d8c598 Move braille_puzzles data to C 2018-09-11 02:17:21 +01:00
Slawter666
b6ee8823f0 Move field_special_scene data to C 2018-09-11 02:04:03 +01:00