Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DSL Script conversion #562

Merged
merged 7 commits into from
Dec 24, 2021
Merged

DSL Script conversion #562

merged 7 commits into from
Dec 24, 2021

Conversation

Brotenko
Copy link
Member

@Brotenko Brotenko commented Dec 23, 2021

Resolves #563
Working towards #368 and #564

Updates update_evts and disasm_script to function better and have a few QoL improvements.
Also do some conversion to the new macro syntax.

@BowserSlug
Copy link
Collaborator

BowserSlug commented Dec 23, 2021

⚠️ This PR introduces 8 warnings:

  • src/world/area_arn/arn_02/events.c:181: warning: missing braces around initializer for `arn_02_npcGroup_802418AC.itemDrops[0]'
  • src/world/area_arn/arn_03/events.c:1124: warning: initialization makes pointer from integer without a cast
  • src/world/area_arn/arn_04/events.c:141: warning: missing braces around initializer for `arn_04_npcGroup_80243840.itemDrops[0]'
  • src/world/area_arn/arn_04/events.c:175: warning: missing braces around initializer for `arn_04_npcGroup_80243A30.itemDrops[0]'
  • src/world/area_arn/arn_04/events.c:610: warning: initialization makes pointer from integer without a cast
  • src/world/area_arn/arn_04/events.c:638: warning: implicit declaration of function `arn_04_func_80241040_BE47F0'
  • src/world/area_arn/arn_07/events.c:1382: warning: initialization makes pointer from integer without a cast
  • src/world/area_arn/arn_07/events.c:1410: warning: implicit declaration of function `arn_07_func_80240B00_BED8F0'
  • src/world/area_arn/arn_09/events.c:204: warning: implicit declaration of function `play_model_animation'
  • src/world/area_arn/arn_10/events.c:220: warning: missing braces around initializer for `arn_10_npcGroup_802409C8.itemDrops[0]'
  • src/world/area_arn/arn_12/events.c:220: warning: missing braces around initializer for `arn_12_npcGroup_802409CC.itemDrops[0]'
  • src/world/area_arn/arn_13/events.c:221: warning: missing braces around initializer for `arn_13_npcGroup_802409DC.itemDrops[0]'
  • src/world/area_dgb/dgb_00/BFA0A0.c:54: warning: initialization makes integer from pointer without a cast
  • src/world/area_dgb/dgb_00/BFA0A0.c:54: warning: initialization makes integer from pointer without a cast
  • src/world/area_dgb/dgb_01/BFD9A0.c:1261: warning: redundant redeclaration of `dgb_01_dgb_00_name_hack' in same scope
  • src/world/area_dgb/dgb_01/BFD9A0.c:1818: warning: redundant redeclaration of `dgb_01_dgb_08_name_hack' in same scope
  • src/world/area_dgb/dgb_01/BFD9A0.c:681: warning: initialization makes pointer from integer without a cast
  • src/world/area_dgb/dgb_01/BFD9A0.c:709: warning: implicit declaration of function `dgb_01_func_802402D0_BFDB50'
  • src/world/area_dgb/dgb_01/BFD9A0.c:828: warning: implicit declaration of function `func_802DE894'
  • src/world/area_dgb/dgb_01/BFD9A0.c:911: warning: implicit declaration of function `partner_enable_input'
  • src/world/area_dgb/dgb_01/BFD9A0.c:979: warning: initialization makes pointer from integer without a cast
  • src/world/area_dgb/dgb_02/C2EBA0.c:137: warning: redundant redeclaration of `dgb_02_main' in same scope
  • src/world/area_dgb/dgb_02/C2EBA0.c:421: warning: redundant redeclaration of `dgb_02_npcGroupList_802425C8' in same scope
  • src/world/area_dgb/dgb_04/C36530.c:1110: warning: assignment from incompatible pointer type
  • src/world/area_dgb/dgb_04/C36530.c:196: warning: initialization makes integer from pointer without a cast
  • src/world/area_dgb/dgb_04/C36530.c:196: warning: initialization makes integer from pointer without a cast
  • src/world/area_dgb/dgb_04/C36530.c:51: warning: initialization makes integer from pointer without a cast
  • src/world/area_dgb/dgb_04/C36530.c:51: warning: initialization makes integer from pointer without a cast
  • src/world/area_dgb/dgb_04/C36530.c:623: warning: implicit declaration of function `dgb_04_func_802401B0_C366E0'
  • src/world/area_dgb/dgb_04/C36530.c:67: warning: initialization makes integer from pointer without a cast
  • src/world/area_dgb/dgb_04/C36530.c:67: warning: initialization makes integer from pointer without a cast
  • src/world/area_dgb/dgb_04/C36530.c:732: warning: implicit declaration of function `func_802DE894'
  • src/world/area_dgb/dgb_04/C36530.c:815: warning: implicit declaration of function `partner_enable_input'
  • src/world/area_dgb/dgb_04/C36530.c:883: warning: initialization makes pointer from integer without a cast

@Brotenko Brotenko marked this pull request as ready for review December 23, 2021 23:10
@Brotenko Brotenko changed the title DSL Script convertion DSL Script conversion Dec 23, 2021
@bates64
Copy link
Member

bates64 commented Dec 23, 2021

I'm good with this PR assuming my review comment above is explained and the added warnings - probably due to a lack of EVT_PTR? - are fixed.

@Brotenko
Copy link
Member Author

Brotenko commented Dec 23, 2021

I was able to resolve most warnings I introduced, the rest of the warnings I looked at (not all of them because there are a lot more than 8 for some reasons) seem to be issues that existed before tho? Really confusing, so unless you absolutely need me to resolve those, I'd leave it like this. @nanaian

Copy link
Member

@ethteck ethteck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Nice work. The only thing I'd add is that before anyone does more batch conversion work, please check warnings as you go because I fear there's a warning-causing thing in the new script that's going to end up propagating warnings all across the codebase, so we should try to catch and fix it before we end up doing a ton of these and then having to manually fix each one

@Brotenko Brotenko merged commit f82f699 into pmret:master Dec 24, 2021
ethteck added a commit that referenced this pull request Dec 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update disasm_script.py
4 participants