diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-06-09 22:54:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 22:54:21 -0500 |
| commit | 377bd14ea67d6177250fb401e12d7dfcf44e2cf6 (patch) | |
| tree | 5440970e02a7890791b234aa233e91e5c1d65b40 /data/data_810AE24.s | |
| parent | eaa141c612dd1689936a21bd57018a55ff686b69 (diff) | |
Dungeon pokemon/Floor ID JSON Part 1 (#39)
* move Thunderwave and Tiny Woods pokemon to json
* rule tweaking to actually build tool before parsing JSON
* delete .inc pokemon for tiny Woods and Thunderwave
* silence git complaining about br_ips and ips_patch
* use defines for species and pass the header file for species
* convert sinister woods
* convert MtThunderPeak
* convert silent chasm
* add trial floor_id w/ tiny woods
* change make rule name to fix compile
* MtSteel converted and bugfix
* convert few floor headers and great canyon pokemon
* code cleanup
* unify unkData into UnkTextStruct2
* more code cleanup and some text decomp
* doc more funcs and decomp/split some stuff
* document more save stuff
* more save work and move some data
* pika sniped UpdateNatureTotal
* decomp a litle and convert a few more dungeons
* better scanning for json files
* mt freeze and peak
Diffstat (limited to 'data/data_810AE24.s')
| -rw-r--r-- | data/data_810AE24.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/data_810AE24.s b/data/data_810AE24.s index c2840a6..a699873 100644 --- a/data/data_810AE24.s +++ b/data/data_810AE24.s @@ -244,8 +244,8 @@ gUnknown_810DFB4: @ 810DFB4 gUnknown_810DFC8: @ 810DFC8 .byte 0xB8, 0xDF, 0x10, 0x08 - .global gUnknown_810DFCC -gUnknown_810DFCC: @ 810DFCC + .global gEvolutionStrings +gEvolutionStrings: @ 810DFCC .4byte NotNowText .4byte PossibleText .4byte NoMoreText @@ -363,7 +363,7 @@ gUnknown_8113918: @ 8113918 .global gUnknown_8113934 gUnknown_8113934: @ 8113934 -.byte 0x1c, 0x39, 0x11, 0x08 + .byte 0x1c, 0x39, 0x11, 0x08 .string "Attack#>42.#c2$d0#r \0" .align 2,0 @@ -759,14 +759,14 @@ gUnknown_8116148: @ 8116148 .byte 0x05, 0x01 .byte 0x00, 0x00 - .global gUnknown_811615C -gUnknown_811615C: @ 811615C + .global gInvalidityText +gInvalidityText: @ 811615C @ replacing .incbin "baserom.gba", 0x0011615c, 0x10 .string "#CWinvalidity#R\0" .align 2,0 - .global gUnknown_811616C -gUnknown_811616C: @ 811616C + .global gUndefineText +gUndefineText: @ 811616C @ replacing .incbin "baserom.gba", 0x0011616c, 0x10 .string "#CWundefine#R\0" .align 2,0 @@ -1663,8 +1663,8 @@ gUnknown_8118250: @ 8118250 .byte 0xF9, 0x06, 0x00, 0x00 .4byte ExecutePlayerScriptActionLives_Text - .global gUnknown_811825C -gUnknown_811825C: @ 811825C + .global gGroundLives_InvalidityText +gGroundLives_InvalidityText: @ 811825C .string "#CWinvalidity#R\0" .align 2,0 |