From 1fcafaf35aaf92251e7802e1e3ea36e8d5a6067b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 1 Oct 2017 18:54:01 +0200 Subject: more of battle2 done --- data/battle_anims.s | 2 +- data/data2b.s | 11 ++++++++--- data/event_scripts.s | 6 +++--- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/battle_anims.s b/data/battle_anims.s index 6b48bcd2a..8b285f7be 100644 --- a/data/battle_anims.s +++ b/data/battle_anims.s @@ -327,7 +327,7 @@ gUnknown_08525E98:: @ 8525E98 gUnknown_08525F58:: @ 8525F58 .incbin "baserom.gba", 0x525f58, 0x20 -gUnknown_08525F78:: @ 8525F78 +gCastformFrontSpriteCoords:: @ 8525F78 .incbin "baserom.gba", 0x525f78, 0x10 gUnknown_08525F88:: @ 8525F88 diff --git a/data/data2b.s b/data/data2b.s index fd72e835e..96d56c820 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -95,7 +95,7 @@ gUnknown_082FF6C0:: @ 82FF6C0 gUnknown_082FF70C:: @ 82FF70C .incbin "baserom.gba", 0x2ff70c, 0x162c -gUnknown_08300D38:: @ 8300D38 +gMonFrontPicCoords:: @ 8300D38 .incbin "baserom.gba", 0x300d38, 0x6e0 @ 8301418 @@ -196,8 +196,13 @@ gUnknown_0831AC70:: @ 831AC70 gUnknown_0831AC88:: @ 831AC88 .incbin "baserom.gba", 0x31ac88, 0x18 -gUnknown_0831ACA0:: @ 831ACA0 - .incbin "baserom.gba", 0x31aca0, 0x40 +gText_ShedinjaJapaneseName:: @ 831ACA0 + .string "ヌケニン$" @Nukenin + +.align 2 + +gUnknown_0831ACA8:: @ 831ACA8 + .incbin "baserom.gba", 0x31aca8, 0x38 gUnknown_0831ACE0:: @ 831ACE0 .incbin "baserom.gba", 0x31ace0, 0x8 diff --git a/data/event_scripts.s b/data/event_scripts.s index e4293570d..4dd5761e5 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -84,14 +84,14 @@ gUnknown_0823B68C:: @ 823B68C gUnknown_0823C050:: @ 823C050 .incbin "baserom.gba", 0x23c050, 0x6431 -gUnknown_08242481:: @ 8242481 +gText_BattleRecordCouldntBeSaved:: @ 8242481 .incbin "baserom.gba", 0x242481, 0x87b gUnknown_08242CFC:: @ 8242CFC .incbin "baserom.gba", 0x242cfc, 0x6a91 -gUnknown_0824978D:: @ 824978D - .incbin "baserom.gba", 0x24978d, 0xe +gText_LinkStandby3:: @ 824978D + .string "Link standby…$" gUnknown_0824979B:: @ 824979B .incbin "baserom.gba", 0x24979b, 0x944d -- cgit v1.2.3 From 46fe1f441f1f40633b538c9db7d24aa4439629cf Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 3 Oct 2017 21:35:27 +0200 Subject: giant battle handler is done wohohohhohoho --- data/battle_scripts_1.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 206519f40..0b797feef 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -561,7 +561,7 @@ BattleScript_BerryStatRaiseEnd2:: @ 82DB84E BattleScript_BerryFocusEnergyEnd2:: @ 82DB869 .incbin "baserom.gba", 0x2db869, 0x10 -gUnknown_082DB879:: @ 82DB879 +BattleScript_ActionSelectionItemsCantBeUsed:: @ 82DB879 .incbin "baserom.gba", 0x2db879, 0x4 gUnknown_082DB87D:: @ 82DB87D -- cgit v1.2.3 From e7175999f55da53392d269a2f03f498a03c9826c Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 5 Oct 2017 13:02:39 -0400 Subject: decompile braille_puzzles.c --- data/field_effect_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 89ed27301..ceb327084 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -316,7 +316,7 @@ gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC field_eff_end gFieldEffectScript_Unknown60:: @ 82DBCD2 - field_eff_callnative sub_81799B8 + field_eff_callnative FldEff_UsePuzzleEffect field_eff_end gFieldEffectScript_Unknown61:: @ 82DBCD8 -- cgit v1.2.3 From 342e616d4b49d1772628947782a931964d36e167 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 6 Oct 2017 00:12:01 +0200 Subject: battle2 more and more and more --- data/battle_scripts_1.s | 22 +++++++++++----------- data/battle_scripts_2.s | 8 ++++---- data/data2b.s | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 0b797feef..faa945bdd 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -45,34 +45,34 @@ gUnknown_082DA7C4:: @ 82DA7C4 gUnknown_082DA7CD:: @ 82DA7CD .incbin "baserom.gba", 0x2da7cd, 0x160 -gUnknown_082DA92D:: @ 82DA92D +BattleScript_LocalTrainerBattleWon:: @ 82DA92D .incbin "baserom.gba", 0x2da92d, 0x3d -gUnknown_082DA96A:: @ 82DA96A +BattleScript_PayDayMoneyAndPickUpItems:: @ 82DA96A .incbin "baserom.gba", 0x2da96a, 0x3 -gUnknown_082DA96D:: @ 82DA96D +BattleScript_LocalBattleLost:: @ 82DA96D .incbin "baserom.gba", 0x2da96d, 0x9e gUnknown_082DAA0B:: @ 82DAA0B .incbin "baserom.gba", 0x2daa0b, 0x2a -gUnknown_082DAA35:: @ 82DAA35 +BattleScript_LinkBattleWonOrLost:: @ 82DAA35 .incbin "baserom.gba", 0x2daa35, 0x52 -gUnknown_082DAA87:: @ 82DAA87 +BattleScript_FrontierTrainerBattleWon:: @ 82DAA87 .incbin "baserom.gba", 0x2daa87, 0x54 -gUnknown_082DAADB:: @ 82DAADB +BattleScript_SmokeBallEscape:: @ 82DAADB .incbin "baserom.gba", 0x2daadb, 0xe -gUnknown_082DAAE9:: @ 82DAAE9 +BattleScript_RanAwayUsingMonAbility:: @ 82DAAE9 .incbin "baserom.gba", 0x2daae9, 0x7 -gUnknown_082DAAF0:: @ 82DAAF0 +BattleScript_GotAwaySafely:: @ 82DAAF0 .incbin "baserom.gba", 0x2daaf0, 0x7 -gUnknown_082DAAF7:: @ 82DAAF7 +BattleScript_WildMonFled:: @ 82DAAF7 .incbin "baserom.gba", 0x2daaf7, 0x7 gUnknown_082DAAFE:: @ 82DAAFE @@ -87,7 +87,7 @@ gUnknown_082DAB0B:: @ 82DAB0B gUnknown_082DAB11:: @ 82DAB11 .incbin "baserom.gba", 0x2dab11, 0x4 -gUnknown_082DAB15:: @ 82DAB15 +BattleScript_ActionSwitch:: @ 82DAB15 .incbin "baserom.gba", 0x2dab15, 0xa4 BattleScript_Pausex20:: @ 82DABB9 @@ -255,7 +255,7 @@ BattleScript_OneHitKOMsg:: @ 82DB1CE BattleScript_SAtkDown2:: @ 82DB1D5 .incbin "baserom.gba", 0x2db1d5, 0x2a -gUnknown_082DB1FF:: @ 82DB1FF +BattleScript_FocusPunchSetUp:: @ 82DB1FF .incbin "baserom.gba", 0x2db1ff, 0x14 BattleScript_MoveUsedIsAsleep:: @ 82DB213 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index adabccb88..985c09b23 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -4,7 +4,7 @@ .section script_data, "aw", %progbits .align 2 -gUnknown_082DBD08:: @ 82DBD08 +gBattlescriptsForBallThrow:: @ 82DBD08 .4byte gUnknown_082DBD68 .4byte gUnknown_082DBD68 .4byte gUnknown_082DBD68 @@ -29,8 +29,8 @@ gUnknown_082DBD3C:: @ 82DBD3C .4byte gUnknown_082DBE91 .align 2 -gUnknown_082DBD54:: @ 82DBD54 - .4byte gUnknown_082DBEB3 +gBattlescriptsForRunningByItem:: @ 82DBD54 + .4byte BattleScript_RunByUsingItem .align 2 gUnknown_082DBD58:: @ 82DBD58 @@ -72,7 +72,7 @@ gUnknown_082DBE6F:: @ 82DBE6F gUnknown_082DBE91:: @ 82DBE91 .incbin "baserom.gba", 0x2dbe91, 0x22 -gUnknown_082DBEB3:: @ 82DBEB3 +BattleScript_RunByUsingItem:: @ 82DBEB3 .incbin "baserom.gba", 0x2dbeb3, 0xA gUnknown_082DBEBD:: @ 82DBEBD diff --git a/data/data2b.s b/data/data2b.s index 96d56c820..717b70d4d 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -226,10 +226,10 @@ gTrainerMoneyTable:: @ 831AEB8 @ 831BAD4 .include "data/text/ability_description_pointers.inc" -gUnknown_0831BC0C:: @ 831BC0C +gTurnActionsFuncsTable:: @ 831BC0C .incbin "baserom.gba", 0x31bc0c, 0x38 -gUnknown_0831BC44:: @ 831BC44 +gEndTurnFuncsTable:: @ 831BC44 .incbin "baserom.gba", 0x31bc44, 0x2c gStatusConditionString_PoisonJpn:: @ 831BC70 -- cgit v1.2.3 From 3cc20c7c3f9c3b6a3c0fc8b47c0128c067f34a4a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 6 Oct 2017 17:06:45 +0200 Subject: battle 2 is done --- data/battle_scripts_1.s | 2 +- data/battle_scripts_2.s | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index faa945bdd..b2dfec5d8 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -78,7 +78,7 @@ BattleScript_WildMonFled:: @ 82DAAF7 gUnknown_082DAAFE:: @ 82DAAFE .incbin "baserom.gba", 0x2daafe, 0x4 -gUnknown_082DAB02:: @ 82DAB02 +BattleScript_PrintFailedToRunString:: @ 82DAB02 .incbin "baserom.gba", 0x2dab02, 0x9 gUnknown_082DAB0B:: @ 82DAB0B diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 985c09b23..4a4dc4665 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -33,7 +33,7 @@ gBattlescriptsForRunningByItem:: @ 82DBD54 .4byte BattleScript_RunByUsingItem .align 2 -gUnknown_082DBD58:: @ 82DBD58 +gBattlescriptsForSafariActions:: @ 82DBD58 .4byte gUnknown_082DBEBD .4byte gUnknown_082DBEC4 .4byte gUnknown_082DBECD -- cgit v1.2.3 From 7b88c7f2f0bceb6adc0ea3081c18e175dd4cb21c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 6 Oct 2017 19:09:37 +0200 Subject: move const data to battle files --- data/battle_message.s | 7 +++++++ data/data2b.s | 43 ------------------------------------------- 2 files changed, 7 insertions(+), 43 deletions(-) (limited to 'data') diff --git a/data/battle_message.s b/data/battle_message.s index 05847eed0..4c72557d8 100644 --- a/data/battle_message.s +++ b/data/battle_message.s @@ -1768,12 +1768,19 @@ gText_SafariBalls:: @ 85CCB2C gText_SafariBallLeft:: @ 85CCB3C .string "{HIGHLIGHT DARK_GREY}Left: $" .string "{HIGHLIGHT DARK_GREY}$" +gText_Sleep:: .string "sleep$" +gText_Poison:: .string "poison$" +gText_Burn:: .string "burn$" +gText_Paralysis:: .string "paralysis$" +gText_Ice:: .string "ice$" +gText_Confusion:: .string "confusion$" +gText_Love:: .string "love$" gText_SpaceAndSpace:: @ 85CCB79 diff --git a/data/data2b.s b/data/data2b.s index 717b70d4d..802399fca 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -225,46 +225,3 @@ gTrainerMoneyTable:: @ 831AEB8 @ 831BAD4 .include "data/text/ability_description_pointers.inc" - -gTurnActionsFuncsTable:: @ 831BC0C - .incbin "baserom.gba", 0x31bc0c, 0x38 - -gEndTurnFuncsTable:: @ 831BC44 - .incbin "baserom.gba", 0x31bc44, 0x2c - -gStatusConditionString_PoisonJpn:: @ 831BC70 - .incbin "baserom.gba", 0x31bc70, 0x8 - -gStatusConditionString_SleepJpn:: @ 831BC78 - .incbin "baserom.gba", 0x31bc78, 0x8 - -gStatusConditionString_ParalysisJpn:: @ 831BC80 - .incbin "baserom.gba", 0x31bc80, 0x8 - -gStatusConditionString_BurnJpn:: @ 831BC88 - .incbin "baserom.gba", 0x31bc88, 0x8 - -gStatusConditionString_IceJpn:: @ 831BC90 - .incbin "baserom.gba", 0x31bc90, 0x8 - -gStatusConditionString_ConfusionJpn:: @ 831BC98 - .incbin "baserom.gba", 0x31bc98, 0x8 - -gStatusConditionString_LoveJpn:: @ 831BCA0 - .incbin "baserom.gba", 0x31bca0, 0x8 - -gUnknown_0831BCA8:: @ 831BCA8 - .incbin "baserom.gba", 0x31bca8, 0x38 - -gUnknown_0831BCE0:: @ 831BCE0 - .incbin "baserom.gba", 0x31bce0, 0xf - -gUnknown_0831BCEF:: @ 831BCEF - .incbin "baserom.gba", 0x31bcef, 0x4 - -gUnknown_0831BCF3:: @ 831BCF3 - .incbin "baserom.gba", 0x31bcf3, 0x5 - -gSoundMovesTable:: @ 831BCF8 - .incbin "baserom.gba", 0x31bcf8, 0x18 - -- cgit v1.2.3 From f383cb8354223de3d8a630800ebeffc470737960 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 6 Oct 2017 19:48:18 -0400 Subject: update labels --- data/data4.s | 13 +++++-------- data/save_failed_screen.s | 8 ++++---- 2 files changed, 9 insertions(+), 12 deletions(-) (limited to 'data') diff --git a/data/data4.s b/data/data4.s index 202b1ffe7..d99336e87 100644 --- a/data/data4.s +++ b/data/data4.s @@ -14,19 +14,16 @@ gUnknown_085B09F4:: @ 85B09F4 gUnknown_085B09F8:: @ 85B09F8 .incbin "baserom.gba", 0x5b09f8, 0x8 -gUnknown_085B0A00:: @ 85B0A00 - .incbin "baserom.gba", 0x5b0a00, 0x2 +gBirchBagGrassPal:: @ 85B0A00 + .incbin "baserom.gba", 0x5b0a00, 0x80 -gUnknown_085B0A02:: @ 85B0A02 - .incbin "baserom.gba", 0x5b0a02, 0x7e - -gUnknown_085B0A80:: @ 85B0A80 +gBirchBagTilemap:: @ 85B0A80 .incbin "baserom.gba", 0x5b0a80, 0x18c -gUnknown_085B0C0C:: @ 85B0C0C +gBirchGrassTilemap:: @ 85B0C0C .incbin "baserom.gba", 0x5b0c0c, 0x1f8 -gUnknown_085B0E04:: @ 85B0E04 +gBirchHelpGfx:: @ 85B0E04 .incbin "baserom.gba", 0x5b0e04, 0xfc8 gUnknown_085B1DCC:: @ 85B1DCC diff --git a/data/save_failed_screen.s b/data/save_failed_screen.s index 446eee2d2..1b9fb7ed1 100644 --- a/data/save_failed_screen.s +++ b/data/save_failed_screen.s @@ -3,7 +3,7 @@ .section .rodata -gUnknown_085EFD80:: @ 85EFD80 +gClockOamData:: @ 85EFD80 .incbin "baserom.gba", 0x5efd80, 0x8 gUnknown_085EFD88:: @ 85EFD88 @@ -18,11 +18,11 @@ gUnknown_085EFD9C:: @ 85EFD9C gUnknown_085EFDA4:: @ 85EFDA4 .incbin "baserom.gba", 0x5efda4, 0x8 -gUnknown_085EFDAC:: @ 85EFDAC +gClockFrames:: @ 85EFDAC .incbin "baserom.gba", 0x5efdac, 0x18 -gUnknown_085EFDC4:: @ 85EFDC4 +gSaveFailedClockPal:: @ 85EFDC4 .incbin "baserom.gba", 0x5efdc4, 0x20 -gUnknown_085EFDE4:: @ 85EFDE4 +gSaveFailedClockGfx:: @ 85EFDE4 .incbin "baserom.gba", 0x5efde4, 0x90 -- cgit v1.2.3 From e38fd8347d2519551648c351d528cc3fee3924d4 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 6 Oct 2017 21:59:47 -0400 Subject: use rodata for save_failed_screen --- data/save_failed_screen.s | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 data/save_failed_screen.s (limited to 'data') diff --git a/data/save_failed_screen.s b/data/save_failed_screen.s deleted file mode 100644 index 1b9fb7ed1..000000000 --- a/data/save_failed_screen.s +++ /dev/null @@ -1,28 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gClockOamData:: @ 85EFD80 - .incbin "baserom.gba", 0x5efd80, 0x8 - -gUnknown_085EFD88:: @ 85EFD88 - .incbin "baserom.gba", 0x5efd88, 0xc - -gUnknown_085EFD94:: @ 85EFD94 - .incbin "baserom.gba", 0x5efd94, 0x8 - -gUnknown_085EFD9C:: @ 85EFD9C - .incbin "baserom.gba", 0x5efd9c, 0x8 - -gUnknown_085EFDA4:: @ 85EFDA4 - .incbin "baserom.gba", 0x5efda4, 0x8 - -gClockFrames:: @ 85EFDAC - .incbin "baserom.gba", 0x5efdac, 0x18 - -gSaveFailedClockPal:: @ 85EFDC4 - .incbin "baserom.gba", 0x5efdc4, 0x20 - -gSaveFailedClockGfx:: @ 85EFDE4 - .incbin "baserom.gba", 0x5efde4, 0x90 -- cgit v1.2.3 From f0775000a1cd87174e9b3a5a6a365e189309385e Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 7 Oct 2017 22:54:32 -0400 Subject: decompile diploma.c --- data/diploma.s | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 data/diploma.s (limited to 'data') diff --git a/data/diploma.s b/data/diploma.s deleted file mode 100644 index 43a3d9c70..000000000 --- a/data/diploma.s +++ /dev/null @@ -1,22 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_085E7088:: @ 85E7088 - .incbin "baserom.gba", 0x5e7088, 0x40 - -gUnknown_085E70C8:: @ 85E70C8 - .incbin "baserom.gba", 0x5e70c8, 0x73c - -gUnknown_085E7804:: @ 85E7804 - .incbin "baserom.gba", 0x5e7804, 0x9f8 - -gUnknown_085E81FC:: @ 85E81FC - .incbin "baserom.gba", 0x5e81fc, 0x8 - -gUnknown_085E8204:: @ 85E8204 - .incbin "baserom.gba", 0x5e8204, 0x10 - -gUnknown_085E8214:: @ 85E8214 - .incbin "baserom.gba", 0x5e8214, 0x4 -- cgit v1.2.3 From a9d94cc5d62540f6f20b17280cb8f45adc5683b1 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 8 Oct 2017 22:21:34 -0400 Subject: decompile save_location.c --- data/save_location.s | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 data/save_location.s (limited to 'data') diff --git a/data/save_location.s b/data/save_location.s deleted file mode 100644 index eabed7d86..000000000 --- a/data/save_location.s +++ /dev/null @@ -1,13 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_086143BC:: @ 86143BC - .incbin "baserom.gba", 0x6143bc, 0x4e - -gUnknown_0861440A:: @ 861440A - .incbin "baserom.gba", 0x61440a, 0x4 - -gUnknown_0861440E:: @ 861440E - .incbin "baserom.gba", 0x61440e, 0x2 -- cgit v1.2.3