dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
4,044 Commits 4 Branches 0 Tags
f46156a98c67345a49768d9313a3d8a036748556
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 8e1537fb57 Document map name popup flag 2019-03-10 09:23:58 -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
Phlosioneer 3ceb1667c9 Reduce externs 2019-03-01 22:32:50 -05:00
Phlosioneer a7e5852f1d More minor fixes 2019-03-01 01:49:11 -05:00
Phlosioneer 459fd93b59 Fix minor errors 2019-03-01 01:18:58 -05:00
Phlosioneer d0f665fddc Fix tabs 2019-03-01 01:09:53 -05:00
Phlosioneer 2d0e0083bb Improve OK bot's symbol counting 2019-03-01 01:06:27 -05:00
Phlosioneer da0687987d Pick better names for constants 2019-02-28 22:21:16 -06:00
Phlosioneer 189d387f01 Add macros for metatile manipulation 2019-02-28 22:21:16 -06:00
Phlosioneer 99bfd8c80f VAR_0x3F20 is not a var 2019-02-28 00:10:44 -05:00
Phlosioneer 373d73eb3b Fix last special var 2019-02-28 00:06:27 -05:00
Phlosioneer bf45b83c65 Finish documenting event vars 2019-02-27 23:54:51 -05:00
Phlosioneer 782979f1fc Finish documenting trainer hill 
Trainer hill isn't anywhere close to done, but I figured out enough
to name the VAR. That's all this PR should do.
 2019-02-27 22:16:01 -05:00
Phlosioneer 66f0616a2d I guess I'm documenting Trainer Hill now 2019-02-27 21:31:05 -05:00
Phlosioneer e77e7844ea Name several vars, document some related events 2019-02-27 20:25:09 -05:00
Phlosioneer 648fc3d4f3 Name more unknown vars 2019-02-27 15:18:56 -05:00
Phlosioneer 4137dd7b0b Identify unused, never read, and never written vars 2019-02-27 14:42:32 -05:00
Phlosioneer c1348d22f3 Name most event scripts related to unusual weather 2019-02-27 04:27:54 -05:00
Phlosioneer fe55580fe1 Reverse engineer unusual weather events 2019-02-27 03:42:04 -05:00
Phlosioneer b2c92ee8c5 Missed some fill values 
Must have forgotten to check FillWindowPixelRect.
 2019-02-26 22:45:39 -05:00
Phlosioneer 72bb0daccb Merge branch 'master' into main-menu-state-machine 2019-02-26 22:34:42 -05:00
Phlosioneer 6cb4c677cd Fix backwards names 2019-02-26 22:30:40 -05:00
Phlosioneer b8a60b055b Fix previous merge 2019-02-26 22:11:43 -05:00
Phlosioneer 3a44b090d1 Merge branch 'master' into multiplayer-stuff 2019-02-26 22:07:29 -05:00
Phlosioneer accea672f1 Incorporate feedback 2019-02-26 22:04:44 -05:00
Phlosioneer a5cf2b8090 Use map script constants in map script functions 2019-02-25 08:01:22 -06:00
Phlosioneer 8816aa527d Update map script files 2019-02-25 08:01:22 -06:00
Phlosioneer 5f7a971313 Source file part of map script renaming 2019-02-25 08:01:22 -06:00
Phlosioneer 1cd5cb09cf Merge branch 'master' into weather-15 2019-02-25 02:30:35 -05:00
Phlosioneer e1b2460748 Adjust formatting, rename function 2019-02-25 02:28:41 -05:00
Phlosioneer 4e5fae0086 Merge branch 'master' into event-vars 2019-02-25 02:24:20 -05:00
Phlosioneer 87859a655b Fix flag formatting for fun 2019-02-25 02:20:38 -05:00
Phlosioneer 04db99bb0a More misc event names 2019-02-24 10:10:18 -06:00
Phlosioneer 0de831fd29 Name some common single-entry movements 2019-02-24 10:10:18 -06:00
Phlosioneer 4582fd1545 Name a ton of commonly used event scripts 2019-02-24 10:10:18 -06:00
Phlosioneer b2866fae21 Document the weather state functions 
All weather types are now documented (including WEATHER_15)
 2019-02-22 22:20:42 -05:00
Phlosioneer cea5696f23 Finish moving pokeruby vars 2019-02-22 04:18:43 -05:00
Phlosioneer e12a7790cf Start porting pokeruby vars to pokeemerald 2019-02-22 04:01:38 -05:00
Phlosioneer 44e92ce259 Give window drawing functions better names 2019-02-22 01:40:11 -05:00
Phlosioneer 199863f21f Replace more instances of fill values 2019-02-21 23:56:22 -05:00
Phlosioneer c96f8751cd Improve window palette macros 2019-02-21 23:27:12 -05:00
Phlosioneer 399d646e3f Merge branch 'master' into main-menu-state-machine 2019-02-21 22:24:25 -05:00
Phlosioneer eca329f9c5 Merge branch 'master' into multiplayer-stuff 2019-02-21 21:22:10 -05:00
Phlosioneer 486cf449b8 Make flag names more consistent 2019-02-18 14:17:02 -05:00
Phlosioneer bfe67842ab Fix spelling (again) 2019-02-18 14:14:07 -05:00
Phlosioneer fcb541189d Rename some flags, and use map ID macros 2019-02-18 02:02:20 -05:00
Phlosioneer 93e9b9fe5d Fix some names 2019-02-18 01:33:41 -05:00
Phlosioneer 0a7b97ee06 Merge branch 'master' into multiplayer-stuff 2019-02-18 01:19:16 -05:00
Phlosioneer 5695617d64 Merge branch 'master' into multiplayer-stuff 2019-02-18 01:12:47 -05:00
Phlosioneer 40d4f7f8db Minor fixes 2019-02-18 01:10:59 -05:00
Phlosioneer 08579edbcd Clean up mistakes and bad formatting 2019-02-18 01:03:44 -05:00
Phlosioneer 7ad225a72f Address formatting issues and use constants 2019-02-18 00:16:27 -05:00
Phlosioneer f528552583 Rename pokenav file 2019-02-17 23:14:14 -05:00
Phlosioneer 762640664f Fix formatting 2019-02-17 23:14:14 -05:00
Phlosioneer bfeb7fb32a Tabs converted to spaces. 
Oops.
 2019-02-17 23:14:14 -05:00