dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
5,277 Commits 4 Branches 0 Tags
4fe507e4539f2c349a7297c31f66893bbf775ff5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Phlosioneer 8338e29279 Pokenav unk 1 almost done 2019-04-13 11:34:53 -05:00
Phlosioneer 2b740b46e8 About halfway done with pokenav_unk_1.s 2019-04-13 11:34:53 -05:00
Phlosioneer ee2edb068a Start decomp of pokenav_unk_1 
Looks like it's the Ribbons menu, based on the first function.
 2019-04-13 11:34:53 -05:00
Phlosioneer 92851ba4e6 Trim headers from pokenav.c 2019-04-08 17:29:07 -05:00
Phlosioneer 50350cc2e1 Merge branch 'master' into contest-ai-cleanup 2019-04-07 20:20:22 -04:00
Phlosioneer be925a438e Remove debug printing 2019-04-07 19:18:42 -05:00
Phlosioneer 29c986e21e Fix nonmatching MatchCall_MoveWindow function 2019-04-07 19:18:32 -05:00
Phlosioneer 8de9c2d912 First round of fixes 2019-04-07 18:31:01 -04:00
Phlosioneer d352999cd8 Change "navgear" to "pokenav" 2019-04-07 18:10:53 -04:00
Phlosioneer 0dc73b0b3a Break up pokenav into subfiles 
The files are separated based on the pokenav resources substruct
ID they use.
 2019-04-07 14:40:35 -04:00
Phlosioneer d84d94e29a Merge branch 'master' into pokenav-decomp-again 2019-04-07 01:56:36 -04:00
Phlosioneer ad2a97935e Document left header system 2019-04-07 01:32:42 -04:00
Phlosioneer ddfe0f91cf Document decompiled parts of the pokenav main menu 2019-04-06 23:34:30 -04:00
Phlosioneer 3b45f37517 Significant documentatioon progress 2019-04-06 16:25:08 -04:00
Phlosioneer bc50686158 Decomp everything onvolving UnknownSubStruct_81C81D4 
Now I can start cleaning up the fields and substructs
 2019-04-06 03:42:14 -04:00
Phlosioneer 1360b3a477 RGB Constants 2019-04-04 17:05:46 -04:00
Phlosioneer 50da52c29b Fix utf8 errors in contest_effect's comments 2019-04-04 16:00:25 -04:00
Phlosioneer 83b6210dcb Forgot to add asm files 2019-04-03 20:56:47 -04:00
Phlosioneer 3b3b2dd031 General cleanup of the second half of contest.c 2019-04-03 20:43:23 -04:00
Phlosioneer 3a2ea40188 Rename and document more contest setup functions 
Also properly label the link contest flags variable, and label the
contest window ID's.
 2019-04-03 17:24:32 -04:00
Phlosioneer f82bdb332a Document applause meter code 2019-04-03 03:00:06 -04:00
Phlosioneer 8f13e991d2 Found a debug system for pokemon contests 2019-04-02 21:51:21 -04:00
Phlosioneer f79a2fda68 Document the nextTurnOrder calculations 2019-04-02 20:46:18 -04:00
Phlosioneer 99e8e8e53f More cleanup, document contestant sorting 2019-04-02 20:00:05 -04:00
Phlosioneer 201c0953ae Cleanup OamData entries 2019-04-02 07:41:50 -05:00
Phlosioneer 9f44ebc5cd Automatically calculate REMATCH_TABLE_ENTRIES 
Uses the standard C way of calculating the length of an enum.
 2019-04-02 07:28:30 -05:00
Phlosioneer 6916f09cd5 Expand MatchCallStruct defs, use REMATCH_* enum 2019-04-02 07:28:30 -05:00
Phlosioneer 65d8b68f9d Expicitly hardcode rematch indecies 
Inserting an entry without updating the indecies will now cause a
compiler error. This will make it easier for modders to remember to
update the constants.
 2019-04-02 07:28:30 -05:00
Phlosioneer ca9f7fe356 Fix hardcoded array sizes 2019-04-02 07:28:30 -05:00
Phlosioneer c3200c0beb Cleanup some of gContestResources 2019-04-02 00:35:57 -04:00
Phlosioneer 845307b3a6 Rename contest AI stuff 2019-04-01 22:16:07 -04:00
Phlosioneer c429e6d69c Move gPlayerFacingPosition out of sym_ewram.txt (#617) 
* Move gPlayerFacingPosition out of sym_ewram.txt

* Fix tabs in sym_ewram.txt

* Remove redundant faraway island extern
 2019-04-01 19:30:41 -05:00
Phlosioneer fe1c14db76 Fix warning for extra parens (#646) 
* Fix warning for extra parens

* Committed too many files
 2019-04-01 19:27:55 -05:00
Phlosioneer cd069446e0 Merge branch 'master' into pokedex-area-const-array 2019-03-31 20:43:42 -04:00
Phlosioneer 3181c64c64 Change names from MAP_AREA_ to MAP_GROUP_ 2019-03-31 20:40:14 -04:00
Phlosioneer b7057e8d92 Update OAMs to use new constants 2019-03-31 20:33:25 -04:00
Phlosioneer 37c7441a15 Merge branch 'master' into contest-data 2019-03-31 20:22:47 -04:00
Phlosioneer 23ac2cc94e Prep for merge 2019-03-31 20:15:44 -04:00
Phlosioneer 207a54393c Fix mistakes and use EVENT_OBJ_GFX_* macros 2019-03-31 20:07:24 -04:00
Phlosioneer f4737874ef Made a new substruct for the substruct 
We must go deeper.
 2019-03-16 22:10:07 -04:00
Phlosioneer 691392fd5d Clean up intro_credits_graphics constants 2019-03-16 12:37:04 -05:00
Phlosioneer a029254faa Apply new macros to intro graphics struct 2019-03-16 12:37:04 -05:00
Phlosioneer eeb329909c Fix anonymous struct 2019-03-16 12:37:04 -05:00
Phlosioneer 9848f84b9e Use constants for Oam .shape and .size fields 
Also some general formatting fixes for constants.
 2019-03-16 12:37:04 -05:00
Phlosioneer 291df27dcb Use new MUS_NONE constant in sound.c 2019-03-16 12:31:29 -05:00
Phlosioneer 092608aef6 Add a constant for "no music" on maps. 2019-03-16 12:31:29 -05:00
Phlosioneer 61fa4cf2ba Make a powershell version of asmdiff.sh 
This version can be used with VSCode's built-in diff, and has better
error detection for new contributors.
 2019-03-16 12:26:01 -05:00
Phlosioneer 703554c4df Ranges are magic 2019-03-16 12:25:02 -05:00
Phlosioneer 61344a4fee Document the water droplet data. 2019-03-16 12:25:02 -05:00
Phlosioneer bdc6ed1a98 Decompiled two difficult functions 
Had do use a lot of `asm` directives for sub_81C8A28 to match.
 2019-03-16 00:34:11 -04:00
Phlosioneer 8cea949e6d Move constant and EWRAM data into C. 2019-03-15 19:33:30 -04:00
Phlosioneer a71c563b10 A few more functions decompiled 2019-03-15 02:33:55 -04:00
Phlosioneer 31ded7cc6f Merge branch 'master' into pokenav-decomp-again 2019-03-15 01:19:00 -04:00
Phlosioneer 7f70b629f5 Document sAreaGlowTilemapMapping 
I used a script to generate the format for the array, so I can easily
change its formatting if needed.
 2019-03-12 05:35:15 -04:00
Phlosioneer 8e1537fb57 Document map name popup flag 2019-03-10 09:23:58 -05:00
Phlosioneer 13c2f91b11 Moved last contest data into C 2019-03-09 23:51:39 -05:00
Phlosioneer 0c935a8bd5 Move the contest opponent filter to C 2019-03-09 22:54:17 -05:00
Phlosioneer a32e8e7405 Move gContestOpponents into C 
2,400 LOC by hand.
 2019-03-09 20:56:36 -05:00
Phlosioneer 0e8f94a83e Last bit of cleanup on contest_opponents 2019-03-09 02:49:57 -05:00
Phlosioneer 153499ed6f Clean up contest_opponents.inc 2019-03-09 01:38:38 -05:00
Phlosioneer 5b4b0a245b Move contest winner list to C 2019-03-09 00:01:49 -05:00
Phlosioneer 88c3781880 Move text pointer tables into C 2019-03-08 22:33:40 -05:00
Phlosioneer b7cfa9d365 Move more contest constants into C 2019-03-08 21:39:51 -05:00
Phlosioneer c3feb9871f Use PIXEL_FILL macro 2019-03-08 04:02:05 -05:00
Phlosioneer 622096a9d3 spaces => tabs 2019-03-08 04:00:11 -05:00
Phlosioneer 146c194b0c Actually change the variable name this time 2019-03-08 03:12:08 -05:00
Phlosioneer 5886f82ef5 Merge branch 'master' into extern-cleanup 2019-03-08 02:45:26 -05:00
Phlosioneer eaddf396b2 I was dumb and forgot to add merge fixes 2019-03-08 02:35:19 -05:00
Phlosioneer b93d923826 Merge branch 'master' into move-tutor 2019-03-08 02:27:20 -05:00
Phlosioneer eac70acab6 Change filename to something more descriptive 2019-03-08 02:17:01 -05:00
Phlosioneer af182d6f16 Minor cleanup before pushing 2019-03-08 02:10:44 -05:00
Phlosioneer 69aec91577 Decompile move tutor stuff 
2 nonmatching.
 2019-03-08 01:56:38 -05:00
Phlosioneer 6638ebe7fd Fix copyright mixup 2019-03-07 08:46:55 -06:00
Phlosioneer b0c634d531 Support absolute paths 2019-03-07 08:46:55 -06:00
Phlosioneer 105e1721d6 Overhaul scaninc to work recursively 
This also fixes the bug where scaninc would ignore #include lines
in assembly files.
 2019-03-07 08:46:55 -06:00
Phlosioneer aa7657a82a Move constants into C 
Also figured out what one of the graphics files is for.
 2019-03-06 22:58:05 -05:00
Phlosioneer 0da83abad2 Several nonmatching functions 
Huge and difficult.
 2019-03-06 22:27:30 -05:00
Phlosioneer 4345ba8e6c More decompiled and cleanup 2019-03-05 22:32:28 -05:00
Phlosioneer c3594f982d Decompiling pokeblock ui stuff 2019-03-05 20:32:14 -05:00
Phlosioneer 9bea9e1624 Start decompiling menu_unknown 2019-03-05 06:06:20 -05:00
Phlosioneer 18902219ad Fix make to look for .json files instead of folders 
Currently, when Make is building the maps, it considers every
folder in the data/maps/ directory as a map that needs to be built,
even folders that are empty. This can be a problem when modding on
a separate branch, because git doesn't always clean up directories
when switching branches (usually because of hidden files in those
directories), so switching back to an unmodded branch will leave
an empty folder that confuses make.

This commit changes the makefile so that it only checks directories
that have map.json files in them.
 2019-03-05 01:46:20 -05:00
Phlosioneer 0e3fc4956b Rename asm file 2019-03-05 00:06:43 -05:00
Phlosioneer 907492fd6e Split rom asm file in half 
The first half is ui/menu stuff, while the second half is link-related
stuff.
 2019-03-04 23:26:51 -05:00
Phlosioneer cae63cf1c7 Rename move tutor to move relearner 2019-03-04 20:56:39 -05:00
Phlosioneer ac7a048380 Removed PREV and NEXT macros, changed summary name 2019-03-04 00:25:07 -05:00
Phlosioneer 05199f8fc7 Fix merge issue 2019-03-03 22:27:57 -05:00
Phlosioneer 2879fe7fe0 Merge branch 'master' into summary-screen-macros 2019-03-03 16:58:54 -05:00
Phlosioneer 63e700af6c Use macros for summary windows 
Other minor changes and fixes are included
 2019-03-03 16:50:51 -05:00
Phlosioneer f378a5a316 Fix symbol overcounting, add partial symbols 2019-03-03 15:02:26 -05:00
Phlosioneer 4ea5e85bed Fix typos 
This is an updated version of #554, since it hasn't been updated in two
weeks.
 2019-03-03 09:31:47 -06:00
Phlosioneer e03595a10d Bugfixes from #591 2019-03-03 09:31:08 -06:00
Phlosioneer 27aa27a2e9 Fix tabs 2019-03-03 02:58:50 -05:00
Phlosioneer 4907ce6f7f Fully document move_tutor (formerly learn_move) 2019-03-03 02:50:40 -05:00
Phlosioneer 9372731c3e Merge branch 'master' into main-menu-state-machine 2019-03-02 17:35:44 -05:00
Phlosioneer 3716da5430 Rename macro with correct name for pixel values 2019-03-02 17:25:39 -05:00
Phlosioneer 80a4ee1145 Remove water.h and flying.h 2019-03-02 17:23:10 -05:00
Phlosioneer 25050b9944 Fix tabs, do suggested rename 2019-03-02 04:13:27 -05:00
Phlosioneer 49bef25856 Clean up the last extern functions 2019-03-02 03:18:08 -05:00
Phlosioneer ee69426838 Eliminate more externs 2019-03-02 02:44:02 -05:00
Phlosioneer 0f6cc27e81 Fixed decomp issue around LoadPalette 
In LoadLinkPartnerEventObjectSpritePalette, using paletteNum += 6 causes
GCC to "mark" paletteNum's register as a possible overflow, even though
it performs the overflow check. Then, when passing args to LoadPalette,
GCC fails to recognize that 0x100 + ((any u8) << 4) can never overflow
as a u16. It then does an overflow check before calling LoadPalette.

Assigning to a temp variable seems to avoid this "marking" behavior.
 2019-03-02 00:36:59 -05:00