Phlosioneer
d84d94e29a
Merge branch 'master' into pokenav-decomp-again
2019-04-07 01:56:36 -04:00
Phlosioneer
ddfe0f91cf
Document decompiled parts of the pokenav main menu
2019-04-06 23:34:30 -04:00
Papa Cancer
255ac6b54d
Leaf Storm animation
...
All credit to Doesnt, just stole it from his pokeruby build
2019-04-06 22:02:22 +01:00
DizzyEggg
f8713f9c15
Merge with master
2019-04-06 20:43:13 +02:00
Marcus Huderle
fe12f2f4b3
Document and cleanup some decoration code
2019-04-06 12:49:09 -05:00
Fontbane
4a09a5da33
Doc field move scripts completely, use fldeff constants for dofieldeffect
...
Fix labels
Fix labels again
Delete extra boulder scripts
Now it should build fine
2019-04-06 12:48:50 -05:00
DizzyEggg
b85a74afc5
Give names to battle anim backgrounds
2019-04-06 12:44:27 -05:00
DizzyEggg
19f151417e
Rename sprite sheet to sprite gfx
2019-04-06 10:14:48 -05:00
DizzyEggg
b93581b519
Rename battle anim sprites
2019-04-06 10:14:48 -05:00
DizzyEggg
311c1b9cba
Change anim tag names
2019-04-06 10:14:48 -05: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
Papa Cancer
33d484a7ed
Merge branch 'battle_engine_v2' into beta
2019-04-06 00:38:56 +01:00
Papa Cancer
43525d2a9c
Merge branch 'battle_engine_v2' into delta
2019-04-05 23:13:41 +01:00
DizzyEggg
794c9aa255
Merge pull request #121 from thechurchofcage/epsilon
...
Three pointless moves
2019-04-05 23:47:54 +02:00
DizzyEggg
7c8f69e6e3
Merge pull request #109 from Fontbane/patch-4
...
Field Effects for Gen IV Abilities
2019-04-05 23:40:30 +02:00
Marcus Huderle
033580da96
Document secret base
2019-04-05 16:24:57 -05:00
Papa Cancer
4c8bc9d526
Three pointless moves
...
Celebrate, Hold Hands and Happy Hour. Yay(!)
Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money.
Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
2019-04-05 18:10:02 +01:00
Fontbane
e8dd8f93d1
Remove Honey functionality
2019-04-05 10:33:19 -04:00
DizzyEggg
70569e7ebc
Use shiny species tag
2019-04-05 07:53:23 -05:00
DizzyEggg
b0223f691f
Clean up data headers
2019-04-05 07:53:23 -05:00
DizzyEggg
c36476af85
Clean up data2b.c
2019-04-05 07:53:23 -05:00
DizzyEggg
dd24597d52
Finish up menu specialised
2019-04-05 07:53:23 -05:00
PikalaxALT
a58d9a16dd
Merge branch 'master' into dodrio_berry_picking
2019-04-05 08:41:31 -04:00
DizzyEggg
183b714ff1
Merge with master and fix web moves
2019-04-05 12:43:44 +02:00
Fontbane
9e74409bb2
Fix labels, label more scripts
2019-04-04 19:34:35 -05:00
PikalaxALT
8db03ba6fa
Documentation of ereader helpers, 2
2019-04-04 19:26:45 -05:00
PikalaxALT
c46f271f67
Documentation of ereader_helpers, 1
2019-04-04 19:26:45 -05:00
PikalaxALT
53efbe2832
Finish decomp of union_room_chat
2019-04-04 19:26:45 -05:00
PikalaxALT
a47abb3949
union_room_chat data, 1
2019-04-04 19:26:45 -05:00
Phlosioneer
1360b3a477
RGB Constants
2019-04-04 17:05:46 -04:00
Diegoisawesome
f125de3e66
Merge pull request #659 from ultima-soul/pokemon
...
Remove pokemon_3.h
2019-04-04 12:49:46 -05:00
Diegoisawesome
8361ada4ba
Merge pull request #656 from ultima-soul/menu_specialized
...
Decompile some of menu_specialized
2019-04-04 12:49:17 -05:00
Diegoisawesome
e476a6d02d
Merge pull request #624 from Wyrserth/master
...
Use constants for naming screen's pages
2019-04-04 12:44:18 -05:00
ultima-soul
91a94a0ca1
Try to get closer to matching.
2019-04-03 21:13:26 -07:00
Phlosioneer
3b3b2dd031
General cleanup of the second half of contest.c
2019-04-03 20:43:23 -04:00
ultima-soul
48d27c035a
Remove pokemon_3.h
2019-04-03 15:15:08 -07:00
PikalaxALT
4fadbaf161
Minor fixes
...
gotoram --> returnram
cmdCF/execram --> gotoram
fix indentation in sym_ewram.txt
fix mevent_client.h guard name
2019-04-03 17:04:42 -05:00
PikalaxALT
d0384ee95e
mevent_server_ish --> mevent_client
2019-04-03 17:04:42 -05:00
PikalaxALT
d220f876fc
Some symbol documentation
2019-04-03 17:04:42 -05:00
PikalaxALT
28646ea64e
Decompile mevent server scripts
2019-04-03 17:04:42 -05:00
PikalaxALT
6c12d154e7
Reformat mevent server and client scripts
2019-04-03 17:04:42 -05:00
PikalaxALT
03badd9c40
mevent_server_ish
2019-04-03 17:04:42 -05:00
PikalaxALT
dabd1f6177
finish mevent_server.s
2019-04-03 17:04:42 -05:00
PikalaxALT
a455d98385
start porting mevent_server from firered
2019-04-03 17:04:42 -05: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
ultima-soul
02651f6177
Attempt to decompile menu_specialized. 2 NONMATCHING
2019-04-02 19:18:36 -07:00
Phlosioneer
8f13e991d2
Found a debug system for pokemon contests
2019-04-02 21:51:21 -04:00
Phlosioneer
99e8e8e53f
More cleanup, document contestant sorting
2019-04-02 20:00:05 -04:00
Marcus Huderle
181baf9fe5
Merge remote-tracking branch 'upstream/master' into misc_docs
...
# Conflicts:
# src/field_weather_effect.c
2019-04-02 18:29:51 -05:00
Marcus Huderle
1241700b20
Finish documenting the other weather effects
2019-04-02 18:28:56 -05:00
DizzyEggg
d8c9f1b30f
Rows and columns
2019-04-02 16:28:38 -05:00
DizzyEggg
baa187665b
Document a bit of script menu and battle anims
2019-04-02 16:28:38 -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
DizzyEggg
5c44f44ad2
Organize new battle anim gfx
2019-04-02 12:26:24 +02:00
DizzyEggg
cd3de7821e
Merge branch 'master' into battle_engine_v2
2019-04-02 08:37:54 +02:00
Phlosioneer
c3200c0beb
Cleanup some of gContestResources
2019-04-02 00:35:57 -04:00
PikalaxALT
7571969a45
Finish union room battle
2019-04-01 22:08:50 -05:00
PikalaxALT
4be97b2dc6
through sub_801A960
2019-04-01 22:08:50 -05:00
Phlosioneer
845307b3a6
Rename contest AI stuff
2019-04-01 22:16:07 -04:00
Marcus Huderle
35505c7f5b
Document somre more weather effects
2019-04-01 20:04:23 -05: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
DizzyEggg
d39b5f6d26
Fix messing with move result flags when not needed
2019-04-02 00:14:01 +02:00
Papa Cancer
c9ad96d228
Stomping Tantrum
...
Uses timer in gBattleStruct to count time since last failed move. This is augmented by a MOVE_FAILED result in atk_49 and decreased with an ENDTURN case. EFFECT_STOMPING_TANTRUM doubles base power if the timer is set.
2019-04-01 20:06:45 +01:00
PikalaxALT
9f1d1219ce
create header and fix prototypes
2019-04-01 14:20:34 -04:00
PikalaxALT
ce89cf6f75
through sub_801A3D0
2019-04-01 14:09:56 -04:00
PikalaxALT
1fe5208560
through sub_801A02C
2019-04-01 12:05:58 -04:00
huderlem
1e8e5af033
Merge pull request #607 from Phlosioneer/contest-data
...
Contest data
2019-04-01 07:37:15 -05:00
huderlem
bee1d1cbb0
Merge pull request #611 from Phlosioneer/pokedex-area-const-array
...
Document sAreaGlowTilemapMapping
2019-04-01 07:33:33 -05:00
DizzyEggg
944dc4f6bf
Merge with master
2019-04-01 13:40:42 +02:00
DizzyEggg
62192b86f7
Aroma Veil
2019-04-01 11:42:37 +02:00
Marcus Huderle
099ea89b77
Document rain weather effect
2019-03-31 21:09:30 -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
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
PikalaxALT
ade0183378
Document mystery_gift
2019-03-31 18:59:52 -04:00
PikalaxALT
0a8427c8ef
fakematching task00_mystery_gift
2019-03-31 15:43:51 -05:00
PikalaxALT
90fb329b70
through task_add_00_mystery_gift
2019-03-31 15:43:51 -05:00
PikalaxALT
fb5c19a33b
through mevent_message
2019-03-31 15:43:51 -05:00
PikalaxALT
813de11154
Through mevent_save_game
2019-03-31 15:43:51 -05:00
PikalaxALT
f88f815cff
WIP sub_8018DAC
2019-03-31 15:43:51 -05:00
PikalaxALT
aafe9df454
through sub_8018798
2019-03-31 15:43:51 -05:00
PikalaxALT
f34cda3b52
Start decompiling mystery gift
2019-03-31 15:43:51 -05:00
DizzyEggg
e878de782e
Merge pull request #114 from thechurchofcage/gamma
...
Misc. move updates
2019-03-31 22:08:14 +02:00
DizzyEggg
6f9096c613
Add Sweet Veil
2019-03-31 22:02:39 +02:00
DizzyEggg
b12334c88b
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
Marcus Huderle
d13563b174
Document some faraway_island code
2019-03-31 14:09:40 -05:00
Papa Cancer
1d5cf3acb5
Misc. move updates
...
Bind: 75% Acc -> 85% Acc
Disable: 55% Acc. -> 100% Acc.
Freeze-Dry: 10% chance to freeze
Hammer Arm and Ice Hammer: lower user's speed
High Jump Kick: 130BP, 10 PP
Jump Kick: 100BP, 10 PP
Tail Glow: raises Sp. Atk by 3 stages
Waterfall: 20% chance to flinch
2019-03-31 18:25:37 +01:00
Marcus Huderle
462b196abc
Give battle_anim files appropriate names
2019-03-31 12:15:39 -05:00
Papa Cancer
ebe2dc6bbb
Mat Block
...
Nothing more needs to be said
2019-03-31 17:17:13 +01:00
Marcus Huderle
500d009b5c
Start decompiling berry_crush.c
2019-03-31 09:13:19 -05:00
huderlem
b9bf3bf072
Merge pull request #637 from DizzyEggg/pokeblock_attempt
...
Use Pokeblock clean-up and some menu_specialised decomp
2019-03-31 08:39:18 -05:00
DizzyEggg
d90767c490
Switch effect and argument fields in BattleMove struct
2019-03-31 15:24:46 +02:00
DizzyEggg
17e74756cb
Merge with master, add defines to atk49 and statbuffchange commands
2019-03-31 15:19:25 +02:00
DizzyEggg
e3c07c83f2
More work on use pokeblock
2019-03-31 14:32:26 +02:00
DizzyEggg
aa7f69f067
Begin use pokeblock and menu specialised
2019-03-31 12:59:01 +02:00
PikalaxALT
ccac4694cd
Merge branch 'master' into continue_union_room
2019-03-30 12:41:10 -04:00
DizzyEggg
35cffea987
Helpful macros for atk49
2019-03-30 08:29:56 -05:00
PikalaxALT
2f57d6bc0f
sub_8018220
2019-03-30 09:18:58 -04:00
DizzyEggg
876be1d9cd
Merge pull request #104 from thechurchofcage/beta
...
Spiky Shield
2019-03-30 11:21:27 +01:00
Marcus Huderle
accc5ae8dd
Merge remote-tracking branch 'upstream/master' into union_room_chat
...
# Conflicts:
# ld_script.txt
2019-03-29 21:27:08 -05:00
Marcus Huderle
a978a6a624
Finish decompiling union_room_chat.c
2019-03-29 21:26:08 -05:00
PikalaxALT
2e588fd4d7
through sub_80181DC
2019-03-29 22:22:26 -04:00
PikalaxALT
8fc51b0459
through sub_8017CB0
2019-03-29 15:50:04 -04:00
Marcus Huderle
519426f4e6
Decompile union_room_chat through sub_8020118
2019-03-28 20:20:52 -05:00
PikalaxALT
7c45a7c443
port mevent_801BAAC from fire red
2019-03-28 07:32:25 -05:00
Marcus Huderle
aebc676913
Decompile union_room_chat.c up to sub_801F5B8
2019-03-27 19:09:12 -05:00
PikalaxALT
8e0773675c
through sub_8017168
2019-03-27 13:16:10 -04:00
PikalaxALT
9a8b001ebf
through sub_801704C
2019-03-27 10:44:49 -04:00
scnorton
c6c0c9582f
Port menews_jisan.c from FireRed
2019-03-27 07:40:08 -05:00
Marcus Huderle
af1baa89f1
Start decompiling union_room_chat.c
2019-03-26 21:58:20 -05:00
Papa Cancer
a3b4767dd2
Spiky Shield
...
Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed
2019-03-26 17:45:34 +00:00
Fontbane
2cfa5ea326
Fixed Honey
...
And updated gitignore
2019-03-25 19:00:46 -04:00
Fontbane
fc69631a10
Field effects for Gen IV Abilities
...
Also added Honey (acts like White Flute for now) and made it so the Griseous Orb can't be removed from Giratina in battle.
2019-03-25 17:49:29 -04:00
scnorton
e3a11bc3ca
through sub_80259FC
2019-03-25 15:26:23 -04:00
PikalaxALT
d4cca4ffa2
through sub_8024F38
2019-03-24 22:56:16 -04:00
PikalaxALT
d49d3b6858
through sub_8024E38
2019-03-24 21:17:25 -04:00
Marcus Huderle
d7a9fcb975
Cleanup mevent2
2019-03-24 18:29:00 -05:00
Marcus Huderle
e6caf0ff10
Port mevent2.c from pokefirered
2019-03-24 18:29:00 -05:00
Marcus Huderle
cf917a8733
Decompile berry_powder.c
2019-03-24 14:50:16 -05:00
Marcus Huderle
456cc3a6f0
Split out the remaining wireless-related files
2019-03-24 13:15:37 -05:00
Papa Cancer
61a7bd2788
Taunt fix etc.
...
Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's.
Heal Block now displays the correct string when preventing usage of a move.
2019-03-24 12:54:01 +00:00
Marcus Huderle
4fd2b0b484
Decompile remaining functions in use_pokeblock.s
2019-03-23 17:23:14 -05:00
Wyrserth
6566a49beb
Use constants for naming screen's pages.
2019-03-23 21:52:58 +01:00
DizzyEggg
7018745230
Fix Defiant stat raise by allies
2019-03-23 17:21:14 +01:00
Marcus Huderle
511ff2f20f
Match sub_8166BEC and do some cleanup
2019-03-23 10:41:09 -05:00
DizzyEggg
e135ea47e5
Touch up Anger Point
2019-03-23 16:33:08 +01:00
Marcus Huderle
a5ee2c14fd
Merge remote-tracking branch 'upstream/master' into use_pokeblock
...
# Conflicts:
# include/menu_specialized.h
2019-03-23 10:14:31 -05:00
Marcus Huderle
91fa5faf4a
Match sub_8166564
2019-03-23 10:10:51 -05:00
Fontbane
e8add87bf3
Document Field Effects and some related text
...
Also VAR_TRICK_HOUSE_LEVEL
2019-03-23 09:57:37 -05:00
Fontbane
7d54c2b960
EventScript and Text Documentation
...
In event_script.s. Also renamed a couple events for consistency/detail.
2019-03-23 09:57:37 -05:00
DizzyEggg
53c60ab292
Merge branch 'master' into battle_engine_v2
2019-03-23 15:54:08 +01:00
DizzyEggg
77c4856e62
Nonmatchings go away
2019-03-23 09:51:27 -05:00
Marcus Huderle
65391a1eb2
Merge remote-tracking branch 'upstream/master' into use_pokeblock
...
# Conflicts:
# src/use_pokeblock.c
2019-03-23 09:39:46 -05:00
Marcus Huderle
a7d5f032b1
Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c
2019-03-22 14:16:26 -05:00
Marcus Huderle
f4f666f5af
Finish decompiling ereader.c
2019-03-22 13:36:06 -05:00
DizzyEggg
54ab6b43dc
Merge with master
2019-03-22 10:40:31 +01:00
Marcus Huderle
768a68d3e8
Decompile ereader.c up to faraway island code
2019-03-21 18:36:12 -05:00
Marcus Huderle
7118462b9f
Decompile ereader.c up to faraway island code
2019-03-21 18:28:44 -05:00
Marcus Huderle
e9a3cc6d51
Merge remote-tracking branch 'upstream/master' into move-tutor
...
# Conflicts:
# include/pokenav.h
# src/battle_script_commands.c
2019-03-17 17:20:40 -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
092608aef6
Add a constant for "no music" on maps.
2019-03-16 12:31:29 -05:00
Phlosioneer
61344a4fee
Document the water droplet data.
2019-03-16 12:25:02 -05:00
Phlosioneer
8cea949e6d
Move constant and EWRAM data into C.
2019-03-15 19:33:30 -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
0c935a8bd5
Move the contest opponent filter to C
2019-03-09 22:54:17 -05:00
